LibreOffice Gerrit News for core on 2014-07-04

[gerrit]

Moin!

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

 First time contributors doing great things! 
+ include correct header to use std:: namespace for strlen
  in https://gerrit.libreoffice.org/10076 from Douglas Mencken
  about module include
+ Convert RID_CONDFORMAT to .ui
  in https://gerrit.libreoffice.org/10064 from Mihály Palenik
  about module reportdesign
+ RID_DLG_LISTCOMBOWIZARD tab pages conversion to .ui
  in https://gerrit.libreoffice.org/10043 from Szymon Kłos
  about module extensions
 End of freshness 

+ Related fdo#77603: update Spanish autocorrection patterns.
  in https://gerrit.libreoffice.org/10061 from Adolfo Jayme Barrientos
  about module extras
+ fdo#80651 - Add 'Single Page' button to Page Preview Toolbar
  in https://gerrit.libreoffice.org/10053 from Joren De Cuyper
  about module icon-themes, officecfg, sw
+ fdo#80195 IFERROR() fails to return correct value
  in https://gerrit.libreoffice.org/9830 from Winfried Donkers
  about module sc
+ first delete, then nullify
  in https://gerrit.libreoffice.org/10047 from Takeshi Abe
  about module svtools


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

+ Don't stop on os.makedirs when making vs2012-ide-integration
  in https://gerrit.libreoffice.org/10062 from Niklas Johansson
+ fdo#54361:Add test case for the chart background
  in https://gerrit.libreoffice.org/9978 from Heena Gupta
+ fdo#80748: Fix for file corruption due to framePr
  in https://gerrit.libreoffice.org/10045 from Rohit Deshmukh
+ fdo#77129 DOCX:Only Six pages were loaded out of 60 pages.
  in https://gerrit.libreoffice.org/9930 from Sushil Shinde
+ Resolves fdo#79276 Add fallback system for autocorrection of French varia
  in https://gerrit.libreoffice.org/9825 from Julien Nabet
+ Shorten Spanish key translations in Linux
  in https://gerrit.libreoffice.org/10030 from Adolfo Jayme Barrientos
+ Typo in HID for ERF
  in https://gerrit.libreoffice.org/10038 from Olivier Hallot


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

+ writerfilter/source: remove "__future__ import print_function" lines
  in https://gerrit.libreoffice.org/10009 from Douglas Mencken
+ add possibility to --disable-autorecovery before building
  in https://gerrit.libreoffice.org/10032 from Douglas Mencken


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

+ Replace the whole content for copied documents
  in https://gerrit.libreoffice.org/9862 from Jan-Marek Glogowski
+ fdo#78947 : The File gets corrupted when saved in LO
  in https://gerrit.libreoffice.org/9775 from BisalNayal
+ fdo#79018: LO hangs while opening file.
  in https://gerrit.libreoffice.org/9564 from Yogesh Bharate
+ configure, gbuild: remove Cygwin paths from make environment
  in https://gerrit.libreoffice.org/9698 from Michael Stahl
+ sw/docx export: fix handling of document with header and section(s)
  in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer
+ move OpenGLContext to SAL
  in https://gerrit.libreoffice.org/9429 from David Tardon
+ Changes for Wordml
  in https://gerrit.libreoffice.org/9013 from Michel Messak
+ fdo#64945 Remove inconvenient localized symbol code.
  in https://gerrit.libreoffice.org/8696 from Darshana Padmadas
+ fdo#77716 : Paragraph spacing is not preserved after RT.
  in https://gerrit.libreoffice.org/9197 from Tushar Bende
+ Lots of changes to Tango icons
  in https://gerrit.libreoffice.org/7987 from Miroslav Mazel
+ Refactored swooxmlexport tests cases. Added function to check contents.
  in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar
+ fdo#77121 Header / Footer positions not preserved after RT
  in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad


Best,

Your friendly LibreOffice Gerrit Digest Mailer

Note: The bot generating this message can be found and improved here:
   
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[matteocam]

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

New commits:
commit f2d6eb4d96918de9b29a96749506b83b0e59293f
Author: matteocam 
Date:   Thu Jul 3 14:16:38 2014 -0400

Fix: EE_CHAR_COLOR to EE_CHAR_BKGCOLOR

diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index 7b4d94a..3c5f9f1 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2600,7 +2600,7 @@ void EditEngine::SetFontInfoInItemSet( SfxItemSet& rSet, 
const SvxFont& rFont )
 rSet.Put( SvxEscapementItem( rFont.GetEscapement(), rFont.GetPropr(), 
EE_CHAR_ESCAPEMENT )  );
 rSet.Put( SvxWeightItem( rFont.GetWeight(), EE_CHAR_WEIGHT )  );
 rSet.Put( SvxColorItem( rFont.GetColor(), EE_CHAR_COLOR )  );
-rSet.Put( SvxBackgroundColorItem( rFont.GetFillColor(), EE_CHAR_COLOR )  );
+rSet.Put( SvxBackgroundColorItem( rFont.GetFillColor(), EE_CHAR_BKGCOLOR ) 
 );
 rSet.Put( SvxUnderlineItem( rFont.GetUnderline(), EE_CHAR_UNDERLINE )  );
 rSet.Put( SvxOverlineItem( rFont.GetOverline(), EE_CHAR_OVERLINE )  );
 rSet.Put( SvxCrossedOutItem( rFont.GetStrikeout(), EE_CHAR_STRIKEOUT )  );
___
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' - chart2/source drawinglayer/Library_drawinglayer.mk drawinglayer/source include/drawinglayer include/svx include/vcl svx/inc svx/Library_svxco

[Markus Mohrhard]

 chart2/source/view/inc/AbstractShapeFactory.hxx|4 
 chart2/source/view/inc/OpenglShapeFactory.hxx  |4 
 chart2/source/view/inc/ShapeFactory.hxx|4 
 chart2/source/view/main/ChartView.cxx  |4 
 chart2/source/view/main/OpenglShapeFactory.cxx |   85 
+-
 drawinglayer/Library_drawinglayer.mk   |3 
 drawinglayer/source/primitive2d/baseprimitive2d.cxx|1 
 drawinglayer/source/primitive2d/openglprimitive2d.cxx  |   32 ---
 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |6 
 drawinglayer/source/processor2d/vclprocessor2d.cxx |   10 -
 drawinglayer/source/processor2d/vclprocessor2d.hxx |3 
 include/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx |3 
 include/drawinglayer/primitive2d/openglprimitive2d.hxx |   41 
 include/svx/svdobj.hxx |1 
 include/svx/unoshape.hxx   |   10 -
 include/vcl/opengl/IOpenGLRenderer.hxx |   28 ---
 include/vcl/opengl/OpenGLContext.hxx   |1 
 svx/Library_svxcore.mk |1 
 svx/inc/svdoopengl.hxx |4 
 svx/source/svdraw/svdobj.cxx   |2 
 svx/source/svdraw/svdoopengl.cxx   |9 -
 svx/source/unodraw/unomod.cxx  |4 
 svx/source/unodraw/unopage.cxx |3 
 svx/source/unodraw/unoprov.cxx |1 
 svx/source/unodraw/unoshap4.cxx|   10 -
 25 files changed, 29 insertions(+), 245 deletions(-)

New commits:
commit d72d80aa8393c9416423602779cb63b22141033a
Author: Markus Mohrhard 
Date:   Sun Jun 15 22:24:46 2014 +0200

Make OpenGL 2D rendering working again.

Change-Id: I29101aee77ac37f5a8e1b929793d7554bc425b26
Reviewed-on: https://gerrit.libreoffice.org/10075
Reviewed-by: Kohei Yoshida 
Tested-by: Kohei Yoshida 

diff --git a/chart2/source/view/inc/AbstractShapeFactory.hxx 
b/chart2/source/view/inc/AbstractShapeFactory.hxx
index b9b247f..015d524 100644
--- a/chart2/source/view/inc/AbstractShapeFactory.hxx
+++ b/chart2/source/view/inc/AbstractShapeFactory.hxx
@@ -237,9 +237,9 @@ public:
 /**
  * Only necessary for stateless implementations
  */
-virtual void render(com::sun::star::uno::Reference< 
com::sun::star::drawing::XDrawPage > xDrawPage) = 0;
+virtual void render(com::sun::star::uno::Reference< 
com::sun::star::drawing::XShapes > xRootShape) = 0;
 
-virtual void clearPage(com::sun::star::uno::Reference< 
com::sun::star::drawing::XDrawPage > xDrawPage) = 0;
+virtual void clearPage(com::sun::star::uno::Reference< 
com::sun::star::drawing::XShapes > xRootShape) = 0;
 
 static ::com::sun::star::uno::Reference< 
::com::sun::star::drawing::XShapes >
  getChartRootShape( const ::com::sun::star::uno::Reference<
diff --git a/chart2/source/view/inc/OpenglShapeFactory.hxx 
b/chart2/source/view/inc/OpenglShapeFactory.hxx
index c93199f..e9b2614 100644
--- a/chart2/source/view/inc/OpenglShapeFactory.hxx
+++ b/chart2/source/view/inc/OpenglShapeFactory.hxx
@@ -184,9 +184,9 @@ public:
 
 virtual void setPageSize( com::sun::star::uno::Reference < 
com::sun::star::drawing::XShapes > xChartShapes, const 
com::sun::star::awt::Size& rSize ) SAL_OVERRIDE;
 
-virtual void render(com::sun::star::uno::Reference< 
com::sun::star::drawing::XDrawPage > xDrawPage) SAL_OVERRIDE;
+virtual void render(com::sun::star::uno::Reference< 
com::sun::star::drawing::XShapes > xRootShape) SAL_OVERRIDE;
 
-virtual void clearPage(com::sun::star::uno::Reference< 
com::sun::star::drawing::XDrawPage > xDrawPage) SAL_OVERRIDE;
+virtual void clearPage(com::sun::star::uno::Reference< 
com::sun::star::drawing::XShapes > xRootShape) SAL_OVERRIDE;
 };
 
 }
diff --git a/chart2/source/view/inc/ShapeFactory.hxx 
b/chart2/source/view/inc/ShapeFactory.hxx
index 87a4387..74a4d38 100644
--- a/chart2/source/view/inc/ShapeFactory.hxx
+++ b/chart2/source/view/inc/ShapeFactory.hxx
@@ -197,9 +197,9 @@ public:
 /**
  * not necessary right now
  */
-virtual void render(com::sun::star::uno::Reference< 
com::sun::star::drawing::XDrawPage > ) SAL_OVERRIDE {}
+virtual void render(com::sun::star::uno::Reference< 
com::sun::star::drawing::XShapes > ) SAL_OVERRIDE {}
 
-virtual void clearPage(com::sun::star::uno::Reference< 
com::sun::star::drawing::XDrawPage > ) SAL_OVERRIDE {}
+virtual void clearPage(com::sun::star::uno::Reference< 
com::sun::star::drawing::XShapes > ) SAL_OVERRIDE {}
 
 private:
 ShapeFac

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

[Takeshi Abe]

 svtools/source/contnr/contentenumeration.cxx |3 --
 svtools/source/contnr/imivctl1.cxx   |4 +-
 svtools/source/control/calendar.cxx  |   39 +--
 svx/source/svdraw/svdouno.cxx|1 
 svx/source/unogallery/unogalitem.cxx |5 +--
 svx/source/xml/xmleohlp.cxx  |5 ++-
 svx/source/xml/xmlgrhlp.cxx  |   11 +++
 svx/source/xml/xmlxtexp.cxx  |   16 +--
 8 files changed, 33 insertions(+), 51 deletions(-)

New commits:
commit f38bf4c6c29d685ec4f1015be09f64c7ae2eb172
Author: Takeshi Abe 
Date:   Fri Jul 4 00:55:08 2014 +0900

Avoid possible memory leaks in case of exceptions

Change-Id: I04a0a2c296206f155ee4916b15b853a7f10c2c2a

diff --git a/svtools/source/contnr/imivctl1.cxx 
b/svtools/source/contnr/imivctl1.cxx
index 1335693..d7ccee1 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -690,7 +690,7 @@ void SvxIconChoiceCtrl_Impl::Paint( const Rectangle& rRect )
 }
 
 SvxIconChoiceCtrlEntryList_impl* pNewZOrderList = new 
SvxIconChoiceCtrlEntryList_impl();
-SvxIconChoiceCtrlEntryList_impl* pPaintedEntries = new 
SvxIconChoiceCtrlEntryList_impl();
+boost::scoped_ptr pPaintedEntries(new 
SvxIconChoiceCtrlEntryList_impl());
 
 size_t nPos = 0;
 while( nCount )
@@ -717,7 +717,7 @@ void SvxIconChoiceCtrl_Impl::Paint( const Rectangle& rRect )
 for( size_t nCur = 0; nCur < nCount; nCur++ )
 pZOrderList->push_back( (*pPaintedEntries)[ nCur ] );
 }
-delete pPaintedEntries;
+pPaintedEntries.reset();
 
 if( bResetClipRegion )
 pView->SetClipRegion();
diff --git a/svtools/source/control/calendar.cxx 
b/svtools/source/control/calendar.cxx
index 26427a4..b380baf8 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -37,7 +37,7 @@
 #include 
 #include 
 #include 
-
+#include 
 
 
 #define DAY_OFFX4
@@ -1084,7 +1084,7 @@ void Calendar::ImplUpdateSelection( IntDateSet* pOld )
 void Calendar::ImplMouseSelect( const Date& rDate, sal_uInt16 nHitTest,
 bool bMove, bool bExpand, bool bExtended )
 {
-IntDateSet*  pOldSel = new IntDateSet( *mpSelectTable );
+boost::scoped_ptr pOldSel(new IntDateSet( *mpSelectTable ));
 DateaOldDate = maCurDate;
 DateaTempDate = rDate;
 
@@ -1181,7 +1181,7 @@ void Calendar::ImplMouseSelect( const Date& rDate, 
sal_uInt16 nHitTest,
 }
 HideFocus();
 if ( bNewSel )
-ImplUpdateSelection( pOldSel );
+ImplUpdateSelection( pOldSel.get() );
 if ( !bNewSel || pOldSel->find( aOldDate.GetDate() ) == pOldSel->end() 
)
 ImplUpdateDate( aOldDate );
 // assure focus rectangle is displayed again
@@ -1189,7 +1189,6 @@ void Calendar::ImplMouseSelect( const Date& rDate, 
sal_uInt16 nHitTest,
  || mpSelectTable->find( maCurDate.GetDate() ) == 
mpSelectTable->end() )
 ImplUpdateDate( maCurDate );
 }
-delete pOldSel;
 }
 
 
@@ -1355,18 +1354,17 @@ void Calendar::ImplEndTracking( bool bCancel )
 
 if ( !bSpinDown )
 {
-IntDateSet* pOldSel = new IntDateSet( *mpSelectTable );
+boost::scoped_ptr pOldSel(new IntDateSet( 
*mpSelectTable ));
 DateaOldDate = maCurDate;
 maCurDate   = maOldCurDate;
 *mpSelectTable  = *mpOldSelectTable;
 HideFocus();
-ImplUpdateSelection( pOldSel );
+ImplUpdateSelection( pOldSel.get() );
 if ( pOldSel->find( aOldDate.GetDate() ) == pOldSel->end() )
 ImplUpdateDate( aOldDate );
 //  assure focus rectangle is displayed again
 if ( HasFocus() || mpSelectTable->find( maCurDate.GetDate() ) == 
mpSelectTable->end() )
 ImplUpdateDate( maCurDate );
-delete pOldSel;
 }
 }
 
