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

2014-02-10 Thread Laurent Balland-Poirier 
 chart2/source/tools/PolynomialRegressionCurveCalculator.cxx |   15 +++-
 1 file changed, 14 insertions(+), 1 deletion(-)

New commits:
commit bac928cf6405c869ab83bc136dac52b037386108
Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net
Date:   Wed Jan 8 22:37:52 2014 +0100

fdo#73374 Trendline: correct R^2 for forced intercept

In case of forced intercept, R^2 must be calculated in a different way.
This patch calculates R^2 of trend line in the same way as LINEST
function.

Change-Id: I3ac361f014569261f05d513acb3428de5c7641ab
Reviewed-on: https://gerrit.libreoffice.org/7326
Reviewed-by: Tomaž Vajngerl qui...@gmail.com
Tested-by: Tomaž Vajngerl qui...@gmail.com
(cherry picked from commit 9e67015be6e9e53e19466117d692de17c18463da)
Reviewed-on: https://gerrit.libreoffice.org/7956
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx 
b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
index 951c071..21b564d 100644
--- a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
@@ -167,6 +167,8 @@ void SAL_CALL 
PolynomialRegressionCurveCalculator::recalculateRegression(
 // Calculate correlation coeffitient
 double aSumError = 0.0;
 double aSumTotal = 0.0;
+double aSumYpred2 = 0.0;
+double aSumYactual2 = 0.0;
 
 for( sal_Int32 i = 0; i  aNoValues; i++ )
 {
@@ -175,9 +177,20 @@ void SAL_CALL 
PolynomialRegressionCurveCalculator::recalculateRegression(
 double yPredicted = getCurveValue( xValue );
 aSumTotal += (yActual - yAverage) * (yActual - yAverage);
 aSumError += (yActual - yPredicted) * (yActual - yPredicted);
+aSumYpred2 += yPredicted * yPredicted;
+aSumYactual2 += yActual * yActual;
 }
 
-double aRSquared = 1.0 - (aSumError / aSumTotal);
+double aRSquared = 0.0;
+if(mForceIntercept)
+{
+if(aSumYactual2 != 0.0)
+aRSquared = aSumYpred2 / aSumYactual2;
+}
+else
+{
+aRSquared = 1.0 - (aSumError / aSumTotal);
+}
 
 if (aRSquared  0.0)
 m_fCorrelationCoeffitient = std::sqrt(aRSquared);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Kohei Yoshida 
 sc/source/core/data/table1.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6a27efa43b2181599fb92ed99061e5b491dfd4a2
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Sun Feb 9 22:10:24 2014 -0500

fdo#74323: The end position is inclusive.

Change-Id: Ibd0ff19d7fd2de72a3b8d790a371da4b23df38c8
(cherry picked from commit b6378a1651e7157063746d7001ef566545338bd0)
Reviewed-on: https://gerrit.libreoffice.org/7961
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 4eed3b0..f958927 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -1434,7 +1434,7 @@ bool ScTable::GetNextMarkedCell( SCCOL rCol, SCROW 
rRow, const ScMarkData rMa
 }
 }
 
-if (nTestRow  nEnd)
+if (nTestRow = nEnd)
 {
 // Cell found.
 rRow = nTestRow;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/rtl

2014-02-10 Thread Stephan Bergmann 
 sal/rtl/ustring.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ff5a48439c7975314e48056092baafa9a6359f9a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Feb 10 09:30:24 2014 +0100

Do not do RTL_LOG_STRING_NEW on null pointer

Change-Id: Ie972599650620324fa7af5ed2b2843bfc1f34c43

diff --git a/sal/rtl/ustring.cxx b/sal/rtl/ustring.cxx
index 3599a92..d31d6bc 100644
--- a/sal/rtl/ustring.cxx
+++ b/sal/rtl/ustring.cxx
@@ -493,9 +493,9 @@ void SAL_CALL rtl_uString_newFromAscii( rtl_uString** 
ppThis,
 pCharStr++;
 }
 while ( *pCharStr );
-}
 
-RTL_LOG_STRING_NEW( *ppThis );
+RTL_LOG_STRING_NEW( *ppThis );
+}
 }
 
 void SAL_CALL rtl_uString_newFromCodePoints(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Miklos Vajna 
 sfx2/source/appl/sfxpicklist.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 8d81fb07a117cf366f1db60db8b33e25ecb4a570
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Mon Feb 10 09:26:13 2014 +0100

startcenter: don't generate thumbnails in headless mode

Commit e2eda70f2746f08376d8cdf5e5360df217335aef (startcenter: fdo#72469:
Thumbnails also for other file types than ODF, 2014-02-03) turned on
thumbnail generation for non-ODF documents as well. This is not that
interesting in case --headless is used, however it slows down unit tests
quite a lot, resulting in about doubled toplevel noop make time.

Numbers on my machine for toplevel 'make' (in case there is no code to
rebuild):
- before: real5m56.857s
- after:  real2m39.432s

Change-Id: I0edc13c29a7713f8faf8158ba240151977cdfa4b

diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index a06002d..236e74f 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -192,7 +192,8 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* 
pDocSh )
 
 // generate a thumbnail
 OUString aThumbnail;
-if (!pDocSh-IsModified())
+// don't generate thumbnail when in headless mode
+if (!pDocSh-IsModified()  !Application::IsHeadlessModeRequested())
 {
 // not modified = the document matches what is in the shell
 boost::shared_ptrGDIMetaFile pMetaFile = 
pDocSh-GetPreviewMetaFile();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Markus Mohrhard 
 chart2/source/view/main/DummyXShape.cxx |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit ada1e6d83202d34871c6f6c9d2f521be3f0bbda5
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Sun Feb 9 16:38:44 2014 +0100

first step into positioning fixes for legends

Change-Id: Id6c83f907c942a48005338090fc01d9d23045548

diff --git a/chart2/source/view/main/DummyXShape.cxx 
b/chart2/source/view/main/DummyXShape.cxx
index 4ed9622..f701314 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -860,10 +860,16 @@ awt::Size DummyGroup2D::getSize()
 return awt::Size(nRight - nLeft, nBottom - nTop);
 }
 
-void DummyGroup2D::setPosition( const awt::Point )
+void DummyGroup2D::setPosition( const awt::Point rPos )
 throw(uno::RuntimeException)
 {
-SAL_WARN(chart2.opengl, set position on group shape);
+for(std::vectorDummyXShape*::const_iterator itr = maShapes.begin(),
+itrEnd = maShapes.end(); itr != itrEnd; ++itr)
+{
+awt::Point aPos = (*itr)-getPosition();
+awt::Point aNewPos( rPos.X + aPos.X, rPos.Y + aPos.Y);
+(*itr)-setPosition(aNewPos);
+}
 }
 
 void DummyGroup2D::setSize( const awt::Size )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Miklos Vajna 
 sw/qa/extras/rtfexport/data/fdo74709.rtf   |   32 +
 sw/qa/extras/rtfexport/rtfexport.cxx   |7 +
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   28 +
 3 files changed, 67 insertions(+)

New commits:
commit 6b5ef795ed4a56195bf09633b03e88474f0b133c
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Mon Feb 10 09:39:16 2014 +0100

fdo#74709 RTF import: implement RTF_CLPAD*

Change-Id: I482735e3fc4091be983b2c7484e086f5d0dd283a

diff --git a/sw/qa/extras/rtfexport/data/fdo74709.rtf 
b/sw/qa/extras/rtfexport/data/fdo74709.rtf
new file mode 100644
index 000..c521084
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/fdo74709.rtf
@@ -0,0 +1,32 @@
+{\rtf1\ansi\deff4\adeflang1025
+\deftab720
+\viewscale100
+{\*\pgdsctbl
+{\pgdsc0\pgdscuse451\pgwsxn11906\pghsxn16838\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\pgdscnxt0
 Default Style;}
+}
+\formshade\paperh16838\paperw11906\margl1134\margr1134\margt1134\margb1134\sectd\sbknone\sectunlocked1\pgndec\pgwsxn11906\pghsxn16838\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc
+\trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0
+\clbrdrt\brdrhair\brdrw1\brdrcf1\clbrdrl\brdrhair\brdrw1\brdrcf1\clbrdrb\brdrhair\brdrw1\brdrcf1\cellx4819
+\clbrdrt\brdrhair\brdrw1\brdrcf1\clpadfl3\clpadl58
+\clbrdrl\brdrhair\brdrw1\brdrcf1\clpadft3\clpadt58
+\clbrdrb\brdrhair\brdrw1\brdrcf1\clpadfb3\clpadb58
+\clbrdrr\brdrhair\brdrw1\brdrcf1\clpadfr3\clpadr360\cellx9638
+\pgndec\pard\plain \s20\noline\intbl\qr
+{\rtlch \ltrch\loch 1.23}
+\cell
+\pard\plain \s20\noline\intbl\qr
+{\rtlch \ltrch\loch 4.56}
+\cell\row
+\pard\trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0
+\clbrdrl\brdrhair\brdrw1\brdrcf1\clbrdrb\brdrhair\brdrw1\brdrcf1\cellx4819
+\clbrdrl\brdrhair\brdrw1\brdrcf1\clbrdrb\brdrhair\brdrw1\brdrcf1\clbrdrr\brdrhair\brdrw1\brdrcf1\cellx9638
+\pard\plain \s20\noline\intbl
+{\rtlch \ltrch\loch first word}
+\cell
+\pard\plain \s20\noline\intbl
+{\rtlch \ltrch\loch second word}
+\cell\row
+\pard\pard\plain \s0\nowidctlpar
+{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}
+\cf0\kerning1\dbch\af5\langfe2052\dbch\af6\afs24\alang1081\loch\f4\fs24\lang2057\rtlch
 \ltrch\loch
+\par }
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 49e7dfb..8d5b214 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -595,6 +595,13 @@ DECLARE_RTFEXPORT_TEST(testFdo68787, fdo68787.rtf)
 CPPUNIT_ASSERT_EQUAL(sal_Int32(25), getPropertysal_Int32(xPageStyle, 
FootnoteLineRelativeWidth));
 }
 
+DECLARE_RTFEXPORT_TEST(testFdo74709, fdo74709.rtf)
+{
+uno::Referencetable::XCell xCell = getCell(getParagraphOrTable(1), B1);
+// This was 0, as top/bottom/left/right padding wasn't imported.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(360)), 
getPropertysal_Int32(xCell, RightBorderDistance));
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 4ba2ea3..d6845b7 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3734,6 +3734,34 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 case RTF_TS:
 m_aStates.top().bHasTableStyle = true;
 break;
