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

[Matúš Kukan]

 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 
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,
+applyTa

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

[Matúš Kukan]

 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 
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 'distro/collabora/lof-4.3' - 9 commits - basic/source dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk dbaccess/CppunitTest_dbaccess_nolib_save.mk dbaccess/Mod

[Kohei Yoshida]

 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 
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 
Tested-by: Caolán McNamara 

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 
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 
Tested-by: Caolán McNamara 

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 
Date:   Thu Sep 18 12:13:13 2014 -0400

fdo#83764: Ensure that the row position is below MAXROW.

When attempting to split formul

LibreOffice Gerrit News for core on 2014-09-26

[gerrit]

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 Styles&Formatting 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 htt

build break in cppunittest

[Andreas Radke]

We are running into build crashes when building packages for i686
architecture in 32bit chroots here (x86_64 builds fine):

[build CUT] writerperfect_draw
/bin/sh: line 1: 13288 Segmentation fault  (core dumped) 
LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"$I/ure/lib:$I/program":$W/UnpackedTarball/cppunit/src/cppunit/.libs
 $W/LinkTarget/Executable/cppunittester 
$W/LinkTarget/CppunitTest/libtest_sw_ooxmlsdrexport.so --headless 
"-env:BRAND_BASE_DIR=file://$S/instdir" "-env:BRAND_SHARE_SUBDIR=share" 
"-env:UserInstallation=file://$W/CppunitTest/sw_ooxmlsdrexport.test.user" 
"-env:CONFIGURATION_LAYERS=xcsxcu:file://$I/share/registry 
xcsxcu:file://$W/unittest/registry" 
"-env:UNO_TYPES=file://$I/program/types/offapi.rdb 
file://$I/ure/share/misc/types.rdb" 
"-env:UNO_SERVICES=file://$W/Rdb/ure/services.rdb 
file://$W/ComponentTarget/basic/util/sb.component 
file://$W/ComponentTarget/canvas/source/factory/canvasfactory.component 
file://$W/ComponentTarget/chart2/source/chartcore.component 
file://$W/ComponentTarget/chart2/source/controller/chartcontroller.component 
file://$W/ComponentTarget/comphelper/util/comphelp.component file
 ://$W/ComponentTarget/configmgr/source/configmgr.component 
file://$W/ComponentTarget/drawinglayer/drawinglayer.component 
file://$W/ComponentTarget/embeddedobj/util/embobj.component 
file://$W/ComponentTarget/filter/source/config/cache/filterconfig1.component 
file://$W/ComponentTarget/forms/util/frm.component 
file://$W/ComponentTarget/framework/util/fwk.component 
file://$W/ComponentTarget/i18npool/util/i18npool.component 
file://$W/ComponentTarget/linguistic/source/lng.component 
file://$W/ComponentTarget/oox/util/oox.component 
file://$W/ComponentTarget/package/source/xstor/xstor.component 
file://$W/ComponentTarget/package/util/package2.component 
file://$W/ComponentTarget/sax/source/expatwrap/expwrap.component 
file://$W/ComponentTarget/sw/util/sw.component 
file://$W/ComponentTarget/sw/util/swd.component 
file://$W/ComponentTarget/sw/util/msword.component 
file://$W/ComponentTarget/sfx2/util/sfx.component 
file://$W/ComponentTarget/starmath/util/sm.component file://$W/ComponentTarge
 t/svl/source/fsstor/fsstorage.component 
file://$W/ComponentTarget/svl/util/svl.component 
file://$W/ComponentTarget/svtools/util/svt.component 
file://$W/ComponentTarget/svx/util/svx.component 
file://$W/ComponentTarget/svx/util/svxcore.component 
file://$W/ComponentTarget/toolkit/util/tk.component 
file://$W/ComponentTarget/ucb/source/core/ucb1.component 
file://$W/ComponentTarget/ucb/source/ucp/file/ucpfile1.component 
file://$W/ComponentTarget/unotools/util/utl.component 
file://$W/ComponentTarget/unoxml/source/service/unoxml.component 
file://$W/ComponentTarget/uui/util/uui.component 
file://$W/ComponentTarget/writerfilter/util/writerfilter.component 
file://$W/ComponentTarget/xmloff/util/xo.component 
file://$W/ComponentTarget/filter/source/storagefilterdetect/storagefd.component"
 -env:URE_INTERNAL_LIB_DIR=file://$I/ure/lib -env:LO_LIB_DIR=file://$I/program 
-env:LO_JAVA_DIR=file://$I/program/classes --protector 
$W/LinkTarget/Library/unoexceptionprotector.so unoexceptionprotector --
 protector $W/LinkTarget/Library/unobootstrapprotector.so unobootstrapprotector 
> $W/CppunitTest/sw_ooxmlsdrexport.test.log 2>&1
File tested,Execution Time (ms)
dashed_line_custdash_percentage.docx,171
File tested,Execution Time (ms)
dashed_line_custdash_percentage.docx,206
File tested,Execution Time (ms)
dashed_line_custdash_1000th_of_percent.docx,66
File tested,Execution Time (ms)
dashed_line_custdash_1000th_of_percent.docx,160
File tested,Execution Time (ms)
dashed_line_preset.docx,62
File tested,Execution Time (ms)
dashed_line_preset.docx,199
File tested,Execution Time (ms)
bnc884615.docx,98
File tested,Execution Time (ms)
bnc884615.docx,192
File tested,Execution Time (ms)
preset-shape.docx,132
File tested,Execution Time (ms)
preset-shape.docx,204
File tested,Execution Time (ms)
test77219.docx,211
File tested,Execution Time (ms)
test77219.docx,453
File tested,Execution Time (ms)
test76734_2K7.docx,43
File tested,Execution Time (ms)
test76734_2K7.docx,153
File tested,Execution Time (ms)
LinkedTextBoxes.docx,186
File tested,Execution Time (ms)
LinkedTextBoxes.docx,460
File tested,Execution Time (ms)
test76317_2K10.docx,105
File tested,Execution Time (ms)
test76317_2K10.docx,178
File tested,Execution Time (ms)
fdo76591.docx,139
File tested,Execution Time (ms)
fdo76591.docx,401
File tested,Execution Time (ms)
test76317.docx,69
File tested,Execution Time (ms)
test76317.docx,228
File tested,Execution Time (ms)
nestedAlternateContent.docx,84
File tested,Execution Time (ms)
nestedAlternateContent.docx,164
File tested,Execution Time (ms)
fdo77719.docx,62
File tested,Execution Time (ms)
fdo77719.docx,180
File tested,Execution Time (ms)
picture-artistic-effects-preservation.docx,129
File tested,Execution Time (ms)
picture-artistic-effects-preservation.docx,307
File tested,Execution Time (ms)
picture

[Libreoffice-commits] core.git: Branch 'feature/perfwork' - sc/source

[Kohei Yoshida]

 sc/source/filter/inc/stylesbuffer.hxx|3 ++
 sc/source/filter/oox/stylesbuffer.cxx|   38 ---
 sc/source/filter/oox/worksheethelper.cxx |   11 ++--
 3 files changed, 46 insertions(+), 6 deletions(-)

New commits:
commit baebfeca06ad107937aa2c655d914720f71a5635
Author: Kohei Yoshida 
Date:   Thu Sep 25 19:38:51 2014 -0400

Set cell style name to the document directly, bypassing the UNO API.

Change-Id: I28decfdfd8248fb9b95416b9b269a4ffabcc6370

diff --git a/sc/source/filter/inc/stylesbuffer.hxx 
b/sc/source/filter/inc/stylesbuffer.hxx
index b2e1186..c2f364e 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -669,6 +669,8 @@ public:
 /** Writes all formatting attributes to the passed property set. */
 voidwriteToPropertySet( PropertySet& rPropSet ) const;
 
+void writeToDoc( ScDocumentImport& rDoc, const 
css::table::CellRangeAddress& rRange ) const;
+
 const ::ScPatternAttr& createPattern( bool bSkipPoolDefs = false );
 
 private:
@@ -912,6 +914,7 @@ public:
 
 /** Writes the cell formatting attributes of the specified XF to the 
passed property set. */
 voidwriteCellXfToPropertySet( PropertySet& rPropSet, 
sal_Int32 nXfId ) const;
+void writeCellXfToDoc( ScDocumentImport& rDoc, const 
css::table::CellRangeAddress& rRange, sal_Int32 nXfId ) const;
 
 boolhasBorder( sal_Int32 nBorderId ) const;
 private:
diff --git a/sc/source/filter/oox/stylesbuffer.cxx 
b/sc/source/filter/oox/stylesbuffer.cxx
index adead6d..2afedcc 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -77,6 +77,7 @@
 #include "attrib.hxx"
 #include "globstr.hrc"
 #include "xlconst.hxx"
+#include 
 
 using ::com::sun::star::table::BorderLine2;
 namespace oox {
@@ -2191,9 +2192,10 @@ void Xf::writeToPropertyMap( PropertyMap& rPropMap ) 
const
 {
 StylesBuffer& rStyles = getStyles();
 
-// create and set cell style
-if( isCellXf() )
-rPropMap.setProperty( PROP_CellStyle, rStyles.createCellStyle( 
maModel.mnStyleXfId ));
+// create and set cell style.
+
+// TODO : We should gradually move things to writeToDoc, to set cell
+// styles to the document directly.
 
 if( maModel.mbFontUsed )
 rStyles.writeFontToPropertyMap( rPropMap, maModel.mnFontId );
@@ -2223,6 +2225,26 @@ void Xf::writeToPropertySet( PropertySet& rPropSet ) 
const
 rPropSet.setProperties( aPropMap );
 }
 
+void Xf::writeToDoc( ScDocumentImport& rDoc, const table::CellRangeAddress& 
rRange ) const
+{
+if (isCellXf())
+{
+const StylesBuffer& rStyles = getStyles();
+OUString aStyleName = rStyles.createCellStyle(maModel.mnStyleXfId);
+
+ScStyleSheet* pStyleSheet =
+static_cast(
+rDoc.getDoc().GetStyleSheetPool()->Find(aStyleName, 
SFX_STYLE_FAMILY_PARA));
+
+if (pStyleSheet)
+{
+rDoc.getDoc().ApplyStyleAreaTab(
+rRange.StartColumn, rRange.StartRow, rRange.EndColumn, 
rRange.EndRow, rRange.Sheet,
+*pStyleSheet);
+}
+}
+}
+
 const ::ScPatternAttr&
 Xf::createPattern( bool bSkipPoolDefs )
 {
@@ -3148,6 +3170,16 @@ void StylesBuffer::writeCellXfToPropertySet( 
PropertySet& rPropSet, sal_Int32 nX
 pXf->writeToPropertySet( rPropSet );
 }
 
+void StylesBuffer::writeCellXfToDoc(
+ScDocumentImport& rDoc, const table::CellRangeAddress& rRange, sal_Int32 
nXfId ) const
+{
+Xf* pXf = maCellXfs.get(nXfId).get();
+if (!pXf)
+return;
+
+pXf->writeToDoc(rDoc, rRange);
+}
+
 bool StylesBuffer::hasBorder( sal_Int32 nBorderId ) const
 {
 Border* pBorder = maBorders.get( nBorderId ).get();
diff --git a/sc/source/filter/oox/worksheethelper.cxx 
b/sc/source/filter/oox/worksheethelper.cxx
index 7ba4baf..9aa8abd 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -301,7 +301,7 @@ public:
 are cached and converted in the finalizeImport() call. */
 voidsetColumnModel( const ColumnModel& rModel );
 /** Converts column default cell formatting. */
-voidconvertColumnFormat( sal_Int32 nFirstCol, sal_Int32 
nLastCol, sal_Int32 nXfId ) const;
+void convertColumnFormat( sal_Int32 nFirstCol, sal_Int32 nLastCol, 
sal_Int32 nXfId );
 
 /** Sets default height and hidden state for all unused rows in the sheet. 
*/
 voidsetDefaultRowSettings( double fHeight, bool 
bCustomHeight, bool bHidden, bool bThickTop, bool bThickBottom );
@@ -829,13 +829,18 @@ void WorksheetGlobals::setColumnModel( const ColumnModel& 
rModel )
 }
 }
 
-void WorksheetGlobals::convertColumnFormat( sal_Int32 nFirstCol, sal_Int32 
nLastCol, sal_Int32 nXfId ) const
+void WorksheetGlobals::convertColumnFormat( sal_Int32 nFirstCol, sal_Int32 
nLastCol, sal_Int32 nXfId )
 {
 CellRange

[Libreoffice-commits] core.git: unoxml/CppunitTest_unoxml_domtest.mk unoxml/qa unoxml/test

[Matúš Kukan]

 unoxml/CppunitTest_unoxml_domtest.mk |2 
 unoxml/qa/unit/domtest.cxx   |  334 ++
 unoxml/test/domtest.cxx  |  336 ---
 unoxml/test/export.map   |   25 --
 unoxml/test/makefile.mk  |   95 -
 5 files changed, 335 insertions(+), 457 deletions(-)

New commits:
commit df73f4115cfe4d07e4159adf087571687eb173ec
Author: Matúš Kukan 
Date:   Thu Sep 25 23:26:28 2014 +0200

Remove unused files and move test to qa/

Change-Id: Ia8c022c958f5547d710f9cb196672b89292bbb49

diff --git a/unoxml/CppunitTest_unoxml_domtest.mk 
b/unoxml/CppunitTest_unoxml_domtest.mk
index 692d51c..127a767 100644
--- a/unoxml/CppunitTest_unoxml_domtest.mk
+++ b/unoxml/CppunitTest_unoxml_domtest.mk
@@ -10,7 +10,7 @@
 $(eval $(call gb_CppunitTest_CppunitTest,unoxml_domtest))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,unoxml_domtest, \
-unoxml/test/domtest \
+unoxml/qa/unit/domtest \
 ))
 
 $(eval $(call gb_CppunitTest_use_api,unoxml_domtest,\
diff --git a/unoxml/test/domtest.cxx b/unoxml/qa/unit/domtest.cxx
similarity index 99%
rename from unoxml/test/domtest.cxx
rename to unoxml/qa/unit/domtest.cxx
index 07d1738..49eefe0 100644
--- a/unoxml/test/domtest.cxx
+++ b/unoxml/qa/unit/domtest.cxx
@@ -37,9 +37,7 @@
 #include 
 #include 
 #include 
-#include "../source/dom/documentbuilder.hxx"
 
-using namespace ::DOM;
 using namespace ::comphelper;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/unoxml/test/export.map b/unoxml/test/export.map
deleted file mode 100644
index 06b6a4a..000
--- a/unoxml/test/export.map
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-UDK_3_0_0 {
-global:
-registerAllTestFunction;
-
-local:
-*;
-};
diff --git a/unoxml/test/makefile.mk b/unoxml/test/makefile.mk
deleted file mode 100644
index 682cedb..000
--- a/unoxml/test/makefile.mk
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ=..
-
-PRJNAME=unoxml
-TARGET=tests
-TARGETTYPE=GUI
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -
-
-.INCLUDE :  settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-# --- Common --
-
-# BEGIN 
-# auto generated Target:tests by codegen.pl
-SHL1OBJS=  \
-$(SLO)$/domtest.obj
-
-# the following three libs are a bit of a hack: cannot link against
-# unoxml here, because not yet delivered (and does not export
-# ~anything). Need the functionality to test, so we're linking it in
-# statically. Need to keep this in sync with
-# source/services/makefile.mk
-SHL1LIBS= \
-$(SLB)$/domimpl.lib \
-$(SLB)$/xpathimpl.lib \
-$(SLB)$/eventsimpl.lib
-
-SHL1TARGET= tests
-SHL1STDLIBS= \
-$(UCBHELPERLIB) \
-$(LIBXML2LIB) \
-$(TOOLSLIB)\
-$(COMPHELPERLIB)   \
-$(CPPUHELPERLIB)   \
-$(CPPUNITLIB)   \
-$(CPPULIB) \
-$(SAXLIB) \
-$(SALLIB)\
-$(EXPATASCII3RDLIB)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-
-DEF1NAME=$(SHL1TARGET)
-SHL1VERSIONMAP = export.map
-
-# END --
-
-#--- All object files 
---
-# do this here, so we get right depend

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

[Samuel Mehrbrodt]

 sd/source/ui/app/menuids_tmpl.src |   10 --
 sd/source/ui/app/popup2_tmpl.src  |1 -
 2 files changed, 11 deletions(-)

New commits:
commit 2e7f83e87907ec05b1f22e9ff1d8c681c94ece23
Author: Samuel Mehrbrodt 
Date:   Thu Sep 25 22:44:18 2014 +0200

fdo#84235 Remove Navigator from Context menu

Change-Id: Ie84fe35db0dfca08e2b270636f06bef90c1455ab

diff --git a/sd/source/ui/app/menuids_tmpl.src 
b/sd/source/ui/app/menuids_tmpl.src
index 30ee1ad..bacff02 100644
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
@@ -858,16 +858,6 @@
 Text [ en-US ] = "Crop Picture..." ; \
 };
 
-#define MN_NAVIGATOR\
-MenuItem\
-{\
-Identifier = SID_NAVIGATOR ; \
-Command = ".uno:Navigator" ; \
-HelpId = CMD_SID_NAVIGATOR ; \
-Text [ en-US ] = "Na~vigator" ; \
-Checkable = TRUE ; \
-};
-
 #define MN_GLUE_INSERT_POINT\
 MenuItem\
 {\
diff --git a/sd/source/ui/app/popup2_tmpl.src b/sd/source/ui/app/popup2_tmpl.src
index e5d23ab..fed9de8 100644
--- a/sd/source/ui/app/popup2_tmpl.src
+++ b/sd/source/ui/app/popup2_tmpl.src
@@ -522,7 +522,6 @@
 #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP
 MN_PAGE_MENU
 #endif
-MN_NAVIGATOR
 #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
 MN_OUTLINEMODE
 MN_DIAMODE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 vcl/qa/cppunit/timer.cxx |   15 +++
 1 file changed, 11 insertions(+), 4 deletions(-)

New commits:
commit 9bce38ee6660bd4216f72966b6b44815dc5922ce
Author: Michael Stahl 
Date:   Thu Sep 25 23:00:59 2014 +0200

vcl: try to make clang tinderbox happy about new timer test

Change-Id: I15ae1693e92e430c78b5d73c12a7bae297c098bb

diff --git a/vcl/qa/cppunit/timer.cxx b/vcl/qa/cppunit/timer.cxx
index 99d71a9..d432f8a 100644
--- a/vcl/qa/cppunit/timer.cxx
+++ b/vcl/qa/cppunit/timer.cxx
@@ -46,13 +46,18 @@ class TimerTest : public test::BootstrapFixture
 public:
 TimerTest() : BootstrapFixture(true, false) {}
 
+#ifdef TEST_WATCHDOG
 void testWatchdog();
+#endif
 void testDurations();
 void testAutoTimer();
 void testRecursiveTimer();
 void testSlowTimerCallback();
 
 CPPUNIT_TEST_SUITE(TimerTest);
+#ifdef TEST_WATCHDOG
+CPPUNIT_TEST(testWatchdog);
+#endif
 CPPUNIT_TEST(testDurations);
 CPPUNIT_TEST(testAutoTimer);
 CPPUNIT_TEST(testRecursiveTimer);
@@ -61,6 +66,7 @@ public:
 CPPUNIT_TEST_SUITE_END();
 };
 
+#ifdef TEST_WATCHDOG
 void TimerTest::testWatchdog()
 {
 // out-wait the watchdog.
@@ -69,6 +75,7 @@ void TimerTest::testWatchdog()
 aWait.Nanosec = 0;
 osl::Thread::wait( aWait );
 }
+#endif
 
 // 
 
@@ -83,7 +90,7 @@ public:
 Start();
 mrBool = false;
 }
-virtual void Timeout()
+virtual void Timeout() SAL_OVERRIDE
 {
 mrBool = true;
 Application::EndYield();
@@ -117,7 +124,7 @@ public:
 Start();
 mrCount = 0;
 }
-virtual void Timeout()
+virtual void Timeout() SAL_OVERRIDE
 {
 mrCount++;
 }
@@ -142,7 +149,7 @@ public:
 SetTimeout( nMS );
 Start();
 }
-virtual void Timeout()
+virtual void Timeout() SAL_OVERRIDE
 {
 for (int i = 0; i < 100; i++)
 Application::Yield();
@@ -171,7 +178,7 @@ public:
 Start();
 mbSlow = false;
 }
-virtual void Timeout()
+virtual void Timeout() SAL_OVERRIDE
 {
 TimeValue aWait;
 aWait.Seconds = 1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libreoffice-marketing] Re: LibreOffice Weekly News #5 waiting for reviews

[William Gathoye]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 09/25/2014 01:56 AM, Philipp Weissenbacher wrote:
> Hi William,
> 
> Also from me congrats for that huge amount of work.

Thanks. You're welcome.

> It's not called XSLT, but /uses/ XSLT ;-) Just remove "called XSLT"
> and you're good. Or "[...] improve the LibreOffice Calc HTML XSL
> export filter."
Corrected. Thanks.

> Maybe you can also post those to reddit.com/r/libreoffice 
>  ? We have 432 subscribers there.

I'm not used to use Reddit, feel free to add this by yourself. Maybe I
should give this social network a try in the near future.

Regards,

- -- 
William Gathoye

-BEGIN PGP SIGNATURE-
Version: GnuPG v2

iQIcBAEBAgAGBQJUJIPLAAoJEA595SwE1xaDbJgP/3yhS7Nf9FUzqOmdN7jLAwzJ
awP6Ot+4BCUYmh90R7C65L85CbOampE5im+QCA/p8FE29ad0ESGvk8jFtNwjSGXv
anuGVmC7eW4I1AkQEDh/oajnzhVi2TL2iWI6WTohTW6LHzQptGyOANOpHfSuq0oH
PG/4I4JX6BpRIJIYOzNA6aN9e8cGcHxw0HfhhFO7ImHyHLGvCVS74riPfJZdpFvr
gNuQ1/3vF6sj5z1dbwLVUDICjX0lvn26NYQeMIFrWmGx1V0uN/QMzKrmiuydfBk+
CxJ+8LVJhC9kpP3F/YtJGq3iC0hE+tA44ZQzZk7Zp59lKiKA2TV5Xu9wtUSa7h5B
8Rwm1FyADPqzkntg51RRNC2iNFJyoroah3mqfvdCusfT7NoKwHPiZjfwnLk5lOMY
3xZCTqzc41mU4O7vlHS6VkpCtSROqJeKnqHAvujIb5rQQBLmJON4f/iRPQK3gM1e
mUfdcpSInyb9cquSYr4apRcaXeVsfLSL+r7X/YN4PPIFX7kyP1A0NIynden3Yi9n
j1xmNgrzGNjmivcgVcPUkYCLOsLuospdNRRBv+gQIwe2C/cY7AuB/YK0BsUInNI1
J/xLD7dLPWVr3Jq81E46mnc7LDzRRXSePabb9uTDYuD+17hmvVJ6C7m2oe06Ovnz
vYhnuLcIbu5mNz5GSHOc
=BXZB
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

QA Meeting Minutes - 2014-09-24

[Robinson Tryon]

Hi all,

Thanks for the great meeting yesterday! Meeting minutes are here:
https://wiki.documentfoundation.org/QA/Meetings/2014/September_24#IRC_Minutes

Our next meeting will be in two weeks. We'll be working hard between
now and then to get even more people involved in QA, so please think
about inviting a friend or fellow LibreOffice user to the meeting or
to the #libreoffice-qa IRC channel:
https://wiki.documentfoundation.org/QA/Meetings/2014/October_08


Thanks for all of your hard work!

Best,
--R

-- 
Robinson Tryon
QA Engineer - The Document Foundation
LibreOffice Community Outreach Herald
qu...@libreoffice.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: unoxml/CppunitTest_unoxml_domtest.mk

[Michael Stahl]

 unoxml/CppunitTest_unoxml_domtest.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ee777116d01511060cff8b845126fecbad038234
Author: Michael Stahl 
Date:   Thu Sep 25 22:32:47 2014 +0200

unoxml: domtest needs unotest library on WNT

Change-Id: I9614e1495e6d990e050c651c2aed0ba0e43d51fe

diff --git a/unoxml/CppunitTest_unoxml_domtest.mk 
b/unoxml/CppunitTest_unoxml_domtest.mk
index b12fd1e..692d51c 100644
--- a/unoxml/CppunitTest_unoxml_domtest.mk
+++ b/unoxml/CppunitTest_unoxml_domtest.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_CppunitTest_use_libraries,unoxml_domtest, \
 cppuhelper \
 sal \
 test \
+unotest \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,unoxml_domtest))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

 connectivity/source/drivers/firebird/Connection.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 337f433731b8eb160a6cdb000df20335e5400432
Author: Jan Holesovsky 
Date:   Thu Sep 25 22:35:18 2014 +0200

Add missing #include.

Change-Id: I0f617f2b4ef7bcb2b07295223acae5519280a41e

diff --git a/connectivity/source/drivers/firebird/Connection.cxx 
b/connectivity/source/drivers/firebird/Connection.cxx
index 802b611..40ed35a 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -26,6 +26,8 @@
 #include "Tables.hxx"
 #include "Util.hxx"
 
+#include 
+
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

 tools/source/datetime/ttime.cxx |   13 ++---
 vcl/inc/win/saldata.hxx |2 +-
 vcl/win/source/app/salinst.cxx  |   17 ++---
 vcl/win/source/app/saltimer.cxx |   27 ---
 4 files changed, 37 insertions(+), 22 deletions(-)

New commits:
commit d68ce6e173502e1b1ce214503f41729a8502cd92
Author: Jan Holesovsky 
Date:   Thu Sep 25 16:30:05 2014 +0200

fdo#84000: Sort out problems with short timeouts & long callbacks.

Previously, the timer events could have accumulated in that scenario leading
to unresponsiveness to user events.

Change-Id: I455d726ae7475f7dbf98d871c54d8c156cb64e52

diff --git a/tools/source/datetime/ttime.cxx b/tools/source/datetime/ttime.cxx
index 71836e7..66d16b4 100644
--- a/tools/source/datetime/ttime.cxx
+++ b/tools/source/datetime/ttime.cxx
@@ -400,19 +400,18 @@ Time Time::GetUTCOffset()
 sal_uIntPtr Time::GetSystemTicks()
 {
 #if defined WNT
-static LARGE_INTEGER nTicksPerMS;
-static bool bTicksPerMSInitialized = false;
-if (!bTicksPerMSInitialized)
+static LARGE_INTEGER nTicksPerSecond;
+static bool bTicksPerSecondInitialized = false;
+if (!bTicksPerSecondInitialized)
 {
-QueryPerformanceFrequency(&nTicksPerMS);
-nTicksPerMS.QuadPart /= 1000;
-bTicksPerMSInitialized = true;
+QueryPerformanceFrequency(&nTicksPerSecond);
+bTicksPerSecondInitialized = true;
 }
 
 LARGE_INTEGER nPerformanceCount;
 QueryPerformanceCounter(&nPerformanceCount);
 
-return (sal_uIntPtr)(nPerformanceCount.QuadPart/nTicksPerMS.QuadPart);
+return 
(sal_uIntPtr)((nPerformanceCount.QuadPart*1000)/nTicksPerSecond.QuadPart);
 #else
 timeval tv;
 gettimeofday (&tv, 0);
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index a50e67d..e1ae8cc 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -180,7 +180,7 @@ void ImplSalAcquireYieldMutex( sal_uLong nCount );
 
 LRESULT CALLBACK SalFrameWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM 
lParam );
 
-void EmitTimerCallback(bool bAllowRecursive);
+void EmitTimerCallback();
 
 void SalTestMouseLeave();
 bool ImplWriteLastError( DWORD lastError, const char *szApiCall );
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 57dfc28..b1d33e4 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -345,7 +345,6 @@ SalData::SalData()
 mnNextTimerTime = 0;
 mnLastEventTime = 0;
 mnTimerId = 0;  // windows timer id
-mbInTimerProc = FALSE;  // timer event is currently being dispatched
 mhSalObjMsgHook = 0;// hook to get interesting msg for SalObject
 mhWantLeaveMsg = 0; // window handle, that want a MOUSELEAVE 
message
 mpMouseLeaveTimer = 0;  // Timer for MouseLeave Test
@@ -731,10 +730,22 @@ LRESULT CALLBACK SalComWndProc( HWND hWnd, UINT nMsg, 
WPARAM wParam, LPARAM lPar
 rDef = FALSE;
 break;
 case SAL_MSG_POSTTIMER:
-EmitTimerCallback(/*bAllowRecursive = */ true);
+EmitTimerCallback();
 break;
 case SAL_MSG_TIMER_CALLBACK:
-EmitTimerCallback(/*bAllowRecursive = */ false);
+EmitTimerCallback();
+MSG aMsg;
+while (PeekMessageW(&aMsg, 0, SAL_MSG_TIMER_CALLBACK, 
SAL_MSG_TIMER_CALLBACK, PM_REMOVE))
+{
+// nothing; just remove all the SAL_MSG_TIMER_CALLBACKs that
+// accumulated in the queue during the EmitTimerCallback(),
+// otherwise it happens with short timeouts and long callbacks
+// that no other events will ever be processed, as the queue
+// is full of SAL_MSG_TIMER_CALLBACKs.
+// It is impossible to limit the amount of them being emited
+// in the first place, as they are emited asynchronously, but
+// here we are already fully synchronized.
+}
 break;
 }
 
diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx
index 9191d5e..e1ce31e 100644
--- a/vcl/win/source/app/saltimer.cxx
+++ b/vcl/win/source/app/saltimer.cxx
@@ -54,9 +54,11 @@ void ImplSalStartTimer( sal_uLong nMS, bool bMutex )
 if (nMS > MAX_SYSPERIOD)
 nMS = MAX_SYSPERIOD;
 
-// can't change a one-shot timer if it has fired already (odd) so delete & 
re-create
-ImplSalStopTimer(pSalData);
-CreateTimerQueueTimer(&pSalData->mnTimerId, NULL, SalTimerProc, NULL, nMS, 
nMS, WT_EXECUTEDEFAULT);
+// change if it exists, create if not
+if (pSalData->mnTimerId)
+ChangeTimerQueueTimer(NULL, pSalData->mnTimerId, nMS, nMS);
+else
+CreateTimerQueueTimer(&pSalData->mnTimerId, NULL, SalTimerProc, NULL, 
nMS, nMS, WT_EXECUTEDEFAULT);
 
 pSalData->mnNextTimerTime = pSalData->mnLastEventTime + nMS;
 }
@@ -111,6 +113,10 @@ void CALLBACK SalTim

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

[Miklos Vajna]

 sw/qa/extras/rtfexport/data/numbering-font.rtf|   22 ++
 sw/qa/extras/rtfexport/rtfexport.cxx  |7 +++
 writerfilter/source/dmapper/DomainMapper.cxx  |2 +-
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   13 +++--
 4 files changed, 41 insertions(+), 3 deletions(-)

New commits:
commit c1f8437dbed0e8b989e41a345ef7e658a6e8a4cd
Author: Miklos Vajna 
Date:   Thu Sep 25 21:29:00 2014 +0200

fdo#83465 RTF import: handle font of numbering

Change-Id: If0da6e0e34ce50bbe7dceda089b6bb81b4a63f36