@@ -1585,7 +1583,7 @@ void Calendar::KeyInput( const KeyEvent& rKEvt )
 {
 if ( bMultiSel && bExpand )
 {
-IntDateSet* pOldSel = new IntDateSet( *mpSelectTable );
+boost::scoped_ptr pOldSel(new IntDateSet( 
*mpSelectTable ));
 Date aOldAnchorDate = maAnchorDate;
 mbSelLeft = aNewDate < maAnchorDate;
 if ( !bExtended )
@@ -1609,8 +1607,7 @@ void Calendar::KeyInput( const KeyEvent& rKEvt )
 mbInSelChange = true;
 SelectionChanging();
 mbInSelChange = false;
-ImplUpdateSelection( pOldSel );
-delete pOldSel;
+ImplUpdateSelection( pOldSel.get() );
 }
 else
 {
@@ -1824,40 +1821,30 @@ void Calendar::SelectDate( const Date& rDate, bool 
bSelect )
 if ( !rDate.IsValidAndGregorian() )
 return;
 
-IntDateSet* pOldSel;
+boost::scoped_ptr pOldSel;
 
 if ( !mbInSelChange )

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

[Michael Stahl]

 writerfilter/source/resourcemodel/Fraction.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit dcbac37efebb9877a72f7c9914b63d60f46a5656
Author: Michael Stahl 
Date:   Fri Jul 4 00:29:55 2014 +0200

fdo#76803: writerfilter: fix image wrap polygon import again

The division in Fraction::init() should be a signed one, to prevent a
change in sign, e.g., -220869/9 = +477194047.

(regression from f8307e5ae11e8235fa1fb88ed52625bf9c650dc2)

Change-Id: Icbbd1721144ff42c53ae71312641bd601ba60762

diff --git a/writerfilter/source/resourcemodel/Fraction.cxx 
b/writerfilter/source/resourcemodel/Fraction.cxx
index 1f24bb3..ba76985 100644
--- a/writerfilter/source/resourcemodel/Fraction.cxx
+++ b/writerfilter/source/resourcemodel/Fraction.cxx
@@ -79,9 +79,11 @@ Fraction::~Fraction()
 
 void Fraction::init(sal_Int32 nNumerator, sal_Int32 nDenominator)
 {
-sal_uInt32 nGCD = gcd(abs(nNumerator), abs(nDenominator));
+// fdo#41068 pass non-negative numbers to gcd
+sal_Int32 const nGCD = gcd(abs(nNumerator), abs(nDenominator));
 
-mnNumerator = nNumerator/ nGCD;
+// fdo#76803 do signed division
+mnNumerator = nNumerator / nGCD;
 mnDenominator = nDenominator / nGCD;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Jay Philips  changed:

   What|Removed |Added

 Depends on||80813

--- Comment #170 from Jay Philips  ---
Regression - effects only 4.1 and 4.2
Bug 80813: Opening .ods crashes calc

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

[Stephan Bergmann]

 include/sfx2/viewsh.hxx   |4 ++--
 sw/source/uibase/misc/glshell.cxx |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6f92b58987f754de31c9ca756e813deb7462d98e
Author: Stephan Bergmann 
Date:   Thu Jul 3 23:16:15 2014 +0200

error: reference cannot be bound to dereferenced null pointer

Change-Id: Ica39bcce389fc5d03a3902d9f703a0efa284ec92

diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 7c43c93..5cde831 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -104,7 +104,7 @@ private: \
 public: \
 static SfxViewShell  *CreateInstance(SfxViewFrame *pFrame, SfxViewShell 
*pOldView); \
 static void   RegisterFactory( sal_uInt16 nPrio = USHRT_MAX ); \
-static SfxViewFactory&Factory() { return *pFactory; } \
+static SfxViewFactory*Factory() { return pFactory; } \
 static void   InitFactory()
 
 #define SFX_IMPL_NAMED_VIEWFACTORY(Class, AsciiViewName) \
@@ -119,7 +119,7 @@ public: \
 void Class::InitFactory()
 
 #define SFX_VIEW_REGISTRATION(DocClass) \
-DocClass::Factory().RegisterViewFactory( Factory() )
+DocClass::Factory().RegisterViewFactory( *Factory() )
 
 class SfxInPlaceClient;
 typedef ::std::vector< SfxInPlaceClient* > SfxInPlaceClientList;
diff --git a/sw/source/uibase/misc/glshell.cxx 
b/sw/source/uibase/misc/glshell.cxx
index 48d33c0..45b7220 100644
--- a/sw/source/uibase/misc/glshell.cxx
+++ b/sw/source/uibase/misc/glshell.cxx
@@ -207,7 +207,7 @@ SwDocShellRef SwGlossaries::EditGroupDoc( const OUString& 
rGroup, const OUString
 if( pGroup && pGroup->GetCount() )
 {
 // query which view is registered. In WebWriter there is no normal view
-sal_uInt16 nViewId = 0 != &SwView::Factory() ? 2 : 6;
+sal_uInt16 nViewId = 0 != SwView::Factory() ? 2 : 6;
 const OUString sLongName = pGroup->GetLongName(pGroup->GetIndex( 
rShortName ));
 
 if( 6 == nViewId )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sw/source/uibase/config/modcfg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 16351a8ba50c04b9e4c7edbcf9491d2882a7eeda
Author: Stephan Bergmann 
Date:   Thu Jul 3 22:38:05 2014 +0200

error: reference cannot be bound to dereferenced null pointer

Change-Id: Id0dbd21225534630b57514a9ddd7cf11a395f272

diff --git a/sw/source/uibase/config/modcfg.cxx 
b/sw/source/uibase/config/modcfg.cxx
index 3795cbd..ec476a0 100644
--- a/sw/source/uibase/config/modcfg.cxx
+++ b/sw/source/uibase/config/modcfg.cxx
@@ -95,7 +95,7 @@ bool SwModuleOptions::SetCapOption(bool bHTML, const 
InsCaptionOpt* pOpt)
 }
 else if (pOpt)
 {
-if(pOpt->GetObjType() == OLE_CAP && &pOpt->GetOleId())
+if(pOpt->GetObjType() == OLE_CAP)
 {
 bool bFound = false;
 for( sal_uInt16 nId = 0; nId <= GLOB_NAME_CHART; nId++)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sw/source/core/layout/ftnfrm.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 40194dc12fd93720c3bea0b3ae2bba54d0b7a82f
Author: Stephan Bergmann 
Date:   Thu Jul 3 22:34:24 2014 +0200

error: reference cannot be bound to dereferenced null pointer

...and SwTxtAttr::GetAttr already asserts non-null-ness.

Change-Id: I978f86103e8121e41bf95a2a79cd2263d6e47853

diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 88157cc..32f05de 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -479,7 +479,7 @@ SwTwips SwFtnFrm::ShrinkFrm( SwTwips nDist, bool bTst, bool 
bInfo )
 if( nNum != USHRT_MAX )
 {
 SwTxtFtn* pTxtFtn = GetAttr();
-if( &pTxtFtn->GetAttr() && pTxtFtn->GetFtn().GetNumber() == nNum )
+if( pTxtFtn->GetFtn().GetNumber() == nNum )
 {
 int bla = 5;
 (void)bla;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sfx2/source/view/printer.cxx |4 
 sfx2/source/view/viewprn.cxx |   15 +--
 2 files changed, 9 insertions(+), 10 deletions(-)

New commits:
commit 3bd78cb6dbc89cbbddb0fcf020d39abb610a99d0
Author: Stephan Bergmann 
Date:   Thu Jul 3 22:29:10 2014 +0200

error: reference cannot be bound to dereferenced null pointer

Change-Id: I4a5c83ba0f1e741104edc933459e7aea9c4aac1f

diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx
index ba4f4eb..94bb8c4 100644
--- a/sfx2/source/view/printer.cxx
+++ b/sfx2/source/view/printer.cxx
@@ -109,6 +109,7 @@ SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions ) :
 bKnown(true)
 
 {
+assert(pOptions);
 pImpl = new SfxPrinter_Impl;
 }
 
@@ -121,6 +122,7 @@ SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions,
 pOptions( pTheOptions )
 
 {
+assert(pOptions);
 pImpl = new SfxPrinter_Impl;
 bKnown = GetName() == rTheOrigJobSetup.GetPrinterName();
 
@@ -138,6 +140,7 @@ SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions,
 bKnown  ( GetName() == rPrinterName )
 
 {
+assert(pOptions);
 pImpl = new SfxPrinter_Impl;
 }
 
@@ -149,6 +152,7 @@ SfxPrinter::SfxPrinter( const SfxPrinter& rPrinter ) :
 pOptions( rPrinter.GetOptions().Clone() ),
 bKnown  ( rPrinter.IsKnown() )
 {
+assert(pOptions);
 SetJobSetup( rPrinter.GetJobSetup() );
 SetPrinterProps( &rPrinter );
 SetMapMode( rPrinter.GetMapMode() );
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 267ab28..7ef21f9 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -478,16 +478,11 @@ SfxPrinter* SfxViewShell::SetPrinter_Impl( SfxPrinter 
*pNewPrinter )
 SfxPrinter *pDocPrinter = GetPrinter();
 
 // Evaluate Printer Options
-bool bOriToDoc = false;
-bool bSizeToDoc = false;
-if ( &pDocPrinter->GetOptions() )
-{
-sal_uInt16 nWhich = GetPool().GetWhich(SID_PRINTER_CHANGESTODOC);
-const SfxFlagItem *pFlagItem = 0;
-pDocPrinter->GetOptions().GetItemState( nWhich, false, (const 
SfxPoolItem**) &pFlagItem );
-bOriToDoc = pFlagItem ? (pFlagItem->GetValue() & 
SFX_PRINTER_CHG_ORIENTATION) : sal_False;
-bSizeToDoc = pFlagItem ? (pFlagItem->GetValue() & 
SFX_PRINTER_CHG_SIZE) : sal_False;
-}
+sal_uInt16 nWhich = GetPool().GetWhich(SID_PRINTER_CHANGESTODOC);
+const SfxFlagItem *pFlagItem = 0;
+pDocPrinter->GetOptions().GetItemState( nWhich, false, (const 
SfxPoolItem**) &pFlagItem );
+bool bOriToDoc = pFlagItem && (pFlagItem->GetValue() & 
SFX_PRINTER_CHG_ORIENTATION);
+bool bSizeToDoc = pFlagItem && (pFlagItem->GetValue() & 
SFX_PRINTER_CHG_SIZE);
 
 // Determine the previous format and size
 Orientation eOldOri = pDocPrinter->GetOrientation();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 chart2/source/inc/InternalData.hxx   |8 
 chart2/source/tools/InternalData.cxx |   20 
 2 files changed, 24 insertions(+), 4 deletions(-)

New commits:
commit 7649a14222dc1e5a7e01ed7c1d5e45a78143b41b
Author: Kohei Yoshida 
Date:   Thu Jul 3 15:28:50 2014 -0400

Make these non-inline.

Change-Id: I0de443a78e3024c7d3834f964a92f5ccdabe3cc3

diff --git a/chart2/source/inc/InternalData.hxx 
b/chart2/source/inc/InternalData.hxx
index 94b7eee..28506b5 100644
--- a/chart2/source/inc/InternalData.hxx
+++ b/chart2/source/inc/InternalData.hxx
@@ -66,15 +66,15 @@ public:
 /// @return the index of the newly appended row
 sal_Int32 appendRow();
 
-sal_Int32 getRowCount() const { return m_nRowCount;}
-sal_Int32 getColumnCount() const { return m_nColumnCount;}
+sal_Int32 getRowCount() const;
+sal_Int32 getColumnCount() const;
 
 typedef ::std::vector< ::std::vector< ::com::sun::star::uno::Any > > 
tVecVecAny; //inner index is hierarchical level
 
 void setComplexRowLabels( const tVecVecAny& rNewRowLabels );
-tVecVecAny getComplexRowLabels() const { return m_aRowLabels;}
+tVecVecAny getComplexRowLabels() const;
 void setComplexColumnLabels( const tVecVecAny& rNewColumnLabels );
-tVecVecAny getComplexColumnLabels() const { return m_aColumnLabels;}
+tVecVecAny getComplexColumnLabels() const;
 
 void dump() const;
 
diff --git a/chart2/source/tools/InternalData.cxx 
b/chart2/source/tools/InternalData.cxx
index e5b2db6..8f51469 100644
--- a/chart2/source/tools/InternalData.cxx
+++ b/chart2/source/tools/InternalData.cxx
@@ -376,6 +376,16 @@ sal_Int32 InternalData::appendRow()
 return getRowCount() - 1;
 }
 
+sal_Int32 InternalData::getRowCount() const
+{
+return m_nRowCount;
+}
+
+sal_Int32 InternalData::getColumnCount() const
+{
+return m_nColumnCount;
+}
+
 void InternalData::insertRow( sal_Int32 nAfterIndex )
 {
 // note: -1 is allowed, as we insert after the given index
@@ -496,6 +506,11 @@ void InternalData::setComplexRowLabels( const vector< 
vector< uno::Any > >& rNew
 enlargeData( 0, nNewRowCount );
 }
 
+InternalData::tVecVecAny InternalData::getComplexRowLabels() const
+{
+return m_aRowLabels;
+}
+
 void InternalData::setComplexColumnLabels( const vector< vector< uno::Any > >& 
rNewColumnLabels )
 {
 m_aColumnLabels = rNewColumnLabels;
@@ -506,6 +521,11 @@ void InternalData::setComplexColumnLabels( const vector< 
vector< uno::Any > >& r
 enlargeData( nNewColumnCount, 0 );
 }
 
+InternalData::tVecVecAny InternalData::getComplexColumnLabels() const
+{
+return m_aColumnLabels;
+}
+
 #ifdef DEBUG_INTERNAL_DATA
 void InternalData::dump() const
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Haiku port

[Norbert Thiebaud]

On Thu, Jul 3, 2014 at 8:58 PM, Kacper Kasper  wrote:
\> 'At the moment' are the keywords here ;) These hacks are the result of
> library ports missing (which I will make later) or other things I
> don't need to work right now.
ah ok :-)

>
>> (yes I read Haiku's code formatting convention :-) please do _not_
>> follow them for LO patches :-) )
> I know that each project has its own coding guidelines and that they
> should be followed in the first place :)

sorry I could not resit a little poke at this 'religious' topic :-)

>
>> For example you prolly will need some patch/new files in
>> solenv/gbuild/platform/*
>> these would likely not be too controversial as they are platform
>> specific files anyway.
> Actually files for linux work fine. Not that much work here.

oh, good, still we have a variety of files to isolate the various
linux/unixes...
see all the files named __.mk

in any case, good luck, and feel free to poke me if you need help with
gerrit and/or code review around autogen/configure/make.

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

Re: Haiku port

[Kacper Kasper]

2014-07-03 20:23 GMT+02:00 Norbert Thiebaud :
> On Thu, Jul 3, 2014 at 7:58 PM, Kacper Kasper  wrote:
>> 2014-07-02 22:48 GMT+02:00 Norbert Thiebaud :
>> I don't want to send my patches upstream
>> because they are very hacky at the moment and wouldn't get accepted
>> anyway.
>
> Then they presumably won't be accepted as a massive code drop at then
> end either right ?
> The soonner you get them in shape, learning the quirck specific to
> this project, the easier it will be to upstream :-)
'At the moment' are the keywords here ;) These hacks are the result of
library ports missing (which I will make later) or other things I
don't need to work right now.

> (yes I read Haiku's code formatting convention :-) please do _not_
> follow them for LO patches :-) )
I know that each project has its own coding guidelines and that they
should be followed in the first place :)

> For example you prolly will need some patch/new files in
> solenv/gbuild/platform/*
> these would likely not be too controversial as they are platform
> specific files anyway.
Actually files for linux work fine. Not that much work here.

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

[Libreoffice-commits] core.git: Library_merged.mk vcl/Library_vcl.mk vcl/unx

[Matúš Kukan]

 Library_merged.mk |6 ++
 vcl/Library_vcl.mk|1 +
 vcl/unx/generic/plugadapt/salplug.cxx |3 +++
 3 files changed, 10 insertions(+)

New commits:
commit 9dd152107c6a1644b180da24f01e3d5a3e309d13
Author: Matúš Kukan 
Date:   Thu Jul 3 20:43:32 2014 +0200

fix libmerged: vclplug_svp is in

Change-Id: I6ab00275b36725fbb0a446c7e5eb888e034a8989

diff --git a/Library_merged.mk b/Library_merged.mk
index 4cfff2b..533acb0a 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -30,6 +30,12 @@ $(eval $(call gb_Library_use_libraries,merged,\
$(gb_UWINAPI) \
 ))
 
+ifeq ($(GUIBASE),unx)
+$(eval $(call gb_Library_use_static_libraries,merged,\
+   headless \
+))
+endif
+
 $(eval $(call gb_Library_use_externals,merged,\
icu_headers \
icui18n \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index e527508..0c980e9 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_Library_add_defs,vcl,\
-DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,cui))\" \
-DDESKTOP_DETECTOR_DLL_NAME=\"$(call 
gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,desktop_detector))\" \
-DTK_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,tk))\" \
+   -DVCLPLUG_SVP_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call 
gb_Library__get_name,vclplug_svp))\" \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,vcl))
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx 
b/vcl/unx/generic/plugadapt/salplug.cxx
index cf7ff97..40a9683 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -54,6 +54,9 @@ static SalInstance* tryInstance( const OUString& rModuleBase, 
bool bForce = fals
 SAL_DLLPREFIX
 #endif
 "vclplug_" + rModuleBase + "lo" SAL_DLLEXTENSION );
+// vclplug_svp is in libmerged
+if (rModuleBase == "svp")
+aModule = VCLPLUG_SVP_DLL_NAME;
 
 oslModule aMod = osl_loadModuleRelative(
 reinterpret_cast< oslGenericFunction >( &tryInstance ), aModule.pData,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 scp2/source/ooo/module_lang_template.scp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e52b3a2be08b8811f76e1f2bbb1e2438dcfbb3b3
Author: Andras Timar 
Date:   Thu Jul 3 11:18:16 2014 -0700

typo: dreport -> dbreport

Change-Id: I7d6208a4ac170adb815ec02364076c5b49cfab9a

diff --git a/scp2/source/ooo/module_lang_template.scp 
b/scp2/source/ooo/module_lang_template.scp
index fb3cdcc..5390a2e 100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -26,7 +26,7 @@ Module gid_Module_Langpack_Basis_Template
  gid_File_Share_Config_Sofficecfg_uiconfig_cui_Lang,
 #ifdef DBCONNECTIVITY
  gid_File_Share_Config_Sofficecfg_uiconfig_dbaccess_Lang,
- gid_File_Share_Config_Sofficecfg_uiconfig_dreport_Lang,
+ gid_File_Share_Config_Sofficecfg_uiconfig_dbreport_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_sbibliography_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_spropctrlr_Lang,
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 39944] ACCESSIBILITY: Implement new ATK Roles

[bugzilla-daemon]

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

Jacobo Aragunde Pérez  changed:

   What|Removed |Added

 Blocks||75191

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

[Bug 39944] ACCESSIBILITY: Implement new ATK Roles

[bugzilla-daemon]

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

Commit Notification  changed:

   What|Removed |Added

 Whiteboard|EasyHack|EasyHack
   |DifficultyInteresting   |DifficultyInteresting
   |SkillCpp target:4.3.0   |SkillCpp target:4.3.0
   |target:4.2.5|target:4.2.5 target:4.4.0

--- Comment #21 from Commit Notification 
 ---
Jacobo Aragunde Perez committed a patch related to this issue.
It has been pushed to "master":

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

fdo#39944: Fix mapping for some a11y roles to ATK



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

[Jacobo Aragunde Pérez]

 vcl/unx/gtk/a11y/atkwrapper.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 7c37cd7bb26b91bda5e57d7bd0cecdbc9d1ebb22
Author: Jacobo Aragunde Pérez 
Date:   Thu Jul 3 20:13:51 2014 +0200

fdo#39944: Fix mapping for some a11y roles to ATK

In particular, EDIT_BAR, EMBEDDED_OBJECT and HYPER_LINK were being
mapped to custom roles when specific roles exist; fixed passing the
proper name to registerRole.

Besides, moved two roles that were in the section 'don't exist in ATK
yet' because that's not the case now.

Change-Id: I6818a0ac623f45053812b5c6dd5fc25c9abf4f65

diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index f3ef8d5..a30bf16 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -291,8 +291,8 @@ static AtkRole mapToAtkRole( sal_Int16 nRole )
 if( ! initialized )
 {
 // re-use strings from ATK library
-roleMap[accessibility::AccessibleRole::EDIT_BAR] = registerRole("edit 
bar");
-roleMap[accessibility::AccessibleRole::EMBEDDED_OBJECT] = 
registerRole("embedded component");
+roleMap[accessibility::AccessibleRole::EDIT_BAR] = 
registerRole("editbar");
+roleMap[accessibility::AccessibleRole::EMBEDDED_OBJECT] = 
registerRole("embedded");
 roleMap[accessibility::AccessibleRole::CHART] = registerRole("chart");
 roleMap[accessibility::AccessibleRole::CAPTION] = 
registerRole("caption");
 roleMap[accessibility::AccessibleRole::DOCUMENT] = 
registerRole("document frame");
@@ -302,16 +302,16 @@ static AtkRole mapToAtkRole( sal_Int16 nRole )
 roleMap[accessibility::AccessibleRole::FORM] = registerRole("form");
 roleMap[accessibility::AccessibleRole::GROUP_BOX] = 
registerRole("grouping");
 roleMap[accessibility::AccessibleRole::COMMENT] = 
registerRole("comment");
+roleMap[accessibility::AccessibleRole::IMAGE_MAP] = 
registerRole("image map");
+roleMap[accessibility::AccessibleRole::TREE_ITEM] = registerRole("tree 
item");
+roleMap[accessibility::AccessibleRole::HYPER_LINK] = 
registerRole("link");
 
 // these don't exist in ATK yet
 roleMap[accessibility::AccessibleRole::END_NOTE] = registerRole("end 
note");
 roleMap[accessibility::AccessibleRole::FOOTNOTE] = registerRole("foot 
note");
-roleMap[accessibility::AccessibleRole::HYPER_LINK] = 
registerRole("hyper link");
 roleMap[accessibility::AccessibleRole::SHAPE] = registerRole("shape");
 roleMap[accessibility::AccessibleRole::TEXT_FRAME] = 
registerRole("text frame");
-roleMap[accessibility::AccessibleRole::IMAGE_MAP] = 
registerRole("image map");
 roleMap[accessibility::AccessibleRole::NOTE] = registerRole("note");
-roleMap[accessibility::AccessibleRole::TREE_ITEM] = registerRole("tree 
item");
 
 initialized = true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 39944] ACCESSIBILITY: Implement new ATK Roles

[bugzilla-daemon]

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

Jacobo Aragunde Pérez  changed:

   What|Removed |Added

 Status|REOPENED|ASSIGNED

--- Comment #20 from Jacobo Aragunde Pérez  ---
Fixed mapping for EDIT_BAR, EMBEDDED_OBJECT and HYPER_LINK roles and opened a
bug in ATK about the five roles that still use atk_register_role:

https://bugzilla.gnome.org/show_bug.cgi?id=732702

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

Re: Haiku port

[Norbert Thiebaud]

On Thu, Jul 3, 2014 at 7:58 PM, Kacper Kasper  wrote:
> 2014-07-02 22:48 GMT+02:00 Norbert Thiebaud :
>> Provided that it is done properly, not overly invasive, and there is
>> manpower to cater to the port(*), I'd say chances are good we would
>> accept the patches.
>> But, I strongly urge you to not wait 'when it is finished'.
>> A big code dump is very unlikely to be reviewed favorably... I
>> strongly encourage to get involved early with this dev community, and
>> seek review of your work early to insure that you are on a track that
>> will allow a smooth upstreaming.
>
> Will a github fork suffice?
No,
here:
https://gerrit.libreoffice.org/

> I don't want to send my patches upstream
> because they are very hacky at the moment and wouldn't get accepted
> anyway.

Then they presumably won't be accepted as a massive code drop at then
end either right ?
The soonner you get them in shape, learning the quirck specific to
this project, the easier it will be to upstream :-)
(yes I read Haiku's code formatting convention :-) please do _not_
follow them for LO patches :-) )

For example you prolly will need some patch/new files in
solenv/gbuild/platform/*
these would likely not be too controversial as they are platform
specific files anyway.

>
>> (*) Libreoffice is a fairly active and large project. any port will
>> need some sustained attention to keep up.
>
> I am aware of that. I am willing to maintain it.

Good, As long there are people willing to do the work, we tend to try
accommodate things :-)


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

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

[Andras Timar]

 scp2/source/ooo/module_lang_template.scp |4 
 1 file changed, 4 insertions(+)

New commits:
commit 1f90cae1debed4b45bb51ced21a03aacd7973cff
Author: Andras Timar 
Date:   Thu Jul 3 20:10:02 2014 +0200

fdo#80535 add missing .ui localizations to install script

Change-Id: I248838633e99ac0ce51950db9049dd451394b558

diff --git a/scp2/source/ooo/module_lang_template.scp 
b/scp2/source/ooo/module_lang_template.scp
index 8e3a1a7..fb3cdcc 100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -26,9 +26,13 @@ Module gid_Module_Langpack_Basis_Template
  gid_File_Share_Config_Sofficecfg_uiconfig_cui_Lang,
 #ifdef DBCONNECTIVITY
  gid_File_Share_Config_Sofficecfg_uiconfig_dbaccess_Lang,
+ gid_File_Share_Config_Sofficecfg_uiconfig_dreport_Lang,
+ gid_File_Share_Config_Sofficecfg_uiconfig_sbibliography_Lang,
+ gid_File_Share_Config_Sofficecfg_uiconfig_spropctrlr_Lang,
 #endif
  gid_File_Share_Config_Sofficecfg_uiconfig_desktop_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_filter_Lang,
+ gid_File_Share_Config_Sofficecfg_uiconfig_sabpilot_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_scalc_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_schart_Lang,
  gid_File_Share_Config_Sofficecfg_uiconfig_sdraw_Lang,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Haiku port

[Kacper Kasper]

2014-07-02 22:48 GMT+02:00 Norbert Thiebaud :
> Provided that it is done properly, not overly invasive, and there is
> manpower to cater to the port(*), I'd say chances are good we would
> accept the patches.
> But, I strongly urge you to not wait 'when it is finished'.
> A big code dump is very unlikely to be reviewed favorably... I
> strongly encourage to get involved early with this dev community, and
> seek review of your work early to insure that you are on a track that
> will allow a smooth upstreaming.

Will a github fork suffice? I don't want to send my patches upstream
because they are very hacky at the moment and wouldn't get accepted
anyway.

> (*) Libreoffice is a fairly active and large project. any port will
> need some sustained attention to keep up.

I am aware of that. I am willing to maintain it.

About the issue with UNO I mentioned: it seems it is caused by some
modules not being compiled (I compile them manually one by one now).
I'll try to make full build work and come back with the results.

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

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

ign_christian  changed:

   What|Removed |Added

 Depends on||80501

--- Comment #169 from ign_christian  ---
Nominating Bug 80501 : undo after moving/dragging cell change formula 
Regression against 4.1.6.2, dataloss, no workaround

-- 
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' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/tocread.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 5ca5b048d74557cb67ae778efd7dcbe95216d6f5
Author: Caolán McNamara 
Date:   Thu Jul 3 11:17:37 2014 +0100

coverity#140 Untrusted value as argument

and

coverity#139 Untrusted value as argument

(cherry picked from commit 5e043613266113a873c55ad45ab0fb1ae14286e8)

Change-Id: I48bacfd988a34d67ffa542edba7cba1bb9b0b3cc
Reviewed-on: https://gerrit.libreoffice.org/10050
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/lotuswordpro/source/filter/tocread.cxx 
b/lotuswordpro/source/filter/tocread.cxx
index bb14371..71e75b1 100644
--- a/lotuswordpro/source/filter/tocread.cxx
+++ b/lotuswordpro/source/filter/tocread.cxx
@@ -67,6 +67,16 @@ CBenTOCReader::ReadLabelAndTOC()
 if ((Err = ReadLabel(&TOCOffset, &cTOCSize)) != BenErr_OK)
 return Err;
 
+unsigned long nLength;
+if ((Err = cpContainer->GetSize(&nLength)) != BenErr_OK)
+return Err;
+
+if (TOCOffset > nLength)
+return BenErr_ReadPastEndOfTOC;
+
+if (cTOCSize > nLength - TOCOffset)
+return BenErr_ReadPastEndOfTOC;
+
 if ((Err = cpContainer->SeekToPosition(TOCOffset)) != BenErr_OK)
 return Err;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/gbuild-to-ide

[Niklas Johansson]

 bin/gbuild-to-ide |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit aa7f272d747dfeb1c7e003b7db123fda688fd881
Author: Niklas Johansson 
Date:   Thu Jul 3 17:55:34 2014 +0200

Don't stop on os.makedirs when making vs2012-ide-integration

At the moment it always stops on folders that already exists. See
https://bugs.freedesktop.org/show_bug.cgi?id=70414#c18 and the following
comments for example of the error messages that I face without this patch.

Change-Id: I1a1f337872ce3a817d425ff10255e3ae9a73c1a2
Reviewed-on: https://gerrit.libreoffice.org/10062
Tested-by: Fridrich Strba 
Reviewed-by: Fridrich Strba 

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 91a3fcf..55bfa37 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -672,7 +672,9 @@ class 
VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
 
 def write_project(self, project_path, target):
 # See info at 
http://blogs.msdn.com/b/visualstudio/archive/2010/05/14/a-guide-to-vcxproj-and-props-file-structure.aspx
-os.makedirs(os.path.dirname(project_path), exist_ok = True)
+folder = os.path.dirname(project_path)
+if not os.path.exists(folder):
+os.makedirs(folder)
 project_guid = str(uuid.uuid4()).upper()
 ns = 'http://schemas.microsoft.com/developer/msbuild/2003'
 ET.register_namespace('', ns)
___
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' - scp2/inc

[Andras Timar]

 scp2/inc/macros.inc |4 
 1 file changed, 4 deletions(-)

New commits:
commit 82d685e72fb1c656d3977fa2a16f2bea256cc2be
Author: Andras Timar 
Date:   Thu Jul 3 13:35:03 2014 +0200

fdo#77057 quick fix: do not touch KindMap for alien file types

Change-Id: Iffc24dc7ce12de07660eadcf8a525e77856593e1
(cherry picked from commit 57bf88d21cacb025e7bea40da78616bb4d165215)
Reviewed-on: https://gerrit.libreoffice.org/10054
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index bed8deb..12545aa 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -434,7 +434,6 @@ End
 REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \
 REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \
 REGISTRY_ENTRY_CAPABILITIES(name,modid,key,doc_type) \
-REGISTRY_ENTRY_KINDMAP(name, modid, key) \
 
 #define 
CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type)
 \
 CONDITIONAL_MODULE_ENTRY(name,modid) \
@@ -449,9 +448,6 @@ End
 REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \
 REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \
 REGISTRY_ENTRY_TEMPLATE_CAPABILITIES(name,modid,key,doc_type) \
-REGISTRY_ENTRY_KINDMAP(name, modid, key) \
-
-
 
 #ifdef _MSC_VER
 
___
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' - scp2/inc

[Andras Timar]

 scp2/inc/macros.inc |4 
 1 file changed, 4 deletions(-)

New commits:
commit cb2eb7194f4f2c0ab6c8e1ba0b360e021c71f1ed
Author: Andras Timar 
Date:   Thu Jul 3 13:35:03 2014 +0200

fdo#77057 quick fix: do not touch KindMap for alien file types

(cherry picked from commit 57bf88d21cacb025e7bea40da78616bb4d165215)

Conflicts:
scp2/inc/macros.inc

Change-Id: Iffc24dc7ce12de07660eadcf8a525e77856593e1
Reviewed-on: https://gerrit.libreoffice.org/10051
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index d55c304..cb3b69c 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -411,7 +411,6 @@ End
 REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \
 REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \
 REGISTRY_ENTRY_CAPABILITIES(name,modid,key,doc_type) \
-REGISTRY_ENTRY_KINDMAP(name, modid, key) \
 
 #define 
CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type)
 \
 CONDITIONAL_MODULE_ENTRY(name,modid) \
@@ -426,9 +425,6 @@ End
 REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \
 REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \
 REGISTRY_ENTRY_TEMPLATE_CAPABILITIES(name,modid,key,doc_type) \
-REGISTRY_ENTRY_KINDMAP(name, modid, key) \
-
-// ---
 
 #ifdef _MSC_VER
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-colors' - 2 commits - include/svx svx/Library_svxcore.mk svx/source

[Krisztian Pinter]

 include/svx/Palette.hxx  |   46 ++
 include/svx/PaletteManager.hxx   |   45 ++
 include/svx/SvxColorValueSet.hxx |4 
 include/svx/tbcontrl.hxx |5 -
 svx/Library_svxcore.mk   |2 
 svx/source/tbxctrls/Palette.cxx  |  120 
 svx/source/tbxctrls/PaletteManager.cxx   |  130 +++
 svx/source/tbxctrls/SvxColorValueSet.cxx |   35 ++--
 svx/source/tbxctrls/colorwindow.hxx  |9 +-
 svx/source/tbxctrls/tbcontrl.cxx |   78 +-
 10 files changed, 406 insertions(+), 68 deletions(-)

New commits:
commit cf8ef7746474c24b93b8083909439f588eb813f6
Author: Krisztian Pinter 
Date:   Thu Jul 3 18:47:10 2014 +0200

Add PaletteManager, refactor palette code

Change-Id: I7e30fc895834318514b51bc648d32aa6d297bfae

diff --git a/include/svx/Palette.hxx b/include/svx/Palette.hxx
new file mode 100644
index 000..f7ced03
--- /dev/null
+++ b/include/svx/Palette.hxx
@@ -0,0 +1,46 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef INCLUDED_SVX_PALETTE_HXX
+#define INCLUDED_SVX_PALETTE_HXX
+
+#include 
+#include 
+
+class Palette
+{
+public:
+typedef std::pair NamedColor;
+typedef std::vector< NamedColor > ColorList;
+private:
+boolmbLoaded;
+OUStringmaFname;
+OString maName;
+ColorList   maColors;
+
+void LoadPalette();
+public:
+Palette(const OUString &rFname);
+
+const OString&  GetPaletteName();
+const ColorList&GetPaletteColors();
+};
+
+#endif // INCLUDED_SVX_PALETTE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/PaletteManager.hxx b/include/svx/PaletteManager.hxx
new file mode 100644
index 000..a6b2dfa
--- /dev/null
+++ b/include/svx/PaletteManager.hxx
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef INCLUDED_SVX_PALETTEMANAGER_HXX
+#define INCLUDED_SVX_PALETTEMANAGER_HXX
+
+#include 
+#include 
+
+class PaletteManager
+{
+sal_uInt16  mnNumOfPalettes;
+sal_uInt16  mnCurrentPalette;
+
+longmnColorCount;
+
+std::vector maPalettes;
+public:
+PaletteManager();
+voidLoadPalettes();
+voidReloadColorSet(SvxColorValueSet& rColorSet);
+voidPrevPalette();
+voidNextPalette();
+longGetColorCount();
+OUStringGetPaletteName();
+};
+
+#endif // INCLUDED_SVX_PALETTEMANAGER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/SvxColorValueSet.hxx b/include/svx/SvxColorValueSet.hxx
index 77ad9b2..7db9f4c 100644
--- a/include/svx/SvxColorValueSet.hxx
+++ b/include/svx/SvxColorValueSet.hxx
@@ -19,21 +19,12 @@
 #ifndef INCLUDED_SVX_SVXCOLORVALUESET_HXX
 #define INCLUDED_SVX_SVXCOLORVALUESET_HXX
 
+#include 
 #include 
 #include 
 
 class XColorList;
 
-struct Palette
-{
-typedef std::pair NamedColor;
-typedef std::vector< NamedColor > ColorList;
-Palette(){};
-Palette(const OUString &rFname);
-OString maName;
-ColorList maColors;
-};
-
 class SVX_DLLPUBLIC SvxColorValueSet : public ValueSet
 {
 private:
@@ -50,7 +41,7 @@ public:
 
 void addEntriesForXColorList(const 

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

[Kohei Yoshida]

 chart2/qa/extras/chart2export.cxx |   39 
 chart2/qa/extras/charttest.hxx|   46 ++
 2 files changed, 85 insertions(+)

New commits:
commit 97857c258178ffc79dd2799cd2d79047a863fb22
Author: Kohei Yoshida 
Date:   Thu Jul 3 12:30:45 2014 -0400

Test the import of data series values as well.

There was a bug in there earlier that none of the tests didn't catch.

Change-Id: I1f4ed1ba5e08e7842899a140163f9e165705569b

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 30b2a35..68f6091 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -521,6 +521,45 @@ void Chart2ExportTest::testCrosses()
 void Chart2ExportTest::testScatterChartTextXValues()
 {
 load("/chart2/qa/extras/data/docx/", "scatter-chart-text-x-values.docx");
+
+Reference xChartDoc(getChartDocFromWriter(0), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xChartDoc.is());
+
+Reference xCT = getChartTypeFromDoc(xChartDoc, 0, 0);
+CPPUNIT_ASSERT(xCT.is());
+
+// Make sure we have exactly 3 data series.
+std::vector > aLabels = 
getDataSeriesLabelsFromChartType(xCT);
+CPPUNIT_ASSERT_EQUAL(size_t(3), aLabels.size());
+CPPUNIT_ASSERT_EQUAL(OUString("Series 1"), aLabels[0][0].get());
+CPPUNIT_ASSERT_EQUAL(OUString("Series 2"), aLabels[1][0].get());
+CPPUNIT_ASSERT_EQUAL(OUString("Series 3"), aLabels[2][0].get());
+
+std::vector > aYValues = 
getDataSeriesYValuesFromChartType(xCT);
+CPPUNIT_ASSERT_EQUAL(size_t(3), aYValues.size());
+
+// Check the Y values of "Series 1".
+CPPUNIT_ASSERT_EQUAL(size_t(4), aYValues[0].size());
+CPPUNIT_ASSERT_EQUAL(4.3, aYValues[0][0]);
+CPPUNIT_ASSERT_EQUAL(2.5, aYValues[0][1]);
+CPPUNIT_ASSERT_EQUAL(3.5, aYValues[0][2]);
+CPPUNIT_ASSERT_EQUAL(4.5, aYValues[0][3]);
+
+// And "Series 2".
+CPPUNIT_ASSERT_EQUAL(size_t(4), aYValues[1].size());
+CPPUNIT_ASSERT_EQUAL(2.4, aYValues[1][0]);
+CPPUNIT_ASSERT_EQUAL(4.4, aYValues[1][1]);
+CPPUNIT_ASSERT_EQUAL(1.8, aYValues[1][2]);
+CPPUNIT_ASSERT_EQUAL(2.8, aYValues[1][3]);
+
+// And "Series 3".
+CPPUNIT_ASSERT_EQUAL(size_t(4), aYValues[2].size());
+CPPUNIT_ASSERT_EQUAL(2.0, aYValues[2][0]);
+CPPUNIT_ASSERT_EQUAL(2.0, aYValues[2][1]);
+CPPUNIT_ASSERT_EQUAL(3.0, aYValues[2][2]);
+CPPUNIT_ASSERT_EQUAL(5.0, aYValues[2][3]);
+
+// Test the export.
 xmlDocPtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML 
Text");
 if (!pXmlDoc)
return;
diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx
index 4ac6db3..f3d1991 100644
--- a/chart2/qa/extras/charttest.hxx
+++ b/chart2/qa/extras/charttest.hxx
@@ -324,6 +324,52 @@ uno::Sequence < OUString > 
getWriterChartColumnDescriptions( Reference< lang::XC
 return seriesList;
 }
 
+std::vector > getDataSeriesYValuesFromChartType( const 
Reference& xCT )
+{
+Reference xDSCont(xCT, uno::UNO_QUERY);
+CPPUNIT_ASSERT(xDSCont.is());
+Sequence > aDataSeriesSeq = 
xDSCont->getDataSeries();
+
+double fNan;
+rtl::math::setNan(&fNan);
+
+std::vector > aRet;
+for (sal_Int32 i = 0; i < aDataSeriesSeq.getLength(); ++i)
+{
+uno::Reference xDSrc(aDataSeriesSeq[i], 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xDSrc.is());
+uno::Sequence > 
aDataSeqs = xDSrc->getDataSequences();
+for (sal_Int32 j = 0; j < aDataSeqs.getLength(); ++j)
+{
+Reference xValues = 
aDataSeqs[j]->getValues();
+CPPUNIT_ASSERT(xValues.is());
+Reference xPropSet(xValues, uno::UNO_QUERY);
+if (!xPropSet.is())
+continue;
+
+OUString aRoleName;
+xPropSet->getPropertyValue("Role") >>= aRoleName;
+if (aRoleName == "values-y")
+{
+uno::Sequence aData = xValues->getData();
+std::vector aValues;
+aValues.reserve(aData.getLength());
+for (sal_Int32 nVal = 0; nVal < aData.getLength(); ++nVal)
+{
+double fVal;
+if (aData[nVal] >>= fVal)
+aValues.push_back(fVal);
+else
+aValues.push_back(fNan);
+}
+aRet.push_back(aValues);
+}
+}
+}
+
+return aRet;
+}
+
 std::vector > getDataSeriesLabelsFromChartType( const 
Reference& xCT )
 {
 OUString aLabelRole = xCT->getRoleOfSequenceForSeriesLabel();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 include/sfx2/printer.hxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 8583bccaac0832f3488d7fefefb80109e535b46e
Author: Stephan Bergmann 
Date:   Thu Jul 3 18:20:39 2014 +0200

Dead declarations

Change-Id: I5fe417a6f3682764f8ff1844cc418e95d68c6c38

diff --git a/include/sfx2/printer.hxx b/include/sfx2/printer.hxx
index 66dd4dc..f07a135 100644
--- a/include/sfx2/printer.hxx
+++ b/include/sfx2/printer.hxx
@@ -39,7 +39,7 @@ private:
 SfxPrinter_Impl*pImpl;
 boolbKnown;
 
-SAL_DLLPRIVATE void operator =(SfxPrinter &); // not defined
+SAL_DLLPRIVATE void operator =(SfxPrinter &) SAL_DELETED_FUNCTION;
 
 SAL_DLLPRIVATE void UpdateFonts_Impl();
 
@@ -49,9 +49,6 @@ public:
 const OUString &rPrinterName );
 SfxPrinter( SfxItemSet *pTheOptions,
 const JobSetup &rTheOrigJobSetup );
-SfxPrinter( SfxItemSet *pTheOptions,
-const OUString &rPrinterName,
-const JobSetup &rTheOrigJobSetup );
 SfxPrinter( const SfxPrinter &rPrinter );
 virtual ~SfxPrinter();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 scp2/source/ooo/file_ooo.scp |4 
 1 file changed, 4 insertions(+)

New commits:
commit e09931ce4d413929b9cbdbbf1f71ac5941ec25ba
Author: Andras Timar 
Date:   Thu Jul 3 18:14:17 2014 +0200

fdo#80535 add missing .ui localizations to install script

Change-Id: Ie7e60522df6aff8fc68b36daddd1c84d0a97cd59

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 63219dc..811071e 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -530,9 +530,13 @@ UI_FILELIST_ALL_LANG(basicide, modules/BasicIDE)
 UI_FILELIST_ALL_LANG(cui, cui)
 #ifdef DBCONNECTIVITY
 UI_FILELIST_ALL_LANG(dbaccess, dbaccess)
+UI_FILELIST_ALL_LANG(dbreport, modules/dbreport)
+UI_FILELIST_ALL_LANG(sbibliography, modules/sbibliography)
+UI_FILELIST_ALL_LANG(spropctrlr, modules/spropctrlr)
 #endif
 UI_FILELIST_ALL_LANG(desktop, desktop)
 UI_FILELIST_ALL_LANG(filter, filter)
+UI_FILELIST_ALL_LANG(sabpilot, modules/sabpilot)
 UI_FILELIST_ALL_LANG(scalc, modules/scalc)
 UI_FILELIST_ALL_LANG(schart, modules/schart)
 UI_FILELIST_ALL_LANG(sdraw, modules/sdraw)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sdext/Library_pdfimport.mk

[Stephan Bergmann]

 sdext/Library_pdfimport.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 4aece3e69d775081dbf5bd3d32fa4bcfacb7de11
Author: Stephan Bergmann 
Date:   Thu Jul 3 18:11:49 2014 +0200

Does not look like Library_pdfimport needs poppler

Change-Id: I1dd162f939ce4f0689ea14724c1e7cec8a6c16b0

diff --git a/sdext/Library_pdfimport.mk b/sdext/Library_pdfimport.mk
index 3e3d170..ca7d5ac 100644
--- a/sdext/Library_pdfimport.mk
+++ b/sdext/Library_pdfimport.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_use_static_libraries,pdfimport,\
 $(eval $(call gb_Library_use_externals,pdfimport,\
boost_headers \
 zlib \
-poppler \
 $(if $(filter-out WNT MACOSX,$(OS)),fontconfig) \
 ))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Zolnai Tamás]

 avmedia/source/opengl/oglwindow.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 09fe9db46615265c6c7119f2524d19335d0e0283
Author: Zolnai Tamás 
Date:   Thu Jul 3 18:07:58 2014 +0200

glTF: improve camera movement constraint

Stop moving only on the wrong direction.

Change-Id: Ic9e7f2e7814d9adcbcf707e7fb786bf17fac3125

diff --git a/avmedia/source/opengl/oglwindow.cxx 
b/avmedia/source/opengl/oglwindow.cxx
index b3b1777..9060145 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -266,7 +266,8 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, pEvent)
 {
 // Limit zooming in orbit mode
 m_fCameraDistance += vMoveBy.z;
-if (m_fCameraDistance < 0.75 * fModelSize || 
m_fCameraDistance > 2 * fModelSize)
+if ((m_fCameraDistance < 0.75 * fModelSize && 
vMoveBy.z < 0.0 ) ||
+(m_fCameraDistance > 2 * fModelSize && vMoveBy.z > 
0.0 ))
 {
 m_fCameraDistance -= vMoveBy.z;
 vMoveBy = glm::vec3(0.0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Armin Le Grand]

 svgio/inc/svgio/svgreader/svgclippathnode.hxx |6 --
 svgio/inc/svgio/svgreader/svgmasknode.hxx |6 --
 svgio/source/svgreader/svgclippathnode.cxx|   12 +++-
 svgio/source/svgreader/svgmasknode.cxx|   17 -
 svgio/source/svgreader/svgstyleattributes.cxx |6 --
 5 files changed, 39 insertions(+), 8 deletions(-)

New commits:
commit 247d5bc4d13c8ab299f8ca72768946f59815dca4
Author: Armin Le Grand 
Date:   Thu Jul 3 15:49:09 2014 +

i124852 Corrected mask and clip polygons for userSpaceOnUse

diff --git a/svgio/inc/svgio/svgreader/svgclippathnode.hxx 
b/svgio/inc/svgio/svgreader/svgclippathnode.hxx
index e2fc7cb..5cf4e71 100644
--- a/svgio/inc/svgio/svgreader/svgclippathnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgclippathnode.hxx
@@ -52,8 +52,10 @@ namespace svgio
 virtual void parseAttribute(const rtl::OUString& rTokenName, 
SVGToken aSVGToken, const rtl::OUString& aContent);
 virtual void 
decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool 
bReferenced) const;
 
-/// apply contained clipPath to given geometry
-void apply(drawinglayer::primitive2d::Primitive2DSequence& 
rTarget) const;
+/// apply contained clipPath to given geometry #i124852# transform 
may be needed
+void apply(
+drawinglayer::primitive2d::Primitive2DSequence& rTarget,
+const basegfx::B2DHomMatrix* pTransform) const;
 
 /// clipPathUnits content
 SvgUnits getClipPathUnits() const { return maClipPathUnits; }
diff --git a/svgio/inc/svgio/svgreader/svgmasknode.hxx 
b/svgio/inc/svgio/svgreader/svgmasknode.hxx
index 6c3089d..4c5fa5f 100644
--- a/svgio/inc/svgio/svgreader/svgmasknode.hxx
+++ b/svgio/inc/svgio/svgreader/svgmasknode.hxx
@@ -57,8 +57,10 @@ namespace svgio
 virtual void parseAttribute(const rtl::OUString& rTokenName, 
SVGToken aSVGToken, const rtl::OUString& aContent);
 virtual void 
decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool 
bReferenced) const;
 
-/// apply contained clipPath to given geometry
-void apply(drawinglayer::primitive2d::Primitive2DSequence& 
rTarget) const;
+/// apply contained clipPath to given geometry #i124852# transform 
may be needed
+void apply(
+drawinglayer::primitive2d::Primitive2DSequence& rTarget,
+const basegfx::B2DHomMatrix* pTransform) const;
 
 /// x content, set if found in current context
 const SvgNumber& getX() const { return maX; }
diff --git a/svgio/source/svgreader/svgclippathnode.cxx 
b/svgio/source/svgreader/svgclippathnode.cxx
index 4e795ff..3e4ecd80 100644
--- a/svgio/source/svgreader/svgclippathnode.cxx
+++ b/svgio/source/svgreader/svgclippathnode.cxx
@@ -132,7 +132,9 @@ namespace svgio
 }
 }
 
-void 
SvgClipPathNode::apply(drawinglayer::primitive2d::Primitive2DSequence& 
rContent) const
+void SvgClipPathNode::apply(
+drawinglayer::primitive2d::Primitive2DSequence& rContent,
+const basegfx::B2DHomMatrix* pTransform) const
 {
 if(rContent.hasElements() && Display_none != getDisplay())
 {
@@ -179,6 +181,14 @@ namespace svgio
 aContentRange.getRange(),
 aContentRange.getMinimum()));
 }
+else // userSpaceOnUse
+{
+// #i124852#
+if(pTransform)
+{
+aClipPolyPolygon.transform(*pTransform);
+}
+}
 
 // #124313# try to avoid creating an embedding to a 
MaskPrimitive2D if
 // possible; MaskPrimitive2D processing is potentially 
expensive
diff --git a/svgio/source/svgreader/svgmasknode.cxx 
b/svgio/source/svgreader/svgmasknode.cxx
index 26e28f5..37459af 100644
--- a/svgio/source/svgreader/svgmasknode.cxx
+++ b/svgio/source/svgreader/svgmasknode.cxx
@@ -197,7 +197,9 @@ namespace svgio
 }
 }
 
-void 
SvgMaskNode::apply(drawinglayer::primitive2d::Primitive2DSequence& rTarget) 
const
+void SvgMaskNode::apply(
+drawinglayer::primitive2d::Primitive2DSequence& rTarget,
+const basegfx::B2DHomMatrix* pTransform) const
 {
 if(rTarget.hasElements() && Display_none != getDisplay())
 {
@@ -259,6 +261,19 @@ namespace svgio
 
 aMaskTarget = 
drawinglayer::primitive2d::Primitive2DSequence(&xTransform, 1);
 }
+else // userSpaceOnUse
+{
+// #i124852#
+if(pTransform)
+{
+

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

[Kohei Yoshida]

 chart2/qa/extras/chart2export.cxx   |8 
 chart2/qa/extras/data/docx/scatter-chart-text-x-values.docx |binary
 dev/null|binary
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 50a5d6ac3f81540ec510b6f88a26060f443395e9
Author: Kohei Yoshida 
Date:   Thu Jul 3 12:02:52 2014 -0400

Better and more descriptive naming.

Change-Id: Ic2e3b14399d2acc91c75922a25dc736b1605c320

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 7ef8dc7..30b2a35 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -37,7 +37,7 @@ public:
 void testStockChart();
 void testBarChart();
 void testCrosses();
-void testScatterChart();
+void testScatterChartTextXValues();
 void testChartDataTable();
 void testChartExternalData();
 void testEmbeddingsGrabBag();
@@ -71,7 +71,7 @@ public:
 CPPUNIT_TEST(testStockChart);
 CPPUNIT_TEST(testBarChart);
 CPPUNIT_TEST(testCrosses);
-CPPUNIT_TEST(testScatterChart);
+CPPUNIT_TEST(testScatterChartTextXValues);
 CPPUNIT_TEST(testChartDataTable);
 CPPUNIT_TEST(testChartExternalData);
 CPPUNIT_TEST(testEmbeddingsGrabBag);
@@ -518,9 +518,9 @@ void Chart2ExportTest::testCrosses()
 assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:crosses", 
"val", "autoZero");
 }
 
-void Chart2ExportTest::testScatterChart()
+void Chart2ExportTest::testScatterChartTextXValues()
 {
-load("/chart2/qa/extras/data/docx/", "fdo77216.docx");
+load("/chart2/qa/extras/data/docx/", "scatter-chart-text-x-values.docx");
 xmlDocPtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML 
Text");
 if (!pXmlDoc)
return;
diff --git a/chart2/qa/extras/data/docx/fdo77216.docx 
b/chart2/qa/extras/data/docx/scatter-chart-text-x-values.docx
similarity index 100%
rename from chart2/qa/extras/data/docx/fdo77216.docx
rename to chart2/qa/extras/data/docx/scatter-chart-text-x-values.docx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 chart2/qa/extras/chart2import.cxx   |   39 
++
 chart2/qa/extras/charttest.hxx  |1 
 chart2/qa/extras/data/pptx/stacked-bar-chart-hidden-series.pptx |binary
 3 files changed, 40 insertions(+)

New commits:
commit d53a9dc1cc64d00b38884168b2003a7da29773e3
Author: Kohei Yoshida 
Date:   Thu Jul 3 11:47:22 2014 -0400

bnc#812796: Write test for this.

Right now, we skip hidden data series when importing OOXML charts into
our internal data table.  This of course means that if/when we add support
for hidden columns in the internal data table, we may want to change this.

Change-Id: Ida1b77821fbc2f8f937244576b52521b59d6ab89

diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index 41a9a2f..d83e8c2 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -34,6 +34,12 @@ public:
 void testDOCChartSeries();
 void testDOCXChartSeries();
 void testPPTXChartSeries();
+/**
+ * Original data contains 3 series but 2 of them are hidden. For now, we
+ * detect and skip those hidden series on import (since we don't support
+ * hidden columns for internal data table yet).
+ */
+void testPPTXHiddenDataSeries();
 void testPPTChartSeries();
 void testODPChartSeries();
 void testBnc864396();
@@ -62,6 +68,7 @@ public:
  */
 CPPUNIT_TEST(testPPTChartSeries);
 CPPUNIT_TEST(testPPTXChartSeries);
+CPPUNIT_TEST(testPPTXHiddenDataSeries);
 CPPUNIT_TEST(testODPChartSeries);
 CPPUNIT_TEST(testBnc864396);
 CPPUNIT_TEST(testSimpleStrictXLSX);
@@ -324,6 +331,38 @@ void Chart2ImportTest::testPPTXChartSeries()
 CPPUNIT_ASSERT_EQUAL(OUString("Column 3"), aLabels[2][0].get());
 }
 
+void Chart2ImportTest::testPPTXHiddenDataSeries()
+{
+load("/chart2/qa/extras/data/pptx/", 
"stacked-bar-chart-hidden-series.pptx");
+Reference xChartDoc(getChartDocFromDrawImpress(0, 
0), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xChartDoc.is());
+
+Reference xCT = getChartTypeFromDoc(xChartDoc, 0, 0);
+CPPUNIT_ASSERT(xCT.is());
+
+// There should be only one data series present.
+std::vector > aLabels = 
getDataSeriesLabelsFromChartType(xCT);
+CPPUNIT_ASSERT_EQUAL(size_t(1), aLabels.size());
+CPPUNIT_ASSERT_EQUAL(OUString("Series 3"), aLabels[0][0].get());
+
+// Test the internal data.
+CPPUNIT_ASSERT(xChartDoc->hasInternalDataProvider());
+
+Reference 
xInternalProvider(xChartDoc->getDataProvider(), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xInternalProvider.is());
+
+Reference xDescAccess(xInternalProvider, 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xDescAccess.is());
+
+// Get the category labels.
+Sequence > aCategories = 
xDescAccess->getComplexRowDescriptions();
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aCategories.getLength());
+CPPUNIT_ASSERT_EQUAL(OUString("Category 1"), aCategories[0][0]);
+CPPUNIT_ASSERT_EQUAL(OUString("Category 2"), aCategories[1][0]);
+CPPUNIT_ASSERT_EQUAL(OUString("Category 3"), aCategories[2][0]);
+CPPUNIT_ASSERT_EQUAL(OUString("Category 4"), aCategories[3][0]);
+}
+
 void Chart2ImportTest::testODPChartSeries()
 {
 //test chart series names for odp
diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx
index 97284542..4ac6db3 100644
--- a/chart2/qa/extras/charttest.hxx
+++ b/chart2/qa/extras/charttest.hxx
@@ -44,6 +44,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/chart2/qa/extras/data/pptx/stacked-bar-chart-hidden-series.pptx 
b/chart2/qa/extras/data/pptx/stacked-bar-chart-hidden-series.pptx
new file mode 100755
index 000..20ba89a
Binary files /dev/null and 
b/chart2/qa/extras/data/pptx/stacked-bar-chart-hidden-series.pptx differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - external/firebird

[Norbert Thiebaud]

 external/firebird/ExternalProject_firebird.mk   |1 
 external/firebird/UnpackedTarball_firebird.mk   |1 
 external/firebird/firebird-no-open-temp-on-shutdown.patch.1 |  359 
 3 files changed, 361 insertions(+)

New commits:
commit 4cf0e29ccf5191b7ba4ed84750108e5361bcde38
Author: Norbert Thiebaud 
Date:   Thu Jul 3 16:19:00 2014 +0200

Revert "firebird: enable-debug cause trouble due to a lifecycle management 
issue"

This reverts commit 814818c3451fa32900c011278e2e5b62e3518eb0.
Upstream patched the underlying cause

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index d25c667..6e3f582 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -50,6 +50,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
--without-editline \
--disable-superserver \
--with-system-icu --without-fbsample 
--without-fbsample-db \
+   $(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter IOS 
ANDROID,$(OS)),--disable-shared,--disable-static) \
&& $(if $(filter WNT,$(OS)),\
commit c39f77fcbe3def727190def1c568c3b47aa8c3c3
Author: Norbert Thiebaud 
Date:   Thu Jul 3 17:31:45 2014 +0200

firebird: backport upstream patch to avoid life cycle issues

with temp files...

Change-Id: I3c76baa38c6854600fbfd1dd48c554ff8716969e

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index 77e691c..8f06102 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-rpath.patch.0 \
external/firebird/firebird-c++11.patch.1 \
external/firebird/firebird-c++11replfn.patch.0 \
+   external/firebird/firebird-no-open-temp-on-shutdown.patch.1 \
 ))
 
 ifeq ($(OS)-$(COM),WNT-MSC)
diff --git a/external/firebird/firebird-no-open-temp-on-shutdown.patch.1 
b/external/firebird/firebird-no-open-temp-on-shutdown.patch.1
new file mode 100644
index 000..5ce748c
--- /dev/null
+++ b/external/firebird/firebird-no-open-temp-on-shutdown.patch.1
@@ -0,0 +1,359 @@
+Only in firebird: Makefile
+Only in firebird: build.log
+diff -ur firebird.org/builds/posix/Makefile.in.client.gfix 
firebird/builds/posix/Makefile.in.client.gfix
+--- firebird.org/builds/posix/Makefile.in.client.gfix  2014-07-03 
13:40:07.0 +0200
 firebird/builds/posix/Makefile.in.client.gfix  2014-07-03 
13:45:17.0 +0200
+@@ -39,7 +39,8 @@
+ @SET_MAKE@
+ 
+ 
+-GFIX_Other_Sources = jrd/isc.cpp jrd/ThreadData.cpp jrd/path_utils.cpp 
common/UtilSvc.cpp
++GFIX_Other_Sources = jrd/isc.cpp jrd/ThreadData.cpp jrd/path_utils.cpp 
common/UtilSvc.cpp \
++   $(OS_SPECIFIC_Sources)
+ 
+ GFIX_Files = alice_meta.epp alice.cpp exe.cpp tdr.cpp aliceMain.cpp
+ GFIX_Sources = $(addprefix alice/, $(GFIX_Files)) $(GFIX_Other_Sources)
+diff -ur firebird.org/builds/posix/Makefile.in.client.util 
firebird/builds/posix/Makefile.in.client.util
+--- firebird.org/builds/posix/Makefile.in.client.util  2014-07-03 
13:40:07.0 +0200
 firebird/builds/posix/Makefile.in.client.util  2014-07-03 
13:45:17.0 +0200
+@@ -90,7 +90,7 @@
+   $(FBCLASSES_MsgObjects) $(CLUMPLETS_Objects) $(FBCOMMON_ClientObjects)
+ 
+ 
+-FBGUARD_Other_Sources = jrd/isc.cpp jrd/divorce.cpp jrd/path_utils.cpp
++FBGUARD_Other_Sources = jrd/isc.cpp jrd/divorce.cpp jrd/path_utils.cpp 
$(OS_SPECIFIC_Sources)
+ FBGUARD_Files =  guard.cpp util.cpp
+ FBGUARD_Sources = $(addprefix utilities/guard/, $(FBGUARD_Files)) 
$(FBGUARD_Other_Sources)
+ FBGUARD_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename 
$(FBGUARD_Sources $(FBCLASSES_ClientObjects)
+diff -ur firebird.org/builds/posix/Makefile.in.embed.gfix 
firebird/builds/posix/Makefile.in.embed.gfix
+--- firebird.org/builds/posix/Makefile.in.embed.gfix   2014-07-03 
13:40:07.0 +0200
 firebird/builds/posix/Makefile.in.embed.gfix   2014-07-03 
13:54:55.0 +0200
+@@ -43,7 +43,8 @@
+alice.cpp exe.cpp tdr.cpp aliceMain.cpp
+ 
+ GFIX_Other_Sources += jrd/isc.cpp jrd/ThreadData.cpp jrd/path_utils.cpp \
+-common/UtilSvc.cpp
++common/UtilSvc.cpp \
++$(OS_SPECIFIC_Sources)
+ 
+ GFIX_Sources = $(addprefix alice/, $(GFIX_Files)) $(GFIX_Other_Sources)
+ GFIX_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename 
$(GFIX_Sources
+Only in firebird/builds/posix: Makefile.in.embed.gfix.orig

[Bug 75025] LibreOffice 4.3 most annoying bugs

[bugzilla-daemon]

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

V Stuart Foote  changed:

   What|Removed |Added

 Depends on||75937

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

minutes of ESC call ...

[Michael Meeks]

* Present
+ Cloph, Jacobo, Markus, Ptyl, Adam, David, Stephan, Norbert, Miklos,
  Caolan, Kendy, Eike, Lionel, Robinson, Michael S, Michael M, Andras, Muthu
 
* Completed Action Items:
+ research / seek a saner access2base solution for master (Stephan)
[ should probably do it as a bundled extension.
  pre-registration in 3.6 times caused the trouble.
  No pressing arguments against bundled extensions now. ]
+ look at fillattribute branch wrt. fdo#78908 & fdo#79158 (Miklos)
[ merged to master; discussed back-porting to 4.3 ...
  input appreciated from Michael S. Easiest to revert the
  first part from 4.3.
  Prefer to revert half-finished version for 4.3 (Caolan)
 + have another small fix in-hand, plenty more to come
AI:  + revert onto the -4-3 branch (Miklos)
]
+ review crazy SfxItemPool hash speedup patch (Kendy)
 
* Pending Action Items:
+ ask UX advise wrt. wrench icons (revert or not ?) (Astron)
+ scripting to generate / list last week's UI changes (Cloph)
[ in progress ... ]
+ blog about the sad realities of web plugins (Bjoern)
+ poke potential Boston Hackfest hosters again (Michael)
 
* GSOC Update (Cedric)
AI: ** All mentors, please invite students in good standing to LibOCon!
+ also remember to register for the conference:
 http://conference.libreoffice.org/2014/registration/
 
* Release Engineering update (Christian)
+ 4.3.0 RC2 status - is out.
+ 4.3.0 RC3 - final
+ several patches not integrated & need review.
+ need help reviewing them
+ filed for the -4-3 branch, but not automatically on -4-3-0
AI: ** please submit fixes for -4-3-0 as well.
+ 3x patches pending:

https://gerrit.libreoffice.org/#/q/status:open+project:core+branch:libreoffice-4-3,n,z
+ Triple review required for 4.3.0
+ Double review for libreoffice-4-3
+ 4.2.5 retrospective
+ no known problems; enabled auto-update without issues.
+ 4.2.6 RC1 deadline - Monday 
+ Windows 8 / registry key mangling / Photos
+ broken for Vista and above (Timar)
+ not a good idea to touch the KindMap at all.
+ happened last summer.
+ reported in April; mis-prioritised ?
+ made it a MAB today.
+ will 4.2.6 be released before 4.3.0 ? (Michael)
+ when did the on-line update to recommend 4.2 ?
+ last week (Cloph)
+ fix won't mend the broken system (Timar)
+ can publish a .reg file to mend it.
AI:  + build a 4.2.5.3 with registry fix (Cloph)
+ and ask internally for quick test / ship ?
+ only for Windows (Michael S)
+ Android / iOS remotes
+ Late features ?
+ OpenGL wrapper not finished for Mac (yet) (Markus)
+ no access to a Mac to write OpenGL bindings for VCL
+ not a huge fix, needs to be done by someone with access
+ is remote access good enough ? (Cloph)
 + unclear (Markus)
+ need the core OpenGL framework from Apple (Markus)
+ Announce anyway, and implement for Mac later
+ people are encouraged to contribute on Mac (Miklos)
+ Android only remote eg. (Kendy) 
+ 2 patches removing dialogs and strings to fix bugs (Markus)
+ 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=77cec206e3c49490e6e380c52cb6d45277a03f65
+ 
http://cgit.freedesktop.org/libreoffice/core/commit/chart2?id=c97424f82a8d9d50d98e868cf0c1c2731ee15e74
+ disabling the GL3DChart in the chart wizard
+ workaround for new strings.
AI: + submit for patch review (Markus)
 
* More Mac Hardware (Michael)
  + sad to see OpenGL support not done - lack of macs.
  + approved $1k to buy Markus a Mac Mini (Norbert, Michael, Adam, Caolan)
 
* Crashtest update (Markus)
  + machine rebooting itself at random times midway through... (Markus)
  + on a TDF server, running perf VM & crash testing
  + other VMs run fine (Cloph)
 + no indication on the host side that the VM has problems.
 + just see in the guest that it has rebooted
 + last line in the journal, SEGV's in the test & then reboots ...
 + http://pastie.org/9347335
  + is there some physical machine we can run this on ? (Kendy)
 + problems in the past with machine becoming un-responsive (Markus)
 + happened for the last 3x test runs ...
 + can we run it more slowly (Michael)
+ currently run at ~100% of CPU, but can reduce parallelism 
(Markus)
+ did we get anywhere with distributing the work in the TB script 
(Michael)
+ no (Norbert)
AI: + can we try adding per-process resource limits (Markus)
  + 4.2 results are much worse than 4.3 results;

Re: minutes of ESC call ...

[Lionel Elie Mamane]

On Thu, Jul 03, 2014 at 02:54:10PM +0200, Stephan Bergmann wrote:
> On 06/12/2014 06:17 PM, Michael Meeks wrote:
> >* allow upgrade of access2base (Lionel?)
> > + access2base now included in LibreOffice 4.2 and later
> > + technical structure: one Basic library (and that's it)
> >+ for other branches (other forks of OO.org & LibreOffice 4.1 and 
> > earlier),
> >  available as extension
> > + competitive "disadvantage": users of other branches
> >   can have newer access2base faster (install extension)
> > + not possible for LibO 4.2 & later because extension not allowed
> >   to override part of LibreOffice (only other extension)
> >+ policy exception for access2base can have new features within 
> > stable line?
> >   + I don't like that
> >+ allow extensions to override any part of LibreOffice?
> >   + no, significant resistance
> >+ demote access2base to bundled extension?
> >   + makes Acces2Base much less "official" in LibreOffice :-(
> > (also more work)
> >   + problems with bundled extensions in the past (Michael)
> >+ allow extensions to override only access2base
> >   + Lionel's preferred option.
> >   + problem comes from extension using the same name etc. (Stephan)
> >+ mostly a problem with basic modules, not an expert there.
> >+ take Noel's advice from the list.
> >+ ok to add something for access2base, no general fix.
> > + always troubles with namespaces.
> >   + fairly sure this will work well tested it in the build.
> >+ change test of who can override what; done on the file-path
> > + why not make it a bundled extension ? (Michael Stahl)
> >   + this is what it was designed for.
> >   + why did we move away from bundled extensions ? (Lionel)
> >+ problems with native code bundled extensions (Stephan)
> >+ problems with the upgrade scenarios.
> >+ shouldn't affect basic.
> >   + when was this included ? (Stephan)
> >+ was included in 4.2 (Lionel)
> > + switching to bundling in 4.2 is a larger change
> >+ vs. a 1-line patch to say it can be overridden (Lionel)
> >+ happy with a 1-line change in 4.2 (Michael S)
> >   + concerned wrt. the future making it a bundled extension.
> >AI:   + merge 1-liner to 4.2 / 4.3 / master (Lionel)
> >AI:   + research / seek a saner solution for master (Stephan)

> One source of trouble for the access2base case is that shared-namespace
> names (like names of Basic libraries) were not replaced when turning the
> functionality into an integral LO-part.  This should definitely be addressed
> on master, one way or another.  The various interfaces by which extensions
> (as well as documents containing macros etc.) can plug into LO are generally
> ad-hoc and brittle enough that we should not tempt fate with neither
> careless nor intended-to-be-clever nameclashes.

I would rather not rename access2base within LibreOffice, as this is
an *API* / library. *All* code using it would have to be changed to
load the new library name.

However, my tests show that trying to mix access2base-as-extension and
access2base-in-core is, as far as I could determine, safe:

 - In 4.2.4 and earlier, the in-core version flatly wins, and the
   as-extension version cannot be enabled: it listed as "there was a
   problem enabling this extension".

 - In 4.2.5 and later, the as-extension version wins; enabling an
   as-extension version disables the in-code version. Disabling (or
   uninstalling) the installed as-extension reenables the in-code
   version (after a LibreOffice restart).

> The remaining question is whether LO should offer the access2base
> functionality in the form of a bundled extension or integral LO-part. The
> historic reasons that lead to the demise of bundled extensions should not be
> too relevant here (similarly to the case of bundled dictionaries, say).  One
> concern would be the update cycles of the access2base functionality vs. LO
> proper.  But a more severe concern probably would be whether concurrent
> installation of the extension and the integral LO-part could lead to
> confusion as described above.  This can only be answered by somebody
> familiar with the actual access2base functionality.  If such confusion is to
> be expected, my recommendation would be to go with a bundled extension on
> master.

 I'm not worried about "confusion", since it is rather easy to
check which one is active.

So, now that Stephan has validated that the past problems with bundled
extensions do not apply anymore / not to access2base, I don't veto
anymore to change access2base to bundled extension in *master*. The
only remaining sort-of reason not to do is political.

-- 
Lionel
___
Libre

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

[Eike Rathke]

 svl/source/numbers/zforfind.cxx |   38 +-
 1 file changed, 37 insertions(+), 1 deletion(-)

New commits:
commit 04bca2bfab406e4e81d758e2b83bf470757fd7d1
Author: Eike Rathke 
Date:   Wed Jul 2 22:24:52 2014 +0200

resolved fdo#80166 check input against date acceptance pattern plausibility

... to prevent confusion of #.### input with D.M that then later is
discarded as invalid date input instead of accepted as valid numeric
input.

(cherry picked from commit 836e504c859a5b67f7ab7ba842785951d41058cd)

work around nonsense -Werror=maybe-uninitialized, fdo#80166 follow-up

(cherry picked from commit 397362d8532d7b0abe38f2024dd2cefe2482d6a3)

0f9cf74550e43d174bf6ac75e70c51ab7f51ccf8

Change-Id: I178e28b7ef3b26d04eecc73e5e5c61ee41f89e32
Reviewed-on: https://gerrit.libreoffice.org/10036
Reviewed-by: David Tardon 
Tested-by: Markus Mohrhard 
Reviewed-by: Markus Mohrhard 

diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index d63fd56..993b712 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -1174,6 +1174,8 @@ bool ImpSvNumberInputScan::IsAcceptedDatePattern( 
sal_uInt16 nStartPatternAt )
 }
 nDatePatternStart = nStartPatternAt; // remember start particle
 
+const sal_Int32 nMonthsInYear = 
pFormatter->GetCalendar()->getNumberOfMonthsInYear();
+
 for (sal_Int32 nPattern=0; nPattern < sDateAcceptancePatterns.getLength(); 
++nPattern)
 {
 sal_uInt16 nNext = nDatePatternStart;
@@ -1183,12 +1185,46 @@ bool ImpSvNumberInputScan::IsAcceptedDatePattern( 
sal_uInt16 nStartPatternAt )
 sal_Int32 nPat = 0;
 for ( ; nPat < rPat.getLength() && bOk && nNext < nAnzStrings; ++nPat, 
++nNext)
 {
-switch (rPat[nPat])
+const sal_Unicode c = rPat[nPat];
+switch (c)
 {
 case 'Y':
 case 'M':
 case 'D':
 bOk = IsNum[nNext];
+if (bOk && (c == 'M' || c == 'D'))
+{
+// Check the D and M cases for plausibility. This also
+// prevents recognition of date instead of number with a
+// numeric group input if date separator is identical to
+// group separator, for example with D.M as a pattern and
+// #.### as a group.
+sal_Int32 nMaxLen, nMaxVal;
+switch (c)
+{
+case 'M':
+nMaxLen = 2;
+nMaxVal = nMonthsInYear;
+break;
+case 'D':
+nMaxLen = 2;
+nMaxVal = 31;
+break;
+default:
+// This merely exists against
+// -Werror=maybe-uninitialized, which is nonsense
+// after the (c == 'M' || c == 'D') check above,
+// but ...
+nMaxLen = 2;
+nMaxVal = 31;
+}
+bOk = (sStrArray[nNext].getLength() <= nMaxLen);
+if (bOk)
+{
+sal_Int32 nNum = sStrArray[nNext].toInt32();
+bOk = (1 <= nNum && nNum <= nMaxVal);
+}
+}
 if (bOk)
 ++nDatePatternNumbers;
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Zolnai Tamás]

 avmedia/source/framework/modeltools.cxx |1 -
 avmedia/source/opengl/oglwindow.cxx |   17 +
 avmedia/source/opengl/oglwindow.hxx |2 ++
 3 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 9a670eb493f3760eb398c3f9d2296d979b608f95
Author: Zolnai Tamás 
Date:   Thu Jul 3 16:26:44 2014 +0200

glTF: constraine camera move in orbit mode

Not to get too close to / too far from the model.
Too close means move into the model.

Change-Id: Ie25d87c88093d4baaf98f13ab8239263b5e1bf66

diff --git a/avmedia/source/opengl/oglwindow.cxx 
b/avmedia/source/opengl/oglwindow.cxx
index f45468e..b3b1777 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -21,6 +21,7 @@ OGLWindow::OGLWindow( glTFHandle& rHandle, OpenGLContext& 
rContext, Window& rEve
 , m_bVisible ( false )
 , m_aLastMousePos(Point())
 , m_bIsOrbitMode( false )
+, m_fCameraDistance(0.0)
 {
 }
 
@@ -261,6 +262,16 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, 
pEvent)
 if(nCode == KEY_A)vMoveBy -= 
vStrafe*(0.0005f*fModelSize);
 if(nCode == KEY_D)vMoveBy += 
vStrafe*(0.0005f*fModelSize);
 }
+else
+{
+// Limit zooming in orbit mode
+m_fCameraDistance += vMoveBy.z;
+if (m_fCameraDistance < 0.75 * fModelSize || 
m_fCameraDistance > 2 * fModelSize)
+{
+m_fCameraDistance -= vMoveBy.z;
+vMoveBy = glm::vec3(0.0);
+}
+}
 }
 gltf_renderer_move_camera(&m_rHandle, vMoveBy.x, vMoveBy.y, 
vMoveBy.z, 0.0);
 }
@@ -275,6 +286,12 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, 
pEvent)
 {
 gltf_orbit_mode_start(&m_rHandle);
 m_bIsOrbitMode = true;
+// Set default camera distance
+glm::vec3 vEye;
+glm::vec3 vView;
+glm::vec3 vUp;
+gltf_get_camera_pos(&m_rHandle, &vEye,&vView,&vUp);
+m_fCameraDistance = vEye.z - 
gltf_get_model_center_pos(&m_rHandle)->z;
 }
 }
 else if(nCode == KEY_F)
diff --git a/avmedia/source/opengl/oglwindow.hxx 
b/avmedia/source/opengl/oglwindow.hxx
index b4b1390..68b1ed8 100644
--- a/avmedia/source/opengl/oglwindow.hxx
+++ b/avmedia/source/opengl/oglwindow.hxx
@@ -68,9 +68,11 @@ private:
 glTFHandle& m_rHandle;
 OpenGLContext& m_rContext;
 Window& m_rEventHandler;
+
 bool m_bVisible;
 Point m_aLastMousePos;
 bool m_bIsOrbitMode;
+double m_fCameraDistance;
 };
 
 } // namespace ogl
