LibreOffice Gerrit News for core on 2014-09-26
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + Force --std=gnu89 for clang. in https://gerrit.libreoffice.org/9904 from Andrzej Hunt about module build + scripting: Format_java_code.sh initial run in https://gerrit.libreoffice.org/11644 from Robert Antoni Buj i Gelonch about module scripting + scripting: modify astyle.options in https://gerrit.libreoffice.org/11643 from Robert Antoni Buj i Gelonch about module scripting + fixed behavior of Writer's Special Character dialog in https://gerrit.libreoffice.org/11642 from Szymon Kłos about module cui + Fix fdo#58161 UI: White Paragraph style invisible in Styles Drop-Down in https://gerrit.libreoffice.org/11636 from juegen funk about module svx End of freshness + fdo#75757: remove inheritance to std::vector in https://gerrit.libreoffice.org/11650 from Takeshi Abe about module include, sfx2 + Use multi-column layout and correct header colour in https://gerrit.libreoffice.org/11649 from Philipp Weissenbacher about module solenv + fdo#73151 Always open StylesFormatting dialog in the sidebar in https://gerrit.libreoffice.org/11648 from Samuel Mehrbrodt about module include, officecfg, qadevOOo, sc, sd, sfx2, svx, sw + implement --with-system-odbc on windows in https://gerrit.libreoffice.org/11499 from Noel Grandin about module build, connectivity, include + DO NOT PUSH remove the versioning of the SvxPoolItem streams in https://gerrit.libreoffice.org/11628 from Noel Grandin about module editeng, include, sc, sd, sfx2, svl, svx, sw * Merged changes on master for project core changed in the last 25 hours: + fdo#83751-FILESAVE:Custom Properties dropped while exporting to .pptx in https://gerrit.libreoffice.org/11390 from Heena Gupta + fdo#84138 Add missing YIELD_GUARD to fix an input method crash in https://gerrit.libreoffice.org/11566 from Matthew Francis + Fix for CONC-104: mysql_options doesn't support MYSQL_SECURE_AUTH option in https://gerrit.libreoffice.org/11492 from Robert Antoni Buj i Gelonch + coverity#705672 Resource leak in https://gerrit.libreoffice.org/11641 from Caolán McNamara + fdo#83751- Add test case for custom properties in pptx in https://gerrit.libreoffice.org/11420 from Heena Gupta + scripting: astyle-java.conf - astyle.options in https://gerrit.libreoffice.org/11639 from Robert Antoni Buj i Gelonch + fdo#39625 Make existing CppUnit tests work in https://gerrit.libreoffice.org/11603 from Tobias Madl + fdo#63483: support for modify passwd in Impress and Draw in https://gerrit.libreoffice.org/11495 from Katarina Behrens + scripting: Format java code by using astyle tool in https://gerrit.libreoffice.org/11304 from Robert Antoni Buj i Gelonch + fdo#78783: fixed init position to 1 and using css in https://gerrit.libreoffice.org/11409 from Stefan Weiberg + Start Center Template Manager Tweaks in https://gerrit.libreoffice.org/11467 from Efe Gürkan Yalaman + Resolves fdo#84283: Export to PDF with footnotes in tables crash in https://gerrit.libreoffice.org/11634 from Julien Nabet + Changing the font properties makes it look better in https://gerrit.libreoffice.org/11620 from Xukai Liu + Fix miscellaneous memory leaks in https://gerrit.libreoffice.org/11638 from Matthew Francis + java: when rethrowing exceptions, store the original cause in https://gerrit.libreoffice.org/11039 from Noel Grandin + Stop using unnecessary std::auto_ptr in https://gerrit.libreoffice.org/11484 from Takeshi Abe + fdo#75757: remove inheritance to std::vector in https://gerrit.libreoffice.org/11482 from Takeshi Abe + fdo#39468 Translate German comments, clean some ws in https://gerrit.libreoffice.org/11622 from Philipp Weissenbacher + Restore searching in sub directories in https://gerrit.libreoffice.org/11522 from Philipp Weissenbacher + Fix PythonTest on windows in https://gerrit.libreoffice.org/11631 from Peter Foley + fdo#39468: translation in https://gerrit.libreoffice.org/11637 from Jennifer Liebel + fdo#75757: remove inheritance to std::vector in https://gerrit.libreoffice.org/11533 from Takeshi Abe * Abandoned changes on master for project core changed in the last 25 hours: + scripting: running Format_java_code.sh in https://gerrit.libreoffice.org/11640 from Robert Antoni Buj i Gelonch + fdo#83010: have WrapFields support adjustments in https://gerrit.libreoffice.org/11278 from Katarina Behrens + Eliminate memory leak due to circular shared_ptr in https://gerrit.libreoffice.org/11629 from Matthew Francis * Open changes needing tweaks, but being untouched for more than a week: + HIG-ification of GSoC Color Picker dialog in https://gerrit.libreoffice.org/11494 from Olivier Hallot + l10ntools-transex3: convert 'int' to 'bool' where it's logical in https://gerrit.libreoffice.org/11317 from Douglas Mencken + Perftest for loading autocorrect dictionaries (fdo#79761) in
[Libreoffice-commits] core.git: Branch 'distro/collabora/lof-4.3' - 9 commits - basic/source dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk dbaccess/CppunitTest_dbaccess_nolib_save.mk dbaccess/Mod
basic/source/uno/namecont.cxx| 17 +- dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk | 119 +++ dbaccess/CppunitTest_dbaccess_nolib_save.mk | 119 +++ dbaccess/Module_dbaccess.mk |2 dbaccess/qa/extras/empty-stdlib-save.cxx | 145 +++ dbaccess/qa/extras/nolib-save.cxx| 135 + download.lst |2 i18npool/source/localedata/data/es_CR.xml| 12 - sc/source/core/data/column4.cxx |7 sc/source/core/data/table3.cxx |7 sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx |1 sc/source/ui/docshell/dbdocfun.cxx |1 sd/source/ui/controller/slidelayoutcontroller.cxx| 16 ++ sd/source/ui/controller/slidelayoutcontroller.hxx|4 sw/qa/extras/ooxmlimport/data/bnc891663.docx |binary sw/qa/extras/ooxmlimport/ooxmlimport.cxx |9 + writerfilter/source/dmapper/GraphicImport.cxx|8 + writerfilter/source/dmapper/PropertyIds.cxx |1 writerfilter/source/dmapper/PropertyIds.hxx |1 19 files changed, 590 insertions(+), 16 deletions(-) New commits: commit 600f01ddec03f900c1ade16425febb50c048a718 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Fri Sep 19 09:11:09 2014 -0400 fdo#84009: Be sure to update the sheet index when moving the sort range. Change-Id: Ic9ad51b33f6dfb6f90e76439c27eeff25ec4c7da (cherry picked from commit 5fd4679e7b92f344ea867e0dca1fc4c9363ae2cd) Reviewed-on: https://gerrit.libreoffice.org/11549 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index dbc75d0..7469578 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -459,6 +459,7 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam rSortParam, return false; aLocalParam.MoveToDest(); +nTab = aLocalParam.nDestTab; } ScEditableTester aTester( pDoc, nTab, aLocalParam.nCol1,aLocalParam.nRow1, commit 4889672fda0ea383f0fbedbbcd1700e3f0f5a2c0 Author: Maxim Monastirsky momonas...@gmail.com Date: Mon Sep 15 22:52:40 2014 +0300 fdo#83619 Retain dropdown part after customization (cherry picked from commit 99ace739828f9d79a2f9b04ef066b90d77f77bc4) Conflicts: sd/source/ui/controller/slidelayoutcontroller.cxx Change-Id: I84c33e5b646ba43b9cad1d9ed106e7ead911e5c0 Reviewed-on: https://gerrit.libreoffice.org/11466 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 34a5e2b..59868ff 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -370,6 +370,22 @@ SlideLayoutController::SlideLayoutController( const Reference uno::XComponentCo +void SAL_CALL SlideLayoutController::initialize( const css::uno::Sequence css::uno::Any aArguments ) +throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) +{ +svt::PopupWindowController::initialize( aArguments ); + +ToolBox* pToolBox = 0; +sal_uInt16 nId = 0; +if ( getToolboxId( nId, pToolBox ) ) +{ +if ( mbInsertPage ) +pToolBox-SetItemBits( nId, pToolBox-GetItemBits( nId ) | TIB_DROPDOWN ); +else +pToolBox-SetItemBits( nId, pToolBox-GetItemBits( nId ) | TIB_DROPDOWNONLY ); +} +} + ::Window* SlideLayoutController::createPopupWindow( ::Window* pParent ) { return new sd::LayoutToolbarMenu( *this, m_xFrame, pParent, mbInsertPage ); diff --git a/sd/source/ui/controller/slidelayoutcontroller.hxx b/sd/source/ui/controller/slidelayoutcontroller.hxx index 71e2bb3..3c6e91b 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.hxx +++ b/sd/source/ui/controller/slidelayoutcontroller.hxx @@ -34,6 +34,10 @@ public: virtual ::Window* createPopupWindow( ::Window* pParent ) SAL_OVERRIDE; +// XInitialization +virtual void SAL_CALL initialize( const css::uno::Sequence css::uno::Any aArguments ) +throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence OUString SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; commit a98953d08df64b7f15a95ac57c05795823a758a1 Author: Kohei Yoshida kohei.yosh...@collabora.com Date:
[Libreoffice-commits] core.git: oox/source sd/qa
oox/source/drawingml/table/tablecell.cxx | 55 ++- sd/qa/unit/import-tests.cxx | 12 ++ 2 files changed, 45 insertions(+), 22 deletions(-) New commits: commit 18898e13fda25fe6dc85318dd0711355c7b2cc26 Author: Matúš Kukan matus.ku...@collabora.com Date: Mon Sep 22 11:59:14 2014 +0200 bnc#897769: OOXML import: Import border lines using reference too. Do not ignore 'lnRef' element. Also fix typo to apply 'seCell' properties to the right cell (southeast). Change-Id: Ia45f7016f358b70e6db06a232c569335ce9d7051 diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx index 96cb28c..45486fd 100644 --- a/oox/source/drawingml/table/tablecell.cxx +++ b/oox/source/drawingml/table/tablecell.cxx @@ -84,15 +84,26 @@ void applyLineAttributes( const ::oox::core::XmlFilterBase rFilterBase, aPropSet.setProperty( nPropId, aBorderLine ); } -void applyBorder( TableStylePart rTableStylePart, sal_Int32 nLineType, oox::drawingml::LineProperties rLineProperties ) +void applyBorder( const ::oox::core::XmlFilterBase rFilterBase, TableStylePart rTableStylePart, sal_Int32 nLineType, oox::drawingml::LineProperties rLineProperties ) { std::map sal_Int32, ::oox::drawingml::LinePropertiesPtr rPartLineBorders( rTableStylePart.getLineBorders() ); +::oox::drawingml::ShapeStyleRef rLineStyleRef = rTableStylePart.getStyleRefs()[ nLineType ]; std::map sal_Int32, ::oox::drawingml::LinePropertiesPtr ::const_iterator aIter( rPartLineBorders.find( nLineType ) ); if ( ( aIter != rPartLineBorders.end() ) aIter-second.get() ) rLineProperties.assignUsed( *aIter-second ); +else if (rLineStyleRef.mnThemedIdx != 0) +{ +if (const Theme* pTheme = rFilterBase.getCurrentTheme()) +{ +rLineProperties.assignUsed( *pTheme-getLineStyle(rLineStyleRef.mnThemedIdx) ); +sal_Int32 nPhClr = rLineStyleRef.maPhClr.getColor( rFilterBase.getGraphicHelper() ); +rLineProperties.maLineFill.maFillColor.setSrgbClr( nPhClr ); +} +} } -void applyTableStylePart( oox::drawingml::FillProperties rFillProperties, +void applyTableStylePart( const ::oox::core::XmlFilterBase rFilterBase, + oox::drawingml::FillProperties rFillProperties, TextCharacterProperties aTextCharProps, oox::drawingml::LineProperties rLeftBorder, oox::drawingml::LineProperties rRightBorder, @@ -106,12 +117,12 @@ void applyTableStylePart( oox::drawingml::FillProperties rFillProperties, if ( rPartFillPropertiesPtr.get() ) rFillProperties.assignUsed( *rPartFillPropertiesPtr ); -applyBorder( rTableStylePart, XML_left, rLeftBorder ); -applyBorder( rTableStylePart, XML_right, rRightBorder ); -applyBorder( rTableStylePart, XML_top, rTopBorder ); -applyBorder( rTableStylePart, XML_bottom, rBottomBorder ); -applyBorder( rTableStylePart, XML_tl2br, rTopLeftToBottomRightBorder ); -applyBorder( rTableStylePart, XML_tr2bl, rBottomLeftToTopRightBorder ); +applyBorder( rFilterBase, rTableStylePart, XML_left, rLeftBorder ); +applyBorder( rFilterBase, rTableStylePart, XML_right, rRightBorder ); +applyBorder( rFilterBase, rTableStylePart, XML_top, rTopBorder ); +applyBorder( rFilterBase, rTableStylePart, XML_bottom, rBottomBorder ); +applyBorder( rFilterBase, rTableStylePart, XML_tl2br, rTopLeftToBottomRightBorder ); +applyBorder( rFilterBase, rTableStylePart, XML_tr2bl, rBottomLeftToTopRightBorder ); aTextCharProps.maLatinFont = rTableStylePart.getLatinFont(); aTextCharProps.maAsianFont = rTableStylePart.getAsianFont(); @@ -171,7 +182,7 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase rFilterBase, ::oo oox::drawingml::LineProperties aLinePropertiesTopLeftToBottomRight; oox::drawingml::LineProperties aLinePropertiesBottomLeftToTopRight; -applyTableStylePart( aFillProperties, aTextStyleProps, +applyTableStylePart( rFilterBase, aFillProperties, aTextStyleProps, aLinePropertiesLeft, aLinePropertiesRight, aLinePropertiesTop, @@ -182,7 +193,7 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase rFilterBase, ::oo if ( rProperties.isFirstRow() ( nRow == 0 ) ) { -applyTableStylePart( aFillProperties, aTextStyleProps, +applyTableStylePart( rFilterBase, aFillProperties, aTextStyleProps, aLinePropertiesLeft, aLinePropertiesRight, aLinePropertiesTop, @@ -193,7 +204,7 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase rFilterBase, ::oo } if ( rProperties.isLastRow() ( nRow == nMaxRow ) ) { -applyTableStylePart( aFillProperties, aTextStyleProps, +applyTableStylePart( rFilterBase, aFillProperties, aTextStyleProps,
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - oox/source sd/qa
oox/source/drawingml/table/tablecell.cxx | 55 ++- sd/qa/unit/import-tests.cxx | 12 ++ 2 files changed, 45 insertions(+), 22 deletions(-) New commits: commit 599e5096ba7bde1c88120376b12f3f691847f17d Author: Matúš Kukan matus.ku...@collabora.com Date: Mon Sep 22 11:59:14 2014 +0200 bnc#897769: OOXML import: Import border lines using reference too. Do not ignore 'lnRef' element. Also fix typo to apply 'seCell' properties to the right cell (southeast). Change-Id: Ia45f7016f358b70e6db06a232c569335ce9d7051 (cherry picked from commit 18898e13fda25fe6dc85318dd0711355c7b2cc26) diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx index 583d7aa..baf49a6 100644 --- a/oox/source/drawingml/table/tablecell.cxx +++ b/oox/source/drawingml/table/tablecell.cxx @@ -84,15 +84,26 @@ void applyLineAttributes( const ::oox::core::XmlFilterBase rFilterBase, aPropSet.setProperty( nPropId, aBorderLine ); } -void applyBorder( TableStylePart rTableStylePart, sal_Int32 nLineType, oox::drawingml::LineProperties rLineProperties ) +void applyBorder( const ::oox::core::XmlFilterBase rFilterBase, TableStylePart rTableStylePart, sal_Int32 nLineType, oox::drawingml::LineProperties rLineProperties ) { std::map sal_Int32, ::oox::drawingml::LinePropertiesPtr rPartLineBorders( rTableStylePart.getLineBorders() ); +::oox::drawingml::ShapeStyleRef rLineStyleRef = rTableStylePart.getStyleRefs()[ nLineType ]; std::map sal_Int32, ::oox::drawingml::LinePropertiesPtr ::const_iterator aIter( rPartLineBorders.find( nLineType ) ); if ( ( aIter != rPartLineBorders.end() ) aIter-second.get() ) rLineProperties.assignUsed( *aIter-second ); +else if (rLineStyleRef.mnThemedIdx != 0) +{ +if (const Theme* pTheme = rFilterBase.getCurrentTheme()) +{ +rLineProperties.assignUsed( *pTheme-getLineStyle(rLineStyleRef.mnThemedIdx) ); +sal_Int32 nPhClr = rLineStyleRef.maPhClr.getColor( rFilterBase.getGraphicHelper() ); +rLineProperties.maLineFill.maFillColor.setSrgbClr( nPhClr ); +} +} } -void applyTableStylePart( oox::drawingml::FillProperties rFillProperties, +void applyTableStylePart( const ::oox::core::XmlFilterBase rFilterBase, + oox::drawingml::FillProperties rFillProperties, TextCharacterProperties aTextCharProps, oox::drawingml::LineProperties rLeftBorder, oox::drawingml::LineProperties rRightBorder, @@ -106,12 +117,12 @@ void applyTableStylePart( oox::drawingml::FillProperties rFillProperties, if ( rPartFillPropertiesPtr.get() ) rFillProperties.assignUsed( *rPartFillPropertiesPtr ); -applyBorder( rTableStylePart, XML_left, rLeftBorder ); -applyBorder( rTableStylePart, XML_right, rRightBorder ); -applyBorder( rTableStylePart, XML_top, rTopBorder ); -applyBorder( rTableStylePart, XML_bottom, rBottomBorder ); -applyBorder( rTableStylePart, XML_tl2br, rTopLeftToBottomRightBorder ); -applyBorder( rTableStylePart, XML_tr2bl, rBottomLeftToTopRightBorder ); +applyBorder( rFilterBase, rTableStylePart, XML_left, rLeftBorder ); +applyBorder( rFilterBase, rTableStylePart, XML_right, rRightBorder ); +applyBorder( rFilterBase, rTableStylePart, XML_top, rTopBorder ); +applyBorder( rFilterBase, rTableStylePart, XML_bottom, rBottomBorder ); +applyBorder( rFilterBase, rTableStylePart, XML_tl2br, rTopLeftToBottomRightBorder ); +applyBorder( rFilterBase, rTableStylePart, XML_tr2bl, rBottomLeftToTopRightBorder ); aTextCharProps.maLatinFont = rTableStylePart.getLatinFont(); aTextCharProps.maAsianFont = rTableStylePart.getAsianFont(); @@ -171,7 +182,7 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase rFilterBase, ::oo oox::drawingml::LineProperties aLinePropertiesTopLeftToBottomRight; oox::drawingml::LineProperties aLinePropertiesBottomLeftToTopRight; -applyTableStylePart( aFillProperties, aTextStyleProps, +applyTableStylePart( rFilterBase, aFillProperties, aTextStyleProps, aLinePropertiesLeft, aLinePropertiesRight, aLinePropertiesTop, @@ -182,7 +193,7 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase rFilterBase, ::oo if ( rProperties.isFirstRow() ( nRow == 0 ) ) { -applyTableStylePart( aFillProperties, aTextStyleProps, +applyTableStylePart( rFilterBase, aFillProperties, aTextStyleProps, aLinePropertiesLeft, aLinePropertiesRight, aLinePropertiesTop, @@ -193,7 +204,7 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase rFilterBase, ::oo } if ( rProperties.isLastRow() ( nRow == nMaxRow ) ) { -applyTableStylePart( aFillProperties, aTextStyleProps, +
Re: build break in cppunittest
Hi Andreas, On Fri, Sep 26, 2014 at 05:50:32AM +0200, Andreas Radke a.ra...@arcor.de wrote: No core file identified in directory /build/libreoffice-fresh/src/libreoffice-4.3.2.2/workdir/CppunitTest/sw_ooxmlsdrexport.test.core To show backtraces for crashes during test execution, enable core files with: ulimit -c unlimited Error: a unit test failed, please do one of: export DEBUGCPPUNIT=TRUE# for exception catching export CPPUNITTRACE=gdb --args# for interactive debugging on Linux export CPPUNITTRACE=\[full path to devenv.exe]\ /debugexe # for interactive debugging in Visual Studio export VALGRIND=memcheck# for memory checking and retry using: make CppunitTest_sw_ooxmlsdrexport /build/libreoffice-fresh/src/libreoffice-4.3.2.2/solenv/gbuild/CppunitTest.mk:70: recipe for target '/build/libreoffice-fresh/src/libreoffice-4.3.2.2/workdir/CppunitTest/sw_ooxmlsdrexport.test' failed make[1]: *** [/build/libreoffice-fresh/src/libreoffice-4.3.2.2/workdir/CppunitTest/sw_ooxmlsdrexport.test] Error 1 Do you have a workaround or fix? Did you follow these instructions? Also note that --enable-symbols is needed to have meaningful backtraces. Workaround is to patch out sw_ooxmlsdrexport from sw/Module_sw.mk, as usual. Regards, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 39625] Make existing cppunittests work
https://bugs.freedesktop.org/show_bug.cgi?id=39625 --- Comment #18 from Tobias Madl tobias.madl@gmail.com --- So for further information, i now removed all occurrence of testshl. But i still can't close the ticket, because on one hand there's the /sal/qa/systools/test_comtools.cxx test, which only runs under windows, so sb with a windows maschine has to fix this. (Suggestion to change the ticket to a windows dependency ticket). On the other hand theres the /unoxml/test/domtest.cxx test, which is running at the moment, but still not with all tests in it. The problem, described in this ticket: Bug 84237 , has to be solved befor this tests can be used, or the tests have to be removed. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 39625] Make existing cppunittests work
https://bugs.freedesktop.org/show_bug.cgi?id=39625 Tobias Madl tobias.madl@gmail.com changed: What|Removed |Added Assignee|tobias.madl@gmail.com |libreoffice-b...@lists.free ||desktop.org -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac
configure.ac |4 1 file changed, 4 insertions(+) New commits: commit 3a4860a751980b566b44d57cde188292df5e8726 Author: Andrzej Hunt andrzej.h...@collabora.com Date: Wed Jun 25 15:01:14 2014 +0100 Force --std=gnu89 for clang. clang builds with a more modern standard by default On Linux gcc builds with gnu89 by default. On Windows MSVC only supports C90. Hence it makes sense to force gnu89 for clang to catch potential gnu89/C90 incompatibilities locally. (C90 and gnu89 appear to be quite close, however using C90 with clang results in warnings and errors to do with comments on lines with code (-Wcomment), and also the lack of inline (instead you would use __inline -- this is #define'd in for Windows only).) Change-Id: I569af7541b86aa0f83ebb66770d43737bac5d21f Reviewed-on: https://gerrit.libreoffice.org/9904 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/configure.ac b/configure.ac index f9c04e8..499d765 100644 --- a/configure.ac +++ b/configure.ac @@ -3245,6 +3245,10 @@ if test $GCC = yes; then AC_MSG_RESULT([Clang $CLANG_FULL_VERSION, $CLANGVER]) AC_DEFINE_UNQUOTED(CLANG_FULL_VERSION,$CLANG_FULL_VERSION) fi + +# On Windows MSVC only supports C90 so force gnu89 (especially in clang) to +# to catch potential gnu89/C90 incompatibilities locally. +CFLAGS=$CFLAGS -std=gnu89 fi AC_SUBST(COM_GCC_IS_CLANG) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress' - 2 commits - desktop/source svx/source
desktop/source/lib/init.cxx|7 +++ svx/source/sdr/contact/objectcontactofpageview.cxx |2 +- 2 files changed, 8 insertions(+), 1 deletion(-) New commits: commit 4686ac905a7bdc80df6bd6ce87ebefc48d735bb5 Author: Andrzej Hunt andrzej.h...@collabora.com Date: Fri Sep 26 09:12:56 2014 +0100 Add more lok debug output. This should allow as at least to see if soffice_main thread initialisation gets stuck (which we'd otherwise have a hard time determining if we are trying to debug e.g. on Android). Change-Id: I0baa211c015318c4e0fcf78a4e86a0ba8b895d5f diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 89c8168..9613514 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -700,9 +700,12 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath) // to LOK in an external program). if (!osl_areCommandArgsSet()) { +SAL_INFO(lok, commandArgs not previously set); osl_setCommandArgs(2, pArgs); } +SAL_INFO(lok, attempting to initalize UNO); initialize_uno(aAppURL); +SAL_INFO(lok, uno successfully initalized); force_c_locale(); // Force headless -- this is only for bitmap rendering. @@ -724,9 +727,13 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath) // the Thread from wherever (it's done again in Desktop::Main), and can // then use it to wait until we're definitely ready to continue. +SAL_INFO(lok, enabling OfficeIPCThread); OfficeIPCThread::EnableOfficeIPCThread(); +SAL_INFO(lok, starting soffice_main); pthread_create((pLib-maThread), 0, lo_startmain, NULL); +SAL_INFO(lok, waiting for OfficeIPCThread); OfficeIPCThread::WaitForReady(); +SAL_INFO(lok, OfficeIPCThread ready -- continuing); // If the Thread has been disabled again that indicates that a // restart is required (or in any case we don't have a useable commit ff9dadd3531b77bf808fef49b58be53e713091e0 Author: Andrzej Hunt andrzej.h...@collabora.com Date: Fri Sep 26 09:11:53 2014 +0100 Don't use this quick hack on Android. It *seems* to cause missing areas (at least in Impress). (i.e. the bottom half or right side of headers on slides can sometimes go missing, not using this hack fixes the problem for me). Change-Id: I205531666e0ad12470020e5ff2568ebf16bc2f01 diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx index 8894d99..848c618 100644 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -236,7 +236,7 @@ namespace sdr updateViewInformation2D(aNewViewInformation2D); drawinglayer::primitive2d::Primitive2DSequence xPrimitiveSequence; -#if HAVE_FEATURE_DESKTOP +#if defined( HAVE_FEATURE_DESKTOP ) || defined( ANDROID ) // get whole Primitive2DSequence; this will already make use of updated ViewInformation2D // and may use the MapMode from the Target OutDev in the DisplayInfo xPrimitiveSequence = rDrawPageVOContact.getPrimitive2DSequenceHierarchy(rDisplayInfo); ___ 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' - sw/source
sw/source/core/text/EnhancedPDFExportHelper.cxx |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit c67942a3158d4ace3753985dab5b9a934b8185a7 Author: Julien Nabet serval2...@yahoo.fr Date: Wed Sep 24 21:26:59 2014 +0200 Resolves fdo#84283: Export to PDF with footnotes in tables crash Don't crash when there's no rectangles Change-Id: I7e713025cacd449f708176254e05d40c0929577f Reviewed-on: https://gerrit.libreoffice.org/11634 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com Reviewed-on: https://gerrit.libreoffice.org/11645 diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx index 6afa51d..0704b91 100644 --- a/sw/source/core/text/EnhancedPDFExportHelper.cxx +++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx @@ -1933,11 +1933,15 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() SwRects aTmp; aTmp.insert( aTmp.begin(), mrSh.SwCrsrShell::_GetCrsr()-begin(), mrSh.SwCrsrShell::_GetCrsr()-end() ); OSL_ENSURE( !aTmp.empty(), Enhanced pdf export - rectangles are missing ); -const SwRect aLinkRect( aTmp[ 0 ] ); mrSh._GetCrsr()-RestoreSavePos(); mrSh.SwCrsrShell::ClearMark(); +if (aTmp.empty()) +continue; + +const SwRect aLinkRect( aTmp[ 0 ] ); + // Goto footnote text: if ( mrSh.GotoFtnTxt() ) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scripting/astyle.options
scripting/astyle.options |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit a0f3b9f9549bff55129b8b8031788c6d60005777 Author: Robert Antoni Buj i Gelonch robert@gmail.com Date: Thu Sep 25 19:35:48 2014 +0200 scripting: modify astyle.options Change-Id: I0e5fb63e2c632890e774b59e6808907067c87ce6 Reviewed-on: https://gerrit.libreoffice.org/11643 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/scripting/astyle.options b/scripting/astyle.options index 3a6ea94..e8b3388 100755 --- a/scripting/astyle.options +++ b/scripting/astyle.options @@ -8,8 +8,7 @@ --unpad-paren --align-reference=name --pad-oper ---unpad-paren ---add-brackets +--pad-header -s4 --indent-col1-comments --lineend=linux @@ -17,3 +16,4 @@ --suffix=none --preserve-date --formatted +--max-code-length=80 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/cuicharmap.cxx | 17 +++-- 1 file changed, 15 insertions(+), 2 deletions(-) New commits: commit 2b5cbaea8321b281be076b089c9de61742401401 Author: Szymon KÅos eszka...@gmail.com Date: Thu Sep 25 18:14:13 2014 +0200 fixed behavior of Writer's Special Character dialog before: the character is inserted at the end after: The character will be inserted where the cursor is or will replace the selected string. Change-Id: If5f7cac24c98a9105c38864da5a4c6363a35a834 Reviewed-on: https://gerrit.libreoffice.org/11642 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 5227bcf..2d46a79 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -52,6 +52,7 @@ SvxCharacterMap::SvxCharacterMap( vcl::Window* pParent, bool bOne_, const SfxIte get(m_pShowChar, showchar); m_pShowChar-SetCentered(true); get(m_pShowText, showtext); +m_pShowText-SetMaxTextLen(CHARMAP_MAXLEN); get(m_pOKBtn, ok); get(m_pFontText, fontft); get(m_pFontLB, fontlb); @@ -507,13 +508,25 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharSelectHdl) if ( !bOne ) { OUString aText = m_pShowText-GetText(); +Selection aSelection = m_pShowText-GetSelection(); +aSelection.Justify(); +long nLen = aSelection.Len(); -if ( aText.getLength() != CHARMAP_MAXLEN ) +if ( aText.getLength() != CHARMAP_MAXLEN || nLen 0 ) { sal_UCS4 cChar = m_pShowSet-GetSelectCharacter(); // using the new UCS4 constructor OUString aOUStr( cChar, 1 ); -m_pShowText-SetText( aText + aOUStr ); + +long nPos = aSelection.Min(); +if( aText.getLength() ) +{ +m_pShowText-SetText( aText.copy( 0, nPos ) + aOUStr + aText.copy( nPos + nLen ) ); +} +else +m_pShowText-SetText( aOUStr ); + +m_pShowText-SetSelection( Selection( nPos + 1 ) ); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source include/filter
filter/source/graphicfilter/eos2met/eos2met.cxx |2 +- filter/source/msfilter/eschesdo.cxx |4 +--- filter/source/svg/svgdialog.hxx |2 +- filter/source/svg/svgwriter.hxx |4 ++-- include/filter/msfilter/escherex.hxx| 10 +++--- include/filter/msfilter/mstoolbar.hxx |2 +- 6 files changed, 9 insertions(+), 15 deletions(-) New commits: commit 402bb706da7a43ee8c161cab5a5fc4d05b965051 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Sep 26 10:14:08 2014 +0200 filter: std::auto_ptr - std::unique_ptr Change-Id: Id1d0392e1dbd33de326aa2bd8cbcf8cc03bf7c90 diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx index 90fb53d..dac8c31 100644 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ b/filter/source/graphicfilter/eos2met/eos2met.cxx @@ -156,7 +156,7 @@ private: sal_uInt32 nWrittenBitmaps; // number of already written Bitmaps sal_uInt32 nActBitmapPercent; // percentage of the next bitmap that's already written -::std::auto_ptr VirtualDevice apDummyVDev; +::std::unique_ptr VirtualDevice apDummyVDev; OutputDevice* pCompDev; com::sun::star::uno::Reference com::sun::star::task::XStatusIndicator xStatusIndicator; diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index bc31462..2e92270 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -267,9 +267,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject rObj, aPropOpt.AddOpt( ESCHER_Prop_wzName, aShapeName ); if ( InteractionInfo* pInteraction = mpHostAppData ? mpHostAppData-GetInteractionInfo():NULL ) { -SAL_WNODEPRECATED_DECLARATIONS_PUSH -const std::auto_ptr SvMemoryStream pMemStrm = pInteraction-getHyperlinkRecord(); -SAL_WNODEPRECATED_DECLARATIONS_POP +const std::unique_ptr SvMemoryStream pMemStrm = pInteraction-getHyperlinkRecord(); if ( pMemStrm.get() ) { pMemStrm-ObjectOwnsMemory( false ); diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx index 5cc62a7..68871a6 100644 --- a/filter/source/svg/svgdialog.hxx +++ b/filter/source/svg/svgdialog.hxx @@ -39,7 +39,7 @@ class SVGDialog : public ::svt::OGenericUnoDialog, { private: -::std::auto_ptr ResMgr mapResMgr; +::std::unique_ptr ResMgr mapResMgr; com::sun::star::uno::Sequence ::com::sun::star::beans::PropertyValue maMediaDescriptor; com::sun::star::uno::Sequence ::com::sun::star::beans::PropertyValue maFilterData; com::sun::star::uno::Reference ::com::sun::star::lang::XComponent mxSrcDoc; diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index 4190937..6e18668 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -132,7 +132,7 @@ struct SVGShapeDescriptor Color maShapeLineColor; sal_Int32 mnStrokeWidth; SvtGraphicStroke::DashArray maDashArray; -::std::auto_ptr Gradient mapShapeGradient; +::std::unique_ptr Gradient mapShapeGradient; OUString maId; basegfx::B2DLineJoinmaLineJoin; @@ -300,7 +300,7 @@ private: sal_Int32 mnCurMaskId; sal_Int32 mnCurPatternId; ::std::stack SVGAttributeWriter* maContextStack; -::std::auto_ptr SVGShapeDescriptormapCurShape; +::std::unique_ptr SVGShapeDescriptor mapCurShape; SVGExport mrExport; SVGFontExport mrFontExport; SVGAttributeWriter* mpContext; diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index 1b86971..29de8ab 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -1415,9 +1415,7 @@ public: class InteractionInfo { bool mbHasInteraction; -SAL_WNODEPRECATED_DECLARATIONS_PUSH -std::auto_ptrSvMemoryStream mpHyperlinkRecord; -SAL_WNODEPRECATED_DECLARATIONS_POP +std::unique_ptrSvMemoryStream mpHyperlinkRecord; InteractionInfo(); public: @@ -1426,9 +1424,7 @@ public: mpHyperlinkRecord.reset( pStream ); } boolhasInteraction() { return mbHasInteraction; } -SAL_WNODEPRECATED_DECLARATIONS_PUSH -const std::auto_ptr SvMemoryStream getHyperlinkRecord() { return mpHyperlinkRecord; } -SAL_WNODEPRECATED_DECLARATIONS_POP +const std::unique_ptr SvMemoryStream getHyperlinkRecord() { return mpHyperlinkRecord; } };
[Libreoffice-commits] core.git: bridges/source
bridges/source/cpp_uno/shared/vtablefactory.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 22730b9f485fe23266d6d5e789dbc00c4f4cc5e4 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Sep 26 10:19:58 2014 +0200 The unused source_arena arg to alloc/freeExec can just be null Change-Id: I16f8a9e8f421215fe5d392ba3f1f304618d70174 diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx index 325f9e3..2daf76b 100644 --- a/bridges/source/cpp_uno/shared/vtablefactory.cxx +++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx @@ -179,7 +179,7 @@ VtableFactory::VtableFactory(): m_arena( rtl_arena_create( bridges::cpp_uno::shared::VtableFactory, sizeof (void *), // to satisfy alignment requirements -0, reinterpret_cast rtl_arena_type * (-1), allocExec, freeExec, 0)) +0, nullptr, allocExec, freeExec, 0)) { if (m_arena == 0) { throw std::bad_alloc(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/bindings.hxx| 21 -- sfx2/source/control/bindings.cxx | 57 --- 2 files changed, 31 insertions(+), 47 deletions(-) New commits: commit b75b473e2ce6120d58023ee740b41cda35299d00 Author: Takeshi Abe t...@fixedpoint.jp Date: Fri Sep 26 11:59:04 2014 +0900 fdo#75757: remove inheritance to std::vector from SfxFoundCacheArr_Impl, by typedef'ing it as boost::ptr_vectorSfxFoundCache_Impl. Change-Id: Id0e50370b440fb53dbb56dabca9743b27a08b90d Reviewed-on: https://gerrit.libreoffice.org/11650 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx index b1f1f0a..0bccd70 100644 --- a/include/sfx2/bindings.hxx +++ b/include/sfx2/bindings.hxx @@ -29,6 +29,7 @@ #include com/sun/star/uno/Reference.h #include com/sun/star/frame/XDispatchRecorderSupplier.hpp #include vector +#include boost/ptr_container/ptr_vector.hpp // some other includes @@ -50,8 +51,6 @@ class SfxDispatcher; class SfxBindings; class SfxBindings_Impl; class Timer; -struct SfxFoundCache_Impl; -class SfxFoundCacheArr_Impl; class SfxWorkWindow; class SfxUnoControllerItem; @@ -74,6 +73,22 @@ enum SfxPopupAction SFX_POPUP_SHOW }; +struct SfxFoundCache_Impl +{ +sal_uInt16 nSlotId; // the Slot-Id +sal_uInt16 nWhichId; // If available: Which-Id, else: nSlotId +const SfxSlot* pSlot; // Pointer to Master-Slot +SfxStateCache* pCache;// Pointer to StatusCache, if possible NULL + +SfxFoundCache_Impl(sal_uInt16 nS, sal_uInt16 nW, const SfxSlot *pS, SfxStateCache *pC ): +nSlotId(nS), +nWhichId(nW), +pSlot(pS), +pCache(pC) +{} +}; + +typedef boost::ptr_vectorSfxFoundCache_Impl SfxFoundCacheArr_Impl; class SFX2_DLLPUBLIC SfxBindings: public SfxBroadcaster @@ -117,7 +132,7 @@ private: SAL_DLLPRIVATE void Update_Impl( SfxStateCache* pCache ); SAL_DLLPRIVATE void UpdateControllers_Impl( const SfxInterface* pIF, -const SfxFoundCache_Impl* pFound, +const SfxFoundCache_Impl rFound, const SfxPoolItem *pItem, SfxItemState eItemState ); SAL_DLLPRIVATE SfxStateCache* GetStateCache( sal_uInt16 nId, sal_uInt16 *pPos); diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 4184c34..ea6a329 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -146,37 +146,6 @@ public: InvalidateSlotMap m_aInvalidateSlots; // store slots which are invalidated while in update }; - - -struct SfxFoundCache_Impl -{ -sal_uInt16 nSlotId; // the Slot-Id -sal_uInt16 nWhichId; // If available: Which-Id, else: nSlotId -const SfxSlot* pSlot; // Pointer to Master-Slot -SfxStateCache* pCache;// Pointer to StatusCache, if possible NULL - -SfxFoundCache_Impl(sal_uInt16 nS, sal_uInt16 nW, const SfxSlot *pS, SfxStateCache *pC ): -nSlotId(nS), -nWhichId(nW), -pSlot(pS), -pCache(pC) -{} -}; - - - -class SfxFoundCacheArr_Impl : public std::vectorSfxFoundCache_Impl* -{ -public: -~SfxFoundCacheArr_Impl() -{ -for(const_iterator it = begin(); it != end(); ++it) -delete *it; -} -}; - - - SfxBindings::SfxBindings() : pImp(new SfxBindings_Impl), pDispatcher(0), @@ -378,8 +347,8 @@ void SfxBindings::Update_Impl rDispat.GetShell(pMsgServer-GetShellLevel())-GetInterface(); for ( sal_uInt16 nPos = 0; nPos aFound.size(); ++nPos ) { -const SfxFoundCache_Impl *pFound = aFound[nPos]; -sal_uInt16 nWhich = pFound-nWhichId; +const SfxFoundCache_Impl rFound = aFound[nPos]; +sal_uInt16 nWhich = rFound.nWhichId; const SfxPoolItem *pItem = 0; SfxItemState eState = pSet-GetItemState(nWhich, true, pItem); if ( eState == SfxItemState::DEFAULT SfxItemPool::IsWhich(nWhich) ) @@ -400,7 +369,7 @@ void SfxBindings::Update_Impl SfxFoundCache_Impl aFoundCache( pCache-GetId(), 0, pRealSlot, pCache ); -UpdateControllers_Impl( 0, aFoundCache, 0, SfxItemState::DISABLED); +UpdateControllers_Impl( 0, aFoundCache, 0, SfxItemState::DISABLED); } } @@ -1390,12 +1359,12 @@ SfxItemSet* SfxBindings::CreateSet_Impl sal_uInt16 i = 0; while ( i rFound.size() ) { -pRanges[j++] = rFound[i]-nWhichId; +pRanges[j++] = rFound[i].nWhichId; // consecutive numbers for ( ; i rFound.size()-1; ++i ) -if ( rFound[i]-nWhichId+1 != rFound[i+1]-nWhichId ) +if (
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sfx2/source
sfx2/source/dialog/backingwindow.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c0cb2dc6a6bc539f4cdad2bc54cbbde29c69ea7e Author: Yousuf Philips philip...@hotmail.com Date: Fri Sep 26 08:20:39 2014 +0400 fdo#82043: Instead of the bold font, use a higher multiplifier (4.3 backport) Change-Id: I835e5c645ef52f23254178c782f2d484c5c0d20f Reviewed-on: https://gerrit.libreoffice.org/11651 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 764337a..d2b52bd 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -60,7 +60,7 @@ const char TEMPLATE_URL[] = slot:5500; const char OPEN_URL[] = .uno:Open; const char SERVICENAME_CFGREADACCESS[] = com.sun.star.configuration.ConfigurationAccess; -float fMultiplier = 1.2; +float fMultiplier = 1.4; const Color aButtonsBackground(114, 168, 84); // TDF green const Color aButtonsText(COL_WHITE); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/mkdocs.sh | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit 3dcb47d0d082696c8170411187e5b262840dc774 Author: Philipp Weissenbacher p.weissenbac...@gmail.com Date: Thu Sep 25 22:52:13 2014 +0200 Use multi-column layout and correct header colour Also fixed some tab indents Change-Id: If2e4301d2199e0a72c8d859231430c1982fd0fc0 Reviewed-on: https://gerrit.libreoffice.org/11649 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh index 888521b..24aeee4 100755 --- a/solenv/bin/mkdocs.sh +++ b/solenv/bin/mkdocs.sh @@ -25,14 +25,14 @@ function header { style * { margin: 0; padding: 0; } body { font-family: sans-serif; font-size: 12px; } - #head { padding: 20px; background: #18A303; } +#head { padding: 20px; background: #00A500; } #head a { color: #000; } #body { padding: 20px; } #foot { padding: 10px; font-size: 9px; border-top: 1px #18A303 solid; margin-top: 25px; } p { line-height: 1.7em; margin-bottom: 1em; } pre { margin-bottom: 0.5em; } - .multi-col { -moz-column-width: 13em; -webkit-column-width: 13em; -moz-column-gap: 1em; -webkit-column-gap: 1em; } - h1 {margin-bottom: 0.5em;} +.multi-col { -moz-column-width: 20em; -webkit-column-width: 20em; -moz-column-gap: 1em; -webkit-column-gap: 1em; } +h1 { margin-bottom: 0.5em; } h2,h3,h4 { margin: 1.3em 0 0.5em 0; } ul, ol { margin: 0.5em 1.5em; } /style @@ -42,7 +42,7 @@ function header { h1$title/h1 p$breadcrumb/p /div - div id=body +div id=body style=multi-col EOF } @@ -87,7 +87,7 @@ function proc_text { function setup { parm=$1 if [ -z ${!parm} ] ; then - echo grep \${parm}=\ ./config_host.mk | sed -re \ s/${parm}=//\) +echo grep \${parm}=\ ./config_host.mk | sed -re \ s/${parm}=//\) echo $parm=$(grep \${parm}=\ ./config_host.mk | sed -re \ s/${parm}=//\) eval $parm=$(grep \${parm}=\ ./config_host.mk | sed -re \ s/${parm}=//\) fi @@ -224,7 +224,7 @@ for module_name in *; do else empty_modules[${#empty_modules[*]}]=$module_name fi - fi + fi done if [ ${#empty_modules[*]} -gt 0 ]; then echo -e pnbsp;/ppREADMEs were not available for these modules:/pul\n $BASE_OUTPUT/index.html ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75757] remove inheritance to std::map and std::vector
https://bugs.freedesktop.org/show_bug.cgi?id=75757 --- Comment #39 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Takeshi Abe committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=b75b473e2ce6120d58023ee740b41cda35299d00 fdo#75757: remove inheritance to std::vector The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac
configure.ac |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit bf00789dacf66488cb4f92819acf6953ed96164b Author: Peter Foley pefol...@pefoley.com Date: Wed Sep 17 21:27:31 2014 -0400 Properly handle the hash-style linker check when cross-compiling Currently the hash-style check fails when cross-compiling, use AC_RUN_IFELSE to properly handle this case. checking for --hash-style gcc linker support ... ./configure: line 12119: ./conftest: cannot execute binary file Change-Id: I77c2d6a859c1c2e6ba42f31b527a9507127d0644 Reviewed-on: https://gerrit.libreoffice.org/11496 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/configure.ac b/configure.ac index 499d765..c4367d9 100644 --- a/configure.ac +++ b/configure.ac @@ -4906,16 +4906,17 @@ if test $GCC = yes; then hash_style_ldflags_save=$LDFLAGS LDFLAGS=$LDFLAGS -Wl,--hash-style=$hash_style -AC_LINK_IFELSE([AC_LANG_PROGRAM( +AC_RUN_IFELSE([AC_LANG_PROGRAM( [ #include stdio.h ],[ printf (); ])], -[ if ./conftest$EXEEXT; then +[ HAVE_LD_HASH_STYLE=TRUE WITH_LINKER_HASH_STYLE=$hash_style - fi], +], +[HAVE_LD_HASH_STYLE=FALSE], [HAVE_LD_HASH_STYLE=FALSE]) LDFLAGS=$hash_style_ldflags_save done ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/lok_sofficemain2' - 2 commits - desktop/source svx/source
desktop/source/lib/init.cxx|7 +++ svx/source/sdr/contact/objectcontactofpageview.cxx |2 +- 2 files changed, 8 insertions(+), 1 deletion(-) New commits: commit 2accef3fe63121d98b866e814e74492d0fae8647 Author: Andrzej Hunt andrzej.h...@collabora.com Date: Fri Sep 26 09:11:53 2014 +0100 Don't use this quick hack on Android. It *seems* to cause missing areas (at least in Impress). (i.e. the bottom half or right side of headers on slides can sometimes go missing, not using this hack fixes the problem for me). Change-Id: I205531666e0ad12470020e5ff2568ebf16bc2f01 diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx index dbd43d3..2eb55f7 100644 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -236,7 +236,7 @@ namespace sdr updateViewInformation2D(aNewViewInformation2D); drawinglayer::primitive2d::Primitive2DSequence xPrimitiveSequence; -#if HAVE_FEATURE_DESKTOP +#if defined( HAVE_FEATURE_DESKTOP ) || defined( ANDROID ) // get whole Primitive2DSequence; this will already make use of updated ViewInformation2D // and may use the MapMode from the Target OutDev in the DisplayInfo xPrimitiveSequence = rDrawPageVOContact.getPrimitive2DSequenceHierarchy(rDisplayInfo); commit a79846ab296a40310af798bb42f0c590c3b87ed8 Author: Andrzej Hunt andrzej.h...@collabora.com Date: Fri Sep 26 09:12:56 2014 +0100 Add more lok debug output. This should allow as at least to see if soffice_main thread initialisation gets stuck (which we'd otherwise have a hard time determining if we are trying to debug e.g. on Android). Change-Id: I0baa211c015318c4e0fcf78a4e86a0ba8b895d5f diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 89c8168..9613514 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -700,9 +700,12 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath) // to LOK in an external program). if (!osl_areCommandArgsSet()) { +SAL_INFO(lok, commandArgs not previously set); osl_setCommandArgs(2, pArgs); } +SAL_INFO(lok, attempting to initalize UNO); initialize_uno(aAppURL); +SAL_INFO(lok, uno successfully initalized); force_c_locale(); // Force headless -- this is only for bitmap rendering. @@ -724,9 +727,13 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath) // the Thread from wherever (it's done again in Desktop::Main), and can // then use it to wait until we're definitely ready to continue. +SAL_INFO(lok, enabling OfficeIPCThread); OfficeIPCThread::EnableOfficeIPCThread(); +SAL_INFO(lok, starting soffice_main); pthread_create((pLib-maThread), 0, lo_startmain, NULL); +SAL_INFO(lok, waiting for OfficeIPCThread); OfficeIPCThread::WaitForReady(); +SAL_INFO(lok, OfficeIPCThread ready -- continuing); // If the Thread has been disabled again that indicates that a // restart is required (or in any case we don't have a useable ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit faf99f6f405e076d5c9ab95c876ae1ffb896f8d1 Author: Kay Schenk ksch...@apache.org Date: Fri Sep 26 09:31:26 2014 +0100 Updated core Project: help c4b49fbddd2099733cb5c7606fbc5b848b23c1e0 diff --git a/helpcontent2 b/helpcontent2 index c15adbc..c4b49fb 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c15adbcd9f39fdd4f2a2e53749e5dc47b365d406 +Subproject commit c4b49fbddd2099733cb5c7606fbc5b848b23c1e0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/explorer/database/02010100.xhp | 98 +- 1 file changed, 62 insertions(+), 36 deletions(-) New commits: commit c4b49fbddd2099733cb5c7606fbc5b848b23c1e0 Author: Kay Schenk ksch...@apache.org Date: Fri Sep 26 09:31:26 2014 +0100 Added information on date types to correspond to SQL2. Reformatted information a bit Change-Id: I0e9be1d68b78aa60f1eb3a30be708ff966ebaea1 diff --git a/source/text/shared/explorer/database/02010100.xhp b/source/text/shared/explorer/database/02010100.xhp index a317ab7..83a2849 100644 --- a/source/text/shared/explorer/database/02010100.xhp +++ b/source/text/shared/explorer/database/02010100.xhp @@ -319,6 +319,7 @@ paragraph role=heading id=hd_id3148926 xml-lang=en-US level=3 l10n=U oldref=37Formulating filter conditions/paragraph section id=abfragekriterien paragraph role=paragraph id=par_id3153162 xml-lang=en-US l10n=U oldref=38When formulating filter conditions, various operators and commands are available to you. Apart from the relational operators, there are SQL-specific commands that query the content of database fields. If you use these commands in the $[officename] syntax, $[officename] automatically converts these into the corresponding SQL syntax. You can also enter the SQL command directly. The following tables give an overview of the operators and commands:/paragraph + table id=tbl_id3152803 tablerow tablecell colspan= rowspan= @@ -399,6 +400,7 @@ /tablecell /tablerow /table + table id=tbl_id3153376 tablerow tablecell colspan= rowspan= @@ -573,6 +575,15 @@ paragraph role=paragraph id=par_id3150948 xml-lang=en-US l10n=U oldref=119returns field names with the field content Ms./paragraph /tablecell /tablerow + +tablerow +tablecell colspan= rowspan= +paragraph role=paragraph id=par_id315379A xml-lang=en-US l10n=U oldref=118lt;'2001-01-10'/paragraph +/tablecell +tablecell colspan= rowspan= +paragraph role=paragraph id=par_id315094A xml-lang=en-US l10n=U oldref=119returns dates that occurred before January 10, 2001/paragraph +/tablecell +/tablerow tablerow tablecell colspan= rowspan= paragraph role=paragraph id=par_id3150333 xml-lang=en-US l10n=U oldref=120LIKE 'g?ve'/paragraph @@ -615,73 +626,88 @@ /tablerow /table /section + +paragraph role=paragraph id=par_id3146073 xml-lang=en-US l10n=U oldref=268 +emphLike /emphEscape Sequence: {escape 'escape-character'}/paragraph +paragraph role=paragraph id=par_id3150661 xml-lang=en-US l10n=U oldref=269Example: select * from Item where ItemName like 'The *%' {escape '*'}/paragraph +paragraph role=paragraph id=par_id3148541 xml-lang=en-US l10n=U oldref=270The example will give you all of the entries where the item name begins with 'The *'. This means that you can also search for characters that would otherwise be interpreted as placeholders, such as *, ?, _, % or the period./paragraph +paragraph role=paragraph id=par_id3150572 xml-lang=en-US l10n=U oldref=271 +emphOuter Join/emph Escape Sequence: {oj outer-join}/paragraph +paragraph role=paragraph id=par_id3156052 xml-lang=en-US l10n=U oldref=272Example: select Article.* from {oj item LEFT OUTER JOIN orders ON item.no=orders.ANR}/paragraph +paragraph role=heading id=hd_id3153674 xml-lang=en-US level=3 l10n=U oldref=109Querying text fields/paragraph +paragraph role=paragraph id=par_id3149134 xml-lang=en-US l10n=U oldref=110To query the content of a text field, you must put the expression between single quotes. The distinction between uppercase and lowercase letters depends on the database in use. LIKE, by definition, is case-sensitive (though some databases don't see it that strict)./paragraph + +paragraph role=heading id=hd_id3149302 xml-lang=en-US level=3 l10n=U oldref=111Querying date fields/paragraph +!--//kls begin edits -- paragraph role=paragraph id=par_id3157998 xml-lang=en-US l10n=U oldref=252 -emphDate fields/emph are represented as #Date# to clearly identify them as dates. The date condition will be reproduced in the resulting SQL statement in the following ODBC - compliant way:/paragraph +emphDate fields/emph are represented as #Date# to clearly identify them as dates. Date, time and date/time constants (literals) used in conditions can be of either the SQL Escape Syntax type, or default SQL2 syntax./paragraph + table id=tbl_id3156186 tablerow tablecell colspan= rowspan= -paragraph role=paragraph id=par_id3153734 xml-lang=en-US l10n=U oldref=253Date/paragraph -/tablecell +paragraph role=tablehead id=par_id31537341 xml-lang=en-US l10n=U oldref=253Date Type Element/paragraph +/tablecell tablecell colspan= rowspan= -paragraph role=paragraph id=par_id3159131 xml-lang=en-US l10n=U oldref=254{D'-MM-DD'}/paragraph +paragraph role=tablehead id=par_id31537342 xml-lang=en-US l10n=U oldref=253SQL Escape syntax #1 - may be obsolete/paragraph /tablecell -/tablerow -tablerow tablecell colspan= rowspan= -paragraph role=paragraph id=par_id3153937
[Libreoffice-commits] core.git: Branch 'feature/perfwork' - include/sax sax/source
include/sax/fastattribs.hxx | 36 +-- sax/source/fastparser/fastparser.cxx |7 ++ sax/source/tools/fastattribs.cxx | 25 3 files changed, 30 insertions(+), 38 deletions(-) New commits: commit 0ea1be53909d30a7fbe22f9c95f7b77ed0054fed Author: Michael Meeks michael.me...@collabora.com Date: Fri Sep 26 10:37:17 2014 +0100 fastparser: avoid allocating un-used FastTokenLookup class. This contained an rtl_Sequence complete with horror internal allocator, caught red-handed serializing threaded loading to no good purpose. Change-Id: I837b2c17e4f70fd6a49bed33ad74a7d79f98f35c diff --git a/include/sax/fastattribs.hxx b/include/sax/fastattribs.hxx index 4724b7e..6d9c7a4 100644 --- a/include/sax/fastattribs.hxx +++ b/include/sax/fastattribs.hxx @@ -52,22 +52,24 @@ typedef std::vector UnknownAttribute UnknownAttributeList; /// A native C++ interface to tokenisation class SAX_DLLPUBLIC FastTokenHandlerBase { -public: -virtual ~FastTokenHandlerBase(); -virtual sal_Int32 getTokenDirect( const char *pToken, sal_Int32 nLength ) const = 0; -}; - -/// avoid constantly allocating and freeing sequences. -class SAX_DLLPUBLIC FastTokenLookup -{ -static const int mnUtf8BufferSize = 128; -css::uno::Sequence sal_Int8 maUtf8Buffer; -public: -FastTokenLookup(); -sal_Int32 getTokenFromChars( -const css::uno::Reference css::xml::sax::XFastTokenHandler mxTokenHandler, -FastTokenHandlerBase *pTokenHandler, -const char *pStr, size_t nLength = 0 ); + public: +virtual ~FastTokenHandlerBase(); +virtual sal_Int32 getTokenDirect( const char *pToken, sal_Int32 nLength ) const = 0; + +/** + * Client method to attempt the use of this interface if possible. + * @xTokenHandler - the UNO handle for the token lookup interface + * @pTokenHandler - a dynamic_cast version of @xTokenHandler to this interface + * @pStr - string buffer to lookup + * @nLength - optional length of chars in that buffer + * + * @return Tokenized form of pStr + */ +static sal_Int32 getTokenFromChars( + const css::uno::Reference + css::xml::sax::XFastTokenHandler xTokenHandler, + FastTokenHandlerBase *pTokenHandler /* can be NULL */, + const char *pStr, size_t nLength = 0 ); }; class SAX_DLLPUBLIC FastAttributeList : public ::cppu::WeakImplHelper1 ::com::sun::star::xml::sax::XFastAttributeList @@ -112,8 +114,6 @@ private: UnknownAttributeList maUnknownAttributes; ::com::sun::star::uno::Reference ::com::sun::star::xml::sax::XFastTokenHandler mxTokenHandler; FastTokenHandlerBase *mpTokenHandler; - -FastTokenLookup maTokenLookup; }; } diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index fcbb58d..12429be 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -253,7 +253,6 @@ private: Entity *mpTop; /// std::stack::top() is amazingly slow = cache this. ::std::stack Entity maEntities; /// Entity stack for each call of parseStream(). -FastTokenLookup maTokenLookup; }; } // namespace sax_fastparser @@ -646,9 +645,9 @@ void FastSaxParserImpl::DefineNamespace( const OString rPrefix, const sal_Char* sal_Int32 FastSaxParserImpl::GetToken( const sal_Char* pToken, sal_Int32 nLen /* = 0 */ ) { -return maTokenLookup.getTokenFromChars( getEntity().mxTokenHandler, -getEntity().mpTokenHandler, -pToken, nLen ); +return FastTokenHandlerBase::getTokenFromChars( getEntity().mxTokenHandler, +getEntity().mpTokenHandler, +pToken, nLen ); } sal_Int32 FastSaxParserImpl::GetTokenWithPrefix( const sal_Char*pPrefix, int nPrefixLen, const sal_Char* pName, int nNameLen ) throw (SAXException) diff --git a/sax/source/tools/fastattribs.cxx b/sax/source/tools/fastattribs.cxx index 9d03772..45887b5 100644 --- a/sax/source/tools/fastattribs.cxx +++ b/sax/source/tools/fastattribs.cxx @@ -127,9 +127,10 @@ sal_Int32 FastAttributeList::getValueToken( ::sal_Int32 Token ) throw (SAXExcept { for (size_t i = 0; i maAttributeTokens.size(); ++i) if (maAttributeTokens[i] == Token) -return maTokenLookup.getTokenFromChars( mxTokenHandler, mpTokenHandler, -mpChunk + maAttributeValues[ i ], -AttributeValueLength( i ) ); +return FastTokenHandlerBase::getTokenFromChars( + mxTokenHandler, mpTokenHandler, + mpChunk + maAttributeValues[ i ], +
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - oox/source sd/qa
oox/source/drawingml/table/tablecell.cxx | 55 ++- sd/qa/unit/import-tests.cxx | 12 ++ 2 files changed, 45 insertions(+), 22 deletions(-) New commits: commit 3fd148ace5d69fe4d7179a5804a16bf8d86a64c5 Author: Matúš Kukan matus.ku...@collabora.com Date: Mon Sep 22 11:59:14 2014 +0200 bnc#897769: OOXML import: Import border lines using reference too. Do not ignore 'lnRef' element. Also fix typo to apply 'seCell' properties to the right cell (southeast). Change-Id: Ia45f7016f358b70e6db06a232c569335ce9d7051 (cherry picked from commit 18898e13fda25fe6dc85318dd0711355c7b2cc26) Reviewed-on: https://gerrit.libreoffice.org/11652 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx index 2c1fa3c..1b33659 100644 --- a/oox/source/drawingml/table/tablecell.cxx +++ b/oox/source/drawingml/table/tablecell.cxx @@ -84,15 +84,26 @@ void applyLineAttributes( const ::oox::core::XmlFilterBase rFilterBase, aPropSet.setProperty( nPropId, aBorderLine ); } -void applyBorder( TableStylePart rTableStylePart, sal_Int32 nLineType, oox::drawingml::LineProperties rLineProperties ) +void applyBorder( const ::oox::core::XmlFilterBase rFilterBase, TableStylePart rTableStylePart, sal_Int32 nLineType, oox::drawingml::LineProperties rLineProperties ) { std::map sal_Int32, ::oox::drawingml::LinePropertiesPtr rPartLineBorders( rTableStylePart.getLineBorders() ); +::oox::drawingml::ShapeStyleRef rLineStyleRef = rTableStylePart.getStyleRefs()[ nLineType ]; std::map sal_Int32, ::oox::drawingml::LinePropertiesPtr ::const_iterator aIter( rPartLineBorders.find( nLineType ) ); if ( ( aIter != rPartLineBorders.end() ) aIter-second.get() ) rLineProperties.assignUsed( *aIter-second ); +else if (rLineStyleRef.mnThemedIdx != 0) +{ +if (const Theme* pTheme = rFilterBase.getCurrentTheme()) +{ +rLineProperties.assignUsed( *pTheme-getLineStyle(rLineStyleRef.mnThemedIdx) ); +sal_Int32 nPhClr = rLineStyleRef.maPhClr.getColor( rFilterBase.getGraphicHelper() ); +rLineProperties.maLineFill.maFillColor.setSrgbClr( nPhClr ); +} +} } -void applyTableStylePart( oox::drawingml::FillProperties rFillProperties, +void applyTableStylePart( const ::oox::core::XmlFilterBase rFilterBase, + oox::drawingml::FillProperties rFillProperties, TextCharacterProperties aTextCharProps, oox::drawingml::LineProperties rLeftBorder, oox::drawingml::LineProperties rRightBorder, @@ -106,12 +117,12 @@ void applyTableStylePart( oox::drawingml::FillProperties rFillProperties, if ( rPartFillPropertiesPtr.get() ) rFillProperties.assignUsed( *rPartFillPropertiesPtr ); -applyBorder( rTableStylePart, XML_left, rLeftBorder ); -applyBorder( rTableStylePart, XML_right, rRightBorder ); -applyBorder( rTableStylePart, XML_top, rTopBorder ); -applyBorder( rTableStylePart, XML_bottom, rBottomBorder ); -applyBorder( rTableStylePart, XML_tl2br, rTopLeftToBottomRightBorder ); -applyBorder( rTableStylePart, XML_tr2bl, rBottomLeftToTopRightBorder ); +applyBorder( rFilterBase, rTableStylePart, XML_left, rLeftBorder ); +applyBorder( rFilterBase, rTableStylePart, XML_right, rRightBorder ); +applyBorder( rFilterBase, rTableStylePart, XML_top, rTopBorder ); +applyBorder( rFilterBase, rTableStylePart, XML_bottom, rBottomBorder ); +applyBorder( rFilterBase, rTableStylePart, XML_tl2br, rTopLeftToBottomRightBorder ); +applyBorder( rFilterBase, rTableStylePart, XML_tr2bl, rBottomLeftToTopRightBorder ); aTextCharProps.maLatinFont = rTableStylePart.getLatinFont(); aTextCharProps.maAsianFont = rTableStylePart.getAsianFont(); @@ -171,7 +182,7 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase rFilterBase, ::oo oox::drawingml::LineProperties aLinePropertiesTopLeftToBottomRight; oox::drawingml::LineProperties aLinePropertiesBottomLeftToTopRight; -applyTableStylePart( aFillProperties, aTextStyleProps, +applyTableStylePart( rFilterBase, aFillProperties, aTextStyleProps, aLinePropertiesLeft, aLinePropertiesRight, aLinePropertiesTop, @@ -182,7 +193,7 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase rFilterBase, ::oo if ( rProperties.isFirstRow() ( nRow == 0 ) ) { -applyTableStylePart( aFillProperties, aTextStyleProps, +applyTableStylePart( rFilterBase, aFillProperties, aTextStyleProps, aLinePropertiesLeft, aLinePropertiesRight, aLinePropertiesTop, @@ -193,7 +204,7 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase rFilterBase,
[Libreoffice-commits] core.git: 10 commits - extensions/source i18npool/source oox/source sdext/source svx/source sw/source
extensions/source/plugin/aqua/macmgr.mm |2 extensions/source/plugin/inc/plugin/impl.hxx |2 extensions/source/plugin/unx/unxmgr.cxx |2 extensions/source/plugin/win/winmgr.cxx |2 i18npool/source/nativenumber/nativenumbersupplier.cxx | 144 ++ oox/source/docprop/ooxmldocpropimport.cxx |2 sdext/source/presenter/PresenterSpritePane.hxx| 18 +- svx/source/fmcomp/gridcell.cxx|3 sw/source/core/crsr/crsrsh.cxx|9 - sw/source/core/unocore/unostyle.cxx |2 10 files changed, 104 insertions(+), 82 deletions(-) New commits: commit 465270077e385946c47235363c1120846d5d Author: Caolán McNamara caol...@redhat.com Date: Fri Sep 26 11:16:18 2014 +0100 Resolves: fdo#84261 unexpected exception - clang builds terminate Change-Id: I545ed112b54fb3d81e67b0f42230811cd48de626 diff --git a/oox/source/docprop/ooxmldocpropimport.cxx b/oox/source/docprop/ooxmldocpropimport.cxx index e274143..c711f2f 100644 --- a/oox/source/docprop/ooxmldocpropimport.cxx +++ b/oox/source/docprop/ooxmldocpropimport.cxx @@ -63,7 +63,7 @@ Reference XInterface SAL_CALL DocumentPropertiesImport_createInstance( const namespace { -Sequence InputSource lclGetRelatedStreams( const Reference XStorage rxStorage, const OUString rStreamType ) throw (RuntimeException) +Sequence InputSource lclGetRelatedStreams( const Reference XStorage rxStorage, const OUString rStreamType ) throw (RuntimeException, css::io::IOException) { Reference XRelationshipAccess xRelation( rxStorage, UNO_QUERY_THROW ); Reference XHierarchicalStorageAccess xHierarchy( rxStorage, UNO_QUERY_THROW ); commit 8305efa9e8c3af4792b4ab96dbee908e004b3356 Author: Caolán McNamara caol...@redhat.com Date: Fri Sep 26 10:11:02 2014 +0100 coverity#983665 Uncaught exception Change-Id: I3d0cd9a9bde8c3705abd876e832b6b7e56bb7fad diff --git a/extensions/source/plugin/aqua/macmgr.mm b/extensions/source/plugin/aqua/macmgr.mm index 1c26cf2..878571a 100644 --- a/extensions/source/plugin/aqua/macmgr.mm +++ b/extensions/source/plugin/aqua/macmgr.mm @@ -584,7 +584,7 @@ static rtl::OUString FindFolderURL( FSVolumeRefNum vRefNum, OSType folderType ) return aRet; } -SequencePluginDescription XPluginManager_Impl::impl_getPluginDescriptions() throw() +SequencePluginDescription XPluginManager_Impl::impl_getPluginDescriptions() throw(css::uno::RuntimeException, std::exception) { static SequencePluginDescription aDescriptions; static sal_Bool bHavePlugins = sal_False; diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx index c9b545e..a22af7c 100644 --- a/extensions/source/plugin/inc/plugin/impl.hxx +++ b/extensions/source/plugin/inc/plugin/impl.hxx @@ -303,7 +303,7 @@ public: virtual Reference com::sun::star::plugin::XPluginContext SAL_CALL createPluginContext() throw(std::exception) SAL_OVERRIDE; // has to be implemented per system -virtual Sequence com::sun::star::plugin::PluginDescription SAL_CALL impl_getPluginDescriptions(void) throw(); +virtual Sequence com::sun::star::plugin::PluginDescription SAL_CALL impl_getPluginDescriptions() throw(css::uno::RuntimeException, std::exception); // calls system specific impl_getPluginDescriptions // checks whether plugins are disabled virtual Sequence com::sun::star::plugin::PluginDescription SAL_CALL getPluginDescriptions() diff --git a/extensions/source/plugin/unx/unxmgr.cxx b/extensions/source/plugin/unx/unxmgr.cxx index b1aae92..0433aea 100644 --- a/extensions/source/plugin/unx/unxmgr.cxx +++ b/extensions/source/plugin/unx/unxmgr.cxx @@ -234,7 +234,7 @@ static void CheckPluginRegistryFiles( const OString rPath, list PluginDescript closedir( pDIR ); } -SequencePluginDescription XPluginManager_Impl::impl_getPluginDescriptions() throw() +SequencePluginDescription XPluginManager_Impl::impl_getPluginDescriptions() throw(css::uno::RuntimeException, std::exception) { static SequencePluginDescription aDescriptions; static bool bHavePlugins = false; diff --git a/extensions/source/plugin/win/winmgr.cxx b/extensions/source/plugin/win/winmgr.cxx index 8f531e7..881ec27 100644 --- a/extensions/source/plugin/win/winmgr.cxx +++ b/extensions/source/plugin/win/winmgr.cxx @@ -299,7 +299,7 @@ static void add_SO_Plugins( PluginLocationMap rPlugins ) } -Sequence PluginDescription XPluginManager_Impl::impl_getPluginDescriptions(void) throw() +Sequence PluginDescription XPluginManager_Impl::impl_getPluginDescriptions() throw(css::uno::RuntimeException, std::exception) { Guard Mutex aGuard( Mutex::getGlobalMutex() ); static SequencePluginDescription s_aDescriptions( 0 ); commit ecbb4efb1588c11c6c9d606ad429d2641f06576c Author: Caolán McNamara caol...@redhat.com Date: Fri
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/rot90-fliph.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 11 +++ writerfilter/source/dmapper/GraphicImport.cxx | 19 --- 3 files changed, 23 insertions(+), 7 deletions(-) New commits: commit dd2b8472a97d1ab0f9969b046a1c2ec5586a Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Sep 26 12:45:12 2014 +0200 DOCX drawingML import: fix handling of rotation in case of horizontal flip Change-Id: I95f74c3d3222a4d713c8d71bcd3263ecb16dba54 diff --git a/sw/qa/extras/ooxmlexport/data/rot90-fliph.docx b/sw/qa/extras/ooxmlexport/data/rot90-fliph.docx new file mode 100644 index 000..c2a916d8 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/rot90-fliph.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index be44a07..43ea669 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -304,6 +304,17 @@ DECLARE_OOXMLEXPORT_TEST(testDrawingmlFlipv, drawingml-flipv.docx) } } +DECLARE_OOXMLEXPORT_TEST(testRot90Fliph, rot90-fliph.docx) +{ +// The problem was that a shape rotation of 90° got turned into 270° after roundtrip. +if (xmlDocPtr pXmlDoc = parseExport(word/document.xml)) +{ +assertXPath(pXmlDoc, //a:xfrm, flipH, 1); +// This was 1620 (270 * 6). +assertXPath(pXmlDoc, //a:xfrm, rot, 540); +} +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 28550bd..0c914af 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -41,6 +41,8 @@ #include com/sun/star/uno/XComponentContext.hpp #include com/sun/star/table/ShadowFormat.hpp +#include svx/svdobj.hxx +#include svx/unoapi.hxx #include cppuhelper/implbase1.hxx #include rtl/ustrbuf.hxx #include rtl/math.hxx @@ -749,15 +751,18 @@ void GraphicImport::lcl_attribute(Id nName, Value rValue) if (m_pImpl-isYSizeValis()) aSize.Height = m_pImpl-getYSize(); -// TODO: avoid this setSize(), just send the size to -// oox, so it can set the right transformation matrix -// right away. -uno::Any aRotation; +sal_Int32 nRotation = 0; if (bKeepRotation) -aRotation = xShapeProps-getPropertyValue(RotateAngle); +{ +// Use internal API, getPropertyValue(RotateAngle) +// would use GetObjectRotation(), which is not what +// we want. +if (SdrObject* pShape = GetSdrObjectFromXShape(m_xShape)) +nRotation = pShape-GetRotateAngle(); +} m_xShape-setSize(aSize); -if (bKeepRotation aRotation.hasValue() aRotation.getsal_Int32() != 0) -xShapeProps-setPropertyValue(RotateAngle, aRotation); +if (bKeepRotation) +xShapeProps-setPropertyValue(RotateAngle, uno::makeAny(nRotation)); m_pImpl-bIsGraphic = true; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source include/sot include/tools oox/source sfx2/source sot/source tools/source
filter/source/msfilter/svdfppt.cxx |4 include/sot/stg.hxx|7 - include/tools/globname.hxx | 23 ++-- oox/source/ole/olehelper.cxx | 18 --- sfx2/source/doc/objitem.cxx|2 sot/source/sdstor/stg.cxx |6 - sot/source/sdstor/stgelem.cxx | 44 sot/source/sdstor/ucbstorage.cxx |2 tools/source/ref/globname.cxx | 196 - 9 files changed, 112 insertions(+), 190 deletions(-) New commits: commit ed085a6d2043e1da6b50a9d00742b812c9ff0247 Author: Noel Grandin n...@peralex.com Date: Fri Sep 26 13:12:52 2014 +0200 cleanup GUID/ClsId/CLSID types - rename GUID to SvGUID so we don't need an #ifdef WIN32 - drop ClsId struct, since it is used interchangeably with GUID and has the same structure Change-Id: Idf5c14c82a6861ef585fb57896a9b12cfe40374c diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 197b869..0d99c9d 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -1822,9 +1822,7 @@ SdrObject* SdrPowerPointImport::ImportOLE( long nOLEId, { if ( xObjStor-GetClassName() == SvGlobalName() ) { -ClsId aId( pObjStor-GetClassId() ); -xObjStor-SetClass( SvGlobalName( aId.n1, aId.n2, aId.n3, aId.n4, aId.n5, aId.n6, aId.n7, aId.n8, aId.n9, aId.n10, aId.n11 ), -pObjStor-GetFormat(), pObjStor-GetUserName() ); +xObjStor-SetClass( SvGlobalName( pObjStor-GetClassId() ), pObjStor-GetFormat(), pObjStor-GetUserName() ); } SotStorageStreamRef xSrcTst = xObjStor-OpenSotStream( \1Ole ); if ( xSrcTst.Is() ) diff --git a/include/sot/stg.hxx b/include/sot/stg.hxx index b42ed4c..2d8b1d1 100644 --- a/include/sot/stg.hxx +++ b/include/sot/stg.hxx @@ -43,12 +43,7 @@ class StgIo; class StgDirEntry; class StgStrm; class SvGlobalName; -struct ClsId -{ -sal_Int32 n1; -sal_Int16 n2, n3; -sal_uInt8 n4, n5, n6, n7, n8, n9, n10, n11; -}; +typedef struct SvGUID ClsId; class SOT_DLLPUBLIC StorageBase : public SvRefBase { diff --git a/include/tools/globname.hxx b/include/tools/globname.hxx index 8bd996f..4defc52 100644 --- a/include/tools/globname.hxx +++ b/include/tools/globname.hxx @@ -24,9 +24,17 @@ #include tools/toolsdllapi.h #include com/sun/star/uno/Sequence.hxx +struct SvGUID +{ +sal_uInt32 Data1; +sal_uInt16 Data2; +sal_uInt16 Data3; +sal_uInt8 Data4[8]; +}; + struct ImpSvGlobalName { -sal_uInt8 szData[ 16 ]; +struct SvGUID szData; sal_uInt16 nRefCount; enum Empty { EMPTY }; @@ -41,14 +49,6 @@ struct ImpSvGlobalName booloperator == ( const ImpSvGlobalName rObj ) const; }; -#ifdef WNT -struct _GUID; -typedef struct _GUID GUID; -#else -struct GUID; -#endif - -typedef GUID CLSID; class SvStream; class TOOLS_DLLPUBLIC SvGlobalName @@ -93,9 +93,8 @@ public: bool MakeId( const OUString rId ); OUString GetHexName() const; - SvGlobalName( const CLSID rId ); -const CLSID GetCLSID() const { return *(CLSID *)pImp-szData; } -const sal_uInt8* GetBytes() const { return pImp-szData; } + SvGlobalName( const SvGUID rId ); +const SvGUID GetCLSID() const { return pImp-szData; } // platform independent representation of a GlobalName // maybe transported remotely diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx index 1be5d6f..409eb4a 100644 --- a/oox/source/ole/olehelper.cxx +++ b/oox/source/ole/olehelper.cxx @@ -259,20 +259,12 @@ sal_uInt32 OleHelper::encodeOleColor( sal_Int32 nRgbColor ) void OleHelper::exportGuid( BinaryOutputStream rOStr, const SvGlobalName rId ) { -const sal_uInt8* pBytes = rId.GetBytes(); -sal_uInt32 a; -memcpy(a, pBytes, sizeof(sal_uInt32)); -rOStr a; - -sal_uInt16 b; -memcpy(b, pBytes+4, sizeof(sal_uInt16)); -rOStr b; - -memcpy(b, pBytes+6, sizeof(sal_uInt16)); -rOStr b; - -rOStr.writeArray( (sal_uInt8 *)pBytes[ 8 ], 8 ); +rOStr rId.GetCLSID().Data1; +rOStr rId.GetCLSID().Data2; +rOStr rId.GetCLSID().Data3; +rOStr.writeArray( rId.GetCLSID().Data4, 8 ); } + OUString OleHelper::importGuid( BinaryInputStream rInStrm ) { OUStringBuffer aBuffer; diff --git a/sfx2/source/doc/objitem.cxx b/sfx2/source/doc/objitem.cxx index b5c8fa0..86b9d48 100644 --- a/sfx2/source/doc/objitem.cxx +++ b/sfx2/source/doc/objitem.cxx @@ -81,7 +81,7 @@ bool SfxObjectShellItem::PutValue( const com::sun::star::uno::Any rVal, sal_uIn xModel, ::com::sun::star::uno::UNO_QUERY ); if ( xTunnel.is() ) { -::com::sun::star::uno::Sequence
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - oox/source
oox/source/docprop/ooxmldocpropimport.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3d468017ababdf4d2bb96c662373c96ec06c6c0c Author: Caolán McNamara caol...@redhat.com Date: Fri Sep 26 11:16:18 2014 +0100 Resolves: fdo#84261 unexpected exception - clang builds terminate Change-Id: I545ed112b54fb3d81e67b0f42230811cd48de626 (cherry picked from commit 465270077e385946c47235363c1120846d5d) Reviewed-on: https://gerrit.libreoffice.org/11653 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/oox/source/docprop/ooxmldocpropimport.cxx b/oox/source/docprop/ooxmldocpropimport.cxx index 4253498..8b60efa 100644 --- a/oox/source/docprop/ooxmldocpropimport.cxx +++ b/oox/source/docprop/ooxmldocpropimport.cxx @@ -63,7 +63,7 @@ Reference XInterface SAL_CALL DocumentPropertiesImport_createInstance( const namespace { -Sequence InputSource lclGetRelatedStreams( const Reference XStorage rxStorage, const OUString rStreamType ) throw (RuntimeException) +Sequence InputSource lclGetRelatedStreams( const Reference XStorage rxStorage, const OUString rStreamType ) throw (RuntimeException, css::io::IOException) { Reference XRelationshipAccess xRelation( rxStorage, UNO_QUERY_THROW ); Reference XHierarchicalStorageAccess xHierarchy( rxStorage, UNO_QUERY_THROW ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/firebird
external/firebird/firebird-cygwin-msvc.patch.1 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fee691380bf6a6335c274b13865b9a7f71581331 Author: Peter Foley pefol...@pefoley.com Date: Tue Sep 23 21:57:15 2014 -0400 Fix firebird without cygwin gcc The firebuild buildsystem calls windres, which depends on cygwin gcc, use rc.exe so that a windows build without cygwin gcc will succeed. Change-Id: Ic7719749b3806232912e3eb8b1ede11e6eb3c10c Reviewed-on: https://gerrit.libreoffice.org/11619 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/external/firebird/firebird-cygwin-msvc.patch.1 b/external/firebird/firebird-cygwin-msvc.patch.1 index 5e2368b..b563a10 100644 --- a/external/firebird/firebird-cygwin-msvc.patch.1 +++ b/external/firebird/firebird-cygwin-msvc.patch.1 @@ -790,5 +790,5 @@ unchanged: $(GEN_ROOT)/%.res: $(SRC_ROOT)/%.rc - windres --output-format=coff --include-dir=$(D) $ $@ -+ windres --output-format=coff --include-dir=$(D) --target=pe-i386 $ $@ ++ rc.exe $(SOLARINC) /fo $@ $ only in patch2: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/gbuild-to-ide
bin/gbuild-to-ide |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0014648fee6c2b499cbd20682b7f27cdc78e1123 Author: Peter Foley pefol...@pefoley.com Date: Thu Sep 25 15:28:44 2014 -0400 improve gbuild-to-ide error message Change-Id: Ia8986764e48f1dbe39374d511a188bd2b5f49e13 Reviewed-on: https://gerrit.libreoffice.org/11654 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide index bdb8688..c63ba59 100755 --- a/bin/gbuild-to-ide +++ b/bin/gbuild-to-ide @@ -889,7 +889,7 @@ if __name__ == '__main__': 'debug': DebugIntegrationGenerator} if args.ide not in generators.keys(): -parser.print_help() +print(Invalid ide. valid values are %s % ','.join(generators.keys())) sys.exit(1) if args.input: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svtools svtools/source
include/svtools/brwbox.hxx| 24 svtools/source/brwbox/brwbox1.cxx | 19 +-- 2 files changed, 41 insertions(+), 2 deletions(-) New commits: commit 827ae65e8577e285b8ad30f4a81af087658e42fa Author: Caolán McNamara caol...@redhat.com Date: Fri Sep 26 12:51:07 2014 +0100 Resolves: fdo#83943 avoid infinite recursion when attempting to make a cell visible when the parent simply isn't large enough to show any part of the cell Change-Id: I987c9b3be30a66a5e1e27ad9e452f2ca65330d9e diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 34eb593..e16e0de 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -271,6 +271,30 @@ private: } uRow; MultiSelection* pColSel;// selected column-ids +//fdo#83943, detect if making the cursor position +//visible is impossible to achieve +struct CursorMoveAttempt +{ +long m_nCol; +long m_nRow; +bool m_bScrolledToReachCell; +CursorMoveAttempt(long nCol, long nRow, bool bScrolledToReachCell) +: m_nCol(nCol) +, m_nRow(nRow) +, m_bScrolledToReachCell(bScrolledToReachCell) +{ +} +bool operator==(const CursorMoveAttempt r) const +{ +return m_nCol == r.m_nCol + m_nRow == r.m_nRow + m_bScrolledToReachCell == r.m_bScrolledToReachCell; +} +bool operator!=(const CursorMoveAttempt r) const { return !(*this == r); } +}; +typedef std::stackCursorMoveAttempt GotoStack; +GotoStack m_aGotoStack; + ::std::auto_ptr ::svt::BrowseBoxImpl m_pImpl; // impl structure of the BrowseBox object boolm_bFocusOnlyCursor; // hide cursor if we don't have the focus diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index 4416b23..3fedada 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -1560,7 +1560,6 @@ bool BrowseBox::GoToColumnId( sal_uInt16 nColId) bool BrowseBox::GoToColumnId( sal_uInt16 nColId, bool bMakeVisible, bool bRowColMove) { - if (!bColumnCursor) return false; @@ -1579,6 +1578,8 @@ bool BrowseBox::GoToColumnId( sal_uInt16 nColId, bool bMakeVisible, bool bRowCol DoHideCursor( GoToColumnId ); nCurColId = nColId; +bool bScrolled = false; + sal_uInt16 nFirstPos = nFirstCol; sal_uInt16 nWidth = (sal_uInt16)pColumn-Width(); sal_uInt16 nLastPos = GetColumnAtXPosPixel( @@ -1591,11 +1592,25 @@ bool BrowseBox::GoToColumnId( sal_uInt16 nColId, bool bMakeVisible, bool bRowCol ScrollColumns( nNewPos-nFirstPos ); else if ( nNewPos nLastPos ) ScrollColumns( nNewPos-nLastPos ); +bScrolled = true; } DoShowCursor( GoToColumnId ); if (!bRowColMove) -CursorMoved(); +{ +//try to move to nCurRow, nColId +CursorMoveAttempt aAttempt(nCurRow, nColId, bScrolled); +//Detect if we are already in a call to BrowseBox::GoToColumnId +//but the the attempt is impossible and we are simply recursing +//into BrowseBox::GoToColumnId with the same impossible to +//fulfill conditions +if (m_aGotoStack.empty() || aAttempt != m_aGotoStack.top()) +{ +m_aGotoStack.push(aAttempt); +CursorMoved(); +m_aGotoStack.pop(); +} +} return true; } return true; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'feature/vcl-opengl'
New branch 'feature/vcl-opengl' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/connectivity svx/Library_svxcore.mk svx/source
include/connectivity/dbconversion.hxx| 63 +++- svx/Library_svxcore.mk |1 svx/source/fmcomp/gridcell.cxx | 16 +++--- svx/source/fmcomp/gridctrl.cxx |9 ++- svx/source/form/typeconversionclient.cxx | 44 svx/source/inc/gridcell.hxx |5 - svx/source/inc/typeconversionclient.hxx | 81 --- 7 files changed, 48 insertions(+), 171 deletions(-) New commits: commit ded97cfe65ed168e83ecbaf9e94710082b42dffa Author: Lionel Elie Mamane lio...@mamane.lu Date: Fri Sep 26 15:10:41 2014 +0200 remove ::svxform::OStaticDataAccessTools from DbCellControl Change-Id: Icd93a418fad8c9f05b49fcd412a1e2ba4b9c240b diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index f7516e8..8ecaf4f 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -63,6 +63,7 @@ #include tools/diagnose_ex.h #include vcl/longcurr.hxx #include vcl/settings.hxx +#include connectivity/dbtools.hxx #include connectivity/dbconversion.hxx #include math.h @@ -81,6 +82,7 @@ using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::form; using namespace ::dbtools::DBTypeConversion; +using namespace ::dbtools; using ::com::sun::star::util::XNumberFormatter; namespace MouseWheelBehavior = ::com::sun::star::awt::MouseWheelBehavior; @@ -1171,7 +1173,7 @@ void DbTextField::PaintFieldToCell( OutputDevice _rDev, const Rectangle _rRect OUString DbTextField::GetFormatText(const Reference XColumn _rxField, const Reference XNumberFormatter xFormatter, Color** /*ppColor*/) { const com::sun::star::uno::Referencecom::sun::star::beans::XPropertySet xPS(_rxField, UNO_QUERY); -::dbtools::FormattedColumnValue fmter( xFormatter, xPS ); +FormattedColumnValue fmter( xFormatter, xPS ); return fmter.getFormattedValue(); } @@ -1324,7 +1326,7 @@ void DbFormattedField::Init( vcl::Window rParent, const Reference XRowSet x Reference XRowSet xCursorForm(xCursor, UNO_QUERY); if (xCursorForm.is()) { // wenn wir vom Cursor den Formatter nehmen, dann auch den Key vom Feld, an das wir gebunden sind -m_xSupplier = getNumberFormats(getRowSetConnection(xCursorForm), false); +m_xSupplier = getNumberFormats(getConnection(xCursorForm), false); if (m_rColumn.GetField().is()) nFormatKey = ::comphelper::getINT32(m_rColumn.GetField()-getPropertyValue(FM_PROP_FORMATKEY)); @@ -1795,7 +1797,7 @@ OUString DbPatternField::impl_formatText( const OUString _rText ) OUString DbPatternField::GetFormatText(const Reference ::com::sun::star::sdb::XColumn _rxField, const Reference XNumberFormatter /*xFormatter*/, Color** /*ppColor*/) { bool bIsForPaint = _rxField != m_rColumn.GetField(); -::std::unique_ptr ::dbtools::FormattedColumnValue rpFormatter = bIsForPaint ? m_pPaintFormatter : m_pValueFormatter; +::std::unique_ptr FormattedColumnValue rpFormatter = bIsForPaint ? m_pPaintFormatter : m_pValueFormatter; if ( !rpFormatter.get() ) { @@ -1918,7 +1920,7 @@ void DbNumericField::implAdjustGenericFieldSetting( const Reference XPropertySe if ( m_rColumn.GetParent().getDataSource() ) xForm = Reference XRowSet ( ( Reference XInterface )*m_rColumn.GetParent().getDataSource(), UNO_QUERY ); if ( xForm.is() ) -xSupplier = getNumberFormats( getRowSetConnection( xForm ), true ); +xSupplier = getNumberFormats( getConnection( xForm ), true ); SvNumberFormatter* pFormatterUsed = NULL; if ( xSupplier.is() ) { @@ -2926,7 +2928,7 @@ bool DbFilterField::commitControl() Reference XRowSet xDataSourceRowSet( (Reference XInterface )*m_rColumn.GetParent().getDataSource(), UNO_QUERY); -Reference XConnection xConnection(getRowSetConnection(xDataSourceRowSet)); +Reference XConnection xConnection(getConnection(xDataSourceRowSet)); xParseNode-parseNodeToPredicateStr(aPreparedText, xConnection, @@ -3019,7 +3021,7 @@ void DbFilterField::Update() Reference XTablesSupplier xSupTab; xFormProp-getPropertyValue(SingleSelectQueryComposer) = xSupTab; -Reference XConnection xConnection(getRowSetConnection(xForm)); +Reference XConnection xConnection(getConnection(xForm)); if (!xSupTab.is()) return; diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index dd5b477..0673bfe 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -24,6 +24,7 @@ #include svx/dbtoolsclient.hxx #include svx/fmtools.hxx #include svtools/stringtransfer.hxx +#include connectivity/dbtools.hxx #include
[Libreoffice-commits] core.git: 11 commits - basic/source connectivity/source dbaccess/source editeng/source extensions/source filter/source idl/source include/tools sc/source sd/source sfx2/source so
basic/source/classes/image.cxx | 24 - basic/source/classes/sb.cxx |2 basic/source/classes/sbxmod.cxx | 16 basic/source/runtime/methods1.cxx | 16 basic/source/sbx/sbxarray.cxx |6 basic/source/sbx/sbxbase.cxx| 20 basic/source/sbx/sbxobj.cxx |4 basic/source/sbx/sbxvalue.cxx | 11 basic/source/sbx/sbxvar.cxx |8 connectivity/source/drivers/dbase/DTable.cxx| 72 +-- connectivity/source/drivers/dbase/dindexnode.cxx|4 dbaccess/source/ui/misc/TokenWriter.cxx | 20 dbaccess/source/ui/tabledesign/TableRow.cxx | 16 dbaccess/source/ui/tabledesign/TableRowExchange.cxx |2 editeng/source/editeng/editobj.cxx |6 editeng/source/editeng/impedit4.cxx | 48 +- editeng/source/items/bulitem.cxx|4 editeng/source/items/flditem.cxx| 18 editeng/source/items/frmitems.cxx | 60 +- editeng/source/items/numitem.cxx| 42 - editeng/source/items/optitems.cxx |4 editeng/source/items/paraitem.cxx | 40 - editeng/source/items/svdfield.cxx |2 editeng/source/items/textitem.cxx | 42 - extensions/source/scanner/sane.cxx | 62 +- filter/source/flash/swfwriter.cxx |6 filter/source/flash/swfwriter2.cxx | 18 filter/source/graphicfilter/egif/egif.cxx | 52 +- filter/source/graphicfilter/egif/giflzwc.cxx|4 filter/source/graphicfilter/eos2met/eos2met.cxx | 296 ++-- filter/source/graphicfilter/epbm/epbm.cxx | 12 filter/source/graphicfilter/epgm/epgm.cxx | 24 - filter/source/graphicfilter/epict/epict.cxx | 208 filter/source/graphicfilter/eppm/eppm.cxx | 24 - filter/source/graphicfilter/eps/eps.cxx | 44 - filter/source/graphicfilter/eras/eras.cxx | 22 filter/source/graphicfilter/etiff/etiff.cxx | 30 - filter/source/graphicfilter/expm/expm.cxx | 16 filter/source/graphicfilter/ios2met/ios2met.cxx |8 filter/source/msfilter/escherex.cxx | 134 ++--- filter/source/msfilter/msdffimp.cxx | 18 idl/source/objects/bastype.cxx |4 idl/source/objects/module.cxx |4 idl/source/objects/types.cxx|2 idl/source/prj/database.cxx |4 include/tools/stream.hxx|4 sc/source/core/data/patattr.cxx |2 sc/source/core/tool/autoform.cxx|8 sc/source/core/tool/rechead.cxx |6 sc/source/core/tool/zforauto.cxx|2 sc/source/filter/excel/xecontent.cxx|2 sc/source/filter/excel/xiescher.cxx | 10 sc/source/filter/xcl97/XclImpChangeTrack.cxx|2 sc/source/ui/docshell/impex.cxx | 20 sd/source/filter/eppt/eppt.cxx | 236 - sd/source/filter/eppt/epptso.cxx| 480 ++-- sd/source/filter/eppt/escherex.cxx | 62 +- sd/source/filter/eppt/pptexanimations.cxx |4 sd/source/filter/eppt/pptexsoundcollection.cxx | 14 sd/source/filter/eppt/pptx-stylesheet.cxx | 34 - sd/source/filter/eppt/pptx-text.cxx |2 sd/source/filter/html/pubdlg.cxx|6 sd/source/ui/dlg/morphdlg.cxx |2 sd/source/ui/dlg/vectdlg.cxx|4 sfx2/source/doc/oleprops.cxx| 22 sfx2/source/doc/zoomitem.cxx|4 sot/source/sdstor/stgelem.cxx |2 sot/source/sdstor/stgole.cxx| 24 - sot/source/sdstor/storinfo.cxx | 10 sot/source/sdstor/ucbstorage.cxx|2 svl/source/items/cintitem.cxx |6 svl/source/items/macitem.cxx|4 svl/source/items/poolio.cxx | 12 svl/source/items/slstitm.cxx|4 svl/source/numbers/numhead.cxx |6 svl/source/numbers/zforlist.cxx | 10 svl/source/numbers/zformat.cxx |2 svtools/source/graphic/grfattr.cxx | 12 svtools/source/misc/imap.cxx|2 svtools/source/misc/imap3.cxx |2
[Libreoffice-commits] core.git: 2 commits - configure.ac connectivity/source include/connectivity
configure.ac| 20 +- connectivity/source/commontools/TSkipDeletedSet.cxx |8 +++ connectivity/source/drivers/calc/CTable.cxx |8 +++ connectivity/source/drivers/dbase/DTable.cxx|8 +++ connectivity/source/drivers/file/FResultSet.cxx | 22 ++-- connectivity/source/drivers/flat/ETable.cxx | 10 - connectivity/source/drivers/odbc/OResultSet.cxx | 12 +- connectivity/source/inc/TResultSetHelper.hxx|7 +++--- connectivity/source/inc/odbc/OFunctiondefs.hxx |6 + connectivity/source/parse/sqlbison.y|2 - connectivity/source/parse/sqliterator.cxx |4 +-- include/connectivity/IParseContext.hxx |5 ++-- 12 files changed, 65 insertions(+), 47 deletions(-) New commits: commit 314c469c93f0ac139f64f742d3fd89e587f42970 Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Sep 16 12:25:29 2014 +0200 try Use system ODBC on MS Windows unless specifically overriden again Now that Noel has a working pattch for system ODBC on MS Windows Change-Id: I11abb53486e45d9c7058c42011df41b5fad0fcde diff --git a/configure.ac b/configure.ac index a0b6ed5..823fcdd 100644 --- a/configure.ac +++ b/configure.ac @@ -1822,7 +1822,7 @@ AC_ARG_WITH(libbase-jar, AC_ARG_WITH(system-odbc, AS_HELP_STRING([--with-system-odbc], [Use the odbc headers already on system.]),, -[with_system_odbc=$with_system_headers]) +[with_system_odbc=auto]) AC_ARG_WITH(system-sane, AS_HELP_STRING([--with-system-sane], @@ -8598,7 +8598,7 @@ dnl === dnl Check for system odbc dnl === AC_MSG_CHECKING([which odbc headers to use]) -if test $with_system_odbc = yes ; then +if test $with_system_odbc = yes -o '(' $with_system_headers = yes -a $with_system_odbc = auto ')' -o '(' $_os = WINNT -a $with_system_odbc != no ')'; then AC_MSG_RESULT([external]) SYSTEM_ODBC_HEADERS=TRUE commit ac10225762ce2c242d21126b5730b1d60f0150ed Author: Noel Grandin n...@peralex.com Date: Thu Sep 18 10:04:20 2014 +0300 implement --with-system-odbc on windows Change-Id: I1757b9ce74277b1c11533f41caeafaf9b88658ef diff --git a/configure.ac b/configure.ac index c4367d9..a0b6ed5 100644 --- a/configure.ac +++ b/configure.ac @@ -2783,7 +2783,6 @@ if test $_os = Darwin; then ;; esac -# If no CC and CXX environment vars, try to guess where the compiler is LIBTOOL=libtool INSTALL_NAME_TOOL=install_name_tool if test -z $save_CC; then @@ -8603,8 +8602,19 @@ if test $with_system_odbc = yes ; then AC_MSG_RESULT([external]) SYSTEM_ODBC_HEADERS=TRUE -AC_CHECK_HEADER(sqlext.h, [], - [AC_MSG_ERROR(odbc not found. install odbc)], []) +if test $build_os = cygwin; then +save_CPPFLAGS=$CPPFLAGS +find_winsdk +PathFormat $winsdktest +CPPFLAGS=$CPPFLAGS -I$formatted_path/include/um -I$formatted_path/include -I$formatted_path/include/shared +AC_CHECK_HEADER(sqlext.h, [], +[AC_MSG_ERROR(odbc not found. install odbc)], +[#include windows.h]) +CPPFLAGS=$save_CPPFLAGS +else +AC_CHECK_HEADER(sqlext.h, [], +[AC_MSG_ERROR(odbc not found. install odbc)],[]) +fi elif test $enable_database_connectivity != yes; then AC_MSG_RESULT([none]) else diff --git a/connectivity/source/commontools/TSkipDeletedSet.cxx b/connectivity/source/commontools/TSkipDeletedSet.cxx index 563d545..cd98dd3 100644 --- a/connectivity/source/commontools/TSkipDeletedSet.cxx +++ b/connectivity/source/commontools/TSkipDeletedSet.cxx @@ -45,7 +45,7 @@ bool OSkipDeletedSet::skipDeleted(IResultSetHelper::Movement _eCursorPosition, s switch (_eCursorPosition) { -case IResultSetHelper::ABSOLUTE: +case IResultSetHelper::ABSOLUTE1: return moveAbsolute(_nOffset,_bRetrieveData); case IResultSetHelper::FIRST: // set the movement when positioning failed eDelPosition = IResultSetHelper::NEXT; @@ -55,7 +55,7 @@ bool OSkipDeletedSet::skipDeleted(IResultSetHelper::Movement _eCursorPosition, s eDelPosition = IResultSetHelper::PRIOR; // last row is invalid so position before nDelOffset = 1; break; -case IResultSetHelper::RELATIVE: +case IResultSetHelper::RELATIVE1: eDelPosition = (_nOffset = 0) ? IResultSetHelper::NEXT : IResultSetHelper::PRIOR; break; default: @@ -107,7 +107,7 @@ bool OSkipDeletedSet::skipDeleted(IResultSetHelper::Movement _eCursorPosition, s } return bDataFound; } -else if (_eCursorPosition != IResultSetHelper::RELATIVE) +else if (_eCursorPosition !=
[Libreoffice-commits] core.git: configure.ac
configure.ac |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 296371d5d8f58c46e976f66b11599410d97dc472 Author: Lionel Elie Mamane lio...@mamane.lu Date: Fri Sep 26 15:39:18 2014 +0200 untabify Change-Id: I4e7eae9270f97db7b840cc57fb29835ac6f1231e diff --git a/configure.ac b/configure.ac index 823fcdd..3981c49 100644 --- a/configure.ac +++ b/configure.ac @@ -9392,10 +9392,10 @@ if test $enable_coinmp != no; then ENABLE_COINMP=TRUE AC_MSG_RESULT([yes]) if test $with_system_coinmp = yes; then - SYSTEM_COINMP=TRUE - PKG_CHECK_MODULES( COINMP, coinmp ) +SYSTEM_COINMP=TRUE +PKG_CHECK_MODULES( COINMP, coinmp ) else - BUILD_TYPE=$BUILD_TYPE COINMP +BUILD_TYPE=$BUILD_TYPE COINMP fi else AC_MSG_RESULT([no]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: formula/source include/formula reportdesign/source sc/inc sc/source
formula/source/core/api/FormulaOpCodeMapperObj.cxx | 18 -- formula/source/ui/dlg/formula.cxx |2 +- include/formula/FormulaOpCodeMapperObj.hxx |8 ++-- include/formula/IFunctionDescription.hxx |2 +- include/formula/formula.hxx|8 ++-- include/formula/formulahelper.hxx |2 +- reportdesign/source/ui/dlg/Formula.cxx | 11 ++- reportdesign/source/ui/inc/Formula.hxx |2 +- sc/inc/tokenuno.hxx|4 +--- sc/source/ui/formdlg/formula.cxx | 10 ++ sc/source/ui/inc/formula.hxx |2 +- sc/source/ui/unoobj/tokenuno.cxx |6 ++ 12 files changed, 24 insertions(+), 51 deletions(-) New commits: commit 1df1c5eed9d44130fee818745cbb3d5ee59b7c3f Author: Stephan Bergmann sberg...@redhat.com Date: Fri Sep 26 15:46:31 2014 +0200 formula: std::auto_ptr - std::unique_ptr Change-Id: I7b4784abf5177e22a9df33c5d4faccfd39801b11 diff --git a/formula/source/core/api/FormulaOpCodeMapperObj.cxx b/formula/source/core/api/FormulaOpCodeMapperObj.cxx index f57114e..21b0f22 100644 --- a/formula/source/core/api/FormulaOpCodeMapperObj.cxx +++ b/formula/source/core/api/FormulaOpCodeMapperObj.cxx @@ -16,6 +16,11 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ + +#include sal/config.h + +#include utility + #include formula/FormulaOpCodeMapperObj.hxx #include formula/opcode.hxx #include comphelper/sequence.hxx @@ -30,12 +35,10 @@ sal_Bool SAL_CALL FormulaOpCodeMapperObj::supportsService( const OUString _rSer return cppu::supportsService(this, _rServiceName); } -SAL_WNODEPRECATED_DECLARATIONS_PUSH -FormulaOpCodeMapperObj::FormulaOpCodeMapperObj(::std::auto_ptrFormulaCompiler _pCompiler) -: m_pCompiler(_pCompiler) +FormulaOpCodeMapperObj::FormulaOpCodeMapperObj(::std::unique_ptrFormulaCompiler _pCompiler) +: m_pCompiler(std::move(_pCompiler)) { } -SAL_WNODEPRECATED_DECLARATIONS_POP FormulaOpCodeMapperObj::~FormulaOpCodeMapperObj() { @@ -102,16 +105,11 @@ uno::Sequence OUString SAL_CALL FormulaOpCodeMapperObj::getSupportedServiceNa return aSeq; } -SAL_WNODEPRECATED_DECLARATIONS_PUSH uno::Reference uno::XInterface SAL_CALL FormulaOpCodeMapperObj::create( uno::Reference uno::XComponentContext const /*_xContext*/) { -return static_castsheet::XFormulaOpCodeMapper*(new FormulaOpCodeMapperObj(::std::auto_ptrFormulaCompiler(new FormulaCompiler(; +return static_castsheet::XFormulaOpCodeMapper*(new FormulaOpCodeMapperObj(::std::unique_ptrFormulaCompiler(new FormulaCompiler(; } -SAL_WNODEPRECATED_DECLARATIONS_POP - - - } // formula diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index c8489ce..5573f72 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -133,7 +133,7 @@ namespace formula public: mutable uno::Reference sheet::XFormulaOpCodeMapper m_xOpCodeMapper; uno::Sequence sheet::FormulaToken m_aTokenList; -::std::auto_ptrFormulaTokenArray m_pTokenArray; +::std::unique_ptrFormulaTokenArraym_pTokenArray; mutable uno::Sequence sheet::FormulaOpCodeMapEntry m_aSpecialOpCodes; mutable const sheet::FormulaOpCodeMapEntry* m_pSpecialOpCodesEnd; mutable uno::Sequence sheet::FormulaToken m_aSeparatorsOpCodes; diff --git a/include/formula/FormulaOpCodeMapperObj.hxx b/include/formula/FormulaOpCodeMapperObj.hxx index f863697..d04112e 100644 --- a/include/formula/FormulaOpCodeMapperObj.hxx +++ b/include/formula/FormulaOpCodeMapperObj.hxx @@ -36,18 +36,14 @@ class FORMULA_DLLPUBLIC FormulaOpCodeMapperObj : public ::cppu::WeakImplHelper2 ::com::sun::star::sheet::XFormulaOpCodeMapper, ::com::sun::star::lang::XServiceInfo { -SAL_WNODEPRECATED_DECLARATIONS_PUSH -::std::auto_ptrFormulaCompiler m_pCompiler; -SAL_WNODEPRECATED_DECLARATIONS_POP +::std::unique_ptrFormulaCompiler m_pCompiler; public: static OUString getImplementationName_Static(); static ::com::sun::star::uno::Sequence OUString getSupportedServiceNames_Static(); static ::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface create(const ::com::sun::star::uno::Reference ::com::sun::star::uno::XComponentContext _xContext); protected: -SAL_WNODEPRECATED_DECLARATIONS_PUSH - FormulaOpCodeMapperObj(::std::auto_ptrFormulaCompiler _pCompiler); -SAL_WNODEPRECATED_DECLARATIONS_POP + FormulaOpCodeMapperObj(::std::unique_ptrFormulaCompiler _pCompiler);
[Libreoffice-commits] core.git: include/connectivity
include/connectivity/dbconversion.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit f85303359d5284fe21b28c99596d3f513c834ee2 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Sep 26 16:07:59 2014 +0200 loplugin:inlinevisible Change-Id: Id2530063cd0302b65dcc82965f1b81c31b759b63 diff --git a/include/connectivity/dbconversion.hxx b/include/connectivity/dbconversion.hxx index 169682a..ebd06b1 100644 --- a/include/connectivity/dbconversion.hxx +++ b/include/connectivity/dbconversion.hxx @@ -123,11 +123,11 @@ namespace dbtools /** convert a double which is a date value relative to a given fixed date into a date value relative to the standard db null date. */ -OOO_DLLPUBLIC_DBTOOLS inline double toStandardDbDate(const ::com::sun::star::util::Date _rNullDate, double _rVal) { return _rVal + toDays(_rNullDate); } +inline double toStandardDbDate(const ::com::sun::star::util::Date _rNullDate, double _rVal) { return _rVal + toDays(_rNullDate); } /** convert a double which is a date value relative to the standard db null date into a date value relative to a given fixed date. */ -OOO_DLLPUBLIC_DBTOOLS inline double toNullDate(const ::com::sun::star::util::Date _rNullDate, double _rVal) { return _rVal - toDays(_rNullDate); } +inline double toNullDate(const ::com::sun::star::util::Date _rNullDate, double _rVal) { return _rVal - toDays(_rNullDate); } // return the date from the numberformatsupplier or the STANDARD_DATE (1900,1,1) OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::util::Date getNULLDate(const ::com::sun::star::uno::Reference ::com::sun::star::util::XNumberFormatsSupplier xSupplier); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - svx/source sw/source
svx/source/form/ParseContext.cxx |2 +- sw/source/filter/html/htmlgrin.cxx |8 2 files changed, 5 insertions(+), 5 deletions(-) New commits: commit f6c6474ddea7dfdb63d5b67a0b637c8c41fa4d13 Author: Michael Stahl mst...@redhat.com Date: Fri Sep 26 15:23:12 2014 +0200 AddressSanitizer: alloc-dealloc-mismatch (operator new vs free) Change-Id: I500e70e64c478210bc6da0c13894995a0984c018 diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 4e136a4..0d834fe 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -698,12 +698,12 @@ IMAGE_SETEVENT: INetURLObject aGraphicURL( sGrfNm ); if( aGraphicURL.GetProtocol() == INET_PROT_DATA ) { -SvMemoryStream* aStream = aGraphicURL.getData(); -if( aStream ) +SvMemoryStream* pStream = aGraphicURL.getData(); +if (pStream) { -if (GRFILTER_OK == GraphicFilter::GetGraphicFilter().ImportGraphic(aGraphic, , *aStream)) +if (GRFILTER_OK == GraphicFilter::GetGraphicFilter().ImportGraphic(aGraphic, , *pStream)) sGrfNm = ; -free( aStream ); +delete pStream; } } // sBaseURL is empty if the source is clipboard commit 24a9eac14fc22e18a48eae5a0de1b5e98194ef86 Author: Michael Stahl mst...@redhat.com Date: Fri Sep 26 15:56:15 2014 +0200 svx: fix up c10225762ce2c242d21126b5730b1d60f0150ed Change-Id: Ib810a512f5a88af88901c53025cdf132f95b2ddc diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx index f075d00..9c3c760 100644 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -65,7 +65,7 @@ OUString OSystemParseContext::getErrorMessage(ErrorCode _eCode) const case ERROR_INVALID_INT_COMPARE: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_INT_NO_VALID); break; case ERROR_INVALID_DATE_COMPARE:aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_ACCESS_DAT_NO_VALID); break; case ERROR_INVALID_REAL_COMPARE:aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_REAL_NO_VALID); break; -case ERROR_INVALID_TABLE: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_TABLE); break; +case ERROR_INVALID_TABLE1: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_TABLE); break; case ERROR_INVALID_TABLE_OR_QUERY: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_TABLE_OR_QUERY); break; case ERROR_INVALID_COLUMN: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_COLUMN); break; case ERROR_INVALID_TABLE_EXIST: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_TABLE_EXISTS); break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/oox/richstring.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit bcded1804340106b65a5ef0fc6aaef6075fd73cf Author: Michael Meeks michael.me...@collabora.com Date: Fri Sep 26 15:14:46 2014 +0100 fdo#84370 - xlsx threaded import - protect editeng. Sadly we need to hold the solar mutex for rich text import, cue massive lock contention on sheets packed with rich text cells; hopefully not a common case. Change-Id: I6a094a070b11c8b572fd8687be96110c4905e78d diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx index 88a83c3..7149358 100644 --- a/sc/source/filter/oox/richstring.cxx +++ b/sc/source/filter/oox/richstring.cxx @@ -27,6 +27,8 @@ #include biffinputstream.hxx #include editutil.hxx +#include vcl/svapp.hxx + namespace oox { namespace xls { @@ -403,6 +405,9 @@ void RichString::convert( const Reference XText rxText, bool bReplaceOld, co for( PortionVector::const_iterator aIt = maTextPortions.begin(), aEnd = maTextPortions.end(); aIt != aEnd; ++aIt ) sString += (*aIt)-getText(); +// fdo#84370 - diving into editeng is not thread safe. +SolarMutexGuard aGuard; + rEE.SetText( sString ); for( PortionVector::const_iterator aIt = maTextPortions.begin(), aEnd = maTextPortions.end(); aIt != aEnd; ++aIt ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/hunspell
external/hunspell/UnpackedTarball_hunspell.mk |1 external/hunspell/hunspell-morph-overflow.patch | 30 2 files changed, 31 insertions(+) New commits: commit b37a88c3080fc72f5f0ff9068bc71098be70ed11 Author: László Németh nem...@numbertext.org Date: Fri Sep 26 15:54:44 2014 +0200 Hunspell: fix buffer overflow during morphological analysis affected: thesaurus usage in a Hungarian document test case: press Ctrl+F7 on the word művészegyéniség Change-Id: I024568e81265c4ce3e05f718bf9147229416ab73 diff --git a/external/hunspell/UnpackedTarball_hunspell.mk b/external/hunspell/UnpackedTarball_hunspell.mk index 96c85bb..9acfd95 100644 --- a/external/hunspell/UnpackedTarball_hunspell.mk +++ b/external/hunspell/UnpackedTarball_hunspell.mk @@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hunspell,\ external/hunspell/hunspell-1.3.2-nullptr.patch \ external/hunspell/hunspell-1.3.2-literal.patch \ external/hunspell/hunspell-fdo48017-wfopen.patch \ + external/hunspell/hunspell-morph-overflow.patch \ )) ifeq ($(COM),MSC) diff --git a/external/hunspell/hunspell-morph-overflow.patch b/external/hunspell/hunspell-morph-overflow.patch new file mode 100644 index 000..fe7c4f7 --- /dev/null +++ b/external/hunspell/hunspell-morph-overflow.patch @@ -0,0 +1,30 @@ +--- hunspell/src/hunspell/affixmgr.cxx 2014-09-24 16:11:10.750421303 +0200 build/hunspell/src/hunspell/affixmgr.cxx 2014-09-26 15:25:09.448688908 +0200 +@@ -2400,8 +2400,10 @@ + } + mystrcat(*result, presult, MAXLNLEN); + if (m || (*m != '\0')) { +-sprintf(*result + strlen(*result), %c%s%s%s, MSEP_FLD, ++char m2[MAXLNLEN]; ++sprintf(m2, %c%s%s%s, MSEP_FLD, + MORPH_PART, word + i, line_uniq_app(m, MSEP_REC)); ++mystrcat(*result, m2, MAXLNLEN); + } + if (m) free(m); + mystrcat(*result, \n, MAXLNLEN); +@@ -2481,11 +2483,13 @@ + } + mystrcat(*result, presult, MAXLNLEN); + if (m (*m != '\0')) { +-sprintf(*result + strlen(*result), %c%s%s%s, MSEP_FLD, ++char m2[MAXLNLEN]; ++sprintf(m2, %c%s%s%s, MSEP_FLD, + MORPH_PART, word + i, line_uniq_app(m, MSEP_REC)); ++mystrcat(*result, m2, MAXLNLEN); + } + if (m) free(m); +- sprintf(*result + strlen(*result), %c, MSEP_REC); ++ if (strlen(*result) + 1 MAXLNLEN) sprintf(*result + strlen(*result), %c, MSEP_REC); + ok = 1; + } + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source include/connectivity svx/source
connectivity/source/parse/sqlbison.y |2 +- connectivity/source/parse/sqliterator.cxx |4 ++-- include/connectivity/IParseContext.hxx|4 ++-- svx/source/form/ParseContext.cxx |2 +- 4 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 325ce86b56131f1e874e8cb2c5948fed719afe07 Author: Lionel Elie Mamane lio...@mamane.lu Date: Fri Sep 26 16:26:22 2014 +0200 fix build better name for ERROR_INVALID_TABLE Change-Id: Ic7253575859766f18869159e4a8dd6b3d715850d diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y index 4d8039d..89b524c 100644 --- a/connectivity/source/parse/sqlbison.y +++ b/connectivity/source/parse/sqlbison.y @@ -4329,7 +4329,7 @@ OUString OParseContext::getErrorMessage(ErrorCode _eCode) const case ERROR_INVALID_INT_COMPARE: aMsg = The field can not be compared with a number.; break; case ERROR_INVALID_DATE_COMPARE:aMsg = The field can not be compared with a date.; break; case ERROR_INVALID_REAL_COMPARE:aMsg = The field can not be compared with a floating point number.; break; - case ERROR_INVALID_TABLE1: aMsg = The database does not contain a table named \#\.; break; + case ERROR_INVALID_TABLE_NOSUCH:aMsg = The database does not contain a table named \#\.; break; case ERROR_INVALID_TABLE_OR_QUERY: aMsg = The database does contain neither a table nor a query named \#\.; break; case ERROR_INVALID_COLUMN: aMsg = The column \#1\ is unknown in the table \#2\.; break; case ERROR_INVALID_TABLE_EXIST: aMsg = The database already contains a table or view with name \#\.; break; diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index 99cb341..d8fd801 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -416,13 +416,13 @@ OSQLTable OSQLParseTreeIterator::impl_locateRecordSource( const OUString _rComp // m_xQueryContainer would not have been set), so emit a better error message impl_appendError( IParseContext::ERROR_INVALID_TABLE_OR_QUERY, sName ); else -impl_appendError( IParseContext::ERROR_INVALID_TABLE1, sName ); +impl_appendError( IParseContext::ERROR_INVALID_NOSUCH, sName ); } } } catch(Exception) { -impl_appendError( IParseContext::ERROR_INVALID_TABLE1, sComposedName ); +impl_appendError( IParseContext::ERROR_INVALID_TABLE_NOSUCH, sComposedName ); } return aReturn; diff --git a/include/connectivity/IParseContext.hxx b/include/connectivity/IParseContext.hxx index a012932..078ae89 100644 --- a/include/connectivity/IParseContext.hxx +++ b/include/connectivity/IParseContext.hxx @@ -43,12 +43,12 @@ namespace connectivity ERROR_INVALID_INT_COMPARE, // The field can not be compared with a number. ERROR_INVALID_DATE_COMPARE, // The field can not be compared with a date. ERROR_INVALID_REAL_COMPARE, // The field can not be compared with a floating point number. -ERROR_INVALID_TABLE1, // The database does not contain a table named \#\. +ERROR_INVALID_TABLE_NOSUCH, // The database does not contain a table named \#\. // Named like this to avoid conflict with a #define in the Windows system ODBC headers. ERROR_INVALID_TABLE_OR_QUERY, // The database does contain neither a table nor a query named \#\. ERROR_INVALID_COLUMN, // The column \#1\ is unknown in the table \#2\. ERROR_INVALID_TABLE_EXIST, // The database already contains a table or view with name \#\. -ERROR_INVALID_QUERY_EXIST, // The database already contains a query with name \#\.; +ERROR_INVALID_QUERY_EXIST // The database already contains a query with name \#\.; }; enumInternationalKeyCode diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx index 9c3c760..0ea76ae 100644 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -65,7 +65,7 @@ OUString OSystemParseContext::getErrorMessage(ErrorCode _eCode) const case ERROR_INVALID_INT_COMPARE: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_INT_NO_VALID); break; case ERROR_INVALID_DATE_COMPARE:aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_ACCESS_DAT_NO_VALID); break; case ERROR_INVALID_REAL_COMPARE:aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_REAL_NO_VALID); break; -case ERROR_INVALID_TABLE1: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_TABLE); break; +
[Libreoffice-commits] core.git: include/tools sw/source tools/qa tools/source
include/tools/urlobj.hxx |4 +++- sw/source/filter/html/htmlgrin.cxx |3 +-- tools/qa/cppunit/test_urlobj.cxx | 14 +++--- tools/source/fsys/urlobj.cxx |8 +--- 4 files changed, 16 insertions(+), 13 deletions(-) New commits: commit ea2d767d4475ac3399fdfa59a4d0e2fbc38d1aa9 Author: Michael Stahl mst...@redhat.com Date: Fri Sep 26 15:35:09 2014 +0200 tools: change INetURLObject::getData to return std::unique_ptr Life-cycle becomes a lot more obvious this way. Change-Id: I1ca99607f609a2223011c40447ad1cd9ca5ccaa5 diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx index aee3aea..9610aab 100644 --- a/include/tools/urlobj.hxx +++ b/include/tools/urlobj.hxx @@ -26,6 +26,8 @@ #include rtl/textenc.h #include sal/types.h +#include memory + class SvMemoryStream; namespace com { namespace sun { namespace star { namespace util { @@ -854,7 +856,7 @@ public: const; // Data URLs: -SvMemoryStream* getData(); +std::unique_ptrSvMemoryStream getData(); // POP3 and URLs: diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 0d834fe..83db824 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -698,12 +698,11 @@ IMAGE_SETEVENT: INetURLObject aGraphicURL( sGrfNm ); if( aGraphicURL.GetProtocol() == INET_PROT_DATA ) { -SvMemoryStream* pStream = aGraphicURL.getData(); +std::unique_ptrSvMemoryStream const pStream(aGraphicURL.getData()); if (pStream) { if (GRFILTER_OK == GraphicFilter::GetGraphicFilter().ImportGraphic(aGraphic, , *pStream)) sGrfNm = ; -delete pStream; } } // sBaseURL is empty if the source is clipboard diff --git a/tools/qa/cppunit/test_urlobj.cxx b/tools/qa/cppunit/test_urlobj.cxx index 6cfca96..df866bc 100644 --- a/tools/qa/cppunit/test_urlobj.cxx +++ b/tools/qa/cppunit/test_urlobj.cxx @@ -246,7 +246,7 @@ namespace tools_urlobj void urlobjTest_data() { INetURLObject url; -SvMemoryStream * strm; +std::unique_ptrSvMemoryStream strm; unsigned char const * buf; url = INetURLObject(data:); @@ -259,7 +259,7 @@ namespace tools_urlobj strm = url.getData(); CPPUNIT_ASSERT(strm != 0); CPPUNIT_ASSERT_EQUAL(sal_uIntPtr(0), strm-GetSize()); -delete strm; +strm.reset(); url = INetURLObject(data:,,%C3%A4%90); CPPUNIT_ASSERT(!url.HasError()); @@ -271,7 +271,7 @@ namespace tools_urlobj CPPUNIT_ASSERT_EQUAL(0xC3, int(buf[1])); CPPUNIT_ASSERT_EQUAL(0xA4, int(buf[2])); CPPUNIT_ASSERT_EQUAL(0x90, int(buf[3])); -delete strm; +strm.reset(); url = INetURLObject(data:base64,); //TODO: CPPUNIT_ASSERT(url.HasError()); @@ -283,14 +283,14 @@ namespace tools_urlobj strm = url.getData(); CPPUNIT_ASSERT(strm != 0); CPPUNIT_ASSERT_EQUAL(sal_uIntPtr(0), strm-GetSize()); -delete strm; +strm.reset(); url = INetURLObject(data:;bAsE64,); CPPUNIT_ASSERT(!url.HasError()); strm = url.getData(); CPPUNIT_ASSERT(strm != 0); CPPUNIT_ASSERT_EQUAL(sal_uIntPtr(0), strm-GetSize()); -delete strm; +strm.reset(); url = INetURLObject(data:;base64,YWJjCg==); CPPUNIT_ASSERT(!url.HasError()); @@ -302,7 +302,7 @@ namespace tools_urlobj CPPUNIT_ASSERT_EQUAL(0x62, int(buf[1])); CPPUNIT_ASSERT_EQUAL(0x63, int(buf[2])); CPPUNIT_ASSERT_EQUAL(0x0A, int(buf[3])); -delete strm; +strm.reset(); url = INetURLObject(data:;base64,YWJjCg=); CPPUNIT_ASSERT(!url.HasError()); @@ -324,7 +324,7 @@ namespace tools_urlobj CPPUNIT_ASSERT_EQUAL(0x51, int(buf[1])); CPPUNIT_ASSERT_EQUAL(0x3D, int(buf[2])); CPPUNIT_ASSERT_EQUAL(0x3D, int(buf[3])); -delete strm; +strm.reset(); url = INetURLObject(http://example.com;); CPPUNIT_ASSERT(!url.HasError()); diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index 7e248a2..e8331e8 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -585,7 +585,9 @@ void INetURLObject::setInvalid() namespace { -SvMemoryStream * memoryStream(void const * data, sal_Int32 length) { +std::unique_ptrSvMemoryStream memoryStream( +void const * data, sal_Int32 length) +{ std::unique_ptrchar, boost::checked_array_deleterchar b( new char[length]); memcpy(b.get(), data, length); @@ -593,12 +595,12 @@ SvMemoryStream * memoryStream(void const * data, sal_Int32 length) { new
Re: minutes of ESC call ...
On Thu, Sep 25, 2014 at 03:36:34PM +0100, Michael Meeks wrote: + Bjoern re-introduced mergelibs for 4.3.2 + enabled for 4.3.1 without a patch, we need other libs in mergelibs to avoid circular deps. + some interesting bug reports wrt. dbtools moving into mergelibs etc. + anyone interested in investigating ? + mergelibs works nicely from 4.0.x - 4.2.x startup time is visibily faster with it. compressed pkg is 1Mb smaller too ... So, since I had to fiddle with this anyway I did measure cold and hot starts of LibreOffice in an Ubuntu 14.10 VM: cold warm mergedlibs 2.06s ~0.8s no mergedlibs3.46s ~0.8s These times were handstopped, thus likely at least -/+0.2s (thus the warm starts arent really worth anything) -- still a cold start of LibreOffice is some ~70% faster on cold start. This is with a full distro build of 4.3.2.2 with full install (including java-foo) on a 8GB VirtualBox VM running on a i7-2720QM/16GB host. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/parse/sqliterator.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 25a092869c9862711714c622e0acd7bddeabf78c Author: Michael Stahl mst...@redhat.com Date: Fri Sep 26 16:58:04 2014 +0200 connectivity: typo Change-Id: Ic4c8637500c13d097f5b26222d7d4005f2251d1a diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index d8fd801..3c08dd8 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -416,7 +416,7 @@ OSQLTable OSQLParseTreeIterator::impl_locateRecordSource( const OUString _rComp // m_xQueryContainer would not have been set), so emit a better error message impl_appendError( IParseContext::ERROR_INVALID_TABLE_OR_QUERY, sName ); else -impl_appendError( IParseContext::ERROR_INVALID_NOSUCH, sName ); +impl_appendError( IParseContext::ERROR_INVALID_TABLE_NOSUCH, sName ); } } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/oox
include/oox/core/recordparser.hxx |2 +- include/oox/core/xmlfilterbase.hxx |2 +- include/oox/vml/vmldrawing.hxx |6 ++ include/oox/vml/vmlshape.hxx | 10 +++--- 4 files changed, 7 insertions(+), 13 deletions(-) New commits: commit e3ee8c68d580cd0782b9ae9497f3584a046f0404 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Sep 26 17:19:03 2014 +0200 oox: std::auto_ptr - std::unique_ptr Change-Id: I35d3cc04eb9bbc8b4446bc501ba35e058c1aa34a diff --git a/include/oox/core/recordparser.hxx b/include/oox/core/recordparser.hxx index f3d1243..8d97af4 100644 --- a/include/oox/core/recordparser.hxx +++ b/include/oox/core/recordparser.hxx @@ -73,7 +73,7 @@ private: RecordInputSource maSource; ::rtl::Reference FragmentHandler mxHandler; ::rtl::Reference prv::Locator mxLocator; -::std::auto_ptr prv::ContextStack mxStack; +::std::unique_ptr prv::ContextStack mxStack; RecordInfoMap maStartMap; RecordInfoMap maEndMap; }; diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx index c4aaff1..a8c950e 100644 --- a/include/oox/core/xmlfilterbase.hxx +++ b/include/oox/core/xmlfilterbase.hxx @@ -252,7 +252,7 @@ private: const ::com::sun::star::uno::Reference ::com::sun::star::io::XStream rxOutStream ) const SAL_OVERRIDE; private: -::std::auto_ptr XmlFilterBaseImpl mxImpl; +::std::unique_ptr XmlFilterBaseImpl mxImpl; sal_Int32 mnRelId; sal_Int32 mnMaxDocId; }; diff --git a/include/oox/vml/vmldrawing.hxx b/include/oox/vml/vmldrawing.hxx index c6c53fd..1fbdf23 100644 --- a/include/oox/vml/vmldrawing.hxx +++ b/include/oox/vml/vmldrawing.hxx @@ -185,10 +185,8 @@ public: private: typedef ::std::vector sal_Int32 BlockIdVector; -SAL_WNODEPRECATED_DECLARATIONS_PUSH -typedef ::std::auto_ptr ::oox::ole::EmbeddedForm EmbeddedFormPtr; -typedef ::std::auto_ptr ShapeContainerShapeContainerPtr; -SAL_WNODEPRECATED_DECLARATIONS_POP +typedef ::std::unique_ptr ::oox::ole::EmbeddedFormEmbeddedFormPtr; +typedef ::std::unique_ptr ShapeContainer ShapeContainerPtr; typedef ::std::map OUString, OleObjectInfo OleObjectInfoMap; typedef ::std::map OUString, ControlInfo ControlInfoMap; diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx index 832d3be..6cc180c 100644 --- a/include/oox/vml/vmlshape.hxx +++ b/include/oox/vml/vmlshape.hxx @@ -192,10 +192,8 @@ struct ClientData struct ShapeModel { typedef ::std::vector ::com::sun::star::awt::PointPointVector; -SAL_WNODEPRECATED_DECLARATIONS_PUSH -typedef ::std::auto_ptr TextBox TextBoxPtr; -typedef ::std::auto_ptr ClientDataClientDataPtr; -SAL_WNODEPRECATED_DECLARATIONS_POP +typedef ::std::unique_ptr TextBox TextBoxPtr; +typedef ::std::unique_ptr ClientData ClientDataPtr; OUString maType; /// Shape template with default properties. PointVector maPoints; /// Points for the polyline shape. @@ -435,9 +433,7 @@ protected: const ::com::sun::star::awt::Rectangle rShapeRect ) const SAL_OVERRIDE; private: -SAL_WNODEPRECATED_DECLARATIONS_PUSH -typedef ::std::auto_ptr ShapeContainer ShapeContainerPtr; -SAL_WNODEPRECATED_DECLARATIONS_POP +typedef ::std::unique_ptr ShapeContainer ShapeContainerPtr; ShapeContainerPtr mxChildren; /// Shapes and templates that are part of this group. }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/perfwork' - sc/source
sc/source/filter/oox/stylesbuffer.cxx| 30 +- sc/source/filter/oox/worksheethelper.cxx |2 ++ 2 files changed, 23 insertions(+), 9 deletions(-) New commits: commit 198796205b60bc3662a7805276f4497b6fa0c8f7 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Fri Sep 26 11:13:43 2014 -0400 Set rotation reference directly via internal API. Note that the original code would first set the rotation reference value stored in the Xf, then later unconditionally overwrite it according to the border setting. The new code only ports the second part. Perhaps there was a bug in the original code Change-Id: I15b6839e9a58e8070a43db70e1a88b42ed99f2d8 diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 2afedcc..210dec2 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -2194,7 +2194,7 @@ void Xf::writeToPropertyMap( PropertyMap rPropMap ) const // create and set cell style. -// TODO : We should gradually move things to writeToDoc, to set cell +// TODO : We should gradually move things to writeToDoc(), to set cell // styles to the document directly. if( maModel.mbFontUsed ) @@ -2209,13 +2209,6 @@ void Xf::writeToPropertyMap( PropertyMap rPropMap ) const rStyles.writeBorderToPropertyMap( rPropMap, maModel.mnBorderId ); if( maModel.mbAreaUsed ) rStyles.writeFillToPropertyMap( rPropMap, maModel.mnFillId ); -if( maModel.mbAlignUsed || maModel.mbBorderUsed ) -rPropMap.setProperty( PROP_RotateReference, meRotationRef); - -sal_Int32 eRotRef = ::com::sun::star::table::CellVertJustify2::STANDARD; -if (maModel.mbBorderUsed rStyles.hasBorder(maModel.mnBorderId) maAlignment.getApiData().mnRotation) -eRotRef = ::com::sun::star::table::CellVertJustify2::BOTTOM; -rPropMap.setProperty( PROP_RotateReference, eRotRef); } void Xf::writeToPropertySet( PropertySet rPropSet ) const @@ -2227,9 +2220,11 @@ void Xf::writeToPropertySet( PropertySet rPropSet ) const void Xf::writeToDoc( ScDocumentImport rDoc, const table::CellRangeAddress rRange ) const { +const StylesBuffer rStyles = getStyles(); + if (isCellXf()) { -const StylesBuffer rStyles = getStyles(); +// Cell style name. OUString aStyleName = rStyles.createCellStyle(maModel.mnStyleXfId); ScStyleSheet* pStyleSheet = @@ -2243,6 +2238,23 @@ void Xf::writeToDoc( ScDocumentImport rDoc, const table::CellRangeAddress rRan *pStyleSheet); } } + +boost::scoped_ptrScPatternAttr pAttr(new ScPatternAttr(rDoc.getDoc().GetPool())); + +{ +SvxRotateMode eRotateMode = SVX_ROTATE_MODE_STANDARD; + +if (maModel.mbBorderUsed rStyles.hasBorder(maModel.mnBorderId) maAlignment.getApiData().mnRotation) +eRotateMode = SVX_ROTATE_MODE_BOTTOM; + +SvxRotateModeItem aItem(eRotateMode, ATTR_ROTATE_MODE); +ScfTools::PutItem(pAttr-GetItemSet(), aItem, false); +} + +// TODO : Move more properties from writeToPropertyMap(). + +rDoc.getDoc().ApplyPatternAreaTab( +rRange.StartColumn, rRange.StartRow, rRange.EndColumn, rRange.EndRow, rRange.Sheet, *pAttr); } const ::ScPatternAttr diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 9aa8abd..de9a644 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -836,9 +836,11 @@ void WorksheetGlobals::convertColumnFormat( sal_Int32 nFirstCol, sal_Int32 nLast { const StylesBuffer rStyles = getStyles(); +// Set cell styles via UNO API. We should move these to the direct API. PropertySet aPropSet( getCellRange( aRange ) ); rStyles.writeCellXfToPropertySet(aPropSet, nXfId); +// Set cell styles via direct API - the preferred approach. ScDocumentImport rDoc = getDocImport(); rStyles.writeCellXfToDoc(rDoc, aRange, nXfId); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
gbuild-to-ide incompatibility with make 4.0
While looking at the gbuild-to-ide script, I noticed that almost all of the regex broke due to the below change in make 4.0. * In -p output, .RECIPEPREFIX settings are shown and all target-specific variables are output as if in a makefile, instead of as comments. I'm wondering if it would be fine to require make = 4.0 to run this script? Otherwise, two sets of regex would be needed, one for make 4.0+ and one for older versions. I'm going to try to get the script to work with make 4.0, but it would be easier if I don't have to worry about old make versions. Thoughts? Thanks, Peter ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Performance samples for LibreOffice ...
Ah, right, good catch. Our XLIB_* trick from include/{pre,post}x.h (which had been duplicated in extensions/source/plugin/inc/plugin/unx/plugcon.hxx prior to http://cgit.freedesktop.org/libreoffice/core/commit/?id=15c609f33da44c24e1d0cf19670b0da43738ce0c Use prex.h/postx.h). Should go away once https://bugs.freedesktop.org/show_bug.cgi?id=82577 get rid of prex.h / postx.h wrapper headers is fully fixed. Cool, I updated tree and plan to look improve the warnings on mismatching bases. However my build now dies at: /aux/hubicka/libreoffice2/50-lto/workdir/UnpackedTarball/boost/boost/unordered/unordered_set.hpp:711:24: error: variadic templates only available with -std=c++11 or -std=gnu++11 template class... Args ^ /aux/hubicka/libreoffice2/50-lto/workdir/UnpackedTarball/boost/boost/unordered/unordered_set.hpp:712:70: error: variadic templates only available with -std=c++11 or -std=gnu++11 iterator emplace_hint(const_iterator, BOOST_FWD_REF(Args)... args) ^ [build CXX] comphelper/source/container/containermultiplexer.cxx [build CXX] comphelper/source/container/embeddedobjectcontainer.cxx make[1]: *** [/aux/hubicka/libreoffice2/50-lto/workdir/CxxObject/odk/qa/checkapi/checkapi.o] Error 1 Honza Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: connectivity/source dbaccess/source include/connectivity
connectivity/source/drivers/odbc/ODatabaseMetaData.cxx |2 connectivity/source/inc/odbc/OConnection.hxx |2 connectivity/source/inc/odbc/ODriver.hxx |2 connectivity/source/inc/odbc/OFunctiondefs.hxx | 104 - connectivity/source/inc/odbc/OFunctions.hxx|2 connectivity/source/inc/odbc/OTools.hxx|2 dbaccess/source/ui/dlg/odbcconfig.cxx | 36 - include/connectivity/odbc.hxx | 104 + 8 files changed, 110 insertions(+), 144 deletions(-) New commits: commit 173e0172092fa87606a80a7b0d6b89323c7166b5 Author: Lionel Elie Mamane lio...@mamane.lu Date: Fri Sep 26 18:25:56 2014 +0200 factorise odbc headers inclusion it is complicated enough that we should implement that logic only once Change-Id: I0cc5ffb871223b27df825f21612e3c8f6f2febb3 diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx index 6a98544..56a2467 100644 --- a/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx +++ b/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx @@ -25,7 +25,7 @@ #include com/sun/star/sdbc/ResultSetType.hpp #include com/sun/star/sdbc/ResultSetConcurrency.hpp #include com/sun/star/sdbc/TransactionIsolation.hpp -#include odbc/OFunctiondefs.hxx +#include connectivity/odbc.hxx #include stdio.h #include TPrivilegesResultSet.hxx #include connectivity/dbexception.hxx diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx index bdf46b6..37f730b 100644 --- a/connectivity/source/inc/odbc/OConnection.hxx +++ b/connectivity/source/inc/odbc/OConnection.hxx @@ -21,7 +21,7 @@ #include com/sun/star/sdbc/SQLWarning.hpp #include com/sun/star/beans/PropertyValue.hpp -#include odbc/OFunctiondefs.hxx +#include connectivity/odbc.hxx #include odbc/odbcbasedllapi.hxx #include connectivity/OSubComponent.hxx #include connectivity/CommonTools.hxx diff --git a/connectivity/source/inc/odbc/ODriver.hxx b/connectivity/source/inc/odbc/ODriver.hxx index f225bd0..210a543 100644 --- a/connectivity/source/inc/odbc/ODriver.hxx +++ b/connectivity/source/inc/odbc/ODriver.hxx @@ -23,7 +23,7 @@ #include com/sun/star/sdbc/XDriver.hpp #include com/sun/star/lang/XServiceInfo.hpp #include cppuhelper/compbase2.hxx -#include odbc/OFunctiondefs.hxx +#include connectivity/odbc.hxx #include odbc/odbcbasedllapi.hxx #include connectivity/CommonTools.hxx #include osl/module.h diff --git a/connectivity/source/inc/odbc/OFunctions.hxx b/connectivity/source/inc/odbc/OFunctions.hxx index 1ead6bb..feeda59 100644 --- a/connectivity/source/inc/odbc/OFunctions.hxx +++ b/connectivity/source/inc/odbc/OFunctions.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_OFUNCTIONS_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_OFUNCTIONS_HXX -#include odbc/OFunctiondefs.hxx +#include connectivity/odbc.hxx #include rtl/ustring.hxx #include osl/module.h diff --git a/connectivity/source/inc/odbc/OTools.hxx b/connectivity/source/inc/odbc/OTools.hxx index d9b8127..ff07cd0 100644 --- a/connectivity/source/inc/odbc/OTools.hxx +++ b/connectivity/source/inc/odbc/OTools.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_OTOOLS_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_OTOOLS_HXX -#include odbc/OFunctiondefs.hxx +#include connectivity/odbc.hxx #include odbc/odbcbasedllapi.hxx #include com/sun/star/sdbc/SQLException.hpp #include com/sun/star/util/Date.hpp diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index e75b160..c301918 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -20,12 +20,6 @@ #include config_folders.h #include odbcconfig.hxx -#ifdef SYSTEM_ODBC_HEADERS -#include sqltypes.h -#else -#include odbc/sqltypes.h -#endif - #include rtl/bootstrap.hxx #include rtl/ustring.hxx #include rtl/ustrbuf.hxx @@ -49,35 +43,7 @@ #endif #endif -// just to go with calling convention of windows -// so don't touch this -#if defined(WNT) -#undef SQL_API -#define SQL_API __stdcall -// At least under some circumstances, the below #include odbc/sqlext.h re- -// defines SQL_API to an empty string, leading to a compiler warning on MSC; to -// not break the current behavior, this is worked around by locally disabling -// that warning: -#if defined _MSC_VER -#pragma warning(push) -#pragma warning(disable: 4005) -#endif -#endif // defined(WNT) - -#ifdef SYSTEM_ODBC_HEADERS -#include sqlext.h -#else -#include odbc/sqlext.h -#endif - -#if defined(WNT) -#if defined _MSC_VER -#pragma warning(pop) -#endif -#undef SQL_API -#define SQL_API __stdcall -#endif // defined(WNT) -// from here on you can do what you want to +#include connectivity/odbc.hxx #else diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx
[Libreoffice-commits] core.git: sd/source
sd/source/ui/func/fudraw.cxx | 21 +++-- sd/source/ui/inc/fudraw.hxx |1 + 2 files changed, 16 insertions(+), 6 deletions(-) New commits: commit ef58e10844dff60cd218306b059ec81d8421f961 Author: Samuel Mehrbrodt s.mehrbr...@gmail.com Date: Fri Sep 26 18:45:42 2014 +0200 fdo#83808 Scale images proportionally by default in Impress/Draw Change-Id: I16cacb90150aef3aa2ad4607e05298f0bc47c1ae diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 99e63b2..360aed0 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -93,11 +93,21 @@ bool FuDraw::MouseButtonDown(const MouseEvent rMEvt) SetMouseButtonCode(rMEvt.GetButtons()); bool bReturn = false; - bDragHelpLine = false; - aMDPos = mpWindow-PixelToLogic( rMEvt.GetPosPixel() ); +// Check whether an image is selected +bIsImageSelected = false; +if (mpView-AreObjectsMarked()) +{ +const SdrMarkList rMarkList = mpView-GetMarkedObjectList(); +if (rMarkList.GetMarkCount() == 1) +{ +SdrMark* pMark = rMarkList.GetMark(0); +bIsImageSelected = pMark-GetMarkedSdrObj()-GetObjIdentifier() == OBJ_GRAF; +} +} + if ( rMEvt.IsLeft() ) { FrameView* pFrameView = mpViewShell-GetFrameView(); @@ -217,7 +227,6 @@ bool FuDraw::MouseMove(const MouseEvent rMEvt) Point aPos = mpWindow-PixelToLogic( rMEvt.GetPosPixel() ); bool bOrtho = false; - bool bRestricted = true; if (mpView-IsDragObj()) @@ -235,10 +244,10 @@ bool FuDraw::MouseMove(const MouseEvent rMEvt) if (mpView-IsAction()) { // #i33136# -if(bRestricted doConstructOrthogonal()) +if(bIsImageSelected || (bRestricted doConstructOrthogonal())) { -// Restrict movement: -// rectangle-quadrat, ellipse-circle etc. +// Scale proportionally by default: +// rectangle-quadrat, ellipse-circle, Images etc. bOrtho = !rMEvt.IsShift(); } else diff --git a/sd/source/ui/inc/fudraw.hxx b/sd/source/ui/inc/fudraw.hxx index fb13e98..41efba2 100644 --- a/sd/source/ui/inc/fudraw.hxx +++ b/sd/source/ui/inc/fudraw.hxx @@ -78,6 +78,7 @@ protected: boolbDragHelpLine; sal_uInt16 nHelpLine; boolbPermanent; +bool bIsImageSelected; }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source sw/qa writerfilter/source
oox/source/drawingml/shape.cxx | 11 --- oox/source/export/drawingml.cxx |6 ++ sw/qa/extras/ooxmlexport/data/rot180-flipv.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 11 +++ sw/qa/extras/ooxmlexport/ooxmlexport2.cxx |2 +- sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx | 10 +- writerfilter/source/dmapper/GraphicImport.cxx | 14 -- 7 files changed, 39 insertions(+), 15 deletions(-) New commits: commit 7f9b242331327c5c1b137b91861a6bb57bfb0ecc Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Sep 26 18:34:15 2014 +0200 DOCX drawingML import: fix remaining rotation / flip combinations With this, each rotation = 0 / 90 / 180 / 270 and flip = none / horizontal / vertical / horizontal+vertical combination (16 cases) are imported perfectly. Also adjust a few testcases -- now that in many cases we only set the position in oox, some rounding errors went away. Change-Id: I5567a7d6964775f2caf10a0e539f3eb84d10461e diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 1276c97..5343172 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -418,7 +418,9 @@ Reference XShape Shape::createAndInsert( aServiceName == com.sun.star.drawing.ConnectorShape ); bool bUseRotationTransform = ( !mbWps || aServiceName == com.sun.star.drawing.LineShape || -aServiceName == com.sun.star.drawing.GroupShape ); +aServiceName == com.sun.star.drawing.GroupShape || +mbFlipH || +mbFlipV ); basegfx::B2DHomMatrix aTransformation; @@ -458,7 +460,10 @@ Reference XShape Shape::createAndInsert( if( maPosition.X != 0 || maPosition.Y != 0) { // if global position is used, add it to transformation -aTransformation.translate( maPosition.X, maPosition.Y ); +if (mbWps aParentTransformation.isIdentity()) +aTransformation.translate( maPosition.X * 360, maPosition.Y * 360); +else +aTransformation.translate( maPosition.X, maPosition.Y ); } aTransformation = aParentTransformation*aTransformation; @@ -986,7 +991,7 @@ Reference XShape Shape::createAndInsert( // These can have a custom geometry, so position should be set here, // after creation but before custom shape handling, using the position // we got from the caller. -if (mbWps aServiceName != com.sun.star.text.TextFrame) +if (mbWps aServiceName == com.sun.star.drawing.LineShape) mxShape-setPosition(maPosition); if( bIsCustomShape ) diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 0ca3054..0660498 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -1169,7 +1169,13 @@ void DrawingML::WriteShapeTransformation( Reference XShape rXShape, sal_Int32 } if (!bSuppressRotation) { +// See SdrObjCustomShape::NbcRotate(). +int nSwap = 0; +if (bFlipH) +nSwap ^= 1; if (bFlipV) +nSwap ^= 1; +if (nSwap) { nRotation=(nRotation+18000)%36000; } diff --git a/sw/qa/extras/ooxmlexport/data/rot180-flipv.docx b/sw/qa/extras/ooxmlexport/data/rot180-flipv.docx new file mode 100644 index 000..2a8bb19 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/rot180-flipv.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 43ea669..c8e2470 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -315,6 +315,17 @@ DECLARE_OOXMLEXPORT_TEST(testRot90Fliph, rot90-fliph.docx) } } +DECLARE_OOXMLEXPORT_TEST(testRot180Flipv, rot180-flipv.docx) +{ +// 180° rotation got lost after roundtrip. +if (xmlDocPtr pXmlDoc = parseExport(word/document.xml)) +{ +assertXPath(pXmlDoc, //a:xfrm, flipV, 1); +// This attribute was completely missing. +assertXPath(pXmlDoc, //a:xfrm, rot, 1080); +} +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx index fcb5c8a..78fbb7e 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx @@ -1048,7 +1048,7 @@ DECLARE_OOXMLEXPORT_TEST(testTableFloating, table-floating.docx) // After import, table is inside a TextFrame. uno::Referencebeans::XPropertySet xShape(getShape(1), uno::UNO_QUERY); // This was 0, should be the the opposite of (left margin + half of the border width). -CPPUNIT_ASSERT_EQUAL(sal_Int32(-198), getPropertysal_Int32(xShape, HoriOrientPosition)); +
[Libreoffice-commits] core.git: tools/source
tools/source/fsys/urlobj.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 0f64ec11a3c80308075b8786fb0a2757a2d7efe8 Author: Tor Lillqvist t...@collabora.com Date: Fri Sep 26 20:05:20 2014 +0300 WaE: implicit conversion of NULL constant to 'nullptr_t' Change-Id: I47ebbac21f48854eb737dd7e8119bd863a5d7ed9 diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index e8331e8..cceadee 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -604,7 +604,7 @@ std::unique_ptrSvMemoryStream INetURLObject::getData() { if( GetProtocol() != INET_PROT_DATA ) { -return NULL; +return nullptr; } OUString sURLPath = GetURLPath( DECODE_WITH_CHARSET, RTL_TEXTENCODING_ISO_8859_1 ); @@ -633,7 +633,7 @@ std::unique_ptrSvMemoryStream INetURLObject::getData() aDecodedData.getArray(), aDecodedData.getLength()); } } -return NULL; +return nullptr; } namespace unnamed_tools_urlobj { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/cvtsvm.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cbee6e53e6345080dc52c75c98cfe0eb1c60e52e Author: Michael Stahl mst...@redhat.com Date: Fri Sep 26 20:38:31 2014 +0200 vcl: restore that cast for MSVC Change-Id: I8a8b4b16811660290c881f82b3cf9b910d054215 diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index 2b1ae14..24fed37 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -2435,7 +2435,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream rOStm, GDIMetaFile rMtf, default: { OStringBuffer aStr(Missing implementation for Action#: ); -aStr.append(pAction-GetType()); +aStr.append(static_castsal_Int32(pAction-GetType())); aStr.append('!'); OSL_FAIL(aStr.getStr()); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/perfwork' - 2 commits - sc/inc sc/source
sc/inc/column.hxx|3 -- sc/inc/rowheightcontext.hxx |6 sc/source/core/data/column.cxx | 19 +++--- sc/source/core/data/column2.cxx | 24 +- sc/source/core/data/rowheightcontext.cxx |5 +++ sc/source/core/data/table1.cxx | 41 +++ 6 files changed, 60 insertions(+), 38 deletions(-) New commits: commit 452d65ff7ee1dc8be16b9262a13ce9be17243f68 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Fri Sep 26 16:21:12 2014 -0400 Annotate FindEditCellsHandler. Change-Id: Ib49a7a3eccee62e5496f7f19824631866e072b6a diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index d6152dd..e49d765 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -2833,17 +2833,21 @@ class FindEditCellsHandler sc::CellStoreType::iterator miCellPos; public: -FindEditCellsHandler(ScColumn rColumn, sc::CellTextAttrStoreType rAttrs, -const sc::CellStoreType::iterator rCellItr) : -mrColumn(rColumn), miAttrPos(rAttrs.begin()), miCellPos(rCellItr) {} +FindEditCellsHandler(ScColumn rCol) : +mrColumn(rCol), +miAttrPos(rCol.GetCellAttrStore().begin()), +miCellPos(rCol.GetCellStore().begin()) {} bool operator() (size_t, const EditTextObject*) { +// This is definitely an edit text cell. return true; } bool operator() (size_t nRow, const ScFormulaCell* p) { +// With a formula cell, it's considered an edit text cell when either +// the result is multi-line or it has more than one script types. sal_uInt8 nScriptType = mrColumn.GetRangeScriptType(miAttrPos, nRow, nRow, miCellPos); if (IsAmbiguousScriptNonZero(nScriptType)) return true; @@ -2851,13 +2855,19 @@ public: return const_castScFormulaCell*(p)-IsMultilineResult(); } +/** + * Callback for a block of other types. + */ std::pairsize_t,bool operator() (const sc::CellStoreType::value_type node, size_t nOffset, size_t nDataSize) { typedef std::pairsize_t,bool RetType; if (node.type == sc::element_type_empty) +// Ignore empty blocks. return RetType(0, false); +// Check the script type of a non-empty element and see if it has +// multiple script types. for (size_t i = 0; i nDataSize; ++i) { SCROW nRow = node.position + i + nOffset; @@ -2867,6 +2877,7 @@ public: return RetType(i+nOffset, true); } +// No edit text cell found. return RetType(0, false); } }; @@ -3232,7 +3243,7 @@ bool ScColumn::HasEditCells(SCROW nStartRow, SCROW nEndRow, SCROW rFirst) { // used in GetOptimalHeight - ambiguous script type counts as edit cell -FindEditCellsHandler aFunc(*this, maCellTextAttrs, maCells.begin()); +FindEditCellsHandler aFunc(*this); std::pairsc::CellStoreType::const_iterator,size_t aPos = sc::FindFormulaEditText(maCells, nStartRow, nEndRow, aFunc); commit 3c23ec10b4b1a881b011d1ce16cc4012415c0f7a Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Fri Sep 26 15:39:50 2014 -0400 Store height array to RowHeightContext and reduce function arg counts. Change-Id: I09b79bc76ffc55e25c24bbfa8f000f4a46df0a1c diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index 893ef13..7b189e0 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -461,8 +461,7 @@ public: bool bFormula, sal_uInt16 nOldWidth, const ScMarkData* pMarkData, const ScColWidthParam* pParam) const; void GetOptimalHeight( -sc::RowHeightContext rCxt, SCROW nStartRow, SCROW nEndRow, sal_uInt16* pHeight, -sal_uInt16 nMinHeight, SCROW nMinStart ); +sc::RowHeightContext rCxt, SCROW nStartRow, SCROW nEndRow, sal_uInt16 nMinHeight, SCROW nMinStart ); /// Including current, may return -1 SCsROW GetNextUnprotected( SCROW nRow, bool bUp ) const; diff --git a/sc/inc/rowheightcontext.hxx b/sc/inc/rowheightcontext.hxx index a334554..a077bd0 100644 --- a/sc/inc/rowheightcontext.hxx +++ b/sc/inc/rowheightcontext.hxx @@ -14,12 +14,16 @@ #include tools/fract.hxx +#include vector + class OutputDevice; namespace sc { class SC_DLLPUBLIC RowHeightContext { +std::vectorsal_uInt16 maHeights; + double mfPPTX; double mfPPTY; Fraction maZoomX; @@ -48,6 +52,8 @@ public: void setForceAutoSize( bool b ); bool isForceAutoSize() const { return mbForceAutoSize;} + +std::vectorsal_uInt16 getHeightArray(); }; } diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 13cdee8..e038da3b 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -772,9 +772,9 @@ static sal_uInt16 lcl_GetAttribHeight( const
[Libreoffice-commits] core.git: 7 commits - android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java | 96 -- android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java | 30 - android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java | 11 android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java |4 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DisplayPortCalculator.java | 48 +-- android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GLController.java | 48 --- android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java | 94 ++--- android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ImmutableViewportMetrics.java | 58 ++- android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/Layer.java | 10 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerController.java | 38 -- android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java | 37 -- android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java |7 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/MultiTileLayer.java | 160 +++--- android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/NinePatchTileLayer.java | 28 - android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ScreenshotLayer.java | 147 + android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ScrollbarLayer.java | 12 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SingleTileLayer.java |2 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SubTile.java | 14 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TouchEventHandler.java | 84 ++--- android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ViewportMetrics.java | 113 +++ android/experimental/LOAndroid3/src/java/org/mozilla/gecko/ui/Axis.java | 19 - android/experimental/LOAndroid3/src/java/org/mozilla/gecko/ui/PanZoomController.java | 129 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/ui/SubdocumentScrollHelper.java |3 23 files changed, 529 insertions(+), 663 deletions(-) New commits: commit 93e7ffbd1bd38ae9fad63a0a8abd2deb7fab9543 Author: Tomaž Vajngerl tomaz.vajng...@collabora.com Date: Fri Sep 26 23:15:29 2014 +0200 android: PanZoomControler updates from Fennec Change-Id: Ic338221ced6133771af8f46ae4a257e043a1709f diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerController.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerController.java index 59fc1fe..8a39b82 100644 --- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerController.java +++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerController.java @@ -80,6 +80,10 @@ public class LayerController { layerClient.setLayerController(this); } +public void destroy() { +mPanZoomController.destroy(); +} + public void setForceRedraw() { mForceRedraw = true; } @@ -93,26 +97,10 @@ public class LayerController { return mViewportMetrics.getViewport(); } -public RectF getCssViewport() { -return mViewportMetrics.getCssViewport(); -} - public FloatSize getViewportSize() { return mViewportMetrics.getSize(); } -public RectF getPageRect() { -return mViewportMetrics.getPageRect(); -} - -public RectF getCssPageRect() { -return mViewportMetrics.getCssPageRect(); -} - -public PointF getOrigin() { -return mViewportMetrics.getOrigin(); -} - public float getZoomFactor() { return mViewportMetrics.zoomFactor; } @@ -321,11 +309,6 @@ public class LayerController { public void setAllowZoom(final boolean aValue) { mAllowZoom = aValue; -mView.post(new Runnable() { -public void run() { -mView.getTouchEventHandler().setDoubleTapEnabled(aValue); -} -}); } public boolean getAllowZoom() { diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java index f7d8c4e..c6f11f4 100644 --- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java +++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java @@ -188,11 +188,9 @@ public class LayerRenderer implements GLSurfaceView.Renderer { @Override protected void finalize() throws Throwable {
[Libreoffice-commits] core.git: 2 commits - include/vcl sc/source svx/source
include/vcl/svapp.hxx| 47 +++ sc/source/core/data/documen3.cxx |5 +--- sc/source/core/tool/compiler.cxx |7 + svx/source/fmcomp/gridctrl.cxx | 13 ++ 4 files changed, 54 insertions(+), 18 deletions(-) New commits: commit ed4791eb2d516e2ce509c13ae63c95dd6bcb52c4 Author: Michael Stahl mst...@redhat.com Date: Fri Sep 26 22:25:46 2014 +0200 svx: convert some horrible code to SolarMutexTryAndBuyGuard Try to preserve the existing spin-lock insanity as-is. Change-Id: Ic98aa33d2e56536856892fcf61de672952101ae1 diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 0673bfe..d9e92c3 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -3545,23 +3545,16 @@ void DbGridControl::FieldValueChanged(sal_uInt16 _nId, const PropertyChangeEvent DbGridColumn* pColumn = ( Location m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; if (pColumn) { -bool bAcquiredPaintSafety = false; -while (!m_bWantDestruction !bAcquiredPaintSafety) -bAcquiredPaintSafety = Application::GetSolarMutex().tryToAcquire(); +boost::scoped_ptrvcl::SolarMutexTryAndBuyGuard pGuard; +while (!m_bWantDestruction (!pGuard || !pGuard-isAcquired())) +pGuard.reset(new vcl::SolarMutexTryAndBuyGuard); if (m_bWantDestruction) { // at this moment, within another thread, our destructor tries to destroy the listener which called this method // = don't do anything // 73365 - 23.02.00 - FS -if (bAcquiredPaintSafety) -// though the above while-loop suggests that (m_bWantDestruction bAcquiredPaintSafety) is impossible, -// it isnt't, as m_bWantDestruction isn't protected with any mutex -Application::GetSolarMutex().release(); return; } -// here we got the solar mutex, transfer it to a guard for safety reasons -SolarMutexGuard aPaintSafety; -Application::GetSolarMutex().release(); // and finally do the update ... pColumn-UpdateFromField(m_xCurrentRow, m_xFormatter); commit 423142538e81d28229c769e0617c6a00a648709a Author: Michael Stahl mst...@redhat.com Date: Fri Sep 26 22:24:14 2014 +0200 add a RAII class that tries to acquire the SolarMutex and releases it Motivated by ScCompiler::IsMacro() which has an error return that does not release the SolarMutex. Change-Id: I064219bb3c0d68839a133101491d5f8828a26c7a diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index e303bc6..64225ec 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -1659,6 +1659,53 @@ protected: comphelper::SolarMutex m_solarMutex; }; +namespace vcl +{ + +/** guard class that uses tryToAcquire() and has isAcquired() to check + */ +class SolarMutexTryAndBuyGuard +: private boost::noncopyable +{ +private: +bool m_isAcquired; +#if OSL_DEBUG_LEVEL 0 +bool m_isChecked; +#endif +comphelper::SolarMutex m_rSolarMutex; + +public: + +SolarMutexTryAndBuyGuard() +: m_isAcquired(false) +#if OSL_DEBUG_LEVEL 0 +, m_isChecked(false) +#endif +, m_rSolarMutex(Application::GetSolarMutex()) + +{ +m_isAcquired = m_rSolarMutex.tryToAcquire(); +} + +~SolarMutexTryAndBuyGuard() +{ +#if OSL_DEBUG_LEVEL 0 +assert(m_isChecked); +#endif +if (m_isAcquired) +m_rSolarMutex.release(); +} + +bool isAcquired() +{ +#if OSL_DEBUG_LEVEL 0 +m_isChecked = true; +#endif +return m_isAcquired; +} +}; + +} // namespace vcl /** A helper class that calls Application::ReleaseSolarMutex() in its constructor diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index 6bf981c..739b1f3 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -877,13 +877,12 @@ void ScDocument::RemoveUnoObject( SfxListener rObject ) // This check is done after calling EndListening, so a later BroadcastUno call // won't touch this object. -comphelper::SolarMutex rSolarMutex = Application::GetSolarMutex(); -if ( rSolarMutex.tryToAcquire() ) +vcl::SolarMutexTryAndBuyGuard g; +if (g.isAcquired()) { // BroadcastUno is always called with the SolarMutex locked, so if it // can be acquired, this is within the same thread (should not happen) OSL_FAIL( RemoveUnoObject called from BroadcastUno ); -rSolarMutex.release(); } else { diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index b4872e2..fa98f83 100644 --- a/sc/source/core/tool/compiler.cxx +++
[Libreoffice-commits] core.git: Branch 'feature/perfwork' - 2 commits - comphelper/source include/comphelper sax/source
comphelper/source/streaming/seqstream.cxx | 23 +++-- include/comphelper/seqstream.hxx |2 sax/source/tools/fastserializer.cxx | 129 -- sax/source/tools/fastserializer.hxx | 20 +--- sax/source/tools/fshelper.cxx |6 - 5 files changed, 97 insertions(+), 83 deletions(-) New commits: commit 784d4bea86d8cbb3a855e557c465ce50a049cefc Author: Matúš Kukan matus.ku...@collabora.com Date: Fri Sep 26 17:17:50 2014 +0200 FastSerializer: Avoid sequences where possible Change-Id: I359ca9d3b766b71904e4199ebfbdbd5b203775cc diff --git a/comphelper/source/streaming/seqstream.cxx b/comphelper/source/streaming/seqstream.cxx index aec4519..91fdc7d7 100644 --- a/comphelper/source/streaming/seqstream.cxx +++ b/comphelper/source/streaming/seqstream.cxx @@ -156,14 +156,19 @@ OSequenceOutputStream::OSequenceOutputStream(Sequence sal_Int8 _rSeq, double // this heuristic is as good as any other ... supply better parameters if you don't like it :) } - void SAL_CALL OSequenceOutputStream::writeBytes( const Sequence sal_Int8 _rData ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { +writeBytes(_rData.getConstArray(), _rData.getLength()); +} + +void SAL_CALL OSequenceOutputStream::writeBytes( const sal_Int8* pStr, sal_Int32 nLen ) +throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) +{ if (!m_bConnected) throw NotConnectedException(); // ensure the sequence has enough space left -if (m_nSize + _rData.getLength() m_rSequence.getLength()) +if (m_nSize + nLen m_rSequence.getLength()) { sal_Int32 nCurrentLength = m_rSequence.getLength(); sal_Int32 nNewLength = static_cast sal_Int32 ( @@ -177,18 +182,18 @@ void SAL_CALL OSequenceOutputStream::writeBytes( const Sequence sal_Int8 _rD // such a large step is not allowed nNewLength = nCurrentLength + m_nMaximumResize; -if (nNewLength m_nSize + _rData.getLength()) +if (nNewLength m_nSize + nLen) { // it's not enough the data would not fit // let's take the double amount of the length of the data to be written, as the next write // request could be as large as this one -sal_Int32 nNewGrowth = _rData.getLength() * 2; +sal_Int32 nNewGrowth = nLen * 2; if ((m_nMaximumResize 0) (nNewGrowth m_nMaximumResize)) { // we came to the limit, again ... nNewGrowth = m_nMaximumResize; -if (nNewGrowth + nCurrentLength m_nSize + _rData.getLength()) +if (nNewGrowth + nCurrentLength m_nSize + nLen) // but it would not fit if we respect the limit -nNewGrowth = m_nSize + _rData.getLength() - nCurrentLength; +nNewGrowth = m_nSize + nLen - nCurrentLength; } nNewLength = nCurrentLength + nNewGrowth; } @@ -199,11 +204,11 @@ void SAL_CALL OSequenceOutputStream::writeBytes( const Sequence sal_Int8 _rD m_rSequence.realloc(nNewLength); } -OSL_ENSURE(m_rSequence.getLength() = m_nSize + _rData.getLength(), +OSL_ENSURE(m_rSequence.getLength() = m_nSize + nLen, ooops ... the realloc algorithm seems to be wrong :( !); -memcpy(m_rSequence.getArray() + m_nSize, _rData.getConstArray(), _rData.getLength()); -m_nSize += _rData.getLength(); +memcpy(m_rSequence.getArray() + m_nSize, pStr, nLen); +m_nSize += nLen; } diff --git a/include/comphelper/seqstream.hxx b/include/comphelper/seqstream.hxx index 75b1934..1288a9b 100644 --- a/include/comphelper/seqstream.hxx +++ b/include/comphelper/seqstream.hxx @@ -119,6 +119,8 @@ public: /// same as XOutputStream::writeBytes (as expected :) virtual void SAL_CALL writeBytes( const ::com::sun::star::uno::Sequence sal_Int8 aData ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; +void SAL_CALL writeBytes( const sal_Int8* pStr, sal_Int32 nLen ) +throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); /** Resizes the sequence used for writing to the really used size. * Next time, writeBytes will write to the beginning of the sequence. */ diff --git a/sax/source/tools/fastserializer.cxx b/sax/source/tools/fastserializer.cxx index 300c0d3..455df0b 100644 --- a/sax/source/tools/fastserializer.cxx +++ b/sax/source/tools/fastserializer.cxx @@ -37,7 +37,6 @@ using ::comphelper::SequenceAsVector; using
[Libreoffice-commits] core.git: sc/source
sc/source/ui/drawfunc/fupoor.cxx | 10 ++ 1 file changed, 10 insertions(+) New commits: commit 425711faddb208efa97e869b885919fff9e570d0 Author: Samuel Mehrbrodt s.mehrbr...@gmail.com Date: Sat Sep 27 00:44:52 2014 +0200 fdo#83808 Scale images proportionally by default in Calc Change-Id: I979d721d2e6617a1214b70138660d657eb1e46b1 diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx index 9a33136..dfad06a 100644 --- a/sc/source/ui/drawfunc/fupoor.cxx +++ b/sc/source/ui/drawfunc/fupoor.cxx @@ -327,6 +327,16 @@ void FuPoor::ImpForceQuadratic(Rectangle rRect) // #i33136# bool FuPoor::doConstructOrthogonal() const { +// Check whether an image is selected - they should scale proportionally +if (pView-AreObjectsMarked()) +{ +const SdrMarkList rMarkList = pView-GetMarkedObjectList(); +if (rMarkList.GetMarkCount() == 1) +{ +if (rMarkList.GetMark(0)-GetMarkedSdrObj()-GetObjIdentifier() == OBJ_GRAF) +return true; +} +} return false; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added Depends on||82009 --- Comment #68 from ign_christian ign_christ...@yahoo.com --- Nominate Bug 82009 : black fields in pivot table, only for Mac OS X A user confirmed that it's not occured in 4.2.x, affects many users -- 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
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/e29862bcc509916e7fe3e9b2f43b0672c49b7f6e/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 53920] EDITING: Data Validity Cell Range not being applied to multiple selected cells
https://bugs.freedesktop.org/show_bug.cgi?id=53920 Laurent BP jumbo4...@yahoo.fr changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |jumbo4...@yahoo.fr |desktop.org | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 62081] Add split menus to items in the style dropdown
https://bugs.freedesktop.org/show_bug.cgi?id=62081 --- Comment #9 from Adolfo Jayme f...@libreoffice.org --- I tested the new dropdowns, but when I click them, the parent Styles menu disappears (leaving a floating submenu in a nonsensical position of the screen), which I think is not what people would expect. Besides that, it’s a wonderful improvement, Szymon. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] MySQL native connector for OS X
Le 25/09/2014 09:44, Bjoern Michaelsen a écrit : The build dependencies package on *buntu doesn't include gstreamer stuff. To fix that: sudo apt-get install libgstreamer0.10-dev libgstreamer-plugins-base0.10-dev Alternatively, do: ./autogen.sh --enable-gstreamer --disable-gstreamer-0-10 to use the less horribly outdated gstreamer 1.0 instead of gstreamer 0.10 (as Ubuntu packages do). This gstreamer dev library support caused me no end of headache initially. For casual builders, such as I assume most QAers, it is one more barrier to entry for people on *buntu (and/or Debian) based distros. Thanks for pointing out the appropriate switches. Alex ___ 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] minutes of ESC call ...
On Thu, Sep 25, 2014 at 03:36:34PM +0100, Michael Meeks wrote: + Bjoern re-introduced mergelibs for 4.3.2 + enabled for 4.3.1 without a patch, we need other libs in mergelibs to avoid circular deps. + some interesting bug reports wrt. dbtools moving into mergelibs etc. + anyone interested in investigating ? + mergelibs works nicely from 4.0.x - 4.2.x startup time is visibily faster with it. compressed pkg is 1Mb smaller too ... So, since I had to fiddle with this anyway I did measure cold and hot starts of LibreOffice in an Ubuntu 14.10 VM: cold warm mergedlibs 2.06s ~0.8s no mergedlibs3.46s ~0.8s These times were handstopped, thus likely at least -/+0.2s (thus the warm starts arent really worth anything) -- still a cold start of LibreOffice is some ~70% faster on cold start. This is with a full distro build of 4.3.2.2 with full install (including java-foo) on a 8GB VirtualBox VM running on a i7-2720QM/16GB host. Best, Bjoern ___ 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 84353] New: EDITING: Become retarded slow when selecting multiple row
https://bugs.freedesktop.org/show_bug.cgi?id=84353 Priority: medium Bug ID: 84353 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: EDITING: Become retarded slow when selecting multiple row Severity: normal Classification: Unclassified OS: Windows (All) Reporter: hitechholdi...@gmail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.2.5.2 release Component: Spreadsheet Product: LibreOffice Created attachment 106899 -- https://bugs.freedesktop.org/attachment.cgi?id=106899action=edit select multiple rows in alternate and right click for function to appear Problem description: Become retarded slow when selecting multiple row by using CTRL + mouse click. Selecting of rows is OK But when clicking on the EDIT or RIGHT CLICK for functions The system become very slow and almost hang Steps to reproduce: 1. Create / Open a sheet 2. Right click multiple rows (alternate rows) 3. Lags and retarded starts about 9 row clicks (selection) 4. Have to wait very long for the functions to appear or clicking at the top FUNCTION MENU It does not happen when only clicking a few rows, but from 6th onwards, the right click function and top menu are lagging. It doesnt happen when all rows selected are in sequence, but only happen in alternate row selection. See attached. This lag happens more to Windows 7. Kubuntu 14.04 doesnt lag that much. Current behavior: Lags and retarded Expected behavior: Almost immediate response. My system, i7-3770 CPU 3.9GHZ Windows 7 64Bit 8GB RAM Operating System: Windows 7 Version: 4.2.5.2 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 79721] writer slow on shapes, locks up if huge amount of shapes
https://bugs.freedesktop.org/show_bug.cgi?id=79721 --- Comment #31 from wabik wa...@wp.pl --- Bumping the bug ... is sth going on with this bug? Thanks for the answer! -- 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 39625] Make existing cppunittests work
https://bugs.freedesktop.org/show_bug.cgi?id=39625 Tobias Madl tobias.madl@gmail.com changed: What|Removed |Added Assignee|tobias.madl@gmail.com |libreoffice-b...@lists.free ||desktop.org -- 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 84319] Outline Numbering - Capitalized A, B, C, I, II, III, A, AA, AAA... are in lower case in non-english UI
https://bugs.freedesktop.org/show_bug.cgi?id=84319 Kevin Suo suokunl...@gmail.com changed: What|Removed |Added Resolution|WORKSFORME |DUPLICATE --- Comment #9 from Kevin Suo suokunl...@gmail.com --- mjayfrancis told me that this issue may have been collateral from fdo#80650. I think it really is. Mark as duplicate of bug 80650. *** This bug has been marked as a duplicate of bug 80650 *** -- 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 84356] New: LO CALC will crash when open a document which contain a chart
https://bugs.freedesktop.org/show_bug.cgi?id=84356 Priority: medium Bug ID: 84356 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: LO CALC will crash when open a document which contain a chart Severity: normal Classification: Unclassified OS: All Reporter: xu...@multicorewareinc.com Hardware: Other Status: UNCONFIRMED Version: unspecified Component: Chart Product: LibreOffice Created attachment 106902 -- https://bugs.freedesktop.org/attachment.cgi?id=106902action=edit The document I want to open Export UNLOCK_FPS_MODE=1 and open the document. The window will twinkle and then crash. I record a video to show how to reproduce this bug, the link is as follow: https://www.sendspace.com/file/8vv2st I also upload the document that I want to open. -- 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 84135] CONFIGURATION: Mendeley 1.12.1 does NOT work with LibreOffice 4.3.1.2. @ LinuxMint Quiana 64-bit
https://bugs.freedesktop.org/show_bug.cgi?id=84135 --- Comment #2 from jki...@gmail.com --- Hi, Thank You for your help. It turned out not to be a bug at all: Mendeley experts noticed that I missed to install the libreoffice-script-provider-python package. Installing it made communication between Mendeley LO working fine (with the newest version of both software as well). Regards, Janos https://bugs.freedesktop.org/show_bug.cgi?id=84135 Robinson Tryon (qubit) qu...@runcibility.com changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |NOTOURBUG CC||qu...@runcibility.com --- Comment #1 from Robinson Tryon (qubit) qu...@runcibility.com --- (In reply to comment #0) Problem description: Mendeley Desktop 1.12.1 with Mendeley 1.12.1.oxt does NOT work with LibreOffice 4.3.1.2. (Build ID: 430m0(Build:2). I do not know if it is a Mendeley or a LibreOffice problem. I report this to both parties. Hi jkis17, Looks like Mendeley 1.12.1 is the latest version available. I believe that Mendeley usually suggest that people update to the latest version of LibreOffice, so please try updating to our just-released LibreOffice 4.3.2 and see if that fixes your problems. Generally speaking, we cover the code that we write, and let extension authors cover the code that they write. If you have further issues with the Mendeley extension, please check with their support team. -- Resolving as 'Not our bug'. (If the Mendeley authors think that the bug is actually in our code, we'd be quite happy to get a bug report) Good luck! -- 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 80403] AutoCorrect - parse XML files using XFastParser ...
https://bugs.freedesktop.org/show_bug.cgi?id=80403 --- Comment #4 from tommy27 ba...@quipo.it --- (In reply to comment #2) Hi David; currently there is a student from Munich working on this easy hack =) ( before you go fix it in a heart-beat ;-). Matus knows who that is ... so I think that he should put his name under the ASSIGNED TO field. -- 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 #39 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Takeshi Abe committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=b75b473e2ce6120d58023ee740b41cda35299d00 fdo#75757: remove inheritance to std::vector The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are 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 80403] AutoCorrect - parse XML files using XFastParser ...
https://bugs.freedesktop.org/show_bug.cgi?id=80403 d.sikele...@gmail.com changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |d.sikele...@gmail.com |desktop.org | --- Comment #5 from d.sikele...@gmail.com --- I'm working on an other easy hack right now, but afterwards I want to start with this as an entry to all the fastparser stuff. -- 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 82043] Start Center green sidebar text is too small
https://bugs.freedesktop.org/show_bug.cgi?id=82043 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|target:4.4.0|target:4.4.0 target:4.3.3 --- Comment #28 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Yousuf Philips committed a patch related to this issue. It has been pushed to libreoffice-4-3: http://cgit.freedesktop.org/libreoffice/core/commit/?id=c0cb2dc6a6bc539f4cdad2bc54cbbde29c69ea7eh=libreoffice-4-3 fdo#82043: Instead of the bold font, use a higher multiplifier (4.3 backport) It will be available in LibreOffice 4.3.3. 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 84319] Outline Numbering - Capitalized A, B, C, I, II, III, A, AA, AAA... are in lower case in non-english UI
https://bugs.freedesktop.org/show_bug.cgi?id=84319 --- Comment #10 from Jacques Guilleron guillero...@aol.com --- That's right. David's commit begin with: fdo#80650 src transl. merge must be case sensitive This makes the desired changes in workdir/SrsPartMergeTarget/starmath/source/symbol.src. The only other merged file that is changed is workdir/SrsPartMergeTarget/sw/source/ui/misc/numberingtypelistbox.src, with changes like 1, 2, 3, ... ; 4/*SVX_NUM_ARABIC - a, b, c, ... ; 0/*SVX_NUM_CHARS_UPPER_LETTER */; ; + A, B, C, ... ; 0/*SVX_NUM_CHARS_UPPER_LETTER */; ; a, b, c, ... ; 1/*SVX_NUM_CHARS_LOWER_LETTER */; ; This looks okay to me too :-) Jacques -- 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 84357] New: EDITING: Polygon objects are not able to manage text anymore
https://bugs.freedesktop.org/show_bug.cgi?id=84357 Priority: medium Bug ID: 84357 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: EDITING: Polygon objects are not able to manage text anymore Severity: normal Classification: Unclassified OS: Windows (All) Reporter: silva...@katamail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.3.2.2 release Component: Drawing Product: LibreOffice Created attachment 106903 -- https://bugs.freedesktop.org/attachment.cgi?id=106903action=edit A draw file containing two text-filled polygon objects Problem description: In OpenOffice draw module (4.1.1), as in all previous version, you can use a polygon object to obtain to create a text that fill an arbitrary shape, and it is then easy to modify the polygon shape with the text that adapts to it dinamically. In LibreOffice 4.3.2 this is not working anymore: the same polygon object filled with text looks completely empty at first, however the text is there because if you double click on the object, then press crtl+A to select all then copy and paste in a text doc, you get the hidden text. I have many files created with OO draw in the past with a large use of polygon objects to manage text in flexible shapes, and they are completely unusable now with LO. I am not sure since which release of LO this regression is present, since I have not used these files in the last year. Steps to reproduce: 1. open the attached file in Openoffice, any release (or older LO releases, results may vary with these). The page contains two polygon objects filled with text that adapts to the polygon shape. The only difference is that the right one does not have a background nor a contour line. Text is visible, try editing the polygon points and see the text adapting to the changes. 2. Now open the same file with LO 4.3.2; you see no text at all, and the object on the right is invisible since it should show only the contained text. If you edit the polygon shapes, nothing happens to the text that remains invisible. 3. you can also create a new polygon and insert some text (a few paragraphs), which at first will be visible but exceed the polygon shape; when you set it to adapt to the contour, the text disappears. Besides the problems with already existing files that are unusable (fortunately they are not corrupted, if you save them with LO and then reopen them with OO the text is there), I could not find another way to obtain the same results without using polygon objects in Draw. Operating System: Windows 7 Version: 4.3.2.2 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 84357] EDITING: Polygon objects are not able to manage text anymore
https://bugs.freedesktop.org/show_bug.cgi?id=84357 Andy silva...@katamail.com 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 84296] FILEOPEN: Opening svg on Windows gives error
https://bugs.freedesktop.org/show_bug.cgi?id=84296 --- Comment #8 from todven...@suomi24.fi --- The fruit.svg doesn't seem to be from Inkscape, but maybe this is related: https://bugs.freedesktop.org/show_bug.cgi?id=77268 -- 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 78510] FILEOPEN: ODT 1.2 bullet points (in file from Word) in wrong location
https://bugs.freedesktop.org/show_bug.cgi?id=78510 --- Comment #3 from todven...@suomi24.fi --- I'm seeing the bullets outside the paragraphs like in the word calligra screenshots, but there is still an unnecessary indent for the bullets. Version: 4.4.0.0.alpha0+ Build ID: 0a32edcdc2bda75a7536ce7f88c91cbc56e7afb1 TinderBox: Win-x86@39, Branch:master, Time: 2014-09-24_00:45:04 -- 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 84360] New: EDITING: Right click on the cell. No context menu shown. Instead goto editing cell mode
https://bugs.freedesktop.org/show_bug.cgi?id=84360 Priority: medium Bug ID: 84360 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: EDITING: Right click on the cell. No context menu shown. Instead goto editing cell mode Severity: normal Classification: Unclassified OS: Linux (All) Reporter: ahx2...@gmail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.2.6.2 release Component: Spreadsheet Product: LibreOffice Problem description: Steps to reproduce: 0. create new spreadsheet; all settings are defaults; 1. write text (not number) into cell A1; 2. text will be underlined by spell checker automatically; 3. right click on cell A1. Current behavior: edit cell A1 (like after pressing key F2). Expected behavior: show context menu. Operating System: Linux (Other) Version: 4.2.6.2 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 84362] New: vcl / timers unit test ...
https://bugs.freedesktop.org/show_bug.cgi?id=84362 Priority: medium Bug ID: 84362 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: vcl / timers unit test ... Severity: normal Classification: Unclassified OS: All Reporter: michael.me...@collabora.com Hardware: Other Status: UNCONFIRMED Version: 4.3.0.2 rc Component: Libreoffice Product: LibreOffice We recently fell over a unit-test problem where (on Windows) we had a rather long running task holding the SolarMutex while the timer thread was trying to emit events. We have a unit test harness in: vcl/qa/cppunit/timer.cxx It would be good to: a) enable this test for Windows (cf. Module_vcl.mk) b) add a new test with a new thread whose job is just to take the SolarMutex for a while (say 250ms) and then release it that we spawn before running a high volume AutoTimer test (say 1ms) =) Hopefully that would catch the queue filling / starvation issue that kendy just fixed on master. Even more ideally we should try to simulate some user input events and ensure that they get through too I 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 84362] vcl / timers unit test ...
https://bugs.freedesktop.org/show_bug.cgi?id=84362 Michael Meeks michael.me...@collabora.com changed: What|Removed |Added Whiteboard||EasyHack ||DifficultyInteresting ||SkillCpp TopicCleanup CC||ke...@collabora.com -- 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 84362] vcl / timers unit test ...
https://bugs.freedesktop.org/show_bug.cgi?id=84362 Michael Meeks michael.me...@collabora.com changed: What|Removed |Added Status|UNCONFIRMED |NEW CC||tobias.madl@gmail.com Ever confirmed|0 |1 --- Comment #1 from Michael Meeks michael.me...@collabora.com --- Tobias - I think this one is in your area - though it may require a Windows build =) [ and I couldn't find Jennifer's mail in bugzilla oddly - can you add her ? ;-] -- 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 84363] New: FILESAVE: Line height not reserved when save as DOCX
https://bugs.freedesktop.org/show_bug.cgi?id=84363 Priority: medium Bug ID: 84363 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FILESAVE: Line height not reserved when save as DOCX Severity: major Classification: Unclassified OS: Windows (All) Reporter: suokunl...@gmail.com Hardware: All Status: UNCONFIRMED Version: 4.3.2.2 release Component: Writer Product: LibreOffice Created attachment 106906 -- https://bugs.freedesktop.org/attachment.cgi?id=106906action=edit ODT file with single-line-height paragraph The attached ODT file has single line height style applied to paragraph. When save as DOCX and reopen, the line height becomes 120% proportional. Steps to reproduce: 1. Save the attached ODT file as DOCX. --Observe that the paragraph has style Body-single-line applied (line height = single) 2. Reopen the saved DOCX file in Writer or MS Office Word. --Observe that the line height for style Body-single-line becomes 120% proportional, as a result the paragraph is 120% line height too. Version: 4.3.2.2 Build ID: edfb5295ba211bd31ad47d0bad0118690f76407d Windows XP SP3 -- 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 84364] New: EDITING: Memory leak when select number of columns
https://bugs.freedesktop.org/show_bug.cgi?id=84364 Priority: medium Bug ID: 84364 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: EDITING: Memory leak when select number of columns Severity: normal Classification: Unclassified OS: Linux (All) Reporter: ahx2...@gmail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.2.6.2 release Component: Spreadsheet Product: LibreOffice Problem description: Steps to reproduce: 3. run htop (apt-get install htop) and see memory usage; 1. open *.xsl or *.ods document; 2. select three or more columns; select entire columns (not some cells). Current behavior: 1. memory (RAM) usage increase from current value to 100%; 2. swap usage increase from 0% to 100%; 3. libreoffice will crash and allocated memory will return to system. Expected behavior: just select number of columns; do not calculate sum, average, count of cells, etc. Operating System: Linux (Other) Version: 4.2.6.2 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 84363] FILESAVE: Line height not reserved when save as DOCX
https://bugs.freedesktop.org/show_bug.cgi?id=84363 Kevin Suo suokunl...@gmail.com changed: What|Removed |Added Attachment #106906|text/plain |application/vnd.oasis.opend mime type||ocument.text -- 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 84363] FILESAVE: Line height not reserved when save as DOCX
https://bugs.freedesktop.org/show_bug.cgi?id=84363 --- Comment #1 from Kevin Suo suokunl...@gmail.com --- Created attachment 106907 -- https://bugs.freedesktop.org/attachment.cgi?id=106907action=edit DOCX file saved from the above ODT file lien height becomes 120% proportional. -- 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 84363] FILESAVE: Line height not reserved when save as DOCX
https://bugs.freedesktop.org/show_bug.cgi?id=84363 --- Comment #2 from Kevin Suo suokunl...@gmail.com --- Created attachment 106908 -- https://bugs.freedesktop.org/attachment.cgi?id=106908action=edit screenshot showing the problem -- 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 84363] FILESAVE: Line height not reserved when saved as DOCX
https://bugs.freedesktop.org/show_bug.cgi?id=84363 Kevin Suo suokunl...@gmail.com changed: What|Removed |Added Summary|FILESAVE: Line height not |FILESAVE: Line height not |reserved when save as DOCX |reserved when saved as DOCX -- 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: Become retarded slow when selecting multiple row
https://bugs.freedesktop.org/show_bug.cgi?id=84353 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=84364 -- 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 84364] EDITING: Memory leak when select number of columns
https://bugs.freedesktop.org/show_bug.cgi?id=84364 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=84353 -- 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 84331] Cannot start LO, msvcr100.dll not found, after 4.3.2 installation
https://bugs.freedesktop.org/show_bug.cgi?id=84331 Chris ch...@cdavies39.plus.com changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |FIXED --- Comment #4 from Chris ch...@cdavies39.plus.com --- Hi All, Thanks for comments, resetting user profile worked, but I don't know why. I saved the previous profile to a different location prior to installing this release. Chris -- 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 84365] New: UI: [feature request] Allow user to select custom color and collect favorite colors
https://bugs.freedesktop.org/show_bug.cgi?id=84365 Priority: medium Bug ID: 84365 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: UI: [feature request] Allow user to select custom color and collect favorite colors Severity: normal Classification: Unclassified OS: Linux (All) Reporter: ahx2...@gmail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.2.6.2 release Component: Spreadsheet Product: LibreOffice Feature request. Instead of color palette show custom color selection dialog with list of favorite colors. Reason: number of palette colors limited. Allow user collect and rename favorite colors per system and per document. Display editable decimal, hexadecimal RGB, HSV, HSL and alpha color values. Operating System: Linux (Other) Version: 4.2.6.2 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 84261] libreoffice crash when open a xlsx file saved by openpyxl
https://bugs.freedesktop.org/show_bug.cgi?id=84261 --- Comment #7 from Caolán McNamara caol...@redhat.com --- It appears to be an unexpected exception. We build release versions under Linux with non enforcing exceptions, but debug versions with enforcing exceptions. Mac is built with clang which always enforces exception specifications. Which would explain why 4.3.1 on Mac falls over, but release build 4.3.1 on Debian doesn't. A self-build 4.3.1 dbgutil on Debian probably falls over in the same place. -- 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: Become retarded slow when selecting multiple row
https://bugs.freedesktop.org/show_bug.cgi?id=84353 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=81966 -- 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 84364] EDITING: Memory leak when select number of columns
https://bugs.freedesktop.org/show_bug.cgi?id=84364 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=81966 -- 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 81966] High CPU usage during row/column selection in Calc
https://bugs.freedesktop.org/show_bug.cgi?id=81966 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=84364, ||https://bugs.freedesktop.or ||g/show_bug.cgi?id=84353 -- 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 84365] UI: [feature request] Allow user to select custom color and collect favorite colors
https://bugs.freedesktop.org/show_bug.cgi?id=84365 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added Severity|normal |enhancement --- Comment #1 from ign_christian ign_christ...@yahoo.com --- Hi.. Please take a look at Bug 80196 / Bug 42159 and all related bugs/duplicates. Then please mark your report as duplicate to one of the bugs if you think it's the same. -- 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 84366] New: UI: Invalid scroll bar position of expanded formula bar
https://bugs.freedesktop.org/show_bug.cgi?id=84366 Priority: medium Bug ID: 84366 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: UI: Invalid scroll bar position of expanded formula bar Severity: normal Classification: Unclassified OS: Linux (All) Reporter: ahx2...@gmail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.2.6.2 release Component: Spreadsheet Product: LibreOffice Problem description: Steps to reproduce: 1. create new spreadsheet; 2. write text into cell A1; length of text must be big (for example 2000 letters or more); 3. press expand formula bar button; 4. try to edit text of cell A1 inside expanded formula bar. Current behavior: - some times scroll bar top position of expanded formula bar is invalid; can't scroll to first wrapped line; - some times textarea top position of expanded formula bar is invalid; can't see top of first wrapped line; - some times pressing expand formula bar button cause hide formula bar; to show formula bar again, use menu item View - Formula bar two times. Expected behavior: calculate valid top position of textarea and scroll bar. Operating System: Linux (Other) Version: 4.2.6.2 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