+case RTF_CLPADB:
+case RTF_CLPADL:
+case RTF_CLPADR:
+case RTF_CLPADT:
+{
+RTFSprms aAttributes;
+aAttributes.set(NS_ooxml::LN_CT_TblWidth_type, 
RTFValue::Pointer_t(new RTFValue(NS_ooxml::LN_Value_ST_TblWidth_dxa)));
+aAttributes.set(NS_ooxml::LN_CT_TblWidth_w, 
RTFValue::Pointer_t(new RTFValue(nParam)));
+switch (nKeyword)
+{
+case RTF_CLPADB:
+nSprm = NS_ooxml::LN_CT_TcMar_bottom;
+break;
+case RTF_CLPADL:
+nSprm = NS_ooxml::LN_CT_TcMar_left;
+break;
+case RTF_CLPADR:
+nSprm = NS_ooxml::LN_CT_TcMar_right;
+break;
+case RTF_CLPADT:
+nSprm = NS_ooxml::LN_CT_TcMar_top;
+break;
+default:
+break;
+}
+lcl_putNestedSprm(m_aStates.top().aTableCellSprms, 
NS_ooxml::LN_CT_TcPrBase_tcMar, nSprm, RTFValue::Pointer_t(new 
RTFValue(aAttributes)));
+}
+break;
 default:
 {
 SAL_INFO(writerfilter, TODO handle value '  
lcl_RtfToString(nKeyword)  ');
___
Libreoffice-commits mailing list

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

2014-02-10 Thread Stephan Bergmann 
 0 files changed

New commits:
commit 46e63b70d99eab31758afd3abf29c2237b9248de
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Feb 10 10:11:45 2014 +0100

instdir/program/senddoc lacks executable mode bits

(but appears OK in true installation sets)

Change-Id: I1c044409b97bd3121509a2185dfac89298312954

diff --git a/shell/source/unix/misc/senddoc.sh 
b/shell/source/unix/misc/senddoc.sh
old mode 100644
new mode 100755
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Tor Lillqvist 
 external/firebird/firebird-macosx.patch.1 |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit dd06463eadd9fe5e3e33e01be3d1aa3bd7c33abc
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Feb 10 11:22:05 2014 +0200

Seems that -fno-weak is unknown in upcoming Clang on OS X

Change-Id: I43bb17757f2b477674c49ad989393bb861c8d934

diff --git a/external/firebird/firebird-macosx.patch.1 
b/external/firebird/firebird-macosx.patch.1
index adede1c..0ad9bd9 100644
--- a/external/firebird/firebird-macosx.patch.1
+++ b/external/firebird/firebird-macosx.patch.1
@@ -87,14 +87,16 @@ diff -ur firebird.org/builds/posix/postfix.darwin 
firebird/builds/posix/postfix.
  export DYLD_LIBRARY_PATH
  
  MACOSX_DEPLOYMENT_TARGET=10.6
-@@ -27,8 +27,8 @@
+@@ -27,9 +27,9 @@
  
  OS_ServerFiles=inet_server.cpp
  
 -PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common 
-mmacosx-version-min=10.6
 -DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall 
-mmacosx-version-min=10.6
+-CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden 
-fno-weak
 +PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common
 +DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall
- CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden 
-fno-weak
++CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden
  EMBED_UTIL_TARGETS=gstat gds_relay gsec fbguard nbackup fb_lock_print 
fbsvcmgr fbtracemgr
  CLIENT_UTIL_TARGETS=gds_relay gstat gsec fbguard fbmgr_bin nbackup 
fb_lock_print fbsvcmgr \
+   fbtracemgr
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Noel Grandin 
 sc/inc/dbdocutl.hxx   |2 
 sc/inc/detdata.hxx|8 +-
 sc/inc/detfunc.hxx|   42 ++--
 sc/source/core/data/dbdocutl.cxx  |2 
 sc/source/core/tool/detdata.cxx   |6 -
 sc/source/core/tool/detfunc.cxx   |  124 +++---
 sc/source/ui/docshell/docfunc.cxx |   16 ++--
 7 files changed, 100 insertions(+), 100 deletions(-)

New commits:
commit ec3c9a5f7fd04327697d50505ac56fcfbb71ca45
Author: Noel Grandin n...@peralex.com
Date:   Fri Feb 7 16:06:27 2014 +0200

sal_Bool-bool

Change-Id: I1b45ccb419ce827ca9ddb475e67878c95d67d36d

diff --git a/sc/inc/detfunc.hxx b/sc/inc/detfunc.hxx
index 4091162..2f7d636 100644
--- a/sc/inc/detfunc.hxx
+++ b/sc/inc/detfunc.hxx
@@ -53,7 +53,7 @@ class SC_DLLPUBLIC ScDetectiveFunc
 static ColorData nArrowColor;
 static ColorData nErrorColor;
 static ColorData nCommentColor;
-static sal_Bool  bColorsInitialized;
+static bool  bColorsInitialized;
 
 ScDocument* pDoc;
 SCTAB   nTab;
@@ -76,30 +76,30 @@ class SC_DLLPUBLIC ScDetectiveFunc
 /** @return the drawing layer rectangle for the passed cell address. */
 Rectangle   GetDrawRect( SCCOL nCol, SCROW nRow ) const;
 
-sal_BoolHasArrow( const ScAddress rStart,
+boolHasArrow( const ScAddress rStart,
 SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab );
 
-voidDeleteArrowsAt( SCCOL nCol, SCROW nRow, sal_Bool bDestPnt );
+voidDeleteArrowsAt( SCCOL nCol, SCROW nRow, bool bDestPnt );
 voidDeleteBox( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 
);
 
-sal_BoolHasError( const ScRange rRange, ScAddress rErrPos );
+boolHasError( const ScRange rRange, ScAddress rErrPos );
 
 voidFillAttributes( ScDetectiveData rData );
 
 /// called from DrawEntry/DrawAlienEntry and InsertObject
-sal_BoolInsertArrow( SCCOL nCol, SCROW nRow,
+boolInsertArrow( SCCOL nCol, SCROW nRow,
 SCCOL nRefStartCol, SCROW nRefStartRow,
 SCCOL nRefEndCol, SCROW nRefEndRow,
-sal_Bool bFromOtherTab, sal_Bool bRed,
+bool bFromOtherTab, bool bRed,
 ScDetectiveData rData );
-sal_BoolInsertToOtherTab( SCCOL nStartCol, SCROW nStartRow,
-SCCOL nEndCol, SCROW nEndRow, sal_Bool bRed,
+boolInsertToOtherTab( SCCOL nStartCol, SCROW nStartRow,
+SCCOL nEndCol, SCROW nEndRow, bool bRed,
 ScDetectiveData rData );
 
 /// DrawEntry / DrawAlienEntry check for existing arrows and 
errors
-sal_BoolDrawEntry( SCCOL nCol, SCROW nRow, const ScRange rRef,
+boolDrawEntry( SCCOL nCol, SCROW nRow, const ScRange rRef,
 ScDetectiveData rData );
-sal_BoolDrawAlienEntry( const ScRange rRef,
+boolDrawAlienEntry( const ScRange rRef,
 ScDetectiveData rData );
 
 voidDrawCircle( SCCOL nCol, SCROW nRow, ScDetectiveData rData );
@@ -118,22 +118,22 @@ class SC_DLLPUBLIC ScDetectiveFunc
 sal_uInt16  FindSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, 
SCROW nRow2,
 sal_uInt16 nLevel, sal_uInt16 nDeleteLevel );
 
-sal_BoolFindFrameForObject( SdrObject* pObject, ScRange rRange );
+boolFindFrameForObject( SdrObject* pObject, ScRange rRange );
 
 voidModified();
 
 public:
 ScDetectiveFunc(ScDocument* pDocument, SCTAB nTable) : 
pDoc(pDocument),nTab(nTable) {}
 
-sal_BoolShowSucc( SCCOL nCol, SCROW nRow );
-sal_BoolShowPred( SCCOL nCol, SCROW nRow );
-sal_BoolShowError( SCCOL nCol, SCROW nRow );
+boolShowSucc( SCCOL nCol, SCROW nRow );
+boolShowPred( SCCOL nCol, SCROW nRow );
+boolShowError( SCCOL nCol, SCROW nRow );
 
-sal_BoolDeleteSucc( SCCOL nCol, SCROW nRow );
-sal_BoolDeletePred( SCCOL nCol, SCROW nRow );
-sal_BoolDeleteAll( ScDetectiveDelete eWhat );
+boolDeleteSucc( SCCOL nCol, SCROW nRow );
+boolDeletePred( SCCOL nCol, SCROW nRow );
+boolDeleteAll( ScDetectiveDelete eWhat );
 
-sal_BoolMarkInvalid(sal_Bool rOverflow);
+boolMarkInvalid(bool rOverflow);
 
 voidGetAllPreds(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW 
nRow2, ::std::vectorScTokenRef rRefTokens);
 voidGetAllSuccs(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW 
nRow2, ::std::vectorScTokenRef rRefTokens);
@@ -141,18 +141,18 @@ public:
 static void UpdateAllComments( ScDocument rDoc );/// on all 
tables
 void

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

2014-02-10 Thread Noel Grandin 
 rsc/source/rsc/rsc.cxx |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit d33d1e316c2c5ce56be0e931f0c742d00451dc7f
Author: Noel Grandin n...@peralex.com
Date:   Mon Feb 10 11:30:33 2014 +0200

coverity#708799 unused pointer value

Change-Id: I141bb64b5e4e2f8624008f12c9551881e91f4fdb

diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 576745e..d3c979c 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -421,8 +421,6 @@ ERRTYPE RscCompiler :: IncludeParser( sal_uLong lFileKey )
 }
 else
 {
-RscFile * pFNTmp;
-RscDepend   * pDep;
 RscFileInst   aFileInst( pTC, lFileKey, lFileKey, finput );
 
 pFName-bScanned = true;
@@ -432,14 +430,14 @@ ERRTYPE RscCompiler :: IncludeParser( sal_uLong lFileKey )
 // Include-Pfad durchsuchen
 for ( size_t i = 0, n = pFName-aDepLst.size(); i  n; ++i )
 {
-pDep = pFName-aDepLst[ i ];
-pFNTmp = pTC-aFileTab.GetFile( pDep-GetFileKey() );
+RscDepend   * pDep = pFName-aDepLst[ i ];
+pTC-aFileTab.GetFile( pDep-GetFileKey() );
 }
 
 for ( size_t i = 0, n = pFName-aDepLst.size(); i  n; ++i )
 {
-pDep = pFName-aDepLst[ i ];
-pFNTmp = pTC-aFileTab.GetFile( pDep-GetFileKey() );
+RscDepend   * pDep = pFName-aDepLst[ i ];
+RscFile * pFNTmp = pTC-aFileTab.GetFile( 
pDep-GetFileKey() );
 // Kein Pfad und Include Datei
 if( pFNTmp  !pFNTmp-bLoaded )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 8 commits - config_host.mk.in configure.ac icu/icu4c-build.patch vcl/Library_vcl.mk

2014-02-10 Thread Tor Lillqvist 
 config_host.mk.in |1 
 configure.ac  |  102 ++
 icu/icu4c-build.patch |   19 +
 vcl/Library_vcl.mk|3 -
 4 files changed, 101 insertions(+), 24 deletions(-)

New commits:
commit fa205eab3712d41e97b80c80baac3f8094f7e0a5
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Feb 10 11:40:33 2014 +0200

Use IOKit *framework*, not library directly. And ApplicationServices

Change-Id: I6e67bb5a4c540d0be605c54c833ebb0b4187c771

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index b8a1f97..cff99f6 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -79,7 +79,8 @@ $(eval $(call gb_Library_use_libraries,vcl,\
 
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_Library_add_libs,vcl,\
--lIOKit \
+-framework IOKit \
+-framework ApplicationServices \
 -lobjc \
 ))
 endif
commit 00ff1b319bfe05be78afa51dd01a06951ae02ac9
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Jun 18 17:04:55 2013 +0300

Stop defining inline as empty on OS X and iOS in icu

It causes problems on newer SDKs.

Change-Id: I6bdb1e50cb239d99b190460fdb11d5c684e92275

diff --git a/icu/icu4c-build.patch b/icu/icu4c-build.patch
index 30ba3ad..4e5d6d9 100644
--- a/icu/icu4c-build.patch
+++ b/icu/icu4c-build.patch
@@ -1,3 +1,22 @@
+--- misc/icu/source/common/umutex.h
 misc/icu/source/common/umutex.h
+@@ -48,16 +48,8 @@
+ #endif  /* win32 */
+ 
+ #if U_PLATFORM_IS_DARWIN_BASED
+-#if defined(__STRICT_ANSI__)
+-#define UPRV_REMAP_INLINE
+-#define inline
+-#endif
+ #include libkern/OSAtomic.h
+ #define USE_MAC_OS_ATOMIC_INCREMENT 1
+-#if defined(UPRV_REMAP_INLINE)
+-#undef inline
+-#undef UPRV_REMAP_INLINE
+-#endif
+ #endif
+ 
+ /*
 --- misc/icu/source/tools/toolutil/pkg_genc.h
 +++ misc/build/icu/source/tools/toolutil/pkg_genc.h
 @@ -58,7 +58,7 @@
commit d242e4d89d50beea87f3e7cea94bb34dcf4e3d1e
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Oct 24 01:01:22 2013 +0300

Enforce avoiding looking for non-existent system dicts on OS X and Windows

It is totally pointless to look for system /usr/share/myspell,
hyphen and mythes dictionaries on systems where they don't exist. Use
only bundled dictionaries.

(For OS X, we have code to use a system-specific spell checking API.)

Change-Id: I13aed7225d003e608f61de95671feb2e50b26c25

diff --git a/configure.ac b/configure.ac
index f7c8087..cf87aab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4460,6 +4460,14 @@ else
 fi
 AC_SUBST(WITH_MYSPELL_DICTS)
 
+# There are no system myspell, hyphen or mythes dictionaries on OS X, 
Windows, Android or iOS.
+if test $_os = Darwin -o $_os = WINNT -o $_os = iOS -o $_os = Android; then
+if test $with_system_dicts = yes; then
+AC_MSG_ERROR([There are no system dicts on this OS in the formats the 
3rd-party libs we use expect]);
+fi
+with_system_dicts=no
+fi
+
 AC_MSG_CHECKING([whether to use dicts from external paths])
 if test -z $with_system_dicts -o $with_system_dicts != no; then
 AC_MSG_RESULT([yes])
commit 664c371b556b4717bd7ce2b16d5a0a55fd4d0681
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Aug 29 08:51:01 2013 +0200

Do not silently ignore --enable-libc++

diff --git a/configure.ac b/configure.ac
index f675204..f7c8087 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2563,6 +2563,9 @@ if test $_os = Darwin; then
 AC_MSG_CHECKING([what compiler to use])
 case $with_macosx_sdk in
 10.6)
+if test $enable_libc__ = yes; then
+AC_MSG_ERROR([--enable-libc++ requires 
--with-macosx-version-min-required = 10.7])
+fi
 # did someone copy her 10.6 sdk into xcode 4 (needed on Mountain 
Lion)?
 if test $(echo $MACOSX_SDK_PATH | cut -c1-23) = 
/Applications/Xcode.app; then
 CC=`xcrun -find gcc` $bitness 
-mmacosx-version-min=$with_macosx_version_min_required -isysroot 
$MACOSX_SDK_PATH
@@ -2574,7 +2577,10 @@ if test $_os = Darwin; then
 fi
 ;;
 10.7|10.8|10.9)
-if test $enable_libc__ = yes -a 
$with_macosx_version_min_required != 10.6; then
+if test $enable_libc__ = yes; then
+if test $with_macosx_version_min_required = 10.6; then
+AC_MSG_ERROR([--enable-libc++ requires 
--with-macosx-version-min-required = 10.7])
+fi
 # Use libc++ instead of libstdc++ when possible
 # and also compile as C++11
 stdlib=-std=c++11 -stdlib=libc++
commit e04715d09f8dc006c79d45c4947f4bde9c3343c4
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jun 19 13:36:27 2013 +0300

Don't use -d32 when building 64-bit code

Change-Id: I83a960cebb8347170a08d2fda7ed11050b8c4229

diff --git a/configure.ac b/configure.ac
index af48c3f..f675204 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6192,7 +6192,7 @@ if test $SOLAR_JAVA != ; then
 fi

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

2014-02-10 Thread Stephan Bergmann 
 sfx2/source/dialog/mailmodel.cxx  |   11 +++-
 shell/source/cmdmail/cmdmailsuppl.cxx |   93 --
 2 files changed, 76 insertions(+), 28 deletions(-)

New commits:
commit 5c8a3bfc7e42009a7eaa6353cf2f66a14bfdab76
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Feb 10 11:23:09 2014 +0100

Don't call pclose(NULL)

Change-Id: I6540ec2b900e82745d5e661dfa920f85db6c0ff2

diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx 
b/shell/source/cmdmail/cmdmailsuppl.cxx
index 7730f05..7f40594 100644
--- a/shell/source/cmdmail/cmdmailsuppl.cxx
+++ b/shell/source/cmdmail/cmdmailsuppl.cxx
@@ -301,7 +301,8 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const 
Reference XSimpleMailM
 }
 
 OString cmd = aBuffer.makeStringAndClear();
-if ( 0 != pclose(popen(cmd.getStr(), w)) )
+FILE * f = popen(cmd.getStr(), w);
+if (f == 0 || pclose(f) != 0)
 {
 throw ::com::sun::star::uno::Exception(No mail client configured,
 static_cast  XSimpleMailClient *  (this) );
commit f669e7907bef8585fd182986c708e2e4aed280aa
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Feb 10 11:20:12 2014 +0100

Properly encode cmd line for popen

Change-Id: I1f7799920b6732a6cd128143dfa7ce282bad25c6

diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx 
b/shell/source/cmdmail/cmdmailsuppl.cxx
index 5b1b403..7730f05 100644
--- a/shell/source/cmdmail/cmdmailsuppl.cxx
+++ b/shell/source/cmdmail/cmdmailsuppl.cxx
@@ -109,6 +109,47 @@ Reference XSimpleMailMessage  SAL_CALL 
CmdMailSuppl::createSimpleMailMessage(
 // XSimpleMailClient
 //
 
+namespace {
+
+void appendShellWord(OStringBuffer  buffer, OUString const  word, bool 
strict)
+{
+OString sys;
+if (!word.convertToString(
+sys, osl_getThreadTextEncoding(),
+(strict
+ ? (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR
+| RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR)
+ : OUSTRING_TO_OSTRING_CVTFLAGS)))
+{
+throw css::uno::Exception(
+(Could not convert \ + word + \ to encoding #
+ + OUString::number(osl_getThreadTextEncoding())),
+css::uno::Referencecss::uno::XInterface());
+}
+buffer.append('\'');
+for (sal_Int32 i = 0; i != sys.getLength(); ++i) {
+char c = sys[i];
+switch (c) {
+case 0:
+if (strict) {
+throw css::uno::Exception(
+Could not convert word containing NUL, \ + word + \,
+css::uno::Referencecss::uno::XInterface());
+}
+break;
+case '\'':
+buffer.append('\\'');
+break;
+default:
+buffer.append(c);
+break;
+}
+}
+buffer.append('\'');
+}
+
+}
+
 void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference 
XSimpleMailMessage  xSimpleMailMessage, sal_Int32 /*aFlag*/ )
 throw (IllegalArgumentException, Exception, RuntimeException)
 {
@@ -135,7 +176,8 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const 
Reference XSimpleMailM
 static_cast  XSimpleMailClient *  (this));
 }
 
-OStringBuffer aBuffer(\ + OUStringToOString(aProgram, 
osl_getThreadTextEncoding()) + \ );
+OStringBuffer aBuffer;
+appendShellWord(aBuffer, aProgram, true);
 
 try
 {
@@ -171,12 +213,12 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const 
Reference XSimpleMailM
 // make sure we have a system path
 FileBase::getSystemPathFromFileURL( aMailer, aMailer );
 
-aBuffer.append(--mailclient  + OUStringToOString( aMailer, 
osl_getThreadTextEncoding() ) +
-);
+aBuffer.append( --mailclient );
+appendShellWord(aBuffer, aMailer, true);
 }
 #ifdef MACOSX
 else
-aBuffer.append(--mailclient Mail );
+aBuffer.append( --mailclient Mail);
 #endif
 }
 
@@ -196,26 +238,28 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const 
Reference XSimpleMailM
 rtl::OUString sBody = xMessage-getBody();
 if ( sBody.getLength()  0 )
 {
-aBuffer.append(--body \);
-aBuffer.append(OUStringToOString(sBody, 
osl_getThreadTextEncoding()));
-aBuffer.append(\ );
+aBuffer.append( --body );
+appendShellWord(aBuffer, sBody, false);
 }
 }
 
+// Convert from, to, etc. in a best-effort rather than a strict way to the
+// system encoding, based on the assumption that the relevant address parts
+// of those strings are ASCII anyway and any problematic characters are 
only
+// in the human-readable, informational-only parts:
+
 // Append originator if set in the message
 if ( !xSimpleMailMessage-getOriginator().isEmpty() )
 {
-

Re: [PATCH] fdo#61320: Allow user to choose whether to create thumbnails

2014-02-10 Thread Michael Stahl 
On 10/02/14 08:42, Christian Junker wrote:
 Hello developers,
 
 this is my first LO patch for review. It enhances LibreOffice by making
 the thumbnail creation inside odf archive files optional. In some cases
 users might not want to have a thumbnail included inside their document,
 because they need the file to be as small as possible.
 
 I have added a new save option to the Options dialog under section
 Load/Save  General, whose name might still get improved possibly, so
 far it is not translated into other languages:
 Include a thumbnail image.

hi Christian,

thanks for your patch, the configuration setting is mostly fine ...

... as such, but i'm quite convinced that this setting is actually too
esoteric to put it on the Tools-Options UI, which already displays too
many settings (or at least that's what our UX experts complain about).
Tools-Options-Advanced now has an Expert Configuration button in LO
4.2 and that seems appropriate here (i.e. no specific UI for this setting).

also, can you please send a license mail to
libreoffice@lists.freedesktop.org  as described on this page:

https://wiki.documentfoundation.org/Development/Developers#Example_Statement

feel free to add an entry for yourself on the page too.

regards,
 michael

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

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

2014-02-10 Thread Stephan Bergmann 
 sc/source/core/tool/detfunc.cxx |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit a95b58060b01046a8881e97e0c5016e44200dd32
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Feb 10 11:56:29 2014 +0100

loplugin:implicitboolconversion, loplugin:literaltoboolconversion

Change-Id: I5940b122d3ed6e2d6464e407e592c4810499ff1f

diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index 55a3dea..0ccd696 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -679,7 +679,7 @@ void ScDetectiveFunc::DeleteArrowsAt( SCCOL nCol, SCROW 
nRow, bool bDestPnt )
 if ( pObject-GetLayer()==SC_LAYER_INTERN 
 pObject-IsPolyObj()  pObject-GetPointCount()==2 )
 {
-if (aRect.IsInside(pObject-GetPoint(bDestPnt)))// 
Start/Zielpunkt
+if (aRect.IsInside(pObject-GetPoint(bDestPnt ? 1 : 0))) // 
Start/Zielpunkt
 ppObj[nDelCount++] = pObject;
 }
 
@@ -1485,9 +1485,9 @@ void ScDetectiveFunc::UpdateAllArrowColors()
 
 ScAddress aErrPos;
 if ( HasError( aSource, aErrPos ) )
-bError = sal_True;
+bError = true;
 else
-bArrow = sal_True;
+bArrow = true;
 }
 else if ( eType == SC_DETOBJ_FROMOTHERTAB )
 {
@@ -1497,15 +1497,15 @@ void ScDetectiveFunc::UpdateAllArrowColors()
 
 ScAddress aErrPos;
 if ( HasError( ScRange( aPos), aErrPos ) )
-bError = sal_True;
+bError = true;
 else
-bArrow = sal_True;
+bArrow = true;
 }
 else if ( eType == SC_DETOBJ_CIRCLE )
 {
 //  circles (error marks) are always red
 
-bError = sal_True;
+bError = true;
 }
 else if ( eType == SC_DETOBJ_NONE )
 {
@@ -1513,7 +1513,7 @@ void ScDetectiveFunc::UpdateAllArrowColors()
 
 if ( pObject-ISA( SdrRectObj )  !pObject-ISA( 
SdrCaptionObj ) )
 {
-bArrow = sal_True;
+bArrow = true;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f6/0d1e36194e2fe6d479b6f747e158efd4ba9e2b

2014-02-10 Thread Caolán McNamara 
 f6/0d1e36194e2fe6d479b6f747e158efd4ba9e2b |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6fe47979a87bee33c4d3c092a95039fb7fc2f805
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 10 11:22:19 2014 +

Notes added by 'git notes add'

diff --git a/f6/0d1e36194e2fe6d479b6f747e158efd4ba9e2b 
b/f6/0d1e36194e2fe6d479b6f747e158efd4ba9e2b
new file mode 100644
index 000..8a2345e
--- /dev/null
+++ b/f6/0d1e36194e2fe6d479b6f747e158efd4ba9e2b
@@ -0,0 +1 @@
+ignore: fixed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - bb/5ce8a2eac6b03bfff54ffaadaeca44ff8fb398

2014-02-10 Thread Caolán McNamara 
 bb/5ce8a2eac6b03bfff54ffaadaeca44ff8fb398 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ba36a41f2882484127958b8ff7675095f7693943
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 10 11:27:03 2014 +

Notes added by 'git notes add'

diff --git a/bb/5ce8a2eac6b03bfff54ffaadaeca44ff8fb398 
b/bb/5ce8a2eac6b03bfff54ffaadaeca44ff8fb398
new file mode 100644
index 000..4a2ba5a
--- /dev/null
+++ b/bb/5ce8a2eac6b03bfff54ffaadaeca44ff8fb398
@@ -0,0 +1 @@
+reject: retain nemeths variants I think for now
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Miklos Vajna 
 sw/qa/extras/ooxmlexport/data/dml-rectangle-relsize.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |7 +++
 sw/source/core/layout/anchoreddrawobject.cxx |2 +-
 writerfilter/source/dmapper/GraphicImport.cxx|   13 +
 4 files changed, 13 insertions(+), 9 deletions(-)

New commits:
commit e86a602df7540d491dbfd6a61571bd128b0d0ca4
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Mon Feb 10 11:55:01 2014 +0100

drawingML import: handle RelativeWidth/Height for drawinglayer shapes

This was already handled in the VML importer previously.

Change-Id: Ie04ed0cec63c5f6481943ad7f4db66a752e5

diff --git a/sw/qa/extras/ooxmlexport/data/dml-rectangle-relsize.docx 
b/sw/qa/extras/ooxmlexport/data/dml-rectangle-relsize.docx
new file mode 100644
index 000..391d737
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/dml-rectangle-relsize.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 1de987d..cecb7fa 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2808,6 +2808,13 @@ DECLARE_OOXMLEXPORT_TEST(testDMLCustomGeometry, 
dml-customgeometry-cubicbezier.
 }
 }
 
+DECLARE_OOXMLEXPORT_TEST(testDmlRectangleRelsize, dml-rectangle-relsize.docx)
+{
+// This was around 19560, as we did not read wp14:pctHeight for
+// drawinglayer shapes and the fallback data was invalid.
+CPPUNIT_ASSERT(21000  getShape(1)-getSize().Height);
+}
+
 DECLARE_OOXMLEXPORT_TEST(testGradientFillPreservation, 
gradient-fill-preservation.docx)
 {
 xmlDocPtr pXmlDocument = parseExport(word/document.xml);
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx 
b/sw/source/core/layout/anchoreddrawobject.cxx
index 3802272..f88690b 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -642,7 +642,7 @@ const SwRect SwAnchoredDrawObject::GetObjRect() const
 const SwRect SwAnchoredDrawObject::GetObjBoundRect() const
 {
 // Resize objects with relative width or height
-if ( GetDrawObj( )-GetRelativeWidth( ) || 
GetDrawObj()-GetRelativeHeight( ) )
+if ( GetPageFrm( )  ( GetDrawObj( )-GetRelativeWidth( ) || 
GetDrawObj()-GetRelativeHeight( ) ) )
 {
 Rectangle aPageRect = GetPageFrm( )-GetBoundRect( ).SVRect();
 Rectangle aCurrObjRect = GetDrawObj()-GetCurrentBoundRect();
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 7eec031..9528cd5 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -44,6 +44,7 @@
 #include cppuhelper/implbase1.hxx
 #include rtl/ustrbuf.hxx
 #include rtl/math.hxx
+#include oox/drawingml/drawingmltypes.hxx
 
 #include dmapper/DomainMapper.hxx
 #include ooxml/resourceids.hxx
@@ -951,16 +952,12 @@ void GraphicImport::lcl_sprm(Sprm  rSprm)
 case NS_ooxml::LN_CT_SizeRelV_pctHeight:
 if (m_xShape.is()  !m_pImpl-m_rPositivePercentages.empty())
 {
-sal_Int16 nPositivePercentage = 
rtl::math::round(m_pImpl-m_rPositivePercentages.front().toDouble() / 1000);
+sal_Int16 nPositivePercentage = 
rtl::math::round(m_pImpl-m_rPositivePercentages.front().toDouble() / 
oox::drawingml::PER_PERCENT);
 m_pImpl-m_rPositivePercentages.pop();
 
-uno::Referencelang::XServiceInfo xServiceInfo(m_xShape, 
uno::UNO_QUERY_THROW);
-if 
(xServiceInfo-supportsService(com.sun.star.text.TextFrame))
-{
-uno::Referencebeans::XPropertySet xPropertySet(m_xShape, 
uno::UNO_QUERY);
-OUString aProperty = nSprmId == 
NS_ooxml::LN_CT_SizeRelH_pctWidth ? OUString(RelativeWidth) : 
OUString(RelativeHeight);
-xPropertySet-setPropertyValue(aProperty, 
uno::makeAny(nPositivePercentage));
-}
+uno::Referencebeans::XPropertySet xPropertySet(m_xShape, 
uno::UNO_QUERY);
+OUString aProperty = nSprmId == 
NS_ooxml::LN_CT_SizeRelH_pctWidth ? OUString(RelativeWidth) : 
OUString(RelativeHeight);
+xPropertySet-setPropertyValue(aProperty, 
uno::makeAny(nPositivePercentage));
 }
 break;
 case 0x271b:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Herbert Dürr 
 chart2/source/controller/main/UndoCommandDispatch.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5718b17d2d7ace098ba3dbeae0ea365c1309500c
Author: Herbert Dürr h...@apache.org
Date:   Mon Feb 10 09:09:32 2014 +

Related: #i123862# use O*String's isEmpty() method...

to check for emptiness in chart2 module

Patch-by: j.nitsc...@ok.de
Review-by: h...@apache.org
(cherry picked from commit 17b6784443432419e9aa9fddf56e5fa6c3ce4c60)

Conflicts:
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx

chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
chart2/source/controller/dialogs/ChartTypeDialogController.cxx
chart2/source/controller/dialogs/DataBrowserModel.cxx
chart2/source/controller/dialogs/ObjectNameProvider.cxx
chart2/source/controller/dialogs/res_ErrorBar.cxx
chart2/source/controller/dialogs/tp_DataSource.cxx
chart2/source/controller/dialogs/tp_RangeChooser.cxx
chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
chart2/source/controller/main/ChartController.cxx
chart2/source/controller/main/ChartController_TextEdit.cxx
chart2/source/controller/main/ChartController_Tools.cxx
chart2/source/controller/main/ChartController_Window.cxx
chart2/source/controller/main/ControllerCommandDispatch.cxx
chart2/source/controller/main/DrawCommandDispatch.cxx
chart2/source/controller/main/ElementSelector.cxx
chart2/source/controller/main/ObjectHierarchy.cxx
chart2/source/controller/main/SelectionHelper.cxx
chart2/source/controller/main/StatusBarCommandDispatch.cxx
chart2/source/controller/main/UndoCommandDispatch.cxx
chart2/source/model/filter/XMLFilter.cxx
chart2/source/model/main/ChartModel_Persistence.cxx
chart2/source/tools/ExplicitCategoriesProvider.cxx
chart2/source/tools/InternalDataProvider.cxx
chart2/source/tools/NamedProperties.cxx
chart2/source/tools/ObjectIdentifier.cxx
chart2/source/tools/PropertyHelper.cxx
chart2/source/tools/RegressionCurveHelper.cxx
chart2/source/tools/WrappedProperty.cxx
chart2/source/tools/XMLRangeHelper.cxx
chart2/source/view/axes/VCartesianAxis.cxx
chart2/source/view/main/ChartView.cxx
chart2/source/view/main/ShapeFactory.cxx
chart2/source/view/main/VLegend.cxx
chart2/source/view/main/VTitle.cxx

Change-Id: Ia013e3d1d215f7391d5bee4b4e80eedc2a3a724f

diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx 
b/chart2/source/controller/main/UndoCommandDispatch.cxx
index ffd38e8..99762ff 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.cxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.cxx
@@ -66,7 +66,7 @@ void UndoCommandDispatch::fireStatusEvent(
 {
 if( m_xUndoManager.is() )
 {
-bool bFireAll = rURL.isEmpty();
+const bool bFireAll = rURL.isEmpty();
 uno::Any aUndoState, aRedoState;
 if( m_xUndoManager-isUndoPossible())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 17/b6784443432419e9aa9fddf56e5fa6c3ce4c60

2014-02-10 Thread Caolán McNamara 
 17/b6784443432419e9aa9fddf56e5fa6c3ce4c60 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit cf584e69e7ce3630c535ed52e6afc3ec5de63a66
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 10 11:44:11 2014 +

Notes added by 'git notes add'

diff --git a/17/b6784443432419e9aa9fddf56e5fa6c3ce4c60 
b/17/b6784443432419e9aa9fddf56e5fa6c3ce4c60
new file mode 100644
index 000..dbe98b6
--- /dev/null
+++ b/17/b6784443432419e9aa9fddf56e5fa6c3ce4c60
@@ -0,0 +1 @@
+merged as: 5718b17d2d7ace098ba3dbeae0ea365c1309500c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - apple_remote/source editeng/source framework/source include/apple_remote svx/source vcl/inc vcl/osx

2014-02-10 Thread Caolán McNamara 
 apple_remote/source/RemoteMainController.m  |6 +++---
 editeng/source/editeng/impedit2.cxx |2 +-
 framework/source/services/pathsettings.cxx  |2 +-
 include/apple_remote/RemoteMainController.h |2 +-
 svx/source/svdraw/svdibrow.cxx  |1 -
 vcl/inc/osx/saldata.hxx |2 +-
 vcl/osx/saldata.cxx |6 +++---
 vcl/osx/salinst.cxx |2 +-
 vcl/osx/vclnsapp.mm |   14 --
 9 files changed, 19 insertions(+), 18 deletions(-)

New commits:
commit d46d063f7ecf87af2c3bb7885e3cacf322e004c6
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 10 12:02:38 2014 +

coverity#705995 Unintended sign extension

Change-Id: I7f14257317c0c09737ad9aed78b39efff1062265

diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index 514668c..eab034b 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -4039,7 +4039,7 @@ void ImpEditEngine::CalcHeight( ParaPortion* pPortion )
 {
 const SvxULSpaceItem rULItem = (const 
SvxULSpaceItem)pPortion-GetNode()-GetContentAttribs().GetItem( 
EE_PARA_ULSPACE );
 const SvxLineSpacingItem rLSItem = (const 
SvxLineSpacingItem)pPortion-GetNode()-GetContentAttribs().GetItem( 
EE_PARA_SBL );
-sal_uInt16 nSBL = ( rLSItem.GetInterLineSpaceRule() == 
SVX_INTER_LINE_SPACE_FIX ) ? GetYValue( rLSItem.GetInterLineSpace() ) : 0;
+sal_Int32 nSBL = ( rLSItem.GetInterLineSpaceRule() == 
SVX_INTER_LINE_SPACE_FIX ) ? GetYValue( rLSItem.GetInterLineSpace() ) : 0;
 
 if ( nSBL )
 {
commit 5e40fcc0cf2147c31028a411e1977394d09c6e7b
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 10 12:00:17 2014 +

coverity#1169847 Uncaught exception

Change-Id: I8adf5d175798c4b820cd7cac2a927aa0f7de718d

diff --git a/framework/source/services/pathsettings.cxx 
b/framework/source/services/pathsettings.cxx
index c4665fb..d7e1f6f 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -1151,7 +1151,7 @@ css::uno::Any PathSettings::impl_getPathValue(sal_Int32 
nID) const
 {
 const PathSettings::PathInfo* pPath = impl_getPathAccessConst(nID);
 if (! pPath)
-throw css::container::NoSuchElementException();
+throw css::lang::IllegalArgumentException();
 
 css::uno::Any aVal;
 switch(impl_getPropGroup(nID))
commit 87f52352614aed918501e8a7df8e8a61499efc5b
Author: Herbert Dürr h...@apache.org
Date:   Mon Feb 10 09:36:08 2014 +

Resolves: #i124201# rename apple_remote's MainController...

to AppleRemoteController

having a MainController class in the global namespace of an application with
gazillions of MVC patterns is not a good idea. Renaming it to better match
its scope (i.e. the Apple Remote) cleans this up.

(cherry picked from commit 8ef3836059ca613d125f66e6bad21c83200dadad)

Conflicts:
apple_remote/source/RemoteMainController.m
include/apple_remote/RemoteMainController.h
vcl/inc/osx/saldata.hxx
vcl/osx/saldata.cxx
vcl/osx/salinst.cxx
vcl/osx/vclnsapp.mm

Change-Id: I1f252ac51ef65966a48ee03b2cd3519f98d57383

diff --git a/apple_remote/source/RemoteMainController.m 
b/apple_remote/source/RemoteMainController.m
index 790c520..caf145e 100644
--- a/apple_remote/source/RemoteMainController.m
+++ b/apple_remote/source/RemoteMainController.m
@@ -39,7 +39,7 @@
 // Sample Code 3: Multi Click Behavior and Hold Event Simulation
 // 
---
 
-@implementation MainController
+@implementation AppleRemoteMainController
 
 - (id) init {
 self = [super init];  // because we redefined our own init instead of use 
the fu..nny awakeFromNib
@@ -75,11 +75,11 @@
 // to give the binding mechanism a chance to see the change of the 
attribute
 [self setValue: container forKey: @remoteControl];
 #ifdef DEBUG
-NSLog(@MainController init done);
+NSLog(@AppleRemoteMainController init done);
 #endif
 }
 else
-NSLog(@MainController init failed);
+NSLog(@AppleRemoteMainController init failed);
 return self;
 }
 
diff --git a/include/apple_remote/RemoteMainController.h 
b/include/apple_remote/RemoteMainController.h
index 60cd4fb..c4ee0ac 100644
--- a/include/apple_remote/RemoteMainController.h
+++ b/include/apple_remote/RemoteMainController.h
@@ -42,7 +42,7 @@
 
 //static void sendTheEvent( unichar, int );
 
-SAL_DLLPUBLIC_EXPORT @interface MainController : NSObject {
+SAL_DLLPUBLIC_EXPORT @interface AppleRemoteMainController : NSObject {
 @public // else remoteControl is not reachable from 
GetSalData()-mpMainController
 RemoteControl* remoteControl;
 @private
diff --git

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - external/libebook

2014-02-10 Thread Caolán McNamara 
 external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch |   30 
++
 external/libebook/UnpackedTarball_libebook.mk   |6 ++
 2 files changed, 36 insertions(+)

New commits:
commit f46fbca76017154f7feb7a4341f3030b2f126693
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Nov 28 09:53:47 2013 +

fdo#72733 Fix crash on abi2010-1.doc example

(cherry picked from commit 3b65cd24408bb78676dfa42cf01669970125068a)
Signed-off-by: David Tardon dtar...@redhat.com

Change-Id: Ib3e43e14f9223bc53f20f1241d9b8c0eaa5470ad

diff --git a/external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch 
b/external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch
new file mode 100644
index 000..21ab72b
--- /dev/null
+++ b/external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch
@@ -0,0 +1,30 @@
+From 30021c75542a008ccf8814fa70d519f00bc69776 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= caol...@redhat.com
+Date: Thu, 28 Nov 2013 09:50:00 +
+Subject: [PATCH] Fix crash on abi2010-1.doc example
+
+---
+ src/lib/FB2Parser.cpp | 7 +--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/FB2Parser.cpp b/src/lib/FB2Parser.cpp
+index d258c09..3cd3e3c 100644
+--- a/src/lib/FB2Parser.cpp
 b/src/lib/FB2Parser.cpp
+@@ -357,8 +357,11 @@ FB2XMLParserContext *processNode(FB2XMLParserContext 
*const context, const xmlTe
+   {
+   case XML_READER_TYPE_ELEMENT :
+   {
+-const EBOOKToken *name = getFB2Token(xmlTextReaderConstLocalName(reader));
+-const EBOOKToken *ns = 
getFB2Token(xmlTextReaderConstNamespaceUri(reader));
++const xmlChar *name_str = xmlTextReaderConstLocalName(reader);
++const xmlChar *ns_str = xmlTextReaderConstNamespaceUri(reader);
++
++const EBOOKToken *name = name_str ? getFB2Token(name_str) : 0;
++const EBOOKToken *ns = ns_str ? getFB2Token(ns_str) : 0;
+ 
+ if (!name || !ns)
+   // TODO: unknown elements should not be skipped entirely, but
+-- 
+1.8.3.1
+
diff --git a/external/libebook/UnpackedTarball_libebook.mk 
b/external/libebook/UnpackedTarball_libebook.mk
index 555837b..3cf21e6 100644
--- a/external/libebook/UnpackedTarball_libebook.mk
+++ b/external/libebook/UnpackedTarball_libebook.mk
@@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libebook))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libebook,$(EBOOK_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libebook,1))
+
+$(eval $(call gb_UnpackedTarball_add_patches,libebook,\
+external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch \
+))
+
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 8e/f3836059ca613d125f66e6bad21c83200dadad

2014-02-10 Thread Caolán McNamara 
 8e/f3836059ca613d125f66e6bad21c83200dadad |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ebf71cda6adb1635992dd6723d75aae736d32901
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 10 12:16:16 2014 +

Notes added by 'git notes add'

diff --git a/8e/f3836059ca613d125f66e6bad21c83200dadad 
b/8e/f3836059ca613d125f66e6bad21c83200dadad
new file mode 100644
index 000..b586c6d
--- /dev/null
+++ b/8e/f3836059ca613d125f66e6bad21c83200dadad
@@ -0,0 +1 @@
+merged as: 87f52352614aed918501e8a7df8e8a61499efc5b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Caolán McNamara 
 framework/source/services/substitutepathvars.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5bf2b49ef7f0534138cc2303b8fea688698048c4
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 10 12:31:22 2014 +

coverity#1169812 condition appears the wrong way around

Change-Id: I97960a1491a247ef9db9536f904e4203e0903abd

diff --git a/framework/source/services/substitutepathvars.cxx 
b/framework/source/services/substitutepathvars.cxx
index d651238..8daf83d 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -1017,7 +1017,7 @@ throw ( NoSuchElementException, RuntimeException )
 else
 {
 // Variable not known
-bVarNotSubstituted = false;
+bVarNotSubstituted = true;
 nPosition += nLength;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Miklos Vajna 
 sw/qa/extras/ooxmlexport/data/dml-rectangle-relsize.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |5 -
 writerfilter/source/dmapper/GraphicImport.cxx|9 ++---
 3 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit d6ee755e35fbe9017aea9c5c908b3cbd4076e056
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Mon Feb 10 12:41:39 2014 +0100

drawingML import: ignore zero relative size

Zero means ignore me, use absolute size in this context.

Change-Id: I872810a9abf9e25c576f483a77494e1b87f3510a

diff --git a/sw/qa/extras/ooxmlexport/data/dml-rectangle-relsize.docx 
b/sw/qa/extras/ooxmlexport/data/dml-rectangle-relsize.docx
index 391d737..265dcbb 100644
Binary files a/sw/qa/extras/ooxmlexport/data/dml-rectangle-relsize.docx and 
b/sw/qa/extras/ooxmlexport/data/dml-rectangle-relsize.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index cecb7fa..ce4ff79 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2812,7 +2812,10 @@ DECLARE_OOXMLEXPORT_TEST(testDmlRectangleRelsize, 
dml-rectangle-relsize.docx)
 {
 // This was around 19560, as we did not read wp14:pctHeight for
 // drawinglayer shapes and the fallback data was invalid.
-CPPUNIT_ASSERT(21000  getShape(1)-getSize().Height);
+CPPUNIT_ASSERT(getShape(1)-getSize().Height  21000);
+
+// This was around 0: relative size of 0% was imported as 0, not fall 
back to absolute size.
+CPPUNIT_ASSERT(getShape(2)-getSize().Height  300);
 }
 
 DECLARE_OOXMLEXPORT_TEST(testGradientFillPreservation, 
gradient-fill-preservation.docx)
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 9528cd5..2009bf5 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -955,9 +955,12 @@ void GraphicImport::lcl_sprm(Sprm  rSprm)
 sal_Int16 nPositivePercentage = 
rtl::math::round(m_pImpl-m_rPositivePercentages.front().toDouble() / 
oox::drawingml::PER_PERCENT);
 m_pImpl-m_rPositivePercentages.pop();
 
-uno::Referencebeans::XPropertySet xPropertySet(m_xShape, 
uno::UNO_QUERY);
-OUString aProperty = nSprmId == 
NS_ooxml::LN_CT_SizeRelH_pctWidth ? OUString(RelativeWidth) : 
OUString(RelativeHeight);
-xPropertySet-setPropertyValue(aProperty, 
uno::makeAny(nPositivePercentage));
+if (nPositivePercentage)
+{
+uno::Referencebeans::XPropertySet xPropertySet(m_xShape, 
uno::UNO_QUERY);
+OUString aProperty = nSprmId == 
NS_ooxml::LN_CT_SizeRelH_pctWidth ? OUString(RelativeWidth) : 
OUString(RelativeHeight);
+xPropertySet-setPropertyValue(aProperty, 
uno::makeAny(nPositivePercentage));
+}
 }
 break;
 case 0x271b:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Stephan Bergmann 
 uui/source/newerverwarn.cxx |   12 +++-
 1 file changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 602a63785ae79ac31d53709a8ae95a6f3de6ef9a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Feb 10 13:53:59 2014 +0100

bUpdateCheckEnabled had always been unused and marked TODO

...ever since its inception in c41efc6d0b2740be4243fd696385f8dbcec0aefe
CWS-TOOLING: integrate CWS dba301a_DEV300

Change-Id: I5da6a38f595146ef0d2894b33bf614e7663d53fa

diff --git a/uui/source/newerverwarn.cxx b/uui/source/newerverwarn.cxx
index 5f96cdb..8e94699 100644
--- a/uui/source/newerverwarn.cxx
+++ b/uui/source/newerverwarn.cxx
@@ -28,11 +28,9 @@
 #include com/sun/star/frame/XDispatchProvider.hpp
 #include com/sun/star/system/SystemShellExecute.hpp
 #include com/sun/star/system/SystemShellExecuteFlags.hpp
-#include com/sun/star/setup/UpdateCheckConfig.hpp
 #include com/sun/star/util/URLTransformer.hpp
 #include com/sun/star/util/XURLTransformer.hpp
 #include com/sun/star/container/XHierarchicalNameAccess.hpp
-#include com/sun/star/container/XNameReplace.hpp
 
 #include comphelper/processfactory.hxx
 #include rtl/bootstrap.hxx
@@ -104,13 +102,9 @@ IMPL_LINK_NOARG(NewerVersionWarningDialog, UpdateHdl)
 }
 else
 {
-uno::Reference  container::XNameReplace  xUpdateConfig =
-setup::UpdateCheckConfig::create(xContext);
-
-sal_Bool bUpdateCheckEnabled = sal_False;
-OSL_VERIFY( xUpdateConfig-getByName(AutoCheckEnabled) = 
bUpdateCheckEnabled );
-
-// TODO: do we need to respect the bUpdateCheckEnabled flag? 
Finally, its meaning is are automatic
+// TODO: do we need to respect the
+// /org.openoffice.Office.Jobs/Jobs/UpdateCheck/Arguments
+// configuration flag? Finally, its meaning is are automatic
 // updates enabled, but this here is not an automatic update, but 
one triggered explicitly by the user.
 css::uno::Reference css::container::XHierarchicalNameAccess  
xOfficeHelp(officecfg::Office::Addons::AddonUI::OfficeHelp::get(xContext), 
css::uno::UNO_QUERY_THROW);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Stephan Bergmann 
 uui/source/newerverwarn.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit b62b4e65586047bd81a563adbe4c53ddfc9bf8b6
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Feb 10 13:57:25 2014 +0100

typo

Change-Id: Ia3b810d7ff231674d63aaf82a8ff254290fa55ca

diff --git a/uui/source/newerverwarn.cxx b/uui/source/newerverwarn.cxx
index 8e94699..2688f11 100644
--- a/uui/source/newerverwarn.cxx
+++ b/uui/source/newerverwarn.cxx
@@ -102,10 +102,11 @@ IMPL_LINK_NOARG(NewerVersionWarningDialog, UpdateHdl)
 }
 else
 {
-// TODO: do we need to respect the
-// /org.openoffice.Office.Jobs/Jobs/UpdateCheck/Arguments
-// configuration flag? Finally, its meaning is are automatic
-// updates enabled, but this here is not an automatic update, but 
one triggered explicitly by the user.
+// TODO: do we need to respect the 
/org.openoffice.Office.Jobs/Jobs/
+// UpdateCheck/Arguments/AutoCheckEnabled configuration flag?
+// Finally, its meaning is are automatic updates enabled, but 
this
+// here is not an automatic update, but one triggered explicitly by
+// the user.
 css::uno::Reference css::container::XHierarchicalNameAccess  
xOfficeHelp(officecfg::Office::Addons::AddonUI::OfficeHelp::get(xContext), 
css::uno::UNO_QUERY_THROW);
 
 util::URL aURL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Stephan Bergmann 
 sc/inc/scmod.hxx |2 +-
 sc/source/filter/excel/impop.cxx |2 +-
 sc/source/ui/app/scmod.cxx   |4 ++--
 sc/source/ui/app/scmod2.cxx  |2 +-
 sc/source/ui/docshell/docsh3.cxx |2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit f39cf7f5b2f8a6a29341b0050c392a02f83e56ce
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Feb 10 14:08:54 2014 +0100

loplugin:implicitboolconversion, loplugin:literaltoboolconversion

Change-Id: I5cd55c9e65a4ac431642ba33da9daf0e2f6a194c

diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index a90a0b3..cedc0ef 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -182,7 +182,7 @@ SC_DLLPUBLICvoidSetAppOptions   ( 
const ScAppOptions rO
 voidRecentFunctionsChanged();
 
 static void GetSpellSettings( sal_uInt16 rDefLang, sal_uInt16 
rCjkLang, sal_uInt16 rCtlLang,
-sal_Bool rAutoSpell );
+bool rAutoSpell );
 static void SetAutoSpellProperty( sal_Bool bSet );
 static sal_Bool HasThesaurusLanguage( sal_uInt16 nLang );
 
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index c2f22d8..ff0e7aa 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -148,7 +148,7 @@ ImportExcel::ImportExcel( XclImpRootData rImpData, 
SvStream rStrm ):
 pD-GetFormatTable()-ChangeNullDate( 30, 12, 1899 );
 
 ScDocOptions aDocOpt( pD-GetDocOptions() );
-aDocOpt.SetIgnoreCase( sal_True );  // always in Excel
+aDocOpt.SetIgnoreCase( true );  // always in Excel
 aDocOpt.SetFormulaRegexEnabled( false );// regular expressions? what's 
that?
 aDocOpt.SetLookUpColRowNames( false );  // default: no natural 
language refs
 pD-SetDocOptions( aDocOpt );
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 13b7a65..41dde36 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -979,7 +979,7 @@ sal_uInt16 ScModule::GetOptDigitLanguage()
 void ScModule::ModifyOptions( const SfxItemSet rOptSet )
 {
 sal_uInt16 nOldSpellLang, nOldCjkLang, nOldCtlLang;
-sal_Bool bOldAutoSpell;
+bool bOldAutoSpell;
 GetSpellSettings( nOldSpellLang, nOldCjkLang, nOldCtlLang, bOldAutoSpell );
 
 if (!pAppCfg)
@@ -1206,7 +1206,7 @@ void ScModule::ModifyOptions( const SfxItemSet rOptSet )
 
 if ( rOptSet.HasItem(SID_AUTOSPELL_CHECK,pItem) )  // an 
Doc-Options
 {
-sal_Bool bDoAutoSpell = ((const SfxBoolItem*)pItem)-GetValue();
+bool bDoAutoSpell = ((const SfxBoolItem*)pItem)-GetValue();
 
 if (pDoc)
 {
diff --git a/sc/source/ui/app/scmod2.cxx b/sc/source/ui/app/scmod2.cxx
index be7eccd..962cbdd 100644
--- a/sc/source/ui/app/scmod2.cxx
+++ b/sc/source/ui/app/scmod2.cxx
@@ -36,7 +36,7 @@ using namespace com::sun::star;
 //--
 
 void ScModule::GetSpellSettings( sal_uInt16 rDefLang, sal_uInt16 rCjkLang, 
sal_uInt16 rCtlLang,
-sal_Bool rAutoSpell )
+bool rAutoSpell )
 {
 //  use SvtLinguConfig instead of service LinguProperties to avoid
 //  loading the linguistic component
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index d74..0a18ba8 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -410,7 +410,7 @@ void ScDocShell::InitOptions(bool bForLoading)  // 
called from InitNew and L
 //  Einstellungen aus dem SpellCheckCfg kommen in Doc- und ViewOptions
 
 sal_uInt16 nDefLang, nCjkLang, nCtlLang;
-sal_Bool bAutoSpell;
+bool bAutoSpell;
 ScModule::GetSpellSettings( nDefLang, nCjkLang, nCtlLang, bAutoSpell );
 ScModule* pScMod = SC_MOD();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

2014-02-10 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=65675

Jan Holesovsky ke...@collabora.com changed:

   What|Removed |Added

 Depends on||74790

-- 
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: download.lst external/libebook

2014-02-10 Thread David Tardon 
 download.lst|4 -
 external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch |   30 
--
 external/libebook/UnpackedTarball_libebook.mk   |4 -
 3 files changed, 2 insertions(+), 36 deletions(-)

New commits:
commit 95c54daf9cc3054de1bdc52dd327908716fc4a8c
Author: David Tardon dtar...@redhat.com
Date:   Mon Feb 10 14:13:00 2014 +0100

upload new libe-book

Change-Id: I69e87ad57513c7349aa0abf38b6054583d367963

diff --git a/download.lst b/download.lst
index 60e01fc..19615f6 100644
--- a/download.lst
+++ b/download.lst
@@ -2,8 +2,8 @@ ABW_MD5SUM := af3ccc1f1884e68389088d490d596409
 export ABW_TARBALL := libabw-0.0.1.tar.bz2
 CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112
 export CDR_TARBALL := libcdr-0.0.14.tar.bz2
-EBOOK_MD5SUM := 3a62e10c57270718cabfdfc4b7b4e095
-export EBOOK_TARBALL := libe-book-0.0.2.tar.bz2
+EBOOK_MD5SUM := 2f1ceaf2ac8752ed278e175447d9b978
+export EBOOK_TARBALL := libe-book-0.0.3.tar.bz2
 ETONYEK_MD5SUM := 9dad826726da4d4ad60084968691f5f4
 export ETONYEK_TARBALL := libetonyek-0.0.3.tar.bz2
 FREEHAND_MD5SUM := 496dd00028afcc19f896b01394769043
diff --git a/external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch 
b/external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch
deleted file mode 100644
index 21ab72b..000
--- a/external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 30021c75542a008ccf8814fa70d519f00bc69776 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= caol...@redhat.com
-Date: Thu, 28 Nov 2013 09:50:00 +
-Subject: [PATCH] Fix crash on abi2010-1.doc example
-

- src/lib/FB2Parser.cpp | 7 +--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/FB2Parser.cpp b/src/lib/FB2Parser.cpp
-index d258c09..3cd3e3c 100644
 a/src/lib/FB2Parser.cpp
-+++ b/src/lib/FB2Parser.cpp
-@@ -357,8 +357,11 @@ FB2XMLParserContext *processNode(FB2XMLParserContext 
*const context, const xmlTe
-   {
-   case XML_READER_TYPE_ELEMENT :
-   {
--const EBOOKToken *name = getFB2Token(xmlTextReaderConstLocalName(reader));
--const EBOOKToken *ns = 
getFB2Token(xmlTextReaderConstNamespaceUri(reader));
-+const xmlChar *name_str = xmlTextReaderConstLocalName(reader);
-+const xmlChar *ns_str = xmlTextReaderConstNamespaceUri(reader);
-+
-+const EBOOKToken *name = name_str ? getFB2Token(name_str) : 0;
-+const EBOOKToken *ns = ns_str ? getFB2Token(ns_str) : 0;
- 
- if (!name || !ns)
-   // TODO: unknown elements should not be skipped entirely, but
--- 
-1.8.3.1
-
diff --git a/external/libebook/UnpackedTarball_libebook.mk 
b/external/libebook/UnpackedTarball_libebook.mk
index 3cf21e6..7dfee2c 100644
--- a/external/libebook/UnpackedTarball_libebook.mk
+++ b/external/libebook/UnpackedTarball_libebook.mk
@@ -13,8 +13,4 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libebook,$(EBOOK_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libebook,1))
 
-$(eval $(call gb_UnpackedTarball_add_patches,libebook,\
-external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch \
-))
-
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Miklos Vajna 
 sw/source/filter/ww8/docxsdrexport.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d06d5e32a04602591827b32fc860bb0536115ddb
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Mon Feb 10 14:02:18 2014 +0100

DocxSdrExport: fix style

Change-Id: I541b75fc4670f77c2961cb77ae425e43b97b0e08

diff --git a/sw/source/filter/ww8/docxsdrexport.cxx 
b/sw/source/filter/ww8/docxsdrexport.cxx
index 6278a29..205751b 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -883,7 +883,7 @@ void DocxSdrExport::writeDMLTextFrame(sw::Frame* 
pParentFrame, int nAnchorId)
 m_pImpl-m_pBodyPrAttrList = pFS-createAttrList();
 {
 drawing::TextVerticalAdjust eAdjust = drawing::TextVerticalAdjust_TOP;
-if( xPropSetInfo.is()  
xPropSetInfo-hasPropertyByName(TextVerticalAdjust) )
+if (xPropSetInfo.is()  
xPropSetInfo-hasPropertyByName(TextVerticalAdjust))
 xPropertySet-getPropertyValue(TextVerticalAdjust) = eAdjust;
 m_pImpl-m_pBodyPrAttrList-add(XML_anchor, 
oox::drawingml::GetTextVerticalAdjust(eAdjust));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Marcos Paulo de Souza 
 Repository.mk |   22 ---
 scp2/source/ooo/file_library_ooo.scp  |   38 --
 scp2/source/ooo/module_hidden_ooo.scp |2 -
 scp2/source/ooo/ure.scp   |   29 -
 4 files changed, 14 insertions(+), 77 deletions(-)

New commits:
commit 4af38b099c741c3676aefeb20c515913aaeed666
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Thu Feb 6 13:53:17 2014 -0200

fdo#60924: Move some packages to autoinstall

Change-Id: I5805c8d1c9978b8625ba0e0ea6c4337baf5a6cb5
Reviewed-on: https://gerrit.libreoffice.org/7903
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/Repository.mk b/Repository.mk
index 1b0396a..b702ae3 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -451,9 +451,14 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, 
\
 
 $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \
affine_uno_uno \
-   $(if $(ENABLE_JAVA),java_uno) \
-   $(if $(ENABLE_JAVA),juh) \
-   $(if $(ENABLE_JAVA),juhx) \
+   $(if $(filter MSC,$(COM)),cli_uno) \
+   $(if $(ENABLE_JAVA), \
+   java_uno \
+   jpipe \
+   $(if $(filter $(OS),WNT),jpipx) \
+   juh \
+   juhx \
+   ) \
log_uno_uno \
unsafe_uno_uno \
$(if $(URELIBS),urelibs) \
@@ -491,11 +496,6 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
$(if $(filter MSC,$(COM)),cli_cppuhelper) \
 ))
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
-   $(if $(filter MSC,$(COM)),cli_uno) \
-   jpipe \
-   $(if $(filter WNT,$(OS)),jpipx) \
-))
 
 $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
$(if $(ENABLE_VLC),avmediavlc) \
@@ -706,6 +706,12 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\
) \
 ))
 
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+   $(if $(SYSTEM_CURL),,curl) \
+   $(if $(SYSTEM_LCMS2),,lcms2) \
+   $(if $(SYSTEM_LIBXSLT),,xslt) \
+))
+
 # External executables
 $(eval $(call gb_ExternalExecutable_register_executables,\
genbrk \
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index c90e28a..c1a9304 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -82,17 +82,6 @@ End
 
 #endif
 
-#ifndef SYSTEM_CURL
-
-File gid_File_Lib_Curl
-LIB_FILE_BODY;
-Styles = (FILELIST);
-Dir = FILELIST_DIR;
-Name = curl.filelist;
-End
-
-#endif
-
 #if defined UNX  ! defined MACOSX
 #ifdef ENABLE_TDE
 File gid_File_Bin_TdeFilePicker
@@ -132,26 +121,8 @@ End
 #endif
 #endif
 
-#ifndef SYSTEM_LCMS2
-
-File gid_File_Lib_Lcms2
-LIB_FILE_BODY;
-Styles = (FILELIST);
-Dir = FILELIST_DIR;
-Name = lcms2.filelist;
-End
-
-#endif
-
 #ifdef NEED_CAIRO
 
-File gid_File_Lib_Cairo
-LIB_FILE_BODY;
-Styles = (FILELIST);
-Dir = FILELIST_DIR;
-Name = cairo.filelist;
-End
-
 #ifndef WNT
 
 File gid_File_Lib_Pixman
@@ -270,15 +241,6 @@ End
 
 #endif
 
-#ifndef SYSTEM_LIBXSLT
-File gid_File_Lib_Xslt
-LIB_FILE_BODY;
-Styles = (FILELIST);
-Dir = FILELIST_DIR;
-Name = xslt.filelist;
-End
-#endif
-
 #ifdef WNT
 File gid_File_Lib_LibXMLSec_xmlseccore
 PACKED_LIB_FILE_BODY;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp 
b/scp2/source/ooo/module_hidden_ooo.scp
index 0881652..6f29752 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -160,7 +160,6 @@ Module gid_Module_Root_Files_5
 #if ! defined SYSTEM_CLUCENE
 gid_File_Lib_CLucene,
 #endif
-   gid_File_Lib_Curl,
gid_Unixlink_File_Lib_Curl,
gid_File_Lib_Icudata,
gid_File_Lib_Icui18n,
@@ -190,7 +189,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Sndfile,
gid_File_Lib_Ucpdav1,
gid_File_Lib_Neon,
-   gid_File_Lib_Xslt,
gid_Unixlink_File_Lib_Xslt,
gid_Unixlink_File_Lib_eXslt,
gid_File_Lib_LibXMLSec_xmlsecnss,
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 7069ee6..d690ed7 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -267,14 +267,6 @@ End
 
 
 #if defined _MSC_VER
-File gid_File_Dl_Cli_Uno
-LIB_FILE_BODY;
-Dir = SCP2_URE_DL_DIR;
-Name = SCP2_URE_DL_NORMAL(cli_uno);
-Styles = (PACKED);
-
-End
-
 File gid_File_Dl_Cli_Ure_Assembly
 TXT_FILE_BODY;
 Styles = (PACKED, ASSEMBLY);
@@ -413,24 +405,6 @@ End
 
 #endif
 
-#if defined ENABLE_JAVA
-File gid_File_Dl_Jpipe
-LIB_FILE_BODY;
-Dir = SCP2_URE_DL_DIR;
-Name = SCP2_URE_JDL_NORMAL(jpipe);
-Styles = (PACKED);
-End
-#endif
-
-#if defined ENABLE_JAVA  defined WNT
-File gid_File_Dl_Jpipx
-

[Bug 60924] move libraries to autoinstallation in scp2

2014-02-10 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=60924

--- Comment #66 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Marcos Paulo de Souza committed a patch related to this issue.
It has been pushed to master:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=4af38b099c741c3676aefeb20c515913aaeed666

fdo#60924: Move some packages to autoinstall



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

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

Re: OpenGL on Linux

2014-02-10 Thread Ruslan Kabatsayev 
On Mon, Feb 10, 2014 at 3:11 AM, Markus Mohrhard
markus.mohrh...@googlemail.com wrote:
 Hey Philipp,


 On Sat, Feb 8, 2014 at 8:09 PM, Philipp Weissenbacher
 p.weissenbac...@gmail.com wrote:

 Bit late to the party, but here you go:
 http://pastie.org/8712627

 System: openSUSE 13.1
 Hardware: Dell Latitude D830 with a Mobile GM965/GL960 Integrated
 Graphics Controller


 Do you by chance run it in Vmware? You are only the third one reporting a
 2.1 OpenGL version. Ignoring the base line we are at just yours and
 Krunoslav Šebetic's. Actually these two are also the ones that don't support
 anti-aliasing which even if we manage to support these old versions results
 in ugly output.

I'd like to note that there're still lots of video cards which are not
even 2.0 capable - e.g. intel video in my EEE PC 1015PN only supports
OpenGL 1.4 with ARB assembly shaders. Another example would be
(although quite old, but still working and actively supported by intel
in Mesa) i915G chipset, which has similar characteristics.
Also, if you try using Mesa 9.1+ with these, you'll get (exactly, not
higher than) OpenGL 2.1 advertised, but really giving you software
fallbacks every now and then.
So, I'd not like to have an office suite require OpenGL higher than
1.4 (it may use higher versions if they are available, but still not
require).
As to antialiasing, it seems Mesa doesn't support useful antialiasing
_at_all_ (not even in swrast). I.e. it has exactly one sample in
GL_ARB_multisample, it doesn't have antialiased lines - only manual
supersampling/jittered frame accumulation/jittered frame blending.


 Regards,
 Markus

 ___
 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-4-2' - shell/source

2014-02-10 Thread Stephan Bergmann 
 0 files changed

New commits:
commit 89f0535dbf3409468cbbda078720b11fa08f9759
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Feb 10 10:11:45 2014 +0100

instdir/program/senddoc lacks executable mode bits

(but appears OK in true installation sets)

Change-Id: I1c044409b97bd3121509a2185dfac89298312954
(cherry picked from commit 46e63b70d99eab31758afd3abf29c2237b9248de)
Reviewed-on: https://gerrit.libreoffice.org/7967
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/shell/source/unix/misc/senddoc.sh 
b/shell/source/unix/misc/senddoc.sh
old mode 100644
new mode 100755
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Markus Mohrhard 
 external/glm/UnpackedTarball_glm.mk  |1 
 external/glm/Wshadow-patch-2.patch.1 |  283 +++
 2 files changed, 284 insertions(+)

New commits:
commit 848f165ceb54b0c7ae3e52ad7ad50c258db2956c
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Sun Feb 9 14:14:49 2014 +0100

fix Wshadow warnings in glm

Change-Id: Ic366699d15338ad4bf14d783ca4dee72aa9d8e40
Reviewed-on: https://gerrit.libreoffice.org/7952
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/external/glm/UnpackedTarball_glm.mk 
b/external/glm/UnpackedTarball_glm.mk
index ff9c998..f357fdc 100644
--- a/external/glm/UnpackedTarball_glm.mk
+++ b/external/glm/UnpackedTarball_glm.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,glm,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,glm, \
 external/glm/Wshadow-patch-fix.patch \
+external/glm/Wshadow-patch-2.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/glm/Wshadow-patch-2.patch.1 
b/external/glm/Wshadow-patch-2.patch.1
new file mode 100644
index 000..499db5a
--- /dev/null
+++ b/external/glm/Wshadow-patch-2.patch.1
@@ -0,0 +1,283 @@
+diff -ur glm.org/glm/gtc/half_float.inl glm/glm/gtc/half_float.inl
+--- glm.org/glm/gtc/half_float.inl 2014-02-09 13:49:08.003856255 +0100
 glm/glm/gtc/half_float.inl 2014-02-09 13:58:59.187670698 +0100
+@@ -112,20 +112,20 @@
+   template typename U 
+   GLM_FUNC_QUALIFIER tvec2half::tvec2
+   (
+-  U const  x
++  U const  x_
+   ) :
+-  x(half(x)),
+-  y(half(x))
++  x(half(x_)),
++  y(half(x_))
+   {}
+ 
+   template typename U, typename V 
+   GLM_FUNC_QUALIFIER tvec2half::tvec2
+   (
+-  U const  x, 
+-  V const  y
++  U const  x_, 
++  V const  y_
+   ) :
+-  x(half(x)),
+-  y(half(y))
++  x(half(x_)),
++  y(half(y_))
+   {}
+ 
+   //
+@@ -268,40 +268,40 @@
+   //
+   // Swizzle operators
+ 
+-  GLM_FUNC_QUALIFIER half tvec2half::swizzle(comp x) const
++  GLM_FUNC_QUALIFIER half tvec2half::swizzle(comp x_) const
+   {
+-  return (*this)[x];
++  return (*this)[x_];
+   }
+ 
+-  GLM_FUNC_QUALIFIER tvec2half tvec2half::swizzle(comp x, comp y) 
const
++  GLM_FUNC_QUALIFIER tvec2half tvec2half::swizzle(comp x_, comp y_) 
const
+   {
+   return tvec2half(
+-  (*this)[x],
+-  (*this)[y]);
++  (*this)[x_],
++  (*this)[y_]);
+   }
+ 
+-  GLM_FUNC_QUALIFIER tvec3half tvec2half::swizzle(comp x, comp y, 
comp z) const
++  GLM_FUNC_QUALIFIER tvec3half tvec2half::swizzle(comp x_, comp y_, 
comp z) const
+   {
+   return tvec3half(
+-  (*this)[x],
+-  (*this)[y],
++  (*this)[x_],
++  (*this)[y_],
+   (*this)[z]);
+   }
+ 
+-  GLM_FUNC_QUALIFIER tvec4half tvec2half::swizzle(comp x, comp y, 
comp z, comp w) const
++  GLM_FUNC_QUALIFIER tvec4half tvec2half::swizzle(comp x_, comp y_, 
comp z, comp w) const
+   {
+   return tvec4half(
+-  (*this)[x],
+-  (*this)[y],
++  (*this)[x_],
++  (*this)[y_],
+   (*this)[z],
+   (*this)[w]);
+   }
+ 
+-  GLM_FUNC_QUALIFIER tref2half tvec2half::swizzle(comp x, comp y)
++  GLM_FUNC_QUALIFIER tref2half tvec2half::swizzle(comp x_, comp y_)
+   {
+   return tref2half(
+-  (*this)[x],
+-  (*this)[y]);
++  (*this)[x_],
++  (*this)[y_]);
+   }
+ 
+   //
+@@ -399,23 +399,23 @@
+   template typename U 
+   GLM_FUNC_QUALIFIER tvec3half::tvec3
+   (
+-  U const  x
++  U const  x_
+   ) :
+-  x(half(x)),
+-  y(half(x)),
+-  z(half(x))
++  x(half(x_)),
++  y(half(x_)),
++  z(half(x_))
+   {}
+ 
+   template typename A, typename B, typename C 
+   GLM_FUNC_QUALIFIER tvec3half::tvec3
+   (
+-  A const  x, 
+-  B const  y, 
+-  C const  z
+-  ) :
+-  x(half(x)),
+-  y(half(y)),
+-  z(half(z))
++  A const  x_, 
++  B const  y_, 
++  C const  z_
++  ) :
++  x(half(x_)),
++  y(half(y_)),
++  z(half(z_))
+   {}
+ 
+   //
+@@

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

2014-02-10 Thread Markus Mohrhard 
 external/glm/UnpackedTarball_glm.mk  |1 
 external/glm/Wshadow-patch-2.patch.1 |  283 ---
 2 files changed, 284 deletions(-)

New commits:
commit 51dd4ebd065701c4fd5e9d774e44716be0664c24
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Mon Feb 10 15:02:21 2014 +0100

Revert fix Wshadow warnings in glm

Only works with some versions and seems to break with cygwin. I'm
working on using a recent upstream version + patches.

This reverts commit 848f165ceb54b0c7ae3e52ad7ad50c258db2956c.

diff --git a/external/glm/UnpackedTarball_glm.mk 
b/external/glm/UnpackedTarball_glm.mk
index f357fdc..ff9c998 100644
--- a/external/glm/UnpackedTarball_glm.mk
+++ b/external/glm/UnpackedTarball_glm.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,glm,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,glm, \
 external/glm/Wshadow-patch-fix.patch \
-external/glm/Wshadow-patch-2.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/glm/Wshadow-patch-2.patch.1 
b/external/glm/Wshadow-patch-2.patch.1
deleted file mode 100644
index 499db5a..000
--- a/external/glm/Wshadow-patch-2.patch.1
+++ /dev/null
@@ -1,283 +0,0 @@
-diff -ur glm.org/glm/gtc/half_float.inl glm/glm/gtc/half_float.inl
 glm.org/glm/gtc/half_float.inl 2014-02-09 13:49:08.003856255 +0100
-+++ glm/glm/gtc/half_float.inl 2014-02-09 13:58:59.187670698 +0100
-@@ -112,20 +112,20 @@
-   template typename U 
-   GLM_FUNC_QUALIFIER tvec2half::tvec2
-   (
--  U const  x
-+  U const  x_
-   ) :
--  x(half(x)),
--  y(half(x))
-+  x(half(x_)),
-+  y(half(x_))
-   {}
- 
-   template typename U, typename V 
-   GLM_FUNC_QUALIFIER tvec2half::tvec2
-   (
--  U const  x, 
--  V const  y
-+  U const  x_, 
-+  V const  y_
-   ) :
--  x(half(x)),
--  y(half(y))
-+  x(half(x_)),
-+  y(half(y_))
-   {}
- 
-   //
-@@ -268,40 +268,40 @@
-   //
-   // Swizzle operators
- 
--  GLM_FUNC_QUALIFIER half tvec2half::swizzle(comp x) const
-+  GLM_FUNC_QUALIFIER half tvec2half::swizzle(comp x_) const
-   {
--  return (*this)[x];
-+  return (*this)[x_];
-   }
- 
--  GLM_FUNC_QUALIFIER tvec2half tvec2half::swizzle(comp x, comp y) 
const
-+  GLM_FUNC_QUALIFIER tvec2half tvec2half::swizzle(comp x_, comp y_) 
const
-   {
-   return tvec2half(
--  (*this)[x],
--  (*this)[y]);
-+  (*this)[x_],
-+  (*this)[y_]);
-   }
- 
--  GLM_FUNC_QUALIFIER tvec3half tvec2half::swizzle(comp x, comp y, 
comp z) const
-+  GLM_FUNC_QUALIFIER tvec3half tvec2half::swizzle(comp x_, comp y_, 
comp z) const
-   {
-   return tvec3half(
--  (*this)[x],
--  (*this)[y],
-+  (*this)[x_],
-+  (*this)[y_],
-   (*this)[z]);
-   }
- 
--  GLM_FUNC_QUALIFIER tvec4half tvec2half::swizzle(comp x, comp y, 
comp z, comp w) const
-+  GLM_FUNC_QUALIFIER tvec4half tvec2half::swizzle(comp x_, comp y_, 
comp z, comp w) const
-   {
-   return tvec4half(
--  (*this)[x],
--  (*this)[y],
-+  (*this)[x_],
-+  (*this)[y_],
-   (*this)[z],
-   (*this)[w]);
-   }
- 
--  GLM_FUNC_QUALIFIER tref2half tvec2half::swizzle(comp x, comp y)
-+  GLM_FUNC_QUALIFIER tref2half tvec2half::swizzle(comp x_, comp y_)
-   {
-   return tref2half(
--  (*this)[x],
--  (*this)[y]);
-+  (*this)[x_],
-+  (*this)[y_]);
-   }
- 
-   //
-@@ -399,23 +399,23 @@
-   template typename U 
-   GLM_FUNC_QUALIFIER tvec3half::tvec3
-   (
--  U const  x
-+  U const  x_
-   ) :
--  x(half(x)),
--  y(half(x)),
--  z(half(x))
-+  x(half(x_)),
-+  y(half(x_)),
-+  z(half(x_))
-   {}
- 
-   template typename A, typename B, typename C 
-   GLM_FUNC_QUALIFIER tvec3half::tvec3
-   (
--  A const  x, 
--  B const  y, 
--  C const  z
--  ) :
--  x(half(x)),
--  y(half(y)),
--  z(half(z))
-+  A const  x_, 
-+  B const  y_, 
-+  C const  z_
-+  ) :
-+  x(half(x_)),
-+  y(half(y_)),
-+  z(half(z_))
-   {}
- 
-   //

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - setup_native/source sysui/desktop

2014-02-10 Thread Herbert Dürr 
 setup_native/source/mac/Info.plist.langpack |2 ++
 sysui/desktop/macosx/Info.plist |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 6aeaaaed06be50118273e5650ebdf63c623e3a17
Author: Herbert Dürr h...@apache.org
Date:   Mon Feb 10 12:12:20 2014 +

#123864# add version check for OSX 10.7

Patch-by: j...@apache.org

diff --git a/setup_native/source/mac/Info.plist.langpack 
b/setup_native/source/mac/Info.plist.langpack
index fa8c377..0e12cc1 100644
--- a/setup_native/source/mac/Info.plist.langpack
+++ b/setup_native/source/mac/Info.plist.langpack
@@ -22,6 +22,8 @@
  ***--
 plist version=1.0
 dict
+   keyLSMinimumSystemVersion/key
+   string10.7.0/string
keyCFBundleDevelopmentRegion/key
stringEnglish/string
!-- UTI declarations for OS X = 10.4  --
diff --git a/sysui/desktop/macosx/Info.plist b/sysui/desktop/macosx/Info.plist
index 03b09a8..898b708 100644
--- a/sysui/desktop/macosx/Info.plist
+++ b/sysui/desktop/macosx/Info.plist
@@ -22,6 +22,8 @@
  ***--
 plist version=1.0
 dict
+   keyLSMinimumSystemVersion/key
+   string10.7.0/string
keyCFBundleDevelopmentRegion/key
stringEnglish/string
!-- UTI declarations for OS X = 10.4  --
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 2 commits - download.lst external/libodfgen

2014-02-10 Thread David Tardon 
 download.lst  |8 +--
 external/libodfgen/0001-use-correct-header-for-std-swap.patch |   26 --
 external/libodfgen/UnpackedTarball_libodfgen.mk   |6 --
 3 files changed, 4 insertions(+), 36 deletions(-)

New commits:
commit 8f294bba6f6dafce989c146e90251e61e23801dc
Author: David Tardon dtar...@redhat.com
Date:   Wed Dec 4 10:02:45 2013 +0100

upload libetonyek-0.0.3

Change-Id: I626345b34332d7797f1df412545d8d718e9c634c
(cherry picked from commit a53dafbc9628bb243cee1714bfea59272ae57663)
Reviewed-on: https://gerrit.libreoffice.org/7970
Tested-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/download.lst b/download.lst
index 249b7d7..f59a190 100644
--- a/download.lst
+++ b/download.lst
@@ -4,8 +4,8 @@ CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112
 export CDR_TARBALL := libcdr-0.0.14.tar.bz2
 EBOOK_MD5SUM := 3a62e10c57270718cabfdfc4b7b4e095
 export EBOOK_TARBALL := libe-book-0.0.2.tar.bz2
-ETONYEK_MD5SUM := 040e0d7ce0cc0eb3a016964699d54a6c
-export ETONYEK_TARBALL := libetonyek-0.0.1.tar.bz2
+ETONYEK_MD5SUM := 9dad826726da4d4ad60084968691f5f4
+export ETONYEK_TARBALL := libetonyek-0.0.3.tar.bz2
 FREEHAND_MD5SUM := 496dd00028afcc19f896b01394769043
 export FREEHAND_TARBALL := libfreehand-0.0.0.tar.bz2
 MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e
commit c470e0982e72879bd7b96830ba8362baede6f87b
Author: David Tardon dtar...@redhat.com
Date:   Wed Dec 4 10:04:48 2013 +0100

upload libodfgen-0.0.4

Change-Id: I1c0527b01a958fca6e0cb3febb1915762f8a0074
(cherry picked from commit 79eab004dca8413cf99ea688291083df2d146230)
Reviewed-on: https://gerrit.libreoffice.org/7972
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/download.lst b/download.lst
index 99e91fd..249b7d7 100644
--- a/download.lst
+++ b/download.lst
@@ -12,8 +12,8 @@ MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e
 export MSPUB_TARBALL := libmspub-0.0.6.tar.bz2
 MWAW_MD5SUM := d794625f156a9fb1c53b3f8a8aa13b5e
 export MWAW_TARBALL := libmwaw-0.2.0.tar.bz2
-ODFGEN_MD5SUM := 9cafe7f50a3b2c5ebd2dc9c6c509d2b4
-export ODFGEN_TARBALL := libodfgen-0.0.3.tar.bz2
+ODFGEN_MD5SUM := e5483d1f0b71e64c367c1194b54b0f53
+export ODFGEN_TARBALL := libodfgen-0.0.4.tar.bz2
 VISIO_MD5SUM := 82628333418f101a20cd21f980cf9f40
 export VISIO_TARBALL := libvisio-0.0.31.tar.bz2
 FIREBIRD_MD5SUM := 21154d2004e025c8a325b0357bb5
diff --git a/external/libodfgen/0001-use-correct-header-for-std-swap.patch 
b/external/libodfgen/0001-use-correct-header-for-std-swap.patch
deleted file mode 100644
index 13502d9..000
--- a/external/libodfgen/0001-use-correct-header-for-std-swap.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9008d84be1eb0b3def0df39b069a309d54aa73ab Mon Sep 17 00:00:00 2001
-From: David Tardon dtar...@redhat.com
-Date: Wed, 30 Oct 2013 19:30:30 +0100
-Subject: [PATCH] use correct header for std::swap
-

- src/GraphicFunctions.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/GraphicFunctions.cxx b/src/GraphicFunctions.cxx
-index d8809f9..606c640 100644
 a/src/GraphicFunctions.cxx
-+++ b/src/GraphicFunctions.cxx
-@@ -24,8 +24,8 @@
-  * Corel Corporation or Corel Corporation Limited.
-  */
- 
-+#include algorithm
- #include math.h
--#include utility
- 
- #include GraphicFunctions.hxx
- 
--- 
-1.8.3.1
-
diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk 
b/external/libodfgen/UnpackedTarball_libodfgen.mk
index 28e589c..1a7f26c 100644
--- a/external/libodfgen/UnpackedTarball_libodfgen.mk
+++ b/external/libodfgen/UnpackedTarball_libodfgen.mk
@@ -11,10 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libodfgen))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libodfgen,$(ODFGEN_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,1))
-
-$(eval $(call gb_UnpackedTarball_add_patches,libodfgen,\
-   external/libodfgen/0001-use-correct-header-for-std-swap.patch \
-))
-
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - download.lst external/libebook

2014-02-10 Thread David Tardon 
 download.lst|4 -
 external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch |   30 
--
 external/libebook/UnpackedTarball_libebook.mk   |4 -
 3 files changed, 2 insertions(+), 36 deletions(-)

New commits:
commit 3b662ee2da7f308189307dd17d3a86aaa5f60d46
Author: David Tardon dtar...@redhat.com
Date:   Mon Feb 10 14:13:00 2014 +0100

upload new libe-book

Change-Id: I69e87ad57513c7349aa0abf38b6054583d367963
(cherry picked from commit 95c54daf9cc3054de1bdc52dd327908716fc4a8c)
Reviewed-on: https://gerrit.libreoffice.org/7971
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/download.lst b/download.lst
index f59a190..70671bc 100644
--- a/download.lst
+++ b/download.lst
@@ -2,8 +2,8 @@ ABW_MD5SUM := af3ccc1f1884e68389088d490d596409
 export ABW_TARBALL := libabw-0.0.1.tar.bz2
 CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112
 export CDR_TARBALL := libcdr-0.0.14.tar.bz2
-EBOOK_MD5SUM := 3a62e10c57270718cabfdfc4b7b4e095
-export EBOOK_TARBALL := libe-book-0.0.2.tar.bz2
+EBOOK_MD5SUM := 2f1ceaf2ac8752ed278e175447d9b978
+export EBOOK_TARBALL := libe-book-0.0.3.tar.bz2
 ETONYEK_MD5SUM := 9dad826726da4d4ad60084968691f5f4
 export ETONYEK_TARBALL := libetonyek-0.0.3.tar.bz2
 FREEHAND_MD5SUM := 496dd00028afcc19f896b01394769043
diff --git a/external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch 
b/external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch
deleted file mode 100644
index 21ab72b..000
--- a/external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 30021c75542a008ccf8814fa70d519f00bc69776 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= caol...@redhat.com
-Date: Thu, 28 Nov 2013 09:50:00 +
-Subject: [PATCH] Fix crash on abi2010-1.doc example
-

- src/lib/FB2Parser.cpp | 7 +--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/FB2Parser.cpp b/src/lib/FB2Parser.cpp
-index d258c09..3cd3e3c 100644
 a/src/lib/FB2Parser.cpp
-+++ b/src/lib/FB2Parser.cpp
-@@ -357,8 +357,11 @@ FB2XMLParserContext *processNode(FB2XMLParserContext 
*const context, const xmlTe
-   {
-   case XML_READER_TYPE_ELEMENT :
-   {
--const EBOOKToken *name = getFB2Token(xmlTextReaderConstLocalName(reader));
--const EBOOKToken *ns = 
getFB2Token(xmlTextReaderConstNamespaceUri(reader));
-+const xmlChar *name_str = xmlTextReaderConstLocalName(reader);
-+const xmlChar *ns_str = xmlTextReaderConstNamespaceUri(reader);
-+
-+const EBOOKToken *name = name_str ? getFB2Token(name_str) : 0;
-+const EBOOKToken *ns = ns_str ? getFB2Token(ns_str) : 0;
- 
- if (!name || !ns)
-   // TODO: unknown elements should not be skipped entirely, but
--- 
-1.8.3.1
-
diff --git a/external/libebook/UnpackedTarball_libebook.mk 
b/external/libebook/UnpackedTarball_libebook.mk
index 3cf21e6..7dfee2c 100644
--- a/external/libebook/UnpackedTarball_libebook.mk
+++ b/external/libebook/UnpackedTarball_libebook.mk
@@ -13,8 +13,4 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libebook,$(EBOOK_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libebook,1))
 
-$(eval $(call gb_UnpackedTarball_add_patches,libebook,\
-external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch \
-))
-
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Caolán McNamara 
 sw/source/ui/dbui/mmaddressblockpage.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0a3cddc4573f3d6d884bef84fed8dbe287e4e6be
Author: Caolán McNamara caol...@redhat.com
Date:   Sun Feb 9 21:07:10 2014 +

coverity#1130443 Improper use of negative value

Change-Id: Ie56b1d5ceeb68bb3d7dffe6ad8949485a93e1fbb
(cherry picked from commit 0419524c57a7c18386c6cdc893a59fd95e589de9)
Reviewed-on: https://gerrit.libreoffice.org/7957
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx 
b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 21e0cf8..d2754c7 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -1344,7 +1344,7 @@ void AddressMultiLineEdit::SetText( const OUString rStr )
 while(true)
 {
 sal_Int32 nStart = sPara.indexOf( '', nIndex );
-sal_Int32 nEnd = sPara.indexOf( '', nStart );
+sal_Int32 nEnd = nStart == -1 ? -1 : sPara.indexOf( '', nStart );
 nIndex = nEnd;
 if(nStart != -1  nEnd != -1)
 pTextEngine-SetAttrib( aProtectAttr, nPara, nStart, nEnd + 1, 
sal_False );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - chart2/uiconfig framework/source svx/source

2014-02-10 Thread Caolán McNamara 
 chart2/uiconfig/ui/tp_RangeChooser.ui |   14 +++---
 framework/source/uielement/popuptoolbarcontroller.cxx |   18 ++
 svx/source/stbctrls/insctrl.cxx   |5 -
 3 files changed, 25 insertions(+), 12 deletions(-)

New commits:
commit b7c89c53a0769236c67f8802f63eab6e5b94560b
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 10 13:36:14 2014 +

set mnemonic widgets

Change-Id: Ia093bcd93bd453f039b0dcba744cb8608158ed43

diff --git a/chart2/uiconfig/ui/tp_RangeChooser.ui 
b/chart2/uiconfig/ui/tp_RangeChooser.ui
index bc3a1b3..0d32774 100644
--- a/chart2/uiconfig/ui/tp_RangeChooser.ui
+++ b/chart2/uiconfig/ui/tp_RangeChooser.ui
@@ -1,6 +1,7 @@
 ?xml version=1.0 encoding=UTF-8?
+!-- Generated with glade 3.16.1 --
 interface
-  !-- interface-requires gtk+ 3.0 --
+  requires lib=gtk+ version=3.0/
   object class=GtkImage id=imageIB_RANGE
 property name=visibleTrue/property
 property name=can_focusFalse/property
@@ -76,7 +77,6 @@
 property name=can_focusFalse/property
 property name=receives_defaultTrue/property
 property name=tooltip_markup translatable=yesSelect data 
range/property
-property name=use_action_appearanceFalse/property
 property name=imageimageIB_RANGE/property
   /object
   packing
@@ -99,7 +99,6 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=receives_defaultFalse/property
-property name=use_action_appearanceFalse/property
 property name=use_underlineTrue/property
 property name=xalign0/property
 property name=activeTrue/property
@@ -119,7 +118,6 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=receives_defaultFalse/property
-property name=use_action_appearanceFalse/property
 property name=use_underlineTrue/property
 property name=xalign0/property
 property name=activeTrue/property
@@ -139,7 +137,6 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=receives_defaultFalse/property
-property name=use_action_appearanceFalse/property
 property name=use_underlineTrue/property
 property name=xalign0/property
 property name=draw_indicatorTrue/property
@@ -157,7 +154,6 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=receives_defaultFalse/property
-property name=use_action_appearanceFalse/property
 property name=use_underlineTrue/property
 property name=xalign0/property
 property name=draw_indicatorTrue/property
@@ -186,7 +182,6 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultFalse/property
-property name=use_action_appearanceFalse/property
 property name=xalign0/property
 property name=draw_indicatorTrue/property
   /object
@@ -200,6 +195,7 @@
   object class=GtkGrid id=grid1
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=column_spacing12/property
 child
   object class=GtkEntry id=ED_TIME_BASED_START
 property name=visibleTrue/property
@@ -237,6 +233,8 @@
 property name=can_focusFalse/property
 property name=xpad4/property
 property name=label translatable=yesStart Table 
Index/property
+property name=use_underlineTrue/property
+property name=mnemonic_widgetED_TIME_BASED_START/property
   /object
   packing
 property name=left_attach0/property
@@ -251,6 +249,8 @@
 property name=can_focusFalse/property
 property name=xpad8/property
 property name=label translatable=yesEnd Table 
Index/property
+property name=use_underlineTrue/property
+property name=mnemonic_widgetED_TIME_BASED_END/property
   /object
   packing
 property name=left_attach2/property
commit c218eb9d4070811eb5b543317bc4c1ba6252062b
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 10 13:05:42 2014 +

coverity#1169805 Unchecked return value

Change-Id: I3eef47e4debc6cfde1ef881a3d525f5ec0adf431

diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx
index 7139d68..8a9c8a6 100644
--- a/svx/source/stbctrls/insctrl.cxx
+++ b/svx/source/stbctrls/insctrl.cxx
@@ -79,9 +79,12 @@ void

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 26/9a448fa67f1e66c4a7ceb78550b45c2499ea95 6a/eaaaed06be50118273e5650ebdf63c623e3a17

2014-02-10 Thread Caolán McNamara 
 26/9a448fa67f1e66c4a7ceb78550b45c2499ea95 |1 +
 6a/eaaaed06be50118273e5650ebdf63c623e3a17 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 93587f0ce96a0492b00147d1c587980341130df5
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 10 14:51:37 2014 +

Notes added by 'git notes add'

diff --git a/26/9a448fa67f1e66c4a7ceb78550b45c2499ea95 
b/26/9a448fa67f1e66c4a7ceb78550b45c2499ea95
new file mode 100644
index 000..8a2345e
--- /dev/null
+++ b/26/9a448fa67f1e66c4a7ceb78550b45c2499ea95
@@ -0,0 +1 @@
+ignore: fixed
commit 0babe1dba173645dc39e43f43eb506805dceaa62
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 10 14:51:22 2014 +

Notes added by 'git notes add'

diff --git a/6a/eaaaed06be50118273e5650ebdf63c623e3a17 
b/6a/eaaaed06be50118273e5650ebdf63c623e3a17
new file mode 100644
index 000..3c228a6
--- /dev/null
+++ b/6a/eaaaed06be50118273e5650ebdf63c623e3a17
@@ -0,0 +1 @@
+prefer: bbbc51e931c3a7018f2f19f61fa823190ee6fbb1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - connectivity/source extras/source framework/inc include/formula include/ucbhelper offapi/com svx/source sw/source testtools/source

2014-02-10 Thread Julien Nabet 
 connectivity/source/drivers/file/FConnection.cxx |2 +-
 connectivity/source/inc/java/tools.hxx   |2 +-
 extras/source/labels/labels.xml  |2 +-
 framework/inc/dispatch/closedispatcher.hxx   |2 +-
 include/formula/compiler.hrc |2 +-
 include/ucbhelper/content.hxx|4 ++--
 offapi/com/sun/star/ucb/Content.idl  |2 +-
 svx/source/unodraw/unoshape.cxx  |2 +-
 sw/source/filter/ww8/wrtw8sty.cxx|4 ++--
 sw/source/filter/ww8/wrtww8.cxx  |2 +-
 sw/source/filter/ww8/ww8par.cxx  |2 +-
 testtools/source/bridgetest/idl/bridgetest.idl   |2 +-
 12 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 07d60f88f28d1f05c50458a66a24cefefa97a54a
Author: Julien Nabet serval2...@yahoo.fr
Date:   Mon Feb 10 15:57:11 2014 +0100

Typo: adress - address

Change-Id: I8b6c66b6919f84c36e43a716d4d62fea5cde6568

diff --git a/extras/source/labels/labels.xml b/extras/source/labels/labels.xml
index babc005..f886178 100644
--- a/extras/source/labels/labels.xml
+++ b/extras/source/labels/labels.xml
@@ -1588,7 +1588,7 @@ Avery J8950, L7950 - the labels are not aligned in a 
rectangular grid
 measureS;10160;5700;9906;5700;467;600;2;5;21000;29700/measure
 /label
 label id=L58
-nameL7651 Mini Adress/name
+nameL7651 Mini Address/name
 measureS;4064;2117;3810;2117;467;1090;5;13;21000;29700/measure
 /label
 label id=L59
diff --git a/framework/inc/dispatch/closedispatcher.hxx 
b/framework/inc/dispatch/closedispatcher.hxx
index fff1ac4..bb7a965 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -281,7 +281,7 @@ class CloseDispatcher : // baseclasses ... order is 
necessary for right initiali
 context where its dispatched. Sometimes the start frame of 
the dispatch
 has to be closed itself (target=_self) ... sometimes it's 
parent frame
 has to be closed - BUT(!) it means a parent frame 
containing a top level
-window. _top cant be used then for dispatch - because it 
adress TopFrames
+window. _top cant be used then for dispatch - because it 
address TopFrames
 not frames containg top level windows. So normaly _magic 
(which btw does not
 exists at the moment .-) ) should be used. So we interpret 
target=empty
 as _magic !
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index 95abb545..1c03f6d 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -384,7 +384,7 @@
 #define SC_OPCODE_ISPMT 386
 #define SC_OPCODE_HYPERLINK 387
 #define SC_OPCODE_INDIRECT_XL   388 /* See also INDIRECT for OOO 
variant */
-#define SC_OPCODE_ADDRESS_XL389 /* See also ADRESS for OOO variant 
*/
+#define SC_OPCODE_ADDRESS_XL389 /* See also ADDRESS for OOO 
variant */
 #define SC_OPCODE_GET_PIVOT_DATA390
 #define SC_OPCODE_EUROCONVERT   391
 #define SC_OPCODE_NUMBERVALUE   392
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx 
b/sw/source/filter/ww8/wrtw8sty.cxx
index f631e65..719c34e 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -375,7 +375,7 @@ OString MSWordStyles::GetStyleId(sal_uInt16 nId) const
 static void impl_SkipOdd( ww::bytes* pO, sal_Size nTableStrmTell )
 {
 if ( ( nTableStrmTell + pO-size() )  1 ) // Start auf gerader
-pO-push_back( (sal_uInt8)0 ); // Adress
+pO-push_back( (sal_uInt8)0 ); // Address
 }
 
 void WW8AttributeOutput::EndStyle()
@@ -664,7 +664,7 @@ void WW8AttributeOutput::StartStyles()
 sal_uLong nCurPos = m_rWW8Export.pTableStrm-Tell();
 if ( nCurPos  1 )   // Start auf gerader
 {
-m_rWW8Export.pTableStrm-WriteChar( (char)0 );// Adress
+m_rWW8Export.pTableStrm-WriteChar( (char)0 );// Address
 ++nCurPos;
 }
 rFib.fcStshfOrig = rFib.fcStshf = nCurPos;
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 43a1cfa..db97528 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -1261,7 +1261,7 @@ void WW8_WrPct::AppendPc(WW8_FC nStartFc, bool bIsUnicode)
 
 if ( !bIsUnicode )
 {
-nStartFc = 1; // Adress * 2
+nStartFc = 1; // Address * 2
 nStartFc |= 0x4000; // second last bit for non-Unicode
 }
 
commit 65f620c99ae177efdf06993561ac019663ce74fd
Author: Julien Nabet serval2...@yahoo.fr
Date:   Mon Feb 10 15:23:52 2014 +0100

Typo: execption - exception

Change-Id: Ib57e0cc39c27595490e29dec46cc6d33067c34b5

diff --git

[Libreoffice-commits] core.git: 5 commits - extensions/source framework/inc framework/source offapi/com

2014-02-10 Thread Stephan Bergmann 
 extensions/source/update/check/updatecheckconfig.hxx |   19 +---
 extensions/source/update/check/updatecheckjob.cxx|   31 ++
 framework/inc/jobs/jobdata.hxx   |   40 
 framework/source/jobs/helponstartup.cxx  |   55 +++-
 framework/source/jobs/job.cxx|   16 +--
 framework/source/jobs/jobdata.cxx|   86 +--
 framework/source/jobs/jobexecutor.cxx|2 
 offapi/com/sun/star/task/ErrorCodeIOException.idl|5 -
 8 files changed, 68 insertions(+), 186 deletions(-)

New commits:
commit ce5f24a6eca4e846a498e794c8adba5593c4fa5a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Feb 10 15:57:51 2014 +0100

Improve documentation

Change-Id: I63b30b6d962820f31821787c1c220734265e1a4a

diff --git a/offapi/com/sun/star/task/ErrorCodeIOException.idl 
b/offapi/com/sun/star/task/ErrorCodeIOException.idl
index 4bc7d33..20011c3 100644
--- a/offapi/com/sun/star/task/ErrorCodeIOException.idl
+++ b/offapi/com/sun/star/task/ErrorCodeIOException.idl
@@ -25,12 +25,11 @@
  module com {  module sun {  module star {  module task {
 
 
-/** IOException that can carry error codes ( not only io related ).
-It can be used to transport the error code information.
+/** IOException that carries a legacy error code (not only I/O related).
  */
 exception ErrorCodeIOException : com::sun::star::io::IOException
 {
-/** specifies the error code.
+/** specifies the error code; see tools/errcode.hxx for details.
  */
 
 long ErrCode;
commit 463e1cd292b347d43ff33eef61a539a5e9d1c53f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Feb 10 15:44:47 2014 +0100

Simplify string literal usage

Change-Id: I216d0af8fd78bec8668ea2a5be7d75f7c1df0c31

diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx
index 6701311..2acc493 100644
--- a/framework/inc/jobs/jobdata.hxx
+++ b/framework/inc/jobs/jobdata.hxx
@@ -49,46 +49,6 @@ class JobData : private ThreadHelpBase
 {
 public:
 
-/// specifies the root package and key to find registered jobs
-static const sal_Char* JOBCFG_ROOT;
-/// define the cfg key Arguments of a job relativ to 
JOBCFG_ROOT/job alias
-static const sal_Char* JOBCFG_PROP_ARGUMENTS;
-/// define the cfg key Service of a job relativ to JOBCFG_ROOT/job 
alias
-static const sal_Char* JOBCFG_PROP_SERVICE;
-/// define the cfg key Context of a job relativ to JOBCFG_ROOT/job 
alias
-static const sal_Char* JOBCFG_PROP_CONTEXT;
-
-/// specifies the root package and key to find event registrations
-static const sal_Char* EVENTCFG_ROOT;
-/// define the cfg key JobList of an event relativ to 
EVENTCFG_ROOT/event
-static const sal_Char* EVENTCFG_PATH_JOBLIST;
-/// define the cfg key AdminTime of a job registration relativ to 
EVENTCFG_ROOT/event/EVENTCFG_PROP_JOBLIST/job alias
-static const sal_Char* EVENTCFG_PROP_ADMINTIME;
-/// define the cfg key UserTime of a job registration relativ to 
EVENTCFG_ROOT/event/EVENTCFG_PROP_JOBLIST/job alias
-static const sal_Char* EVENTCFG_PROP_USERTIME;
-
-/// mark the starting point of static job data inside argument list of 
job execution
-static const sal_Char* PROPSET_CONFIG;
-/// mark the starting point of job specific data inside argument list 
of job execution
-static const sal_Char* PROPSET_OWNCONFIG;
-/// mark the starting point of environment data inside argument list 
of job execution
-static const sal_Char* PROPSET_ENVIRONMENT;
-/// mark the starting point of any other dynamic generated data inside 
argument list of job execution (e.g. from a dispatch() request)
-static const sal_Char* PROPSET_DYNAMICDATA;
-
-static const sal_Char* PROP_ALIAS;
-static const sal_Char* PROP_EVENTNAME;
-static const sal_Char* PROP_ENVTYPE;
-static const sal_Char* PROP_FRAME;
-static const sal_Char* PROP_MODEL;
-static const sal_Char* PROP_SERVICE;
-static const sal_Char* PROP_CONTEXT;
-
-//___
-// structs
-
-public:
-
 /** These values can be used to differe between jobs with and jobs 
without
 a configuration. Of course an unknown state should be available 
too,
 to detect a missing initialization.
diff --git a/framework/source/jobs/helponstartup.cxx 
b/framework/source/jobs/helponstartup.cxx
index 19b35a4..af7e5af 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -44,31 +44,6 @@
 
 namespace framework{
 
-
-// path to module config
-static OUString CFG_PACKAGE_MODULES 
(/org.openoffice.Setup/Office/Factories);
-static OUString CFG_PACKAGE_SETUP   (/org.openoffice.Setup);
-static OUString CFG_PACKAGE_COMMON

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

2014-02-10 Thread Tor Lillqvist 
 solenv/bin/native-code.py |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 4ff56fd1fa6f0ad2501274086a03d51a0e9cf03f
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Feb 10 17:05:19 2014 +0200

TiledLibreOffice needs css_comp_uui_UUIInteractionHandler_get_implementation

Change-Id: Ib42a305bbab9d05d0c187fdf15952cfeee5250a7

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index f16f98f..ada5a43 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -91,6 +91,8 @@ core_constructor_list = [
 com_sun_star_drawing_EnhancedCustomShapeEngine_get_implementation,
 # toolkit/util/tk.component
 stardiv_Toolkit_VCLXToolkit_get_implementation,
+# uui/util/uui.component
+com_sun_star_comp_uui_UUIInteractionHandler_get_implementation,
 ]
 
 extended_core_factory_list = core_factory_list + [
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread David Tardon 
 download.lst   |4 
 external/libabw/UnpackedTarball_libabw.mk  |6 -
 external/libabw/libabw-0.0.1-badtable.patch.1  |  100 -
 external/libabw/libabw-0.0.1-inttypes.patch.1  |   36 --
 external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 |   11 -
 5 files changed, 2 insertions(+), 155 deletions(-)

New commits:
commit baa84c47a1637898560162ef5d24530eef81b10d
Author: David Tardon dtar...@redhat.com
Date:   Mon Feb 10 16:05:56 2014 +0100

upload libabw 0.0.2

Change-Id: I2b73c5546e767030344f787efb9a9cafa9635ad3

diff --git a/download.lst b/download.lst
index 19615f6..cea2517 100644
--- a/download.lst
+++ b/download.lst
@@ -1,5 +1,5 @@
-ABW_MD5SUM := af3ccc1f1884e68389088d490d596409
-export ABW_TARBALL := libabw-0.0.1.tar.bz2
+ABW_MD5SUM := 40fa48e03b1e28ae0325cc34b35bc46d
+export ABW_TARBALL := libabw-0.0.2.tar.bz2
 CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112
 export CDR_TARBALL := libcdr-0.0.14.tar.bz2
 EBOOK_MD5SUM := 2f1ceaf2ac8752ed278e175447d9b978
diff --git a/external/libabw/UnpackedTarball_libabw.mk 
b/external/libabw/UnpackedTarball_libabw.mk
index 8e28755..6288b0e 100644
--- a/external/libabw/UnpackedTarball_libabw.mk
+++ b/external/libabw/UnpackedTarball_libabw.mk
@@ -11,10 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libabw))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libabw,$(ABW_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_add_patches,libabw,\
-   external/libabw/libabw-0.0.1-inttypes.patch.1 \
-   external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 \
-   external/libabw/libabw-0.0.1-badtable.patch.1 \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/libabw/libabw-0.0.1-badtable.patch.1 
b/external/libabw/libabw-0.0.1-badtable.patch.1
deleted file mode 100644
index ddb0c8f..000
--- a/external/libabw/libabw-0.0.1-badtable.patch.1
+++ /dev/null
@@ -1,100 +0,0 @@
 a/src/lib/ABWContentCollector.cpp
-+++ b/src/lib/ABWContentCollector.cpp
-@@ -1492,26 +1492,32 @@ void libabw::ABWContentCollector::closeTable()
- 
- void libabw::ABWContentCollector::openCell(const char *props)
- {
--  if (props)
--parsePropString(props, m_ps-m_tableStates.top().m_currentCellProperties);
--  int currentRow(0);
--  if (!findInt(_findCellProperty(top-attach), currentRow))
--currentRow = m_ps-m_tableStates.top().m_currentTableRow + 1;
--  while (m_ps-m_tableStates.top().m_currentTableRow  currentRow)
-+  if (!m_ps-m_tableStates.empty())
-   {
--if (m_ps-m_tableStates.top().m_currentTableRow = 0)
--  _closeTableRow();
--_openTableRow();
--  }
-+if (props)
-+  parsePropString(props, 
m_ps-m_tableStates.top().m_currentCellProperties);
-+int currentRow(0);
-+if (!findInt(_findCellProperty(top-attach), currentRow))
-+  currentRow = m_ps-m_tableStates.top().m_currentTableRow + 1;
-+while (m_ps-m_tableStates.top().m_currentTableRow  currentRow)
-+{
-+  if (m_ps-m_tableStates.top().m_currentTableRow = 0)
-+_closeTableRow();
-+  _openTableRow();
-+}
- 
--  if (!findInt(_findCellProperty(left-attach), 
m_ps-m_tableStates.top().m_currentTableCol))
--m_ps-m_tableStates.top().m_currentTableCol++;
-+if (!findInt(_findCellProperty(left-attach), 
m_ps-m_tableStates.top().m_currentTableCol))
-+  m_ps-m_tableStates.top().m_currentTableCol++;
-+  }
- }
- 
- void libabw::ABWContentCollector::closeCell()
- {
--  _closeTableCell();
--  m_ps-m_tableStates.top().m_currentCellProperties.clear();
-+  if (!m_ps-m_tableStates.empty())
-+  {
-+_closeTableCell();
-+m_ps-m_tableStates.top().m_currentCellProperties.clear();
-+  }
- }
- 
- void libabw::ABWContentCollector::collectData(const char *, const char *, 
const WPXBinaryData )
 a/src/lib/ABWStylesCollector.cpp
-+++ b/src/lib/ABWStylesCollector.cpp
-@@ -167,28 +167,32 @@ void libabw::ABWStylesCollector::closeTable()
- 
- void libabw::ABWStylesCollector::openCell(const char *props)
- {
--  if (props)
--parsePropString(props, m_ps-m_tableStates.top().m_currentCellProperties);
--  int currentRow(0);
--  if (!findInt(_findCellProperty(top-attach), currentRow))
--currentRow = m_ps-m_tableStates.top().m_currentTableRow + 1;
--  while (m_ps-m_tableStates.top().m_currentTableRow  currentRow)
--m_ps-m_tableStates.top().m_currentTableRow++;
--
--  if (!m_ps-m_tableStates.empty()  0 == 
m_ps-m_tableStates.top().m_currentTableRow)
-+  if (!m_ps-m_tableStates.empty())
-   {
--int leftAttach(0);
--int rightAttach(0);
--if (findInt(_findCellProperty(left-attach), leftAttach)  
findInt(_findCellProperty(right-attach), rightAttach))
--  m_ps-m_tableStates.top().m_currentTableWidth += rightAttach - 
leftAttach;
--else
--  m_ps-m_tableStates.top().m_currentTableWidth++;
-+if (props)
-+  parsePropString(props, 
m_ps-m_tableStates.top().m_currentCellProperties);
-+int currentRow(0);
-+if

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

2014-02-10 Thread Julien Nabet 
 sw/source/ui/dbui/mailmergehelper.cxx |   32 
 1 file changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 5b63010228df1d58d71fcc99beab5e2d7b10348c
Author: Julien Nabet serval2...@yahoo.fr
Date:   Mon Feb 10 16:14:35 2014 +0100

Typo: aAdresses - aAddresses

Change-Id: If565c01510a56e872d65615275f614fb799c7171

diff --git a/sw/source/ui/dbui/mailmergehelper.cxx 
b/sw/source/ui/dbui/mailmergehelper.cxx
index 57d25c0..4c0535f 100644
--- a/sw/source/ui/dbui/mailmergehelper.cxx
+++ b/sw/source/ui/dbui/mailmergehelper.cxx
@@ -182,7 +182,7 @@ SwBoldFixedInfo::~SwBoldFixedInfo()
 
 struct  SwAddressPreview_Impl
 {
-::std::vector OUString aAdresses;
+::std::vector OUString aAddresses;
 sal_uInt16  nRows;
 sal_uInt16  nColumns;
 sal_uInt16  nSelectedAddress;
@@ -249,27 +249,27 @@ IMPL_LINK_NOARG(SwAddressPreview, ScrollHdl)
 
 void SwAddressPreview::AddAddress(const OUString rAddress)
 {
-pImpl-aAdresses.push_back(rAddress);
+pImpl-aAddresses.push_back(rAddress);
 UpdateScrollBar();
 }
 
 void SwAddressPreview::SetAddress(const OUString rAddress)
 {
-pImpl-aAdresses.clear();
-pImpl-aAdresses.push_back(rAddress);
+pImpl-aAddresses.clear();
+pImpl-aAddresses.push_back(rAddress);
 aVScrollBar.Show(false);
 Invalidate();
 }
 
 sal_uInt16   SwAddressPreview::GetSelectedAddress()const
 {
-OSL_ENSURE(pImpl-nSelectedAddress  pImpl-aAdresses.size(), selection 
invalid);
+OSL_ENSURE(pImpl-nSelectedAddress  pImpl-aAddresses.size(), selection 
invalid);
 return pImpl-nSelectedAddress;
 }
 
 void SwAddressPreview::SelectAddress(sal_uInt16 nSelect)
 {
-OSL_ENSURE(pImpl-nSelectedAddress  pImpl-aAdresses.size(), selection 
invalid);
+OSL_ENSURE(pImpl-nSelectedAddress  pImpl-aAddresses.size(), selection 
invalid);
 pImpl-nSelectedAddress = nSelect;
 // now make it visible..
 sal_uInt16 nSelectRow = nSelect / pImpl-nColumns;
@@ -280,20 +280,20 @@ void SwAddressPreview::SelectAddress(sal_uInt16 nSelect)
 
 void SwAddressPreview::Clear()
 {
-pImpl-aAdresses.clear();
+pImpl-aAddresses.clear();
 pImpl-nSelectedAddress = 0;
 UpdateScrollBar();
 }
 
 void SwAddressPreview::ReplaceSelectedAddress(const OUString rNew)
 {
-pImpl-aAdresses[pImpl-nSelectedAddress] = rNew;
+pImpl-aAddresses[pImpl-nSelectedAddress] = rNew;
 Invalidate();
 }
 
 void SwAddressPreview::RemoveSelectedAddress()
 {
-pImpl-aAdresses.erase(pImpl-aAdresses.begin() + pImpl-nSelectedAddress);
+pImpl-aAddresses.erase(pImpl-aAddresses.begin() + 
pImpl-nSelectedAddress);
 if(pImpl-nSelectedAddress)
 --pImpl-nSelectedAddress;
 UpdateScrollBar();
@@ -317,7 +317,7 @@ void SwAddressPreview::UpdateScrollBar()
 if(pImpl-nColumns)
 {
 aVScrollBar.SetVisibleSize(pImpl-nRows);
-sal_uInt16 nResultingRows = (sal_uInt16)(pImpl-aAdresses.size() + 
pImpl-nColumns - 1) / pImpl-nColumns;
+sal_uInt16 nResultingRows = (sal_uInt16)(pImpl-aAddresses.size() + 
pImpl-nColumns - 1) / pImpl-nColumns;
 ++nResultingRows;
 aVScrollBar.Show(pImpl-bEnableScrollBar  nResultingRows  
pImpl-nRows);
 aVScrollBar.SetRange(Range(0, nResultingRows));
@@ -350,7 +350,7 @@ void SwAddressPreview::Paint(const Rectangle)
 aPartSize.Height() -= 2;
 
 sal_uInt16 nAddress = nStartRow * pImpl-nColumns;
-const sal_uInt16 nNumAddresses = static_cast sal_uInt16 
(pImpl-aAdresses.size());
+const sal_uInt16 nNumAddresses = static_cast sal_uInt16 
(pImpl-aAddresses.size());
 for(sal_uInt16 nRow = 0; nRow  pImpl-nRows ; ++nRow)
 {
 for(sal_uInt16 nCol = 0; nCol  pImpl-nColumns; ++nCol)
@@ -362,7 +362,7 @@ void SwAddressPreview::Paint(const Rectangle)
 bool bIsSelected = nAddress == pImpl-nSelectedAddress;
 if((pImpl-nColumns * pImpl-nRows) == 1)
 bIsSelected = false;
-OUString adr(pImpl-aAdresses[nAddress]);
+OUString adr(pImpl-aAddresses[nAddress]);
 DrawText_Impl(adr,aPos,aPartSize,bIsSelected);
 ++nAddress;
 }
@@ -387,7 +387,7 @@ void  SwAddressPreview::MouseButtonDown( const MouseEvent 
rMEvt )
 sal_uInt32 nCol = rMousePos.X() / aPartSize.Width();
 sal_uInt32 nSelect = nRow * pImpl-nColumns + nCol;
 
-if( nSelect  pImpl-aAdresses.size() 
+if( nSelect  pImpl-aAddresses.size() 
 pImpl-nSelectedAddress != (sal_uInt16)nSelect)
 {
 pImpl-nSelectedAddress = (sal_uInt16)nSelect;
@@ -411,7 +411,7 @@ void  SwAddressPreview::KeyInput( const KeyEvent rKEvt )
 --nSelectedRow;
 break;
 case KEY_DOWN:
-if(pImpl-aAdresses.size()  
sal_uInt32(pImpl-nSelectedAddress + pImpl-nColumns))
+if(pImpl-aAddresses.size()  
sal_uInt32(pImpl-nSelectedAddress

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

2014-02-10 Thread Julien Nabet 
 offapi/com/sun/star/chart2/XCoordinateSystem.idl |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 128700cdb722fff64782c2be2c755222ae87b607
Author: Julien Nabet serval2...@yahoo.fr
Date:   Mon Feb 10 16:20:34 2014 +0100

Try to fix a warning during building

by disambiguating comment ending for the parser

Change-Id: I3432d4d034f10e81ce493acf8a952b200bde95a1

diff --git a/offapi/com/sun/star/chart2/XCoordinateSystem.idl 
b/offapi/com/sun/star/chart2/XCoordinateSystem.idl
index 7d61a79..be94784 100644
--- a/offapi/com/sun/star/chart2/XCoordinateSystem.idl
+++ b/offapi/com/sun/star/chart2/XCoordinateSystem.idl
@@ -32,9 +32,6 @@ module star
 module chart2
 {
 
-/**
-*/
-
 interface XCoordinateSystem : ::com::sun::star::uno::XInterface
 {
 /** the dimension of the coordinate-system.
@@ -71,7 +68,7 @@ interface XCoordinateSystem : 
::com::sun::star::uno::XInterface
 /** In one dimension there could be several axes to enable main and 
secondary axis and maybe more in future.
 This method returns the maximum index at which an axis exists for the 
given dimension.
 It is allowed that some indexes in between do not have an axis.
-/*/
+*/
 long getMaximumAxisIndexByDimension( [in] long nDimension )
 raises( com::sun::star::lang::IndexOutOfBoundsException );
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Jacobo Aragunde Pérez 
 sw/source/filter/ww8/docxattributeoutput.cxx |   10 +++---
 sw/source/filter/ww8/docxattributeoutput.hxx |6 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit eddcfe55f1fc995f88756c2fdc99321ef48c5188
Author: Jacobo Aragunde Pérez jaragu...@igalia.com
Date:   Thu Feb 6 18:40:54 2014 +0100

sw: fix fallback for OLE object output.

OLE objects could be written as graphics as a fallback for
unsupported formats, but it happened in a wrong position of the
document (inside w:rPr).

Added two extra fields to the PostponedGraphic structure to be able
to postpone the writing of OLE graphics.

Change-Id: If36a0aed11bcac2115ef0322cc83efccd6ef1204

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 46d862e..3733c7c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1231,7 +1231,7 @@ void DocxAttributeOutput::WritePostponedGraphic()
 for( std::list PostponedGraphic ::const_iterator it = 
m_postponedGraphic-begin();
  it != m_postponedGraphic-end();
  ++it )
-FlyFrameGraphic( it-grfNode, it-size, 0, 0, it-pSdrObj );
+FlyFrameGraphic( it-grfNode, it-size, it-mOLEFrmFmt, it-mOLENode, 
it-pSdrObj );
 delete m_postponedGraphic;
 m_postponedGraphic = NULL;
 }
@@ -3091,7 +3091,11 @@ void DocxAttributeOutput::WriteOLE2Obj( const SdrObject* 
pSdrObj, SwOLENode rOL
 if( WriteOLEMath( pSdrObj, rOLENode, rSize ))
 return;
 // Then we fall back to just export the object as a graphic.
-FlyFrameGraphic( 0, rSize, pFlyFrmFmt, rOLENode );
+if( m_postponedGraphic == NULL )
+FlyFrameGraphic( 0, rSize, pFlyFrmFmt, rOLENode );
+else
+// w:drawing should not be inside w:rPr, so write it out later
+m_postponedGraphic-push_back( PostponedGraphic( 0, rSize, pFlyFrmFmt, 
rOLENode, 0 ) );
 }
 
 bool DocxAttributeOutput::WriteOLEChart( const SdrObject* pSdrObj, const Size 
rSize )
@@ -3272,7 +3276,7 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const 
sw::Frame rFrame, const Po
 FlyFrameGraphic( pGrfNode, rFrame.GetLayoutSize(), 0, 
0, pSdrObj);
 else // we are writing out attributes, but w:drawing 
should not be inside w:rPr,
 {// so write it out later
-m_postponedGraphic-push_back( PostponedGraphic( 
pGrfNode, rFrame.GetLayoutSize(), pSdrObj));
+m_postponedGraphic-push_back( PostponedGraphic( 
pGrfNode, rFrame.GetLayoutSize(), 0, 0, pSdrObj));
 }
 }
 }
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 5c628c6..926db22 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -752,9 +752,13 @@ private:
 
 struct PostponedGraphic
 {
-PostponedGraphic( const SwGrfNode* n, Size s,  const SdrObject* sObj ) 
: grfNode( n ), size( s ),  pSdrObj(sObj) {};
+PostponedGraphic( const SwGrfNode* n, Size s, const SwFlyFrmFmt* 
pOLEFrmFmt, SwOLENode* pOLENode, const SdrObject* sObj )
+: grfNode( n ), size( s ), mOLEFrmFmt( pOLEFrmFmt ), mOLENode( 
pOLENode ), pSdrObj(sObj) {};
+
 const SwGrfNode* grfNode;
 Size size;
+const SwFlyFrmFmt* mOLEFrmFmt;
+SwOLENode* mOLENode;
 const SdrObject* pSdrObj;
 };
 std::list PostponedGraphic * m_postponedGraphic;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Bjoern Michaelsen 
 solenv/gbuild/extensions/post_PackageInfo.mk |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 289ced4011a2866fcf59b86c7cf9a89c924882cc
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Feb 4 17:42:03 2014 +0100

adjust PackageInfo for zip files

see commit 7fe9808f009af2f0a4da58663eacd2caccdcaafe for reference

diff --git a/solenv/gbuild/extensions/post_PackageInfo.mk 
b/solenv/gbuild/extensions/post_PackageInfo.mk
index 0063e88..e4bbd14 100644
--- a/solenv/gbuild/extensions/post_PackageInfo.mk
+++ b/solenv/gbuild/extensions/post_PackageInfo.mk
@@ -58,8 +58,8 @@ define gb_PackageInfo_emit_l10n_for_one_ressource
 
 endef
 
-define gb_PackageInfo_emit_l10n_for_one_uifile
-@echo $(gb_UIConfig_INSTDIR)/$(2)/ui/res/$(1)/$(3)  
$(gb_PackageInfo_get_target)/l10n-$(1).files
+define gb_PackageInfo_emit_l10n_for_one_uizip
+@echo $(gb_UIConfig_INSTDIR)/$(2)/ui/res/$(1).zip  
$(gb_PackageInfo_get_target)/l10n-$(1).files
 
 endef
 
@@ -72,7 +72,9 @@ define gb_PackageInfo_emit_l10n_for_one_lang
 @touch $(foreach suf,executables libraries 
files,$(gb_PackageInfo_get_target)/l10n-$(1).$(suf))
 $(if $(filter-out qtz en-US,$(1)),$(foreach packagedir,$(patsubst 
%/,%,$(gb_AllLangPackage_ALLDIRS)),$(call 
gb_PackageInfo_emit_l10n_for_one_alllangpackage,$(packagedir),$(1
 $(if $(filter $(gb_AllLangResTarget_LANGS),$(1)),$(foreach 
target,$(gb_AllLangResTarget_ALLTARGETS),$(call 
gb_PackageInfo_emit_l10n_for_one_ressource,$(target),$(1
-$(foreach uifile,$(gb_UIConfig_ALLFILES),$(call 
gb_PackageInfo_emit_l10n_for_one_uifile,$(1),$(firstword $(subst 
:,$(WHITESPACE),$(uifile))),$(lastword $(subst :,$(WHITESPACE),$(uifile)
+$(foreach uizip,\
+$(sort $(foreach uifile,$(gb_UIConfig_ALLFILES),$(firstword $(subst 
:,$(WHITESPACE),$(uifile),\
+$(call gb_PackageInfo_emit_l10n_for_one_uizip,$(1),$(uizip)))
 $(if $(filter $(gb_Configuration_LANGS),$(1)),$(foreach configfile,Langpack- 
res/fcfg_langpack_ res/registry_,$(call 
gb_PackageInfo_emit_l10n_for_one_configfile,$(1),$(configfile
 @echo $(foreach suf,executables libraries 
files,$(gb_PackageInfo_get_target)/l10n-$(1).$(suf)) \\  
$(WORKDIR)/Dep/packageinfo.d
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - scp2/source solenv/bin sysui/desktop

2014-02-10 Thread Tor Lillqvist 
 scp2/source/ooo/directory_ooo_macosx.scp  |2 +-
 solenv/bin/modules/installer/simplepackage.pm |2 +-
 sysui/desktop/macosx/Info.plist   |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d65198686137d0eed0777eb05adc19d329b16258
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Feb 10 17:29:01 2014 +0200

Hardcode vendor-specific app bundle name

Change-Id: Iee89a606e507f4356a62d5cd4ee2ebbed671bcdd

diff --git a/scp2/source/ooo/directory_ooo_macosx.scp 
b/scp2/source/ooo/directory_ooo_macosx.scp
index fdc51f10..483be25 100644
--- a/scp2/source/ooo/directory_ooo_macosx.scp
+++ b/scp2/source/ooo/directory_ooo_macosx.scp
@@ -21,7 +21,7 @@
 #ifdef MACOSX
 Directory gid_Dir_Bundle
 ParentID = PD_PROGDIR;
-HostName = %PRODUCTNAME.app;
+HostName = LibreOffice from Collabora.app;
 LangPackHostName = %PRODUCTNAME Language Pack.app;
 End
 
diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index 63a4c8b..b2ef9f4 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -270,7 +270,7 @@ sub create_package
 
 my $volume_name = $allvariables-{'PRODUCTNAME'};
 my $volume_name_classic = $allvariables-{'PRODUCTNAME'} . ' ' . 
$allvariables-{'PRODUCTVERSION'};
-my $volume_name_classic_app = $volume_name;  # app should not 
contain version number
+my $volume_name_classic_app = 'LibreOffice from Collabora';  # app 
should not contain version number
 if ( $allvariables-{'DMG_VOLUMEEXTENSION'} ) {
 $volume_name = $volume_name . ' ' . 
$allvariables-{'DMG_VOLUMEEXTENSION'};
 $volume_name_classic = $volume_name_classic . ' ' . 
$allvariables-{'DMG_VOLUMEEXTENSION'};
diff --git a/sysui/desktop/macosx/Info.plist b/sysui/desktop/macosx/Info.plist
index 5a682dc..9682cb0 100755
--- a/sysui/desktop/macosx/Info.plist
+++ b/sysui/desktop/macosx/Info.plist
@@ -1411,7 +1411,7 @@
keyCFBundleInfoDictionaryVersion/key
string6.0/string
keyCFBundleName/key
-   string${PRODUCTNAME}/string
+   stringLibreOffice from Collabora/string
keyCFBundlePackageType/key
stringAPPL/string
keyCFBundleSignature/key
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - desktop/test framework/source include/svtools

2014-02-10 Thread Julien Nabet 
 desktop/test/deployment/update/updateinfocreation/readme.txt |2 +-
 framework/source/services/frame.cxx  |2 +-
 include/svtools/genericunodialog.hxx |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 70d8b26810c927949206dc6189b7f163651ce55e
Author: Julien Nabet serval2...@yahoo.fr
Date:   Mon Feb 10 16:48:09 2014 +0100

Typo: acess - access

Change-Id: I8fb5efa49ccd886fa0172fdc59ede0821ecce486

diff --git a/framework/source/services/frame.cxx 
b/framework/source/services/frame.cxx
index 553979d..14d5d69 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -3440,7 +3440,7 @@ void Frame::impl_checkMenuCloser()
 ReadGuard aReadLock(m_aLock);
 
 // only top frames, which are part of our desktop hierarchy, can
-// do so! By the way - we need the desktop instance to have acess
+// do so! By the way - we need the desktop instance to have access
 // to all other top level frames too.
 css::uno::Reference css::frame::XDesktop xDesktop 
(m_xParent, css::uno::UNO_QUERY);
 css::uno::Reference css::frame::XFramesSupplier  xTaskSupplier(xDesktop 
, css::uno::UNO_QUERY);
diff --git a/include/svtools/genericunodialog.hxx 
b/include/svtools/genericunodialog.hxx
index 5c2c9d1..0d18d7a 100644
--- a/include/svtools/genericunodialog.hxx
+++ b/include/svtools/genericunodialog.hxx
@@ -70,7 +70,7 @@ namespace svt
 ,public ::comphelper::OPropertyContainer
 {
 private:
-::osl::Mutexm_aExecutionMutex;  /// acess safety 
for execute/cancel
+::osl::Mutexm_aExecutionMutex;  /// access safety 
for execute/cancel
 
 protected:
 Dialog* m_pDialog;  /// the dialog 
to execute
commit 060810180beec636be719768c25a377140336869
Author: Julien Nabet serval2...@yahoo.fr
Date:   Mon Feb 10 16:46:06 2014 +0100

Typo: diretory - directory

Change-Id: I46270104db3192f427bb7a954e6c074ab3aced33

diff --git a/desktop/test/deployment/update/updateinfocreation/readme.txt 
b/desktop/test/deployment/update/updateinfocreation/readme.txt
index 9a649bc..20819bb 100644
--- a/desktop/test/deployment/update/updateinfocreation/readme.txt
+++ b/desktop/test/deployment/update/updateinfocreation/readme.txt
@@ -32,7 +32,7 @@ See also the Wiki entry at:
 http://wiki.openoffice.org/wiki/Creating_update_information_for_extensions
 This generated update information file can then be used by the webserver, when 
it 
 sends back the requested update information. The update information file will 
be 
-generated in the misc diretory of the output directory.
+generated in the misc directory of the output directory.
 
 The update information file needs to be copied into common.pro/pus.mxyz 
directory. 
 The project mwsfinish will process the files in the pus directory.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 6 commits - framework/Library_fwk.mk framework/source include/sal solenv/bin

2014-02-10 Thread Matúš Kukan 
 framework/Library_fwk.mk  |4 
 framework/source/layoutmanager/toolbarlayoutmanager.cxx   |   29 -
 framework/source/layoutmanager/toolbarlayoutmanager.hxx   |7 
 framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx |   14 
 framework/source/uiconfiguration/uiconfigurationmanager.cxx   |   28 -
 framework/source/uielement/menubarmanager.cxx |7 
 framework/source/uielement/toolbarmanager.cxx |7 
 framework/source/uifactory/addonstoolbarfactory.cxx   |  240 
++
 framework/source/uifactory/addonstoolboxfactory.cxx   |  240 
--
 framework/source/uifactory/toolbarfactory.cxx |   99 
 framework/source/uifactory/toolboxfactory.cxx |   99 
 framework/source/uifactory/uielementfactorymanager.cxx|   16 
 include/sal/log-areas.dox |1 
 solenv/bin/native-code.py |2 
 14 files changed, 395 insertions(+), 398 deletions(-)

New commits:
commit 4c726e9607fbcd54c5ef39c951202e3776ec35ae
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Mon Feb 10 16:40:30 2014 +0100

Survive missing UIElementFactories.

And try to not use AddonsToolBarFactory in native code generator.

Change-Id: I4782e6c719bdc7e01da14d2ea026e119da542517

diff --git a/framework/source/uifactory/uielementfactorymanager.cxx 
b/framework/source/uifactory/uielementfactorymanager.cxx
index 68cf917..2282b06 100644
--- a/framework/source/uifactory/uielementfactorymanager.cxx
+++ b/framework/source/uifactory/uielementfactorymanager.cxx
@@ -28,6 +28,7 @@
 #include com/sun/star/container/XContainer.hpp
 #include com/sun/star/container/XContainerListener.hpp
 #include com/sun/star/lang/XServiceInfo.hpp
+#include com/sun/star/loader/CannotActivateFactoryException.hpp
 #include com/sun/star/frame/ModuleManager.hpp
 #include com/sun/star/frame/XFrame.hpp
 #include com/sun/star/frame/XModuleManager2.hpp
@@ -503,10 +504,17 @@ throw ( RuntimeException )
 aServiceSpecifier = 
m_pConfigAccess-getFactorySpecifierFromTypeNameModule( aType, aName, aModuleId 
);
 } // SAFE
 
-if ( !aServiceSpecifier.isEmpty() )
-return Reference XUIElementFactory ( 
m_xContext-getServiceManager()-createInstanceWithContext(aServiceSpecifier, 
m_xContext), UNO_QUERY );
-else
-return Reference XUIElementFactory ();
+if ( !aServiceSpecifier.isEmpty() ) try
+{
+return Reference XUIElementFactory (m_xContext-getServiceManager()-
+createInstanceWithContext(aServiceSpecifier, m_xContext), 
UNO_QUERY);
+}
+catch ( const css::loader::CannotActivateFactoryException )
+{
+SAL_WARN(fwk.uielement, aServiceSpecifier 
+ not available. This should happen only on mobile 
platforms.);
+}
+return Reference XUIElementFactory ();
 }
 
 void SAL_CALL UIElementFactoryManager::registerFactory( const OUString aType, 
const OUString aName, const OUString aModuleId, const OUString 
aFactoryImplementationName )
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index cf57fc1..3883a8d 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -48,7 +48,6 @@ core_factory_list = [
 
 core_constructor_list = [
 # framework/util/fwk.component
-com_sun_star_comp_framework_AddonsToolBarFactory_get_implementation,
 com_sun_star_comp_framework_AutoRecovery_get_implementation,
 com_sun_star_comp_framework_Frame_get_implementation,
 com_sun_star_comp_framework_JobExecutor_get_implementation,
commit 5306890b2c960235183caad0bf89e5f31f2f29a0
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Mon Feb 10 12:15:07 2014 +0100

native code generator: Do not use uui component.

Since fe537786a42abea57551395f73328db48bebd086 and
4ff56fd1fa6f0ad2501274086a03d51a0e9cf03f it should not be needed.

Change-Id: I497c7920e94c322cee5db1b10cd61f30dfbba634

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index ada5a43..cf57fc1 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -41,7 +41,6 @@ core_factory_list = [
 (libunordflo.a, unordf_component_getFactory),
 (libunoxmllo.a, unoxml_component_getFactory),
 (libutllo.a, utl_component_getFactory),
-(libuuilo.a, uui_component_getFactory),
 (libxmlsecurity.a, xmlsecurity_component_getFactory),
 (libxolo.a, xo_component_getFactory),
 (libxstor.a, xstor_component_getFactory),
commit d55495daf9b412eacc271860788ad822e99e57c1
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Mon Feb 10 11:49:18 2014 +0100

Do not throw if AcceleratorConfigurations are missing.

Which can happen on mobile platforms if we don't want them.

Change-Id: I53639ccc75886708850d2d3a01eec76104b7f2c9

diff --git

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - download.lst external/libabw

2014-02-10 Thread David Tardon 
 download.lst   |4 
 external/libabw/UnpackedTarball_libabw.mk  |6 -
 external/libabw/libabw-0.0.1-badtable.patch.1  |  100 -
 external/libabw/libabw-0.0.1-inttypes.patch.1  |   36 --
 external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 |   11 -
 5 files changed, 2 insertions(+), 155 deletions(-)

New commits:
commit d0f2627feb1a406d423af45dea8b1773aeaa0a82
Author: David Tardon dtar...@redhat.com
Date:   Mon Feb 10 16:05:56 2014 +0100

upload libabw 0.0.2

Change-Id: I2b73c5546e767030344f787efb9a9cafa9635ad3
(cherry picked from commit baa84c47a1637898560162ef5d24530eef81b10d)
Reviewed-on: https://gerrit.libreoffice.org/7973
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/download.lst b/download.lst
index 70671bc..1b14652 100644
--- a/download.lst
+++ b/download.lst
@@ -1,5 +1,5 @@
-ABW_MD5SUM := af3ccc1f1884e68389088d490d596409
-export ABW_TARBALL := libabw-0.0.1.tar.bz2
+ABW_MD5SUM := 40fa48e03b1e28ae0325cc34b35bc46d
+export ABW_TARBALL := libabw-0.0.2.tar.bz2
 CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112
 export CDR_TARBALL := libcdr-0.0.14.tar.bz2
 EBOOK_MD5SUM := 2f1ceaf2ac8752ed278e175447d9b978
diff --git a/external/libabw/UnpackedTarball_libabw.mk 
b/external/libabw/UnpackedTarball_libabw.mk
index 8e28755..6288b0e 100644
--- a/external/libabw/UnpackedTarball_libabw.mk
+++ b/external/libabw/UnpackedTarball_libabw.mk
@@ -11,10 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libabw))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libabw,$(ABW_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_add_patches,libabw,\
-   external/libabw/libabw-0.0.1-inttypes.patch.1 \
-   external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 \
-   external/libabw/libabw-0.0.1-badtable.patch.1 \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/libabw/libabw-0.0.1-badtable.patch.1 
b/external/libabw/libabw-0.0.1-badtable.patch.1
deleted file mode 100644
index ddb0c8f..000
--- a/external/libabw/libabw-0.0.1-badtable.patch.1
+++ /dev/null
@@ -1,100 +0,0 @@
 a/src/lib/ABWContentCollector.cpp
-+++ b/src/lib/ABWContentCollector.cpp
-@@ -1492,26 +1492,32 @@ void libabw::ABWContentCollector::closeTable()
- 
- void libabw::ABWContentCollector::openCell(const char *props)
- {
--  if (props)
--parsePropString(props, m_ps-m_tableStates.top().m_currentCellProperties);
--  int currentRow(0);
--  if (!findInt(_findCellProperty(top-attach), currentRow))
--currentRow = m_ps-m_tableStates.top().m_currentTableRow + 1;
--  while (m_ps-m_tableStates.top().m_currentTableRow  currentRow)
-+  if (!m_ps-m_tableStates.empty())
-   {
--if (m_ps-m_tableStates.top().m_currentTableRow = 0)
--  _closeTableRow();
--_openTableRow();
--  }
-+if (props)
-+  parsePropString(props, 
m_ps-m_tableStates.top().m_currentCellProperties);
-+int currentRow(0);
-+if (!findInt(_findCellProperty(top-attach), currentRow))
-+  currentRow = m_ps-m_tableStates.top().m_currentTableRow + 1;
-+while (m_ps-m_tableStates.top().m_currentTableRow  currentRow)
-+{
-+  if (m_ps-m_tableStates.top().m_currentTableRow = 0)
-+_closeTableRow();
-+  _openTableRow();
-+}
- 
--  if (!findInt(_findCellProperty(left-attach), 
m_ps-m_tableStates.top().m_currentTableCol))
--m_ps-m_tableStates.top().m_currentTableCol++;
-+if (!findInt(_findCellProperty(left-attach), 
m_ps-m_tableStates.top().m_currentTableCol))
-+  m_ps-m_tableStates.top().m_currentTableCol++;
-+  }
- }
- 
- void libabw::ABWContentCollector::closeCell()
- {
--  _closeTableCell();
--  m_ps-m_tableStates.top().m_currentCellProperties.clear();
-+  if (!m_ps-m_tableStates.empty())
-+  {
-+_closeTableCell();
-+m_ps-m_tableStates.top().m_currentCellProperties.clear();
-+  }
- }
- 
- void libabw::ABWContentCollector::collectData(const char *, const char *, 
const WPXBinaryData )
 a/src/lib/ABWStylesCollector.cpp
-+++ b/src/lib/ABWStylesCollector.cpp
-@@ -167,28 +167,32 @@ void libabw::ABWStylesCollector::closeTable()
- 
- void libabw::ABWStylesCollector::openCell(const char *props)
- {
--  if (props)
--parsePropString(props, m_ps-m_tableStates.top().m_currentCellProperties);
--  int currentRow(0);
--  if (!findInt(_findCellProperty(top-attach), currentRow))
--currentRow = m_ps-m_tableStates.top().m_currentTableRow + 1;
--  while (m_ps-m_tableStates.top().m_currentTableRow  currentRow)
--m_ps-m_tableStates.top().m_currentTableRow++;
--
--  if (!m_ps-m_tableStates.empty()  0 == 
m_ps-m_tableStates.top().m_currentTableRow)
-+  if (!m_ps-m_tableStates.empty())
-   {
--int leftAttach(0);
--int rightAttach(0);
--if (findInt(_findCellProperty(left-attach), leftAttach)  
findInt(_findCellProperty(right-attach), rightAttach))
--  m_ps-m_tableStates.top().m_currentTableWidth +=

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

2014-02-10 Thread Michael Stahl 
 sd/source/ui/unoidl/sddetect.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit e62339f856efa0b8ef03df3bf8b93e098c4ac0d3
Author: Michael Stahl mst...@redhat.com
Date:   Mon Feb 10 16:45:27 2014 +0100

fdo#73363: sd: fix mis-detection of Visio files as PPT

SdFilterDetect::detect() erroneously detects all binary MSO files, and
because the Visio types would be checked after PPT, Visio is pre-empted.

Change-Id: I6ec3647a508dc8d79b47bfff6de35ccae39416ee

diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 31043ca..f962b9c 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -372,6 +372,10 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence 
beans::PropertyValue  lDes
 else
 pFilter = SfxFilter::GetFilterByName( 
pFilterPowerPoint97);
 }
+else
+{
+pFilter = 0;
+}
 }
 else
 {
@@ -424,6 +428,10 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence 
beans::PropertyValue  lDes
 }
 }
 }
+else
+{
+pFilter = 0;
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2014-02-10 Thread Caolán McNamara 
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ba33cb1d84a67f6f87df711b82eb34716ed441b1
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 10 15:36:41 2014 +

Updated core
Project: help  a6e3e5ef597f1e429e6784e475c1a06b4265f08d

diff --git a/helpcontent2 b/helpcontent2
index 297543f..a6e3e5e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 297543fff266d60698d32021757ad9b419a9862c
+Subproject commit a6e3e5ef597f1e429e6784e475c1a06b4265f08d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - apple_remote/AppleRemote.m apple_remote/GlobalKeyboardDevice.m apple_remote/HIDRemoteControlDevice.m apple_remote/RemoteControlContainer.m apple_re

2014-02-10 Thread Herbert Dürr 
 apple_remote/AppleRemote.m|6 +++---
 apple_remote/GlobalKeyboardDevice.m   |2 +-
 apple_remote/HIDRemoteControlDevice.m |   16 
 apple_remote/RemoteControl.m  |   34 ++
 apple_remote/RemoteControlContainer.m |   12 ++--
 apple_remote/RemoteMainController.m   |6 +++---
 6 files changed, 39 insertions(+), 37 deletions(-)

New commits:
commit fe4ae4735c5a5e2b2210e684e97228cd91174e4c
Author: Herbert Dürr h...@apache.org
Date:   Mon Feb 10 14:36:17 2014 +

#i124201# mark debug-infos from the apple_remote module appropriately

to make the source of some log messages more clear

diff --git a/apple_remote/AppleRemote.m b/apple_remote/AppleRemote.m
index 85d9017..44369f7 100644
--- a/apple_remote/AppleRemote.m
+++ b/apple_remote/AppleRemote.m
@@ -59,7 +59,7 @@ const char* AppleRemoteDeviceName = AppleIRController;
if (floor(NSAppKitVersionNumber) = NSAppKitVersionNumber10_4) 
 {
 #ifdef DEBUG
-NSLog( @setting 10.4 cookies );
+NSLog( @Apple Remote: setting 10.4 cookies );
 #endif
 
// 10.4.x Tiger
@@ -78,7 +78,7 @@ const char* AppleRemoteDeviceName = AppleIRController;
 else if( floor(NSAppKitVersionNumber) = NSAppKitVersionNumber10_5 )
 {
 #ifdef DEBUG
-NSLog( @setting 10.5 cookies );
+NSLog( @Apple Remote: setting 10.5 cookies );
 #endif
// 10.5.x Leopard
[_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonPlus]forKey:@31_29_28_19_18_];
@@ -96,7 +96,7 @@ const char* AppleRemoteDeviceName = AppleIRController;
 else
 {
 #ifdef DEBUG
-NSLog( @setting 10.6 cookies );
+NSLog( @Apple Remote: setting OSX=10.6 cookies );
 #endif
 // 10.6.x Snow Leopard
 [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonPlus]   forKey:@33_31_30_21_20_2_];
diff --git a/apple_remote/GlobalKeyboardDevice.m 
b/apple_remote/GlobalKeyboardDevice.m
index 14bf558..9cc4739 100644
--- a/apple_remote/GlobalKeyboardDevice.m
+++ b/apple_remote/GlobalKeyboardDevice.m
@@ -111,7 +111,7 @@ static OSStatus hotKeyEventHandler(EventHandlerCallRef, 
EventRef, void*);
break;  
default: 
 #ifdef DEBUG
-   NSLog(@Unknown global keyboard defaults key for remote 
button identifier %d, remoteButtonIdentifier);
+   NSLog( @Apple Remote: Unknown global keyboard defaults 
key for button identifier %d, remoteButtonIdentifier);
 #endif
 break;
}
diff --git a/apple_remote/HIDRemoteControlDevice.m 
b/apple_remote/HIDRemoteControlDevice.m
index 9b52f47..f6bc848 100644
--- a/apple_remote/HIDRemoteControlDevice.m
+++ b/apple_remote/HIDRemoteControlDevice.m
@@ -274,7 +274,7 @@ cleanup:
/*
if (previousRemainingCookieString) {
cookieString = [previousRemainingCookieString 
stringByAppendingString: cookieString];
-   NSLog(@New cookie string is %@, cookieString);
+   NSLog( @Apple Remote: New cookie string is %@, cookieString);
[previousRemainingCookieString release], 
previousRemainingCookieString=nil;  
   
}*/
if (cookieString == nil || [cookieString length] == 0) return;
@@ -310,7 +310,7 @@ cleanup:
[self handleEventWithCookieString: lastSubCookieString 
sumOfValues:0];
}
if ([cookieString length]  0) {
-   NSLog(@Unknown button for cookiestring %@, cookieString);
+   NSLog( @Apple Remote: Unknown button for cookiestring %@, 
cookieString);
}   
}
 }
@@ -331,7 +331,7 @@ Will be called for any event of any type (cookie) to which 
we subscribe
 */
 static void QueueCallbackFunction(void* target,  IOReturn result, void* 
refcon, void* sender) {
if (target  0) {
-   NSLog(@QueueCallbackFunction called with invalid target!);
+   NSLog( @Apple Remote: QueueCallbackFunction called with 
invalid target!);
return;
}
NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -373,7 +373,7 @@ static void QueueCallbackFunction(void* target,  IOReturn 
result, void* refcon,
ioReturnValue = IOObjectGetClass(hidDevice, className);

if (ioReturnValue != kIOReturnSuccess) {
-   NSLog(@Error: Failed to get class name.);
+   NSLog( @Apple Remote: Error: Failed to get RemoteControlDevice 
class name.);
return NULL;
}

@@ -388,7 +388,7 @@ static void QueueCallbackFunction(void* target,  IOReturn 
result, void* refcon,
plugInResult = 
(*plugInInterface)-QueryInterface(plugInInterface,

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

2014-02-10 Thread Caolán McNamara 
 helpers/help_hid.lst   |   18 --
 source/text/scalc/01/0605.xhp  |   24 
 source/text/shared/02/14020100.xhp |   20 ++--
 3 files changed, 22 insertions(+), 40 deletions(-)

New commits:
commit a6e3e5ef597f1e429e6784e475c1a06b4265f08d
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 10 15:36:41 2014 +

update help ids for relationships table dialog .ui conversion

Change-Id: I962d7c8fe700a704cc87154024f126c78c365e92

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 3c01b07..f021fd2 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1,6 +1,5 @@
 ,,
 1,1,
-DLG_JOIN_TABADD,19214,
 FID_ADJUST_PRINTZOOM,26652,.uno:AdjustPrintZoom
 FID_APPLY_NAME,26274,.uno:ApplyNames
 FID_AUTOCOMPLETE,26319,.uno:AutoComplete
@@ -2211,9 +2210,6 @@ HID_IS_BTN_IMG8,41012,
 HID_IS_BTN_IMG9,41013,
 HID_IS_BTN_NONE,41002,
 HID_IS_BTN_OK,41003,
-HID_JOINSH_ADDTAB_CLOSE,38852,
-HID_JOINSH_ADDTAB_QUERYLIST,38857,
-HID_JOINSH_ADDTAB_TABLELIST,38853,
 HID_LETTER_PAGE1,53269,
 HID_LETTER_PAGE2,53270,
 HID_LETTER_PAGE3,53271,
@@ -5551,7 +5547,6 @@ 
dbaccess_PushButton_DLG_COLLECTION_VIEW_BTN_EXPLORERFILE_SAVE,1388761603,
 dbaccess_PushButton_DLG_DATASOURCE_SELECTION_PB_CREATE,1388384777,
 dbaccess_PushButton_DLG_DATASOURCE_SELECTION_PB_MANAGE,1388384773,
 dbaccess_PushButton_DLG_INDEXDESIGN_PB_CLOSE,1388630529,
-dbaccess_PushButton_DLG_JOIN_TABADD_PB_ADDTABLE,2462290433,
 dbaccess_PushButton_DLG_PARAMETERS_BT_TRAVELNEXT,1388401158,
 dbaccess_PushButton_PAGE_ADABAS_PB_STAT,851530241,
 dbaccess_PushButton_PAGE_CONNECTION_PB_TESTCONNECTION,851546626,
@@ -5565,8 +5560,6 @@ dbaccess_PushButton_TAB_WIZ_TYPE_SELECT_PB_AUTO,851612165,
 dbaccess_PushButton_TP_SAVE_DBDOC_AS_PB_BROWSE_SAVE_AS_LOCATION,851464705,
 dbaccess_PushButton_WIZ_RTFCOPYTABLE_PB_NEXT,1388581385,
 dbaccess_PushButton_WIZ_RTFCOPYTABLE_PB_PREV,1388581386,
-dbaccess_RadioButton_DLG_JOIN_TABADD_RB_CASE_QUERIES,2462286338,
-dbaccess_RadioButton_DLG_JOIN_TABADD_RB_CASE_TABLES,2462286337,
 dbaccess_RadioButton_PAGE_DBWIZARD_MYSQL_INTRO_RB_CONNECTVIANATIVE,852197893,
 dbaccess_RadioButton_PAGE_GENERAL_RB_OPENEXISTINGDOC,851444227,
 dbaccess_RadioButton_TAB_WIZ_COPYTABLE_RB_APPENDDATA,851640836,
diff --git a/source/text/shared/02/14020100.xhp 
b/source/text/shared/02/14020100.xhp
index c91d4f2..29a19db 100644
--- a/source/text/shared/02/14020100.xhp
+++ b/source/text/shared/02/14020100.xhp
@@ -31,28 +31,28 @@
 /bookmark
 bookmark xml-lang=en-US branch=hid/.uno:AddTable id=bm_id8385907 
localize=false/
 bookmark xml-lang=en-US branch=hid/.uno:AddTable id=bm_id3143284 
localize=false/
-bookmark xml-lang=en-US branch=hid/DBACCESS_HID_JOINSH_ADDTAB_TABLELIST 
id=bm_id3159224 localize=false/
+bookmark xml-lang=en-US branch=hid/dbaccess/ui/tablesjoindialog/tablelist 
id=bm_id3159224 localize=false/
 paragraph xml-lang=en-US id=hd_id3154788 role=heading level=1 
l10n=U oldref=1Add Tables/paragraph
-  paragraph xml-lang=en-US id=par_id3152821 role=paragraph l10n=U 
oldref=2variable id=tabellehinzufuegentextahelp 
hid=HID_JOINSH_ADDTAB_TABLELIST visibility=hiddenSpecifies the tables to 
be inserted into the design window./ahelp In theemph Add Tables 
/emphdialog, select the tables you need for your current task. 
+  paragraph xml-lang=en-US id=par_id3152821 role=paragraph l10n=U 
oldref=2variable id=tabellehinzufuegentextahelp 
hid=dbaccess/ui/tablesjoindialog/tablelist visibility=hiddenSpecifies the 
tables to be inserted into the design window./ahelp In theemph Add Tables 
/emphdialog, select the tables you need for your current task. 
 /variable When creating a query or a new table presentation, select the 
corresponding table to which the query or table presentation should refer. When 
working with relational databases, select the tables between which you want to 
build relationships./paragraph
   paragraph xml-lang=en-US id=par_id3149760 role=paragraph l10n=U 
oldref=15The inserted tables appear in a separate window in the query design 
or relational windows, along with a list of the fields contained in the table. 
You can determine the size and order of this window./paragraph
   section id=howtoget
  embed href=text/shared/00/0450.xhp#tabellehinzu/
   /section
   paragraph xml-lang=en-US id=hd_id3154927 role=heading level=2 
l10n=U oldref=5Table/paragraph
-bookmark xml-lang=en-US 
branch=hid/dbaccess:RadioButton:DLG_JOIN_TABADD:RB_CASE_TABLES 
id=bm_id0305200912070094 localize=false/
+bookmark xml-lang=en-US branch=hid/dbaccess/ui/tablesjoindialog/tables 
id=bm_id0305200912070094 localize=false/
 paragraph xml-lang=en-US id=par_id030520091208059 role=paragraph 
l10n=NEWahelp hid=. visibility=hiddenShows only 
tables./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/dbaccess:RadioButton:DLG_JOIN_TABADD:RB_CASE_QUERIES 
id=bm_id0305200912074475 localize=false/
+bookmark xml-lang=en-US

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

2014-02-10 Thread David Tardon 
 solenv/bin/uiimagelist.xsl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f1969530895e305b50d305eb2d7a755673f3b762
Author: David Tardon dtar...@redhat.com
Date:   Mon Feb 10 17:16:03 2014 +0100

handle icon_name property too

Change-Id: Idfdc24201b2d4cde0e451daf237d102c71a8b2f4

diff --git a/solenv/bin/uiimagelist.xsl b/solenv/bin/uiimagelist.xsl
index 41aefe3..3d14f8d 100644
--- a/solenv/bin/uiimagelist.xsl
+++ b/solenv/bin/uiimagelist.xsl
@@ -17,7 +17,7 @@
 
 xsl:template match=@*|text()|processing-instruction()|comment()/
 
-xsl:template match=property[@name='pixbuf']
+xsl:template match=property[@name='icon_name'] | 
property[@name='pixbuf']
 xsl:variable name=inpath select=normalize-space(.)/
 xsl:variable name=outpath
 xsl:choose
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - solenv/gbuild

2014-02-10 Thread Bjoern Michaelsen 
 solenv/gbuild/extensions/post_PackageInfo.mk |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 519def2ae0ffeb210e7309a368508e03f815c650
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Feb 4 17:42:03 2014 +0100

adjust PackageInfo for zip files

see commit 7fe9808f009af2f0a4da58663eacd2caccdcaafe for reference

Change-Id: I060021150f8ef976ffeb417b18dda31367e549b8
Reviewed-on: https://gerrit.libreoffice.org/7975
Reviewed-by: Matúš Kukan matus.ku...@collabora.com
Tested-by: Matúš Kukan matus.ku...@collabora.com

diff --git a/solenv/gbuild/extensions/post_PackageInfo.mk 
b/solenv/gbuild/extensions/post_PackageInfo.mk
index 54d6c5f..aa16e0d 100644
--- a/solenv/gbuild/extensions/post_PackageInfo.mk
+++ b/solenv/gbuild/extensions/post_PackageInfo.mk
@@ -54,8 +54,8 @@ define gb_PackageInfo_emit_l10n_for_one_ressource
 
 endef
 
-define gb_PackageInfo_emit_l10n_for_one_uifile
-@echo $(gb_UIConfig_INSTDIR)/$(2)/ui/res/$(1)/$(3)  
$(gb_PackageInfo_get_target)/l10n-$(1).files
+define gb_PackageInfo_emit_l10n_for_one_uizip
+@echo $(gb_UIConfig_INSTDIR)/$(2)/ui/res/$(1).zip  
$(gb_PackageInfo_get_target)/l10n-$(1).files
 
 endef
 
@@ -68,7 +68,9 @@ define gb_PackageInfo_emit_l10n_for_one_lang
 @touch $(foreach suf,executables libraries 
files,$(gb_PackageInfo_get_target)/l10n-$(1).$(suf))
 $(if $(filter-out qtz en-US,$(1)),$(foreach packagedir,$(patsubst 
%/,%,$(gb_AllLangPackage_ALLDIRS)),$(call 
gb_PackageInfo_emit_l10n_for_one_alllangpackage,$(packagedir),$(1
 $(if $(filter $(gb_AllLangResTarget_LANGS),$(1)),$(foreach 
target,$(gb_AllLangResTarget_ALLTARGETS),$(call 
gb_PackageInfo_emit_l10n_for_one_ressource,$(target),$(1
-$(foreach uifile,$(gb_UIConfig_ALLFILES),$(call 
gb_PackageInfo_emit_l10n_for_one_uifile,$(1),$(firstword $(subst 
:,$(WHITESPACE),$(uifile))),$(lastword $(subst :,$(WHITESPACE),$(uifile)
+$(foreach uizip,\
+$(sort $(foreach uifile,$(gb_UIConfig_ALLFILES),$(firstword $(subst 
:,$(WHITESPACE),$(uifile),\
+$(call gb_PackageInfo_emit_l10n_for_one_uizip,$(1),$(uizip)))
 $(if $(filter $(gb_Configuration_LANGS),$(1)),$(foreach configfile,Langpack- 
res/fcfg_langpack_ res/registry_,$(call 
gb_PackageInfo_emit_l10n_for_one_configfile,$(1),$(configfile
 
 endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Minutes of ESC call

2014-02-10 Thread Caolán McNamara 
On Fri, 2014-02-07 at 11:07 -0800, bfoman wrote:
 Jan Holesovsky-4 wrote
  * Crash reporter (Caolan)
  + probably let's kill that for now, and if there is interest in
  resurrecting it, let's
revert that / bring it back from history? [Kendy]
  + yes [Caolan]
  + not needed on Linux anyway, distros do it differently [Miklos]

I have removed the existing 4 or 5 tabpages which are not visible in the
product but which are blockers to completing the removal of the old
style dialogs.

That is neither pro or against automated crash collection or reporting
in general. It's just setting out that if we go down that route and need
new dialogs then they'll have to be written in the new .ui format and
not reuse the out of date hidden .src ones.

 I think that having integrated multi-platform (Windows, Mac, Linux) crash
 reporting central system, together with public statistical UI, on TDF infra,
 would be a next big milestone for a QA efforts.

All of which sounds good, but in the interim one could mine the
publically available crash info from e.g.
http://retrace.fedoraproject.org/ and the other distros where equivalent
is available and e.g. determine the top 3 or so biggies and determine
reproducible scenarios for them.

C.

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

[RESOLVED] Re: Update on patch

2014-02-10 Thread Caolán McNamara 
On Sat, 2014-02-08 at 17:18 +0530, Rachit Gupta wrote:
 I posted an update on my patch 7 days ago, but i am yet to receive any
 update/reply on the same. Can someone please take a look at it?
 
 
 Gerrit link: https://gerrit.libreoffice.org/#/c/7514

As far as I can see, this got resolved on the 8th.

C.


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

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

2014-02-10 Thread Herbert Dürr 
 apple_remote/source/AppleRemote.m|2 -
 apple_remote/source/GlobalKeyboardDevice.m   |2 -
 apple_remote/source/HIDRemoteControlDevice.m |   16 ++--
 apple_remote/source/RemoteControl.m  |   34 ++-
 apple_remote/source/RemoteControlContainer.m |   12 -
 apple_remote/source/RemoteMainController.m   |6 ++--
 6 files changed, 37 insertions(+), 35 deletions(-)

New commits:
commit 9d5841aa433ee325b702c3a8c4c8784052e09b3a
Author: Herbert Dürr h...@apache.org
Date:   Mon Feb 10 14:36:17 2014 +

Resolved: #i124201# mark debug-infos from the apple_remote...

module appropriately

to make the source of some log messages more clear

(cherry picked from commit fe4ae4735c5a5e2b2210e684e97228cd91174e4c)

Conflicts:
apple_remote/AppleRemote.m
apple_remote/source/HIDRemoteControlDevice.m
apple_remote/source/RemoteControl.m
apple_remote/source/RemoteControlContainer.m

Change-Id: Ie57114f4d2d67f258808d03e01dff8bc05ba9f2c

diff --git a/apple_remote/source/AppleRemote.m 
b/apple_remote/source/AppleRemote.m
index 120297e..8f1b2ce 100644
--- a/apple_remote/source/AppleRemote.m
+++ b/apple_remote/source/AppleRemote.m
@@ -49,7 +49,7 @@ const char* AppleRemoteDeviceName = AppleIRController;
 
 // TODO : avoid such magics 
 #ifdef DEBUG
-NSLog( @setting 10.6 cookies );
+NSLog( @Apple Remote: setting 10.6 cookies );
 #endif
 // 10.6.x Snow Leopard
 [_cookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonPlus]   forKey:@33_31_30_21_20_2_];
diff --git a/apple_remote/source/GlobalKeyboardDevice.m 
b/apple_remote/source/GlobalKeyboardDevice.m
index 27322d2..f5ecb1f 100644
--- a/apple_remote/source/GlobalKeyboardDevice.m
+++ b/apple_remote/source/GlobalKeyboardDevice.m
@@ -112,7 +112,7 @@ static OSStatus hotKeyEventHandler(EventHandlerCallRef, 
EventRef, void*);
break;
default:
 #ifdef DEBUG
-   NSLog(@Unknown global keyboard defaults key for remote 
button identifier %d, remoteButtonIdentifier);
+   NSLog( @Apple Remote: Unknown global keyboard defaults 
key for button identifier %d, remoteButtonIdentifier);
 #endif
 break;
}
diff --git a/apple_remote/source/HIDRemoteControlDevice.m 
b/apple_remote/source/HIDRemoteControlDevice.m
index c7c6263..cffcfa0 100644
--- a/apple_remote/source/HIDRemoteControlDevice.m
+++ b/apple_remote/source/HIDRemoteControlDevice.m
@@ -279,7 +279,7 @@ cleanup:
/*
if (previousRemainingCookieString) {
cookieString = [previousRemainingCookieString 
stringByAppendingString: cookieString];
-   NSLog(@New cookie string is %@, cookieString);
+   NSLog( @Apple Remote: New cookie string is %@, cookieString);
[previousRemainingCookieString release], 
previousRemainingCookieString=nil;
}*/
if (cookieString == nil || [cookieString length] == 0) return;
@@ -315,7 +315,7 @@ cleanup:
[self handleEventWithCookieString: lastSubCookieString 
sumOfValues:0];
}
if ([cookieString length]  0) {
-   NSLog(@Unknown button for cookiestring %@, 
cookieString);
+   NSLog( @Apple Remote: Unknown button for cookiestring 
%@, cookieString);
}
}
 }
@@ -339,7 +339,7 @@ static void QueueCallbackFunction(void* target,  IOReturn 
result, void* refcon,
 (void)refcon;
 (void)sender;
if ((intptr_t)target  0) {
-   NSLog(@QueueCallbackFunction called with invalid target!);
+   NSLog( @Apple Remote: QueueCallbackFunction called with 
invalid target!);
return;
}
NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -381,7 +381,7 @@ static void QueueCallbackFunction(void* target,  IOReturn 
result, void* refcon,
ioReturnValue = IOObjectGetClass(hidDevice, className);
 
if (ioReturnValue != kIOReturnSuccess) {
-   NSLog(@Error: Failed to get class name.);
+   NSLog( @Apple Remote: Error: Failed to get RemoteControlDevice 
class name.);
return NULL;
}
 
@@ -396,7 +396,7 @@ static void QueueCallbackFunction(void* target,  IOReturn 
result, void* refcon,
plugInResult = 
(*plugInInterface)-QueryInterface(plugInInterface, 
CFUUIDGetUUIDBytes(kIOHIDDeviceInterfaceID), (LPVOID) hidDeviceInterface);
 
if (plugInResult != S_OK) {
-   NSLog(@Error: Couldn't create HID class device 
interface);
+   NSLog( @Apple Remote: Error: Couldn't create HID class 
device interface);
}
// Release
if (plugInInterface) 
(*plugInInterface)-Release(plugInInterface);
@@ -489,13 +489,13 @@ static void

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - fe/4ae4735c5a5e2b2210e684e97228cd91174e4c

2014-02-10 Thread Caolán McNamara 
 fe/4ae4735c5a5e2b2210e684e97228cd91174e4c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 95164b7bd4ebd61e1475b0081956a6366085f4c8
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 10 16:37:08 2014 +

Notes added by 'git notes add'

diff --git a/fe/4ae4735c5a5e2b2210e684e97228cd91174e4c 
b/fe/4ae4735c5a5e2b2210e684e97228cd91174e4c
new file mode 100644
index 000..a2f3d14
--- /dev/null
+++ b/fe/4ae4735c5a5e2b2210e684e97228cd91174e4c
@@ -0,0 +1 @@
+merged as: 9d5841aa433ee325b702c3a8c4c8784052e09b3a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Chris Sherlock 
 vcl/source/gdi/outdev.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6551fe2d93ed1deeecfa1de7306d5950b4453712
Author: Chris Sherlock chris.sherloc...@gmail.com
Date:   Mon Feb 10 19:49:41 2014 +1100

fdo#39468 translated German comment in outdev.cxx

German comment about clipping backup translated in function
OutputDevice::ImplInitClipRegion().

Change-Id: I55c3b5899ae36a2e25204fd054b80bd786b17e91
Reviewed-on: https://gerrit.libreoffice.org/7966
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index dd7f733..485ebb2 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -895,7 +895,7 @@ void OutputDevice::ImplInitClipRegion()
 Window* pWindow = (Window*)this;
 Region  aRegion;
 
-// Hintergrund-Sicherung zuruecksetzen
+// Put back backed up background
 if ( pWindow-mpWindowImpl-mpFrameData-mpFirstBackWin )
 pWindow-ImplInvalidateAllOverlapBackgrounds();
 if ( pWindow-mpWindowImpl-mbInPaint )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Joren De Cuyper 
 vcl/source/app/settings.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bd37c63eff9eb4a263d43f84431cb2c32f32908b
Author: Joren De Cuyper jore...@libreoffice.org
Date:   Mon Feb 10 16:14:26 2014 +0100

Correct comment: we can select icon theme in LibreOffice - View

Change-Id: I692e9d6037b2fa5a9f69069177b6d9925661ec60
Reviewed-on: https://gerrit.libreoffice.org/7974
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 3f07a2b..3f5c9c7 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -621,7 +621,7 @@ void StyleSettings::SetCheckedColorSpecialCase( )
 
 sal_uLong StyleSettings::GetCurrentSymbolsStyle() const
 {
-// style selected in Tools - Options... - OpenOffice.org - View
+// style selected in Tools - Options... - LibreOffice - View
 sal_uLong nStyle = GetSymbolsStyle();
 
 if ( nStyle == STYLE_SYMBOLS_AUTO || ( !CheckSymbolStyle (nStyle) ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Joren De Cuyper 
 sfx2/source/doc/templatedlg.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 9c9a9708dd6115f9619cf66daa99f2470a8f9d4e
Author: Joren De Cuyper jore...@libreoffice.org
Date:   Mon Feb 10 11:26:19 2014 +0100

fdo#74782 search view doesn't hide local view when searching first time

See bug report for screenshot of current behavior.
When the search button is hit, OnTemplateSearch() is called.
If we switch from 'no search' to 'search' view, mpSearchView was not hidden.
This'll result in SearchUpdateHdl that mpCurView will not hide.

It doesn't matter if we hide it anyway (either when we would start 
searching,
or end searching). If we start searching, we don't have any search term yet
(so no result anyway). If we stop searching, it has to be hidden for sure.

Change-Id: I6bcf540b4866eeb6a8196c171027b385635cf084
Reviewed-on: https://gerrit.libreoffice.org/7969
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index df996fc..935d62d 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -748,6 +748,7 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg, SearchUpdateHdl)
 }
 else
 {
+mpSearchView-deselectItems();
 mpSearchView-Hide();
 mpCurView-Show();
 }
@@ -1055,11 +1056,14 @@ void SfxTemplateManagerDlg::OnTemplateSearch ()
 mpActionBar-SetItemState(mpActionBar-GetItemId(ACTIONBAR_SEARCH),
 bVisible? STATE_NOCHECK: STATE_CHECK);
 
+// fdo#74782 We are switching views. No matter to which state,
+// deselect and hide our current SearchView items.
+mpSearchView-deselectItems();
+mpSearchView-Hide();
+
 // Hide search view
 if (bVisible)
 {
-mpSearchView-deselectItems();
-mpSearchView-Hide();
 mpCurView-Show();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/crystal icon-themes/galaxy icon-themes/hicontrast icon-themes/human icon-themes/industrial icon-themes/oxygen icon-themes/tango icon-themes/tango_testing

2014-02-10 Thread Rodolfo Ribeiro Gomes 
 dev/null  |binary
 icon-themes/crystal/cmd/lc_zoomoptimal.png|binary
 icon-themes/crystal/cmd/sc_zoomoptimal.png|binary
 icon-themes/human/cmd/lc_zoomoptimal.png  |binary
 icon-themes/human/cmd/sc_zoomoptimal.png  |binary
 icon-themes/industrial/cmd/lc_zoomoptimal.png |binary
 icon-themes/industrial/cmd/lc_zoomoptimal.xcf.bz2 |binary
 icon-themes/industrial/cmd/sc_zoomoptimal.png |binary
 icon-themes/oxygen/cmd/lc_zoomoptimal.png |binary
 icon-themes/oxygen/cmd/sc_zoomoptimal.png |binary
 icon-themes/tango/cmd/lc_zoomoptimal.png  |binary
 icon-themes/tango/cmd/lc_zoomoptimal.xcf.bz2  |binary
 icon-themes/tango_testing/cmd/lc_zoomoptimal.png  |binary
 13 files changed

New commits:
commit aee6ad3022b4ba4a19e13cad81ab974ef4ba1724
Author: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Date:   Fri May 31 07:52:55 2013 -0300

Remove unused icons after cleaning up Math zoom

After commit ffc2e5be1f712b09710e2096ad2f7eb81b80118d ,
these deleted icons are useless since other UNO commands are used instead:
  View050 - Zoom50Percent
  View100 - Zoom100Percent
  View200 - Zoom200Percent
  Adjust  - ZoomOptimal
  FitInWindow - ZoomOptimal

Sorry I forgot to remove then in that commit.

Note: As UNO command now is 'zoomoptimal' instead of 'adjust' and
people feel 'adjust' icon better, I deleted the disliked 'zoomoptimal'
icons and renamed 'adjust' icons to it.

Change-Id: I141f2c4ad2f63928efb15faa5f68bc9c6dabc144
Signed-off-by: Rodolfo Ribeiro Gomes rodolf...@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/4117
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/icon-themes/crystal/cmd/lc_view100.png 
b/icon-themes/crystal/cmd/lc_view100.png
deleted file mode 100644
index cc8ce15..000
Binary files a/icon-themes/crystal/cmd/lc_view100.png and /dev/null differ
diff --git a/icon-themes/crystal/cmd/lc_adjust.png 
b/icon-themes/crystal/cmd/lc_zoomoptimal.png
similarity index 100%
rename from icon-themes/crystal/cmd/lc_adjust.png
rename to icon-themes/crystal/cmd/lc_zoomoptimal.png
diff --git a/icon-themes/crystal/cmd/sc_view100.png 
b/icon-themes/crystal/cmd/sc_view100.png
deleted file mode 100644
index 8709d0a..000
Binary files a/icon-themes/crystal/cmd/sc_view100.png and /dev/null differ
diff --git a/icon-themes/crystal/cmd/sc_adjust.png 
b/icon-themes/crystal/cmd/sc_zoomoptimal.png
similarity index 100%
rename from icon-themes/crystal/cmd/sc_adjust.png
rename to icon-themes/crystal/cmd/sc_zoomoptimal.png
diff --git a/icon-themes/galaxy/cmd/lc_adjust.png 
b/icon-themes/galaxy/cmd/lc_adjust.png
deleted file mode 100644
index 228d958..000
Binary files a/icon-themes/galaxy/cmd/lc_adjust.png and /dev/null differ
diff --git a/icon-themes/galaxy/cmd/lc_view100.png 
b/icon-themes/galaxy/cmd/lc_view100.png
deleted file mode 100644
index 2f00d91..000
Binary files a/icon-themes/galaxy/cmd/lc_view100.png and /dev/null differ
diff --git a/icon-themes/galaxy/cmd/sc_adjust.png 
b/icon-themes/galaxy/cmd/sc_adjust.png
deleted file mode 100644
index d9d1a66..000
Binary files a/icon-themes/galaxy/cmd/sc_adjust.png and /dev/null differ
diff --git a/icon-themes/galaxy/cmd/sc_view100.png 
b/icon-themes/galaxy/cmd/sc_view100.png
deleted file mode 100644
index bfd1a58..000
Binary files a/icon-themes/galaxy/cmd/sc_view100.png and /dev/null differ
diff --git a/icon-themes/hicontrast/cmd/lc_adjust.png 
b/icon-themes/hicontrast/cmd/lc_adjust.png
deleted file mode 100644
index 60765d6..000
Binary files a/icon-themes/hicontrast/cmd/lc_adjust.png and /dev/null differ
diff --git a/icon-themes/hicontrast/cmd/lc_view100.png 
b/icon-themes/hicontrast/cmd/lc_view100.png
deleted file mode 100644
index 33af72d..000
Binary files a/icon-themes/hicontrast/cmd/lc_view100.png and /dev/null differ
diff --git a/icon-themes/hicontrast/cmd/sc_adjust.png 
b/icon-themes/hicontrast/cmd/sc_adjust.png
deleted file mode 100644
index fdaabf5..000
Binary files a/icon-themes/hicontrast/cmd/sc_adjust.png and /dev/null differ
diff --git a/icon-themes/hicontrast/cmd/sc_view100.png 
b/icon-themes/hicontrast/cmd/sc_view100.png
deleted file mode 100644
index 2254149..000
Binary files a/icon-themes/hicontrast/cmd/sc_view100.png and /dev/null differ
diff --git a/icon-themes/human/cmd/lc_adjust.png 
b/icon-themes/human/cmd/lc_adjust.png
deleted file mode 100644
index 4beea80..000
Binary files a/icon-themes/human/cmd/lc_adjust.png and /dev/null differ
diff --git a/icon-themes/human/cmd/lc_view100.png 
b/icon-themes/human/cmd/lc_view100.png
deleted file mode 100644
index 2c52084..000
Binary files a/icon-themes/human/cmd/lc_view100.png and /dev/null differ
diff --git a/icon-themes/human/cmd/lc_zoomoptimal.png 
b/icon-themes/human/cmd/lc_zoomoptimal.png
index 575284b..4beea80

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

2014-02-10 Thread Joren De Cuyper 
 sfx2/source/doc/templatedlg.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8d041e05d3bacc32532dc716e677688e1c71bb2d
Author: Joren De Cuyper jore...@libreoffice.org
Date:   Sun Feb 9 23:49:21 2014 +0100

related fdo#65430: forgot to 'unlink' setOpenTemplateHdl

This was introduced in 96e7225260aac0815643a4043f4ddb4e6b5764a1

Change-Id: I9bb8abbc9e9167b1e43bebf4477cf73010bf2d92
Reviewed-on: https://gerrit.libreoffice.org/7958
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 935d62d..d7899ee 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -315,6 +315,7 @@ SfxTemplateManagerDlg::~SfxTemplateManagerDlg ()
 mpRemoteView-setOpenTemplateHdl(Link());
 
 mpSearchView-setItemStateHdl(Link());
+mpSearchView-setOpenTemplateHdl(Link());
 }
 
 void SfxTemplateManagerDlg::setSaveMode()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Alexander Wilms 
 sw/source/core/docnode/nodes.cxx  |6 +-
 sw/source/core/edit/autofmt.cxx   |2 
 sw/source/core/edit/edglss.cxx|2 
 sw/source/core/fields/dbfld.cxx   |2 
 sw/source/core/fields/expfld.cxx  |2 
 sw/source/core/fields/reffld.cxx  |   13 ++---
 sw/source/core/inc/UndoInsert.hxx |2 
 sw/source/core/inc/flyfrms.hxx|2 
 sw/source/core/inc/layact.hxx |   40 
 sw/source/core/inc/swfont.hxx |   94 +++---
 sw/source/core/inc/tabfrm.hxx |   17 +++---
 11 files changed, 90 insertions(+), 92 deletions(-)

New commits:
commit 8314374293749dea65bf91da40a742ddeb404275
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date:   Sat Feb 8 12:26:43 2014 +0100

Translated some German comments

Change-Id: Id8a4db32d0fe95ecf543fcfc82fd6b236d544616
Reviewed-on: https://gerrit.libreoffice.org/7948
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index de7685c..30c83fe 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -1345,7 +1345,7 @@ sal_Bool SwNodes::CheckNodesRange( const SwNodeIndex 
rStt, const SwNodeIndex r
 if( TstIdx( nStt, nEnd, pEndOfRedlines-StartOfSectionIndex(),
 pEndOfRedlines-GetIndex() )) return sal_True;
 
-return sal_False;   // liegt irgendwo dazwischen, FEHLER
+return sal_False;   // is somewhere in the middle, ERROR
 }
 
 /** Delete a number of nodes
@@ -2092,9 +2092,9 @@ SwNode* SwNodes::FindPrvNxtFrmNode( SwNodeIndex rFrmIdx,
 // search forward or backward for a content node
 else if( 0 != ( pFrmNd = GoPrevSection( aIdx, true, false )) 
 ::CheckNodesRange( aIdx, rFrmIdx, true ) 
-// nach vorne nie aus der Tabelle hinaus!
+// Never out of the table at the start
 pFrmNd-FindTableNode() == pTableNd 
-// Bug 37652: nach hinten nie aus der Tabellenzelle hinaus!
+// Bug 37652: Never out of the table at the end
 (!pFrmNd-FindTableNode() || 
pFrmNd-FindTableBoxStartNode()
 == pSttNd-FindTableBoxStartNode() ) 
  (!pSectNd || pSttNd-IsSectionNode() ||
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 92bcfc0..1e69917 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -1238,7 +1238,7 @@ void SwAutoFormat::DelPrevPara()
 SwTxtNode* pTNd = m_aDelPam.GetNode()-GetTxtNode();
 if( pTNd )
 {
-// erstmal den vorherigen Textnode benutzen.
+// use the previous text node first
 m_aDelPam.GetPoint()-nContent.Assign(pTNd, 
pTNd-GetTxt().getLength());
 DeleteSel( m_aDelPam );
 }
diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx
index 5bb7440..ac634cf 100644
--- a/sw/source/core/edit/edglss.cxx
+++ b/sw/source/core/edit/edglss.cxx
@@ -135,7 +135,7 @@ sal_uInt16 SwEditShell::SaveGlossaryDoc( SwTextBlocks 
rBlock,
 SwPaM aCpyPam( *pNd );
 aCpyPam.SetMark();
 
-// dann bis zum Ende vom Nodes Array
+// then until the end of the nodes array
 aCpyPam.GetPoint()-nNode = 
pMyDoc-GetNodes().GetEndOfContent().GetIndex()-1;
 pCntntNd = aCpyPam.GetCntntNode();
 aCpyPam.GetPoint()-nContent.Assign( pCntntNd, pCntntNd-Len() );
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index 0a16277..a59cdf1 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -665,7 +665,7 @@ void SwDBNumSetField::Evaluate(SwDoc* pDoc)
 
 if( bCondValid  pMgr  pMgr-IsInMerge() 
 pMgr-IsDataSourceOpen(aTmpData.sDataSource, 
aTmpData.sCommand, sal_True))
-{   // Bedingug OK - aktuellen Set einstellen
+{   // condition OK - adjust current Set
 pMgr-ToRecordId(std::max((sal_uInt16)aPar2.toInt32(), 
sal_uInt16(1))-1);
 }
 }
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index d7e49ad..c7d2507 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -608,7 +608,7 @@ void SwSetExpFieldType::SetChapter( SwSetExpField rFld, 
const SwNode rNd )
 {
 const SwNodeNum  aNum = *(pTxtNd-GetNum());
 
-// nur die Nummer besorgen, ohne Pre-/Post-fixstrings
+// only get the number, without pre-/post-fixstrings
 OUString sNumber( pRule-MakeNumString(aNum, sal_False ));
 
 if( !sNumber.isEmpty() )
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 496669d..e9ca3e9 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx

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

2014-02-10 Thread Joren De Cuyper 
 sfx2/source/doc/templatedlg.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2b81559c7a271e130500380a455cddfa841752c3
Author: Joren De Cuyper jore...@libreoffice.org
Date:   Sun Feb 9 23:49:21 2014 +0100

related fdo#65430: forgot to 'unlink' setOpenTemplateHdl

This was introduced in 96e7225260aac0815643a4043f4ddb4e6b5764a1

Conflicts:
sfx2/source/doc/templatedlg.cxx

Change-Id: I9bb8abbc9e9167b1e43bebf4477cf73010bf2d92
Reviewed-on: https://gerrit.libreoffice.org/7959
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 08608aa..07c054f 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -293,6 +293,7 @@ SfxTemplateManagerDlg::~SfxTemplateManagerDlg ()
 mpRemoteView-setOpenTemplateHdl(Link());
 
 mpSearchView-setItemStateHdl(Link());
+mpSearchView-setOpenTemplateHdl(Link());
 
 delete mpSearchEdit;
 delete mpViewBar;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Joren De Cuyper 
 sfx2/source/doc/templatedlg.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 02aa4f5d3110001da5514d5a308ba77f1b7dd421
Author: Joren De Cuyper jore...@libreoffice.org
Date:   Sun Feb 9 23:49:21 2014 +0100

related fdo#65430: forgot to 'unlink' setOpenTemplateHdl

This was introduced in 96e7225260aac0815643a4043f4ddb4e6b5764a1

Conflicts:
sfx2/source/doc/templatedlg.cxx

Change-Id: I9bb8abbc9e9167b1e43bebf4477cf73010bf2d92
Reviewed-on: https://gerrit.libreoffice.org/7960
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index e6e464c..7032914 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -288,6 +288,7 @@ SfxTemplateManagerDlg::~SfxTemplateManagerDlg ()
 mpRemoteView-setOpenTemplateHdl(Link());
 
 mpSearchView-setItemStateHdl(Link());
+mpSearchView-setOpenTemplateHdl(Link());
 
 delete mpSearchEdit;
 delete mpViewBar;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Alexander Wilms 
 sfx2/uiconfig/ui/managestylepage.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2eea96c702a44ab009743b0d22ef639127f0b57b
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date:   Sat Feb 8 01:59:46 2014 +0100

Linked with - Inherit from in style dialog

Change-Id: I3ca5f297217c898a12375f7f8e9c57841cd3db84
Reviewed-on: https://gerrit.libreoffice.org/7941
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sfx2/uiconfig/ui/managestylepage.ui 
b/sfx2/uiconfig/ui/managestylepage.ui
index 551f2d3..6835793 100644
--- a/sfx2/uiconfig/ui/managestylepage.ui
+++ b/sfx2/uiconfig/ui/managestylepage.ui
@@ -67,7 +67,7 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=xalign0/property
-property name=label translatable=yesLinked 
with/property
+property name=label translatable=yesInherit 
from/property
 property name=use_underlineTrue/property
 property name=mnemonic_widgetlinkedwith/property
   /object
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Eike Rathke 
 sc/source/core/data/table1.cxx |   12 +++-
 1 file changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 6c5acfbefddeca1b2336cdc4158ec6e6f2a46858
Author: Eike Rathke er...@redhat.com
Date:   Mon Feb 10 18:22:27 2014 +0100

do not loop 30 million cells to find a non-empty row

If for whatever reason an AutoFilter area was setup to extend down to,
for example, row 1048559 but the actual last data row is 15817, with 27
columns it took ScTable::GetDataArea() to look at 27884034 cells to find
the last non-empty data row ...

Change-Id: Ic8cbebe7ddf9b23c8edb55c4821d8a4c69e8b75d

diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index b3385a3..22da0ae 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -898,15 +898,9 @@ void ScTable::GetDataArea( SCCOL rStartCol, SCROW 
rStartRow, SCCOL rEndCol, S
 {
 if ( !bBottom  rEndRow  0  rStartRow  rEndRow )
 {
-bool shrink = true;
-do
-{
-for ( SCCOL i = rStartCol; i=rEndCol  shrink; i++)
-if (aCol[i].HasDataAt(rEndRow))
-shrink = false;
-if (shrink)
---rEndRow;
-}while( shrink  rEndRow  0  rStartRow  rEndRow );
+SCROW nLastDataRow = GetLastDataRow( rStartCol, rEndCol, rEndRow);
+if (nLastDataRow = 0  rStartRow = nLastDataRow  nLastDataRow 
 rEndRow)
+rEndRow = nLastDataRow;
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Tomaž Vajngerl 
 oox/source/export/drawingml.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit d505d2ef49a8aadb24cd254bffbf1a6b549b282c
Author: Tomaž Vajngerl qui...@gmail.com
Date:   Mon Feb 10 18:49:03 2014 +0100

Werror=maybe-uninitialized in drawingml export

Change-Id: Ib04a464483c43a999db82bfaa539193c526d5041

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 22a1d97..0058aa7 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -204,10 +204,11 @@ void DrawingML::WriteColorTransformations( Sequence 
PropertyValue  aTransforma
 for( sal_Int32 i = 0; i  aTransformations.getLength(); i++ )
 {
 sal_Int32 nToken = Color::getColorTransformationToken( 
aTransformations[i].Name );
-sal_Int32 nValue; aTransformations[i].Value = nValue;
-
-if( nToken != XML_TOKEN_INVALID )
+if( nToken != XML_TOKEN_INVALID  
aTransformations[i].Value.hasValue() )
+{
+sal_Int32 nValue = aTransformations[i].Value.getsal_Int32();
 mpFS-singleElementNS( XML_a, nToken, XML_val, I32S( nValue ), 
FSEND );
+}
 }
 }
 
@@ -239,10 +240,9 @@ void DrawingML::WriteSolidFill( OUString sSchemeName, 
sal_Int32 nAlpha )
 void DrawingML::WriteSolidFill( Reference XPropertySet  rXPropSet )
 {
 // get fill color
-sal_uInt32 nFillColor;
 if ( !GetProperty( rXPropSet, FillColor ) )
 return;
-mAny = nFillColor;
+sal_uInt32 nFillColor = mAny.getsal_uInt32();
 
 // get InteropGrabBag and search the relevant attributes
 OUString sColorFillScheme;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 70414] create VSProject files for code editing in MSVS from gbuild

2014-02-10 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=70414

Commit Notification libreoffice-comm...@lists.freedesktop.org changed:

   What|Removed |Added

 Whiteboard|EasyHack|EasyHack
   |DifficultyInteresting   |DifficultyInteresting
   |SkillScript target:4.2.0|SkillScript target:4.2.0
   ||target:4.3.0

--- Comment #8 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Honza Havliček committed a patch related to this issue.
It has been pushed to master:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=2e2303a3e2904735cf7da416ec79e107785106f4

fdo#70414 Added generator of VS2012 project files



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
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: bin/gbuild-to-ide Makefile.in

2014-02-10 Thread Honza Havlíček 
 Makefile.in   |1 
 bin/gbuild-to-ide |  232 ++
 2 files changed, 233 insertions(+)

New commits:
commit 2e2303a3e2904735cf7da416ec79e107785106f4
Author: Honza Havlíček havlicek.ho...@gmail.com
Date:   Sun Feb 9 20:58:46 2014 +0100

fdo#70414 Added generator of VS2012 project files

Change-Id: Ib087a24ae6de049ffb6d93b5ac66452700edddb3
Reviewed-on: https://gerrit.libreoffice.org/7955
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com

diff --git a/Makefile.in b/Makefile.in
index ec45b51..f7c06c3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -336,6 +336,7 @@ endef
 
 $(foreach ide,\
kdevelop \
+   vs2012 \
xcode, \
 $(eval $(call gb_Top_GbuildToIdeIntegration,$(ide
 
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 6a7e7f0..4fa6bd7 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -14,6 +14,8 @@ import os.path
 import shutil
 import re
 import sys
+import uuid
+import xml.etree.ElementTree as ET
 
 
 class GbuildParserState:
@@ -32,6 +34,9 @@ class GbuildLinkTarget:
 def short_name(self):
 return self.name
 
+def is_empty(self):
+return not self.include and not self.defs and not self.cxxobjects and 
not self.linked_libs
+
 def __str__(self):
 return '%s at %s with include path: %s, defines %s, objects: %s and 
linked libs: %s' % (
 self.short_name(), self.location, self.include, self.defs, 
self.cxxobjects, self.linked_libs)
@@ -44,6 +49,9 @@ class GbuildLib(GbuildLinkTarget):
 def short_name(self):
 return 'Library %s' % self.name
 
+def target(self):
+return 'Library_%s' % self.name
+
 
 class GbuildExe(GbuildLinkTarget):
 def __init__(self, name, location, include, defs, cxxobjects, linked_libs):
@@ -52,12 +60,16 @@ class GbuildExe(GbuildLinkTarget):
 def short_name(self):
 return 'Executable %s' % self.name
 
+def target(self):
+return 'Executable_%s' % self.name
+
 
 class GbuildParser:
 makecmdpattern = re.compile('^MAKE_COMMAND := (.*)')
 srcdirpattern = re.compile('^SRCDIR = (.*)')
 builddirpattern = re.compile('^BUILDDIR = (.*)')
 instdirpattern = re.compile('^INSTDIR = (.*)')
+binpathpattern = re.compile('LS = (.*)ls(.exe)?')
 libpattern = re.compile('#  [a-z]+ to execute \(from 
`(.*)/Library_(.*)\.mk\', line [0-9]*\):')
 exepattern = re.compile('#  [a-z]+ to execute \(from 
`(.*)/Executable_(.*)\.mk\', line [0-9]*\):')
 includepattern = re.compile('# INCLUDE := (.*)')
@@ -91,6 +103,10 @@ class GbuildParser:
 if instdirmatch:
 self.instdir = instdirmatch.group(1)
 continue
+binpathmatch = GbuildParser.binpathpattern.match(line)
+if binpathmatch:
+self.binpath = binpathmatch.group(1)
+continue
 state = GbuildParserState()
 continue
 libmatch = GbuildParser.libpattern.match(line)
@@ -508,6 +524,220 @@ class XcodeIntegrationGenerator(IdeIntegrationGenerator):
 self.write_xcodeproj(location, modulename)
 
 
+class VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
+def __init__(self, gbuildparser):
+IdeIntegrationGenerator.__init__(self, gbuildparser)
+self.solution_directory = './'
+self.configurations = {
+'Build' : {
+'build': self.module_make_command('%(target)s'),
+'clean': self.module_make_command('%(target)s.clean'),
+'rebuild': self.module_make_command('%(target)s.clean 
%(target)s')
+},
+'Unit Tests': {
+'build': self.module_make_command('unitcheck'),
+'clean': self.module_make_command('clean'),
+'rebuild': self.module_make_command('clean unitcheck'),
+},
+'Integration tests': {
+'build': self.module_make_command('unitcheck slowcheck 
subsequentcheck'),
+'clean': self.module_make_command('clean'),
+'rebuild': self.module_make_command('clean unitcheck slowcheck 
subsequentcheck')
+}
+}
+self.target_by_location = {}
+for target in set(self.gbuildparser.libs) | 
set(self.gbuildparser.exes):
+if target.is_empty():
+continue
+if not target.location in self.target_by_location:
+self.target_by_location[target.location] = set()
+self.target_by_location[target.location] |= set([target])
+
+def module_make_command(self, targets):
+return '%(sh)s -c PATH=\\/bin:$PATH\\; cd %(location)s  
%(makecmd)s -rs ' + targets + '';
+
+def emit(self):
+for location in self.target_by_location:
+

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

2014-02-10 Thread Eike Rathke 
 sc/source/core/data/table1.cxx |   23 ++-
 1 file changed, 10 insertions(+), 13 deletions(-)

New commits:
commit c782212abf4114b6dd366c38a44574be21c81eb1
Author: Eike Rathke er...@redhat.com
Date:   Mon Feb 10 20:52:07 2014 +0100

use GetLastDataRow() also in ShrinkToUsedDataArea()

Change-Id: Ie9d729900d6096dc8f540b3bc52df749b15675e2

diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 1ba2c2c..45180cf 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -966,13 +966,10 @@ bool ScTable::ShrinkToUsedDataArea( bool o_bShrunk, 
SCCOL rStartCol, SCROW rS
 
 if (rStartRow  rEndRow)
 {
-bool bFound = false;
-for (SCCOL i=rStartCol; i=rEndCol  !bFound; i++)
-if (aCol[i].HasDataAt( rEndRow))
-bFound = true;
-if (!bFound)
+SCROW nLastDataRow = GetLastDataRow( rStartCol, rEndCol, 
rEndRow);
+if (0 = nLastDataRow  nLastDataRow  rEndRow)
 {
---rEndRow;
+rEndRow = std::max( rStartRow, nLastDataRow);
 bChanged = true;
 }
 }
commit c32e93e561d234e289ce14b88a73368d7862ee47
Author: Eike Rathke er...@redhat.com
Date:   Mon Feb 10 20:00:52 2014 +0100

actually the extra check isn't needed

The end row will be the maximum of the start row and the last data row
up to the original end row.

Change-Id: I906a5f44f31f333c814b6832767dc3bd0ecd8278

diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 8e6f276..1ba2c2c 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -899,8 +899,8 @@ void ScTable::GetDataArea( SCCOL rStartCol, SCROW 
rStartRow, SCCOL rEndCol, S
 if ( !bBottom  rEndRow  0  rStartRow  rEndRow )
 {
 SCROW nLastDataRow = GetLastDataRow( rStartCol, rEndCol, rEndRow);
-if (nLastDataRow = 0  rStartRow = nLastDataRow  nLastDataRow 
 rEndRow)
-rEndRow = nLastDataRow;
+if (nLastDataRow  rEndRow)
+rEndRow = std::max( rStartRow, nLastDataRow);
 }
 }
 }
commit 840accea91da58a4532ff7cf7f5b1eaa501f0b6d
Author: Eike Rathke er...@redhat.com
Date:   Mon Feb 10 19:45:16 2014 +0100

cosmetical adapt to style

Change-Id: I210f74670631707b02b68150efac76b0985390ac

diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 22da0ae..8e6f276 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -882,15 +882,15 @@ void ScTable::GetDataArea( SCCOL rStartCol, SCROW 
rStartRow, SCCOL rEndCol, S
 
 if ( !bTop  rStartRow  MAXROW  rStartRow  rEndRow )
 {
-bool shrink = true;
+bool bShrink = true;
 do
 {
-for ( SCCOL i = rStartCol; i=rEndCol  shrink; i++)
+for ( SCCOL i = rStartCol; i=rEndCol  bShrink; i++)
 if (aCol[i].HasDataAt(rStartRow))
-shrink = false;
-if (shrink)
+bShrink = false;
+if (bShrink)
 ++rStartRow;
-}while( shrink  rStartRow  MAXROW  rStartRow  rEndRow);
+} while (bShrink  rStartRow  MAXROW  rStartRow  rEndRow);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Jacobo Aragunde Pérez 
 sw/qa/extras/ooxmlexport/data/theme-preservation.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |6 +
 sw/source/filter/ww8/docxattributeoutput.cxx  |6 +
 writerfilter/source/dmapper/DomainMapper.cxx  |   19 ++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   17 
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |5 
 writerfilter/source/dmapper/PropertyIds.cxx   |1 
 writerfilter/source/dmapper/PropertyIds.hxx   |1 
 8 files changed, 47 insertions(+), 8 deletions(-)

New commits:
commit 32210fc19324c659603e1dfed1ed006072ccf22f
Author: Jacobo Aragunde Pérez jaragu...@igalia.com
Date:   Mon Feb 10 20:55:53 2014 +0100

writerfilter: legibility improvement regarding grabbag use

Change-Id: I01b99887dc1e94616633ae6509e13ec951fd5485

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 2c96ada..bdf3565 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1911,11 +1911,13 @@ void DomainMapper::sprmWithProps( Sprm rSprm, 
PropertyMapPtr rContext, SprmType
 case NS_ooxml::LN_CT_Style_rPr:
 case NS_ooxml::LN_CT_PPr_rPr:
 case NS_ooxml::LN_CT_PPrBase_numPr:
+{
+bool bTempGrabBag = !m_pImpl-isInteropGrabBagEnabled();
 if (nSprmId == NS_ooxml::LN_CT_PPr_sectPr)
 m_pImpl-SetParaSectpr(true);
-else if (nSprmId == NS_ooxml::LN_EG_RPrBase_color  
m_pImpl-m_aInteropGrabBagName.isEmpty())
-// if DomainMapper grab bag is not enabled, enable it temporarilly
-m_pImpl-m_aInteropGrabBagName = OUString 
(TempColorPropsGrabBag);
+else if (nSprmId == NS_ooxml::LN_EG_RPrBase_color  bTempGrabBag)
+// if DomainMapper grab bag is not enabled, enable it temporarily
+m_pImpl-enableInteropGrabBag(TempColorPropsGrabBag);
 resolveSprmProps(*this, rSprm);
 if (nSprmId == NS_ooxml::LN_CT_PPrBase_spacing)
 m_pImpl-appendGrabBag(m_pImpl-m_aInteropGrabBag, spacing, 
m_pImpl-m_aSubInteropGrabBag);
@@ -1937,16 +1939,15 @@ void DomainMapper::sprmWithProps( Sprm rSprm, 
PropertyMapPtr rContext, SprmType
 else if (aIter-Name == themeTint)
 
m_pImpl-GetTopContext()-Insert(PROP_CHAR_THEME_COLOR_TINT, aIter-Value, 
true, CHAR_GRAB_BAG);
 }
-if (m_pImpl-m_aInteropGrabBagName == TempColorPropsGrabBag)
-{
+if (bTempGrabBag)
 //disable and clear DomainMapper grab bag if it wasn't enabled 
before
-m_pImpl-m_aInteropGrabBagName = OUString();
-m_pImpl-m_aSubInteropGrabBag.clear();
-}
+m_pImpl-disableInteropGrabBag();
+
 m_pImpl-appendGrabBag(m_pImpl-m_aInteropGrabBag, color, 
m_pImpl-m_aSubInteropGrabBag);
 }
 else if (nSprmId == NS_ooxml::LN_CT_PPrBase_ind)
 m_pImpl-appendGrabBag(m_pImpl-m_aInteropGrabBag, ind, 
m_pImpl-m_aSubInteropGrabBag);
+}
 break;
 case NS_ooxml::LN_CT_PPrBase_wordWrap:
 m_pImpl-appendGrabBag(m_pImpl-m_aInteropGrabBag, wordWrap, );
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 8b7dc2d..12855fe 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4194,6 +4194,23 @@ bool DomainMapper_Impl::IsNewDoc()
 return m_bIsNewDoc;
 }
 
+void DomainMapper_Impl::enableInteropGrabBag(OUString aName)
+{
+m_aInteropGrabBagName = aName;
+}
+
+void DomainMapper_Impl::disableInteropGrabBag()
+{
+m_aInteropGrabBagName = ;
+m_aInteropGrabBag.clear();
+m_aSubInteropGrabBag.clear();
+}
+
+bool DomainMapper_Impl::isInteropGrabBagEnabled()
+{
+return !(m_aInteropGrabBagName.isEmpty());
+}
+
 void DomainMapper_Impl::appendGrabBag(std::vectorbeans::PropertyValue 
rInteropGrabBag, OUString aKey, OUString aValue)
 {
 if (m_aInteropGrabBagName.isEmpty())
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 0a14054..e08fa97 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -731,6 +731,11 @@ public:
 void appendGrabBag(std::vectorbeans::PropertyValue rInteropGrabBag, 
OUString aKey, OUString aValue);
 void appendGrabBag(std::vectorbeans::PropertyValue rInteropGrabBag, 
OUString aKey, std::vectorbeans::PropertyValue rValue);
 
+/// Enable, disable an check status of grabbags
+void enableInteropGrabBag(OUString aName);
+void disableInteropGrabBag();
+bool isInteropGrabBagEnabled();
+
 /// Name of m_aInteropGrabBag.
 OUString m_aInteropGrabBagName;
 
commit 05506b377a81bcbdd0191aa592f17987f2ddcd34
Author: Jacobo Aragunde

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

2014-02-10 Thread Chris Sherlock 
 include/vcl/outdev.hxx |2 +-
 include/vcl/print.hxx  |2 ++
 include/vcl/window.hxx |4 
 vcl/source/gdi/outdev.cxx  |4 
 vcl/source/gdi/print.cxx   |6 ++
 vcl/source/window/dockmgr.cxx  |3 +--
 vcl/source/window/floatwin.cxx |4 ++--
 vcl/source/window/status.cxx   |3 +--
 vcl/source/window/window.cxx   |6 ++
 9 files changed, 23 insertions(+), 11 deletions(-)

New commits:
commit 19c5867f922e9acf0564b6213fa15cc899a77c16
Author: Chris Sherlock chris.sherloc...@gmail.com
Date:   Fri Feb 7 22:32:58 2014 +1100

fdo#74424 HasMirroredGraphics changes

HasMirroredGraphics should be called upon by the object using the
OutputDevice. As I'm focussing on Window, which will be shortly decoupled
from OutputDevice, I have changed HasMirroredGraphics into a virtual
function, and introduced a wrapper function of the same name into Window
that calls upon Window's OutputDevice object.

Due to a bug that never appears to have been fully fixed, mirroring in
printing was broken and a workaround (hotfix in the code!) was
implemented but never fully fixed. Therefore, I have overridden
HasMirroredGraphics in Printer and just return false.

Change-Id: I9029e2c50cdb339c1e936bed6b92e8b2aac1dcf9
Reviewed-on: https://gerrit.libreoffice.org/7912
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 7458475..546331b 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -755,7 +755,7 @@ public:
  */
 ///@{
 SAL_DLLPRIVATE sal_Bool ImplIsRecordLayout() const;
-SAL_DLLPRIVATE bool HasMirroredGraphics() const;
+virtual boolHasMirroredGraphics() const;
 SAL_DLLPRIVATE void ReMirror( Point rPoint ) const;
 SAL_DLLPRIVATE void ReMirror( Rectangle rRect ) const;
 SAL_DLLPRIVATE void ReMirror( Region rRegion ) const;
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 93595fc..672b1fd 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -373,6 +373,8 @@ public:
   const JobSetup i_rInitSetup
   );
 
+virtual bool HasMirroredGraphics() const;
+
 // implementation detail of PrintJob being asynchronous
 // not exported, not usable outside vcl
 static void SAL_DLLPRIVATE ImplPrintJob( const 
boost::shared_ptrvcl::PrinterController i_pController,
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index bf6bf24..51cd179 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -575,6 +575,10 @@ protected:
 virtual Window* getAccessibleRelationLabelFor() const;
 virtual sal_uInt16 getDefaultAccessibleRole() const;
 virtual OUString getDefaultAccessibleName() const;
+
+public:
+bool HasMirroredGraphics() const;
+
 public:
 // Single argument ctors shall be explicit.
 explicitWindow( Window* pParent, WinBits nStyle = 0 );
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index 485ebb2..b2c73b0 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -483,10 +483,6 @@ void OutputDevice::EnableRTL( sal_Bool bEnable )
 
 bool OutputDevice::HasMirroredGraphics() const
 {
-   // HOTFIX for #i55719#
-   if( meOutDevType == OUTDEV_PRINTER )
-   return false;
-
return ( ImplGetGraphics()  (mpGraphics-GetLayout()  
SAL_LAYOUT_BIDI_RTL) );
 }
 
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index a77bdce..f064c2e 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -213,6 +213,12 @@ void Printer::SetPrinterOptions( const PrinterOptions 
i_rOptions )
 *mpPrinterOptions = i_rOptions;
 }
 
+bool Printer::HasMirroredGraphics() const
+{
+// due to a hotfix for AOO bug i55719, this needs to return false
+return false;
+}
+
 // QueueInfo
 QueueInfo::QueueInfo()
 {
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index f33886f..495d807 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -802,8 +802,7 @@ void ImplPopupFloatWin::MouseButtonDown( const MouseEvent 
rMEvt )
 {
 // get mouse pos at a static window to have a fixed reference point
 PointerState aState = GetParent()-GetPointerState();
-const OutputDevice *pOutDev = GetOutDev();
-if (pOutDev-HasMirroredGraphics()  IsRTLEnabled())
+if (HasMirroredGraphics()  IsRTLEnabled())
 ImplMirrorFramePos(aState.maPos);
 maTearOffPosition = GetWindow( WINDOW_BORDER )-GetPosPixel();
 maDelta = aState.maPos - maTearOffPosition;
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index e836e62..e459fad 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -457,7

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

2014-02-10 Thread Caolán McNamara 
 cui/source/tabpages/grfpage.cxx  |   24 +---
 cui/source/tabpages/swpossizetabpage.cxx |3 +--
 sfx2/source/control/unoctitm.cxx |2 +-
 svtools/source/contnr/svimpbox.cxx   |2 +-
 4 files changed, 16 insertions(+), 15 deletions(-)

New commits:
commit c3c1a8f373e73d8bfa3180a21ccae0e4fb1cd982
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 10 20:55:35 2014 +

coverity#704611 Dereference after null check

Change-Id: I7ce68773c85408d0dc3d46bac85bcbd0f5806ade

diff --git a/cui/source/tabpages/swpossizetabpage.cxx 
b/cui/source/tabpages/swpossizetabpage.cxx
index 43f0f4a..bacecec 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -1274,8 +1274,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox *, pLB )
 m_pVertByFT-Enable( bEnable );
 }
 
-if (pLB)// only if the hanlder has been called by a change of the 
controller
-RangeModifyHdl( 0 );
+RangeModifyHdl( 0 );
 
 short nRel = 0;
 if (pLB-GetSelectEntryCount())
commit 750105967d6add2670cff5847ea74da925a3e679
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 10 20:53:03 2014 +

coverity#704610 Dereference after null check

Change-Id: I1a08d643a695f1d22e339b8906588aca7d190578

diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 065bee0..8d8ce6f 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -204,23 +204,25 @@ void SvxGrfCropPage::Reset( const SfxItemSet rSet )
 referer = it-GetValue();
 }
 const Graphic* pGrf = ((SvxBrushItem*)pItem)-GetGraphic(referer);
-if( pGrf ) {
+if( pGrf )
+{
 aOrigSize = GetGrfOrigSize( *pGrf );
-if (pGrf-GetType() == GRAPHIC_BITMAP  aOrigSize.Width()  
aOrigSize.Height()) {
+if (pGrf-GetType() == GRAPHIC_BITMAP  aOrigSize.Width()  
aOrigSize.Height())
+{
 Bitmap aBitmap = pGrf-GetBitmap();
 aOrigPixelSize = aBitmap.GetSizePixel();
 }
-}
 
-if( aOrigSize.Width()  aOrigSize.Height() )
-{
-CalcMinMaxBorder();
-m_pExampleWN-SetGraphic( *pGrf );
-m_pExampleWN-SetFrameSize( aOrigSize );
+if( aOrigSize.Width()  aOrigSize.Height() )
+{
+CalcMinMaxBorder();
+m_pExampleWN-SetGraphic( *pGrf );
+m_pExampleWN-SetFrameSize( aOrigSize );
 
-bFound = sal_True;
-if( !((SvxBrushItem*)pItem)-GetGraphicLink().isEmpty() )
-aGraphicName = ((SvxBrushItem*)pItem)-GetGraphicLink();
+bFound = sal_True;
+if( !((SvxBrushItem*)pItem)-GetGraphicLink().isEmpty() )
+aGraphicName = ((SvxBrushItem*)pItem)-GetGraphicLink();
+}
 }
 }
 
commit c748d6115e6c9f2820701e410611b75c09156987
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 10 20:51:29 2014 +

coverity#440991 Dereference after null check

Change-Id: I3b911e4bc1e6c2eccf4b9655f12162936fc5a946

diff --git a/svtools/source/contnr/svimpbox.cxx 
b/svtools/source/contnr/svimpbox.cxx
index 3618681..6ac1b35 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -2346,7 +2346,7 @@ bool SvImpLBox::KeyInput( const KeyEvent rKEvt)
 nDelta--;
 }
 
-if( nDelta )
+if( nDelta  pNewCursor )
 {
 
DBG_ASSERT(pNewCursor(sal_uLong)pNewCursor!=(sal_uLong)pCursor,Cursor?);
 aSelEng.CursorPosChanging( bShift, bMod1 );
commit 9e6dfbd2444be53e28d3ca5e8dc786a4099af413
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 10 20:49:48 2014 +

coverity#441011 Dereference after null check

Change-Id: I8a3430440bdd8cc1561eb60863c2bda3df8eac6d

diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 1fbcba9..413fa96 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -809,7 +809,7 @@ void SAL_CALL 
SfxDispatchController_Impl::addStatusListener(const ::com::sun::st
 ::com::sun::star::uno::Any aState;
 if ( !pDispatcher  pBindings )
 pDispatcher = GetBindings().GetDispatcher_Impl();
-SfxItemState eState = pDispatcher-QueryState( GetId(), aState );
+SfxItemState eState = pDispatcher ? pDispatcher-QueryState( GetId(), 
aState ) : SFX_ITEM_DONTCARE;
 
 if ( eState == SFX_ITEM_DONTCARE )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Kohei Yoshida 
 editeng/source/outliner/outlvw.cxx |   23 +++
 1 file changed, 23 insertions(+)

New commits:
commit 684a0308dcb847f816967202ba87f536b83dcb4e
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Feb 10 01:26:35 2014 -0500

fdo#46707: Don't bother with synonyms for text with mixed script types.

Change-Id: I7922905523406d05f864b10e1ecfd27f3fb5f9d6
(cherry picked from commit 49341001e76389f11bf67d756f4742275bc9dcd9)
Reviewed-on: https://gerrit.libreoffice.org/7962
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/editeng/source/outliner/outlvw.cxx 
b/editeng/source/outliner/outlvw.cxx
index 036b464..1435c77 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -29,6 +29,7 @@
 #include editeng/fhgtitem.hxx
 
 #include svl/style.hxx
+#include svl/languageoptions.hxx
 #include i18nlangtag/languagetag.hxx
 
 #include editeng/outliner.hxx
@@ -1552,6 +1553,24 @@ Selection OutlinerView::GetSurroundingTextSelection() 
const
 // = some code for thesaurus sub menu within context menu
 // ==
 
+namespace {
+
+bool isSingleScriptType( sal_uInt16 nScriptType )
+{
+sal_uInt8 nScriptCount = 0;
+
+if (nScriptType  SCRIPTTYPE_LATIN)
+++nScriptCount;
+if (nScriptType  SCRIPTTYPE_ASIAN)
+++nScriptCount;
+if (nScriptType  SCRIPTTYPE_COMPLEX)
+++nScriptCount;
+
+return nScriptCount == 1;
+}
+
+}
+
 // returns: true if a word for thesaurus look-up was found at the current 
cursor position.
 // The status string will be word + iso language string (e.g. light#en-US)
 bool EDITENG_DLLPUBLIC GetStatusValueForThesaurusFromContext(
@@ -1567,6 +1586,10 @@ bool EDITENG_DLLPUBLIC 
GetStatusValueForThesaurusFromContext(
 aTextSel = pEditEngine-GetWord( aTextSel, 
i18n::WordType::DICTIONARY_WORD );
 aText = pEditEngine-GetText( aTextSel );
 aTextSel.Adjust();
+
+if (!isSingleScriptType(pEditEngine-GetScriptType(aTextSel)))
+return false;
+
 LanguageType nLang = pEditEngine-GetLanguage( aTextSel.nStartPara, 
aTextSel.nStartPos );
 OUString aLangText( LanguageTag::convertToBcp47( nLang ) );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Kohei Yoshida 
 editeng/source/outliner/outlvw.cxx |   23 +++
 1 file changed, 23 insertions(+)

New commits:
commit 9ad3a5f665f83ee4f635d37f1fc35b33661ea094
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Feb 10 01:26:35 2014 -0500

fdo#46707: Don't bother with synonyms for text with mixed script types.

Change-Id: I7922905523406d05f864b10e1ecfd27f3fb5f9d6
(cherry picked from commit 49341001e76389f11bf67d756f4742275bc9dcd9)
Reviewed-on: https://gerrit.libreoffice.org/7963
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/editeng/source/outliner/outlvw.cxx 
b/editeng/source/outliner/outlvw.cxx
index c1b8fa8..52429ed 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -29,6 +29,7 @@
 #include editeng/fhgtitem.hxx
 
 #include svl/style.hxx
+#include svl/languageoptions.hxx
 #include i18nlangtag/languagetag.hxx
 
 #include editeng/outliner.hxx
@@ -1559,6 +1560,24 @@ Selection OutlinerView::GetSurroundingTextSelection() 
const
 // = some code for thesaurus sub menu within context menu
 // ==
 
+namespace {
+
+bool isSingleScriptType( sal_uInt16 nScriptType )
+{
+sal_uInt8 nScriptCount = 0;
+
+if (nScriptType  SCRIPTTYPE_LATIN)
+++nScriptCount;
+if (nScriptType  SCRIPTTYPE_ASIAN)
+++nScriptCount;
+if (nScriptType  SCRIPTTYPE_COMPLEX)
+++nScriptCount;
+
+return nScriptCount == 1;
+}
+
+}
+
 // returns: true if a word for thesaurus look-up was found at the current 
cursor position.
 // The status string will be word + iso language string (e.g. light#en-US)
 bool EDITENG_DLLPUBLIC GetStatusValueForThesaurusFromContext(
@@ -1574,6 +1593,10 @@ bool EDITENG_DLLPUBLIC 
GetStatusValueForThesaurusFromContext(
 aTextSel = pEditEngine-GetWord( aTextSel, 
i18n::WordType::DICTIONARY_WORD );
 aText = pEditEngine-GetText( aTextSel );
 aTextSel.Adjust();
+
+if (!isSingleScriptType(pEditEngine-GetScriptType(aTextSel)))
+return false;
+
 LanguageType nLang = pEditEngine-GetLanguage( aTextSel.nStartPara, 
aTextSel.nStartPos );
 OUString aLangText( LanguageTag( nLang ).getBcp47() );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Kohei Yoshida 
 sc/source/filter/inc/numberformatsbuffer.hxx |2 -
 sc/source/filter/inc/stylesbuffer.hxx|4 +-
 sc/source/filter/oox/stylesbuffer.cxx|   47 +++
 3 files changed, 38 insertions(+), 15 deletions(-)

New commits:
commit d12c0e5d36cc106cb4f9a27dba2f29c10b5d6f93
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Feb 10 16:03:54 2014 -0500

cp#100030: Use internal API to fill dxf styles during xlsx import.

It's faster, and it actually prevents a bug where styles fail to get
set when the document contains at least one protected sheet.

Change-Id: I9a5d7250ca44dd46364ab62f2e0130e967427c66

diff --git a/sc/source/filter/inc/numberformatsbuffer.hxx 
b/sc/source/filter/inc/numberformatsbuffer.hxx
index 32c3611..52a68f0 100644
--- a/sc/source/filter/inc/numberformatsbuffer.hxx
+++ b/sc/source/filter/inc/numberformatsbuffer.hxx
@@ -77,7 +77,7 @@ public:
 sal_Int32   finalizeImport(
 const ::com::sun::star::uno::Reference 
::com::sun::star::util::XNumberFormats  rxNumFmts,
 const ::com::sun::star::lang::Locale rFromLocale 
);
-voidfillToItemSet( SfxItemSet rItemSet, bool 
bSkipPoolDefs ) const;
+void fillToItemSet( SfxItemSet rItemSet, bool bSkipPoolDefs = false ) 
const;
 /** Writes the number format to the passed property map. */
 voidwriteToPropertyMap( PropertyMap rPropMap ) const;
 
diff --git a/sc/source/filter/inc/stylesbuffer.hxx 
b/sc/source/filter/inc/stylesbuffer.hxx
index 6802e9b..e3c4036 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -520,7 +520,7 @@ public:
 /** Returns the converted API border data struct. */
 inline const ApiBorderData getApiData() const { return maApiData; }
 
-voidfillToItemSet( SfxItemSet rItemSet, bool 
bSkipPoolDefs ) const;
+void fillToItemSet( SfxItemSet rItemSet, bool bSkipPoolDefs = false ) 
const;
 
 /** Writes all border attributes to the passed property map. */
 voidwriteToPropertyMap( PropertyMap rPropMap ) const;
@@ -771,6 +771,8 @@ public:
 /** Writes all formatting attributes to the passed property set. */
 voidwriteToPropertySet( PropertySet rPropSet ) const;
 
+void fillToItemSet( SfxItemSet rSet ) const;
+
 private:
 FontRef mxFont; /// Font data.
 NumberFormatRef mxNumFmt;   /// Number format data.
diff --git a/sc/source/filter/oox/stylesbuffer.cxx 
b/sc/source/filter/oox/stylesbuffer.cxx
index 49b1194..d14b353 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -2498,6 +2498,22 @@ void Dxf::writeToPropertySet( PropertySet rPropSet ) 
const
 rPropSet.setProperties( aPropMap );
 }
 
+void Dxf::fillToItemSet( SfxItemSet rSet ) const
+{
+if (mxFont)
+mxFont-fillToItemSet(rSet, FONT_PROPTYPE_CELL);
+if (mxNumFmt)
+mxNumFmt-fillToItemSet(rSet);
+if (mxAlignment)
+mxAlignment-fillToItemSet(rSet);
+if (mxProtection)
+mxProtection-fillToItemSet(rSet);
+if (mxBorder)
+mxBorder-fillToItemSet(rSet);
+if (mxFill)
+mxFill-fillToItemSet(rSet);
+}
+
 // 
 
 namespace {
@@ -3111,21 +3127,26 @@ OUString StylesBuffer::createCellStyle( sal_Int32 nXfId 
) const
 OUString StylesBuffer::createDxfStyle( sal_Int32 nDxfId ) const
 {
 OUString rStyleName = maDxfStyles[ nDxfId ];
-if( rStyleName.isEmpty() )
+if (!rStyleName.isEmpty())
+return rStyleName;
+
+if (Dxf* pDxf = maDxfs.get(nDxfId).get())
 {
-if( Dxf* pDxf = maDxfs.get( nDxfId ).get() )
-{
-rStyleName = OUStringBuffer( ConditionalStyle_ ).append( nDxfId 
+ 1 ).makeStringAndClear();
-// create the style sheet (this may change rStyleName if such a 
style already exists)
-Reference XStyle  xStyle = createStyleObject( rStyleName, false 
);
-// write style formatting properties
-PropertySet aPropSet( xStyle );
-pDxf-writeToPropertySet( aPropSet );
-}
-// on error: fallback to default style
-if( rStyleName.isEmpty() )
-rStyleName = maCellStyles.getDefaultStyleName();
+rStyleName = OUStringBuffer(ConditionalStyle_).append(nDxfId + 
1).makeStringAndClear();
+
+// Create a cell style. This may overwrite an existing style if
+// one with the same name exists.
+SfxItemSet rStyleItemSet =
+ScfTools::MakeCellStyleSheet(
+*getScDocument().GetStyleSheetPool(), rStyleName, 
true).GetItemSet();
+
+pDxf-fillToItemSet(rStyleItemSet);
 }
+
+// on error: fallback to default style
+if (rStyleName.isEmpty())
+rStyleName =

[Bug 70414] create VSProject files for code editing in MSVS from gbuild

2014-02-10 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=70414

--- Comment #9 from Honza Havlíček havlicek.ho...@gmail.com ---
There is somewhat working version in master, so progress report:

What works:
* It is possible to generate solution (collection of projects) for each module
that will contain C++ project for all Library_* and Executable_* in the the
module.
* You can build (calls make {project makefile}), rebuild (calls make calls make
{project makefile}.clean {project makefile}) and clean projects (calls make
{project makefile}.clean). Use context menu of project or define keyboard
shortcut (see below).
* There are multiple configurations, default one is for building projects, .
You can switch between them from drop down menu in the toolbar (the one with
text Build next to Win32). Other configuration are for unit testing and
integration tests.
* You can run LO by from menu Debug-Start Without Debugging and attach to it
(Debug- Attach To Project, choose soffice.bin). Breakpoints work, you can
change content of variables in debugger and all that good stuff.

What doesn't work:
* No projects for unit tests (parser doesn't currently support them)
* When running LO from VS, it always says that project is out of date and if it
should be rebuild. How exactly does VS checks that is unclear, but it seems to
check for some .pdb file in build directory.
* There might also be one solution for all projects, in addition to per-module
solutions.
* Generation of projects only works when you run it in source directory, not
for different directory.
* When you build solution all projects are build in parallel (= a lot of make
module.build at once), that can probably lead to some trouble. Build only one
project at time. VS2012 Express doesn't have shortcut for building only one
project by default, I recomment defining it using Tools-
Options-Environment-Keyboard, Command Build.BuildSelection builds the
project currently active file is part of 

Notes:
Since VS2010, MS has changed the project file structure to MSBuild (something
like Ant). When VS builds project, it runs MSBuild file with target build.
Except build, there are also rebuild, clean and publish (though probably only
for some types of project). Instead of overriding targets in MSBuild, I used
NMake type of project, that allows user to change the command performed by VS
when target (build/rebuild/clean) is run in GUI: Project Properties -
Configuration Properties - NMake.

-- 
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 67350] sanity check utility for help ids

2014-02-10 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=67350

Mat M m...@gmx.fr changed:

   What|Removed |Added

   Assignee|libreoffice-b...@lists.free |m...@gmx.fr
   |desktop.org |

-- 
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 67350] sanity check utility for help ids

2014-02-10 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=67350

Mat M m...@gmx.fr changed:

   What|Removed |Added

 Status|NEW |ASSIGNED

-- 
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] test-files.git: loperf/empty.ods loperf/empty.odt loperf/sample.xlsx

2014-02-10 Thread Matúš Kukan 
 loperf/empty.ods   |binary
 loperf/empty.odt   |binary
 loperf/sample.xlsx |binary
 3 files changed

New commits:
commit eecb07e19285e39d84bd284133884a3bf5dfdda1
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Mon Feb 10 22:24:56 2014 +0100

Add loperf files used for performance testing.

We really need more and better files.

diff --git a/loperf/empty.ods b/loperf/empty.ods
new file mode 100644
index 000..6b13dbc
Binary files /dev/null and b/loperf/empty.ods differ
diff --git a/loperf/empty.odt b/loperf/empty.odt
new file mode 100644
index 000..857387b
Binary files /dev/null and b/loperf/empty.odt differ
diff --git a/loperf/sample.xlsx b/loperf/sample.xlsx
new file mode 100644
index 000..1c1cfc3
Binary files /dev/null and b/loperf/sample.xlsx differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65108] Clean-up header includes (global/local)

2014-02-10 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=65108

Julien Nabet serval2...@yahoo.fr changed:

   What|Removed |Added

 Depends on||70681

-- 
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 65108] Clean-up header includes (global/local)

2014-02-10 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=65108

Julien Nabet serval2...@yahoo.fr changed:

   What|Removed |Added

 Depends on|70681   |

--- Comment #24 from Julien Nabet serval2...@yahoo.fr ---
Oups, I read this tracker a little too quickly.

-- 
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] buildbot.git: 5 commits - loperf/docs loperf/loperf.sh loperf/utls.sh

2014-02-10 Thread Matúš Kukan 
 dev/null |binary
 loperf/loperf.sh |  144 ---
 loperf/utls.sh   |   69 --
 3 files changed, 44 insertions(+), 169 deletions(-)

New commits:
commit 557bcd408b2bc825e1f348f1d6fc61b78b78b6f0
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Thu Jan 16 15:11:46 2014 +0100

loperf: Deduplicate code into function.

diff --git a/loperf/loperf.sh b/loperf/loperf.sh
index 6a35ab4..c0a31b2 100755
--- a/loperf/loperf.sh
+++ b/loperf/loperf.sh
@@ -75,84 +75,57 @@ function launch {
 fi
 }
 
-# Do a clean launch
-echo Start offload pvt...
-cur_log=$(launch)
-
 # Mapping the data to array:
 #
-# offload[0] - Ir
-# offload[1] - Dr
-# offload[2] - Dw
-# offload[3] - I1mr
-# offload[4] - D1mr
-# offload[5] - D1mw
-# offload[6] - ILmr
-# offload[7] - DLmr
-# offload[8] - DLmw
-# offload[9] - Bc
-# offload[10] - Bcm
-# offload[11] - Bi
-# offload[12] - Bim
-# offload[13] - Ge
-
-offload_str=$(grep '^summary:' $cur_log | sed s/summary: //)
-offload=($offload_str)
-if test -n $GZIP; then gzip $cur_log  /dev/null 21; fi
-
-#Collect data to csv file
-CSV_FN=$CSV_LOG_DIR/offload.csv
-echo -n $TESTDATE$'\t'$LOVERSION  $CSV_FN
-for i in $(seq 0 13); do
-echo -n $'\t'${offload[$i]}  $CSV_FN
-done
-# CEst = Ir + 10 Bm + 10 L1m + 20 Ge + 100 L2m + 100 LLm
-CEst=$(expr ${offload[0]} + 10 \* $(expr ${offload[12]} + ${offload[10]}) + 10 
\* $(expr ${offload[3]} + ${offload[4]} + ${offload[5]}) + 20 \* ${offload[13]} 
+ 100 \* $(expr ${offload[6]} + ${offload[7]} + ${offload[8]}))
-echo $'\t'$CEst  $CSV_FN
-echo -n $TESTDATE,$LOVERSION,$CEst  $CSV_HISTORY
-
-# Loaded launch one by one
-echo Start onload pvt...
-find $DOCUMENTSDIR -type f |  grep -Ev \/\. | while read f; do
-cur_log=$(launch $f)
-
-# Mapping the data to array:
-#
-# onload[0] - Ir
-# onload[1] - Dr
-# onload[2] - Dw
-# onload[3] - I1mr
-# onload[4] - D1mr
-# onload[5] - D1mw
-# onload[6] - ILmr
-# onload[7] - DLmr
-# onload[8] - DLmw
-# onload[9] - Bc
-# onload[10] - Bcm
-# onload[11] - Bi
-# onload[12] - Bim
-# onload[13] - Ge
-
-onload_str=$(grep '^summary:' $cur_log | sed s/summary: //)
-onload=($onload_str)
-if test -n $GZIP; then gzip $cur_log  /dev/null 21; fi
-
-#Construct the csv file name
-CSV_FN=$CSV_LOG_DIR/onload-${f#$DOCUMENTSDIR\/}.csv
+# data[0] - Ir
+# data[1] - Dr
+# data[2] - Dw
+# data[3] - I1mr
+# data[4] - D1mr
+# data[5] - D1mw
+# data[6] - ILmr
+# data[7] - DLmr
+# data[8] - DLmw
+# data[9] - Bc
+# data[10] - Bcm
+# data[11] - Bi
+# data[12] - Bim
+# data[13] - Ge
+
+echo -n $TESTDATE,$LOVERSION  $CSV_HISTORY
+
+function write_data {
+cur_log=$(launch $1)
+
+data=($(grep '^summary:' $cur_log | sed s/summary: //))
+
+test -n $GZIP  gzip $cur_log  /dev/null 21
+
+#Collect data to csv file
+test -z $1  CSV_FN=$CSV_LOG_DIR/offload.csv
+test -n $1  CSV_FN=$CSV_LOG_DIR/onload-${1#$DOCUMENTSDIR\/}.csv
 
 echo -n $TESTDATE$'\t'$LOVERSION  $CSV_FN
-
-# Populate onload to CSV_FN
 for i in $(seq 0 13); do
-echo -n $'\t'${onload[$i]}  $CSV_FN
+echo -n $'\t'${data[$i]}  $CSV_FN
 done
 
 # CEst = Ir + 10 Bm + 10 L1m + 20 Ge + 100 L2m + 100 LLm
-CEst=$(expr ${onload[0]} + 10 \* $(expr ${onload[12]} + ${onload[10]}) + 
10 \* $(expr ${onload[3]} + ${onload[4]} + ${onload[5]}) + 20 \* ${onload[13]} 
+ 100 \* $(expr ${onload[6]} + ${onload[7]} + ${onload[8]}))
+CEst=$(expr ${data[0]} + 10 \* $(expr ${data[12]} + ${data[10]}) + 10 \* 
$(expr ${data[3]} + ${data[4]} + ${data[5]}) + 20 \* ${data[13]} + 100 \* 
$(expr ${data[6]} + ${data[7]} + ${data[8]}))
 echo $'\t'$CEst  $CSV_FN
 echo -n ,$CEst  $CSV_HISTORY
+}
+
+# Do a clean launch
+echo Start offload pvt...
+$(write_data )
 
+# Loaded launch one by one
+echo Start onload pvt...
+find $DOCUMENTSDIR -type f |  grep -Ev \/\. | while read f; do
+$(write_data $f)
 done
+
 echo   $CSV_HISTORY
 $OFFICEBIN --headless --convert-to fods --outdir logs $CSV_HISTORY
 
commit 751a86f53e588fdcc317bace102d5a57b69835fd
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Thu Jan 16 14:40:28 2014 +0100

loperf: Do not log each loperf run. Removes commented out regression 
checking.

It does not make much sense to report individual performance regressions.
Instead this script produces history file with all runs, so you can draw
nice graphs with it.

diff --git a/loperf/loperf.sh b/loperf/loperf.sh
index e302972..6a35ab4 100755
--- a/loperf/loperf.sh
+++ b/loperf/loperf.sh
@@ -52,13 +52,11 @@ LOVERSION=$(get_lo_version $OFFICEBIN)
 DT=$(echo $TESTDATE | tr -s '\ \+\-\:' _)
 
 CG_LOG=logs/callgrind/cg-lo-$DT-$LOVERSION
-PF_LOG=logs/loperf/pf-lo-$DT-$LOVERSION.log
 ERR_LOG=logs/error.log
 CSV_LOG_DIR=logs/csv/
 CSV_HISTORY=logs/history.csv
 
 mkdir -p logs/callgrind  /dev/null 21
-mkdir -p logs/loperf  /dev/null 21
 mkdir -p $CSV_LOG_DIR

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

2014-02-10 Thread Kohei Yoshida 
 sc/source/filter/inc/numberformatsbuffer.hxx |2 -
 sc/source/filter/inc/stylesbuffer.hxx|4 +-
 sc/source/filter/oox/stylesbuffer.cxx|   47 +++
 3 files changed, 38 insertions(+), 15 deletions(-)

New commits:
commit 2a2168ac2d78645749ade4e6408097ff0dff3cce
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Feb 10 16:03:54 2014 -0500

cp#100030: Use internal API to fill dxf styles during xlsx import.

It's faster, and it actually prevents a bug where styles fail to get
set when the document contains at least one protected sheet.

Change-Id: I9a5d7250ca44dd46364ab62f2e0130e967427c66
(cherry picked from commit d12c0e5d36cc106cb4f9a27dba2f29c10b5d6f93)

diff --git a/sc/source/filter/inc/numberformatsbuffer.hxx 
b/sc/source/filter/inc/numberformatsbuffer.hxx
index 32c3611..52a68f0 100644
--- a/sc/source/filter/inc/numberformatsbuffer.hxx
+++ b/sc/source/filter/inc/numberformatsbuffer.hxx
@@ -77,7 +77,7 @@ public:
 sal_Int32   finalizeImport(
 const ::com::sun::star::uno::Reference 
::com::sun::star::util::XNumberFormats  rxNumFmts,
 const ::com::sun::star::lang::Locale rFromLocale 
);
-voidfillToItemSet( SfxItemSet rItemSet, bool 
bSkipPoolDefs ) const;
+void fillToItemSet( SfxItemSet rItemSet, bool bSkipPoolDefs = false ) 
const;
 /** Writes the number format to the passed property map. */
 voidwriteToPropertyMap( PropertyMap rPropMap ) const;
 
diff --git a/sc/source/filter/inc/stylesbuffer.hxx 
b/sc/source/filter/inc/stylesbuffer.hxx
index 7332b78..65f8884 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -520,7 +520,7 @@ public:
 /** Returns the converted API border data struct. */
 inline const ApiBorderData getApiData() const { return maApiData; }
 
-voidfillToItemSet( SfxItemSet rItemSet, bool 
bSkipPoolDefs ) const;
+void fillToItemSet( SfxItemSet rItemSet, bool bSkipPoolDefs = false ) 
const;
 
 /** Writes all border attributes to the passed property map. */
 voidwriteToPropertyMap( PropertyMap rPropMap ) const;
@@ -772,6 +772,8 @@ public:
 /** Writes all formatting attributes to the passed property set. */
 voidwriteToPropertySet( PropertySet rPropSet ) const;
 
+void fillToItemSet( SfxItemSet rSet ) const;
+
 private:
 FontRef mxFont; /// Font data.
 NumberFormatRef mxNumFmt;   /// Number format data.
diff --git a/sc/source/filter/oox/stylesbuffer.cxx 
b/sc/source/filter/oox/stylesbuffer.cxx
index 09735e6..02b8fd7 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -2632,6 +2632,22 @@ void Dxf::writeToPropertySet( PropertySet rPropSet ) 
const
 rPropSet.setProperties( aPropMap );
 }
 
+void Dxf::fillToItemSet( SfxItemSet rSet ) const
+{
+if (mxFont)
+mxFont-fillToItemSet(rSet, FONT_PROPTYPE_CELL);
+if (mxNumFmt)
+mxNumFmt-fillToItemSet(rSet);
+if (mxAlignment)
+mxAlignment-fillToItemSet(rSet);
+if (mxProtection)
+mxProtection-fillToItemSet(rSet);
+if (mxBorder)
+mxBorder-fillToItemSet(rSet);
+if (mxFill)
+mxFill-fillToItemSet(rSet);
+}
+
 // 
 
 namespace {
@@ -3262,21 +3278,26 @@ OUString StylesBuffer::createCellStyle( sal_Int32 nXfId 
) const
 OUString StylesBuffer::createDxfStyle( sal_Int32 nDxfId ) const
 {
 OUString rStyleName = maDxfStyles[ nDxfId ];
-if( rStyleName.isEmpty() )
+if (!rStyleName.isEmpty())
+return rStyleName;
+
+if (Dxf* pDxf = maDxfs.get(nDxfId).get())
 {
-if( Dxf* pDxf = maDxfs.get( nDxfId ).get() )
-{
-rStyleName = OUStringBuffer( ConditionalStyle_ ).append( nDxfId 
+ 1 ).makeStringAndClear();
-// create the style sheet (this may change rStyleName if such a 
style already exists)
-Reference XStyle  xStyle = createStyleObject( rStyleName, false 
);
-// write style formatting properties
-PropertySet aPropSet( xStyle );
-pDxf-writeToPropertySet( aPropSet );
-}
-// on error: fallback to default style
-if( rStyleName.isEmpty() )
-rStyleName = maCellStyles.getDefaultStyleName();
+rStyleName = OUStringBuffer(ConditionalStyle_).append(nDxfId + 
1).makeStringAndClear();
+
+// Create a cell style. This may overwrite an existing style if
+// one with the same name exists.
+SfxItemSet rStyleItemSet =
+ScfTools::MakeCellStyleSheet(
+*getScDocument().GetStyleSheetPool(), rStyleName, 
true).GetItemSet();
+
+pDxf-fillToItemSet(rStyleItemSet);
 }
+
+// on error: fallback to default style
+if

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

2014-02-10 Thread Kohei Yoshida 
 sc/source/filter/inc/stylesbuffer.hxx |5 -
 sc/source/filter/oox/stylesbuffer.cxx |   23 ---
 2 files changed, 28 deletions(-)

New commits:
commit 4c0e5eaea9155f40766116c5c44deab38ed80eb4
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Feb 10 17:30:23 2014 -0500

Remove unused.

Change-Id: Iee50396bdbf027373a544f2280cad931745a23c1

diff --git a/sc/source/filter/inc/stylesbuffer.hxx 
b/sc/source/filter/inc/stylesbuffer.hxx
index e3c4036..19f37cb 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -766,11 +766,6 @@ public:
 /** Final processing after import of all style settings. */
 voidfinalizeImport();
 
-/** Writes all formatting attributes to the passed property map. */
-voidwriteToPropertyMap( PropertyMap rPropMap ) const;
-/** Writes all formatting attributes to the passed property set. */
-voidwriteToPropertySet( PropertySet rPropSet ) const;
-
 void fillToItemSet( SfxItemSet rSet ) const;
 
 private:
diff --git a/sc/source/filter/oox/stylesbuffer.cxx 
b/sc/source/filter/oox/stylesbuffer.cxx
index d14b353..cd0a43e 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -2475,29 +2475,6 @@ void Dxf::finalizeImport()
 mxFill-finalizeImport();
 }
 
-void Dxf::writeToPropertyMap( PropertyMap rPropMap ) const
-{
-if( mxFont.get() )
-mxFont-writeToPropertyMap( rPropMap, FONT_PROPTYPE_CELL );
-if( mxNumFmt.get() )
-mxNumFmt-writeToPropertyMap( rPropMap );
-if( mxAlignment.get() )
-mxAlignment-writeToPropertyMap( rPropMap );
-if( mxProtection.get() )
-mxProtection-writeToPropertyMap( rPropMap );
-if( mxBorder.get() )
-mxBorder-writeToPropertyMap( rPropMap );
-if( mxFill.get() )
-mxFill-writeToPropertyMap( rPropMap );
-}
-
-void Dxf::writeToPropertySet( PropertySet rPropSet ) const
-{
-PropertyMap aPropMap;
-writeToPropertyMap( aPropMap );
-rPropSet.setProperties( aPropMap );
-}
-
 void Dxf::fillToItemSet( SfxItemSet rSet ) const
 {
 if (mxFont)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Markus Mohrhard 
 sc/source/core/data/dpobject.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 68c280f6230bf3203614678fc7eb81996c616d66
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Mon Feb 10 23:24:15 2014 +0100

fix import crash related to ooo94186

Change-Id: I2eb8c895eef53b5b14e81c5491d7ced6ead3c40a

diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index de077db..bc9949f 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -978,7 +978,9 @@ void ScDPObject::BuildAllDimensionMembers()
 if (pServDesc)
 return;
 
-pSaveData-BuildAllDimensionMembers(GetTableData());
+ScDPTableData* pTableData = GetTableData();
+if(pTableData)
+pSaveData-BuildAllDimensionMembers(pTableData);
 }
 
 bool ScDPObject::SyncAllDimensionMembers()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 2 commits - solenv/bin

2014-02-10 Thread Tor Lillqvist 
 solenv/bin/macosx-codesign-app-bundle |   33 --
 solenv/bin/modules/installer/simplepackage.pm |4 +--
 2 files changed, 23 insertions(+), 14 deletions(-)

New commits:
commit c8e0e5858f7cb5d6269d2b71b735ca14dad10921
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Feb 11 00:30:23 2014 +0200

Handle app bundles with space in name, also sign the mdimporter properly

Just like the Python framework, also the Spotlight importer needs to
be signed specially, it seems.

I wondoer if we could get rid of all the hair in this script by simply
just signing the app bundle, with the --deep option?

Change-Id: I722b4403e74560f6555a7528005ed7aa0c94352b

diff --git a/solenv/bin/macosx-codesign-app-bundle 
b/solenv/bin/macosx-codesign-app-bundle
index 4197780..48454a3 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -19,7 +19,7 @@ for V in \
 fi
 done
 
-APP_BUNDLE=$1
+APP_BUNDLE=$1
 
 # Sign dylibs
 #
@@ -34,8 +34,8 @@ APP_BUNDLE=$1
 # add some where it makes sense. Make a depth-first search to sign the contents
 # of e.g. the spotlight plugin before attempting to sign the plugin itself
 
-find $APP_BUNDLE \( -name '*.dylib' -or -name '*.dylib.*' -or -name '*.so' \
--or -name '*.fodt' -or -name 'schema.strings' -or -name 'schema.xml' 
-or -name '*.mdimporter' \
+find $APP_BUNDLE \( -name '*.dylib' -or -name '*.dylib.*' -or -name '*.so' \
+-or -name '*.fodt' -or -name 'schema.strings' -or -name 'schema.xml' \
 -or -name '*.jar' -or -name '*.jnilib' -or -name 'LICENSE' -or -name 
'LICENSE.html' \
 -or -name '*.applescript' \) ! -type l | grep -v 
LibreOfficePython\.framework |
 while read dylib; do
@@ -47,23 +47,31 @@ done
 # gb_LinkTarget__command_dynamiclink in
 # solenv/gbuild/platform/macosx.mk.
 
-# Sign frameworks.
-#
+# Sign included bundles. First frameworks.
+
 # Yeah, we don't bundle any other framework than our Python one, and
 # it has just one version, so this generic search is mostly for
 # completeness.
 
-for framework in `find $APP_BUNDLE -name '*.framework' -type d`; do
-fn=$(basename $framework)
+find $APP_BUNDLE -name '*.framework' -type d |
+while read framework; do
+fn=`basename $framework`
 fn=${fn%.*}
-for version in $framework/Versions/*; do
-if test ! -L $version -a -d $version; then
-codesign --verbose --prefix=$MACOSX_BUNDLE_IDENTIFIER. --sign 
$MACOSX_CODESIGNING_IDENTITY $version/$fn
-   codesign --verbose --prefix=$MACOSX_BUNDLE_IDENTIFIER. --sign 
$MACOSX_CODESIGNING_IDENTITY $version
+for version in $framework/Versions/*; do
+if test ! -L $version -a -d $version; then
+codesign --verbose --prefix=$MACOSX_BUNDLE_IDENTIFIER. --sign 
$MACOSX_CODESIGNING_IDENTITY $version/$fn
+codesign --verbose --prefix=$MACOSX_BUNDLE_IDENTIFIER. --sign 
$MACOSX_CODESIGNING_IDENTITY $version
 fi
 done
 done
 
+# Then mdimporters
+
+find $APP_BUNDLE -name '*.mdimporter' -type d |
+while read bundle; do
+codesign --verbose --prefix=$MACOSX_BUNDLE_IDENTIFIER. --sign 
$MACOSX_CODESIGNING_IDENTITY $bundle
+done
+
 # Sign the app bundle as a whole which means (re-)signing the
 # CFBundleExecutable from Info.plist, i.e. soffice, plus the contents
 # of the Resources tree (which unless you used
@@ -80,6 +88,7 @@ if test $ENABLE_MACOSX_SANDBOX = YES; then
 entitlements=--entitlements $BUILDDIR/lo.xcent
 fi
 
-codesign --force --verbose 
--identifier=${MACOSX_BUNDLE_IDENTIFIER}.$(basename ${APP_BUNDLE}) 
--resource-rules $SRCDIR/setup_native/source/mac/CodesignRules.plist --sign 
$MACOSX_CODESIGNING_IDENTITY $entitlements $APP_BUNDLE
+id=`basename $APP_BUNDLE`
+codesign --force --verbose --identifier=${MACOSX_BUNDLE_IDENTIFIER}.$id 
--resource-rules $SRCDIR/setup_native/source/mac/CodesignRules.plist --sign 
$MACOSX_CODESIGNING_IDENTITY $entitlements $APP_BUNDLE
 
 exit 0
commit 40f4ec95acb1e28b1ba08a3a8259e5877bfc8c16
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Feb 10 18:56:40 2014 +0200

Hardcode app bundle name here, too

Change-Id: I69cabd516e7c40b7ee75e311d725f6db78519855

diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index b2ef9f4..23a1f7b 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -401,10 +401,10 @@ sub create_package
 }
 else
 {
-if (($volume_name_classic_app eq 'LibreOffice' || 
$volume_name_classic_app eq 'LibreOfficeDev') 
+if (($volume_name_classic_app eq 'LibreOffice from Collabora' || 
$volume_name_classic_app eq 'LibreOfficeDev') 
 defined($ENV{'MACOSX_CODESIGNING_IDENTITY'})  
$ENV{'MACOSX_CODESIGNING_IDENTITY'} ne  )
 {
-$systemcall = 
$ENV{'SRCDIR'}/solenv/bin/macosx-codesign-app-bundle

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

2014-02-10 Thread Markus Mohrhard 
 sot/source/sdstor/stgelem.cxx |   11 +++
 1 file changed, 3 insertions(+), 8 deletions(-)

New commits:
commit 8a0298fc1fd05e0bee69048ea12d360768d7ecd0
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Mon Feb 10 23:42:15 2014 +0100

remove commented code

Change-Id: Ibc04f08b52d754263151ee66d03b58abe2f4e4ee

diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx
index ed1a144..3ebc729 100644
--- a/sot/source/sdstor/stgelem.cxx
+++ b/sot/source/sdstor/stgelem.cxx
@@ -352,16 +352,11 @@ void StgEntry::GetName( OUString rName ) const
 
 short StgEntry::Compare( const StgEntry r ) const
 {
-/*
-short nRes = r.nNameLen - nNameLen;
-if( !nRes ) return strcmp( r.aName, aName );
-else return nRes;
-*/
 sal_Int32 nRes = r.nNameLen - nNameLen;
 if( !nRes )
 nRes = r.aName.compareTo( aName );
+
 return (short)nRes;
-//return aName.CompareTo( r.aName );
 }
 
 // These load/store operations are a bit more complicated,
commit b3621802219d3ad7d8eafbb9367903c9001a3602
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Mon Feb 10 23:38:32 2014 +0100

fix crash during xls import, related fdo#36580

Looks like a possibly invalid xls file but let us just do the right
thing and not crash.

Change-Id: Id96db06798cd19d96938ca84956046e5a5e5b529

diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx
index 0ac6bae..ed1a144 100644
--- a/sot/source/sdstor/stgelem.cxx
+++ b/sot/source/sdstor/stgelem.cxx
@@ -299,7 +299,7 @@ bool StgEntry::SetName( const OUString rName )
 }
 
 int i;
-for( i = 0; i  aName.getLength()  i  32; i++ )
+for( i = 0; i  rName.getLength()  i  32; i++ )
 {
 nName[ i ] = rName[ i ];
 }
@@ -307,7 +307,7 @@ bool StgEntry::SetName( const OUString rName )
 {
 nName[ i++ ] = 0;
 }
-nNameLen = ( aName.getLength() + 1 )  1;
+nNameLen = ( rName.getLength() + 1 )  1;
 return true;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Tomaž Vajngerl 
 sw/source/core/text/txtfrm.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2bf2dee04c1d698e586316c2bd18a3e34df4be77
Author: Tomaž Vajngerl qui...@gmail.com
Date:   Mon Feb 10 23:48:34 2014 +0100

Werror=strict-overflow

Change-Id: Id9eaa7af7f12c22d675561fa4e86767c36bf6d15

diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 7031b54..9a2aa38 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -673,7 +673,7 @@ sal_Int32 SwTxtFrm::FindBrk( const OUString rTxt,
 
 sal_Bool SwTxtFrm::IsIdxInside( const sal_Int32 nPos, const sal_Int32 nLen ) 
const
 {
-if( GetOfst()  nPos + nLen ) // the range preceded us
+if( nPos + nLen  0 || GetOfst()  nPos + nLen ) // the range preceded us
 return sal_False;
 
 if( !GetFollow() )// the range doesn't precede us,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Markus Mohrhard 
 oox/source/crypto/CryptTools.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit db96add4686875efce6a6e6bc6a860b249b0c210
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Tue Feb 11 00:08:24 2014 +0100

fix crash during file format detection, related #i101863#

Change-Id: I2aec2e95f49ab70a9e94c5d52f70855f4381a24e

diff --git a/oox/source/crypto/CryptTools.cxx b/oox/source/crypto/CryptTools.cxx
index 6c46297..d9ba500 100644
--- a/oox/source/crypto/CryptTools.cxx
+++ b/oox/source/crypto/CryptTools.cxx
@@ -61,7 +61,10 @@ void Crypto::setupContext(vectorsal_uInt8 key, 
vectorsal_uInt8 iv, CryptoT
 
 SECItem ivItem;
 ivItem.type = siBuffer;
-ivItem.data = iv[0];
+if(iv.empty())
+ivItem.data = NULL;
+else
+ivItem.data = iv[0];
 ivItem.len = iv.size();
 
 SECItem* pIvItem = NULL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - extensions.lst sw/source

2014-02-10 Thread Andrea Pescetti 
 extensions.lst   |2 -
 sw/source/core/graphic/ndgrf.cxx |   40 +--
 2 files changed, 39 insertions(+), 3 deletions(-)

New commits:
commit 58f18227a16379b5a4b3530b6ab2b683a63e6906
Author: Andrea Pescetti pesce...@apache.org
Date:   Mon Feb 10 22:56:42 2014 +

#i124127# Update English dictionary to the latest (2014.02.10) version.

diff --git a/extensions.lst b/extensions.lst
index 1f53f19..e016099 100644
--- a/extensions.lst
+++ b/extensions.lst
@@ -39,7 +39,7 @@
 
 # English dictionary
 [ language=en.* || language=de || language=it ]
-043e3c42b1b2a20517f8069afb9cba24 
http://sourceforge.net/projects/aoo-extensions/files/17102/2/dict-en-marcoagpinto-20140107.oxt/download
 dict-en.oxt
+21000528c50707539220e05df554172f 
http://sourceforge.net/projects/aoo-extensions/files/17102/3/dict-en.oxt/download
 dict-en.oxt
 
 # English (USA, en_US) dictionary
 [ language==nl || language==ru ]
commit a9325263271883fb147351d287c817ea7984fbe9
Author: Armin Le Grand a...@apache.org
Date:   Mon Feb 10 22:24:18 2014 +

i15508 keep trhe original file and format AFAP when breaking links to 
graphic contents in Writer

diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index b96e13f..5fa944c 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -741,8 +741,11 @@ void SwGrfNode::ReleaseLink()
 {
 if( refLink.Is() )
 {
-// erst die Grafik reinswappen!
-//  if( aGraphic.IsSwapOut() || !refLink-IsSynchron() )
+// #15508# remember some stuff from the linked graphic
+const String aFileName(maGrfObj.GetLink());
+const Graphic aLocalGraphic(maGrfObj.GetGraphic());
+const bool bHasOriginalData(aLocalGraphic.IsLink());
+
 {
 bInSwapIn = sal_True;
 SwBaseLink* pLink = (SwBaseLink*)(::sfx2::SvBaseLink*) refLink;
@@ -750,9 +753,42 @@ void SwGrfNode::ReleaseLink()
 pLink-SwapIn( sal_True, sal_True );
 bInSwapIn = sal_False;
 }
+
 getIDocumentLinksAdministration()-GetLinkManager().Remove( refLink );
 refLink.Clear();
 maGrfObj.SetLink();
+
+// #15508# added extra processing after getting rid of the link. Use 
whatever is
+// known from the formally linked graphic to get to a state as close 
to a directly
+// unlinked insterted graphic as possible. Goal is to have a valid 
GfxLink at the
+// ImplGraphic (see there) that holds temporary data to the original 
data and type
+// information about the original data. Only when this is given will
+// SvXMLGraphicHelper::ImplInsertGraphicURL which is used at export 
use that type
+// and use the original graphic at export for the ODF, without evtl. 
recoding
+// of trhe bitmap graphic data to something without loss (e.g. PNG) 
but bigger
+if(bHasOriginalData)
+{
+// #15508# if we have the original data at the Graphic, let it 
survive
+// by using that Graphic again, this time at a GraphicObject 
without link.
+// This happens e.g. when inserting a linked graphic and breaking 
the link
+maGrfObj.SetGraphic(aLocalGraphic);
+}
+else if(aFileName.Len())
+{
+// #15508# we have no original data, but a file name. This happens 
e.g.
+// when inserting a linked graphic and save, reload document. Try 
to access
+// that data from the original file; if this works, use it. Else 
use the
+// data we have (but without knowing the original format)
+int nRes = GRFILTER_OK;
+GraphicFilter* pFlt = GraphicFilter::GetGraphicFilter();
+Graphic aNew;
+nRes = GraphicFilter::LoadGraphic( aFileName, String(), aNew, 
pFlt);
+
+if(GRFILTER_OK == nRes)
+{
+maGrfObj.SetGraphic(aNew);
+}
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-10 Thread Norbert Thiebaud 
 Makefile.in|   10 +-
 vcl/source/window/toolbox2.cxx |   13 -
 2 files changed, 5 insertions(+), 18 deletions(-)

New commits:
commit 3e2f1601278b9e079230566712c40820dbd81fce
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Sun Feb 9 16:21:54 2014 -0600

fast scale doubling of biptmap mess up mac retina

Change-Id: Ib39dd0048266483c385551a2f8f9f9629ea2ff66

diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 3fc9e3e..9f6a1af 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1379,19 +1379,6 @@ void ToolBox::SetItemImage( sal_uInt16 nItemId, const 
Image rImage )
 {
 Image aImage(rImage);
 
-if ( GetDPIScaleFactor()  1)
-{
-BitmapEx aBitmap(aImage.GetBitmapEx());
-
-// Some code calls this twice, so add a sanity check
-// FIXME find out what that code is  fix accordingly
-if (aBitmap.GetSizePixel().Width()  32)
-{
-aBitmap.Scale(GetDPIScaleFactor(), GetDPIScaleFactor(), 
BMP_SCALE_FAST);
-aImage = Image(aBitmap);
-}
-}
-
 ImplToolItem* pItem = mpData-m_aItems[nPos];
 // Nur wenn alles berechnet ist, mehr Aufwand treiben
 if ( !mbCalc )
commit 3047ac5c1f9966592ea1f73be919e47c7fd0db64
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Sat Feb 8 22:08:33 2014 -0600

Makefile.in make the initial invocation of Makefile.build a bit less ugly

Change-Id: Ic25f0e379142ad8e0581598e314b5d314ee5f9e1

diff --git a/Makefile.in b/Makefile.in
index f7c06c3..29d76e1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -10,6 +10,10 @@
 .PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check 
clean clean-build clean-host test-install distclean distro-pack-install docs 
download fetch findunusedcode get-submodules id install install-strip 
subsequentcheck tags debugrun help slowcheck translations unitcheck packageinfo
 
 MAKECMDGOALS?=all
+build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\
+ $(if $(filter build-nocheck,$(MAKECMDGOALS)),build)\
+ $(if $(filter check,$(MAKECMDGOALS)),subsequentcheck)\
+ $(filter all build-l10n-only build-non-l10n-only debugrun help slowcheck 
translations unitcheck subsequentcheck check packageinfo,$(MAKECMDGOALS))
 
 SHELL=/usr/bin/env bash
 SRCDIR := @SRC_ROOT@
@@ -217,11 +221,7 @@ build: bootstrap fetch $(if 
$(CROSS_COMPILING),cross-toolset)
 ifneq ($(filter-out WNT MACOSX IOS ANDROID,$(OS)),)
mkdir -p $(INSTDIR)  install-gdb-printers -a $(INSTDIR) -c
 endif
-   $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild \
-   $(if $(filter build check,$(MAKECMDGOALS)),all) \
-   $(if $(filter build-nocheck,$(MAKECMDGOALS)),build) \
-   $(if $(filter check,$(MAKECMDGOALS)),subsequentcheck) \
-   $(filter all build-l10n-only build-non-l10n-only debugrun help 
slowcheck translations unitcheck subsequentcheck check 
packageinfo,$(MAKECMDGOALS))
+   $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $(build_goal)
 ifeq ($(OS),IOS)
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) ios
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

  1   2   3   4   >