diff --git a/sw/qa/extras/rtfexport/data/numbering-font.rtf 
b/sw/qa/extras/rtfexport/data/numbering-font.rtf
new file mode 100644
index 000..46fdb7e
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/numbering-font.rtf
@@ -0,0 +1,22 @@
+{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\deff0\deflang1033
+{\fonttbl
+{\f0\fbidi \froman\fcharset238\fprq2 Times New Roman;}
+{\f40\fbidi \fswiss\fcharset238\fprq2 Verdana;}
+}
+{\*\listtable
+{\list\listtemplateid645944990
+{\listlevel\levelnfc0\leveljc0
+\levelfollow0\levelstartat1
+{\leveltext\'02\'00.;}
+{\levelnumbers\'01;}
+\rtlch \af0\afs18 \ltrch \fs18 \fi-360\li720\lin720 }
+{\listname ;}
+\listid1421871093}
+}
+{\*\listoverridetable
+{\listoverride\listid1421871093\listoverridecount0\ls30}
+}
+\pard\plain Before.\par
+\pard\plain \ls30\f40\fs18 First line.\par
+\pard\plain After.\par
+}
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index bdcb26b..f0071cd 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -691,6 +691,13 @@ DECLARE_RTFEXPORT_TEST(testAbi10076, "abi10076.odt")
 // Just make sure that we don't crash after exporting a fully calculated 
layout.
 }
 
+DECLARE_RTFEXPORT_TEST(testNumberingFont, "numbering-font.rtf")
+{
+uno::Reference 
xStyle(getStyles("CharacterStyles")->getByName("ListLabel 1"), uno::UNO_QUERY);
+// This was Liberation Serif, i.e. custom font of the numbering itself 
("1.\t") was lost on import.
+CPPUNIT_ASSERT_EQUAL(OUString("Verdana"), getProperty(xStyle, 
"CharFontName"));
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 417655e..5330076 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -308,7 +308,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 if (m_pImpl->GetTopContext())
 {
 m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME, 
uno::makeAny( sStringValue ));
-if (m_pImpl->GetTopContextType() == CONTEXT_PARAGRAPH && 
m_pImpl->GetTopContext()->isSet(PROP_NUMBERING_RULES))
+if (m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH) && 
m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH)->isSet(PROP_NUMBERING_RULES))
 {
 // Font of the paragraph mark should be used for the 
numbering as well.
 uno::Reference 
xCharStyle(m_pImpl->GetCurrentNumberingCharStyle());
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 0259aca..471e59e 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4817,15 +4817,24 @@ uno::Reference 
DomainMapper_Impl::GetCurrentNumberingCharSt
 uno::Reference xLevels = 
GetCurrentNumberingRules(&nListLevel);
 if (!xLevels.is())
 {
+// Looking up the paragraph context explicitly (and not just taking
+// the top context) is necessary for RTF, where formatting of a run
+// and of the paragraph mark is not separated.
+PropertyMapPtr pContext = GetTopContextOfType(CONTEXT_PARAGRAPH);
+if (!pContext)
+return xRet;
+
 // In case numbering rules is not found via a style, try the 
direct formatting instead.
-boost::optional oProp = 
m_pTopContext->getProperty(PROP_NUMBERING_RULES);
+boost::optional oProp = 
pContext->getProperty(PROP_NUMBERING_RULES);
 if (oProp)
 {
 xLevels.set(oProp->second, uno::UNO_QUERY);
 // Found the rules, then also try to look up our numbering 
level.
-oProp = m_pTopContext->getProperty(PROP_NUMBERING_LEVEL);
+oProp = pContext->getProperty(PROP_NUMBERING_LEVEL);
 if (oProp)
 oProp->second >>= nListLevel;
+else
+nListLevel = 0;
 }
 
 if (!xLevels.is())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 oox/source/core/xmlfilterbase.cxx |4 
 sd/qa/unit/sdmodeltestbase.hxx|2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit fd0a49bdd7cf7979d18feff003d1b5fbe53fdc14
Author: Miklos Vajna 
Date:   Thu Sep 25 21:06:40 2014 +0200

Fix validation problems pointed out by CppunitTest_sd_export_tests

Regression from e8bdd38882522591723097c028ca7a6927ee70c4
(fdo#83751-FILESAVE:Custom Properties dropped while exporting to .pptx,
2014-09-11), there were two problems here:

1) Using the wrong filter when the output is expected to be suitable for
validation.

2) Writing empty custom property values, which is not valid.

Change-Id: Ic18c789c53bd40cc8aa07385cb5fd0d5c7ada6ab

diff --git a/oox/source/core/xmlfilterbase.cxx 
b/oox/source/core/xmlfilterbase.cxx
index bf82eef..001c9db 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -713,6 +713,10 @@ writeCustomProperties( XmlFilterBase& rSelf, Reference< 
XDocumentProperties > xP
 {
 if ( !aprop[n].Name.isEmpty() )
 {
+// Ignore empty string property as well.
+if (aprop[n].Value.has() && 
aprop[n].Value.get().isEmpty())
+continue;
+
 OString aName = OUStringToOString( aprop[n].Name, 
RTL_TEXTENCODING_ASCII_US );
 // pid starts from 2 not from 1 as MS supports pid from 2
 OString pid =  OUStringToOString( OUString::number(n + 2), 
RTL_TEXTENCODING_ASCII_US );
diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx
index e07e46f..b1472ce 100644
--- a/sd/qa/unit/sdmodeltestbase.hxx
+++ b/sd/qa/unit/sdmodeltestbase.hxx
@@ -56,7 +56,7 @@ FileFormat aFileFormats[] =
 {
 { "odp",  "impress8", "impress8", "", ODP_FORMAT_TYPE },
 { "ppt",  "MS PowerPoint 97", "Microsoft PowerPoint 97/2000/XP/2003", 
"sdfilt", PPT_FORMAT_TYPE },
-{ "pptx", "Impress MS PowerPoint 2007 XML", "MS PowerPoint 2007 XML", "", 
PPTX_FORMAT_TYPE },
+{ "pptx", "Impress Office Open XML", "Office Open XML Presentation", "", 
PPTX_FORMAT_TYPE },
 { "html", "graphic_HTML", "graphic_HTML", "", HTML_FORMAT_TYPE },
 { 0, 0, 0, 0, 0 }
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - scp2/inc vcl/inc vcl/source vcl/win xmloff/source

[Michael Stahl]

 scp2/inc/macros.inc |   11 ---
 vcl/inc/win/saltimer.h  |5 ++---
 vcl/source/app/timer.cxx|   11 +--
 vcl/win/source/app/saltimer.cxx |2 +-
 xmloff/source/transform/TransformerBase.cxx |2 ++
 5 files changed, 14 insertions(+), 17 deletions(-)

New commits:
commit 24a0129274ebfd41b4a2e81ec7cb5be238b9cf78
Author: Michael Stahl 
Date:   Thu Sep 25 20:43:53 2014 +0200

assert that XMLTransformerBase::m_xHandler is initialized

Just seen a test with a null m_xHandler, no idea how that happened.

Change-Id: I2e5ff9d3c799284beea5fdca37fa8a825f8a4756

diff --git a/xmloff/source/transform/TransformerBase.cxx 
b/xmloff/source/transform/TransformerBase.cxx
index 513692f..f74c687 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -489,6 +489,8 @@ void SAL_CALL XMLTransformerBase::initialize( const 
Sequence< Any >& aArguments
 
 }
 }
+
+assert(m_xHandler.is()); // can't do anything without that
 }
 
 static sal_Int16 lcl_getUnit( const OUString& rValue )
commit 021307d659984e937b18b9eb760d8d8d8b91da54
Author: Michael Stahl 
Date:   Thu Sep 25 18:12:46 2014 +0200

vcl: avoid crashes from Timer Queues on shutdown

The timer callback SalTimerProc can be called after DeInitVCL has
deleted the SalInstance, and crash.  Avoid that by calling
WinSalTimer::Stop() and also using the INVALID_HANDLE_VALUE parameter
which waits until the timer callback is done executing.

Change-Id: Ia4cf2cf9dc48904d077e0a691e14107256c50ded

diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx
index 1f9870b..703f7e8 100644
--- a/vcl/source/app/timer.cxx
+++ b/vcl/source/app/timer.cxx
@@ -43,6 +43,12 @@ void Timer::ImplDeInitTimer()
 ImplSVData* pSVData = ImplGetSVData();
 ImplTimerData*  pTimerData = pSVData->mpFirstTimerData;
 
+// on WNT the timer queue thread needs killing
+if (pSVData->mpSalTimer)
+{
+pSVData->mpSalTimer->Stop();
+}
+
 if ( pTimerData )
 {
 do
@@ -60,9 +66,10 @@ void Timer::ImplDeInitTimer()
 
 pSVData->mpFirstTimerData   = NULL;
 pSVData->mnTimerPeriod  = 0;
-delete pSVData->mpSalTimer;
-pSVData->mpSalTimer = NULL;
 }
+
+delete pSVData->mpSalTimer;
+pSVData->mpSalTimer = 0;
 }
 
 static void ImplStartTimer( ImplSVData* pSVData, sal_uLong nMS )
diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx
index f54e2a3..9191d5e 100644
--- a/vcl/win/source/app/saltimer.cxx
+++ b/vcl/win/source/app/saltimer.cxx
@@ -38,7 +38,7 @@ void ImplSalStopTimer(SalData* pSalData)
 {
 HANDLE hTimer = pSalData->mnTimerId;
 pSalData->mnTimerId = 0;
-DeleteTimerQueueTimer(NULL, hTimer, 0);
+DeleteTimerQueueTimer(NULL, hTimer, INVALID_HANDLE_VALUE);
 }
 
 void ImplSalStartTimer( sal_uLong nMS, bool bMutex )
commit 3cf9e1156d96b911632e0246271a49b9b9d819c6
Author: Michael Stahl 
Date:   Thu Sep 25 17:45:16 2014 +0200

use SAL_OVERRIDE for WinSalTimer

... and no, we do not "overload" virtual methods.

Change-Id: Iff7c46326974995994e966873ff804092bc53540

diff --git a/vcl/inc/win/saltimer.h b/vcl/inc/win/saltimer.h
index 93d98d6..adc0fea 100644
--- a/vcl/inc/win/saltimer.h
+++ b/vcl/inc/win/saltimer.h
@@ -28,9 +28,8 @@ public:
 WinSalTimer() {}
 virtual ~WinSalTimer();
 
-// overload all pure virtual methods
-voidStart( sal_uIntPtr nMS );
-voidStop();
+virtual void Start(sal_uIntPtr nMS) SAL_OVERRIDE;
+virtual void Stop() SAL_OVERRIDE;
 };
 
 #endif
commit cce464488d7ba1ce10dad40d8fc0c5ae74ad73d5
Author: Michael Stahl 
Date:   Thu Sep 25 17:28:17 2014 +0200

scp2: remove some very SPECIAL unused macros

Change-Id: I28f2f4bc3c43aac1faf8be35cf7ce89480487102

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index a2a2f3e..d9bcf20 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -57,22 +57,11 @@
 #endif
 
 #ifdef UNX
-#define LIBNAME(name) 
STRING(CONCAT4(lib,name,DLLPOSTFIX,UNXSUFFIX))
 #define EXENAME(name) STRING(name)
 #define PROFILENAME(name) STRING(CONCAT2(name,rc))
-#define SPECIAL_NAME(name)
STRING(CONCAT3(lib,name,UNXSUFFIX))
-#ifdef MACOSX
-   #define SPECIAL_NAME_VER(name,version)
STRING(CONCAT5(lib,name,.,version,UNXSUFFIX))
-#else
-   #define SPECIAL_NAME_VER(name,version)
STRING(CONCAT5(lib,name,UNXSUFFIX,.,version))
-#endif
-#define SPECIAL_COMPONENT_LIB_NAME(name)  STRING(CONCAT2(name,UNXSUFFIX))
 #else
-#define LIBNAME(name) 
STRING(CONCAT3(name,DLLPOSTFIX,.dll))
 #define EXENAME(name) STRING(CONCAT2(name,.exe))
 #define PROFILENAME(name) STRING(CONCAT2(name,.ini))
-#define 

[Libreoffice-commits] core.git: connectivity/Jar_sdbc_hsqldb.mk

[Stephan Bergmann]

 connectivity/Jar_sdbc_hsqldb.mk |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 13da98f99f0d696a5e2b489600a4eeb0ad832e6c
Author: Stephan Bergmann 
Date:   Thu Sep 25 20:38:38 2014 +0200

fdo#84284: Adapt jar Class-Path to new Mac OS X LibreOffice.app layout

Change-Id: If5a04b7b9ab6c7909cf089f7e935f9c08ea31948

diff --git a/connectivity/Jar_sdbc_hsqldb.mk b/connectivity/Jar_sdbc_hsqldb.mk
index 7519bf1..20cd1f8 100644
--- a/connectivity/Jar_sdbc_hsqldb.mk
+++ b/connectivity/Jar_sdbc_hsqldb.mk
@@ -14,9 +14,8 @@ $(eval $(call gb_Jar_use_externals,sdbc_hsqldb,\
hsqldb \
 ))
 
-# FIXME: is this really necessary?
 $(eval $(call gb_Jar_add_manifest_classpath,sdbc_hsqldb,\
-   .. \
+   $(if $(filter MACOSX,$(OS)),../../Frameworks/,..) \
 ))
 
 $(eval $(call gb_Jar_set_packageroot,sdbc_hsqldb,com))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-4.2-16'

[Christian Lohmaier]

Tag 'cp-4.2-16' created by Andras Timar  at 
2014-09-25 19:15 -0700

cp-4.2-16

Changes since cp-4.2-15-6:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-4.2-16'

[Zolnai Tamás]

Tag 'cp-4.2-16' created by Andras Timar  at 
2014-09-25 19:15 -0700

cp-4.2-16

Changes since libreoffice-4-2-branch-point-7:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-4.2-16'

[Andras Timar]

Tag 'cp-4.2-16' created by Andras Timar  at 
2014-09-25 19:15 -0700

cp-4.2-16

Changes since cp-4.2-6:
Andras Timar (1):
  sync with libreoffice-4-2-5 branch

---
 source/cy/scp2/source/accessories.po   |   
18 
 source/cy/svx/source/unodialogs/textconversiondlgs.po  |   
 9 
 source/cy/sw/source/ui/config.po   |   
14 
 source/de/officecfg/registry/data/org/openoffice/Office/UI.po  |   
 6 
 source/de/svx/uiconfig/ui.po   |   
10 
 source/et/helpcontent2/source/text/swriter/01.po   |   
 8 
 source/et/sw/source/ui/fldui.po|   
10 
 source/fr/sd/uiconfig/sdraw/ui.po  |   
 9 
 source/gl/scp2/source/accessories.po   |   
22 -
 source/gl/sfx2/source/dialog.po|   
 8 
 source/gl/sfx2/uiconfig/ui.po  |   
10 
 source/gl/svx/source/unodialogs/textconversiondlgs.po  |   
 9 
 source/gl/sw/source/ui/inc.po  |   
14 
 source/gl/sw/uiconfig/swriter/ui.po|   
10 
 source/id/cui/source/options.po|   
10 
 source/id/cui/uiconfig/ui.po   |   
10 
 source/id/extensions/source/propctrlr.po   |   
10 
 source/id/filter/uiconfig/ui.po|   
14 
 source/id/officecfg/registry/data/org/openoffice/Office/UI.po  |   
26 -
 source/id/sc/source/ui/drawfunc.po |   
12 
 source/id/sc/source/ui/navipi.po   |   
10 
 source/id/sc/source/ui/src.po  |   
16 
 source/id/sd/source/ui/app.po  |   
40 -
 source/id/sd/source/ui/dlg.po  |   
18 
 source/id/sd/uiconfig/sdraw/ui.po  |   
16 
 source/id/sd/uiconfig/simpress/ui.po   |   
12 
 source/id/sfx2/source/appl.po  |   
20 
 source/nl/connectivity/registry/evoab2/org/openoffice/Office/DataAccess.po |   
 9 
 source/nl/cui/uiconfig/ui.po   |   
 6 
 source/nl/dbaccess/source/ui/dlg.po|   
 6 
 source/nl/extensions/source/abpilot.po |   
13 
 source/nl/filter/source/pdf.po |   
12 
 source/nl/helpcontent2/source/text/shared/guide.po |   
 8 
 source/nl/officecfg/registry/data/org/openoffice/Office/UI.po  |   
10 
 source/nl/reportdesign/source/ui/dlg.po|   
10 
 source/nl/sc/source/ui/StatisticsDialogs.po|   
10 
 source/nl/sc/source/ui/dbgui.po|   
14 
 source/nl/sc/source/ui/src.po  |   
18 
 source/nl/scaddins/source/analysis.po  |   
10 
 source/nl/starmath/source.po   |   
10 
 source/nn/helpcontent2/source/text/shared/guide.po |  
204 +-
 source/pl/cui/source/dialogs.po|   
10 
 source/pl/filter/source/config/fragments/filters.po|   
10 
 source/pl/helpcontent2/source/text/sbasic/shared.po|   
 8 
 source/pl/helpcontent2/source/text/shared/00.po|   
 8 
 source/pl/helpcontent2/source/text/shared/01.po|   
10 
 source/pl/helpcontent2/source/text/shared/optionen.po  |   
10 
 source/pl/sc/source/ui/styleui.po  |   
14 
 source/pl/sfx2/source/appl.po  |   
 8 
 source/pl/svx/source/items.po  |   
16 
 source/pl/svx/source/stbctrls.po   |   
14 
 source/pl/svx/uiconfig/ui.po   |   
12 
 source/pl/sw/source/core/undo.po   |   
10 
 source/pl/sw/source/ui/dbui.po |   
10 
 source/pl/sw/uiconfig/swriter/ui.po|   
16 
 source/ru/chart2/uiconfig/ui.po|   
10 
 source/sk/dbaccess/officecfg/registry/data/org/openoffice

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-4.2-16'

[Olivier R]

Tag 'cp-4.2-16' created by Andras Timar  at 
2014-09-25 19:15 -0700

cp-4.2-16

Changes since cp-4.2-9:
Olivier R (1):
  French dictionary update: v5.2

---
 fr_FR/README_fr.txt   |   13 
 fr_FR/description.xml |2 
 fr_FR/fr.aff  |14658 +++---
 fr_FR/fr.dic  |15695 ++
 4 files changed, 15644 insertions(+), 14724 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/inc vcl/win

[Tor Lillqvist]

 vcl/inc/win/saldata.hxx|1 
 vcl/win/source/app/salinst.cxx |   75 +++--
 2 files changed, 35 insertions(+), 41 deletions(-)

New commits:
commit 92f92db220fe9393b9dd10914b804767649f9b99
Author: Tor Lillqvist 
Date:   Thu Sep 25 20:18:59 2014 +0300

mhPrevInst was pointless

Change-Id: Iacd1c0856f991e11ef26d7ff6bf1e75264b89ac9

diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index 9d9321d..a50e67d 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -74,7 +74,6 @@ public:
 
 public:
 HINSTANCE   mhInst; // default instance handle
-HINSTANCE   mhPrevInst; // previous instance handle
 int mnCmdShow;  // default frame show style
 HPALETTEmhDitherPal;// dither palette
 HGLOBAL mhDitherDIB;// dither memory handle
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index e6ae953..57dfc28 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -332,7 +332,6 @@ void SalData::initKeyCodeMap()
 SalData::SalData()
 {
 mhInst = 0; // default instance handle
-mhPrevInst = 0; // previous instance handle
 mnCmdShow = 0;  // default frame show style
 mhDitherPal = 0;// dither palette
 mhDitherDIB = 0;// dither memory handle
@@ -435,7 +434,6 @@ void InitSalMain()
 aSI.cb = sizeof( aSI );
 GetStartupInfo( &aSI );
 pData->mhInst   = GetModuleHandle( NULL );
-pData->mhPrevInst   = NULL;
 pData->mnCmdShow= aSI.wShowWindow;
 }
 }
@@ -464,44 +462,41 @@ SalInstance* CreateSalInstance()
 pSalData->mnAppThreadId = GetCurrentThreadId();
 
 // register frame class
-if ( !pSalData->mhPrevInst )
-{
-WNDCLASSEXW aWndClassEx;
-aWndClassEx.cbSize  = sizeof( aWndClassEx );
-aWndClassEx.style   = CS_OWNDC;
-aWndClassEx.lpfnWndProc = SalFrameWndProcW;
-aWndClassEx.cbClsExtra  = 0;
-aWndClassEx.cbWndExtra  = SAL_FRAME_WNDEXTRA;
-aWndClassEx.hInstance   = pSalData->mhInst;
-aWndClassEx.hCursor = 0;
-aWndClassEx.hbrBackground   = 0;
-aWndClassEx.lpszMenuName= 0;
-aWndClassEx.lpszClassName   = SAL_FRAME_CLASSNAMEW;
-ImplLoadSalIcon( SAL_RESID_ICON_DEFAULT, aWndClassEx.hIcon, 
aWndClassEx.hIconSm );
-if ( !RegisterClassExW( &aWndClassEx ) )
-return NULL;
-
-aWndClassEx.hIcon   = 0;
-aWndClassEx.hIconSm = 0;
-aWndClassEx.style  |= CS_SAVEBITS;
-aWndClassEx.lpszClassName   = SAL_SUBFRAME_CLASSNAMEW;
-if ( !RegisterClassExW( &aWndClassEx ) )
-return NULL;
-
-// shadow effect for popups on XP
-if( aSalShlData.mbWXP )
-aWndClassEx.style   |= CS_DROPSHADOW;
-aWndClassEx.lpszClassName   = SAL_TMPSUBFRAME_CLASSNAMEW;
-if ( !RegisterClassExW( &aWndClassEx ) )
-return NULL;
-
-aWndClassEx.style   = 0;
-aWndClassEx.lpfnWndProc = SalComWndProcW;
-aWndClassEx.cbWndExtra  = 0;
-aWndClassEx.lpszClassName   = SAL_COM_CLASSNAMEW;
-if ( !RegisterClassExW( &aWndClassEx ) )
-return NULL;
-}
+WNDCLASSEXW aWndClassEx;
+aWndClassEx.cbSize  = sizeof( aWndClassEx );
+aWndClassEx.style   = CS_OWNDC;
+aWndClassEx.lpfnWndProc = SalFrameWndProcW;
+aWndClassEx.cbClsExtra  = 0;
+aWndClassEx.cbWndExtra  = SAL_FRAME_WNDEXTRA;
+aWndClassEx.hInstance   = pSalData->mhInst;
+aWndClassEx.hCursor = 0;
+aWndClassEx.hbrBackground   = 0;
+aWndClassEx.lpszMenuName= 0;
+aWndClassEx.lpszClassName   = SAL_FRAME_CLASSNAMEW;
+ImplLoadSalIcon( SAL_RESID_ICON_DEFAULT, aWndClassEx.hIcon, 
aWndClassEx.hIconSm );
+if ( !RegisterClassExW( &aWndClassEx ) )
+return NULL;
+
+aWndClassEx.hIcon   = 0;
+aWndClassEx.hIconSm = 0;
+aWndClassEx.style  |= CS_SAVEBITS;
+aWndClassEx.lpszClassName   = SAL_SUBFRAME_CLASSNAMEW;
+if ( !RegisterClassExW( &aWndClassEx ) )
+return NULL;
+
+// shadow effect for popups on XP
+if( aSalShlData.mbWXP )
+aWndClassEx.style   |= CS_DROPSHADOW;
+aWndClassEx.lpszClassName   = SAL_TMPSUBFRAME_CLASSNAMEW;
+if ( !RegisterClassExW( &aWndClassEx ) )
+return NULL;
+
+aWndClassEx.style   = 0;
+aWndClassEx.lpfnWndProc = SalComWndProcW;
+aWndClassEx.cbWndExtra  = 0;
+aWndClassEx.lpszClassName   = SAL_COM_CLASSNAMEW;
+if ( !RegisterClassExW( &aWndClassEx ) )
+return NULL;
 
 HWND hComWnd = CreateWindowExW( WS

[Libreoffice-commits] core.git: vcl/inc vcl/win

[Tor Lillqvist]

 vcl/inc/win/saldata.hxx|7 ---
 vcl/win/source/app/saldata.cxx |   25 
 vcl/win/source/app/salinst.cxx |   50 -
 vcl/win/source/app/saltimer.cxx|6 +--
 vcl/win/source/gdi/salgdi3.cxx |2 -
 vcl/win/source/gdi/salprn.cxx  |   12 +++---
 vcl/win/source/window/salframe.cxx |   72 ++---
 vcl/win/source/window/salobj.cxx   |   16 
 8 files changed, 79 insertions(+), 111 deletions(-)

New commits:
commit 50c627257e5856c44e1a2f2ced3a948496df0cc6
Author: Tor Lillqvist 
Date:   Thu Sep 25 16:07:20 2014 +0300

Bin pointless single-line wrappers of Win32 API

Change-Id: I9c56dbee65c93dd98344577d9e696dc61c1edbd8

diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index 409ca3e..9d9321d 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -288,13 +288,6 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const 
char* pStr2 );
 // Call the Timer's callback from the main thread
 #define SAL_MSG_TIMER_CALLBACK  (WM_USER+162)
 
-// A/W-Wrapper
-BOOLImplPostMessage( HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam );
-BOOLImplSendMessage( HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam );
-BOOLImplGetMessage( LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT 
wMsgFilterMax );
-BOOLImplPeekMessage( LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT 
wMsgFilterMax, UINT wRemoveMsg );
-LONGImplDispatchMessage( CONST MSG *lpMsg );
-
 inline void SetWindowPtr( HWND hWnd, WinSalFrame* pThis )
 {
 SetWindowLongPtr( hWnd, SAL_FRAME_THIS, (LONG_PTR)pThis );
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index 0e9a32a..f149a16 100644
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -75,29 +75,4 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const char* 
pStr2 )
 return nRet;
 }
 
-BOOL ImplPostMessage( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam )
-{
-return PostMessageW( hWnd, nMsg, wParam, lParam );
-}
-
-BOOL ImplSendMessage( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam )
-{
-return SendMessageW( hWnd, nMsg, wParam, lParam );
-}
-
-BOOL ImplGetMessage( LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT 
wMsgFilterMax )
-{
-return GetMessageW( lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax );
-}
-
-BOOL ImplPeekMessage( LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT 
wMsgFilterMax, UINT wRemoveMsg )
-{
-return PeekMessageW( lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg 
);
-}
-
-LONG ImplDispatchMessage( CONST MSG *lpMsg )
-{
-return DispatchMessageW( lpMsg );
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index c8eb110..e6ae953 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -152,7 +152,7 @@ void SalYieldMutex::release()
 
 mpInstData->mpSalWaitMutex->acquire();
 if ( mpInstData->mnYieldWaitCount )
-ImplPostMessage( mpInstData->mhComWnd, 
SAL_MSG_RELEASEWAITYIELD, 0, 0 );
+PostMessageW( mpInstData->mhComWnd, 
SAL_MSG_RELEASEWAITYIELD, 0, 0 );
 mnThreadId = 0;
 mnCount--;
 m_mutex.release();
@@ -227,10 +227,10 @@ void ImplSalYieldMutexAcquireWithWait()
 pInst->mnYieldWaitCount++;
 pInst->mpSalWaitMutex->release();
 MSG aTmpMsg;
-ImplGetMessage( &aTmpMsg, pInst->mhComWnd, 
SAL_MSG_RELEASEWAITYIELD, SAL_MSG_RELEASEWAITYIELD );
+GetMessageW( &aTmpMsg, pInst->mhComWnd, 
SAL_MSG_RELEASEWAITYIELD, SAL_MSG_RELEASEWAITYIELD );
 pInst->mnYieldWaitCount--;
 if ( pInst->mnYieldWaitCount )
-ImplPostMessage( pInst->mhComWnd, 
SAL_MSG_RELEASEWAITYIELD, 0, 0 );
+PostMessageW( pInst->mhComWnd, 
SAL_MSG_RELEASEWAITYIELD, 0, 0 );
 }
 }
 }
@@ -579,7 +579,7 @@ static void ImplSalDispatchMessage( MSG* pMsg )
 if ( ImplSalPreDispatchMsg( pMsg ) )
 return;
 }
-LRESULT lResult = ImplDispatchMessage( pMsg );
+LRESULT lResult = DispatchMessageW( pMsg );
 if ( pSalData->mpFirstObject )
 ImplSalPostDispatchMsg( pMsg, lResult );
 }
