LibreOffice Gerrit News for core on 2014-08-10
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + jurt: Use T[] toArray(T[] a) in https://gerrit.libreoffice.org/10853 from Robert Antoni Buj i Gelonch about module jurt + javaunohelper: Iterate over each Entry in a Map & Enhanced for-loops in https://gerrit.libreoffice.org/10852 from Robert Antoni Buj i Gelonch about module javaunohelper + javaunohelper: Enhancement loading bootstrap_parameters in Bootstrap_Test in https://gerrit.libreoffice.org/10850 from Robert Antoni Buj i Gelonch about module javaunohelper End of freshness + Code clean-up/consolidation task. in https://gerrit.libreoffice.org/5926 from Vishv Brahmbhatt about module basic, cui, framework, unotools * Merged changes on master for project core changed in the last 25 hours: + fdo#82278 SfxUInt16Item -> SfxInt16Item in https://gerrit.libreoffice.org/10823 from Maxim Monastirsky + fdo#75757: remove inheritance to std::vector in https://gerrit.libreoffice.org/10847 from Takeshi Abe + javaunohelper: Iterate over each Entry in a Map in https://gerrit.libreoffice.org/10846 from Robert Antoni Buj i Gelonch + jurt: Number parsing in https://gerrit.libreoffice.org/10845 from Robert Antoni Buj i Gelonch + Fixed erroneous comment (by me). in https://gerrit.libreoffice.org/10809 from Matthew Pottage + VS2013: Prefer it over VS2012 and VS2010 in https://gerrit.libreoffice.org/10154 from David Ostrovsky + Converted RID_XMLSECTP_GENERAL to Widget Layout. in https://gerrit.libreoffice.org/10842 from Rachit Gupta * Abandoned changes on master for project core changed in the last 25 hours: + Changes for Wordml in https://gerrit.libreoffice.org/9013 from Michel Messak + fdo#64945 Remove inconvenient localized symbol code. in https://gerrit.libreoffice.org/8696 from Darshana Padmadas + javaunohelper: Bootstrap_Test.java needs at least 2 arguments in https://gerrit.libreoffice.org/10848 from Robert Antoni Buj i Gelonch + fdo#57950 Replace chained append( with operator+) in https://gerrit.libreoffice.org/10149 from Petr Vorel + VS2013: Add support for new msbuild and Windows SDK 8.1 in https://gerrit.libreoffice.org/10155 from David Ostrovsky + fix make dependencies related issues in https://gerrit.libreoffice.org/10841 from Douglas Mencken * Open changes needing tweaks, but being untouched for more than a week: + fdo#79541 :Corrupt: Shape enclosed within a floating table in https://gerrit.libreoffice.org/9914 from Rajashri Udhoji + fdo#79422 Fix hang problem After ReplaceAll by closing Search Dialog in https://gerrit.libreoffice.org/10643 from Seyeong Kim + Rel fdo#48068: fix errors when 2 decimals in svg path position in https://gerrit.libreoffice.org/10544 from Joren De Cuyper + fdo#80996:Fix for DataLabel not preserved for ColumnChart after RT in https://gerrit.libreoffice.org/10169 from Dushyant Bhalgami + VS2013: Make 64 bit shell extensions optional in https://gerrit.libreoffice.org/10163 from David Ostrovsky + fdo#79018: LO hangs while opening file. in https://gerrit.libreoffice.org/9564 from Yogesh Bharate + Use assert instead of OSL_ASSERT in sal/ in https://gerrit.libreoffice.org/10113 from Arnaud Versini + move OpenGLContext to SAL in https://gerrit.libreoffice.org/9429 from David Tardon + fdo#77716 : Paragraph spacing is not preserved after RT. in https://gerrit.libreoffice.org/9197 from Tushar Bende + fdo#77121 Header / Footer positions not preserved after RT in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad 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 mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: May I know where is intro image and how to link it?
Thanks for informing, I don't know the source code has been far left behind. I could not tell which version I'm building because I get the source from LibreOffice development site. According to `git log`, the latest commit is on 12-07-2013, May I know how could I update my source to the latest version? Regarding the build, since you mention solver has been dead for a year, may I know where would be the final executable being place? On Sat, Aug 9, 2014 at 10:54 PM, David Tardon wrote: > Hi, > > On Sat, Aug 09, 2014 at 09:42:45PM +0800, LOH KOK HOE wrote: > > Dear all, > > > > I'm building LibreOffice from source. Now I have complete my build and > have > > LD_LIBRARY_PATH being configure pointing to `solver/ > > unxlngx6.pro/lib/libsofficeapp.so`. When I try to execute `./soffice`, I > > hit following error: > > Which version are you building? solver has been dead on master for nearly > a year. And related question: why are you building a version that old? > > D. > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ANN] LIbreOffice 4.3.1 RC1 available
Dear Community, The Document Foundation is pleased to announce the first release candidate of LibreOffice 4.3.1. The upcoming 4.3.1 will be the first in a sequence of frequent bugfix release for our feature-packed 4.3 line. Please be aware that LibreOffice 4.3.1 RC1 is not been flagged as ready for production use yet, however feel free to give it a try instead of 4.3.0. A work-in-progress list of new features in LibreOffice 4.3 can be found at https://wiki.documentfoundation.org/ReleaseNotes/4.3 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.3.1 RC1 is available from our wiki: http://wiki.documentfoundation.org/Releases/4.3.1/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: 2 commits - cui/source dbaccess/source
cui/source/tabpages/align.cxx |2 --
dbaccess/source/ui/inc/dbu_resource.hrc |6 +++---
dbaccess/source/ui/misc/charsets.cxx|7 ++-
dbaccess/source/ui/misc/dbumiscres.src |7 ++-
4 files changed, 7 insertions(+), 15 deletions(-)
New commits:
commit 5b5571505a1db0ccc98f471e358dbd644f8cd6e5
Author: Thomas Arnhold
Date: Sun Aug 10 00:27:36 2014 +0200
cui align: no need for OLocalResourceAccess
Change-Id: Id500403fb70787cd856e2413d7a8e9a949942ac0
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 7532118..a66e7d9 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -36,7 +36,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -317,7 +316,6 @@ void AlignmentTabPage::DataChanged( const DataChangedEvent&
rDCEvt )
SfxTabPage::DataChanged( rDCEvt );
if( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() &
SETTINGS_STYLE) )
{
-svt::OLocalResourceAccess aLocalResAcc( CUI_RES( RID_SVXPAGE_ALIGNMENT
), RSC_TABPAGE );
InitVsRefEgde();
}
}
commit ac08537688971b55a5fd0982cf5bc18a8ffa961e
Author: Thomas Arnhold
Date: Sat Aug 9 18:41:08 2014 +0200
make string a global resource
Change-Id: I65eee002d2f04b09a73c597ece4b29d1f1593414
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc
b/dbaccess/source/ui/inc/dbu_resource.hrc
index 93ea5a9..dc4a6e6 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -62,10 +62,10 @@
#define RID_STR_UNO_END RID_STR_UNO_START + 20// 414
- 433
#define RID_STR_GEN_START RID_STR_UNO_END
-#define RID_STR_GEN_END RID_STR_GEN_START + 56// 434
- 489
+#define RID_STR_GEN_END RID_STR_GEN_START + 57// 434
- 490
#define RID_STR_APP_START RID_STR_GEN_END
-#define RID_STR_APP_END RID_STR_APP_START + 40//
490 - 529
+#define RID_STR_APP_END RID_STR_APP_START + 40//
491 - 530
#if RID_STR_GEN_END > RID_DBACCESS_END
#error Resource-Id Ueberlauf in #file, #line
@@ -229,10 +229,10 @@
#define STR_SPREADSHEET_HEADERTEXT RID_STR_GEN_START + 53
#define STR_SPREADSHEET_HELPTEXTRID_STR_GEN_START + 54
#define STR_SPREADSHEETPATH RID_STR_GEN_START + 55
+#define STR_RSC_CHARSETSRID_STR_GEN_START + 56
// untyped resources
-#define RSC_CHARSETSRID_UNTYPED_START + 2
#define RSC_QUERY_OBJECT_TYPE RID_UNTYPED_START + 4
// various
diff --git a/dbaccess/source/ui/misc/charsets.cxx
b/dbaccess/source/ui/misc/charsets.cxx
index dd7f90c..3c03ad2 100644
--- a/dbaccess/source/ui/misc/charsets.cxx
+++ b/dbaccess/source/ui/misc/charsets.cxx
@@ -22,7 +22,7 @@
#include "dbu_misc.hrc"
#include
#include
-#include "localresaccess.hxx"
+#include "moduledbu.hxx"
namespace dbaui
{
@@ -32,11 +32,8 @@ namespace dbaui
OCharsetDisplay::OCharsetDisplay()
:OCharsetMap()
,SvxTextEncodingTable()
+, m_aSystemDisplayName(ModuleRes( STR_RSC_CHARSETS ))
{
-{
-LocalResourceAccess aCharsetStrings( RSC_CHARSETS, RSC_RESOURCE );
-m_aSystemDisplayName = ModuleRes( 1 ).toString();
-}
}
bool OCharsetDisplay::approveEncoding( const rtl_TextEncoding _eEncoding,
const rtl_TextEncodingInfo& _rInfo ) const
diff --git a/dbaccess/source/ui/misc/dbumiscres.src
b/dbaccess/source/ui/misc/dbumiscres.src
index 9f334ad..5a4e1c9 100644
--- a/dbaccess/source/ui/misc/dbumiscres.src
+++ b/dbaccess/source/ui/misc/dbumiscres.src
@@ -19,12 +19,9 @@
#include "dbu_misc.hrc"
-Resource RSC_CHARSETS
+String STR_RSC_CHARSETS
{
-String 1
-{
-Text [ en-US ] = "System";
-};
+Text [ en-US ] = "System";
};
String STR_ERROR_DURING_CREATION
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/icu
external/icu/UnpackedTarball_icu.mk |1
external/icu/icu4c-icu11054.patch.1 | 44
2 files changed, 45 insertions(+)
New commits:
commit d79d2f0ef7a0e300a3ee4be128c625121d0c4b26
Author: Caolán McNamara
Date: Sat Aug 9 21:14:03 2014 +0100
Resolves: icu#11054 crashes in bracketAddOpening
Change-Id: I5dd63fa41c1568e8bf2d120cc0de5d2c44dd789c
diff --git a/external/icu/UnpackedTarball_icu.mk
b/external/icu/UnpackedTarball_icu.mk
index 3b06d22..07dcab8 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-buffer-overflow.patch \
external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch \
external/icu/icu-ubsan.patch.0 \
+ external/icu/icu4c-icu11054.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/icu/icu4c-icu11054.patch.1
b/external/icu/icu4c-icu11054.patch.1
new file mode 100644
index 000..48d21f5
--- /dev/null
+++ b/external/icu/icu4c-icu11054.patch.1
@@ -0,0 +1,44 @@
+--- icu/source/common/ubidi.c.orig 2014-08-09 20:54:39.338833533 +0100
icu/source/common/ubidi.c 2014-08-09 20:55:48.625469055 +0100
+@@ -679,10 +679,10 @@
+ bd->isoRuns[0].contextPos=0;
+ if(pBiDi->openingsMemory) {
+ bd->openings=pBiDi->openingsMemory;
+-bd->openingsSize=pBiDi->openingsSize;
++bd->openingsCount=pBiDi->openingsSize / sizeof(Opening);
+ } else {
+ bd->openings=bd->simpleOpenings;
+-bd->openingsSize=SIMPLE_OPENINGS_SIZE;
++bd->openingsCount=SIMPLE_OPENINGS_SIZE;
+ }
+
bd->isNumbersSpecial=bd->pBiDi->reorderingMode==UBIDI_REORDER_NUMBERS_SPECIAL ||
+
bd->pBiDi->reorderingMode==UBIDI_REORDER_INVERSE_FOR_NUMBERS_SPECIAL;
+@@ -743,7 +743,7 @@
+ bracketAddOpening(BracketData *bd, UChar match, int32_t position) {
+ IsoRun *pLastIsoRun=&bd->isoRuns[bd->isoRunLast];
+ Opening *pOpening;
+-if(pLastIsoRun->limit>=bd->openingsSize) { /* no available new entry */
++if(pLastIsoRun->limit>=bd->openingsCount) { /* no available new entry */
+ UBiDi *pBiDi=bd->pBiDi;
+ if(!getInitialOpeningsMemory(pBiDi, pLastIsoRun->limit * 2))
+ return FALSE;
+@@ -751,7 +751,7 @@
+ uprv_memcpy(pBiDi->openingsMemory, bd->simpleOpenings,
+ SIMPLE_OPENINGS_SIZE * sizeof(Opening));
+ bd->openings=pBiDi->openingsMemory; /* may have changed */
+-bd->openingsSize=pBiDi->openingsSize;
++bd->openingsCount=pBiDi->openingsSize / sizeof(Opening);
+ }
+ pOpening=&bd->openings[pLastIsoRun->limit];
+ pOpening->position=position;
+--- icu/source/common/ubidiimp.h.orig 2014-08-09 20:55:15.053161192 +0100
icu/source/common/ubidiimp.h 2014-08-09 20:56:07.028637725 +0100
+@@ -173,7 +173,7 @@
+ /* array of opening entries which should be enough in most cases; no
malloc() */
+ Opening simpleOpenings[SIMPLE_OPENINGS_SIZE];
+ Opening *openings; /* pointer to current array of
entries */
+-int32_t openingsSize; /* number of allocated entries */
++int32_t openingsCount; /* number of allocated entries */
+ int32_t isoRunLast; /* index of last used entry */
+ /* array of nested isolated sequence entries; can never excess
UBIDI_MAX_EXPLICIT_LEVEL
++ 1 for index 0, + 1 for before the first isolated sequence */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/sdi sfx2/source
sfx2/sdi/sfx.sdi |2 +-
sfx2/source/view/viewfrm.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 154c20cb320fb62cdd54cd248c3b981acc3903c8
Author: Maxim Monastirsky
Date: Thu Aug 7 23:53:04 2014 +0300
fdo#82278 SfxUInt16Item -> SfxInt16Item
A regression of 2245288574ef77b09416872326b4543c82790815.
VerbID can be negative.
Change-Id: Ib242376696346ab310031d1b7c5c74362fb4b3d1
Reviewed-on: https://gerrit.libreoffice.org/10823
Reviewed-by: Maxim Monastirsky
Tested-by: Maxim Monastirsky
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 4302753..4ce0378 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -4235,7 +4235,7 @@ SfxVoidItem ObjectCatalog SID_BASICIDE_OBJCAT
SfxStringItem ObjectMenue SID_OBJECT
-(SfxUInt16Item VerbID SID_OBJECT)
+(SfxInt16Item VerbID SID_OBJECT)
[
/* flags: */
AutoUpdate = FALSE,
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 57de550..bbabaa3 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -2279,7 +2279,7 @@ void SfxViewFrame::ExecView_Impl
case SID_OBJECT:
{
-SFX_REQUEST_ARG( rReq, pItem, SfxUInt16Item, SID_OBJECT, false );
+SFX_REQUEST_ARG( rReq, pItem, SfxInt16Item, SID_OBJECT, false );
SfxViewShell *pViewShell = GetViewShell();
if ( pViewShell && pItem )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 38/c03d440036c8b0d129ed846b85991c804463a3
38/c03d440036c8b0d129ed846b85991c804463a3 |1 + 1 file changed, 1 insertion(+) New commits: commit c28fd1bf0633f75802953a25ce46603c9d281ea6 Author: Caolán McNamara Date: Sat Aug 9 17:34:04 2014 +0100 Notes added by 'git notes add' diff --git a/38/c03d440036c8b0d129ed846b85991c804463a3 b/38/c03d440036c8b0d129ed846b85991c804463a3 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/38/c03d440036c8b0d129ed846b85991c804463a3 @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/graphicfilter/itiff/itiff.cxx | 31 +++-
1 file changed, 22 insertions(+), 9 deletions(-)
New commits:
commit a1fab361cb3325b2d012942e43660f2c0a2a4b96
Author: Caolán McNamara
Date: Sat Aug 9 17:23:07 2014 +0100
valgrind + bff: Integer divide by zero
Change-Id: I4c47d17a421f1c6d2d6cc29c7b92ec930bdf901f
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx
b/filter/source/graphicfilter/itiff/itiff.cxx
index 6ece188..1eb4c8a 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -176,6 +176,19 @@ public:
delete pAlphaMask;
}
+sal_uLong GetRowsPerStrip() const
+{
+//Rows Per Strip:
+//
+//(TIFF format only) The number of rows of pixels per strip to use for
+//encoding the TIFF image. A value greater than zero specifies the
+//number of rows per strip. A value of 0 sets the rows per strip equal
+//to the image length, resulting in a single strip. A value of -1 (the
+//default) sets the rows per strip equal to infinity, resulting in a
+//single strip.
+return nRowsPerStrip == 0 ? nImageLength : nRowsPerStrip;
+}
+
bool ReadTIFF( SvStream & rTIFF, Graphic & rGraphic );
};
@@ -539,10 +552,10 @@ bool TIFFReader::ReadMap( sal_uLong nMinPercent,
sal_uLong nMaxPercent )
{
for ( np = 0; np < nPlanes; np++ )
{
-nStrip = ny / nRowsPerStrip + np * nStripsPerPlane;
+nStrip = ny / GetRowsPerStrip() + np * nStripsPerPlane;
if ( nStrip >= nNumStripOffsets )
return false;
-pTIFF->Seek( pStripOffsets[ nStrip ] + ( ny % nRowsPerStrip )
* nStripBytesPerRow );
+pTIFF->Seek( pStripOffsets[ nStrip ] + ( ny %
GetRowsPerStrip() ) * nStripBytesPerRow );
pTIFF->Read( pMap[ np ], nBytesPerRow );
if ( pTIFF->GetError() )
return false;
@@ -593,9 +606,9 @@ bool TIFFReader::ReadMap( sal_uLong nMinPercent, sal_uLong
nMaxPercent )
{
for ( np = 0; np < nPlanes; np++ )
{
-if ( ny / nRowsPerStrip + np * nStripsPerPlane > nStrip )
+if ( ny / GetRowsPerStrip() + np * nStripsPerPlane > nStrip )
{
-nStrip=ny/nRowsPerStrip+np*nStripsPerPlane;
+nStrip=ny/GetRowsPerStrip()+np*nStripsPerPlane;
if ( nStrip >= nNumStripOffsets )
return false;
pTIFF->Seek( pStripOffsets[ nStrip ] );
@@ -624,9 +637,9 @@ bool TIFFReader::ReadMap( sal_uLong nMinPercent, sal_uLong
nMaxPercent )
{
for ( np = 0; np < nPlanes; np++ )
{
-if ( ny / nRowsPerStrip + np * nStripsPerPlane > nStrip )
+if ( ny / GetRowsPerStrip() + np * nStripsPerPlane > nStrip )
{
-nStrip = ny / nRowsPerStrip + np * nStripsPerPlane;
+nStrip = ny / GetRowsPerStrip() + np * nStripsPerPlane;
if ( nStrip >= nNumStripOffsets )
return false;
pTIFF->Seek(pStripOffsets[nStrip]);
@@ -652,9 +665,9 @@ bool TIFFReader::ReadMap( sal_uLong nMinPercent, sal_uLong
nMaxPercent )
{
for ( np = 0; np < nPlanes; np++ )
{
-if ( ny / nRowsPerStrip + np * nStripsPerPlane > nStrip )
+if ( ny / GetRowsPerStrip() + np * nStripsPerPlane > nStrip )
{
-nStrip=ny/nRowsPerStrip+np*nStripsPerPlane;
+nStrip=ny/GetRowsPerStrip()+np*nStripsPerPlane;
if ( nStrip >= nNumStripOffsets )
return false;
pTIFF->Seek(pStripOffsets[nStrip]);
@@ -1310,7 +1323,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic &
rGraphic )
if ( ( nFillOrder == 2 ) && ( nCompression != 5 ) ) //
in the LZW mode bits are already being inverted
bByteSwap = true;
-nStripsPerPlane = ( nImageLength - 1 ) / nRowsPerStrip + 1;
+nStripsPerPlane = ( nImageLength - 1 ) / GetRowsPerStrip()
+ 1;
nBytesPerRow = ( nImageWidth * nSamplesPerPixel / nPlanes
* nBitsPerSample + 7 ) >> 3;
for ( sal_uLong j = 0; j < 4; j++ )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 16 commits - chart2/source cui/source dbaccess/source desktop/AllLangResTarget_deploymentgui.mk desktop/source formula/source fpicker/source framework/inc include/sfx2
chart2/source/controller/dialogs/TabPages.hrc | 28 - chart2/source/controller/dialogs/dlg_ObjectProperties.cxx |2 chart2/source/controller/dialogs/dlg_View3D.cxx |2 chart2/source/controller/dialogs/tp_AxisLabel.cxx |2 chart2/source/controller/dialogs/tp_AxisPositions.cxx |2 chart2/source/controller/dialogs/tp_DataLabel.cxx |2 chart2/source/controller/dialogs/tp_ErrorBars.cxx |2 chart2/source/controller/dialogs/tp_LegendPosition.cxx|2 chart2/source/controller/dialogs/tp_PointGeometry.cxx |2 chart2/source/controller/dialogs/tp_TitleRotation.cxx |2 chart2/source/controller/dialogs/tp_Trendline.cxx |2 cui/source/dialogs/hyperdlg.src |1 dbaccess/source/ui/dlg/AutoControls_tmpl.hrc |2 dbaccess/source/ui/dlg/dbadmin.hrc|2 dbaccess/source/ui/dlg/dbadmin.src| 49 - dbaccess/source/ui/dlg/paramdialog.cxx|7 - dbaccess/source/ui/dlg/paramdialog.hrc| 35 --- dbaccess/source/ui/dlg/paramdialog.src| 69 -- dbaccess/source/ui/inc/dbu_dlg.hrc|5 - dbaccess/source/ui/inc/dbu_resource.hrc | 15 --- desktop/AllLangResTarget_deploymentgui.mk |1 desktop/source/deployment/gui/dp_gui.hrc |5 - desktop/source/deployment/gui/dp_gui_dependencydialog.src | 66 - formula/source/ui/inc/ForResId.hrc|1 fpicker/source/office/iodlg.hrc |2 framework/inc/framework.hrc | 11 -- include/sfx2/dialogs.hrc |1 include/sfx2/sfx.hrc |2 include/sfx2/tabpage.hrc | 33 -- include/svx/dialogs.hrc |3 reportdesign/source/ui/dlg/CondFormat.hrc | 28 - reportdesign/source/ui/dlg/GroupsSorting.hrc |2 sc/source/ui/formdlg/dwfunctr.src |1 sc/source/ui/inc/datafdlg.hxx |7 - sfx2/source/dialog/dinfdlg.src|1 sfx2/source/doc/doc.hrc |5 - starmath/source/smres.src |1 sw/inc/envelp.hrc |2 sw/inc/globals.hrc|2 uui/source/ids.hrc|2 xmlsecurity/source/dialogs/dialogs.hrc| 52 -- 41 files changed, 20 insertions(+), 441 deletions(-) New commits: commit 273ed07a5779da84a3c7055866139bd422559818 Author: Thomas Arnhold Date: Sat Aug 9 10:22:32 2014 +0200 remove unused resource ids Change-Id: I3971ecc7dc0c3faf8dd1ed63adc08a6e18dc2964 diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc index b805b84..a7a7827 100644 --- a/sfx2/source/doc/doc.hrc +++ b/sfx2/source/doc/doc.hrc @@ -36,11 +36,6 @@ #define STR_DELETE_TEMPLATE (RID_SFX_DOC_START+15) #define MSG_REGION_NOTEMPTY (RID_SFX_DOC_START+17) -#define DLG_DOC_TEMPLATE(RID_SFX_DOC_START+2) - -#define DLG_TEMPLATE_MANAGER(RID_SFX_DOC_START+4) -#define TAB_TEMPLATE_MANAGER(RID_SFX_DOC_START+5) - #define BMP_STYLES_CLOSED (RID_SFX_DOC_START+ 0) #define BMP_STYLES_OPENED (RID_SFX_DOC_START+ 1) diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc index 5708eb5..f73056e 100644 --- a/uui/source/ids.hrc +++ b/uui/source/ids.hrc @@ -25,7 +25,6 @@ #define RID_KEEP_PASSWORD (RID_UUI_START + 0) #define RID_SAVE_PASSWORD (RID_UUI_START + 1) -#define DLG_UUI_LOGIN (RID_UUI_START + 2) #define DLG_FILTER_SELECT (RID_UUI_START + 10) #define DLG_SIMPLE_NAME_CLASH (RID_UUI_START + 13) #define STR_ERROR_PASSWORDS_NOT_IDENTICAL (RID_UUI_START + 13) @@ -33,7 +32,6 @@ // RID_UUI_START + 15, 16, 17 are misused by syncaccess/source/ui/resids.hrc #define RID_UUI_ERRHDL (RID_UUI_START + 20) -#define DLG_UUI_MASTERPASSWORD_CRT (RID_UUI_START + 21) #define STR_ERROR_SIMPLE_PASSWORD_WRONG (RID_UUI_START + 23) #define STR_ERROR_PASSWORD_TO_OPEN_WRONG(RID_UUI_START + 24) #define STR_ERROR_PASSWORD_TO_MODIFY_WRONG (RID_UUI_START + 25) commit 1c5c0e48a3cbff0460fcfb4d09a866e5a9e5bbc1 Author: Thomas Arnhold Date: Sat Aug 9 10:19:25 2014 +0200 remove unused resources
[Bug 75757] remove inheritance to std::map and std::vector
https://bugs.freedesktop.org/show_bug.cgi?id=75757 --- Comment #19 from Commit Notification --- Takeshi Abe committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=5932906656a9291b38811970cd933f05dd54eaac fdo#75757: remove inheritance to std::vector 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: sdext/source
sdext/source/presenter/PresenterTheme.cxx | 30 ++
1 file changed, 18 insertions(+), 12 deletions(-)
New commits:
commit 5932906656a9291b38811970cd933f05dd54eaac
Author: Takeshi Abe
Date: Sun Aug 10 00:06:13 2014 +0900
fdo#75757: remove inheritance to std::vector
... for PaneStyleContainer and ViewStyleContainer.
Change-Id: I6a6e2b1733266f54a94a49ab491cf854eb5df492
Reviewed-on: https://gerrit.libreoffice.org/10847
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/sdext/source/presenter/PresenterTheme.cxx
b/sdext/source/presenter/PresenterTheme.cxx
index a60209b..fc59c18 100644
--- a/sdext/source/presenter/PresenterTheme.cxx
+++ b/sdext/source/presenter/PresenterTheme.cxx
@@ -142,8 +142,11 @@ public:
typedef ::boost::shared_ptr SharedPaneStyle;
-class PaneStyleContainer : vector
+class PaneStyleContainer
{
+private:
+::std::vector mStyles;
+
public:
void Read (
ReadContext& rReadContext,
@@ -179,8 +182,11 @@ public:
typedef ::boost::shared_ptr SharedViewStyle;
-class ViewStyleContainer : vector
+class ViewStyleContainer
{
+private:
+::std::vector mStyles;
+
public:
void Read (
ReadContext& rReadContext,
@@ -882,8 +888,8 @@ void PaneStyleContainer::ProcessPaneStyle(
if (rValues[1] >>= sParentStyleName)
{
// Find parent style.
-PaneStyleContainer::const_iterator iStyle;
-for (iStyle=begin(); iStyle!=end(); ++iStyle)
+::std::vector::const_iterator iStyle;
+for (iStyle=mStyles.begin(); iStyle!=mStyles.end(); ++iStyle)
if ((*iStyle)->msStyleName.equals(sParentStyleName))
{
pStyle->mpParentStyle = *iStyle;
@@ -919,13 +925,13 @@ void PaneStyleContainer::ProcessPaneStyle(
rReadContext.mxPresenterHelper));
}
-push_back(pStyle);
+mStyles.push_back(pStyle);
}
SharedPaneStyle PaneStyleContainer::GetPaneStyle (const OUString& rsStyleName)
const
{
-const_iterator iEnd (end());
-for (const_iterator iStyle=begin(); iStyle!=iEnd; ++iStyle)
+::std::vector::const_iterator iEnd (mStyles.end());
+for (::std::vector::const_iterator
iStyle=mStyles.begin(); iStyle!=iEnd; ++iStyle)
if ((*iStyle)->msStyleName == rsStyleName)
return *iStyle;
return SharedPaneStyle();
@@ -1008,8 +1014,8 @@ void ViewStyleContainer::ProcessViewStyle(
>>= sParentStyleName)
{
// Find parent style.
-ViewStyleContainer::const_iterator iStyle;
-for (iStyle=begin(); iStyle!=end(); ++iStyle)
+::std::vector::const_iterator iStyle;
+for (iStyle=mStyles.begin(); iStyle!=mStyles.end(); ++iStyle)
if ((*iStyle)->msStyleName.equals(sParentStyleName))
{
pStyle->mpParentStyle = *iStyle;
@@ -1039,13 +1045,13 @@ void ViewStyleContainer::ProcessViewStyle(
if (pBackground.get() != NULL && pBackground->GetNormalBitmap().is())
pStyle->mpBackground = pBackground;
-push_back(pStyle);
+mStyles.push_back(pStyle);
}
SharedViewStyle ViewStyleContainer::GetViewStyle (const OUString& rsStyleName)
const
{
-const_iterator iEnd (end());
-for (const_iterator iStyle=begin(); iStyle!=iEnd; ++iStyle)
+::std::vector::const_iterator iEnd (mStyles.end());
+for (::std::vector::const_iterator
iStyle=mStyles.begin(); iStyle!=iEnd; ++iStyle)
if ((*iStyle)->msStyleName == rsStyleName)
return *iStyle;
return SharedViewStyle();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: javaunohelper/com
javaunohelper/com/sun/star/comp/helper/Bootstrap.java | 10 +++---
1 file changed, 3 insertions(+), 7 deletions(-)
New commits:
commit c6de012a66deebbaefa01cffdc6ed7961b3ed57e
Author: rbuj
Date: Sat Aug 9 15:51:20 2014 +0200
javaunohelper: Iterate over each Entry in a Map
Change-Id: I12a3348c297cfd2902c1cbb04bd0ce35b15e
Reviewed-on: https://gerrit.libreoffice.org/10846
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
index 3bc5bde..c11a415 100644
--- a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
+++ b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
@@ -38,7 +38,6 @@ import java.io.File;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.PrintStream;
-import java.util.Iterator;
import java.util.Hashtable;
import java.util.Random;
@@ -187,13 +186,10 @@ public class Bootstrap {
if (null != bootstrap_parameters)
{
pairs = new String [ 2 * bootstrap_parameters.size() ];
-Iterator keys = bootstrap_parameters.keySet().iterator();
int n = 0;
-while (keys.hasNext())
-{
-String name = keys.next();
-pairs[ n++ ] = name;
-pairs[ n++ ] = bootstrap_parameters.get( name );
+for (java.util.Map.Entry bootstrap_parameter :
bootstrap_parameters.entrySet()) {
+pairs[ n++ ] = bootstrap_parameter.getKey();
+pairs[ n++ ] = bootstrap_parameter.getValue();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: May I know where is intro image and how to link it?
Hi, On Sat, Aug 09, 2014 at 09:42:45PM +0800, LOH KOK HOE wrote: > Dear all, > > I'm building LibreOffice from source. Now I have complete my build and have > LD_LIBRARY_PATH being configure pointing to `solver/ > unxlngx6.pro/lib/libsofficeapp.so`. When I try to execute `./soffice`, I > hit following error: Which version are you building? solver has been dead on master for nearly a year. And related question: why are you building a version that old? D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/coinmp external/cppunit external/libgltf external/python3
external/coinmp/ExternalProject_coinmp.mk |2 +-
external/cppunit/ExternalProject_cppunit.mk |2 +-
external/libgltf/ExternalProject_libgltf.mk |2 +-
external/python3/ExternalProject_python3.mk |2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 0b684fa3e919dea3a482f85580c1266b81598f70
Author: Thomas Arnhold
Date: Sat Aug 9 16:06:09 2014 +0200
VS2013: Override ToolsVersion setting
Otherwise those external projects will fail, because with only VS2013
installed
there is no ToolsVersion 4.0 (which is set inside the VC projects files).
http://msdn.microsoft.com/en-us/library/bb383985.aspx
Change-Id: I144ba1ef95372226ebadb082e3a78155cca316fd
diff --git a/external/coinmp/ExternalProject_coinmp.mk
b/external/coinmp/ExternalProject_coinmp.mk
index c5f181d..3c54e42 100644
--- a/external/coinmp/ExternalProject_coinmp.mk
+++ b/external/coinmp/ExternalProject_coinmp.mk
@@ -21,7 +21,7 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) :
/p:Platform=Win32 \
$(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100
/p:VisualStudioVersion=10.0) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
- $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120
/p:VisualStudioVersion=12.0) \
+ $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120
/p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
,CoinMP/MSVisualStudio/v9)
else
diff --git a/external/cppunit/ExternalProject_cppunit.mk
b/external/cppunit/ExternalProject_cppunit.mk
index 5c62c96..b5b7f8a 100644
--- a/external/cppunit/ExternalProject_cppunit.mk
+++ b/external/cppunit/ExternalProject_cppunit.mk
@@ -19,7 +19,7 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) :
PROFILEFLAGS="$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
/p:VisualStudioVersion=11.0) \
- $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120
/p:VisualStudioVersion=12.0)" \
+ $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120
/p:VisualStudioVersion=12.0 /ToolsVersion:12.0)" \
&& msbuild.exe cppunit_dll.vcxproj
/p:Configuration=$${PROFILEFLAGS} \
&& cd ../DllPlugInTester \
&& msbuild.exe DllPlugInTester.vcxproj
/p:Configuration=$${PROFILEFLAGS} \
diff --git a/external/libgltf/ExternalProject_libgltf.mk
b/external/libgltf/ExternalProject_libgltf.mk
index cd84dcd..c402e59 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -43,7 +43,7 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
$(call gb_ExternalProject_run,build,\
msbuild.exe libgltf.vcxproj \
/p:Configuration=$(if
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
- $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120
/p:VisualStudioVersion=12.0) \
+ $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120
/p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
/p:VisualStudioVersion=11.0) \
$(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 \
diff --git a/external/python3/ExternalProject_python3.mk
b/external/python3/ExternalProject_python3.mk
index cabff00..21a3f11 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
/p:VisualStudioVersion=11.0) \
$(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 \
- /p:VisualStudioVersion=12.0) \
+ /p:VisualStudioVersion=12.0 /ToolsVersion:12.0)
\
,PCBuild)
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - extensions.lst
extensions.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 38c03d440036c8b0d129ed846b85991c804463a3 Author: Andrea Pescetti Date: Sat Aug 9 13:11:39 2014 + #i125262# Updated Portuguese (European) dictionary. diff --git a/extensions.lst b/extensions.lst index 28c616c..48eea3a 100644 --- a/extensions.lst +++ b/extensions.lst @@ -137,7 +137,7 @@ # Portuguese (European). [ language=pt || language=pt_PT ] -196c27dd8da422006b64129665abd08f http://sourceforge.net/projects/aoo-extensions/files/1196/29/oo3x-pt-pt-14.7.4.1.oxt/download "dict-pt.oxt" +c29cd2b68639b4fe78e98f88f1b4dd8e http://sourceforge.net/projects/aoo-extensions/files/1196/30/oo3x-pt-pt-14.7.8.2.oxt/download "dict-pt.oxt" # Catalan. [ language=ca ] ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
May I know where is intro image and how to link it?
Dear all, I'm building LibreOffice from source. Now I have complete my build and have LD_LIBRARY_PATH being configure pointing to `solver/ unxlngx6.pro/lib/libsofficeapp.so`. When I try to execute `./soffice`, I hit following error: Failed to find intro image Warning: failed to launch javaldx - java may not function correctly Any clue on this error? THanks @! ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - comphelper/source include/comphelper sfx2/source svtools/source sw/source
comphelper/source/container/embeddedobjectcontainer.cxx | 36
include/comphelper/embeddedobjectcontainer.hxx |3 +
sfx2/source/appl/linkmgr2.cxx | 12 -
svtools/source/misc/embedhlp.cxx| 29
sw/source/filter/ww8/ww8graf.cxx| 21 +++--
5 files changed, 70 insertions(+), 31 deletions(-)
New commits:
commit 227f3aab1791ffde82fe930ea1c9f7ed4ed2d82d
Author: Steve Yin
Date: Fri Aug 8 03:10:58 2014 +
Resolves: #i125391# textbox object's location changes...
after importing the sample file
Fixed by Oliver-Rainer Wittmann
(cherry picked from commit 700479573567e82f9bd9ae065f18f9ec9d943300)
Conflicts:
sw/source/filter/ww8/ww8graf.cxx
Change-Id: I963689a80dfe4ac1439afb29132015e900886317
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 1445ce5..c145c22 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2138,20 +2138,15 @@ RndStdIds
SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
if (pFSPA)
{
-/*
-#i15718# #i19008#
-Strangely in this case the FSPA value seems to be considered before
-the newer escher nXRelTo record.
-*/
-// #i52565# - correct condition checking:
-// first check, if and have default values. This
-// is a hint that these values aren't set by the escher import - see
-// method . Then, check if for each
-// values, if it differs from the one in the FSPA.
-
-if ( *(pRecord->pXRelTo) == 2 && *(pRecord->pYRelTo) == 2 &&
!bCurSectionVertical)
+// #i52565# - try to handle special case for objects in tables
regarding its X Rel
+
+// if X and Y Rel values are on default take it as a hint, that they
have not been set
+// by
+const bool bXYRelHaveDefaultValues = *(pRecord->pXRelTo) == 2 &&
*(pRecord->pYRelTo) == 2;
+if ( bXYRelHaveDefaultValues
+ && nInTable > 0
+ && !bCurSectionVertical )
{
-// if differs from overwrite
if ( pFSPA->nby != *(pRecord->pYRelTo) )
{
*(pRecord->pYRelTo) = pFSPA->nby;
commit d005acae3aa315921f2c331612131626c470bd22
Author: Armin Le Grand
Date: Thu Aug 7 09:59:26 2014 +
Resolves: #i125386# secured user request and changed some bools to bitfield
(cherry picked from commit 5e3cbe056c19bea5018dbf1fd4b2bc8f8b030ff3)
Conflicts:
comphelper/inc/comphelper/embeddedobjectcontainer.hxx
comphelper/source/container/embeddedobjectcontainer.cxx
sfx2/source/appl/linkmgr2.cxx
svtools/source/misc/embedhlp.cxx
Change-Id: I7e9b20a87ca6afe8cb91c577860a6c6b72368ee9
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx
b/comphelper/source/container/embeddedobjectcontainer.cxx
index d614c1a..e3696f1 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -62,7 +62,10 @@ struct EmbedImpl
uno::WeakReference < uno::XInterface > m_xModel;
//EmbeddedObjectContainerNameMap maTempObjectContainer;
//uno::Reference < embed::XStorage > mxTempStorage;
-bool bOwnsStorage;
+
+/// bitfield
+bool mbOwnsStorage : 1;
+bool mbUserAllowsLinkUpdate : 1;
const uno::Reference < embed::XStorage >& GetReplacements();
};
@@ -93,7 +96,8 @@ EmbeddedObjectContainer::EmbeddedObjectContainer()
{
pImpl = new EmbedImpl;
pImpl->mxStorage = ::comphelper::OStorageHelper::GetTemporaryStorage();
-pImpl->bOwnsStorage = true;
+pImpl->mbOwnsStorage = true;
+pImpl->mbUserAllowsLinkUpdate = true;
pImpl->mpTempObjectContainer = 0;
}
@@ -101,7 +105,8 @@ EmbeddedObjectContainer::EmbeddedObjectContainer( const
uno::Reference < embed::
{
pImpl = new EmbedImpl;
pImpl->mxStorage = rStor;
-pImpl->bOwnsStorage = false;
+pImpl->mbOwnsStorage = false;
+pImpl->mbUserAllowsLinkUpdate = true;
pImpl->mpTempObjectContainer = 0;
}
@@ -109,7 +114,8 @@ EmbeddedObjectContainer::EmbeddedObjectContainer( const
uno::Reference < embed::
{
pImpl = new EmbedImpl;
pImpl->mxStorage = rStor;
-pImpl->bOwnsStorage = false;
+pImpl->mbOwnsStorage = false;
+pImpl->mbUserAllowsLinkUpdate = true;
pImpl->mpTempObjectContainer = 0;
pImpl->m_xModel = xModel;
}
@@ -118,11 +124,11 @@ void EmbeddedObjectContainer::SwitchPersistence( const
uno::Reference < embed::X
{
ReleaseImageSubStorage();
-if ( pImpl->bOwnsStorage )
+if ( pImpl->mbOwnsStorage )
pImpl->mxStorage->dispose();
pImpl->mxStorage = rStor;
-pImpl->bOwnsStorage = false;
+pImpl->mbOwnsStorage = false;
}
bool EmbeddedObjectContainer::CommitImageSubStorage()
@@ -178,7 +184,7 @
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 5e/3cbe056c19bea5018dbf1fd4b2bc8f8b030ff3
5e/3cbe056c19bea5018dbf1fd4b2bc8f8b030ff3 |1 + 1 file changed, 1 insertion(+) New commits: commit c702feabf7957b21aaa87a14efb27f1f118a3796 Author: Caolán McNamara Date: Sat Aug 9 14:13:27 2014 +0100 Notes added by 'git notes add' diff --git a/5e/3cbe056c19bea5018dbf1fd4b2bc8f8b030ff3 b/5e/3cbe056c19bea5018dbf1fd4b2bc8f8b030ff3 new file mode 100644 index 000..e73d2ca --- /dev/null +++ b/5e/3cbe056c19bea5018dbf1fd4b2bc8f8b030ff3 @@ -0,0 +1 @@ +merged as: d005acae3aa315921f2c331612131626c470bd22 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 70/0479573567e82f9bd9ae065f18f9ec9d943300
70/0479573567e82f9bd9ae065f18f9ec9d943300 |1 + 1 file changed, 1 insertion(+) New commits: commit 31b519fc86689816a89b67a235be103d193a5f83 Author: Caolán McNamara Date: Sat Aug 9 14:13:43 2014 +0100 Notes added by 'git notes add' diff --git a/70/0479573567e82f9bd9ae065f18f9ec9d943300 b/70/0479573567e82f9bd9ae065f18f9ec9d943300 new file mode 100644 index 000..d7c7165 --- /dev/null +++ b/70/0479573567e82f9bd9ae065f18f9ec9d943300 @@ -0,0 +1 @@ +merged as: 227f3aab1791ffde82fe930ea1c9f7ed4ed2d82d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: jurt/com
jurt/com/sun/star/lib/connections/socket/ConnectionDescriptor.java |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit bb8540a3b4fe0798669a1d355695c97d86ef58a0
Author: rbuj
Date: Sat Aug 9 14:45:51 2014 +0200
jurt: Number parsing
Change-Id: I40721bdaae62f063c188546fedb4037e40f890fa
Reviewed-on: https://gerrit.libreoffice.org/10845
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/jurt/com/sun/star/lib/connections/socket/ConnectionDescriptor.java
b/jurt/com/sun/star/lib/connections/socket/ConnectionDescriptor.java
index f362dac..aec6a63 100644
--- a/jurt/com/sun/star/lib/connections/socket/ConnectionDescriptor.java
+++ b/jurt/com/sun/star/lib/connections/socket/ConnectionDescriptor.java
@@ -43,7 +43,7 @@ final class ConnectionDescriptor {
host = value;
} else if (key.equalsIgnoreCase("port")) {
try {
-port = Integer.valueOf(value).intValue();
+port = Integer.parseInt(value);
} catch (NumberFormatException e) {
throw new com.sun.star.lang.IllegalArgumentException(
e.toString());
@@ -55,7 +55,7 @@ final class ConnectionDescriptor {
}
} else if (key.equalsIgnoreCase("backlog")) {
try {
-backlog = Integer.valueOf(value).intValue();
+backlog = Integer.parseInt(value);
} catch (NumberFormatException e) {
throw new com.sun.star.lang.IllegalArgumentException(
e.toString());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 6 commits - connectivity/source filter/CppunitTest_filter_dxf_test.mk filter/Module_filter.mk filter/qa sc/CppunitTest_sc_filters_test.mk sc/qa writerperfect/qa
connectivity/source/drivers/dbase/DTable.cxx | 20 ++
connectivity/source/drivers/file/FResultSet.cxx |4
filter/CppunitTest_filter_dxf_test.mk| 43
++
filter/Module_filter.mk |1
filter/qa/cppunit/data/dxf/fail/CVE-2010-1681-1.dxf |binary
filter/qa/cppunit/data/dxf/indeterminate/.gitignore |1
filter/qa/cppunit/filters-dxf-test.cxx | 71
++
sc/CppunitTest_sc_filters_test.mk|1
sc/qa/unit/data/dbf/pass/sf_52f907dbea3069ba59ef1e183a0f4160-430.dbf |binary
sc/qa/unit/filters-test.cxx |3
writerperfect/qa/unit/data/draw/libvisio/pass/EDB-22679-1.vsd|binary
11 files changed, 139 insertions(+), 5 deletions(-)
New commits:
commit ef933f02447c25cc0d6048a62e9bc08f3bca5470
Author: Caolán McNamara
Date: Sat Aug 9 13:25:56 2014 +0100
add calc dbase import test
Change-Id: I6dd23b5dfab096f67a189ce2747b211b2a3044e9
diff --git a/sc/CppunitTest_sc_filters_test.mk
b/sc/CppunitTest_sc_filters_test.mk
index 71f4d7e..4fbf489 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -80,6 +80,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_filters_test,\
chart2/source/controller/chartcontroller \
comphelper/util/comphelp \
configmgr/source/configmgr \
+connectivity/source/manager/sdbc2 \
dbaccess/util/dba \
embeddedobj/util/embobj \
eventattacher/source/evtatt \
diff --git a/sc/qa/unit/data/dbf/fail/.gitignore
b/sc/qa/unit/data/dbf/fail/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/sc/qa/unit/data/dbf/indeterminate/.gitignore
b/sc/qa/unit/data/dbf/indeterminate/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/sc/qa/unit/data/dbf/pass/.gitignore
b/sc/qa/unit/data/dbf/pass/.gitignore
new file mode 100644
index 000..e69de29
diff --git
a/sc/qa/unit/data/dbf/pass/sf_52f907dbea3069ba59ef1e183a0f4160-430.dbf
b/sc/qa/unit/data/dbf/pass/sf_52f907dbea3069ba59ef1e183a0f4160-430.dbf
new file mode 100644
index 000..c58f608
Binary files /dev/null and
b/sc/qa/unit/data/dbf/pass/sf_52f907dbea3069ba59ef1e183a0f4160-430.dbf differ
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index da9ec56..1aa9c70 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -128,6 +128,9 @@ void ScFiltersTest::testCVEs()
testDir(OUString("MS Excel 97"),
getURLFromSrc("/sc/qa/unit/data/xls/"), OUString());
+
+testDir(OUString("dBase"),
+getURLFromSrc("/sc/qa/unit/data/dbf/"), OUString());
#endif
}
commit e49e41f7601122dcaf7e31f4fa1cb4074c3dd35a
Author: Caolán McNamara
Date: Sat Aug 9 13:31:24 2014 +0100
check return of Execute row and propogate error code
Change-Id: I75b2c454122aa2d75d66dc46865135e01277bbcb
diff --git a/connectivity/source/drivers/file/FResultSet.cxx
b/connectivity/source/drivers/file/FResultSet.cxx
index 589ecd3..ee98373 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -999,7 +999,9 @@ bool OResultSet::Move(IResultSetHelper::Movement
eCursorPosition, sal_Int32 nOff
if (m_nRowPos < (sal_Int32)m_pFileSet->get().size())
{
// Fetch via Index
-
ExecuteRow(IResultSetHelper::BOOKMARK,(m_pFileSet->get())[m_nRowPos],false,bRetrieveData);
+bool bOK =
ExecuteRow(IResultSetHelper::BOOKMARK,(m_pFileSet->get())[m_nRowPos],false,bRetrieveData);
+if (!bOK)
+goto Error;
// now set the bookmark for outside
*(*m_aRow->get().begin()) = sal_Int32(m_nRowPos + 1);
commit a9201a4dfe54d920ff6272aae949eefb7888dc20
Author: Caolán McNamara
Date: Fri Aug 8 15:55:02 2014 +0100
Conditional jump or move depends on uninitialised value(s)
at 0x2DC948DF: connectivity::dbase::ODbaseTable::fillColumns()
(DTable.cxx:330)
...
by 0x2C57E3B3: ScDocShell::DBaseImport(rtl::OUString const&, unsigned
short, ScColWidthParam*, ScFlatBoolRowSegments&) (docsh8.cxx:345)
bff + valgrind: sf_52f907dbea3069ba59ef1e183a0f4160-430.pcx
fuzz a pcx long enough and it turns into a dbase file
Change-Id: Idf1622d6b55ae2cca381f26d0ab0b6a469b2
diff --git a/connectivity/source/drivers/dbase/DTable.cxx
b/connectivity/source/drivers/dbase/DTable.cxx
index 5d04f13..b205958 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -322,13 +322,20 @@ void ODbaseTable::fillColumns()
for (; i < nFieldCount; i++)
{
DBFColumn aDBFColumn;
-m_pFileStream->Read((char*)&aDBFColumn,
Re: LibreOffice Feature Request
> > ·*Ribbon Interface Option* for using the LibreOffice Like it’s > there on *KINGSOFT OFFICE OR WPS OFFICE (Both are free)*. > Why don't you use them then instead, if they are more to your liking? We won't mind. There is no lack of (more or less obvious) ideas for features and changes needed in LibreOffice. There is also no lack of people who oppose any more or less radical UI or functionality change (open source is all about choice, everything must be an option, yadda yadda), and no lack of wannabe visionaries to tell what others should work on. What there is a lack of is developer resources, and the way to get those is funding. Typically by buying support for a large number of LibreOffice seats from a company specialising in such support, or by hiring people, or assigning people already working on something else, to work on LibreOffice. Which might be useful for Libreoffice as becoming the office application > for Next Generation of People like me. > Sorry, but vague feelgood reasons like that won't have much effect on actual development work. (Obviously I talk only for myself, etc etc.) --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/dialog/mailmodel.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a3094e40ba83b3bfe76b3a01df20662dded7fc45
Author: Julien Nabet
Date: Sat Aug 9 13:08:24 2014 +0200
Typo: filen->file
Change-Id: I68a963cd63fdb016a6f7b12cdc9314012e373612
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index fcf077e..ea30e59 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -423,7 +423,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat(
( aTypeName.isEmpty() && !bHasLocation ))
return eRet;
-// Determine filen name and extension
+// Determine file name and extension
if ( bHasLocation && !bStoreTo )
{
INetURLObject aFileObj( xStorable->getLocation() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 6 commits - writerfilter/source
writerfilter/source/ooxml/factoryimpl_ns.py |7 writerfilter/source/ooxml/model.xml | 1482 --- writerfilter/source/ooxml/modelpreprocess.py |8 3 files changed, 8 insertions(+), 1489 deletions(-) New commits: commit 9d98c42b3222bb77da4fbace8472770196f22e0b Author: Miklos Vajna Date: Sat Aug 9 12:42:57 2014 +0200 Unreferenced simple types Stuff like NS_ooxml::LN_Value_wordprocessingml_ST_TargetScreenSz_1920x1200 is no doubt not mapped to anything or quite some VML bits, which are handled in oox. Change-Id: Id50af0b61c25794b5d2c34f3deb3f16f3a8ab838 diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 8333c08..bd0ec2d 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -780,20 +780,6 @@ http://www.w3.org/2001/XMLSchema"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:fn="http://www.w3.org/2006/xpath-functions"; xmlns="http://relaxng.org/ns/structure/1.0"; ns="http://schemas.openxmlformats.org/drawingml/2006/main"; datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes";> - - - - - - - -major - -minor - -none - - @@ -984,12 +970,6 @@ - - - major - minor - none - dk1 lt1 @@ -2702,15 +2682,9 @@ - - - - - - @@ -3458,9 +3432,6 @@ br - - - @@ -3569,7 +3540,6 @@ - @@ -3839,7 +3809,6 @@ b br - @@ -5474,9 +5443,6 @@ - - - @@ -8374,9 +8340,6 @@ http://schemas.openxmlformats.org/officeDocument/2006/relationships"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:fn="http://www.w3.org/2006/xpath-functions"; xmlns="http://relaxng.org/ns/structure/1.0"; datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"; ns="http://schemas.openxmlformats.org/officeDocument/2006/relationships";> - - - @@ -8414,7 +8377,6 @@ - @@ -9409,31 +9371,6 @@ - - - -view - -edit - -backwardCompatible - - - - - -t - -f - -true - -false - - - - - @@ -9450,32 +9387,6 @@ frame - - - -none - -linear - -sigma - -any - -linear sigma - - - - - -single - -double - -emboss - -perspective - - @@ -9570,24 +9481,6 @@ - - - -canvas - -orgchart - -radial - -cycle - -stacked - -venn - -bullseye - - @@ -9601,18 +9494,6 @@ - - view - edit - backwardCompatible - - - t - f - true - false - - solid gradient @@ -9621,19 +9502,6 @@ pattern frame - - none - linear - sigma - any - linear sigma - - - single - double - emboss - perspective - single thinThin @@ -9681,15 +9549,6 @@ false - - canvas - orgchart - radial - cycle - stacked - venn - bullseye - @@ -10573,125 +10432,6 @@ - - - -arc - -callout - -connector - -align - - - - - -top - -middle - -bottom - -left - -center - -right - - - -
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/PropertyMap.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 053435d20a2206ecfb2b7d522895b0a89b66a649
Author: Matthew Pottage
Date: Thu Aug 7 15:13:26 2014 +0100
Fixed erroneous comment (by me).
Change-Id: Ie2430d0ef63bed95fd86f927260442814b0e5566
Reviewed-on: https://gerrit.libreoffice.org/10809
Reviewed-by: Thomas Arnhold
Tested-by: Thomas Arnhold
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx
b/writerfilter/source/dmapper/PropertyMap.hxx
index 4c1d2e2..63e7c2c 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -135,7 +135,7 @@ public:
//Returns a copy of the property if it exists, .first is its PropertyIds
and .second is its Value (type css::uno::Any)
boost::optional getProperty( PropertyIds eId ) const;
-//Has the property named been set (via Insert or Set)?
+//Has the property named been set (via Insert)?
bool isSet( PropertyIds eId ) const;
const ::com::sun::star::uno::Reference<
::com::sun::star::text::XFootnote>& GetFootnote() const { return m_xFootnote;}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-commits] core.git: 2 commits - editeng/source writerperfect/qa
Hi, On Thu, Aug 07, 2014 at 01:06:18PM -0700, Caolán McNamara wrote: > commit 8f2a714b60d35d7f17b317fa16ab4caac806e932 > Author: Caol??n McNamara > Date: Thu Aug 7 20:55:17 2014 +0100 > > add test-case for CVE-2007-1735 > > Change-Id: If505b45bd197fb24a2bacaf44cb46f84de8b61ff > > diff --git > a/writerperfect/qa/unit/data/writer/libwpd/pass/CVE-2007-1735-1.wpd > b/writerperfect/qa/unit/data/writer/libwpd/pass/CVE-2007-1735-1.wpd > new file mode 100644 > index 000..4d11b93 > Binary files /dev/null and > b/writerperfect/qa/unit/data/writer/libwpd/pass/CVE-2007-1735-1.wpd differ The writerperfect import tests are supposed to test libreoffice integration of the libraries, rather than the libraries themselves. I.e., that the service that wraps a library can detect and load a document (of every format that is enabled, for multi-format libs like libmwaw). Every import library already has its own regression test suite (http://sourceforge.net/p/libwpd/libwpd-regression/ci/master/tree/ for libwpd) and specifc documents that need to be tested should preferably go there. On the other side, tests in libreoffice will be done on various platforms, while the regression test suites are typically run only on Linux/x86_64... D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac
configure.ac | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 05ed013cbc5f3b9a112e7080a52a69f456d7e506
Author: David Ostrovsky
Date: Fri Jun 27 17:52:12 2014 +0200
VS2013: Prefer it over VS2012 and VS2010
The preference for compiler picking on Windows is:
1. vs2012
2. vs2010
3. vs2013
Because vs2013 was considered as unsupported compiler the only
option to acivate is to provide additional option to the autogen:
--with-visual-studio=2013
Now, that vs2013 is up and running change the preference order and
pick the newest installed compiler.
Change-Id: I76412b9a1bd9514904bbcca99230896add0424f1
Reviewed-on: https://gerrit.libreoffice.org/10154
Reviewed-by: Thomas Arnhold
Tested-by: Thomas Arnhold
diff --git a/configure.ac b/configure.ac
index 38c2ea9..dcf3b69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2002,12 +2002,12 @@ AC_ARG_WITH(
[with_doxygen=yes])
AC_ARG_WITH(visual-studio,
-AS_HELP_STRING([--with-visual-studio=<2012/2010/2013>],
+AS_HELP_STRING([--with-visual-studio=<2013/2012/2010>],
[Specify which Visual Studio version to use in case several are
are installed. If not specified, the order of preference is
- 2012, 2010, 2013 (including Express editions).])
+ 2013, 2012, 2010 (including Express editions).])
[
- Usage: --with-visual-studio=<2012/2010/2013>
+ Usage: --with-visual-studio=<2013/2012/2010>
],
,)
@@ -3610,14 +3610,14 @@ vs_versions_to_check()
map_vs_year_to_version "$1"
vsversions=$vsversion
else
-# By default we prefer 2012, then 2010, then 2013
-vsversions="11.0 10.0 12.0"
+# By default we prefer 2013, 2012, then 2010
+vsversions="12.0 11.0 10.0"
fi
}
find_msvs()
{
-# Find Visual Studio 2012/2010/2013
+# Find Visual Studio 2013/2012/2010
# Args: $1 (optional) : versions to check, in the order of preference
# Return value: $vstest
@@ -3641,7 +3641,7 @@ find_msvs()
find_msvc()
{
-# Find Visual C++ 2012/2010/2013
+# Find Visual C++ 2013/2012/2010
# Args: $1 (optional) : The VS version year
# Return values: $vctest, $vcyear, $vcnum, $vcnumwithdot
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice Feature Request
Dear LibreOffice Team, Kindly Accept my hearty congratulations for your ongoing endeavour to keep the Office Application Free for many users who are unable to access expensive office applications across the world. This Email is regarding feature request. Libreoffice is designed keeping in mind the classic look of office, but many young users who are used to the looks of Ms-Office 2013 and want to shift to LibreOffice find the Classic use sometime very tough, So Can you help users like us with *Ribbon Interface Option for using the LibreOffice Like it's there on KINGSOFT OFFICE OR WPS OFFICE (Both are free). *Can you please modernise the interface with Flat Look (Of Icons) and keep the background white. I wish I was a Software Developer, But Since I am an End User, I can only provide with little Feedback, Which might be useful for Libreoffice as becoming the office application for Next Generation of People like me. Kindly provide a Feature Request Email ID or Some Place to Post so that it can be easy to contact you. My Best Wishes again to LibreOffice Team. Regards, Sandy. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