commit 0b3a918860944878b5fc4cf87883889bc467a052
Author: Zolnai Tamás 
Date:   Tue Jul 1 12:29:45 2014 +0200

Remove obsolete comment

Change-Id: I0cc592b245871187dd41e85be8c86e6e7878181b

diff --git a/avmedia/source/framework/modeltools.cxx 
b/avmedia/source/framework/modeltools.cxx
index 6119cb7..87c7519 100644
--- a/avmedia/source/framework/modeltools.cxx
+++ b/avmedia/source/framework/modeltools.cxx
@@ -87,7 +87,6 @@ bool KmzDae2Gltf(const OUString& rSourceURL, OUString& 
o_rOutput)
 asset->setBundleOutputPath(OUStringToOString( sOutput, 
RTL_TEXTENCODING_UTF8 ).getStr());
 
 // If *.dae file is not in the local file system, then copy it to a temp 
folder for the conversion
-// KMZ covnerter need a temp folder in all case, because it creates temp 
files next to the source file
 OUString sInput = rSourceURL;
 const INetURLObject aSourceURLObj(rSourceURL);
 if( aSourceURLObj.GetProtocol() != INET_PROT_FILE )
___
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' - fpicker/source

[Caolán McNamara]

 fpicker/source/office/iodlgimp.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 24fbc8ef2a4332b7a70e9d1148ea625df862388c
Author: Caolán McNamara 
Date:   Wed Jul 2 11:09:22 2014 +0100

fix crash when m_aType is '*'

Change-Id: If2c4ca98814a58b785cd2670eac1e522e70464fd
(cherry picked from commit 5983675eccd9517915d8f5558c25f47c952edb24)
Reviewed-on: https://gerrit.libreoffice.org/10048
Tested-by: Markus Mohrhard 
Reviewed-by: Markus Mohrhard 

diff --git a/fpicker/source/office/iodlgimp.hxx 
b/fpicker/source/office/iodlgimp.hxx
index 816d6ef..2f211f5 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -57,7 +57,7 @@ public:
 
 const OUString& GetName() const { return m_aName; }
 const OUString& GetType() const { return m_aType; }
-const OUString  GetExtension() const{ return m_aType.copy( 2 ); }
+const OUString  GetExtension() const{ return m_aType.getLength() > 
2 ? m_aType.copy( 2 ) : OUString(); }
 
 boolisGroupSeparator() const{ return m_aType.isEmpty(); }
 };
___
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' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/tocread.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 574399df9c2ebf3c328a3b95455d3a9fac84771f
Author: Caolán McNamara 
Date:   Thu Jul 3 11:17:37 2014 +0100

coverity#140 Untrusted value as argument

and

coverity#139 Untrusted value as argument

(cherry picked from commit 5e043613266113a873c55ad45ab0fb1ae14286e8)

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

diff --git a/lotuswordpro/source/filter/tocread.cxx 
b/lotuswordpro/source/filter/tocread.cxx
index c27909c..8be2015 100644
--- a/lotuswordpro/source/filter/tocread.cxx
+++ b/lotuswordpro/source/filter/tocread.cxx
@@ -67,6 +67,16 @@ CBenTOCReader::ReadLabelAndTOC()
 if ((Err = ReadLabel(&TOCOffset, &cTOCSize)) != BenErr_OK)
 return Err;
 
+unsigned long nLength;
+if ((Err = cpContainer->GetSize(&nLength)) != BenErr_OK)
+return Err;
+
+if (TOCOffset > nLength)
+return BenErr_ReadPastEndOfTOC;
+
+if (cTOCSize > nLength - TOCOffset)
+return BenErr_ReadPastEndOfTOC;
+
 if ((Err = cpContainer->SeekToPosition(TOCOffset)) != BenErr_OK)
 return Err;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Heena Gupta]

 chart2/qa/extras/chart2import.cxx|   21 +
 chart2/qa/extras/data/xlsx/fdo54361.xlsx |binary
 2 files changed, 21 insertions(+)

New commits:
commit 994fc8faa1cd232456910e2de1ff4add1eee024a
Author: Heena Gupta 
Date:   Mon Jun 30 15:12:32 2014 +0530

fdo#54361:Add test case for the chart background

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

diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index b7c1e78..41a9a2f 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -16,6 +16,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -40,6 +41,7 @@ public:
 void testDelayedCellImport(); // chart range referencing content on later 
sheets
 void testFlatODSStackedColumnChart();
 void testFdo78080();
+void testFdo54361();
 
 CPPUNIT_TEST_SUITE(Chart2ImportTest);
 CPPUNIT_TEST(Fdo60083);
@@ -66,6 +68,7 @@ public:
 CPPUNIT_TEST(testDelayedCellImport);
 CPPUNIT_TEST(testFlatODSStackedColumnChart);
 CPPUNIT_TEST(testFdo78080);
+CPPUNIT_TEST(testFdo54361);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -396,6 +399,24 @@ void Chart2ImportTest::testFdo78080()
 CPPUNIT_ASSERT(!xTitle.is());
 }
 
+void Chart2ImportTest::testFdo54361()
+{
+load("/chart2/qa/extras/data/xlsx/", "fdo54361.xlsx");
+uno::Reference< chart2::XChartDocument > xChartDoc = 
getChartDocFromSheet(0, mxComponent);
+CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
+
+uno::Reference< chart::XChartDocument > xChart2Doc (xChartDoc, 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChart2Doc.is());
+
+Reference< beans::XPropertySet > xPropSet( xChart2Doc->getArea(), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_MESSAGE("failed to get Area", xPropSet.is());
+
+com::sun::star::drawing::FillStyle aStyle;
+xPropSet -> getPropertyValue("FillStyle") >>= aStyle;
+
+CPPUNIT_ASSERT_MESSAGE("Background needs to be with solid fill style", 
aStyle == 1);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ImportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/xlsx/fdo54361.xlsx 
b/chart2/qa/extras/data/xlsx/fdo54361.xlsx
new file mode 100644
index 000..2c49802
Binary files /dev/null and b/chart2/qa/extras/data/xlsx/fdo54361.xlsx differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - sw/source sysui/desktop

[Armin Le Grand]

 sw/source/core/doc/notxtfrm.cxx  |   55 ++-
 sysui/desktop/debian/control |3 +-
 sysui/desktop/debian/makefile.mk |2 -
 3 files changed, 51 insertions(+), 9 deletions(-)

New commits:
commit 131669af7168020750b726e4e6d1568975f73886
Author: Armin Le Grand 
Date:   Thu Jul 3 13:58:29 2014 +

i125171 support lossless embedding of linked jpegs in writer for PDF export

diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index d96023a..a988b36 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -1006,13 +1006,54 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, 
const SwRect &rGrfArea ) cons
 basegfx::tools::createScaleTranslateB2DHomMatrix(
 aTargetRange.getRange(),
 aTargetRange.getMinimum()));
-drawinglayer::primitive2d::Primitive2DSequence aContent;
-
-aContent.realloc(1);
-aContent[0] = new 
drawinglayer::primitive2d::GraphicPrimitive2D(
-aTargetTransform,
-rGrfObj.GetGraphic(),
-aGrfAttr);
+drawinglayer::primitive2d::Primitive2DSequence aContent(1);
+bool bDone(false);
+
+// #i125171# The mechanism to get lossless jpegs into pdf 
is based on having the original
+// file data (not the bitmap data) at the Graphic in the 
GfxLink (which has *nothing* to
+// do with the graphic being linked). This works well for 
DrawingLayer GraphicObjects (linked
+// and unlinked) but fails for linked Writer 
GraphicObjects. These have the URL in the
+// GraphicObject, but no GfxLink with the original file 
data when it's a linked graphic.
+// Since this blows up PDF size by a factor of 10 (the 
graphics get embedded as pixel maps
+// then) it is okay to add this workarund: In the needed 
case, load the graphic in a way to
+// get the GfxLink in the needed form and use that Graphic 
temporarily. Do this only when
+// - we have PDF export
+// - the GraphicObject is linked
+// - the Graphic has no GfxLink
+// - LosslessCompression is activated
+// - it's indeed a jpeg graphic (could be checked by the 
url ending, but is more reliable to check later)
+// In all other cases (normal repaint, print, etc...) use 
the available Graphic with the
+// already loaded pixel graphic as before this change.
+if(pOut->GetExtOutDevData() && rGrfObj.HasLink() && 
!rGrfObj.GetGraphic().IsLink())
+{
+const vcl::PDFExtOutDevData* pPDFExt = dynamic_cast< 
const vcl::PDFExtOutDevData* >(pOut->GetExtOutDevData());
+
+if(pPDFExt && pPDFExt->GetIsLosslessCompression())
+{
+Graphic aTempGraphic;
+INetURLObject aURL(rGrfObj.GetLink());
+
+if(GRFILTER_OK == 
GraphicFilter::GetGraphicFilter()->ImportGraphic(aTempGraphic, aURL))
+{
+if(aTempGraphic.IsLink() && 
GFX_LINK_TYPE_NATIVE_JPG == aTempGraphic.GetLink().GetType())
+{
+aContent[0] = new 
drawinglayer::primitive2d::GraphicPrimitive2D(
+aTargetTransform,
+aTempGraphic,
+aGrfAttr);
+bDone = true;
+}
+}
+}
+}
+
+if(!bDone)
+{
+aContent[0] = new 
drawinglayer::primitive2d::GraphicPrimitive2D(
+aTargetTransform,
+rGrfObj.GetGraphic(),
+aGrfAttr);
+}
 
 paintUsingPrimitivesHelper(
 *pOut,
commit 90a3fb5a924cb16e3b2c05b2ac9d4cd6bd32d504
Author: Herbert Dürr 
Date:   Thu Jul 3 12:50:04 2014 +

#i125176# add Debian package maintainer and extended description

the package maintainer is a to-be-created email alias to the target that
will be decided by the Apache OpenOffice PMC.

diff --git a/sysui/desktop/debian/control b/sysui/desktop/debian/control
index 90f0c09..75f9191 100644
--- a/sysui/desktop/debian/control
+++ b/sysui/desktop/debian/control
@@ -1,5 +1,6 @@
 Description: %productname desktop integration
-Maintainer: Apache Software Foundatio

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

[Caolán McNamara]

 svx/source/dialog/pagectrl.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 0ed069ff8dc941bf902edfefd5c62f1ece3f8ad8
Author: Caolán McNamara 
Date:   Thu Jul 3 15:03:26 2014 +0100

fix regression in paper format preview

regression from 7d9bb549d498d6beed2c4050c402d09643febdfa

Change-Id: Iede5abe9fddfff48bd73d69f4b48e178aa2342d3

diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index 0094aed..ed2d580 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -83,7 +83,7 @@ SvxPageWindow::SvxPageWindow(Window* pParent)
 {
 // Count in Twips by default
 SetMapMode(MapMode(MAP_TWIP));
-aWinSize = GetOutputSizePixel();
+aWinSize = GetOptimalSize();
 aWinSize.Height() -= 4;
 aWinSize.Width() -= 4;
 
@@ -91,8 +91,6 @@ SvxPageWindow::SvxPageWindow(Window* pParent)
 SetBackground();
 }
 
-
-
 SvxPageWindow::~SvxPageWindow()
 {
 delete pHdBorder;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jacobo Aragunde Pérez]

 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c38be106ff1c1ff5e1b279e4ea2c710b524d23f1
Author: Jacobo Aragunde Pérez 
Date:   Thu Jul 3 15:56:08 2014 +0200

fdo80555: Add comment on unit test

Change-Id: I1507449e60338744a8be2851decc73e1d42bc38d

diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 21f5ac6..c1916b1 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2233,6 +2233,7 @@ DECLARE_OOXMLIMPORT_TEST(testTableBtlrCenter, 
"table-btlr-center.docx")
 DECLARE_OOXMLIMPORT_TEST(testFdo80555, "fdo80555.docx")
 {
 uno::Reference xShape = getShape(1);
+// Shape was wrongly placed at X=0, Y=0
 CPPUNIT_ASSERT_EQUAL(sal_Int32(3318), xShape->getPosition().X);
 CPPUNIT_ASSERT_EQUAL(sal_Int32(245), xShape->getPosition().Y);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 9 commits - sal/rtl svtools/source svx/source sw/source vcl/source xmloff/source

[Caolán McNamara]

 sal/rtl/string.cxx  |2 +-
 svtools/source/contnr/svimpbox.cxx  |2 +-
 svtools/source/control/valueset.cxx |4 ++--
 svx/source/tbxctrls/colrctrl.cxx|4 ++--
 sw/source/ui/misc/pgfnote.cxx   |3 ++-
 sw/source/uibase/utlui/navipi.cxx   |4 ++--
 vcl/source/gdi/octree.cxx   |6 +++---
 xmloff/source/draw/ximpshap.cxx |   18 ++
 8 files changed, 23 insertions(+), 20 deletions(-)

New commits:
commit da0c0f2a846947c56866a3637a6952b3d47f2068
Author: Caolán McNamara 
Date:   Thu Jul 3 14:49:01 2014 +0100

this string is in svx

we shouldn't be in this condition, but seeing as we are fix the
string source.

Change-Id: Ia746a24db3daae7952f4b5dbd94a315a4e79cf12

diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index a4b32cb..ac5b3ee 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -19,6 +19,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -232,7 +233,7 @@ void SwFootNotePage::Reset(const SfxItemSet *rSet)
 sal_Int32 nSelPos = m_pLineColorBox->GetEntryPos( pFtnInfo->GetLineColor() 
);
 if( nSelPos == LISTBOX_ENTRY_NOTFOUND )
 nSelPos = m_pLineColorBox->InsertEntry( pFtnInfo->GetLineColor(),
-OUString( SW_RES( RID_SVXSTR_COLOR_USER ) ) );
+SVX_RESSTR(RID_SVXSTR_COLOR_USER) );
 
 m_pLineColorBox->SetSelectHdl( LINK( this, SwFootNotePage, 
LineColorSelected_Impl ) );
 m_pLineColorBox->SelectEntryPos( nSelPos );
commit 19100e5e9a0bf5f6829b52e8459f176b5fe7bc51
Author: Caolán McNamara 
Date:   Thu Jul 3 13:39:37 2014 +0100

coverity#704112 Unchecked return value

Change-Id: Ic1147662012426126c1cfcf7cb496a3d03cab794

diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index dc2d886..1f224a1 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -3865,16 +3865,18 @@ void SdXMLCustomShapeContext::EndElement()
 OSL_FAIL( "could not set enhanced customshape geometry" );
 }
 
-sal_Int32 nUPD( 0 );
-sal_Int32 nBuild( 0 );
-GetImport().getBuildIds( nUPD, nBuild );
-if( ((nUPD >= 640 && nUPD <= 645) || (nUPD == 680)) && (nBuild <= 
9221) )
+sal_Int32 nUPD;
+sal_Int32 nBuild;
+if (GetImport().getBuildIds(nUPD, nBuild))
 {
-Reference< drawing::XEnhancedCustomShapeDefaulter > xDefaulter( 
mxShape, UNO_QUERY );
-if( xDefaulter.is() )
+if( ((nUPD >= 640 && nUPD <= 645) || (nUPD == 680)) && (nBuild <= 
9221) )
 {
-OUString aEmptyType;
-xDefaulter->createCustomShapeDefaults( aEmptyType );
+Reference< drawing::XEnhancedCustomShapeDefaulter > 
xDefaulter( mxShape, UNO_QUERY );
+if( xDefaulter.is() )
+{
+OUString aEmptyType;
+xDefaulter->createCustomShapeDefaults( aEmptyType );
+}
 }
 }
 }
