Build fail on master

[julien2412]

Hi,

On pc Debian x86-64 with master sources updated today + make clean, I've got
this:
In file included from
/home/julien/compile-libreoffice/libo/basic/source/runtime/methods1.cxx:41:0:
/home/julien/compile-libreoffice/libo/basic/source/inc/runtime.hxx: In
function ‘void SbRtl_CallByName(StarBASIC*, SbxArray&, sal_Bool)’:
/home/julien/compile-libreoffice/libo/basic/source/inc/runtime.hxx:351:10:
error: ‘void SbiRuntime::StepSET_Impl(SbxVariableRef&, SbxVariableRef&,
bool)’ is private
 void StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, bool
bDefaultHandling = false );
  ^
/home/julien/compile-libreoffice/libo/basic/source/runtime/methods1.cxx:184:65:
error: within this context
 pRT->StepSET_Impl( pValVar, rFindVar, false );

(gcc (Debian 4.8.2-16) 4.8.2)
autogen.input:
--with-system-odbc
--enable-ext-barcode
--enable-ext-diagram
--enable-ext-hunart
--enable-ext-nlpsolver
--enable-ext-ct2n
--enable-ext-numbertext
--enable-postgresql-sdbc
--enable-ext-typo
--enable-ext-validator
--enable-ext-watch-window
--enable-ext-wiki-publisher
--enable-dbus
--enable-graphite
--enable-werror
--enable-debug
--enable-dbgutil
--enable-crashdump
--enable-dependency-tracking
--enable-online-update
--enable-extra-sample
--enable-extra-template
--enable-extra-gallery
--enable-python=internal
--enable-ext-mariadb-connector
--with-system-mariadb
--enable-bundle-mariadb
--enable-avahi
--enable-eot
--disable-gstreamer-0.10
--enable-gstreamer
--enable-odk

Any idea?



--
View this message in context: 
http://nabble.documentfoundation.org/Build-fail-on-master-tp4105630.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Ariel Constenla-Haile]

 framework/source/uielement/popuptoolbarcontroller.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 46d6cabf120e6c1cdf4b01548f435a5ae6f72ae2
Author: Ariel Constenla-Haile 
Date:   Fri Apr 18 05:40:56 2014 +

i124706 - Consider the toolbar alignment when executing the PopupMenu

diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx 
b/framework/source/uielement/popuptoolbarcontroller.cxx
index 5e160d4..f269d81 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -156,10 +156,13 @@ PopupMenuToolbarController::createPopupWindow()
 return xRet;
 
 pToolBox->SetItemDown( m_nToolBoxId, sal_True );
+WindowAlign eAlign( pToolBox->GetAlign() );
 sal_uInt16 nId = m_xPopupMenu->execute(
 css::uno::Reference< css::awt::XWindowPeer >( getParent(), 
css::uno::UNO_QUERY ),
 VCLUnoHelper::ConvertToAWTRect( pToolBox->GetItemRect( m_nToolBoxId ) 
),
-css::awt::PopupMenuDirection::EXECUTE_DEFAULT );
+( eAlign == WINDOWALIGN_TOP || eAlign == WINDOWALIGN_BOTTOM ) ?
+css::awt::PopupMenuDirection::EXECUTE_DOWN :
+css::awt::PopupMenuDirection::EXECUTE_RIGHT );
 pToolBox->SetItemDown( m_nToolBoxId, sal_False );
 
 if ( nId )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LibreOffice Gerrit News for core on 2014-04-18

[gerrit]

Moin!

* Open changes on master for project core changed in the last 25 hours:

 First time contributors doing great things! 
+ Begin removing ASCII art and useless comments from sw
  in https://gerrit.libreoffice.org/9090 from Chris Laplante
  about module sw
+ Rewrite getHash to reduce code duplication & improve maintainability.
  in https://gerrit.libreoffice.org/8912 from Chris Laplante
  about module sw
+ FDO#74886: Data labels are not preserved for Column Chart in RT file
  in https://gerrit.libreoffice.org/8098 from Umesh Kadam
  about module chart2, oox
+ fdo77216-Charts-Scattered chart: Chart gets distorted on RT
  in https://gerrit.libreoffice.org/9011 from Sourav Mahajan
  about module chart2, oox
+ Change use of '*b' to a varable, to remove compiler warning
  in https://gerrit.libreoffice.org/9088 from Adam CloudOn
  about module external
+ fd0#74150:Numbered list getting display after RT -table-within-table-1.do
  in https://gerrit.libreoffice.org/7767 from Rajashri Udhoji
  about module sw
 End of freshness 

+ fdo#67350 : sanity check utility for help ids wrt ui files
  in https://gerrit.libreoffice.org/9089 from Mathias M
  about module bin
+ fdo#73148 (partial patch) Add Excel 2010 function AGGREGATE
  in https://gerrit.libreoffice.org/8475 from Winfried Donkers
  about module formula, include, sc
+ cppcheck: multiCondition, second test should be DataOutputStream
  in https://gerrit.libreoffice.org/9007 from Julien Nabet
  about module extensions


* Merged changes on master for project core changed in the last 25 hours:

+ cppcheck: Fix redundant assignments in the sw module
  in https://gerrit.libreoffice.org/8914 from Chris Laplante
+ fdo#57950 Replace chained append() with operator+
  in https://gerrit.libreoffice.org/8701 from Krisztian Pinter
+ Enable letter-spacing for Firefox HTML export
  in https://gerrit.libreoffice.org/8947 from Harri Pitkänen
+ Fix a memory leak
  in https://gerrit.libreoffice.org/9016 from Takeshi Abe
+ fdo#77219 Image property Z-index [behindDoc] not preserved after RT
  in https://gerrit.libreoffice.org/9065 from Ravindra Vidhate


* Abandoned changes on master for project core changed in the last 25 hours:

None

* Open changes needing tweaks, but being untouched for more than a week:

+ fdo#43157 : Remove OSL_THIS_FILE
  in https://gerrit.libreoffice.org/8886 from Michaël Lefèvre
+ fdo#43157 Remove OSL_POSTCOND, prefer SAL_WARN_IF
  in https://gerrit.libreoffice.org/8883 from Michaël Lefèvre
+ new method INetURLObject::getData() for data urls
  in https://gerrit.libreoffice.org/8737 from Christina Roßmanith
+ fdo#67544 Slide transistion sound(other sound) is not included in present
  in https://gerrit.libreoffice.org/8700 from Vishv Brahmbhatt
+ fdo#57950: Replace chained O(U)StringBuffer::append() with operator+
  in https://gerrit.libreoffice.org/8699 from Tharindu Lakmal
+ Refactored
  in https://gerrit.libreoffice.org/8683 from Tharindu Lakmal
+ fdo#75757 Remove inheritance to std::map from PropertyMap
  in https://gerrit.libreoffice.org/8656 from Krisztian Pinter
+ Remove visual noise from ios
  in https://gerrit.libreoffice.org/8274 from Alexander Wilms
+ FDO#75205 : Charts - Up Down bars are getting added to Line Chart.
  in https://gerrit.libreoffice.org/8360 from Umesh Kadam
+ WIP: Converting ExtensionUpdate dialog for new format
  in https://gerrit.libreoffice.org/8506 from Rodolfo Ribeiro Gomes
+ Refactored swooxmlexport tests cases. Added function to check contents.
  in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar
+ fdo#71984 fix first line indentation in footnotes for MS Word documents
  in https://gerrit.libreoffice.org/8160 from Andras Timar
+ Lots of changes to Tango icons
  in https://gerrit.libreoffice.org/7987 from Miroslav Mazel
+ sw/docx export: fix handling of document with header and section(s)
  in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer
+ fdo#51525 Fix duplicate "Paste Special" entries in Calc.
  in https://gerrit.libreoffice.org/7784 from Andrzej Hunt
+ fdo#72661: Check ‘Hyphenation active’ automatically
  in https://gerrit.libreoffice.org/7291 from Jiwoong Youn
+ sa/l add release_assert() and assert that stay even in release code
  in https://gerrit.libreoffice.org/7625 from Norbert Thiebaud
+ WIP fdo#72987 Use firebird backup format for .odb
  in https://gerrit.libreoffice.org/7299 from Andrzej Hunt
+ sw/export docx: add unit test for document with header and section(s)
  in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer
+ WIP: fdo#33980 Preserve selection across all slide sorters.
  in https://gerrit.libreoffice.org/6633 from Andrzej Hunt
+ Positional Tab additions
  in https://gerrit.libreoffice.org/5387 from Adam CloudOn


Best,

Your friendly LibreOffice Gerrit Digest Mailer

Note: The bot generating this message can be found and improved here:
   
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest
_

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

[Andras Timar]

 filter/source/pdf/impdialog.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a538d6f05820e8912da2f20846d2b274d45112c2
Author: Andras Timar 
Date:   Tue Apr 15 16:39:07 2014 +0200

fdo#74654 fix typo: printnone -> printhigh

Change-Id: I286dedfb6dfd8d9c119bf1b6ac777a2a08f22d7e
Reviewed-on: https://gerrit.libreoffice.org/9015
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 
(cherry picked from commit a9e669b7948ab734bcbbd76a0919ba91cca2850e)
Reviewed-on: https://gerrit.libreoffice.org/9056
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
Tested-by: Markus Mohrhard 
Reviewed-by: Markus Mohrhard 

diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 54e40ab..631afd239 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -1088,7 +1088,7 @@ ImpPDFTabSecurityPage::ImpPDFTabSecurityPage(Window* 
i_pParent, const SfxItemSet
 get(mpPrintPermissions, "printing");
 get(mpRbPrintNone, "printnone");
 get(mpRbPrintLowRes, "printlow");
-get(mpRbPrintHighRes, "printnone");
+get(mpRbPrintHighRes, "printhigh");
 
 get(mpChangesAllowed, "changes");
 get(mpRbChangesNone, "changenone");
___
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' - canvas/source vcl/unx

[Caolán McNamara]

 canvas/source/cairo/cairo_canvasbitmap.cxx |2 +-
 canvas/source/cairo/cairo_xlib_cairo.cxx   |9 +
 vcl/unx/x11/xlimits.cxx|   13 ++---
 3 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 0826bf264c7308be1da045b79bdcc2cff8b7cb42
Author: Caolán McNamara 
Date:   Thu Apr 17 11:56:17 2014 +0100

Resolves: rhbz#1086714 overlarge pixmap

(cherry picked from commit f31ac2405bbd0755fb14daa6cb84d7bb7d84c492)

Conflicts:
canvas/source/cairo/cairo_xlib_cairo.cxx
vcl/unx/x11/xlimits.cxx

Change-Id: I015308406a43e6b039059a5e35316d59745d0a48
Reviewed-on: https://gerrit.libreoffice.org/9083
Tested-by: Markus Mohrhard 
Reviewed-by: Markus Mohrhard 

diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx 
b/canvas/source/cairo/cairo_canvasbitmap.cxx
index 277c133..d243596 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.cxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.cxx
@@ -158,7 +158,7 @@ namespace cairocanvas
 pPixels = cairo_image_surface_create( CAIRO_FORMAT_ARGB32,
   aSize.Width(), 
aSize.Height() );
 cairo_t *pCairo = cairo_create( pPixels );
-if( !pPixels || !pCairo )
+if( !pPixels || !pCairo || cairo_status(pCairo) != 
CAIRO_STATUS_SUCCESS )
 break;
 
 // suck ourselves from the X server to this buffer so then we 
can fiddle with
diff --git a/canvas/source/cairo/cairo_xlib_cairo.cxx 
b/canvas/source/cairo/cairo_xlib_cairo.cxx
index bae6943..e5bb189 100644
--- a/canvas/source/cairo/cairo_xlib_cairo.cxx
+++ b/canvas/source/cairo/cairo_xlib_cairo.cxx
@@ -36,11 +36,12 @@ namespace
 Pixmap limitXCreatePixmap(Display *display, Drawable d, unsigned int 
width, unsigned int height, unsigned int depth)
 {
 // The X protocol request CreatePixmap puts an upper bound
-// of 16 bit to the size.
-//
-// see, e.g. moz#424333, fdo#48961
+// of 16 bit to the size. And in practice some drivers
+// fall over with values close to the max.
+
+// see, e.g. moz#424333, fdo#48961, rhbz#1086714
 // we've a duplicate of this in vcl :-(
-if (width > SAL_MAX_INT16 || height > SAL_MAX_INT16)
+if (width > SAL_MAX_INT16-10 || height > SAL_MAX_INT16-10)
 {
 SAL_WARN("canvas", "overlarge pixmap: " << width << " x " << 
height);
 return None;
diff --git a/vcl/unx/x11/xlimits.cxx b/vcl/unx/x11/xlimits.cxx
index 71b9983..b8509cb 100644
--- a/vcl/unx/x11/xlimits.cxx
+++ b/vcl/unx/x11/xlimits.cxx
@@ -13,13 +13,12 @@
 Pixmap limitXCreatePixmap(Display *display, Drawable d, unsigned int width, 
unsigned int height, unsigned int depth)
 {
 // The X protocol request CreatePixmap puts an upper bound
-// of 16 bit to the size. Beyond that there may be implementation
-// limits of the Xserver; which we should catch by a failed XCreatePixmap
-// call. However extra large values should be caught here since we'd run 
into
-// 16 bit truncation here without noticing.
-//
-// see, e.g. moz#424333
-if (width > SAL_MAX_INT16 || height > SAL_MAX_INT16)
+// of 16 bit to the size. And in practice some drivers
+// fall over with values close to the max.
+
+// see, e.g. moz#424333, fdo#48961, rhbz#1086714
+// we've a duplicate of this in canvas :-(
+if (width > SAL_MAX_INT16-10 || height > SAL_MAX_INT16-10)
 {
 SAL_WARN("vcl", "overlarge pixmap: " << width << " x " << height);
 return None;
___
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' - filter/source

[Caolán McNamara]

 filter/source/graphicfilter/ipcx/ipcx.cxx  |9 +-
 filter/source/graphicfilter/itiff/itiff.cxx|   80 -
 filter/source/graphicfilter/itiff/lzwdecom.cxx |   14 +++-
 3 files changed, 80 insertions(+), 23 deletions(-)

New commits:
commit 15494c3dc504c693bd84a6217498f6bf17411855
Author: Caolán McNamara 
Date:   Thu Apr 17 11:58:38 2014 +0100

zero various members

(cherry picked from commit 9de20d1eb046f7bb92d893408206b91a9c054e2e)

Conflicts:
filter/Module_filter.mk
filter/source/graphicfilter/ipcx/ipcx.cxx
filter/source/graphicfilter/itiff/itiff.cxx

Change-Id: Iad6948fdf6eb60f86d764783b72a4fe7f5642e40
Reviewed-on: https://gerrit.libreoffice.org/9082
Tested-by: Markus Mohrhard 
Reviewed-by: Markus Mohrhard 

diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx 
b/filter/source/graphicfilter/ipcx/ipcx.cxx
index 54579ff..2d35844 100644
--- a/filter/source/graphicfilter/ipcx/ipcx.cxx
+++ b/filter/source/graphicfilter/ipcx/ipcx.cxx
@@ -148,10 +148,7 @@ sal_Bool PCXReader::ReadPCX(Graphic & rGraphic)
 
 void PCXReader::ImplReadHeader()
 {
-sal_uInt8 nbyte;
-sal_uInt16 nushort;
-sal_uInt16 nMinX,nMinY,nMaxX,nMaxY;
-
+sal_uInt8 nbyte(0);
 m_rPCX >> nbyte >> nVersion >> nEncoding;
 if ( nbyte!=0x0a || (nVersion != 0 && nVersion != 2 && nVersion != 3 && 
nVersion != 5) || nEncoding > 1 )
 {
@@ -159,7 +156,9 @@ void PCXReader::ImplReadHeader()
 return;
 }
 
+nbyte = 0;
 m_rPCX >> nbyte; nBitsPerPlanePix = (sal_uLong)nbyte;
+sal_uInt16 nMinX(0),nMinY(0),nMaxX(0),nMaxY(0);
 m_rPCX >> nMinX >> nMinY >> nMaxX >> nMaxY;
 
 if ((nMinX > nMaxX) || (nMinY > nMaxY))
@@ -179,7 +178,9 @@ void PCXReader::ImplReadHeader()
 ImplReadPalette( 16 );
 
 m_rPCX.SeekRel( 1 );
+nbyte = 0;
 m_rPCX >> nbyte;   nPlanes = (sal_uLong)nbyte;
+sal_uInt16 nushort(0);
 m_rPCX >> nushort; nBytesPerPlaneLin = (sal_uLong)nushort;
 m_rPCX >> nPaletteInfo;
 
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx 
b/filter/source/graphicfilter/itiff/itiff.cxx
index 71bd7e0..71bad87 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -125,7 +125,54 @@ private:
 bool HasAlphaChannel() const;
 public:
 
-TIFFReader() : pAlphaMask(0), pMaskAcc(0) {}
+TIFFReader()
+: bStatus(false)
+, nLastPercent(0)
+, pTIFF(NULL)
+, pAcc(NULL)
+, nDstBitsPerPixel(0)
+, pAlphaMask(NULL)
+, pMaskAcc(NULL)
+, nOrigPos(0)
+, nOrigNumberFormat(0)
+, nDataType(0)
+, bByteSwap(false)
+, nNewSubFile(0)
+, nSubFile(0)
+, nImageWidth(0)
+, nImageLength(0)
+, nBitsPerSample(1)
+, nCompression(1)
+, nPhotometricInterpretation(0)
+, nThresholding(1)
+, nCellWidth(1)
+, nCellLength(1)
+, nFillOrder(1)
+, pStripOffsets(NULL)
+, nNumStripOffsets(0)
+, nOrientation(1)
+, nSamplesPerPixel(1)
+, nRowsPerStrip(0x)
+, pStripByteCounts(NULL)
+, nNumStripByteCounts(0)
+, nMinSampleValue(0)
+, nMaxSampleValue(0)
+, fXResolution(0.0)
+, fYResolution(0.0)
+, nPlanarConfiguration(1)
+, nGroup3Options(0)
+, nGroup4Options(0)
+, nResolutionUnit(2)
+, nPredictor(0)
+, pColorMap(NULL)
+, nNumColors(0)
+, nPlanes(0)
+, nStripsPerPlane(0)
+, nBytesPerRow(0)
+{
+pMap[ 0 ] = pMap[ 1 ] = pMap[ 2 ] = pMap[ 3 ] = NULL;
+}
+
 ~TIFFReader()
 {
 delete pAlphaMask;
@@ -178,14 +225,14 @@ sal_uLong TIFFReader::DataTypeSize()
 
 sal_uLong TIFFReader::ReadIntData()
 {
-double  nDOUBLE;
-float   nFLOAT;
-sal_uInt32  nUINT32a, nUINT32b;
-sal_Int32   nINT32;
-sal_uInt16  nUINT16;
-sal_Int16   nINT16;
-sal_uInt8   nBYTE;
-charnCHAR;
+double  nDOUBLE(0.0);
+float   nFLOAT(0);
+sal_uInt32  nUINT32a(0), nUINT32b(0);
+sal_Int32   nINT32(0);
+sal_uInt16  nUINT16(0);
+sal_Int16   nINT16(0);
+sal_uInt8   nBYTE(0);
+charnCHAR(0);
 
 switch( nDataType )
 {
@@ -241,13 +288,14 @@ sal_uLong TIFFReader::ReadIntData()
 
 double TIFFReader::ReadDoubleData()
 {
-sal_uInt32 nulong;
 double  nd;
 
 if ( nDataType == 5 )
 {
+sal_uInt32 nulong(0);
 *pTIFF >> nulong;
 nd = (double)nulong;
+nulong = 0;
 *pTIFF >> nulong;
 if ( nulong != 0 )
 nd /= (double)nulong;
@@ -603,7 +651,7 @@ sal_Bool TIFFReader::ReadMap( sal_uLong nMinPercent, 
sal_uLong nMaxPercent )
 else if ( nCompression == 32773 )
 {
 sal_uLong nStrip,nRecCount,nRowBytesLeft,ny,np,i;
-sal_uInt8 * pdst, nRecHeader, nRecData;
+sal_uInt8 * pdst;
 nStrip = 

[Libreoffice-commits] core.git: Branch 'private/kohei/calc-sort-fix' - sc/source

[Kohei Yoshida]

 sc/source/core/data/table3.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit a8cb708c920f7b1508e64517322c6d7168c54f82
Author: Kohei Yoshida 
Date:   Fri Apr 18 00:37:22 2014 -0400

I don't need this anymore.

Change-Id: I03c52705979dd239ee90fde2406800c1a9c2809a

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index bb6148f..169fa90 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -210,7 +210,6 @@ short Compare( const OUString &sInput1, const OUString 
&sInput2,
 struct ScSortInfo
 {
 ScRefCellValue maCell;
-const sc::CellTextAttr* mpTextAttr;
 SCCOLROWnOrg;
 DECL_FIXEDMEMPOOL_NEWDEL( ScSortInfo );
 };
@@ -334,7 +333,6 @@ ScSortInfoArray* ScTable::CreateSortInfoArray( SCCOLROW 
nInd1, SCCOLROW nInd2 )
 {
 ScSortInfo* pInfo = pArray->Get( nSort, nRow );
 pInfo->maCell = pCol->GetCellValue(aBlockPos, nRow);
-pInfo->mpTextAttr = pCol->GetCellTextAttr(aBlockPos, nRow);
 pInfo->nOrg = nRow;
 }
 }
@@ -368,7 +366,6 @@ ScSortInfoArray* ScTable::CreateSortInfoArray( SCCOLROW 
nInd1, SCCOLROW nInd2 )
 {
 ScSortInfo* pInfo = pArray->Get( nSort, nCol );
 pInfo->maCell = GetCellValue(nCol, nRow);
-pInfo->mpTextAttr = GetCellTextAttr(nCol, nRow);
 pInfo->nOrg = nCol;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/kohei/calc-sort-fix' - 3 commits - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/cellvalues.hxx  |   21 +++
 sc/inc/column.hxx  |5 
 sc/inc/table.hxx   |3 
 sc/source/core/data/cellvalues.cxx |  119 --
 sc/source/core/data/column.cxx |   36 ++
 sc/source/core/data/column4.cxx|   31 -
 sc/source/core/data/table2.cxx |8 +
 sc/source/core/data/table3.cxx |  200 -
 sc/source/core/data/table7.cxx |8 +
 9 files changed, 371 insertions(+), 60 deletions(-)

New commits:
commit 5bbf5e86ced9d449da1e859e0ad98385eaeb969c
Author: Kohei Yoshida 
Date:   Fri Apr 18 00:29:55 2014 -0400

Avoid using SwapRow() when sorting.

Instead, build a data table prior to sorting, swap rows in this data table
as we sort, then transfer the results back to the document in one step.  
This
significantly speeds up the sort performance.

Formula cells are yet to be handled. I'll work on that next.

Change-Id: I59bde1a243dc8940411d1a33eef147671b060cd0

diff --git a/sc/inc/cellvalues.hxx b/sc/inc/cellvalues.hxx
index c22e3b3..8de0b04 100644
--- a/sc/inc/cellvalues.hxx
+++ b/sc/inc/cellvalues.hxx
@@ -13,10 +13,12 @@
 #include 
 
 class ScColumn;
+struct ScRefCellValue;
 
 namespace sc {
 
 struct CellValuesImpl;
+struct CellTextAttr;
 
 /**
  * Think of this as a mini-ScColumn like storage that only stores cell
@@ -33,10 +35,21 @@ public:
 CellValues();
 ~CellValues();
 
+/**
+ * Transfer values from specified column.  The transferred segment in the
+ * source column becomes empty after this call.
+ *
+ * @param rCol source column to transfer values from.
+ * @param nRow top row position in the source column.
+ * @param nLen length of the segment to transfer.
+ */
 void transferFrom( ScColumn& rCol, SCROW nRow, size_t nLen );
+
+void transferTo( ScColumn& rCol, SCROW nRow );
 void copyTo( ScColumn& rCol, SCROW nRow ) const;
 
 void assign( const std::vector& rVals );
+void append( ScRefCellValue& rVal, const CellTextAttr* pAttr );
 
 size_t size() const;
 
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 1fc84ca..10970df 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -566,6 +566,7 @@ public:
 void RegroupFormulaCells();
 
 void TransferCellValuesTo( SCROW nRow, size_t nLen, sc::CellValues& rDest 
);
+void TransferCellValuesFrom( SCROW nRow, sc::CellValues& rSrc );
 void CopyCellValuesFrom( SCROW nRow, const sc::CellValues& rSrc );
 
 #if DEBUG_COLUMN_STORAGE
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 542979f..5ddcc5c 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -916,6 +916,7 @@ public:
 SCCOL nColDelta, SCROW nRowDelta );
 
 void TransferCellValuesTo( SCCOL nCol, SCROW nRow, size_t nLen, 
sc::CellValues& rDest );
+void TransferCellValuesFrom( SCCOL nCol, SCROW nRow, sc::CellValues& rSrc 
);
 void CopyCellValuesFrom( SCCOL nCol, SCROW nRow, const sc::CellValues& 
rSrc );
 
 #if DEBUG_COLUMN_STORAGE
diff --git a/sc/source/core/data/cellvalues.cxx 
b/sc/source/core/data/cellvalues.cxx
index 423fa26..38ce4e8 100644
--- a/sc/source/core/data/cellvalues.cxx
+++ b/sc/source/core/data/cellvalues.cxx
@@ -9,6 +9,7 @@
 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -37,6 +38,15 @@ void CellValues::transferFrom( ScColumn& rCol, SCROW nRow, 
size_t nLen )
 rCol.maCellTextAttrs.transfer(nRow, nRow+nLen-1, mpImpl->maCellTextAttrs, 
0);
 }
 
+void CellValues::transferTo( ScColumn& rCol, SCROW nRow )
+{
+assert(mpImpl->maCells.size() == mpImpl->maCellTextAttrs.size());
+
+size_t nLen = mpImpl->maCells.size();
+mpImpl->maCells.transfer(0, nLen-1, rCol.maCells, nRow);
+mpImpl->maCellTextAttrs.transfer(0, nLen-1, rCol.maCellTextAttrs, nRow);
+}
+
 void CellValues::copyTo( ScColumn& rCol, SCROW nRow ) const
 {
 copyCellsTo(rCol, nRow);
@@ -54,6 +64,55 @@ void CellValues::assign( const std::vector& rVals )
 mpImpl->maCellTextAttrs.set(0, aDefaults.begin(), aDefaults.end());
 }
 
+void CellValues::append( ScRefCellValue& rVal, const CellTextAttr* pAttr )
+{
+assert(mpImpl->maCells.size() == mpImpl->maCellTextAttrs.size());
+
+size_t n = mpImpl->maCells.size();
+
+bool bAppendAttr = true;
+
+switch (rVal.meType)
+{
+case CELLTYPE_STRING:
+{
+mpImpl->maCells.resize(n+1);
+mpImpl->maCells.set(n, *rVal.mpString);
+}
+break;
+case CELLTYPE_VALUE:
+{
+mpImpl->maCells.resize(n+1);
+mpImpl->maCells.set(n, rVal.mfValue);
+}
+break;
+case CELLTYPE_EDIT:
+{
+mpImpl->maCells.resize(n+1);
+mpImpl->maCells.set(n, rVal.mpEditText->Clone());
+}
+break;
+case CELLTYPE_FORMULA:
+{
+mpImpl->maCells.resize(n+1);
+
+// TODO : Handle this.
+}
+default:
+

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

[Eike Rathke]

 framework/inc/helper/mischelper.hxx |3 --
 framework/source/fwi/helper/mischelper.cxx  |   13 
--
 framework/source/uielement/langselectionmenucontroller.cxx  |7 ++---
 framework/source/uielement/langselectionstatusbarcontroller.cxx |   13 
+++---
 include/svx/langbox.hxx |1 
 5 files changed, 14 insertions(+), 23 deletions(-)

New commits:
commit 619b4c40da9e85febbb08a3f7cf8aa8d10963fc1
Author: Eike Rathke 
Date:   Fri Apr 18 02:02:47 2014 +0200

and again ... geez..

Change-Id: Ib74e4690de547612bbc58ad7db650cf37931d7dd

diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx 
b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index df3f2bc..78733cf 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -194,7 +194,7 @@ throw (css::uno::RuntimeException)
 }
 
 xPopupMenu->insertItem( MID_LANG_SEL_NONE,  
FWK_RESSTR(STR_LANGSTATUS_NONE), 0, MID_LANG_SEL_NONE );
-if ( SvtLanguageTable::GetLanguageString( LANGUAGE_NONE ) == m_aCurLang )
+if ( sNone == m_aCurLang )
 xPopupMenu->checkItem( MID_LANG_SEL_NONE, sal_True );
 xPopupMenu->insertItem( MID_LANG_SEL_RESET, 
FWK_RESSTR(STR_RESET_TO_DEFAULT_LANGUAGE), 0, MID_LANG_SEL_RESET );
 xPopupMenu->insertItem( MID_LANG_SEL_MORE,  
FWK_RESSTR(STR_LANGSTATUS_MORE), 0, MID_LANG_SEL_MORE );
commit 14f917058e214b4796856655fc3989366bd67139
Author: Eike Rathke 
Date:   Fri Apr 18 02:01:20 2014 +0200

and again

Change-Id: I79fd5b90fd79f55bd80a4ab297192114aae5da42

diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx 
b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index b2f3d45..df3f2bc 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -204,7 +204,7 @@ throw (css::uno::RuntimeException)
 for (it = aLangItems.begin(); it != aLangItems.end(); ++it)
 {
 const OUString & rStr( *it );
-if( rStr != OUString( SvtLanguageTable::GetLanguageString( 
LANGUAGE_NONE ) )&&
+if( rStr != sNone &&
 rStr != sAsterisk &&
 rStr != sEmpty)
 {
commit 131edeac010f61918bd9403f5e7e2cb2025dedd9
Author: Eike Rathke 
Date:   Fri Apr 18 02:00:31 2014 +0200

why obtain the string in each iteration again

Change-Id: I3faf1d27bb11eeabbe91da32d35480c9381c50e2

diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx 
b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index 7d3e9be..b2f3d45 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -170,12 +170,13 @@ throw (css::uno::RuntimeException)
 sal_Int16 nItemId = static_cast< sal_Int16 >(MID_LANG_SEL_1);
 const OUString sAsterisk("*");  // multiple languages in current selection
 const OUString sEmpty;  // 'no language found' from language guessing
+const OUString sNone( SvtLanguageTable::GetLanguageString( LANGUAGE_NONE 
));
 std::map< sal_Int16, OUString > aLangMap;
 std::set< OUString >::const_iterator it;
 for (it = aLangItems.begin(); it != aLangItems.end(); ++it)
 {
 const OUString & rStr( *it );
-if ( rStr != OUString( SvtLanguageTable::GetLanguageString( 
LANGUAGE_NONE ) ) &&
+if ( rStr != sNone &&
  rStr != sAsterisk &&
  rStr != sEmpty)
 {
commit d4ccbef95dd026a489d920d8a0929a84984b6250
Author: Eike Rathke 
Date:   Fri Apr 18 01:58:42 2014 +0200

why obtain the string in each iteration again

Change-Id: I78225a0b0b53178e6cb7d534d767f5984604e442

diff --git a/framework/source/uielement/langselectionmenucontroller.cxx 
b/framework/source/uielement/langselectionmenucontroller.cxx
index 3c1cf94..8d1ced1 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -233,11 +233,12 @@ void LanguageSelectionMenuController::fillPopupMenu( 
Reference< css::awt::XPopup
 sal_Int16 nItemId = 1;  // in this control the item id is not important 
for executing the command
 const OUString sAsterisk("*");  // multiple languages in current selection
 const OUString sEmpty;  // 'no language found' from language guessing
+const OUString sNone( SvtLanguageTable::GetLanguageString( LANGUAGE_NONE 
));
 std::set< OUString >::const_iterator it;
 for (it = aLangItems.begin(); it != aLangItems.end(); ++it)
 {
 const OUString & rStr( *it );
-if (rStr != SvtLanguageTable::GetLanguageString( LANGUAGE_NONE ) &&
+if (rStr != sNone &&
 rStr != sAsterisk &&
 rStr != sEmpty)
 {

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

[Eike Rathke]

 include/svx/langbox.hxx   |1 -
 svx/source/dialog/langbox.cxx |   10 --
 2 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 7531f838c89b0e1d0826d4144ad2d0c70a41e1aa
Author: Eike Rathke 
Date:   Fri Apr 18 01:03:55 2014 +0200

we don't even need an instance of SvtLanguageTable at SvxLanguageBox

Change-Id: I7ccefc73d7f6e5b7c41d6819ae13116af9d5b5ef

diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index 8885064..0208142 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -57,7 +57,6 @@ private:
 Image   m_aCheckedImage;
 OUStringm_aAllString;
 com::sun::star::uno::Sequence< sal_Int16 >  *m_pSpellUsedLang;
-SvtLanguageTable*   m_pLangTable;
 sal_Int16   m_nLangList;
 boolm_bHasLangNone;
 boolm_bLangNoneIsLangAll;
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 4e206af..ae89cf4 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -143,7 +143,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL 
makeSvxLanguageBox(Window *pPar
 
 void SvxLanguageBox::Init()
 {
-m_pLangTable = new SvtLanguageTable;
 m_aNotCheckedImage = Image( SVX_RES( RID_SVXIMG_NOTCHECKED ) );
 m_aCheckedImage = Image( SVX_RES( RID_SVXIMG_CHECKED ) );
 m_aAllString= SVX_RESSTR( RID_SVXSTR_LANGUAGE_ALL );
@@ -180,7 +179,6 @@ void SvxLanguageBox::Init()
 SvxLanguageBox::~SvxLanguageBox()
 {
 delete m_pSpellUsedLang;
-delete m_pLangTable;
 }
 
 
@@ -340,7 +338,7 @@ sal_Int32 SvxLanguageBox::ImplInsertLanguage( const 
LanguageType nLangType, sal_
 return nAt;
 }
 
-OUString aStrEntry = m_pLangTable->GetString( nLang );
+OUString aStrEntry = SvtLanguageTable::GetLanguageString( nLang );
 if (LANGUAGE_NONE == nLang && m_bHasLangNone && m_bLangNoneIsLangAll)
 aStrEntry = m_aAllString;
 
@@ -349,11 +347,11 @@ sal_Int32 SvxLanguageBox::ImplInsertLanguage( const 
LanguageType nLangType, sal_
 {
 nRealLang = MsLangId::resolveSystemLanguageByScriptType(nRealLang, 
nType);
 aStrEntry += " - ";
-aStrEntry += m_pLangTable->GetString( nRealLang );
+aStrEntry += SvtLanguageTable::GetLanguageString( nRealLang );
 } else if (nRealLang == LANGUAGE_USER_SYSTEM_CONFIG) {
 nRealLang = MsLangId::getSystemLanguage();
 aStrEntry += " - ";
-aStrEntry += m_pLangTable->GetString( nRealLang );
+aStrEntry += SvtLanguageTable::GetLanguageString( nRealLang );
 }
 
 aStrEntry = ApplyLreOrRleEmbedding( aStrEntry );
@@ -411,7 +409,7 @@ sal_Int32 SvxLanguageBox::InsertLanguage( const 
LanguageType nLangType,
 return nAt;
 }
 
-OUString aStrEntry = m_pLangTable->GetString( nLang );
+OUString aStrEntry = SvtLanguageTable::GetLanguageString( nLang );
 if (LANGUAGE_NONE == nLang && m_bHasLangNone && m_bLangNoneIsLangAll)
 aStrEntry = m_aAllString;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 Repository.mk|   37 +-
 scp2/source/extensions/file_extensions.scp   |4 -
 scp2/source/extensions/module_extensions.scp |2 
 scp2/source/ooo/file_ooo.scp |   55 ---
 scp2/source/ooo/module_hidden_ooo.scp|   14 --
 scp2/source/ooo/module_reportbuilder.scp |5 --
 6 files changed, 21 insertions(+), 96 deletions(-)

New commits:
commit 2580b5dd875f7a8d12b652128e27aaea7d9b6403
Author: Michael Stahl 
Date:   Thu Apr 17 23:44:54 2014 +0200

these wizards Jars are gone as well

Change-Id: Ie3010431f69169d022d19c5ba6ff234adf191750

diff --git a/Repository.mk b/Repository.mk
index fc83489..e255636 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -677,13 +677,6 @@ $(eval $(call 
gb_Helper_register_jars_for_install,OOO,extensions_rhino, \
 ))
 endif
 
-$(eval $(call gb_Helper_register_jars,OOO, \
-   agenda \
-   fax \
-   letter \
-   web \
-))
-
 $(eval $(call gb_Helper_register_jars,OXT, \
EvolutionarySolver \
active_java \
commit 23c6fa8cece31cf4fd1ebd01253910beb07bef73
Author: Michael Stahl 
Date:   Thu Apr 17 23:41:54 2014 +0200

XMerge based filters removed in a5783fe922b2419b5b662eb5f544a1f401341dbf

Change-Id: Idd5dae2843f774fdee49a5f2d5eb26022746c5c1

diff --git a/Repository.mk b/Repository.mk
index cee72b8..fc83489 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -679,12 +679,8 @@ endif
 
 $(eval $(call gb_Helper_register_jars,OOO, \
agenda \
-   aportisdoc \
fax \
-   htmlsoff \
letter \
-   pexcel \
-   pocketword \
web \
 ))
 
commit 96d36e876441f8ec9b2f1a05ab0a5f82f271e6cc
Author: Michael Stahl 
Date:   Thu Apr 17 23:39:38 2014 +0200

XSLTFilter/XSLTValidate jars are gone

removed by bfc71eb03e2bc6f26d53f70b32f9a8937086808b and
143f0b895fb2c0a1449af4f6f307487900921cbe

Change-Id: Iaf6e99c15356ebe08cfb1d386a6dab97f47a730a

diff --git a/Repository.mk b/Repository.mk
index a57ab08..cee72b8 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -678,8 +678,6 @@ $(eval $(call 
gb_Helper_register_jars_for_install,OOO,extensions_rhino, \
 endif
 
 $(eval $(call gb_Helper_register_jars,OOO, \
-   XSLTFilter \
-   XSLTValidate \
agenda \
aportisdoc \
fax \
commit 31c32c14259e8479e61456230804e3e3b0f42067
Author: Michael Stahl 
Date:   Thu Apr 17 23:37:30 2014 +0200

ConnectivityTools is not installed, used by JunitTests

Change-Id: Id095087d05b64119f80e2c1d476091765f017afa

diff --git a/Repository.mk b/Repository.mk
index b669b8a..a57ab08 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -678,7 +678,6 @@ $(eval $(call 
gb_Helper_register_jars_for_install,OOO,extensions_rhino, \
 endif
 
 $(eval $(call gb_Helper_register_jars,OOO, \
-   ConnectivityTools \
XSLTFilter \
XSLTValidate \
agenda \
@@ -700,6 +699,7 @@ $(eval $(call gb_Helper_register_jars,OXT, \
 ))
 
 $(eval $(call gb_Helper_register_jars,NONE,\
+   ConnectivityTools \
HelloWorld \
Highlight \
MemoryUsage \
commit e9ae308a1675debfccda866264dc6c85f19cf8cb
Author: Michael Stahl 
Date:   Thu Apr 17 23:33:05 2014 +0200

scp2: move reportbuilder Jars to AutoInstall

Change-Id: Ie8e8e4e5278278eecc1a6e54dbb70389df3e7155

diff --git a/Repository.mk b/Repository.mk
index adce4a2..b669b8a 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -660,6 +660,11 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,ooo, 
\
xmerge \
 ))
 
+$(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_rhino, \
+   reportbuilder \
+   reportbuilderwizard \
+))
+
 ifneq ($(ENABLE_SCRIPTING_BEANSHELL),)
 $(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_bsh, \
ScriptProviderForBeanShell \
@@ -683,8 +688,6 @@ $(eval $(call gb_Helper_register_jars,OOO, \
letter \
pexcel \
pocketword \
-   reportbuilder \
-   reportbuilderwizard \
web \
 ))
 
diff --git a/scp2/source/ooo/module_reportbuilder.scp 
b/scp2/source/ooo/module_reportbuilder.scp
index 1245e7f..ff2502b 100644
--- a/scp2/source/ooo/module_reportbuilder.scp
+++ b/scp2/source/ooo/module_reportbuilder.scp
@@ -23,8 +23,6 @@ Module gid_Module_Reportbuilder
 gid_File_Lib_Rpt,
 gid_File_Lib_Rptui,
 gid_File_Lib_Rptxml,
-gid_File_Jar_Reportbuilder,
-gid_File_Jar_Reportbuilderwizard,
 gid_File_Xcd_Reportbuilder,
 gid_Filelist_ReportbuilderTemplates);
 End
@@ -34,9 +32,6 @@ Directory gid_Dir_Share_Reportbuilder
 DosName = "reportbuilder";
 End
 
-STD_JAR_FILE( gid_File_Jar_Reportbuilder, reportbuilder )
-STD_JAR_FILE( gid_File_Jar_Reportbuilderwizard, reportbuilderwizard )
-
 File gid_File_Xcd_Reportbuilder
 TXT_FILE_BODY;
 Dir = gid_Brand_Dir_Share_Registry;
commit 4a3e8aaa3199a056975bfe2f96748d742d3313b0
Author: Michael Stahl 
Date:

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

[Eike Rathke]

 cui/source/options/optgdlg.cxx  |   10 --
 include/svtools/langtab.hxx |1 +
 svtools/source/misc/langtab.cxx |7 ++-
 3 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 1ba03cff6f9f2ba3f3912818c301ce7a07bf6027
Author: Eike Rathke 
Date:   Thu Apr 17 23:56:35 2014 +0200

and another temporary SvtLanguageTable instance is moot

Change-Id: Ia6d9d46124c04018f3f8a4fd6208f29054e5c94c

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 7ae17fd..db279d0 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1026,12 +1026,11 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* 
pParent, const SfxItemSet& rSe
 get(m_pIgnoreLanguageChangeCB, "ignorelanguagechange");
 
 // initialize user interface language selection
-SvtLanguageTable* pLanguageTable = new SvtLanguageTable;
-m_sSystemDefaultString = pLanguageTable->GetString( LANGUAGE_SYSTEM );
+m_sSystemDefaultString = SvtLanguageTable::GetLanguageString( 
LANGUAGE_SYSTEM );
 
 OUString aUILang = m_sSystemDefaultString +
" - " +
-   pLanguageTable->GetString( 
Application::GetSettings().GetUILanguageTag().getLanguageType(), true );
+   SvtLanguageTable::GetLanguageString( 
Application::GetSettings().GetUILanguageTag().getLanguageType(), true );
 
 m_pUserInterfaceLB->InsertEntry(aUILang);
 m_pUserInterfaceLB->SetEntryData(0, 0);
@@ -1056,7 +1055,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* 
pParent, const SfxItemSet& rSe
 if (aLang != LANGUAGE_DONTKNOW)
 {
 //sal_uInt16 p = m_pUserInterfaceLB->InsertLanguage(aLang);
-OUString aLangStr( pLanguageTable->GetString( aLang, true ) );
+OUString aLangStr( SvtLanguageTable::GetLanguageString( aLang, 
true ) );
 sal_uInt16 p = m_pUserInterfaceLB->InsertEntry(aLangStr);
 m_pUserInterfaceLB->SetEntryData(p, (void*)(i+1));
 }
@@ -1116,11 +1115,10 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* 
pParent, const SfxItemSet& rSe
  pCurr->GetSymbol();
 aStr_ = ApplyLreOrRleEmbedding( aStr_ ) +
 aTwoSpace +
-ApplyLreOrRleEmbedding( pLanguageTable->GetString( 
pCurr->GetLanguage() ) );
+ApplyLreOrRleEmbedding( SvtLanguageTable::GetLanguageString( 
pCurr->GetLanguage() ) );
 sal_uInt16 nPos = m_pCurrencyLB->InsertEntry( aStr_ );
 m_pCurrencyLB->SetEntryData( nPos, (void*) pCurr );
 }
-delete pLanguageTable;
 
 m_pLocaleSettingLB->SetSelectHdl( LINK( this, OfaLanguagesTabPage, 
LocaleSettingHdl ) );
 m_pDatePatternsED->SetModifyHdl( LINK( this, OfaLanguagesTabPage, 
DatePatternsHdl ) );
commit e84331b4fdbbdca1e221c990578aaf889038d60a
Author: Eike Rathke 
Date:   Thu Apr 17 23:53:11 2014 +0200

introduce second static GetLanguageString() with explicit bool parameter

Change-Id: Ief79b8871701cc2e39e421145370feb246ce5e20

diff --git a/include/svtools/langtab.hxx b/include/svtools/langtab.hxx
index 7521313..7f437e0 100644
--- a/include/svtools/langtab.hxx
+++ b/include/svtools/langtab.hxx
@@ -47,6 +47,7 @@ public:
 LanguageTypeGetTypeAtIndex( sal_uInt32 nIndex ) const;
 
 static OUString GetLanguageString( const LanguageType eType );
+static OUString GetLanguageString( const LanguageType eType, bool 
bUserInterfaceSelection );
 static LanguageType GetLanguageType( const OUString& rStr );
 };
 
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index e5c7cc4..236f074 100644
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.cxx
@@ -154,7 +154,12 @@ const OUString SvtLanguageTable::GetString( const 
LanguageType eType, bool bUser
 
 OUString SvtLanguageTable::GetLanguageString( const LanguageType eType )
 {
-return theLanguageTable::get().GetString( eType );
+return theLanguageTable::get().GetString( eType, false );
+}
+
+OUString SvtLanguageTable::GetLanguageString( const LanguageType eType, bool 
bUserInterfaceSelection )
+{
+return theLanguageTable::get().GetString( eType, bUserInterfaceSelection );
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 5 commits - cui/source include/svtools svtools/source sw/source

[Eike Rathke]

 cui/source/dialogs/thesdlg.cxx  |2 +-
 include/svtools/langtab.hxx |4 +++-
 svtools/source/misc/langtab.cxx |   12 +---
 sw/source/core/uibase/lingu/olmenu.cxx  |   18 --
 sw/source/core/uibase/shells/langhelper.cxx |2 +-
 5 files changed, 22 insertions(+), 16 deletions(-)

New commits:
commit f3501ee89ff65cd40468e84f4d9fb52f12a67b0f
Author: Eike Rathke 
Date:   Thu Apr 17 23:43:22 2014 +0200

now no temporary instance of SvtLanguageTable necessary here anymore

Change-Id: I8154d8d198ba0826f24cb1da65d2de4fc1943517

diff --git a/sw/source/core/uibase/shells/langhelper.cxx 
b/sw/source/core/uibase/shells/langhelper.cxx
index 53adf42..e3ec901 100644
--- a/sw/source/core/uibase/shells/langhelper.cxx
+++ b/sw/source/core/uibase/shells/langhelper.cxx
@@ -233,7 +233,7 @@ namespace SwLangHelper
 
 void SetLanguage( SwWrtShell &rWrtSh, OutlinerView* pOLV, ESelection 
aSelection, const OUString &rLangText, bool bIsForSelection, SfxItemSet 
&rCoreSet )
 {
-const LanguageType nLang = SvtLanguageTable().GetType( rLangText );
+const LanguageType nLang = SvtLanguageTable::GetLanguageType( 
rLangText );
 if (nLang != LANGUAGE_DONTKNOW)
 {
 sal_uInt16 nScriptType = 
SvtLanguageOptions::GetScriptTypeOfLanguage( nLang );
commit d7992dbf924c229c8e913913b15b2d5c42012baa
Author: Eike Rathke 
Date:   Thu Apr 17 23:40:27 2014 +0200

now no temporary instance of SvtLanguageTable necessary here anymore

Change-Id: I8eaaee1fd45efc71b1acdcf36360bca11b30dbfc

diff --git a/sw/source/core/uibase/lingu/olmenu.cxx 
b/sw/source/core/uibase/lingu/olmenu.cxx
index 59e9047..682df9a 100644
--- a/sw/source/core/uibase/lingu/olmenu.cxx
+++ b/sw/source/core/uibase/lingu/olmenu.cxx
@@ -122,8 +122,6 @@ void SwSpellPopup::fillLangPopupMenu(
 if (!pPopupMenu)
 return;
 
-SvtLanguageTableaLanguageTable;
-
 // set of languages to be displayed in the sub menus
 std::set< OUString > aLangItems;
 
@@ -133,7 +131,7 @@ void SwSpellPopup::fillLangPopupMenu(
 OUStringaGuessedTextLang( aSeq[3] );
 
 if (!aCurLang.isEmpty() &&
-LANGUAGE_DONTKNOW != aLanguageTable.GetType( aCurLang ))
+LANGUAGE_DONTKNOW != SvtLanguageTable::GetLanguageType( aCurLang ))
 aLangItems.insert( aCurLang );
 
 //2--System
@@ -142,7 +140,7 @@ void SwSpellPopup::fillLangPopupMenu(
 if (rSystemLanguage != LANGUAGE_DONTKNOW)
 {
 if (lcl_checkScriptType( nScriptType, rSystemLanguage ))
-aLangItems.insert( aLanguageTable.GetString(rSystemLanguage) );
+aLangItems.insert( 
SvtLanguageTable::GetLanguageString(rSystemLanguage) );
 }
 
 //3--UI
@@ -150,20 +148,20 @@ void SwSpellPopup::fillLangPopupMenu(
 if (rUILanguage != LANGUAGE_DONTKNOW)
 {
 if (lcl_checkScriptType(nScriptType, rUILanguage ))
-aLangItems.insert( aLanguageTable.GetString(rUILanguage) );
+aLangItems.insert( 
SvtLanguageTable::GetLanguageString(rUILanguage) );
 }
 
 //4--guessed language
 if (!aGuessedTextLang.isEmpty())
 {
-if (lcl_checkScriptType(nScriptType, 
aLanguageTable.GetType(aGuessedTextLang)))
+if (lcl_checkScriptType(nScriptType, 
SvtLanguageTable::GetLanguageType(aGuessedTextLang)))
 aLangItems.insert( aGuessedTextLang );
 }
 
 //5--keyboard language
 if (!aKeyboardLang.isEmpty())
 {
-if (lcl_checkScriptType(nScriptType, 
aLanguageTable.GetType(aKeyboardLang)))
+if (lcl_checkScriptType(nScriptType, 
SvtLanguageTable::GetLanguageType(aKeyboardLang)))
 aLangItems.insert( aKeyboardLang );
 }
 
@@ -189,7 +187,7 @@ void SwSpellPopup::fillLangPopupMenu(
 if (aLangItems.size() == (size_t)nMaxCount)
 break;
 const lang::Locale& rLocale = rLocales[i];
-if (lcl_checkScriptType( nScriptType, aLanguageTable.GetType( 
rLocale.Language )))
+if (lcl_checkScriptType( nScriptType, 
SvtLanguageTable::GetLanguageType( rLocale.Language )))
 aLangItems.insert( rLocale.Language );
 }
 }
@@ -200,7 +198,7 @@ void SwSpellPopup::fillLangPopupMenu(
 for (it = aLangItems.begin(); it != aLangItems.end(); ++it)
 {
 OUString aEntryTxt( *it );
-if (aEntryTxt != OUString( aLanguageTable.GetString( LANGUAGE_NONE ) 
)&&
+if (aEntryTxt != OUString( SvtLanguageTable::GetLanguageString( 
LANGUAGE_NONE ) )&&
 aEntryTxt != "*" && // multiple languages in current selection
 !aEntryTxt.isEmpty()) // 'no language found' from language guessing
 {
@@ -218,7 +216,7 @@ void SwSpellPopup::fillLangPopupMenu(
 }
 
 pPopupMenu->InsertItem( nLangItemIdStart + MN_NONE_OFFSET,  
OUString(SW_RES( STR_LANGSTATUS_NONE )), MIB_RADIOCHECK );
-if ( aLanguageTable.GetString( LANGUAG

[ANN] LIbreOffice 4.2.4 RC1 available

[Christian Lohmaier]

Dear Community,

The Document Foundation is pleased to announce the first release
candidate of LibreOffice 4.2.4. The upcoming 4.2.4 will be the fourth
in a sequence of frequent bugfix releases for our feature-packed 4.2
line. Feel free to give it a try instead of 4.2.3. Conservative users
should continue to use LibreOffice 4.1.5

The release is available for Windows, Linux and Mac OS X from our QA
builds download page at

  http://www.libreoffice.org/download/pre-releases/

Developers and QA might also be interested in the symbol server for
windows debug information (see the release notes linked below for
details)

Should you find bugs, please report them to the FreeDesktop Bugzilla:

  https://bugs.freedesktop.org

A good way to assess the release candidate quality is to run some
specific manual tests on it, our TCM wiki page has more details:

 
http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test

For other ways to get involved with this exciting project - you can
e.g. contribute code:

  http://www.libreoffice.org/community/developers/

translate LibreOffice to your language:

  http://wiki.documentfoundation.org/LibreOffice_Localization_Guide

or help with funding our operations:

  http://donate.libreoffice.org/

A list of known issues and fixed bugs with 4.2.4 RC1 is available
from our wiki:

  http://wiki.documentfoundation.org/Releases/4.2.4/RC1

Let us close again with a BIG Thank You! to all of you having
contributed to the LibreOffice project - this release would not have
been possible without your help.

On behalf of the Community,

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

[Libreoffice-commits] core.git: 13 commits - basctl/source cui/source editeng/source sc/source svx/source sw/source

[Eike Rathke]

 basctl/source/basicide/basicbox.cxx |3 +--
 basctl/source/dlged/managelang.cxx  |3 +--
 cui/source/dialogs/thesdlg.cxx  |8 
 cui/source/options/opthtml.cxx  |3 +--
 editeng/source/items/textitem.cxx   |3 +--
 sc/source/ui/view/viewfun4.cxx  |3 +--
 svx/source/items/numfmtsh.cxx   |8 ++--
 sw/source/core/uibase/lingu/olmenu.cxx  |   14 ++
 sw/source/core/uibase/shells/langhelper.cxx |6 ++
 sw/source/core/uibase/shells/textsh1.cxx|6 ++
 sw/source/core/uibase/uno/unotxdoc.cxx  |3 +--
 11 files changed, 22 insertions(+), 38 deletions(-)

New commits:
commit d112cf387513231b6bc133e5d37ba51f4bc4c6ac
Author: Eike Rathke 
Date:   Thu Apr 17 23:12:38 2014 +0200

no temporary instance of SvtLanguageTable necessary here

Change-Id: I19de12c9199dec3d922334a16649142acaea0235

diff --git a/sw/source/core/uibase/lingu/olmenu.cxx 
b/sw/source/core/uibase/lingu/olmenu.cxx
index d619926..59e9047 100644
--- a/sw/source/core/uibase/lingu/olmenu.cxx
+++ b/sw/source/core/uibase/lingu/olmenu.cxx
@@ -561,27 +561,26 @@ m_aInfo16( SW_RES(IMG_INFO_16) )
 //ADD NEW LANGUAGE MENU ITEM
 
 OUString aScriptTypesInUse( OUString::number( pWrtSh->GetScriptType() ) );
-SvtLanguageTable aLanguageTable;
 
 // get keyboard language
 OUString aKeyboardLang;
 SwEditWin& rEditWin = pWrtSh->GetView().GetEditWin();
 LanguageType nLang = rEditWin.GetInputLanguage();
 if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM)
-aKeyboardLang = aLanguageTable.GetString( nLang );
+aKeyboardLang = SvtLanguageTable::GetLanguageString( nLang );
 
 // get the language that is in use
 OUString aCurrentLang("*");
 nLang = SwLangHelper::GetCurrentLanguage( *pWrtSh );
 if (nLang != LANGUAGE_DONTKNOW)
-aCurrentLang = aLanguageTable.GetString( nLang );
+aCurrentLang = SvtLanguageTable::GetLanguageString( nLang );
 
 // build sequence for status value
 uno::Sequence< OUString > aSeq( 4 );
 aSeq[0] = aCurrentLang;
 aSeq[1] = aScriptTypesInUse;
 aSeq[2] = aKeyboardLang;
-aSeq[3] = aLanguageTable.GetString(m_nGuessLangWord);
+aSeq[3] = SvtLanguageTable::GetLanguageString(m_nGuessLangWord);
 
 PopupMenu *pMenu = GetPopupMenu(MN_SET_LANGUAGE_SELECTION);
 fillLangPopupMenu( pMenu, MN_SET_LANGUAGE_SELECTION_START, aSeq, pWrtSh, 
m_aLangTable_Text );
commit b9ba0528d96c7c38824db7f9b3f5ba17a49c82be
Author: Eike Rathke 
Date:   Thu Apr 17 23:09:45 2014 +0200

no temporary instance of SvtLanguageTable necessary here

Change-Id: I7a32bc6391630266eb548c4fa2c7b9dedec3697c

diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index 5c4b0af..9e464d0 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -1515,13 +1515,11 @@ void 
SvxNumberFormatShell::GetCurrencySymbols(std::vector& rList, bool
 const NfCurrencyTable& 
rCurrencyTable=SvNumberFormatter::GetTheCurrencyTable();
 sal_uInt16 nCount=rCurrencyTable.size();
 
-SvtLanguageTable* pLanguageTable=new SvtLanguageTable;
-
 sal_uInt16 nStart=1;
 
 OUString aString( ApplyLreOrRleEmbedding( rCurrencyTable[0].GetSymbol()));
 aString += " ";
-aString += ApplyLreOrRleEmbedding( pLanguageTable->GetString( 
rCurrencyTable[0].GetLanguage()));
+aString += ApplyLreOrRleEmbedding( SvtLanguageTable::GetLanguageString( 
rCurrencyTable[0].GetLanguage()));
 
 rList.push_back(aString);
 sal_uInt16 nAuto=(sal_uInt16)-1;
@@ -1545,7 +1543,7 @@ void 
SvxNumberFormatShell::GetCurrencySymbols(std::vector& rList, bool
 aStr += aTwoSpace;
 aStr += ApplyLreOrRleEmbedding( rCurrencyTable[i].GetSymbol());
 aStr += aTwoSpace;
-aStr += ApplyLreOrRleEmbedding( pLanguageTable->GetString( 
rCurrencyTable[i].GetLanguage()));
+aStr += ApplyLreOrRleEmbedding( SvtLanguageTable::GetLanguageString( 
rCurrencyTable[i].GetLanguage()));
 
 sal_uInt16 j = nStart;
 for(; j < rList.size(); ++j)
@@ -1580,8 +1578,6 @@ void 
SvxNumberFormatShell::GetCurrencySymbols(std::vector& rList, bool
 aCurCurrencyList.insert(aCurCurrencyList.begin()+j, i);
 }
 }
-
-delete pLanguageTable;
 }
 
 void SvxNumberFormatShell::SetCurrencySymbol(sal_uInt32 nPos)
commit 5684e67aa8f046d43ac0e97730bd8cd30dcf31f0
Author: Eike Rathke 
Date:   Thu Apr 17 23:06:08 2014 +0200

no temporary instance of SvtLanguageTable necessary here

Change-Id: I35395e169e795386740fb2b5ee34fc3117b8c844

diff --git a/editeng/source/items/textitem.cxx 
b/editeng/source/items/textitem.cxx
index 8b3e357..e4b5b8d 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -2582,8 +2582,7 @@ SfxItemPresentation SvxLanguageItem::GetPresentation
 case SFX_ITEM_PRESENTATION_NAMELESS:
 case SFX_ITEM_PRESENTAT

[Libreoffice-commits] core.git: chart2/CppunitTest_chart2_export.mk chart2/CppunitTest_chart2_import.mk chart2/CppunitTest_chart2_xshape.mk dbaccess/CppunitTest_dbaccess_dialog_save.mk dbaccess/Cppuni

[Tor Lillqvist]

 chart2/CppunitTest_chart2_export.mk   |1 -
 chart2/CppunitTest_chart2_import.mk   |1 -
 chart2/CppunitTest_chart2_xshape.mk   |1 -
 dbaccess/CppunitTest_dbaccess_dialog_save.mk  |1 -
 dbaccess/CppunitTest_dbaccess_macros_test.mk  |1 -
 postprocess/Rdb_services.mk   |2 +-
 sc/CppunitTest_sc_annotationobj.mk|1 -
 sc/CppunitTest_sc_annotationshapeobj.mk   |1 -
 sc/CppunitTest_sc_annotationsobj.mk   |1 -
 sc/CppunitTest_sc_cellrangeobj.mk |1 -
 sc/CppunitTest_sc_chart_regression_test.mk|1 -
 sc/CppunitTest_sc_databaserangeobj.mk |1 -
 sc/CppunitTest_sc_datapilotfieldobj.mk|1 -
 sc/CppunitTest_sc_datapilottableobj.mk|1 -
 sc/CppunitTest_sc_editfieldobj_cell.mk|1 -
 sc/CppunitTest_sc_editfieldobj_header.mk  |1 -
 sc/CppunitTest_sc_filters_test.mk |1 -
 sc/CppunitTest_sc_macros_test.mk  |1 -
 sc/CppunitTest_sc_modelobj.mk |1 -
 sc/CppunitTest_sc_namedrangeobj.mk|1 -
 sc/CppunitTest_sc_namedrangesobj.mk   |1 -
 sc/CppunitTest_sc_opencl_test.mk  |1 -
 sc/CppunitTest_sc_outlineobj.mk   |1 -
 sc/CppunitTest_sc_rangelst_test.mk|1 -
 sc/CppunitTest_sc_subsequent_export_test.mk   |1 -
 sc/CppunitTest_sc_subsequent_filters_test.mk  |1 -
 sc/CppunitTest_sc_tableautoformatfield.mk |1 -
 sc/CppunitTest_sc_tablesheetobj.mk|1 -
 sc/CppunitTest_sc_tablesheetsobj.mk   |1 -
 sc/CppunitTest_sc_ucalc.mk|2 +-
 sd/CppunitTest_sd_filters_test.mk |1 -
 sd/CppunitTest_sd_html_export_tests.mk|1 -
 sd/CppunitTest_sd_import_tests.mk |2 +-
 sd/CppunitTest_sd_uimpress.mk |2 +-
 slideshow/CppunitTest_slideshow.mk|1 -
 slideshow/source/engine/shapes/viewmediashape.cxx |   11 +--
 sw/CppunitTest_sw_layout_test.mk  |1 -
 sw/CppunitTest_sw_macros_test.mk  |1 -
 sw/CppunitTest_sw_uwriter.mk  |2 +-
 39 files changed, 14 insertions(+), 40 deletions(-)

New commits:
commit be862ff4f7239497625125067c646bf5adab7741
Author: Tor Lillqvist 
Date:   Fri Apr 18 00:05:44 2014 +0300

Try making it possible to use --disable-avmedia for desktop platforms too

Unfinished work in progress.

Change-Id: I978755d73630b8653b169a53f937c1332799e22e

diff --git a/chart2/CppunitTest_chart2_export.mk 
b/chart2/CppunitTest_chart2_export.mk
index ab37efb..de05471 100644
--- a/chart2/CppunitTest_chart2_export.mk
+++ b/chart2/CppunitTest_chart2_export.mk
@@ -21,7 +21,6 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,chart2_export, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,chart2_export, \
-avmedia \
 basegfx \
 comphelper \
 cppu \
diff --git a/chart2/CppunitTest_chart2_import.mk 
b/chart2/CppunitTest_chart2_import.mk
index 0aec8bd..59ed1f0 100644
--- a/chart2/CppunitTest_chart2_import.mk
+++ b/chart2/CppunitTest_chart2_import.mk
@@ -21,7 +21,6 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,chart2_import, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,chart2_import, \
-avmedia \
 basegfx \
 comphelper \
 cppu \
diff --git a/chart2/CppunitTest_chart2_xshape.mk 
b/chart2/CppunitTest_chart2_xshape.mk
index f2b3c15..fd6edb5 100644
--- a/chart2/CppunitTest_chart2_xshape.mk
+++ b/chart2/CppunitTest_chart2_xshape.mk
@@ -21,7 +21,6 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,chart2_xshape, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,chart2_xshape, \
-avmedia \
 basegfx \
 comphelper \
 cppu \
diff --git a/dbaccess/CppunitTest_dbaccess_dialog_save.mk 
b/dbaccess/CppunitTest_dbaccess_dialog_save.mk
index 4d99ed8..66abc7c 100644
--- a/dbaccess/CppunitTest_dbaccess_dialog_save.mk
+++ b/dbaccess/CppunitTest_dbaccess_dialog_save.mk
@@ -18,7 +18,6 @@ $(eval $(call 
gb_CppunitTest_use_externals,dbaccess_dialog_save,\
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,dbaccess_dialog_save, \
-avmedia \
 basegfx \
 comphelper \
 cppu \
diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk 
b/dbaccess/CppunitTest_dbaccess_macros_test.mk
index d5baaea..df8d67b 100644
--- a/dbaccess/CppunitTest_dbaccess_macros_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk
@@ -18,7 +18,6 @@ $(eval $(call 
gb_CppunitTest_use_externals,dbaccess_macros_test,\
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,dbaccess_macros_test, \
-avmedia \
 basegfx \
 comphelper \
 cppu \
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 3e9424c..8053b7d 100644
--- a/postprocess/Rdb_se

[Libreoffice-commits] core.git: config_host/config_features.h.in config_host.mk.in configure.ac forms/Library_frm.mk include/connectivity Repository.mk RepositoryModule_host.mk sc/source sfx2/source s

[Tor Lillqvist]

 Repository.mk |   26 ++
 RepositoryModule_host.mk  |4 ++--
 config_host.mk.in |1 -
 config_host/config_features.h.in  |6 ++
 configure.ac  |   28 +++-
 forms/Library_frm.mk  |2 +-
 include/connectivity/sqlparse.hxx |4 +++-
 sc/source/ui/docshell/docsh8.cxx  |   26 ++
 sfx2/source/doc/objxtor.cxx   |2 +-
 solenv/gbuild/gbuild.mk   |1 -
 svx/source/dialog/txencbox.cxx|5 +++--
 11 files changed, 51 insertions(+), 54 deletions(-)

New commits:
commit 629cc605a45e75d6896b524eada2354c1d4d33a8
Author: Tor Lillqvist 
Date:   Thu Apr 17 23:51:04 2014 +0300

Intermediate commit of hacking on --disable-database-connectivity

Add HAVE_FEATURE_DBCONNECTIVITY to  instead of
using (or not, more likely) -DDISABLE_DBCONNECTIVITY.

The plan is still that database connectivity would be disabled always
for the non-desktop platforms, and otherwise disabling it would be a
configure option.

But, still lots to do; the TiledLibreOffice iOS test app gets tons of
undefineds when linking if I actually try to disable the database
connectivity.

Change-Id: If1e4b55faa1514cd55dec5fc5487a30d689739ac

diff --git a/Repository.mk b/Repository.mk
index dd1928f..3b6f3d9 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -149,7 +149,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,base, \
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \
analysis \
-   calc \
+   $(call gb_Helper_optional,DBCONNECTIVITY,calc) \
date \
pricing \
sc \
@@ -227,11 +227,12 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
configmgr \
ctl \
cui \
-   dba \
-   dbase \
-   dbmm \
-   $(if $(DISABLE_DBCONNECTIVITY),,dbtools) \
-   dbaxml \
+   $(call gb_Helper_optional,DBCONNECTIVITY, \
+   dba \
+   dbase \
+   dbmm \
+   dbtools \
+   dbaxml) \
deploymentmisc \
$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
$(if $(filter unx,$(GUIBASE)),desktop_detector) \
@@ -253,8 +254,9 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
evtatt \
exp \
expwrap \
-   flat \
-   file \
+   $(call gb_Helper_optional,DBCONNECTIVITY, \
+   flat \
+   file) \
filterconfig \
$(if $(filter $(ENABLE_FIREBIRD_SDBC),TRUE),firebird_sdbc) \
fps_office \
@@ -300,7 +302,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
msfilter \
$(if $(DISABLE_SCRIPTING),,msforms) \
mtfrenderer \
-   mysql \
+   $(call gb_Helper_optional,DBCONNECTIVITY,mysql) \
odbc \
odfflatxml \
offacc \
@@ -313,7 +315,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
res \
sax \
sb \
-   sdbt \
+   $(call gb_Helper_optional,DBCONNECTIVITY,sdbt) \
scn \
sd \
sdd \
@@ -412,7 +414,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
) \
communi \
ooxml \
-   sdbc \
+   $(call gb_Helper_optional,DBCONNECTIVITY,sdbc) \
avmediaQuickTime \
filtertracer \
rpt \
@@ -502,7 +504,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
cached1 \
collator_data \
comphelper \
-   dbpool2 \
+   $(call gb_Helper_optional,DBCONNECTIVITY,dbpool2) \
deployment \
deploymentgui \
dict_ja \
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 9b18d63..0d5185e 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -37,7 +37,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
cpputools \
$(call gb_Helper_optional,CRASHREP,crashrep) \
cui \
-   dbaccess \
+   $(call gb_Helper_optional,DBCONNECTIVITY,dbaccess) \
desktop \
$(call gb_Helper_optional,DICTIONARIES,dictionaries) \
dtrans \
@@ -50,7 +50,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
external \
extras \
filter \
-   $(call gb_Helper_optional,DBCONNECTIVITY,forms) \
+   forms \
formula \
fpicker \
framework \
diff --git a/config_host.mk.in b/config_host.mk.in
index 6eb2c1a..f798ce3 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -92,7 +92,6 @@ export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@
 export DISABLE_ACTIVEX=@DISABLE_ACTIVEX@
 export DISABLE_ATL=@DISABLE_ATL@
 export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@
-export DISABLE_DBCONNECTIVITY=@DISABLE_DBCONNECTIVITY@
 export DISABLE_DYNLOADING=@DISABLE_DYNLOADING@
 export DISABLE_EXP

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 2 commits - configure.ac instsetoo_native/util postprocess/CustomTarget_registry.mk shell/Module_shell.mk

[Andras Timar]

 configure.ac|2 +-
 instsetoo_native/util/openoffice.lst.in |   12 ++--
 postprocess/CustomTarget_registry.mk|2 +-
 shell/Module_shell.mk   |2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit b8199ac1b7f8bf561575705fd851a8bfbfe647c4
Author: Andras Timar 
Date:   Thu Apr 17 13:51:26 2014 -0700

shell build fix on Windows

Change-Id: I500f8a86bb9bca5532577a37268b94fb8a8c8b16

diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index 1e93743..b9b0bc2 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -101,13 +101,13 @@ ifeq ($(filter DESKTOP,$(BUILD_TYPE)),DESKTOP)
 
 $(eval $(call gb_Module_add_targets,shell,\
Executable_lngconvex \
-   Library_syssh \
 ))
 
 ifneq ($(OS),WNT)
 
 $(eval $(call gb_Module_add_targets,shell,\
StaticLibrary_xmlparser \
+   Library_syssh \
 ))
 
 endif
commit 628a6607513d19faac17274dfa88d2e4e384ce30
Author: Andras Timar 
Date:   Thu Apr 17 09:55:57 2014 -0700

LibreOffice from Collabora versioning

Change-Id: Iff7004808f9637f3dbc6393751246c3a82134487

diff --git a/configure.ac b/configure.ac
index 64fa5db..a6d36c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.2.4.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.2.10.1],[],[],[https://libreoffice-from-collabora.com/])
 
 AC_PREREQ([2.59])
 
diff --git a/instsetoo_native/util/openoffice.lst.in 
b/instsetoo_native/util/openoffice.lst.in
index 92da96a..5b6ae24 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -4,7 +4,7 @@ Globals
 {
 variables
 {
-UREPACKAGEVERSION 
@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+UREPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
 URELAYERVERSION 1
 REFERENCEOOOMAJORMINOR 3.4
 WINDOWSBASISROOTNAME LibreOffice @LIBO_VERSION_MAJOR@
@@ -29,7 +29,7 @@ Globals
 CREATE_MSP_INSTALLSET 0
 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
 PACKAGEMAP package_names.txt,package_names_ext.txt
-WINDOWSPATCHLEVEL 8
+WINDOWSPATCHLEVEL @LIBO_VERSION_PATCH@
 OOOVENDOR The Document Foundation
 OOODOWNLOADNAME 1
 STARTCENTER_HIDE_EXTERNAL_LINKS 0
@@ -45,19 +45,19 @@ LibreOffice
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
-PRODUCTEXTENSION 
.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+PRODUCTEXTENSION -@LIBO_VERSION_PATCH@
 POSTVERSIONEXTENSION
 BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@
 BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
 USERDIRPRODUCTVERSION @LIBO_VERSION_MAJOR@
-ABOUTBOXPRODUCTVERSION 
@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
-ABOUTBOXPRODUCTVERSIONSUFFIX @LIBO_VERSION_SUFFIX_SUFFIX@
+ABOUTBOXPRODUCTVERSION 
@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@-@LIBO_VERSION_PATCH@
+ABOUTBOXPRODUCTVERSIONSUFFIX
 BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
 PCPFILENAME libreoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
 ADD_INCLUDE_FILES 
cli_ure/version/version.txt,unoil/climaker/version.txt
 ADDSYSTEMINTEGRATION 1
-PACKAGEVERSION 
@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+PACKAGEVERSION 
@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@
 PACKAGEREVISION {buildid}
 LICENSENAME LGPL
 GLOBALFILEGID gid_File_Lib_Oox
diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index 364bb2c..6d755759 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -550,7 +550,7 @@ $(foreach lang,$(gb_Configuration_LANGS),$(eval $(call 
postprocess_lang_deps,$(l
 #
 
 postprocess_main_SED := \
-   -e 
's,$${ABOUTBOXPRODUCTVERSION},$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX),g'
 \
+   -e 
's,$${ABOUTBOXPRODUCTVERSION},$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)-$(LIBO_VERSION_PATCH),g'
 \
-e 's,$${ABOUTBOXPRODUCTVERSIONSUFFIX},$(LIBO_VERSION_SUFFIX_SUFFIX),g' 
\
-e 
's,$${DICT_REPO_URL},http://extensions.libreoffice.org/dic

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

[Stephan Bergmann]

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

New commits:
commit 558aa44672fe3565dfe1eab82c8766f2f499ee0d
Author: Stephan Bergmann 
Date:   Thu Apr 17 22:45:47 2014 +0200

-Werror,-Wimplicit-exception-spec-mismatch

Change-Id: I6e93180cbc980438e47ee24735de1fb9758b7add

diff --git a/oox/source/ppt/slidefragmenthandler.cxx 
b/oox/source/ppt/slidefragmenthandler.cxx
index 853348d..62e64da 100644
--- a/oox/source/ppt/slidefragmenthandler.cxx
+++ b/oox/source/ppt/slidefragmenthandler.cxx
@@ -60,7 +60,7 @@ SlideFragmentHandler::SlideFragmentHandler( XmlFilterBase& 
rFilter, const OUStri
 getFilter(), aVMLDrawingFragmentPath, *pPersistPtr->getDrawing() ) 
);
 }
 
-SlideFragmentHandler::~SlideFragmentHandler()
+SlideFragmentHandler::~SlideFragmentHandler() throw ()
 {
 // convert and insert all VML shapes (mostly form controls)
 mpSlidePersistPtr->getDrawing()->convertAndInsert();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sw/source/core/unocore/unostyle.cxx |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit de9954f2a528867f80fda3a8596a87d478eeaaf0
Author: Michael Stahl 
Date:   Thu Apr 17 22:31:13 2014 +0200

fdo#77340: SwXStyle::setPropertyValue PageNumberOffset, PageDescName

... throw exceptions instead of setting values.

(regression from 6e61ecd09679a66060f932835622821d39e92f01)

Change-Id: Ibe704ebd294724035a87473f51b76421063f25d3

diff --git a/sw/source/core/unocore/unostyle.cxx 
b/sw/source/core/unocore/unostyle.cxx
index 57ec2ba..d5ac430 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1929,6 +1929,8 @@ static void lcl_SetStyleProperty(const 
SfxItemPropertySimpleEntry& rEntry,
 }
 case RES_PAGEDESC :
 {
+if (MID_PAGEDESC_PAGEDESCNAME != nMemberId)
+break;
 // Sonderbehandlung RES_PAGEDESC
 if(aValue.getValueType() != ::getCppuType((const OUString*)0))
 throw lang::IllegalArgumentException();
@@ -1970,10 +1972,9 @@ static void lcl_SetStyleProperty(const 
SfxItemPropertySimpleEntry& rEntry,
 else
 rStyleSet.Put(*pNewDesc);
 
-delete pNewDesc;
-bDone = true;
 }
-
+delete pNewDesc;
+bDone = true;
 break;
 }
 case FN_UNO_IS_AUTO_UPDATE:
@@ -2388,7 +2389,8 @@ static uno::Any lcl_GetStyleProperty(const 
SfxItemPropertySimpleEntry& rEntry,
 {
 // Sonderbehandlung RES_PAGEDESC
 const SfxPoolItem* pItem;
-if(SFX_ITEM_SET == rBase.GetItemSet().GetItemState( 
RES_PAGEDESC, true, &pItem ) )
+if (MID_PAGEDESC_PAGEDESCNAME == nMemberId &&
+SFX_ITEM_SET == 
rBase.GetItemSet().GetItemState(RES_PAGEDESC, true, &pItem))
 {
 const SwPageDesc* pDesc = ((const 
SwFmtPageDesc*)pItem)->GetPageDesc();
 if(pDesc)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm |8 
 1 file changed, 8 deletions(-)

New commits:
commit 1160dc2a14bd3faf9471d60afa2497518c9cde74
Author: Stephan Bergmann 
Date:   Thu Apr 17 22:08:38 2014 +0200

loplugin:unreffun

Change-Id: I9f80184d8066f69787722322915b4a70e432141a

diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm 
b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm
index 00b3bb3..802061e 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm
@@ -507,14 +507,6 @@ inline basegfx::B2DVector clamp(const basegfx::B2DVector& 
v)
   min(max(v.getY(),-1.0),1.0));
 }
 
-// TODO(Q3): extract to basegfx
-inline basegfx::B3DVector clamp(const basegfx::B3DVector& v)
-{
-return basegfx::B3DVector(min(max(v.getX(),-1.0),1.0),
-  min(max(v.getY(),-1.0),1.0),
-  min(max(v.getZ(),-1.0),1.0));
-}
-
 inline double randFromNeg1to1()
 {
 return ( ( static_cast( rand() ) / static_cast( RAND_MAX ) 
) * 2.0 ) - 1.0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 connectivity/source/drivers/odbc/OConnection.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b2a32d9b86b65ac89b00a200b2c8d22a5962494a
Author: Stephan Bergmann 
Date:   Thu Apr 17 22:21:48 2014 +0200

loplugin:literaltoboolconversion

Change-Id: Iade344b7b148787fea183fbabd3c72b711766cb3

diff --git a/connectivity/source/drivers/odbc/OConnection.cxx 
b/connectivity/source/drivers/odbc/OConnection.cxx
index 38a8d03..93c0b3e 100644
--- a/connectivity/source/drivers/odbc/OConnection.cxx
+++ b/connectivity/source/drivers/odbc/OConnection.cxx
@@ -144,7 +144,7 @@ SQLRETURN OConnection::OpenConnection(const OUString& 
aConnectStr, sal_Int32 nTi
 if (nSQLRETURN == SQL_ERROR || nSQLRETURN == SQL_NO_DATA)
 return nSQLRETURN;
 
-m_bClosed = sal_False;
+m_bClosed = false;
 
 #endif //LINUX
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 7 commits - extensions/source include/svx oovbaapi/ooo oox/source svx/source sw/source ucbhelper/source

[Caolán McNamara]

 extensions/source/propctrlr/formcomponenthandler.cxx |2 +-
 extensions/source/propctrlr/formcomponenthandler.hxx |2 +-
 include/svx/unoshape.hxx |6 +++---
 oovbaapi/ooo/vba/word/XFields.idl|2 +-
 oox/source/ppt/slidefragmenthandler.cxx  |2 +-
 svx/source/unodraw/unoshap4.cxx  |2 +-
 svx/source/unodraw/unoshape.cxx  |4 ++--
 sw/source/filter/ww8/docxattributeoutput.cxx |3 +--
 sw/source/ui/vba/vbafield.cxx|2 +-
 sw/source/ui/vba/vbafield.hxx|2 +-
 ucbhelper/source/client/content.cxx  |   10 --
 11 files changed, 13 insertions(+), 24 deletions(-)

New commits:
commit abd5786847811ed1f10d8d7433b52ab795b4f263
Author: Caolán McNamara 
Date:   Thu Apr 17 21:06:59 2014 +0100

coverity#1202901 Uncaught exception

and probably gadzillions of other uncaught exception warnings

this exception can't actually be thrown because all possible InsertOperation
conditions are already handled.

Change-Id: I176c5e253e8b1092a060fc066c2e03dae3cea343

diff --git a/ucbhelper/source/client/content.cxx 
b/ucbhelper/source/client/content.cxx
index 4cb7628..c8ccd88 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -1016,16 +1016,6 @@ bool Content::transferContent( const Content& 
rSourceContent,
 sCommand = "checkin";
 bCheckIn = true;
 break;
-
-default:
-ucbhelper::cancelCommandExecution(
-makeAny( IllegalArgumentException(
-OUString(
-"Unknown transfer operation!" ),
-get(),
--1 ) ),
- m_xImpl->getEnvironment() );
-// Unreachable
 }
 Command aCommand;
 aCommand.Name = sCommand;
commit b35ea8b0fe7773f4bd09590d482fb49a2ebc3440
Author: Caolán McNamara 
Date:   Thu Apr 17 20:39:38 2014 +0100

coverity#1202900 Uncaught exception

Change-Id: I53e7bd12701ca4d30fdbf36fe525076d53f86edc

diff --git a/oox/source/ppt/slidefragmenthandler.cxx 
b/oox/source/ppt/slidefragmenthandler.cxx
index a44f63c..853348d 100644
--- a/oox/source/ppt/slidefragmenthandler.cxx
+++ b/oox/source/ppt/slidefragmenthandler.cxx
@@ -60,7 +60,7 @@ SlideFragmentHandler::SlideFragmentHandler( XmlFilterBase& 
rFilter, const OUStri
 getFilter(), aVMLDrawingFragmentPath, *pPersistPtr->getDrawing() ) 
);
 }
 
-SlideFragmentHandler::~SlideFragmentHandler() throw()
+SlideFragmentHandler::~SlideFragmentHandler()
 {
 // convert and insert all VML shapes (mostly form controls)
 mpSlidePersistPtr->getDrawing()->convertAndInsert();
commit 747a56821ed615158b91367c70cc7ad530e58160
Author: Caolán McNamara 
Date:   Thu Apr 17 18:41:42 2014 +0100

coverity#1202899 Uncaught exception

Change-Id: I1fd4e8bad535db1b787eac231ab02ed34ee09445

diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index 7c3195d..937ecce 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -328,7 +328,7 @@ protected:
 protected:
 // overide these for special property handling in subcasses. Return true 
if property is handled
 virtual bool setPropertyValueImpl( const OUString& rName, const 
SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue 
) throw(::com::sun::star::beans::UnknownPropertyException, 
::com::sun::star::beans::PropertyVetoException, 
::com::sun::star::lang::IllegalArgumentException, 
::com::sun::star::lang::WrappedTargetException, 
::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
-virtual bool getPropertyValueImpl( const OUString& rName, const 
SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) 
throw(::com::sun::star::beans::UnknownPropertyException, 
::com::sun::star::lang::WrappedTargetException, 
::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+virtual bool getPropertyValueImpl( const OUString& rName, const 
SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) 
throw(::com::sun::star::beans::UnknownPropertyException, 
::com::sun::star::lang::WrappedTargetException, 
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 virtual bool getPropertyStateImpl( const SfxItemPropertySimpleEntry* 
pProperty, ::com::sun::star::beans::PropertyState& rState ) 
throw(::com::sun::star::beans::UnknownPropertyException, 
::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
 virtual bool setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* 
pProperty ) throw(::com::sun::star::beans::UnknownPropertyException, 
::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
 
@@ -567,7 +567,7 @@ class SVX_DLLPUBLIC SvxOle2Shape : public SvxShapeText
 protected:
 // overide these 

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - officecfg/registry sw/sdi sw/source xmloff/inc xmloff/source

[Armin Le Grand]

 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |3 
 sw/sdi/_frmsh.sdi|   12 +
 sw/source/core/attr/format.cxx   |   19 ++
 sw/source/core/layout/paintfrm.cxx   |7 
 sw/source/core/unocore/unobrushitemhelper.cxx|   26 ++-
 sw/source/core/unocore/unoframe.cxx  |   60 
 sw/source/core/unocore/unomap.cxx|   37 -
 sw/source/core/unocore/unostyle.cxx  |   14 +
 sw/source/ui/frmdlg/frmpage.src  |   40 +
 sw/source/ui/shells/frmsh.cxx|6 
 sw/source/ui/shells/grfsh.cxx|   55 +--
 xmloff/inc/xmloff/XMLShapeStyleContext.hxx   |2 
 xmloff/source/draw/XMLShapeStyleContext.cxx  |   81 ++-
 13 files changed, 320 insertions(+), 42 deletions(-)

New commits:
commit 8433ee82c9323501545164ddf6e6008db483ab7a
Author: Armin Le Grand 
Date:   Thu Apr 17 16:44:58 2014 +

i124638 support for DrawingLayre FillStyle for GraphicFrames and 
EmbeddedObjectFrames in Writer

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index abb4f9c..25de5cf 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -348,9 +348,12 @@
 Calc,   OLE,hidden  ;
 DrawImpress,3DObject,   visible ;
 DrawImpress,Draw,   visible ;
+DrawImpress,Graphic,hidden  ;
 DrawImpress,TextObject, hidden  ;
 DrawImpress,OLE,hidden  ;
 WriterVariants, Draw,   visible ;
+Writer, Graphic,hidden  ;
+Writer, OLE,hidden  ;
 Writer, Frame,  visible ;
   
 
diff --git a/sw/sdi/_frmsh.sdi b/sw/sdi/_frmsh.sdi
index 3715e65..e729a60 100644
--- a/sw/sdi/_frmsh.sdi
+++ b/sw/sdi/_frmsh.sdi
@@ -26,6 +26,7 @@ interface BaseTextFrame
 Automation = FALSE;
 ]
 {
+//
 SID_ATTR_FILL_STYLE
 [
 Export = FALSE;
@@ -34,6 +35,7 @@ interface BaseTextFrame
 DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
 ]
 
+//
 SID_ATTR_FILL_COLOR
 [
 Export = FALSE;
@@ -42,6 +44,7 @@ interface BaseTextFrame
 DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
 ]
 
+//
 SID_ATTR_FILL_GRADIENT
 [
 Export = FALSE;
@@ -50,6 +53,7 @@ interface BaseTextFrame
 DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
 ]
 
+//
 SID_ATTR_FILL_HATCH
 [
 Export = FALSE;
@@ -58,6 +62,7 @@ interface BaseTextFrame
 DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
 ]
 
+//
 SID_ATTR_FILL_BITMAP
 [
 Export = FALSE;
@@ -66,6 +71,7 @@ interface BaseTextFrame
 DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
 ]
 
+//
 SID_ATTR_FILL_TRANSPARENCE
 [
 Export = FALSE;
@@ -74,6 +80,7 @@ interface BaseTextFrame
 DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
 ]
 
+//
 SID_ATTR_FILL_FLOATTRANSPARENCE
 [
 Export = FALSE;
@@ -82,26 +89,31 @@ interface BaseTextFrame
 DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
 ]
 
+//
 SID_COLOR_TABLE
 [
 StateMethod = GetDrawAttrStateTextFrame;
 ]
 
+//
 SID_GRADIENT_LIST
 [
 StateMethod = GetDrawAttrStateTextFrame;
 ]
 
+//
 SID_HATCH_LIST
 [
 StateMethod = GetDrawAttrStateTextFrame;
 ]
 
+//
 SID_BITMAP_LIST
 [
 StateMethod = GetDrawAttrStateTextFrame;
 ]
 
+//
 SID_ATTRIBUTES_AREA
 [
 ExecMethod = ExecDrawDlgTextFrame;
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index c36b13f..9cace99 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -586,16 +586,27 @@ sal_Bool SwFmt::SetFmtAttr( const SfxItemSet& rSet )
 
 sal_Bool bRet = sal_False;
 
+// Usel local copy to be able to apply needed changes, e.g. call
+// CheckForUniqueItemForLineFillNameOrIndex which is needed for 
NameOrIndex stuff
+SfxItemSet aTempSet(rSet);
+
+// Need to check for unique item for DrawingLayer items of type 
NameOrIndex
+// and evtl. correct that item to ensure unique names for that type. This 
call may
+// modify/correct entries inside of the given SfxItemSet
+if(GetDoc())
+{
+GetDoc()->CheckForUniqueItemForLineFillNameOrIndex(aTempSet);
+}
+
 //
 if(RES_FLYFRMFMT == Which())
 {
 const SfxPoolItem* pSource = 0;
 
-if(SFX_ITEM_SET == rSet.GetIte

Re: build error - don't want to make clean:-/

[Michael Stahl]

On 17/04/14 21:39, Joel Madero wrote:
> Hi All,
> 
> I got an error earlier so I did a pull and tried building again and now 
> hitting this:
> 
> make[1]: *** No rule to make target 
> `/data/libreoffice/workdir/UnpackedTaRball/boost/boost/mpl/iterator_tags.hpp',
>  

"UnpackedTaRball"? that sounds like you have bad RAM and that flipped a
bit and so the "r" became "R" (Thorsten's PPC Mac tinderox did that kind
of thing a lot).

> needed by 
> `/data/libreoffice/workdir/CxxObject/sw/source/core/fields/flddat.o'. Stop.
> 
> 
> Solutions appreciated :)

install memtest86 and see if it finds anything?


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

build error - don't want to make clean:-/

[Joel Madero]

Hi All,

I got an error earlier so I did a pull and tried building again and now 
hitting this:


make[1]: *** No rule to make target 
`/data/libreoffice/workdir/UnpackedTaRball/boost/boost/mpl/iterator_tags.hpp', 
needed by 
`/data/libreoffice/workdir/CxxObject/sw/source/core/fields/flddat.o'. Stop.



Solutions appreciated :)


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

[Libreoffice-commits] core.git: config_host/config_features.h.in configure.ac cui/Library_cui.mk postprocess/Rdb_services.mk Repository.mk RepositoryModule_host.mk sc/Library_sc.mk sd/Library_sd.mk sf

[Tor Lillqvist]

 Repository.mk |2 -
 RepositoryModule_host.mk  |2 -
 config_host/config_features.h.in  |6 +++
 configure.ac  |   27 --
 cui/Library_cui.mk|2 -
 postprocess/Rdb_services.mk   |4 +-
 sc/Library_sc.mk  |2 -
 sd/Library_sd.mk  |2 -
 sfx2/Library_sfx.mk   |1 
 sfx2/source/bastyp/dummytypes.cxx |   18 +
 slideshow/Library_slideshow.mk|2 -
 svx/Library_svxcore.mk|2 -
 svx/source/gallery2/galtheme.cxx  |5 ++
 svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx |2 -
 svx/source/svdraw/svdobj.cxx  |2 -
 svx/source/unodraw/unopage.cxx|2 -
 sw/Library_sw.mk  |2 -
 sw/source/core/uibase/dochdl/swdtflvr.cxx |8 
 sw/source/core/uibase/shells/textdrw.cxx  |4 ++
 sw/source/core/uibase/shells/textsh.cxx   |2 -
 sw/source/core/uibase/uiview/view.cxx |2 -
 sw/source/core/uibase/uiview/view0.cxx|4 ++
 22 files changed, 84 insertions(+), 19 deletions(-)

New commits:
commit 262aa2c2e540c803196d53779fb72226a8efeb5f
Author: Tor Lillqvist 
Date:   Thu Apr 17 22:09:44 2014 +0300

More generic way to disable avmedia

Introduce a configure option --disable-avmedia. For non-desktop,
avmedia is always disabled (for now), and for desktop enabled by
default. Add AVMEDIA to BUILD_TYPE when enabled. Don't build avmedia
when disabled. Add HAVE_FEATURE_AVMEDIA to . Bypass
avmedia-related code when disabled.

Change-Id: I919c6e199bff87d9f142d55dff6373f0ed217f39

diff --git a/Repository.mk b/Repository.mk
index e3715d5..dd1928f 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -211,7 +211,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,math, \
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
acc \
-   avmedia \
+   $(call gb_Helper_optional,AVMEDIA,avmedia) \
$(if $(DISABLE_SCRIPTING),,basctl) \
$(if $(DISABLE_SCRIPTING),,basprov) \
basegfx \
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 6e3b90b..9b18d63 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
android \
animations \
apple_remote \
-   avmedia \
+   $(call gb_Helper_optional,AVMEDIA,avmedia) \
basctl \
basebmp \
basegfx \
diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index 6a46e1c..612ceca 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -43,6 +43,12 @@
 
 #define HAVE_FEATURE_X11 0
 
+/* AVMEDIA - Whether to have functionality to display and manipulate
+ * embedded AV media in documents
+ */
+
+#define HAVE_FEATURE_AVMEDIA 0
+
 /* EXTENSIONS - Whether we have any extension mechanism at all
  *
  * Primarily intended for non-desktop platforms where supporting
diff --git a/configure.ac b/configure.ac
index eaa46b5..4e83ed6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -764,6 +764,11 @@ AC_ARG_ENABLE(export,
  only for exporrt linked in. Work in progress, use only if you are 
hacking on it.])
 )
 
+AC_ARG_ENABLE(avmedia,
+AS_HELP_STRING([--disable-avmedia],
+[Disable displaying and inserting AV media in documents. Work in 
progress, use only if you are hacking on it.])
+)
+
 AC_ARG_ENABLE(database-connectivity,
 AS_HELP_STRING([--disable-database-connectivity],
 [Disable various database connectivity. Work in progress, use only if 
you are hacking on it.])
@@ -2338,6 +2343,22 @@ else
 fi
 AC_SUBST(DISABLE_EXPORT)
 
+# Whether to build "avmedia" functionality or not.
+# We probably don't want it for non-desktop.
+
+if test -z "$enable_avmedia"; then
+if test $_os != iOS -a $_os != Android; then
+enable_avmedia=yes
+fi
+fi
+
+if test "$enable_avmedia" = yes; then
+BUILD_TYPE="$BUILD_TYPE AVMEDIA"
+AC_DEFINE(HAVE_FEATURE_AVMEDIA)
+else
+SCPDEFS="$SCPDEFS -DDISABLE_AVMEDIA"
+fi
+
 dnl Decide whether to build database connectivity stuff (including
 dnl Base) or not. We probably don't want to on non-desktop OSes.
 
@@ -10201,7 +10222,7 @@ ENABLE_GSTREAMER=""
 if test "$build_gstreamer" = "yes"; then
 
 AC_MSG_CHECKING([whether to enable the new GStreamer 1.0 avmedia backend])
-if test "x$enable_gstreamer" != "xno"; then
+if test "$enable_avm

[Libreoffice-commits] mso-dumper.git: 4 commits - msodumper/emfrecord.py msodumper/wmfrecord.py

[Miklos Vajna]

 msodumper/emfrecord.py |   91 ++---
 msodumper/wmfrecord.py |   14 +++
 2 files changed, 101 insertions(+), 4 deletions(-)

New commits:
commit 945fb415736a7cb9c228d14fef367e6e6a02ec17
Author: Miklos Vajna 
Date:   Thu Apr 17 21:07:00 2014 +0200

dump EmrEndpath

diff --git a/msodumper/emfrecord.py b/msodumper/emfrecord.py
index b6d2922..2a360c2 100644
--- a/msodumper/emfrecord.py
+++ b/msodumper/emfrecord.py
@@ -305,6 +305,18 @@ class EmrBeginpath(EMFRecord):
 assert self.pos - posOrig == self.Size
 
 
+class EmrEndpath(EMFRecord):
+"""This record closes a path bracket and selects the path defined by the 
bracket into the playback device context."""
+def __init__(self, parent):
+EMFRecord.__init__(self, parent)
+
+def dump(self):
+posOrig = self.pos
+self.printAndSet("Type", self.readuInt32())
+self.printAndSet("Size", self.readuInt32(), hexdump=False)
+assert self.pos - posOrig == self.Size
+
+
 class RegionData(EMFRecord):
 """The RegionData object specifies data that defines a region, which is 
made of non-overlapping rectangles."""
 def __init__(self, parent, name, size):
@@ -471,7 +483,7 @@ RecordType = {
 0x0039: ['EMR_SETARCDIRECTION'],
 0x003A: ['EMR_SETMITERLIMIT'],
 0x003B: ['EMR_BEGINPATH', EmrBeginpath],
-0x003C: ['EMR_ENDPATH'],
+0x003C: ['EMR_ENDPATH', EmrEndpath],
 0x003D: ['EMR_CLOSEFIGURE'],
 0x003E: ['EMR_FILLPATH'],
 0x003F: ['EMR_STROKEANDFILLPATH'],
commit b2eac9eebd1e4bfaa3c219d5df0c2d1f424b1bb5
Author: Miklos Vajna 
Date:   Thu Apr 17 21:04:28 2014 +0200

dump EmrBeginpath

diff --git a/msodumper/emfrecord.py b/msodumper/emfrecord.py
index d823f87..b6d2922 100644
--- a/msodumper/emfrecord.py
+++ b/msodumper/emfrecord.py
@@ -293,6 +293,18 @@ class EmrPolygon16(EMFRecord):
 assert self.pos - posOrig == self.Size
 
 
+class EmrBeginpath(EMFRecord):
+"""This record opens a path bracket in the current playback device 
context."""
+def __init__(self, parent):
+EMFRecord.__init__(self, parent)
+
+def dump(self):
+posOrig = self.pos
+self.printAndSet("Type", self.readuInt32())
+self.printAndSet("Size", self.readuInt32(), hexdump=False)
+assert self.pos - posOrig == self.Size
+
+
 class RegionData(EMFRecord):
 """The RegionData object specifies data that defines a region, which is 
made of non-overlapping rectangles."""
 def __init__(self, parent, name, size):
@@ -458,7 +470,7 @@ RecordType = {
 0x0038: ['EMR_POLYDRAW'],
 0x0039: ['EMR_SETARCDIRECTION'],
 0x003A: ['EMR_SETMITERLIMIT'],
-0x003B: ['EMR_BEGINPATH'],
+0x003B: ['EMR_BEGINPATH', EmrBeginpath],
 0x003C: ['EMR_ENDPATH'],
 0x003D: ['EMR_CLOSEFIGURE'],
 0x003E: ['EMR_FILLPATH'],
commit 3308ef622503617abd3a55eed9a53fa44ff0afdd
Author: Miklos Vajna 
Date:   Thu Apr 17 21:01:32 2014 +0200

dump EmrPolygon16

diff --git a/msodumper/emfrecord.py b/msodumper/emfrecord.py
index a0ee5e8..d823f87 100644
--- a/msodumper/emfrecord.py
+++ b/msodumper/emfrecord.py
@@ -275,6 +275,24 @@ class EmrSelectobject(EMFRecord):
 assert self.pos - posOrig == self.Size
 
 
+class EmrPolygon16(EMFRecord):
+"""Draws a polygon consisting of two or more vertexes connected by 
straight lines."""
+def __init__(self, parent):
+EMFRecord.__init__(self, parent)
+
+def dump(self):
+posOrig = self.pos
+self.printAndSet("Type", self.readuInt32())
+self.printAndSet("Size", self.readuInt32(), hexdump=False)
+wmfrecord.RectL(self, "Bounds").dump()
+self.printAndSet("Count", self.readuInt32(), hexdump=False)
+print ''
+for i in range(self.Count):
+wmfrecord.PointS(self, "aPoint").dump()
+print ''
+assert self.pos - posOrig == self.Size
+
+
 class RegionData(EMFRecord):
 """The RegionData object specifies data that defines a region, which is 
made of non-overlapping rectangles."""
 def __init__(self, parent, name, size):
@@ -466,7 +484,7 @@ RecordType = {
 0x0053: ['EMR_EXTTEXTOUTA'],
 0x0054: ['EMR_EXTTEXTOUTW'],
 0x0055: ['EMR_POLYBEZIER16'],
-0x0056: ['EMR_POLYGON16'],
+0x0056: ['EMR_POLYGON16', EmrPolygon16],
 0x0057: ['EMR_POLYLINE16'],
 0x0058: ['EMR_POLYBEZIERTO16'],
 0x0059: ['EMR_POLYLINETO16'],
diff --git a/msodumper/wmfrecord.py b/msodumper/wmfrecord.py
index 5cfcb1d..dd4e8ea 100644
--- a/msodumper/wmfrecord.py
+++ b/msodumper/wmfrecord.py
@@ -94,6 +94,20 @@ class PointL(WMFRecord):
 self.parent.pos = self.pos
 
 
+class PointS(WMFRecord):
+"""The PointS Object defines the x- and y-coordinates of a point."""
+def __init__(self, parent, name):
+WMFRecord.__init__(self, parent)
+self.name = name
+
+def dump(self):
+print '<%

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

[Miklos Vajna]

 oox/source/drawingml/customshapeproperties.cxx |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit f5ccbfdc561c68099872d1abe07ac72fcddedd35
Author: Miklos Vajna 
Date:   Thu Apr 17 20:22:44 2014 +0200

oox customshapepreset: switch to generated data -> code

With this, oox/source/drawingml/customshapepresets*.cxx becomes unused
code, while share/filter/oox-drawingml-cs-presets in instdir becomes a
requirement.

Change-Id: Ia886a47295514bbacd1e522273c59f0656e4cf6b

diff --git a/oox/source/drawingml/customshapeproperties.cxx 
b/oox/source/drawingml/customshapeproperties.cxx
index 229251e..7a07c2a 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -117,8 +117,8 @@ void CustomShapeProperties::pushToPropSet( const 
::oox::core::FilterBase& /* rFi
 {
 OSL_TRACE("preset: %d", mnShapePresetType);
 
-if (maPresetsMap.empty())
-initializePresetsMap();
+if (maPresetDataMap.empty())
+initializePresetDataMap();
 
 PropertyMap aPropertyMap;
 PropertySet aPropSet( xPropSet );
@@ -135,13 +135,11 @@ void CustomShapeProperties::pushToPropSet( const 
::oox::core::FilterBase& /* rFi
 aPropertyMap.setProperty( PROP_Type, sConnectorShapeType );
 }
 }
-else if (maPresetsMap.find(mnShapePresetType) != maPresetsMap.end())
+else if (maPresetDataMap.find(mnShapePresetType) != 
maPresetDataMap.end())
 {
 OSL_TRACE("found property map for preset: %s (%d)", 
USS(getShapePresetTypeName()), mnShapePresetType);
 
-CustomShapeProvider *pProvider = maPresetsMap[ mnShapePresetType ];
-if (pProvider)
-aPropertyMap = pProvider->getProperties();
+aPropertyMap = maPresetDataMap[mnShapePresetType];
 #ifdef DEBUG
 aPropertyMap.dumpCode();
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

US Hackfest July 26-27

[Joel Madero]

Hi All,

So Robinson, Immanuel and myself are in the midst of planning a US 
hackfest in Boston. We're trying to get a sense of who will be there so 
we can plan accordingly. If you're at all interested please respond so 
we can get you on the list.


Date: July 26-27
Location: Boston, MA
Accommodations: TBD

The goal is to hopefully do some QA work and some development stuff but 
in order for development we'll need someone preferably there who is an 
expert with the code - but at minimum we'd like to have a developer or 
two "on call."



Best,
Joel


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

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

[Miklos Vajna]

 oox/source/drawingml/customshapepresetdata.cxx |   18 --
 1 file changed, 12 insertions(+), 6 deletions(-)

New commits:
commit a87e8268f8c32387052adf9a9283834dcf83e5ab
Author: Miklos Vajna 
Date:   Thu Apr 17 17:28:20 2014 +0200

oox customshapepresetdata: empty is an empty string sequence

In case the data is empty, the data loader still set the proper type for
the sequence, while the generated code used a string sequence. Do the
same to keep testcases happy, there is no visual difference anyway.

Change-Id: I1b9be4486184a2a84c384f1365cc68dd45b8eee0

diff --git a/oox/source/drawingml/customshapepresetdata.cxx 
b/oox/source/drawingml/customshapepresetdata.cxx
index 6d3a281..7e4ecde 100644
--- a/oox/source/drawingml/customshapepresetdata.cxx
+++ b/oox/source/drawingml/customshapepresetdata.cxx
@@ -751,44 +751,50 @@ void CustomShapeProperties::initializePresetDataMap()
 if (aLine == "AdjustmentValues")
 {
 aStream.ReadLine(aLine);
-
comphelper::SequenceAsVector 
aAdjustmentValues;
 if (aLine != 
"([]com.sun.star.drawing.EnhancedCustomShapeAdjustmentValue) {}")
 {
+
comphelper::SequenceAsVector 
aAdjustmentValues;
 OString 
aExpectedPrefix("([]com.sun.star.drawing.EnhancedCustomShapeAdjustmentValue) { 
");
 assert(aLine.startsWith(aExpectedPrefix));
 
 OString aValue = aLine.copy(aExpectedPrefix.getLength(), 
aLine.getLength() - aExpectedPrefix.getLength() - strlen(" }"));
 lcl_parseAdjustmentValues(aAdjustmentValues, aValue);
+aPropertyMap.setProperty(PROP_AdjustmentValues, 
aAdjustmentValues.getAsConstList());
 }
-aPropertyMap.setProperty(PROP_AdjustmentValues, 
aAdjustmentValues.getAsConstList());
+else
+aPropertyMap.setProperty(PROP_AdjustmentValues, 
uno::Sequence(0));
 }
 else if (aLine == "Equations")
 {
 aStream.ReadLine(aLine);
-comphelper::SequenceAsVector aEquations;
 if (aLine != "([]string) {}")
 {
+comphelper::SequenceAsVector aEquations;
 OString aExpectedPrefix("([]string) { ");
 assert(aLine.startsWith(aExpectedPrefix));
 
 OString aValue = aLine.copy(aExpectedPrefix.getLength(), 
aLine.getLength() - aExpectedPrefix.getLength() - strlen(" }"));
 lcl_parseEquations(aEquations, aValue);
+aPropertyMap.setProperty(PROP_Equations, 
aEquations.getAsConstList());
 }
-aPropertyMap.setProperty(PROP_Equations, 
aEquations.getAsConstList());
+else
+aPropertyMap.setProperty(PROP_Equations, 
uno::Sequence(0));
 }
 else if (aLine == "Handles")
 {
 aStream.ReadLine(aLine);
-comphelper::SequenceAsVector< 
uno::Sequence > aHandles;
 if (aLine != "([][]com.sun.star.beans.PropertyValue) {}")
 {
+comphelper::SequenceAsVector< 
uno::Sequence > aHandles;
 OString 
aExpectedPrefix("([][]com.sun.star.beans.PropertyValue) { ");
 assert(aLine.startsWith(aExpectedPrefix));
 
 OString aValue = aLine.copy(aExpectedPrefix.getLength(), 
aLine.getLength() - aExpectedPrefix.getLength() - strlen(" }"));
 lcl_parseHandles(aHandles, aValue);
+aPropertyMap.setProperty(PROP_Handles, 
aHandles.getAsConstList());
 }
-aPropertyMap.setProperty(PROP_Handles, 
aHandles.getAsConstList());
+else
+aPropertyMap.setProperty(PROP_Handles, 
uno::Sequence(0));
 }
 else if (aLine == "MirroredX")
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 connectivity/source/drivers/flat/EConnection.cxx |3 ++-
 connectivity/source/inc/flat/EConnection.hxx |2 +-
 svtools/source/control/roadmap.cxx   |   10 +++---
 sw/source/core/doc/doctxm.cxx|4 ++--
 sw/source/core/uibase/app/docstyle.cxx   |2 +-
 5 files changed, 9 insertions(+), 12 deletions(-)

New commits:
commit 3716833635926fa59372a8274decfebd4dc498e9
Author: Caolán McNamara 
Date:   Thu Apr 17 17:47:32 2014 +0100

coverity#1202903 Uncaught exception

Change-Id: I2872cf32d9cd3d28a70d02365e2169da5f79ad7b

diff --git a/connectivity/source/drivers/flat/EConnection.cxx 
b/connectivity/source/drivers/flat/EConnection.cxx
index 03bb821..5f55159 100644
--- a/connectivity/source/drivers/flat/EConnection.cxx
+++ b/connectivity/source/drivers/flat/EConnection.cxx
@@ -60,7 +60,7 @@ IMPLEMENT_SERVICE_INFO(OFlatConnection, 
"com.sun.star.sdbc.drivers.flat.Connecti
 
 
 void OFlatConnection::construct(const OUString& url,const Sequence< 
PropertyValue >& info)
-throw(css::sdbc::SQLException, css::uno::RuntimeException)
+throw(css::sdbc::SQLException, css::uno::RuntimeException, 
css::uno::DeploymentException)
 {
 osl_atomic_increment( &m_refCount );
 
diff --git a/connectivity/source/inc/flat/EConnection.hxx 
b/connectivity/source/inc/flat/EConnection.hxx
index ac5f451..1c64858 100644
--- a/connectivity/source/inc/flat/EConnection.hxx
+++ b/connectivity/source/inc/flat/EConnection.hxx
@@ -40,7 +40,7 @@ namespace connectivity
 OFlatConnection(ODriver*_pDriver);
 virtual ~OFlatConnection();
 
-virtual void construct(const OUString& _rUrl,const 
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& 
_rInfo ) throw(css::sdbc::SQLException, css::uno::RuntimeException) 
SAL_OVERRIDE;
+virtual void construct(const OUString& _rUrl,const 
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& 
_rInfo ) throw(css::sdbc::SQLException, css::uno::RuntimeException, 
css::uno::DeploymentException) SAL_OVERRIDE;
 
 // own methods
 inline bool isHeaderLine()  const { return 
m_bHeaderLine;   }
commit 5a2d9fffad710b13bceb02e7c3b3f563b935a8bc
Author: Caolán McNamara 
Date:   Thu Apr 17 17:46:28 2014 +0100

coverity#706314 Uncaught exception

Change-Id: Ib723848550c910f94db2b1c5bc16e5f886e03bed

diff --git a/connectivity/source/drivers/flat/EConnection.cxx 
b/connectivity/source/drivers/flat/EConnection.cxx
index 3f39820..03bb821 100644
--- a/connectivity/source/drivers/flat/EConnection.cxx
+++ b/connectivity/source/drivers/flat/EConnection.cxx
@@ -59,7 +59,8 @@ OFlatConnection::~OFlatConnection()
 IMPLEMENT_SERVICE_INFO(OFlatConnection, 
"com.sun.star.sdbc.drivers.flat.Connection", "com.sun.star.sdbc.Connection")
 
 
-void OFlatConnection::construct(const OUString& url,const Sequence< 
PropertyValue >& info)  throw(SQLException)
+void OFlatConnection::construct(const OUString& url,const Sequence< 
PropertyValue >& info)
+throw(css::sdbc::SQLException, css::uno::RuntimeException)
 {
 osl_atomic_increment( &m_refCount );
 
diff --git a/connectivity/source/inc/flat/EConnection.hxx 
b/connectivity/source/inc/flat/EConnection.hxx
index 6b7fa29..ac5f451 100644
--- a/connectivity/source/inc/flat/EConnection.hxx
+++ b/connectivity/source/inc/flat/EConnection.hxx
@@ -40,7 +40,7 @@ namespace connectivity
 OFlatConnection(ODriver*_pDriver);
 virtual ~OFlatConnection();
 
-virtual void construct(const OUString& _rUrl,const 
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& 
_rInfo ) throw( ::com::sun::star::sdbc::SQLException) SAL_OVERRIDE;
+virtual void construct(const OUString& _rUrl,const 
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& 
_rInfo ) throw(css::sdbc::SQLException, css::uno::RuntimeException) 
SAL_OVERRIDE;
 
 // own methods
 inline bool isHeaderLine()  const { return 
m_bHeaderLine;   }
commit fdd716991a40d805027520cc345d6334426ff312
Author: Caolán McNamara 
Date:   Thu Apr 17 17:42:55 2014 +0100

coverity#1202787 Unchecked dynamic_cast

Change-Id: I16d9ae0f87157eaac2653ae76e5522a888b88f2b

diff --git a/sw/source/core/uibase/app/docstyle.cxx 
b/sw/source/core/uibase/app/docstyle.cxx
index db739ce..d2b14a8 100644
--- a/sw/source/core/uibase/app/docstyle.cxx
+++ b/sw/source/core/uibase/app/docstyle.cxx
@@ -550,7 +550,7 @@ void SwDocStyleSheet::SetHidden( bool bValue )
 if( bChg )
 {
 // calling pPool->First() here would be quite slow...
-dynamic_cast(pPool)->InvalidateIterator(); // 
internal list has to be updated
+dynamic_cast(*pPool).InvalidateIterator(); // 
internal list has to be updated
 pPool->Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_MODIFIED, *this ) 
);
 SwEditShell* pSh = rDoc

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

[Michael Stahl]

 sw/source/filter/xml/xmlithlp.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4af664af7003e93577a0aee67f251950fe529660
Author: Michael Stahl 
Date:   Thu Apr 17 19:07:14 2014 +0200

this looks more like a "merge" than c34cc212

Change-Id: I36307a8b676327b050cb5b5073325131a62bbebd

diff --git a/sw/source/filter/xml/xmlithlp.cxx 
b/sw/source/filter/xml/xmlithlp.cxx
index aade817..faa2dd5 100644
--- a/sw/source/filter/xml/xmlithlp.cxx
+++ b/sw/source/filter/xml/xmlithlp.cxx
@@ -292,7 +292,7 @@ void sw_frmitems_MergeXMLVertPos( SvxGraphicPosition& ePos,
 case GPOS_LT:
 case GPOS_LM:
 case GPOS_LB:
-ePos = eVert;
+ePos = GPOS_MT==eVert ? GPOS_LT : (GPOS_MM==eVert ? GPOS_LM : GPOS_LB);
 break;
 
 case GPOS_MT:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Chris Laplante]

 sw/source/core/doc/tblafmt.cxx|2 ++
 sw/source/core/layout/pagechg.cxx |6 ++
 sw/source/core/text/txtftn.cxx|1 -
 sw/source/filter/xml/swxml.cxx|1 +
 sw/source/filter/xml/xmlithlp.cxx |1 -
 5 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit c34cc21244d74f115165e1893f03b9c62a0eef2b
Author: Chris Laplante 
Date:   Wed Apr 9 18:17:34 2014 -0400

cppcheck: Fix redundant assignments in the sw module

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

diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 0dedd8b..dc0f19f 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -1206,6 +1206,8 @@ sal_Bool SwTableAutoFmtTbl::Save( SvStream& rStream ) 
const
.WriteUChar( (sal_uInt8)GetStoreCharSet( 
::osl_getThreadTextEncoding() ) );
 
 bRet = 0 == rStream.GetError();
+if (!bRet)
+return sal_False;
 
 // Write this version number for all attributes
 m_pImpl->m_AutoFormats[0].GetBoxFmt(0).SaveVersionNo(
diff --git a/sw/source/core/layout/pagechg.cxx 
b/sw/source/core/layout/pagechg.cxx
index 3b714b8..3f348b7 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1156,10 +1156,9 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, sal_Bool 
bNotifyFields, SwPageFrm
 SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, sal_Bool bFtn )
 {
 SwRootFrm *pRoot = (SwRootFrm*)pPrevPage->GetUpper();
-SwPageFrm *pSibling = (SwPageFrm*)pRoot->GetLower();
-SwPageDesc *pDesc = pSibling->GetPageDesc();
+SwPageFrm *pSibling = (SwPageFrm*)pPrevPage->GetNext();
+SwPageDesc *pDesc = 0;
 
-pSibling = (SwPageFrm*)pPrevPage->GetNext();
 // insert right (odd) or left (even) page?
 bool bNextOdd = !pPrevPage->OnRightPage();
 bool bWishedOdd = bNextOdd;
@@ -1167,7 +1166,6 @@ SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, 
sal_Bool bFtn )
 // Which PageDesc is relevant?
 // For CntntFrm take the one from format if provided,
 // otherwise from the Follow of the PrevPage
-pDesc = 0;
 if ( IsFlowFrm() && !SwFlowFrm::CastFlowFrm( this )->IsFollow() )
 {   SwFmtPageDesc &rDesc = (SwFmtPageDesc&)GetAttrSet()->GetPageDesc();
 pDesc = rDesc.GetPageDesc();
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 17dc849..182251e 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -1102,7 +1102,6 @@ sal_Int32 SwTxtFormatter::FormatQuoVadis( const sal_Int32 
nOffset )
 pCurrPor = pFollow;
 }
 
-nLastLeft = nOldRealWidth - nQuoWidth;
 Right( Right() - nQuoWidth );
 
 SWAP_IF_NOT_SWAPPED( pFrm )
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 2fb7a03..1073937 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -676,6 +676,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& 
rBaseURL, SwPaM &rPaM, c
 *pArgs++ <<= aLateInitSettings;
 
 Sequence aEmptyArgs( 3 );
+// cppcheck-suppress redundantAssignment
 pArgs = aEmptyArgs.getArray();
 *pArgs++ <<= xInfoSet;
 *pArgs++ <<= xStatusIndicator;
diff --git a/sw/source/filter/xml/xmlithlp.cxx 
b/sw/source/filter/xml/xmlithlp.cxx
index 97d21b8..aade817 100644
--- a/sw/source/filter/xml/xmlithlp.cxx
+++ b/sw/source/filter/xml/xmlithlp.cxx
@@ -292,7 +292,6 @@ void sw_frmitems_MergeXMLVertPos( SvxGraphicPosition& ePos,
 case GPOS_LT:
 case GPOS_LM:
 case GPOS_LB:
-ePos = GPOS_MT==eVert ? GPOS_LT : (GPOS_MM==eVert ? GPOS_LM : GPOS_LB);
 ePos = eVert;
 break;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/fontsubset/cff.cxx |   21 +++-
 vcl/source/gdi/metaact.cxx|  198 +-
 vcl/source/outdev/font.cxx|2 
 3 files changed, 196 insertions(+), 25 deletions(-)

New commits:
commit 91821848a3a50229b8b96e91e9eb053a8ebc5d9a
Author: Caolán McNamara 
Date:   Thu Apr 17 17:13:22 2014 +0100

coverity#708613 Uninitialized scalar field

Change-Id: I368396dc257503eac17f3519bfee72ef1366171a

diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 3dc1986..20440f1 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -2404,7 +2404,16 @@ void MetaISectRegionClipRegionAction::Read( SvStream& 
rIStm, ImplMetaReadData* )
 ReadRegion( rIStm, maRegion );
 }
 
-IMPL_META_ACTION( MoveClipRegion, META_MOVECLIPREGION_ACTION )
+MetaMoveClipRegionAction::MetaMoveClipRegionAction() :
+MetaAction  ( META_MOVECLIPREGION_ACTION ),
+mnHorzMove  ( 0 ),
+mnVertMove  ( 0 )
+{
+}
+
+MetaMoveClipRegionAction::~MetaMoveClipRegionAction()
+{
+}
 
 MetaMoveClipRegionAction::MetaMoveClipRegionAction( long nHorzMove, long 
nVertMove ) :
 MetaAction  ( META_MOVECLIPREGION_ACTION ),
@@ -2454,7 +2463,15 @@ void MetaMoveClipRegionAction::Read( SvStream& rIStm, 
ImplMetaReadData* )
 mnVertMove = nTmpVM;
 }
 
-IMPL_META_ACTION( LineColor, META_LINECOLOR_ACTION )
+MetaLineColorAction::MetaLineColorAction() :
+MetaAction  ( META_LINECOLOR_ACTION ),
+mbSet   ( false )
+{
+}
+
+MetaLineColorAction::~MetaLineColorAction()
+{
+}
 
 MetaLineColorAction::MetaLineColorAction( const Color& rColor, bool bSet ) :
 MetaAction  ( META_LINECOLOR_ACTION ),
@@ -2743,7 +2760,15 @@ void MetaOverlineColorAction::Read( SvStream& rIStm, 
ImplMetaReadData* )
 rIStm.ReadCharAsBool( mbSet );
 }
 
-IMPL_META_ACTION( TextAlign, META_TEXTALIGN_ACTION )
+MetaTextAlignAction::MetaTextAlignAction() :
+MetaAction  ( META_TEXTALIGN_ACTION ),
+maAlign ( ALIGN_TOP )
+{
+}
+
+MetaTextAlignAction::~MetaTextAlignAction()
+{
+}
 
 MetaTextAlignAction::MetaTextAlignAction( TextAlign aAlign ) :
 MetaAction  ( META_TEXTALIGN_ACTION ),
commit af7e9972a1113bf026a5a8cc32a075b5a3a7be09
Author: Caolán McNamara 
Date:   Thu Apr 17 17:11:44 2014 +0100

coverity#708615 Uninitialized scalar field

Change-Id: I93cc49b13b2b13c6ac8d1b7b4bf826c39cdb1759

diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 0a8d5f6..3dc1986 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -3467,7 +3467,15 @@ void MetaCommentAction::Read( SvStream& rIStm, 
ImplMetaReadData* )
 mpData = NULL;
 }
 
-IMPL_META_ACTION( LayoutMode, META_LAYOUTMODE_ACTION )
+MetaLayoutModeAction::MetaLayoutModeAction() :
+MetaAction  ( META_LAYOUTMODE_ACTION ),
+mnLayoutMode( 0 )
+{
+}
+
+MetaLayoutModeAction::~MetaLayoutModeAction()
+{
+}
 
 MetaLayoutModeAction::MetaLayoutModeAction( sal_uInt32 nLayoutMode ) :
 MetaAction  ( META_LAYOUTMODE_ACTION ),
commit c162763507d0c112dea70ed4f9f175a1beae9052
Author: Caolán McNamara 
Date:   Thu Apr 17 17:10:19 2014 +0100

coverity#708616 Uninitialized scalar field

Change-Id: Ic63f010b0e5d4f0d74c79e16673e3a3fde435e10

diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 9f2523b..0a8d5f6 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -1202,7 +1202,17 @@ void MetaTextArrayAction::Read( SvStream& rIStm, 
ImplMetaReadData* pData )
 }
 }
 
-IMPL_META_ACTION( StretchText, META_STRETCHTEXT_ACTION )
+MetaStretchTextAction::MetaStretchTextAction() :
+MetaAction  ( META_STRETCHTEXT_ACTION ),
+mnWidth ( 0 ),
+mnIndex ( 0 ),
+mnLen   ( 0 )
+{
+}
+
+MetaStretchTextAction::~MetaStretchTextAction()
+{
+}
 
 MetaStretchTextAction::MetaStretchTextAction( const Point& rPt, sal_uInt32 
nWidth,
   const OUString& rStr,
commit dbe1fd4ce068d982da678f3e7aa95a7f8cf00da6
Author: Caolán McNamara 
Date:   Thu Apr 17 17:09:31 2014 +0100

coverity#708617 Uninitialized scalar field

Change-Id: If4d6963b4f9ccf8683c95eff2ba1bb0f0d10e282

diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 6994a43..9f2523b 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -2993,7 +2993,15 @@ void MetaRasterOpAction::Read( SvStream& rIStm, 
ImplMetaReadData* )
 rIStm.ReadUInt16( nTmp16 ); meRasterOp = (RasterOp) nTmp16;
 }
 
-IMPL_META_ACTION( Transparent, META_TRANSPARENT_ACTION )
+MetaTransparentAction::MetaTransparentAction() :
+MetaAction  ( META_TRANSPARENT_ACTION ),
+mnTransPercent  ( 0 )
+{
+}
+
+MetaTransparentAction::~MetaTransparentAction()
+{
+}
 
 MetaTransparentAction::MetaTransparentAction( const PolyPolygon& rPolyPoly, 
sal_uInt16 nTransPercent ) :
 MetaAction  ( META_TRANSPARENT_ACTION ),
commit 3cb3ca5ca25cf22a12d98e2f379c6f5779e7e574
Author: Caolán McNamara 
Date:  

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

[Andras Timar]

 scp2/source/ooo/file_font_ooo.scp |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 66420bb9d1a4d38f0cc81d83957a685d7279911d
Author: Andras Timar 
Date:   Thu Oct 24 16:29:23 2013 +0200

disable Liberation fonts on Windows

Change-Id: Ief9ee02f78f08a3002cc3ced3b9da80fc855aeef

diff --git a/scp2/source/ooo/file_font_ooo.scp 
b/scp2/source/ooo/file_font_ooo.scp
index e7a2da35..5e27d1f 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -36,9 +36,11 @@ STD_FONT_FILELIST( gid_File_Fnt_Opensymb, 
"extras_fonts.filelist" )
 // DejaVu fonts
 STD_FONT_FILELIST(gid_File_Fnt_DejaVu, "fonts_dejavu.filelist")
 
+#ifndef WNT // fdo#62764 - Libreration fonts reportedly cause BSOD on Win7 SP1
 // Liberation fonts
 STD_FONT_FILELIST(gid_File_Fnt_LibSansNarrow, 
"fonts_liberation_narrow.filelist")
 STD_FONT_FILELIST(gid_File_Fnt_Liberation, "fonts_liberation.filelist")
+#endif
 
 // Gentium fonts
 STD_FONT_FILELIST(gid_File_Fnt_Gentium, "fonts_gentium.filelist")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Makefile.in

[Michael Stahl]

 Makefile.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 880e7587f704bf96c26388198ca32168735f2d0f
Author: Michael Stahl 
Date:   Thu Apr 17 17:51:56 2014 +0200

Makefile: let "make foo.genpatch" work on top-level

Change-Id: Ib0e370472be5da03359bca6f90287083d3465605

diff --git a/Makefile.in b/Makefile.in
index 4fcb163..0be30f7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -122,7 +122,7 @@ gbuild_TARGETS := AllLangHelp \
Zip \
 
 # build a generic gbuild target
-$(foreach target,$(gbuild_TARGETS),$(target)_% $(foreach 
module,$(gbuild_modules),$(target)_$(module)/%)):
+$(foreach target,$(gbuild_TARGETS),$(target)_% $(foreach 
module,$(gbuild_modules),$(target)_$(module)/%)) %.genpatch:
$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $@
 
 #
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 svx/source/svdraw/svdobj.cxx|4 
 svx/source/unodraw/unopage.cxx  |6 ++
 sw/source/core/uibase/shells/textsh.cxx |4 
 sw/source/core/uibase/uiview/view.cxx   |3 ++-
 4 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit c0b3d5be8fcec28190b1f25c9c0fd99916299249
Author: Tor Lillqvist 
Date:   Thu Apr 17 18:39:33 2014 +0300

Try harder to bypass avmedia on non-desktop for now

Change-Id: I8a45f7436383cb904d375d0f0d86416f3ce56567

diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index eaf24ac..9b82f10 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
 #include "sal/config.h"
 
 #include 
@@ -3394,7 +3396,9 @@ SdrObject* SdrObjFactory::MakeNewObject(sal_uInt32 
nInvent, sal_uInt16 nIdent, S
 case sal_uInt16(OBJ_PAGE   ): pObj=new SdrPageObj; 
 break;
 case sal_uInt16(OBJ_UNO): pObj=new SdrUnoObj(OUString());  
 break;
 case sal_uInt16(OBJ_CUSTOMSHAPE  ): pObj=new SdrObjCustomShape();  
 break;
+#if HAVE_FEATURE_DESKTOP
 case sal_uInt16(OBJ_MEDIA  ): pObj=new SdrMediaObj();  
 break;
+#endif
 case sal_uInt16(OBJ_TABLE  ): pObj=new 
::sdr::table::SdrTableObj(pModel);   break;
 case sal_uInt16(OBJ_OPENGL ): pObj=new SdrOpenGLObj;   
 break;
 }
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 4352206..52c1fc9 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
 #include 
 #include 
 #include 
@@ -536,11 +538,13 @@ void SvxDrawPage::GetTypeAndInventor( sal_uInt16& rType, 
sal_uInt32& rInventor,
 rInventor = SdrInventor;
 rType = OBJ_TABLE;
 }
+#if HAVE_FEATURE_DESKTOP
 else if ( aName == "com.sun.star.presentation.MediaShape" )
 {
 rInventor = SdrInventor;
 rType = OBJ_MEDIA;
 }
+#endif
 }
 else if(nTempType & E3D_INVENTOR_FLAG)
 {
@@ -732,9 +736,11 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( 
sal_uInt16 nType, sal_uInt3
 case OBJ_CUSTOMSHAPE:
 pRet = new SvxCustomShape( pObj );
 break;
+#if HAVE_FEATURE_DESKTOP
 case OBJ_MEDIA:
 pRet = new SvxMediaShape( pObj, referer );
 break;
+#endif
 case OBJ_TABLE:
 pRet = new SvxTableShape( pObj );
 break;
diff --git a/sw/source/core/uibase/shells/textsh.cxx 
b/sw/source/core/uibase/shells/textsh.cxx
index 635e21e..8db56d3 100644
--- a/sw/source/core/uibase/shells/textsh.cxx
+++ b/sw/source/core/uibase/shells/textsh.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
 #include 
 #include 
 #include 
@@ -224,6 +226,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
 rReq.Done();
 break;
 
+#if HAVE_FEATURE_DESKTOP
 case SID_INSERT_AVMEDIA:
 rReq.SetReturnValue(SfxBoolItem(nSlot, InsertMediaDlg( rReq )));
 break;
@@ -267,6 +270,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
 }
 }
 break;
+#endif
 
 case SID_INSERT_OBJECT:
 case SID_INSERT_PLUGIN:
diff --git a/sw/source/core/uibase/uiview/view.cxx 
b/sw/source/core/uibase/uiview/view.cxx
index f9d28d8..a952671 100644
--- a/sw/source/core/uibase/uiview/view.cxx
+++ b/sw/source/core/uibase/uiview/view.cxx
@@ -337,13 +337,14 @@ void SwView::SelectShell()
 m_pShell = new SwBezierShell( *this );
 rDispatcher.Push( *m_pShell );
 }
+#if HAVE_FEATURE_DESKTOP
 else if( m_nSelectionType & nsSelectionType::SEL_MEDIA )
 {
 eShellMode = SHELL_MODE_MEDIA;
 m_pShell = new SwMediaShell( *this );
 rDispatcher.Push( *m_pShell );
 }
-
+#endif
 if (m_nSelectionType & nsSelectionType::SEL_EXTRUDED_CUSTOMSHAPE)
 {
 eShellMode = SHELL_MODE_EXTRUDED_CUSTOMSHAPE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sw/source/filter/ww8/wrtww8gr.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dfd893ddd3f3f28e2c6856dce8d74189e55a9e3b
Author: Stephan Bergmann 
Date:   Thu Apr 17 17:28:01 2014 +0200

Get order of arguments right

Change-Id: Idf87fb375ed573588eff738ad01c69236adf945b

diff --git a/sw/source/filter/ww8/wrtww8gr.cxx 
b/sw/source/filter/ww8/wrtww8gr.cxx
index 163e4f7..4c96d5e 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -586,7 +586,7 @@ void SwWW8WrGrf::WritePICFHeader(SvStream& rStrm, const 
sw::Frame &rFly,
 pBox->GetDistance( aLnArr[ i ] ), bShadow );
 sal_uInt8 ico = rWrt.TransCol(msfilter::util::BGRToRGB(
 aBrc90.cv()));
-aBrc = WW8_BRC(ico, aBrc90.dptLineWidth(), 
aBrc90.brcType(),
+aBrc = WW8_BRC(aBrc90.dptLineWidth(), aBrc90.brcType(), 
ico,
 aBrc90.dptSpace(), aBrc90.fShadow(), aBrc90.fFrame());
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/CppunitTest_filter_psd_test.mk filter/Module_filter.mk filter/qa

[Caolán McNamara]

 filter/CppunitTest_filter_psd_test.mk   |   41 +++
 filter/Module_filter.mk |1 
 filter/qa/cppunit/data/psd/fail/CVE-2007-3741-1.psd |binary
 filter/qa/cppunit/data/psd/indeterminate/.gitignore |1 
 filter/qa/cppunit/data/psd/pass/rhbz899670-1.psd|binary
 filter/qa/cppunit/filters-pcx-test.cxx  |   12 +--
 filter/qa/cppunit/filters-psd-test.cxx  |   71 
 7 files changed, 120 insertions(+), 6 deletions(-)

New commits:
commit 3e28dff92cc25e7058e18545998088cad3ba6ccf
Author: Caolán McNamara 
Date:   Thu Apr 17 16:18:49 2014 +0100

add regression tests for psd filter

Change-Id: Ia9b34bc3b77902f8edbc0e7040da5edd02e02879

diff --git a/filter/CppunitTest_filter_psd_test.mk 
b/filter/CppunitTest_filter_psd_test.mk
new file mode 100644
index 000..850cc32
--- /dev/null
+++ b/filter/CppunitTest_filter_psd_test.mk
@@ -0,0 +1,41 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,filter_psd_test))
+
+$(eval $(call gb_CppunitTest_use_external,filter_psd_test,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,filter_psd_test, \
+filter/qa/cppunit/filters-psd-test \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,filter_psd_test, \
+ipd \
+   sal \
+   test \
+   tl \
+   unotest \
+   vcl \
+   $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,filter_psd_test,\
+udkapi \
+offapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,filter_psd_test))
+
+$(eval $(call gb_CppunitTest_use_components,filter_psd_test,\
+configmgr/source/configmgr \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,filter_psd_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index d37d91b..eeab593 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -85,6 +85,7 @@ ifneq ($(DISABLE_CVE_TESTS),TRUE)
 $(eval $(call gb_Module_add_check_targets,filter,\
 CppunitTest_filter_pcx_test \
 CppunitTest_filter_pict_test \
+CppunitTest_filter_psd_test \
 CppunitTest_filter_ras_test \
 CppunitTest_filter_tiff_test \
 CppunitTest_filter_tga_test \
diff --git a/filter/qa/cppunit/data/psd/fail/.gitignore 
b/filter/qa/cppunit/data/psd/fail/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/filter/qa/cppunit/data/psd/fail/CVE-2007-3741-1.psd 
b/filter/qa/cppunit/data/psd/fail/CVE-2007-3741-1.psd
new file mode 100644
index 000..59b6900
Binary files /dev/null and 
b/filter/qa/cppunit/data/psd/fail/CVE-2007-3741-1.psd differ
diff --git a/filter/qa/cppunit/data/psd/indeterminate/.gitignore 
b/filter/qa/cppunit/data/psd/indeterminate/.gitignore
new file mode 100644
index 000..583b009c
--- /dev/null
+++ b/filter/qa/cppunit/data/psd/indeterminate/.gitignore
@@ -0,0 +1 @@
+*.wmf-*
diff --git a/filter/qa/cppunit/data/psd/pass/.gitignore 
b/filter/qa/cppunit/data/psd/pass/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/filter/qa/cppunit/data/psd/pass/rhbz899670-1.psd 
b/filter/qa/cppunit/data/psd/pass/rhbz899670-1.psd
new file mode 100644
index 000..ce8de84
Binary files /dev/null and b/filter/qa/cppunit/data/psd/pass/rhbz899670-1.psd 
differ
diff --git a/filter/qa/cppunit/filters-pcx-test.cxx 
b/filter/qa/cppunit/filters-pcx-test.cxx
index 678b267..013d96d 100644
--- a/filter/qa/cppunit/filters-pcx-test.cxx
+++ b/filter/qa/cppunit/filters-pcx-test.cxx
@@ -27,12 +27,12 @@ using namespace ::com::sun::star;
 
 /* Implementation of Filters test */
 
-class RasFilterTest
+class PcxFilterTest
 : public test::FiltersTest
 , public test::BootstrapFixture
 {
 public:
-RasFilterTest() : BootstrapFixture(true, false) {}
+PcxFilterTest() : BootstrapFixture(true, false) {}
 
 virtual bool load(const OUString &,
 const OUString &rURL, const OUString &,
@@ -43,12 +43,12 @@ public:
  */
 void testCVEs();
 
-CPPUNIT_TEST_SUITE(RasFilterTest);
+CPPUNIT_TEST_SUITE(PcxFilterTest);
 CPPUNIT_TEST(testCVEs);
 CPPUNIT_TEST_SUITE_END();
 };
 
-bool RasFilterTest::load(const OUString &,
+bool PcxFilterTest::load(const OUString &,
 const OUString &rURL, const OUString &,
 unsigned int, unsigned int, unsigned int)
 {
@@ -57,14 +57,14 @@ bool RasFilterTest::load(const OUString &,
 return GraphicImport(aFileStream, aGraphic, NULL);
 }
 
-void RasFilterTest::testCVEs()
+void PcxFilterTest::testCVEs()
 {
 testDir(OUString(),
 getURLFromSrc("/filter/qa/cppunit/data/pcx/"),
 OUString());
 }
 
-CPPUNIT_TEST_SUITE_REGISTRATION(RasFilterTest);
+CPPUNIT_TEST_SUITE_REGISTRATION(PcxFil

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

[Miklos Vajna]

 oox/source/drawingml/customshapepresetdata.cxx |  155 +
 1 file changed, 131 insertions(+), 24 deletions(-)

New commits:
commit 06abff6caef5205178858796643ced0dff13ad95
Author: Miklos Vajna 
Date:   Thu Apr 17 16:00:25 2014 +0200

oox customshapepresetdata: parse SubViewSize

Change-Id: I2feb7054ea2bd699384b01a1d83845cd3c2562b0

diff --git a/oox/source/drawingml/customshapepresetdata.cxx 
b/oox/source/drawingml/customshapepresetdata.cxx
index 97e9b74..6d3a281 100644
--- a/oox/source/drawingml/customshapepresetdata.cxx
+++ b/oox/source/drawingml/customshapepresetdata.cxx
@@ -161,6 +161,25 @@ awt::Rectangle lcl_parseRectangle(const OString& rValue)
 return aRectangle;
 }
 
+awt::Size lcl_parseSize(const OString& rValue)
+{
+awt::Size aSize;
+OString aToken = rValue;
+// We expect the followings here: Width, Height
+static const OString aExpectedWidthPrefix = "Width = (long) ";
+assert(aToken.startsWith(aExpectedWidthPrefix));
+sal_Int32 nIndex = aExpectedWidthPrefix.getLength();
+aSize.Width = static_cast(aToken.getToken(0, ',', 
nIndex).toInt32());
+
+static const OString aExpectedHeightPrefix = " Height = (long) ";
+aToken = aToken.copy(nIndex);
+assert(aToken.startsWith(aExpectedHeightPrefix));
+nIndex = aExpectedHeightPrefix.getLength();
+aSize.Width = static_cast(aToken.copy(nIndex).toInt32());
+
+return aSize;
+}
+
 drawing::EnhancedCustomShapeTextFrame 
lcl_parseEnhancedCustomShapeTextFrame(const OString& rValue)
 {
 drawing::EnhancedCustomShapeTextFrame aTextFrame;
@@ -602,6 +621,68 @@ void 
lcl_parsePathTextFrames(comphelper::SequenceAsVector&
 }
 }
 
+void 
lcl_parsePathSubViewSizeValues(comphelper::SequenceAsVector&
 rPath, const OString& rValue)
+{
+comphelper::SequenceAsVector aSizes;
+sal_Int32 nLevel = 0;
+sal_Int32 nStart = 0;
+for (sal_Int32 i = 0; i < rValue.getLength(); ++i)
+{
+if (rValue[i] == '{')
+{
+if (!nLevel)
+nStart = i;
+nLevel++;
+}
+else if (rValue[i] == '}')
+{
+nLevel--;
+if (!nLevel)
+aSizes.push_back(lcl_parseSize(rValue.copy(nStart + strlen("{ 
"), i - nStart - strlen(" },";
+}
+}
+
+beans::PropertyValue aPropertyValue;
+aPropertyValue.Name = "SubViewSize";
+aPropertyValue.Value = uno::makeAny(aSizes.getAsConstList());
+rPath.push_back(aPropertyValue);
+}
+
+void 
lcl_parsePathSubViewSize(comphelper::SequenceAsVector& 
rPath, const OString& rValue)
+{
+sal_Int32 nLevel = 0;
+bool bIgnore = false;
+sal_Int32 nStart = 0;
+for (sal_Int32 i = 0; i < rValue.getLength(); ++i)
+{
+if (rValue[i] == '{')
+{
+if (!nLevel)
+bIgnore = true;
+nLevel++;
+}
+else if (rValue[i] == '}')
+{
+nLevel--;
+if (!nLevel)
+bIgnore = false;
+}
+else if (rValue[i] == ',' && !bIgnore)
+{
+OString aToken = rValue.copy(nStart, i - nStart);
+static const OString aExpectedPrefix("Value = (any) { 
([]com.sun.star.awt.Size) { ");
+if (aToken.startsWith(aExpectedPrefix))
+{
+aToken = aToken.copy(aExpectedPrefix.getLength(), 
aToken.getLength() - aExpectedPrefix.getLength() - strlen(" } }"));
+lcl_parsePathSubViewSizeValues(rPath, aToken);
+}
+else if (!aToken.startsWith("Name =") && 
!aToken.startsWith("Handle ="))
+SAL_WARN("oox", "lcl_parsePathSubViewSize: unexpected token: " 
<< aToken);
+nStart = i + strlen(", ");
+}
+}
+}
+
 void lcl_parsePath(comphelper::SequenceAsVector& rPath, 
const OString& rValue)
 {
 sal_Int32 nLevel = 0;
@@ -626,6 +707,8 @@ void 
lcl_parsePath(comphelper::SequenceAsVector& rPath, co
 lcl_parsePathSegments(rPath, aToken);
 else if (aToken.startsWith("Name = \"TextFrames\""))
 lcl_parsePathTextFrames(rPath, aToken);
+else if (aToken.startsWith("Name = \"SubViewSize\""))
+lcl_parsePathSubViewSize(rPath, aToken);
 else
 SAL_WARN("oox", "lcl_parsePath: unexpected token: " << 
aToken);
 }
commit ea06c516a8b8b2d8dbf0dadba1e8c2196cb89449
Author: Miklos Vajna 
Date:   Thu Apr 17 15:48:11 2014 +0200

oox customshapepresetdata: allow empty equation list

Change-Id: Ie18c3e631c266d4281df8b92d08ddeaaef20e8d7

diff --git a/oox/source/drawingml/customshapepresetdata.cxx 
b/oox/source/drawingml/customshapepresetdata.cxx
index 71add4f..97e9b74 100644
--- a/oox/source/drawingml/customshapepresetdata.cxx
+++ b/oox/source/drawingml/customshapepresetdata.cxx
@@ -682,12 +682,15 @@ void CustomShapeProperties::initializePresetDataMap()
 else if (aLine == "Equations"

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

[Caolán McNamara]

 vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2007-3741-1.bmp |binary
 vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2007-3741-2.bmp |binary
 2 files changed

New commits:
commit 42b3064025268fdc5f64dbf053ea61b5cef07857
Author: Caolán McNamara 
Date:   Thu Apr 17 15:51:09 2014 +0100

add more bmp test cases

Change-Id: I42e4d9c708e4c4c833f58fec7ce2b324ceec6496

diff --git a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2007-3741-1.bmp 
b/vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2007-3741-1.bmp
new file mode 100644
index 000..84ac054
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2007-3741-1.bmp differ
diff --git a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2007-3741-2.bmp 
b/vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2007-3741-2.bmp
new file mode 100644
index 000..a6aed59
Binary files /dev/null and 
b/vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2007-3741-2.bmp differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/fontsubset/fontsubset.cxx |   28 ++--
 1 file changed, 18 insertions(+), 10 deletions(-)

New commits:
commit f6d2bd87b056b187f856d380837b72f5d16522ba
Author: Caolán McNamara 
Date:   Thu Apr 17 15:41:56 2014 +0100

coverity#708591 Uninitialized pointer field

Change-Id: Ib829316c9aa522ca846bb2c1cd5233197dba3b54

diff --git a/vcl/source/fontsubset/fontsubset.cxx 
b/vcl/source/fontsubset/fontsubset.cxx
index 3be4099..dea870b 100644
--- a/vcl/source/fontsubset/fontsubset.cxx
+++ b/vcl/source/fontsubset/fontsubset.cxx
@@ -23,18 +23,26 @@
 #include 
 
 FontSubsetInfo::FontSubsetInfo()
-:   m_nAscent( 0)
-,   m_nDescent( 0)
-,   m_nCapHeight( 0)
-,   m_nFontType( FontSubsetInfo::NO_FONT)
-,   mpInFontBytes( NULL)
-,   mnInByteLength( 0)
-,   meInFontType( FontSubsetInfo::NO_FONT)
-,   mpSftTTFont( NULL)
-{}
+: m_nAscent( 0)
+, m_nDescent( 0)
+, m_nCapHeight( 0)
+, m_nFontType( FontSubsetInfo::NO_FONT)
+, mpInFontBytes( NULL)
+, mnInByteLength( 0)
+, meInFontType( FontSubsetInfo::NO_FONT)
+, mpSftTTFont( NULL)
+, mnReqFontTypeMask(0)
+, mpOutFile(NULL)
+, mpReqFontName(NULL)
+, mpReqGlyphIds(NULL)
+, mpReqEncodedIds(NULL)
+, mnReqGlyphCount(0)
+{
+}
 
 FontSubsetInfo::~FontSubsetInfo()
-{}
+{
+}
 
 // prepare subsetting for fonts where the input font file is mapped
 bool FontSubsetInfo::LoadFont(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sw/source/filter/ww8/ww8par2.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 6269c009ea0c4ef6037e435d8e759db954ed54fe
Author: Stephan Bergmann 
Date:   Thu Apr 17 16:35:09 2014 +0200

Fix pointer casting

Change-Id: I813168cbaa99d421886fc27be34efdfd7d97e0d4

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 5bcc3e0..6b3cd27 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -21,6 +21,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1243,8 +1244,9 @@ void WW8TabBandDesc::ProcessSprmTTableBorders(int 
nBrcVer, const sal_uInt8* pPar
 }
 else if ( nBrcVer == 8 )
 {
+BOOST_STATIC_ASSERT(sizeof (WW8_BRC) == 4);
 for( int i = 0; i < 6; ++i )
-aDefBrcs[i] = ((WW8_BRC*)&pParams)[i];
+aDefBrcs[i] = reinterpret_cast(pParams)[i];
 }
 else
 memcpy( aDefBrcs, pParams, sizeof( aDefBrcs ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 filter/qa/cppunit/data/pcx/fail/CVE-2007-3741-2.pcx |binary
 filter/qa/cppunit/data/pcx/fail/CVE-2007-3741-3.pcx |binary
 2 files changed

New commits:
commit b4be3f153f2cc0350e8e31f8e64ab8d4082955c5
Author: Caolán McNamara 
Date:   Thu Apr 17 15:34:17 2014 +0100

more pcx testcases

Change-Id: I73fd736f7acfb50d151fd89db3b4d56fb13800a0

diff --git a/filter/qa/cppunit/data/pcx/fail/CVE-2007-3741-2.pcx 
b/filter/qa/cppunit/data/pcx/fail/CVE-2007-3741-2.pcx
new file mode 100644
index 000..9c8a751
Binary files /dev/null and 
b/filter/qa/cppunit/data/pcx/fail/CVE-2007-3741-2.pcx differ
diff --git a/filter/qa/cppunit/data/pcx/fail/CVE-2007-3741-3.pcx 
b/filter/qa/cppunit/data/pcx/fail/CVE-2007-3741-3.pcx
new file mode 100644
index 000..4117565
Binary files /dev/null and 
b/filter/qa/cppunit/data/pcx/fail/CVE-2007-3741-3.pcx differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 57950] Replace chained O(U)StringBuffer::append() with operator+

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=57950

--- Comment #50 from Commit Notification 
 ---
Krisztian Pinter committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=9832e23703b989da1dc470f543eb31c25d6c5e29

fdo#57950 Replace chained append() with operator+



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: sw/source

[Krisztian Pinter]

 sw/source/filter/html/htmlforw.cxx |  186 -
 1 file changed, 82 insertions(+), 104 deletions(-)

New commits:
commit 9832e23703b989da1dc470f543eb31c25d6c5e29
Author: Krisztian Pinter 
Date:   Fri Mar 21 21:20:14 2014 +0100

fdo#57950 Replace chained append() with operator+

Replaced in the following files:
 sw/source/filter/html/htmldraw.cxx
  /htmlfly.cxx
  /htmlforw.cxx

Conflicts:
sw/source/filter/html/htmldrawreader.cxx
sw/source/filter/html/htmlfly.cxx

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

diff --git a/sw/source/filter/html/htmlforw.cxx 
b/sw/source/filter/html/htmlforw.cxx
index b9bf2ab..f03f6ca 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -162,35 +162,27 @@ static void lcl_html_outEvents( SvStream& rStrm,
 }
 }
 
-OStringBuffer sOut;
-sOut.append(' ');
+OString sOut = " ";
 if( pOpt && (EXTENDED_STYPE != eScriptType ||
  pDescs[i].AddListenerParam.isEmpty()) )
-sOut.append(pOpt);
+sOut += OString(pOpt);
 else
 {
-sOut.append(OOO_STRING_SVTOOLS_HTML_O_sdevent)
-.append(OUStringToOString(sListener,
-RTL_TEXTENCODING_ASCII_US))
-.append('-')
-.append(OUStringToOString(sMethod,
-RTL_TEXTENCODING_ASCII_US));
+sOut += OString(OOO_STRING_SVTOOLS_HTML_O_sdevent) +
+OUStringToOString(sListener, RTL_TEXTENCODING_ASCII_US) + "-" +
+OUStringToOString(sMethod, RTL_TEXTENCODING_ASCII_US);
 }
-sOut.append("=\"");
-rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() );
+sOut += "=\"";
+rStrm.WriteOString( sOut );
 HTMLOutFuncs::Out_String( rStrm, pDescs[i].ScriptCode, eDestEnc, 
pNonConvertableChars );
 rStrm.WriteChar( '\"' );
 if( EXTENDED_STYPE == eScriptType &&
 !pDescs[i].AddListenerParam.isEmpty() )
 {
-sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_sdaddparam)
-.append(OUStringToOString(sListener,
-RTL_TEXTENCODING_ASCII_US))
-.append('-')
-.append(OUStringToOString(sMethod,
-RTL_TEXTENCODING_ASCII_US))
-.append("=\"");
-rStrm.WriteCharPtr( sOut.makeStringAndClear().getStr() );
+sOut = " " + OString(OOO_STRING_SVTOOLS_HTML_O_sdaddparam) +
+OUStringToOString(sListener, RTL_TEXTENCODING_ASCII_US) + "-" +
+OUStringToOString(sMethod, RTL_TEXTENCODING_ASCII_US) + "=\"";
+rStrm.WriteOString( sOut );
 HTMLOutFuncs::Out_String( rStrm, pDescs[i].AddListenerParam,
   eDestEnc, pNonConvertableChars );
 rStrm.WriteChar( '\"' );
@@ -467,8 +459,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn,
 // die neue Form wird geoeffnet
 if( bLFPossible )
 OutNewLine();
-OStringBuffer sOut;
-sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_form);
+OString sOut = "<" + OString(OOO_STRING_SVTOOLS_HTML_form);
 
 uno::Reference< beans::XPropertySet > xFormPropSet( rFormComps, 
uno::UNO_QUERY );
 
@@ -477,11 +468,11 @@ void SwHTMLWriter::OutForm( sal_Bool bOn,
 if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
 !((OUString*)aTmp.getValue())->isEmpty() )
 {
-sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name).append("=\"");
-Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
+sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_name) + "=\"";
+Strm().WriteOString( sOut );
 HTMLOutFuncs::Out_String( Strm(), *(OUString*)aTmp.getValue(),
   eDestEnc, &aNonConvertableCharacters );
-sOut.append('\"');
+sOut = "\"";
 }
 
 aTmp = xFormPropSet->getPropertyValue(
@@ -489,12 +480,12 @@ void SwHTMLWriter::OutForm( sal_Bool bOn,
 if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
 !((OUString*)aTmp.getValue())->isEmpty() )
 {
-sOut.append(' 
').append(OOO_STRING_SVTOOLS_HTML_O_action).append("=\"");
-Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
+sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_action) + "=\"";
+Strm().WriteOString( sOut );
 OUString aURL( *(OUString*)aTmp.getValue() );
 aURL = URIHelper::simpleNormalizedMakeRelative( GetBaseURL(), aURL);
 HTMLOutFuncs::Out_String( Strm(), aURL, eDestEnc, 
&aNonConvertableCharacters );
-sOut.append('\"');
+sOut = "\"";
 }
 
 aTmp = x

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

[Tor Lillqvist]

 chart2/source/view/main/ChartView.cxx   |4 
 svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx |4 
 2 files changed, 8 insertions(+)

New commits:
commit 95f4d0fed142171acba11a3a6feda4fd820e70cc
Author: Tor Lillqvist 
Date:   Thu Apr 17 17:24:22 2014 +0300

Try harder to bypass OpenGL 3D stuff on non-desktop for now

At least while the OpenGL chart feature is a work in progress, and
nobody is working on it for iOS or Android anyway.

Change-Id: I9de5c6647e6db42b330e593089e296aa9a346afb

diff --git a/chart2/source/view/main/ChartView.cxx 
b/chart2/source/view/main/ChartView.cxx
index 978ecef..c530354 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
 #include "ChartView.hxx"
 #include "chartview/DrawModelWrapper.hxx"
 #include "NumberFormatterWrapper.hxx"
@@ -2455,11 +2457,13 @@ void ChartView::createShapes()
 pShapeFactory->setPageSize(mxRootShape, aPageSize);
 pShapeFactory->clearPage(m_xDrawPage);
 
+#if HAVE_FEATURE_DESKTOP
 if(isReal3DChart())
 {
 createShapes3D();
 return;
 }
+#endif
 
 {
 SolarMutexGuard aSolarGuard;
diff --git a/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx 
b/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
index 6062ab9..2f76985 100644
--- a/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include 
+
 #include 
 #include 
 
@@ -21,9 +23,11 @@ ViewObjectContactOfOpenGLObj::ViewObjectContactOfOpenGLObj(
 ObjectContact& rObjectContact, ViewContact& rViewContact )
 : ViewObjectContactOfSdrObj( rObjectContact, rViewContact )
 {
+#if HAVE_FEATURE_DESKTOP
 OpenGLContext* pContext = 
static_cast(static_cast(rViewContact).GetSdrObject()).getOpenGLContext();
 if (pContext)
 pContext->init(getWindow());
+#endif
 }
 
 ViewObjectContactOfOpenGLObj::~ViewObjectContactOfOpenGLObj()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Chris Sherlock]

 include/vcl/outdev.hxx|   14 +-
 vcl/source/outdev/bitmap.cxx  |  214 --
 vcl/source/outdev/transparent.cxx |2 
 3 files changed, 99 insertions(+), 131 deletions(-)

New commits:
commit 2a67712f5ff97ebf04860a10d50ed94a654e1f5e
Author: Chris Sherlock 
Date:   Fri Apr 18 00:08:53 2014 +1000

Refactor VCL bitmap code

Turns out that all bitmap code eventually calls on ImplDrawBitmap and
ImplDrawBitmapEx, which is called by a version with the same function
signature but without a type parameter. If you make that sal_uLong
parameter a default parameter, you can remove ImplDrawBitmap/Ex and just
call on that version of DrawBitmap/Ex.

Change-Id: Ifd75561bb824b3941c2cf700984ca80e0b851bd3

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index c428c81..c98ff3a 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -20,6 +20,9 @@
 #ifndef INCLUDED_VCL_OUTDEV_HXX
 #define INCLUDED_VCL_OUTDEV_HXX
 
+#define META_BMPSCALEPART_ACTION(118)
+#define META_BMPEXSCALEPART_ACTION  (121)
+
 #include 
 #include 
 #include 
@@ -774,12 +777,6 @@ public:
  */
 ///@{
 SAL_DLLPRIVATE void ImplDrawOutDevDirect ( const OutputDevice* 
pSrcDev, SalTwoRect& rPosAry );
-SAL_DLLPRIVATE void ImplDrawBitmap   ( const Point& rDestPt, 
const Size& rDestSize,
-   const Point& 
rSrcPtPixel, const Size& rSrcSizePixel,
-   const Bitmap& rBitmap, 
const sal_uLong nAction );
-SAL_DLLPRIVATE void ImplDrawBitmapEx ( const Point& rDestPt, 
const Size& rDestSize,
-   const Point& 
rSrcPtPixel, const Size& rSrcSizePixel,
-   const BitmapEx& 
rBitmapEx, const sal_uLong nAction );
 SAL_DLLPRIVATE void ImplDrawAlpha( const Bitmap& rBmp, 
const AlphaMask& rAlpha,
const Point& rDestPt, 
const Size& rDestSize,
const Point& 
rSrcPtPixel, const Size& rSrcSizePixel );
@@ -,7 +1108,8 @@ public:
 const Bitmap& rBitmap );
 voidDrawBitmap( const Point& rDestPt, const Size& 
rDestSize,
 const Point& rSrcPtPixel, const 
Size& rSrcSizePixel,
-const Bitmap& rBitmap );
+const Bitmap& rBitmap, sal_uLong 
nAction = META_BMPSCALEPART_ACTION );
+
 
 voidDrawBitmapEx( const Point& rDestPt,
   const BitmapEx& rBitmapEx );
@@ -1119,7 +1117,7 @@ public:
   const BitmapEx& rBitmapEx );
 voidDrawBitmapEx( const Point& rDestPt, const 
Size& rDestSize,
   const Point& rSrcPtPixel, const 
Size& rSrcSizePixel,
-  const BitmapEx& rBitmapEx );
+  const BitmapEx& rBitmapExi, 
sal_uLong nAction = META_BMPEXSCALEPART_ACTION );
 
 /** Draw BitampEx transformed
 
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 80b7c4e..973a604 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -43,54 +43,24 @@
 
 void OutputDevice::DrawBitmap( const Point& rDestPt, const Bitmap& rBitmap )
 {
-if( ImplIsRecordLayout() )
-return;
-
 const Size aSizePix( rBitmap.GetSizePixel() );
-ImplDrawBitmap( rDestPt, PixelToLogic( aSizePix ), Point(), aSizePix, 
rBitmap, META_BMP_ACTION );
-
-if( mpAlphaVDev )
-{
-// #i32109#: Make bitmap area opaque
-mpAlphaVDev->ImplFillOpaqueRectangle( Rectangle(rDestPt, PixelToLogic( 
aSizePix )) );
-}
+DrawBitmap( rDestPt, PixelToLogic( aSizePix ), Point(), aSizePix, rBitmap, 
META_BMP_ACTION );
 }
 
 void OutputDevice::DrawBitmap( const Point& rDestPt, const Size& rDestSize, 
const Bitmap& rBitmap )
 {
-if( ImplIsRecordLayout() )
-return;
-
-ImplDrawBitmap( rDestPt, rDestSize, Point(), rBitmap.GetSizePixel(), 
rBitmap, META_BMPSCALE_ACTION );
-
-if( mpAlphaVDev )
-{
-// #i32109#: Make bitmap area opaque
-mpAlphaVDev->ImplFillOpaqueRectangle( Rectangle(rDestPt, rDestSize) );
-}
+DrawBitmap( rDestPt, rDestSize, Point(), rBitmap.GetSizePixel(), rBitmap, 
META_BMPSCALE_ACTION );
 }
 
-void OutputDevice::DrawBitmap( const Point& rDestPt, const Size& rDestSize,
-   const Point& rSrcPtPixel, const Size& 
rSrcSizePixel,
-   const Bitmap& rBitmap )
-{
-if( ImplIsRecordLayout() )

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

[Caolán McNamara]

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

New commits:
commit c0fca42bf7c192292d0ab5058d6b1815477bf57c
Author: Caolán McNamara 
Date:   Wed Apr 16 13:04:52 2014 +0100

Resolves: fdo#75525 out by one error

(cherry picked from commit 12984e46704f1e55f76b210cf65217e54662dc26)

Conflicts:
starmath/source/dialog.cxx

Change-Id: I0171d2a79b6b015fa2f01d78228e901005017fb0
Reviewed-on: https://gerrit.libreoffice.org/9066
Reviewed-by: Kohei Yoshida 
Tested-by: Kohei Yoshida 
(cherry picked from commit f7e32ba07910956bd09d79e37eb8ce6eb8a0ac30)
Reviewed-on: https://gerrit.libreoffice.org/9080
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 73d93ab..fc9641b 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -643,7 +643,7 @@ SmCategoryDesc::SmCategoryDesc(VclBuilderContainer& 
rBuilder, sal_uInt16 nCatego
 Graphics [i] = 0;
 }
 
-const FieldMinMax &rMinMax = pMinMaxData[ nCategoryIdx ][i];
+const FieldMinMax &rMinMax = pMinMaxData[ nCategoryIdx-1 ][i];
 Value[i] = Minimum[i] = rMinMax.nMin;
 Maximum[i] = rMinMax.nMax;
 }
___
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' - sw/source

[Michael Stahl]

 sw/source/core/fields/reffld.cxx |   73 ++-
 1 file changed, 34 insertions(+), 39 deletions(-)

New commits:
commit 4786291566320aaf21fe4c9a7fb52269ddba4f3c
Author: Michael Stahl 
Date:   Thu Apr 17 15:25:23 2014 +0200

fdo#77342: sw: fix copy/paste of footnote cross references

The fix for sequence fields broke the footnote references some more;
simplify it by handling the footnotes in the same way as the sequence
fields, and not remapping GetExp fields for which the corresponding
SetExp field / footnote is missing.

Also, don't do any remapping when the target is a clipboard document, to
prevent modifying the source document.

(regression from bb665affbd8870652ade3951d626d76e99143f67)

(cherry picked from commit cbfcb837fb06a14daf5281ae13fc1886328cee6f)

Conflicts:
sw/source/core/fields/reffld.cxx

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

diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index ba0e4bb..fee6d0e 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -1014,6 +1014,17 @@ void _RefIdsMap::Init( SwDoc& rDoc, SwDoc& rDestDoc, 
bool bField )
 {
 GetNoteIdsFromDoc( rDestDoc, aIds );
 GetNoteIdsFromDoc( rDoc, aDstIds );
+
+for (std::set::iterator pIt = aDstIds.begin(); pIt != 
aDstIds.end(); ++pIt)
+AddId( GetFirstUnusedId(aIds), *pIt );
+
+// Change the footnotes/endnotes in the source doc to the new ID
+for (sal_uInt16 i = 0, nCnt = rDoc.GetFtnIdxs().size(); i < nCnt; ++i)
+{
+SwTxtFtn *const pFtnIdx = rDoc.GetFtnIdxs()[i];
+sal_uInt16 const n = pFtnIdx->GetSeqRefNo();
+pFtnIdx->SetSeqNo(sequencedIds[n]);
+}
 }
 bInit = true;
 }
@@ -1051,54 +1062,38 @@ void _RefIdsMap::Check( SwDoc& rDoc, SwDoc& rDestDoc, 
SwGetRefField& rFld,
 {
 Init( rDoc, rDestDoc, bField);
 
-sal_uInt16 nSeqNo = rFld.GetSeqNo();
+sal_uInt16 const nSeqNo = rFld.GetSeqNo();
 
-// Check if the number is used in both documents
-// Note: For fields, aIds contains both the ids of SetExp from rDestDoc
-// and the targets of the already remapped ones from rDoc.
-// It is possible that aDstIds contains numbers that aIds does not contain!
-// For example, copying a selection to clipboard that does not contain
-// the first SwSetExpField will result in id 0 missing, then pasting that
-// into empty document gives a mapping 1->0 ... N->N-1 (fdo#63553).
-if (aIds.count(nSeqNo) || aDstIds.count(nSeqNo))
+// check if it needs to be remapped
+// if sequencedIds doesn't contain the number, it means there is no
+// SetExp field / footnote in the source document: do not modify
+// the number, which works well for copy from/paste to same document
+// (and if it is not the same document, there's no "correct" result anyway)
+if (sequencedIds.count(nSeqNo))
 {
-// Number already taken, so need a new one.
-if( sequencedIds.count(nSeqNo) )
-rFld.SetSeqNo( sequencedIds[nSeqNo] );
-else
-{
-assert(!bField || !aDstIds.count(nSeqNo)); // postcond of Init
-
-sal_uInt16 n = GetFirstUnusedId( aIds );
-
-// die neue SeqNo eintragen, damit die "belegt" ist
-AddId( n, nSeqNo );
-rFld.SetSeqNo( n );
-
-// und noch die Fuss-/EndNote auf die neue Id umsetzen
-if( !bField )
-{
-SwTxtFtn* pFtnIdx;
-for( sal_uInt16 i = 0, nCnt = rDoc.GetFtnIdxs().size(); i < 
nCnt; ++i )
-if( nSeqNo == (pFtnIdx = rDoc.GetFtnIdxs()[ i 
])->GetSeqRefNo() )
-{
-pFtnIdx->SetSeqNo( n );
-break;
-}
-}
-}
-}
-else
-{
-AddId( nSeqNo, nSeqNo ); // this requires that nSeqNo is unused in 
both!
+rFld.SetSeqNo( sequencedIds[nSeqNo] );
 }
 }
 
-
+/// 1. if _both_ SetExp + GetExp / Footnote + GetExp field are copied,
+///enusure that both get a new unused matching number
+/// 2. if only SetExp / Footnote is copied, it gets a new unused number
+/// 3. if only GetExp field is copied, for the case of copy from / paste to
+///same document it's desirable to keep the same number;
+///for other cases of copy/paste or master documents it's not obvious
+///what is most desirable since it's going to be wrong anyway
 void SwGetRefFieldType::MergeWithOtherDoc( SwDoc& rDestDoc )
 {
 if( &rDestDoc != pDoc )
 {
+if (rDestDoc.IsClipBoard())
+{
+// when copying _to_ clipboard, expectation is that no fields exist
+// so no re-mapping

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

[Michael Stahl]

 sw/source/core/fields/reffld.cxx |   72 ++-
 1 file changed, 34 insertions(+), 38 deletions(-)

New commits:
commit e8252361548e3ca7849ced1a31d90fa5e5aacb09
Author: Michael Stahl 
Date:   Thu Apr 17 15:25:23 2014 +0200

fdo#77342: sw: fix copy/paste of footnote cross references

The fix for sequence fields broke the footnote references some more;
simplify it by handling the footnotes in the same way as the sequence
fields, and not remapping GetExp fields for which the corresponding
SetExp field / footnote is missing.

Also, don't do any remapping when the target is a clipboard document, to
prevent modifying the source document.

(regression from bb665affbd8870652ade3951d626d76e99143f67)

(cherry picked from commit cbfcb837fb06a14daf5281ae13fc1886328cee6f)

Conflicts:
sw/source/core/fields/reffld.cxx

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

diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index e20accb..9fbd6cd 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -1009,6 +1009,17 @@ void _RefIdsMap::Init( SwDoc& rDoc, SwDoc& rDestDoc, 
bool bField )
 {
 GetNoteIdsFromDoc( rDestDoc, aIds );
 GetNoteIdsFromDoc( rDoc, aDstIds );
+
+for (std::set::iterator pIt = aDstIds.begin(); pIt != 
aDstIds.end(); ++pIt)
+AddId( GetFirstUnusedId(aIds), *pIt );
+
+// Change the footnotes/endnotes in the source doc to the new ID
+for (sal_uInt16 i = 0, nCnt = rDoc.GetFtnIdxs().size(); i < nCnt; ++i)
+{
+SwTxtFtn *const pFtnIdx = rDoc.GetFtnIdxs()[i];
+sal_uInt16 const n = pFtnIdx->GetSeqRefNo();
+pFtnIdx->SetSeqNo(sequencedIds[n]);
+}
 }
 bInit = true;
 }
@@ -1046,53 +1057,38 @@ void _RefIdsMap::Check( SwDoc& rDoc, SwDoc& rDestDoc, 
SwGetRefField& rFld,
 {
 Init( rDoc, rDestDoc, bField);
 
-sal_uInt16 nSeqNo = rFld.GetSeqNo();
-
-// Check if the number is used in both documents
-// Note: For fields, aIds contains both the ids of SetExp from rDestDoc
-// and the targets of the already remapped ones from rDoc.
-// It is possible that aDstIds contains numbers that aIds does not contain!
-// For example, copying a selection to clipboard that does not contain
-// the first SwSetExpField will result in id 0 missing, then pasting that
-// into empty document gives a mapping 1->0 ... N->N-1 (fdo#63553).
-if (aIds.count(nSeqNo) || aDstIds.count(nSeqNo))
-{
-// Number already taken, so need a new one.
-if( sequencedIds.count(nSeqNo) )
-rFld.SetSeqNo( sequencedIds[nSeqNo] );
-else
-{
-assert(!bField || !aDstIds.count(nSeqNo)); // postcond of Init
-
-sal_uInt16 n = GetFirstUnusedId( aIds );
-
-// die neue SeqNo eintragen, damit die "belegt" ist
-AddId( n, nSeqNo );
-rFld.SetSeqNo( n );
+sal_uInt16 const nSeqNo = rFld.GetSeqNo();
 
-// und noch die Fuss-/EndNote auf die neue Id umsetzen
-if( !bField )
-{
-SwTxtFtn* pFtnIdx;
-for( sal_uInt16 i = 0, nCnt = rDoc.GetFtnIdxs().size(); i < 
nCnt; ++i )
-if( nSeqNo == (pFtnIdx = rDoc.GetFtnIdxs()[ i 
])->GetSeqRefNo() )
-{
-pFtnIdx->SetSeqNo( n );
-break;
-}
-}
-}
-}
-else
+// check if it needs to be remapped
+// if sequencedIds doesn't contain the number, it means there is no
+// SetExp field / footnote in the source document: do not modify
+// the number, which works well for copy from/paste to same document
+// (and if it is not the same document, there's no "correct" result anyway)
+if (sequencedIds.count(nSeqNo))
 {
-AddId( nSeqNo, nSeqNo ); // this requires that nSeqNo is unused in 
both!
+rFld.SetSeqNo( sequencedIds[nSeqNo] );
 }
 }
 
+/// 1. if _both_ SetExp + GetExp / Footnote + GetExp field are copied,
+///enusure that both get a new unused matching number
+/// 2. if only SetExp / Footnote is copied, it gets a new unused number
+/// 3. if only GetExp field is copied, for the case of copy from / paste to
+///same document it's desirable to keep the same number;
+///for other cases of copy/paste or master documents it's not obvious
+///what is most desirable since it's going to be wrong anyway
 void SwGetRefFieldType::MergeWithOtherDoc( SwDoc& rDestDoc )
 {
 if( &rDestDoc != pDoc )
 {
+if (rDestDoc.IsClipBoard())
+{
+// when copying _to_ clipboard, expectation is that no fields exist
+// so no re-mapping i

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

[Caolán McNamara]

 include/vcl/dockwin.hxx   |2 -
 vcl/source/window/dockmgr.cxx |   55 ++
 2 files changed, 29 insertions(+), 28 deletions(-)

New commits:
commit f596ee9a79c01ff4a170aa521b349f5ddd234abc
Author: Caolán McNamara 
Date:   Thu Apr 17 13:24:29 2014 +0100

coverity#708644 Uninitialized pointer field

Change-Id: I329c6b1d901286892e9e03afa299c635e25c59cb

diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index 3872f33..1587be0 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -117,8 +117,6 @@ private:
 mbStartDockingEnabled:1,
 mbLocked:1;
 
-voidImplInitData();
-
 DECL_LINK( PopupModeEnd, void* );
 voidImplEnableStartDocking( bool bEnable = true )  { 
mbStartDockingEnabled = bEnable; }
 boolImplStartDockingEnabled()   { return 
mbStartDockingEnabled; }
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 799fcbe..bcffef5 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -795,20 +795,39 @@ void ImplPopupFloatWin::Tracking( const TrackingEvent& 
rTEvt )
 }
 
 ImplDockingWindowWrapper::ImplDockingWindowWrapper( const Window *pWindow )
+: mpDockingWindow(const_cast(pWindow))
+, mpFloatWin(NULL)
+, mpOldBorderWin(NULL)
+, mpParent(pWindow->GetParent())
+, maMaxOutSize( SHRT_MAX, SHRT_MAX )
+, mnTrackX(0)
+, mnTrackY(0)
+, mnTrackWidth(0)
+, mnTrackHeight(0)
+, mnDockLeft(0)
+, mnDockTop(0)
+, mnDockRight(0)
+, mnDockBottom(0)
+, mnFloatBits(WB_BORDER | WB_CLOSEABLE | WB_SIZEABLE | 
(pWindow->GetStyle() & DOCKWIN_FLOATSTYLES))
+, mbDockCanceled(false)
+, mbFloatPrevented(false)
+, mbDockable(true)
+, mbDocking(false)
+, mbDragFull(false)
+, mbLastFloatMode(false)
+, mbStartFloat(false)
+, mbTrackDock(false)
+, mbPinned(false)
+, mbRollUp(false)
+, mbDockBtn(false)
+, mbHideBtn(false)
+// must be enabled in Window::Notify to prevent permanent docking during 
mouse move
+, mbStartDockingEnabled(false)
+, mbLocked(false)
 {
-ImplInitData();
-
-mpDockingWindow = (Window*) pWindow;
-mpParent= pWindow->GetParent();
-mbDockable  = true;
-mbLocked= false;
-mnFloatBits = WB_BORDER | WB_CLOSEABLE | WB_SIZEABLE | 
(pWindow->GetStyle() & DOCKWIN_FLOATSTYLES);
 DockingWindow *pDockWin = dynamic_cast< DockingWindow* > ( mpDockingWindow 
);
 if( pDockWin )
 mnFloatBits = pDockWin->GetFloatStyle();
-
-// must be enabled in Window::Notify to prevent permanent docking during 
mouse move
-mbStartDockingEnabled = false;
 }
 
 ImplDockingWindowWrapper::~ImplDockingWindowWrapper()
@@ -877,22 +896,6 @@ bool ImplDockingWindowWrapper::ImplStartDocking( const 
Point& rPos )
 return true;
 }
 
-void ImplDockingWindowWrapper::ImplInitData()
-{
-mpDockingWindow = NULL;
-
-//GetWindow()->mpWindowImpl->mbDockWin  = true; // TODO: must be 
eliminated
-mpFloatWin  = NULL;
-mbDockCanceled  = false;
-mbFloatPrevented= false;
-mbDocking   = false;
-mbPinned = false;
-mbRollUp= false;
-mbDockBtn   = false;
-mbHideBtn   = false;
-maMaxOutSize= Size( SHRT_MAX, SHRT_MAX );
-}
-
 void ImplDockingWindowWrapper::Tracking( const TrackingEvent& rTEvt )
 {
 // used during docking of a currently docked window
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sw/source/core/fields/reffld.cxx |   72 ++-
 sw/source/core/uibase/utlui/glbltree.cxx |6 --
 2 files changed, 36 insertions(+), 42 deletions(-)

New commits:
commit cbfcb837fb06a14daf5281ae13fc1886328cee6f
Author: Michael Stahl 
Date:   Thu Apr 17 15:25:23 2014 +0200

fdo#77342: sw: fix copy/paste of footnote cross references

The fix for sequence fields broke the footnote references some more;
simplify it by handling the footnotes in the same way as the sequence
fields, and not remapping GetExp fields for which the corresponding
SetExp field / footnote is missing.

Also, don't do any remapping when the target is a clipboard document, to
prevent modifying the source document.

(regression from bb665affbd8870652ade3951d626d76e99143f67)

Change-Id: If1be1e1d9742182a4085bbbff53e26a8fa8665b8

diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index b9faba3..ad19f9f 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -1013,6 +1013,17 @@ void _RefIdsMap::Init( SwDoc& rDoc, SwDoc& rDestDoc, 
bool bField )
 {
 GetNoteIdsFromDoc( rDestDoc, aIds );
 GetNoteIdsFromDoc( rDoc, aDstIds );
+
+for (std::set::iterator pIt = aDstIds.begin(); pIt != 
aDstIds.end(); ++pIt)
+AddId( GetFirstUnusedId(aIds), *pIt );
+
+// Change the footnotes/endnotes in the source doc to the new ID
+for (sal_uInt16 i = 0, nCnt = rDoc.GetFtnIdxs().size(); i < nCnt; ++i)
+{
+SwTxtFtn *const pFtnIdx = rDoc.GetFtnIdxs()[i];
+sal_uInt16 const n = pFtnIdx->GetSeqRefNo();
+pFtnIdx->SetSeqNo(sequencedIds[n]);
+}
 }
 bInit = true;
 }
@@ -1050,53 +1061,38 @@ void _RefIdsMap::Check( SwDoc& rDoc, SwDoc& rDestDoc, 
SwGetRefField& rFld,
 {
 Init( rDoc, rDestDoc, bField);
 
-sal_uInt16 nSeqNo = rFld.GetSeqNo();
-
-// Check if the number is used in both documents
-// Note: For fields, aIds contains both the ids of SetExp from rDestDoc
-// and the targets of the already remapped ones from rDoc.
-// It is possible that aDstIds contains numbers that aIds does not contain!
-// For example, copying a selection to clipboard that does not contain
-// the first SwSetExpField will result in id 0 missing, then pasting that
-// into empty document gives a mapping 1->0 ... N->N-1 (fdo#63553).
-if (aIds.count(nSeqNo) || aDstIds.count(nSeqNo))
-{
-// Number already taken, so need a new one.
-if( sequencedIds.count(nSeqNo) )
-rFld.SetSeqNo( sequencedIds[nSeqNo] );
-else
-{
-assert(!bField || !aDstIds.count(nSeqNo)); // postcond of Init
-
-sal_uInt16 n = GetFirstUnusedId( aIds );
-
-// register the new SeqNo, so that it's "in use"
-AddId( n, nSeqNo );
-rFld.SetSeqNo( n );
+sal_uInt16 const nSeqNo = rFld.GetSeqNo();
 
-// and move the footnotes/endnotes to the new ID
-if( !bField )
-{
-SwTxtFtn* pFtnIdx;
-for( sal_uInt16 i = 0, nCnt = rDoc.GetFtnIdxs().size(); i < 
nCnt; ++i )
-if( nSeqNo == (pFtnIdx = rDoc.GetFtnIdxs()[ i 
])->GetSeqRefNo() )
-{
-pFtnIdx->SetSeqNo( n );
-break;
-}
-}
-}
-}
-else
+// check if it needs to be remapped
+// if sequencedIds doesn't contain the number, it means there is no
+// SetExp field / footnote in the source document: do not modify
+// the number, which works well for copy from/paste to same document
+// (and if it is not the same document, there's no "correct" result anyway)
+if (sequencedIds.count(nSeqNo))
 {
-AddId( nSeqNo, nSeqNo ); // this requires that nSeqNo is unused in 
both!
+rFld.SetSeqNo( sequencedIds[nSeqNo] );
 }
 }
 
+/// 1. if _both_ SetExp + GetExp / Footnote + GetExp field are copied,
+///enusure that both get a new unused matching number
+/// 2. if only SetExp / Footnote is copied, it gets a new unused number
+/// 3. if only GetExp field is copied, for the case of copy from / paste to
+///same document it's desirable to keep the same number;
+///for other cases of copy/paste or master documents it's not obvious
+///what is most desirable since it's going to be wrong anyway
 void SwGetRefFieldType::MergeWithOtherDoc( SwDoc& rDestDoc )
 {
 if( &rDestDoc != pDoc )
 {
+if (rDestDoc.IsClipBoard())
+{
+// when copying _to_ clipboard, expectation is that no fields exist
+// so no re-mapping is required to avoid collisions
+assert(!rDestDoc.GetSysFldType(RES_GETREFFLD)->GetDepends());
+return; // don't modify the fields in the source doc
+}
+
 // then there are RefF

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

[Miklos Vajna]

 include/oox/drawingml/customshapeproperties.hxx |3 
 oox/Library_oox.mk  |1 
 oox/source/drawingml/customshapepresetdata.cxx  |  743 
 oox/source/drawingml/customshapeproperties.cxx  |1 
 4 files changed, 748 insertions(+)

New commits:
commit d28b9e8fefa095471d1511c7948bcaf2a3473379
Author: Miklos Vajna 
Date:   Thu Apr 17 14:49:35 2014 +0200

oox: initial customshape preset data loader

CustomShapeProperties::pushToPropSet() still uses the old generated
code, though.

Change-Id: I02550bdf4ac57ef54992facd7ccd144e798be1e8

diff --git a/include/oox/drawingml/customshapeproperties.hxx 
b/include/oox/drawingml/customshapeproperties.hxx
index 8e237b2..29d4ba2 100644
--- a/include/oox/drawingml/customshapeproperties.hxx
+++ b/include/oox/drawingml/customshapeproperties.hxx
@@ -172,8 +172,10 @@ private:
 sal_Int32   mnTextRotateAngle;
 
 typedef boost::unordered_map< sal_Int32, CustomShapeProvider * > 
PresetsMap;
+typedef boost::unordered_map< sal_Int32, PropertyMap > PresetDataMap;
 
 static PresetsMap maPresetsMap;
+static PresetDataMap maPresetDataMap;
 static void initializePresetsMap();
 static void initializePresetsMap1();
 static void initializePresetsMap2();
@@ -181,6 +183,7 @@ private:
 static void initializePresetsMap4();
 static void initializePresetsMap5();
 static void initializePresetsMap6();
+static void initializePresetDataMap();
 
 sal_Int32 mnArcNum;
 };
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 06f0477..f27d0fa 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -138,6 +138,7 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
 oox/source/drawingml/customshapepresets4 \
 oox/source/drawingml/customshapepresets5 \
 oox/source/drawingml/customshapepresets6 \
+oox/source/drawingml/customshapepresetdata \
 oox/source/drawingml/customshapeproperties \
 oox/source/drawingml/diagram/constraintlistcontext \
 oox/source/drawingml/diagram/datamodelcontext \
diff --git a/oox/source/drawingml/customshapepresetdata.cxx 
b/oox/source/drawingml/customshapepresetdata.cxx
new file mode 100644
index 000..4522c3c
--- /dev/null
+++ b/oox/source/drawingml/customshapepresetdata.cxx
@@ -0,0 +1,743 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+#include 
+#include 
+
+#include "oox/drawingml/customshapeproperties.hxx"
+#include "oox/helper/helper.hxx"
+#include "oox/helper/propertymap.hxx"
+#include "oox/helper/propertyset.hxx"
+#include "oox/token/tokenmap.hxx"
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+using namespace ::com::sun::star;
+
+namespace
+{
+
+// Parses a string like: Value = (any) { (long) 19098 }, State = 
(com.sun.star.beans.PropertyState) DIRECT_VALUE, Name = "adj"
+void 
lcl_parseAdjustmentValue(comphelper::SequenceAsVector&
 rAdjustmentValues, const OString& rValue)
+{
+sal_Int32 nIndex = 0;
+drawing::EnhancedCustomShapeAdjustmentValue aAdjustmentValue;
+do
+{
+OString aToken = rValue.getToken(0, ',', nIndex).trim();
+static const OString aNamePrefix("Name = \"");
+static const OString aValuePrefix("Value = (any) { (long) ");
+if (aToken.startsWith(aNamePrefix))
+{
+OString aName = aToken.copy(aNamePrefix.getLength(), 
aToken.getLength() - aNamePrefix.getLength() - strlen("\""));
+aAdjustmentValue.Name = OStringToOUString(aName, 
RTL_TEXTENCODING_UTF8);
+}
+else if (aToken.startsWith(aValuePrefix))
+{
+OString aValue = aToken.copy(aValuePrefix.getLength(), 
aToken.getLength() - aValuePrefix.getLength() - strlen(" }"));
+aAdjustmentValue.Value = uno::makeAny(aValue.toInt32());
+}
+else if (!aToken.startsWith("State = "))
+SAL_WARN("oox", "lcl_parseAdjustmentValue: unexpected prefix: " << 
aToken);
+}
+while (nIndex >= 0);
+rAdjustmentValues.push_back(aAdjustmentValue);
+}
+
+// Parses a string like: { Value = (any) { (long) 19098 }, State = 
(com.sun.star.beans.PropertyState) DIRECT_VALUE, Name = "adj" }, { Value = ..., 
State = ..., Name = ... }
+void 
lcl_parseAdjustmentValues(comphelper::SequenceAsVector&
 rAdjustmentValues, const OString& rValue)
+{
+sal_Int32 nLevel = 0;
+sal_Int32 nStart = 0;
+for (sal_Int32 i = 0; i < rValue.getLength(); ++i)
+{
+if (rValue[i] == '{')
+{
+if (!nLevel)
+nStart = i;
+nLevel++;
+}
+else if (rValue[i] == '}')
+{
+ 

Re: Fwd: [Bug 1087931] [abrt] libreoffice-core: KDE4FilePicker::execute -> QTransform::type: soffice.bin killed by SIGABRT

[Lubos Lunak]

On Wednesday 16 of April 2014, Stephan Bergmann wrote:
> Jan-Marek, all,
>
> Any details on the reason for the revert, and whether it could be the
> cause for the newly seen crash?

 KDE4 file dialog support is currently apparently broken one way or another.

 Current git master (or at least few weeks back when I checked) when built 
with dbgutil simply aborts on assertion failure about holding the yield mutex 
properly. Older LO version without these modifications sooner or later 
crashes on QTransform::type(), I'm not sure what has changed, since this used 
to be pretty stable for me on openSUSE 12.3, but with 13.1 it crashes easily. 
So it looks like so far the best option is just not including the Qt4 patch, 
which will mean the cumbersome generic LO file dialog :-/.

 I haven't had yet the time to look deeper into this, and getting this event 
loops stuff is not exactly trivial :(.

> On 04/15/2014 06:12 PM, bugzi...@redhat.com wrote:
> > https://bugzilla.redhat.com/show_bug.cgi?id=1087931
> >
> > Stephan Bergmann  changed:
> >
> > What|Removed |Added
> > -
> >---
> >
> >  Summary|[abrt] libreoffice-core:|[abrt] libreoffice-core:
> > |os::die()(): soffice.bin|KDE4FilePicker::execute
> > | ->
> > |
> > |killed by SIGABRT   |QTransform::type:
> > ||soffice.bin killed by
> > ||SIGABRT
> >
> > --- Comment #12 from Stephan Bergmann  ---
> > The backtrace in attachment 886519 indicates this is a duplicate of bug
> > 977068, which was fixed for libreoffice-4.1.3.2-7.fc19 via upstream
> >  >2443cbf3fbd83bfdd8cdbafb> "Rewrite Qt4 based nested yield mutex locking."
> >
> > But part of that got later reverted (and is reverted in
> > libreoffice-core-4.2.3.2-3.fc20) via upstream
> >  >244c0298494820d9a0c6d3bc> "Revert 'Rewrite Qt4 based nested yield mutex
> > locking,'" but unfortunately without any rationale.
> >
> > So it looks somewhat plausible that this got broken again (if it ever was
> > actually truly fixed) with that revert.
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice



-- 
 Lubos Lunak
 l.lu...@collabora.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann]

 sw/source/filter/ww8/ww8scan.hxx |8 
 1 file changed, 8 deletions(-)

New commits:
commit 3dd991224cd3bc9ed3da88b4c2ad5b1de2ddfafa
Author: Stephan Bergmann 
Date:   Thu Apr 17 14:25:14 2014 +0200

Remove newly unused struct

Change-Id: I70523221fb8fad22ae5fc6738ed4f6e571561892

diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 5eb2ebe..250d15a 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -65,14 +65,6 @@ struct SprmInfo
 unsigned int nVari : 2;
 };
 
-struct SprmInfoHash
-{
-size_t operator()(const SprmInfo &a) const
-{
-return a.nId;
-}
-};
-
 class wwSprmSearcher {
 public:
 wwSprmSearcher(SprmInfo const * infos, std::size_t size) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/Makefile.mk

[Jan Holesovsky]

 compilerplugins/Makefile.mk |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 4101fa184150663ddee6688c19eb4a44e341e8d4
Author: Jan Holesovsky 
Date:   Thu Apr 17 14:08:09 2014 +0200

compilerplugins: Build them in parallel.

Change-Id: Idddc9a2b76e33c7e90ca51cb2c53e0d9f34d3906

diff --git a/compilerplugins/Makefile.mk b/compilerplugins/Makefile.mk
index c3b5290..4a58ddd 100644
--- a/compilerplugins/Makefile.mk
+++ b/compilerplugins/Makefile.mk
@@ -21,7 +21,11 @@ else
 
 ifeq ($(COM_GCC_IS_CLANG),TRUE)
 
-include $(SRCDIR)/compilerplugins/Makefile-clang.mk
+compilerplugins:
+   $(MAKE) $(PARALLELISM_OPTION) -f 
$(SRCDIR)/compilerplugins/Makefile-clang.mk compilerplugins
+
+compilerplugins-clean:
+   $(MAKE) -f $(SRCDIR)/compilerplugins/Makefile-clang.mk 
compilerplugins-clean
 
 compilerplugins.clean: compilerplugins-clean
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Harri Pitkänen]

 sw/source/filter/html/css1atr.cxx |4 
 sw/source/filter/html/htmlatr.cxx |3 +--
 2 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 2b531388388853342d6ecefcbeb2027f22f8728c
Author: Harri Pitkänen 
Date:   Sat Apr 12 13:46:54 2014 +0300

Enable letter-spacing for Firefox HTML export

Kerning (letter-spacing in CSS) was disabled for Firefox HTML
export mode. There is no need to do that since Firefox does
support this feature.

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

diff --git a/sw/source/filter/html/css1atr.cxx 
b/sw/source/filter/html/css1atr.cxx
index fa65155..1e51c69 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -2577,10 +2577,6 @@ static Writer& OutCSS1_SvxKerning( Writer& rWrt, const 
SfxPoolItem& rHt )
 {
 SwHTMLWriter& rHTMLWrt = (SwHTMLWriter&)rWrt;
 
-// Only export Kerning-Item, if the Style supports it fully
-if( !rHTMLWrt.IsHTMLMode(HTMLMODE_FULL_STYLES) )
-return rWrt;
-
 sal_Int16 nValue = ((const SvxKerningItem&)rHt).GetValue();
 if( nValue )
 {
diff --git a/sw/source/filter/html/htmlatr.cxx 
b/sw/source/filter/html/htmlatr.cxx
index 216a925..e8c4156 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -1349,8 +1349,7 @@ HTMLOnOffState HTMLEndPosLst::GetHTMLItemState( const 
SfxPoolItem& rItem )
 break;
 
 case RES_CHRATR_KERNING:
-if( IsHTMLMode(HTMLMODE_FULL_STYLES) )
-eState = HTML_STYLE_VALUE;
+eState = HTML_STYLE_VALUE;
 break;
 
 case RES_CHRATR_BACKGROUND:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Takeshi Abe]

 framework/source/uielement/imagebuttontoolbarcontroller.cxx |4 
 sw/source/filter/ww8/hash_wrap.hxx  |  111 
 sw/source/filter/ww8/ww8par.cxx |1 
 sw/source/filter/ww8/ww8scan.cxx|   81 +++-
 sw/source/filter/ww8/ww8scan.hxx|   27 ++
 5 files changed, 62 insertions(+), 162 deletions(-)

New commits:
commit 2a3e221c8807789afcbbe9ea5eae3c3fc90a473c
Author: Takeshi Abe 
Date:   Wed Apr 16 00:22:16 2014 +0900

Fix a memory leak

The stream should be freed eventually in any case.

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

diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx 
b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index 733b322..7c385f2 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -40,6 +40,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::awt;
@@ -159,7 +160,7 @@ void ImageButtonToolbarController::executeControlCommand( 
const ::com::sun::star
 
 bool ImageButtonToolbarController::ReadImageFromURL( bool bBigImage, const 
OUString& aImageURL, Image& aImage )
 {
-SvStream* pStream = utl::UcbStreamHelper::CreateStream( aImageURL, 
STREAM_STD_READ );
+boost::scoped_ptr pStream(utl::UcbStreamHelper::CreateStream( 
aImageURL, STREAM_STD_READ ));
 if ( pStream && ( pStream->GetErrorCode() == 0 ))
 {
 // Use graphic class to also support more graphic formats (bmp,png,...)
@@ -183,7 +184,6 @@ bool ImageButtonToolbarController::ReadImageFromURL( bool 
bBigImage, const OUStr
 }
 }
 
-delete pStream;
 return false;
 }
 
commit a0656ed3386a071ee43440ee870a90d7a1fe7fa7
Author: Stephan Bergmann 
Date:   Thu Apr 17 12:09:50 2014 +0200

Simplify wwSprmSearcher

Change-Id: I1642556f507af9db722dadda707ae11b4080fcf0

diff --git a/sw/source/filter/ww8/hash_wrap.hxx 
b/sw/source/filter/ww8/hash_wrap.hxx
deleted file mode 100644
index a07dd66..000
--- a/sw/source/filter/ww8/hash_wrap.hxx
+++ /dev/null
@@ -1,111 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-//this is a shameless rip from sortedarray.hxx but changed to 
boost::unordered_set
-
-#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_HASH_WRAP_HXX
-#define INCLUDED_SW_SOURCE_FILTER_WW8_HASH_WRAP_HXX
-
-#include 
-
-//simple wrapper around boost::unordered_set to behave like sorted array
-namespace ww
-{
-/** simple template that manages a hash
-
-@author
-mailto:mikel...@openoffice.org";>Michael Leibowitz
-*/
-template > class WrappedHash
-{
-private:
-boost::unordered_set mHashSet;
-
-//No copying
-WrappedHash(const WrappedHash&);
-WrappedHash& operator=(const WrappedHash&);
-public:
-//Find an entry, return its address if found and 0 if not
-const C* search(C aSrch) const
-{
-typename boost::unordered_set::const_iterator it;
-it= mHashSet.find(aSrch);
-if (it != mHashSet.end())
-return &(*it);
-else
-return 0;
-}
-
-WrappedHash(const C *pWwSprmTab, const size_t nNoElems)
-{
-OSL_ENSURE(nNoElems && pWwSprmTab, "WW8: empty Array: Don't do 
that");
-const C *pIter = pWwSprmTab;
-const C *pEnd  = pWwSprmTab + nNoElems;
-while (pIter < pEnd)
-{
-mHashSet.insert(*pIter);
-pIter++;
-}
-#if OSL_DEBUG_LEVEL > 1
-bool bBroken=false;
-OUString sError;
-pIter = pWwSprmTab;
-const C *pBeforeEnd = pWwSprmTab + nNoElems - 1;
-while (pIter < pBeforeEnd)
-{
-if (*pIter == *(pIter+1))
-{
-  

Re: [libreoffice-users] Playing Video in a Dialog

[Tom Davies]

Hi :)
I am guessing that you have already posted to the devs mailing list or irc
channel?  Also to the French mailing list?  If not then it's worth trying.

It seems a bit weird they have gone for a proprietary, undocumented player
instead of gnash, swfplayer, totem, Vlc or some other OpenSource
alternative.  There probably is a reason.  If it's purely down to trying to
use something that you can be certain people already have on their system
then Vlc might be worth a try because that is quite popular too.  (plus you
can always give a link for people to downnload and install an OpenSource
alternative anyway (as people do for pdfs))

Regards from
Tom :)





On 17 April 2014 10:23, Fernand Vanrie  wrote:

> On The French user site i found usefull code to play video on Windows
> using the API and Basic.
>
> The code opens a MediaWindow and play any video
>
> The player has a undocumented method "CreatePlayerWindow" who needs
> arguments (a empty array do crash LO)
>
> Do someone knows how to use this method and how Video can been played in a
> Dialog ?
>
> Thanks for any hints
>
> Global video
> Global oPlayer
> Global Player_flag, Video_flag, Time
>
> ' --
> Sub VideoPlayer
>If Video_flag = 0 Then
>  video =converttoURL("C:\Users\PMG\Videos\Untitled.avi") ' La vidéo à
> charger
>  Video_flag = 1
> 'for windows:
>  oManager = CreateUnoService("com.sun.star.media.Manager_DirectX")
> ' for Linux
> ' oManager = CreateUnoService("com.sun.
> star.media.Manager_GStreamer")
> End Select
>  oPlayer = oManager.createPlayer( video )
>'  oPlayer.CreatePlayerwindow(array()) ' do crash LO
>  oPlayer.start() ' Lecture
>  Player_flag = 1
>Else
>  oPlayer.start() ' Lecture
>  Player_flag = 1
>End If
> End Sub
>
> ' --
> Sub VideoPlayer_pause
>If Player_flag = 1 Then
> oPlayer.stop() ' Pause
> Player_flag = 0
> Time = oPlayer.getmediatime()
>End If
> End Sub
>
> ' --
> Sub VideoPlayer_avance_rapide
>If Player_flag = 0 Then
> oPlayer.setmediatime(Time +1) ' Avance_rapide
> Time = oPlayer.getmediatime()
>End If
> End Sub
>
> ' --
> Sub VideoPlayer_recul_rapide
>If Player_flag = 0 Then
> oPlayer.setmediatime(Time -1) ' Recul_rapide
> Time = oPlayer.getmediatime()
>End If
> End Sub
>
> ' --
> Sub VideoPlayer_stop
>oPlayer.stop() ' Pause
>'Video_flag = 1
>Time = 0
>oPlayer.setmediatime(Time)
> End Sub
>
>
> --
> To unsubscribe e-mail to: users+unsubscr...@global.libreoffice.org
> Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-
> unsubscribe/
> Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
> List archive: http://listarchives.libreoffice.org/global/users/
> All messages sent to this list will be publicly archived and cannot be
> deleted
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Searching help to build LibreOffice

[Markus Mohrhard]

Hey,


On Thu, Apr 17, 2014 at 12:12 PM, Eike Rathke  wrote:

> Hi Oswald,
>
> Please don't continue public discussions as private mail, stay on the
> mailing list instead where others can jump in as well. I'm taking this
> back to the list, please use Reply-All when replying or reply only to
> the list.
>
> Btw, which branch of LibreOffice are you building? master,
> libreoffice-4-2, ...?
>
> On Monday, 2014-04-14 22:38:45 +0200, Oswald Luc wrote:
>
> > Here is the whole make output in the attached file.
>
> It would be nice to trim log files to the necessary parts.. which is
>
> > opencl-test.cxx:3789:Assertion
> > Test name: ScOpenclTest::testStatisticalFormulaExpondist
> > double equality assertion failed
> > - Expected: 3.35964639172048e-321
> > - Actual  : 3.30035851421953e-321
> > - Delta   : 0
> >
> > [...]
> > make[1]: ***
> [/home/MyLibreOffice/core/workdir/CppunitTest/sc_opencl_test.test] Erreur 1
>
> So strangely your combination of OpenCL driver and graphics card
> produces quite a large difference in the result.
>
> > About the graphics card I have, here is what I found :
> >
> > lspci | grep -E "VGA|3D"
> > 01:00.0 VGA compatible controller: Advanced Micro Devices, Inc.
> > [AMD/ATI] Whistler LE [Radeon HD 6610M/7610M]
> >
> > sudo lspci -v -s 01:00.0
> > 01:00.0 VGA compatible controller: Advanced Micro Devices, Inc.
> > [AMD/ATI] Whistler LE [Radeon HD 6610M/7610M] (prog-if 00 [VGA
> > controller])
> > Subsystem: Toshiba America Info Systems Radeon HD 7610M
> > Flags: bus master, fast devsel, latency 0, IRQ 47
> > Memory at b000 (64-bit, prefetchable) [size=256M]
> > Memory at c200 (64-bit, non-prefetchable) [size=128K]
> > I/O ports at 4000 [size=256]
> > Expansion ROM at c204 [disabled] [size=128K]
> > Capabilities: [50] Power Management version 3
> > Capabilities: [58] Express Legacy Endpoint, MSI 00
> > Capabilities: [a0] MSI: Enable+ Count=1/1 Maskable- 64bit+
> > Capabilities: [100] Vendor Specific Information: ID=0001 Rev=1
> > Len=010 
> > Capabilities: [150] Advanced Error Reporting
> > Kernel driver in use: fglrx_pci
> > Kernel modules: fglrx_updates, radeon



Please share the output of clinfo and your exact system (e.g. OpenSuse AMD
drivers for example are known to be problematic).
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Maxim Monastirsky]

 filter/source/config/cache/typedetection.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 2fe0081a4c283972592eaf0e22c7141262caeda7
Author: Maxim Monastirsky 
Date:   Thu Apr 17 14:39:49 2014 +0300

shure -> sure

Change-Id: I3da74098f72aa3a5426ee0d750055f48146c23e2

diff --git a/filter/source/config/cache/typedetection.cxx 
b/filter/source/config/cache/typedetection.cxx
index bd179b2..61f2c74 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -493,7 +493,7 @@ void 
TypeDetection::impl_checkResultsAndAddBestFilter(utl::MediaDescriptor& rDes
 // SAFE ->
 ::osl::ResettableMutexGuard aLock(m_aLock);
 
-// Attention: For executing next lines of code, We must be shure 
that
+// Attention: For executing next lines of code, We must be sure 
that
 // all filters already loaded :-(
 // That can disturb our "load on demand feature". But we have no 
other chance!
 m_rCache->load(FilterCache::E_CONTAINS_FILTERS);
@@ -575,7 +575,7 @@ void 
TypeDetection::impl_checkResultsAndAddBestFilter(utl::MediaDescriptor& rDes
 // SAFE ->
 ::osl::ResettableMutexGuard aLock(m_aLock);
 
-// Attention: For executing next lines of code, We must be shure that
+// Attention: For executing next lines of code, We must be sure that
 // all filters already loaded :-(
 // That can disturb our "load on demand feature". But we have no other 
chance!
 m_rCache->load(FilterCache::E_CONTAINS_FILTERS);
@@ -743,7 +743,7 @@ bool TypeDetection::impl_getPreselectionForDocumentService(
 // SAFE -> --
 ::osl::ResettableMutexGuard aLock(m_aLock);
 
-// Attention: For executing next lines of code, We must be shure that
+// Attention: For executing next lines of code, We must be sure that
 // all filters already loaded :-(
 // That can disturb our "load on demand feature". But we have no other 
chance!
 m_rCache->load(FilterCache::E_CONTAINS_FILTERS);
@@ -1088,7 +1088,7 @@ OUString 
TypeDetection::impl_askUserForTypeAndFilterIfAllowed(utl::MediaDescript
 
 // Dont distrub the user for "non existing files - means empty URLs" or
 // if we was forced to detect a stream.
-// Reason behind: We must be shure to ask user for "unknown contents" only 
...
+// Reason behind: We must be sure to ask user for "unknown contents" only 
...
 // and not for "missing files". Especialy if detection is done by a stream 
only
 // we cant check if the stream points to an "existing content"!
 if (
@@ -,7 +,7 @@ OUString 
TypeDetection::impl_askUserForTypeAndFilterIfAllowed(utl::MediaDescript
 // "OK" pressed => verify the selected filter, get its corresponding
 // type and return it. (BTW: We must update the media descriptor here 
...)
 // The user selected explicitly a filter ... but normaly we are 
interested on
-// a type here only. But we must be shure, that the selected filter is 
used
+// a type here only. But we must be sure, that the selected filter is 
used
 // too and no ambigous filter registration disturb us .-)
 
 OUString sFilter = aRequest.getFilter();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 filter/qa/cppunit/data/pcx/fail/CVE-2007-3741-1.pcx |binary
 filter/source/graphicfilter/itiff/itiff.cxx |   17 +
 2 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 3c7d17aa6fb8393452cbcbcc032f3a6c5ea928cc
Author: Caolán McNamara 
Date:   Thu Apr 17 12:33:00 2014 +0100

add testcase for CVE-2007-3741

Change-Id: I33561649dc5cde240bc7a18dff082245c76543b1

diff --git a/filter/qa/cppunit/data/pcx/fail/CVE-2007-3741-1.pcx 
b/filter/qa/cppunit/data/pcx/fail/CVE-2007-3741-1.pcx
new file mode 100644
index 000..915f38a
Binary files /dev/null and 
b/filter/qa/cppunit/data/pcx/fail/CVE-2007-3741-1.pcx differ
commit 5535d6ee7d3f5e7d7d86642a1dec85bce78a6f0c
Author: Caolán McNamara 
Date:   Thu Apr 17 12:28:01 2014 +0100

zero a few more things out

Change-Id: Ief743978876885745431c59a0f56f065cbd61ace

diff --git a/filter/source/graphicfilter/itiff/itiff.cxx 
b/filter/source/graphicfilter/itiff/itiff.cxx
index 0949e23..03c324c 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -282,13 +282,14 @@ sal_uLong TIFFReader::ReadIntData()
 
 double TIFFReader::ReadDoubleData()
 {
-sal_uInt32 nulong;
 double  nd;
 
 if ( nDataType == 5 )
 {
+sal_uInt32 nulong(0);
 pTIFF->ReadUInt32( nulong );
 nd = (double)nulong;
+nulong = 0;
 pTIFF->ReadUInt32( nulong );
 if ( nulong != 0 )
 nd /= (double)nulong;
@@ -298,8 +299,6 @@ double TIFFReader::ReadDoubleData()
 return nd;
 }
 
-
-
 void TIFFReader::ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen)
 {
 if ( bStatus == sal_False )
@@ -644,7 +643,7 @@ sal_Bool TIFFReader::ReadMap( sal_uLong nMinPercent, 
sal_uLong nMaxPercent )
 else if ( nCompression == 32773 )
 {
 sal_uLong nStrip,nRecCount,nRowBytesLeft,ny,np,i;
-sal_uInt8 * pdst, nRecHeader, nRecData;
+sal_uInt8 * pdst;
 nStrip = 0;
 if ( nStrip >= nNumStripOffsets )
 return sal_False;
@@ -664,6 +663,7 @@ sal_Bool TIFFReader::ReadMap( sal_uLong nMinPercent, 
sal_uLong nMaxPercent )
 pdst=pMap[ np ];
 do
 {
+sal_uInt8 nRecHeader(0);
 pTIFF->ReadUChar( nRecHeader );
 if ((nRecHeader&0x80)==0)
 {
@@ -685,6 +685,7 @@ sal_Bool TIFFReader::ReadMap( sal_uLong nMinPercent, 
sal_uLong nMaxPercent )
 //  return;
 
 }
+sal_uInt8 nRecData(0);
 pTIFF->ReadUChar( nRecData );
 for ( i = 0; i < nRecCount; i++ )
 *(pdst++) = nRecData;
@@ -1122,8 +1123,8 @@ void TIFFReader::MakePalCol( void )
 
 void TIFFReader::ReadHeader()
 {
-sal_uInt8 nbyte1, nbyte2;
-sal_uInt16 nushort;
+sal_uInt8 nbyte1(0), nbyte2(0);
+sal_uInt16 nushort(0);
 
 pTIFF->ReadUChar( nbyte1 );
 if ( nbyte1 == 'I' )
@@ -1152,10 +1153,10 @@ bool TIFFReader::HasAlphaChannel() const
 
 bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
 {
-sal_uInt16  i, nNumTags, nTagType;
+sal_uInt16  i, nNumTags(0), nTagType(0);
 sal_uInt64  nMaxPos;
 sal_uLong   nPos;
-sal_uInt32 nFirstIfd, nDataLen;
+sal_uInt32 nFirstIfd(0), nDataLen;
 
 bStatus = sal_True;
 nLastPercent = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - canvas/source filter/CppunitTest_filter_pcx_test.mk filter/Module_filter.mk filter/qa filter/source vcl/unx

[Caolán McNamara]

 canvas/source/cairo/cairo_canvasbitmap.cxx  |2 
 canvas/source/cairo/cairo_xlib_cairo.cxx|7 +
 dev/null|binary
 filter/CppunitTest_filter_pcx_test.mk   |   41 +++
 filter/Module_filter.mk |3 
 filter/qa/cppunit/data/pcx/fail/CVE-2008-1097-1.pcx |binary
 filter/qa/cppunit/data/pcx/indeterminate/.gitignore |1 
 filter/qa/cppunit/data/pcx/pass/rhbz469075-1.pcx|binary
 filter/qa/cppunit/data/ras/fail/CVE-2007-2356-1.ras |binary
 filter/qa/cppunit/filters-pcx-test.cxx  |   71 
 filter/source/graphicfilter/ipcx/ipcx.cxx   |9 +-
 filter/source/graphicfilter/itiff/itiff.cxx |   20 ++---
 vcl/unx/x11/xlimits.cxx |   11 +--
 13 files changed, 138 insertions(+), 27 deletions(-)

New commits:
commit 9de20d1eb046f7bb92d893408206b91a9c054e2e
Author: Caolán McNamara 
Date:   Thu Apr 17 11:58:38 2014 +0100

add tests for CVE-2008-1097, etc.

Change-Id: Iad6948fdf6eb60f86d764783b72a4fe7f5642e40

diff --git a/filter/CppunitTest_filter_pcx_test.mk 
b/filter/CppunitTest_filter_pcx_test.mk
new file mode 100644
index 000..5a5f6d6
--- /dev/null
+++ b/filter/CppunitTest_filter_pcx_test.mk
@@ -0,0 +1,41 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,filter_pcx_test))
+
+$(eval $(call gb_CppunitTest_use_external,filter_pcx_test,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,filter_pcx_test, \
+filter/qa/cppunit/filters-pcx-test \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,filter_pcx_test, \
+ipx \
+   sal \
+   test \
+   tl \
+   unotest \
+   vcl \
+   $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,filter_pcx_test,\
+udkapi \
+offapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,filter_pcx_test))
+
+$(eval $(call gb_CppunitTest_use_components,filter_pcx_test,\
+configmgr/source/configmgr \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,filter_pcx_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 6571242..d37d91b 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -83,10 +83,11 @@ $(eval $(call gb_Module_add_check_targets,filter,\
 
 ifneq ($(DISABLE_CVE_TESTS),TRUE)
 $(eval $(call gb_Module_add_check_targets,filter,\
+CppunitTest_filter_pcx_test \
 CppunitTest_filter_pict_test \
 CppunitTest_filter_ras_test \
-CppunitTest_filter_tga_test \
 CppunitTest_filter_tiff_test \
+CppunitTest_filter_tga_test \
 ))
 endif
 
diff --git a/filter/qa/cppunit/data/pcx/fail/.gitignore 
b/filter/qa/cppunit/data/pcx/fail/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/filter/qa/cppunit/data/pcx/fail/CVE-2008-1097-1.pcx 
b/filter/qa/cppunit/data/pcx/fail/CVE-2008-1097-1.pcx
new file mode 100644
index 000..c55c64e
Binary files /dev/null and 
b/filter/qa/cppunit/data/pcx/fail/CVE-2008-1097-1.pcx differ
diff --git a/filter/qa/cppunit/data/pcx/indeterminate/.gitignore 
b/filter/qa/cppunit/data/pcx/indeterminate/.gitignore
new file mode 100644
index 000..583b009c
--- /dev/null
+++ b/filter/qa/cppunit/data/pcx/indeterminate/.gitignore
@@ -0,0 +1 @@
+*.wmf-*
diff --git a/filter/qa/cppunit/data/pcx/pass/.gitignore 
b/filter/qa/cppunit/data/pcx/pass/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/filter/qa/cppunit/data/pcx/pass/rhbz469075-1.pcx 
b/filter/qa/cppunit/data/pcx/pass/rhbz469075-1.pcx
new file mode 100644
index 000..d928c08
Binary files /dev/null and b/filter/qa/cppunit/data/pcx/pass/rhbz469075-1.pcx 
differ
diff --git a/filter/qa/cppunit/filters-pcx-test.cxx 
b/filter/qa/cppunit/filters-pcx-test.cxx
new file mode 100644
index 000..678b267
--- /dev/null
+++ b/filter/qa/cppunit/filters-pcx-test.cxx
@@ -0,0 +1,71 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+extern "C"
+{
+SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+GraphicImport(SvStream & rStream, Graphic & rGraphic,
+FilterConfigItem*);
+}
+
+using namespace ::com::sun::star;
+
+/* Implementation of Filters test */
+
+class RasFilterTest
+: public test::FiltersTest
+, public test::BootstrapFixture
+{
+pu

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

[Tor Lillqvist]

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

New commits:
commit 04c3f6fe60c9406faf0867922eca8cd64a3bd19f
Author: Tor Lillqvist 
Date:   Thu Apr 17 12:50:42 2014 +0300

Using -Oz causes crash, revert to Os

This is with the Xcode 5.1.1 tool-chain. Either a compiler bug, or
some undefined behaviour in our code sensitive to compiler
optimisation details.

The crash we noticed was in sw/source/core/layout/paintfrm.cxx. (There
might of course be more locations with similar behaviour.)

Change-Id: I5d0f0aee369b2ca5fc77356f0a7cb88bec6cc58e

diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk 
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 27659c4..a85a4b6 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -26,7 +26,7 @@ ifeq ($(CXX),)
 $(error You must set CXX in the environment. See README.cross for example.)
 endif
 
-gb_COMPILERDEFAULTOPTFLAGS := -Oz
+gb_COMPILERDEFAULTOPTFLAGS := -Os
 
 include $(GBUILDDIR)/platform/com_GCC_defs.mk
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Searching help to build LibreOffice

[Eike Rathke]

Hi Oswald,

Please don't continue public discussions as private mail, stay on the
mailing list instead where others can jump in as well. I'm taking this
back to the list, please use Reply-All when replying or reply only to
the list.

Btw, which branch of LibreOffice are you building? master, libreoffice-4-2, ...?

On Monday, 2014-04-14 22:38:45 +0200, Oswald Luc wrote:

> Here is the whole make output in the attached file.

It would be nice to trim log files to the necessary parts.. which is

> opencl-test.cxx:3789:Assertion
> Test name: ScOpenclTest::testStatisticalFormulaExpondist
> double equality assertion failed
> - Expected: 3.35964639172048e-321
> - Actual  : 3.30035851421953e-321
> - Delta   : 0
> 
> [...]
> make[1]: *** 
> [/home/MyLibreOffice/core/workdir/CppunitTest/sc_opencl_test.test] Erreur 1

So strangely your combination of OpenCL driver and graphics card
produces quite a large difference in the result.

> About the graphics card I have, here is what I found :
> 
> lspci | grep -E "VGA|3D"
> 01:00.0 VGA compatible controller: Advanced Micro Devices, Inc.
> [AMD/ATI] Whistler LE [Radeon HD 6610M/7610M]
> 
> sudo lspci -v -s 01:00.0
> 01:00.0 VGA compatible controller: Advanced Micro Devices, Inc.
> [AMD/ATI] Whistler LE [Radeon HD 6610M/7610M] (prog-if 00 [VGA
> controller])
> Subsystem: Toshiba America Info Systems Radeon HD 7610M
> Flags: bus master, fast devsel, latency 0, IRQ 47
> Memory at b000 (64-bit, prefetchable) [size=256M]
> Memory at c200 (64-bit, non-prefetchable) [size=128K]
> I/O ports at 4000 [size=256]
> Expansion ROM at c204 [disabled] [size=128K]
> Capabilities: [50] Power Management version 3
> Capabilities: [58] Express Legacy Endpoint, MSI 00
> Capabilities: [a0] MSI: Enable+ Count=1/1 Maskable- 64bit+
> Capabilities: [100] Vendor Specific Information: ID=0001 Rev=1
> Len=010 
> Capabilities: [150] Advanced Error Reporting
> Kernel driver in use: fglrx_pci
> Kernel modules: fglrx_updates, radeon


Let's see if one of our OpenCL experts can make something of it.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Support the FSFE, care about Free Software! https://fsfe.org/support/?erack


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

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

[Markus Mohrhard]

 sc/source/ui/unoobj/chart2uno.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 45b959806da456adf3ba3a1e4f08130480ccf89c
Author: Markus Mohrhard 
Date:   Thu Apr 17 02:02:15 2014 +0200

limit the range shrinking in charts to really large ranges, fdo#70609,

Also improves the situation for fdo#55697.

It is just the fist step to a better algorithm.

Change-Id: I15de1ca6604e585fcf5690f0d903c757d641e765
Reviewed-on: https://gerrit.libreoffice.org/9078
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sc/source/ui/unoobj/chart2uno.cxx 
b/sc/source/ui/unoobj/chart2uno.cxx
index 8754057..093dbbe 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -1372,6 +1372,8 @@ bool lcl_addUpperLeftCornerIfMissing(vector& 
rRefTokens,
 return true;
 }
 
+#define SHRINK_RANGE_THRESHOLD 1
+
 class ShrinkRefTokenToDataRange : std::unary_function
 {
 ScDocument* mpDoc;
@@ -1391,6 +1393,9 @@ public:
 ScSingleRefData& s = rData.Ref1;
 ScSingleRefData& e = rData.Ref2;
 
+if(abs((e.Col()-s.Col())*(e.Row()-s.Row())) < SHRINK_RANGE_THRESHOLD)
+return;
+
 SCCOL nMinCol = MAXCOL, nMaxCol = 0;
 SCROW nMinRow = MAXROW, nMaxRow = 0;
 
___
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' - sd/source

[Andrzej Hunt]

 sd/source/ui/remotecontrol/BluetoothServer.cxx  |  673 +---
 sd/source/ui/remotecontrol/BufferedStreamSocket.cxx |2 
 sd/source/ui/remotecontrol/Communicator.cxx |2 
 3 files changed, 605 insertions(+), 72 deletions(-)

New commits:
commit 3adb6f809f19d3132062bed405de5ef128a8
Author: Andrzej Hunt 
Date:   Thu Apr 10 21:58:29 2014 +0100

fdo#74697 Add Bluez 5 support for impress remote.

This time we:
 - Don't break SAL_WARN with an fprintf like syntax.
 - Replace DBUS_TYPE_UNIX_FD with it's definition 'h' as we might
   be building on dbus-glib versions that do not support it (however
   presumably anyone running bluez 5 will have a dbus version that is
   new enough to support this, i.e. purely a build-time issue).
 - Remove various C++11'isms.

Change-Id: I736cad2122cd3789a5c7fb62c39e409d41fc1e32
Reviewed-on: https://gerrit.libreoffice.org/8924
Tested-by: Andrzej Hunt 
Reviewed-by: Andrzej Hunt 
(cherry picked from commit b15666fd7582729c75bd0dd1bd0cb5d7c5a77f0c)
Reviewed-on: https://gerrit.libreoffice.org/8931
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx 
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 63407a6..a447900 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -13,6 +13,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 
 #ifdef LINUX_BLUETOOTH
@@ -90,25 +92,40 @@ struct DBusObject {
 }
 };
 
+static DBusObject* getBluez5Adapter(DBusConnection *pConnection);
+
 struct sd::BluetoothServer::Impl {
 // the glib mainloop running in the thread
 GMainContext *mpContext;
 DBusConnection *mpConnection;
 DBusObject *mpService;
 volatile bool mbExitMainloop;
+enum BluezVersion { BLUEZ4, BLUEZ5, UNKNOWN };
+BluezVersion maBluezVersion;
 
 Impl()
 : mpContext( g_main_context_new() )
 , mpConnection( NULL )
 , mpService( NULL )
 , mbExitMainloop( false )
+, maBluezVersion( UNKNOWN )
 { }
 
 DBusObject *getAdapter()
 {
-if( !mpService )
+if (mpService)
+{
+DBusObject* pAdapter = mpService->cloneForInterface( 
"org.bluez.Adapter" );
+return pAdapter;
+}
+else if (spServer->mpImpl->maBluezVersion == BLUEZ5)
+{
+return getBluez5Adapter(mpConnection);
+}
+else
+{
 return NULL;
-return mpService->cloneForInterface( "org.bluez.Adapter" );
+}
 }
 };
 
@@ -156,37 +173,181 @@ sendUnrefAndWaitForReply( DBusConnection *pConnection, 
DBusMessage *pMsg )
 return pMsg;
 }
 
+static bool
+isBluez5Available(DBusConnection *pConnection)
+{
+DBusMessage *pMsg;
+
+// Simplest wasy to check whether we have Bluez 5+ is to check
+// that we can obtain adapters using the new interfaces.
+// The first two error checks however don't tell us anything as they should
+// succeed as long as dbus is working correctly.
+pMsg = DBusObject( "org.bluez", "/", "org.freedesktop.DBus.ObjectManager" 
).getMethodCall( "GetManagedObjects" );
+if (!pMsg)
+{
+SAL_INFO("sdremote.bluetooth", "No GetManagedObjects call created");
+return false;
+}
+
+pMsg = sendUnrefAndWaitForReply( pConnection, pMsg );
+if (!pMsg)
+{
+SAL_INFO("sdremote.bluetooth", "No reply received");
+return false;
+}
+
+// If dbus is working correctly and we aren't on bluez 5 this is where we
+// should actually get the error.
+if (dbus_message_get_error_name( pMsg ))
+{
+SAL_INFO( "sdremote.bluetooth", "GetManagedObjects call failed with \""
+<< dbus_message_get_error_name( pMsg )
+<< "\" -- we don't seem to have Bluez 5 available");
+return false;
+}
+SAL_INFO("sdremote.bluetooth", "GetManagedObjects call seems to have 
succeeded -- we must be on Bluez 5");
+dbus_message_unref(pMsg);
+return true;
+}
+
+
+static DBusObject*
+getBluez5Adapter(DBusConnection *pConnection)
+{
+DBusMessage *pMsg;
+// This returns a list of objects where we need to find the first
+// org.bluez.Adapter1 .
+pMsg = DBusObject( "org.bluez", "/", "org.freedesktop.DBus.ObjectManager" 
).getMethodCall( "GetManagedObjects" );
+if (!pMsg)
+return NULL;
+
+const gchar* pInterfaceType = "org.bluez.Adapter1";
+
+pMsg = sendUnrefAndWaitForReply( pConnection, pMsg );
+
+DBusMessageIter aObjectIterator;
+if (pMsg && dbus_message_iter_init(pMsg, &aObjectIterator))
+{
+if (DBUS_TYPE_ARRAY == 
dbus_message_iter_get_arg_type(&aObjectIterator))
+{
+DBusMessageIter aObject;
+dbus_message_iter_recurse(&aObjectIterator, &aObject);
+do
+{
+if (DBUS_TY

Playing Video in a Dialog

[Fernand Vanrie]

On The French user site i found usefull code to play video on Windows 
using the API and Basic.


The code opens a MediaWindow and play any video

The player has a undocumented method "CreatePlayerWindow" who needs 
arguments (a empty array do crash LO)


Do someone knows how to use this method and how Video can been played in 
a Dialog ?


Thanks for any hints

Global video
Global oPlayer
Global Player_flag, Video_flag, Time

' --
Sub VideoPlayer
   If Video_flag = 0 Then
 video =converttoURL("C:\Users\PMG\Videos\Untitled.avi") ' La vidéo 
à charger

 Video_flag = 1
'for windows:
 oManager = CreateUnoService("com.sun.star.media.Manager_DirectX")
' for Linux
' oManager = 
CreateUnoService("com.sun.star.media.Manager_GStreamer")

End Select
 oPlayer = oManager.createPlayer( video )
   '  oPlayer.CreatePlayerwindow(array()) ' do crash LO
 oPlayer.start() ' Lecture
 Player_flag = 1
   Else
 oPlayer.start() ' Lecture
 Player_flag = 1
   End If
End Sub

' --
Sub VideoPlayer_pause
   If Player_flag = 1 Then
oPlayer.stop() ' Pause
Player_flag = 0
Time = oPlayer.getmediatime()
   End If
End Sub

' --
Sub VideoPlayer_avance_rapide
   If Player_flag = 0 Then
oPlayer.setmediatime(Time +1) ' Avance_rapide
Time = oPlayer.getmediatime()
   End If
End Sub

' --
Sub VideoPlayer_recul_rapide
   If Player_flag = 0 Then
oPlayer.setmediatime(Time -1) ' Recul_rapide
Time = oPlayer.getmediatime()
   End If
End Sub

' --
Sub VideoPlayer_stop
   oPlayer.stop() ' Pause
   'Video_flag = 1
   Time = 0
   oPlayer.setmediatime(Time)
End Sub

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

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

[Caolán McNamara]

 sd/source/ui/animations/CustomAnimationCreateDialog.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 8a42ecdaa6bf1c5d0c4749e3178daf2c3dc34ff3
Author: Caolán McNamara 
Date:   Wed Apr 16 20:24:33 2014 +0100

Resolves: fdo#76916 'User paths' is missing in tab MotionMotion Paths tab

(cherry picked from commit 8b9858b0aeae8bfb3af6dd8fcfce6cecdb9b8fab)

Conflicts:
sd/source/ui/animations/CustomAnimationCreateDialog.cxx

Change-Id: I38deeae3135badde23b9d454d548193af654caab
Reviewed-on: https://gerrit.libreoffice.org/9076
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx 
b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index 0eb084a..6117f9d 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -174,7 +174,7 @@ void CategoryListBox::MouseButtonUp( const MouseEvent& 
rMEvt )
 class CustomAnimationCreateTabPage : public TabPage
 {
 public:
-CustomAnimationCreateTabPage( Window* pParent, 
CustomAnimationCreateDialog* pDialogParent, sal_uInt16 nTabId, const 
PresetCategoryList& rCategoryList, bool bHasText );
+CustomAnimationCreateTabPage( Window* pParent, 
CustomAnimationCreateDialog* pDialogParent, sal_uInt16 nTabId, const 
PresetCategoryList& rCategoryList, bool bHasText, bool bIsMotionPath = false );
 ~CustomAnimationCreateTabPage();
 
 PathKind getCreatePathKind() const;
@@ -235,7 +235,7 @@ bool ImplStlEffectCategorySortHelper::operator()( const 
CustomAnimationPresetPtr
 return mxCollator->compareString(p1->getLabel(), p2->getLabel()) == -1;
 }
 
-CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( Window* pParent, 
CustomAnimationCreateDialog* pDialogParent, sal_uInt16 nTabId, const 
PresetCategoryList& rCategoryList, bool bHasText )
+CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( Window* pParent, 
CustomAnimationCreateDialog* pDialogParent, sal_uInt16 nTabId, const 
PresetCategoryList& rCategoryList, bool bHasText, bool bIsMotionPath )
 : TabPage( pParent, "CustomAnimationCreateTab", 
"modules/simpress/ui/customanimationcreatetab.ui" )
 , mpParent( pDialogParent )
 , mnId( nTabId )
@@ -256,7 +256,7 @@ CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( 
Window* pParent, Cus
 
 sal_uInt16 nFirstEffect = LISTBOX_ENTRY_NOTFOUND;
 
-if( nTabId == MOTIONPATH )
+if( bIsMotionPath )
 {
 mpLBEffects->InsertCategory( sMotionPathLabel );
 
@@ -523,7 +523,7 @@ CustomAnimationCreateDialog::CustomAnimationCreateDialog( 
Window* pParent, Custo
 mpTabControl->SetTabPage( mnEmphasisId, mpTabPages[EMPHASIS] );
 mpTabPages[EXIT] = new CustomAnimationCreateTabPage( mpTabControl, this, 
mnExitId, rPresets.getExitPresets(), bHasText );
 mpTabControl->SetTabPage( mnExitId, mpTabPages[EXIT] );
-mpTabPages[MOTIONPATH] = new CustomAnimationCreateTabPage( mpTabControl, 
this, mnMPathId, rPresets.getMotionPathsPresets(), bHasText );
+mpTabPages[MOTIONPATH] = new CustomAnimationCreateTabPage( mpTabControl, 
this, mnMPathId, rPresets.getMotionPathsPresets(), bHasText, true );
 mpTabControl->SetTabPage( mnMPathId, mpTabPages[MOTIONPATH] );
 mpTabPages[MISCEFFECTS] = new CustomAnimationCreateTabPage( mpTabControl, 
this, mnMiscId, rPresets.getMiscPresets(), bHasText );
 mpTabControl->SetTabPage( mnMiscId, mpTabPages[MISCEFFECTS] );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 7 commits - sw/source vcl/source vcl/unx xmloff/source

[Caolán McNamara]

 sw/source/core/docnode/ndtbl1.cxx|2 ++
 sw/source/core/layout/pagechg.cxx|   13 -
 sw/source/core/layout/sectfrm.cxx|3 ++-
 sw/source/core/uibase/utlui/glbltree.cxx |6 --
 vcl/source/gdi/pngwrite.cxx  |   26 +++---
 vcl/unx/generic/dtrans/bmp.cxx   |   22 ++
 xmloff/source/style/xmlnumfi.cxx |1 +
 7 files changed, 50 insertions(+), 23 deletions(-)

New commits:
commit 6907b67d3d3208eb54289db2476132188d86dfec
Author: Caolán McNamara 
Date:   Thu Apr 17 09:41:38 2014 +0100

coverity#708633 Uninitialized pointer field

Change-Id: Ia629e4d41f163be0c6206943b11a4db083d713c5

diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx
index ff836c5..4b29431 100644
--- a/vcl/source/gdi/pngwrite.cxx
+++ b/vcl/source/gdi/pngwrite.cxx
@@ -95,13 +95,25 @@ private:
 };
 
 PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx,
-const ::com::sun::star::uno::Sequence< 
::com::sun::star::beans::PropertyValue >* pFilterData ) :
-mnCompLevel ( PNG_DEF_COMPRESSION ),
-mbStatus( true ),
-mpAccess( NULL ),
-mpMaskAccess( NULL ),
-mpZCodec( new ZCodec( DEFAULT_IN_BUFSIZE, DEFAULT_OUT_BUFSIZE, 
MAX_MEM_USAGE ) ),
-mnCRC(0UL)
+const ::com::sun::star::uno::Sequence< 
::com::sun::star::beans::PropertyValue >* pFilterData )
+: mnCompLevel(PNG_DEF_COMPRESSION)
+, mnInterlaced(0)
+, mnMaxChunkSize(0)
+, mbStatus(true)
+, mpAccess(NULL)
+, mpMaskAccess(NULL)
+, mpZCodec(new ZCodec(DEFAULT_IN_BUFSIZE, DEFAULT_OUT_BUFSIZE, 
MAX_MEM_USAGE))
+, mpDeflateInBuf(NULL)
+, mpPreviousScan(NULL)
+, mpCurrentScan(NULL)
+, mnDeflateInSize(0)
+, mnWidth(0)
+, mnHeight(0)
+, mnBitsPerPixel(0)
+, mnFilterType(0)
+, mnBBP(0)
+, mbTrueAlpha(false)
+, mnCRC(0UL)
 {
 if ( !rBmpEx.IsEmpty() )
 {
commit 078803a802c86eb772a77074475b5fd3db9b66ce
Author: Caolán McNamara 
Date:   Thu Apr 17 09:27:25 2014 +0100

coverity#708655 Uninitialized scalar field

Change-Id: Icbb7d84f127a374f0199c217de529575263a8a4e

diff --git a/vcl/unx/generic/dtrans/bmp.cxx b/vcl/unx/generic/dtrans/bmp.cxx
index 0e8a2e5..0fb3fe6 100644
--- a/vcl/unx/generic/dtrans/bmp.cxx
+++ b/vcl/unx/generic/dtrans/bmp.cxx
@@ -346,11 +346,20 @@ void x11::X11_freeBmp( sal_uInt8* pBmp )
  *  PixmapHolder
  */
 
-PixmapHolder::PixmapHolder( Display* pDisplay ) :
-m_pDisplay( pDisplay ),
-m_aColormap( None ),
-m_aPixmap( None ),
-m_aBitmap( None )
+PixmapHolder::PixmapHolder( Display* pDisplay )
+: m_pDisplay(pDisplay)
+, m_aColormap(None)
+, m_aPixmap(None)
+, m_aBitmap(None)
+, m_nRedShift(0)
+, m_nRedShift2(0)
+, m_nGreenShift(0)
+, m_nGreenShift2(0)
+, m_nBlueShift(0)
+, m_nBlueShift2(0)
+, m_nBlueShift2Mask(0)
+, m_nRedShift2Mask(0)
+, m_nGreenShift2Mask(0)
 {
 /*  try to get a 24 bit true color visual, if that fails,
  *  revert to default visual
@@ -384,11 +393,8 @@ PixmapHolder::PixmapHolder( Display* pDisplay ) :
 if( m_aInfo.c_class == TrueColor )
 {
 int nRedSig, nGreenSig, nBlueSig;
-m_nRedShift = m_nRedShift2 = 0;
 getShift( m_aInfo.red_mask, m_nRedShift, nRedSig, m_nRedShift2 );
-m_nGreenShift = m_nGreenShift2 = 0;
 getShift( m_aInfo.green_mask, m_nGreenShift, nGreenSig, m_nGreenShift2 
);
-m_nBlueShift = m_nBlueShift2 = 0;
 getShift( m_aInfo.blue_mask, m_nBlueShift, nBlueSig, m_nBlueShift2 );
 
 m_nBlueShift2Mask = m_nBlueShift2 ? ~((unsigned 
long)((1<
Date:   Thu Apr 17 09:23:19 2014 +0100

coverity#738948 Uninitialized scalar field

Change-Id: Ieca446ab69b84249059c5ce4ec713832bd0a8134

diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index e34e5ea..676cd822 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -656,6 +656,7 @@ SvXMLNumFmtPropContext::SvXMLNumFmtPropContext( 
SvXMLImport& rImport,
 const 
uno::Reference& xAttrList ) :
 SvXMLImportContext( rImport, nPrfx, rLName ),
 rParent( rParentContext ),
+m_nColor( 0 ),
 bColSet( false )
 {
 sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
commit 8721ae4f77587aa14032708638c2b5a63355a2c7
Author: Caolán McNamara 
Date:   Thu Apr 17 09:14:36 2014 +0100

coverity#705493 Dereference null return value

Change-Id: I20133ad19197fdfe40bb449680ac274ca0fa056e

diff --git a/sw/source/core/layout/pagechg.cxx 
b/sw/source/core/layout/pagechg.cxx
index 4b66fbf..3b714b8 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -725,12 +725,15 @@ SwPageDesc *SwPageFrm::FindPageDesc()
 if( pSh && pSh->GetViewOptions()->getBrowseMode() )
 {
 SwCntntFrm *pFrm 

[Bug 67350] sanity check utility for help ids

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=67350

--- Comment #27 from Caolán McNamara  ---
that way I could just run it from inside the existing repository and it would
"just work" out of the box ?, sure sounds great

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

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

[Markus Mohrhard]

 sc/source/ui/unoobj/chart2uno.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 3750025d3290fd4db6b18dcc33c9c077b05af524
Author: Markus Mohrhard 
Date:   Thu Apr 17 02:02:15 2014 +0200

limit the range shrinking in charts to really large ranges, fdo#70609,

Also improves the situation for fdo#55697.

It is just the fist step to a better algorithm.

Change-Id: I15de1ca6604e585fcf5690f0d903c757d641e765

diff --git a/sc/source/ui/unoobj/chart2uno.cxx 
b/sc/source/ui/unoobj/chart2uno.cxx
index 832f59c..bfa2599 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -1379,6 +1379,8 @@ bool lcl_addUpperLeftCornerIfMissing(vector& 
rRefTokens,
 return true;
 }
 
+#define SHRINK_RANGE_THRESHOLD 1
+
 class ShrinkRefTokenToDataRange : std::unary_function
 {
 ScDocument* mpDoc;
@@ -1398,6 +1400,9 @@ public:
 ScSingleRefData& s = rData.Ref1;
 ScSingleRefData& e = rData.Ref2;
 
+if(abs((e.Col()-s.Col())*(e.Row()-s.Row())) < SHRINK_RANGE_THRESHOLD)
+return;
+
 SCCOL nMinCol = MAXCOL, nMaxCol = 0;
 SCROW nMinRow = MAXROW, nMaxRow = 0;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ravindra Vidhate]

 oox/source/vml/vmlshape.cxx   |   14 +
 sw/qa/extras/ooxmlexport/data/test77219.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |8 +
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |2 -
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   31 +-
 5 files changed, 48 insertions(+), 7 deletions(-)

New commits:
commit 2496eaa5c4535b88b44e4ac034aae6af0c08de0e
Author: Ravindra Vidhate 
Date:   Wed Apr 16 15:32:43 2014 +0530

fdo#77219 Image property Z-index [behindDoc] not preserved after RT

Problem description:
For the images who has the "Text wrapping" property set as Behind Text
 is not preserved after saving the file in DOCX format using LO.

Reviewed on:
https://gerrit.libreoffice.org/9065

Change-Id: Ic8555103909c0f1ed1cb58fba4dc2ef2f84cc9dd

diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index d4bdbcf..6167a19 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -336,6 +336,20 @@ Reference< XShape > ShapeBase::convertAndInsert( const 
Reference< XShapes >& rxS
 aGrabBag[length].Value = uno::makeAny( 
maTypeModel.maZIndex.toInt32() );
 propertySet->setPropertyValue( "FrameInteropGrabBag", 
uno::makeAny(aGrabBag) );
 }
+else
+{
+if( maTypeModel.maZIndex.toInt32() )
+{
+uno::Sequence aGrabBag;
+uno::Reference propertySet 
(xShape, uno::UNO_QUERY);
+propertySet->getPropertyValue("InteropGrabBag") >>= 
aGrabBag;
+sal_Int32 length = aGrabBag.getLength();
+aGrabBag.realloc( length+1 );
+aGrabBag[length].Name = "VML-Z-ORDER";
+aGrabBag[length].Value = uno::makeAny( 
maTypeModel.maZIndex.toInt32() );
+propertySet->setPropertyValue( "InteropGrabBag", 
uno::makeAny(aGrabBag) );
+}
+}
 Reference< XControlShape > xControlShape( xShape, 
uno::UNO_QUERY );
 if ( xControlShape.is() && !getTypeModel().mbVisible )
 {
diff --git a/sw/qa/extras/ooxmlexport/data/test77219.docx 
b/sw/qa/extras/ooxmlexport/data/test77219.docx
new file mode 100644
index 000..29aca1b
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/test77219.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 1e4067e..e7f57e6 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3121,6 +3121,14 @@ DECLARE_OOXMLEXPORT_TEST(test76734_2K7, 
"test76734_2K7.docx")
 assertXPath(pXmlDoc, 
"/w:document[1]/w:body[1]/w:p[1]/w:r[3]/mc:AlternateContent[1]/mc:Choice[1]", 
"Requires", "wps");
 }
 
+DECLARE_OOXMLEXPORT_TEST(test77219, "test77219.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+assertXPath(pXmlDoc, 
"/w:document[1]/w:body[1]/w:p[6]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]",
 "behindDoc", "1");
+}
+
 DECLARE_OOXMLEXPORT_TEST(testFDO76597, "fdo76597.docx")
 {
 // check XML
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 6e3388b..f727d6f 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -743,7 +743,7 @@ DECLARE_OOXMLIMPORT_TEST(testN779627, "n779627.docx")
  * Another problem tested with this document is that the roundrect is
  * centered vertically and horizontally.
  */
-uno::Reference xShapeProperties( getShape(4), 
uno::UNO_QUERY );
+uno::Reference xShapeProperties( getShape(1), 
uno::UNO_QUERY );
 uno::Reference 
xShapeDescriptor(xShapeProperties, uno::UNO_QUERY);
 // If this goes wrong, probably the index of the shape is changed and the 
test should be adjusted.
 CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.RectangleShape"), 
xShapeDescriptor->getShapeType());
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 51810b3..3a6dfef 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1742,11 +1742,7 @@ void DomainMapper_Impl::PushShapeContext( const 
uno::Reference< drawing::XShape
 #endif
 text::TextContentAnchorType 
nAnchorType(text::TextContentAnchorType_AT_PARAGRAPH);
 xProps->getPropertyValue(rPropNameSupplier.GetName( 
PROP_ANCHOR_TYPE )) >>= nAnchorType;
-
-if (!m_bInHeaderFooterImport)
-xProps->setPropertyValue(
-rPropNameSupplier.GetName( PROP_OPAQUE ),
-uno::makeAny( true ) 

[Libreoffice-commits] core.git: 5 commits - oox/source sd/source svx/source sw/source

[Caolán McNamara]

 oox/source/export/drawingml.cxx |2 +-
 sd/source/ui/remotecontrol/Communicator.cxx |5 ++---
 svx/source/svdraw/svdmrkv.cxx   |2 +-
 sw/source/core/crsr/crstrvl.cxx |9 ++---
 sw/source/core/layout/wsfrm.cxx |2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

New commits:
commit 7bda5f04a693c7943bc4201c11e73ca45bead661
Author: Caolán McNamara 
Date:   Thu Apr 17 08:52:09 2014 +0100

coverity#1202822 Dereference null return value

Change-Id: I8630bfa0c4c557ab14c3b7448b6281072eebec8a

diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index a7085b8..ee0ac18 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -2256,9 +2256,12 @@ bool SwCrsrShell::SelectNxtPrvHyperlink( bool bNext )
 else if( RES_DRAWFRMFMT == pFndFmt->Which() )
 {
 const SdrObject* pSObj = pFndFmt->FindSdrObject();
-((SwFEShell*)this)->SelectObj( 
pSObj->GetCurrentBoundRect().Center() );
-MakeSelVisible();
-bRet = true;
+if (pSObj)
+{
+((SwFEShell*)this)->SelectObj( 
pSObj->GetCurrentBoundRect().Center() );
+MakeSelVisible();
+bRet = true;
+}
 }
 else // then is it a fly
 {
commit 4f4d8c8edbd0fc9f951c42cc1c02235b411a700f
Author: Caolán McNamara 
Date:   Wed Apr 16 20:42:48 2014 +0100

coverity#1202823 Dereference null return value

Change-Id: I72d795203aedf34d32012ecee3c8fdfbc2a8a08f

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index fd60107..fb0cd6a 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1031,7 +1031,7 @@ void DrawingML::WriteShapeTransformation( Reference< 
XShape > rXShape, sal_Int32
 if (!bSuppressRotation)
 {
 SdrObject* pShape = (SdrObject*) GetSdrObjectFromXShape( rXShape );
-nRotation=pShape->GetRotateAngle();
+nRotation = pShape ? pShape->GetRotateAngle() : 0;
 if (nRotation != 0 && nRotation != 18000)
 {
 int faccos=bFlipV ? -1 : 1;
commit c152349f69acfb6bb873ed1cd12ca1b6dc325f1f
Author: Caolán McNamara 
Date:   Wed Apr 16 20:41:44 2014 +0100

coverity#1202882 Dereference before null check

Change-Id: Ie61df08c11b687c0b4a3ae212b3f9a6c95171396

diff --git a/sd/source/ui/remotecontrol/Communicator.cxx 
b/sd/source/ui/remotecontrol/Communicator.cxx
index d3af697..bf399ca 100644
--- a/sd/source/ui/remotecontrol/Communicator.cxx
+++ b/sd/source/ui/remotecontrol/Communicator.cxx
@@ -122,10 +122,9 @@ void Communicator::execute()
 pTransmitter->join();
 pTransmitter = NULL;
 
-if( mpSocket )
-mpSocket->close();
+mpSocket->close();
 delete mpSocket;
-
+mpSocket = NULL;
 
 RemoteServer::removeCommunicator( this );
 }
commit f510a9726e2ab9f0c8513cd90154bcf67739ceed
Author: Caolán McNamara 
Date:   Wed Apr 16 20:38:33 2014 +0100

coverity#735915 Dereference after null check

Change-Id: I6a846af53a2e3492905d9c89e7e55da8778405a5

diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index cf6bced..1a99bc3 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -1945,7 +1945,7 @@ void SwCntntFrm::Modify( const SfxPoolItem* pOld, const 
SfxPoolItem * pNew )
 {
 sal_uInt8 nInvFlags = 0;
 
-if( pNew && RES_ATTRSET_CHG == pNew->Which() )
+if( pNew && RES_ATTRSET_CHG == pNew->Which() && pOld )
 {
 SfxItemIter aNIter( *((SwAttrSetChg*)pNew)->GetChgSet() );
 SfxItemIter aOIter( *((SwAttrSetChg*)pOld)->GetChgSet() );
commit 297df4434848902a771b6a01c6b210ffbf04a6dc
Author: Caolán McNamara 
Date:   Wed Apr 16 20:37:26 2014 +0100

coverity#704833 Dereference after null check

Change-Id: I307a277ce8f473652afd084eb9848ecb27574714

diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 4c26809..7d301ed 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -1804,7 +1804,7 @@ bool SdrMarkView::PickObj(const Point& rPnt, short nTol, 
SdrObject*& rpObj, SdrP
 if (!pObj->HasMacro() || !pObj->IsMacroHit(aHitRec)) pObj=NULL;
 }
 if (pObj!=NULL && (nOptions & SDRSEARCH_WITHTEXT) !=0 && 
pObj->GetOutlinerParaObject()==NULL) pObj=NULL;
-if (pObj!=NULL && (nOptions & SDRSEARCH_TESTTEXTAREA) !=0)
+if (pObj!=NULL && (nOptions & SDRSEARCH_TESTTEXTAREA) !=0 && pPV)
 {
 if(!SdrObjectPrimitiveHit(*pObj, aPt, 0, *pPV, 0, true))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/source/core/text/inftxt.cxx |6 +++---
 sw/source/core/text/inftxt.hxx |4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 213571db0e69db5d8d16d16e8a5c428b824e80d1
Author: Miklos Vajna 
Date:   Thu Apr 17 09:28:02 2014 +0200

SwTxtSlot::SwTxtSlot now takes an empty reference by default, not a NULL

Change-Id: I3fc7cef18dc1df228a648edb3020a976209f12ee

diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 001844d..8c303a0 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1659,7 +1659,7 @@ SwTxtSlot::SwTxtSlot(
 const SwLinePortion *pPor,
 bool bTxtLen,
 bool bExgLists,
-OUString const & pCh )
+OUString const & rCh )
 : pOldTxt(0)
 , pOldSmartTagList(0)
 , pOldGrammarCheckList(0)
@@ -1668,13 +1668,13 @@ SwTxtSlot::SwTxtSlot(
 , nLen(0)
 , pInf(NULL)
 {
-if( pCh.isEmpty() )
+if( rCh.isEmpty() )
 {
 bOn = pPor->GetExpTxt( *pNew, aTxt );
 }
 else
 {
-aTxt = pCh;
+aTxt = rCh;
 bOn = true;
 }
 
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 112bed8..35c783e 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -775,9 +775,9 @@ protected:
 SwTxtSizeInfo *pInf;
 public:
 // The replacement string originates either from the portion via 
GetExpText()
-// or from the char * pCh, if it is not NULL
+// or from the rCh, if it is not empty.
 SwTxtSlot( const SwTxtSizeInfo *pNew, const SwLinePortion *pPor, bool 
bTxtLen,
-   bool bExgLists, OUString const & pCh = OUString() );
+   bool bExgLists, OUString const & rCh = OUString() );
 ~SwTxtSlot();
 bool IsOn() const { return bOn; }
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/core/layout/paintfrm.cxx |2 +-
 sw/source/core/uibase/docvw/SidebarWin.cxx |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit fede08ac7d8b9d6c0abd2ba1b09fd3beb1c1b7e7
Author: Caolán McNamara 
Date:   Thu Apr 17 08:41:07 2014 +0100

Related: fdo#36815 print the text highlight range as well

Change-Id: Ic332b1968b5dc72d26bd704cce70a496ec81e0b8

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index a5cbf3b..eb3133a 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -6172,7 +6172,7 @@ static void lcl_paintBitmapExToRect(OutputDevice *pOut, 
const Point& aPoint, con
 SwAlignRect( aPageRect, _pViewShell );
 
 const SwPostItMgr *pMgr = _pViewShell->GetPostItMgr();
-if (pMgr /*&& pMgr->ShowNotes()*/ && pMgr->HasNotes())  // do not show 
anything in print preview
+if (pMgr && pMgr->ShowNotes() && pMgr->HasNotes())  // do not show 
anything in print preview
 {
 sal_Int32 nScrollerHeight = pMgr->GetSidebarScrollerHeight();
 const Rectangle &aVisRect = _pViewShell->VisArea().SVRect();
diff --git a/sw/source/core/uibase/docvw/SidebarWin.cxx 
b/sw/source/core/uibase/docvw/SidebarWin.cxx
index ef6d4d3..ac6cf3a 100644
--- a/sw/source/core/uibase/docvw/SidebarWin.cxx
+++ b/sw/source/core/uibase/docvw/SidebarWin.cxx
@@ -269,13 +269,13 @@ void SwSidebarWin::Draw(OutputDevice* pDev, const Point& 
rPt, const Size& rSz, s
 
 mpSidebarTxtControl->Draw(pDev, rPt, rSz, nInFlags);
 
-const drawinglayer::primitive2d::Primitive2DSequence& rSequence = 
mpAnchor->getOverlayObjectPrimitive2DSequence();
 const drawinglayer::geometry::ViewInformation2D aNewViewInfos;
 drawinglayer::processor2d::BaseProcessor2D * pProcessor =
 drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(
 *pDev, aNewViewInfos );
 
-pProcessor->process(rSequence);
+pProcessor->process(mpAnchor->getOverlayObjectPrimitive2DSequence());
+
pProcessor->process(mpTextRangeOverlay->getOverlayObjectPrimitive2DSequence());
 delete pProcessor;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 chart2/qa/extras/data/xlsx/fdo70609.xlsx |binary
 1 file changed

New commits:
commit 4211ce7c62677c65dfbbb3602be6c36fd0f98977
Author: Markus Mohrhard 
Date:   Thu Apr 17 09:29:31 2014 +0200

add file

Change-Id: I45401846ae33e0b26e487093e60d90d128480c60

diff --git a/chart2/qa/extras/data/xlsx/fdo70609.xlsx 
b/chart2/qa/extras/data/xlsx/fdo70609.xlsx
new file mode 100644
index 000..261ef88
Binary files /dev/null and b/chart2/qa/extras/data/xlsx/fdo70609.xlsx differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits