[Libreoffice-commits] core.git: sd/qa sd/source
sd/qa/unit/import-tests.cxx |2
sd/source/filter/eppt/eppt.cxx|2
sd/source/filter/eppt/pptx-epptbase.cxx |2
sd/source/filter/ppt/pptin.cxx| 68 +++---
sd/source/filter/sdpptwrp.cxx |4 -
sd/source/ui/animations/CustomAnimationDialog.cxx | 12 +--
sd/source/ui/animations/CustomAnimationPane.cxx | 16 ++---
sd/source/ui/annotations/annotationmanager.cxx| 14 ++--
sd/source/ui/annotations/annotationwindow.cxx |8 +-
sd/source/ui/app/sdmod1.cxx |8 +-
sd/source/ui/app/sdmod2.cxx | 10 +--
sd/source/ui/app/sdpopup.cxx | 36 +--
sd/source/ui/app/sdxfer.cxx | 10 +--
sd/source/ui/app/tmplctrl.cxx |2
sd/source/ui/dlg/animobjs.cxx |6 -
sd/source/ui/dlg/brkdlg.cxx |2
sd/source/ui/dlg/copydlg.cxx | 18 ++---
sd/source/ui/dlg/diactrl.cxx |2
sd/source/ui/dlg/dlgassim.cxx |6 -
sd/source/ui/dlg/dlgchar.cxx |2
sd/source/ui/dlg/dlgfield.cxx | 38 ++--
sd/source/ui/dlg/dlgolbul.cxx |8 +-
sd/source/ui/dlg/dlgpage.cxx |8 +-
sd/source/ui/dlg/dlgsnap.cxx |4 -
sd/source/ui/dlg/gluectrl.cxx |4 -
sd/source/ui/dlg/headerfooterdlg.cxx | 28 -
sd/source/ui/dlg/layeroptionsdlg.cxx | 12 +--
sd/source/ui/dlg/masterlayoutdlg.cxx |2
sd/source/ui/dlg/morphdlg.cxx |8 +-
sd/source/ui/dlg/paragr.cxx |4 -
sd/source/ui/dlg/present.cxx | 34 +--
sd/source/ui/dlg/prltempl.cxx | 14 ++--
sd/source/ui/dlg/sdpreslt.cxx |8 +-
sd/source/ui/dlg/sdtreelb.cxx | 38 +---
sd/source/ui/dlg/tabtempl.cxx |4 -
sd/source/ui/dlg/tpaction.cxx | 12 +--
sd/source/ui/dlg/tpoption.cxx | 40 ++--
sd/source/ui/dlg/unchss.cxx |9 +-
sd/source/ui/dlg/vectdlg.cxx |2
sd/source/ui/docshell/docshel3.cxx| 13 +---
sd/source/ui/docshell/docshel4.cxx|4 -
sd/source/ui/view/drviewse.cxx|4 -
42 files changed, 263 insertions(+), 265 deletions(-)
New commits:
commit b52a7c4df461109e6b80c65b043135582dd4f01b
Author: Noel Grandin n...@peralex.com
Date: Thu Nov 13 10:19:16 2014 +0200
loplugin: cstylecast
Change-Id: I071962c646199c30e842b9ec7673473de237ee45
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 141db84..bf98862 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -449,7 +449,7 @@ void SdImportTest::testFdo72998()
{
SdrObjCustomShape *pObj = dynamic_castSdrObjCustomShape
*(pPage-GetObj(2));
CPPUNIT_ASSERT( pObj );
-const SdrCustomShapeGeometryItem rGeometryItem = (const
SdrCustomShapeGeometryItem)pObj-GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY );
+const SdrCustomShapeGeometryItem rGeometryItem = static_castconst
SdrCustomShapeGeometryItem(pObj-GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY
));
const ::com::sun::star::uno::Any* pViewBox =
((SdrCustomShapeGeometryItem)rGeometryItem).GetPropertyValueByName( OUString(
ViewBox ) );
CPPUNIT_ASSERT_MESSAGE( Missing ViewBox, pViewBox );
com::sun::star::awt::Rectangle aViewBox;
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 8861fed..4bf6e91 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -1272,7 +1272,7 @@ void PPTWriter::ImplWriteOLE( )
SdrObject* pSdrObj = GetSdrObjectFromXShape( pPtr-xShape );
if ( pSdrObj pSdrObj-ISA( SdrOle2Obj ) )
{
-::uno::Reference embed::XEmbeddedObject xObj( (
(SdrOle2Obj*) pSdrObj )-GetObjRef() );
+::uno::Reference embed::XEmbeddedObject xObj(
static_castSdrOle2Obj*(pSdrObj)-GetObjRef() );
if( xObj.is() )
{
SvStorageRef xTempStorage( new SvStorage( new
SvMemoryStream(), true ) );
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx
b/sd/source/filter/eppt/pptx-epptbase.cxx
index 1e17c09..2ec0569 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -540,7 +540,7 @@ bool PPTWriterBase::GetStyleSheets()
? (sal_uInt16)( *(sal_Int32*)mAny.getValue() / 4.40972 )
: 1250;
-
[Libreoffice-commits] core.git: vcl/Library_vclplug_kde4.mk vcl/Library_vclplug_kde.mk
vcl/Library_vclplug_kde.mk |1 + vcl/Library_vclplug_kde4.mk |1 + 2 files changed, 2 insertions(+) New commits: commit 2842972232083c848016762b72470cafc8e85fa7 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Thu Nov 13 10:07:29 2014 +0100 fix missing dependency to glew diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index ef14fd6..4071422 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_externals,vclplug_kde,\ boost_headers \ icuuc \ kde \ + glew \ )) $(eval $(call gb_Library_add_libs,vclplug_kde,\ diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index 18ffa02..645d6c9 100644 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -54,6 +54,7 @@ $(eval $(call gb_Library_use_externals,vclplug_kde4,\ boost_headers \ icuuc \ kde4 \ + glew \ )) $(eval $(call gb_Library_add_libs,vclplug_kde4,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - vcl/qa vcl/source
vcl/qa/cppunit/graphicfilter/data/bmp/pass/afl-sample-bad-rle-1.bmp|binary
vcl/qa/cppunit/graphicfilter/data/gif/pass/afl-sample-short-read-1.gif |binary
vcl/qa/cppunit/graphicfilter/data/gif/pass/afl-sample-short-read-2.gif |binary
vcl/qa/cppunit/graphicfilter/data/png/pass/afl-sample-IDAT.png |binary
vcl/source/filter/igif/gifread.cxx | 53
+-
vcl/source/gdi/dibtools.cxx| 43
+++-
vcl/source/gdi/pngread.cxx |6 -
7 files changed, 73 insertions(+), 29 deletions(-)
New commits:
commit a129959cf3b6821cb1b13e6bb28ed410a0e3223a
Author: Caolán McNamara caol...@redhat.com
Date: Tue Nov 11 17:48:26 2014 +
valgrind+afl: various problems
valgrind+afl: check p1 at start of loop
(cherry picked from commit e76098b22e5d3f5bb422dfcca34b4d61fe2bd593)
valgrind+afl: initialize cSize
(cherry picked from commit 9313095ea2d5f3dcc531d658e159e16ac2cb44fd)
valgrind+afl: short read
(cherry picked from commit 9d7979b1319ed7360cec8765a1b387dc1e086148)
valgrind+afl: initialize nFlags
(cherry picked from commit f23a51c9f978a3a8796a63ebcc03f7fcad52c6dc)
valgrind+afl: short read
(cherry picked from commit a967c85b13819e2c81082edec0f217259dca7ca8)
valgrind+afl: short read
(cherry picked from commit 1e9a50075bd39e1387f43605eeaa0132af1bd2c0)
valgrind+afl: bad rle
(cherry picked from commit a9aee04ecfbc4494b752b10e2a2348a0ccb991f1)
Change-Id: I0a9e5fc88ed1fcc7f1bd21218cabeb0adf65c9f4
Reviewed-on: https://gerrit.libreoffice.org/12383
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git
a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/afl-sample-bad-rle-1.bmp
b/vcl/qa/cppunit/graphicfilter/data/bmp/pass/afl-sample-bad-rle-1.bmp
new file mode 100644
index 000..1ca6e00
Binary files /dev/null and
b/vcl/qa/cppunit/graphicfilter/data/bmp/pass/afl-sample-bad-rle-1.bmp differ
diff --git
a/vcl/qa/cppunit/graphicfilter/data/gif/pass/afl-sample-short-read-1.gif
b/vcl/qa/cppunit/graphicfilter/data/gif/pass/afl-sample-short-read-1.gif
new file mode 100644
index 000..7cb2a03
Binary files /dev/null and
b/vcl/qa/cppunit/graphicfilter/data/gif/pass/afl-sample-short-read-1.gif differ
diff --git
a/vcl/qa/cppunit/graphicfilter/data/gif/pass/afl-sample-short-read-2.gif
b/vcl/qa/cppunit/graphicfilter/data/gif/pass/afl-sample-short-read-2.gif
new file mode 100644
index 000..cddbdc3
Binary files /dev/null and
b/vcl/qa/cppunit/graphicfilter/data/gif/pass/afl-sample-short-read-2.gif differ
diff --git a/vcl/qa/cppunit/graphicfilter/data/png/pass/afl-sample-IDAT.png
b/vcl/qa/cppunit/graphicfilter/data/png/pass/afl-sample-IDAT.png
new file mode 100644
index 000..b116a92
Binary files /dev/null and
b/vcl/qa/cppunit/graphicfilter/data/png/pass/afl-sample-IDAT.png differ
diff --git a/vcl/source/filter/igif/gifread.cxx
b/vcl/source/filter/igif/gifread.cxx
index a3633cd..a0a2be2 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -184,17 +184,20 @@ bool GIFReader::ReadGlobalHeader()
void GIFReader::ReadPaletteEntries( BitmapPalette* pPal, sal_uLong nCount )
{
-const sal_uLong nLen = 3UL * nCount;
+sal_uLong nLen = 3UL * nCount;
+const sal_uInt64 nMaxPossible = rIStm.remainingSize();
+if (nLen nMaxPossible)
+nLen = nMaxPossible;
boost::scoped_arraysal_uInt8 pBuf(new sal_uInt8[ nLen ]);
-
-rIStm.Read( pBuf.get(), nLen );
+sal_Size nRead = rIStm.Read(pBuf.get(), nLen);
+nCount = nRead/3UL;
if( NO_PENDING( rIStm ) )
{
sal_uInt8* pTmp = pBuf.get();
-for( sal_uLong i = 0UL; i nCount; )
+for (sal_uLong i = 0UL; i nCount; ++i)
{
-BitmapColor rColor = (*pPal)[ (sal_uInt16) i++ ];
+BitmapColor rColor = (*pPal)[i];
rColor.SetRed( *pTmp++ );
rColor.SetGreen( *pTmp++ );
@@ -214,16 +217,15 @@ void GIFReader::ReadPaletteEntries( BitmapPalette* pPal,
sal_uLong nCount )
bool GIFReader::ReadExtension()
{
-sal_uInt8 cFunction;
-sal_uInt8 cSize;
-sal_uInt8 cByte;
boolbRet = false;
boolbOverreadDataBlocks = false;
// Extension-Label
+sal_uInt8 cFunction(0);
rIStm.ReadUChar( cFunction );
if( NO_PENDING( rIStm ) )
{
+sal_uInt8 cSize(0);
// Block length
rIStm.ReadUChar( cSize );
@@ -232,12 +234,12 @@ bool GIFReader::ReadExtension()
// 'Graphic Control Extension'
case( 0xf9 ) :
{
-sal_uInt8 cFlags;
-
-rIStm.ReadUChar( cFlags );
-rIStm.ReadUInt16( nTimer );
-rIStm.ReadUChar( nGCTransparentIndex );
-rIStm.ReadUChar( cByte );
+sal_uInt8 cFlags(0);
+
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - vcl/source
vcl/source/filter/graphicfilter.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 89d74f0735d943b58393c309d0f080499d6ecdd9
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 12 11:53:25 2014 +
valgrind: logic for last-ditch svg detection is busted
bIsGZip was never set, and the condition that uses it is additionally
inverted
Change-Id: I0496bb27435c4323d74c1b99467d3ede68e7bee6
(cherry picked from commit 631378fe110ec7c4161a6c36011640522b881c27)
Reviewed-on: https://gerrit.libreoffice.org/12382
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/vcl/source/filter/graphicfilter.cxx
b/vcl/source/filter/graphicfilter.cxx
index 2274e83..6a8dc5b 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -662,6 +662,8 @@ static bool ImpPeekGraphicFormat( SvStream rStream,
OUString rFormatExtension,
nCheckSize = nDecompressedSize 256 ? nDecompressedSize : 256;
aCodec.EndCompression();
pCheckArray = sExtendedOrDecompressedFirstBytes;
+
+bIsGZip = true;
}
bool bIsSvg(false);
@@ -696,7 +698,7 @@ static bool ImpPeekGraphicFormat( SvStream rStream,
OUString rFormatExtension,
pCheckArray = sExtendedOrDecompressedFirstBytes;
-if(!bIsGZip)
+if (bIsGZip)
{
nCheckSize = nDecompressedSize 2048 ? nDecompressedSize :
2048;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/access/accmap.cxx | 54 ++-
1 file changed, 36 insertions(+), 18 deletions(-)
New commits:
commit a81af704a4e930d1f8f9b307fa8508118f90ea98
Author: Juan Picca jumap...@gmail.com
Date: Wed Nov 12 10:44:40 2014 -0200
fdo#75757: remove inheritance to std::map
Change-Id: Ie42dd57c1d75987ed462aac152426665bf416178
Reviewed-on: https://gerrit.libreoffice.org/12385
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 22c55e3..c407114 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -197,13 +197,23 @@ struct SwShapeFunc
return p1 p2;
}
};
-typedef ::std::map const SdrObject *, uno::WeakReference XAccessible ,
SwShapeFunc _SwAccessibleShapeMap_Impl;
typedef ::std::pair const SdrObject *, ::rtl::Reference
::accessibility::AccessibleShape SwAccessibleObjShape_Impl;
-class SwAccessibleShapeMap_Impl: public _SwAccessibleShapeMap_Impl
-
+class SwAccessibleShapeMap_Impl
{
-::accessibility::AccessibleShapeTreeInfo maInfo;
+public:
+
+typedef const SdrObject *
key_type;
+typedef uno::WeakReferenceXAccessible
mapped_type;
+typedef std::pairconst key_type,mapped_type
value_type;
+typedef SwShapeFunc
key_compare;
+typedef std::mapkey_type,mapped_type,key_compare::iterator
iterator;
+typedef std::mapkey_type,mapped_type,key_compare::const_iterator
const_iterator;
+
+private:
+
+::accessibility::AccessibleShapeTreeInfomaInfo;
+std::mapkey_type,mapped_type,SwShapeFunc maMap;
public:
@@ -211,8 +221,9 @@ public:
bool mbLocked;
#endif
SwAccessibleShapeMap_Impl( SwAccessibleMap *pMap )
+: maMap()
#if OSL_DEBUG_LEVEL 0
-: mbLocked( false )
+, mbLocked( false )
#endif
{
maInfo.SetSdrView( pMap-GetShell()-GetDrawView() );
@@ -231,6 +242,15 @@ public:
SwAccessibleObjShape_Impl *Copy( size_t rSize,
const SwFEShell *pFESh = 0,
SwAccessibleObjShape_Impl **pSelShape = 0 ) const;
+
+iterator begin() { return maMap.begin(); }
+iterator end() { return maMap.end(); }
+const_iterator cbegin() { return maMap.cbegin(); }
+const_iterator cend() { return maMap.cend(); }
+bool empty() const { return maMap.empty(); }
+iterator find(const key_type key) { return maMap.find(key); }
+std::pairiterator,bool insert(const value_type value ) { return
maMap.insert(value); }
+iterator erase(const_iterator pos) { return maMap.erase(pos); }
};
SwAccessibleShapeMap_Impl::~SwAccessibleShapeMap_Impl()
@@ -249,15 +269,15 @@ SwAccessibleObjShape_Impl
SwAccessibleObjShape_Impl *pSelShape = 0;
sal_uInt16 nSelShapes = pFESh ? pFESh-IsObjSelected() : 0;
-rSize = size();
+rSize = maMap.size();
if( rSize 0 )
{
pShapes =
new SwAccessibleObjShape_Impl[rSize];
-const_iterator aIter = begin();
-const_iterator aEndIter = end();
+const_iterator aIter = maMap.cbegin();
+const_iterator aEndIter = maMap.cend();
SwAccessibleObjShape_Impl *pShape = pShapes;
pSelShape = (pShapes[rSize]);
@@ -1087,8 +1107,8 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
if( mpShapeMap )
{
//Checked for shapes.
-_SwAccessibleShapeMap_Impl::const_iterator aIter = mpShapeMap-begin();
-_SwAccessibleShapeMap_Impl::const_iterator aEndIter =
mpShapeMap-end();
+SwAccessibleShapeMap_Impl::const_iterator aIter = mpShapeMap-cbegin();
+SwAccessibleShapeMap_Impl::const_iterator aEndIter =
mpShapeMap-cend();
::rtl::Reference SwAccessibleContext xParentAccImpl;
if( bIsSelAll)
@@ -1972,8 +1992,7 @@ uno::Reference XAccessible SwAccessibleMap::GetContext(
mpShapeMap = new SwAccessibleShapeMap_Impl( this );
if( mpShapeMap )
{
-SwAccessibleShapeMap_Impl::iterator aIter =
- mpShapeMap-find( pObj );
+SwAccessibleShapeMap_Impl::iterator aIter = mpShapeMap-find( pObj
);
if( aIter != mpShapeMap-end() )
xAcc = (*aIter).second;
@@ -3162,8 +3181,8 @@ bool SwAccessibleMap::ReplaceChild (
osl::MutexGuard aGuard( maMutex );
if( mpShapeMap )
{
-SwAccessibleShapeMap_Impl::const_iterator aIter =
mpShapeMap-begin();
-SwAccessibleShapeMap_Impl::const_iterator aEndIter =
mpShapeMap-end();
+SwAccessibleShapeMap_Impl::const_iterator aIter =
mpShapeMap-cbegin();
+SwAccessibleShapeMap_Impl::const_iterator aEndIter =
mpShapeMap-cend();
while( aIter != aEndIter !pObj )
{
[Bug 75757] remove inheritance to std::map and std::vector
https://bugs.freedesktop.org/show_bug.cgi?id=75757 --- Comment #44 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Juan Picca committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=a81af704a4e930d1f8f9b307fa8508118f90ea98 fdo#75757: remove inheritance to std::map It will be available in 4.4.0. 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: 3 commits - sc/source sd/qa writerperfect/qa
sc/source/filter/xml/xmlcelli.cxx | 18 ++--
sd/qa/unit/data/pptx/fail/CVE-2014-6352-1.ppsx |1
writerperfect/qa/unit/data/draw/libcdr/fail/EDB-35217-1.cdr |binary
writerperfect/qa/unit/data/draw/libcdr/pass/EDB-35217-2.cdr |binary
4 files changed, 11 insertions(+), 8 deletions(-)
New commits:
commit 3150ae30415c1253258829dd3d39c015e75c6171
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 13 10:22:08 2014 +
valgrind: check return of convertDateTime before using fDate
lots of spew in VALGRIND=memcheck make CppunitTest_writerperfect_calc
Change-Id: I8b95e95218beefe19e881c9d055323d0abec49c7
diff --git a/sc/source/filter/xml/xmlcelli.cxx
b/sc/source/filter/xml/xmlcelli.cxx
index 7c2c190..68fb1fe 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -935,14 +935,16 @@ void ScXMLTableRowCellContext::SetAnnotation(const
ScAddress rPos)
if( pNote )
{
double fDate;
-rXMLImport.GetMM100UnitConverter().convertDateTime( fDate,
mxAnnotationData-maCreateDate );
-SvNumberFormatter* pNumForm = pDoc-GetFormatTable();
-sal_uInt32 nfIndex = pNumForm-GetFormatIndex( NF_DATE_SYS_DDMM,
LANGUAGE_SYSTEM );
-OUString aDate;
-Color* pColor = 0;
-Color** ppColor = pColor;
-pNumForm-GetOutputString( fDate, nfIndex, aDate, ppColor );
-pNote-SetDate( aDate );
+if (rXMLImport.GetMM100UnitConverter().convertDateTime(fDate,
mxAnnotationData-maCreateDate))
+{
+SvNumberFormatter* pNumForm = pDoc-GetFormatTable();
+sal_uInt32 nfIndex = pNumForm-GetFormatIndex(
NF_DATE_SYS_DDMM, LANGUAGE_SYSTEM );
+OUString aDate;
+Color* pColor = 0;
+Color** ppColor = pColor;
+pNumForm-GetOutputString( fDate, nfIndex, aDate, ppColor );
+pNote-SetDate( aDate );
+}
pNote-SetAuthor( mxAnnotationData-maAuthor );
}
commit 78bc1be4a7f8b507eaddc6defe1cc3505edf2238
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 13 09:35:34 2014 +
add CVE-2014-6352 testcase
Change-Id: I4f1ad13f73737a2c88d5b911f9df858a3427eac2
diff --git a/sd/qa/unit/data/pptx/fail/CVE-2014-6352-1.ppsx
b/sd/qa/unit/data/pptx/fail/CVE-2014-6352-1.ppsx
new file mode 100644
index 000..f88506ff
--- /dev/null
+++ b/sd/qa/unit/data/pptx/fail/CVE-2014-6352-1.ppsx
@@ -0,0 +1 @@
+ ת.Gx© }Ø'[eë2Î~
\ No newline at end of file
commit 58d5cbd978fdd7dd29e61e1aa99f8141581a6599
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 13 09:20:56 2014 +
add EDB-35217 tests
Change-Id: Id37702123bd81a7102d101d3348dcf923c20a5d8
diff --git a/writerperfect/qa/unit/data/draw/libcdr/fail/EDB-35217-1.cdr
b/writerperfect/qa/unit/data/draw/libcdr/fail/EDB-35217-1.cdr
new file mode 100644
index 000..3745033
Binary files /dev/null and
b/writerperfect/qa/unit/data/draw/libcdr/fail/EDB-35217-1.cdr differ
diff --git a/writerperfect/qa/unit/data/draw/libcdr/pass/EDB-35217-2.cdr
b/writerperfect/qa/unit/data/draw/libcdr/pass/EDB-35217-2.cdr
new file mode 100644
index 000..7a15b4b
Binary files /dev/null and
b/writerperfect/qa/unit/data/draw/libcdr/pass/EDB-35217-2.cdr differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/CppunitTest_connectivity_commontools.mk
connectivity/CppunitTest_connectivity_commontools.mk | 10 ++ 1 file changed, 10 insertions(+) New commits: commit 3adad743e7702a5403927c89d2d19534509c7085 Author: Noel Grandin n...@peralex.com Date: Wed Nov 12 16:31:09 2014 +0200 fix connectivity unit test for --enable-mergedlibs it's a workaround, but given the conflicting requirements of MSVC not liking duplicate symbols, but the unit test needing to link the objects directly to access internal symbols, there is not much else we can do. Change-Id: I9bdcc5f2b6ab0712cc3317033c4fbae4791cbb6b Reviewed-on: https://gerrit.libreoffice.org/12387 Reviewed-by: Noel Grandin noelgran...@gmail.com Tested-by: Noel Grandin noelgran...@gmail.com diff --git a/connectivity/CppunitTest_connectivity_commontools.mk b/connectivity/CppunitTest_connectivity_commontools.mk index e1c899e..e9d6e98 100644 --- a/connectivity/CppunitTest_connectivity_commontools.mk +++ b/connectivity/CppunitTest_connectivity_commontools.mk @@ -35,6 +35,16 @@ $(eval $(call gb_CppunitTest_add_defs,connectivity_commontools,\ )) endif +# In mergedlibs mode we have multiply-defined symbols, which Visual Studio +# does not like. There is no good solution, so just force it. +ifeq ($(COM),MSC) +ifeq ($(MERGELIBS),CORE) +$(eval $(call gb_CppunitTest_add_ldflags,connectivity_commontools,\ +/FORCE:MULTIPLE \ +)) +endif +endif + $(eval $(call gb_CppunitTest_add_exception_objects,connectivity_commontools, \ connectivity/qa/connectivity/commontools/FValue_test \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Google shuts down the OpenID 2.0 on April 20, 2015
On Tue, Nov 11, 2014 at 2:29 PM, Norbert Thiebaud nthieb...@gmail.com wrote: I think that the most promising alternative would be to set up OpenID service on TDF infrastructure. between fedora, I poked around, but couldn't find any publicly-accessible OpenID service provided by Fedora the OS (I didn't poke at Fedora Commons). launchpad, yahoo, fb, blogger, wordpress, etc... there are already plenty. Lots of people don't trust any of those services. I'm hesitant to require contributors to enter into a trust agreement with a 3rd party such as Canonical or Google as a requirement to contribute to LibreOffice development. If it's at all technically possible, I think our developers should have a choice. In fact it would prolly be best to recommend that people register in their gerrit account more than one openid to protect themselves again single-point-of-failure. True (I'd regard that as an engineering flaw in the design of OpenID :-) Feature #308 (New): single sign-on for bugzilla and redmine https://redmine.documentfoundation.org/issues/308 that is not an infra-related bug.. that is a Bugzilla 'bug'. Insofar as we want to make it easier for people to use our bug tracker (and other project resources), I see it as something of concern to both our QA and Infra teams. there are a couple of seemingly abandoned attempt Yep. I'd like to avoid having Persona for Bugzilla + MozTrap and then a separate OpenID for Gerrit, Ask, Redmine, TDF Wiki, etc.., but perhaps 2 sets of logins are preferable to 8. Best, --R -- Robinson Tryon QA Engineer - The Document Foundation LibreOffice Community Outreach Herald qu...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [dtar...@redhat.com: Re: windows and mergedlibs - help with debugging makefile]
Hi David Thanks for your reply. On 2014-11-11 03:39 PM, David Tardon wrote: But I really do not know how to solve this generically. If a test uses Perhaps we don't need to? The Microsoft linker has an option /FORCE:MULTIPLE, which will basically ignore this error. http://msdn.microsoft.com/en-us/library/70abkas3.aspx I figured out how to add this option globally, so I know it fixes this problem. But I would prefer to add it locally, and only in --enabled-merged-libs mode. Is there a way I can do this in the connectivity/CppunitTest_connectivity_commontools.mk file? Thanks, Noel Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: UOF v2.0, the PRC national XML standard for Chinese Office documents--what to do with it in LibreOffice?
Stuart, all, Le 12.11.2014 15:25, V Stuart Foote a écrit : jonathon-4 wrote What happened to the Chinese language team? zh.libreoffice.org is in English, even though that is not on the There is a pretty vibrant Chinese user community here: http://www.libreofficechina.org/forum.php And the truth is, it is not that difficult to gist most document and posting content using Google Translate MT services as coming from ZhongZi to English is usually very high quality--exactly what is needed to identify the mixed code (UTF-8, or GB encoding) that UOF seems to use. PinYin to English presents challenges, and like most westerners I am illiterate with ZhongZi in that my Chinese skills are limited to PinYin. But as I'd mentioned, I've not been able to locate a specification for the UOF v2.0 standard to start to review. UOF has always looked like an oddball to me. A good idea, but an oddball. You will not find UOF specs as such anywhere. But you will find the mark-up language spec leading to the format specification at the OASIS, provided there is no other repository that is more active than this one in China: https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=uoml-x It is called UOML-X. As you can see, this is the continuation of an older TC called UOML TC, that was not very active either. The whole point of UOML (and UOF) is to wrap entire document files (OOXML, ODF, PDF...) into a new format with a mark-up language describing the various possible operations on these documents. My point however, is not to criticize the quality of the standard itself - I just think it either fully works as it claims it does or it has completely failed a long time ago. Now, the UOF standard does exist as such and has enjoyed Chinese's governmental support. I'm not so sure whether it has any actual traction inside China and I have never even seen an UOF file, ever. I note it was started sometime in 2007, and had a few revisions until 2009. After that, nothing. The best solution was already suggested earlier: do you think you could check with Ubuntu Kylin about this? Is UOF popular? Is it even used? If it is, the next step is to attract chinese contributors, possibly under the www.documentliberation.org umbrella. But until there is such an interest, it is unlikely that TDF and the devs here will pay much attention. Hope this helps, Charles. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/bitmap4.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d7b8a41282800e9e7d2b44deae372dd23435e444
Author: Michael Stahl mst...@redhat.com
Date: Thu Nov 13 13:23:55 2014 +0100
spurious warning C4701: potentially uninitialized local variable
Change-Id: Ie1353d0251fab6f12b34fbd5d2d25d8b6e3e3c6b
diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx
index 9236308..ced810a 100644
--- a/vcl/source/gdi/bitmap4.cxx
+++ b/vcl/source/gdi/bitmap4.cxx
@@ -788,8 +788,8 @@ bool Bitmap::ImplMosaic( const BmpFilterParam*
pFilterParam, const Link* /*pProg
}
bool bConditionsMet = false;
-long nWidth;
-long nHeight;
+long nWidth(0);
+long nHeight(0);
if (pReadAcc pWriteAcc)
{
nWidth = pReadAcc-Width();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/priorities' - avmedia/source basctl/source framework/inc framework/source sc/source
avmedia/source/framework/soundhandler.cxx| 10 +-
avmedia/source/framework/soundhandler.hxx|2 +-
basctl/source/basicide/baside2.hxx |2 +-
basctl/source/basicide/baside2b.cxx | 14 +++---
framework/inc/services/layoutmanager.hxx |2 +-
framework/inc/uielement/toolbarmanager.hxx |2 +-
framework/source/layoutmanager/layoutmanager.cxx | 22 +++---
framework/source/uielement/toolbarmanager.cxx| 18 +-
sc/source/ui/formdlg/dwfunctr.cxx|6 +++---
sc/source/ui/inc/anyrefdg.hxx|2 +-
sc/source/ui/inc/dwfunctr.hxx|2 +-
sc/source/ui/miscdlgs/anyrefdg.cxx |6 +++---
12 files changed, 44 insertions(+), 44 deletions(-)
New commits:
commit ccbd142b37ca0184528e4a63515b9a7a878eb0e2
Author: Jennifer Liebel jliebe...@gmail.com
Date: Thu Nov 13 13:10:55 2014 +
changed timers to idle
Change-Id: I05ccb8bd73070462edcc911956859aa7967b5901
diff --git a/avmedia/source/framework/soundhandler.cxx
b/avmedia/source/framework/soundhandler.cxx
index d80d29b..6801d4c 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -188,7 +188,7 @@ SoundHandler::SoundHandler( const css::uno::Reference
css::lang::XMultiServiceF
, m_bError( false)
, m_xFactory ( xFactory )
{
-m_aUpdateTimer.SetTimeoutHdl(LINK(this, SoundHandler,
implts_PlayerNotify));
+m_aUpdateIdle.SetIdleHdl(LINK(this, SoundHandler, implts_PlayerNotify));
}
/*-
@@ -245,7 +245,7 @@ void SAL_CALL SoundHandler::dispatchWithNotification(const
css::util::URL
// If player currently used for other dispatch() requests ...
// cancel it by calling stop()!
-m_aUpdateTimer.Stop();
+m_aUpdateIdle.Stop();
if (m_xPlayer.is())
{
if (m_xPlayer-isPlaying())
@@ -263,8 +263,8 @@ void SAL_CALL SoundHandler::dispatchWithNotification(const
css::util::URL
// Count this request and initialize self-holder against dieing by uno
ref count ...
m_xSelfHold = css::uno::Reference css::uno::XInterface (static_cast
::cppu::OWeakObject* (this), css::uno::UNO_QUERY);
m_xPlayer-start();
-m_aUpdateTimer.SetTimeout( 200 );
-m_aUpdateTimer.Start();
+m_aUpdateIdle.SetPriority( VCL_IDLE_PRIORITY_LOWER );
+m_aUpdateIdle.Start();
}
catch( css::uno::Exception e )
{
@@ -347,7 +347,7 @@ IMPL_LINK_NOARG(SoundHandler, implts_PlayerNotify)
if (m_xPlayer.is() m_xPlayer-isPlaying() m_xPlayer-getMediaTime()
m_xPlayer-getDuration())
{
-m_aUpdateTimer.Start();
+m_aUpdateIdle.Start();
return 0L;
}
m_xPlayer.clear();
diff --git a/avmedia/source/framework/soundhandler.hxx
b/avmedia/source/framework/soundhandler.hxx
index d41c033..642dbba 100644
--- a/avmedia/source/framework/soundhandler.hxx
+++ b/avmedia/source/framework/soundhandler.hxx
@@ -130,7 +130,7 @@ class SoundHandler : // interfaces
css::uno::Reference css::media::XPlayer m_xPlayer
; // uses avmedia player to play sounds...
css::uno::Reference css::frame::XDispatchResultListener m_xListener
;
-Timer m_aUpdateTimer;
+Idle m_aUpdateIdle;
}; // class SoundHandler
diff --git a/basctl/source/basicide/baside2.hxx
b/basctl/source/basicide/baside2.hxx
index df3aae8..4e18db6 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -93,7 +93,7 @@ private:
longnCurTextWidth;
SyntaxHighlighter aHighlighter;
-Timer aSyntaxIdleTimer;
+IdleaSyntaxIdle;
typedef std::setsal_uInt16 SyntaxLineSet;
SyntaxLineSet aSyntaxLineTable;
DECL_LINK(SyntaxTimerHdl, void *);
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index f8fb47f..61a7e6b 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -271,7 +271,7 @@ EditorWindow::~EditorWindow()
n-removePropertiesChangeListener(listener_.get());
}
-aSyntaxIdleTimer.Stop();
+aSyntaxIdle.Stop();
if ( pEditEngine )
{
@@ -962,8 +962,8 @@ void EditorWindow::CreateEditEngine()
ImplSetFont();
-aSyntaxIdleTimer.SetTimeout( 200 );
-aSyntaxIdleTimer.SetTimeoutHdl( LINK( this, EditorWindow, SyntaxTimerHdl )
);
+aSyntaxIdle.SetPriority( VCL_IDLE_PRIORITY_LOWER );
+aSyntaxIdle.SetIdleHdl( LINK( this, EditorWindow, SyntaxTimerHdl ) );
bool bWasDoSyntaxHighlight = bDoSyntaxHighlight;
bDoSyntaxHighlight = false; // too slow for large texts...
@@ -998,7 +998,7 @@ void EditorWindow::CreateEditEngine()
[Libreoffice-commits] core.git: officecfg/registry sc/inc sc/source sc/uiconfig
officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 12 +++--- sc/inc/calcconfig.hxx|2 - sc/source/core/tool/calcconfig.cxx | 11 +++-- sc/source/core/tool/formulaopt.cxx | 28 +++ sc/source/ui/optdlg/calcoptionsdlg.cxx | 14 +++ sc/uiconfig/scalc/ui/formulacalculationoptions.ui| 16 6 files changed, 42 insertions(+), 41 deletions(-) New commits: commit 8003afa1f35821e6f8ca8b917b9d446219b6a1ae Author: Tor Lillqvist t...@collabora.com Date: Thu Nov 13 15:24:40 2014 +0200 Blacklist has precedence over whitelist, so order them like that Change-Id: I0cf00abd582a4be4d385a6ef4f199c7aa0bc diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index 42b28bc..8a74759 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -1389,19 +1389,19 @@ /info value/ /prop -prop oor:name=OpenCLWhiteList oor:type=oor:string-list oor:nillable=false +prop oor:name=OpenCLBlackList oor:type=oor:string-list oor:nillable=false !-- UIHints: Tools - Options Spreadsheet Formula -- info -descCombinations of (OS, OS version, OpenCL platform vendor, OpenCL device name, OpenCL driver version) that are known to be good. Has higher priority than OpenCLBlackList. Each entry is a string consisting of five parts separated by slashes. In case a slash occurs inside a part, it is prefixed by a backslash. And in case a backslash occurs inside a part, it is also prefixed by another backslash. Any part might contain a single asterisk as a wildcard, matching any value, but there is no more generic regexp support./desc +descCombinations of (OS, OS version, OpenCL platform vendor, OpenCL device name, OpenCL driver version) that are known to be bad. Each entry is a string consisting of six parts separated by slashes. In case a slash, percent or semicolon occurs inside a part, it is replaced by a percent followed by the corresponding number as two hex digits. Any part might contain a single asterisk as a wildcard, matching any value, but there is no more generic regexp support. Has higher priority than OpenCLWhiteList./desc /info - value oor:separator=;Linux/*/Advanced Micro Devices, Inc./*/1445.5 (sse2,avx)//value + value oor:separator=;Windows/*/Intel(R) Corporation/*/9.17.10.2884/;SuperOS/*/Big Corp, Inc./Whizz\Grafix/4.2%2Fbeta%3B3/4.4/value /prop -prop oor:name=OpenCLBlackList oor:type=oor:string-list oor:nillable=false +prop oor:name=OpenCLWhiteList oor:type=oor:string-list oor:nillable=false !-- UIHints: Tools - Options Spreadsheet Formula -- info -descLike OpenCLWhiteList, but for combinations known to be bad./desc +descLike OpenCLWhiteList, but for combinations known to be good./desc /info - value oor:separator=;Windows/*/Intel(R) Corporation/*/9.17.10.2884/;SuperOS/*/Big Corp, Inc./Whizz\Grafix/4.2%2Fbeta%3B3/4.4/value + value oor:separator=;Linux/*/Advanced Micro Devices, Inc./*/1445.5 (sse2,avx)//value /prop /group group oor:name=Syntax diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx index d46fa84..40a33b6 100644 --- a/sc/inc/calcconfig.hxx +++ b/sc/inc/calcconfig.hxx @@ -114,8 +114,8 @@ struct SC_DLLPUBLIC ScCalcConfig typedef std::setOpenCLImplMatcher OpenCLImplMatcherSet; -OpenCLImplMatcherSet maOpenCLWhiteList; OpenCLImplMatcherSet maOpenCLBlackList; +OpenCLImplMatcherSet maOpenCLWhiteList; ScCalcConfig(); diff --git a/sc/source/core/tool/calcconfig.cxx b/sc/source/core/tool/calcconfig.cxx index 0d9b769..8825ac3 100644 --- a/sc/source/core/tool/calcconfig.cxx +++ b/sc/source/core/tool/calcconfig.cxx @@ -45,10 +45,10 @@ void ScCalcConfig::setOpenCLConfigToDefault() maOpenCLSubsetOpCodes.insert(ocAverage); maOpenCLSubsetOpCodes.insert(ocSumIfs); -maOpenCLWhiteList.insert(OpenCLImplMatcher(Linux, *, Advanced Micro Devices, Inc., *, 1445.5 (sse2,avx), )); - maOpenCLBlackList.insert(OpenCLImplMatcher(Windows, *, Intel(R) Corporation, *, 9.17.10.2884, )); maOpenCLBlackList.insert(OpenCLImplMatcher(SuperOS, *, Big Corp, Inc., Whizz\\Grafix, 4.2/beta;3, 4.4)); + +maOpenCLWhiteList.insert(OpenCLImplMatcher(Linux, *, Advanced Micro Devices, Inc., *, 1445.5 (sse2,avx), )); } void ScCalcConfig::reset() @@ -76,8 +76,9 @@ bool ScCalcConfig::operator== (const ScCalcConfig r) const maOpenCLDevice == r.maOpenCLDevice mnOpenCLMinimumFormulaGroupSize == r.mnOpenCLMinimumFormulaGroupSize maOpenCLSubsetOpCodes == r.maOpenCLSubsetOpCodes +
[Libreoffice-commits] core.git: svx/source
svx/source/table/svdotable.cxx | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 98cd2671f0a215ced6203372ac673e2380031ac0
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 13 13:32:35 2014 +
table layout cache returns wrong rectangle
the layouter can modify its input rectangle to grow
it to the necessary size to contain the layout
but we're returning the input rectangle when the inputs are the same as the
last call, not returning the output rectangle.
cache the output rect for a given input and return that
so now insert-table in impress and tab so extra cells are added and
then select the table and the blue border contains the whole
table, not just the first two rows
Change-Id: I4f09594d82c1597204afbd059e175af9bf8e2527
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 71d6f3e..c775c4b 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -241,7 +241,8 @@ public:
virtual bool isInUse() SAL_OVERRIDE;
private:
static SdrTableObjImpl* lastLayoutTable;
-static Rectangle lastLayoutRectangle;
+static Rectangle lastLayoutInputRectangle;
+static Rectangle lastLayoutResultRectangle;
static bool lastLayoutFitWidth;
static bool lastLayoutFitHeight;
static WritingMode lastLayoutMode;
@@ -250,7 +251,8 @@ private:
};
SdrTableObjImpl* SdrTableObjImpl::lastLayoutTable = NULL;
-Rectangle SdrTableObjImpl::lastLayoutRectangle;
+Rectangle SdrTableObjImpl::lastLayoutInputRectangle;
+Rectangle SdrTableObjImpl::lastLayoutResultRectangle;
bool SdrTableObjImpl::lastLayoutFitWidth;
bool SdrTableObjImpl::lastLayoutFitHeight;
WritingMode SdrTableObjImpl::lastLayoutMode;
@@ -693,14 +695,14 @@ void SdrTableObjImpl::LayoutTable( Rectangle rArea, bool
bFitWidth, bool bFitHe
// Optimization: SdrTableObj::SetChanged() can call this very often,
repeatedly
// with the same settings, noticeably increasing load time. Skip if
already done.
WritingMode writingMode = mpTableObj-GetWritingMode();
-if( lastLayoutTable != this || lastLayoutRectangle != rArea
+if( lastLayoutTable != this || lastLayoutInputRectangle != rArea
|| lastLayoutFitWidth != bFitWidth || lastLayoutFitHeight !=
bFitHeight
|| lastLayoutMode != writingMode
|| lastRowCount != getRowCount()
|| lastColCount != getColumnCount() )
{
lastLayoutTable = this;
-lastLayoutRectangle = rArea;
+lastLayoutInputRectangle = rArea;
lastLayoutFitWidth = bFitWidth;
lastLayoutFitHeight = bFitHeight;
lastLayoutMode = writingMode;
@@ -708,6 +710,11 @@ void SdrTableObjImpl::LayoutTable( Rectangle rArea, bool
bFitWidth, bool bFitHe
lastColCount = getColumnCount();
TableModelNotifyGuard aGuard( mxTable.get() );
mpLayouter-LayoutTable( rArea, bFitWidth, bFitHeight );
+lastLayoutResultRectangle = rArea;
+}
+else
+{
+rArea = lastLayoutResultRectangle;
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/CppunitTest_sc_perfobj.mk sc/Module_sc.mk sc/qa
sc/CppunitTest_sc_perfobj.mk | 77 +
sc/Module_sc.mk|4
sc/qa/perf/scperfobj.cxx | 255 +
sc/qa/perf/testdocuments/scBigFile.ods |binary
4 files changed, 335 insertions(+), 1 deletion(-)
New commits:
commit 4ef9e07c6526ac2e36f9d10a81da264f0b205920
Author: Laurent Godard lgodard.li...@laposte.net
Date: Mon Nov 3 16:01:07 2014 +0100
calc performance test
- a plain perfcheck test example on big file
- searches
- named ranges
- sheets
- big file is approx.
- 100 sheets
- 60k values in a sheets
- 5k named ranges
- 2k formulas (calling named ranges)
Change-Id: I61970f3387d400ed6737a369ead6daf896afacdc
diff --git a/sc/CppunitTest_sc_perfobj.mk b/sc/CppunitTest_sc_perfobj.mk
new file mode 100644
index 000..decabe0
--- /dev/null
+++ b/sc/CppunitTest_sc_perfobj.mk
@@ -0,0 +1,77 @@
+# -*- 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,sc_perfobj))
+
+$(eval $(call gb_CppunitTest_use_external,sc_perfobj,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_perfobj, \
+sc/qa/perf/scperfobj \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_perfobj, \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+drawinglayer \
+editeng \
+for \
+forui \
+i18nlangtag \
+msfilter \
+oox \
+sal \
+salhelper \
+sax \
+sb \
+sc \
+sfx \
+sot \
+subsequenttest \
+svl \
+svt \
+svx \
+svxcore \
+test \
+tk \
+tl \
+ucbhelper \
+unotest \
+utl \
+vbahelper \
+vcl \
+xo \
+$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_perfobj,\
+-I$(SRCDIR)/sc/source/ui/inc \
+-I$(SRCDIR)/sc/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sc_perfobj,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_perfobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_perfobj))
+
+
+$(eval $(call gb_CppunitTest_use_rdb,sc_perfobj,services))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_perfobj))
+
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_perfobj))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 3f57318..9385dc5 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -85,7 +85,9 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
))
$(eval $(call gb_Module_add_perfcheck_targets,sc,\
- CppunitTest_sc_tablesheetobj \
+CppunitTest_sc_perfobj \
+CppunitTest_sc_tablesheetobj \
))
+
# vim: set noet sw=4 ts=4:
diff --git a/sc/qa/perf/scperfobj.cxx b/sc/qa/perf/scperfobj.cxx
new file mode 100644
index 000..b30a2c2
--- /dev/null
+++ b/sc/qa/perf/scperfobj.cxx
@@ -0,0 +1,255 @@
+/* -*- 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 test/calc_unoapi_test.hxx
+
+#include rtl/ustring.hxx
+#include cppunit/extensions/HelperMacros.h
+
+#include com/sun/star/util/XSearchable.hpp
+#include com/sun/star/util/XSearchDescriptor.hpp
+#include com/sun/star/container/XIndexAccess.hpp
+#include com/sun/star/sheet/XSpreadsheetDocument.hpp
+#include com/sun/star/sheet/XSpreadsheet.hpp
+#include com/sun/star/sheet/XSpreadsheets.hpp
+
+#include com/sun/star/beans/XPropertySet.hpp
+#include com/sun/star/table/XCellRange.hpp
+#include com/sun/star/sheet/XCellRangeAddressable.hpp
+#include com/sun/star/sheet/XCellRangeReferrer.hpp
+#include com/sun/star/sheet/XNamedRanges.hpp
+#include com/sun/star/sheet/XNamedRange.hpp
+#include com/sun/star/table/XCell.hpp
+#include com/sun/star/text/XTextRange.hpp
+#include com/sun/star/table/CellAddress.hpp
+#include com/sun/star/table/CellRangeAddress.hpp
+#include com/sun/star/sheet/Border.hpp
+#include com/sun/star/sheet/NamedRangeFlag.hpp
+
+#include test/callgrind.hxx
+
+using namespace css;
+using namespace css::uno;
+
+namespace sc_apitest {
+
+#define NUMBER_OF_TESTS 3
+
+class ScPerfObj : public CalcUnoApiTest
+{
+public:
+
+ScPerfObj();
+
+virtual void setUp() SAL_OVERRIDE;
+virtual void tearDown() SAL_OVERRIDE;
+
+uno::Reference uno::XInterface init();
+
+CPPUNIT_TEST_SUITE(ScPerfObj);
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - vcl/workben
vcl/workben/vcldemo.cxx | 68
1 file changed, 58 insertions(+), 10 deletions(-)
New commits:
commit cca52572c73a7e41960744b71241f8fa8804470f
Author: Michael Meeks michael.me...@collabora.com
Date: Thu Nov 13 13:48:24 2014 +
vcldemo: add OutputDevice / copyBits test case.
Change-Id: Ie585daba1d1a1f1dc9f2957c19462a501131d10a
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index fa38874..06a6d86 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -510,20 +510,67 @@ public:
struct DrawToVirtualDevice : public RegionRenderer
{
+enum RenderType {
+RENDER_AS_BITMAP,
+RENDER_AS_OUTDEV,
+RENDER_AS_BITMAPEX,
+RENDER_AS_ALPHA_OUTDEV
+};
+
+void SizeAndRender(OutputDevice rDev, Rectangle r, RenderType eType,
+ const RenderContext rCtx)
+{
+VirtualDevice *pNested;
+
+if ((int)eType RENDER_AS_BITMAPEX)
+pNested = new VirtualDevice(rDev);
+else
+pNested = new VirtualDevice(rDev,0,0);
+
+pNested-SetOutputSizePixel(r.GetSize());
+Rectangle aWhole(Point(0,0), r.GetSize());
+
+// mini me
+rCtx.mpDemoWin-drawToDevice(*pNested, true);
+
+if (eType == RENDER_AS_BITMAP)
+{
+Bitmap
aBitmap(pNested-GetBitmap(Point(0,0),aWhole.GetSize()));
+rDev.DrawBitmap(r.TopLeft(), aBitmap);
+}
+else if (eType == RENDER_AS_BITMAPEX)
+{
+BitmapEx
aBitmapEx(pNested-GetBitmapEx(Point(0,0),aWhole.GetSize()));
+rDev.DrawBitmapEx(r.TopLeft(), aBitmapEx);
+}
+else if (eType == RENDER_AS_OUTDEV ||
+ eType == RENDER_AS_ALPHA_OUTDEV)
+{
+rDev.DrawOutDev(r.TopLeft(), r.GetSize(),
+aWhole.TopLeft(), aWhole.GetSize(),
+*pNested);
+}
+delete pNested;
+}
virtual void RenderRegion(OutputDevice rDev, Rectangle r,
const RenderContext rCtx) SAL_OVERRIDE
{
// avoid infinite recursion
if (rCtx.mbVDev)
return;
-VirtualDevice aNested(rDev);
-aNested.SetOutputSizePixel(r.GetSize());
-Rectangle aWhole(Point(0,0), r.GetSize());
-// mini me
-rCtx.mpDemoWin-drawToDevice(aNested, true);
-Bitmap aBitmap(aNested.GetBitmap(Point(0,0),aWhole.GetSize()));
-rDev.DrawBitmap(r.TopLeft(), aBitmap);
+if (rCtx.meStyle == RENDER_EXPANDED)
+{
+std::vectorRectangle aRegions(DemoWin::partition(rDev, 2,
2));
+DemoWin::clearRects(rDev, aRegions);
+
+RenderType eRenderTypes[] = { RENDER_AS_BITMAP,
RENDER_AS_OUTDEV,
+ RENDER_AS_BITMAPEX,
RENDER_AS_ALPHA_OUTDEV };
+for (size_t i = 0; i aRegions.size(); i++)
+SizeAndRender(rDev, aRegions[i], eRenderTypes[i], rCtx);
+}
+else
+SizeAndRender(rDev, r, RENDER_AS_BITMAP, rCtx);
}
};
@@ -578,17 +625,18 @@ public:
}
};
-void drawToDevice(OutputDevice rDev, bool bVdev)
+void drawToDevice(OutputDevice rDev, bool bVDev)
{
RenderContext aCtx;
-aCtx.mbVDev = bVdev;
+aCtx.mbVDev = bVDev;
aCtx.mpDemoWin = this;
Rectangle aWholeWin(Point(0,0), rDev.GetOutputSizePixel());
drawBackground(rDev, aWholeWin);
-if (mnSelectedRenderer = 0)
+if (!bVDev /* want everything in the vdev */
+mnSelectedRenderer = 0)
{
aCtx.meStyle = RENDER_EXPANDED;
maRenderers[mnSelectedRenderer]-RenderRegion(rDev, aWholeWin,
aCtx);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/workben
vcl/workben/vcldemo.cxx | 68
1 file changed, 58 insertions(+), 10 deletions(-)
New commits:
commit 779b57b8244ee7552a125b8cef9b51ebad34921a
Author: Michael Meeks michael.me...@collabora.com
Date: Thu Nov 13 13:48:24 2014 +
vcldemo: add OutputDevice / copyBits test case.
Change-Id: Ie585daba1d1a1f1dc9f2957c19462a501131d10a
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 177cd51..b5d2ccc 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -495,20 +495,67 @@ public:
struct DrawToVirtualDevice : public RegionRenderer
{
+enum RenderType {
+RENDER_AS_BITMAP,
+RENDER_AS_OUTDEV,
+RENDER_AS_BITMAPEX,
+RENDER_AS_ALPHA_OUTDEV
+};
+
+void SizeAndRender(OutputDevice rDev, Rectangle r, RenderType eType,
+ const RenderContext rCtx)
+{
+VirtualDevice *pNested;
+
+if ((int)eType RENDER_AS_BITMAPEX)
+pNested = new VirtualDevice(rDev);
+else
+pNested = new VirtualDevice(rDev,0,0);
+
+pNested-SetOutputSizePixel(r.GetSize());
+Rectangle aWhole(Point(0,0), r.GetSize());
+
+// mini me
+rCtx.mpDemoWin-drawToDevice(*pNested, true);
+
+if (eType == RENDER_AS_BITMAP)
+{
+Bitmap
aBitmap(pNested-GetBitmap(Point(0,0),aWhole.GetSize()));
+rDev.DrawBitmap(r.TopLeft(), aBitmap);
+}
+else if (eType == RENDER_AS_BITMAPEX)
+{
+BitmapEx
aBitmapEx(pNested-GetBitmapEx(Point(0,0),aWhole.GetSize()));
+rDev.DrawBitmapEx(r.TopLeft(), aBitmapEx);
+}
+else if (eType == RENDER_AS_OUTDEV ||
+ eType == RENDER_AS_ALPHA_OUTDEV)
+{
+rDev.DrawOutDev(r.TopLeft(), r.GetSize(),
+aWhole.TopLeft(), aWhole.GetSize(),
+*pNested);
+}
+delete pNested;
+}
virtual void RenderRegion(OutputDevice rDev, Rectangle r,
const RenderContext rCtx) SAL_OVERRIDE
{
// avoid infinite recursion
if (rCtx.mbVDev)
return;
-VirtualDevice aNested(rDev);
-aNested.SetOutputSizePixel(r.GetSize());
-Rectangle aWhole(Point(0,0), r.GetSize());
-// mini me
-rCtx.mpDemoWin-drawToDevice(aNested, true);
-Bitmap aBitmap(aNested.GetBitmap(Point(0,0),aWhole.GetSize()));
-rDev.DrawBitmap(r.TopLeft(), aBitmap);
+if (rCtx.meStyle == RENDER_EXPANDED)
+{
+std::vectorRectangle aRegions(DemoWin::partition(rDev, 2,
2));
+DemoWin::clearRects(rDev, aRegions);
+
+RenderType eRenderTypes[] = { RENDER_AS_BITMAP,
RENDER_AS_OUTDEV,
+ RENDER_AS_BITMAPEX,
RENDER_AS_ALPHA_OUTDEV };
+for (size_t i = 0; i aRegions.size(); i++)
+SizeAndRender(rDev, aRegions[i], eRenderTypes[i], rCtx);
+}
+else
+SizeAndRender(rDev, r, RENDER_AS_BITMAP, rCtx);
}
};
@@ -563,17 +610,18 @@ public:
}
};
-void drawToDevice(OutputDevice rDev, bool bVdev)
+void drawToDevice(OutputDevice rDev, bool bVDev)
{
RenderContext aCtx;
-aCtx.mbVDev = bVdev;
+aCtx.mbVDev = bVDev;
aCtx.mpDemoWin = this;
Rectangle aWholeWin(Point(0,0), rDev.GetOutputSizePixel());
drawBackground(rDev, aWholeWin);
-if (mnSelectedRenderer = 0)
+if (!bVDev /* want everything in the vdev */
+mnSelectedRenderer = 0)
{
aCtx.meStyle = RENDER_EXPANDED;
maRenderers[mnSelectedRenderer]-RenderRegion(rDev, aWholeWin,
aCtx);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/table/svdotable.cxx |9 -
1 file changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 22ef69b25fa60f4543dc72cb7a8d2f88b789ce43
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 13 14:31:09 2014 +
impress tables are not interactively growing
the optimization here stops tables growing as their text
contents change in editing mode
So, just recalculate if the table could grow and its
being interactively edited, which leaves the original
(dubious ?) load-time optimization in place
Change-Id: I894acf47d34ec8b68aaf9076b5a0cb7e29c38a17
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index c775c4b..9617904 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -686,16 +686,17 @@ sal_Int32 SdrTableObjImpl::getRowCount() const
return mxTable.is() ? mxTable-getRowCount() : 0;
}
-
-
void SdrTableObjImpl::LayoutTable( Rectangle rArea, bool bFitWidth, bool
bFitHeight )
{
if( mpLayouter mpTableObj-GetModel() )
{
// Optimization: SdrTableObj::SetChanged() can call this very often,
repeatedly
// with the same settings, noticeably increasing load time. Skip if
already done.
+bool bInteractiveMightGrowBecauseTextChanged =
+mpTableObj-IsRealyEdited() (mpTableObj-IsAutoGrowHeight() ||
mpTableObj-IsAutoGrowHeight());
WritingMode writingMode = mpTableObj-GetWritingMode();
-if( lastLayoutTable != this || lastLayoutInputRectangle != rArea
+if( bInteractiveMightGrowBecauseTextChanged
+|| lastLayoutTable != this || lastLayoutInputRectangle != rArea
|| lastLayoutFitWidth != bFitWidth || lastLayoutFitHeight !=
bFitHeight
|| lastLayoutMode != writingMode
|| lastRowCount != getRowCount()
@@ -719,8 +720,6 @@ void SdrTableObjImpl::LayoutTable( Rectangle rArea, bool
bFitWidth, bool bFitHe
}
}
-
-
void SdrTableObjImpl::UpdateCells( Rectangle rArea )
{
if( mpLayouter mxTable.is() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/uiconfig sw/uiconfig
sc/uiconfig/scalc/menubar/menubar.xml|3 ++- sw/uiconfig/sglobal/menubar/menubar.xml |3 ++- sw/uiconfig/swform/menubar/menubar.xml |3 ++- sw/uiconfig/swreport/menubar/menubar.xml |3 ++- sw/uiconfig/swriter/menubar/menubar.xml |3 ++- sw/uiconfig/swxform/menubar/menubar.xml |3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) New commits: commit cca366231538c62696a424b43353027905e3dfbf Author: Cor Nouws oo...@nouenoff.nl Date: Thu Nov 13 15:24:55 2014 +0100 fdo#86252: Menu 'Merge Documents' is at wrong position Fixing a small mistake that slipped through with the many great improvements Change-Id: I252f2f05e6d624094507cc1f825faab5912e006e Reviewed-on: https://gerrit.libreoffice.org/12407 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index 489e892..00368d3 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -93,9 +93,10 @@ menu:menuseparator/ menu:menuitem menu:id=.uno:AcceptChanges/ menu:menuitem menu:id=.uno:CommentChange/ +menu:menuseparator/ +menu:menuitem menu:id=.uno:MergeDocuments/ /menu:menupopup /menu:menu -menu:menuitem menu:id=.uno:MergeDocuments/ menu:menuitem menu:id=.uno:CompareDocuments/ menu:menuseparator/ menu:menu menu:id=.uno:FillCellsMenu diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml index 294e445..be10398 100644 --- a/sw/uiconfig/sglobal/menubar/menubar.xml +++ b/sw/uiconfig/sglobal/menubar/menubar.xml @@ -106,9 +106,10 @@ menu:menuitem menu:id=.uno:CommentChangeTracking/ menu:menuitem menu:id=.uno:NextTrackedChange/ menu:menuitem menu:id=.uno:PreviousTrackedChange/ + menu:menuseparator/ + menu:menuitem menu:id=.uno:MergeDocuments/ /menu:menupopup /menu:menu - menu:menuitem menu:id=.uno:MergeDocuments/ menu:menuitem menu:id=.uno:CompareDocuments/ menu:menuseparator/ menu:menuitem menu:id=.uno:ChangeDatabaseField/ diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml index 7c9ae51..d29a58a 100644 --- a/sw/uiconfig/swform/menubar/menubar.xml +++ b/sw/uiconfig/swform/menubar/menubar.xml @@ -105,9 +105,10 @@ menu:menuitem menu:id=.uno:CommentChangeTracking/ menu:menuitem menu:id=.uno:NextTrackedChange/ menu:menuitem menu:id=.uno:PreviousTrackedChange/ + menu:menuseparator/ + menu:menuitem menu:id=.uno:MergeDocuments/ /menu:menupopup /menu:menu - menu:menuitem menu:id=.uno:MergeDocuments/ menu:menuitem menu:id=.uno:CompareDocuments/ menu:menuseparator/ menu:menuitem menu:id=.uno:ChangeDatabaseField/ diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml index f744dab..eb0a968 100644 --- a/sw/uiconfig/swreport/menubar/menubar.xml +++ b/sw/uiconfig/swreport/menubar/menubar.xml @@ -106,9 +106,10 @@ menu:menuitem menu:id=.uno:CommentChangeTracking/ menu:menuitem menu:id=.uno:NextTrackedChange/ menu:menuitem menu:id=.uno:PreviousTrackedChange/ + menu:menuseparator/ + menu:menuitem menu:id=.uno:MergeDocuments/ /menu:menupopup /menu:menu - menu:menuitem menu:id=.uno:MergeDocuments/ menu:menuitem menu:id=.uno:CompareDocuments/ menu:menuseparator/ menu:menuitem menu:id=.uno:ChangeDatabaseField/ diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index 2b13789..1495eb5 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -110,9 +110,10 @@ menu:menuitem menu:id=.uno:CommentChangeTracking/ menu:menuitem menu:id=.uno:NextTrackedChange/ menu:menuitem menu:id=.uno:PreviousTrackedChange/ + menu:menuseparator/ + menu:menuitem menu:id=.uno:MergeDocuments/ /menu:menupopup /menu:menu - menu:menuitem menu:id=.uno:MergeDocuments/ menu:menuitem menu:id=.uno:CompareDocuments/ menu:menuseparator/ menu:menuitem menu:id=.uno:ChangeDatabaseField/ diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml index e59469e..bbba7b2 100644 --- a/sw/uiconfig/swxform/menubar/menubar.xml +++ b/sw/uiconfig/swxform/menubar/menubar.xml @@ -107,9 +107,10 @@ menu:menuitem menu:id=.uno:CommentChangeTracking/ menu:menuitem menu:id=.uno:NextTrackedChange/ menu:menuitem menu:id=.uno:PreviousTrackedChange/ + menu:menuseparator/ +
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/autoformattable.ui |3 sw/uiconfig/swriter/ui/businessdatapage.ui| 20 sw/uiconfig/swriter/ui/captionoptions.ui | 11 sw/uiconfig/swriter/ui/cardmediumpage.ui | 100 -- sw/uiconfig/swriter/ui/ccdialog.ui| 22 sw/uiconfig/swriter/ui/columnpage.ui | 749 ++ sw/uiconfig/swriter/ui/columnwidth.ui | 18 sw/uiconfig/swriter/ui/converttexttable.ui| 36 - sw/uiconfig/swriter/ui/createaddresslist.ui | 24 sw/uiconfig/swriter/ui/createautomarkdialog.ui|5 sw/uiconfig/swriter/ui/customizeaddrlistdialog.ui | 45 - sw/uiconfig/swriter/ui/dropcapspage.ui| 57 - sw/uiconfig/swriter/ui/dropdownfielddialog.ui |6 13 files changed, 449 insertions(+), 647 deletions(-) New commits: commit 313c4d08a1514e38bebb827db5528db29ee801ee Author: Adolfo Jayme Barrientos fit...@ubuntu.com Date: Thu Nov 13 00:56:43 2014 -0600 More HIG fixes for sw Change-Id: I7aa36de06b70da68625ed860b330fdcf62d48de5 Reviewed-on: https://gerrit.libreoffice.org/12400 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/uiconfig/swriter/ui/autoformattable.ui b/sw/uiconfig/swriter/ui/autoformattable.ui index 9855f08..9ecb322 100644 --- a/sw/uiconfig/swriter/ui/autoformattable.ui +++ b/sw/uiconfig/swriter/ui/autoformattable.ui @@ -2,11 +2,12 @@ !-- Generated with glade 3.16.1 -- interface requires lib=gtk+ version=3.0/ - !-- interface-requires LibreOffice 1.0 -- + requires lib=LibreOffice version=1.0/ object class=GtkDialog id=AutoFormatTableDialog property name=can_focusFalse/property property name=border_width6/property property name=title translatable=yesAutoFormat/property +property name=resizableFalse/property property name=type_hintdialog/property child internal-child=vbox object class=GtkBox id=dialog-vbox1 diff --git a/sw/uiconfig/swriter/ui/businessdatapage.ui b/sw/uiconfig/swriter/ui/businessdatapage.ui index 467d577..7b03005 100644 --- a/sw/uiconfig/swriter/ui/businessdatapage.ui +++ b/sw/uiconfig/swriter/ui/businessdatapage.ui @@ -24,7 +24,7 @@ object class=GtkLabel id=label5 property name=visibleTrue/property property name=can_focusFalse/property -property name=xalign0/property +property name=xalign1/property property name=label translatable=yesCompany:/property property name=use_underlineTrue/property property name=mnemonic_widgetcompany/property @@ -38,7 +38,7 @@ object class=GtkLabel id=streetft property name=visibleTrue/property property name=can_focusFalse/property -property name=xalign0/property +property name=xalign1/property property name=label translatable=yesSlogan:/property property name=use_underlineTrue/property property name=mnemonic_widgetslogan/property @@ -52,7 +52,7 @@ object class=GtkLabel id=countryft property name=visibleTrue/property property name=can_focusFalse/property -property name=xalign0/property +property name=xalign1/property property name=label translatable=yesCo_untry/state:/property property name=use_underlineTrue/property property name=mnemonic_widgetcountry/property @@ -66,7 +66,7 @@ object class=GtkLabel id=label8 property name=visibleTrue/property property name=can_focusFalse/property -property name=xalign0/property +property name=xalign1/property property name=label translatable=yesPosition:/property property name=use_underlineTrue/property property name=mnemonic_widgetposition/property @@ -80,7 +80,7 @@ object class=GtkLabel id=phoneft property name=visibleTrue/property property name=can_focusFalse/property -property name=xalign0/property +property name=xalign1/property property name=label translatable=yesFa_x:/property property name=use_underlineTrue/property property name=mnemonic_widgetfax/property @@ -99,7 +99,7 @@ object class=GtkLabel id=faxft property name=visibleTrue/property property name=can_focusFalse/property -property name=xalign0/property +property name=xalign1/property property name=label translatable=yesHomepage/e-mail:/property property name=use_underlineTrue/property property
[Libreoffice-commits] core.git: external/apache-commons
external/apache-commons/ExternalProject_apache_commons_logging.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c17f215c613d9da9c0cd30d6597fefcfa37be76e Author: Robert Antoni Buj i Gelonch robert@gmail.com Date: Tue Oct 28 10:53:41 2014 +0100 Apache Commons Logging 1.2 - re-enable the non debug version. Change-Id: Ib0f3b3a650b7f72c7942f8b72420e33743ff9c44 Reviewed-on: https://gerrit.libreoffice.org/12123 Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/external/apache-commons/ExternalProject_apache_commons_logging.mk b/external/apache-commons/ExternalProject_apache_commons_logging.mk index afb2f01..ed9e536 100644 --- a/external/apache-commons/ExternalProject_apache_commons_logging.mk +++ b/external/apache-commons/ExternalProject_apache_commons_logging.mk @@ -25,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,apache_commons_logging,build) : ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ -Dant.build.javac.target=$(JAVA_TARGET_VER) \ ) \ - $(if $(debug),-Dbuild.debug=on) \ + $(if $(debug),-Dcompile.debug=true,-Dcompile.debug=false) \ compile build-jar \ ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] buildbot.git: lcov-report/lcov-report.cmds.example lcov-report/lcov-report.sh lcov-report/README
lcov-report/README | 33 ++
lcov-report/lcov-report.cmds.example |8 +
lcov-report/lcov-report.sh | 178 +--
3 files changed, 172 insertions(+), 47 deletions(-)
New commits:
commit dc7ef6b14866d787fe5fad9969de93c32536a2e3
Author: Maarten Hoes hoes.maar...@gmail.com
Date: Thu Nov 13 12:22:54 2014 +0100
Split script up in functions. Added example commandfile and README on usage.
Change-Id: I34c6bb1793e39dbc6ecc9336f34c086fc1803a24
Reviewed-on: https://gerrit.libreoffice.org/12404
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/lcov-report/README b/lcov-report/README
new file mode 100644
index 000..e73f51a
--- /dev/null
+++ b/lcov-report/README
@@ -0,0 +1,33 @@
+
+A small script to create gcov/lcov code coverage reports of tests run
+on the libreoffice source code.
+
+
+Usage: lcov-report.sh [-b] -c [FILE] -s [DIRECTORY] -t [DIRECTORY] -w
[DIRECTORY]
+
+
+-s
+Specify the location where the libreoffice source code is
+located. This flag is mandatory.
+
+-c
+Specify the file containing the libreoffice test commands to run.
+In it's simplest form, this file could contain a single line
+reading something like 'cd $SRCDIR make check'. This flag
+is mandatory.
+
+-b
+Specifies to build the libreoffice sources in the location
+specified by the '-s' flag. This flag is optional. If you
+choose to omit it, you must make sure the libreoffice source
+code is built using the appropriate FLAGS ('-fprofile-arcs
+-ftest-coverage').
+
+-t
+Specifies the directory in which to contain the lcov
+tracefile's. This flag is mandatory.
+
+-w
+Specifies the directory in which to contain the generated HTML
+report files. This flag is mandatory.
+
diff --git a/lcov-report/lcov-report.cmds.example
b/lcov-report/lcov-report.cmds.example
new file mode 100644
index 000..a577fde
--- /dev/null
+++ b/lcov-report/lcov-report.cmds.example
@@ -0,0 +1,8 @@
+cd $SRC_DIR
+make check
+MY_EXITCODE=$?
+if [ $MY_EXITCODE != 0 ]
+then
+ echo ERROR: make check failed with exitcode $MY_EXITCODE 2
+ exit $MY_EXITCODE
+fi
diff --git a/lcov-report/lcov-report.sh b/lcov-report/lcov-report.sh
index 5adee75..607405e 100755
--- a/lcov-report/lcov-report.sh
+++ b/lcov-report/lcov-report.sh
@@ -7,41 +7,23 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-usage()
-{
- echo Usage: lcov-report.sh -s [DIRECTORY] -t [DIRECTORY] -w [DIRECTORY]
- -s source code directory
- -t tracefile directory
- -w html (www) directory
- exit 1
-}
-if [ $# != 6 ]
+#
+# Functions
+#
+
+
+init()
+{
+if [ $SRC_DIR = / -o $TRACEFILE_DIR = / -o $HTML_DIR = / ]
then
- usage
+ echo ERROR: Dont use the root '/' directory for storage. 2
+ exit 1
fi
-while getopts :s:t:w: opt
-do
- case $opt in
- s)
- SRC_DIR=$OPTARG
- ;;
- t)
- TRACEFILE_DIR=$OPTARG
- ;;
- w)
- HTML_DIR=$OPTARG
- ;;
- *)
- usage
- ;;
- esac
-done
-
if [ ! -d $SRC_DIR ]
then
- echo ERROR: Failed to locate directory $SRC_DIR 2
+ echo ERROR: Failed to locate directory $SRC_DIR. 2
exit 1
fi
@@ -50,25 +32,37 @@ rm -rf $TRACEFILE_DIR $HTML_DIR
mkdir $TRACEFILE_DIR
if [ $? != 0 ]
then
- echo ERROR: Failed to create directory $TRACEFILE_DIR 2
+ echo ERROR: Failed to create directory $TRACEFILE_DIR. 2
exit 1
fi
mkdir $HTML_DIR
if [ $? != 0 ]
then
- echo ERROR: Failed to create directory $HTML_DIR 2
+ echo ERROR: Failed to create directory $HTML_DIR. 2
+ exit 1
+fi
+
+if [ ! -f $TEST_CMDS_FILE ]
+then
+ echo ERROR: Failed to find test command file $TEST_CMDS_FILE. 2
exit 1
fi
+}
+lcov_cleanup()
+{
lcov --zerocounters --directory $SRC_DIR
+}
+source_build()
+{
cd $SRC_DIR
make distclean
MY_EXITCODE=$?
if [ $MY_EXITCODE != 0 ]
then
- echo ERROR: make distclean failed with exitcode $MY_EXITCODE 2
+ echo ERROR: make distclean failed with exitcode $MY_EXITCODE. 2
exit $MY_EXITCODE
fi
@@ -78,7 +72,7 @@ LDFLAGS+='-fprofile-arcs' CFLAGS+='-fprofile-arcs
-ftest-coverage' CXXFLAGS+='-f
MY_EXITCODE=$?
if [ $MY_EXITCODE != 0 ]
then
- echo ERROR: configure failed with exitcode $MY_EXITCODE 2
+ echo ERROR: configure failed with exitcode $MY_EXITCODE. 2
exit $MY_EXITCODE
fi
@@ -86,55 +80,80 @@ make build-nocheck
MY_EXITCODE=$?
if [ $MY_EXITCODE != 0 ]
then
- echo ERROR: make build-nocheck failed with exitcode $MY_EXITCODE 2
+ echo ERROR: make build-nocheck failed
[Libreoffice-commits] core.git: vcl/inc vcl/Library_vcl.mk vcl/win
vcl/Library_vcl.mk |1 vcl/inc/cairotextrender.hxx |2 vcl/inc/textrender.hxx |7 - vcl/inc/win/salgdi.h | 23 - vcl/inc/wintextrender.hxx| 140 +++ vcl/win/source/gdi/salgdi.cxx| 30 +-- vcl/win/source/gdi/salgdi3.cxx | 131 ++-- vcl/win/source/gdi/winlayout.cxx |8 +- vcl/win/source/gdi/wintextrender.cxx | 64 9 files changed, 330 insertions(+), 76 deletions(-) New commits: commit 146e4f8bac3b76c33726219858aa0c823167a0a6 Author: Jan Holesovsky ke...@collabora.com Date: Thu Nov 13 13:18:46 2014 +0100 vcl: Abstract the Windows text rendering into a TextRenderImpl descendant. Change-Id: I7ee9d7e705bb0344ba59c3edd10ed85390636cd4 diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 81f774a..f15e5b6 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -660,6 +660,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/win/source/gdi/salprn \ vcl/win/source/gdi/salvd \ vcl/win/source/gdi/winlayout \ +vcl/win/source/gdi/wintextrender \ vcl/win/source/gdi/wntgdi \ vcl/win/source/window/salframe \ vcl/win/source/window/keynames \ diff --git a/vcl/inc/cairotextrender.hxx b/vcl/inc/cairotextrender.hxx index e5db2ab..ea995bb 100644 --- a/vcl/inc/cairotextrender.hxx +++ b/vcl/inc/cairotextrender.hxx @@ -79,7 +79,7 @@ protected: virtual cairo_surface_t* getCairoSurface() = 0; virtual void drawSurface(cairo_t* cr) = 0; -bool setFont( const FontSelectPattern *pEntry, int nFallbackLevel ); +bool setFont(const FontSelectPattern *pEntry, int nFallbackLevel); virtual void clipRegion(cairo_t* cr) = 0; diff --git a/vcl/inc/textrender.hxx b/vcl/inc/textrender.hxx index f4dcc83..2d9031a 100644 --- a/vcl/inc/textrender.hxx +++ b/vcl/inc/textrender.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_UNX_CAIROFONTIMPL_HXX -#define INCLUDED_VCL_INC_UNX_CAIROFONTIMPL_HXX +#ifndef INCLUDED_VCL_INC_TEXTRENDER_HXX +#define INCLUDED_VCL_INC_TEXTRENDER_HXX #include sal/types.h #include vcl/salgtype.hxx @@ -29,9 +29,6 @@ #include salglyphid.hxx #include fontsubset.hxx -class PspSalPrinter; -class PspSalInfoPrinter; -class ServerFont; class ImplLayoutArgs; class ServerFontLayout; class PhysicalFontCollection; diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index 69ea4cf..18709e1 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -25,7 +25,9 @@ #include outfont.hxx #include PhysicalFontFace.hxx #include impfont.hxx +#include textrender.hxx #include vcl/fontcapabilities.hxx +#include win/svsys.h #include boost/scoped_ptr.hpp #include boost/unordered_set.hpp @@ -148,6 +150,7 @@ class WinSalGraphics : public SalGraphics friend class ScopedFont; private: boost::scoped_ptrSalGraphicsImpl mpImpl; +boost::scoped_ptrTextRenderImpl mpTextRenderImpl; HDC mhLocalDC; // HDC boolmbPrinter : 1; // is Printer @@ -156,26 +159,13 @@ private: boolmbScreen : 1; // is Screen compatible HWNDmhWnd; // Window-Handle, when Window-Graphics -HFONT mhFonts[ MAX_FALLBACK ];// Font + Fallbacks -const ImplWinFontData* mpWinFontData[ MAX_FALLBACK ]; // pointer to the most recent font face -ImplWinFontEntry* mpWinFontEntry[ MAX_FALLBACK ]; // pointer to the most recent font instance -float mfFontScale[ MAX_FALLBACK ];// allows metrics emulation of huge font sizes -float mfCurrentFontScale; HRGNmhRegion; // vcl::Region Handle HPENmhDefPen; // DefaultPen HBRUSH mhDefBrush; // DefaultBrush -HFONT mhDefFont; // DefaultFont HPALETTEmhDefPal; // DefaultPalette COLORREFmnTextColor;// TextColor RGNDATA*mpClipRgnData; // ClipRegion-Data RGNDATA*mpStdClipRgnData; // Cache Standard-ClipRegion-Data -LOGFONTA* mpLogFont; // LOG-Font which is currently selected (only W9x) -ImplFontAttrCache* mpFontAttrCache;// Cache font attributes from files in so/share/fonts -BYTE* mpFontCharSets; // All Charsets for the current font -BYTEmnFontCharSetCount; // Number of Charsets of the current font; 0 - if not queried -boolmbFontKernInit; // FALSE: FontKerns must be queried -KERNINGPAIR*mpFontKernPairs;// Kerning Pairs of the current Font -sal_uIntPtr
[Libreoffice-commits] core.git: Branch 'feature/priorities' - forms/source linguistic/source sfx2/source starmath/inc starmath/source
forms/source/component/ListBox.cxx | 16 +++
forms/source/component/ListBox.hxx |2 -
linguistic/source/lngsvcmgr.cxx |6 ++---
linguistic/source/lngsvcmgr.hxx |2 -
sfx2/source/dialog/filedlghelper.cxx | 12 +--
sfx2/source/dialog/filedlgimpl.hxx |2 -
sfx2/source/dialog/templdlg.cxx | 18 -
sfx2/source/doc/new.cxx |8 +++
sfx2/source/inc/templdgi.hxx |2 -
starmath/inc/edit.hxx|4 +--
starmath/source/edit.cxx | 36 +--
11 files changed, 54 insertions(+), 54 deletions(-)
New commits:
commit dd523a5f478420d15ace896a961c02ad048ab43d
Author: Tobias Madl tobias.madl@gmail.com
Date: Thu Nov 13 14:50:26 2014 +
changed timers to idles
Change-Id: Ic0d7730f7880dfe2e83c84e773b8cc420249b269
diff --git a/forms/source/component/ListBox.cxx
b/forms/source/component/ListBox.cxx
index 2d42a97..e86bef7 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -1789,8 +1789,8 @@ namespace frm
doSetDelegator();
-m_aChangeTimer.SetTimeout(500);
-m_aChangeTimer.SetTimeoutHdl(LINK(this,OListBoxControl,OnTimeout));
+m_aChangeIdle.SetPriority(VCL_IDLE_PRIORITY_LOWEST);
+m_aChangeIdle.SetIdleHdl(LINK(this,OListBoxControl,OnTimeout));
}
@@ -1866,13 +1866,13 @@ namespace frm
// and do the handling for the ChangeListeners
::osl::ClearableMutexGuard aGuard(m_aMutex);
-if ( m_aChangeTimer.IsActive() )
+if ( m_aChangeIdle.IsActive() )
{
ReferenceXPropertySet xSet(getModel(), UNO_QUERY);
m_aCurrentSelection = xSet-getPropertyValue(PROPERTY_SELECT_SEQ);
-m_aChangeTimer.Stop();
-m_aChangeTimer.Start();
+m_aChangeIdle.Stop();
+m_aChangeIdle.Start();
}
else
{
@@ -1902,7 +1902,7 @@ namespace frm
if (bModified)
{
m_aCurrentSelection = aValue;
-m_aChangeTimer.Start();
+m_aChangeIdle.Start();
}
}
}
@@ -1935,8 +1935,8 @@ namespace frm
void OListBoxControl::disposing()
{
-if (m_aChangeTimer.IsActive())
-m_aChangeTimer.Stop();
+if (m_aChangeIdle.IsActive())
+m_aChangeIdle.Stop();
EventObject aEvent( *this );
m_aChangeListeners.disposeAndClear( aEvent );
diff --git a/forms/source/component/ListBox.hxx
b/forms/source/component/ListBox.hxx
index 991627c..85b380c 100644
--- a/forms/source/component/ListBox.hxx
+++ b/forms/source/component/ListBox.hxx
@@ -255,7 +255,7 @@ private:
::cppu::OInterfaceContainerHelper m_aItemListeners;
::com::sun::star::uno::Any m_aCurrentSelection;
-Timer m_aChangeTimer;
+Idlem_aChangeIdle;
::com::sun::star::uno::Reference ::com::sun::star::awt::XListBox
m_xAggregateListBox;
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 259dd8f..2538f41 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -476,8 +476,8 @@ LngSvcMgr::LngSvcMgr()
UpdateAll();
-aUpdateTimer.SetTimeout(500);
-aUpdateTimer.SetTimeoutHdl(LINK(this, LngSvcMgr, updateAndBroadcast));
+aUpdateIdle.SetPriority(VCL_IDLE_PRIORITY_LOWEST);
+aUpdateIdle.SetIdleHdl(LINK(this, LngSvcMgr, updateAndBroadcast));
// request to be notified if an extension has been added/removed
uno::Referenceuno::XComponentContext
xContext(comphelper::getProcessComponentContext());
@@ -513,7 +513,7 @@ void LngSvcMgr::modified(const lang::EventObject)
clearSvcInfoArray(pAvailThesSvcs);
//schedule in an update to execute in the main thread
-aUpdateTimer.Start();
+aUpdateIdle.Start();
}
//run update, and inform everyone that dictionaries (may) have changed, this
diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx
index 1b0d664..c3046e8 100644
--- a/linguistic/source/lngsvcmgr.hxx
+++ b/linguistic/source/lngsvcmgr.hxx
@@ -81,7 +81,7 @@ class LngSvcMgr :
com::sun::star::uno::Reference
::com::sun::star::util::XModifyBroadcaster xMB;
-Timer aUpdateTimer;
+IdleaUpdateIdle;
com::sun::star::uno::Sequence
diff --git a/sfx2/source/dialog/filedlghelper.cxx
b/sfx2/source/dialog/filedlghelper.cxx
index 18da893..fe2fe37 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -200,7 +200,7 @@ void FileDialogHelper_Impl::handleFileSelectionChanged(
const
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - vcl/inc vcl/Library_vcl.mk vcl/win
vcl/Library_vcl.mk |1 vcl/inc/cairotextrender.hxx |2 vcl/inc/textrender.hxx |7 - vcl/inc/win/salgdi.h | 23 - vcl/inc/wintextrender.hxx| 140 +++ vcl/win/source/gdi/salgdi.cxx| 30 +-- vcl/win/source/gdi/salgdi3.cxx | 131 ++-- vcl/win/source/gdi/winlayout.cxx |8 +- vcl/win/source/gdi/wintextrender.cxx | 64 9 files changed, 330 insertions(+), 76 deletions(-) New commits: commit 309257ddadfdc3e46506036ed81f6e0695211ebe Author: Jan Holesovsky ke...@collabora.com Date: Thu Nov 13 13:18:46 2014 +0100 vcl: Abstract the Windows text rendering into a TextRenderImpl descendant. Change-Id: I7ee9d7e705bb0344ba59c3edd10ed85390636cd4 diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 81f774a..f15e5b6 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -660,6 +660,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/win/source/gdi/salprn \ vcl/win/source/gdi/salvd \ vcl/win/source/gdi/winlayout \ +vcl/win/source/gdi/wintextrender \ vcl/win/source/gdi/wntgdi \ vcl/win/source/window/salframe \ vcl/win/source/window/keynames \ diff --git a/vcl/inc/cairotextrender.hxx b/vcl/inc/cairotextrender.hxx index e5db2ab..ea995bb 100644 --- a/vcl/inc/cairotextrender.hxx +++ b/vcl/inc/cairotextrender.hxx @@ -79,7 +79,7 @@ protected: virtual cairo_surface_t* getCairoSurface() = 0; virtual void drawSurface(cairo_t* cr) = 0; -bool setFont( const FontSelectPattern *pEntry, int nFallbackLevel ); +bool setFont(const FontSelectPattern *pEntry, int nFallbackLevel); virtual void clipRegion(cairo_t* cr) = 0; diff --git a/vcl/inc/textrender.hxx b/vcl/inc/textrender.hxx index b18b630..a004143 100644 --- a/vcl/inc/textrender.hxx +++ b/vcl/inc/textrender.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_UNX_CAIROFONTIMPL_HXX -#define INCLUDED_VCL_INC_UNX_CAIROFONTIMPL_HXX +#ifndef INCLUDED_VCL_INC_TEXTRENDER_HXX +#define INCLUDED_VCL_INC_TEXTRENDER_HXX #include tools/rational.hxx #include vcl/salgtype.hxx @@ -29,9 +29,6 @@ #include salglyphid.hxx #include fontsubset.hxx -class PspSalPrinter; -class PspSalInfoPrinter; -class ServerFont; class ImplLayoutArgs; class ServerFontLayout; class PhysicalFontCollection; diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index 69ea4cf..18709e1 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -25,7 +25,9 @@ #include outfont.hxx #include PhysicalFontFace.hxx #include impfont.hxx +#include textrender.hxx #include vcl/fontcapabilities.hxx +#include win/svsys.h #include boost/scoped_ptr.hpp #include boost/unordered_set.hpp @@ -148,6 +150,7 @@ class WinSalGraphics : public SalGraphics friend class ScopedFont; private: boost::scoped_ptrSalGraphicsImpl mpImpl; +boost::scoped_ptrTextRenderImpl mpTextRenderImpl; HDC mhLocalDC; // HDC boolmbPrinter : 1; // is Printer @@ -156,26 +159,13 @@ private: boolmbScreen : 1; // is Screen compatible HWNDmhWnd; // Window-Handle, when Window-Graphics -HFONT mhFonts[ MAX_FALLBACK ];// Font + Fallbacks -const ImplWinFontData* mpWinFontData[ MAX_FALLBACK ]; // pointer to the most recent font face -ImplWinFontEntry* mpWinFontEntry[ MAX_FALLBACK ]; // pointer to the most recent font instance -float mfFontScale[ MAX_FALLBACK ];// allows metrics emulation of huge font sizes -float mfCurrentFontScale; HRGNmhRegion; // vcl::Region Handle HPENmhDefPen; // DefaultPen HBRUSH mhDefBrush; // DefaultBrush -HFONT mhDefFont; // DefaultFont HPALETTEmhDefPal; // DefaultPalette COLORREFmnTextColor;// TextColor RGNDATA*mpClipRgnData; // ClipRegion-Data RGNDATA*mpStdClipRgnData; // Cache Standard-ClipRegion-Data -LOGFONTA* mpLogFont; // LOG-Font which is currently selected (only W9x) -ImplFontAttrCache* mpFontAttrCache;// Cache font attributes from files in so/share/fonts -BYTE* mpFontCharSets; // All Charsets for the current font -BYTEmnFontCharSetCount; // Number of Charsets of the current font; 0 - if not queried -boolmbFontKernInit; // FALSE: FontKerns must be queried -KERNINGPAIR*mpFontKernPairs;// Kerning Pairs of the current Font -sal_uIntPtr
[Libreoffice-commits] core.git: 5 commits - external/boost external/firebird external/libabw external/libcdr external/libebook external/libetonyek external/libfreehand external/liblangtag external/lib
external/boost/UnpackedTarball_boost.mk |1 + external/boost/w4702.patch.0 | 10 ++ external/firebird/ExternalProject_firebird.mk |2 +- external/libabw/ExternalProject_libabw.mk |2 +- external/libcdr/ExternalProject_libcdr.mk |2 +- external/libebook/ExternalProject_libebook.mk |2 +- external/libetonyek/ExternalProject_libetonyek.mk |2 +- external/libfreehand/ExternalProject_libfreehand.mk |2 +- external/liblangtag/ExternalProject_langtag.mk|2 +- external/libmspub/ExternalProject_libmspub.mk |2 +- external/liborcus/ExternalProject_liborcus.mk |2 +- external/libpagemaker/ExternalProject_libpagemaker.mk |2 +- external/libvisio/ExternalProject_libvisio.mk |2 +- external/libwpd/ExternalProject_libwpd.mk |2 +- external/libwpg/ExternalProject_libwpg.mk |2 +- external/nss/nss.windows.patch| 11 +++ vcl/win/source/gdi/gdiimpl.hxx|2 +- vcl/win/source/gdi/salgdi.cxx |2 -- 18 files changed, 36 insertions(+), 16 deletions(-) New commits: commit 904f9284a2250e17ff4c25f2c5d7540430a0c020 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Nov 13 16:50:36 2014 +0100 More passing of MAKE into external configure ...like 2fdf78109e815a64169fdab1a8175b63ef9c64d4 Pass MAKE into external/poppler's configure Change-Id: I4e2f1a13d120a7398fa81884710c589bb905714d diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index f557a361..ed802c3 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -46,7 +46,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build): -L$(call gb_UnpackedTarball_get_dir,icu)/source/lib \ ) \ \ -./configure \ +MAKE=$(MAKE) ./configure \ --without-editline \ --disable-superserver \ --with-system-icu --without-fbsample --without-fbsample-db \ diff --git a/external/libabw/ExternalProject_libabw.mk b/external/libabw/ExternalProject_libabw.mk index d45ef05..fd0b98a 100644 --- a/external/libabw/ExternalProject_libabw.mk +++ b/external/libabw/ExternalProject_libabw.mk @@ -25,7 +25,7 @@ $(eval $(call gb_ExternalProject_use_externals,libabw,\ $(call gb_ExternalProject_get_state_target,libabw,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG= \ -./configure \ +MAKE=$(MAKE) ./configure \ --with-pic \ --enable-static \ --disable-shared \ diff --git a/external/libcdr/ExternalProject_libcdr.mk b/external/libcdr/ExternalProject_libcdr.mk index 67f79b6..fd9658d 100644 --- a/external/libcdr/ExternalProject_libcdr.mk +++ b/external/libcdr/ExternalProject_libcdr.mk @@ -26,7 +26,7 @@ $(eval $(call gb_ExternalProject_use_externals,libcdr,\ $(call gb_ExternalProject_get_state_target,libcdr,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG= \ -./configure \ +MAKE=$(MAKE) ./configure \ --with-pic \ --enable-static \ --disable-shared \ diff --git a/external/libebook/ExternalProject_libebook.mk b/external/libebook/ExternalProject_libebook.mk index 1bc7f7c..5e7f2b0 100644 --- a/external/libebook/ExternalProject_libebook.mk +++ b/external/libebook/ExternalProject_libebook.mk @@ -27,7 +27,7 @@ $(eval $(call gb_ExternalProject_use_externals,libebook,\ $(call gb_ExternalProject_get_state_target,libebook,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG= \ -./configure \ +MAKE=$(MAKE) ./configure \ --with-pic \ --enable-static \ --disable-shared \ diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk index 9f57a10..f5ea457 100644 --- a/external/libetonyek/ExternalProject_libetonyek.mk +++ b/external/libetonyek/ExternalProject_libetonyek.mk @@ -25,7 +25,7 @@ $(eval $(call gb_ExternalProject_use_externals,libetonyek,\ $(call gb_ExternalProject_get_state_target,libetonyek,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG= \ -./configure \ +MAKE=$(MAKE) ./configure \ --with-pic \ --enable-static \ --disable-shared \ diff --git
[Libreoffice-commits] core.git: sc/source unusedcode.easy
sc/source/filter/inc/drawingmanager.hxx | 89 --
sc/source/filter/oox/drawingmanager.cxx | 266
unusedcode.easy |1
3 files changed, 356 deletions(-)
New commits:
commit 18eab4c154eb033e8751c85df3b170a3946e3a20
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 13 11:05:37 2014 +
callcatcher: BiffDrawingObjectBase is never constructed
which has a bunch of related knock-on effects given that logic.
Change-Id: Ib245af1005e37464e1a782018d88b379300641a2
diff --git a/sc/source/filter/inc/drawingmanager.hxx
b/sc/source/filter/inc/drawingmanager.hxx
index 6ea03c9..c9a50fa 100644
--- a/sc/source/filter/inc/drawingmanager.hxx
+++ b/sc/source/filter/inc/drawingmanager.hxx
@@ -62,89 +62,6 @@ struct BiffObjFillModel
// BIFF drawing objects
class BiffDrawingBase;
-class BiffDrawingObjectBase;
-typedef ::boost::shared_ptr BiffDrawingObjectBase BiffDrawingObjectRef;
-
-class BiffDrawingObjectContainer
-{
-public:
-explicitBiffDrawingObjectContainer();
-
-/** Returns true, if the object list is empty. */
-inline bool empty() const { return maObjects.empty(); }
-
-/** Creates and inserts all UNO shapes into the passed shape container. */
-voidconvertAndInsert( BiffDrawingBase rDrawing,
-const ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShapes rxShapes,
-const ::com::sun::star::awt::Rectangle*
pParentRect = 0 ) const;
-
-private:
-typedef RefVector BiffDrawingObjectBase BiffDrawingObjectVector;
-BiffDrawingObjectVector maObjects;
-};
-
-/** Base class for all BIFF drawing objects (OBJ records). */
-class BiffDrawingObjectBase : public WorksheetHelper
-{
-public:
-explicitBiffDrawingObjectBase( const WorksheetHelper rHelper
);
-virtual ~BiffDrawingObjectBase();
-
-/** Sets whether this is an area object (then its width and height must be
greater than 0). */
-inline void setAreaObj( bool bAreaObj ) { mbAreaObj = bAreaObj; }
-/** If set to true, the object supports a simple on-click macro and/or
hyperlink. */
-inline void setSimpleMacro( bool bMacro ) { mbSimpleMacro =
bMacro; }
-
-/** If set to false, the UNO shape will not be created, processed, or
inserted into the draw page. */
-inline void setProcessShape( bool bProcess ) { mbProcessShape =
bProcess; }
-/** If set to false, the UNO shape will be created or processed, but not
be inserted into the draw page. */
-inline void setInsertShape( bool bInsert ) { mbInsertShape =
bInsert; }
-/** If set to true, a new custom UNO shape will be created while in DFF
import (BIFF8 only). */
-inline void setCustomDffObj( bool bCustom ) { mbCustomDff =
bCustom; }
-
-/** Returns the object identifier from the OBJ record. */
-inline sal_uInt16 getObjId() const { return mnObjId; }
-/** Returns the object type from the OBJ record. */
-inline sal_uInt16 getObjType() const { return mnObjType; }
-
-/** Returns true, if the object is hidden. */
-inline bool isHidden() const { return mbHidden; }
-/** Returns true, if the object is visible. */
-inline bool isVisible() const { return mbVisible; }
-/** Returns true, if the object is printable. */
-inline bool isPrintable() const { return mbPrintable; }
-
-/** Creates the UNO shape and inserts it into the passed shape container.
*/
-::com::sun::star::uno::Reference ::com::sun::star::drawing::XShape
-convertAndInsert( BiffDrawingBase rDrawing,
-const ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShapes rxShapes,
-const ::com::sun::star::awt::Rectangle*
pParentRect = 0 ) const;
-
-protected:
-/** Converts the passed line formatting to the passed property map. */
-voidconvertLineProperties(
::oox::drawingml::ShapePropertyMap rPropMap, const BiffObjLineModel
rLineModel, sal_uInt16 nArrows = 0 ) const;
-/** Converts the passed fill formatting to the passed property map. */
-voidconvertFillProperties(
::oox::drawingml::ShapePropertyMap rPropMap, const BiffObjFillModel
rFillModel ) const;
-
-/** Derived classes create the corresponding XShape and insert it into the
passed container. */
-virtual ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShape
-implConvertAndInsert( BiffDrawingBase rDrawing,
-const ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShapes rxShapes,
-const ::com::sun::star::awt::Rectangle rShapeRect
) const = 0;
-
-private:
-ShapeAnchor maAnchor; /// Position of the drawing object.
-sal_uInt16
[Libreoffice-commits] core.git: sc/inc
sc/inc/formulagroup.hxx |1 + 1 file changed, 1 insertion(+) New commits: commit 7a741ac6dbfb579c28520911d4c11fafd7d48411 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Nov 13 17:09:36 2014 +0100 Missing include Change-Id: Ic94c452802c5171d1557bc78a74ea1a700db512f diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx index d507cd5..3c2c282 100644 --- a/sc/inc/formulagroup.hxx +++ b/sc/inc/formulagroup.hxx @@ -18,6 +18,7 @@ #include formula/opcode.hxx #include svl/sharedstringpool.hxx +#include set #include vector #include boost/noncopyable.hpp #include boost/ptr_container/ptr_vector.hpp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
minutes of ESC call ...
* Present: + Muthu, cloph, Markus, Lionel, Eike, Norbert, Stephan, Kendy, Michael M, Robinson, JMux, David T, Kohei, Michael S, Ptyl * Completed Action Items: + commit UX default tweak to master (Kendy) + mention calc sorting issue in the 4.2.7 / 4.3.3 release notes (Cloph) + build pre-canned downloadable VM's for Tolouse (Cloph) [ VirtualBox images - still up-loading cloud based VM is running re-building ] + look at sorting spreadsheet / use-cases etc. (Eike) cf. https://bugs.freedesktop.org/show_bug.cgi?id=85490 ] [ some progress, Luke did some good work on JBF's doc. several use-cases where things are different, further fixes expected for 4.3.next+1 4.2.x new ? perhaps when we have most important ones fixed ] + update on student projects from A Coruña University (Jacobo) [ as below ] * Pending Action Items: + look at regressions associated with a SUSE bugzilla bugfix (Timar) * Release Engineering update (Cloph) + 4.3.4 RC1 status + available on the web-site, since Tues for general public. + plan to announce on Friday. + ignoring Mac / senddoc script fix for now. + ~60 bug fixes. + 4.3.5 RC1 due in 2 weeks (previously called 4.3.4) + just re-numbered the schedule + have nice chart - Thunderbird/elsewhere mail/HTML copy/paste patch (Muthu) + review appreciated: https://gerrit.libreoffice.org/#/c/11911/ + 4.4.0 Beta 1 / Feature Freeze / adjust ? + Recent Features ( fun ? ) + Image lifecycle re-work (Tamas) + an OpenCL subset for whitelisted drivers by default (Tor) + mail merge should be faster and correct for more documents (JMux, LLunak) + Lateish Feature collection: + expat - libxml2 sax2 - 10% ? (Lubos) + merging in the next few days. + OpenGL rendering for Windows by default for good drivers (various) + CloudOn really waiting for the OpenGL work (Ptyl) + threaded package2 / zipping (Matus) + threaded XLS[X] XclExpRow export win - ~20% (Michael) + bogus image compression avoidance (Matus) + calc bulk sliding window dep. tracking (Kohei) + ongoing gerrit patch submissions + chart related patches in gerrit - fear factor (Kohei) + a queue of UX guys patches - modifying toolbars (Moggi) + good review before the feature freeze. + hackfest in Toulouse... + Android / iOS Remote * Crashtest update (Markus) + futures / Manitu ordering update ? + working on script to analyse results + a number of image-format import crashers + TIFF other misc. obscure binary formats + hopefully with new server - can run 1x per month with asan to get memory protection issues sorted out. + XML / validation numbers: + much improved over time (thanks to Eike, Markus, Michael S) + one element Sun/Oracle forgot to include in the std. in 1.0 + written by every version of OO.o / LibreOffice - 30% of Calc validation errors. + investigated 2x elements: very old problems from OO.o (Michael S) + docx import crashers mostly gone; otherwise similar. + more files included in the runs now; 64k docs on import. * Hackfests + Toulouse Hackfest [ This Weekend ! ] (Arnaud) + Confirmed for Nov. 15-16th + more details: https://wiki.documentfoundation.org/Hackfest/Toulouse2014 + budget reserved (Eur 2k) - poke Bjoern. + Munich hack-fest [ Next Weekend ! ] (Jan-Marek): http://www.it-muenchen-blog.de/2014/07/bug-squashing-party-2014/ + jmux (IRC) can add you if you don't want to create an account + will have a BSP come-together; if someone says they're coming just show up etc. + November 21st-23rd, 2014 https://wiki.debian.org/BSP/2014/11/de/Munich + 35 or so registrations - looking fun. + Need further offers [!] ... (Bjoern) + propose Collabora / Cambridge (Michael) + should consider Las Palmas de Gran Canaria/University again (Bjoern) + Freiburg - also an option (prolly better in summer anyway (Bjoern) * FOSDEM bits + https://penta.fosdem.org/submission/FOSDEM15 + 20 minute slots (good to collect talks) + please consider filing by mid. December ! + Volunteer needed to book / run the hackfest afterwards. * library bloat (Michael S) + not really an issue for release builds - --enable-mergelibs + big library + --enable-symbols - OOM + especially problematic CppuniTests with use_library_objects + perhaps a barrier to entry to new developers + Calc: (with debuginfo) 4.1 - 413Mb, 4.3 - 512Mb, master - 600Mb (stripped)4.3 - 26.8Mb master - 30Mb +
[Libreoffice-commits] core.git: sd/source
sd/source/ui/animations/CustomAnimationDialog.cxx |3 ++-
sd/source/ui/animations/CustomAnimationPane.cxx | 17 -
2 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 236819ecfa38360aa72d1061808b20204a0af594
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Nov 3 23:28:43 2014 +0100
Resolves fdo#85750: Custom Animation timeing does not retain settings
Conflicts:
sd/source/ui/animations/CustomAnimationPane.cxx
Change-Id: Id6bbd113630348493ed1e67da72c7a42c5188b44
Reviewed-on: https://gerrit.libreoffice.org/12236
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx
b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 82dd8a7..1da5de8 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1811,6 +1811,7 @@ void CustomAnimationDurationTabPage::update(
STLPropertySet* pSet )
{
case 0:
break;
+
case 6:
{
Event aEvent;
@@ -1824,7 +1825,7 @@ void CustomAnimationDurationTabPage::update(
STLPropertySet* pSet )
break;
default:
{
-OUString aText( mpCBRepeat-GetText() );
+OUString aText(mpCBRepeat-GetEntry(nPos));
if( !aText.isEmpty() )
aRepeatCount = aText.toDouble();
}
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx
b/sd/source/ui/animations/CustomAnimationPane.cxx
index 8f0d8ae..b7087f9 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -131,19 +131,18 @@ void fillDurationComboBox( ListBox* pBox )
void fillRepeatComboBox( ListBox* pBox )
{
OUString aNone( SD_RESSTR( STR_CUSTOMANIMATION_REPEAT_NONE ) );
-pBox-SetEntryData( pBox-InsertEntry( aNone ),
reinterpret_castvoid*((sal_Int32)0) );
-
-pBox-SetEntryData( pBox-InsertEntry( OUString::number( 2 ) ),
reinterpret_castvoid*((sal_Int32)1) );
-pBox-SetEntryData( pBox-InsertEntry( OUString::number( 3 ) ),
reinterpret_castvoid*((sal_Int32)3) );
-pBox-SetEntryData( pBox-InsertEntry( OUString::number( 4 ) ),
reinterpret_castvoid*((sal_Int32)4) );
-pBox-SetEntryData( pBox-InsertEntry( OUString::number( 5 ) ),
reinterpret_castvoid*((sal_Int32)5) );
-pBox-SetEntryData( pBox-InsertEntry( OUString::number( 10 ) ),
reinterpret_castvoid*((sal_Int32)10) );
+pBox-InsertEntry(aNone);
+pBox-InsertEntry(OUString::number(2));
+pBox-InsertEntry(OUString::number(3));
+pBox-InsertEntry(OUString::number(4));
+pBox-InsertEntry(OUString::number(5));
+pBox-InsertEntry(OUString::number(10));
OUString aUntilClick( SD_RESSTR(
STR_CUSTOMANIMATION_REPEAT_UNTIL_NEXT_CLICK ) );
-pBox-SetEntryData( pBox-InsertEntry( aUntilClick ),
reinterpret_castvoid*((sal_Int32)-1) );
+pBox-InsertEntry(aUntilClick);
OUString aEndOfSlide( SD_RESSTR(
STR_CUSTOMANIMATION_REPEAT_UNTIL_END_OF_SLIDE ) );
-pBox-SetEntryData( pBox-InsertEntry( aEndOfSlide ),
reinterpret_castvoid*((sal_Int32)-2) );
+pBox-InsertEntry(aEndOfSlide);
}
CustomAnimationPane::CustomAnimationPane( Window* pParent, ViewShellBase
rBase,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/filter/xml/xmlcelli.cxx | 18 ++
1 file changed, 10 insertions(+), 8 deletions(-)
New commits:
commit 14609e342936225ddd1fcbd9874672ca36440bfe
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 13 10:22:08 2014 +
valgrind: check return of convertDateTime before using fDate
lots of spew in VALGRIND=memcheck make CppunitTest_writerperfect_calc
Change-Id: I8b95e95218beefe19e881c9d055323d0abec49c7
(cherry picked from commit 3150ae30415c1253258829dd3d39c015e75c6171)
Reviewed-on: https://gerrit.libreoffice.org/12403
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/sc/source/filter/xml/xmlcelli.cxx
b/sc/source/filter/xml/xmlcelli.cxx
index d8d409a..182f751 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -935,14 +935,16 @@ void ScXMLTableRowCellContext::SetAnnotation(const
ScAddress rPos)
if( pNote )
{
double fDate;
-rXMLImport.GetMM100UnitConverter().convertDateTime( fDate,
mxAnnotationData-maCreateDate );
-SvNumberFormatter* pNumForm = pDoc-GetFormatTable();
-sal_uInt32 nfIndex = pNumForm-GetFormatIndex( NF_DATE_SYS_DDMM,
LANGUAGE_SYSTEM );
-OUString aDate;
-Color* pColor = 0;
-Color** ppColor = pColor;
-pNumForm-GetOutputString( fDate, nfIndex, aDate, ppColor );
-pNote-SetDate( aDate );
+if (rXMLImport.GetMM100UnitConverter().convertDateTime(fDate,
mxAnnotationData-maCreateDate))
+{
+SvNumberFormatter* pNumForm = pDoc-GetFormatTable();
+sal_uInt32 nfIndex = pNumForm-GetFormatIndex(
NF_DATE_SYS_DDMM, LANGUAGE_SYSTEM );
+OUString aDate;
+Color* pColor = 0;
+Color** ppColor = pColor;
+pNumForm-GetOutputString( fDate, nfIndex, aDate, ppColor );
+pNote-SetDate( aDate );
+}
pNote-SetAuthor( mxAnnotationData-maAuthor );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: autogen.sh
autogen.sh | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 1e03a686a386314be25520dc70e7be01d0f7193b
Author: Michael Meeks michael.me...@collabora.com
Date: Thu Nov 13 16:27:30 2014 +
autogen: add --best-effort to help automation bridge option changes.
When we add or deprecate configure --with / --enable options lots
of scripts can break. Instead just add --best-effort to your autogen.sh
command line to get warnings but not a failure in this case.
Change-Id: I73d6ba53ee179384c2e34bf6780d074b04f70c06
diff --git a/autogen.sh b/autogen.sh
index 1a1a2d4..cdf4e76 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -161,6 +161,10 @@ die Failed to generate the configure script if (! -f
configure);
# Handle help arguments first, so we don't clobber autogen.lastrun
for my $arg (@ARGV) {
if ($arg =~ /^(--help|-h|-\?)$/) {
+print STDERR autogen.sh - libreoffice configuration helper\n;
+print STDERR--cleanforcibly re-generate configuration\n;
+print STDERR--best-effort don't fail on un-known configure
with/enable options\n;
+print STDERR \nOther arguments passed directly to configure:\n\n;
system (./configure --help);
exit;
}
@@ -203,6 +207,8 @@ WARNING
my @args;
my $default_config = $src_path/distro-configs/default.conf;
+my $option_checking = 'fatal';
+
if (-f $default_config) {
print STDERR Reading default config file: $default_config.\n;
push @args, read_args ($default_config);
@@ -217,6 +223,8 @@ for my $arg (@cmdline_args) {
} else {
push @args, read_args ($config);
}
+} elsif ($arg =~ m/--best-effort$/) {
+$option_checking = 'warn';
} else {
push @args, $arg;
}
@@ -252,7 +260,7 @@ if (defined $ENV{NOCONFIGURE}) {
}
}
push @args, --srcdir=$src_path;
-push @args, --enable-option-checking=fatal;
+push @args, --enable-option-checking=$option_checking;
print Running ./configure with ' . join (' ', @args), '\n;
system (./configure, @args) die Error running configure;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - svx/source
svx/source/table/svdotable.cxx | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 5839f0c4b98b37327a80b3fbe66d3b28459737b0
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 13 13:32:35 2014 +
impress table layout cache returns wrong rectangle
the layouter can modify its input rectangle to grow
it to the necessary size to contain the layout
but we're returning the input rectangle when the inputs are the same as the
last call, not returning the output rectangle.
cache the output rect for a given input and return that
so now insert-table in impress and tab so extra cells are added and
then select the table and the blue border contains the whole
table, not just the first two rows
(cherry picked from commit 98cd2671f0a215ced6203372ac673e2380031ac0)
Change-Id: I4f09594d82c1597204afbd059e175af9bf8e2527
Reviewed-on: https://gerrit.libreoffice.org/12406
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index d49cfb3..fbd532a 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -244,7 +244,8 @@ public:
virtual bool isInUse() SAL_OVERRIDE;
private:
static SdrTableObjImpl* lastLayoutTable;
-static Rectangle lastLayoutRectangle;
+static Rectangle lastLayoutInputRectangle;
+static Rectangle lastLayoutResultRectangle;
static bool lastLayoutFitWidth;
static bool lastLayoutFitHeight;
static WritingMode lastLayoutMode;
@@ -253,7 +254,8 @@ private:
};
SdrTableObjImpl* SdrTableObjImpl::lastLayoutTable = NULL;
-Rectangle SdrTableObjImpl::lastLayoutRectangle;
+Rectangle SdrTableObjImpl::lastLayoutInputRectangle;
+Rectangle SdrTableObjImpl::lastLayoutResultRectangle;
bool SdrTableObjImpl::lastLayoutFitWidth;
bool SdrTableObjImpl::lastLayoutFitHeight;
WritingMode SdrTableObjImpl::lastLayoutMode;
@@ -696,14 +698,14 @@ void SdrTableObjImpl::LayoutTable( Rectangle rArea, bool
bFitWidth, bool bFitHe
// Optimization: SdrTableObj::SetChanged() can call this very often,
repeatedly
// with the same settings, noticeably increasing load time. Skip if
already done.
WritingMode writingMode = mpTableObj-GetWritingMode();
-if( lastLayoutTable != this || lastLayoutRectangle != rArea
+if( lastLayoutTable != this || lastLayoutInputRectangle != rArea
|| lastLayoutFitWidth != bFitWidth || lastLayoutFitHeight !=
bFitHeight
|| lastLayoutMode != writingMode
|| lastRowCount != getRowCount()
|| lastColCount != getColumnCount() )
{
lastLayoutTable = this;
-lastLayoutRectangle = rArea;
+lastLayoutInputRectangle = rArea;
lastLayoutFitWidth = bFitWidth;
lastLayoutFitHeight = bFitHeight;
lastLayoutMode = writingMode;
@@ -711,6 +713,11 @@ void SdrTableObjImpl::LayoutTable( Rectangle rArea, bool
bFitWidth, bool bFitHe
lastColCount = getColumnCount();
TableModelNotifyGuard aGuard( mxTable.get() );
mpLayouter-LayoutTable( rArea, bFitWidth, bFitHeight );
+lastLayoutResultRectangle = rArea;
+}
+else
+{
+rArea = lastLayoutResultRectangle;
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/config/StoredChapterNumbering.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a378fe877302a06141fd517c35a738ccd0967874
Author: Michael Stahl mst...@redhat.com
Date: Thu Nov 13 20:50:27 2014 +0100
coverity#1251590: fascinating what sort of nonsense works by accident
Change-Id: I23704604ed2d041075caff4254074e83ae229402
diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx
b/sw/source/uibase/config/StoredChapterNumbering.cxx
index eb8ae2f..646676c 100644
--- a/sw/source/uibase/config/StoredChapterNumbering.cxx
+++ b/sw/source/uibase/config/StoredChapterNumbering.cxx
@@ -371,7 +371,7 @@ public:
}
else if (XML_NAMESPACE_STYLE == nPrefix IsXMLToken(rLocalName,
XML_STYLE))
{
-new StoredChapterNumberingDummyStyleContext(
+return new StoredChapterNumberingDummyStyleContext(
GetImport(), nPrefix, rLocalName, xAttrList);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/wintextrender.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit 7e6205117d535905b46c0106e66e5e3b593ee813 Author: Michael Stahl mst...@redhat.com Date: Thu Nov 13 21:18:26 2014 +0100 vcl: remove non-existent include and hope that it builds? Change-Id: Iabe375773caea89ab631e6b2aa1926e0d39cd19a diff --git a/vcl/inc/wintextrender.hxx b/vcl/inc/wintextrender.hxx index 90b0561..0647980 100644 --- a/vcl/inc/wintextrender.hxx +++ b/vcl/inc/wintextrender.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_VCL_INC_WINTEXTRENDER_HXX #define INCLUDED_VCL_INC_WINTEXTRENDER_HXX -#include tools/rational.hxx #include vcl/salgtype.hxx #include vcl/sysdata.hxx #include vcl/vclenum.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/svx sd/source svx/source
include/svx/svdotable.hxx |2 +-
include/svx/svdotext.hxx |2 +-
sd/source/ui/animations/CustomAnimationDialog.cxx |1 +
svx/source/svdraw/svdotext.cxx|3 +--
svx/source/table/svdotable.cxx| 14 ++
svx/source/unodraw/unoshtxt.cxx |2 +-
6 files changed, 7 insertions(+), 17 deletions(-)
New commits:
commit 98d311c651347a49f73e8e316be30887e5a99751
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 13 20:54:50 2014 +
limit width of list whose text can grow to silly widths
Change-Id: I982602e829bbf3f2efccfcafae67d22df8daa2e9
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx
b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 1da5de8..2e0272f 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1595,6 +1595,7 @@
CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(vcl::Window* pPar
get(mpRBClickSequence, rb_click_sequence );
get(mpRBInteractive, rb_interactive );
get(mpLBTrigger, trigger_list);
+mpLBTrigger-set_width_request(approximate_char_width() * 40);
fillRepeatComboBox( mpCBRepeat );
fillDurationComboBox( mpCBDuration );
commit c376ecbc9614ccaa4f4392c287d0d1c731c3aa77
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 13 14:12:00 2014 +
Realy-Really
that's really bugging me
Change-Id: Id15bd4dc42748b3cb24eb891741195499c5df9c3
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx
index 2594a35..df738c2 100644
--- a/include/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
@@ -178,7 +178,7 @@ public:
bool IsTextEditActive( const sdr::table::CellPos rPos );
/** returns true only if we are in edit mode and the user actually changed
anything */
-virtual bool IsRealyEdited() const SAL_OVERRIDE;
+virtual bool IsReallyEdited() const SAL_OVERRIDE;
// Gleichzeitig wird der Text in den Outliner gesetzt (ggf.
// der des EditOutliners) und die PaperSize gesetzt.
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index c7a5850..ef8e0f1 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -363,7 +363,7 @@ public:
virtual sal_Int32 getTextCount() const SAL_OVERRIDE;
/** returns true only if we are in edit mode and the user actually changed
anything */
-virtual bool IsRealyEdited() const;
+virtual bool IsReallyEdited() const;
/** changes the current active text */
virtual void setActiveText( sal_Int32 nIndex );
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 4ef80f6..d15e642 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1759,12 +1759,11 @@ void SdrTextObj::TRSetBaseGeometry(const
basegfx::B2DHomMatrix rMatrix, const b
}
}
-bool SdrTextObj::IsRealyEdited() const
+bool SdrTextObj::IsReallyEdited() const
{
return pEdtOutl pEdtOutl-IsModified();
}
-
// moved inlines here form hxx
long SdrTextObj::GetEckenradius() const
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 9617904..ce05325 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -693,7 +693,7 @@ void SdrTableObjImpl::LayoutTable( Rectangle rArea, bool
bFitWidth, bool bFitHe
// Optimization: SdrTableObj::SetChanged() can call this very often,
repeatedly
// with the same settings, noticeably increasing load time. Skip if
already done.
bool bInteractiveMightGrowBecauseTextChanged =
-mpTableObj-IsRealyEdited() (mpTableObj-IsAutoGrowHeight() ||
mpTableObj-IsAutoGrowHeight());
+mpTableObj-IsReallyEdited() (mpTableObj-IsAutoGrowHeight() ||
mpTableObj-IsAutoGrowHeight());
WritingMode writingMode = mpTableObj-GetWritingMode();
if( bInteractiveMightGrowBecauseTextChanged
|| lastLayoutTable != this || lastLayoutInputRectangle != rArea
@@ -2097,8 +2097,6 @@ bool
SdrTableObj::TRGetBaseGeometry(basegfx::B2DHomMatrix rMatrix, basegfx::B2D
return SdrTextObj::TRGetBaseGeometry( rMatrix, rPolyPolygon );
}
-
-
// sets the base geometry of the object using infos contained in the homogen
3x3 matrix.
// If it's an SdrPathObj it will use the provided geometry information. The
Polygon has
// to use (0,0) as upper left and will be scaled to the given size in the
matrix.
@@ -2107,22 +2105,16 @@ void SdrTableObj::TRSetBaseGeometry(const
basegfx::B2DHomMatrix rMatrix, const
SdrTextObj::TRSetBaseGeometry( rMatrix, rPolyPolygon );
}
-
-
-bool SdrTableObj::IsRealyEdited() const
+bool SdrTableObj::IsReallyEdited() const
{
return pEdtOutl pEdtOutl-IsModified();
}
-
-
bool SdrTableObj::IsFontwork() const
{
return false;
}
-
-
sal_uInt32 SdrTableObj::GetHdlCount()
[Libreoffice-commits] core.git: Branch 'feature/perfwork5' - sc/inc sc/source
sc/inc/sharedformula.hxx | 14 ++
sc/source/core/data/documentimport.cxx | 18 +-
sc/source/core/tool/sharedformula.cxx | 13 +
3 files changed, 40 insertions(+), 5 deletions(-)
New commits:
commit 81116b30b2884f7270be442c675f51ac23e0719f
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Nov 12 13:15:13 2014 -0500
Differentiate shared and non-shared formula cells when registering.
For now this is just for a pure redirection, but later we'll use this
to do a different area listening registration for grouped formula cells.
Change-Id: I8e68bb53c3e96821175ae562ef36ec5e800c8688
diff --git a/sc/inc/sharedformula.hxx b/sc/inc/sharedformula.hxx
index b29843f..e1799bf 100644
--- a/sc/inc/sharedformula.hxx
+++ b/sc/inc/sharedformula.hxx
@@ -17,6 +17,8 @@
namespace sc {
+class StartListeningContext;
+
class SharedFormulaUtil
{
public:
@@ -109,6 +111,18 @@ public:
* @param rRows row positions at which to unshare formula cells.
*/
static void unshareFormulaCells(CellStoreType rCells, std::vectorSCROW
rRows);
+
+/**
+ * Have all formula cells belonging to a group start listening to their
+ * references.
+ *
+ * @param rCxt context object.
+ * @param ppSharedTop memory position of the pointer of the topmost
+ *formula cell instance in the cell storage. The
+ *caller is responsible for ensuring that it is indeed
+ *the topmost cell of a shared formula group.
+ */
+static void startListeningAsGroup( StartListeningContext rCxt,
ScFormulaCell** ppSharedTop );
};
}
diff --git a/sc/source/core/data/documentimport.cxx
b/sc/source/core/data/documentimport.cxx
index ed46752..02242cb 100644
--- a/sc/source/core/data/documentimport.cxx
+++ b/sc/source/core/data/documentimport.cxx
@@ -21,6 +21,7 @@
#include paramisc.hxx
#include listenercontext.hxx
#include attarray.hxx
+#include sharedformula.hxx
#include svl/sharedstringpool.hxx
#include svl/languageoptions.hxx
@@ -558,12 +559,19 @@ public:
if (node.type == sc::element_type_formula)
{
// Have all formula cells start listening to the document.
-sc::formula_block::iterator it =
sc::formula_block::begin(*node.data);
-sc::formula_block::iterator itEnd =
sc::formula_block::end(*node.data);
-for (; it != itEnd; ++it)
+ScFormulaCell** pp = sc::formula_block::at(*node.data, 0);
+ScFormulaCell** ppEnd = pp + node.size;
+for (; pp != ppEnd; ++pp)
{
-ScFormulaCell rFC = **it;
-rFC.StartListeningTo(mrDocImpl.maListenCxt);
+ScFormulaCell rFC = **pp;
+if (rFC.IsSharedTop())
+{
+// Register formula cells as a group.
+
sc::SharedFormulaUtil::startListeningAsGroup(mrDocImpl.maListenCxt, pp);
+pp += rFC.GetSharedLength() - 1; // Move to the last one
in the group.
+}
+else
+rFC.StartListeningTo(mrDocImpl.maListenCxt);
}
}
}
diff --git a/sc/source/core/tool/sharedformula.cxx
b/sc/source/core/tool/sharedformula.cxx
index 6f66365..65d91a73 100644
--- a/sc/source/core/tool/sharedformula.cxx
+++ b/sc/source/core/tool/sharedformula.cxx
@@ -326,6 +326,19 @@ void SharedFormulaUtil::unshareFormulaCells(CellStoreType
rCells, std::vectorS
splitFormulaCellGroups(rCells, aRows2);
}
+void SharedFormulaUtil::startListeningAsGroup( sc::StartListeningContext
rCxt, ScFormulaCell** ppSharedTop )
+{
+assert((**ppSharedTop).IsSharedTop());
+
+ScFormulaCell** pp = ppSharedTop;
+ScFormulaCell** ppEnd = ppSharedTop + (**ppSharedTop).GetSharedLength();
+for (; pp != ppEnd; ++pp)
+{
+ScFormulaCell rFC = **pp;
+rFC.StartListeningTo(rCxt);
+}
+}
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 10 commits - svtools/source vcl/opengl vcl/source vcl/unx
svtools/source/graphic/grfmgr.cxx|2 +-
vcl/opengl/salbmp.cxx|8
vcl/opengl/x11/gdiimpl.cxx |5 +++--
vcl/source/fontsubset/sft.cxx|2 +-
vcl/unx/generic/gdi/gdiimpl.cxx |9 +++--
vcl/unx/generic/gdi/salgdi.cxx |2 +-
vcl/unx/generic/gdi/salgdi2.cxx |8
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 13 ++---
8 files changed, 23 insertions(+), 26 deletions(-)
New commits:
commit 124b666538dce60ff30b274f7809776cbb358e93
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 13 21:13:09 2014 +
coverity#1251593 Unintended sign extension
Change-Id: I4374672040b3c6314c4356abe95ee1fb15f568cf
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 871b669..5a98d34 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -204,7 +204,7 @@ bool OpenGLSalBitmap::AllocateUserData()
{
try
{
-maUserBuffer.reset( new sal_uInt8[mnBytesPerRow * mnHeight] );
+maUserBuffer.reset( new
sal_uInt8[static_castsal_uInt32(mnBytesPerRow) * mnHeight] );
alloc = true;
}
catch (const std::bad_alloc ) {}
commit 8eb8175db8ba33e7bde15011f31de20a84a6e56f
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 13 21:11:15 2014 +
coverity#1251592 Dereference before null check
Change-Id: Ia69bb21080ab7a42a0b9f9871f72ab696b6098ed
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx
index 4adea62..0088028 100644
--- a/vcl/unx/generic/gdi/gdiimpl.cxx
+++ b/vcl/unx/generic/gdi/gdiimpl.cxx
@@ -167,13 +167,10 @@ X11Pixmap* X11SalGraphicsImpl::GetPixmapFromScreen( const
Rectangle rRect )
rRect.GetWidth(), rRect.GetHeight(),
24 );
GC aTmpGC = XCreateGC( pDpy, pPixmap-GetPixmap(), 0, NULL );
-if( !pPixmap || !aTmpGC )
+if (!aTmpGC)
{
-if ( pPixmap )
-delete pPixmap;
-if ( aTmpGC )
-XFreeGC( pDpy, aTmpGC );
-SAL_WARN( vcl, Could not get valid pixmap from screen );
+delete pPixmap;
+SAL_WARN( vcl, Could not get valid GC from screen );
return NULL;
}
commit 64f3c4fe478f0e2478fead92506f592d5401bf33
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 13 21:09:23 2014 +
coverity#1251591 Resource leak
Change-Id: Ieab948d11da7f56b2273637ff3caaefec86030d1
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 2473297..9c11cd9 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -870,7 +870,7 @@ bool GtkSalGraphics::drawNativeControl(ControlType
nType,
clipList aClip;
GdkDrawable* gdkDrawable = GDK_DRAWABLE( GetGdkWindow() );
-GdkX11Pixmap* pixmap = NULL;
+std::unique_ptrGdkX11Pixmap xPixmap;
Rectangle aPixmapRect;
if( ( bNeedPixmapPaint )
nType != CTRL_SCROLLBAR
@@ -885,10 +885,10 @@ bool GtkSalGraphics::drawNativeControl(ControlType
nType,
// outside the rectangle, see e.g. checkbox
aPixmapRect = Rectangle( Point( aCtrlRect.Left()-1, aCtrlRect.Top()-1
),
Size( aCtrlRect.GetWidth()+2,
aCtrlRect.GetHeight()+2) );
-pixmap = NWGetPixmapFromScreen( aPixmapRect );
-if( ! pixmap )
+xPixmap.reset(NWGetPixmapFromScreen(aPixmapRect));
+if (!xPixmap)
return false;
-gdkDrawable = pixmap-GetGdkDrawable();
+gdkDrawable = xPixmap-GetGdkDrawable();
aCtrlRect = Rectangle( Point(1,1), aCtrlRect.GetSize() );
aClip.push_back( aCtrlRect );
}
@@ -1022,10 +1022,9 @@ bool GtkSalGraphics::drawNativeControl(ControlType
nType,
returnVal = NWPaintGTKArrow( gdkDrawable, nType, nPart, aCtrlRect,
aClip, nState, aValue, rCaption );
}
-if( pixmap )
+if( xPixmap )
{
-returnVal = NWRenderPixmapToScreen( pixmap, aPixmapRect ) returnVal;
-delete pixmap;
+returnVal = NWRenderPixmapToScreen(xPixmap.get(), aPixmapRect)
returnVal;
}
return( returnVal );
commit 900b202bb6a9e79c51327a8a157d04241ce4fdf3
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 13 21:06:51 2014 +
coverity#1251588 Unchecked dynamic_cast
Change-Id: Ic6f287b5ee4f4ac3a9674d67b8c15a589405c951
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index 62cf796..768e596 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -85,8 +85,8 @@ void X11SalGraphics::CopyScreenArea( Display* pDisplay,
X11Pixmap* X11SalGraphics::GetPixmapFromScreen( const Rectangle rRect )
{
-X11GraphicsImpl* pImpl = dynamic_castX11GraphicsImpl*(mpImpl.get());
-return pImpl-GetPixmapFromScreen( rRect );
+X11GraphicsImpl rImpl =
[Libreoffice-commits] core.git: 9 commits - framework/source sd/source vcl/inc vcl/opengl vcl/workben
framework/source/uiconfiguration/imagemanagerimpl.cxx |7 +-
framework/source/uiconfiguration/imagemanagerimpl.hxx |2
sd/source/ui/presenter/SlideRenderer.cxx |3
sd/source/ui/presenter/SlideRenderer.hxx |2
vcl/inc/openglgdiimpl.hxx |1
vcl/opengl/salbmp.cxx | 12 +++
vcl/workben/outdevgrind.cxx | 57 +++---
vcl/workben/vcldemo.cxx | 23 ++-
8 files changed, 72 insertions(+), 35 deletions(-)
New commits:
commit ee0f878da903f5054a03f526160bc6958c876128
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 13 21:28:05 2014 +
coverity#1251596 Uncaught exception
Change-Id: I02b7abcd9ee17158ee063b2c9b6d0324eef70801
diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index cbcd1c5..528eae3 100644
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.cxx
@@ -909,38 +909,51 @@ int GrindApp::Main()
SAL_IMPLEMENT_MAIN()
{
-bool bHelp = false;
-
-for( sal_uInt16 i = 0; i Application::GetCommandLineParamCount(); i++ )
+try
{
-OUString aParam = Application::GetCommandLineParam( i );
+bool bHelp = false;
-if( aParam == --help || aParam == -h )
-bHelp = true;
-}
+for( sal_uInt16 i = 0; i Application::GetCommandLineParamCount();
i++ )
+{
+OUString aParam = Application::GetCommandLineParam( i );
-if( bHelp )
-{
-printf( outdevgrind - Profile OutputDevice\n );
-return EXIT_SUCCESS;
-}
+if( aParam == --help || aParam == -h )
+bHelp = true;
+}
+
+if( bHelp )
+{
+printf( outdevgrind - Profile OutputDevice\n );
+return EXIT_SUCCESS;
+}
-tools::extendApplicationEnvironment();
+tools::extendApplicationEnvironment();
-uno::Reference uno::XComponentContext xContext =
cppu::defaultBootstrap_InitialComponentContext();
-uno::Reference lang::XMultiServiceFactory xServiceManager(
xContext-getServiceManager(), uno::UNO_QUERY );
+uno::Reference uno::XComponentContext xContext =
cppu::defaultBootstrap_InitialComponentContext();
+uno::Reference lang::XMultiServiceFactory xServiceManager(
xContext-getServiceManager(), uno::UNO_QUERY );
-if( !xServiceManager.is() )
-Application::Abort( Failed to bootstrap );
+if( !xServiceManager.is() )
+Application::Abort( Failed to bootstrap );
-comphelper::setProcessServiceFactory( xServiceManager );
+comphelper::setProcessServiceFactory( xServiceManager );
-InitVCL();
+InitVCL();
-GrindApp aGrindApp;
-aGrindApp.Main();
+GrindApp aGrindApp;
+aGrindApp.Main();
-DeInitVCL();
+DeInitVCL();
+}
+catch (const css::uno::Exception e)
+{
+SAL_WARN(vcl.app, Fatal exception: e.Message);
+return EXIT_FAILURE;
+}
+catch (const std::exception e)
+{
+SAL_WARN(vcl.app, Fatal exception: e.what());
+return EXIT_FAILURE;
+}
return EXIT_SUCCESS;
}
commit 5b7497e5aad80774167a6c1f050aabe429280918
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 13 21:24:46 2014 +
coverity#1251600 Uncaught exception
and
coverity#1251597 Uncaught exception
coverity#1251598 Uncaught exception
coverity#1251599 Uncaught exception
Change-Id: Ifd14f1db5692a8f3ccd1d9ea45d8f0e16c4b0324
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 46538cb..e56d95c 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -730,10 +730,23 @@ public:
virtual int Main() SAL_OVERRIDE
{
-DemoWin aMainWin;
-aMainWin.SetText( Interactive VCL demo );
-aMainWin.Show();
-Application::Execute();
+try
+{
+DemoWin aMainWin;
+aMainWin.SetText( Interactive VCL demo );
+aMainWin.Show();
+Application::Execute();
+}
+catch (const css::uno::Exception e)
+{
+SAL_WARN(vcl.app, Fatal exception: e.Message);
+return 1;
+}
+catch (const std::exception e)
+{
+SAL_WARN(vcl.app, Fatal exception: e.what());
+return 1;
+}
return 0;
}
commit 0b10bac9138fe560f9d108adaa7a875f78dd8ea7
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 13 21:22:49 2014 +
coverity#1251605 Uninitialized scalar field
Change-Id: I5f18bd7bcd332e28df9dcec43b9dedc664290aec
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index b5d2ccc..46538cb 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -79,6 +79,8 @@ public:
, mnSelectedRenderer(-1)
,
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - 4 commits - vcl/inc vcl/Library_vcl.mk vcl/win
vcl/Library_vcl.mk |1
vcl/inc/cairotextrender.hxx |2
vcl/inc/opengl/win/gdiimpl.hxx |1
vcl/inc/textrender.hxx |7
vcl/inc/win/salgdi.h | 24 ++
vcl/inc/win/salvd.h |3
vcl/inc/wintextrender.hxx| 140 -
vcl/win/source/gdi/salgdi.cxx| 30 ++
vcl/win/source/gdi/salgdi3.cxx | 131 ++---
vcl/win/source/gdi/salvd.cxx | 15 -
vcl/win/source/gdi/winlayout.cxx | 352 +++
vcl/win/source/gdi/winlayout.hxx | 229 ++
vcl/win/source/gdi/wintextrender.cxx | 64 --
13 files changed, 432 insertions(+), 567 deletions(-)
New commits:
commit 1e6046d87440a860a3d1704226fd86f960d9e11c
Author: Jan Holesovsky ke...@collabora.com
Date: Thu Nov 13 23:53:34 2014 +0100
windows opengl: Proof-of-concept text rendering.
We don't have a method that would paint a texture with transparency yet. We
also need to limit the size of the DIBSection exactly to what we are going
to
paint, no point in creating a huge bitmap that is mostly empty (but the part
where is the text being drawn).
Change-Id: Ice0bf325743d08e19e636be73cef6aff3cde5704
diff --git a/vcl/inc/opengl/win/gdiimpl.hxx b/vcl/inc/opengl/win/gdiimpl.hxx
index aa29dd9..085be79 100644
--- a/vcl/inc/opengl/win/gdiimpl.hxx
+++ b/vcl/inc/opengl/win/gdiimpl.hxx
@@ -17,6 +17,7 @@
class WinOpenGLSalGraphicsImpl : public OpenGLSalGraphicsImpl
{
+friend class WinLayout;
private:
WinSalGraphics mrParent;
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 69ea4cf..5e4d32f 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -146,6 +146,7 @@ class WinSalGraphics : public SalGraphics
{
friend class WinSalGraphicsImpl;
friend class ScopedFont;
+friend class WinLayout;
private:
boost::scoped_ptrSalGraphicsImpl mpImpl;
diff --git a/vcl/inc/win/salvd.h b/vcl/inc/win/salvd.h
index 546a1f0..2c59f47 100644
--- a/vcl/inc/win/salvd.h
+++ b/vcl/inc/win/salvd.h
@@ -51,8 +51,11 @@ public:
virtual voidReleaseGraphics( SalGraphics* pGraphics );
virtual boolSetSize( long nNewDX, long nNewDY );
virtual voidGetSize( long rWidth, long rHeight );
+
+static HBITMAP ImplCreateVirDevBitmap(HDC hDC, long nDX, long nDY,
sal_uInt16 nBitCount, void **ppDummy);
};
+
#endif // INCLUDED_VCL_INC_WIN_SALVD_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/win/source/gdi/salvd.cxx b/vcl/win/source/gdi/salvd.cxx
index 2269deb..2b00c03 100644
--- a/vcl/win/source/gdi/salvd.cxx
+++ b/vcl/win/source/gdi/salvd.cxx
@@ -27,14 +27,14 @@
#include win/salgdi.h
#include win/salvd.h
-static HBITMAP ImplCreateVirDevBitmap( HDC hDC, long nDX, long nDY,
- sal_uInt16 nBitCount )
+HBITMAP WinSalVirtualDevice::ImplCreateVirDevBitmap(HDC hDC, long nDX, long
nDY, sal_uInt16 nBitCount, void **ppData)
{
HBITMAP hBitmap;
if ( nBitCount == 1 )
{
hBitmap = CreateBitmap( (int)nDX, (int)nDY, 1, 1, NULL );
+ ppData = NULL;
}
else
{
@@ -55,9 +55,8 @@ static HBITMAP ImplCreateVirDevBitmap( HDC hDC, long nDX,
long nDY,
aBitmapInfo.bmiHeader.biClrUsed = 0;
aBitmapInfo.bmiHeader.biClrImportant = 0;
- void* pDummy;
hBitmap = CreateDIBSection( hDC, aBitmapInfo,
- DIB_RGB_COLORS, pDummy, NULL,
+ DIB_RGB_COLORS, ppData, NULL,
0 );
}
@@ -87,8 +86,8 @@ SalVirtualDevice* WinSalInstance::CreateVirtualDevice(
SalGraphics* pSGraphics,
if( !hDC )
ImplWriteLastError( GetLastError(), CreateCompatibleDC in
CreateVirtualDevice );
-hBmp= ImplCreateVirDevBitmap( pGraphics-getHDC(),
-nDX, nDY, nBitCount );
+void *pDummy;
+hBmp =
WinSalVirtualDevice::ImplCreateVirDevBitmap(pGraphics-getHDC(), nDX, nDY,
nBitCount, pDummy);
if( !hBmp )
ImplWriteLastError( GetLastError(), ImplCreateVirDevBitmap in
CreateVirtualDevice );
// #124826# continue even if hBmp could not be created
@@ -198,8 +197,8 @@ bool WinSalVirtualDevice::SetSize( long nDX, long nDY )
return TRUE;// ???
else
{
-HBITMAP hNewBmp = ImplCreateVirDevBitmap( getHDC(), nDX, nDY,
- mnBitCount );
+void *pDummy;
+HBITMAP hNewBmp = ImplCreateVirDevBitmap(getHDC(), nDX, nDY,
mnBitCount, pDummy);
if ( hNewBmp )
{
SelectBitmap( getHDC(), hNewBmp );
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index b63e0fa..2bdc8e3 100644
---
[Libreoffice-commits] core.git: 5 commits - vcl/inc vcl/Library_vcl.mk vcl/win
vcl/Library_vcl.mk |1
vcl/inc/cairotextrender.hxx |2
vcl/inc/opengl/win/gdiimpl.hxx |1
vcl/inc/textrender.hxx |7
vcl/inc/win/salgdi.h | 24 ++
vcl/inc/win/salvd.h |3
vcl/inc/wintextrender.hxx| 139 -
vcl/win/source/gdi/salgdi.cxx| 30 ++
vcl/win/source/gdi/salgdi3.cxx | 131 ++---
vcl/win/source/gdi/salvd.cxx | 15 -
vcl/win/source/gdi/winlayout.cxx | 352 +++
vcl/win/source/gdi/winlayout.hxx | 229 ++
vcl/win/source/gdi/wintextrender.cxx | 64 --
13 files changed, 432 insertions(+), 566 deletions(-)
New commits:
commit 19ad91f7bc7ca96c55e0ca3450608f616f87c4ed
Author: Jan Holesovsky ke...@collabora.com
Date: Thu Nov 13 23:53:34 2014 +0100
windows opengl: Proof-of-concept text rendering.
We don't have a method that would paint a texture with transparency yet. We
also need to limit the size of the DIBSection exactly to what we are going
to
paint, no point in creating a huge bitmap that is mostly empty (but the part
where is the text being drawn).
Change-Id: Ice0bf325743d08e19e636be73cef6aff3cde5704
diff --git a/vcl/inc/opengl/win/gdiimpl.hxx b/vcl/inc/opengl/win/gdiimpl.hxx
index aa29dd9..085be79 100644
--- a/vcl/inc/opengl/win/gdiimpl.hxx
+++ b/vcl/inc/opengl/win/gdiimpl.hxx
@@ -17,6 +17,7 @@
class WinOpenGLSalGraphicsImpl : public OpenGLSalGraphicsImpl
{
+friend class WinLayout;
private:
WinSalGraphics mrParent;
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 69ea4cf..5e4d32f 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -146,6 +146,7 @@ class WinSalGraphics : public SalGraphics
{
friend class WinSalGraphicsImpl;
friend class ScopedFont;
+friend class WinLayout;
private:
boost::scoped_ptrSalGraphicsImpl mpImpl;
diff --git a/vcl/inc/win/salvd.h b/vcl/inc/win/salvd.h
index 546a1f0..2c59f47 100644
--- a/vcl/inc/win/salvd.h
+++ b/vcl/inc/win/salvd.h
@@ -51,8 +51,11 @@ public:
virtual voidReleaseGraphics( SalGraphics* pGraphics );
virtual boolSetSize( long nNewDX, long nNewDY );
virtual voidGetSize( long rWidth, long rHeight );
+
+static HBITMAP ImplCreateVirDevBitmap(HDC hDC, long nDX, long nDY,
sal_uInt16 nBitCount, void **ppDummy);
};
+
#endif // INCLUDED_VCL_INC_WIN_SALVD_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/win/source/gdi/salvd.cxx b/vcl/win/source/gdi/salvd.cxx
index 2269deb..2b00c03 100644
--- a/vcl/win/source/gdi/salvd.cxx
+++ b/vcl/win/source/gdi/salvd.cxx
@@ -27,14 +27,14 @@
#include win/salgdi.h
#include win/salvd.h
-static HBITMAP ImplCreateVirDevBitmap( HDC hDC, long nDX, long nDY,
- sal_uInt16 nBitCount )
+HBITMAP WinSalVirtualDevice::ImplCreateVirDevBitmap(HDC hDC, long nDX, long
nDY, sal_uInt16 nBitCount, void **ppData)
{
HBITMAP hBitmap;
if ( nBitCount == 1 )
{
hBitmap = CreateBitmap( (int)nDX, (int)nDY, 1, 1, NULL );
+ ppData = NULL;
}
else
{
@@ -55,9 +55,8 @@ static HBITMAP ImplCreateVirDevBitmap( HDC hDC, long nDX,
long nDY,
aBitmapInfo.bmiHeader.biClrUsed = 0;
aBitmapInfo.bmiHeader.biClrImportant = 0;
- void* pDummy;
hBitmap = CreateDIBSection( hDC, aBitmapInfo,
- DIB_RGB_COLORS, pDummy, NULL,
+ DIB_RGB_COLORS, ppData, NULL,
0 );
}
@@ -87,8 +86,8 @@ SalVirtualDevice* WinSalInstance::CreateVirtualDevice(
SalGraphics* pSGraphics,
if( !hDC )
ImplWriteLastError( GetLastError(), CreateCompatibleDC in
CreateVirtualDevice );
-hBmp= ImplCreateVirDevBitmap( pGraphics-getHDC(),
-nDX, nDY, nBitCount );
+void *pDummy;
+hBmp =
WinSalVirtualDevice::ImplCreateVirDevBitmap(pGraphics-getHDC(), nDX, nDY,
nBitCount, pDummy);
if( !hBmp )
ImplWriteLastError( GetLastError(), ImplCreateVirDevBitmap in
CreateVirtualDevice );
// #124826# continue even if hBmp could not be created
@@ -198,8 +197,8 @@ bool WinSalVirtualDevice::SetSize( long nDX, long nDY )
return TRUE;// ???
else
{
-HBITMAP hNewBmp = ImplCreateVirDevBitmap( getHDC(), nDX, nDY,
- mnBitCount );
+void *pDummy;
+HBITMAP hNewBmp = ImplCreateVirDevBitmap(getHDC(), nDX, nDY,
mnBitCount, pDummy);
if ( hNewBmp )
{
SelectBitmap( getHDC(), hNewBmp );
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 4351883c..a5945da 100644
---
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - 3 commits - vcl/inc vcl/win
vcl/inc/win/salgdi.h |6 --
vcl/win/source/gdi/salgdi.cxx|9 +
vcl/win/source/gdi/salgdi3.cxx |6 --
vcl/win/source/gdi/winlayout.cxx |2 --
4 files changed, 1 insertion(+), 22 deletions(-)
New commits:
commit 151fdd5e4990389c2c2ceb3e69fb64d0e438db40
Author: Jan Holesovsky ke...@collabora.com
Date: Fri Nov 14 00:47:42 2014 +0100
vcl: Fix leak.
Change-Id: I201e50060c44bba3c0eb20026be1daccd3b2e945
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index e5735bd..b920a50 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -615,7 +615,7 @@ WinSalGraphics::~WinSalGraphics()
// delete cache data
delete [] mpStdClipRgnData;
-delete mpFontKernPairs;
+delete [] mpFontKernPairs;
}
bool WinSalGraphics::isPrinter() const
commit 5da6b157bf669482f71fdffe83d0ce6f1a44f938
Author: Jan Holesovsky ke...@collabora.com
Date: Fri Nov 14 00:46:26 2014 +0100
vcl: mpFontCharSets is never set.
Change-Id: Ic9102dabe9a74e7ad2aaa5c8cad2bae1b2c7b1ec
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index d26e0e6..82cfb38 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -121,9 +121,6 @@ private:
mutable const Ucs2SIntMap* mpEncodingVector;
mutable vcl::FontCapabilities maFontCapabilities;
-// TODO: get rid of the members below needed to work with the Win9x
non-unicode API
-BYTE* mpFontCharSets; // all Charsets for the
current font (used on W98 for kerning)
-BYTEmnFontCharSetCount; // Number of Charsets of the
current font; 0 - if not queried
BYTEmeWinCharSet;
BYTEmnPitchAndFamily;
boolmbAliasSymbolsHigh;
@@ -171,8 +168,6 @@ private:
RGNDATA*mpClipRgnData; // ClipRegion-Data
RGNDATA*mpStdClipRgnData; // Cache
Standard-ClipRegion-Data
ImplFontAttrCache* mpFontAttrCache;// Cache font attributes from
files in so/share/fonts
-BYTE* mpFontCharSets; // All Charsets for the
current font
-BYTEmnFontCharSetCount; // Number of Charsets of the
current font; 0 - if not queried
boolmbFontKernInit; // FALSE: FontKerns must be
queried
KERNINGPAIR*mpFontKernPairs;// Kerning Pairs of the
current Font
sal_uIntPtr mnFontKernPairCount;// Number of Kerning Pairs
of the current Font
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index 0a33c77..e5735bd 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -581,9 +581,7 @@ WinSalGraphics::WinSalGraphics(WinSalGraphics::Type eType,
bool bScreen, HWND hW
mhDefFont(0),
mhDefPal(0),
mpStdClipRgnData(NULL),
-mpFontCharSets(NULL),
mpFontAttrCache(NULL),
-mnFontCharSetCount(0),
mpFontKernPairs(NULL),
mnFontKernPairCount(0),
mbFontKernInit(false),
@@ -617,8 +615,6 @@ WinSalGraphics::~WinSalGraphics()
// delete cache data
delete [] mpStdClipRgnData;
-delete mpFontCharSets;
-
delete mpFontKernPairs;
}
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index f3933d9..ba3f5d7e 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -1098,8 +1098,6 @@ ImplWinFontData::ImplWinFontData( const
ImplDevFontAttributes rDFS,
mbFontCapabilitiesRead( false ),
mpUnicodeMap( NULL ),
mpEncodingVector( NULL ),
-mpFontCharSets( NULL ),
-mnFontCharSetCount( 0 ),
meWinCharSet( eWinCharSet ),
mnPitchAndFamily( nPitchAndFamily ),
mbAliasSymbolsHigh( false ),
@@ -1135,8 +1133,6 @@ ImplWinFontData::ImplWinFontData( const
ImplDevFontAttributes rDFS,
ImplWinFontData::~ImplWinFontData()
{
-delete[] mpFontCharSets;
-
if( mpUnicodeMap )
mpUnicodeMap = 0;
#if ENABLE_GRAPHITE
@@ -1586,8 +1582,6 @@ sal_uInt16 WinSalGraphics::SetFont( FontSelectPattern*
pFont, int nFallbackLevel
mnFontKernPairCount = 0;
}
-mnFontCharSetCount = 0;
-
// some printers have higher internal resolution, so their
// text output would be different from what we calculated
// = suggest DrawTextArray to workaround this problem
commit 24f357d0b2b4ef4c2c3a8a469d7c73cac8b20501
Author: Jan Holesovsky ke...@collabora.com
Date: Fri Nov 14 00:42:55 2014 +0100
vcl: mpLogFont is never set.
Change-Id: I2ea287da7448c5094eb13a3083c7c0f82ed25760
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 5e4d32f..d26e0e6 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -170,7 +170,6 @@ private:
COLORREFmnTextColor;// TextColor
RGNDATA*mpClipRgnData; // ClipRegion-Data
RGNDATA*mpStdClipRgnData; //
[Libreoffice-commits] core.git: 3 commits - vcl/inc vcl/win
vcl/inc/win/salgdi.h |6 --
vcl/win/source/gdi/salgdi.cxx|9 +
vcl/win/source/gdi/salgdi3.cxx |6 --
vcl/win/source/gdi/winlayout.cxx |2 --
4 files changed, 1 insertion(+), 22 deletions(-)
New commits:
commit a2bba429fa4328d17818cbafe5229655b11e5c33
Author: Jan Holesovsky ke...@collabora.com
Date: Fri Nov 14 00:47:42 2014 +0100
vcl: Fix leak.
Change-Id: I201e50060c44bba3c0eb20026be1daccd3b2e945
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index 22478b8..195d14c 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -612,7 +612,7 @@ WinSalGraphics::~WinSalGraphics()
// delete cache data
delete [] mpStdClipRgnData;
-delete mpFontKernPairs;
+delete [] mpFontKernPairs;
}
bool WinSalGraphics::isPrinter() const
commit 82eb3121a1a18b1c5bcc136f70adc5e506389d41
Author: Jan Holesovsky ke...@collabora.com
Date: Fri Nov 14 00:46:26 2014 +0100
vcl: mpFontCharSets is never set.
Change-Id: Ic9102dabe9a74e7ad2aaa5c8cad2bae1b2c7b1ec
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index d26e0e6..82cfb38 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -121,9 +121,6 @@ private:
mutable const Ucs2SIntMap* mpEncodingVector;
mutable vcl::FontCapabilities maFontCapabilities;
-// TODO: get rid of the members below needed to work with the Win9x
non-unicode API
-BYTE* mpFontCharSets; // all Charsets for the
current font (used on W98 for kerning)
-BYTEmnFontCharSetCount; // Number of Charsets of the
current font; 0 - if not queried
BYTEmeWinCharSet;
BYTEmnPitchAndFamily;
boolmbAliasSymbolsHigh;
@@ -171,8 +168,6 @@ private:
RGNDATA*mpClipRgnData; // ClipRegion-Data
RGNDATA*mpStdClipRgnData; // Cache
Standard-ClipRegion-Data
ImplFontAttrCache* mpFontAttrCache;// Cache font attributes from
files in so/share/fonts
-BYTE* mpFontCharSets; // All Charsets for the
current font
-BYTEmnFontCharSetCount; // Number of Charsets of the
current font; 0 - if not queried
boolmbFontKernInit; // FALSE: FontKerns must be
queried
KERNINGPAIR*mpFontKernPairs;// Kerning Pairs of the
current Font
sal_uIntPtr mnFontKernPairCount;// Number of Kerning Pairs
of the current Font
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index 1424f40..22478b8 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -578,9 +578,7 @@ WinSalGraphics::WinSalGraphics(WinSalGraphics::Type eType,
bool bScreen, HWND hW
mhDefFont(0),
mhDefPal(0),
mpStdClipRgnData(NULL),
-mpFontCharSets(NULL),
mpFontAttrCache(NULL),
-mnFontCharSetCount(0),
mpFontKernPairs(NULL),
mnFontKernPairCount(0),
mbFontKernInit(false),
@@ -614,8 +612,6 @@ WinSalGraphics::~WinSalGraphics()
// delete cache data
delete [] mpStdClipRgnData;
-delete mpFontCharSets;
-
delete mpFontKernPairs;
}
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index f3933d9..ba3f5d7e 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -1098,8 +1098,6 @@ ImplWinFontData::ImplWinFontData( const
ImplDevFontAttributes rDFS,
mbFontCapabilitiesRead( false ),
mpUnicodeMap( NULL ),
mpEncodingVector( NULL ),
-mpFontCharSets( NULL ),
-mnFontCharSetCount( 0 ),
meWinCharSet( eWinCharSet ),
mnPitchAndFamily( nPitchAndFamily ),
mbAliasSymbolsHigh( false ),
@@ -1135,8 +1133,6 @@ ImplWinFontData::ImplWinFontData( const
ImplDevFontAttributes rDFS,
ImplWinFontData::~ImplWinFontData()
{
-delete[] mpFontCharSets;
-
if( mpUnicodeMap )
mpUnicodeMap = 0;
#if ENABLE_GRAPHITE
@@ -1586,8 +1582,6 @@ sal_uInt16 WinSalGraphics::SetFont( FontSelectPattern*
pFont, int nFallbackLevel
mnFontKernPairCount = 0;
}
-mnFontCharSetCount = 0;
-
// some printers have higher internal resolution, so their
// text output would be different from what we calculated
// = suggest DrawTextArray to workaround this problem
commit 265203da403585aa8d2f881d95a0c85fd302ba05
Author: Jan Holesovsky ke...@collabora.com
Date: Fri Nov 14 00:42:55 2014 +0100
vcl: mpLogFont is never set.
Change-Id: I2ea287da7448c5094eb13a3083c7c0f82ed25760
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 5e4d32f..d26e0e6 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -170,7 +170,6 @@ private:
COLORREFmnTextColor;// TextColor
RGNDATA*mpClipRgnData; // ClipRegion-Data
RGNDATA*mpStdClipRgnData; //
[Libreoffice-commits] core.git: 2 commits - basic/source cui/source dbaccess/source desktop/source drawinglayer/source editeng/source filter/source include/oox include/svtools include/svx include/vcl
basic/source/runtime/methods1.cxx |1 cui/source/tabpages/grfpage.cxx |1 dbaccess/source/ui/inc/JoinController.hxx |1 desktop/source/lib/init.cxx |1 drawinglayer/source/primitive2d/metafileprimitive2d.cxx |1 editeng/source/editeng/impedit.hxx |1 filter/source/graphicfilter/eos2met/eos2met.cxx |1 filter/source/graphicfilter/epict/epict.cxx |1 filter/source/graphicfilter/eps/eps.cxx |1 filter/source/graphicfilter/ios2met/ios2met.cxx |1 filter/source/graphicfilter/ipict/ipict.cxx |1 filter/source/graphicfilter/ipsd/ipsd.cxx |1 filter/source/graphicfilter/itiff/itiff.cxx |1 include/oox/export/shapes.hxx |1 include/svtools/ruler.hxx |1 include/svx/sdr/overlay/overlaymanager.hxx |1 include/svx/svdetc.hxx |1 include/svx/svdmodel.hxx|1 include/vcl/gfxlink.hxx |1 include/vcl/mapmod.hxx | 54 +++- sd/source/filter/eppt/epptbase.hxx |1 sd/source/ui/inc/animobjs.hxx |1 sd/source/ui/inc/copydlg.hxx|1 sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx |1 sfx2/source/doc/objembed.cxx|1 svtools/source/brwbox/brwbox1.cxx |1 svtools/source/brwbox/brwbox2.cxx |1 svtools/source/brwbox/datwin.cxx|1 svtools/source/control/ctrltool.cxx |1 svtools/source/filter/DocumentToGraphicRenderer.cxx |2 svtools/source/filter/exportdialog.cxx |1 svtools/source/graphic/grfmgr.cxx |1 svtools/source/graphic/provider.cxx |1 svtools/source/misc/imap.cxx|1 svx/source/dialog/pagectrl.cxx |1 svx/source/fmcomp/gridctrl.cxx |1 svx/source/sdr/overlay/overlaymanagerbuffered.cxx |1 svx/source/sdr/properties/itemsettools.cxx |1 svx/source/sidebar/possize/PosSizePropertyPanel.hxx |1 svx/source/svdraw/svdfmtf.hxx |1 sw/source/core/docnode/ndnotxt.cxx |1 sw/source/core/graphic/ndgrf.cxx|1 sw/source/core/layout/anchoreddrawobject.cxx|1 sw/source/core/view/pagepreviewlayout.cxx |1 sw/source/core/view/viewpg.cxx |1 sw/source/filter/html/htmlflywriter.cxx |1 sw/source/uibase/frmdlg/colex.cxx |1 sw/source/uibase/inc/pview.hxx |1 toolkit/source/awt/vclxtoolkit.cxx |1 toolkit/source/awt/vclxwindow.cxx |1 vcl/inc/window.h|1 vcl/source/filter/graphicfilter.cxx |1 vcl/source/filter/graphicfilter2.cxx|1 vcl/source/filter/jpeg/JpegReader.cxx |1 vcl/source/filter/sgfbram.cxx |1 vcl/source/filter/sgvmain.cxx |1 vcl/source/filter/sgvtext.cxx |1 vcl/source/filter/wmf/emfwr.cxx |1 vcl/source/filter/wmf/winmtf.cxx|1 vcl/source/filter/wmf/winwmf.cxx|1 vcl/source/filter/wmf/wmfwr.cxx |1 vcl/source/gdi/cvtsvm.cxx |1 vcl/source/gdi/dibtools.cxx |1 vcl/source/gdi/gdimtf.cxx |1 vcl/source/gdi/impgraph.cxx |1 vcl/source/gdi/mapmod.cxx | 53 +-- vcl/source/gdi/pdfwriter_impl.cxx |1 vcl/source/gdi/pdfwriter_impl2.cxx |2 vcl/source/gdi/textlayout.cxx |1 vcl/source/outdev/map.cxx | 11 +-- 70 files changed, 132 insertions(+), 55 deletions(-) New commits: commit f9a161f89a00f2f706ec85b66ab994d1dbea89df Author: Michael Stahl mst...@redhat.com Date: Fri Nov 14 00:39:57 2014 +0100 vcl: remove more unnecessary headers from mapmod.hxx Change-Id: I9ce4c11cc9e7e703fbaad76a062ad38bb900ed9a diff --git a/include/svx/sdr/overlay/overlaymanager.hxx
[Libreoffice-commits] core.git: Branch 'feature/perfwork5' - sc/inc sc/source
sc/inc/column.hxx| 10 +++-- sc/inc/document.hxx | 15 +-- sc/inc/table.hxx |9 +++- sc/source/core/data/column.cxx | 23 +++ sc/source/core/data/column3.cxx | 17 +--- sc/source/core/data/document.cxx | 77 ++- sc/source/core/data/table2.cxx | 12 +++--- 7 files changed, 125 insertions(+), 38 deletions(-) New commits: commit 32624ea130d2ad066c187dace9a884e48c885423 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Thu Nov 13 20:14:27 2014 -0500 Reduce duplicate broadcasting done when pasting a range of cells from clip. We do pasting from clip in 2 steps: 1) delete the destination range, then 2) paste the content onto the destination range. The old code would broadcast both during 1) and 2). This change consolidates them and do broadcasting only once at the end, and also avoids broadcasting the same cell twice, which the old code sometimes did. Change-Id: Ic524c2b70888ce158619d99cbfb55dea85870497 diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index d1ec1de..4e8bb00 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -230,8 +230,11 @@ public: bool TestInsertRow( SCROW nStartRow, SCSIZE nSize ) const; voidInsertRow( SCROW nStartRow, SCSIZE nSize ); voidDeleteRow( SCROW nStartRow, SCSIZE nSize ); + void DeleteArea( -SCROW nStartRow, SCROW nEndRow, InsertDeleteFlags nDelFlag, bool bBroadcast = true ); +SCROW nStartRow, SCROW nEndRow, InsertDeleteFlags nDelFlag, +bool bBroadcast = true, sc::ColumnSpanSet* pBroadcastSpans = NULL ); + void DeleteRanges( const std::vectorsc::RowSpan rRanges, InsertDeleteFlags nDelFlag, bool bBroadcast ); void CopyToClip( @@ -347,7 +350,8 @@ public: bool IsFormulaDirty( SCROW nRow ) const; void SetAllFormulasDirty( const sc::SetFormulaDirtyContext rCxt ); -voidSetDirty( SCROW nRow1, SCROW nRow2 ); +void BroadcastInArea( SCROW nRow1, SCROW nRow2, sc::ColumnSpanSet rBroadcastSpans ); +void SetDirty( SCROW nRow1, SCROW nRow2 ); voidSetDirtyVar(); voidSetDirtyAfterLoad(); voidSetTableOpDirty( const ScRange ); @@ -644,7 +648,7 @@ private: void DeleteCells( sc::ColumnBlockPosition rBlockPos, SCROW nRow1, SCROW nRow2, InsertDeleteFlags nDelFlag, -std::vectorSCROW rDeleted ); +std::vectorSCROW rDeleted, sc::ColumnSpanSet* pDeletedSpans = NULL ); /** * Get all non-grouped formula cells and formula cell groups in the whole diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 3974b47..9f6ab2c 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -1204,8 +1204,11 @@ public: const ScMarkData rMark ); voidDeleteObjectsInSelection( const ScMarkData rMark ); -voidDeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, -const ScMarkData rMark, InsertDeleteFlags nDelFlag); +void DeleteArea( +SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData rMark, +InsertDeleteFlags nDelFlag, bool bBroadcast = true, +sc::ColumnSpanSet* pBroadcastSpans = NULL ); + SC_DLLPUBLIC void DeleteAreaTab(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCTAB nTab, InsertDeleteFlags nDelFlag); voidDeleteAreaTab(const ScRange rRange, InsertDeleteFlags nDelFlag); @@ -1253,9 +1256,11 @@ public: voidStartListeningFromClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData rMark, InsertDeleteFlags nInsFlag ); -voidBroadcastFromClip( SCCOL nCol1, SCROW nRow1, -SCCOL nCol2, SCROW nRow2, -const ScMarkData rMark, InsertDeleteFlags nInsFlag ); + +void BroadcastFromClip( +SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData rMark, +InsertDeleteFlags nInsFlag, sc::ColumnSpanSet rBroadcastSpans ); + /** If pDestRanges is given it overrides rDestRange, rDestRange in this case is the overall encompassing range. */ voidCopyFromClip( const ScRange rDestRange, const ScMarkData rMark, diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 0b5adfa..5a6f015 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -411,7 +411,10 @@ public: void DeleteCol( const sc::ColumnSet rRegroupCols, SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE nSize, bool* pUndoOutline = NULL ); -voidDeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, InsertDeleteFlags nDelFlag); +void DeleteArea( +SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - 6 commits - vcl/inc vcl/Library_vclplug_gen.mk vcl/opengl vcl/source vcl/unx vcl/win
vcl/Library_vclplug_gen.mk |1
vcl/inc/generic/genpspgraphics.h |1
vcl/inc/headless/svpgdi.hxx |1
vcl/inc/opengl/salbmp.hxx|7
vcl/inc/opengl/texture.hxx | 67 +---
vcl/inc/opengl/x11/gdiimpl.hxx |2
vcl/inc/openglgdiimpl.hxx| 12 -
vcl/inc/salgdi.hxx |3
vcl/inc/unx/pixmap.hxx | 24 +--
vcl/inc/unx/salgdi.h |5
vcl/inc/unx/x11/x11gdiimpl.h |2
vcl/inc/win/salgdi.h |1
vcl/opengl/gdiimpl.cxx | 125 +--
vcl/opengl/salbmp.cxx| 71 +++--
vcl/opengl/scale.cxx | 97 ++--
vcl/opengl/texture.cxx | 243 ++-
vcl/opengl/x11/gdiimpl.cxx | 32 +---
vcl/source/outdev/gradient.cxx |7
vcl/unx/generic/gdi/gdiimpl.cxx | 19 --
vcl/unx/generic/gdi/gdiimpl.hxx |2
vcl/unx/generic/gdi/pixmap.cxx | 54 --
vcl/unx/generic/gdi/salgdi.cxx |5
vcl/unx/generic/gdi/salgdi2.cxx |4
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 59 +++
vcl/unx/kde/salnativewidgets-kde.cxx | 140 +
vcl/win/source/gdi/salgdi.cxx|5
vcl/win/source/gdi/winlayout.cxx |2
27 files changed, 568 insertions(+), 423 deletions(-)
New commits:
commit f2354f58782c5fddcc8bdb9451b9bbf3cef211da
Author: Louis-Francis Ratté-Boulianne l...@collabora.com
Date: Thu Nov 13 21:38:58 2014 -0500
vcl: Make sure the offscreen texture is unique before rendering to it
Change-Id: I265ce62e983e6f44ba51675993c9ec1f071c160e
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index bb6e113..0d91d48 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -76,6 +76,8 @@ protected:
void ImplSetClipBit( const vcl::Region rClip, GLuint nMask );
+bool CheckOffscreenTexture();
+
bool CreateSolidProgram( void );
bool CreateTextureProgram( void );
bool CreateMaskedTextureProgram( void );
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 3dc4f9a..d05b08b 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -97,7 +97,7 @@ void OpenGLSalGraphicsImpl::PreDraw()
maContext.makeCurrent();
// TODO: lfrb: make sure the render target has the right size
if( mbOffscreen )
-glBindFramebuffer( GL_FRAMEBUFFER, mnFramebufferId );
+CheckOffscreenTexture();
glViewport( 0, 0, GetWidth(), GetHeight() );
if( mbUseScissor )
glEnable( GL_SCISSOR_TEST );
@@ -282,6 +282,28 @@ void OpenGLSalGraphicsImpl::SetOffscreen( bool bOffscreen )
CHECK_GL_ERROR();
}
+bool OpenGLSalGraphicsImpl::CheckOffscreenTexture()
+{
+glBindFramebuffer( GL_FRAMEBUFFER, mnFramebufferId );
+
+if( maOffscreenTex.IsUnique() )
+return true;
+
+SalTwoRect aPosAry;
+aPosAry.mnSrcX = aPosAry.mnDestX = 0;
+aPosAry.mnSrcY = aPosAry.mnDestY = 0;
+aPosAry.mnSrcWidth = aPosAry.mnDestWidth = GetWidth();
+aPosAry.mnSrcHeight = aPosAry.mnDestHeight = GetHeight();
+
+// TODO: lfrb: User GL_ARB_copy_image?
+OpenGLTexture aNewTex = OpenGLTexture( GetWidth(), GetHeight() );
+glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
GL_TEXTURE_2D, aNewTex.Id(), 0 );
+glViewport( 0, 0, GetWidth(), GetHeight() );
+DrawTexture( maOffscreenTex, aPosAry );
+
+return true;
+}
+
bool OpenGLSalGraphicsImpl::CreateSolidProgram( void )
{
SAL_INFO( vcl.opengl, ::CreateSolidProgram );
commit a031e11752521c996a50b4d9c271ef9fb0581edc
Author: Louis-Francis Ratté-Boulianne l...@collabora.com
Date: Thu Nov 13 21:37:54 2014 -0500
vcl: Improve OpenGLTexture implementation by allowing implicit sharing
Change-Id: I6421265325e72023d1affe671d75488185772786
diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx
index c1f0cdb..dbb29d8 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -40,7 +40,7 @@ class VCL_PLUGIN_PUBLIC OpenGLSalBitmap : public SalBitmap
{
private:
OpenGLContext* mpContext;
-OpenGLTextureSharedPtr mpTexture;
+OpenGLTexture maTexture;
boolmbDirtyTexture;
BitmapPalette maPalette;
basebmp::RawMemorySharedArray maUserBuffer;
@@ -81,9 +81,8 @@ public:
public:
-boolCreate( OpenGLContext rContext, OpenGLTextureSharedPtr
pTex, long nX, long nY, long nWidth, long nHeight );
-boolDraw( OpenGLContext rContext, const SalTwoRect rPosAry );
-GLuint GetTexture( OpenGLContext rContext ) const;
+boolCreate( OpenGLContext rContext, const OpenGLTexture
rTex, long
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - vcl/inc vcl/opengl vcl/unx vcl/win
vcl/inc/openglgdiimpl.hxx|4 +-
vcl/opengl/gdiimpl.cxx | 16 ++--
vcl/unx/generic/gdi/openglx11cairotextrender.cxx | 45 +--
vcl/win/source/gdi/winlayout.cxx |6 +--
4 files changed, 29 insertions(+), 42 deletions(-)
New commits:
commit eefe932a05e2d8744242a1a715c4cd963f796646
Author: Louis-Francis Ratté-Boulianne l...@collabora.com
Date: Thu Nov 13 22:24:35 2014 -0500
vcl: Add DrawAlphaTexture to directly render Cairo surface
Change-Id: I7aa824578b14999d0ef667a5bcfccd731f1d3b64
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index 0d91d48..65ec12e 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -85,6 +85,7 @@ protected:
bool CreateLinearGradientProgram( void );
bool CreateRadialGradientProgram( void );
+public:
void BeginSolid( SalColor nColor, sal_uInt8 nTransparency );
void BeginSolid( SalColor nColor, double fTransparency );
void BeginSolid( SalColor nColor );
@@ -103,12 +104,13 @@ protected:
void DrawPolyPolygon( const basegfx::B2DPolyPolygon rPolyPolygon );
void DrawTextureRect( OpenGLTexture rTexture, const SalTwoRect rPosAry,
bool bInverted = false );
void DrawTexture( OpenGLTexture rTexture, const SalTwoRect rPosAry, bool
bInverted = false );
+void DrawAlphaTexture( OpenGLTexture rTexture, const SalTwoRect rPosAry,
bool bInverted = false, bool pPremultiplied = false );
void DrawTextureWithMask( OpenGLTexture rTexture, OpenGLTexture rMask,
const SalTwoRect rPosAry );
void DrawMask( OpenGLTexture rTexture, SalColor nMaskColor, const
SalTwoRect rPosAry );
void DrawLinearGradient( const Gradient rGradient, const Rectangle rRect
);
void DrawRadialGradient( const Gradient rGradient, const Rectangle rRect
);
-protected:
+public:
// get the width of the device
virtual GLfloat GetWidth() const = 0;
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index d05b08b..0c47f33 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -670,6 +670,17 @@ void OpenGLSalGraphicsImpl::DrawTexture( OpenGLTexture
rTexture, const SalTwoRe
CHECK_GL_ERROR();
}
+void OpenGLSalGraphicsImpl::DrawAlphaTexture( OpenGLTexture rTexture, const
SalTwoRect rPosAry, bool bInverted, bool bPremultiplied )
+{
+glEnable( GL_BLEND );
+if( bPremultiplied )
+glBlendFunc( GL_ONE, GL_ONE_MINUS_SRC_ALPHA );
+else
+glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
+DrawTexture( rTexture, rPosAry, bInverted );
+glDisable( GL_BLEND );
+}
+
void OpenGLSalGraphicsImpl::DrawTextureWithMask( OpenGLTexture rTexture,
OpenGLTexture rMask, const SalTwoRect pPosAry )
{
if( mnMaskedTextureProgram == 0 )
@@ -1301,10 +1312,7 @@ bool OpenGLSalGraphicsImpl::drawAlphaBitmap(
SAL_INFO( vcl.opengl, ::drawAlphaBitmap );
PreDraw();
-glEnable( GL_BLEND );
-glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
-DrawTexture( rTexture, rPosAry );
-glDisable( GL_BLEND );
+DrawAlphaTexture( rTexture, rPosAry );
PostDraw();
CHECK_GL_ERROR();
diff --git a/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
b/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
index 36a76b0..38a7213 100644
--- a/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
@@ -9,6 +9,7 @@
#include openglx11cairotextrender.hxx
+#include openglgdiimpl.hxx
#include salbmp.hxx
#include vcl/salbtype.hxx
@@ -33,40 +34,8 @@ void OpenGLX11CairoTextRender::drawSurface(cairo_t* cr)
cairo_surface_t* pSurface = cairo_get_target(cr);
int nWidth = cairo_image_surface_get_width( pSurface );
int nHeight = cairo_image_surface_get_height( pSurface );
-SalBitmap* pBitmap = ImplGetSVData()-mpDefInst-CreateSalBitmap();
-pBitmap-Create(Size(nWidth, nHeight), 32, BitmapPalette());
-
cairo_surface_flush( pSurface );
-BitmapBuffer* pBuffer = pBitmap-AcquireBuffer(false);
unsigned char *pSrc = cairo_image_surface_get_data( pSurface );
-unsigned int nSrcStride = cairo_image_surface_get_stride( pSurface );
-unsigned int nDestStride = pBuffer-mnScanlineSize;
-for( unsigned long y = 0; y (unsigned long) nHeight; y++ )
-{
-// Cairo surface is y-inverse
-sal_uInt32 *pSrcPix = (sal_uInt32 *)(pSrc + nSrcStride * (nHeight - y
- 1));
-sal_uInt32 *pDestPix = (sal_uInt32 *)(pBuffer-mpBits + nDestStride *
y);
-for( unsigned long x = 0; x (unsigned long) nWidth; x++ )
-{
-sal_uInt8 nAlpha = (*pSrcPix 24);
-sal_uInt8 nR = (*pSrcPix 16) 0xff;
-sal_uInt8 nG = (*pSrcPix 8) 0xff;
-sal_uInt8 nB = *pSrcPix 0xff;
-if( nAlpha != 0 nAlpha != 255 )
-{
-// Cairo uses pre-multiplied alpha - we do not = re-multiply
-nR =
www.lists.freedesktop.org
Hi, I recently browsed through your business website and wanted to highlight some key points for consideration. I am sure it will complement your-SEO work to help your website attract only quality visitors and make it scale high on the search .engine results page (SERP) gradually. Would you be interested in receiving the details? Best regards, Morris Online-Strategist DOBOTICS MEDIA PTY LTD. Headquarters: Napier 4112, Hawke's Bay, New Zealand Branch Offices: Auckland | Christchurch | Wellington | Hamilton | Tauranga Dunedin Disclaimer: This e-mail is private and confidential. If you are not the intended recipient, please advise us by return e-mail immediately, and delete the e-mail and any attachments without using or disclosing the contents in any way. The views expressed in this e-mail are those of the author, and do not represent those of this company unless this is clearly indicated. You should scan this e-mail and any attachments for viruses. This company accepts no liability for any direct or indirect damage or loss resulting from the use of any attachments to this e-mail. All quotes received from Dobotics Media by email are informal and not binding until a formal quote is agreed upon by both the parties. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
On Thu, 13 Nov 2014 17:13:33 +0100, Michael Meeks michael.me...@collabora.com wrote: + look at sorting spreadsheet / use-cases etc. (Eike) cf. https://bugs.freedesktop.org/show_bug.cgi?id=85490 ] [ some progress, Luke did some good work on JBF's doc. several use-cases where things are different, further fixes expected for 4.3.next+1 4.2.x new ? perhaps when we have most important ones fixed ] ... does this mean that an extra 4.2.8 release is under consideration? the 4.2.x branche EOL is set to november 19th which is in less than 1 week ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Survey about updating trueWord of ZH-TW locale data
Hi , I noticed that there is a recent change to ZH-CN locale data merged to master branch from Gerrit news. ( ref. https://gerrit.libreoffice.org/#/c/12284/ ) I notcied that trueWord was changed from localized Chinese '真' or '假' into English 'true' or 'false'. I want to apply similar change to ZH-TW locale data. It affects entering formula in Calc a lot. For the other changes among the patch set, due to lack of understanding about the actual use case, I'd prefer to keep them untouched. If any ZH-TW developers here, please advice. Thanks. -- Mark Hung ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Childwindow slot missing
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Starting up 'swriter', 'scalc' or such I notice the following warnings systematically : | richard@omnis:/home/richard$ swriter | warn:sfx.control:101391:1:sfx2/source/control/dispatch.cxx:1505: | Childwindow slot missing: 10365 | warn:sfx.control:101391:1:sfx2/source/control/dispatch.cxx:1505: | Childwindow slot missing: 10365 | warn:sfx.control:101391:1:sfx2/source/control/dispatch.cxx:1505: | Childwindow slot missing: 10365 Searching bugzilla it seems I'm not alone, although it doesn't seem to be the primary topic. Is this a concern needing a specific issue to be filed? -BEGIN PGP SIGNATURE- Version: GnuPG v1 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBAgAGBQJUZZZQAAoJECAB22fHtp27pVoIAI4SruXFMqhGXuW4I2uVbR7t XuKkPGv23sm1TZQUEFrV8mgCmUqus6NnvxrrBPmtDwXooTvQ5eiGBfUC9b8RcEwy JgSpmz2nDlqN2F3A6upVKQWw5F9JhVP7Y0t7sU+x/lbDW0mOaBiNQKc3MHbFCjug QHx7tqguDV2cE0il2SWenOaXN88UmqErYgQtS2BtC1c0fO0ciMNdD5H8qDuYrlZ2 ZjsLj8pLKphi82tsvIejQrjPseUNaFvfZWwKWiHHdyjiNTgTqfza6Y0k+HF3HL6c 3BJNHKfjvuttapFpFKeClntdz9yodt0iAp8wZTjTo/hVfOe7exvzK5NetStB7tU= =5rFL -END PGP SIGNATURE- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/access/accmap.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 34b12a170e1b3264fa46a8996cc67e12e2fea947
Author: Takeshi Abe t...@fixedpoint.jp
Date: Fri Nov 14 14:47:15 2014 +0900
Mark as const
Change-Id: I3236bbbdddf819afb11d8f80dd80c92a04281bf9
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index c407114..6a153ff 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -245,8 +245,8 @@ public:
iterator begin() { return maMap.begin(); }
iterator end() { return maMap.end(); }
-const_iterator cbegin() { return maMap.cbegin(); }
-const_iterator cend() { return maMap.cend(); }
+const_iterator cbegin() const { return maMap.cbegin(); }
+const_iterator cend() const { return maMap.cend(); }
bool empty() const { return maMap.empty(); }
iterator find(const key_type key) { return maMap.find(key); }
std::pairiterator,bool insert(const value_type value ) { return
maMap.insert(value); }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice Gerrit News for core on 2014-11-14
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#86209 reorganized the view menu in impress and draw in https://gerrit.libreoffice.org/12421 from Yousuf Philips about module sd + fdo#81475 moving alignment buttons back to original place in https://gerrit.libreoffice.org/12420 from Yousuf Philips about module sw + fdo#85817 changed 'Document as Email' to 'Email Document' in https://gerrit.libreoffice.org/12419 from Yousuf Philips about module officecfg + TANGO: improve existing icons used in calc's toolbar and provide sources in https://gerrit.libreoffice.org/12418 from Yousuf Philips about module icon-themes + fdo#85594 moving merge cells to standard toolbar in https://gerrit.libreoffice.org/12417 from Yousuf Philips about module sc + fdo#75757: remove inheritance to std::map in https://gerrit.libreoffice.org/12401 from Juan Picca about module sw + fdo#86132 add useful tooltips to number formatting toolbar buttons in https://gerrit.libreoffice.org/12416 from Yousuf Philips about module sc + fdo#86183 set ctrl+shift+e to track changes and reassign edit mode in https://gerrit.libreoffice.org/12415 from Yousuf Philips about module officecfg + Patch for bug#86023 - O[U]String needs a 'clear' method, Added clear() me in https://gerrit.libreoffice.org/12391 from Brij Mohan Lal Srivastava about module accessibility, avmedia, basctl, basic, bridges, chart2, codemaker, comphelper, configmgr, connectivity, cui, dbaccess, desktop, editeng, embeddedobj, extensions, filter, forms, fpicker, framework, i18nlangtag, i18npool, idl, idlc, include, jvmfwk, l10ntools, linguistic, lotuswordpro, mysqlc, oox, package, registry, reportdesign, rsc, sc, sd, sdext, sfx2, starmath, stoc, svgio, svl, svtools, svx, sw, toolkit, tools, tubes, ucb, unodevtools, unotools, unoxml, vcl, writerfilter, xmlhelp, xmloff, xmlscript, xmlsecurity + Removed not-included-includes... in https://gerrit.libreoffice.org/12263 from Andrea Gelmini about module apple_remote, bridges, extensions, external, include, ios, sal, sc, sd, slideshow, stoc, svx, sw, vcl + Apache Commons Codec 1.9 at least requires Java 1.6 and non debug version in https://gerrit.libreoffice.org/12115 from Robert Antoni Buj i Gelonch about module external + Fraction: rewrite 'GetDenominator()==0' conditions in https://gerrit.libreoffice.org/12238 from Juan Picca about module include, svx + fdo#80403: Writer specific AutoCorr use FastParser in https://gerrit.libreoffice.org/12386 from Daniel Sikeler about module sw + revert change made in fdo#86040 as agreed on by design team in https://gerrit.libreoffice.org/12395 from Yousuf Philips about module officecfg + Don’t Save -- Don't Save. in https://gerrit.libreoffice.org/12399 from Kevin Suo about module sfx2 + fdo#86190 glmwrappers for bdhommatrix/affinematrix in https://gerrit.libreoffice.org/12379 from Michael Jaumann about module basegfx, include End of freshness + request single buffered context on windows in https://gerrit.libreoffice.org/12398 from Markus Mohrhard about module vcl + Cleanup parse-perfcheck.py in https://gerrit.libreoffice.org/12405 from Riccardo Magliocchetti about module bin + Replace internal jpeg with jpeg-turbo in https://gerrit.libreoffice.org/12402 from Matúš Kukan about module build, external, vcl * Merged changes on master for project core changed in the last 25 hours: + Resolves fdo#85750: Custom Animation timeing does not retain settings in https://gerrit.libreoffice.org/12236 from Julien Nabet + fdo#86252: Menu 'Merge Documents' is at wrong position in https://gerrit.libreoffice.org/12407 from Cor Nouws + calc performance test in https://gerrit.libreoffice.org/12218 from Laurent Godard + Apache Commons Logging 1.2 - re-enable the non debug version. in https://gerrit.libreoffice.org/12123 from Robert Antoni Buj i Gelonch + More HIG fixes for sw in https://gerrit.libreoffice.org/12400 from Adolfo Jayme Barrientos + fix connectivity unit test for --enable-mergedlibs in https://gerrit.libreoffice.org/12387 from Noel Grandin + fdo#75757: remove inheritance to std::map in https://gerrit.libreoffice.org/12385 from Juan Picca + fdo#85776 swap increase and decrease indent in sidebar in https://gerrit.libreoffice.org/12396 from Yousuf Philips + Remove unhelpful tooltips in https://gerrit.libreoffice.org/12397 from Adolfo Jayme Barrientos * 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#77569 - Add Choose Theme to Format Menu in https://gerrit.libreoffice.org/12275 from Joel Madero + Perftest for loading autocorrect dictionaries, related fdo#79761 in https://gerrit.libreoffice.org/11296 from Matúš Kukan + android: Show document browser back in the menu in
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - vcl/inc vcl/opengl
vcl/inc/openglgdiimpl.hxx|1
vcl/opengl/gdiimpl.cxx | 67 +++
vcl/opengl/linearGradientFragmentShader.glsl |2
3 files changed, 69 insertions(+), 1 deletion(-)
New commits:
commit fdbc95ee2a80b3660802cea5ac40e2032d78e15f
Author: Louis-Francis Ratté-Boulianne l...@collabora.com
Date: Fri Nov 14 01:16:28 2014 -0500
vcl: Implement axial gradients in OpenGL backend
Change-Id: I93b8c3c076c79d992d467b01ca5f5eca1ed626d3
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index 65ec12e..fa88a2a 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -108,6 +108,7 @@ public:
void DrawTextureWithMask( OpenGLTexture rTexture, OpenGLTexture rMask,
const SalTwoRect rPosAry );
void DrawMask( OpenGLTexture rTexture, SalColor nMaskColor, const
SalTwoRect rPosAry );
void DrawLinearGradient( const Gradient rGradient, const Rectangle rRect
);
+void DrawAxialGradient( const Gradient rGradient, const Rectangle rRect
);
void DrawRadialGradient( const Gradient rGradient, const Rectangle rRect
);
public:
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 0c47f33..09e80f8 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -772,6 +772,68 @@ void OpenGLSalGraphicsImpl::DrawLinearGradient( const
Gradient rGradient, const
CHECK_GL_ERROR();
}
+void OpenGLSalGraphicsImpl::DrawAxialGradient( const Gradient rGradient,
const Rectangle rRect )
+{
+if( mnLinearGradientProgram == 0 )
+{
+if( !CreateLinearGradientProgram() )
+return;
+}
+
+glUseProgram( mnLinearGradientProgram );
+
+Color aStartCol = rGradient.GetStartColor();
+Color aEndCol = rGradient.GetEndColor();
+long nFactor = rGradient.GetStartIntensity();
+glUniformColorIntensity( mnLinearGradientStartColorUniform, aStartCol,
nFactor );
+nFactor = rGradient.GetEndIntensity();
+glUniformColorIntensity( mnLinearGradientEndColorUniform, aEndCol, nFactor
);
+
+/**
+ * Draw two rectangles with linear gradient.
+ *
+ * 1 *---* 2
+ *| /|
+ *| / | Points 0 and 3 have start color
+ * 0 |/__| 3 Points 1, 2, 4 and 5 have end color
+ *|\ |
+ *| \ |
+ *| \|
+ * 5 *---* 4
+ *
+ */
+
+Rectangle aRect;
+Point aCenter;
+rGradient.GetBoundRect( rRect, aRect, aCenter );
+
+// determine points 0 and 3
+Point aPt0( aRect.Left(), (aRect.Top() + aRect.Bottom() + 1) / 2 );
+Point aPt3( aRect.Right(), (aRect.Top() + aRect.Bottom() + 1) / 2 );
+
+Polygon aPoly( 7 );
+aPoly.SetPoint( aPt0,0 );
+aPoly.SetPoint( aRect.TopLeft(), 1 );
+aPoly.SetPoint( aRect.TopRight(),2 );
+aPoly.SetPoint( aPt3,3 );
+aPoly.SetPoint( aRect.BottomRight(), 4 );
+aPoly.SetPoint( aRect.BottomLeft(), 5 );
+aPoly.SetPoint( aPt0,6 );
+aPoly.Rotate( aCenter, rGradient.GetAngle() % 3600 );
+
+GLfloat aTexCoord[12] = { 0, 1, 1, 0, 2, 0, 3, 1, 4, 0, 5, 0 };
+GLfloat fMin = 1.0 - 100.0 / (100.0 - rGradient.GetBorder());
+aTexCoord[3] = aTexCoord[5] = aTexCoord[9] = aTexCoord[11] = fMin;
+glEnableVertexAttribArray( GL_ATTRIB_TEX );
+glVertexAttribPointer( GL_ATTRIB_TEX, 2, GL_FLOAT, GL_FALSE, 0, aTexCoord
);
+
+DrawConvexPolygon( aPoly );
+
+glDisableVertexAttribArray( GL_ATTRIB_TEX );
+glUseProgram( 0 );
+CHECK_GL_ERROR();
+}
+
void OpenGLSalGraphicsImpl::DrawRadialGradient( const Gradient rGradient,
const Rectangle rRect )
{
if( mnRadialGradientProgram == 0 )
@@ -1365,6 +1427,7 @@ bool OpenGLSalGraphicsImpl::drawGradient(const
tools::PolyPolygon rPolyPoly,
return true;
if( rGradient.GetStyle() != GradientStyle_LINEAR
+rGradient.GetStyle() != GradientStyle_AXIAL
rGradient.GetStyle() != GradientStyle_RADIAL )
return false;
@@ -1402,6 +1465,10 @@ bool OpenGLSalGraphicsImpl::drawGradient(const
tools::PolyPolygon rPolyPoly,
{
DrawLinearGradient( rGradient, aBoundRect );
}
+else if( rGradient.GetStyle() == GradientStyle_AXIAL )
+{
+DrawAxialGradient( rGradient, aBoundRect );
+}
else if( rGradient.GetStyle() == GradientStyle_RADIAL )
{
DrawRadialGradient( rGradient, aBoundRect );
diff --git a/vcl/opengl/linearGradientFragmentShader.glsl
b/vcl/opengl/linearGradientFragmentShader.glsl
index 7b84c06..bd1137c 100644
--- a/vcl/opengl/linearGradientFragmentShader.glsl
+++ b/vcl/opengl/linearGradientFragmentShader.glsl
@@ -16,7 +16,7 @@ varying vec2 tex_coord;
void main(void)
{
-gl_FragColor = mix(start_color, end_color,
+gl_FragColor = mix(end_color, start_color,
clamp(tex_coord.t, 0.0, 1.0));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
Re: minutes of ESC call ...
On 2014-11-13 06:13 PM, Michael Meeks wrote: * library bloat (Michael S) + not really an issue for release builds - --enable-mergelibs + big library + --enable-symbols - OOM + especially problematic CppuniTests with use_library_objects + perhaps a barrier to entry to new developers + Calc: (with debuginfo) 4.1 - 413Mb, 4.3 - 512Mb, master - 600Mb (stripped)4.3 - 26.8Mb master - 30Mb + linking in parallel gives OOM issues. = avoid making libraries even bigger. + new calc engine uses lots of templates (Markus) + mdds usage is restricted to only a few modules: (Kohei) + 5-6 translation units only. + whole code-base is using lots more templates (Markus) + compilation speed also got more than 2x slower (Kohei) + use of own templates container - STL + recently turned a lot of methods to inline methods left/right (Kohei) Some suggestions: (1) Would it make a difference if I went through the *.hxx files, marking the inline methods with an explicit inline qualifier? (2) Perhaps we need to be using the extern template feature to limit the number of instantiations of various templates? (3) Use gcc's -gsplit-dwarf feature to reduce size of debug information (clang also has some support for this) https://gcc.gnu.org/wiki/DebugFission We could auto-detect this in configure.ac and use it if available. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
SalGraphics::mirror() question
Hi all, Some time ago, all the SalGraphics::mirror() functions added a check to get the width from OutputDevice::GetOutWidthPixel() if the class is VirtualDevice. My questions are: 1. Why is this necessary? 2. What is the difference between SalGraphics::GetGraphicsWidth() and OutputDevice::GetOutWidthPixel()? Any insights here would be really helpful! Chris ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/filter/oox/drawingmanager.cxx | 21 -
1 file changed, 21 deletions(-)
New commits:
commit 7f232c7b91625138adf1d2e2cb8330aa14ce22d8
Author: Noel Grandin n...@peralex.com
Date: Fri Nov 14 09:27:02 2014 +0200
-Werror,-Wunused-const-variable
Change-Id: I2ace311bc1fe66329a7833e602820f275a7dbd04
Reviewed-on: https://gerrit.libreoffice.org/12422
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/sc/source/filter/oox/drawingmanager.cxx
b/sc/source/filter/oox/drawingmanager.cxx
index d6804e4..bf9c9a8 100644
--- a/sc/source/filter/oox/drawingmanager.cxx
+++ b/sc/source/filter/oox/drawingmanager.cxx
@@ -46,41 +46,20 @@ namespace {
// OBJ record -
-const sal_uInt16 BIFF_OBJTYPE_UNKNOWN = 0x; // for internal use
only
-
// line formatting
const sal_uInt8 BIFF_OBJ_LINE_AUTOCOLOR = 64;
const sal_uInt8 BIFF_OBJ_LINE_SOLID = 0;
-const sal_uInt8 BIFF_OBJ_LINE_DASH = 1;
-const sal_uInt8 BIFF_OBJ_LINE_DOT = 2;
-const sal_uInt8 BIFF_OBJ_LINE_DASHDOT = 3;
-const sal_uInt8 BIFF_OBJ_LINE_DASHDOTDOT= 4;
-const sal_uInt8 BIFF_OBJ_LINE_MEDTRANS = 5;
-const sal_uInt8 BIFF_OBJ_LINE_DARKTRANS = 6;
-const sal_uInt8 BIFF_OBJ_LINE_LIGHTTRANS= 7;
-const sal_uInt8 BIFF_OBJ_LINE_NONE = 255;
const sal_uInt8 BIFF_OBJ_LINE_HAIR = 0;
-const sal_uInt8 BIFF_OBJ_LINE_THIN = 1;
-const sal_uInt8 BIFF_OBJ_LINE_MEDIUM= 2;
-const sal_uInt8 BIFF_OBJ_LINE_THICK = 3;
-const sal_uInt8 BIFF_OBJ_ARROW_OPEN = 1;
-const sal_uInt8 BIFF_OBJ_ARROW_FILLED = 2;
-const sal_uInt8 BIFF_OBJ_ARROW_OPENBOTH = 3;
-const sal_uInt8 BIFF_OBJ_ARROW_FILLEDBOTH = 4;
-const sal_uInt8 BIFF_OBJ_ARROW_NARROW = 0;
-const sal_uInt8 BIFF_OBJ_ARROW_MEDIUM = 1;
-const sal_uInt8 BIFF_OBJ_ARROW_WIDE = 2;
// fill formatting
const sal_uInt8 BIFF_OBJ_FILL_AUTOCOLOR = 65;
-const sal_uInt8 BIFF_OBJ_PATT_NONE = 0;
const sal_uInt8 BIFF_OBJ_PATT_SOLID = 1;
} // namespace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-qa] minutes of ESC call ...
* Present: + Muthu, cloph, Markus, Lionel, Eike, Norbert, Stephan, Kendy, Michael M, Robinson, JMux, David T, Kohei, Michael S, Ptyl * Completed Action Items: + commit UX default tweak to master (Kendy) + mention calc sorting issue in the 4.2.7 / 4.3.3 release notes (Cloph) + build pre-canned downloadable VM's for Tolouse (Cloph) [ VirtualBox images - still up-loading cloud based VM is running re-building ] + look at sorting spreadsheet / use-cases etc. (Eike) cf. https://bugs.freedesktop.org/show_bug.cgi?id=85490 ] [ some progress, Luke did some good work on JBF's doc. several use-cases where things are different, further fixes expected for 4.3.next+1 4.2.x new ? perhaps when we have most important ones fixed ] + update on student projects from A Coruña University (Jacobo) [ as below ] * Pending Action Items: + look at regressions associated with a SUSE bugzilla bugfix (Timar) * Release Engineering update (Cloph) + 4.3.4 RC1 status + available on the web-site, since Tues for general public. + plan to announce on Friday. + ignoring Mac / senddoc script fix for now. + ~60 bug fixes. + 4.3.5 RC1 due in 2 weeks (previously called 4.3.4) + just re-numbered the schedule + have nice chart - Thunderbird/elsewhere mail/HTML copy/paste patch (Muthu) + review appreciated: https://gerrit.libreoffice.org/#/c/11911/ + 4.4.0 Beta 1 / Feature Freeze / adjust ? + Recent Features ( fun ? ) + Image lifecycle re-work (Tamas) + an OpenCL subset for whitelisted drivers by default (Tor) + mail merge should be faster and correct for more documents (JMux, LLunak) + Lateish Feature collection: + expat - libxml2 sax2 - 10% ? (Lubos) + merging in the next few days. + OpenGL rendering for Windows by default for good drivers (various) + CloudOn really waiting for the OpenGL work (Ptyl) + threaded package2 / zipping (Matus) + threaded XLS[X] XclExpRow export win - ~20% (Michael) + bogus image compression avoidance (Matus) + calc bulk sliding window dep. tracking (Kohei) + ongoing gerrit patch submissions + chart related patches in gerrit - fear factor (Kohei) + a queue of UX guys patches - modifying toolbars (Moggi) + good review before the feature freeze. + hackfest in Toulouse... + Android / iOS Remote * Crashtest update (Markus) + futures / Manitu ordering update ? + working on script to analyse results + a number of image-format import crashers + TIFF other misc. obscure binary formats + hopefully with new server - can run 1x per month with asan to get memory protection issues sorted out. + XML / validation numbers: + much improved over time (thanks to Eike, Markus, Michael S) + one element Sun/Oracle forgot to include in the std. in 1.0 + written by every version of OO.o / LibreOffice - 30% of Calc validation errors. + investigated 2x elements: very old problems from OO.o (Michael S) + docx import crashers mostly gone; otherwise similar. + more files included in the runs now; 64k docs on import. * Hackfests + Toulouse Hackfest [ This Weekend ! ] (Arnaud) + Confirmed for Nov. 15-16th + more details: https://wiki.documentfoundation.org/Hackfest/Toulouse2014 + budget reserved (Eur 2k) - poke Bjoern. + Munich hack-fest [ Next Weekend ! ] (Jan-Marek): http://www.it-muenchen-blog.de/2014/07/bug-squashing-party-2014/ + jmux (IRC) can add you if you don't want to create an account + will have a BSP come-together; if someone says they're coming just show up etc. + November 21st-23rd, 2014 https://wiki.debian.org/BSP/2014/11/de/Munich + 35 or so registrations - looking fun. + Need further offers [!] ... (Bjoern) + propose Collabora / Cambridge (Michael) + should consider Las Palmas de Gran Canaria/University again (Bjoern) + Freiburg - also an option (prolly better in summer anyway (Bjoern) * FOSDEM bits + https://penta.fosdem.org/submission/FOSDEM15 + 20 minute slots (good to collect talks) + please consider filing by mid. December ! + Volunteer needed to book / run the hackfest afterwards. * library bloat (Michael S) + not really an issue for release builds - --enable-mergelibs + big library + --enable-symbols - OOM + especially problematic CppuniTests with use_library_objects + perhaps a barrier to entry to new developers + Calc: (with debuginfo) 4.1 - 413Mb, 4.3 - 512Mb, master - 600Mb (stripped)4.3 - 26.8Mb master - 30Mb +
Re: [Libreoffice-qa] retest ping to UNCONFIRMED bugs older than 6 months
On Wed, Nov 12, 2014 at 10:13 PM, Tommy ba...@quipo.it wrote: On Wed, 12 Nov 2014 16:24:30 +0100, Joel Madero jmadero@gmail.com wrote: Ok. let's go ahead with the old NEW bugs (nice oxymoron). I suggest waiting a few days after the incoming release of LibO 4.3.4 before running this ping. I want to wait for QA call to discuss and give the +1 also. I don't think two of us agreeing is sufficient :-b But assuming they +1 it, I figure late next week (maybe Friday night) I'll go ahead and push the comment to all of them. Best, Joel m/mail/ sure, QA consensus is necessary, however please wait the official release of 4.3.4 which is planned in Week 47 , Nov 17, 2014 - Nov 23, 2014 so we are sure the user will retest the bugs with the latest up to date version Sounds like a great idea. Does that link that you provide keep out enhancement requests, meta bugs, easy hacks, and potential easy hacks? Best, Joel -- *Joel Madero* LibreOffice QA Volunteer jmadero@gmail.com ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] retest ping to UNCONFIRMED bugs older than 6 months
On Thu, 13 Nov 2014 18:13:49 +0100, Joel Madero jmadero@gmail.com wrote: ... sure, QA consensus is necessary, however please wait the official release of 4.3.4 which is planned in Week 47 , Nov 17, 2014 - Nov 23, 2014 so we are sure the user will retest the bugs with the latest up to date version Sounds like a great idea. Does that link that you provide keep out enhancement requests, meta bugs, easy hacks, and potential easy hacks? Best, Joel the link you refer is this one: http://snipurl.com/29febjl it's just a list of NEW bugs with no new comments since 2 years and I've not done any filtering to exclude eventual meta or easy hacks ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] retest ping to UNCONFIRMED bugs older than 6 months
On 11/13/2014 10:05 AM, Tommy wrote: On Thu, 13 Nov 2014 18:13:49 +0100, Joel Madero jmadero@gmail.com wrote: ... sure, QA consensus is necessary, however please wait the official release of 4.3.4 which is planned in Week 47 , Nov 17, 2014 - Nov 23, 2014 so we are sure the user will retest the bugs with the latest up to date version Sounds like a great idea. Does that link that you provide keep out enhancement requests, meta bugs, easy hacks, and potential easy hacks? Best, Joel the link you refer is this one: http://snipurl.com/29febjl it's just a list of NEW bugs with no new comments since 2 years and I've not done any filtering to exclude eventual meta or easy hacks Okay we'll need to do that as well as MStahl (and Bjoern) asked us not to ping those bugs. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 86239] New: Horizontal split is lost when file reopened
https://bugs.freedesktop.org/show_bug.cgi?id=86239 Bug ID: 86239 Summary: Horizontal split is lost when file reopened Product: LibreOffice Version: 4.2.7.2 rc Hardware: x86-64 (AMD64) OS: Linux (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Spreadsheet Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: juergenme...@yahoo.com Release 4.2.7.2. Open a large spreadsheet, select a cell and use Window = Split a horizontal and vertical splitter will be created. Closing the file and open it again only the vertical split is still there, the horizontal split is lost. Workaround is to remove the vertical splitter (unsplit) and recreate both again. The behaviour is difficult to reproduce because it does not happen all the time. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 86240] New: Can not move a cell
https://bugs.freedesktop.org/show_bug.cgi?id=86240 Bug ID: 86240 Summary: Can not move a cell Product: LibreOffice Version: 4.2.7.2 rc Hardware: x86-64 (AMD64) OS: Linux (All) Status: UNCONFIRMED Severity: critical Priority: medium Component: Spreadsheet Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: pingal...@gmail.com Created attachment 109388 -- https://bugs.freedesktop.org/attachment.cgi?id=109388action=edit Calculate house heating dimensioning can not move a cell with data validation. Attachment follows. In that Sheet1.G10 is not bossible to move. Why? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 86240] Can not move a cell
https://bugs.freedesktop.org/show_bug.cgi?id=86240 GerardF gerard.farg...@orange.fr changed: What|Removed |Added Attachment #109388|text/plain |application/vnd.oasis.opend mime type||ocument.spreadsheet CC||gerard.farg...@orange.fr -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82955] Unexpected chart type reset using Chart Wizard in calc
https://bugs.freedesktop.org/show_bug.cgi?id=82955 Beluga todven...@suomi24.fi changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED CC||todven...@suomi24.fi Resolution|--- |WORKSFORME --- Comment #3 from Beluga todven...@suomi24.fi --- Yep, could not repro, let's set to WFM. Win 7 64-bit Version: 4.4.0.0.alpha2+ Build ID: b021b5983c62e266b82d9f0c5c6d8d8900553827 TinderBox: Win-x86@42, Branch:master, Time: 2014-11-12_00:19:18 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 86241] New: Lotus unkn75 function
https://bugs.freedesktop.org/show_bug.cgi?id=86241 Bug ID: 86241 Summary: Lotus unkn75 function Product: LibreOffice Version: 4.4.0.0.alpha2 Hardware: Other OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Spreadsheet Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: davian...@gmail.com UNKN75 function seems to be the @TERM function. Excel converts it from @TERM(a,b,c) to NPER(b, -a, c) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 85806] Hebrew and Arabic Is Not Working On MAC
https://bugs.freedesktop.org/show_bug.cgi?id=85806 --- Comment #6 from Gal Bar-Nissan g...@cloudon.com --- Yes. Found the bug. It's in the ctlayout.cxx. Will be soon submitted (sorry. no free time lately :) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70836] FORMATTING: Line-break not working correctly when the text is vertical
https://bugs.freedesktop.org/show_bug.cgi?id=70836 Beluga todven...@suomi24.fi changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED CC||todven...@suomi24.fi Resolution|--- |INVALID --- Comment #2 from Beluga todven...@suomi24.fi --- Per comment 1, let's set to INVALID. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 86240] Can not move a cell
https://bugs.freedesktop.org/show_bug.cgi?id=86240 --- Comment #1 from Paavo Ingalsuo pingal...@gmail.com --- When move cell Sheet1.G10 to some other place and then save the spreadsheet and then close the program. When reopen it again, all link´s to other Sheets are broken. Try to move sell, save and close. When reopen it again You can see the problem with broken link´s.! -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 71940] Formatting - Conditional changes inappropriately and creates additional rules when it should not
https://bugs.freedesktop.org/show_bug.cgi?id=71940 Beluga todven...@suomi24.fi changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED CC||todven...@suomi24.fi Resolution|--- |WORKSFORME --- Comment #20 from Beluga todven...@suomi24.fi --- (In reply to Aprax from comment #19) Version 4.3.0.4 essentially resolves this issue and a couple of other issues as well. Ok, let's set this to WFM, then. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 86243] New: LO Draw Crash when edit
https://bugs.freedesktop.org/show_bug.cgi?id=86243 Bug ID: 86243 Summary: LO Draw Crash when edit Product: LibreOffice Version: 4.3.3.2 rc Hardware: Other OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Drawing Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: ralf.kr...@bluewin.ch Created attachment 109390 -- https://bugs.freedesktop.org/attachment.cgi?id=109390action=edit Backtrace WinDbg Hi System: Win7 x64. LO Draw 4.3.3.2 crashes when editing a drawing. Possible related Bugs: -Bug 83547 -Bug 84171 The Backtrace ist attached. Cheers Ralf -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 86243] LO Draw Crash when edit
https://bugs.freedesktop.org/show_bug.cgi?id=86243 ralf.kr...@bluewin.ch changed: What|Removed |Added Priority|medium |high -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84171] LO Crash when editing legendbox
https://bugs.freedesktop.org/show_bug.cgi?id=84171 --- Comment #6 from ralf.kr...@bluewin.ch --- Created attachment 109391 -- https://bugs.freedesktop.org/attachment.cgi?id=109391action=edit Backtrace with Problems... -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84171] LO Crash when editing legendbox
https://bugs.freedesktop.org/show_bug.cgi?id=84171 --- Comment #7 from ralf.kr...@bluewin.ch --- Hi I tried a backtrace with WinDbg on Win7 x64. But the !analyze -v seems not to work... Any ideas? The backtrace is attached. Cheers Ralf -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 86049] MENUS: Addition of keyboard shortcuts for insert and delete rows and columns
https://bugs.freedesktop.org/show_bug.cgi?id=86049 --- Comment #9 from Heiko Tietze heiko.tie...@user-prompt.com --- (In reply to Jay Philips from comment #0) We currently have [Ctrl + plus] to adding a cell and [Ctrl + minus] for deleting a cell and i was thinking that we could use Ctrl + Insert for insert row, Ctrl + Delete for delete row, Ctrl + Shift + Insert for insert column and Ctrl + Shift + Delete for delete column. Ctrl+Insert is an alternative for Copy (along with Shift+Insert for Paste). And the question is where you insert the new column/row - left or right. Okay, right now it's only the col left and the row above which can be added by menu. My first idea was ctr+left/right/up/down but these shortcuts are used to jump to the next filled cell (I use it always). And together with Shift it selects the cells between the current and the next one. Alt+left/right increases/decreases the col width; we could override this IMHO. On the other hand, it's in fact dangerous to just press two buttons and loose all data. If you don't see it immediately the undo function wouldn't help. Therefore my (non-working) shortcuts do only add cols/rows. Putting all together I think we should keep the current behavior. If it's unclear where col/rows should be added/deleted, a dialog is shown (unclear in terms of only one or a few cell are selected). However when a column or row is selected the shortcut works immediately as expected. And the new toolbar buttons makes it very easy to modify the sheet. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84353] EDITING: Very slow when selecting multiple row
https://bugs.freedesktop.org/show_bug.cgi?id=84353 benico benico...@gmail.com changed: What|Removed |Added Hardware|Other |x86 (IA32) Version|4.2.5.2 release |4.3.3.2 rc OS|Windows (All) |Linux (All) --- Comment #2 from benico benico...@gmail.com --- Same problem with 4.3 range on ubuntu 12.04 32bit. I'm still using 4.1.2.3 - which does not suffer from this - and also does not sort referenced cells. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82855] MAILMERGE: Mail Merge Wizard not working anymore (freezes) when a data source exists
https://bugs.freedesktop.org/show_bug.cgi?id=82855 --- Comment #7 from Marcus m...@bachhausen.com --- Created attachment 109392 -- https://bugs.freedesktop.org/attachment.cgi?id=109392action=edit Ods and Odt file to reproduce the problem Letter.odt is the letter with the address fields and Addresses.ods contains the records for the mail merge wizard. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 85614] Accelerate 4.3.4 release to resolve sorting issue with 4.2.7 and 4.3.3
https://bugs.freedesktop.org/show_bug.cgi?id=85614 --- Comment #28 from benico benico...@gmail.com --- Hi Guys. If apache office had a better conditional formatting interface I would have switched. But anycase because of this issue I've downgraded all the Windows versions at work to 4.3.0 - and personally I'm still on 4.1.2.3 (which does not throw away the call out boxes in my graphs). Thanks for working to solve this ;-) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 85796] Equation/image appears double in presentation mode
https://bugs.freedesktop.org/show_bug.cgi?id=85796 --- Comment #3 from Mark van Rossum mvanr...@inf.ed.ac.uk --- Sorry, I don;t have those images. I think they were somehow converted from Equations. It is not the first time that image cropping leads to odd effects. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 65351] Sidebar: default view is not Styles and formatting
https://bugs.freedesktop.org/show_bug.cgi?id=65351 --- Comment #12 from Cor Nouws c...@nouenoff.nl --- Maybe split this issue in two: - enhancement to improve styles and formatting there (and if that really goes fine, open a discussion on making it default ;) ) - enhancement to open side bar with pane that was active when last used? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75757] remove inheritance to std::map and std::vector
https://bugs.freedesktop.org/show_bug.cgi?id=75757 --- Comment #44 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Juan Picca committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=a81af704a4e930d1f8f9b307fa8508118f90ea98 fdo#75757: remove inheritance to std::map It will be available in 4.4.0. 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 the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 72377] Unable to compile LibreOffice from git
https://bugs.freedesktop.org/show_bug.cgi?id=72377 --- Comment #6 from Björn Michaelsen bjoern.michael...@canonical.com --- Debian Wheezy is pretty ancient and likely needs a few tweaks to compile recent LibreOffice releases. I would suggest to look at how the source package for Debian configures the build (apt-get source libreoffice cd libreoffice* dpkg-buildpackage). AFAIK Rene even has later releases supported, see: http://anonscm.debian.org/cgit/pkg-openoffice/libreoffice.git/ and look for wheezy-backports. Note that those configurations need some vendor patching to work with other debian packages (e.g. lpsolve). -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 86217] Formatting: Hidden gridlines rendering incorrectly in preview/print
https://bugs.freedesktop.org/show_bug.cgi?id=86217 raal r...@post.cz changed: What|Removed |Added Version|unspecified |4.2.6.3 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76277] Connectors should allow snapping to elements inside a group
https://bugs.freedesktop.org/show_bug.cgi?id=76277 Beluga todven...@suomi24.fi changed: What|Removed |Added Status|UNCONFIRMED |NEW CC||todven...@suomi24.fi Ever confirmed|0 |1 Severity|normal |enhancement --- Comment #4 from Beluga todven...@suomi24.fi --- Reproduced, setting as enhancement. Win 7 64-bit Version: 4.4.0.0.alpha2+ Build ID: b021b5983c62e266b82d9f0c5c6d8d8900553827 TinderBox: Win-x86@42, Branch:master, Time: 2014-11-12_00:19:18 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 72377] Unable to compile LibreOffice from git
https://bugs.freedesktop.org/show_bug.cgi?id=72377 --- Comment #7 from Michael Stahl mst...@redhat.com --- there is absolutely nothing for which LO would need tkinter, gdbm and readline in python - we don't install any GUI or database modules from the bundled python exactly to reduce build time requirements, and LO has its own APIs for these that can be used via pyuno. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82855] MAILMERGE: Mail Merge Wizard not working anymore (freezes) when a data source exists
https://bugs.freedesktop.org/show_bug.cgi?id=82855 --- Comment #8 from Beluga todven...@suomi24.fi --- (In reply to Marcus from comment #7) Created attachment 109392 [details] Ods and Odt file to reproduce the problem Letter.odt is the letter with the address fields and Addresses.ods contains the records for the mail merge wizard. Sorry, I can't reproduce even with these. Win 7 64-bit Version: 4.4.0.0.alpha2+ Build ID: b021b5983c62e266b82d9f0c5c6d8d8900553827 TinderBox: Win-x86@42, Branch:master, Time: 2014-11-12_00:19:18 Ubuntu 14.10 64-bit Version: 4.4.0.0.alpha2+ Build ID: 5bff4b016c4b44f4123e0e6a4fd4c0c4dc0cfa2d TinderBox: Linux-rpm_deb-x86_64@46-TDF-dbg, Branch:master, Time: 2014-11-13_00:14:29 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 86157] references to sums/formulas won't recalculate
https://bugs.freedesktop.org/show_bug.cgi?id=86157 --- Comment #3 from Cor Nouws c...@nouenoff.nl --- (In reply to Bram from comment #2) I'm sorry but I can't provide the file, it contains sensitive data. I think it's caused by changing data and then closing the file, then reopening and going to the faulty sheet. Having a test case really is important. Do references to other sheets get recalculated when you change the source cell or when you select the other sheet ? It always was immediately. I think some things changed there recently. At least for opening files (dependent on the type) Look at Tools Options Calc .. Formulae .. Recalculate at loading Saving to xls (it was an ods file) and reopening also solved the problem, it's too soon to say if only ods files have this prolben and xls files don't. Newer version, I could check that if you think it makes a difference, I'm running linux/el7. There is 4.3.4.rc1 http://nl.libreoffice.org/download/pre-releases/ and nightlies http://dev-builds.libreoffice.org/daily/master/ Best, Cor -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 78789] Other: can not edit date field in form with windows date format chinese (simplified, VR china)
https://bugs.freedesktop.org/show_bug.cgi?id=78789 Beluga todven...@suomi24.fi changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||todven...@suomi24.fi Ever confirmed|0 |1 --- Comment #1 from Beluga todven...@suomi24.fi --- I have no problems changing the date or adding new users with the Windows simplified Chinese format. Please test with 4.3.x. Change to UNCONFIRMED, if the problem still exists for you. Win 7 64-bit Version: 4.4.0.0.alpha2+ Build ID: b021b5983c62e266b82d9f0c5c6d8d8900553827 TinderBox: Win-x86@42, Branch:master, Time: 2014-11-12_00:19:18 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82950] XTextFieldsSupplier delivers wrong Field type
https://bugs.freedesktop.org/show_bug.cgi?id=82950 Beluga todven...@suomi24.fi changed: What|Removed |Added Attachment #105104|text/plain |application/vnd.oasis.opend mime type||ocument.text CC||todven...@suomi24.fi -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82950] XTextFieldsSupplier delivers wrong Field type
https://bugs.freedesktop.org/show_bug.cgi?id=82950 Beluga todven...@suomi24.fi changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #3 from Beluga todven...@suomi24.fi --- Can you give more detailed steps for reproduction, so any random QA team member without prior experience with scripting can test this? Change back to UNCONFIRMED after supplying the information. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 86209] MENUS: Reorganize the View menu
https://bugs.freedesktop.org/show_bug.cgi?id=86209 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Status|NEW |NEEDINFO CC||c...@nouenoff.nl --- Comment #2 from Cor Nouws c...@nouenoff.nl --- (In reply to Jay Philips from comment #0) Created attachment 109353 [details] before and after of the menu thanks! After frequent viewing of the impress menubar, i found it quite disorganized indeed :) when compared to the writer and calc menubars, so here is a suggest reorganization. The after screenshot doesnt show View Headers and Footers that should either be in the Edit or Format menus Edit would be my choice. and View Start from first Slide is removed as its already in the Slide Show menu. Agreed. Only I doubt a bit about the Ruler. I would think that belongs in the next group, with Grid, since it refers the active slide. But it's more my feeling that a - IMO - strong argument.. What do you think? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 85436] Table Insertion bordering inconsistency
https://bugs.freedesktop.org/show_bug.cgi?id=85436 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Component|Libreoffice |Presentation Version|4.3.2.2 release |Inherited From OOo --- Comment #4 from Cor Nouws c...@nouenoff.nl --- I bet this is old as Metusalem :) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82954] Other: Inputfield is merged with data from base
https://bugs.freedesktop.org/show_bug.cgi?id=82954 Beluga todven...@suomi24.fi changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||todven...@suomi24.fi Ever confirmed|0 |1 --- Comment #2 from Beluga todven...@suomi24.fi --- Please provide the problematic document and related database file. Use this to strip out confidential info: https://wiki.documentfoundation.org/QA/BugReport/Attachments#Confidential_Attachments Change back to UNCONFIRMED after you have attached the documents. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73923] The Download Mirror for Hong Kong (free.nchc.org.tw) is Not Reachable
https://bugs.freedesktop.org/show_bug.cgi?id=73923 foss f...@openmailbox.org changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |NOTOURBUG --- Comment #12 from foss f...@openmailbox.org --- This really is NOTOURBUG. Not a TDF domain, and others are able to download just fine. Please contact your ISP and resolve the issue with them. Not sure why they would be blocking this though. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 83362] UI: Add preview to styles + formatting dialog
https://bugs.freedesktop.org/show_bug.cgi?id=83362 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added CC||c...@nouenoff.nl Version|4.2.5.2 release |Inherited From OOo --- Comment #2 from Cor Nouws c...@nouenoff.nl --- Nice idea to combine with improving use of styles in Side bar :) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 83198] Other: LibreOffice Document Recovery after close new window
https://bugs.freedesktop.org/show_bug.cgi?id=83198 Beluga todven...@suomi24.fi changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||todven...@suomi24.fi Ever confirmed|0 |1 --- Comment #1 from Beluga todven...@suomi24.fi --- Can you explain to a newbie like myself, what do I have to do to test with OOoBeanViewer.java found at http://api.libreoffice.org/examples/DevelopersGuide/OfficeBean/OOoBeanViewer.java ? I tried creating a new Beanshell script. I opened it for editing, cleared it and pasted the contents of OOoBeanViewer, but I got Parse error at line 75, column 23. Encountered: [ I guess I'm doing it wrong? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 83071] [META] UI: User interface for outline numbering is confusing.
https://bugs.freedesktop.org/show_bug.cgi?id=83071 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 Severity|normal |enhancement --- Comment #20 from Cor Nouws c...@nouenoff.nl --- I agree that some improvement is needed. Failing time atm to dive in details, except my comment in bug 83369 So set to NEEDINFO as to find out details .. ;) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 83369] UI: Missing functionality to start dialog 'Outline Numbering in the Styles Formatting window
https://bugs.freedesktop.org/show_bug.cgi?id=83369 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Hardware|x86-64 (AMD64) |All Version|4.2.5.2 release |Inherited From OOo OS|Windows (All) |All -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 83369] UI: Missing functionality to start dialog 'Outline Numbering in the Styles Formatting window
https://bugs.freedesktop.org/show_bug.cgi?id=83369 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||c...@nouenoff.nl Summary|UI: Missing functionality |UI: Missing functionality |in the Styles |to start dialog 'Outline |Formatting window |Numbering in the Styles ||Formatting window Ever confirmed|0 |1 --- Comment #3 from Cor Nouws c...@nouenoff.nl --- (In reply to Albrecht Müller from comment #0) If you think that the Styles Formatting window is the entry point that allows you to access any formatting property than this is not completely true. You Should Not Think That in the first place ;) The expected behaviour is that you can access the Outline Numbering functionality from the Styles Formatting window. Not for me.. nevertheless, I do like this idea: This problem could be solved be adding an additional Outline Numbering button to the Styles Formatting window as shown in attachment 105326 [details] (see bug 83071) Pls note that the picture shows Outline style I expect that it opens the dialog Outline Numbering. Is that your idea too? Then maybe a little distinct icon is needed. thanks a lot for your help with this! Cor -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