commit 29e353bdf7990a9d3db36e3210136893bf75fe94
Author: Caolán McNamara 
Date:   Thu Jul 3 13:37:04 2014 +0100

coverity#704075 Unchecked return value

Change-Id: Iacb7ccb17106bd3439c56756eb6d6a4b5969465d

diff --git a/sw/source/uibase/utlui/navipi.cxx 
b/sw/source/uibase/utlui/navipi.cxx
index f20fc03..d73e23f 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -1163,8 +1163,8 @@ OUString SwNavigationPI::CreateDropFileName( 
TransferableDataHelper& rData )
 rData.HasFormat( nFmt = 
SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR ))
 {
 INetBookmark aBkmk( aEmptyOUStr, aEmptyOUStr );
-rData.GetINetBookmark( nFmt, aBkmk );
-sFileName = aBkmk.GetURL();
+if (rData.GetINetBookmark(nFmt, aBkmk))
+sFileName = aBkmk.GetURL();
 }
 if( !sFileName.isEmpty() )
 {
commit d1f9507ff88b6e1934fbfee597182c7c1393e888
Author: Caolán McNamara 
Date:   Thu Jul 3 13:32:01 2014 +0100

coverity#706077 Unintended sign extension

Change-Id: I3a5d8a946b5134b4cd58694283bea0fac59a043a

diff --git a/svtools/source/contnr/svimpbox.cxx 
b/svtools/source/contnr/svimpbox.cxx
index 32c694a..a04856c 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -424,7 +424,7 @@ void SvImpLBox::PageDown( sal_uInt16 nDelta )
 long nScroll = nRealDelta * (-1);
 pView->NotifyScrolling( nScroll );
 Rectangle aArea( GetVisibleArea() );
-nScroll = pView->GetEntryHeight()*nRealDelta;
+nScroll = pView->GetEntryHeight() * static_cast(nRealDelta);
 nScroll = -nScroll;
 pView->Update();
 pView->Scroll( 0, nScroll, aArea, SCROLL_NOCHILDREN );
commit cfdf9a6c5a15a47e44b216ba372ee0b80cfe83b2
Author: Caolán McNamara 
Date:   Thu Jul 3 13:30:21 2014 +0100

coverity#706081 Unintended sign

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

[Miklos Vajna]

 sax/source/tools/fastserializer.hxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0f6888a25b3d39eca2b7aac596121dc0128c7c6a
Author: Miklos Vajna 
Date:   Thu Jul 3 15:35:44 2014 +0200

FastSaxSerializer: update documentation

Change-Id: I5e374c426a4741a88d43848392fc83e2368dbf92

diff --git a/sax/source/tools/fastserializer.hxx 
b/sax/source/tools/fastserializer.hxx
index fbbaede..da8c527 100644
--- a/sax/source/tools/fastserializer.hxx
+++ b/sax/source/tools/fastserializer.hxx
@@ -120,20 +120,20 @@ public:
 
 This is to be able to change the order of the data being written.
 If you need to write eg.
-  p, r, rPr, [something], /rPr, t, [text], /r, /p,
+  p, r, rPr, [something], /rPr, t, [text], /t, /r, /p,
 but get it in order
   p, r, t, [text], /t, rPr, [something], /rPr, /r, /p,
 simply do
   p, r, mark(), t, [text], /t, mark(), rPr, [something], /rPr,
-  mergeTopMarks( true ), mergeTopMarks(), /r, /p
+  mergeTopMarks( MERGE_MARKS_PREPEND ), mergeTopMarks( 
MERGE_MARKS_APPEND ), /r, /p
 and you are done.
  */
 void mark( const Int32Sequence& aOrder = Int32Sequence() );
 
 /** Merge 2 topmost marks.
 
-There are 3 possibilities - prepend the top before the second top-most
-mark, append it, or append it later; prepending brings the possibility
+The possibilities: prepend the top before the second top-most
+mark, append it, append it later or ignore; prepending brings the 
possibility
 to switch parts of the output, appending later allows to write some
 output in advance.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 connectivity/source/parse/sqlbison.y |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b5997b9354f536b9631df3cfada6595c7b60d6c9
Author: Lionel Elie Mamane 
Date:   Thu Jul 3 15:42:40 2014 +0200

JOINs are left-associative

Change-Id: I24fdd2ce9bb87cc52a7c84ec8cd300bc13b11461

diff --git a/connectivity/source/parse/sqlbison.y 
b/connectivity/source/parse/sqlbison.y
index 6a61b50..f8d7bec 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -121,7 +121,8 @@ using namespace connectivity;
 
 %token  SQL_TOKEN_GRANT SQL_TOKEN_GROUP SQL_TOKEN_HAVING 
SQL_TOKEN_IN SQL_TOKEN_INDICATOR SQL_TOKEN_INNER SQL_TOKEN_INTEGER 
SQL_TOKEN_INTO SQL_TOKEN_IS SQL_TOKEN_INTERSECT
 
-%token  SQL_TOKEN_JOIN SQL_TOKEN_KEY SQL_TOKEN_LEADING 
SQL_TOKEN_LIKE SQL_TOKEN_LOCAL SQL_TOKEN_LOWER
+%left  SQL_TOKEN_JOIN
+%token  SQL_TOKEN_KEY SQL_TOKEN_LEADING SQL_TOKEN_LIKE 
SQL_TOKEN_LOCAL SQL_TOKEN_LOWER
 %token  SQL_TOKEN_MAX SQL_TOKEN_MIN SQL_TOKEN_NATURAL 
SQL_TOKEN_NCHAR SQL_TOKEN_NULL SQL_TOKEN_NUMERIC
 
 %token  SQL_TOKEN_OCTET_LENGTH SQL_TOKEN_OF SQL_TOKEN_ON 
SQL_TOKEN_OPTION SQL_TOKEN_ORDER SQL_TOKEN_OUTER
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Rohit Deshmukh]

 include/sax/fshelper.hxx |2 
 sax/source/tools/fastserializer.cxx  |4 +
 sw/source/filter/ww8/docxattributeoutput.cxx |   81 +--
 sw/source/filter/ww8/docxattributeoutput.hxx |2 
 4 files changed, 57 insertions(+), 32 deletions(-)

New commits:
commit 83d51e5e52688c4c9bc0ad70a511458bb06a242d
Author: Rohit Deshmukh 
Date:   Tue Jul 1 21:24:24 2014 +0530

fdo#80748: Fix for file corruption due to framePr

 -For framePr Unit test is there in ooxmlexport.cxx

-http://opengrok.libreoffice.org/xref/core/sw/qa/extras/ooxmlexport/ooxmlexport.cxx#3578

Change-Id: Ic1fd4c7a863d8ab57c6495e20bff6863eb941688
Reviewed-on: https://gerrit.libreoffice.org/10045
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/include/sax/fshelper.hxx b/include/sax/fshelper.hxx
index e3d3f05..8a9f1cc 100644
--- a/include/sax/fshelper.hxx
+++ b/include/sax/fshelper.hxx
@@ -62,7 +62,7 @@ const sal_Int32 FSEND_internal = -1; // same as 
XML_TOKEN_INVALID
 
 namespace sax_fastparser {
 
-enum MergeMarksEnum { MERGE_MARKS_APPEND = 0, MERGE_MARKS_PREPEND = 1, 
MERGE_MARKS_POSTPONE = 2 };
+enum MergeMarksEnum { MERGE_MARKS_APPEND = 0, MERGE_MARKS_PREPEND = 1, 
MERGE_MARKS_POSTPONE = 2, MERGE_MARKS_IGNORE = 3 };
 
 typedef ::com::sun::star::uno::Reference< 
::com::sun::star::xml::sax::XFastAttributeList > XFastAttributeListRef;
 
diff --git a/sax/source/tools/fastserializer.cxx 
b/sax/source/tools/fastserializer.cxx
index 1eea16e..fbce18a 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -291,7 +291,7 @@ namespace sax_fastparser {
 if ( maMarkStack.empty() )
 return;
 
-if ( maMarkStack.size() == 1 )
+if ( maMarkStack.size() == 1  && eMergeType != MERGE_MARKS_IGNORE)
 {
 mxOutputStream->writeBytes( maMarkStack.top()->getData() );
 maMarkStack.pop();
@@ -306,6 +306,8 @@ namespace sax_fastparser {
 case MERGE_MARKS_APPEND:   maMarkStack.top()->append( aMerge );   
break;
 case MERGE_MARKS_PREPEND:  maMarkStack.top()->prepend( aMerge );  
break;
 case MERGE_MARKS_POSTPONE: maMarkStack.top()->postpone( aMerge ); 
break;
+case MERGE_MARKS_IGNORE  :  break;
+
 }
 }
 
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 1ff9d84..ebe556d 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -329,11 +329,9 @@ void DocxAttributeOutput::PopulateFrameProperties(const 
SwFrmFmt* pFrmFmt, const
 relativeFromV = "page";
 break;
 case text::RelOrientation::FRAME:
-relativeFromV = "paragraph";
-break;
 case text::RelOrientation::TEXT_LINE:
 default:
-relativeFromV = "line";
+relativeFromV = "text";
 break;
 }
 
@@ -346,19 +344,31 @@ void DocxAttributeOutput::PopulateFrameProperties(const 
SwFrmFmt* pFrmFmt, const
 relativeFromH = "page";
 break;
 case text::RelOrientation::CHAR:
-relativeFromH = "character";
-break;
 case text::RelOrientation::PAGE_RIGHT:
-relativeFromH = "page";
-break;
 case text::RelOrientation::FRAME:
 default:
-relativeFromH = "column";
+relativeFromH = "text";
 break;
 }
+
+switch (pFrmFmt->GetSurround().GetValue())
+{
+case SURROUND_NONE:
+attrList->add( FSNS( XML_w, XML_wrap), "none");
+break;
+case SURROUND_THROUGHT:
+attrList->add( FSNS( XML_w, XML_wrap), "through");
+break;
+case SURROUND_PARALLEL:
+attrList->add( FSNS( XML_w, XML_wrap), "notBeside");
+break;
+case SURROUND_IDEAL:
+default:
+attrList->add( FSNS( XML_w, XML_wrap), "auto");
+break;
+}
 attrList->add( FSNS( XML_w, XML_vAnchor), relativeFromV);
 attrList->add( FSNS( XML_w, XML_hAnchor), relativeFromH);
-attrList->add( FSNS( XML_w, XML_wrap), "notBeside");
 attrList->add( FSNS( XML_w, XML_hRule), "exact");
 
 sax_fastparser::XFastAttributeListRef xAttrList(attrList);
@@ -399,7 +409,7 @@ void DocxAttributeOutput::EndParagraph( 
ww8::WW8TableNodeInfoInner::Pointer_t pT
 {
 // write the paragraph properties + the run, already in the correct order
 m_pSerializer->mergeTopMarks();
-
+std::vector<  boost::shared_ptr  > aFramePrTextbox;
 // Write the anchored frame if any
 // Word can't handle nested text boxes, so write them on the same level.
 ++m_nTextFrameLevel;
@@ -411,12 +421,11 @@ void DocxAttributeOutput::EndParagraph( 
ww8::WW8TableNodeInfoInner::Pointer_t pT
 {
 m_bParagraphFrameOpen = true;
 sw::Frame aFrame = m_aFramesOfParagraph[nIndex];
-

[Bug 32664] Keyboard volume keys don't work when LibreOffice is in focus

[bugzilla-daemon]

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

--- Comment #47 from Adolfo Jayme  ---
(In reply to comment #46)
> I have sent a fix proposal to the mailing list, but apparently my e-mail was
> not approved by the moderators.

libreoffice at lists.freedesktop.org, the developer list, does not use
moderation nor subscription (you can tell by the high amount of spam it gets).
Where did you send your patch?

BTW, using Gerrit is much preferred
(http://wiki.documentfoundation.org/gerrit).

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

[Bug 32664] Keyboard volume keys don't work when LibreOffice is in focus

[bugzilla-daemon]

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

--- Comment #46 from Daniel Rech  ---
I have sent a fix proposal to the mailing list, but apparently my e-mail was
not approved by the moderators.

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

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

[sushil_shinde]

 sw/qa/extras/ooxmlexport/data/fdo77129.docx   |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |   12 ++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   42 ++
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |1 
 4 files changed, 40 insertions(+), 15 deletions(-)

New commits:
commit 9948d9566e86b190e74a62e63f273f5fa0eb8929
Author: sushil_shinde 
Date:   Thu Jun 26 15:40:05 2014 +0530

fdo#77129 DOCX:Only Six pages were loaded out of 60 pages.

   - Footer reference was inside TOC field.
   - m_bStartTOC flag was enabled while handling TOC from document.
   - Since m_bStartTOC was enabled while importing footer it was inserting 
extra textcursors entries
 to m_aTextAppendStack.
   - Due to bad entries in textappendstack, footer was not popped properly.
   - Because of this all lost data after sixth page was inserted into 
footer node and it was not
 visible on page.
   - Added new flag to differentiate TOC from main document and Header or 
Footer.

Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/9930

Change-Id: I5288f5c313c890e0fdddf3c60c4609eab30edde6

diff --git a/sw/qa/extras/ooxmlexport/data/fdo77129.docx 
b/sw/qa/extras/ooxmlexport/data/fdo77129.docx
new file mode 100644
index 000..b0661e9
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo77129.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 0d03eb4..30ced5b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3666,6 +3666,18 @@ DECLARE_OOXMLEXPORT_TEST(testfdo80097, "fdo80097.docx")
 assertXPath(pXmlDocument, 
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:insideV[@w:color
 = '0A']", 1);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testFdo77129, "fdo77129.docx")
+{
+// The problem was that text after TOC field was missing if footer 
reference  comes in field.
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+
+if (!pXmlDoc)
+   return;
+
+// Data was lost from this paragraph.
+assertXPathContent(pXmlDoc, "/w:document/w:body/w:p[5]/w:r[1]/w:t", 
"Abstract");
+}
+
 DECLARE_OOXMLEXPORT_TEST(testfdo79969_xlsm, "fdo79969_xlsm.docx")
 {
 // This UT for DOCX embedded with excel work sheet.
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 8bd5900..9457568 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -161,6 +161,7 @@ DomainMapper_Impl::DomainMapper_Impl(
 m_bIsColumnBreakDeferred( false ),
 m_bIsPageBreakDeferred( false ),
 m_bStartTOC(false),
+m_bStartTOCHeaderFooter(false),
 m_bStartedTOC(false),
 m_bStartIndex(false),
 m_bStartBibliography(false),
@@ -1183,26 +1184,33 @@ void DomainMapper_Impl::appendTextPortion( const 
OUString& rString, PropertyMapP
 {
 if (m_bStartTOC || m_bStartIndex || m_bStartBibliography || 
m_bStartGenericField)
 {
-m_bStartedTOC = true;
-uno::Reference< text::XTextCursor > xTOCTextCursor;
-xTOCTextCursor = xTextAppend->getEnd()->getText( 
)->createTextCursor( );
-xTOCTextCursor->gotoEnd(false);
-if (xTOCTextCursor.is())
+if(m_bInHeaderFooterImport && !m_bStartTOCHeaderFooter)
 {
-if (m_bStartIndex || m_bStartBibliography || 
m_bStartGenericField)
-xTOCTextCursor->goLeft(1, false);
-xTextRange = xTextAppend->insertTextPortion(rString, 
pValues, xTOCTextCursor);
-m_bTextInserted = true;
-xTOCTextCursor->gotoRange(xTextRange->getEnd(), true);
-mxTOCTextCursor = xTOCTextCursor;
+xTextRange = xTextAppend->appendTextPortion(rString, 
pValues);
 }
 else
 {
-xTextRange = xTextAppend->appendTextPortion(rString, 
pValues);
-xTOCTextCursor = xTextAppend->createTextCursor();
-xTOCTextCursor->gotoRange(xTextRange->getEnd(), false);
+m_bStartedTOC = true;
+uno::Reference< text::XTextCursor > xTOCTextCursor;
+xTOCTextCursor = xTextAppend->getEnd()->getText( 
)->createTextCursor( );
+xTOCTextCursor->gotoEnd(false);
+if (xTOCTextCursor.is())
+{
+if (m_bStartIndex || m_bStartBibliography || 
m_bStartGenericField)
+ 

Re: minutes of ESC call ...

[Stephan Bergmann]

On 06/12/2014 06:17 PM, Michael Meeks wrote:

* allow upgrade of access2base (Lionel?)
 + access2base now included in LibreOffice 4.2 and later
 + technical structure: one Basic library (and that's it)
+ for other branches (other forks of OO.org & LibreOffice 4.1 and 
earlier),
  available as extension
 + competitive "disadvantage": users of other branches
   can have newer access2base faster (install extension)
 + not possible for LibO 4.2 & later because extension not allowed
   to override part of LibreOffice (only other extension)
+ policy exception for access2base can have new features within stable 
line?
   + I don't like that
+ allow extensions to override any part of LibreOffice?
   + no, significant resistance
+ demote access2base to bundled extension?
   + makes Acces2Base much less "official" in LibreOffice :-(
 (also more work)
   + problems with bundled extensions in the past (Michael)
+ allow extensions to override only access2base
   + Lionel's preferred option.
   + problem comes from extension using the same name etc. (Stephan)
+ mostly a problem with basic modules, not an expert there.
+ take Noel's advice from the list.
+ ok to add something for access2base, no general fix.
 + always troubles with namespaces.
   + fairly sure this will work well tested it in the build.
+ change test of who can override what; done on the file-path
 + why not make it a bundled extension ? (Michael Stahl)
   + this is what it was designed for.
   + why did we move away from bundled extensions ? (Lionel)
+ problems with native code bundled extensions (Stephan)
+ problems with the upgrade scenarios.
+ shouldn't affect basic.
   + when was this included ? (Stephan)
+ was included in 4.2 (Lionel)
 + switching to bundling in 4.2 is a larger change
+ vs. a 1-line patch to say it can be overridden (Lionel)
+ happy with a 1-line change in 4.2 (Michael S)
   + concerned wrt. the future making it a bundled extension.
AI:   + merge 1-liner to 4.2 / 4.3 / master (Lionel)
AI:   + research / seek a saner solution for master (Stephan)


For historic perspective, the case where we ran into massive problems 
with bundled extensions was the (since abandoned) "prereg" feature as 
discussed in  
"LO cannot start (reports runtime error with Visual C++ Runtime 
Library)."  From that time comes the current strategy to throw away all 
per-user cached information about any (bundled, shared, per-user) 
extensions and re-build it upon first start after a LO upgrade (which is 
somewhat time-consuming).  That was further reason to reduce the 
back-then large number of bundled extensions we shipped---changing such 
"always included, anyway" functionality from a bundled extension to an 
integral part of the code base reduced brittleness and first-start-time 
(no more need to re-build the per-user cache for that extension), among 
other benefits.


However, in each case where we turned a bundled extension into an 
integral LO-part back then, we were careful to avoid any clashes between 
a functionality's new incarnation as an integral LO-part and its still 
available incarnation as an extension (which a user could still download 
and install independently from the web).  That meant that any names that 
appear in shared namespaces (UNO implementation names etc., potentially 
also .xcs/.xcu configuration data identifiers) were replaced with fresh 
names.


There is, of course, also some downsides in turning functionality from a 
bundled extension into an integral LO-part:  For one, the user can no 
longer update that functionality independently from LO's update cycle. 
(Which is one reason why dictionaries still come as bundled extensions.) 
 For another, the extensions is typically still independently available 
to be installed by an (unsuspecting) user, which can lead to confusion. 
 This can range from somewhat harmless confusion, like two identically 
named menu entries that effectively do the same thing, to more severe 
cases like two competing callbacks being installed for a single 
customization hook and the code not well prepared to handle that.


One source of trouble for the access2base case is that shared-namespace 
names (like names of Basic libraries) were not replaced when turning the 
functionality into an integral LO-part.  This should definitely be 
addressed on master, one way or another.  The various interfaces by 
which extensions (as well as documents containing macros etc.) can plug 
into LO are generally ad-hoc and brittle enough that we should not tempt 
fate with neither careless nor intended-to-be-clever nameclas

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

[Andrzej Hunt]

 sc/source/ui/view/gridwin4.cxx |   50 +++--
 1 file changed, 33 insertions(+), 17 deletions(-)

New commits:
commit 432473cb1697bda298d7edab0a5ec4f7abf2733c
Author: Andrzej Hunt 
Date:   Thu Jul 3 14:47:15 2014 +0200

Iterate from origin to tile area to ensure correct positioning.

Change-Id: I29e881f9e67b84e208a198d2aad06db382d14698

diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 34e085b..028c114 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -341,8 +341,16 @@ void ScGridWindow::Paint( const Rectangle& rRect, 
OutputDevice* pOutDev )
 
 bIsInPaint = true;
 
-SCCOL nX1 = pViewData->GetPosX(eHWhich);
-SCROW nY1 = pViewData->GetPosY(eVWhich);
+// If we're doing tiled rendering we'll have a different output device 
here,
+// and we could really be at a completely random position, hence we
+// iterate from 0.
+SCCOL nX1 = 0;
+SCROW nY1 = 0;
+if ( pOutDev == this )
+{
+nX1 = pViewData->GetPosX(eHWhich);
+nY1 = pViewData->GetPosY(eVWhich);
+}
 
 SCTAB nTab = pViewData->GetTabNo();
 
@@ -381,6 +389,14 @@ void ScGridWindow::Paint( const Rectangle& rRect, 
OutputDevice* pOutDev )
 nScrY += pDoc->GetRowHeight( nY2, nTab );
 }
 
+// Bit hacky -- but Draw starts drawing with nX1/nY1 being at
+// the output devices origin, so we make sure we start drawing
+// with cell A1 at the origin etc.
+if ( pOutDev != this )
+{
+nX1 = 0;
+nY1 = 0;
+}
 // We specifically need to set the visible range here -- by default it is
 // set in UpdateVisibleRange which however uses the viewdata, which is
 // completely irrelevant for tiled rendering.
commit b7a71cc225cd229e2bce98046b0aa6a342f10cb3
Author: Andrzej Hunt 
Date:   Thu Jul 3 14:46:32 2014 +0200

Use logic units for visible-cells determination.

This eliminates a bunch of LogicToPixel conversions, and also
means that tiles starting other than the origin are correctly
processed (as LogicToPixel run on a rectangle will also move that
rectangle depending on the origin set in the output device).

Change-Id: I42903fe23ad5f6baa1d5276d5dcc7ee038bd27cf

diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index e752559..34e085b 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -341,46 +341,44 @@ void ScGridWindow::Paint( const Rectangle& rRect, 
OutputDevice* pOutDev )
 
 bIsInPaint = true;
 
-Rectangle aPixRect = pOutDev->LogicToPixel( rRect );
-
 SCCOL nX1 = pViewData->GetPosX(eHWhich);
 SCROW nY1 = pViewData->GetPosY(eVWhich);
 
 SCTAB nTab = pViewData->GetTabNo();
 
-Rectangle aMirroredPixel = aPixRect;
+Rectangle aMirroredRect = rRect;
 if ( pDoc->IsLayoutRTL( nTab ) )
 {
 //  mirror and swap
-long nWidth = GetSizePixel().Width();
-aMirroredPixel.Left()  = nWidth - 1 - aPixRect.Right();
-aMirroredPixel.Right() = nWidth - 1 - aPixRect.Left();
+long nWidth = PixelToLogic(GetSizePixel()).Width();
+aMirroredRect.Left()  = nWidth - 1 - rRect.Right();
+aMirroredRect.Right() = nWidth - 1 - rRect.Left();
 }
 
-long nScrX = pOutDev->LogicToPixel( Point( pDoc->GetColWidth( nX1, nTab ), 
0 ) ).getX();/*ScViewData::ToPixel( pDoc->GetColWidth( nX1, nTab ), nPPTX );*/
-while ( nScrX <= aMirroredPixel.Left() && nX1 < MAXCOL )
+long nScrX = pDoc->GetColWidth( nX1, nTab );
+while ( nScrX <= aMirroredRect.Left() && nX1 < MAXCOL )
 {
 ++nX1;
-nScrX += pOutDev->LogicToPixel( Point( pDoc->GetColWidth( nX1, nTab ), 
0 ) ).getX();
+nScrX += pDoc->GetColWidth( nX1, nTab );
 }
 SCCOL nX2 = nX1;
-while ( nScrX <= aMirroredPixel.Right() && nX2 < MAXCOL )
+while ( nScrX <= aMirroredRect.Right() && nX2 < MAXCOL )
 {
 ++nX2;
-nScrX += pOutDev->LogicToPixel( Point( pDoc->GetColWidth( nX2, nTab ), 
0 ) ).getX();
+nScrX += pDoc->GetColWidth( nX2, nTab );
 }
 
 long nScrY = 0;
-while ( nScrY < aPixRect.Top() && nY1 < MAXROW )
+while ( nScrY < rRect.Top() && nY1 < MAXROW )
 {
 ++nY1;
-nScrY += pOutDev->LogicToPixel( Point( 0, pDoc->GetRowHeight( nY1, 
nTab ) ) ).getY();
+nScrY += pDoc->GetRowHeight( nY1, nTab );
 }
 SCROW nY2 = nY1;
-while ( nScrY <= aPixRect.Bottom() && nY2 < MAXROW )
+while ( nScrY <= rRect.Bottom() && nY2 < MAXROW )
 {
 ++nY2;
-nScrY += pOutDev->LogicToPixel( Point( 0, pDoc->GetRowHeight( nY2, 
nTab ) ) ).getY();
+nScrY += pDoc->GetRowHeight( nY2, nTab );
 }
 
 // We specifically need to set the visible range here -- by default it is
commit df080a9ca216696219f3f88f8f5430e51d139f25
Author: Andrzej Hunt 
Date:   Thu Jul 3 14:43:28 2014 +0200

Scale the origin for the Draw Layer (Calc Ti

[Libreoffice-commits] core.git: editeng/source extras/CustomTarget_autocorr.mk extras/Package_autocorr.mk include/editeng sw/source

[Julien Nabet]

 editeng/source/misc/svxacorr.cxx |   24 ++--
 extras/CustomTarget_autocorr.mk  |2 +-
 extras/Package_autocorr.mk   |2 +-
 include/editeng/svxacorr.hxx |3 ++-
 sw/source/core/edit/acorrect.cxx |2 +-
 5 files changed, 23 insertions(+), 10 deletions(-)

New commits:
commit 82f291d2f7630938ce6ca740f904cab07d1ff90d
Author: Julien Nabet 
Date:   Wed Jun 18 21:08:03 2014 +0200

Resolves fdo#79276 Add fallback system for autocorrection of French variants

1) Replace the creation of acor_fr-FR.dat by acor_fr.dat since there's no 
specific for variants of fr
2) Add a fallback system to use it

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

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 8291492..7e2cc7e 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1544,7 +1544,7 @@ bool SvxAutoCorrect::CreateLanguageFile( const 
LanguageTag& rLanguageTag, bool b
 {
 OSL_ENSURE(pLangTable->find(rLanguageTag) == pLangTable->end(), "Language 
already exists ");
 
-OUString sUserDirFile( GetAutoCorrFileName( rLanguageTag, true, false ));
+OUString sUserDirFile( GetAutoCorrFileName( rLanguageTag, true, false, 
false ));
 OUString sShareDirFile( sUserDirFile );
 
 SvxAutoCorrectLanguageListsPtr pLists = 0;
@@ -1567,10 +1567,15 @@ bool SvxAutoCorrect::CreateLanguageFile( const 
LanguageTag& rLanguageTag, bool b
 aLastFileTable.erase(nFndPos);
 }
 }
-else if( ( FStatHelper::IsDocument( sUserDirFile ) ||
-FStatHelper::IsDocument( sShareDirFile =
-  GetAutoCorrFileName( rLanguageTag, false, false 
) ) ) ||
-( sShareDirFile = sUserDirFile, bNewFile ))
+else if(
+ ( FStatHelper::IsDocument( sUserDirFile ) ||
+   FStatHelper::IsDocument( sShareDirFile =
+   GetAutoCorrFileName( rLanguageTag, false, false, false ) ) 
||
+   FStatHelper::IsDocument( sShareDirFile =
+   GetAutoCorrFileName( rLanguageTag, false, false, true) )
+ ) ||
+( sShareDirFile = sUserDirFile, bNewFile )
+  )
 {
 pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile, 
sUserDirFile );
 LanguageTag aTmp(rLanguageTag); // this insert() needs a non-const 
reference
@@ -1886,9 +1891,16 @@ bool SvxAutoCorrect::FindInCplSttExceptList(LanguageType 
eLang,
 }
 
 OUString SvxAutoCorrect::GetAutoCorrFileName( const LanguageTag& rLanguageTag,
-bool bNewFile, bool bTst ) const
+bool bNewFile, bool bTst, bool 
bUnlocalized ) const
 {
 OUString sRet, sExt( rLanguageTag.getBcp47() );
+if (bUnlocalized)
+{
+// we don't want variant, so we'll take "fr" instead of "fr-CA" for 
example
+::std::vector< OUString > vecFallBackStrings = 
rLanguageTag.getFallbackStrings(false);
+if (!vecFallBackStrings.empty())
+   sExt = vecFallBackStrings[0];
+}
 
 sExt = "_" + sExt + ".dat";
 if( bNewFile )
diff --git a/extras/CustomTarget_autocorr.mk b/extras/CustomTarget_autocorr.mk
index db2577f..d119e9e 100644
--- a/extras/CustomTarget_autocorr.mk
+++ b/extras/CustomTarget_autocorr.mk
@@ -23,7 +23,7 @@ extras_AUTOCORR_LANGS := \
es:es-ES \
fa:fa-IR \
fi:fi-FI \
-   fr:fr-FR \
+   fr:fr \
ga-IE:ga-IE \
hr:hr-HR \
hu:hu-HU \
diff --git a/extras/Package_autocorr.mk b/extras/Package_autocorr.mk
index 54db294..a93544d 100644
--- a/extras/Package_autocorr.mk
+++ b/extras/Package_autocorr.mk
@@ -23,7 +23,7 @@ $(eval $(call 
gb_Package_add_files,extras_autocorr,$(LIBO_SHARE_FOLDER)/autocorr
acor_es-ES.dat \
acor_fa-IR.dat \
acor_fi-FI.dat \
-   acor_fr-FR.dat \
+   acor_fr.dat \
acor_ga-IE.dat \
acor_hr-HR.dat \
acor_hu-HU.dat \
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index d4529a5..f2d06655 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -329,7 +329,8 @@ public:
 // the default is "autocorr.dat"
 OUString GetAutoCorrFileName( const LanguageTag& rLanguageTag /* = 
LANGUAGE_SYSTEM */ ,
 bool bNewFile = false,
-bool bTstUserExist = false ) const;
+bool bTstUserExist = false,
+bool bUnlocalized = false ) const;
 
 // Query/Set the current settings of AutoCorrect
 long GetFlags() const   { return nFlags; }
diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx
index 6e836f4..0c4346e 100644
--- a/sw/source/core/edit/aco

[Bug 75025] LibreOffice 4.3 most annoying bugs

[bugzilla-daemon]

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

V Stuart Foote  changed:

   What|Removed |Added

 CC||vstuart.fo...@utsa.edu

--- Comment #33 from V Stuart Foote  ---
expert configuration has some pretty annoying issues that need some love soon.
nominating
bug 70465, bug 73806

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

[Bug 75025] LibreOffice 4.3 most annoying bugs

[bugzilla-daemon]

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

V Stuart Foote  changed:

   What|Removed |Added

 Depends on||70465
 Blocks|70465   |

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

[Bug 75025] LibreOffice 4.3 most annoying bugs

[bugzilla-daemon]

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

V Stuart Foote  changed:

   What|Removed |Added

 Blocks||70465

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

[Bug 75025] LibreOffice 4.3 most annoying bugs

[bugzilla-daemon]

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

V Stuart Foote  changed:

   What|Removed |Added

 Depends on||73806

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

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

[Caolán McNamara]

 sw/inc/dbui.hrc  |6 +
 sw/source/ui/dbui/mmaddressblockpage.cxx |1 
 sw/source/ui/dbui/mmaddressblockpage.hrc |   37 ---
 sw/source/ui/dbui/mmaddressblockpage.src |1 
 4 files changed, 6 insertions(+), 39 deletions(-)

New commits:
commit bc3830587c2a8325d6a9b0f94984d90b7683b295
Author: Caolán McNamara 
Date:   Thu Jul 3 12:48:28 2014 +0100

make these global level resids

Change-Id: I129fa1f649f8dfcec1434734193daf22ea841889

diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index 58bbc6d..b9f9089 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -66,6 +66,12 @@
 #define ST_NAME (RC_DBUI_BEGIN + 35)
 #define ST_TABLE(RC_DBUI_BEGIN + 36)
 #define ST_QUERY(RC_DBUI_BEGIN + 37)
+#define ST_SALUTATIONPREVIEW(RC_DBUI_BEGIN + 38)
+#define ST_SALUTATIONMATCHING   (RC_DBUI_BEGIN + 39)
+#define ST_SALUTATIONELEMENT(RC_DBUI_BEGIN + 40)
+#define ST_ADDRESSELEMENT   (RC_DBUI_BEGIN + 41)
+#define ST_MATCHESTO(RC_DBUI_BEGIN + 42)
+#define ST_PREVIEW  (RC_DBUI_BEGIN + 43)
 
 // Elements -
 #define MM_PART_TITLE   0
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx 
b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 406c7f8..349bbae 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -33,7 +33,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hrc 
b/sw/source/ui/dbui/mmaddressblockpage.hrc
deleted file mode 100644
index 3afdb63..000
--- a/sw/source/ui/dbui/mmaddressblockpage.hrc
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _MAILMERGEADDRESSBLOCKPAGE_HRC
-#define _MAILMERGEADDRESSBLOCKPAGE_HRC
-
-
-#define STR_DOCUMENT13
-#define STR_CHANGEADDRESS   16
-
-
-#define ST_SALUTATIONPREVIEW72
-#define ST_SALUTATIONMATCHING   73
-#define ST_SALUTATIONELEMENT   74
-
-#define ST_ADDRESSELEMENT   2
-#define ST_MATCHESTO3
-#define ST_PREVIEW  4
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dbui/mmaddressblockpage.src 
b/sw/source/ui/dbui/mmaddressblockpage.src
index c06aecb..eae338e 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.src
+++ b/sw/source/ui/dbui/mmaddressblockpage.src
@@ -16,7 +16,6 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include 
 #include 
 #include 
 
___
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

[Jacobo Aragunde Pérez]

 sw/qa/extras/ooxmlimport/data/fdo80555.docx   |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |7 +++
 writerfilter/source/dmapper/GraphicImport.cxx |4 +++-
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 816542b2bdd23423625ad4c2f0e706d5558b8ba9
Author: Jacobo Aragunde Pérez 
Date:   Thu Jul 3 11:47:23 2014 +0200

fdo#80555: Set position of GraphicObjectShape objects correctly

Added a unit test for this issue.

Change-Id: I13656f82c97e5bb8458cdc1cb47ddcc5f6d60330

diff --git a/sw/qa/extras/ooxmlimport/data/fdo80555.docx 
b/sw/qa/extras/ooxmlimport/data/fdo80555.docx
new file mode 100644
index 000..a15bdc1
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo80555.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 6562b97..21f5ac6 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2230,6 +2230,13 @@ DECLARE_OOXMLIMPORT_TEST(testTableBtlrCenter, 
"table-btlr-center.docx")
 CPPUNIT_ASSERT_EQUAL(text::VertOrientation::CENTER, 
getProperty(xTable->getCellByName("A2"), "VertOrient"));
 }
 
+DECLARE_OOXMLIMPORT_TEST(testFdo80555, "fdo80555.docx")
+{
+uno::Reference xShape = getShape(1);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(3318), xShape->getPosition().X);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(245), xShape->getPosition().Y);
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index cf3da2a..038d974 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -782,9 +782,11 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue)
 m_pImpl->applyPosition(xShapeProps);
 
 uno::Reference 