@@ -592,7 +592,7 @@ void ImplSalYield( bool bWait, bool bHandleAllCurrentEvents 
)
 int nMaxEvents = bHandleAllCurrentEvents ? 100 : 1;
 do
 {
-if ( ImplPeekMessage( &aMsg, 0, 0, 0, PM_REMOVE ) )
+if ( PeekMessageW( &aMsg, 0, 0, 0, PM_REMOVE ) )
 {
 TranslateMessage( &aMsg );
 ImplSalDispatchMessage( &aMsg );
@@ -605,7 +605,7 @@ void ImplSalYield( bool bWait, bool bHandleAllCurrentEvents 
)
 
 if ( bWait && ! bWasMsg )
 {
-if ( ImplGetMessage( &aMsg, 0, 0, 0 ) )
+   

[Libreoffice-commits] core.git: 2 commits - vcl/osx

[Tor Lillqvist]

 vcl/osx/salframeview.mm |4 
 1 file changed, 4 insertions(+)

New commits:
commit c40a8f6c0466f609e49ad1bd4b9da339552d18dc
Author: Tor Lillqvist 
Date:   Thu Sep 25 19:21:38 2014 +0300

Follow-up to fdo#84138: Add YIELD_GUARD here, too, fixes another crash

Change-Id: If4de88233493d7590736e4a3b76c2447ed429ae5

diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 92b579b..8e74086 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -1629,6 +1629,8 @@ private:
 (void) replacementRange; // FIXME - use it!
 #endif
 
+YIELD_GUARD;
+
 if( ![aString isKindOfClass:[NSAttributedString class]] )
 aString = [[[NSAttributedString alloc] initWithString:aString] 
autorelease];
 NSRange rangeToReplace = [self hasMarkedText] ? [self markedRange] : [self 
selectedRange];
commit 7377768b290e728d3df1fc5b7b04ce81ae285ada
Author: Matthew J. Francis 
Date:   Sun Sep 21 23:43:00 2014 +0800

fdo#84138 Add missing YIELD_GUARD to fix an input method crash

Change-Id: Iecf69c29a4574105a33ec003970067d4db823423

diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index bd937db..92b579b 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -1760,6 +1760,8 @@ private:
 (void) actualRange;
 #endif
 
+YIELD_GUARD;
+
 SalExtTextInputPosEvent aPosEvent;
 mpFrame->CallCallback( SALEVENT_EXTTEXTINPUTPOS, (void *)&aPosEvent );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 5 commits - chart2/source chart2/uiconfig cui/source cui/uiconfig extras/source include/svx include/vcl svx/Library_svx.mk svx/source vcl/source

[Caolán McNamara]

 chart2/source/controller/dialogs/res_DataLabel.hxx|3 
 chart2/source/controller/dialogs/tp_AxisLabel.hxx |3 
 chart2/source/controller/dialogs/tp_TitleRotation.hxx |3 
 chart2/uiconfig/ui/dlg_DataLabel.ui   |  183 +-
 chart2/uiconfig/ui/titlerotationtabpage.ui|2 
 chart2/uiconfig/ui/tp_DataLabel.ui|6 
 chart2/uiconfig/ui/tp_PolarOptions.ui |7 
 chart2/uiconfig/ui/tp_axisLabel.ui|6 
 cui/source/inc/align.hxx  |3 
 cui/uiconfig/ui/cellalignment.ui  |2 
 extras/source/glade/libreoffice-catalog.xml.in|3 
 include/svx/wrapfield.hxx |   50 
 include/vcl/field.hxx |3 
 svx/Library_svx.mk|1 
 svx/source/dialog/wrapfield.cxx   |   51 -
 vcl/source/control/field.cxx  |   47 +---
 vcl/source/gdi/cvtsvm.cxx |3 
 vcl/source/window/menu.cxx|2 
 18 files changed, 135 insertions(+), 243 deletions(-)

New commits:
commit 892a7be963f5ffdb5af86a9de1cf8a613fbdc162
Author: Caolán McNamara 
Date:   Thu Sep 25 15:36:40 2014 +0100

Resolves: fdo#83010 remove svx::WrapField

in favour of a wrap property on NumericField

Change-Id: I62c6bdb69a16f37ae6018a2fe41070fb18dbe4a0

diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx 
b/chart2/source/controller/dialogs/res_DataLabel.hxx
index 0044e4a..9d6d0e0 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.hxx
@@ -26,7 +26,6 @@
 #include 
 #include "TextDirectionListBox.hxx"
 #include 
-#include 
 #include 
 
 class SvNumberFormatter;
@@ -64,7 +63,7 @@ private:
 VclHBox* m_pBxOrientation;
 svx::DialControl*m_pDC_Dial;
 FixedText*   m_pFT_Dial;
-svx::WrapField*  m_pNF_Degrees;
+NumericField*m_pNF_Degrees;
 
 VclHBox* m_pBxTextDirection;
 TextDirectionListBox*m_pLB_TextDirection;
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx 
b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
index 059215b..8da5eaf 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
@@ -23,7 +23,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include "TextDirectionListBox.hxx"
 
@@ -51,7 +50,7 @@ private:
 FixedText*   m_pFlOrient;
 svx::DialControl*m_pCtrlDial;
 FixedText*   m_pFtRotate;
-svx::WrapField*  m_pNfRotate;
+NumericField*m_pNfRotate;
 TriStateBox* m_pCbStacked;
 svx::OrientationHelper* m_pOrientHlp;
 
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx 
b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
index dd3ceb0..0bd5c97 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
@@ -21,7 +21,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include "TextDirectionListBox.hxx"
@@ -34,7 +33,7 @@ class SchAlignmentTabPage : public SfxTabPage
 private:
 svx::DialControl*m_pCtrlDial;
 FixedText*   m_pFtRotate;
-svx::WrapField*  m_pNfRotate;
+NumericField*m_pNfRotate;
 TriStateBox* m_pCbStacked;
 svx::OrientationHelper*  m_pOrientHlp;
 FixedText*   m_pFtTextDirection;
diff --git a/chart2/uiconfig/ui/dlg_DataLabel.ui 
b/chart2/uiconfig/ui/dlg_DataLabel.ui
index 2910aba..cd35953 100644
--- a/chart2/uiconfig/ui/dlg_DataLabel.ui
+++ b/chart2/uiconfig/ui/dlg_DataLabel.ui
@@ -1,12 +1,101 @@
 
+
 
-  
+  
   
   
 359
 1
 10
   
+  
+
+  
+  
+  
+  
+
+
+  
+Best fit
+0
+  
+  
+Center
+1
+  
+  
+Above
+2
+  
+  
+Top left
+3
+  
+  
+Left
+4
+  
+  
+Bottom left
+5
+  
+  
+Below
+6
+  
+  
+Bottom right
+7
+  
+  
+Right
+8
+  
+  
+Top right
+9
+  
+  
+Inside
+10
+  
+  
+Outside
+11
+  
+  
+Near origin
+12
+  
+
+  
+  
+
+  
+  
+  
+  
+
+
+  
+Space
+0
+  
+  
+Comma
+1
+  
+  
+Semicolon
+2
+  
+  
+New line
+3
+  
+
+  
   
 False
 6
@@ -366,13 +455,13 @@
   
 
 
-  
+

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

[Caolán McNamara]

 connectivity/source/drivers/firebird/Connection.cxx |  442 ++--
 connectivity/source/drivers/firebird/Connection.hxx |7 
 svx/source/table/tablecontroller.cxx|2 
 3 files changed, 248 insertions(+), 203 deletions(-)

New commits:
commit baede5e8758c406d8361b18967a5852df2cfa5d0
Author: Caolán McNamara 
Date:   Thu Sep 25 14:00:30 2014 +0100

ensure that osl_atomic_decrement gets called after osl_atomic_increment

Change-Id: If110d27950a4efd1a96dc5f2702f4dfbfe58bcbe

diff --git a/connectivity/source/drivers/firebird/Connection.cxx 
b/connectivity/source/drivers/firebird/Connection.cxx
index fd4b43f..802b611 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -106,10 +106,24 @@ void SAL_CALL Connection::release() throw()
 relase_ChildImpl();
 }
 
+struct ConnectionGuard
+{
+oslInterlockedCount& m_refCount;
+ConnectionGuard(oslInterlockedCount& refCount)
+: m_refCount(refCount)
+{
+osl_atomic_increment(&m_refCount);
+}
+~ConnectionGuard()
+{
+osl_atomic_decrement(&m_refCount);
+}
+};
+
 void Connection::construct(const ::rtl::OUString& url, const Sequence< 
PropertyValue >& info)
 throw (SQLException, RuntimeException, std::exception)
 {
-osl_atomic_increment( &m_refCount );
+ConnectionGuard aGuard(m_refCount);
 
 try
 {
@@ -308,8 +322,6 @@ void Connection::construct(const ::rtl::OUString& url, 
const Sequence< PropertyV
 {
 throw std::runtime_error("Generic Firebird::Exception");
 }
-
-osl_atomic_decrement( &m_refCount );
 }
 
 void Connection::notifyDatabaseModified()
commit e01a142c5d1400ac489c2ac0c5bf7779e308434f
Author: Caolán McNamara 
Date:   Thu Sep 25 13:56:39 2014 +0100

coverity#121 Uncaught exception

and

coverity#1210001 Uncaught exception

Change-Id: Ia6ef659ba6e62d56813a87c3fcf0fa4a5d26d9f9

diff --git a/connectivity/source/drivers/firebird/Connection.cxx 
b/connectivity/source/drivers/firebird/Connection.cxx
index caf62f8..fd4b43f 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -107,190 +107,206 @@ void SAL_CALL Connection::release() throw()
 }
 
 void Connection::construct(const ::rtl::OUString& url, const Sequence< 
PropertyValue >& info)
-throw(SQLException, RuntimeException)
+throw (SQLException, RuntimeException, std::exception)
 {
 osl_atomic_increment( &m_refCount );
 
-m_sConnectionURL = url;
-
-bool bIsNewDatabase = false;
-OUString aStorageURL;
-if (url.equals("sdbc:embedded:firebird"))
+try
 {
-m_bIsEmbedded = true;
+m_sConnectionURL = url;
 
-const PropertyValue* pIter = info.getConstArray();
-const PropertyValue* pEnd = pIter + info.getLength();
-
-for (;pIter != pEnd; ++pIter)
+bool bIsNewDatabase = false;
+OUString aStorageURL;
+if (url.equals("sdbc:embedded:firebird"))
 {
-if ( pIter->Name == "Storage" )
+m_bIsEmbedded = true;
+
+const PropertyValue* pIter = info.getConstArray();
+const PropertyValue* pEnd = pIter + info.getLength();
+
+for (;pIter != pEnd; ++pIter)
 {
-m_xEmbeddedStorage.set(pIter->Value,UNO_QUERY);
+if ( pIter->Name == "Storage" )
+{
+m_xEmbeddedStorage.set(pIter->Value,UNO_QUERY);
+}
+else if ( pIter->Name == "URL" )
+{
+pIter->Value >>= aStorageURL;
+}
+else if ( pIter->Name == "Document" )
+{
+pIter->Value >>= m_xParentDocument;
+}
 }
-else if ( pIter->Name == "URL" )
+
+if ( !m_xEmbeddedStorage.is() )
 {
-pIter->Value >>= aStorageURL;
+::connectivity::SharedResources aResources;
+const OUString sMessage = 
aResources.getResourceString(STR_NO_STORAGE);
+::dbtools::throwGenericSQLException(sMessage ,*this);
 }
-else if ( pIter->Name == "Document" )
+
+bIsNewDatabase = !m_xEmbeddedStorage->hasElements();
+
+m_pExtractedFDBFile.reset(new ::utl::TempFile(NULL, true));
+m_pExtractedFDBFile->EnableKillingFile();
+m_sFirebirdURL = m_pExtractedFDBFile->GetFileName() + 
"/firebird.fdb";
+
+SAL_INFO("connectivity.firebird", "Temporary .fdb location:  " << 
m_sFirebirdURL);
+
+if (!bIsNewDatabase)
 {
-pIter->Value >>= m_xParentDocument;
+SAL_INFO("connectivity.firebird", "Extracting .fdb from .odb" 
);
+if (!m_xEmbeddedStorage->isStreamElement(our_sDBLocation))
+{
+  

[Libreoffice-commits] core.git: configure.ac external/libmariadb external/mysqlcppconn

[Robert Antoni Buj i Gelonch]

 configure.ac  |1 
 external/libmariadb/UnpackedTarball_mariadb.mk|5 -
 external/libmariadb/mariadb-CONC-104.patch.1  |   49 ++
 external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk |1 
 external/mysqlcppconn/patches/enable-libmysql-proxy.patch |   27 +++
 5 files changed, 80 insertions(+), 3 deletions(-)

New commits:
commit 5c6d26753d758c2173f21a14283bdafa54063b63
Author: Robert Antoni Buj i Gelonch 
Date:   Wed Sep 17 18:05:43 2014 +0200

Fix for CONC-104: mysql_options doesn't support MYSQL_SECURE_AUTH option


http://bazaar.launchpad.net/~maria-captains/mariadb-native-client/trunk/revision/149

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

diff --git a/configure.ac b/configure.ac
index ee434df..f9c04e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8070,7 +8070,6 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
 fi
 else
 AC_MSG_RESULT([internal])
-AC_MSG_ERROR([libmariadb is known to be incompatible as of 2014-09; 
use libmysqlclient])
 SYSTEM_MARIADB=
 MARIADB_CFLAGS="-I${WORKDIR}/UnpackedTarball/mariadb/include"
 MARIADB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lmariadblib"
diff --git a/external/libmariadb/UnpackedTarball_mariadb.mk 
b/external/libmariadb/UnpackedTarball_mariadb.mk
index d3a315f..d03e2ee 100644
--- a/external/libmariadb/UnpackedTarball_mariadb.mk
+++ b/external/libmariadb/UnpackedTarball_mariadb.mk
@@ -28,8 +28,9 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mariadb,1))
 # non-static inline local_thr_alarm in libmariadb/net.c":
 $(eval $(call gb_UnpackedTarball_add_patches,mariadb,\
 external/libmariadb/mariadb-swap.patch \
-external/libmariadb/mariadb-msvc.patch.1 \
-   external/libmariadb/mariadb-inline.patch.1 \
+$(if $(filter MSC,$(COM)),external/libmariadb/mariadb-msvc.patch.1) \
+external/libmariadb/mariadb-inline.patch.1 \
+external/libmariadb/mariadb-CONC-104.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libmariadb/mariadb-CONC-104.patch.1 
b/external/libmariadb/mariadb-CONC-104.patch.1
new file mode 100644
index 000..cba9fbb
--- /dev/null
+++ b/external/libmariadb/mariadb-CONC-104.patch.1
@@ -0,0 +1,49 @@
+--- mariadb/include/errmsg.h   2014-04-04 12:21:01.0 +0200
 mariadb/include/errmsg.h   2014-09-17 17:47:25.0 +0200
+@@ -66,6 +66,7 @@
+ #define CR_PARAMS_NOT_BOUND 2031
+ #define CR_INVALID_PARAMETER_NO  2034
+ #define CR_UNSUPPORTED_PARAM_TYPE 2036
++#define CR_SECURE_AUTH  2049
+ #define CR_NO_DATA  2051
+ #define CR_NO_STMT_METADATA 2052
+ #define CR_NOT_IMPLEMENTED  2054
+--- mariadb/libmariadb/errmsg.c2014-04-04 12:21:01.0 +0200
 mariadb/libmariadb/errmsg.c2014-09-17 17:48:44.0 +0200
+@@ -129,7 +129,7 @@
+ /* 2046 */  "",
+ /* 2047 */  "",
+ /* 2048 */  "",
+-/* 2049 */  "",
++/* 2049 */  "Connection with old authentication protocol refused.",
+ /* 2050 */  "",
+ /* 2051 */  "",
+ /* 2052 */  "Prepared statement contains no metadata",
+--- mariadb/libmariadb/libmariadb.c2014-04-04 12:21:01.0 +0200
 mariadb/libmariadb/libmariadb.c2014-09-17 17:56:13.0 +0200
+@@ -1864,7 +1864,14 @@
+   scramble_plugin= native_password_plugin_name;
+ }
+   } else
++  {
+ mysql->server_capabilities&= ~CLIENT_SECURE_CONNECTION;
++if (mysql->options.secure_auth)
++{
++  SET_CLIENT_ERROR(mysql, CR_SECURE_AUTH, unknown_sqlstate, 0);
++  goto error;
++}
++  }
+ 
+   /* Set character set */
+   if (mysql->options.charset_name)
+@@ -3031,7 +3038,9 @@
+   }
+ }
+ break;
+-
++  case MYSQL_SECURE_AUTH:
++mysql->options.secure_auth= *(my_bool *)arg1;
++break;
+   default:
+ va_end(ap);
+ DBUG_RETURN(-1);
diff --git a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk 
b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
index 9647c38..65f0f83 100644
--- a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
+++ b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
@@ -19,6 +19,7 @@ $(eval $(call 
gb_UnpackedTarball_add_file,mysqlcppconn,driver/nativeapi/binding_
 $(eval $(call gb_UnpackedTarball_add_patches,mysqlcppconn,\
external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch \
external/mysqlcppconn/patches/warnings.patch.0 \
+external/mysqlcppconn/patches/enable-libmysql-proxy.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/mysqlcppconn/patches/enable-libmysql-proxy.patch 
b/external/mysqlcppconn/patches/enable-libmysql-proxy.patch
new file mode 100644
index 000..6a5894c
--- /dev/null
+++ b/external/mysqlcppconn/patches/enable-libmysql-proxy.patch
@@ -0,0 +1,27 @@
+--- UnpackedTarball/mysqlcppconn/driver/nativeapi

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

[Caolán McNamara]

 registry/source/regimpl.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 81055f589fc2de92e37dbe29f59b5da80728b28a
Author: Caolán McNamara 
Date:   Thu Sep 25 16:39:51 2014 +0100

coverity#705672 Resource leak

Change-Id: Ibeab8e1b64f3185eaca81a31bd131d11994386f3
Signed-off-by: Stephan Bergmann 

diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index 7021f45..f043eef 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -541,11 +541,11 @@ RegError ORegistry::destroyRegistry(const OUString& 
regName)
 
 if (!regName.isEmpty())
 {
-ORegistry* pReg = new ORegistry();
+std::unique_ptr pReg(new ORegistry());
 
 if (!pReg->initRegistry(regName, REG_READWRITE))
 {
-delete pReg;
+pReg.reset();
 
 OUString systemName;
 if ( FileBase::getSystemPathFromFileURL(regName, systemName) != 
FileBase::E_None )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang

[Stephan Bergmann]

 compilerplugins/clang/store/nullptr.cxx |  211 
 1 file changed, 211 insertions(+)

New commits:
commit 5a9a3da719b65c53980e85940595f17c2f84f3c2
Author: Stephan Bergmann 
Date:   Thu Sep 25 17:31:38 2014 +0200

loplugin:nullptr

A plugin to warn about and rewrite null pointer constants that are not 
written
as nullptr (in C++11 code) resp. NULL (in C and C++03 code).  It is not
activated for the following reasons:

* At least the call to

  pImpl->aFmtNms.insert(pImpl->aFmtNms.begin() + nPos, nullptr);

  in svx/source/items/clipfmtitem.cxx would require
   "missing std::nullptr_t
  support in boost/type_traits/is_pointer.hpp" to be fixed first.

* Additions of code that violate the plugin would probably be frequent, 
causing
  unnecessary grief for those building with plugins enabled.

* It did not find anything interesting, apart from the above Boost bug and 
the
  mildly interesting 1da153b617b80887680be65c1854ef8080c2e1c9 "Consistently 
use
  APP_WRITER as an integer, never as a nullptr."

Anyway,

  until make -O -j4 -k check; do make -O -j1 -k check \
COMPILER_PLUGIN_TOOL=nullptr UPDATE_FILES=all; done

sucessfully executed on a recent master and resulted in

  6798 files changed, 60919 insertions(+), 60919 deletions(-)

Change-Id: I1260227949868e73fcb63fda13d83e79fde685d7

diff --git a/compilerplugins/clang/store/nullptr.cxx 
b/compilerplugins/clang/store/nullptr.cxx
new file mode 100644
index 000..528bb6a
--- /dev/null
+++ b/compilerplugins/clang/store/nullptr.cxx
@@ -0,0 +1,211 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+
+#include "compat.hxx"
+#include "plugin.hxx"
+
+namespace {
+
+char const * kindName(Expr::NullPointerConstantKind kind) {
+switch (kind) {
+case Expr::NPCK_NotNull:
+assert(false); // cannot happen
+// fall through
+case Expr::NPCK_ZeroExpression:
+return "ZeroExpression";
+case Expr::NPCK_ZeroLiteral:
+return "ZeroLiteral";
+case Expr::NPCK_CXX11_nullptr:
+return "CXX11_nullptr";
+case Expr::NPCK_GNUNull:
+return "GNUNull";
+}
+}
+
+class Nullptr:
+public RecursiveASTVisitor, public loplugin::RewritePlugin
+{
+public:
+explicit Nullptr(InstantiationData const & data): RewritePlugin(data) {}
+
+void run() override
+{ TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
+
+bool VisitImplicitCastExpr(CastExpr const * expr);
+
+private:
+bool isFromCIncludeFile(SourceLocation spellingLocation) const;
+
+bool isMacroBodyExpansion(SourceLocation location) const;
+
+void rewriteOrWarn(
+Expr const & expr, char const * castKind,
+Expr::NullPointerConstantKind nullPointerkind,
+char const * replacement);
+};
+
+bool Nullptr::VisitImplicitCastExpr(CastExpr const * expr) {
+if (ignoreLocation(expr)) {
+return true;
+}
+switch (expr->getCastKind()) {
+case CK_NullToPointer:
+case CK_NullToMemberPointer:
+break;
+default:
+return true;
+}
+Expr::NullPointerConstantKind k = expr->isNullPointerConstant(
+compiler.getASTContext(), Expr::NPC_ValueDependentIsNotNull);
+switch (k) {
+case Expr::NPCK_NotNull:
+k = expr->isNullPointerConstant(
+compiler.getASTContext(), Expr::NPC_ValueDependentIsNull);
+switch (k) {
+case Expr::NPCK_NotNull:
+break;
+case Expr::NPCK_ZeroExpression:
+case Expr::NPCK_ZeroLiteral:
+report(
+DiagnosticsEngine::Warning,
+"suspicious ValueDependendIsNull %0", expr->getLocStart())
+<< kindName(k) << expr->getSourceRange();
+break;
+default:
+assert(false); // cannot happen
+}
+break;
+case Expr::NPCK_CXX11_nullptr:
+break;
+default:
+{
+Expr const * e = expr->getSubExpr();
+SourceLocation loc;
+for (;;) {
+e = e->IgnoreImpCasts();
+loc = e->getLocStart();
+while (compiler.getSourceManager().isMacroArgExpansion(loc)) {
+loc = compiler.getSourceManager()
+.getImmediateMacroCallerLoc(
+loc);
+}
+if (isMacroBodyExpansion(loc)) {
+if (Lexer::getImmediateMacroName(
+loc, compiler.getSourceManager(),
+   

[Libreoffice-commits] core.git: 2 commits - include/vcl vcl/CppunitTest_vcl_timer.mk vcl/Module_vcl.mk vcl/qa

[Michael Meeks]

 include/vcl/timer.hxx|5 -
 vcl/CppunitTest_vcl_timer.mk |   51 ++
 vcl/Module_vcl.mk|6 +
 vcl/qa/cppunit/timer.cxx |  200 +++
 4 files changed, 261 insertions(+), 1 deletion(-)

New commits:
commit 48e1675ca204b6ad68f5844e21de1f7485cfd306
Author: Michael Meeks 
Date:   Thu Sep 25 16:20:36 2014 +0100

vcl: comment timer classes at least minimally.

Change-Id: Iabc76b3e78afa491a38fa04d648f48f15ac3870e

diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx
index 6659780..d3ebe1a 100644
--- a/include/vcl/timer.hxx
+++ b/include/vcl/timer.hxx
@@ -27,6 +27,7 @@
 struct ImplTimerData;
 struct ImplSVData;
 
+/// Base-class for timers - usually a simple, one-shot timeout
 class VCL_DLLPUBLIC Timer
 {
 protected:
@@ -51,6 +52,7 @@ public:
 sal_uLong   GetTimeout() const { return mnTimeout; }
 boolIsActive() const { return mbActive; }
 
+/// Make it possible to associate a callback with this timeout
 voidSetTimeoutHdl( const Link& rLink ) { maTimeoutHdl = rLink; 
}
 const Link& GetTimeoutHdl() const { return maTimeoutHdl; }
 
@@ -60,7 +62,8 @@ public:
 static void ImplTimerCallbackProc();
 };
 
-
+/// An auto-timer is a multi-shot timer re-emitting itself at
+/// interval until destroyed.
 class VCL_DLLPUBLIC AutoTimer : public Timer
 {
 public:
commit d998a6ae3afab1ea51c72843d8400cf5c1eca35c
Author: Michael Meeks 
Date:   Thu Sep 25 11:22:39 2014 +0100

fdo#84000 - unit test timers / main-loop bits.

At least test Unix platforms.

Change-Id: I960343cb9622474fe48687a5e458e1c6dbe55358

diff --git a/vcl/CppunitTest_vcl_timer.mk b/vcl/CppunitTest_vcl_timer.mk
new file mode 100644
index 000..c1abf2f
--- /dev/null
+++ b/vcl/CppunitTest_vcl_timer.mk
@@ -0,0 +1,51 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,vcl_timer))
+
+$(eval $(call gb_CppunitTest_set_include,vcl_timer,\
+$$(INCLUDE) \
+-I$(SRCDIR)/vcl/inc \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,vcl_timer, \
+   vcl/qa/cppunit/timer \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,vcl_timer,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_libraries,vcl_timer, \
+   comphelper \
+   cppu \
+   cppuhelper \
+   sal \
+   salhelper \
+   test \
+   unotest \
+   vcl \
+   $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,vcl_timer,\
+   udkapi \
+   offapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,vcl_timer))
+$(eval $(call gb_CppunitTest_use_vcl,vcl_timer))
+
+$(eval $(call gb_CppunitTest_use_components,vcl_timer,\
+   configmgr/source/configmgr \
+   i18npool/util/i18npool \
+   ucb/source/core/ucb1 \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,vcl_timer))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index acf8ccb..f2eef6f 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -100,4 +100,10 @@ $(eval $(call gb_Module_add_check_targets,vcl,\
CppunitTest_vcl_wmf_test \
 ))
 
+ifeq ($(GUIBASE),unx)
+$(eval $(call gb_Module_add_check_targets,vcl,\
+   CppunitTest_vcl_timer \
+))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/qa/cppunit/timer.cxx b/vcl/qa/cppunit/timer.cxx
new file mode 100644
index 000..99d71a9
--- /dev/null
+++ b/vcl/qa/cppunit/timer.cxx
@@ -0,0 +1,200 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+/*
+ * Timers are evil beasties across platforms ...
+ */
+
+#include 
+
+#include 
+#include 
+
+#include 
+#include 
+
+/// Avoid our timer tests just wedging the build if they fail.
+class WatchDog : public osl::Thread
+{
+sal_Int32 mnSeconds;
+public:
+WatchDog(sal_Int32 nSeconds) :
+Thread(),
+mnSeconds( nSeconds )
+{
+create();
+}
+virtual void SAL_CALL run() SAL_OVERRIDE
+{
+TimeValue aWait;
+aWait.Seconds = mnSeconds;
+aWait.Nanosec = 100; // +1ms
+osl::Thread::wait( aWait );
+CPPUNIT_ASSERT_MESSAGE("watchdog triggered", false);
+}
+};
+
+static WatchDog aWatchDog( 10 /* 10 secs should be enough */);
+
+class TimerTest : public test::BootstrapFixture
+{
+public:
+TimerTest() : BootstrapFixture(true, false) {}
+
+void testWatchdog();
+void testDurations();
+void testAutoT

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

[Heena Gupta]

 sd/qa/unit/data/pptx/fdo83751.pptx |binary
 sd/qa/unit/export-tests.cxx|   19 +++
 2 files changed, 19 insertions(+)

New commits:
commit 13f4581c8db921f93f3a278f212f859a7158c482
Author: Heena Gupta 
Date:   Fri Sep 12 17:27:16 2014 +0530

fdo#83751- Add test case for custom properties in pptx

Change-Id: I83fb0462c662e0da1f1c5c6dfec4bd8d94d97b87
Reviewed-on: https://gerrit.libreoffice.org/11420
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sd/qa/unit/data/pptx/fdo83751.pptx 
b/sd/qa/unit/data/pptx/fdo83751.pptx
new file mode 100644
index 000..be0dfe4
Binary files /dev/null and b/sd/qa/unit/data/pptx/fdo83751.pptx differ
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 0c856fd..7aa1e26 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -52,6 +52,7 @@
 #include 
 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 
@@ -69,6 +70,7 @@ public:
 void testBnc880763();
 void testBnc862510_5();
 void testBnc822347_EmptyBullet();
+void testFdo83751();
 
 CPPUNIT_TEST_SUITE(SdFiltersTest);
 CPPUNIT_TEST(testN821567);
@@ -82,6 +84,7 @@ public:
 CPPUNIT_TEST(testBnc880763);
 CPPUNIT_TEST(testBnc862510_5);
 CPPUNIT_TEST(testBnc822347_EmptyBullet);
+CPPUNIT_TEST(testFdo83751);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -457,6 +460,22 @@ void SdFiltersTest::testBnc822347_EmptyBullet()
 xDocShRef->DoClose();
 }
 
+void SdFiltersTest::testFdo83751()
+{
+::sd::DrawDocShellRef xDocShRef = 
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/fdo83751.pptx"), PPTX);
+xDocShRef = saveAndReload( xDocShRef, PPTX );
+
+SdDrawDocument *pDoc = xDocShRef->GetDoc();
+CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
+
+uno::Reference 
xDocumentPropertiesSupplier( xDocShRef->GetModel(), uno::UNO_QUERY );
+uno::Reference xProps( 
xDocumentPropertiesSupplier->getDocumentProperties(), uno::UNO_QUERY );
+uno::Reference xUDProps( 
xProps->getUserDefinedProperties(), uno::UNO_QUERY );
+OUString propValue;
+xUDProps->getPropertyValue(OUString("Testing")) >>= propValue;
+CPPUNIT_ASSERT_EQUAL(OUString("Document"), propValue);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdFiltersTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Heena Gupta]

 sd/source/filter/eppt/epptooxml.hxx  |3 +++
 sd/source/filter/eppt/pptx-epptooxml.cxx |   21 -
 2 files changed, 23 insertions(+), 1 deletion(-)

New commits:
commit e8bdd38882522591723097c028ca7a6927ee70c4
Author: Heena Gupta 
Date:   Thu Sep 11 13:15:51 2014 +0530

fdo#83751-FILESAVE:Custom Properties dropped while exporting to .pptx

Change-Id: Ic4b8acfc3cbd8c86b765a950d61742c229f3fb6d
Reviewed-on: https://gerrit.libreoffice.org/11390
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sd/source/filter/eppt/epptooxml.hxx 
b/sd/source/filter/eppt/epptooxml.hxx
index 05359fc..0197b97 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -128,6 +128,9 @@ protected:
 sal_Int32 GetAuthorIdAndLastIndex( const OUString& sAuthor, sal_Int32& 
nLastIndex );
 
 private:
+// Write docProps/core.xml and docprops/custom.xml and docprops/app.xml
+void writeDocumentProperties();
+
 void AddLayoutIdAndRelation( ::sax_fastparser::FSHelperPtr pFS, sal_Int32 
nLayoutFileId );
 
 virtual OUString implGetImplementationName() const SAL_OVERRIDE;
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx 
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index e829fca..d00f4d8 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -64,6 +64,9 @@
 
 #include "pptexanimations.hxx"
 
+#include 
+#include 
+
 // presentation namespaces
 #define PNMSS FSNS( XML_xmlns, XML_a ), 
"http://schemas.openxmlformats.org/drawingml/2006/main";, \
   FSNS( XML_xmlns, XML_p ), 
"http://schemas.openxmlformats.org/presentationml/2006/main";, \
@@ -318,6 +321,18 @@ PowerPointExport::~PowerPointExport()
 {
 }
 
+void PowerPointExport::writeDocumentProperties()
+{
+uno::Reference xDPS( mXModel, 
uno::UNO_QUERY );
+uno::Reference xDocProps = 
xDPS->getDocumentProperties();
+
+if (xDocProps.is())
+{
+PowerPointExport& mrExport(*this);
+mrExport.exportDocumentProperties( xDocProps );
+}
+}
+
 bool PowerPointExport::importDocument() throw()
 {
 return false;
@@ -328,6 +343,11 @@ bool PowerPointExport::exportDocument() throw 
(css::uno::RuntimeException, std::
 DrawingML::ResetCounters();
 maShapeMap.clear ();
 
+mXModel.set( getModel(), UNO_QUERY );
+
+//write document properties
+writeDocumentProperties();
+
 addRelation( 
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument";,
 "ppt/presentation.xml" );
 
 mPresentationFS = openFragmentStreamWithSerializer( "ppt/presentation.xml",
@@ -339,7 +359,6 @@ bool PowerPointExport::exportDocument() throw 
(css::uno::RuntimeException, std::
 
 mPresentationFS->startElementNS( XML_p, XML_presentation, PNMSS, FSEND );
 
-mXModel.set( getModel(), UNO_QUERY );
 mXStatusIndicator.set( getStatusIndicator(), UNO_QUERY );
 
 OUString sBaseURI( "BaseURI");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: editeng/source include/editeng sc/source sd/source starmath/source svx/source sw/source

[Stephan Bergmann]

 editeng/source/items/xmlcnitm.cxx  |2 
 editeng/source/uno/unoedhlp.cxx|   30 ++---
 include/editeng/AccessibleStaticTextBase.hxx   |4 -
 include/editeng/hangulhanja.hxx|4 -
 include/editeng/unoedhlp.hxx   |4 -
 sc/source/ui/Accessibility/AccessibleText.cxx  |8 ---
 sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx |2 
 starmath/source/accessibility.cxx  |2 
 svx/source/unodraw/unoshtxt.cxx|7 ++-
 sw/source/uibase/docvw/SidebarTxtControlAcc.cxx|4 -
 10 files changed, 28 insertions(+), 39 deletions(-)

New commits:
commit a924606810a5d6e9a8e3d23e491d0bea5a5d2477
Author: Stephan Bergmann 
Date:   Thu Sep 25 17:35:05 2014 +0200

editeng: std::auto_ptr -> std::unique_ptr

Change-Id: I25e3599a37d720cbcf70ea13ab30234e54637d53

diff --git a/editeng/source/items/xmlcnitm.cxx 
b/editeng/source/items/xmlcnitm.cxx
index f112383..1362304 100644
--- a/editeng/source/items/xmlcnitm.cxx
+++ b/editeng/source/items/xmlcnitm.cxx
@@ -108,7 +108,7 @@ bool SvXMLAttrContainerItem::PutValue( const 
com::sun::star::uno::Any& rVal, sal
 }
 else
 {
-std::auto_ptr pNewImpl(new 
SvXMLAttrContainerData);
+std::unique_ptr pNewImpl(new 
SvXMLAttrContainerData);
 
 try
 {
diff --git a/editeng/source/uno/unoedhlp.cxx b/editeng/source/uno/unoedhlp.cxx
index 83a6fd3..dec1333 100644
--- a/editeng/source/uno/unoedhlp.cxx
+++ b/editeng/source/uno/unoedhlp.cxx
@@ -44,56 +44,54 @@ sal_uLong SvxEditSourceHint::GetValue() const
 }
 
 
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-::std::auto_ptr SvxEditSourceHelper::EENotification2Hint( EENotify* 
aNotify )
+::std::unique_ptr SvxEditSourceHelper::EENotification2Hint( EENotify* 
aNotify )
 {
 if( aNotify )
 {
 switch( aNotify->eNotificationType )
 {
 case EE_NOTIFY_TEXTMODIFIED:
-return ::std::auto_ptr( new TextHint( 
TEXT_HINT_MODIFIED, aNotify->nParagraph ) );
+return ::std::unique_ptr( new TextHint( 
TEXT_HINT_MODIFIED, aNotify->nParagraph ) );
 
 case EE_NOTIFY_PARAGRAPHINSERTED:
-return ::std::auto_ptr( new TextHint( 
TEXT_HINT_PARAINSERTED, aNotify->nParagraph ) );
+return ::std::unique_ptr( new TextHint( 
TEXT_HINT_PARAINSERTED, aNotify->nParagraph ) );
 
 case EE_NOTIFY_PARAGRAPHREMOVED:
-return ::std::auto_ptr( new TextHint( 
TEXT_HINT_PARAREMOVED, aNotify->nParagraph ) );
+return ::std::unique_ptr( new TextHint( 
TEXT_HINT_PARAREMOVED, aNotify->nParagraph ) );
 
 case EE_NOTIFY_PARAGRAPHSMOVED:
-return ::std::auto_ptr( new SvxEditSourceHint( 
EDITSOURCE_HINT_PARASMOVED, aNotify->nParagraph, aNotify->nParam1, 
aNotify->nParam2 ) );
+return ::std::unique_ptr( new SvxEditSourceHint( 
EDITSOURCE_HINT_PARASMOVED, aNotify->nParagraph, aNotify->nParam1, 
aNotify->nParam2 ) );
 
 case EE_NOTIFY_TEXTHEIGHTCHANGED:
-return ::std::auto_ptr( new TextHint( 
TEXT_HINT_TEXTHEIGHTCHANGED, aNotify->nParagraph ) );
+return ::std::unique_ptr( new TextHint( 
TEXT_HINT_TEXTHEIGHTCHANGED, aNotify->nParagraph ) );
 
 case EE_NOTIFY_TEXTVIEWSCROLLED:
-return ::std::auto_ptr( new TextHint( 
TEXT_HINT_VIEWSCROLLED ) );
+return ::std::unique_ptr( new TextHint( 
TEXT_HINT_VIEWSCROLLED ) );
 
 case EE_NOTIFY_TEXTVIEWSELECTIONCHANGED:
-return ::std::auto_ptr( new SvxEditSourceHint( 
EDITSOURCE_HINT_SELECTIONCHANGED ) );
+return ::std::unique_ptr( new SvxEditSourceHint( 
EDITSOURCE_HINT_SELECTIONCHANGED ) );
 
 case EE_NOTIFY_BLOCKNOTIFICATION_START:
-return ::std::auto_ptr( new TextHint( 
TEXT_HINT_BLOCKNOTIFICATION_START, 0 ) );
+return ::std::unique_ptr( new TextHint( 
TEXT_HINT_BLOCKNOTIFICATION_START, 0 ) );
 
 case EE_NOTIFY_BLOCKNOTIFICATION_END:
-return ::std::auto_ptr( new TextHint( 
TEXT_HINT_BLOCKNOTIFICATION_END, 0 ) );
+return ::std::unique_ptr( new TextHint( 
TEXT_HINT_BLOCKNOTIFICATION_END, 0 ) );
 
 case EE_NOTIFY_INPUT_START:
-return ::std::auto_ptr( new TextHint( 
TEXT_HINT_INPUT_START, 0 ) );
+return ::std::unique_ptr( new TextHint( 
TEXT_HINT_INPUT_START, 0 ) );
 
 case EE_NOTIFY_INPUT_END:
-return ::std::auto_ptr( new TextHint( 
TEXT_HINT_INPUT_END, 0 ) );
+return ::std::unique_ptr( new TextHint( 
TEXT_HINT_INPUT_END, 0 ) );
 case EE_NOTIFY_TEXTVIEWSELECTIONCHANGED_ENDD_PARA:
-return ::std::auto_ptr( new SvxEditSourceHintEndPara( 
EDITSOURCE_HINT_SELECTIONCHANGED ) );
+   

[Libreoffice-commits] core.git: Branch 'feature/perfwork' - 2 commits - include/sax sax/source

[Matúš Kukan]

 include/sax/fshelper.hxx|1 +
 sax/source/tools/fastserializer.cxx |   33 ++---
 sax/source/tools/fastserializer.hxx |8 +++-
 sax/source/tools/fshelper.cxx   |   17 -
 4 files changed, 22 insertions(+), 37 deletions(-)

New commits:
commit 700ac99d93c87d88bf5adf74ad10257d672d72e1
Author: Matúš Kukan 
Date:   Thu Sep 25 17:06:22 2014 +0200

FastSerializer: Have OString version of write() too.

And remove characters() member function.

Change-Id: Ifcedbb6d969b7b057ff378d2fbce09c2dde5ac18

diff --git a/include/sax/fshelper.hxx b/include/sax/fshelper.hxx
index 8a9f1cc..d83ce78 100644
--- a/include/sax/fshelper.hxx
+++ b/include/sax/fshelper.hxx
@@ -126,6 +126,7 @@ public:
 
 FastSerializerHelper* write(const char* value);
 FastSerializerHelper* write(const OUString& value);
+FastSerializerHelper* write(const OString& value);
 FastSerializerHelper* write(sal_Int32 value);
 FastSerializerHelper* write(sal_Int64 value);
 FastSerializerHelper* write(double value);
diff --git a/sax/source/tools/fastserializer.cxx 
b/sax/source/tools/fastserializer.cxx
index a6b5afd..56b27af 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -99,9 +99,13 @@ namespace sax_fastparser {
 return sBuf.makeStringAndClear();
 }
 
-void FastSaxSerializer::write( const OUString& s )
+void FastSaxSerializer::write( const OUString& sOutput )
+{
+write( OUStringToOString(sOutput, RTL_TEXTENCODING_UTF8) );
+}
+
+void FastSaxSerializer::write( const OString& sOutput )
 {
-OString sOutput( OUStringToOString( s, RTL_TEXTENCODING_UTF8 ) );
 writeBytes( Sequence< sal_Int8 >(
 reinterpret_cast< const sal_Int8*>( sOutput.getStr() ),
 sOutput.getLength() ) );
@@ -191,12 +195,6 @@ namespace sax_fastparser {
 writeBytes(toUnoSequence(maSlashAndClosingBracket));
 }
 
-void SAL_CALL FastSaxSerializer::characters( const OUString& aChars )
-throw (SAXException, RuntimeException)
-{
-write( aChars );
-}
-
 void SAL_CALL FastSaxSerializer::setOutputStream( const 
::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& 
xOutputStream )
 throw (::com::sun::star::uno::RuntimeException)
 {
diff --git a/sax/source/tools/fastserializer.hxx 
b/sax/source/tools/fastserializer.hxx
index 45535f2..d754b98 100644
--- a/sax/source/tools/fastserializer.hxx
+++ b/sax/source/tools/fastserializer.hxx
@@ -100,10 +100,6 @@ public:
 void SAL_CALL singleFastElement( ::sal_Int32 Element, const 
::com::sun::star::uno::Reference< 
::com::sun::star::xml::sax::XFastAttributeList >& Attribs )
 throw (::com::sun::star::xml::sax::SAXException, 
::com::sun::star::uno::RuntimeException);
 
-/// receives notification of character data.
-void SAL_CALL characters( const OUString& aChars )
-throw (::com::sun::star::xml::sax::SAXException, 
::com::sun::star::uno::RuntimeException);
-
 void SAL_CALL setOutputStream( const ::com::sun::star::uno::Reference< 
::com::sun::star::io::XOutputStream >& xOutputStream )
 throw (::com::sun::star::uno::RuntimeException);
 
@@ -114,6 +110,9 @@ public:
 void SAL_CALL writeId( ::sal_Int32 Element );
 OString SAL_CALL getId( ::sal_Int32 Element );
 
+void write( const OUString& s );
+void write( const OString& s );
+
 static OUString escapeXml( const OUString& s );
 
 public:
@@ -216,7 +215,6 @@ private:
 #endif
 
 void writeFastAttributeList( const ::com::sun::star::uno::Reference< 
::com::sun::star::xml::sax::XFastAttributeList >& Attribs );
-void write( const OUString& s );
 void writeOutput( const css::uno::Sequence< ::sal_Int8 >& aData )
 throw (css::io::NotConnectedException, 
css::io::BufferSizeExceededException, css::io::IOException, 
css::uno::RuntimeException);
 
diff --git a/sax/source/tools/fshelper.cxx b/sax/source/tools/fshelper.cxx
index c49c0da..cb2c7f7 100644
--- a/sax/source/tools/fshelper.cxx
+++ b/sax/source/tools/fshelper.cxx
@@ -107,28 +107,34 @@ void FastSerializerHelper::singleElement(sal_Int32 
elementTokenId, XFastAttribut
 
 FastSerializerHelper* FastSerializerHelper::write(const char* value)
 {
-return write(OUString::createFromAscii(value));
+return write(OString(value));
 }
 
 FastSerializerHelper* FastSerializerHelper::write(const OUString& value)
 {
-mpSerializer->characters(value);
+mpSerializer->write(value);
+return this;
+}
+
+FastSerializerHelper* FastSerializerHelper::write(const OString& value)
+{
+mpSerializer->write(value);
 return this;
 }
 
 FastSerializerHelper* FastSerializerHelper::write(sal_Int32 value)
 {
-return write(OUString::number(value));
+return write(OString::number(value));
 }
 
 FastSerializerHelper* FastSerializerHelper::write(sal_Int64 value)
 {
-return write

Re: [Libreoffice-qa] minutes of ESC call ...

[Bjoern Michaelsen]

On Thu, Sep 25, 2014 at 03:36:34PM +0100, Michael Meeks wrote:
> + blog about the sad realities of web plugins (Bjoern)
> [ writing it right now ]

done: http://skyfromme.wordpress.com/2014/09/25/killing-the-npapi-plugin/

Best,

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

Re: Crash test update, threaded xlsb crases

[Michael Meeks]

On Mon, 2014-09-22 at 09:58 +0100, Caolán McNamara wrote:
> FWIW the xlsb files are crashing in threading related problems since the
> oox filter became threaded.

Will take a look when my build completes =)

Thanks,

Michael.

-- 
 michael.me...@collabora.com  <><, Pseudo Engineer, itinerant idiot

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

minutes of ESC call ...

[Michael Meeks]

* Attendees:
+ Stephan, Caolan, Andras, Bjoern, Norbert, Kohei, Miklos,
  Ptyl, Michael M, Robinson, Michael S, Noel, Jan-Marek
 
* Completed Action Items:
+ get Samuel Mehrbrot access again (Michael)
+ get phone bits sorted out with Florian (Michael)
+ setup a LiMux / gcc 4.6 based tinderbox (Jmux)
+ send Jmux some tinderbox pointers (Norbert)
 
* Pending Action Items:
+ Ask Bjoern to do a survey on the wrench icons (Mirek)
+ blog about the sad realities of web plugins (Bjoern)
[ writing it right now ]
+ open-source newer Synezip tests (Umesh)
[ Plan to run these on a server on the cloud service,
  announce the results in the ESC meeting. ]
+ provide wiki links for new processes for design interation (Mirek)
+ poke Alex wrt. off-site backup for TDF services (Cloph)
 
* Release Engineering update (Robinson)
+ Cloph on vacation until next week
+ 4.3.2 release
+ released, and going well.
+ 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 ...
+ bug is:
# https://bugs.freedesktop.org/show_bug.cgi?id=84315
+ 4.3.3 RC1 - October 6th - week 41
+ 4.2.7 - due in week 40 - 29th Sept freeze.
+ credits: Tor not listed - why ? (for Cloph)
http://www.libreoffice.org/about-us/credits/
+ Android Remote
 
* Gerrit patch review / backlog (Thorsten)
+ looks like there are lots of un-reviewed patches.
AI: + everyone review one patch (All)
 
* Crashtest update (Miklos)
+ 
http://dev-builds.libreoffice.org/crashtest/051b29e1025253f35f87a04e297760aa8b40611f/
+ a run during the conference, detected some writerfilter issues, now 
mostly fixed.
+ bug around the conference
 + took crashers to 200, Miklos fixed it to 2000 instead
 + but now back to normal
 + RTF: zero crashers & low for docx / doc.
AI: + look at Excel threaded loading issue (Michael)
 + 6x documents affected.
+ crashers are with debugging enabled & a ton of asserts (Caolan)
 
* Hackfests (Robinson)
+ Seattle 'Libre-Fest' (Robinson)
https://wiki.documentfoundation.org/Events/2014/Seattle_LibreFest
+ October 26, 2014
+ Bug-triaging/Intro-to-community event
+ Following SeaGL conference
+ definite interest, heard back from some professors from the security 
lab
+ want to meet Norbert and/or Kohei and/or Bjoern - why not go ?
+ Toulouse Hackfest ...
+ Confirmed for Nov. 15-16th
+ more details: 
https://wiki.documentfoundation.org/Hackfest/Toulouse2014
+ Munich hack-fest (Jan-Marek):
http://www.it-muenchen-blog.de/2014/07/bug-squashing-party-2014/
+ jmux (IRC) can add you if you don't want to create an account
+ will have a BSP come-together; if someone says they're coming
  just show up etc.
   + November 21st-23rd, 2014
   https://wiki.debian.org/BSP/2014/11/de/Munich
   + we should drop by with 2 or 3 developers, if possible
+ Be great to have -really- easy easy hacks for devs (Bjoern)
 
* UX Update (Kendy)
+ asked for Sifr icon sources - sent to red-mine, apparently using it
want to make icon generation more predictable, avoiding black-magic
working on this with Mirek & sensibly ordered Inkscape sheet.
+ use of redmine discussion - issues / benefits (Bjoern)
+ Mirek won't be able to make the ESC call; so in absentia ...
+ Florian doesn't want the use of the redmine wiki - not backed up etc.
+ prefer a single tool used
+ how is redmine used for QA ? (Robinson)
+ specific admin pieces tracked in there.
+ happy to use bugzilla for that purpose
+ might already fit in the existing infra in Redmine ? (Bjoern)
+ could we merge those & close the project ?
AI: + move the data across to infra / bugzilla (Bjoern)
+ easy to do now - only 10x tasks or so.
+ sometimes there is infra not maintained by infra team (Robinson)
+ otherwise happy enough with UX guys in Redmine.
 
* QA (Robinson)
  + un-confirmed bug count holding just above 900
+ Robinson distracted by releng while Cloph on vacation
+ rallying the troops on IRC
+ unconfirmed state at same point in last cycle similar (Bjoern)
  + otherwise mostly quiet.
 
* QA stats:
  + https://bugs.freedesktop.org/page.cgi?id=weekly-bug-summary.html
+168-88(+80 overall)
many thanks to the top bug squashers

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

[Kohei Yoshida]

 sc/source/ui/docshell/dbdocfun.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 14907346d792f2f93a00083bbab5086cf56ddb24
Author: Kohei Yoshida 
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 
Tested-by: Caolán McNamara 

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,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - postprocess/CustomTarget_signing.mk solenv/gbuild

[Christian Lohmaier]

 postprocess/CustomTarget_signing.mk |8 +---
 solenv/gbuild/Module.mk |2 +-
 solenv/gbuild/Postprocess.mk|1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit b9c4f5d499b4202936a237cc1cbba0d63010bef0
Author: Christian Lohmaier 
Date:   Sun Apr 27 03:00:31 2014 +0200

make signing depend on slowchecks being done

otherwise signing (at least on windows) fails because files are in use

Change-Id: Ida6a7d43dc74eb278fd79410b9c0a60f823c5933
Reviewed-on: https://gerrit.libreoffice.org/9176
Tested-by: David Tardon 
Reviewed-by: David Tardon 

diff --git a/postprocess/CustomTarget_signing.mk 
b/postprocess/CustomTarget_signing.mk
index 40f7250..f8a7c77 100644
--- a/postprocess/CustomTarget_signing.mk
+++ b/postprocess/CustomTarget_signing.mk
@@ -20,10 +20,12 @@ TIMESTAMPURL ?= 
"http://timestamp.globalsign.com/scripts/timestamp.dll";
 $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done: \
$(SRCDIR)/postprocess/signing/signing.pl \
$(SRCDIR)/postprocess/signing/no_signing.txt \
+   $(call gb_Postprocess_get_target,AllLibraries) \
+   $(call gb_Postprocess_get_target,AllExecutables) \
+   $(call gb_Postprocess_get_target,AllModuleTests) \
+   $(call gb_Postprocess_get_target,AllModuleSlowtests)
 
-$(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done : \
-   $(call gb_Postprocess_get_target,AllLibraries) $(call 
gb_Postprocess_get_target,AllExecutables) \
-   $(call gb_Postprocess_get_target,AllModuleTests)
+$(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done:
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
 ifeq ($(COM),MSC)
 ifneq ($(ENABLE_DBGUTIL),TRUE)
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index d08e5cb..cc04d5f 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -199,7 +199,7 @@ $(if $(filter-out libreoffice instsetoo_native android 
ios,$(1)),\
 $(call 
gb_Postprocess_register_target,AllModulesButInstsetNative,Module,$(1)))
 
 $(call gb_Postprocess_get_target,AllModuleTests) : $(call 
gb_Module_get_check_target,$(1))
-$(call gb_Postprocess_get_clean_target,AllModuleTests) : $(call 
gb_Module_get_clean_target,$(1))
+$(call gb_Postprocess_get_target,AllModuleSlowtests) : $(call 
gb_Module_get_slowcheck_target,$(1))
 
 endef
 
diff --git a/solenv/gbuild/Postprocess.mk b/solenv/gbuild/Postprocess.mk
index 445f0ea..dfff5ee 100644
--- a/solenv/gbuild/Postprocess.mk
+++ b/solenv/gbuild/Postprocess.mk
@@ -46,6 +46,7 @@ $(call gb_Postprocess_Postprocess,AllPackages,All 
packages,$(WORKDIR)/Package/)
 $(call gb_Postprocess_Postprocess,AllResources,All 
resources,$(WORKDIR)/AllLangRes/)
 $(call gb_Postprocess_Postprocess,AllUIConfigs,All UI configuration 
files,$(WORKDIR)/UIConfig/)
 $(call gb_Postprocess_Postprocess,AllModuleTests,All modules' 
tests,$(WORKDIR)/Module/check/)
+$(call gb_Postprocess_Postprocess,AllModuleSlowtests,All modules' 
slowtests,$(WORKDIR)/Module/slowcheck/)
 
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/astyle-java.conf scripting/astyle.options scripting/Format_java_code.sh scripting/README

[Robert Antoni Buj i Gelonch]

 scripting/Format_java_code.sh |2 +-
 scripting/README  |5 +
 scripting/astyle-java.conf|   19 ---
 scripting/astyle.options  |   19 +++
 4 files changed, 25 insertions(+), 20 deletions(-)

New commits:
commit 09b13e1e4c6667b307fdd9608a02d2a792efd940
Author: Robert Antoni Buj i Gelonch 
Date:   Thu Sep 25 15:50:05 2014 +0200

scripting: astyle-java.conf -> astyle.options

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

Change-Id: I0852f9766495379b0208e236b3cbeafde5bf07b3

diff --git a/scripting/Format_java_code.sh b/scripting/Format_java_code.sh
index edf75d1..8fbffe8 100755
--- a/scripting/Format_java_code.sh
+++ b/scripting/Format_java_code.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-astyle --options=astyle-java.conf --verbose --recursive ./*.java
+astyle --options=astyle.options --verbose --recursive ./*.java
diff --git a/scripting/README b/scripting/README
index f19fa3b..1ca4fe9 100644
--- a/scripting/README
+++ b/scripting/README
@@ -3,6 +3,11 @@ This module provides the source code for the Scripting 
Framework.
 For more information on the Scripting Framework, see the project web page:
 [http://framework.openoffice.org/scripting/]
 
+This module uses astyle to keep consistent java coding style. Please run
+
+./Format_java_code.sh
+
+before committing.
 
 == Source Code Structure ==
 
diff --git a/scripting/astyle-java.conf b/scripting/astyle.options
similarity index 100%
rename from scripting/astyle-java.conf
rename to scripting/astyle.options
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/qa/extras/ooxmlexport/data/drawingml-flipv.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx   |   14 ++
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx   |2 +-
 writerfilter/source/dmapper/GraphicImport.cxx  |5 -
 4 files changed, 19 insertions(+), 2 deletions(-)

New commits:
commit 9791453283407a0a129a71767a290058ac759da2
Author: Miklos Vajna 
Date:   Thu Sep 25 15:14:22 2014 +0200

DOCX drawingML filter: avoid fake rotation on vertical flip

This also improves positioning a bit, in the changed testcase the
perfect position would be 211.66389, and reality is now 210 instead
of 208 (100th millimeters).

Change-Id: I5226f2165224a8bbfebfd11d9c612f72d83b8c69

diff --git a/sw/qa/extras/ooxmlexport/data/drawingml-flipv.docx 
b/sw/qa/extras/ooxmlexport/data/drawingml-flipv.docx
new file mode 100644
index 000..f10a83f
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/drawingml-flipv.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 0b2c78f..be44a07 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -290,6 +290,20 @@ DECLARE_OOXMLEXPORT_TEST(testNumberingFont, 
"numbering-font.docx")
 CPPUNIT_ASSERT_EQUAL(OUString("Verdana"), getProperty(xStyle, 
"CharFontName"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testDrawingmlFlipv, "drawingml-flipv.docx")
+{
+// The problem was that the shape had vertical flip only, but then we 
added rotation as well on export.
+if (xmlDocPtr pXmlDoc = parseExport("word/document.xml"))
+{
+xmlXPathObjectPtr pXPath = getXPathNode(pXmlDoc, "//a:xfrm");
+xmlNodeSetPtr pXmlNodes = pXPath->nodesetval;
+CPPUNIT_ASSERT_EQUAL(1, xmlXPathNodeSetGetLength(pXmlNodes));
+xmlNodePtr pXmlNode = pXmlNodes->nodeTab[0];
+// The attribute existed, so xmlGetProp() returned non-NULL.
+CPPUNIT_ASSERT_EQUAL(static_cast(0), xmlGetProp(pXmlNode, 
BAD_CAST("rot")));
+}
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 7136808..eca11e6 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1665,7 +1665,7 @@ DECLARE_OOXMLIMPORT_TEST(lineWpsOnly, 
"line-wps-only.docx")
 {
 uno::Reference xShape = getShape(1);
 // Check position, it was -7223 as it was set after the 
CustomShapeGeometry property.
-CPPUNIT_ASSERT_EQUAL(sal_Int32(208), xShape->getPosition().X);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(210), xShape->getPosition().X);
 }
 
 DECLARE_OOXMLIMPORT_TEST(lineRotation, "line-rotation.docx")
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index e2ad109..28550bd 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -749,11 +749,14 @@ 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;
 if (bKeepRotation)
 aRotation = 
xShapeProps->getPropertyValue("RotateAngle");
 m_xShape->setSize(aSize);
-if (bKeepRotation)
+if (bKeepRotation && aRotation.hasValue() && 
aRotation.get() != 0)
 xShapeProps->setPropertyValue("RotateAngle", 
aRotation);
 
 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: Branch 'feature/perfwork' - comphelper/source include/comphelper sax/source

[Matúš Kukan]

 comphelper/source/streaming/seqstream.cxx |2 ++
 include/comphelper/seqstream.hxx  |   11 +++
 sax/source/tools/fastserializer.cxx   |   19 +++
 sax/source/tools/fastserializer.hxx   |2 ++
 4 files changed, 26 insertions(+), 8 deletions(-)

New commits:
commit 8524d5aba59148eef94859289f00ab6477e0e821
Author: Matúš Kukan 
Date:   Thu Sep 25 14:45:55 2014 +0200

FastSerializer: Do not keep whole sequence in memory; write in chunks

Change-Id: Ibca65a2b8397358ac4013c8e5b53389ac6949e4d

diff --git a/comphelper/source/streaming/seqstream.cxx 
b/comphelper/source/streaming/seqstream.cxx
index d66ce3b..aec4519 100644
--- a/comphelper/source/streaming/seqstream.cxx
+++ b/comphelper/source/streaming/seqstream.cxx
@@ -214,6 +214,8 @@ void SAL_CALL OSequenceOutputStream::flush(  ) 
throw(NotConnectedException, Buff
 
 // cut the sequence to the real size
 m_rSequence.realloc(m_nSize);
+// and next time write to the beginning
+m_nSize = 0;
 }
 
 
diff --git a/include/comphelper/seqstream.hxx b/include/comphelper/seqstream.hxx
index 13dd4dc..75b1934 100644
--- a/include/comphelper/seqstream.hxx
+++ b/include/comphelper/seqstream.hxx
@@ -115,13 +115,16 @@ public:
 
 virtual ~OSequenceOutputStream() { if (m_bConnected) closeOutput(); }
 
+sal_Int32 getSize() const { return m_nSize; }
+
 /// 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;
-/// this is a dummy in this implementation, no buffering is used
+/** Resizes the sequence used for writing to the really used size.
+ *  Next time, writeBytes will write to the beginning of the sequence.
+*/
 virtual void SAL_CALL flush(  ) 
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;
-/** closes the output stream. In the case of this class, this means that 
the sequence used for writing is
-resized to the really used size and not used any further, every 
subsequent call to one of the XOutputStream
-methods will throw a NotConnectedException.
+/** Calls flush() and closes the output stream to prevent further 
manipulation with the sequence.
+Every subsequent call to one of the XOutputStream methods will throw a 
NotConnectedException.
 */
 virtual void SAL_CALL closeOutput(  ) 
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;
 };
diff --git a/sax/source/tools/fastserializer.cxx 
b/sax/source/tools/fastserializer.cxx
index dfa37c7..d85bfef 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -53,8 +53,8 @@ using ::com::sun::star::io::BufferSizeExceededException;
 
 namespace sax_fastparser {
 FastSaxSerializer::FastSaxSerializer( )
-: maOutputData()
-, maOutputStream(maOutputData)
+: maOutputData(0x4000)
+, maOutputStream(maOutputData, 1.3, 0x1000, 0x4000)
 , mxOutputStream()
 , mxFastTokenHandler()
 , maMarkStack()
@@ -298,7 +298,7 @@ namespace sax_fastparser {
 
 if ( maMarkStack.size() == 1  && eMergeType != MERGE_MARKS_IGNORE)
 {
-maOutputStream.writeBytes( maMarkStack.top()->getData() );
+writeOutput( maMarkStack.top()->getData() );
 maMarkStack.pop();
 return;
 }
@@ -319,11 +319,22 @@ namespace sax_fastparser {
 void FastSaxSerializer::writeBytes( const Sequence< ::sal_Int8 >& aData ) 
throw ( NotConnectedException, BufferSizeExceededException, IOException, 
RuntimeException )
 {
 if ( maMarkStack.empty() )
-maOutputStream.writeBytes( aData );
+writeOutput( aData );
 else
 maMarkStack.top()->append( aData );
 }
 
+void FastSaxSerializer::writeOutput( const Sequence< ::sal_Int8 >& aData ) 
throw ( NotConnectedException, BufferSizeExceededException, IOException, 
RuntimeException )
+{
+maOutputStream.writeBytes( aData );
+// Write when the sequence gets big enough
+if (maOutputStream.getSize() > 0x1)
+{
+maOutputStream.flush();
+mxOutputStream->writeBytes(maOutputData);
+}
+}
+
 FastSaxSerializer::Int8Sequence& FastSaxSerializer::ForMerge::getData()
 {
 merge( maData, maPostponed, true );
diff --git a/sax/source/tools/fastserializer.hxx 
b/sax/source/tools/fastserializer.hxx
inde

[Bug 39625] Make existing cppunittests work

[bugzilla-daemon]

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

--- Comment #17 from Commit Notification 
 ---
Tobias Madl committed a patch related to this issue.
It has been pushed to "master":

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

fdo#39625 Make existing CppUnit tests work



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: unoxml/CppunitTest_unoxml_domtest.mk unoxml/Module_unoxml.mk unoxml/test

[Tobias Madl]

 unoxml/CppunitTest_unoxml_domtest.mk |   47 ++
 unoxml/Module_unoxml.mk  |4 
 unoxml/test/domtest.cxx  |  150 ---
 3 files changed, 103 insertions(+), 98 deletions(-)

New commits:
commit dbbd89efdeaa44421d1f2ad774c342009d881d9b
Author: Tobias Madl 
Date:   Tue Sep 23 11:43:14 2014 +

fdo#39625 Make existing CppUnit tests work

As in the ticket description, this test is now working, but
some parts of it are still commented out, because they are waiting
for a fix of another bug (Bug 84237). Once it is fixed, it should
be possible to just uncomment them, and then they should work.

Change-Id: I73d1cc7391080e357c08cb3442616e2901070c1f
Signed-off-by: Stephan Bergmann  (with minor 
amendments)

diff --git a/unoxml/CppunitTest_unoxml_domtest.mk 
b/unoxml/CppunitTest_unoxml_domtest.mk
new file mode 100644
index 000..b12fd1e
--- /dev/null
+++ b/unoxml/CppunitTest_unoxml_domtest.mk
@@ -0,0 +1,47 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,unoxml_domtest))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,unoxml_domtest, \
+unoxml/test/domtest \
+))
+
+$(eval $(call gb_CppunitTest_use_api,unoxml_domtest,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_components,unoxml_domtest,\
+configmgr/source/configmgr \
+framework/util/fwk \
+i18npool/util/i18npool \
+sfx2/util/sfx \
+ucb/source/core/ucb1 \
+ucb/source/ucp/file/ucpfile1 \
+unoxml/source/service/unoxml \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,unoxml_domtest, \
+boost_headers \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,unoxml_domtest, \
+comphelper \
+cppu \
+cppuhelper \
+sal \
+test \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,unoxml_domtest))
+$(eval $(call gb_CppunitTest_use_ure,unoxml_domtest))
+$(eval $(call gb_CppunitTest_use_vcl,unoxml_domtest))
+
+# vim: set noet sw=4 ts=4:
diff --git a/unoxml/Module_unoxml.mk b/unoxml/Module_unoxml.mk
index 53cf589..bb06953 100644
--- a/unoxml/Module_unoxml.mk
+++ b/unoxml/Module_unoxml.mk
@@ -24,6 +24,10 @@ $(eval $(call gb_Module_add_targets,unoxml,\
 Library_unordf \
 ))
 
+$(eval $(call gb_Module_add_slowcheck_targets,unoxml,\
+CppunitTest_unoxml_domtest \
+))
+
 ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,unoxml,\
 JunitTest_unoxml_complex \
diff --git a/unoxml/test/domtest.cxx b/unoxml/test/domtest.cxx
index 5d49922..07d1738 100644
--- a/unoxml/test/domtest.cxx
+++ b/unoxml/test/domtest.cxx
@@ -17,28 +17,34 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-// autogenerated file with codegen.pl
-
-#include 
-
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
+#include 
 #include 
 #include 
 #include 
-
 #include "../source/dom/documentbuilder.hxx"
 
 using namespace ::DOM;
 using namespace ::comphelper;
 using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using css::xml::dom::XDocumentBuilder;
+using css::xml::dom::DocumentBuilder;
 
 namespace
 {
@@ -96,17 +102,17 @@ struct ErrorHandler
 ErrorHandler() : mnErrCount(0), mnFatalCount(0), mnWarnCount(0)
 {}
 
-virtual void SAL_CALL error( const uno::Any& ) throw 
(xml::sax::SAXException, uno::RuntimeException)
+virtual void SAL_CALL error( const uno::Any& ) throw 
(xml::sax::SAXException, uno::RuntimeException) SAL_OVERRIDE
 {
 ++mnErrCount;
 }
 
-virtual void SAL_CALL fatalError( const uno::Any& ) throw 
(xml::sax::SAXException, uno::RuntimeException)
+virtual void SAL_CALL fatalError( const uno::Any& ) throw 
(xml::sax::SAXException, uno::RuntimeException) SAL_OVERRIDE
 {
 ++mnFatalCount;
 }
 
-virtual void SAL_CALL warning( const uno::Any& ) throw 
(xml::sax::SAXException, uno::RuntimeException)
+virtual void SAL_CALL warning( const uno::Any& ) throw 
(xml::sax::SAXException, uno::RuntimeException) SAL_OVERRIDE
 {
 ++mnWarnCount;
 }
@@ -116,48 +122,48 @@ struct DocumentHandler
 : public ::cppu::WeakImplHelper1< xml::sax::XFastDocumentHandler >
 {
 // XFastContextHandler
-virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const 
uno::Reference< xml::sax::XFastAttributeList >& Attribs ) throw 
(xml::sax::SAXException, uno::RuntimeException)
+virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const 
uno::Reference< xml::sax::XFastAttributeList >& ) throw 
(xml::sax::SAXException, uno::RuntimeExcepti

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

[Katarina Behrens]

 filter/source/config/fragments/filters/draw8.xcu |2 
 filter/source/config/fragments/filters/draw8_template.xcu|2 
 filter/source/config/fragments/filters/impress8.xcu  |2 
 filter/source/config/fragments/filters/impress8_draw.xcu |2 
 filter/source/config/fragments/filters/impress8_template.xcu |2 
 sd/source/ui/unoidl/UnoDocumentSettings.cxx  |   29 ++-
 sd/source/ui/view/drvwshrg.cxx   |1 
 7 files changed, 34 insertions(+), 6 deletions(-)

New commits:
commit a895a27c6bd0af5c4880bcd9e6238b99af0eed51
Author: Katarina Behrens 
Date:   Wed Sep 17 21:40:34 2014 +0200

fdo#63483: support for modify passwd in Impress and Draw

iow, allow opening Impress and Draw ODF documents read-only

Change-Id: I379b9f92b9bfb20e8177d9a5fae80069d98f
Reviewed-on: https://gerrit.libreoffice.org/11495
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/filter/source/config/fragments/filters/draw8.xcu 
b/filter/source/config/fragments/filters/draw8.xcu
index 6738cd8..70167a7 100644
--- a/filter/source/config/fragments/filters/draw8.xcu
+++ b/filter/source/config/fragments/filters/draw8.xcu
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 
-IMPORT EXPORT TEMPLATE OWN DEFAULT 
PREFERRED ENCRYPTION
+IMPORT EXPORT TEMPLATE OWN DEFAULT 
PREFERRED ENCRYPTION PASSWORDTOMODIFY
 
 
 XML
diff --git a/filter/source/config/fragments/filters/draw8_template.xcu 
b/filter/source/config/fragments/filters/draw8_template.xcu
index b81730e..4103a27 100644
--- a/filter/source/config/fragments/filters/draw8_template.xcu
+++ b/filter/source/config/fragments/filters/draw8_template.xcu
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 
-IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN 
ENCRYPTION
+IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN 
ENCRYPTION PASSWORDTOMODIFY
 
 
 CXMLV
diff --git a/filter/source/config/fragments/filters/impress8.xcu 
b/filter/source/config/fragments/filters/impress8.xcu
index 90e11da..9e564c8 100644
--- a/filter/source/config/fragments/filters/impress8.xcu
+++ b/filter/source/config/fragments/filters/impress8.xcu
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 
-IMPORT EXPORT TEMPLATE OWN DEFAULT 
PREFERRED ENCRYPTION
+IMPORT EXPORT TEMPLATE OWN DEFAULT 
PREFERRED ENCRYPTION PASSWORDTOMODIFY
 
 
 XML
diff --git a/filter/source/config/fragments/filters/impress8_draw.xcu 
b/filter/source/config/fragments/filters/impress8_draw.xcu
index 5a5d5a2..47e0be9 100644
--- a/filter/source/config/fragments/filters/impress8_draw.xcu
+++ b/filter/source/config/fragments/filters/impress8_draw.xcu
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 
-IMPORT EXPORT TEMPLATE OWN 
ENCRYPTION
+IMPORT EXPORT TEMPLATE OWN ENCRYPTION 
PASSWORDTOMODIFY
 
 
 XML
diff --git a/filter/source/config/fragments/filters/impress8_template.xcu 
b/filter/source/config/fragments/filters/impress8_template.xcu
index c812fd2..fb3cf0c 100644
--- a/filter/source/config/fragments/filters/impress8_template.xcu
+++ b/filter/source/config/fragments/filters/impress8_template.xcu
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 
-IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN 
ENCRYPTION
+IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN 
ENCRYPTION PASSWORDTOMODIFY
 
 
 CXMLV
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx 
b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index a0de11f..1a9c67f 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -139,7 +139,7 @@ enum SdDocumentSettingsPropertyHandles
 HANDLE_PRINTERNAME, HANDLE_PRINTERJOB, HANDLE_PARAGRAPHSUMMATION, 
HANDLE_CHARCOMPRESS, HANDLE_ASIANPUNCT, HANDLE_UPDATEFROMTEMPLATE,
 HANDLE_PRINTER_INDEPENDENT_LAYOUT
 // #i33095#
-,HANDLE_LOAD_READONLY, HANDLE_SAVE_VERSION
+,HANDLE_LOAD_READONLY, HANDLE_MODIFY_PASSWD, HANDLE_SAVE_VERSION
 ,HANDLE_SLIDESPERHANDOUT, HANDLE_HANDOUTHORIZONTAL, HANDLE_EMBED_FONTS
 };
 
@@ -200,6 +200,7 @@ enum SdDocumentSettingsPropertyHandles
 { 
OUString("PrinterIndependentLayout"),HANDLE_PRINTER_INDEPENDENT_LAYOUT,::cppu::UnoType::get(),
 0,  0 },
 // --> #i33095#
 { OUString("LoadReadonly"),  HANDLE_LOAD_READONLY,   
::getBooleanCppuType(),0,  0 },
+{ OUString("ModifyPasswordInfo"),HANDLE_MODIFY_PASSWD,   
::getCppuType((uno::Sequence < beans::PropertyValue > *)0),  0,  0 },
 { OUString("SaveVersionOnClose"),HANDLE_SAVE_VERSION,
::getBooleanCppuType(

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

[Noel Grandin]

 include/svl/poolitem.hxx|2 +-
 svl/source/items/cntwall.cxx|2 +-
 svl/source/items/ctypeitm.cxx   |2 +-
 svl/source/items/flagitem.cxx   |2 +-
 svl/source/items/globalnameitem.cxx |2 +-
 svl/source/items/grabbagitem.cxx|2 +-
 svl/source/items/ilstitem.cxx   |2 +-
 svl/source/items/imageitm.cxx   |3 ++-
 svl/source/items/itemset.cxx|   26 +-
 svl/source/items/lckbitem.cxx   |2 +-
 svl/source/items/macitem.cxx|2 +-
 svl/source/items/poolcach.cxx   |4 ++--
 svl/source/items/poolio.cxx |2 +-
 svl/source/items/ptitem.cxx |2 +-
 svl/source/items/rectitem.cxx   |2 +-
 svl/source/items/rngitem.cxx|8 +++-
 svl/source/items/sitem.cxx  |2 +-
 svl/source/items/slstitm.cxx|4 ++--
 svl/source/items/srchitem.cxx   |2 +-
 svl/source/items/style.cxx  |4 ++--
 svl/source/items/szitem.cxx |2 +-
 svl/source/numbers/zforlist.cxx |2 +-
 22 files changed, 40 insertions(+), 41 deletions(-)

New commits:
commit 52b8b3d3a55d38c49e183ec5d6ed5cc012f6f1d0
Author: Noel Grandin 
Date:   Fri Sep 19 08:40:23 2014 +0200

loplugin: cstylecast

Change-Id: I75267bf44d0fd36ff316f59300efd31524da36ef

diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index 3c5db8f..df4b6fb 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -256,7 +256,7 @@ inline bool IsPooledItem( const SfxPoolItem *pItem )
 
 inline bool IsInvalidItem(const SfxPoolItem *pItem)
 {
-return pItem == (SfxPoolItem *)-1;
+return pItem == reinterpret_cast(-1);
 }
 
 
diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx
index ce2fe9d..d0f6202 100644
--- a/svl/source/items/cntwall.cxx
+++ b/svl/source/items/cntwall.cxx
@@ -94,7 +94,7 @@ bool CntWallpaperItem::operator==( const SfxPoolItem& rItem ) 
const
 {
 DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" );
 
-const CntWallpaperItem& rWallItem = (const CntWallpaperItem&)rItem;
+const CntWallpaperItem& rWallItem = static_cast(rItem);
 
 return ( rWallItem._nStyle == _nStyle ) &&
 ( rWallItem._nColor == _nColor ) &&
diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx
index cbc8d28..b734f07 100644
--- a/svl/source/items/ctypeitm.cxx
+++ b/svl/source/items/ctypeitm.cxx
@@ -96,7 +96,7 @@ SvStream & CntContentTypeItem::Store(SvStream & rStream, 
sal_uInt16) const
 // virtual
 bool CntContentTypeItem::operator==( const SfxPoolItem& rOrig ) const
 {
-const CntContentTypeItem& rOther = (const CntContentTypeItem&)rOrig;
+const CntContentTypeItem& rOther = static_cast(rOrig);
 
 if ( ( _eType != CONTENT_TYPE_NOT_INIT ) &&
  ( rOther._eType != CONTENT_TYPE_NOT_INIT ) )
diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx
index b7ac574..bd9c5b9 100644
--- a/svl/source/items/flagitem.cxx
+++ b/svl/source/items/flagitem.cxx
@@ -86,7 +86,7 @@ SfxPoolItem* SfxFlagItem::Create(SvStream &, sal_uInt16) const
 bool SfxFlagItem::operator==( const SfxPoolItem& rItem ) const
 {
 DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" );
-return (((SfxFlagItem&)rItem).nVal == nVal);
+return static_cast(rItem).nVal == nVal;
 }
 
 
diff --git a/svl/source/items/globalnameitem.cxx 
b/svl/source/items/globalnameitem.cxx
index faf8f72..7b7dba9 100644
--- a/svl/source/items/globalnameitem.cxx
+++ b/svl/source/items/globalnameitem.cxx
@@ -55,7 +55,7 @@ SfxGlobalNameItem::~SfxGlobalNameItem()
 
 bool SfxGlobalNameItem::operator==( const SfxPoolItem& rItem ) const
 {
-return ((SfxGlobalNameItem&)rItem).m_aName == m_aName;
+return static_cast(rItem).m_aName == m_aName;
 }
 
 
diff --git a/svl/source/items/grabbagitem.cxx b/svl/source/items/grabbagitem.cxx
index c1b8078..aa2b3e3 100644
--- a/svl/source/items/grabbagitem.cxx
+++ b/svl/source/items/grabbagitem.cxx
@@ -43,7 +43,7 @@ SfxGrabBagItem::~SfxGrabBagItem()
 
 bool SfxGrabBagItem::operator==(const SfxPoolItem& rItem) const
 {
-SfxGrabBagItem* pItem = (SfxGrabBagItem*)&rItem;
+const SfxGrabBagItem* pItem = static_cast(&rItem);
 
 return m_aMap == pItem->m_aMap;
 }
diff --git a/svl/source/items/ilstitem.cxx b/svl/source/items/ilstitem.cxx
index ab7c3f8..58eb459 100644
--- a/svl/source/items/ilstitem.cxx
+++ b/svl/source/items/ilstitem.cxx
@@ -61,7 +61,7 @@ bool SfxIntegerListItem::operator==( const SfxPoolItem& 
rPoolItem ) const
 if ( !rPoolItem.ISA( SfxIntegerListItem ) )
 return false;
 
-const SfxIntegerListItem rItem = (const SfxIntegerListItem&) rPoolItem;
+const SfxIntegerListItem rItem = static_cast(rPoolItem);
 return rItem.m_aList == m_aList;
 }
 
diff --git a/svl/source/items/imageitm.cxx b/svl/source/items/imageitm.cxx
index 99487fa..f81e7bb 100644
--- a/svl/source/items/imageitm.cxx
+++ b/svl/source/items/imageitm.cxx
@@ -61,7 +

Re: X-KDE-Protocols=...,smb,...

[Rene Engelhard]

On Thu, Sep 25, 2014 at 02:32:51PM +0200, Stephan Bergmann wrote:
> If program/libucpgio1lo.so is installed, LO accesses smb URLs via
> GNOME's GIO framework.  For that GIO framework to successfully
> handle smb URLs, at least on Fedora a package gvfs-smb must be
> installed.



> Out of curiosity, I wonder how Debian and Ubuntu (where
> 673be8e76856c6bc39f448f3374db4ae84258952 originates from) handle
> this.---Björn, Rene?

Probably we don't ;)

> Hoever, the TDF LO Linux builds are configured to contain
> program/libcupgvfs1lo.so in a libobasis*-gnome-integration package
> (which requires libgnomevfs-2.so.0), while the *.desktop files are
> in packages that have no dependency on the
> libobasis*-gnome-integration package.

Dito here, with libreoffice-gnome.

> (Independently, it would of course be useful if LO failed
> non-silently if it cannot access an smb URL.)

ACK :)

Regards,

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

[Libreoffice-commits] core.git: scripting/astyle-java.conf scripting/Format_java_code.sh

[rbuj]

 scripting/Format_java_code.sh |2 ++
 scripting/astyle-java.conf|   19 +++
 2 files changed, 21 insertions(+)

New commits:
commit feea4b250ba72984ca4d53bac44fa7dc9a31f63f
Author: rbuj 
Date:   Sat Sep 6 12:19:07 2014 +0200

scripting: Format java code by using astyle tool

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

diff --git a/scripting/Format_java_code.sh b/scripting/Format_java_code.sh
new file mode 100755
index 000..edf75d1
--- /dev/null
+++ b/scripting/Format_java_code.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+astyle --options=astyle-java.conf --verbose --recursive ./*.java
diff --git a/scripting/astyle-java.conf b/scripting/astyle-java.conf
new file mode 100755
index 000..3a6ea94
--- /dev/null
+++ b/scripting/astyle-java.conf
@@ -0,0 +1,19 @@
+--style=java
+--mode=java
+--indent-switches
+--indent-cases
+--min-conditional-indent=0
+--max-instatement-indent=40
+--break-blocks
+--unpad-paren
+--align-reference=name
+--pad-oper
+--unpad-paren
+--add-brackets
+-s4
+--indent-col1-comments
+--lineend=linux
+--ignore-exclude-errors
+--suffix=none
+--preserve-date
+--formatted
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 cui/source/options/optsave.cxx |   26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 1da153b617b80887680be65c1854ef8080c2e1c9
Author: Stephan Bergmann 
Date:   Mon Sep 22 15:11:22 2014 +0200

Consistently use APP_WRITER as an integer, never as a nullptr

(not that it matters much in practice, on platforms where nullptr is 
all-zero
anyway)

Change-Id: I640e4e3e8c77f8c5c59c8e4b51c04f72dc1fadf9

diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index bb01888..5101a21 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -110,13 +110,13 @@ SfxSaveTabPage::SfxSaveTabPage( vcl::Window* pParent, 
const SfxItemSet& rCoreSet
 aODFVersionLB->SetEntryData(2, (void*)8 ); // 1.2 Extended (compat 
mode)
 aODFVersionLB->SetEntryData(3, (void*)0x7fff); // 1.2 Extended 
(recommended)
 
-aDocTypeLB->SetEntryData(0, (void*)APP_WRITER   );
-aDocTypeLB->SetEntryData(1, (void*)APP_WRITER_WEB   );
-aDocTypeLB->SetEntryData(2, (void*)APP_WRITER_GLOBAL);
-aDocTypeLB->SetEntryData(3, (void*)APP_CALC );
-aDocTypeLB->SetEntryData(4, (void*)APP_IMPRESS  );
-aDocTypeLB->SetEntryData(5, (void*)APP_DRAW );
-aDocTypeLB->SetEntryData(6, (void*)APP_MATH );
+aDocTypeLB->SetEntryData(0, reinterpret_cast(APP_WRITER)   );
+aDocTypeLB->SetEntryData(1, reinterpret_cast(APP_WRITER_WEB)   );
+aDocTypeLB->SetEntryData(2, reinterpret_cast(APP_WRITER_GLOBAL));
+aDocTypeLB->SetEntryData(3, reinterpret_cast(APP_CALC) );
+aDocTypeLB->SetEntryData(4, reinterpret_cast(APP_IMPRESS)  );
+aDocTypeLB->SetEntryData(5, reinterpret_cast(APP_DRAW) );
+aDocTypeLB->SetEntryData(6, reinterpret_cast(APP_MATH) );
 
 Link aLink = LINK( this, SfxSaveTabPage, AutoClickHdl_Impl );
 aAutoSaveCB->SetClickHdl( aLink );
@@ -169,12 +169,12 @@ SfxSaveTabPage::SfxSaveTabPage( vcl::Window* pParent, 
const SfxItemSet& rCoreSet
 
 if ( !aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) )
 {
-aSaveAsLB->RemoveEntry(aSaveAsLB->GetEntryPos( (void*) APP_WRITER ));
-aSaveAsLB->RemoveEntry(aSaveAsLB->GetEntryPos( (void*) APP_WRITER_WEB 
));
-aSaveAsLB->RemoveEntry(aSaveAsLB->GetEntryPos( (void*) 
APP_WRITER_GLOBAL ));
-aDocTypeLB->RemoveEntry(aDocTypeLB->GetEntryPos( (void*) APP_WRITER ));
-aDocTypeLB->RemoveEntry(aDocTypeLB->GetEntryPos( (void*) 
APP_WRITER_WEB ));
-aDocTypeLB->RemoveEntry(aDocTypeLB->GetEntryPos( (void*) 
APP_WRITER_GLOBAL ));
+aSaveAsLB->RemoveEntry(aSaveAsLB->GetEntryPos( 
reinterpret_cast(APP_WRITER) ));
+aSaveAsLB->RemoveEntry(aSaveAsLB->GetEntryPos( 
reinterpret_cast(APP_WRITER_WEB) ));
+aSaveAsLB->RemoveEntry(aSaveAsLB->GetEntryPos( 
reinterpret_cast(APP_WRITER_GLOBAL) ));
+aDocTypeLB->RemoveEntry(aDocTypeLB->GetEntryPos( 
reinterpret_cast(APP_WRITER) ));
+aDocTypeLB->RemoveEntry(aDocTypeLB->GetEntryPos( 
reinterpret_cast(APP_WRITER_WEB) ));
+aDocTypeLB->RemoveEntry(aDocTypeLB->GetEntryPos( 
reinterpret_cast(APP_WRITER_GLOBAL) ));
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

X-KDE-Protocols=...,smb,...

[Stephan Bergmann]

 
"add X-KDE-Protocols," first appearing in LO 4.2.0, adds the line


  X-KDE-Protocols=file,http,smb,ftp,webdav

to each of our *.desktop files.

This apparently instructs KDE's Dolphin to pass smb URLs directly to 
soffice, instead of downloading and passing some /var/tmp filepath to 
soffice.  (In the latter case of going via a /var/tmp filepath, Dolphin 
is apparently smart enough to detect if you edit and save that proxy 
document in LO; it then asks you "File Changed - KIOExec: The file 
smb://... has been modified. Do you want to upload the changes?")


Whether LO (on Linux) can access smb URLs depends on a number of factors:

First, either program/libucpgio1lo.so or program/libucpgvfs1lo.so must 
be installed.


If program/libucpgio1lo.so is installed, LO accesses smb URLs via 
GNOME's GIO framework.  For that GIO framework to successfully handle 
smb URLs, at least on Fedora a package gvfs-smb must be installed.


If program/libucpgvfs1lo.so is installed, LO accesses smb URLs via 
GNOME's deprecated GnomeVFS framework.  For that GnomeVFS framework to 
successfully handle smb URLs, at least on Fedora in a GNOME environment 
a package gnome-vfs2-smb must be installed.  On a Fedora KDE spin, not 
even that appears to suffice, there must be some further magic that's 
missing.


If those requirements are not met, passing an smb URL to soffice 
unhelpfully results in soffice silently doing nothing.


On Fedora, where LO is configured to contain program/libucpgio1lo.so, 
this caused problems on Fedora KDE spins, where the gvfs-smb package is 
not installed by default.  This has been addressed now by making the 
Fedora libreoffice-* packages that contain such *.desktop files require 
gvfs-smb.  (Leaving only the nuisance that, even if a user has entered 
an smb password into Dolphin already, LO asks for the password again.)


Out of curiosity, I wonder how Debian and Ubuntu (where 
673be8e76856c6bc39f448f3374db4ae84258952 originates from) handle 
this.---Björn, Rene?


Hoever, the TDF LO Linux builds are configured to contain 
program/libcupgvfs1lo.so in a libobasis*-gnome-integration package 
(which requires libgnomevfs-2.so.0), while the *.desktop files are in 
packages that have no dependency on the libobasis*-gnome-integration 
package.


So a KDE user installing the TDF LO build without also installing the 
libobasis*-gnome-integration package will have access to files via smb 
silently fail.  (And even installing the libobasis*-gnome-integration 
package does not necessarily change that, see above.)


In light of this, is it helpful that we unconditionally claim smb 
support in those X-KDE-Protocols lines?


(Independently, it would of course be useful if LO failed non-silently 
if it cannot access an smb URL.)


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

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

[Stefan Weiberg]

 cui/source/tabpages/numpages.cxx |   41 ++-
 1 file changed, 28 insertions(+), 13 deletions(-)

New commits:
commit c613b5dba883897c927f7b60c84830c62a79d0ea
Author: Stefan Weiberg 
Date:   Fri Sep 12 05:57:02 2014 +

fdo#78783: fixed init position to 1 and using css

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

diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 5585361..5828d67 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -72,14 +72,14 @@
 #include 
 #include 
 
-using namespace com::sun::star;
-using namespace com::sun::star::uno;
-using namespace com::sun::star::beans;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::i18n;
-using namespace com::sun::star::text;
-using namespace com::sun::star::container;
-using namespace com::sun::star::style;
+using namespace css;
+using namespace css::uno;
+using namespace css::beans;
+using namespace css::lang;
+using namespace css::i18n;
+using namespace css::text;
+using namespace css::container;
+using namespace css::style;
 
 #define NUM_PAGETYPE_BULLET 0
 #define NUM_PAGETYPE_SINGLENUM  1
@@ -1169,11 +1169,15 @@ voidSvxNumOptionsTabPage::ActivatePage(const 
SfxItemSet& rSet)
 if(*pActNum != *pSaveNum ||
 nActNumLvl != nTmpNumLvl)
 {
+*pActNum = *pSaveNum;
 nActNumLvl = nTmpNumLvl;
 sal_uInt16 nMask = 1;
 m_pLevelLB->SetUpdateMode(false);
 m_pLevelLB->SetNoSelection();
-m_pLevelLB->SelectEntryPos( pActNum->GetLevelCount(), nActNumLvl == 
SAL_MAX_UINT16);
+if(bModified)
+m_pLevelLB->SelectEntryPos( 0, true);
+else
+m_pLevelLB->SelectEntryPos( pActNum->GetLevelCount(), nActNumLvl 
== SAL_MAX_UINT16);
 if(nActNumLvl != SAL_MAX_UINT16)
 for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
 {
@@ -1182,7 +1186,7 @@ voidSvxNumOptionsTabPage::ActivatePage(const 
SfxItemSet& rSet)
 nMask <<= 1 ;
 }
 m_pLevelLB->SetUpdateMode(true);
-*pActNum = *pSaveNum;
+
 InitControls();
 }
 
@@ -1249,7 +1253,11 @@ voidSvxNumOptionsTabPage::Reset( const SfxItemSet* 
rSet )
 sal_uInt16 nMask = 1;
 m_pLevelLB->SetUpdateMode(false);
 m_pLevelLB->SetNoSelection();
-if(nActNumLvl == SAL_MAX_UINT16)
+if(nActNumLvl == SAL_MAX_UINT16  && !bModified)
+{
+m_pLevelLB->SelectEntryPos( 0, true);
+}
+else if (nActNumLvl == SAL_MAX_UINT16)
 {
 m_pLevelLB->SelectEntryPos( pSaveNum->GetLevelCount(), true);
 }
@@ -2923,7 +2931,10 @@ void SvxNumPositionTabPage::ActivatePage(const 
SfxItemSet& rSet)
 sal_uInt16 nMask = 1;
 m_pLevelLB->SetUpdateMode(false);
 m_pLevelLB->SetNoSelection();
-m_pLevelLB->SelectEntryPos( pActNum->GetLevelCount(), nActNumLvl == 
SAL_MAX_UINT16);
+if(bModified)
+m_pLevelLB->SelectEntryPos( 0, true);
+else
+m_pLevelLB->SelectEntryPos( pActNum->GetLevelCount(), nActNumLvl 
== SAL_MAX_UINT16);
 if(nActNumLvl != SAL_MAX_UINT16)
 for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
 {
@@ -3009,7 +3020,11 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet* 
rSet )
 sal_uInt16 nMask = 1;
 m_pLevelLB->SetUpdateMode(false);
 m_pLevelLB->SetNoSelection();
-if(nActNumLvl == SAL_MAX_UINT16)
+if(nActNumLvl == SAL_MAX_UINT16  && !bModified)
+{
+m_pLevelLB->SelectEntryPos( 0, true);
+}
+else if (nActNumLvl == SAL_MAX_UINT16)
 {
 m_pLevelLB->SelectEntryPos( pSaveNum->GetLevelCount(), true);
 }
___
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' - sd/source

[Maxim Monastirsky]

 sd/source/ui/controller/slidelayoutcontroller.cxx |   16 
 sd/source/ui/controller/slidelayoutcontroller.hxx |4 
 2 files changed, 20 insertions(+)

New commits:
commit d5dcbd6cb2cd1f8d11428bed88730f7f513784a7
Author: Maxim Monastirsky 
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 
Tested-by: Caolán McNamara 

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;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/source/core/data/column4.cxx |7 ++-
 sc/source/core/data/table3.cxx  |7 +--
 2 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 59e7789744c99b6431461f14694b6f9ab2492a80
Author: Kohei Yoshida 
Date:   Thu Sep 18 12:13:13 2014 -0400

fdo#83764: Ensure that the row position is below MAXROW.

When attempting to split formula groups, else multi_type_vector would
try to locate a block outside its logical range.

Change-Id: I424ede112138de459b5ba3bff5e021c4407ccf3d
(cherry picked from commit 0ef6263ed2b31b8f9e431971e6c5e8928996c1c8)
Reviewed-on: https://gerrit.libreoffice.org/11518
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 3f26db1..93fca48 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -916,11 +916,16 @@ public:
 
 void ScColumn::SplitFormulaGroupByRelativeRef( const ScRange& rBoundRange )
 {
+if (rBoundRange.aStart.Row() >= MAXROW)
+// Nothing to split.
+return;
+
 std::vector aBounds;
 
 // Cut at row boundaries first.
 aBounds.push_back(rBoundRange.aStart.Row());
-aBounds.push_back(rBoundRange.aEnd.Row()+1);
+if (rBoundRange.aEnd.Row() < MAXROW)
+aBounds.push_back(rBoundRange.aEnd.Row()+1);
 sc::SharedFormulaUtil::splitFormulaCellGroups(maCells, aBounds);
 
 RelativeRefBoundChecker aFunc(rBoundRange);
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 613cb1f..c5bfe75 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -772,8 +772,11 @@ void ScTable::SortReorderByColumn(
 sc::CellStoreType& rCells = aCol[nCol].maCells;
 sc::CellStoreType::position_type aPos = rCells.position(nRow1);
 sc::SharedFormulaUtil::joinFormulaCellAbove(aPos);
-aPos = rCells.position(aPos.first, nRow2+1);
-sc::SharedFormulaUtil::joinFormulaCellAbove(aPos);
+if (nRow2 < MAXROW)
+{
+aPos = rCells.position(aPos.first, nRow2+1);
+sc::SharedFormulaUtil::joinFormulaCellAbove(aPos);
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extras/source include/sfx2 sfx2/Library_sfx.mk sfx2/source sfx2/uiconfig

[Efe Gürkan YALAMAN]

 extras/source/glade/libreoffice-catalog.xml.in |2 -
 include/sfx2/templatedefaultview.hxx   |   31 ++
 sfx2/Library_sfx.mk|1 
 sfx2/source/control/templatecontaineritem.cxx  |   15 +++-
 sfx2/source/control/templatedefaultview.cxx|   42 +
 sfx2/source/control/templateviewitem.cxx   |   15 +++-
 sfx2/source/dialog/backingwindow.cxx   |6 +--
 sfx2/source/dialog/backingwindow.hxx   |4 +-
 sfx2/uiconfig/ui/startcenter.ui|2 -
 9 files changed, 107 insertions(+), 11 deletions(-)

New commits:
commit 5911154175b381b96991ec13c3d3d4619ad13d1d
Author: Efe Gürkan YALAMAN 
Date:   Tue Sep 16 02:30:59 2014 +0300

Start Center Template Manager Tweaks

Template Manager and the related Start Center view has same
transparent highlight color as Recent Documents. Also Template
thumbnail containers should have the same size as Recent Docs view.

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

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 12ff8b4..98e5e26 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -755,7 +755,7 @@
 
-
 http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_SFX2_TEMPLATEDEFAULTVIEW_HXX
+#define INCLUDED_SFX2_TEMPLATEDEFAULTVIEW_HXX
+
+#include 
+#include 
+
+class SFX2_DLLPUBLIC TemplateDefaultView : public TemplateLocalView
+{
+public:
+TemplateDefaultView(Window *pParent);
+virtual ~TemplateDefaultView();
+
+virtual void reload() SAL_OVERRIDE;
+protected:
+longmnItemMaxSize;
+longmnTextHeight;
+longmnItemPadding;
+size_t mnLastMouseDownItem;
+};
+
+#endif // INCLUDED_SFX2_TEMPLATEDEFAULTVIEW_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 998dc63..ae85eaa 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -148,6 +148,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
 sfx2/source/control/sorgitm \
 sfx2/source/control/statcach \
 sfx2/source/control/templateabstractview \
+   sfx2/source/control/templatedefaultview \
 sfx2/source/control/templateviewitem \
 sfx2/source/control/templatelocalview \
 sfx2/source/control/templatecontaineritem \
diff --git a/sfx2/source/control/templatecontaineritem.cxx 
b/sfx2/source/control/templatecontaineritem.cxx
index 2ad7b9f3..d16cb69 100644
--- a/sfx2/source/control/templatecontaineritem.cxx
+++ b/sfx2/source/control/templatecontaineritem.cxx
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace basegfx;
 using namespace basegfx::tools;
@@ -67,14 +68,24 @@ void TemplateContainerItem::Paint 
(drawinglayer::processor2d::BaseProcessor2D *p
 
 BColor aFillColor = pAttrs->aFillColor;
 drawinglayer::primitive2d::Primitive2DSequence aSeq(nSeqSize);
+double fTransparence = 0.0;
 
 // Draw background
 if ( mbSelected || mbHover )
 aFillColor = pAttrs->aHighlightColor;
 
-aSeq[nCount++] = drawinglayer::primitive2d::Primitive2DReference( new 
PolyPolygonColorPrimitive2D(
+if (mbHover)
+{
+const SvtOptionsDrawinglayer aSvtOptionsDrawinglayer;
+fTransparence = 
aSvtOptionsDrawinglayer.GetTransparentSelectionPercent() * 0.01;
+}
+
+aSeq[nCount++] = drawinglayer::primitive2d::Primitive2DReference( new 
PolyPolygonSelectionPrimitive2D(

B2DPolyPolygon(Polygon(maDrawArea,5,5).getB2DPolygon()),
-   aFillColor));
+   aFillColor,
+   fTransparence,
+   0.0,
+   true));
 
 // Create rounded rectangle border
 aSeq[nCount++] = drawinglayer::primitive2d::Primitive2DReference( new 
PolygonStrokePrimitive2D(
diff --git a/sfx2/source/control/templatedefaultview.cxx 
b/sfx2/source/control/templatedefaultview.cxx
new file mode 100644
index 000..9e2f83a
--- /dev/null
+++ b/sfx2/source/control/templatedefaultview.cxx
@@ -0,0 +1,42 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 
-*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+#include 
+#include 
+
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL 
makeTemplateDefaultView(vcl::Window *pParent, VclBuilder:

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

[Julien Nabet]

 sw/source/core/text/EnhancedPDFExportHelper.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 86af599c81dc695400b0cc999f559bcf9070e8b9
Author: Julien Nabet 
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 
Tested-by: Caolán McNamara 

diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx 
b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 68b8d4c..5d9a488 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -1934,11 +1934,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: chart2/source

[xukai]

 chart2/source/view/charttypes/GL3DBarChart.cxx |4 ++--
 chart2/source/view/main/3DChartObjects.cxx |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 62deb6d6227105d67e46dbfb89a43dc5e510791a
Author: xukai 
Date:   Wed Sep 24 13:47:53 2014 +0800

Changing the font properties makes it look better

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

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
old mode 100644
new mode 100755
index 05738d7..45aa0b3
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -1244,7 +1244,7 @@ void GL3DBarChart::addMovementScreenText(sal_uInt32 
nBarId)
 OUString aBarValue = OUString("Value: ") + 
OUString::number(rBarInfo.mnVal);
 maScreenTextShapes.push_back(new opengl3D::ScreenText(mpRenderer.get(), 
*mpTextCache, aBarValue, glm::vec4(0.0f, 0.0f, 1.0f, 0.0f), CALC_POS_EVENT_ID, 
true));
 const opengl3D::TextCacheItem& rTextCache = 
mpTextCache->getText(aBarValue);
-float nRectWidth = (float)rTextCache.maSize.Width() / 
(float)rTextCache.maSize.Height() * 0.015;
+float nRectWidth = (float)rTextCache.maSize.Width() / 
(float)rTextCache.maSize.Height() * 0.024;
 opengl3D::ScreenText* pScreenText = 
static_cast(&maScreenTextShapes.back());
 pScreenText->setPosition(glm::vec2(-nRectWidth / 2, 0.03f), 
glm::vec2(nRectWidth / 2, -0.03f), aTextPos);
 }
@@ -1441,7 +1441,7 @@ void GL3DBarChart::updateScroll()
 OUString aBarValue = OUString("Value: ") + 
OUString::number(aBarInfoList[i].mnVal);
 maScreenTextShapes.push_back(new 
opengl3D::ScreenText(mpRenderer.get(), *mpTextCache, aBarValue, glm::vec4(0.0f, 
0.0f, 1.0f, 0.0f), CALC_POS_EVENT_ID, true));
 const opengl3D::TextCacheItem& rTextCache = 
mpTextCache->getText(aBarValue);
-float nRectWidth = (float)rTextCache.maSize.Width() / 
(float)rTextCache.maSize.Height() * 0.015;
+float nRectWidth = (float)rTextCache.maSize.Width() / 
(float)rTextCache.maSize.Height() * 0.024;
 glm::vec3 aTextPos = glm::vec3(aBarInfoList[i].maPos.x + 
BAR_SIZE_X / 2.0f,
   aBarInfoList[i].maPos.y + BAR_SIZE_Y / 
2.0f,
   aBarInfoList[i].maPos.z);
diff --git a/chart2/source/view/main/3DChartObjects.cxx 
b/chart2/source/view/main/3DChartObjects.cxx
index 13d1fb3..7bf6966 100755
--- a/chart2/source/view/main/3DChartObjects.cxx
+++ b/chart2/source/view/main/3DChartObjects.cxx
@@ -79,7 +79,7 @@ const TextCacheItem& TextCache::getText(OUString const & 
rText, bool bIs3dText)
 VirtualDevice aDevice(*Application::GetDefaultDevice(), 0, 0);
 vcl::Font aFont;
 if(bIs3dText)
-aFont = vcl::Font("postoffice Bold",Size(0,0));
+aFont = vcl::Font("Brillante St",Size(0,0));
 else
 aFont = aDevice.GetFont();
 aFont.SetSize(Size(0, 96));
___
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' - dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk dbaccess/CppunitTest_dbaccess_nolib_save.mk dbaccess/Module_dbaccess.mk dbaccess/qa

[Lionel Elie Mamane]

 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 +++
 5 files changed, 520 insertions(+)

New commits:
commit 7fb3a39b7492399fd8bdd69589c528c7ded1c1a9
Author: Lionel Elie Mamane 
Date:   Thu Sep 4 11:59:11 2014 +0200

fdo#52076 unittest

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

diff --git a/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk 
b/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk
new file mode 100644
index 000..408c0bf
--- /dev/null
+++ b/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk
@@ -0,0 +1,119 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,dbaccess_empty_stdlib_save))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_empty_stdlib_save, 
\
+dbaccess/qa/extras/empty-stdlib-save \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,dbaccess_empty_stdlib_save,\
+boost_headers \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,dbaccess_empty_stdlib_save, \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+dba \
+dbu \
+sdbt \
+drawinglayer \
+editeng \
+for \
+forui \
+i18nlangtag \
+msfilter \
+oox \
+sal \
+salhelper \
+sax \
+sb \
+sfx \
+sot \
+svl \
+svt \
+svx \
+svxcore \
+test \
+subsequenttest \
+tl \
+tk \
+ucbhelper \
+   unotest \
+utl \
+vbahelper \
+vcl \
+xo \
+   $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,dbaccess_empty_stdlib_save,\
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,dbaccess_empty_stdlib_save,\
+offapi \
+oovbaapi \
+udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,dbaccess_empty_stdlib_save))
+$(eval $(call gb_CppunitTest_use_vcl,dbaccess_empty_stdlib_save))
+
+$(eval $(call gb_CppunitTest_use_components,dbaccess_empty_stdlib_save,\
+basic/util/sb \
+comphelper/util/comphelp \
+configmgr/source/configmgr \
+dbaccess/util/dba \
+dbaccess/util/dbu \
+dbaccess/util/sdbt \
+dbaccess/source/filter/xml/dbaxml \
+filter/source/config/cache/filterconfig1 \
+forms/util/frm \
+framework/util/fwk \
+i18npool/util/i18npool \
+linguistic/source/lng \
+oox/util/oox \
+package/source/xstor/xstor \
+package/util/package2 \
+sax/source/expatwrap/expwrap \
+scripting/source/basprov/basprov \
+scripting/util/scriptframe \
+sfx2/util/sfx \
+sot/util/sot \
+svl/source/fsstor/fsstorage \
+svl/util/svl \
+toolkit/util/tk \
+ucb/source/core/ucb1 \
+ucb/source/ucp/file/ucpfile1 \
+ucb/source/ucp/tdoc/ucptdoc1 \
+unotools/util/utl \
+unoxml/source/rdf/unordf \
+unoxml/source/service/unoxml \
+xmloff/util/xo \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,dbaccess_empty_stdlib_save))
+
+$(eval $(call 
gb_CppunitTest_use_filter_configuration,dbaccess_empty_stdlib_save))
+
+$(eval $(call 
gb_CppunitTest_use_unittest_configuration,dbaccess_empty_stdlib_save))
+
+$(call gb_CppunitTest_get_target,dbaccess_empty_stdlib_save) : 
$(WORKDIR)/CppunitTest/testEmptyStdlibSave.odb
+$(WORKDIR)/CppunitTest/testEmptyStdlibSave.odb : 
$(SRCDIR)/dbaccess/qa/extras/testdocuments/testDialogSave.odb
+   mkdir -p $(dir $@)
+   cp -P -f "$<" "$@"
+.PHONY: $(WORKDIR)/CppunitTest/testEmptyStdlibSave.odb
+
+$(call gb_CppunitTest_get_target,dbaccess_empty_stdlib_save): \
+$(call gb_AllLangResTarget_get_target,ofa)
+
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/CppunitTest_dbaccess_nolib_save.mk 
b/dbaccess/CppunitTest_dbaccess_nolib_save.mk
new file mode 100644
index 000..6684d72
--- /dev/null
+++ b/dbaccess/CppunitTest_dbaccess_nolib_save.mk
@@ -0,0 +1,119 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,dbaccess_nolib_save))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_nolib_save, \
+dbaccess/qa/extras/nolib-save \
+))
+
+$(eval $(

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - basic/source

[Lionel Elie Mamane]

 basic/source/uno/namecont.cxx |   17 +++--
 1 file changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 97fbd19655bd83d9f3682627f88737daf0ca5c39
Author: Lionel Elie Mamane 
Date:   Thu Sep 4 11:56:12 2014 +0200

fdo#52076 remove Library dir when no library

when saving to same storage (in place)
we already did that when empty "Standard" was the only library,
but not when there was no library...
Cannot get through that state in through UI, but possible through scripting.

Change-Id: I0f1129e034ac31b3eaf6bd388a03aee5aae5b87e
Reviewed-on: https://gerrit.libreoffice.org/11276
Reviewed-by: Muthu Subramanian K 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index abdd3d5..61672d3 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -1795,18 +1795,22 @@ void SfxLibraryContainer::storeLibraries_Impl( const 
uno::Reference< embed::XSto
 nLibsToSave--;
 }
 }
-if( !nLibsToSave )
-{
-return;
-}
-boost::scoped_ptr< ::xmlscript::LibDescriptorArray > pLibArray(new 
::xmlscript::LibDescriptorArray(nLibsToSave));
-
 // Write to storage?
 bool bStorage = i_rStorage.is();
 uno::Reference< embed::XStorage > xSourceLibrariesStor;
 uno::Reference< embed::XStorage > xTargetLibrariesStor;
 OUString sTempTargetStorName;
 const bool bInplaceStorage = bStorage && ( i_rStorage == mxStorage );
+
+if( nLibsToSave == 0 )
+{
+if ( bInplaceStorage && mxStorage->hasByName(maLibrariesDir) )
+{
+mxStorage->removeElement(maLibrariesDir);
+}
+return;
+}
+
 if ( bStorage )
 {
 // Don't write if only empty standard lib exists
@@ -1884,6 +1888,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const 
uno::Reference< embed::XSto
 int iArray = 0;
 pName = aNames.getConstArray();
 ::xmlscript::LibDescriptor aLibDescriptorForExtensionLibs;
+boost::scoped_ptr< ::xmlscript::LibDescriptorArray > pLibArray(new 
::xmlscript::LibDescriptorArray(nLibsToSave));
 for( ; pName != pNamesEnd; ++pName )
 {
 SfxLibrary* pImplLib = getImplLib( *pName );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Matthew J . Francis]

 sfx2/source/control/thumbnailview.cxx |3 ++-
 vcl/unx/gtk/window/gloactiongroup.cxx |2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 456fb845113ac79954027728c5773f4552b33501
Author: Matthew J. Francis 
Date:   Thu Sep 25 18:44:52 2014 +0800

Fix miscellaneous memory leaks

thumbnailview.cxx: ::ImplInitSettings is called from various
places other than the constructor, so mpItemAttrs must be
freed each time
gloactiongroup.cxx: Must call g_list_free on list returned by
g_hash_table_get_keys

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

diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index 9bf3df1..96ae388 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -59,6 +59,7 @@ enum
 ThumbnailView::ThumbnailView (vcl::Window *pParent, WinBits nWinStyle, bool 
bDisableTransientChildren)
 : Control( pParent, nWinStyle )
 {
+mpItemAttrs = NULL;
 ImplInit();
 mbIsTransientChildrenDisabled = bDisableTransientChildren;
 }
@@ -215,7 +216,7 @@ void ThumbnailView::ImplInitSettings( bool bFont, bool 
bForeground, bool bBackgr
 SetBackground( aColor );
 }
 
-
+delete mpItemAttrs;
 mpItemAttrs = new ThumbnailItemAttributes;
 mpItemAttrs->aFillColor = maColor.getBColor();
 mpItemAttrs->aHighlightColor = 
rStyleSettings.GetHighlightColor().getBColor();
diff --git a/vcl/unx/gtk/window/gloactiongroup.cxx 
b/vcl/unx/gtk/window/gloactiongroup.cxx
index e6c10b7..60f46cd 100644
--- a/vcl/unx/gtk/window/gloactiongroup.cxx
+++ b/vcl/unx/gtk/window/gloactiongroup.cxx
@@ -430,6 +430,8 @@ g_lo_action_group_clear (GLOActionGroup  *group)
 {
 g_lo_action_group_remove (group, (gchar*) element->data);
 }
+
+g_list_free (keys);
 }
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - cppcanvas/qa svx/source sw/source vcl/source

[Caolán McNamara]

 cppcanvas/qa/extras/emfplus/emfplus.cxx |1 +
 svx/source/tbxctrls/PaletteManager.cxx  |4 +++-
 sw/source/filter/html/htmlflywriter.cxx |2 +-
 vcl/source/window/layout.cxx|2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit d7fdf70c4433a41debb4729607df081f15b4ed54
Author: Caolán McNamara 
Date:   Thu Sep 25 13:11:13 2014 +0100

coverity#1241427 Unchecked dynamic_cast

Change-Id: Ie011d0bcc504c6c17a525abb368e69009a3d2d2e

diff --git a/cppcanvas/qa/extras/emfplus/emfplus.cxx 
b/cppcanvas/qa/extras/emfplus/emfplus.cxx
index 68694b4..70ee827 100644
--- a/cppcanvas/qa/extras/emfplus/emfplus.cxx
+++ b/cppcanvas/qa/extras/emfplus/emfplus.cxx
@@ -51,6 +51,7 @@ public:
 {
 mxComponent = loadFromDesktop(getURLFromSrc(mpTestDocumentPath) + 
OUString::createFromAscii(pName), "com.sun.star.drawing.DrawingDocument");
 SfxBaseModel* pModel = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pModel);
 SfxObjectShell* pShell = pModel->GetObjectShell();
 boost::shared_ptr pMetaFile = 
pShell->GetPreviewMetaFile();
 BitmapEx aResultBitmap;
commit cadcbae92323cc715fc7e8241e5b9a6369d20eb8
Author: Caolán McNamara 
Date:   Thu Sep 25 11:46:00 2014 +0100

coverity#1241396 Uninitialized pointer field

Change-Id: Ib9c38ae857125036252ba27ebd03f428046724e0

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 9eb085b..3a898f5 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1940,6 +1940,8 @@ MessageDialog::MessageDialog(vcl::Window* pParent, 
WinBits nStyle)
 : Dialog(pParent, nStyle)
 , m_eButtonsType(VCL_BUTTONS_NONE)
 , m_eMessageType(VCL_MESSAGE_INFO)
+, m_pOwnedContentArea(NULL)
+, m_pOwnedActionArea(NULL)
 , m_pGrid(NULL)
 , m_pImage(NULL)
 , m_pPrimaryMessage(NULL)
commit 4e388f8b81afdb780c0f75df657b3a2063fc9ff1
Author: Caolán McNamara 
Date:   Thu Sep 25 11:42:04 2014 +0100

coverity#1241102 Uninitialized pointer field

Change-Id: I10580e92da47b97d8d496366833e79a89cbd9260

diff --git a/svx/source/tbxctrls/PaletteManager.cxx 
b/svx/source/tbxctrls/PaletteManager.cxx
index b104fe9..ce7e2ef 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -34,6 +34,7 @@ PaletteManager::PaletteManager() :
 mnNumOfPalettes(2),
 mnCurrentPalette(0),
 mnColorCount(0),
+mpBtnUpdater(NULL),
 mLastColor(COL_AUTO)
 {
 LoadPalettes();
@@ -201,7 +202,8 @@ void PaletteManager::PopupColorPicker(const OUString& 
aCommand)
 aColorDlg.SetMode( svtools::ColorPickerMode_MODIFY );
 if( aColorDlg.Execute() == RET_OK )
 {
-mpBtnUpdater->Update( aColorDlg.GetColor() );
+if (mpBtnUpdater)
+mpBtnUpdater->Update( aColorDlg.GetColor() );
 mLastColor = aColorDlg.GetColor();
 AddRecentColor( mLastColor );
 DispatchColorCommand(aCommand, mLastColor);
commit f6a6f240711d39df9669086453cb3bce34c93cab
Author: Caolán McNamara 
Date:   Thu Sep 25 11:38:57 2014 +0100

coverity#1240270 Copy-paste error

regression from

commit 03fe839d6e76ed8b1dfb65093ab59a8904852ff6
Date:   Sat Sep 20 15:41:13 2014 +0200
html export: rework image output to use HTML writer

Change-Id: If50d4e3cc2d19ea35d41e848cb5b9f92f356bc59

diff --git a/sw/source/filter/html/htmlflywriter.cxx 
b/sw/source/filter/html/htmlflywriter.cxx
index 94b5118..6a0d313 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -988,7 +988,7 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& 
aHtml, const SwFrmFmt& rF
 ((nPrcHeight && nPrcHeight!=255) || aPixelSz.Height()) )
 {
 OString sHeight;
-if (nPrcWidth)
+if (nPrcHeight)
 sHeight = OString::number(static_cast(nPrcHeight)) 
+ "%";
 else
 sHeight = 
OString::number(static_cast(aPixelSz.Height()));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com bridges/test codemaker/source framework/qa javaunohelper/com jurt/com qadevOOo/runner qadevOOo/tests ridljar/com scripting/java xmerge/source xmlsecurity/test_

[Noel Grandin]

 bean/com/sun/star/beans/LocalOfficeConnection.java 
   |2 
 bean/com/sun/star/comp/beans/LocalOfficeConnection.java
   |2 
 bridges/test/java_uno/nativethreadpool/Relay.java  
   |8 
 codemaker/source/javamaker/javatype.cxx
   |  137 +++
 framework/qa/complex/framework/recovery/RecoveryTools.java 
   |   16 
 javaunohelper/com/sun/star/comp/helper/Bootstrap.java  
   |2 
 
javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
  |   14 
 
javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java
|8 
 
javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
  |   16 
 
javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java
|   12 
 javaunohelper/com/sun/star/lib/uno/helper/Factory.java 
   |7 
 javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java  
   |2 
 jurt/com/sun/star/comp/connections/PipedConnection.java
   |7 
 jurt/com/sun/star/comp/loader/FactoryHelper.java   
   |   14 
 jurt/com/sun/star/comp/servicemanager/ServiceManager.java  
   |2 
 jurt/com/sun/star/lib/connections/socket/socketAcceptor.java   
   |7 
 jurt/com/sun/star/lib/connections/socket/socketConnector.java  
   |9 
 
jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java
 |4 
 
jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java
|6 
 jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java   
   |  352 --
 jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java 
   |  279 +++
 jurt/com/sun/star/lib/uno/protocols/urp/urp.java   
   |2 
 qadevOOo/runner/lib/StatusException.java   
   |8 
 qadevOOo/runner/util/UITools.java  
   |2 
 qadevOOo/runner/util/utils.java
   |4 
 qadevOOo/tests/java/mod/_sd/DrawController_HandoutView.java
   |2 
 qadevOOo/tests/java/mod/_sd/DrawController_NotesView.java  
   |2 
 qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java
   |2 
 qadevOOo/tests/java/mod/_sd/DrawController_PresentationView.java   
   |2 
 ridljar/com/sun/star/uno/Type.java 
   |2 
 ridljar/com/sun/star/uno/UnoRuntime.java   
   |8 
 scripting/java/com/sun/star/script/framework/container/Parcel.java 
   |   10 
 scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
   |   32 
 scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
   |   11 
 scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java  
   |4 
 scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java  
   |   15 
 
scripting/java/org/openoffice/netbeans/modules/office/wizard/InstallationPathDescriptor.java
  |   20 
 
scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelPropertiesVisualPanel.java
 |   11 
 
scripting/java/org/openoffice/netbeans/modules/office/wizard/SelectPathVisualPanel.java
   |   11 
 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java 
   |   11 
 
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
 |7 
 xmlsecurity/test_docs/tools/httpserv/src/httpserv/Main.java
   |4 
 42 files changed, 556 insertions(+), 520 deletions(-)

New commits:
commit 83636d2c09802aeeb1b30078022d228d04da21eb
Author: Noel Grandin 
Date:   Fri Aug 15 16:17:25 2014 +0200

java: when rethrowing exceptions, store the original cause

so that we get a nice complete stacktrace when it hits the final
handler

Change-Id: Iec4fcc15a2a25c55f591b5e069dce3d010197a90

diff --git a/bean/com/sun/star/beans/LocalOfficeConnection.java 
b/bean/com/sun/star/beans/LocalOfficeConnection.java
index b091d54..a47650d 100644
--- a/bean/com/sun/star/beans/LocalOfficeConnection.java
+++ b

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

[Michael Stahl]

 dbaccess/source/ui/dlg/odbcconfig.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit cf49392511e98851174b353782df9eb6bac46f77
Author: Michael Stahl 
Date:   Thu Sep 25 13:11:51 2014 +0200

dbaccess: C2668: ambiguous call to overloaded function

Change-Id: I49522f0cd3c5749a5a0116e134fa2a93bd3e50c3

diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx 
b/dbaccess/source/ui/dlg/odbcconfig.cxx
index 557af35..e75b160 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.cxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.cxx
@@ -296,9 +296,8 @@ protected:
 };
 
 // OOdbcManagement
-OOdbcManagement::OOdbcManagement( const Link& _rAsyncFinishCallback )
-:m_pProcessWait( NULL )
-,m_aAsyncFinishCallback( _rAsyncFinishCallback )
+OOdbcManagement::OOdbcManagement(const Link& rAsyncFinishCallback)
+: m_aAsyncFinishCallback(rAsyncFinishCallback)
 {
 }
 
___
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 - comphelper/source include/comphelper sax/source

[Matúš Kukan]

 comphelper/source/streaming/seqstream.cxx |9 +
 include/comphelper/seqstream.hxx  |1 -
 sax/source/tools/fastserializer.cxx   |2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)

New commits:
commit 018f1deae884febbbe639c7ee46b45ce4807e9d3
Author: Matúš Kukan 
Date:   Thu Sep 25 11:39:11 2014 +0200

Remove mutex from OSequenceOutputStream; it's intended to be fast

Make the caller responsible for using it wisely.
AFAICS it's used only in FastSaxSerializer, so far.

Change-Id: I50d48fd7f3e6cdeb9e4637868da213b8171e542b

diff --git a/comphelper/source/streaming/seqstream.cxx 
b/comphelper/source/streaming/seqstream.cxx
index 5bc44a5..d66ce3b 100644
--- a/comphelper/source/streaming/seqstream.cxx
+++ b/comphelper/source/streaming/seqstream.cxx
@@ -159,7 +159,6 @@ OSequenceOutputStream::OSequenceOutputStream(Sequence< 
sal_Int8 >& _rSeq, double
 
 void SAL_CALL OSequenceOutputStream::writeBytes( const Sequence< sal_Int8 >& 
_rData ) throw(NotConnectedException, BufferSizeExceededException, IOException, 
RuntimeException, std::exception)
 {
-MutexGuard aGuard(m_aMutex);
 if (!m_bConnected)
 throw NotConnectedException();
 
@@ -210,7 +209,6 @@ void SAL_CALL OSequenceOutputStream::writeBytes( const 
Sequence< sal_Int8 >& _rD
 
 void SAL_CALL OSequenceOutputStream::flush(  ) throw(NotConnectedException, 
BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
-MutexGuard aGuard(m_aMutex);
 if (!m_bConnected)
 throw NotConnectedException();
 
@@ -221,12 +219,7 @@ void SAL_CALL OSequenceOutputStream::flush(  ) 
throw(NotConnectedException, Buff
 
 void SAL_CALL OSequenceOutputStream::closeOutput(  ) 
throw(NotConnectedException, BufferSizeExceededException, IOException, 
RuntimeException, std::exception)
 {
-MutexGuard aGuard(m_aMutex);
-if (!m_bConnected)
-throw NotConnectedException();
-
-// cut the sequence to the real size
-m_rSequence.realloc(m_nSize);
+flush();
 // and don't allow any further accesses
 m_bConnected = false;
 }
diff --git a/include/comphelper/seqstream.hxx b/include/comphelper/seqstream.hxx
index d4f301c..13dd4dc 100644
--- a/include/comphelper/seqstream.hxx
+++ b/include/comphelper/seqstream.hxx
@@ -89,7 +89,6 @@ protected:
 sal_Int32   m_nSize;
 
 boolm_bConnected; ///< 
closeOutput has been called ?
-::osl::Mutexm_aMutex;
 
 public:
 /** constructs the object. Everything written into the stream through the 
XOutputStream methods will be forwarded
commit 5811fde317f78fd0713414b2e0d40522251b855d
Author: Matúš Kukan 
Date:   Thu Sep 25 11:07:21 2014 +0200

FastSerializer: We already know the attribute value

Change-Id: I6996e15f99b94b50c1903092d7424a96339ccfaf

diff --git a/sax/source/tools/fastserializer.cxx 
b/sax/source/tools/fastserializer.cxx
index a9520e4..dfa37c7 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -271,7 +271,7 @@ namespace sax_fastparser {
 
 writeBytes(toUnoSequence(maEqualSignAndQuote));
 
-write(escapeXml(Attribs->getValue(pFastAttr[j].Token)));
+write(escapeXml(pFastAttr[j].Value));
 
 writeBytes(toUnoSequence(maQuote));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sfx2/source/toolbox/tbxitem.cxx |   12 ++--
 ucb/source/ucp/gio/gio_seekable.cxx |4 
 2 files changed, 6 insertions(+), 10 deletions(-)

New commits:
commit be7a99bca77cd7176f2c01cfff42801475f90f82
Author: Caolán McNamara 
Date:   Thu Sep 25 11:36:34 2014 +0100

coverity#1240266 Logically dead code

Change-Id: I97256c687c6d56beef2c3664bbba8c43f685228b

diff --git a/ucb/source/ucp/gio/gio_seekable.cxx 
b/ucb/source/ucp/gio/gio_seekable.cxx
index 26e222a..ba338c0 100644
--- a/ucb/source/ucp/gio/gio_seekable.cxx
+++ b/ucb/source/ucp/gio/gio_seekable.cxx
@@ -110,10 +110,6 @@ sal_Int64 SAL_CALL Seekable::getLength() throw( 
io::IOException, uno::RuntimeExc
 bOk = true;
 }
 
-if (!bOk)
-throw io::IOException("Getting size unsupported",
-static_cast< cppu::OWeakObject * >(this));
-
 return nSize;
 }
 
commit c7b6f0733127863ace4f351629301990f99a2178
Author: Caolán McNamara 
Date:   Thu Sep 25 11:34:58 2014 +0100

coverity#1240261 Logically dead code

we must check the new proposed state for sanity, not the
old state

Change-Id: Iabab0ccda4942ec82b243ad07762187be916d43f

diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index a6c3be4..d0486db 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -549,9 +549,9 @@ throw ( ::com::sun::star::uno::RuntimeException, 
std::exception )
 rEvent.State >>= aItemStatus;
 SfxItemState tmpState = (SfxItemState) aItemStatus.State;
 // make sure no-one tries to send us a combination of 
states
-if (eState != SfxItemState::UNKNOWN && eState != 
SfxItemState::DISABLED &&
-eState != SfxItemState::READONLY && eState != 
SfxItemState::DONTCARE &&
-eState != SfxItemState::DEFAULT && eState != 
SfxItemState::SET)
+if (tmpState != SfxItemState::UNKNOWN && tmpState != 
SfxItemState::DISABLED &&
+tmpState != SfxItemState::READONLY && tmpState != 
SfxItemState::DONTCARE &&
+tmpState != SfxItemState::DEFAULT && tmpState != 
SfxItemState::SET)
 throw ::com::sun::star::uno::RuntimeException("unknown 
status");
 eState = tmpState;
 pItem = new SfxVoidItem( nSlotId );
@@ -1103,9 +1103,9 @@ throw ( ::com::sun::star::uno::RuntimeException, 
std::exception )
 rEvent.State >>= aItemStatus;
 SfxItemState tmpState = (SfxItemState) aItemStatus.State;
 // make sure no-one tries to send us a combination of 
states
-if (eState != SfxItemState::UNKNOWN && eState != 
SfxItemState::DISABLED &&
-eState != SfxItemState::READONLY && eState != 
SfxItemState::DONTCARE &&
-eState != SfxItemState::DEFAULT && eState != 
SfxItemState::SET)
+if (tmpState != SfxItemState::UNKNOWN && tmpState != 
SfxItemState::DISABLED &&
+tmpState != SfxItemState::READONLY && tmpState != 
SfxItemState::DONTCARE &&
+tmpState != SfxItemState::DEFAULT && tmpState != 
SfxItemState::SET)
 throw ::com::sun::star::uno::RuntimeException("unknown 
status");
 eState = tmpState;
 pItem = new SfxVoidItem( nSlotId );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/editeng

[Stephan Bergmann]

 include/editeng/flditem.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 5001357be9f0680ad6fbfe1af8c2a7c10b7508ab
Author: Stephan Bergmann 
Date:   Thu Sep 25 12:24:36 2014 +0200

Remove unnecessary #include

Change-Id: I7cc165095db24761d086680b70ef3ed81fd30f19

diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx
index 96720fe..532e30a 100644
--- a/include/editeng/flditem.hxx
+++ b/include/editeng/flditem.hxx
@@ -25,7 +25,6 @@
 #include 
 #include 
 #include 
-#include <../sd/inc/sdpage.hxx> // for Page Title field
 
 #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 include/vcl/menu.hxx |4 
 vcl/source/window/menu.cxx   |6 --
 vcl/source/window/menubarwindow.cxx  |1 -
 vcl/source/window/menufloatingwindow.cxx |2 --
 4 files changed, 13 deletions(-)

New commits:
commit 2162041fabaf8b65ac1e5ed04909a15678a2f57b
Author: Caolán McNamara 
Date:   Thu Sep 25 11:16:40 2014 +0100

nHighlightedItem only ever set, never read

Change-Id: Ie4b1517e41e09df3c243b6d4ff124f50777e8bc0

diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 6ca076f..d6d9837 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -140,8 +140,6 @@ private:
 sal_uInt16  nDefaultItem;   // Id of default item
 sal_uInt16  nSelectedId;
 
-sal_uInt16  nHighlightedItem;
-
 // for output:
 sal_uInt16  nImgOrChkPos;
 sal_uInt16  nTextPos;
@@ -256,8 +254,6 @@ public:
 sal_uInt16  GetCurItemId() const { return nSelectedId;}
 OString GetCurItemIdent() const;
 
-voidSetHighlightItem(sal_uInt16 nHighlightedItem);
-
 voidSetDefaultItem( sal_uInt16 nItemId ){ nDefaultItem 
= nItemId; }
 sal_uInt16  GetDefaultItem() const  { return 
nDefaultItem; }
 
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 236929a..8809231 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -722,12 +722,6 @@ MenuItemType Menu::GetItemType( sal_uInt16 nPos ) const
 return MENUITEM_DONTKNOW;
 }
 
-void Menu::SetHighlightItem( sal_uInt16 nItem )
-{
-nHighlightedItem = nItem;
-}
-
-
 OString Menu::GetCurItemIdent() const
 {
 const MenuItemData* pData = pItemList->GetData(nSelectedId);
diff --git a/vcl/source/window/menubarwindow.cxx 
b/vcl/source/window/menubarwindow.cxx
index 2a82c61..c9770ca 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -508,7 +508,6 @@ void MenuBarWindow::ChangeHighlightItem( sal_uInt16 n, bool 
bSelectEntry, bool b
 HighlightItem( nHighlightedItem, true );
 else if ( nRolloveredItem != ITEMPOS_INVALID )
 HighlightItem( nRolloveredItem, true );
-pMenu->SetHighlightItem(nHighlightedItem);
 pMenu->ImplCallHighlight(nHighlightedItem);
 
 if( mbAutoPopup )
diff --git a/vcl/source/window/menufloatingwindow.cxx 
b/vcl/source/window/menufloatingwindow.cxx
index a1754b0..ad53c97 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -67,7 +67,6 @@ void MenuFloatingWindow::doShutdown()
 // otherwise the entry will not be read when the menu is opened again
 if( nHighlightedItem != ITEMPOS_INVALID )
 pMenu->ImplCallEventListeners( VCLEVENT_MENU_DEHIGHLIGHT, 
nHighlightedItem );
-pMenu->SetHighlightItem(ITEMPOS_INVALID);
 if (!bKeyInput && pMenu && pMenu->pStartedFrom && 
!pMenu->pStartedFrom->IsMenuBar())
 {
 // #102461# remove highlight in parent
@@ -692,7 +691,6 @@ void MenuFloatingWindow::ChangeHighlightItem( sal_uInt16 n, 
bool bStartPopupTime
 }
 }
 HighlightItem( nHighlightedItem, true );
-pMenu->SetHighlightItem(nHighlightedItem);
 pMenu->ImplCallHighlight( nHighlightedItem );
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Luboš Luňák]

 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 +
 5 files changed, 19 insertions(+)

New commits:
commit ef0f5acbf2bb177526ff54e7b7cd09228fd7099d
Author: Luboš Luňák 
Date:   Sun Sep 21 17:52:58 2014 +0200

handle docx's w:anchor layoutInCell attribute (bnc#891663)

(cherry picked from commit 3891ba42a886fa85eb43da24d1badf44e765d54c)

Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
writerfilter/source/dmapper/PropertyIds.cxx
writerfilter/source/dmapper/PropertyIds.hxx

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

diff --git a/sw/qa/extras/ooxmlimport/data/bnc891663.docx 
b/sw/qa/extras/ooxmlimport/data/bnc891663.docx
new file mode 100644
index 000..d5f057e
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/bnc891663.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 0035e7b..2a7ab9a 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1723,6 +1723,15 @@ DECLARE_OOXMLIMPORT_TEST(testTableBtlrCenter, 
"table-btlr-center.docx")
 CPPUNIT_ASSERT_EQUAL(text::VertOrientation::CENTER, 
getProperty(xTable->getCellByName("A2"), "VertOrient"));
 }
 
+DECLARE_OOXMLIMPORT_TEST(testBnc891663, "bnc891663.docx")
+{
+// The image should be inside a cell, so the text in the following cell 
should be below it.
+int imageTop = 
parseDump("/root/page/body/tab/row[1]/cell[2]/txt[1]/anchored/fly/infos/bounds",
 "top").toInt32();
+int imageHeight = 
parseDump("/root/page/body/tab/row[1]/cell[2]/txt[1]/anchored/fly/infos/bounds",
 "height").toInt32();
+int textNextRowTop = 
parseDump("/root/page/body/tab/row[2]/cell[1]/txt[1]/infos/bounds", 
"top").toInt32();
+CPPUNIT_ASSERT( textNextRowTop >= imageTop + imageHeight );
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 607d92b..9cda86a 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -210,6 +210,7 @@ public:
 sal_Int16 nVertOrient;
 sal_Int16 nVertRelation;
 sal_Int32 nWrap;
+bool  bLayoutInCell;
 bool  bOpaque;
 bool  bContour;
 bool  bContourOutside;
@@ -282,6 +283,7 @@ public:
 ,nVertOrient(  text::VertOrientation::NONE )
 ,nVertRelation( text::RelOrientation::FRAME )
 ,nWrap(0)
+,bLayoutInCell(false)
 ,bOpaque( true )
 ,bContour(false)
 ,bContourOutside(true)
@@ -855,7 +857,10 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
 m_pImpl->bOpaque = false;
 break;
 case NS_ooxml::LN_CT_Anchor_locked: // 90990; - ignored
+break;
 case NS_ooxml::LN_CT_Anchor_layoutInCell: // 90991; - ignored
+m_pImpl->bLayoutInCell = nIntValue != 0;
+break;
 case NS_ooxml::LN_CT_Anchor_hidden: // 90992; - ignored
 break;
 case NS_ooxml::LN_CT_Anchor_allowOverlap: // 90993;
@@ -1508,6 +1513,9 @@ uno::Reference< text::XTextContent > 
GraphicImport::createGraphicObject( const b
 }
 
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( 
PROP_SURROUND ),
 uno::makeAny(m_pImpl->nWrap));
+if( m_pImpl->bLayoutInCell && m_pImpl->nWrap != 
text::WrapTextMode_THROUGHT )
+
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( 
PROP_FOLLOW_TEXT_FLOW ),
+uno::makeAny(true));
 
 
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( 
PROP_SURROUND_CONTOUR ),
 uno::makeAny(m_pImpl->bContour));
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx 
b/writerfilter/source/dmapper/PropertyIds.cxx
index d693ddb..14dbc25 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -347,6 +347,7 @@ const OUString& PropertyNameSupplier::GetName( PropertyIds 
eId ) const
 case PROP_HORIZONTAL_MERGE: sName = "HorizontalMerge"; break;
 case PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING : sName = 
"ApplyParagraphMarkFormatToNumbering"; break;
 case PROP_CELL_DIRECTION: sName = "CellDirection"; break;
+case PROP_FOLLOW_TEXT_FLOW: sName = "IsFollowingTextFlow"; break;
 }
 ::std::pair aInsertIt =
 m_pImpl->aNameMap.insert( PropertyNameMap_t::value_type( eId, 

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

[Stephan Bergmann]

 binaryurp/source/cache.hxx |   58 ++---
 1 file changed, 29 insertions(+), 29 deletions(-)

New commits:
commit 11311b9216b61c7c7baa1d223726520fe2ad2264
Author: Stephan Bergmann 
Date:   Thu Sep 25 11:49:23 2014 +0200

untabify

Change-Id: Iad53e9cea28c3c7f3a8a2eaa1186d1e1be72affc

diff --git a/binaryurp/source/cache.hxx b/binaryurp/source/cache.hxx
index a580c5e..7cbb303 100644
--- a/binaryurp/source/cache.hxx
+++ b/binaryurp/source/cache.hxx
@@ -49,35 +49,35 @@ public:
 }
 
 IdxType add( const T& rContent, bool* pbFound) {
-   assert( pbFound != NULL);
-   if( !size_) {
-   *pbFound = false;
-   return cache::ignore;
-   }
-   // try to insert into the map
-   list_.push_front( rContent); // create a temp entry
-   typedef std::pair MappedType;
-   typedef std::pair MapPair;
-   MapPair aMP = map_.insert( MappedType( list_.begin(), 0));
-   *pbFound = !aMP.second;
-
-   if( !aMP.second) { // insertion not needed => found the entry
-   list_.pop_front(); // remove the temp entry
-   list_.splice( list_.begin(), list_, aMP.first->first); // the 
found entry is moved to front
-   return aMP.first->second;
-   }
-
-   // test insertion successful => it was new so we keep it
-   IdxType n = static_cast( map_.size() - 1);
-   if( n >= size_) { // cache full => replace the LRU entry
-   // find the least recently used element in the map
-   typename LruItMap::iterator it = map_.find( --list_.end());
-   n = it->second;
-   map_.erase( it); // remove it from the map
-   list_.pop_back(); // remove from the list
-   }
-   aMP.first->second = n;
-   return n;
+assert( pbFound != NULL);
+if( !size_) {
+*pbFound = false;
+return cache::ignore;
+}
+// try to insert into the map
+list_.push_front( rContent); // create a temp entry
+typedef std::pair MappedType;
+typedef std::pair MapPair;
+MapPair aMP = map_.insert( MappedType( list_.begin(), 0));
+*pbFound = !aMP.second;
+
+if( !aMP.second) { // insertion not needed => found the entry
+list_.pop_front(); // remove the temp entry
+list_.splice( list_.begin(), list_, aMP.first->first); // the 
found entry is moved to front
+return aMP.first->second;
+}
+
+// test insertion successful => it was new so we keep it
+IdxType n = static_cast( map_.size() - 1);
+if( n >= size_) { // cache full => replace the LRU entry
+// find the least recently used element in the map
+typename LruItMap::iterator it = map_.find( --list_.end());
+n = it->second;
+map_.erase( it); // remove it from the map
+list_.pop_back(); // remove from the list
+}
+aMP.first->second = n;
+return n;
 }
 
 private:
___
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/qa writerfilter/source

[Luboš Luňák]

 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 +
 5 files changed, 19 insertions(+)

New commits:
commit 19af97e868c6a2b2578509a24ef0e7a88e5515bc
Author: Luboš Luňák 
Date:   Sun Sep 21 17:52:58 2014 +0200

handle docx's w:anchor layoutInCell attribute (bnc#891663)

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

diff --git a/sw/qa/extras/ooxmlimport/data/bnc891663.docx 
b/sw/qa/extras/ooxmlimport/data/bnc891663.docx
new file mode 100644
index 000..d5f057e
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/bnc891663.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 305b6ed..07761dd 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2275,6 +2275,15 @@ DECLARE_OOXMLIMPORT_TEST(testBnc519228OddBreaks, 
"bnc519228_odd-breaks.docx")
 getParagraphOfText( 1, getProperty< uno::Reference 
>(page5Style, "HeaderText"), "This is the header for odd pages");
 }
 
+DECLARE_OOXMLIMPORT_TEST(testBnc891663, "bnc891663.docx")
+{
+// The image should be inside a cell, so the text in the following cell 
should be below it.
+int imageTop = 
parseDump("/root/page/body/tab/row[1]/cell[2]/txt[1]/anchored/fly/infos/bounds",
 "top").toInt32();
+int imageHeight = 
parseDump("/root/page/body/tab/row[1]/cell[2]/txt[1]/anchored/fly/infos/bounds",
 "height").toInt32();
+int textNextRowTop = 
parseDump("/root/page/body/tab/row[2]/cell[1]/txt[1]/infos/bounds", 
"top").toInt32();
+CPPUNIT_ASSERT( textNextRowTop >= imageTop + imageHeight );
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 6cd88a5..4c68904 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -210,6 +210,7 @@ public:
 sal_Int16 nVertOrient;
 sal_Int16 nVertRelation;
 sal_Int32 nWrap;
+bool  bLayoutInCell;
 bool  bOpaque;
 bool  bContour;
 bool  bContourOutside;
@@ -283,6 +284,7 @@ public:
 ,nVertOrient(  text::VertOrientation::NONE )
 ,nVertRelation( text::RelOrientation::FRAME )
 ,nWrap(0)
+,bLayoutInCell(false)
 ,bOpaque( true )
 ,bContour(false)
 ,bContourOutside(true)
@@ -580,7 +582,10 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue)
 m_pImpl->bOpaque = false;
 break;
 case NS_ooxml::LN_CT_Anchor_locked: // 90990; - ignored
+break;
 case NS_ooxml::LN_CT_Anchor_layoutInCell: // 90991; - ignored
+m_pImpl->bLayoutInCell = nIntValue != 0;
+break;
 case NS_ooxml::LN_CT_Anchor_hidden: // 90992; - ignored
 break;
 case NS_ooxml::LN_CT_Anchor_allowOverlap: // 90993;
@@ -1230,6 +1235,9 @@ uno::Reference< text::XTextContent > 
GraphicImport::createGraphicObject( const b
 }
 
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( 
PROP_SURROUND ),
 uno::makeAny(m_pImpl->nWrap));
+if( m_pImpl->bLayoutInCell && m_pImpl->nWrap != 
text::WrapTextMode_THROUGHT )
+
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( 
PROP_FOLLOW_TEXT_FLOW ),
+uno::makeAny(true));
 
 
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( 
PROP_SURROUND_CONTOUR ),
 uno::makeAny(m_pImpl->bContour));
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx 
b/writerfilter/source/dmapper/PropertyIds.cxx
index 3f5fa05..fc81dae 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -394,6 +394,7 @@ OUString PropertyNameSupplier::GetName( PropertyIds eId ) 
const
 case PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING : sName = 
"ApplyParagraphMarkFormatToNumbering"; break;
 case PROP_CELL_DIRECTION: sName = "CellDirection"; break;
 case PROP_CELL_HIDE_MARK: sName = "CellHideMark"; break;
+case PROP_FOLLOW_TEXT_FLOW: sName = "IsFollowingTextFlow"; break;
 }
 ::std::pair aInsertIt =
 m_pImpl->aNameMap.insert( PropertyNameMap_t::value_type( eId, 
sName ));
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx 
b/writerfilter/source/dmapper/PropertyIds.hxx
index 3510e62..7394a50 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -366

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

[Takeshi Abe]

 sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx |   32 +++
 sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx |2 -
 2 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit c35db5ca9d82554149d6a63e159c2da6037fa867
Author: Takeshi Abe 
Date:   Wed Sep 17 18:20:42 2014 +0900

Stop using unnecessary std::auto_ptr

No need to allocate mpMasterPages dynamically.
Thanks David Tardon for pointing it out.

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

diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx 
b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
index 591b578..c7e295e 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
@@ -90,7 +90,7 @@ RecentlyUsedMasterPages&  RecentlyUsedMasterPages::Instance 
(void)
 
 RecentlyUsedMasterPages::RecentlyUsedMasterPages (void)
 : maListeners(),
-  mpMasterPages(new MasterPageList()),
+  mvMasterPages(),
   mnMaxListSize(8),
   mpContainer(new MasterPageContainer())
 {
@@ -135,8 +135,8 @@ void RecentlyUsedMasterPages::LoadPersistentValues (void)
 
 // Read the names and URLs of the master pages.
 Sequence aKeys (xSet->getElementNames());
-mpMasterPages->clear();
-mpMasterPages->reserve(aKeys.getLength());
+mvMasterPages.clear();
+mvMasterPages.reserve(aKeys.getLength());
 for (int i=0; i xSetItem (
@@ -168,7 +168,7 @@ void RecentlyUsedMasterPages::LoadPersistentValues (void)
 pDescriptor->mpPreviewProvider = 
::boost::shared_ptr(
 new PagePreviewProvider());
 MasterPageContainer::Token aToken 
(mpContainer->PutMasterPage(pDescriptor));
-mpMasterPages->push_back(Descriptor(aToken,sURL,sName));
+mvMasterPages.push_back(Descriptor(aToken,sURL,sName));
 }
 }
 
@@ -209,8 +209,8 @@ void RecentlyUsedMasterPages::SavePersistentValues (void)
 return;
 MasterPageList::const_iterator iDescriptor;
 sal_Int32 nIndex(0);
-for (iDescriptor=mpMasterPages->begin();
-iDescriptor!=mpMasterPages->end();
+for (iDescriptor=mvMasterPages.begin();
+iDescriptor!=mvMasterPages.end();
 ++iDescriptor,++nIndex)
 {
 // Create new child.
@@ -261,13 +261,13 @@ void RecentlyUsedMasterPages::RemoveEventListener (const 
Link& rEventListener)
 
 int RecentlyUsedMasterPages::GetMasterPageCount (void) const
 {
-return mpMasterPages->size();
+return mvMasterPages.size();
 }
 
 MasterPageContainer::Token RecentlyUsedMasterPages::GetTokenForIndex 
(sal_uInt32 nIndex) const
 {
-if(nIndexsize())
-return (*mpMasterPages)[nIndex].maToken;
+if(nIndexbegin(),mpMasterPages->end(),
+::std::find_if(mvMasterPages.begin(),mvMasterPages.end(),
 Descriptor::TokenComparator(aToken)));
-if (aIterator != mpMasterPages->end())
+if (aIterator != mvMasterPages.end())
 {
 // When an entry for the given token already exists then remove
 // it now and insert it later at the head of the list.
-mpMasterPages->erase (aIterator);
+mvMasterPages.erase (aIterator);
 }
 
-mpMasterPages->insert(mpMasterPages->begin(),
+mvMasterPages.insert(mvMasterPages.begin(),
 Descriptor(
 aToken,
 mpContainer->GetURLForToken(aToken),
 mpContainer->GetStyleNameForToken(aToken)));
 
 // Shorten list to maximal size.
-while (mpMasterPages->size() > mnMaxListSize)
+while (mvMasterPages.size() > mnMaxListSize)
 {
-mpMasterPages->pop_back ();
+mvMasterPages.pop_back ();
 }
 
 if (bMakePersistent)
@@ -368,7 +368,7 @@ void RecentlyUsedMasterPages::ResolveList (void)
 bool bNotify (false);
 
 MasterPageList::iterator iDescriptor;
-for (iDescriptor=mpMasterPages->begin(); 
iDescriptor!=mpMasterPages->end(); ++iDescriptor)
+for (iDescriptor=mvMasterPages.begin(); iDescriptor!=mvMasterPages.end(); 
++iDescriptor)
 {
 if (iDescriptor->maToken == MasterPageContainer::NIL_TOKEN)
 {
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx 
b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
index aba7fe3..37af4a8 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
@@ -87,7 +87,7 @@ private:
 ::std::vector maListeners;
 
 typedef ::std::vector MasterPageList;
-::std::auto_ptr mpMasterPages;
+MasterPageList mvMasterPages;
 unsigned long int mnMaxListSize;
 ::boost::shared_ptr mpContainer;
 
___

[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress' - 46 commits - include/tools sc/inc sc/source

[Andrzej Hunt]

 include/tools/mapunit.hxx |   26 +
 sc/inc/editutil.hxx   |7 
 sc/source/core/data/fillinfo.cxx  |   12 
 sc/source/core/tool/editutil.cxx  |   57 ++--
 sc/source/ui/docshell/docsh.cxx   |7 
 sc/source/ui/docshell/docsh3.cxx  |   10 
 sc/source/ui/docshell/docsh4.cxx  |   24 -
 sc/source/ui/docshell/sizedev.cxx |2 
 sc/source/ui/inc/docsh.hxx|4 
 sc/source/ui/inc/gridwin.hxx  |   13 
 sc/source/ui/inc/output.hxx   |   80 +
 sc/source/ui/inc/viewdata.hxx |   32 +-
 sc/source/ui/unoobj/docuno.cxx|   13 
 sc/source/ui/view/colrowba.cxx|   25 +
 sc/source/ui/view/drawvie4.cxx|2 
 sc/source/ui/view/gridwin.cxx |2 
 sc/source/ui/view/gridwin3.cxx|   24 -
 sc/source/ui/view/gridwin4.cxx|  288 
 sc/source/ui/view/output.cxx  |  182 +++--
 sc/source/ui/view/output2.cxx |  530 ++
 sc/source/ui/view/preview.cxx |   27 +
 sc/source/ui/view/printfun.cxx|6 
 sc/source/ui/view/tabview2.cxx|6 
 sc/source/ui/view/viewdata.cxx|  380 ++-
 sc/source/ui/view/viewfunc.cxx|4 
 25 files changed, 1119 insertions(+), 644 deletions(-)

New commits:
commit 262e1773c4ba1294c3d9744249048931e31f6d14
Author: Andrzej Hunt 
Date:   Fri Aug 29 11:47:55 2014 +0200

TEMPORARY: more twips in ScOutputData.

Some parts are working, some aren't.

Change-Id: I69b63a585e971a4a56514a66ab318e48507ca5be

diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 989728d..d34de7d 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -3198,9 +3198,11 @@ bool ScOutputData::Clip( DrawEditParam& rParam, const 
Size& aCellSize,
 aAreaParam.maClipRect.Left() = nScrX;
 aAreaParam.mbLeftClip = true;
 }
-if ( aAreaParam.maClipRect.Right() > nScrX + nScrW )
+if ( aAreaParam.maClipRect.Right() >
+ nScrX + LogicToPixelHorizontal(nScrWTwips ) )
 {
-aAreaParam.maClipRect.Right() = nScrX + nScrW;  //! minus one?
+aAreaParam.maClipRect.Right() = nScrX +
+LogicToPixelHorizontal( nScrWTwips );  //! minus one?
 aAreaParam.mbRightClip = true;
 }
 
@@ -3218,9 +3220,11 @@ bool ScOutputData::Clip( DrawEditParam& rParam, const 
Size& aCellSize,
 aAreaParam.maClipRect.Top() = nScrY;
 bClip = true;
 }
-if ( aAreaParam.maClipRect.Bottom() > nScrY + nScrH )
+if ( aAreaParam.maClipRect.Bottom() >
+ nScrY + LogicToPixelVertical( nScrHTwips ) )
 {
-aAreaParam.maClipRect.Bottom() = nScrY + nScrH; //! minus one?
+aAreaParam.maClipRect.Bottom() = nScrY +
+LogicToPixelVertical( nScrHTwips ); //! minus one?
 bClip = true;
 }
 
@@ -3282,7 +3286,7 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& 
rParam)
 //! mirror margin values for RTL?
 //! move margin down to after final GetOutputArea call
 long nTopM, nLeftM, nBottomM, nRightM;
-rParam.calcMargins(nTopM, nLeftM, nBottomM, nRightM, mnPPTX, mnPPTY);
+rParam.calcMargins( nTopM, nLeftM, nBottomM, nRightM );
 
 SCCOL nXForPos = rParam.mnX;
 if ( nXForPos < nX1 )
@@ -3312,7 +3316,7 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& 
rParam)
rParam.mbCellIsValue, true, false, aAreaParam );
 
 //! special ScEditUtil handling if formatting for printer
-rParam.calcPaperSize(aPaperSize, aAreaParam.maAlignRect, mnPPTX, 
mnPPTY);
+rParam.calcPaperSize( aPaperSize, aAreaParam.maAlignRect );
 }
 if (rParam.mbPixelToLogic)
 {
@@ -3444,7 +3448,7 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& 
rParam)
 nStartX += nLeftM;
 }
 
-const bool bOutside = (aAreaParam.maClipRect.Right() < nScrX || 
aAreaParam.maClipRect.Left() >= nScrX + nScrW);
+const bool bOutside = (aAreaParam.maClipRect.Right() < nScrX || 
aAreaParam.maClipRect.Left() >= nScrX + nScrWTwips);
 if (bOutside)
 return;
 
@@ -3542,7 +3546,7 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& 
rParam)
 //! mirror margin values for RTL?
 //! move margin down to after final GetOutputArea call
 long nTopM, nLeftM, nBottomM, nRightM;
-rParam.calcMargins(nTopM, nLeftM, nBottomM, nRightM, mnPPTX, mnPPTY);
+rParam.calcMargins( nTopM, nLeftM, nBottomM, nRightM );
 
 SCCOL nXForPos = rParam.mnX;
 if ( nXForPos < nX1 )
@@ -3572,7 +3576,7 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& 
rParam)
rParam.mbCellIsValue, true, false, aAreaParam );
 
 //! special ScEditUtil handling if formatting for printer
-rParam.calcPaperSize(aPaperSize, aAreaParam.maAlignRect, mnPPTX, 
mnPPTY);
+rParam.calcPaperSize( aPaperSize, aAreaParam.maAlignRect );
 }
 if (rParam.mbPixelToLogic)
 {
@@ -3706,7 +3710,7 @@ void ScOutput

[Libreoffice-commits] core.git: Changes to 'feature/droid_calcimpress'

[Andrzej Hunt]

New branch 'feature/droid_calcimpress' available with the following commits:
commit d8b6dbfbcb69e69928b61a638a23f00873e2265b
Author: Andrzej Hunt 
Date:   Thu Sep 25 10:08:54 2014 +0100

TEMPORARY: We need OfficeIPCThread for LOK on Android for now.

LOK uses the OfficeIPCThread to know that soffice_main is ready --
we should have some form of separate condition instead since I don't
think we need any of the actual functionality here for Android.

Change-Id: I27030383aae4d7895725c2161c53617f896a5f83

commit 653f28dd1589e82dada5371eef84a02b25d1da44
Author: Andrzej Hunt 
Date:   Thu Sep 25 09:25:47 2014 +0100

Don't use ImplDoTiledRendering for Android.

With svp this causes images not to be rendered for tiled rendering,
however this could potentially cause issues with SmartArt (however
SmartArt support for Tiled Rendering is possibly problematic in any case).

Change-Id: Iccbdce7b6d5353966892fbde3d3d10eb49164df9

commit 3fded815f6e731ba54bfc15ec5fec636dce97530
Author: Andrzej Hunt 
Date:   Thu Sep 25 09:20:56 2014 +0100

LOK Android: don't initialise until TMPDIR is set.

As part of LOK initialisation we now start soffice_main, this
requires TMPDIR access, and will fail if we haven't set TMPDIR
(as by default it attemps to access /tmp which is not allowed on
Android).

Change-Id: I63bd7bce9b52c898c60fda6eea33ee919349a109

commit 0ad9b8c22c8c5016db2545ea730bb5c697d484f8
Author: Andrzej Hunt 
Date:   Thu Jul 31 10:07:39 2014 +0200

Use one test instance to run all LOK tests.

Recreating Office instances after destruction (when still
within the same process) currently fails, hence we need
to do all tests at once for now.

Change-Id: Ic7652c909e1cd970fe1ee76995e61fb6aae8f96c

commit aa93dad9eb2d58755922f6cec7e2b279a82035f6
Author: Andrzej Hunt 
Date:   Wed Jul 30 19:52:46 2014 +0200

Make common paths member variables.

We'll need these for other tests too.

Change-Id: Ia99c2e60f5e5bb24a83875a9dcf85a6b4f54beb4

commit c23f3781e551eba2a3f9c1af7b4ee9fd48f3c6f9
Author: Andrzej Hunt 
Date:   Tue Jul 29 07:18:28 2014 +0200

Upgrade lokconf_init to LibreOfficeKitInit.h

Change-Id: I0581a107c3eefd33c25b003afe9f7be217598441

commit dd5b8efb19df5d3f8e6ffbc65d6869e2348a9bce
Author: Andrzej Hunt 
Date:   Mon Jul 28 20:23:03 2014 +0200

Kill the libreofficekit static library / shim.c.

It looks like the cleanest method of getting lok_init into
a LibreOfficeKitInit.h header (in a c89 compatible way) is to
have it as a static function.

(inline is only available in C99 or later -- this is actually
 available on Linux which is the only place that we can actually
 use lok_init anyways currently, however given we have to keep
 c89 for the C code (for MSVC) compatibility, selectively enabling
 c99 would likely be more messy.)

Conflicts:
libreofficekit/Module_libreofficekit.mk

Change-Id: I0493e7a68ed5397479220bb6ba8c3db870b6dd32

commit 11d1858eded28df8691a2c9ea8d61138e7f15da5
Author: Andrzej Hunt 
Date:   Mon Jul 28 16:18:57 2014 +0200

LOK: do clean main thread shutdown cleanly.

Change-Id: If44971f67a489f6b50dee6c1683707c47e695de4

commit 3a73cb35af83b35dfd250fb12269d8e82f5b5e52
Author: Andrzej Hunt 
Date:   Fri Jul 25 21:03:19 2014 +0200

Make sure LOK is actually headless.

This prevents e.g. the document recovery dialog from trying to be shown.

Change-Id: I253720f7fa1abd1c053670434f8394473517b670

commit 852bc7eabf1df2791c72e5c5a9c587f774117bd8
Author: Andrzej Hunt 
Date:   Fri Jul 25 20:56:18 2014 +0200

Don't fail on --protector.

If we have any "unknown" command line arguments Desktop init will fail,
however our LOK Tiled Rendering test uses Desktop (via soffice_main).
(Other unit tests don't use soffice_main hence this check never
comes into play.) It looks like it's most reliable simply to ignore
--protector here, rather than try to filter it out elsewhere (which
is difficult as it is passed to osl via SAL_IMPLEMENT_MAIN).

Change-Id: I95d047892851ba2cf9edd2e26bacc6efa0320f71

commit a1a6eda3c3062c5b1e3574cf65220f3f5c42a5cc
Author: Andrzej Hunt 
Date:   Mon Jul 21 21:16:09 2014 +0200

Don't start Impress Remote server in headless mode.

Change-Id: Ibafe57413a60745e949dc3146fbc843c52c029d6

commit 76333801b8a37c39f48d9f25d435a8972122f80a
Author: Andrzej Hunt 
Date:   Mon Jul 21 19:36:11 2014 +0200

Use gb_CppunitTest_use_confpreinit for LOK tiled rendering.

Now that we use the event loop for LOK we need to make sure that
it is able to run successfully first time, as unit tests start
with a completely clean config.

Change-Id: If9ddcb75fe8286381d71ecdc76ac7eb3697960d0

commit a43c307f6cfe574d95748178f0043370e1dd9679
Author: Andrzej Hunt 
Date:   Mon Jul 21 19:35:13 2014 +0200

Add gb_Cppunit

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

[Luboš Luňák]

 writerfilter/source/dmapper/GraphicImport.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5aa05e27c8920be0c164683187170f1c5670189d
Author: Luboš Luňák 
Date:   Wed Sep 24 16:34:42 2014 +0200

add missing break

Should have been included in 3891ba42a886fa85eb43da24d1badf44e765d54c.

Change-Id: I22e5ba931a58c83efdbf996ce701c52dcf0bf9c5

diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 2c57337..9cda86a 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -857,6 +857,7 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
 m_pImpl->bOpaque = false;
 break;
 case NS_ooxml::LN_CT_Anchor_locked: // 90990; - ignored
+break;
 case NS_ooxml::LN_CT_Anchor_layoutInCell: // 90991; - ignored
 m_pImpl->bLayoutInCell = nIntValue != 0;
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'feature/lok_sofficemain2'

[Andrzej Hunt]

New branch 'feature/lok_sofficemain2' available with the following commits:
commit 35cecf52d34cbcc54eb7b3b2297635b4cc227ede
Author: Andrzej Hunt 
Date:   Thu Sep 25 10:08:54 2014 +0100

TEMPORARY: We need OfficeIPCThread for LOK on Android for now.

LOK uses the OfficeIPCThread to know that soffice_main is ready --
we should have some form of separate condition instead since I don't
think we need any of the actual functionality here for Android.

Change-Id: I27030383aae4d7895725c2161c53617f896a5f83

commit 3a69e64571c55b5566467e7c30d0ab701406d5f5
Author: Andrzej Hunt 
Date:   Thu Sep 25 09:25:47 2014 +0100

Don't use ImplDoTiledRendering for Android.

With svp this causes images not to be rendered for tiled rendering,
however this could potentially cause issues with SmartArt (however
SmartArt support for Tiled Rendering is possibly problematic in any case).

Change-Id: Iccbdce7b6d5353966892fbde3d3d10eb49164df9

commit 59c84d1793b71b1b8affb53cbf20ac19c4d66058
Author: Andrzej Hunt 
Date:   Thu Sep 25 09:20:56 2014 +0100

LOK Android: don't initialise until TMPDIR is set.

As part of LOK initialisation we now start soffice_main, this
requires TMPDIR access, and will fail if we haven't set TMPDIR
(as by default it attemps to access /tmp which is not allowed on
Android).

Change-Id: I63bd7bce9b52c898c60fda6eea33ee919349a109

commit fa1b21a3126f9151e6e2cef8c4dbedc1adb1f312
Author: Andrzej Hunt 
Date:   Thu Jul 31 10:07:39 2014 +0200

Use one test instance to run all LOK tests.

Recreating Office instances after destruction (when still
within the same process) currently fails, hence we need
to do all tests at once for now.

Change-Id: Ic7652c909e1cd970fe1ee76995e61fb6aae8f96c

commit ad391da7fa4f98d054347ce77bc4820f78e8d698
Author: Andrzej Hunt 
Date:   Wed Jul 30 19:52:46 2014 +0200

Make common paths member variables.

We'll need these for other tests too.

Change-Id: Ia99c2e60f5e5bb24a83875a9dcf85a6b4f54beb4

commit 1f05df9bb2f69020f7c29d50c7f8c57b2077783a
Author: Andrzej Hunt 
Date:   Tue Jul 29 07:18:28 2014 +0200

Upgrade lokconf_init to LibreOfficeKitInit.h

Change-Id: I0581a107c3eefd33c25b003afe9f7be217598441

commit 6d14c422f131693533ccc63741fa807112ea59af
Author: Andrzej Hunt 
Date:   Mon Jul 28 20:23:03 2014 +0200

Kill the libreofficekit static library / shim.c.

It looks like the cleanest method of getting lok_init into
a LibreOfficeKitInit.h header (in a c89 compatible way) is to
have it as a static function.

(inline is only available in C99 or later -- this is actually
 available on Linux which is the only place that we can actually
 use lok_init anyways currently, however given we have to keep
 c89 for the C code (for MSVC) compatibility, selectively enabling
 c99 would likely be more messy.)

Conflicts:
libreofficekit/Module_libreofficekit.mk

Change-Id: I0493e7a68ed5397479220bb6ba8c3db870b6dd32

commit 2acb608c195b3fcdefe10b926b2660363d3bc4e8
Author: Andrzej Hunt 
Date:   Mon Jul 28 16:18:57 2014 +0200

LOK: do clean main thread shutdown cleanly.

Change-Id: If44971f67a489f6b50dee6c1683707c47e695de4

commit d0b2b26c944c89a59a3842b50f300a5c19c5c305
Author: Andrzej Hunt 
Date:   Fri Jul 25 21:03:19 2014 +0200

Make sure LOK is actually headless.

This prevents e.g. the document recovery dialog from trying to be shown.

Change-Id: I253720f7fa1abd1c053670434f8394473517b670

commit d65508ad56e44f2c7f39273a544dfe54d1d830b0
Author: Andrzej Hunt 
Date:   Fri Jul 25 20:56:18 2014 +0200

Don't fail on --protector.

If we have any "unknown" command line arguments Desktop init will fail,
however our LOK Tiled Rendering test uses Desktop (via soffice_main).
(Other unit tests don't use soffice_main hence this check never
comes into play.) It looks like it's most reliable simply to ignore
--protector here, rather than try to filter it out elsewhere (which
is difficult as it is passed to osl via SAL_IMPLEMENT_MAIN).

Change-Id: I95d047892851ba2cf9edd2e26bacc6efa0320f71

commit df64981179409732553bcae5842564be1c16be0f
Author: Andrzej Hunt 
Date:   Mon Jul 21 21:16:09 2014 +0200

Don't start Impress Remote server in headless mode.

Change-Id: Ibafe57413a60745e949dc3146fbc843c52c029d6

commit 17449a8d0bf1621ced693edd294cf7201ba8ecd8
Author: Andrzej Hunt 
Date:   Mon Jul 21 19:36:11 2014 +0200

Use gb_CppunitTest_use_confpreinit for LOK tiled rendering.

Now that we use the event loop for LOK we need to make sure that
it is able to run successfully first time, as unit tests start
with a completely clean config.

Change-Id: If9ddcb75fe8286381d71ecdc76ac7eb3697960d0

commit ea0c7e9f2bff0669f13d427113a04810eccdd1c1
Author: Andrzej Hunt 
Date:   Mon Jul 21 19:35:13 2014 +0200

Add gb_CppunitT

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

[Stephan Bergmann]

 jvmfwk/source/framework.hxx |3 ++-
 vcl/source/gdi/outdev3.cxx  |6 --
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 629eac17fda6b875a87f96d86ba468359b73c29d
Author: Stephan Bergmann 
Date:   Tue Dec 3 09:23:43 2013 +0100

Call getLineBreak with null XHyphenator unless 
TEXT_DRAW_WORDBREAK_HYPHENATION

So no longer instantiate XLinguServiceManager (which might e.g. bootstrap
Python) unless explicitly requested, which e.g. removes a noticable delay 
when
switching to the Options dialog's "Security" page (which causes size
calculations of FixedText controls that use TEXT_DRAW_WORDBREAK but not
TEXT_DRAW_WORDBREAK_HYPHENATION).

Change-Id: Ib0a28d3d7d7718faf6df7a138f5a86b8b2fd7713

diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index a8cb7fc..d707888 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -4729,8 +4729,10 @@ long OutputDevice::ImplGetTextLines( 
ImplMultiTextLineInfo& rLineInfo,
 // get service provider
 uno::Reference< uno::XComponentContext > xContext( 
comphelper::getProcessComponentContext() );
 
+bool bHyphenate = (nStyle & TEXT_DRAW_WORDBREAK_HYPHENATION)
+== TEXT_DRAW_WORDBREAK_HYPHENATION;
 uno::Reference< linguistic2::XHyphenator > xHyph;
-if ( nStyle & TEXT_DRAW_WORDBREAK )
+if ( bHyphenate )
 {
 uno::Reference< linguistic2::XLinguServiceManager2> xLinguMgr = 
linguistic2::LinguServiceManager::create(xContext);
 xHyph = xLinguMgr->getHyphenator();
@@ -4762,7 +4764,7 @@ long OutputDevice::ImplGetTextLines( 
ImplMultiTextLineInfo& rLineInfo,
 nBreakPos = (xub_StrLen)aLBR.breakIndex;
 if ( nBreakPos <= nPos )
 nBreakPos = nSoftBreak;
-if ( (nStyle & TEXT_DRAW_WORDBREAK_HYPHENATION) == 
TEXT_DRAW_WORDBREAK_HYPHENATION )
+if ( bHyphenate )
 {
 // Whether hyphen or not: Put the word after the 
hyphen through
 // word boundary.
commit 9d91e2b652922a362fdcf5f3716b48946d5865b3
Author: Stephan Bergmann 
Date:   Wed Sep 3 10:20:31 2014 +0200

Nothrow dtor

Change-Id: I1793d2eab568f4a65813fca7257c74e1a85a0090

diff --git a/jvmfwk/source/framework.hxx b/jvmfwk/source/framework.hxx
index c0ebc79..ddf826f 100644
--- a/jvmfwk/source/framework.hxx
+++ b/jvmfwk/source/framework.hxx
@@ -113,6 +113,7 @@ public:
 errorCode(err), message(msg)
 {
 }
+virtual ~FrameworkException() throw () {}
 javaFrameworkError errorCode;
 OString message;
 };
commit 09afbc349341c06cb48cff6be7a18ce2e00b2ddf
Author: Caolán McNamara 
Date:   Tue Sep 2 15:30:54 2014 +0100

coverity#707200 Uncaught exception

Change-Id: Iaf115f1f11aef69ef5dba7023f4126c22d1f49ff

diff --git a/jvmfwk/source/framework.hxx b/jvmfwk/source/framework.hxx
index a884cd8..c0ebc79 100644
--- a/jvmfwk/source/framework.hxx
+++ b/jvmfwk/source/framework.hxx
@@ -105,7 +105,7 @@ public:
 sal_uInt64 getFeatures() const;
 };
 
-class FrameworkException
+class FrameworkException : public std::exception
 {
 public:
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/sfx2 officecfg/registry sc/source sd/source sfx2/sdi sfx2/source svx/source sw/source

[Stephan Bergmann]

 include/sfx2/app.hxx|1 
 include/sfx2/templdlg.hxx   |   10 +
 officecfg/registry/data/org/openoffice/Office/Views.xcu |6 +++
 sc/source/ui/view/tabvwsh.cxx   |1 
 sd/source/ui/slideshow/slideshowimpl.cxx|1 
 sd/source/ui/view/drvwshrg.cxx  |2 +
 sd/source/ui/view/outlnvsh.cxx  |1 
 sfx2/sdi/frmslots.sdi   |1 
 sfx2/source/appl/appchild.cxx   |   14 
 sfx2/source/appl/appreg.cxx |1 
 sfx2/source/dialog/templdlg.cxx |   16 +
 sfx2/source/inc/templdgi.hxx|3 +
 sfx2/source/view/viewfrm.cxx|   11 --
 svx/source/sidebar/gallery/GalleryPanel.hxx |   27 
 sw/source/uibase/app/docst.cxx  |8 
 sw/source/uibase/uiview/view0.cxx   |1 
 sw/source/uibase/web/wview.cxx  |1 
 17 files changed, 93 insertions(+), 12 deletions(-)

New commits:
commit 89ecdc47e14e3be7fe939b5e76985b9531fcfb42
Author: Stephan Bergmann 
Date:   Thu Sep 25 10:58:43 2014 +0200

Revert "fdo#73151 Always open Styles&Formatting dialog in the sidebar"

This reverts commit 473ed449a4b6f550dc1af47a07c6e0ef243a98b2, which made
JunitTest_toolkit_unoapi fail, as
AccessibleDropDownListBox.createTestEnvironment
(qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java) was no 
longer
able to find its AccessilbeRole.COMBO_BOX AccessibleDropDownListBox, which 
it
apparently expected to find in a docked stylist (cf. 
DesktopTools.dockStylist
in AccessibleDropDownListBox.initialize).

diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 1f1e831..5c456af 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -175,6 +175,7 @@ public:
 * @param pArgs Takes ownership
 */
 sal_uIntPtr   LoadTemplate( SfxObjectShellLock& xDoc, 
const OUString& rFileName, bool bCopy=true, SfxItemSet* pArgs = 0 );
+SfxTemplateDialog*  GetTemplateDialog();
 vcl::Window* GetTopWindow() const;
 
 // members
diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx
index 6e6ed778..4bd6ac4 100644
--- a/include/sfx2/templdlg.hxx
+++ b/include/sfx2/templdlg.hxx
@@ -34,6 +34,7 @@ class SfxTemplateDialog_Impl;
 class SfxTemplateDialog : public SfxDockingWindow
 {
 private:
+friend class SfxTemplateDialogWrapper;
 friend class SfxTemplateDialog_Impl;
 
 SfxTemplateDialog_Impl* pImpl;
@@ -55,6 +56,15 @@ public:
 static SfxStyleFamily SFX2_DLLPUBLIC NIdToSfxFamilyId(sal_uInt16 nId);
 };
 
+// class SfxTemplateDialogWrapper 
+
+class SFX2_DLLPUBLIC SfxTemplateDialogWrapper : public SfxChildWindow
+{
+public:
+SfxTemplateDialogWrapper
+(vcl::Window*,sal_uInt16,SfxBindings*,SfxChildWinInfo*);
+SFX_DECL_CHILDWINDOW_WITHID(SfxTemplateDialogWrapper);
+};
 
 // class SfxTemplatePanelControl -
 
diff --git a/officecfg/registry/data/org/openoffice/Office/Views.xcu 
b/officecfg/registry/data/org/openoffice/Office/Views.xcu
index a2c7f43..771ed28 100644
--- a/officecfg/registry/data/org/openoffice/Office/Views.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Views.xcu
@@ -19,6 +19,12 @@
 
 http://openoffice.org/2001/registry"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:install="http://openoffice.org/2004/installation"; oor:name="Views" 
oor:package="org.openoffice.Office">
   
+
+
+  
+false
+  
+
 
 
   
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index 51aaae8..847f3f6 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -54,6 +54,7 @@ void ScTabViewShell::InitInterface_Impl()
 ScResId(RID_OBJECTBAR_TOOLS));
 
 GetStaticInterface()->RegisterChildWindow(FID_INPUTLINE_STATUS);
+
GetStaticInterface()->RegisterChildWindow(SfxTemplateDialogWrapper::GetChildWindowId());
 
GetStaticInterface()->RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId());
 
 GetStaticInterface()->RegisterChildWindow(SID_NAVIGATOR, true);
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx 
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 4704c90..a6ccac9 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -2482,6 +2482,7 @@ FncGetChildWindowId aShowChildren[] =
 &SvxBmpMaskChildWindow::GetChildWindowId,
 &SvxIMapDlgChildWindow::GetChildWindowId,
 &SvxHlinkDlgWrapper::Get

[Bug 75757] remove inheritance to std::map and std::vector

[bugzilla-daemon]

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

--- Comment #38 from Commit Notification 
 ---
Takeshi Abe committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=805df2f4131be1a62e64da87cc990c07481b988f

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: Branch 'libreoffice-4-3' - sc/source

[Niklas Johansson]

 sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit cc803df1a94bf572bd14ff5402ccbad5674c9bef
Author: Niklas Johansson 
Date:   Mon Sep 15 08:57:01 2014 +0200

fdo#81264 Calc is not accessible to screen readers if sheet is modified 
[a11y]

When the IA2 changes was merged it removed the call to CommitFocusGained
and thereby stopped sending a STATE_CHANGED FOCUSED. A big thank you to
Joanmarie Diggs for noticing the lack of that event.

I tested the patch on Fedora, Windows and Mac. At a quick glance Windows 
and Mac seem unaffected by the patch but Fedora and Orca seem to require the 
added event.

Change-Id: Ic616d1b367ad8b8ed5d243e0ba124764082e96f1
Reviewed-on: https://gerrit.libreoffice.org/11451
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit 93410b5ba13749cf3663d3d696fe1a14474bf696)
Reviewed-on: https://gerrit.libreoffice.org/11544
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx 
b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index 6d26093..6cb8118 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -362,6 +362,7 @@ void ScAccessibleSpreadsheet::LostFocus()
 
 void ScAccessibleSpreadsheet::GotFocus()
 {
+CommitFocusGained();
 AccessibleEventObject aEvent;
 aEvent.EventId = AccessibleEventId::ACTIVE_DESCENDANT_CHANGED;
 aEvent.Source = uno::Reference< XAccessibleContext >(this);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Takeshi Abe]

 svl/source/svdde/ddesvr.cxx |   18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 805df2f4131be1a62e64da87cc990c07481b988f
Author: Takeshi Abe 
Date:   Wed Sep 17 16:02:44 2014 +0900

fdo#75757: remove inheritance to std::vector

from DdeItemImp.

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

diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index 54a83d4..1409b9d 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -42,7 +42,23 @@ struct DdeItemImpData
 DdeItemImpData( sal_uLong nH ) : nHCnv( nH ), nCnt( 1 ) {}
 };
 
-class DdeItemImp : public std::vector {};
+class DdeItemImp {
+public:
+DdeItemImp() : mvData() {}
+
+size_t size() const { return mvData.size(); }
+
+std::vector::iterator begin() { return mvData.begin(); }
+
+void erase(std::vector::iterator it) { mvData.erase(it); }
+
+void push_back(const DdeItemImpData& rData) { mvData.push_back(rData); }
+
+DdeItemImpData& operator[](size_t i) { return mvData[i]; }
+
+private:
+std::vector mvData;
+};
 
 HDDEDATA CALLBACK DdeInternal::SvrCallback(
 WORD nCode, WORD nCbType, HCONV hConv, HSZ hText1, HSZ hText2,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 39468] translate German comments, removing redundant ones

[bugzilla-daemon]

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

--- Comment #137 from Commit Notification 
 ---
Philipp Weissenbacher committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=0f8ed329131573289c98b8339f53e57abf67967d

fdo#39468 Translate German comments, clean some ws



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: Branch 'libreoffice-4-3' - download.lst

[Kohei Yoshida]

 download.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7afda0272e4fe61f24af97a5b16f74a5ef0ff198
Author: Kohei Yoshida 
Date:   Thu Sep 18 14:22:27 2014 -0400

Update mdds to 0.11.0.

(cherry picked from commit 3f3b404b643f907f9feff893324174c00c3c4e4a)

Conflicts:
download.lst

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

diff --git a/download.lst b/download.lst
index f413a57..303033d 100644
--- a/download.lst
+++ b/download.lst
@@ -95,7 +95,7 @@ export LIBXML_TARBALL := 
9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz
 export LIBXSLT_TARBALL := 
9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export MARIADB_TARBALL := 
05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2
-export MDDS_TARBALL := aa5ca9d1ed1082890835afab26400a39-mdds_0.10.3.tar.bz2
+export MDDS_TARBALL := a67a46ec9d00d283a7cd8dbdd2906b59-mdds_0.11.0.tar.bz2
 export MSPUB_MD5SUM := 1d489c4932109e72495b1df8b69e5f11
 export MSPUB_TARBALL := libmspub-0.1.1.tar.bz2
 export MWAW_MD5SUM := 6f1ac4a0e24131c422e1e91f07718fb6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Philipp Weissenbacher]

 forms/source/component/FormComponent.cxx |6 +-
 forms/source/component/FormattedField.cxx|   67 +++
 forms/source/component/FormattedField.hxx|2 
 forms/source/component/FormattedFieldWrapper.hxx |2 
 forms/source/component/FormsCollection.hxx   |   12 +---
 forms/source/component/Grid.hxx  |   16 ++---
 forms/source/component/GroupBox.cxx  |1 
 forms/source/component/GroupBox.hxx  |2 
 forms/source/component/GroupManager.cxx  |   35 +---
 forms/source/component/GroupManager.hxx  |   34 +--
 forms/source/component/Hidden.cxx|2 
 forms/source/component/ImageButton.cxx   |   10 +--
 forms/source/component/ImageButton.hxx   |4 -
 13 files changed, 92 insertions(+), 101 deletions(-)

New commits:
commit 0f8ed329131573289c98b8339f53e57abf67967d
Author: Philipp Weissenbacher 
Date:   Wed Sep 24 11:43:17 2014 +0200

fdo#39468 Translate German comments, clean some ws

Conflicts:
forms/source/component/FormComponent.cxx
forms/source/component/FormattedField.cxx

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

diff --git a/forms/source/component/FormComponent.cxx 
b/forms/source/component/FormComponent.cxx
index e8547ac..996e1b6 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -154,7 +154,7 @@ void OControl::doSetDelegator()
 decrement( m_refCount );
 }
 
-// UNO Anbindung
+// UNO Binding
 Any SAL_CALL OControl::queryAggregation( const Type& _rType ) 
throw(RuntimeException, std::exception)
 {
 // ask the base class
@@ -758,13 +758,13 @@ void SAL_CALL OControlModel::write(const 
Reference
 xMark->jumpToFurthest();
 xMark->deleteMark(nMark);
 
-// 2. wrting a version number
+// 2. writing a version number
 _rxOutStream->writeShort(0x0003);
 
 // 3. writing the general properties
 ::comphelper::operator<<( _rxOutStream, m_aName);
 _rxOutStream->writeShort(m_nTabIndex);
-::comphelper::operator<<( _rxOutStream, m_aTag); // 3. version
+::comphelper::operator<<( _rxOutStream, m_aTag); // 3rd version
 
 // IMPORTANT NOTE!
 // don't write any new members here: this wouldn't be compatible with 
older versions, as OControlModel
diff --git a/forms/source/component/FormattedField.cxx 
b/forms/source/component/FormattedField.cxx
index 30d72fc..6ed7274 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -196,7 +196,7 @@ void OFormattedControl::keyPressed(const 
::com::sun::star::awt::KeyEvent& e) thr
 {
 if( e.KeyCode != KEY_RETURN || e.Modifiers != 0 )
 return;
-// Is the control on a form with a submit URL?
+// Is the control located in a form with a Submit URL?
 Reference  xSet(getModel(), 
UNO_QUERY);
 if( !xSet.is() )
 return;
@@ -223,13 +223,13 @@ void OFormattedControl::keyPressed(const 
::com::sun::star::awt::KeyEvent& e) thr
 if (hasProperty(PROPERTY_CLASSID, xFCSet) &&
 getINT16(xFCSet->getPropertyValue(PROPERTY_CLASSID)) == 
FormComponentType::TEXTFIELD)
 {
-// Found another edit ==> no submit
+// Found another Edit -> Do not submit then
 if (xFCSet != xSet)
 return;
 }
 }
 }
-// Still in the handler, trigger submit asynchronous
+// Because we're still in the Handler, execute submit asynchronously
 if( m_nKeyEvent )
 Application::RemoveUserEvent( m_nKeyEvent );
 m_nKeyEvent = Application::PostUserEvent( LINK(this, OFormattedControl,
@@ -283,7 +283,7 @@ void OFormattedModel::implConstruct()
 }
 OFormattedModel::OFormattedModel(const Reference& 
_rxFactory)
 :OEditBaseModel(_rxFactory, VCL_CONTROLMODEL_FORMATTEDFIELD, 
FRM_SUN_CONTROL_FORMATTEDFIELD, true, true )
-// use the old control name for compytibility 
reasons
+// use the old control name for compytibility reasons
 ,OErrorBroadcaster( OComponentHelper::rBHelper )
 {
 implConstruct();
@@ -363,17 +363,17 @@ void OFormattedModel::describeFixedProperties( Sequence< 
Property >& _rProps ) c
 void OFormattedModel::describeAggregateProperties( Sequence< Property >& 
_rAggregateProps ) const
 {
 OEditBaseModel::describeAggregateProperties( _rAggregateProps );
-// TreatAsNumeric not transient : we want to bind it to the UI (necessary, 
because EffectiveDefault
-// - could be text or numbers - for making sense)
+// TreatAsNumeric is not transient: we want to attach it to the UI
+// This is necessary to make EffectiveDefault (which may be text or a 
number) meaningful
 ModifyPropertyAttributes(_rAggregateProps, PROPERT

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

[Matthew J . Francis]

 cppuhelper/source/servicemanager.cxx |   31 ---
 1 file changed, 20 insertions(+), 11 deletions(-)

New commits:
commit 0af1c09b3ad23790d9992ec329a2c3f28b820050
Author: Matthew J. Francis 
Date:   Wed Sep 24 23:30:23 2014 +0800

Eliminate memory leak due to circular shared_ptr

Without this, a Data::Implementation can have a circular reference of
shared_ptr to itself through .factory1

Change-Id: Ie05545e7ecc0ae85256d2c374fe79f0c678ccf64

Signed-off-by: Stephan Bergmann 

diff --git a/cppuhelper/source/servicemanager.cxx 
b/cppuhelper/source/servicemanager.cxx
index 84b29b3..ed8e9ec 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -15,6 +15,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -586,7 +587,7 @@ private:
 getSupportedServiceNames() throw (css::uno::RuntimeException, 
std::exception) SAL_OVERRIDE;
 
 rtl::Reference< cppuhelper::ServiceManager > manager_;
-boost::shared_ptr< cppuhelper::ServiceManager::Data::Implementation >
+boost::weak_ptr< cppuhelper::ServiceManager::Data::Implementation >
 implementation_;
 };
 
@@ -595,8 +596,10 @@ ImplementationWrapper::createInstanceWithContext(
 css::uno::Reference< css::uno::XComponentContext > const & Context)
 throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
-manager_->loadImplementation(Context, implementation_);
-return implementation_->createInstance(Context, false);
+boost::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl 
= implementation_.lock();
+assert(impl);
+manager_->loadImplementation(Context, impl);
+return impl->createInstance(Context, false);
 }
 
 css::uno::Reference< css::uno::XInterface >
@@ -605,8 +608,10 @@ 
ImplementationWrapper::createInstanceWithArgumentsAndContext(
 css::uno::Reference< css::uno::XComponentContext > const & Context)
 throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
-manager_->loadImplementation(Context, implementation_);
-return implementation_->createInstanceWithArguments(
+boost::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl 
= implementation_.lock();
+assert(impl);
+manager_->loadImplementation(Context, impl);
+return impl->createInstanceWithArguments(
 Context, false, Arguments);
 }
 
@@ -629,7 +634,9 @@ ImplementationWrapper::createInstanceWithArguments(
 rtl::OUString ImplementationWrapper::getImplementationName()
 throw (css::uno::RuntimeException, std::exception)
 {
-return implementation_->info->name;
+boost::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl 
= implementation_.lock();
+assert(impl);
+return impl->info->name;
 }
 
 sal_Bool ImplementationWrapper::supportsService(rtl::OUString const & 
ServiceName)
@@ -642,20 +649,22 @@ css::uno::Sequence< rtl::OUString >
 ImplementationWrapper::getSupportedServiceNames()
 throw (css::uno::RuntimeException, std::exception)
 {
-if (implementation_->info->services.size()
+boost::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl 
= implementation_.lock();
+assert(impl);
+if (impl->info->services.size()
 > static_cast< sal_uInt32 >(SAL_MAX_INT32))
 {
 throw css::uno::RuntimeException(
-("Implementation " + implementation_->info->name
+("Implementation " + impl->info->name
  + " supports too many services"),
 static_cast< cppu::OWeakObject * >(this));
 }
 css::uno::Sequence< rtl::OUString > names(
-static_cast< sal_Int32 >(implementation_->info->services.size()));
+static_cast< sal_Int32 >(impl->info->services.size()));
 sal_Int32 i = 0;
 for (std::vector< rtl::OUString >::const_iterator j(
- implementation_->info->services.begin());
- j != implementation_->info->services.end(); ++j)
+ impl->info->services.begin());
+ j != impl->info->services.end(); ++j)
 {
 names[i++] = *j;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/qa/extras/ooxmlexport/data/numbering-font.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |7 +++
 writerfilter/source/dmapper/DomainMapper.cxx  |9 +
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   16 +++-
 4 files changed, 31 insertions(+), 1 deletion(-)

New commits:
commit f5ba3098b4406ff8656f2710df8af6ca6edcddc8
Author: Miklos Vajna 
Date:   Thu Sep 25 10:12:14 2014 +0200

fdo#83465 writerfilter: import font of numbering

Change-Id: I0afe389fa6ea8b4c701232c6ecb425d5fdcde5fe

diff --git a/sw/qa/extras/ooxmlexport/data/numbering-font.docx 
b/sw/qa/extras/ooxmlexport/data/numbering-font.docx
new file mode 100644
index 000..ccbbd9e
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/numbering-font.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index af4e9dd..0b2c78f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -283,6 +283,13 @@ DECLARE_OOXMLEXPORT_TEST(testPositionAndRotation, 
"position-and-rotation.docx")
 CPPUNIT_ASSERT(xShape->getPosition().Y < 100);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testNumberingFont, "numbering-font.docx")
+{
+uno::Reference 
xStyle(getStyles("CharacterStyles")->getByName("ListLabel 1"), uno::UNO_QUERY);
+// This was Calibri, i.e. custom font of the numbering itself ("1.\t") was 
lost on import.
+CPPUNIT_ASSERT_EQUAL(OUString("Verdana"), getProperty(xStyle, 
"CharFontName"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 2fe97d9..417655e 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -306,7 +306,16 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 
 case NS_ooxml::LN_CT_Fonts_ascii:
 if (m_pImpl->GetTopContext())
+{
 m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME, 
uno::makeAny( sStringValue ));
+if (m_pImpl->GetTopContextType() == CONTEXT_PARAGRAPH && 
m_pImpl->GetTopContext()->isSet(PROP_NUMBERING_RULES))
+{
+// Font of the paragraph mark should be used for the 
numbering as well.
+uno::Reference 
xCharStyle(m_pImpl->GetCurrentNumberingCharStyle());
+if (xCharStyle.is())
+xCharStyle->setPropertyValue("CharFontName", 
uno::makeAny(sStringValue));
+}
+}
 break;
 case NS_ooxml::LN_CT_Fonts_asciiTheme:
 m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, 
"asciiTheme", ThemeTable::getStringForTheme(nIntValue));
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index bf5a748..0259aca 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4816,7 +4816,21 @@ uno::Reference 
DomainMapper_Impl::GetCurrentNumberingCharSt
 sal_Int32 nListLevel = -1;
 uno::Reference xLevels = 
GetCurrentNumberingRules(&nListLevel);
 if (!xLevels.is())
-return xRet;
+{
+// In case numbering rules is not found via a style, try the 
direct formatting instead.
+boost::optional oProp = 
m_pTopContext->getProperty(PROP_NUMBERING_RULES);
+if (oProp)
+{
+xLevels.set(oProp->second, uno::UNO_QUERY);
+// Found the rules, then also try to look up our numbering 
level.
+oProp = m_pTopContext->getProperty(PROP_NUMBERING_LEVEL);
+if (oProp)
+oProp->second >>= nListLevel;
+}
+
+if (!xLevels.is())
+return xRet;
+}
 uno::Sequence aProps;
 xLevels->getByIndex(nListLevel) >>= aProps;
 for (int i = 0; i < aProps.getLength(); ++i)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/find-german-comments

[Philipp Weissenbacher]

 bin/find-german-comments |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 76034b4962027155a44b1c6aab665ac12fecf952
Author: Philipp Weissenbacher 
Date:   Thu Sep 18 23:40:32 2014 +0200

Restore searching in sub directories

With earlier version of fgc, one could cd into a sub directory and
use fgc to find the German comments in there.
This change restores that behaviour again.

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

diff --git a/bin/find-german-comments b/bin/find-german-comments
index 7e48b9f..2288bcc 100755
--- a/bin/find-german-comments
+++ b/bin/find-german-comments
@@ -351,7 +351,11 @@ class Parser:
 
 for path in lines:
 baseDir = self.first_elem(path)
-if not baseDir in directory_whitelist:
+
+# Support searching within sub directories
+if directory is '.':
+self.check_file(path.strip())
+elif not baseDir in directory_whitelist:
 print ("Missing path %s " % baseDir)
 elif directory_whitelist[baseDir] is 0:
 #print ("Scan path %s " % baseDir)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Peter Foley]

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

New commits:
commit 030812e5dce29080f3fd24bbd7bdd2b6b4ec649e
Author: Peter Foley 
Date:   Wed Sep 24 13:09:19 2014 -0400

Fix PythonTest on windows

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

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index b1546fe..390a7b8 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -567,7 +567,7 @@ gb_UIMenubarTarget_UIMenubarTarget_platform :=
 
 # Python
 gb_Python_PRECOMMAND := PATH="$(shell cygpath -w $(INSTDIR)/program)" 
PYTHONHOME="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)" 
PYTHONPATH="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib;$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib/lib-dynload:$(INSTDIR)/program"
-gb_Python_INSTALLED_EXECUTABLE := $(INSTROOT)/$(LIBO_BIN_FOLDER)/python.exe
+gb_Python_INSTALLED_EXECUTABLE := 
$(INSTROOT)/$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/bin/python.exe
 
 gb_ICU_PRECOMMAND := PATH="$(shell cygpath -w 
$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/lib)"
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 39468] translate German comments, removing redundant ones

[bugzilla-daemon]

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

--- Comment #136 from Commit Notification 
 ---
Jennifer Liebel committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=9b94cf75499bf9fbb9f0072cbba0152c7bfdc387

fdo#39468: translation



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: include/svtools include/svx sc/source

[Jennifer Liebel]

 include/svtools/wizdlg.hxx   |   36 +++-
 include/svx/sxmtfitm.hxx |   10 +-
 include/svx/sxmuitm.hxx  |4 ++--
 include/svx/tabline.hxx  |   12 ++--
 include/svx/viewpt3d.hxx |   34 +-
 include/svx/xflbmsxy.hxx |   12 
 sc/source/filter/excel/impop.cxx |   24 
 7 files changed, 61 insertions(+), 71 deletions(-)

New commits:
commit 9b94cf75499bf9fbb9f0072cbba0152c7bfdc387
Author: Jennifer Liebel 
Date:   Thu Sep 25 08:25:27 2014 +

fdo#39468: translation

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

diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx
index e65d596..480032d 100644
--- a/include/svtools/wizdlg.hxx
+++ b/include/svtools/wizdlg.hxx
@@ -37,30 +37,24 @@ Beschreibung
 
 class WizardDialog
 
-Diese Klasse dient als Basis fuer einen WizardDialog. Als
-Basisfunktionalitaet wird das Anordnen der Controls angeboten und
-Hilfesmethoden fuer das Umschalten von TabPages. Der Dialog
-ordnet bei einer Groessenanderung die Controls auch wieder
-entsprechend an.
+This class is the base for WizardDialog. The basic functionality is to
+order the Controls. Besides it's a helper method for switching the TabPages.
+The dialog orders the Controls when their size changed.
 
 --
 
-Mit SetPageSizePixel() kann als Groesse die Groesse der groessten
-TabPage vorgegeben werden. Wenn der Dialog angezeigt wird, wird
-zu dem Zeitpunkt wenn noch keine Groesse gesetzt wurde, dafuer
-die entsprechende Dialoggroesse berechnet und gesetzt. Wenn mit
-SetPageSizePixel() keine Groesse gesetzt wurde, wird als Groesse
-die maximale Groesse der zu diesem Zeitpunkt zugewiesenen TabPages
-berechnet und genommen.
-
-ShowPrevPage()/ShowNextPage() zeigt die vorherige/naechste TabPage
-an. Dazu wird zuerst der Deactivate-Handler vom Dialog gerufen und
-wenn dieser sal_True zurueckgegeben hat, wird der Acivate-Handler
-vom Dialog gerufen und die entsprechende TabPage angezeigt.
-Finnsh() kann gerufen werden, wenn der Finnish-Button betaetigt
-wird. Dort wird dann auch noch der Deactivate-Page-Handler vom
-Dialog und der aktuellen TabPage gerufen und dann der Dialog
-beendet (Close() oder EndDialog()).
+SetPageSizePixel() sets the biggest TabPage size. When the dialog
+should be displayed, first the dialog size is calculated and set.
+If there is no size set with SetPageSizePixel(), max size of the
+current TabPage is set as default.
+
+ShowPrevPage()/ShowNextPage() shows the previous/next TabPage.
+First the Deactivate-Handler is called by dialog and if the return
+value is sal_True the Active-Handler is called by dialog and the
+corresponding TabPage is showed. Finnish() can only be called
+if the Finnish-Button is activated. Then the Deactivate-Page-Handler
+is called by dialog and by the current TabPage. Now the dialog ends
+(Close() or EndDialog()).
 
 Mit AddPage()/RemovePage()/SetPage() koennen die TabPages dem Wizard
 bekannt gemacht werden. Es wird immer die TabPage des aktuellen Levels
diff --git a/include/svx/sxmtfitm.hxx b/include/svx/sxmtfitm.hxx
index 0024913..b8c788e 100644
--- a/include/svx/sxmtfitm.hxx
+++ b/include/svx/sxmtfitm.hxx
@@ -23,17 +23,17 @@
 #include 
 #include 
 
-// die 2 folgenden sind noch nicht implementiert!
-// Text auf einen wirklich fixen Winkel festnageln.
-// Der Textwinkel ist dann auch unabhaengig vom Winkel der Masslinie.
-// Setzt TextUpsideDown, TextRota90 sowie TextAutoAngle ausser Kraft. (n.i.)
+// The two following are not implemented yet!
+// Nail text down to a fix angle.
+// The text angle is independet of the dimension line.
+// Abrogate TextUpsideDown, TextRota90 and TextAutoAngle. (n.i.)
 class SdrMeasureTextIsFixedAngleItem: public SdrYesNoItem {
 public:
 SdrMeasureTextIsFixedAngleItem(bool bOn=false): 
SdrYesNoItem(SDRATTR_MEASURETEXTISFIXEDANGLE,bOn) {}
 SdrMeasureTextIsFixedAngleItem(SvStream& rIn): 
SdrYesNoItem(SDRATTR_MEASURETEXTISFIXEDANGLE,rIn) {}
 };
 
-// Der Winkel des Textes in 1/100deg. 0=Horizontal von links nach rechts zu 
lesen. (n.i.)
+//Angle of the text in 1/100deg. 0=horizontal; read from left to right. (n.i.)
 class SdrMeasureTextFixedAngleItem: public SdrAngleItem {
 public:
 SdrMeasureTextFixedAngleItem(long nVal=0): 
SdrAngleItem(SDRATTR_MEASURETEXTFIXEDANGLE,nVal)  {}
diff --git a/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx
index 57c8c1d..bcc7c28 100644
--- a/include/svx/sxmuitm.hxx
+++ b/include/svx/sxmuitm.hxx
@@ -24,8 +24,8 @@
 #include 
 #include 
 
-// Vorgabe einer Masseinheit. Der Zahlenwert wird in diese Einheit umgerechnet
-// (ausgehend von der MapUnit des Models). Diese Einheit wird dann ggf. auch 
angezeigt.
+// specification of the unit i

[Bug 75757] remove inheritance to std::map and std::vector

[bugzilla-daemon]

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

--- Comment #37 from Commit Notification 
 ---
Takeshi Abe committed a patch related to this issue.
It has been pushed to "master":

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

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: vcl/inc

[Takeshi Abe]

 vcl/inc/graphite_layout.hxx |8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit bad30ceceee6750b6ece0057080473383d216ea7
Author: Takeshi Abe 
Date:   Fri Sep 19 16:32:23 2014 +0900

fdo#75757: remove inheritance to std::vector

Glyphs::iterator_pair_t was gone at 
df3c7e76cca60d246277731d0c525d5f7e6f6597.

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

diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx
index 3295468..7356bd5 100644
--- a/vcl/inc/graphite_layout.hxx
+++ b/vcl/inc/graphite_layout.hxx
@@ -87,13 +87,7 @@ private:
 class VCL_PLUGIN_PUBLIC GraphiteLayout : public SalLayout
 {
 public:
-
-class Glyphs : public std::vector
-{
-public:
-typedef std::pair 
iterator_pair_t;
-
-};
+typedef std::vector Glyphs;
 
 mutable Glyphs  mvGlyphs;
 void clear();
___
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' - i18npool/source

[Julien Nabet]

 i18npool/source/localedata/data/es_CR.xml |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit d75c75e50e96bec00305258fcc8961c6e780db3f
Author: Julien Nabet 
Date:   Wed Sep 24 22:20:56 2014 +0200

Resolves fdo#84260: Wrong CRC Costa Rica currency symbol

See https://en.wikipedia.org/wiki/Costa_Rican_col%C3%B3n

Cherry-picked from aa33dd16b0e3075f28c56656678c0f5cb764

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

diff --git a/i18npool/source/localedata/data/es_CR.xml 
b/i18npool/source/localedata/data/es_CR.xml
index 2513623..6a04a8e 100644
--- a/i18npool/source/localedata/data/es_CR.xml
+++ b/i18npool/source/localedata/data/es_CR.xml
@@ -143,22 +143,22 @@
   #.###,00
 
 
-  [$¢-140A] #.##0;-[$¢-140A] #.##0
+  [$₡-140A] #.##0;-[$₡-140A] #.##0
 
 
-  [$¢-140A] #.##0,00;-[$¢-140A] #.##0,00
+  [$₡-140A] #.##0,00;-[$₡-140A] #.##0,00
 
 
-  [$¢-140A] #.##0;[RED]-[$¢-140A] #.##0
+  [$₡-140A] #.##0;[RED]-[$₡-140A] #.##0
 
 
-  [$¢-140A] #.##0,00;[RED]-[$¢-140A] #.##0,00
+  [$₡-140A] #.##0,00;[RED]-[$₡-140A] #.##0,00
 
 
   #.##0,00 CCC
 
 
-  [$¢-140A] #.##0,--;[RED]-[$¢-140A] #.##0,--
+  [$₡-140A] #.##0,--;[RED]-[$₡-140A] #.##0,--
 
 
   0%
@@ -180,7 +180,7 @@
   
 
   CRC
-  ¢
+  ₡
   CRC
   Colon
   2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 62081] Add split menus to items in the style dropdown

[bugzilla-daemon]

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

Jay Philips  changed:

   What|Removed |Added

 CC||philip...@hotmail.com

--- Comment #8 from Jay Philips  ---
Thanks Szymon Kłos for the patch as i know it will also benefit the sidebar
when the styles drop down is put there as well.

Look forward to the upcoming improvements and here are some suggestions that i
know Mirek2 would also recommend.

1) 'Update Style' - In the 'styles & formatting' dialog, there is a drop down
menu item that has an 'Update Style' entry, so it would useful to link that the
code in there.

2) Right-click activation - It would be good if right-click would open up that
menu, rather than apply the current style, as right-click is the common button
for context menu.

3) 'Apply Style' - I think this could be removed, as clicking on the style name
does the same thing.

-- 
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