xServiceInfo(m_xShape, uno::UNO_QUERY_THROW);
-if 
(xServiceInfo->supportsService("com.sun.star.drawing.GroupShape"))
+if 
(xServiceInfo->supportsService("com.sun.star.drawing.GroupShape") ||
+
xServiceInfo->supportsService("com.sun.star.drawing.GraphicObjectShape"))
 {
 // Position of the groupshape should be set after 
children have been added.
+// fdo#80555: also set position for graphic shapes 
here
 
m_xShape->setPosition(awt::Point(m_pImpl->nLeftPosition, 
m_pImpl->nTopPosition));
 }
 m_pImpl->applyRelativePosition(xShapeProps);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

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

New commits:
commit 392d59013afb83906bd5d181beda0ea4facab256
Author: Caolán McNamara 
Date:   Thu Jul 3 13:01:06 2014 +0100

bah, bogus

Change-Id: I94619f2a3274c719366ae947771e10ffc39f70fe

diff --git a/lotuswordpro/source/filter/tocread.cxx 
b/lotuswordpro/source/filter/tocread.cxx
index 87b6bee..b924d93 100644
--- a/lotuswordpro/source/filter/tocread.cxx
+++ b/lotuswordpro/source/filter/tocread.cxx
@@ -68,7 +68,7 @@ CBenTOCReader::ReadLabelAndTOC()
 return Err;
 
 unsigned long nLength;
-if ((Err = cpContainer->GetSize(nLength)) != BenErr_OK)
+if ((Err = cpContainer->GetSize(&nLength)) != BenErr_OK)
 return Err;
 
 if (TOCOffset > nLength)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Matúš Kukan]

 desktop/Library_sofficeapp.mk  |1 -
 solenv/gbuild/extensions/pre_MergedLibsList.mk |4 
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 7931b6d3985a1846bf9db4f51d8af9c54538038b
Author: Matúš Kukan 
Date:   Thu Jul 3 13:56:23 2014 +0200

Fix dependencies for libmerged wrt. libsofficeapp

Change-Id: If1575e0bcacbc5c3c40d485063b1025017eef73a

diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index d81420f..be86dd1 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -47,7 +47,6 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\
 sfx \
 svl \
 svt \
-sw \
 tk \
 tl \
 ucbhelper \
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index b85d36f..99f9302 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -108,6 +108,7 @@ gb_EXTRAMERGEDLIBS := \
 # we link all object files from these libraries into one, merged library
 gb_MERGEDLIBS := \
avmedia \
+   $(if $(filter $(OS),ANDROID),,basebmp) \
basegfx \
canvastools \
configmgr \
@@ -152,6 +153,9 @@ gb_MERGEDLIBS := \
uui \
vcl \
vclopengl \
+   $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
+   $(if $(ENABLE_HEADLESS),,vclplug_svp) \
+   ) \
xmlscript \
xo \
xstor \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 editeng/source/editeng/impedit2.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit f4e35c5c5e7888574f0074dae0523114dc78e5e1
Author: Caolán McNamara 
Date:   Thu Jul 3 12:56:45 2014 +0100

WaE: -Werror=unused-variable

Change-Id: I910c2262f031f7916fbf242f31c193d8b030468b

diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index f72f991..2184d8f 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -3302,7 +3302,6 @@ void ImpEditEngine::UpdateSelections()
 // Use ParaPortions, as now also hidden paragraphs have to be
 // taken into account!
 sal_Int32 nPara = rInf.GetPosition();
-ParaPortion* pPPortion = GetParaPortions().SafeGetObject( 
nPara );
 if (!GetParaPortions().SafeGetObject(nPara)) // Last paragraph
 {
 nPara = GetParaPortions().Count()-1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Michael Meeks  changed:

   What|Removed |Added

 Depends on||77057

-- 
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 'refs/notes/commits' - 29/072b501b276ac4d0129a86ab31d0b8634e5283

[Caolán McNamara]

 29/072b501b276ac4d0129a86ab31d0b8634e5283 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 86bbb3c19e142f9ab5e42f28698d6f1ec13f54c7
Author: Caolán McNamara 
Date:   Thu Jul 3 12:53:39 2014 +0100

Notes added by 'git notes add'

diff --git a/29/072b501b276ac4d0129a86ab31d0b8634e5283 
b/29/072b501b276ac4d0129a86ab31d0b8634e5283
new file mode 100644
index 000..8a2345e
--- /dev/null
+++ b/29/072b501b276ac4d0129a86ab31d0b8634e5283
@@ -0,0 +1 @@
+ignore: fixed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 63/f53dbd6cac4fcd7fe568af62f29ae19768085f

[Caolán McNamara]

 63/f53dbd6cac4fcd7fe568af62f29ae19768085f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit efb60f3f85a7ab616bf73880b4a43a879448fbb0
Author: Caolán McNamara 
Date:   Thu Jul 3 12:50:25 2014 +0100

Notes added by 'git notes add'

diff --git a/63/f53dbd6cac4fcd7fe568af62f29ae19768085f 
b/63/f53dbd6cac4fcd7fe568af62f29ae19768085f
new file mode 100644
index 000..cc51db5
--- /dev/null
+++ b/63/f53dbd6cac4fcd7fe568af62f29ae19768085f
@@ -0,0 +1 @@
+merged as: 82e41a0cd250fa720ba4b545172517ce74dd6814
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/inc

[Andras Timar]

 scp2/inc/macros.inc |4 
 1 file changed, 4 deletions(-)

New commits:
commit 57bf88d21cacb025e7bea40da78616bb4d165215
Author: Andras Timar 
Date:   Thu Jul 3 13:35:03 2014 +0200

fdo#77057 quick fix: do not touch KindMap for alien file types

Change-Id: Iffc24dc7ce12de07660eadcf8a525e77856593e1

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 9497473..ac4de16 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -424,7 +424,6 @@ End
 REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \
 REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \
 REGISTRY_ENTRY_CAPABILITIES(name,modid,key,doc_type) \
-REGISTRY_ENTRY_KINDMAP(name, modid, key) \
 
 #define 
CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type)
 \
 CONDITIONAL_MODULE_ENTRY(name,modid) \
@@ -439,9 +438,6 @@ End
 REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \
 REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \
 REGISTRY_ENTRY_TEMPLATE_CAPABILITIES(name,modid,key,doc_type) \
-REGISTRY_ENTRY_KINDMAP(name, modid, key) \
-
-
 
 #ifdef _MSC_VER
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libcdr.git: src/lib

[David Tardon]

 src/lib/CDRDocument.cpp |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 9a46ea9577d72f5e9f2eef6c74401bc7c33e3f79
Author: David Tardon 
Date:   Thu Jul 3 13:17:14 2014 +0200

clang: value stored to input is never read

Change-Id: I50aeae903940a5ce3acfd9b5e3276fddf8aef584

diff --git a/src/lib/CDRDocument.cpp b/src/lib/CDRDocument.cpp
index 9abd5f3..5509716 100644
--- a/src/lib/CDRDocument.cpp
+++ b/src/lib/CDRDocument.cpp
@@ -225,7 +225,6 @@ CDRAPI bool 
libcdr::CDRDocument::parse(librevenge::RVNGInputStream *input, libre
   }
   if (input != tmpInput)
 delete input;
-  input = tmpInput;
   for (std::vector::iterator iter = 
dataStreams.begin(); iter != dataStreams.end(); ++iter)
 delete *iter;
   return retVal;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - hwpfilter/source sdext/source

[Stephan Bergmann]

 hwpfilter/source/hiodev.cxx|   20 +++-
 hwpfilter/source/hiodev.h  |5 ++--
 hwpfilter/source/hstream.cxx   |5 
 hwpfilter/source/hstream.h |5 
 hwpfilter/source/hwpfile.cxx   |4 +--
 hwpfilter/source/hwpfile.h |4 +--
 hwpfilter/source/hwpreader.cxx |7 +++--
 sdext/source/pdfimport/test/tests.cxx  |   23 +--
 sdext/source/pdfimport/wrapper/wrapper.cxx |   35 -
 9 files changed, 67 insertions(+), 41 deletions(-)

New commits:
commit 4a32ef9c3f3bcb603e253444b4221cebd227b3d8
Author: Stephan Bergmann 
Date:   Thu Jul 3 11:25:35 2014 +0200

Improve test code

(never call CPPUNIT_ASSERT etc., which work by throwing exceptions, from a 
dtor)

Change-Id: I293d54eb40c2ad9205d485ccff0ffd2161257142

diff --git a/sdext/source/pdfimport/test/tests.cxx 
b/sdext/source/pdfimport/test/tests.cxx
index 8b47c0a..9538c66 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -82,7 +82,9 @@ namespace
 m_bImageSeen(false)
 {}
 
-virtual ~TestSink()
+virtual ~TestSink() {}
+
+void check()
 {
 CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( "A4 page size (in 100th of 
points): Width", 79400, m_aPageSize.Width, 0.0001);
 CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( "A4 page size (in 100th of 
points): Height", 59500, m_aPageSize.Height, 0.001 );
@@ -458,16 +460,15 @@ namespace
 public:
 void testXPDFParser()
 {
-pdfi::ContentSinkSharedPtr pSink( new TestSink() );
-pdfi::xpdf_ImportFromFile( 
getURLFromSrc("/sdext/source/pdfimport/test/testinput.pdf"),
-   pSink,
-   uno::Reference< 
task::XInteractionHandler >(),
-   OUString(),
-   getComponentContext() );
-
-// make destruction explicit, a bunch of things are
-// checked in the destructor
-pSink.reset();
+boost::shared_ptr pSink( new TestSink() );
+CPPUNIT_ASSERT(
+pdfi::xpdf_ImportFromFile(
+
getURLFromSrc("/sdext/source/pdfimport/test/testinput.pdf"),
+pSink,
+uno::Reference< task::XInteractionHandler >(),
+OUString(),
+getComponentContext() ) );
+pSink->check();
 }
 
 void testOdfDrawExport()
commit 44565f46b22c99db4e06353531ba48956efe31be
Author: Stephan Bergmann 
Date:   Thu Jul 3 11:24:28 2014 +0200

Check exit code of spawned xpdfimport

Change-Id: I4bea1ebe5c9915ad5e3a4f8fecb516bc056d060d

diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx 
b/sdext/source/pdfimport/wrapper/wrapper.cxx
index c60a141..7cdb775 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -1059,7 +1059,7 @@ bool xpdf_ImportFromFile( const OUString& 
rURL,
 oslFileHandle pOut = NULL;
 oslFileHandle pErr = NULL;
 oslSecurity pSecurity = osl_getCurrentSecurity ();
-const oslProcessError eErr =
+oslProcessError eErr =
 osl_executeProcess_WithRedirectedIO(converterURL.pData,
 args,
 nArgs,
@@ -1115,6 +1115,39 @@ bool xpdf_ImportFromFile( const OUString&
 rURL,
 osl_closeFile(pOut);
 if( pErr )
 osl_closeFile(pErr);
+eErr = osl_joinProcess(aProcess);
+if (eErr == osl_Process_E_None)
+{
+oslProcessInfo info;
+info.Size = sizeof info;
+eErr = osl_getProcessInfo(aProcess, osl_Process_EXITCODE, &info);
+if (eErr == osl_Process_E_None)
+{
+if (info.Code != 0)
+{
+SAL_WARN(
+"sdext.pdfimport",
+"getProcessInfo of " << converterURL
+<< " failed with exit code " << info.Code);
+bRet = false;
+}
+}
+else
+{
+SAL_WARN(
+"sdext.pdfimport",
+"getProcessInfo of " << converterURL << " failed with "
+<< +eErr);
+bRet = false;
+}
+}
+else
+{
+SAL_WARN(
+"sdext.pdfimport",
+"joinProcess of " << converterURL << " failed with " << +eErr);
+bRet = false;
+}
 osl_freeProcessHandle(aProcess);
 return bRet;
 }
commit e7118d205d474a3cac747238671b6fa34963eec8
Author: Stephan Bergmann 
Date:   Thu Jul 3 09:17:53 2014 +0200

HStream::closeInput does nothing

Change-Id: I0d57e227be45bb2c098969ab24eedab30514313f

d

[Libreoffice-commits] core.git: sal/CppunitTest_sal_osl_process.mk

[Stephan Bergmann]

 sal/CppunitTest_sal_osl_process.mk |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 729d16f7f4eb0ce8d9898b46f6c4f16b01c797ea
Author: Stephan Bergmann 
Date:   Thu Jul 3 13:09:10 2014 +0200

Use gb_CppunitTest_use_executable

Change-Id: I58b0d7d7a9a0ee78650b536b41154aee466f8ac5

diff --git a/sal/CppunitTest_sal_osl_process.mk 
b/sal/CppunitTest_sal_osl_process.mk
index a72c978..b6688d7 100644
--- a/sal/CppunitTest_sal_osl_process.mk
+++ b/sal/CppunitTest_sal_osl_process.mk
@@ -19,8 +19,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_process,\
$(gb_UWINAPI) \
 ))
 
-# Depend on to be tested executable
-$(call gb_CppunitTest_get_target,sal_osl_process) : \
-   $(call gb_Executable_get_target,osl_process_child)
+$(eval $(call gb_CppunitTest_use_executable,sal_osl_process,osl_process_child))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-libcmis' - ucb/source

[Mihai Varga]

 ucb/source/ucp/cmis/cmis_repo_content.cxx |   16 
 1 file changed, 16 insertions(+)

New commits:
commit f1e765493d2adf793da2a0a80c07c4fa537efb88
Author: Mihai Varga 
Date:   Thu Jul 3 14:05:53 2014 +0300

NSSinitializer

diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx 
b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index e364b43..52068da 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -15,6 +15,11 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -120,6 +125,17 @@ namespace cmis
 
 void RepoContent::getRepositories( const uno::Reference< 
ucb::XCommandEnvironment > & xEnv )
 {
+const uno::Reference< com::sun::star::uno::XComponentContext >& 
+xComponentContext = ::comphelper::getProcessComponentContext();
+
+uno::Reference< com::sun::star::xml::crypto::XNSSInitializer > 
+xNSSInitializer = 
com::sun::star::xml::crypto::NSSInitializer::create( xComponentContext );
+
+uno::Reference< com::sun::star::xml::crypto::XDigestContext > 
xDigestContext( 
+xNSSInitializer->getDigestContext( 
com::sun::star::xml::crypto::DigestID::SHA256,
+  uno::Sequence< 
beans::NamedValue >() ),
+  uno::UNO_SET_THROW );
+
 // Set the proxy if needed. We are doing that all times as the proxy 
data shouldn't be cached.
 ucbhelper::InternetProxyDecider aProxyDecider( m_xContext );
 INetURLObject aBindingUrl( m_aURL.getBindingUrl( ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Adolfo Jayme Barrientos]

 vcl/unx/generic/app/keysymnames.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 90810c1b8d49a1cd586dbd87c67ba87d44b13beb
Author: Adolfo Jayme Barrientos 
Date:   Wed Jul 2 11:46:46 2014 -0500

Shorten Spanish key translations in Linux

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

diff --git a/vcl/unx/generic/app/keysymnames.cxx 
b/vcl/unx/generic/app/keysymnames.cxx
index 27efa55..fb77ac3 100644
--- a/vcl/unx/generic/app/keysymnames.cxx
+++ b/vcl/unx/generic/app/keysymnames.cxx
@@ -322,15 +322,15 @@ namespace vcl_sal {
 { XK_Home, "Inicio" },
 { XK_Delete, "Supr" },
 { XK_Escape, "Esc" },
-{ XK_Right, "Hacia la derecha" },
-{ XK_Left, "Hacia la izquierda" },
-{ XK_Up, "Hacia arriba" },
-{ XK_Down, "Hacia abajo" },
+{ XK_Right, "Derecha" },
+{ XK_Left, "Izquierda" },
+{ XK_Up, "Arriba" },
+{ XK_Down, "Abajo" },
 { XK_BackSpace, "Ret" },
 { XK_Return, "Entrada" },
 { XK_space, "Espacio" },
 { XK_KP_Enter, "Intro" },
-{ SunXK_Stop,  "Stop" },
+{ SunXK_Stop,  "Detener" },
 { SunXK_Again, "Repetir" },
 { SunXK_Props, "Props" },
 { SunXK_Undo,  "Anular" },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 32500] [Metabug] GTK style doesn't draw some elements via GTK

[bugzilla-daemon]

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

Adolfo Jayme  changed:

   What|Removed |Added

 Depends on||46973

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

[Libreoffice-commits] core.git: 3 commits - extras/AllLangCustomTarget_autotextshare.mk extras/CustomTarget_autotextshare.mk extras/Module_extras.mk solenv/gbuild

[David Tardon]

 extras/AllLangCustomTarget_autotextshare.mk | 3980 
 extras/CustomTarget_autotextshare.mk| 3980 
 extras/Module_extras.mk |2 
 solenv/gbuild/Module.mk |2 
 4 files changed, 3982 insertions(+), 3982 deletions(-)

New commits:
commit 628520684fafb1bcbf184ab8ed2f755c6ae9ee52
Author: David Tardon 
Date:   Thu Jul 3 12:19:56 2014 +0200

CustomTarget_autotextshare is l10n target

Change-Id: Id82bbfc94645d9153e0d79475de008adb0edf3b9

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 3d6f42b..59a3d25 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -236,7 +236,7 @@ $(call gb_Module_get_clean_target,$(1)) : 
$$(gb_Module_CURRENTCLEANTARGET)
 endef
 
 define gb_Module_add_l10n_target
-$(if $(filter AllLang% Dictionary% UIConfig% Package_registry,$(2)),,$(warning 
target $(2) should not be a l10n target))
+$(if $(filter AllLang% CustomTarget_autotextshare Dictionary% UIConfig% 
Package_registry,$(2)),,$(warning target $(2) should not be a l10n target))
 $(call gb_Module__read_targetfile,$(1),$(2),target)
 
 $(call gb_Module_get_l10n_target,$(1)) : $$(gb_Module_CURRENTTARGET)
commit 32d2ec2562e7ae22089569285393a3b5cb55a0b0
Author: David Tardon 
Date:   Thu Jul 3 12:18:27 2014 +0200

remove stray \

Change-Id: I55a695835d6c7085aebd36c37de4866daebb8134

diff --git a/extras/CustomTarget_autotextshare.mk 
b/extras/CustomTarget_autotextshare.mk
index 85fc284..e30c40d 100644
--- a/extras/CustomTarget_autotextshare.mk
+++ b/extras/CustomTarget_autotextshare.mk
@@ -3927,15 +3927,15 @@ $(call 
gb_CustomTarget_get_workdir,extras/source/autotext)/%/mimetype : $(SRCDIR
$(call gb_Output_announce,$*/mimetype,$(true),CPY,1)
cp $< $@
 
-$(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.rdf : 
$(SRCDIR)/extras/source/autotext/lang/%.rdf \
+$(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.rdf : 
$(SRCDIR)/extras/source/autotext/lang/%.rdf
$(call gb_Output_announce,$*.rdf,$(true),CPY,1)
cp $< $@
 
-$(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.svm : 
$(SRCDIR)/extras/source/autotext/lang/%.svm \
+$(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.svm : 
$(SRCDIR)/extras/source/autotext/lang/%.svm
$(call gb_Output_announce,$*.svm,$(true),CPY,1)
cp $< $@
 
-$(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.png : 
$(SRCDIR)/extras/source/autotext/lang/%.png \
+$(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.png : 
$(SRCDIR)/extras/source/autotext/lang/%.png
$(call gb_Output_announce,$*.png,$(true),CPY,1)
cp $< $@
 
commit 1bb51903d69d81708157fe04b262bae8766d
Author: David Tardon 
Date:   Thu Jul 3 12:06:19 2014 +0200

rename makefile

Change-Id: I05b0bd047176cb35f162592e1be48765d955be8a

diff --git a/extras/AllLangCustomTarget_autotextshare.mk 
b/extras/CustomTarget_autotextshare.mk
similarity index 100%
rename from extras/AllLangCustomTarget_autotextshare.mk
rename to extras/CustomTarget_autotextshare.mk
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index c23fa8a..51d617f 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -43,7 +43,7 @@ $(eval $(call gb_Module_add_targets,extras,\
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,extras,\
-   AllLangCustomTarget_autotextshare \
+   CustomTarget_autotextshare \
AllLangPackage_autotextshare \
 ))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ANN] LIbreOffice 4.3.0 RC2 available

[Christian Lohmaier]

Dear Community,

The Document Foundation is pleased to announce the second release
candidate of LibreOffice 4.3.0. The upcoming 4.3.0 will be the eighth
major release of LibreOffice, coming with a bunch of new features
beside the usual bugfixes.

RC2 is in release configuration and can be be installed alongside the
stable version on linux and Mac OS X, but will update an earlier
version on Windows.

RC2 is not ready for production yet (there is one additional RC
planned), and while it marks hard code freeze, translations are
not all up-to-date yet.

A work-in-progress list of new features in LibreOffice 4.3 can be
found at https://wiki.documentfoundation.org/ReleaseNotes/4.3

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

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

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

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

  https://bugs.freedesktop.org

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

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

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

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

translate LibreOffice to your language:

  http://wiki.documentfoundation.org/LibreOffice_Localization_Guide

or help with funding our operations:

  http://donate.libreoffice.org/

A list of known issues and fixed bugs with 4.3.0 RC2 is available
from our wiki:

  http://wiki.documentfoundation.org/Releases/4.3.0/RC2

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

On behalf of the Community,

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

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

[Stephan Bergmann]

 comphelper/source/misc/accessibleselectionhelper.cxx  |8 
 comphelper/source/misc/accimplaccess.cxx  |2 +-
 include/comphelper/accessibleselectionhelper.hxx  |2 +-
 include/comphelper/accimplaccess.hxx  |2 +-
 sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx |2 +-
 sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx |2 +-
 sd/source/ui/inc/AccessibleDocumentViewBase.hxx   |2 +-
 sd/source/ui/inc/AccessibleDrawDocumentView.hxx   |2 +-
 svx/source/accessibility/charmapacc.cxx   |2 +-
 svx/source/inc/charmapacc.hxx |2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 2134c9653ef1744cb6b422644673ed086f4f663d
Author: Stephan Bergmann 
Date:   Thu Jul 3 11:51:01 2014 +0200

comphelper: sal_Bool -> bool

Change-Id: I7d7ae1f5ddff0cf7d11a407b190256f37a71d48a

diff --git a/comphelper/source/misc/accessibleselectionhelper.cxx 
b/comphelper/source/misc/accessibleselectionhelper.cxx
index 35c6622..814faa1 100644
--- a/comphelper/source/misc/accessibleselectionhelper.cxx
+++ b/comphelper/source/misc/accessibleselectionhelper.cxx
@@ -42,7 +42,7 @@ namespace comphelper
 
 void SAL_CALL OCommonAccessibleSelection::selectAccessibleChild( sal_Int32 
nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
-implSelect( nChildIndex, sal_True );
+implSelect( nChildIndex, true );
 }
 
 
@@ -54,13 +54,13 @@ namespace comphelper
 
 void SAL_CALL OCommonAccessibleSelection::clearAccessibleSelection(  ) 
throw (RuntimeException)
 {
-implSelect( ACCESSIBLE_SELECTION_CHILD_ALL, sal_False );
+implSelect( ACCESSIBLE_SELECTION_CHILD_ALL, false );
 }
 
 
 void SAL_CALL OCommonAccessibleSelection::selectAllAccessibleChildren(  ) 
throw (RuntimeException)
 {
-implSelect( ACCESSIBLE_SELECTION_CHILD_ALL, sal_True );
+implSelect( ACCESSIBLE_SELECTION_CHILD_ALL, true );
 }
 
 
@@ -102,7 +102,7 @@ namespace comphelper
 
 void SAL_CALL OCommonAccessibleSelection::deselectAccessibleChild( 
sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, 
RuntimeException)
 {
-implSelect( nSelectedChildIndex, sal_False );
+implSelect( nSelectedChildIndex, false );
 }
 
 
diff --git a/comphelper/source/misc/accimplaccess.cxx 
b/comphelper/source/misc/accimplaccess.cxx
index 6cf5637..96f255d 100644
--- a/comphelper/source/misc/accimplaccess.cxx
+++ b/comphelper/source/misc/accimplaccess.cxx
@@ -84,7 +84,7 @@ namespace comphelper
 }
 
 
-void OAccessibleImplementationAccess::setStateBit( const sal_Int16 
_nState, const sal_Bool _bSet )
+void OAccessibleImplementationAccess::setStateBit( const sal_Int16 
_nState, const bool _bSet )
 {
 OSL_ENSURE( _nState >= 0 && static_cast< sal_uInt16 >(_nState) < 
sizeof( sal_Int64 ) * 8, "OAccessibleImplementationAccess::setStateBit: no more 
bits (shutting down the universe now)!" );
 
diff --git a/include/comphelper/accessibleselectionhelper.hxx 
b/include/comphelper/accessibleselectionhelper.hxx
index dbc4c20..4bb64a9 100644
--- a/include/comphelper/accessibleselectionhelper.hxx
+++ b/include/comphelper/accessibleselectionhelper.hxx
@@ -62,7 +62,7 @@ namespace comphelper
 
 // select the specified child => watch for special ChildIndexes 
(ACCESSIBLE_SELECTION_CHILD_xxx)
 virtual void
-implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bSelect )
+implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect )
 throw (css::lang::IndexOutOfBoundsException, 
css::uno::RuntimeException, std::exception) = 0;
 
 protected:
diff --git a/include/comphelper/accimplaccess.hxx 
b/include/comphelper/accimplaccess.hxx
index f416e14..2c6f159 100644
--- a/include/comphelper/accimplaccess.hxx
+++ b/include/comphelper/accimplaccess.hxx
@@ -85,7 +85,7 @@ namespace comphelper
 const ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible >& _rxAccParent );
 
 /// sets or resets a bit of the foreign controlled states
-void setStateBit( const sal_Int16 _nState, const sal_Bool _bSet );
+void setStateBit( const sal_Int16 _nState, const bool _bSet );
 
 protected:
 OAccessibleImplementationAccess( );
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx 
b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index d5a7211..333c165 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -729,7 +729,7 @@ bool
 
 // return nothing in default case
 void
-AccessibleDocumentViewBase::implSelect( sal_Int32, sal_Bool )
+AccessibleDocumentViewBase::implSelect( sal_Int32, bool )
 throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
 }
diff --

[ Rinoshop ] - Smartphone Galaxy S4 | Maleta de Ferramentas com 186 peças | Caixa de Som Mormaii Alpino

[Ellen dos Santos]

Caso não consiga visualizar o e-mail, clique
aqui.


























 Smartphone Galaxy S4 - 4G, Android 4.2,
Wi-fi, Câmera de 13MP, 16Gb - Samsung 







 Samsung Galaxy S4 branco é o melhor celular para você que
gosta de simplificar seu cotidiano. Um super Smartphone Android capaz com
conexão de internet 4G. Guarde e compartilhe fotos e vídeos
com seus amigos. Sistema operacional Android 4.2. Possui conexão 4G
e roteador e Wi-fi.Um display de 5 polegadas. Memória interna de 16
GB. Cartão de memória externo de até 64 GB (não
incluso). 

 Por: R$ 1.589,99 ou 10x
de R$ 159,00 sem juros 














 Maleta de Ferramentas com 186
peças - Lee Tools 







 Ideal para ter em casa, no carro, no barco, na oficina ou em
qualquer outro lugar que tenha a necessidade de alguma ferramenta pois este
kit tem 4 compartimentos de ferramentas para as mais diversas
utilizações. 

 Por: R$ 599,00 ou 6x de R$ 99,83 sem juros
















 Caixa de Som Mormaii Alpino








  Caixa de Som: Estéreo com Rádio FM  Compatibilidade:
MP3, celular, TVs ou equipamento de som que tenha saída de fones de
ouvido P2  Diâmetro do Alto-Falante: 40mm x 2  Fonte de
Alimentação: Bateria Íon de Lítio de 3.7v / 800
mAh  Frequência de Resposta: 80Hz - 20kHz  Interfaces:
USB e Cartão de SD de até 32GB 

 Por: R$ 99,90 ou 10x de R$ 9,99 sem juros 
































Celular LG C300


Submarino Aventura Imaginext


Bateria Infantil Barbie









Celular LG com teclado QWERTY, Câmera 2MP, Rádio FM, MP3 e
Bluetooth.


A Bat Caverna da linha DC Super Friends de Imaginext é muito
legal!


Comece a brilhar, seja uma rock star!









Por: R$ 175,00 ou 10x deR$ 17,50 sem juros 

Por: R$ 149,99 ou 10x deR$ 15,00 sem juros 

Por: R$ 139,90 ou 10x deR$ 13,99 sem juros 































As ofertas deste e-mail são
válidas enquanto durarem os estoques. As condições de
venda podem ser alteradas após o envio dessa mensagem. Caso haja
diferença de preço ou descrição do produto
entre este e-mail e o do site, a condição válida e
praticada será a do site. Reservamo-nos o direito de corrigir
eventuais erros de divulgação neste e-mail marketing.
Você está recebendo esta mensagem por estar na nossa lista de
cadastros. Para garantir que nossos comunicados cheguem em sua caixa de
entrada, adicione este e-mail ao seu catálogo de endereços.
Os assuntos dos e-mails não são acentuados porque alguns
servidores não reconhecem acentos. Respeitamos sua privacidade e
somos contra o spam na rede. Esperamos que você tenha apreciado os
descontos e novidades.



Se
você não deseja receber mais e-mails como este, acesse este
link.


















	
		
		
			

	
	Sistema E-Marketer de Envio
	

			
		
		
	




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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - chart2/qa

[Kohei Yoshida]

 chart2/qa/extras/chart2import.cxx |   30 ++
 1 file changed, 22 insertions(+), 8 deletions(-)

New commits:
commit c58eb6a79a84ddfa01941bb60d96de658cd1de1e
Author: Kohei Yoshida 
Date:   Wed Jul 2 11:19:05 2014 -0400

More fine-grained check of data series labels in the unit test.

Change-Id: I6b23126816bb114407f2b75545094bc297ee7cc3
(cherry picked from commit bdad8d9051c207b2eff0d5a7842da83e6119a600)
Reviewed-on: https://gerrit.libreoffice.org/10041
Tested-by: Markus Mohrhard 
Reviewed-by: Markus Mohrhard 

diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index 01b9281..47df59f 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -279,10 +279,17 @@ void Chart2ImportTest::testDOCChartSeries()
 void Chart2ImportTest::testDOCXChartSeries()
 {
 load("/chart2/qa/extras/data/docx/", "chart.docx");
-uno::Sequence< OUString > seriesList = 
getWriterChartColumnDescriptions(mxComponent);
-CPPUNIT_ASSERT_EQUAL(OUString("Series 1"), seriesList[0]);
-CPPUNIT_ASSERT_EQUAL(OUString("Series 2"), seriesList[1]);
-CPPUNIT_ASSERT_EQUAL(OUString("Series 3"), seriesList[2]);
+Reference xChartDoc(getChartDocFromWriter(0), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xChartDoc.is());
+
+Reference xCT = getChartTypeFromDoc(xChartDoc, 0, 0);
+CPPUNIT_ASSERT(xCT.is());
+
+std::vector > aLabels = 
getDataSeriesLabelsFromChartType(xCT);
+CPPUNIT_ASSERT_EQUAL(size_t(3), aLabels.size());
+CPPUNIT_ASSERT_EQUAL(OUString("Series 1"), aLabels[0][0].get());
+CPPUNIT_ASSERT_EQUAL(OUString("Series 2"), aLabels[1][0].get());
+CPPUNIT_ASSERT_EQUAL(OUString("Series 3"), aLabels[2][0].get());
 }
 
 void Chart2ImportTest::testPPTChartSeries()
@@ -299,11 +306,18 @@ void Chart2ImportTest::testPPTChartSeries()
 void Chart2ImportTest::testPPTXChartSeries()
 {
 //test chart series names for pptx
-uno::Sequence < OUString > seriesList = 
getImpressChartColumnDescriptions("/chart2/qa/extras/data/pptx/", "chart.pptx");
-CPPUNIT_ASSERT_EQUAL(OUString("Column 1"), seriesList[1]);
-CPPUNIT_ASSERT_EQUAL(OUString("Column 2"), seriesList[2]);
-CPPUNIT_ASSERT_EQUAL(OUString("Column 3"), seriesList[3]);
+load("/chart2/qa/extras/data/pptx/", "chart.pptx");
+Reference xChartDoc(getChartDocFromDrawImpress(0, 
0), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xChartDoc.is());
+
+Reference xCT = getChartTypeFromDoc(xChartDoc, 0, 0);
+CPPUNIT_ASSERT(xCT.is());
 
+std::vector > aLabels = 
getDataSeriesLabelsFromChartType(xCT);
+CPPUNIT_ASSERT_EQUAL(size_t(3), aLabels.size());
+CPPUNIT_ASSERT_EQUAL(OUString("Column 1"), aLabels[0][0].get());
+CPPUNIT_ASSERT_EQUAL(OUString("Column 2"), aLabels[1][0].get());
+CPPUNIT_ASSERT_EQUAL(OUString("Column 3"), aLabels[2][0].get());
 }
 
 void Chart2ImportTest::testODPChartSeries()
___
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' - chart2/source dbaccess/source include/oox offapi/com oox/source sc/inc sc/source sw/inc sw/source

[Kohei Yoshida]

 chart2/source/inc/InternalDataProvider.hxx |8 
 chart2/source/tools/InternalDataProvider.cxx   |  200 ++---
 dbaccess/source/core/inc/DatabaseDataProvider.hxx  |6 
 dbaccess/source/core/misc/DatabaseDataProvider.cxx |8 
 include/oox/drawingml/chart/chartconverter.hxx |8 
 offapi/com/sun/star/chart2/data/XDataProvider.idl  |3 
 oox/source/drawingml/chart/chartconverter.cxx  |6 
 oox/source/drawingml/chart/datasourceconverter.cxx |4 
 oox/source/drawingml/chart/seriesconverter.cxx |2 
 sc/inc/chart2uno.hxx   |4 
 sc/source/filter/inc/excelchartconverter.hxx   |8 
 sc/source/filter/oox/excelchartconverter.cxx   |3 
 sc/source/ui/unoobj/chart2uno.cxx  |8 
 sw/inc/unochart.hxx|5 
 sw/source/core/unocore/unochart.cxx|8 
 15 files changed, 209 insertions(+), 72 deletions(-)

New commits:
commit 2a5fbd9e48c33734bd44c56ac5742f913cd63df4
Author: Kohei Yoshida 
Date:   Wed Jul 2 09:53:54 2014 -0400

bnc#812796: Correctly handle static value array for OOXML charts.

We need to pass the role of the data sequence in order to avoid unreliable
guess work when importing static value array.

Also, not all Excel's scatter plots have real numeric X values; some have
textural X values in which case Excel switch to generating 1, 2, 3, ... as
X values.  When importing to our chart implementation, using "categories" 
role
in such cases instead of "values-x" results in a more faithful chart 
rendering.

(cherry picked from commit 6c4e21a234f12e1310ba06f9859e08b424acf8bf)

Conflicts:
chart2/source/inc/InternalDataProvider.hxx
chart2/source/tools/InternalDataProvider.cxx

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

diff --git a/chart2/source/inc/InternalDataProvider.hxx 
b/chart2/source/inc/InternalDataProvider.hxx
index 901c792..4bc998a 100644
--- a/chart2/source/inc/InternalDataProvider.hxx
+++ b/chart2/source/inc/InternalDataProvider.hxx
@@ -134,6 +134,11 @@ public:
 const OUString& aRangeRepresentation )
 throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException, std::exception) 
SAL_OVERRIDE;
+
+virtual css::uno::Reference SAL_CALL
+createDataSequenceByValueArray( const OUString& aRole, const OUString& 
aRangeRepresentation )
+throw (css::lang::IllegalArgumentException, 
css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+
 virtual ::com::sun::star::uno::Reference< 
::com::sun::star::sheet::XRangeSelection > SAL_CALL getRangeSelection()
 throw (::com::sun::star::uno::RuntimeException, std::exception) 
SAL_OVERRIDE;
 
@@ -232,6 +237,9 @@ private:
 
 void lcl_deleteMapReferences( const OUString & rRangeRepresentation );
 
+css::uno::Reference
+createDataSequenceFromArray( const OUString& rArrayStr, const 
OUString& rRole );
+
 void lcl_adaptMapReferences(
 const OUString & rOldRangeRepresentation,
 const OUString & rNewRangeRepresentation );
diff --git a/chart2/source/tools/InternalDataProvider.cxx 
b/chart2/source/tools/InternalDataProvider.cxx
index e83fbae..f6081b5 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -492,79 +492,155 @@ void InternalDataProvider::lcl_decreaseMapReferences(
 Reference< chart2::data::XDataSequence > 
InternalDataProvider::lcl_createDataSequenceAndAddToMap(
 const OUString & rRangeRepresentation )
 {
-OUString aRangeRepresentation = rRangeRepresentation;
-if( aRangeRepresentation.indexOf('{') >= 0 )
-{
-::std::vector< double > aNewData;
-::std::vector< uno::Any > aNewLabels;
-OUStringaToken;
-sal_Int32   nCategories = 0;
-sal_Int32   nIndex  = 0;
-boolbValues = true;
-boolbLabelSet   = false;
-OUString str = aRangeRepresentation.replace('{',' ').replace('}',' ');
-
-m_aInternalData.clearDefaultData();
-sal_Int32 n = m_aInternalData.getColumnCount();
-if( n )
-n = n - 1;
-
-do
+Reference xSeq = 
createDataSequenceFromArray(rRangeRepresentation, OUString());
+if (xSeq.is())
+return xSeq;
+
+xSeq.set(new UncachedDataSequence(this, rRangeRepresentation));
+lcl_addDataSequenceToMap(rRangeRepresentation, xSeq);
+return xSeq;
+}
+
+uno::Reference
+InternalDataProvider::createDataSequenceFromArray( const OUString& rArrayStr, 
const OUString& rRole )
+{
+if (rArrayStr.indexOf('{') != 0 || rArrayStr[rArrayStr.getLength()-1] != 
'}')
+{
+// Not an array string.
+return uno::Reference();
+   

[Libreoffice-commits] core.git: basebmp/Module_basebmp.mk

[Matúš Kukan]

 basebmp/Module_basebmp.mk |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit d9ea0b15219d2774891e42012165ea389b9944a4
Author: Matúš Kukan 
Date:   Thu Jul 3 11:29:05 2014 +0200

Remove empty gb_Module_add_targets,basebmp,

Change-Id: I2e05aeb16707f8e8e17e5379f4cfa01a0c431e14

diff --git a/basebmp/Module_basebmp.mk b/basebmp/Module_basebmp.mk
index e55ebbb..4591512 100644
--- a/basebmp/Module_basebmp.mk
+++ b/basebmp/Module_basebmp.mk
@@ -19,9 +19,6 @@ $(eval $(call gb_Module_add_targets,basebmp,\
 ))
 endif
 
-$(eval $(call gb_Module_add_targets,basebmp,\
-))
-
 $(eval $(call gb_Module_add_check_targets,basebmp,\
 CppunitTest_basebmp \
 ))
___
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' - oox/source

[Kohei Yoshida]

 oox/source/drawingml/chart/seriesconverter.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 7ba14f3fa86d1a5fbb04ca35dcb2fd1439a4223e
Author: Kohei Yoshida 
Date:   Tue Jul 1 15:10:19 2014 -0400

bnc#812796: Don't create data series when the series has no values.

Change-Id: I92e2d7a3fab0948aea0557cf3cb65d57d48f3f59
(cherry picked from commit 5e2b7e37a29edf45f829ccee2302a942b54568a1)
Reviewed-on: https://gerrit.libreoffice.org/10039
Tested-by: Markus Mohrhard 
Reviewed-by: Markus Mohrhard 

diff --git a/oox/source/drawingml/chart/seriesconverter.cxx 
b/oox/source/drawingml/chart/seriesconverter.cxx
index 292e8a4..bc27b35 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -544,6 +544,10 @@ Reference< XDataSeries > 
SeriesConverter::createDataSeries( const TypeGroupConve
 Reference< XDataSequence > xValues = xYValueSeq->getValues();
 if( xValues.is() )
 nDataPointCount = xValues->getData().getLength();
+
+if (!nDataPointCount)
+// No values present.  Don't create a data series.
+return Reference();
 }
 // add X values of scatter and bubble charts
 if( !rTypeInfo.mbCategoryAxis )
___
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' - 3 commits - chart2/qa chart2/source dbaccess/source include/oox offapi/com oox/source sc/inc sc/source sw/inc sw/source

[Kohei Yoshida]

 chart2/qa/extras/chart2import.cxx  |   30 ++-
 chart2/qa/extras/charttest.hxx |   89 +
 chart2/source/inc/InternalDataProvider.hxx |8 
 chart2/source/tools/InternalDataProvider.cxx   |  200 ++---
 dbaccess/source/core/inc/DatabaseDataProvider.hxx  |6 
 dbaccess/source/core/misc/DatabaseDataProvider.cxx |8 
 include/oox/drawingml/chart/chartconverter.hxx |8 
 offapi/com/sun/star/chart2/data/XDataProvider.idl  |3 
 oox/source/drawingml/chart/chartconverter.cxx  |6 
 oox/source/drawingml/chart/datasourceconverter.cxx |4 
 oox/source/drawingml/chart/seriesconverter.cxx |6 
 sc/inc/chart2uno.hxx   |4 
 sc/source/filter/inc/excelchartconverter.hxx   |2 
 sc/source/filter/oox/excelchartconverter.cxx   |3 
 sc/source/ui/unoobj/chart2uno.cxx  |8 
 sw/inc/unochart.hxx|5 
 sw/source/core/unocore/unochart.cxx|8 
 17 files changed, 321 insertions(+), 77 deletions(-)

New commits:
commit 81d6116452abd2622e6b20fa36b51066b694db41
Author: Kohei Yoshida 
Date:   Wed Jul 2 11:19:05 2014 -0400

More fine-grained check of data series labels in the unit test.

(cherry picked from commit bdad8d9051c207b2eff0d5a7842da83e6119a600)

Change-Id: I6b23126816bb114407f2b75545094bc297ee7cc3
Signed-off-by: Andras Timar 

diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index 9ca95b6..1441903 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -244,10 +244,17 @@ void Chart2ImportTest::testDOCChartSeries()
 void Chart2ImportTest::testDOCXChartSeries()
 {
 load("/chart2/qa/extras/data/docx/", "chart.docx");
-uno::Sequence< OUString > seriesList = 
getWriterChartColumnDescriptions(mxComponent);
-CPPUNIT_ASSERT_EQUAL(OUString("Series 1"), seriesList[0]);
-CPPUNIT_ASSERT_EQUAL(OUString("Series 2"), seriesList[1]);
-CPPUNIT_ASSERT_EQUAL(OUString("Series 3"), seriesList[2]);
+Reference xChartDoc(getChartDocFromWriter(0), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xChartDoc.is());
+
+Reference xCT = getChartTypeFromDoc(xChartDoc, 0, 0);
+CPPUNIT_ASSERT(xCT.is());
+
+std::vector > aLabels = 
getDataSeriesLabelsFromChartType(xCT);
+CPPUNIT_ASSERT_EQUAL(size_t(3), aLabels.size());
+CPPUNIT_ASSERT_EQUAL(OUString("Series 1"), aLabels[0][0].get());
+CPPUNIT_ASSERT_EQUAL(OUString("Series 2"), aLabels[1][0].get());
+CPPUNIT_ASSERT_EQUAL(OUString("Series 3"), aLabels[2][0].get());
 }
 
 void Chart2ImportTest::testPPTChartSeries()
@@ -264,11 +271,18 @@ void Chart2ImportTest::testPPTChartSeries()
 void Chart2ImportTest::testPPTXChartSeries()
 {
 //test chart series names for pptx
-uno::Sequence < OUString > seriesList = 
getImpressChartColumnDescriptions("/chart2/qa/extras/data/pptx/", "chart.pptx");
-CPPUNIT_ASSERT_EQUAL(OUString("Column 1"), seriesList[1]);
-CPPUNIT_ASSERT_EQUAL(OUString("Column 2"), seriesList[2]);
-CPPUNIT_ASSERT_EQUAL(OUString("Column 3"), seriesList[3]);
+load("/chart2/qa/extras/data/pptx/", "chart.pptx");
+Reference xChartDoc(getChartDocFromDrawImpress(0, 
0), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xChartDoc.is());
+
+Reference xCT = getChartTypeFromDoc(xChartDoc, 0, 0);
+CPPUNIT_ASSERT(xCT.is());
 
+std::vector > aLabels = 
getDataSeriesLabelsFromChartType(xCT);
+CPPUNIT_ASSERT_EQUAL(size_t(3), aLabels.size());
+CPPUNIT_ASSERT_EQUAL(OUString("Column 1"), aLabels[0][0].get());
+CPPUNIT_ASSERT_EQUAL(OUString("Column 2"), aLabels[1][0].get());
+CPPUNIT_ASSERT_EQUAL(OUString("Column 3"), aLabels[2][0].get());
 }
 
 void Chart2ImportTest::testODPChartSeries()
diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx
index 637cfe0..53a465b 100644
--- a/chart2/qa/extras/charttest.hxx
+++ b/chart2/qa/extras/charttest.hxx
@@ -50,6 +50,10 @@ public:
 void reload( const OUString& rFilterName );
 uno::Sequence < OUString > getImpressChartColumnDescriptions( const char* 
pDir, const char* pName );
 
+uno::Reference getChartDocFromWriter( sal_Int32 
nShape );
+
+uno::Reference getChartDocFromDrawImpress( 
sal_Int32 nPage, sal_Int32 nShape );
+
 virtual void setUp();
 virtual void tearDown();
 protected:
@@ -205,4 +209,89 @@ uno::Sequence < OUString > 
ChartTest::getImpressChartColumnDescriptions( const c
 return seriesList;
 }
 
+uno::Reference ChartTest::getChartDocFromWriter( 
sal_Int32 nShape )
+{
+Reference xPageSupp(mxComponent, 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xPageSupp.is());
+
+Reference xPage = xPageSupp->getDrawPage();
+CPPUNIT_ASSERT(xPage.is());
+
+Reference xShapeProps(xPage->getByIndex(nShape), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xShapeProps.is());
+
+Reference xDocModel;
+xShapeProps->getPropertyValue("Model") >>= xDocModel;

Re: RID_CONDFORMAT conversion

[Caolán McNamara]

On Wed, 2014-07-02 at 15:47 +0200, Mihály Palenik wrote:
> Hello!
> 
> I'm making RID_CONDFORMAT conversion to .ui. It contains a
> Control(http://opengrok.libreoffice.org/xref/core/reportdesign/source/ui/dlg/CondFormat.src#25).
>  I'd like to convert this 
> Control(http://opengrok.libreoffice.org/xref/core/reportdesign/source/ui/dlg/Condition.hxx#64)
>  to .ui. It was inherited VclBuilderContainer and I allocate memory for 
> m_pUIBuilder in ctor and use 'get' function to  connect variable with ui 
> file's widgets. It compiled but not work. I see my dialog but don't draw 
> converted control. Did I miss out something?

Hard to tell without seeing the code in question. Probably its a missing
implementation of ::Resize etc to trigger the request of size allocation
from the contents of the window and to apply the size to the tree.

You might get away with replacing "public Control" with "public VclHBox"
like SwTokenWindow does in order to reuse the hbox implementations of
those.

C.


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

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

[Miklos Vajna]

 sw/qa/extras/ooxmlimport/data/table-btlr-center.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |9 +++
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   17 +++
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |7 ++
 writerfilter/source/dmapper/PropertyIds.cxx  |1 
 writerfilter/source/dmapper/PropertyIds.hxx  |1 
 6 files changed, 35 insertions(+)

New commits:
commit 6e20fc2414a625f9f2419af6bbba46bccd93d2b1
Author: Miklos Vajna 
Date:   Wed Jul 2 17:33:03 2014 +0200

bnc#865381 DOCX import: handle w:jc=center inside w:textDirection=btLr

Change-Id: I102c70429457515b34e74cb8e82e1417e6276d1d
(cherry picked from commit 3325e0f206ce864730468c3556ce06760042c157)

diff --git a/sw/qa/extras/ooxmlimport/data/table-btlr-center.docx 
b/sw/qa/extras/ooxmlimport/data/table-btlr-center.docx
new file mode 100644
index 000..79cb53e
Binary files /dev/null and 
b/sw/qa/extras/ooxmlimport/data/table-btlr-center.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 88acef8..26e0e36 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1703,6 +1703,15 @@ DECLARE_OOXMLIMPORT_TEST(testFootnote, "footnote.docx")
 CPPUNIT_ASSERT(aFootnote.endsWith("bar"));
 }
 
+DECLARE_OOXMLIMPORT_TEST(testTableBtlrCenter, "table-btlr-center.docx")
+{
+uno::Reference xTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY);
+uno::Reference xTable(xTables->getByIndex(0), 
uno::UNO_QUERY);
+// Cell vertical alignment was NONE, should be CENTER.
+CPPUNIT_ASSERT_EQUAL(text::VertOrientation::CENTER, 
getProperty(xTable->getCellByName("A2"), "VertOrient"));
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 0827cc9..7b8d9cd 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -28,6 +28,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 
 #ifdef DEBUG_DMAPPER_TABLE_HANDLER
@@ -715,6 +717,21 @@ CellPropertyValuesSeq_t 
DomainMapperTableHandler::endTableGetCellProperties(Tabl
 }
 aCellIterator->get()->erase(PROP_HORIZONTAL_MERGE);
 }
+
+// Cell direction is not an UNO Property, either.
+const PropertyMap::const_iterator aCellDirectionIter = 
aCellIterator->get()->find(PROP_CELL_DIRECTION);
+if (aCellDirectionIter != aCellIterator->get()->end())
+{
+if (aCellDirectionIter->second.getValue().get() 
== 3)
+{
+// btLr, so map ParagraphAdjust_CENTER to 
VertOrientation::CENTER.
+uno::Reference 
xPropertySet((*m_pTableSeq)[nRow][nCell][0], uno::UNO_QUERY);
+if 
(xPropertySet->getPropertyValue("ParaAdjust").get() == 
style::ParagraphAdjust_CENTER)
+aCellIterator->get()->Insert(PROP_VERT_ORIENT, 
uno::makeAny(text::VertOrientation::CENTER));
+}
+aCellIterator->get()->erase(PROP_CELL_DIRECTION);
+}
+
 pSingleCellProperties[nCell] = 
aCellIterator->get()->GetPropertyValues();
 #ifdef DEBUG_DMAPPER_TABLE_HANDLER
 dmapper_logger->endElement();
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx 
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 764a065..6a95be3 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -324,6 +324,13 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
 case NS_ooxml::LN_CT_TcPrBase_textDirection:
 {
 TablePropertyMapPtr pPropMap( new TablePropertyMap );
+
+// Remember the cell direction, so later in
+// DomainMapperTableHandler::endTableGetCellProperties() can we
+// handle the combination of the cell direction and paragraph
+// alignment as necessary.
+pPropMap->Insert(PROP_CELL_DIRECTION, uno::Any(sal_Int32(3)));
+
 bool bInsertCellProps = true;
 switch ( nIntValue )
 {
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx 
b/writerfilter/source/dmapper/PropertyIds.cxx
index bacbcd3..d693ddb 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -346,6 +346,7 @@ const OUString& PropertyNameSupplier::GetName( PropertyIds 
eId ) const
 case PROP_FOOTNOTE_LINE_RELATIVE_WIDTH: sName = 
"FootnoteLi

[Libreoffice-commits] core.git: android/Bootstrap desktop/source

[Tomaž Vajngerl]

 android/Bootstrap/src/org/libreoffice/kit/Document.java |   38 +++-
 android/Bootstrap/src/org/libreoffice/kit/Office.java   |8 +--
 desktop/source/lib/lokandroid.cxx   |   11 +---
 3 files changed, 17 insertions(+), 40 deletions(-)

New commits:
commit a3ccf3eab5e9dbba80490e057d6f30c4288ad467
Author: Tomaž Vajngerl 
Date:   Thu Jul 3 10:45:14 2014 +0200

lok JNI: no "handle" in funcs & don't wrap some native funcs

Change-Id: If783fecd80a0de05e94c76e23572b567d151bb06

diff --git a/android/Bootstrap/src/org/libreoffice/kit/Document.java 
b/android/Bootstrap/src/org/libreoffice/kit/Document.java
index 367a314..27893d2 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/Document.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/Document.java
@@ -15,43 +15,23 @@ public class Document {
 
 private final long handle;
 
-private native void setPartNative(long handle, int part);
-private native int getNumberOfPartsNative(long handle);
-private native int getDocumentTypeNative(long handle);
-private native void paintTileNative(long handle, ByteBuffer buffer, int 
canvasWidth, int canvasHeight, int tilePositionX, int tilePositionY, int 
tileWidth, int tileHeight);
-private native long getDocumentHeightNative(long handle);
-private native long getDocumentWidthNative(long handle);
+public native void setPart(int part);
+public native int getNumberOfParts();
+public native long getDocumentHeight();
+public native long getDocumentWidth();
+
+private native int getDocumentTypeNative();
+private native void paintTileNative(ByteBuffer buffer, int canvasWidth, 
int canvasHeight, int tilePositionX, int tilePositionY, int tileWidth, int 
tileHeight);
 
 public Document(long handle) {
 this.handle = handle;
 }
 
-public boolean saveAs(String url) {
-return false;
-}
-
 public int getDocumentType() {
-return getDocumentTypeNative(handle);
-}
-
-public int getNumberOfParts() {
-return getNumberOfPartsNative(handle);
-}
-
-public void setPart(int part) {
-setPartNative(handle, part);
+return getDocumentTypeNative();
 }
 
 public void paintTile(ByteBuffer buffer, int canvasWidth, int 
canvasHeight, int tilePositionX, int tilePositionY, int tileWidth, int 
tileHeight) {
-paintTileNative(handle, buffer, canvasWidth, canvasHeight, 
tilePositionX, tilePositionY, tileWidth, tileHeight);
-}
-
-public long getDocumentWidth() {
-return getDocumentWidthNative(handle);
+paintTileNative(buffer, canvasWidth, canvasHeight, tilePositionX, 
tilePositionY, tileWidth, tileHeight);
 }
-
-public long getDocumentHeight() {
-return getDocumentHeightNative(handle);
-}
-
 }
diff --git a/android/Bootstrap/src/org/libreoffice/kit/Office.java 
b/android/Bootstrap/src/org/libreoffice/kit/Office.java
index abd98c7..a680735 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/Office.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/Office.java
@@ -19,15 +19,15 @@ public class Office {
 this.handle = handle;
 }
 
-public native String getErrorNative();
+public native String getError();
 
 private native long documentLoadNative(String url);
 
 public Document documentLoad(String url) {
-long handle = documentLoadNative(url);
+long documentHandle = documentLoadNative(url);
 Document document = null;
-if (handle > 0) {
-document = new Document(handle);
+if (documentHandle > 0) {
+document = new Document(documentHandle);
 }
 return document;
 }
diff --git a/desktop/source/lib/lokandroid.cxx 
b/desktop/source/lib/lokandroid.cxx
index d796342..981f556 100644
--- a/desktop/source/lib/lokandroid.cxx
+++ b/desktop/source/lib/lokandroid.cxx
@@ -19,8 +19,6 @@
 
 #include 
 
-// #define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, 
"LibreOfficeKit", __VA_ARGS__))
-
 /* LibreOfficeKit */
 
 jfieldID getHandleField(JNIEnv* pEnv, jobject aObject)
@@ -70,14 +68,14 @@ extern "C" SAL_JNI_EXPORT jlong JNICALL 
Java_org_libreoffice_kit_Office_document
 }
 
 /* Document */
-extern "C" SAL_JNI_EXPORT void JNICALL 
Java_org_libreoffice_kit_Document_setPartNative
+extern "C" SAL_JNI_EXPORT void JNICALL 
Java_org_libreoffice_kit_Document_setPart
 (JNIEnv* pEnv, jobject aObject, jint aPart)
 {
 LibreOfficeKitDocument* pDocument = 
getHandle(pEnv, aObject);
 pDocument->pClass->setPart(pDocument, aPart);
 }
 
-extern "C" SAL_JNI_EXPORT jint JNICALL 
Java_org_libreoffice_kit_Document_getNumberOfPartsNative
+extern "C" SAL_JNI_EXPORT jint JNICALL 
Java_org_libreoffice_kit_Document_getNumberOfParts
 (JNIEnv* pEnv, jobject aObject)
 {
 LibreOfficeKitDocument* pDocument = 
getHandle(pEnv, aObject);
@@ -99,13 +97,12 @@ extern "C" SAL_JNI_EXPORT void JNICALL 
Java_org_libreoffice_kit_Document_paintTi
 

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

[Caolán McNamara]

 i18npool/source/collator/collator_unicode.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 938cf25d7c9c475931a3b6ebc8d84b3e12a05528
Author: Caolán McNamara 
Date:   Wed Jul 2 12:35:11 2014 +0100

allow build with icu 4.2

Change-Id: I4bbcff7963520426d4c04e15d2239431aff65b56
Reviewed-on: https://gerrit.libreoffice.org/10042
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/i18npool/source/collator/collator_unicode.cxx 
b/i18npool/source/collator/collator_unicode.cxx
index 42dfef3..35c237d 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -308,6 +308,10 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& 
rAlgorithm, const lang::
 if (func && funclen) {
 const sal_uInt8* ruleImage=func();
 size_t ruleImageSize = funclen();
+
+#if (U_ICU_VERSION_MAJOR_NUM == 4) && (U_ICU_VERSION_MINOR_NUM <= 2)
+uca_base = new RuleBasedCollator(static_cast(NULL), 
status);
+#else
 // Not only changed ICU 53.1 the API behavior that a negative
 // length (ruleImageSize) now leads to failure, but also that
 // the base RuleBasedCollator passed as uca_base here needs to
@@ -319,6 +323,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& 
rAlgorithm, const lang::
 // NULL (default) locale does not.
 uca_base = 
static_cast(icu::Collator::createInstance(
 icu::Locale::getRoot(), status));
+#endif
 if (! U_SUCCESS(status)) throw RuntimeException();
 collator = new RuleBasedCollator(
 reinterpret_cast(ruleImage), 
ruleImageSize, uca_base, status);
___
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

[Caolán McNamara]

 i18npool/source/collator/collator_unicode.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 9153b804cd2a1149a6811db74fa9be594b275391
Author: Caolán McNamara 
Date:   Wed Jul 2 12:35:11 2014 +0100

allow build with icu 4.2

Change-Id: I4bbcff7963520426d4c04e15d2239431aff65b56
(cherry picked from commit 414540aecae90774e12390cfcf8f0a37e10684b4)
Reviewed-on: https://gerrit.libreoffice.org/10044
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/i18npool/source/collator/collator_unicode.cxx 
b/i18npool/source/collator/collator_unicode.cxx
index 2960f03..d0aef3f 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -333,6 +333,10 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& 
rAlgorithm, const lang::
 if (func && funclen) {
 const sal_uInt8* ruleImage=func();
 size_t ruleImageSize = funclen();
+
+#if (U_ICU_VERSION_MAJOR_NUM == 4) && (U_ICU_VERSION_MINOR_NUM <= 2)
+uca_base = new RuleBasedCollator(static_cast(NULL), 
status);
+#else
 // Not only changed ICU 53.1 the API behavior that a negative
 // length (ruleImageSize) now leads to failure, but also that
 // the base RuleBasedCollator passed as uca_base here needs to
@@ -344,6 +348,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& 
rAlgorithm, const lang::
 // NULL (default) locale does not.
 uca_base = 
static_cast(icu::Collator::createInstance(
 icu::Locale::getRoot(), status));
+#endif
 if (! U_SUCCESS(status)) throw RuntimeException();
 collator = new RuleBasedCollator(
 reinterpret_cast(ruleImage), 
ruleImageSize, uca_base, status);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Norbert Thiebaud]

 xmloff/source/forms/propertyimport.cxx |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 246cb7e068b0955d407d82279d66c3846ccd9438
Author: Norbert Thiebaud 
Date:   Wed Jul 2 23:29:16 2014 +0200

coverity#1223084 Unchecked return value

Change-Id: I1573d14412b9e01fe7382796275b83405a3bb994

diff --git a/xmloff/source/forms/propertyimport.cxx 
b/xmloff/source/forms/propertyimport.cxx
index 5840928..42bbe4f 100644
--- a/xmloff/source/forms/propertyimport.cxx
+++ b/xmloff/source/forms/propertyimport.cxx
@@ -128,11 +128,10 @@ Any PropertyConversion::convertString( const 
::com::sun::star::uno::Type& _rExpe
 case TypeClass_ENUM:
 {
 sal_uInt16 nEnumValue(0);
-#if OSL_DEBUG_LEVEL > 0
-bool bSuccess =
-#endif
-SvXMLUnitConverter::convertEnum(nEnumValue, _rReadCharacters, 
_pEnumMap);
+bool bSuccess = SvXMLUnitConverter::convertEnum(nEnumValue, 
_rReadCharacters, _pEnumMap);
 OSL_ENSURE(bSuccess, "PropertyConversion::convertString: could not 
convert to an enum value!");
+(void)bSuccess;
+
 if (bEnumAsInt)
 if (TypeClass_SHORT == _rExpectedType.getTypeClass())
 aReturn <<= (sal_Int16)nEnumValue;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Too big commit

[Caolán McNamara]

On Wed, 2014-07-02 at 11:40 -0700, Laurent BP [via Document Foundation
Mail Archive] wrote:
> Hi, 
> 
> My commit 9954  https://gerrit.libreoffice.org/9954
> has been accepted but I received an automatic message from
> libreoffice-commits-ow...@lists.freedesktop.org 
> which said 
>  
> Your mail to 'Libreoffice-commits' with the subject 
> 
> core.git: extras/AllLangCustomTarget_autotextshare.mk 
> [...] 
> 
> Is being held until the list moderator can review it for approval. 

I wouldn't worry about it. That's just the mailing list that emails the
commits to interested parties.

C.





--
View this message in context: 
http://nabble.documentfoundation.org/Too-big-commit-tp4114413p4114460.html
Sent from the Dev mailing list archive at Nabble.com.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara]

 basic/source/inc/namecont.hxx |   11 +
 basic/source/uno/namecont.cxx |   29 +-
 i18npool/source/collator/collator_unicode.cxx |5 
 3 files changed, 36 insertions(+), 9 deletions(-)

New commits:
commit 414540aecae90774e12390cfcf8f0a37e10684b4
Author: Caolán McNamara 
Date:   Wed Jul 2 12:35:11 2014 +0100

allow build with icu 4.2

Change-Id: I4bbcff7963520426d4c04e15d2239431aff65b56

diff --git a/i18npool/source/collator/collator_unicode.cxx 
b/i18npool/source/collator/collator_unicode.cxx
index 2960f03..d0aef3f 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -333,6 +333,10 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& 
rAlgorithm, const lang::
 if (func && funclen) {
 const sal_uInt8* ruleImage=func();
 size_t ruleImageSize = funclen();
+
+#if (U_ICU_VERSION_MAJOR_NUM == 4) && (U_ICU_VERSION_MINOR_NUM <= 2)
+uca_base = new RuleBasedCollator(static_cast(NULL), 
status);
+#else
 // Not only changed ICU 53.1 the API behavior that a negative
 // length (ruleImageSize) now leads to failure, but also that
 // the base RuleBasedCollator passed as uca_base here needs to
@@ -344,6 +348,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& 
rAlgorithm, const lang::
 // NULL (default) locale does not.
 uca_base = 
static_cast(icu::Collator::createInstance(
 icu::Locale::getRoot(), status));
+#endif
 if (! U_SUCCESS(status)) throw RuntimeException();
 collator = new RuleBasedCollator(
 reinterpret_cast(ruleImage), 
ruleImageSize, uca_base, status);
commit c80be30203b842c7b6d3145200b120cefb452cb8
Author: Caolán McNamara 
Date:   Wed Jul 2 14:30:18 2014 +0100

coverity#706241 Uncaught exception

we've already checked to see if the element exists, so
we know that its not there.

Change-Id: I538c0d48a883d478e4c748d222b21958d083c049

diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index 6355549..bcbd245 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -96,6 +96,17 @@ public:
 void setEventSource( ::com::sun::star::uno::XInterface* pxEventSource )
 { mpxEventSource = pxEventSource; }
 
+void insertCheck(const OUString& aName, const css::uno::Any& aElement)
+throw (css::lang::IllegalArgumentException,
+   css::container::ElementExistException,
+   css::lang::WrappedTargetException,
+   css::uno::RuntimeException, std::exception);
+
+void insertNoCheck(const OUString& aName, const css::uno::Any& aElement)
+throw (css::lang::IllegalArgumentException,
+   css::lang::WrappedTargetException,
+   css::uno::RuntimeException, std::exception);
+
 // Methods XElementAccess
 virtual ::com::sun::star::uno::Type SAL_CALL getElementType(  )
 throw(::com::sun::star::uno::RuntimeException, std::exception) 
SAL_OVERRIDE;
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index de2b91a..ac35350 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -186,21 +186,25 @@ void NameContainer::replaceByName( const OUString& aName, 
const Any& aElement )
 }
 }
 
-
-// Methods XNameContainer
-void NameContainer::insertByName( const OUString& aName, const Any& aElement )
+void NameContainer::insertCheck(const OUString& aName, const Any& aElement)
 throw(IllegalArgumentException, ElementExistException, 
WrappedTargetException, RuntimeException, std::exception)
 {
+NameContainerNameMap::iterator aIt = mHashMap.find(aName);
+if( aIt != mHashMap.end() )
+{
+throw ElementExistException();
+}
+insertNoCheck(aName, aElement);
+}
+
+void NameContainer::insertNoCheck(const OUString& aName, const Any& aElement)
+throw(IllegalArgumentException, WrappedTargetException, RuntimeException, 
std::exception)
+{
 Type aAnyType = aElement.getValueType();
 if( mType != aAnyType )
 {
 throw IllegalArgumentException();
 }
-NameContainerNameMap::iterator aIt = mHashMap.find( aName );
-if( aIt != mHashMap.end() )
-{
-throw ElementExistException();
-}
 
 sal_Int32 nCount = mNames.getLength();
 mNames.realloc( nCount + 1 );
@@ -236,6 +240,13 @@ void NameContainer::insertByName( const OUString& aName, 
const Any& aElement )
 }
 }
 
+// Methods XNameContainer
+void NameContainer::insertByName( const OUString& aName, const Any& aElement )
+throw(IllegalArgumentException, ElementExistException, 
WrappedTargetException, RuntimeException, std::exception)
+{
+insertCheck(aName, aElement);
+}
+
 void NameContainer::removeByName( const OUString& a

[Libreoffice-commits] core.git: sc/inc

[Olivier Hallot]

 sc/inc/helpids.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 39d5ba2fda01ffe56c8bcc0c5dbbb2b7d1bdf0fe
Author: Olivier Hallot 
Date:   Wed Jul 2 20:43:59 2014 -0300

Typo in HID for ERF

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

diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 50df627..a67cc87 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -705,7 +705,7 @@
 #define HID_FUNC_FLOOR_MS   
"SC_HID_FUNC_FLOOR_MS"
 #define HID_FUNC_NETWORKDAYS_MS 
"SC_HID_FUNC_NETWORKDAYS_MS"
 #define HID_FUNC_WORKDAY_MS 
"SC_HID_FUNC_WORKDAY_MS"
-#define HID_FUNC_ERF_MS 
"SC_HID_FUNC_EFR_MS"
+#define HID_FUNC_ERF_MS 
"SC_HID_FUNC_ERF_MS"
 #define HID_FUNC_ERFC_MS
"SC_HID_FUNC_ERFC_MS"
 #define HID_FUNC_AGGREGATE  
"SC_HID_FUNC_AGGREGATE"
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits