date:20141001

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

2014-10-01 Thread Miklos Vajna

 writerfilter/source/dmapper/DomainMapper.cxx  |3 +--
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
 writerfilter/source/dmapper/PropertyMap.cxx   |2 +-
 writerfilter/source/ooxml/model.xml   |6 +++---
 writerfilter/source/rtftok/rtfdocumentimpl.cxx|2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit d620629521aee48dc820b6970ca446c329d0b09a
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Oct 1 09:00:00 2014 +0200

Use constants for ST_LineNumberRestart values

Change-Id: I9fe7909bb8f6174ac05edb340a7d5606f077679d

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index a624e12..18800ac 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -864,8 +864,7 @@ void DomainMapper::lcl_attribute(Id nName, Value  val)
 pSectionContext-SetdxaLnn( nIntValue );
 break;
 case NS_ooxml::LN_CT_LineNumber_restart:
-//page:empty, probably 0,section:1,continuous:2;
-aSettings.bRestartAtEachPage = nIntValue  1;
+aSettings.bRestartAtEachPage = nIntValue == 
NS_ooxml::LN_Value_ST_LineNumberRestart_newPage;
 OSL_ENSURE(pSectionContext, SectionContext unavailable!);
 if( pSectionContext )
 pSectionContext-SetLnc( nIntValue );
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index a416ea1..24889e5 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4529,7 +4529,7 @@ void DomainMapper_Impl::SetLineNumbering( sal_Int32 
nLnnMod, sal_Int32 nLnc, sal
 xProperties-setPropertyValue( rPropNameSupplier.GetName( 
PROP_DISTANCE   ), uno::makeAny( 
ConversionHelper::convertTwipToMM100(ndxaLnn) ));
 xProperties-setPropertyValue( rPropNameSupplier.GetName( 
PROP_NUMBER_POSITION), uno::makeAny( style::LineNumberPosition::LEFT));
 xProperties-setPropertyValue( rPropNameSupplier.GetName( 
PROP_NUMBERING_TYPE ), uno::makeAny( style::NumberingType::ARABIC));
-xProperties-setPropertyValue( rPropNameSupplier.GetName( 
PROP_RESTART_AT_EACH_PAGE   ), uno::makeAny( nLnc == 0 ));
+xProperties-setPropertyValue( rPropNameSupplier.GetName( 
PROP_RESTART_AT_EACH_PAGE   ), uno::makeAny( nLnc == 
NS_ooxml::LN_Value_ST_LineNumberRestart_newPage ));
 }
 catch( const uno::Exception )
 {}
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index c6dcc39..105f69a 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1047,7 +1047,7 @@ void SectionPropertyMap::CloseSectionGroup( 
DomainMapper_Impl rDM_Impl )
 {
 bool bFirst = rDM_Impl.IsLineNumberingSet();
 rDM_Impl.SetLineNumbering( m_nLnnMod, m_nLnc, m_ndxaLnn );
-if( m_nLnnMin  0 || (bFirst  m_nLnc == 1))
+if( m_nLnnMin  0 || (bFirst  m_nLnc == 
NS_ooxml::LN_Value_ST_LineNumberRestart_newSection))
 {
 //set the starting value at the beginning of the section
 try
diff --git a/writerfilter/source/ooxml/model.xml 
b/writerfilter/source/ooxml/model.xml
index ddfc717..410ae60 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -17686,9 +17686,9 @@
   value tokenid=ooxml:Value_ST_ChapterSep_enDashenDash/value
 /resource
 resource name=ST_LineNumberRestart resource=List
-  value tokenid=0newPage/value
-  value tokenid=1newSection/value
-  value tokenid=2continuous/value
+  value tokenid=ooxml:Value_ST_LineNumberRestart_newPagenewPage/value
+  value 
tokenid=ooxml:Value_ST_LineNumberRestart_newSectionnewSection/value
+  value 
tokenid=ooxml:Value_ST_LineNumberRestart_continuouscontinuous/value
 /resource
 resource name=CT_LineNumber resource=Properties
   attribute name=countBy tokenid=ooxml:CT_LineNumber_countBy/
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 33b83dd..d4415a9 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3153,7 +3153,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
 case RTF_LINEPPAGE:
 case RTF_LINECONT:
 {
-RTFValue::Pointer_t pValue(new RTFValue(nKeyword == RTF_LINEPPAGE ? 0 
: 2));
+RTFValue::Pointer_t pValue(new RTFValue(nKeyword == RTF_LINEPPAGE ? 
NS_ooxml::LN_Value_ST_LineNumberRestart_newPage : 
NS_ooxml::LN_Value_ST_LineNumberRestart_continuous));
 lcl_putNestedAttribute(m_aStates.top().aSectionSprms,

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

2014-10-01 Thread Katarina Behrens

 vcl/source/control/field.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit eb4811590c85895ce531674596bdd6afb3397725
Author: Katarina Behrens bu...@bubli.org
Date:   Wed Oct 1 08:59:41 2014 +0200

Fallout fdo#83010: wrap on limits also in corner cases

e.g. when spin != 1 and min != 0

Copies the algorithm from now non-existent WrapField widget, it used
to work there ...

Change-Id: Id12f2565f10f272bec4e61737add9c197b674d3b

diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index c475bd2..1749180 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -707,9 +707,11 @@ void NumericFormatter::ImplNewFieldValue( sal_Int64 
nNewValue )
 sal_Int64 NumericFormatter::ClipAgainstMinMax(sal_Int64 nValue) const
 {
 if (nValue  mnMax)
-nValue = mbWrapOnLimits ? mnMin : mnMax;
+nValue = mbWrapOnLimits ? ((nValue - mnMin) % (mnMax + 1)) + mnMin
+: mnMax;
 else if (nValue  mnMin)
-nValue = mbWrapOnLimits ? mnMax : mnMin;
+nValue = mbWrapOnLimits ? ((nValue + mnMax + 1 - mnMin) % (mnMax + 1)) 
+ mnMin
+: mnMin;
 return nValue;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress3' - android/experimental

2014-10-01 Thread Andrzej Hunt

 android/experimental/LOAndroid3/res/menu/view_menu.xml 
|4 +---
 
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
 |3 ---
 2 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 3d709933f7b2f4763c394de95753f0d9be816fdd
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Wed Oct 1 08:13:45 2014 +0100

android: remove preferences menu item for now.

The preferences activity doesn't work, so easiest not to try to use
it until it is properly implemented.

Change-Id: I4b4195f6dcafa3c99dbef1ae3044ea18ab173c21

diff --git a/android/experimental/LOAndroid3/res/menu/view_menu.xml 
b/android/experimental/LOAndroid3/res/menu/view_menu.xml
index f1fc362..dca660a 100644
--- a/android/experimental/LOAndroid3/res/menu/view_menu.xml
+++ b/android/experimental/LOAndroid3/res/menu/view_menu.xml
@@ -11,6 +11,4 @@
   android:title=@string/menu_sort_az/
 item android:id=@+id/menu_sort_modified
   android:title=@string/menu_sort_modified/
-   item android:id=@+id/menu_preferences
-  android:title=@string/menu_preferences/
-/menu
\ No newline at end of file
+/menu
diff --git 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
index feb74b3..db3559e 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -276,9 +276,6 @@ public class LibreOfficeUIActivity extends Activity 
implements ActionBar.OnNavig
 case R.id.menu_sort_modified:
 sortFiles(item);
 break;
-case R.id.menu_preferences:
-editPreferences(item);
-break;
 default:
 return super.onOptionsItemSelected(item);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - vcl/generic

2014-10-01 Thread Caolán McNamara

 vcl/generic/glyphs/gcach_ftyp.cxx |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 5aceca0f5bf25d535c33a726d698777322b378d7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Sep 11 14:16:05 2014 +0100

server font dtor always calls ReleaseFaceFT

therefore we must always call GetFaceFT in the ctor
and not return early *before* calling GetFaceFT which
could happen in case of inane font size requests, i.e.

if( (mnWidth  0) || (mfStretch  +64.0) || (mfStretch  -64.0) )

valgrind+bff

Change-Id: If22f8f7ff6aaed3ffa9eec68630da8601dfd5cae
(cherry picked from commit 884229ed3ee2f84eb052c866e22bdb242a385788)
Reviewed-on: https://gerrit.libreoffice.org/11400
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx 
b/vcl/generic/glyphs/gcach_ftyp.cxx
index 47adb09..3978f02 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -488,6 +488,10 @@ ServerFont::ServerFont( const FontSelectPattern rFSD, 
FtFontInfo* pFI )
 // it becomes reponsible for the ServerFont instantiation
 ((ImplServerFontEntry*)rFSD.mpFontEntry)-SetServerFont( this );
 
+maFaceFT = pFI-GetFaceFT();
+if( !maFaceFT )
+return;
+
 if( rFSD.mnOrientation != 0 )
 {
 const double dRad = rFSD.mnOrientation * ( F_2PI / 3600.0 );
@@ -504,10 +508,6 @@ ServerFont::ServerFont( const FontSelectPattern rFSD, 
FtFontInfo* pFI )
 if( (mnWidth  0) || (mfStretch  +64.0) || (mfStretch  -64.0) )
 return;
 
-maFaceFT = pFI-GetFaceFT();
-if( !maFaceFT )
-return;
-
 FT_New_Size( maFaceFT, maSizeFT );
 FT_Activate_Size( maSizeFT );
 FT_Error rc = FT_Set_Pixel_Sizes( maFaceFT, mnWidth, rFSD.mnHeight );
@@ -627,8 +627,7 @@ bool ServerFont::TestFont() const
 
 ServerFont::~ServerFont()
 {
-if( mpLayoutEngine )
-delete mpLayoutEngine;
+delete mpLayoutEngine;
 
 if( maSizeFT )
 FT_Done_Size( maSizeFT );
___
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' - writerfilter/source

2014-10-01 Thread Caolán McNamara

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

New commits:
commit 3ebb09e0e7a0ca78e535d3c6721c2b87da37bd9d
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Sat Sep 27 20:38:24 2014 +0100

Resolves: fdo#79130 Crash in DomainMapper_Impl::CloseFieldCommand

Change-Id: Ia59e0c79ec7f2066891b78657559f41eaeb80a09
(cherry picked from commit a392a1deb0bb55f39f0232f9b3df8ad9ac9062af)
Reviewed-on: https://gerrit.libreoffice.org/11665
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index d873892..075a3fa 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3288,7 +3288,7 @@ void DomainMapper_Impl::CloseFieldCommand()
 dmapper_logger-element(closeFieldCommand);
 #endif
 
-FieldContextPtr pContext = m_aFieldStack.top();
+FieldContextPtr pContext = m_aFieldStack.empty() ? NULL : 
m_aFieldStack.top();
 OSL_ENSURE( pContext.get(), no field context available);
 if( pContext.get() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: avmedia/source basic/source connectivity/source cui/source editeng/source extensions/source filter/source forms/source fpicker/source framework/source i18npool/source i

2014-10-01 Thread Noel Grandin

 avmedia/source/framework/mediacontrol.cxx   |  
  4 
 basic/source/comp/sbcomp.cxx|  
  6 
 basic/source/runtime/methods.cxx|  
 18 -
 basic/source/runtime/methods1.cxx   |  
  2 
 basic/source/sbx/sbxdate.cxx|  
  2 
 connectivity/source/commontools/DateConversion.cxx  |  
  2 
 connectivity/source/commontools/FValue.cxx  |  
 20 +-
 connectivity/source/commontools/dbtools.cxx |  
  2 
 connectivity/source/drivers/ado/APreparedStatement.cxx  |  
  2 
 connectivity/source/drivers/calc/CTable.cxx |  
 16 -
 connectivity/source/drivers/evoab2/NPreparedStatement.cxx   |  
  2 
 connectivity/source/drivers/file/FDateFunctions.cxx |  
  2 
 connectivity/source/drivers/firebird/PreparedStatement.cxx  |  
  2 
 connectivity/source/drivers/firebird/ResultSet.cxx  |  
  2 
 connectivity/source/drivers/jdbc/ConnectionLog.cxx  |  
  2 
 connectivity/source/drivers/kab/KPreparedStatement.cxx  |  
 98 ++
 connectivity/source/drivers/kab/KResultSet.cxx  |  
  2 
 connectivity/source/drivers/macab/MacabPreparedStatement.cxx|  
 98 ++
 connectivity/source/drivers/macab/MacabResultSet.cxx|  
 20 +-
 connectivity/source/drivers/mork/MPreparedStatement.cxx |  
  2 
 connectivity/source/drivers/mozab/MPreparedStatement.cxx|  
  2 
 connectivity/source/drivers/odbc/OPreparedStatement.cxx |  
  2 
 connectivity/source/drivers/odbc/OResultSet.cxx |  
  2 
 connectivity/source/parse/sqlnode.cxx   |  
  4 
 cui/source/dialogs/postdlg.cxx  |  
  2 
 cui/source/options/optmemory.cxx|  
  4 
 cui/source/options/optupdt.cxx  |  
  4 
 editeng/source/items/flditem.cxx|  
 14 -
 editeng/source/misc/svxacorr.cxx|  
 26 +-
 editeng/source/uno/unofield.cxx |  
  8 
 extensions/source/propctrlr/standardcontrol.cxx |  
  2 
 extensions/source/propctrlr/usercontrol.cxx |  
  2 
 filter/source/msfilter/svdfppt.cxx  |  
  4 
 filter/source/msfilter/util.cxx |  
  4 
 forms/source/component/DatabaseForm.cxx |  
  4 
 forms/source/component/EditBase.cxx |  
  4 
 forms/source/xforms/datatypes.cxx   |  
 10 -
 forms/source/xforms/xpathlib/xpathlib.cxx   |  
  6 
 fpicker/source/office/iodlg.cxx |  
  2 
 framework/source/services/autorecovery.cxx  |  
  2 
 i18npool/source/calendar/calendar_gregorian.cxx |  
  2 
 i18npool/source/calendar/calendar_hijri.cxx |  
  4 
 include/editeng/flditem.hxx |  
  8 
 include/editeng/svxacorr.hxx|  
  2 
 include/postx.h |  
  1 
 include/prex.h  |  
  3 
 include/svl/fstathelper.hxx |  
  4 
 include/svx/ctredlin.hxx|  
 12 -
 include/svx/galmisc.hxx |  
  4 
 include/tools/datetime.hxx  |  
 14 -
 include/tools/time.hxx  |  
 32 +--
 include/unotools/datetime.hxx   |  
  2 
 include/unotools/localedatawrapper.hxx  |  
  6 
 include/vcl/field.hxx   |  
 46 ++--
 include/xmloff/xmluconv.hxx |  
  2 
 lotuswordpro/source/filter/xfilter/xftimestyle.cxx  |  
  2 
 mysqlc/source/mysqlc_preparedstatement.cxx  |  
  2 
 mysqlc/source/mysqlc_resultset.cxx

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

2014-10-01 Thread Caolán McNamara

 sw/qa/core/data/ooxml/pass/fdo73608-1.docx   |binary
 sw/qa/core/data/ooxml/pass/fdo73608-2.docx   |binary
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   16 ++-
 3 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit dea3d98936aad30a7d6804c76e502c9fc9603985
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Sun Sep 28 16:47:13 2014 +0100

Related: fdo#73608 don't crash on missing table styles

(cherry picked from commit 5fd7382651d64f77e8ad1d9a5c053f52f3641f9f)

Conflicts:
writerfilter/source/dmapper/DomainMapperTableHandler.cxx

Change-Id: I340b43b7afc4c5c4d6dc8e4ed182279240306540

Resolves: fdo#73608 bail out on loop in style sheet hierarchy

Change-Id: I03975d1ce8eaceceb4d5c263eb11c1521bcd57eb
(cherry picked from commit be18133e84120625734a09380594ee89b23c4322)
Reviewed-on: https://gerrit.libreoffice.org/11679
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/sw/qa/core/data/ooxml/pass/fdo73608-1.docx 
b/sw/qa/core/data/ooxml/pass/fdo73608-1.docx
new file mode 100644
index 000..d3cc84a
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/fdo73608-1.docx differ
diff --git a/sw/qa/core/data/ooxml/pass/fdo73608-2.docx 
b/sw/qa/core/data/ooxml/pass/fdo73608-2.docx
new file mode 100644
index 000..f558878
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/fdo73608-2.docx differ
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 33f70cc..b8193c7 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -119,9 +119,17 @@ void DomainMapperTableHandler::startTable(unsigned int 
nRows,
 PropertyMapPtr lcl_SearchParentStyleSheetAndMergeProperties(const 
StyleSheetEntryPtr pStyleSheet, StyleSheetTablePtr pStyleSheetTable)
 {
 PropertyMapPtr pRet;
+
+if (!pStyleSheet)
+return pRet;
+
 if(!pStyleSheet-sBaseStyleIdentifier.isEmpty())
 {
 const StyleSheetEntryPtr pParentStyleSheet = 
pStyleSheetTable-FindStyleSheetByISTD( pStyleSheet-sBaseStyleIdentifier );
+//a loop in the style hierarchy, bail out
+if (pParentStyleSheet == pStyleSheet)
+return pRet;
+
 pRet = lcl_SearchParentStyleSheetAndMergeProperties( 
pParentStyleSheet, pStyleSheetTable );
 }
 else
@@ -129,7 +137,10 @@ PropertyMapPtr 
lcl_SearchParentStyleSheetAndMergeProperties(const StyleSheetEntr
 pRet.reset( new PropertyMap );
 }
 
-pRet-InsertProps(pStyleSheet-pProperties);
+if (pRet)
+{
+pRet-InsertProps(pStyleSheet-pProperties);
+}
 
 return pRet;
 }
@@ -294,6 +305,9 @@ namespace
 
 bool lcl_extractTableBorderProperty(PropertyMapPtr pTableProperties, const 
PropertyIds nId, TableInfo rInfo, table::BorderLine2 rLine)
 {
+if (!pTableProperties)
+return false;
+
 PropertyMap::iterator aTblBorderIter = pTableProperties-find(nId);
 if( aTblBorderIter != pTableProperties-end() )
 {
___
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 sw/qa sw/source

2014-10-01 Thread Luboš Luňák

 oox/source/token/properties.txt   |1 
 oox/source/vml/vmlshape.cxx   |   27 ++
 sw/qa/extras/ooxmlexport/data/bnc884615-mso-position.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |   37 +++
 sw/source/filter/ww8/docxattributeoutput.cxx  |  168 +++---
 5 files changed, 151 insertions(+), 82 deletions(-)

New commits:
commit bccb5eff14b2aebd18fd933c2790d78a2fa940e9
Author: LuboÅ¡ LuÅÃ¡k l.lu...@collabora.com
Date:   Sat Sep 27 16:59:48 2014 +0200

fix/improve handling of mso-position-(horizontal|vertical)(-relative)

This is a squash of commits f6fa787 to e5bbc721 .

Change-Id: Ieb76ccb2fe8a425af3204de144021b7a731d0778
Reviewed-on: https://gerrit.libreoffice.org/11701
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index 988857b..f1b237b 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -339,6 +339,7 @@ OutputPosition
 OverlapSequence
 PageScale
 PageStyle
+PageToggle
 PageViewZoomValue
 PaintTransparent
 ParaAdjust
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index d7783d8..3adf5c8 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -482,12 +482,38 @@ void lcl_SetAnchorType(PropertySet rPropSet, const 
ShapeTypeModel rTypeModel)
 {
 if ( rTypeModel.maPositionHorizontal == center )
 rPropSet.setAnyProperty(PROP_HoriOrient, 
makeAny(text::HoriOrientation::CENTER));
+else if ( rTypeModel.maPositionHorizontal == left )
+rPropSet.setAnyProperty(PROP_HoriOrient, 
makeAny(text::HoriOrientation::LEFT));
+else if ( rTypeModel.maPositionHorizontal == right )
+rPropSet.setAnyProperty(PROP_HoriOrient, 
makeAny(text::HoriOrientation::RIGHT));
+else if ( rTypeModel.maPositionHorizontal == inside )
+{
+rPropSet.setAnyProperty(PROP_HoriOrient, 
makeAny(text::HoriOrientation::LEFT));
+rPropSet.setAnyProperty(PROP_PageToggle, makeAny(sal_True));
+}
+else if ( rTypeModel.maPositionHorizontal == outside )
+{
+rPropSet.setAnyProperty(PROP_HoriOrient, 
makeAny(text::HoriOrientation::RIGHT));
+rPropSet.setAnyProperty(PROP_PageToggle, makeAny(sal_True));
+}
 
 if ( rTypeModel.maPositionHorizontalRelative == page )
 rPropSet.setAnyProperty(PROP_HoriOrientRelation, 
makeAny(text::RelOrientation::PAGE_FRAME));
+else if ( rTypeModel.maPositionVerticalRelative == margin )
+rPropSet.setProperty(PROP_VertOrientRelation, 
text::RelOrientation::PAGE_PRINT_AREA);
+else if ( rTypeModel.maPositionVerticalRelative == text )
+rPropSet.setProperty(PROP_VertOrientRelation, 
text::RelOrientation::FRAME);
 
 if ( rTypeModel.maPositionVertical == center )
 rPropSet.setAnyProperty(PROP_VertOrient, 
makeAny(text::VertOrientation::CENTER));
+else if ( rTypeModel.maPositionVertical == top )
+rPropSet.setAnyProperty(PROP_VertOrient, 
makeAny(text::VertOrientation::TOP));
+else if ( rTypeModel.maPositionVertical == bottom )
+rPropSet.setAnyProperty(PROP_VertOrient, 
makeAny(text::VertOrientation::BOTTOM));
+else if ( rTypeModel.maPositionVertical == inside )
+rPropSet.setAnyProperty(PROP_VertOrient, 
makeAny(text::VertOrientation::LINE_TOP));
+else if ( rTypeModel.maPositionVertical == outside )
+rPropSet.setAnyProperty(PROP_VertOrient, 
makeAny(text::VertOrientation::LINE_BOTTOM));
 
 if ( rTypeModel.maPosition == absolute )
 {
@@ -504,7 +530,6 @@ void lcl_SetAnchorType(PropertySet rPropSet, const 
ShapeTypeModel rTypeModel)
 }
 else
 {
-// Vertical placement relative to margin, because parent style 
must not modify vertical position
 rPropSet.setProperty(PROP_VertOrientRelation, 
text::RelOrientation::FRAME);
 }
 }
diff --git a/sw/qa/extras/ooxmlexport/data/bnc884615-mso-position.docx 
b/sw/qa/extras/ooxmlexport/data/bnc884615-mso-position.docx
new file mode 100644
index 000..2fb28ec
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/bnc884615-mso-position.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 5590246..18c15fa 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3658,6 +3658,43 @@ DECLARE_OOXMLEXPORT_TEST(testFooterBodyDistance, 
footer-body-distance.docx)
 
 #endif
 
+DECLARE_OOXMLEXPORT_TEST(testMsoPosition, bnc884615-mso-position.docx)
+{
+if(xmlDocPtr doc = parseExport(word/footer1.xml))
+{
+// We write the frames out in different order than they were read, so 
check it's the correct
+// textbox first by checking width. These tests may need reordering if 
that gets fixed.
+

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

2014-10-01 Thread Caolán McNamara

 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |   10 +-
 sw/qa/core/data/ooxml/pass/fdo79129.docx|binary
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 97291b92b70249c1bcdca33425585b201a1822db
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Sep 30 10:43:37 2014 +0100

Resolves: fdo#79129 Crash in oox::drawingml::LayoutNode::setupShape

Change-Id: I0bafd2c43d29806eea0ff0cb165e67aece53488f
Reviewed-on: https://gerrit.libreoffice.org/11726
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index ba1f857..fc07a90 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -400,7 +400,15 @@ bool LayoutNode::setupShape( const ShapePtr rShape, const 
Diagram rDgm, sal_uI
 const 
DiagramData::StringMap::value_type::second_type::const_iterator 
aVecEnd=aNodeName-second.end();
 while( aVecIter != aVecEnd )
 {
-DiagramData::PointNameMap::const_iterator 
aDataNode2=rDgm.getData()-getPointNameMap().find(aVecIter-first);
+DiagramData::PointNameMap rMap = 
rDgm.getData()-getPointNameMap();
+DiagramData::PointNameMap::const_iterator aDataNode2 = 
rMap.find(aVecIter-first);
+if (aDataNode2 == rMap.end())
+{
+//busted, skip it
+++aVecIter;
+continue;
+}
+
 if( aVecIter-second == 0 )
 {
 // grab shape attr from topmost element(s)
diff --git a/sw/qa/core/data/ooxml/pass/fdo79129.docx 
b/sw/qa/core/data/ooxml/pass/fdo79129.docx
new file mode 100644
index 000..46ff0f5
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/fdo79129.docx differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 5 commits - offapi/com offapi/type_reference sw/CppunitTest_sw_mailmerge.mk sw/inc sw/Module_sw.mk sw/qa sw/source

2014-10-01 Thread Jan-Marek Glogowski

 offapi/com/sun/star/text/MailMergeType.idl   |9 
 offapi/type_reference/offapi.idl |1 
 sw/CppunitTest_sw_mailmerge.mk   |   93 +++
 sw/Module_sw.mk  |1 
 sw/inc/anchoreddrawobject.hxx|2 
 sw/inc/anchoredobject.hxx|4 
 sw/inc/dbmgr.hxx |   50 +-
 sw/inc/doc.hxx   |2 
 sw/inc/docary.hxx|   14 
 sw/inc/ndarr.hxx |2 
 sw/inc/ndhints.hxx   |4 
 sw/inc/ndtxt.hxx |2 
 sw/inc/node.hxx  |4 
 sw/inc/numrule.hxx   |2 
 sw/inc/swabstdlg.hxx |2 
 sw/qa/extras/inc/swmodeltestbase.hxx |  161 ++
 sw/qa/extras/mailmerge/data/4_v01.ods|binary
 sw/qa/extras/mailmerge/data/multiple-page-anchored-draws.odt |binary
 sw/qa/extras/mailmerge/mailmerge.cxx |   76 +++
 sw/source/core/docnode/nodedump.cxx  |   36 -
 sw/source/core/inc/MarkManager.hxx   |2 
 sw/source/core/inc/flyfrm.hxx|2 
 sw/source/core/inc/frame.hxx |8 
 sw/source/core/inc/sectfrm.hxx   |2 
 sw/source/core/inc/tabfrm.hxx|2 
 sw/source/core/inc/txtfrm.hxx|2 
 sw/source/core/text/xmldump.cxx  |   22 
 sw/source/ui/dbui/mailmergewizard.cxx|2 
 sw/source/ui/dialog/swdlgfact.cxx|4 
 sw/source/ui/dialog/swdlgfact.hxx|2 
 sw/source/ui/envelp/mailmrge.cxx |7 
 sw/source/uibase/dbui/dbmgr.cxx  |  271 ++-
 sw/source/uibase/inc/mailmrge.hxx|6 
 sw/source/uibase/uno/unomailmerge.cxx|  172 +++---
 34 files changed, 700 insertions(+), 269 deletions(-)

New commits:
commit 4687ce06757e75432bde17bf4077e45ce88bb126
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Wed Sep 24 20:02:57 2014 +0200

Constify dumpAsXml and friends

All these dump functions should never change the dumped objects
so 'const' all of them.

Change-Id: Id83422e3950a73e48feb4708fbd4c251506997e0

diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx
index e49185e..55fdb78 100644
--- a/sw/inc/anchoreddrawobject.hxx
+++ b/sw/inc/anchoreddrawobject.hxx
@@ -188,7 +188,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public 
SwAnchoredObject
 
 /** The element name to show in the XML dump.
   */
-virtual const char* getElementName( ) SAL_OVERRIDE { return 
SwAnchoredDrawObject; }
+virtual const char* getElementName( ) const SAL_OVERRIDE { return 
SwAnchoredDrawObject; }
 };
 
 #endif
diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx
index 14750c8..c31afee 100644
--- a/sw/inc/anchoredobject.hxx
+++ b/sw/inc/anchoredobject.hxx
@@ -542,11 +542,11 @@ class SW_DLLPUBLIC SwAnchoredObject
 /** Dump a bunch of useful data to an XML representation to ease
 layout understanding, debugging and testing.
   */
-virtual void dumpAsXml( xmlTextWriterPtr pWriter );
+virtual void dumpAsXml( xmlTextWriterPtr pWriter ) const;
 
 /** The element name to show in the XML dump.
   */
-virtual const char* getElementName( ) { return SwAnchoredObject; }
+virtual const char* getElementName( ) const { return 
SwAnchoredObject; }
 };
 
 /// Helper class for notify that positioning of an anchored object is in 
progress.
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 1742d8e..209c745 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1669,7 +1669,7 @@ public:
  * Dumps the entire nodes structure to the given destination (file 
nodes.xml in the current directory by default)
  * @since 3.5
  */
-void dumpAsXml( xmlTextWriterPtr writer = NULL );
+void dumpAsXml( xmlTextWriterPtr writer = NULL ) const;
 
 std::vectorColor GetDocColors();
 
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 2c7c75a..0f75324 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -81,7 +81,7 @@ public:
 virtual SwFmt* GetFmt(size_t idx) const SAL_OVERRIDE { return 
(SwFmt*)operator[](idx); }
 sal_uInt16 GetPos(const SwFrmFmt* pFmt) const;
 bool Contains(const SwFrmFmt* pFmt) const;
-void

[Libreoffice-commits] core.git: offapi/type_reference

2014-10-01 Thread Stephan Bergmann

 offapi/type_reference/offapi.idl |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 709a62f9b2d49ea596b8308429f12dd4f8b6caca
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Oct 1 10:53:05 2014 +0200

Revert inadvertent modification of type_reference/offapi.idl

...from 9835bb562cfe3a5d386c24d86176ba7bb5ab26d2 MM: export the SwDocShell 
mail
merge via UNO.  It shall only be edited manually when deliberately going
incompatible.

Change-Id: I19c82dca3b6537631a155629d6072b516b32ded5

diff --git a/offapi/type_reference/offapi.idl b/offapi/type_reference/offapi.idl
index fb4b93b..fc5b795 100644
--- a/offapi/type_reference/offapi.idl
+++ b/offapi/type_reference/offapi.idl
@@ -14535,7 +14535,6 @@ module com {
  const short FILE = 2;
  const short MAIL = 3;
  const short PRINTER = 1;
- const short SHELL = 4;
 };
 published service NumberingLevel {
  [property] short Adjust;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/postx.h include/prex.h

2014-10-01 Thread Noel Grandin

 include/postx.h |3 ---
 include/prex.h  |5 -
 2 files changed, 8 deletions(-)

New commits:
commit 7bacb89bb955f4985e435c33dde629099dab744b
Author: Noel Grandin n...@peralex.com
Date:   Tue Sep 30 15:00:56 2014 +0200

fdo#82577: Handle Icon

It appears that this became unnecessary at some point

Change-Id: I6638d68d1c44162b4aa62224dc03c19c2413180e
Reviewed-on: https://gerrit.libreoffice.org/11715
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/include/postx.h b/include/postx.h
index 195786f..ec0b826 100644
--- a/include/postx.h
+++ b/include/postx.h
@@ -24,9 +24,6 @@
 }
 #endif
 
-/* X Types */
-#undef Icon
-
 #undef Min
 #undef Max
 #undef DestroyAll
diff --git a/include/prex.h b/include/prex.h
index a7db2bd..9bc86fb 100644
--- a/include/prex.h
+++ b/include/prex.h
@@ -24,11 +24,6 @@
 #error No X headers should be included for MACOSX even if they are present in 
the SDK
 #endif
 
-/* Types from X11/X.h that clash with LO's identifiers
- * and we don't need.
- */
-#define IconHIDE_XLIB_Icon
-
 #if defined __cplusplus
 extern C {
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-01 Thread Stephan Bergmann

 sw/qa/extras/mailmerge/mailmerge.cxx |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit a5824fa97c7300faca3b09fe0922c9f319b3c49b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Oct 1 11:31:35 2014 +0200

loplugin:implicitboolconversion

Change-Id: Ia63460949a3ba58f0394f5b94e0d906ca7849710

diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx 
b/sw/qa/extras/mailmerge/mailmerge.cxx
index 7c51b3f..79ab78d 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -6,6 +6,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include sal/config.h
+
+#include set
+
 #include swmodeltestbase.hxx
 
 #if !defined(MACOSX)  !defined(WNT)
@@ -49,8 +53,7 @@ DECLARE_DFLT_MAILMERGE_TEST(testMultiPageAnchoredDraws, 
multiple-page-anchored-
 uno::Referencecontainer::XIndexAccess 
xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY);
 CPPUNIT_ASSERT_EQUAL(sal_Int32(8), xDraws-getCount());
 
-// bitset of all page numbers
-char nPageSum = 0xFF;
+std::setsal_uInt16 pages;
 uno::Referencebeans::XPropertySet xPropertySet;
 
 for (sal_Int32 i = 0; i  xDraws-getCount(); i++)
@@ -63,11 +66,9 @@ DECLARE_DFLT_MAILMERGE_TEST(testMultiPageAnchoredDraws, 
multiple-page-anchored-
 CPPUNIT_ASSERT_EQUAL( text::TextContentAnchorType_AT_PAGE, nAnchorType 
);
 
 xPropertySet-getPropertyValue( UNO_NAME_ANCHOR_PAGE_NO ) = 
nAnchorPageNo;
-nPageSum = !nAnchorPageNo;
+// are all shapes are on different page numbers?
+CPPUNIT_ASSERT(pages.insert(nAnchorPageNo).second);
 }
-
-// are all shapes are on different page numbers?
-CPPUNIT_ASSERT_EQUAL(char(0), nPageSum);
 }
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Anti-Virus vendors warnings

2014-10-01 Thread Michael Meeks

Dear Nicholas,

On Tue, 2014-09-30 at 17:19 -0400, nicholas ferguson wrote:
 I duplicated their directory structure.  And my build still failed.

Grief; we should certainly document turning off AV more prominently.
Ideally we could find a reproducer that we could check during configure
and print out:

You have a (typically) rubbish AV product installed -
 please un-install and or disable it ;-)

It'd be great to isolate exactly what is causing the problem, so we can
save other people this suffering; I'd love to invest in that.

 Wow.  So I did a forensic on the env.  And I discovered that Norton
 Antivirus was isolating state files and some executables being built by the
 LibreOffice build system.

Great - is any of these small enough that we can build a reproducer out
of it ?

 So that alone took two to three weeks.  I even had to resort to buying a new
 machine...devoted to libreoffice.  $300 machine.  Trying to solve why my
 builds were failing on windows.  

Sorry it bit you so hard - we aim to be easy to build =) that's mostly
achieved by people iterating and helping to fix problems they find.

 If an antivirus was turned on when LibreOffice staffers do builds..then they
 would have had to correct something..so that Norton Antivirus would not
 decide that a virus had been generated.

So - my opinion of anti-virus' is that they are appallingly poorly
performing, superstition-ridden, scare-ware products. They are also
mostly proprietary. Each time we build LibreOffice - there is some other
co-incidence that triggers some AV fingerprinting with 200Mb of 'stuff'
on disk, what is the chance that something frightens an AV ?

It has got -so- bad that some of our plain-text SVG files were
triggering one AV or other - because they contained co-ordinates lists
that looked like credit card numbers ;-) That takes the biscuit.

 This is probably why Michael and Tor rememeber me for too many emails. What
 the heck is going on here? I would email them.  how can you claim your stuff
 builds?

This noisy mail exchange by itself is sufficient proof of verbosity and
a feeling of entitlement that doesn't, at least to my mind match a
reasonable expectation of what you can get for free from a Free Software
project =) I'd love to help you get over that. Collapsing some other
bits here:

On Tue, 2014-09-30 at 17:50 -0400, nicholas ferguson wrote:
 I think that is a bad idea.  A good idea is to turn on anti virus
 where work is done.  you can't tell developers to turn off their
 anti virus when working on windows.  That’s  crazy talk

Did you read the recent interview where a prominent AV vendor said
their (debilitatingly slow and expensive) solution was only about 50%
effective ? [ IIRC ].

It is easy to be full of good ideas of the form: someone else should
do a lot of work to make my life easier ;-) I have a lot of those kind
of good ideas too - they are mostly focused on encouraging -you- to do
something to improve things. Along those lines I loved your idea of
working on a different VS project file target - that was a positive
direction. In general in a volunteer project - if something is not done
-you- are the default solution to your own problem / need =)

So - if you genuinely want to start this new Anti-Virus clean
initiative - then I suggest that you get a set of tinderboxes setup to
build with X, Y, and Z AV solutions enabled. Then when they fail -
you'll need to try to remediate the failure. In the SVG case above -
that might mean working out a different way to represent co-ordinates
(changing the SVG standard is perhaps hard), and/or compressing /
crypting the files with some non-standard header/magic so the AV doesn't
de-compress it to peek inside. That we could obscure the co-ordinates
that look like credit card numbers ;-) [ you'd also need to do some work
to persuade people to accept piece-meal changes like this into
LibreOffice ].

In the more common / general case - you will need to work out why a
random 50Mb DLL triggers some arbitrary signature (the AV reports are
-very- spartan on details around this - they often won't tell you byte
offsets or - well anything much), and then when you've worked out what
the binary signature, you can then try to either:

a) report it to the AV vendors (who will just white-list
   an md5sum or moral equivalent of that DLL you compiled just
   once leaving it to break again next commit / compile; and
   they'll white-list without any real understanding or analysis
   of the code too FWIW ;-)

b) encourage Microsoft to 'fix' their compiler to generate
   (perhaps less optimal) code that doesn't co-incidentally
   include this particular fingerprint. or

c) write an x86 binary re-writer that munges the generated
   code to do the same thing or

d) find and tweak the random piece of

Re: Anti-Virus vendors warnings

2014-10-01 Thread Noel Grandin




On 2014-10-01 11:55 AM, Michael Meeks wrote:




Wow.  So I did a forensic on the env.  And I discovered that Norton
Antivirus was isolating state files and some executables being built by the
LibreOffice build system.






Most anti-virus products have a way of excluding specific folder hierarchies - I simply exclude my entire libreoffice 
working space and build folder from the AV.


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

[Libreoffice-commits] core.git: sal/osl

2014-10-01 Thread Michael Stahl

 sal/osl/unx/thread.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 460a807809c31fbce94daacff1c89018d9ae2610
Author: Michael Stahl mst...@redhat.com
Date:   Wed Oct 1 12:07:30 2014 +0200

sal: work around spurious Apple clang warning about pointer cast to int

Change-Id: I4e4281ac8767c9a6b6b85bc759f28bcf074d8e39

diff --git a/sal/osl/unx/thread.cxx b/sal/osl/unx/thread.cxx
index 1f0a587..739dd18 100644
--- a/sal/osl/unx/thread.cxx
+++ b/sal/osl/unx/thread.cxx
@@ -551,7 +551,7 @@ void SAL_CALL osl_setThreadName(char const * name) {
 /* osl_getThreadIdentifier @@@ see TODO @@@ */
 /*/
 
-#define HASHID(x) ((unsigned int)PTHREAD_VALUE(x) % HashSize)
+#define HASHID(x) ((unsigned long)PTHREAD_VALUE(x) % HashSize)
 
 typedef struct _HashEntry
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-01 Thread Noel Grandin

 include/postx.h  |8 
 vcl/unx/generic/app/i18n_im.cxx  |8 
 vcl/unx/generic/app/saldisp.cxx  |6 +++---
 vcl/unx/generic/app/salinst.cxx  |2 +-
 vcl/unx/generic/dtrans/X11_selection.cxx |   10 +-
 vcl/unx/generic/window/salframe.cxx  |8 
 vcl/unx/kde4/KDESalDisplay.cxx   |2 +-
 7 files changed, 18 insertions(+), 26 deletions(-)

New commits:
commit 544c4fc14bca0e670ed1d59569f22c5d4a643c72
Author: Noel Grandin n...@peralex.com
Date:   Wed Oct 1 08:13:30 2014 +0200

fdo#82577: Handle KeyPress

It appears that this became unnecessary at some point

Change-Id: Iee7c09d00f8dee79f51f0a93b8f5f16137c9c626

diff --git a/include/postx.h b/include/postx.h
index ec0b826..36cf120 100644
--- a/include/postx.h
+++ b/include/postx.h
@@ -37,14 +37,6 @@
 #undef InitializeToken
 #undef NextRequest
 
-#ifdef KeyPress
-#if KeyPress != 2
-Error KeyPress must be Equal 2
-#endif
-#undef KeyPress
-#endif
-#define XLIB_KeyPress 2
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx
index 0cd33d2..795df40 100644
--- a/vcl/unx/generic/app/i18n_im.cxx
+++ b/vcl/unx/generic/app/i18n_im.cxx
@@ -108,8 +108,8 @@ XKeyEventOp::erase ()
 bool
 XKeyEventOp::match (const XKeyEvent rEvent) const
 {
-return (   (type == XLIB_KeyPressrEvent.type == KeyRelease)
-|| (type == KeyRelease  rEvent.type == XLIB_KeyPress  ))
+return (   (type == KeyPressrEvent.type == KeyRelease)
+|| (type == KeyRelease  rEvent.type == KeyPress  ))
  /*  serial  == rEvent.serial */
  send_event  == rEvent.send_event
  display == rEvent.display
@@ -385,7 +385,7 @@ SalI18N_InputMethod::FilterEvent( XEvent *pEvent, ::Window 
window)
 
 bool bFilterEvent = XFilterEvent (pEvent, window);
 
-if (pEvent-type != XLIB_KeyPress  pEvent-type != KeyRelease)
+if (pEvent-type != KeyPress  pEvent-type != KeyRelease)
 return bFilterEvent;
 
 /*
@@ -402,7 +402,7 @@ SalI18N_InputMethod::FilterEvent( XEvent *pEvent, ::Window 
window)
 }
 else /* (!bFilterEvent) */
 {
-if (pKeyEvent-type == XLIB_KeyPress)
+if (pKeyEvent-type == KeyPress)
 maLastKeyPress = *pKeyEvent;
 else
 maLastKeyPress.erase();
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index cd556c6..85d3997 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -1887,7 +1887,7 @@ void SalX11Display::Yield()
 
 bool SalX11Display::Dispatch( XEvent *pEvent )
 {
-if( pEvent-type == XLIB_KeyPress || pEvent-type == KeyRelease )
+if( pEvent-type == KeyPress || pEvent-type == KeyRelease )
 {
 ::Window aWindow = pEvent-xkey.window;
 
@@ -1950,7 +1950,7 @@ bool SalX11Display::Dispatch( XEvent *pEvent )
 case ButtonRelease:
 m_nLastUserEventTime = pEvent-xbutton.time;
 break;
-case XLIB_KeyPress:
+case KeyPress:
 case KeyRelease:
 m_nLastUserEventTime = pEvent-xkey.time;
 break;
@@ -2044,7 +2044,7 @@ void SalDisplay::DbgPrintDisplayEvent(const char 
*pComment, XEvent *pEvent) cons
 
 switch( pEvent-type )
 {
-case XLIB_KeyPress:
+case KeyPress:
 case KeyRelease:
 fprintf( stderr, \t\ts=%d c=%d\n,
  pEvent-xkey.state,
diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index fd11d1d..0845ddc 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -104,7 +104,7 @@ Bool ImplPredicateEvent( Display *, XEvent *pEvent, char 
*pData )
 nType = VCL_INPUT_MOUSE;
 break;
 
-case XLIB_KeyPress:
+case KeyPress:
 //case KeyRelease:
 nType = VCL_INPUT_KEYBOARD;
 break;
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx 
b/vcl/unx/generic/dtrans/X11_selection.cxx
index 22dbdb7..d9a3838 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -2538,7 +2538,7 @@ bool SelectionManager::handleDragEvent( XEvent rMessage )
 case ButtonRelease:
 fprintf( stderr, handleDragEvent: ButtonRelease %d (m_nDragButton 
= %d)\n, rMessage.xbutton.button, m_nDragButton );
 break;
-case XLIB_KeyPress:
+case KeyPress:
 fprintf( stderr, handleDragEvent: KeyPress\n );
 break;
 case KeyRelease:
@@ -2639,7 +2639,7 @@ bool SelectionManager::handleDragEvent( XEvent rMessage )
 sendDropPosition( bForce, rMessage.type == MotionNotify ? 
rMessage.xmotion.time : rMessage.xcrossing.time );
 }
 }
-else if( rMessage.type == XLIB_KeyPress || rMessage.type ==

[Libreoffice-commits] core.git: configure.ac

2014-10-01 Thread Caolán McNamara

 configure.ac |   14 ++
 1 file changed, 14 insertions(+)

New commits:
commit a6b2c618cb02168bba950652367f494a1021cf53
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Oct 1 11:32:59 2014 +0100

disable cve tests by default on windows

what we really want to do here is to disable if there is a virus
checker active that will cause us grief

Change-Id: Ic1162c9e1cf7a8ee09ca1dbf03b5be02dd20b981

diff --git a/configure.ac b/configure.ac
index d58df76..4c6aec9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9128,6 +9128,20 @@ dnl 
===
 dnl Check for disabling cve_tests
 dnl ===
 AC_MSG_CHECKING([whether to execute CVE tests])
+# If not explicitly enabled or disabled, default
+if test -z $enable_cve_tests; then
+case $OS in
+WNT)
+# Default cves off for windows with its wild and wonderful
+# varienty of AV software kicking in and panicing
+enable_cve_tests=no
+;;
+*)
+# otherwise yes
+enable_cve_tests=yes
+;;
+esac
+fi
 if test $enable_cve_tests = no; then
 AC_MSG_RESULT([no])
 DISABLE_CVE_TESTS=TRUE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-01 Thread Miklos Vajna

 oox/source/drawingml/shape.cxx|   12 +++-
 oox/source/shape/WpsContext.cxx   |   13 +
 sw/qa/extras/ooxmlexport/data/wps-char-color.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |7 +++
 writerfilter/source/dmapper/PropertyMap.cxx   |1 -
 writerfilter/source/dmapper/PropertyMap.hxx   |9 -
 6 files changed, 31 insertions(+), 11 deletions(-)

New commits:
commit 5bab5aae165158621dcf740be9bee9fca808aa9d
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Oct 1 12:53:27 2014 +0200

DOCX drawingML import: handle char color from theme for shape text

When we import table styles, we apply that as direct formatting, in case
there is no real direct formatting, see lcl_ApplyCellProperties() in the
sw UNO implementation.

We can do the same here: in case there is no other formatting, then
apply the char color from the WPS theme, that will give us the expected
result.

Change-Id: Ic8e6afc09167f7924a11ab0b445351075f16738e

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 96b9129..1aa23f7 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1013,10 +1013,10 @@ Reference XShape  Shape::createAndInsert(
 else if( getTextBody() )
 getTextBody()-getTextProperties().pushVertSimulation();
 
+PropertySet aPropertySet(mxShape);
 if ( !bUseRotationTransform  mnRotation != 0 )
 {
 // use the same logic for rotation from VML exporter 
(SimpleShape::implConvertAndInsert at vmlshape.cxx)
-PropertySet aPropertySet( mxShape );
 aPropertySet.setAnyProperty( PROP_RotateAngle, makeAny( sal_Int32( 
NormAngle360( mnRotation / -600 ) ) ) );
 aPropertySet.setAnyProperty( PROP_HoriOrientPosition, makeAny( 
maPosition.X ) );
 aPropertySet.setAnyProperty( PROP_VertOrientPosition, makeAny( 
maPosition.Y ) );
@@ -1042,6 +1042,16 @@ Reference XShape  Shape::createAndInsert(
 getTextBody()-insertAt( rFilterBase, xText, xAt, 
aCharStyleProperties, mpMasterTextListStyle );
 }
 }
+else if (mbTextBox)
+{
+// No drawingML text, but WPS text is expected: save the theme
+// character color on the shape, then.
+if(const ShapeStyleRef* pFontRef = getShapeStyleRef(XML_fontRef))
+{
+sal_Int32 nCharColor = 
pFontRef-maPhClr.getColor(rGraphicHelper);
+aPropertySet.setAnyProperty(PROP_CharColor, 
uno::makeAny(nCharColor));
+}
+}
 }
 
 if( mxShape.is() )
diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index 4d58638..9e3218e 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -111,6 +111,19 @@ oox::core::ContextHandlerRef 
WpsContext::onCreateContext(sal_Int32 nElementToken
 drawing::TextVerticalAdjust eAdjust = 
drawingml::GetTextVerticalAdjust(rAttribs.getToken(XML_anchor, XML_t));
 xPropertySet-setPropertyValue(TextVerticalAdjust, 
uno::makeAny(eAdjust));
 }
+
+// Apply character color of the shape to the shape's textbox.
+uno::Referencetext::XText xText(mxShape, uno::UNO_QUERY);
+uno::Referencetext::XTextCursor xTextCursor = 
xText-createTextCursor();
+xTextCursor-gotoStart(false);
+xTextCursor-gotoEnd(true);
+const uno::Referencebeans::XPropertyState 
xPropertyState(xTextCursor, uno::UNO_QUERY);
+const beans::PropertyState ePropertyState = 
xPropertyState-getPropertyState(CharColor);
+if (ePropertyState == beans::PropertyState_DEFAULT_VALUE)
+{
+uno::Referencebeans::XPropertySet 
xTextBoxPropertySet(xTextCursor, uno::UNO_QUERY);
+xTextBoxPropertySet-setPropertyValue(CharColor, 
xPropertySet-getPropertyValue(CharColor));
+}
 return this;
 }
 break;
diff --git a/sw/qa/extras/ooxmlexport/data/wps-char-color.docx 
b/sw/qa/extras/ooxmlexport/data/wps-char-color.docx
new file mode 100644
index 000..a027e92
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/wps-char-color.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index d136875..c5cfe79 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -360,6 +360,13 @@ DECLARE_OOXMLEXPORT_TEST(testMsoPosition, 
bnc884615-mso-position.docx)
 }
 }
 
+DECLARE_OOXMLEXPORT_TEST(testWpsCharColor, wps-char-color.docx)
+{
+uno::Referencetext::XTextRange xShape(getShape(1), uno::UNO_QUERY);
+// This was -1, i.e. the character color was default (-1), not white.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0xff),

[Libreoffice-commits] core.git: sw/CppunitTest_sw_mailmerge.mk

2014-10-01 Thread Noel Grandin

 sw/CppunitTest_sw_mailmerge.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 99bb7d664ef6c809ff6478fe2335c8a4a00e141b
Author: Noel Grandin n...@peralex.com
Date:   Wed Oct 1 13:02:57 2014 +0200

blind fix for windows build

Change-Id: I8c3d8b039bc82b23d74b41ca4254f50d5c84

diff --git a/sw/CppunitTest_sw_mailmerge.mk b/sw/CppunitTest_sw_mailmerge.mk
index f1020ff..47b51b6 100644
--- a/sw/CppunitTest_sw_mailmerge.mk
+++ b/sw/CppunitTest_sw_mailmerge.mk
@@ -16,6 +16,7 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,sw_mailmerge, \
 $(eval $(call gb_CppunitTest_use_libraries,sw_mailmerge, \
 comphelper \
 cppu \
+cppuhelper \
 sal \
 sw \
 test \
___
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

2014-10-01 Thread bugzilla-daemon

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

Matthew Francis fdb...@neosheffield.co.uk changed:

   What|Removed |Added

 CC||fdb...@neosheffield.co.uk
 Depends on||84352

--- Comment #219 from Matthew Francis fdb...@neosheffield.co.uk ---
Adding bug 84352 - Code signing broken by OSX 10.9.5

This is going to affect an ever increasing number of Mac users upon each new
install / upgrade of LibreOffice

-- 
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 'feature/droid_calcimpress3' - 7 commits - android/experimental

2014-10-01 Thread Tomaž Vajngerl

 android/experimental/LOAndroid3/res/layout/activity_main.xml   
  |   12 
 
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java 
 |3 
 android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java 
  |5 
 android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java 
  |3 
 
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java
 |  197 +++
 
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
 |8 
 
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/MultiTileLayer.java
   |  277 --
 
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SingleTileLayer.java
  |  104 ++-
 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SubTile.java
  |   22 
 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TileLayer.java  
  |2 
 10 files changed, 287 insertions(+), 346 deletions(-)

New commits:
commit cd44820c0802cea1e72d765d4765f403a2a66110
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Wed Oct 1 13:53:42 2014 +0200

android: image in TileLayer can be null

Change-Id: I4a910eb60f6fe81f97933d1b9e57bac6af4547c9

diff --git 
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TileLayer.java 
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TileLayer.java
index 1ee1f1a..28ac487 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TileLayer.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TileLayer.java
@@ -28,7 +28,7 @@ public abstract class TileLayer extends Layer {
 private PaintMode mPaintMode;
 
 public TileLayer(CairoImage image, PaintMode paintMode) {
-super(image.getSize());
+super(image == null ? null : image.getSize());
 
 mPaintMode = paintMode;
 mImage = image;
commit 56163a91947bbc83a8221eea3f06649501b9dcf0
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Wed Oct 1 13:53:11 2014 +0200

android: SubTile - equals and hash

Change-Id: I6e8cf220d108cefdf16f9b4553e2d2ecd7a5338c

diff --git 
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SubTile.java 
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SubTile.java
index 5ab4f0d..27f11fc 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SubTile.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SubTile.java
@@ -22,4 +22,26 @@ public class SubTile extends SingleTileLayer {
 public void markForRemoval() {
 markedForRemoval = true;
 }
+
+@Override
+public boolean equals(Object o) {
+if (this == o) return true;
+if (o == null || getClass() != o.getClass()) return false;
+
+SubTile subTile = (SubTile) o;
+
+if (x != subTile.x) return false;
+if (y != subTile.y) return false;
+if (Float.compare(subTile.zoom, zoom) != 0) return false;
+
+return true;
+}
+
+@Override
+public int hashCode() {
+int result = x;
+result = 31 * result + y;
+result = 31 * result + (zoom != +0.0f ? Float.floatToIntBits(zoom) : 
0);
+return result;
+}
 }
commit 7825d334db021113331a409db5e93f556d1ff0c2
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Wed Oct 1 13:52:07 2014 +0200

android: SingleTileLayer - less var. trashing (Fennec update)

Change-Id: I8c32f6a43cad6dd3790a3e7dd0b990516a35ebca

diff --git 
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SingleTileLayer.java
 
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SingleTileLayer.java
index cc1988f..0bc2716 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SingleTileLayer.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SingleTileLayer.java
@@ -23,14 +23,40 @@ public class SingleTileLayer extends TileLayer {
 
 private Rect mMask;
 
-public SingleTileLayer(CairoImage image) { this(false, image); }
+// To avoid excessive GC, declare some objects here that would otherwise
+// be created and destroyed frequently during draw().
+private final RectF mBounds;
+private final RectF mTextureBounds;
+private final RectF mViewport;
+private final Rect mIntBounds;
+private final Rect mSubRect;
+private final RectF mSubRectF;
+private final Region mMaskedBounds;
+private final Rect mCropRect;
+private final RectF mObjRectF;
+private final float[] mCoords;
+
+public SingleTileLayer(CairoImage image) {
+this(false, image);
+}
 
 public SingleTileLayer(boolean repeat, CairoImage image) {
-super(image, repeat ? PaintMode.REPEAT : PaintMode.NORMAL);
+this(image, repeat ? TileLayer.PaintMode.REPEAT : 
TileLayer.PaintMode.NORMAL);
 }

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

2014-10-01 Thread Samuel Mehrbrodt

 svx/source/tbxctrls/layctrl.cxx  |2 +-
 sw/source/uibase/ribbar/workctrl.cxx |2 +-
 sw/source/uibase/ribbar/workctrl.src |   32 
 3 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 5f45400ca17d52a4ee40672ac409b6521ad86f76
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date:   Wed Oct 1 14:17:07 2014 +0200

fdo#84550 Make 'Insert field' entry dropdown only

and reorder items; rename Other to More

Change-Id: I8a6f2a68fd43af2c7c25a2d14bdad09409964037

diff --git a/sw/source/uibase/ribbar/workctrl.cxx 
b/sw/source/uibase/ribbar/workctrl.cxx
index ff70be3..6b51a18 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -286,7 +286,7 @@ SwTbxFieldCtrl::SwTbxFieldCtrl(
 pPopup(0),
 pView(0)
 {
-rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
+rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
 }
 
 SwTbxFieldCtrl::~SwTbxFieldCtrl()
diff --git a/sw/source/uibase/ribbar/workctrl.src 
b/sw/source/uibase/ribbar/workctrl.src
index 0362623..4acde4c 100644
--- a/sw/source/uibase/ribbar/workctrl.src
+++ b/sw/source/uibase/ribbar/workctrl.src
@@ -30,18 +30,6 @@ Menu RID_INSERT_FIELD_CTRL
 {
 MenuItem
 {
-Identifier = FN_INSERT_FLD_DATE ;
-HelpId = CMD_FN_INSERT_FLD_DATE ;
-Text [ en-US ] = Date ;
-};
-MenuItem
-{
-Identifier = FN_INSERT_FLD_TIME ;
-HelpId = CMD_FN_INSERT_FLD_TIME ;
-Text [ en-US ] = Time ;
-};
-MenuItem
-{
 Identifier = FN_INSERT_FLD_PGNUMBER ;
 HelpId = CMD_FN_INSERT_FLD_PGNUMBER ;
 Text [ en-US ] = Page Number ;
@@ -54,9 +42,15 @@ Menu RID_INSERT_FIELD_CTRL
 };
 MenuItem
 {
-Identifier = FN_INSERT_FLD_TOPIC ;
-HelpId = CMD_FN_INSERT_FLD_TOPIC ;
-Text [ en-US ] = Subject ;
+Identifier = FN_INSERT_FLD_DATE ;
+HelpId = CMD_FN_INSERT_FLD_DATE ;
+Text [ en-US ] = Date ;
+};
+MenuItem
+{
+Identifier = FN_INSERT_FLD_TIME ;
+HelpId = CMD_FN_INSERT_FLD_TIME ;
+Text [ en-US ] = Time ;
 };
 MenuItem
 {
@@ -72,13 +66,19 @@ Menu RID_INSERT_FIELD_CTRL
 };
 MenuItem
 {
+Identifier = FN_INSERT_FLD_TOPIC ;
+HelpId = CMD_FN_INSERT_FLD_TOPIC ;
+Text [ en-US ] = Subject ;
+};
+MenuItem
+{
 Separator = TRUE ;
 };
 MenuItem
 {
 Identifier = FN_INSERT_FIELD ;
 HelpId = CMD_FN_INSERT_FIELD ;
-Text [ en-US ] = Other... ;
+Text [ en-US ] = More... ;
 };
 };
 };
commit 92bbd7bc99103df5136b012bf3b6652a2a721ab0
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date:   Wed Oct 1 13:49:54 2014 +0200

fdo#84551 Make 'Insert table' entry dropdown only

Change-Id: I26a3f2672fa9a849c370a24a5d21162cfb2a91c5

diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 2794af2..920669e 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -704,7 +704,7 @@ SvxTableToolBoxControl::SvxTableToolBoxControl( sal_uInt16 
nSlotId, sal_uInt16 n
 SfxToolBoxControl( nSlotId, nId, rTbx ),
 bEnabled( true )
 {
-rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
+rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
 rTbx.Invalidate();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

RE: Anti-Virus vendors warnings

2014-10-01 Thread nicholas ferguson

 why isn't this wiki page referenced in the readme?  Isn't that wiki a 
 page for develpers.  What kind of developer in your world, doesn't 
 build a debug version, first?

  We used to recommend a debug version AFAIR, but the build tree on Linux 
 with debuginfo is 30Gb small - and 
with debug symbols it takes forages to link. Often it's more feasible to 
 re-build just a single module with debuginfo.
[nicholas ferguson] 
[nicholas ferguson] 
I guess its english.
Recommending a debug build...is saying on wiki how to put --enable-dbgutil into 
the autogen.input ... and then solving that wacky issue with boost.
why do you think I was asking to download a debug version. of 30G...

 Where is it mentioned how not to keep downloading the tar files? for 
 3rd party dependencies.  That alone is a HUGE COST OF ENTRY...to 
 discover how to turn that off.

  The automatic download saves manually downloading 70 or so individual 
 dependencies; you can argue that it sucks (and it does) - but doing that 
 manually sucks more =)

A build for a newcomer has to be run three or four times?  Why should the tar 
files get downloaded four times?  How does a newcomer turn it off after the 
first download?  Tor had to explain that to me.



This is another HIGH COST OF ENTRY.  I ask questions and I get answer that 
don't fit my questions.


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

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

2014-10-01 Thread PriyankaGaikwad

 sw/qa/extras/ooxmlexport/data/fdo78907.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx|   13 +
 sw/source/filter/ww8/ww8atr.cxx |2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 4e41b9b6e3da0b29f213df7745ac286bcbab6270
Author: PriyankaGaikwad priyanka.gaik...@synerzip.com
Date:   Fri May 30 17:23:45 2014 +0530

fdo#78907 fdo#82895 : File crashed while saving.

   - There is pagebreak in file and footer has nested table.
   - While exporting LO write section break instead of PAGE_BREAK.
   - Due to this it was writing two sections in file and same footer
 for both sections.
   - This was causing wrong table depth values due to this it was crashing
 while writing table.
   - So in MSWordExportBase::OutputSectionBreaks if next node has
 RES_BREAK(page break) then bNewPageDesc value should be false.

Reviewed-on: https://gerrit.libreoffice.org/9568
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
(cherry picked from commit 2df0d9d32d05f08ccf673fd0f61f650438511acb)

Change-Id: I2ccc4e48a26253716253a7280a244f06e172770a

diff --git a/sw/qa/extras/ooxmlexport/data/fdo78907.docx 
b/sw/qa/extras/ooxmlexport/data/fdo78907.docx
new file mode 100644
index 000..abae6b4
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo78907.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 18c15fa..6c46d98 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3656,6 +3656,19 @@ DECLARE_OOXMLEXPORT_TEST(testFooterBodyDistance, 
footer-body-distance.docx)
 assertXPath(pXmlDoc, /w:document/w:body/w:p/w:r/w:br, 1);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testfdo78907,fdo78907.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+assertXPath ( pXmlDoc, /w:document/w:body/w:p[1]/w:r[2]/w:br, type, 
page );
+
+xmlDocPtr pXmlDoc1 = parseExport(word/footer1.xml);
+if (!pXmlDoc1)
+return;
+assertXPath ( pXmlDoc1, 
/w:ftr[1]/w:tbl[1]/w:tr[1]/w:tc[1]/w:tbl[1]/w:tr[1]/w:tc[1]/w:tbl, 0 );
+}
+
 #endif
 
 DECLARE_OOXMLEXPORT_TEST(testMsoPosition, bnc884615-mso-position.docx)
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 6065d19..c364d20 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -478,7 +478,7 @@ void MSWordExportBase::OutputSectionBreaks( const 
SfxItemSet *pSet, const SwNode
 }
 }
 }
-
+bNewPageDesc = false; // if next node has RES_BREAK(page break) 
then bNewPageDesc value should be false.
 bBreakSet = true;
 
 if ( !bRemoveHardBreakInsideTable )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

RE: examples to manage docs using LibreOffice as a major component

2014-10-01 Thread nicholas ferguson

[nicholas ferguson] What I do understand is that Libreoffice had an internal 
architecture change after 4.0
To prove this worked, there must have been a ton of samples coded up?  
Otherwise your clients would have complained and dropped it.
where are those samples?  They should be loaded up into github as samples used 
to test the new architecture.

And if you tell me they are in cppunittests... only... and no one coded up a 
remote app that talked to libreoffice.. really?



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

Re: examples to manage docs using LibreOffice as a major component

2014-10-01 Thread David Tardon

On Wed, Oct 01, 2014 at 09:00:44AM -0400, nicholas ferguson wrote:
 [nicholas ferguson] What I do understand is that Libreoffice had an internal 
 architecture change after 4.0

No, it had not. Where did you find that information?

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

RE: examples to manage docs using LibreOffice as a major component

2014-10-01 Thread nicholas ferguson


On Wed, Oct 01, 2014 at 09:00:44AM -0400, nicholas ferguson wrote:
 [nicholas ferguson] What I do understand is that Libreoffice had an
internal architecture change after 4.0

No, it had not. Where did you find that information?

[nicholas ferguson] I have to go someplace for a meeting.  I will answer you
in about six hours.



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

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

2014-10-01 Thread Christian M . Heller

 sc/source/filter/dif/difimp.cxx  |   26 +-
 sw/qa/extras/ooxmlexport/ooxmlexport2.cxx|6 +-
 sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
 sw/source/filter/ww8/wrtw8esh.cxx|   10 +-
 sw/source/filter/ww8/wrtww8.cxx  |1 +
 sw/source/filter/ww8/wrtww8.hxx  |2 ++
 6 files changed, 31 insertions(+), 16 deletions(-)

New commits:
commit 3bbb934da7368217680e67cb76d6ecd2b4694696
Author: Christian M. Heller christian.helle...@gmail.com
Date:   Wed Oct 1 05:30:54 2014 -0400

fdo#39468 Translate German Comments - sc/cource/filter/dif

Change-Id: I1d44c2538baac9a1443118c95a2886db5098dab1
Reviewed-on: https://gerrit.libreoffice.org/11736
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index 243f6fa..2a8e187 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -121,7 +121,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream 
rIn, ScDocument* pDoc,
 }
 
 if( eTopic == T_DATA )
-{   // Ab hier kommen die Daten
+{   // data starts here
 SCCOL   nBaseCol = rInsPos.Col();
 
 SCCOL   nColCnt = SCCOL_MAX;
@@ -149,7 +149,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream 
rIn, ScDocument* pDoc,
 break;
 case D_EOD:
 break;
-case D_NUMERIC: // Numbercell
+case D_NUMERIC: // Number cell
 if( nColCnt == SCCOL_MAX )
 nColCnt = nBaseCol;
 
@@ -188,7 +188,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream 
rIn, ScDocument* pDoc,
 
 nColCnt++;
 break;
-case D_STRING:  // Textcell
+case D_STRING:  // Text cell
 if( nColCnt == SCCOL_MAX )
 nColCnt = nBaseCol;
 
@@ -221,7 +221,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream 
rIn, ScDocument* pDoc,
 
 if( bSyntErrWarn )
 
-// ACHTUNG: Hier fehlt noch die richtige Warnung!
+// FIXME: Add proper Warnung!
 return eERR_RNGOVRFLW;
 
 else if( bOverflowWarn )
@@ -369,7 +369,7 @@ TOPIC DifParser::GetNextTopic( void )
 break;
 case S_Data:
 OSL_ENSURE( aLine.getLength() = 2,
-+GetNextTopic(): String ist zu kurz! );
++GetNextTopic(): String is too short! );
 if( aLine.getLength()  2 )
 aData = aLine.copy( 1, aLine.getLength() - 2 );
 else
@@ -380,11 +380,11 @@ TOPIC DifParser::GetNextTopic( void )
 OSL_FAIL( DifParser::GetNextTopic - unexpected state );
 break;
 case S_UNKNOWN:
-// 2 Zeilen ueberlesen
+// skip 2 lines
 ReadNextLine( aLine );
 // fall-through
 case S_ERROR_L2:// Fehler in Line 2 aufgetreten
-// eine Zeile ueberlesen
+// skip 1 line
 ReadNextLine( aLine );
 eS = S_END;
 break;
@@ -418,7 +418,7 @@ DATASET DifParser::GetNumberDataset( const sal_Unicode* 
pPossibleNumericData )
 eRet = D_SYNT_ERROR;
 }
 else
-{   // ...und zur Strafe mit'm Numberformatter...
+{   // ...and for punishment, with number formatting...
 OSL_ENSURE( pNumFormatter, -DifParser::GetNextDataset(): No 
Formatter, more fun! );
 OUString aTestVal( pPossibleNumericData );
 sal_uInt32 nFormat = 0;
@@ -514,7 +514,7 @@ DATASET DifParser::GetNextDataset( void )
 }
 break;
 case '0':   // Numeric Data
-pAktBuffer++;   // Wert in fVal, 2. Zeile in aData
+pAktBuffer++;   // value in fVal, 2. line in aData
 if( *pAktBuffer == ',' )
 {
 pAktBuffer++;
@@ -636,7 +636,7 @@ bool DifParser::ScanFloatVal( const sal_Unicode* pStart )
 sal_Int32   nExp = 0;
 boolbExpNeg = false;
 boolbExpOverflow = false;
-static const sal_uInt16 nExpLimit = 4096;   // ACHTUNG: muss genauer 
ermittelt werden!
+static const sal_uInt16 nExpLimit = 4096;   // FIXME: has to be set 
more accurately!
 
 sal_Unicode cAkt;
 boolbRet = false;
@@ -774,7 +774,7 @@ bool DifParser::ScanFloatVal( const sal_Unicode* pStart )
 case S_FINDEND:
 if( IsNumberEnding( cAkt ) )
 {
-bRet = true;// damit sinnvoll weitergeparst werden

[Bug 39468] translate German comments, removing redundant ones

2014-10-01 Thread bugzilla-daemon

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

--- Comment #139 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Christian M. Heller committed a patch related to this issue.
It has been pushed to master:

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

fdo#39468 Translate German Comments - sc/cource/filter/dif



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: writerfilter/source

2014-10-01 Thread Noel Grandin

 writerfilter/source/dmapper/PropertyMap.cxx |1 -
 writerfilter/source/dmapper/PropertyMap.hxx |1 -
 2 files changed, 2 deletions(-)

New commits:
commit 5e83f36cb5221172c76d4ab363d889f30ea70aed
Author: Noel Grandin n...@peralex.com
Date:   Wed Oct 1 16:19:11 2014 +0200

-Werror,-Wunused-private-field

Change-Id: I6516c004f75e416f016042aa561a20642db70b57

diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index 6283553..adf882e 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1423,7 +1423,6 @@ StyleSheetPropertyMap::StyleSheetPropertyMap() :
 mbCT_Spacing_lineRuleSet( false ),
 mbCT_TrPrBase_tblHeaderSet( false ),
 mbCT_TrPrBase_jcSet( false ),
-mbCT_TcPrBase_vAlignSet( false ),
 mbCT_TblWidth_wSet( false ),
 mbCT_TblWidth_typeSet( false ),
 mnListId( -1 ),
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx 
b/writerfilter/source/dmapper/PropertyMap.hxx
index 24ffe1b..dcd313d 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -439,7 +439,6 @@ class StyleSheetPropertyMap : public PropertyMap, public 
ParagraphProperties
 
 boolmbCT_TrPrBase_tblHeaderSet;
 boolmbCT_TrPrBase_jcSet;
-boolmbCT_TcPrBase_vAlignSet;
 
 boolmbCT_TblWidth_wSet;
 boolmbCT_TblWidth_typeSet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - bridges/Library_cpp_uno.mk bridges/source configure.ac filter/qa sal/qa vcl/osx

2014-10-01 Thread Tor Lillqvist

 bridges/Library_cpp_uno.mk   |4 
 bridges/source/cpp_uno/gcc3_ios_arm/except.cxx   |   24 
 bridges/source/cpp_uno/gcc3_macosx_intel/call.s  |  318 ---
 bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx |  525 ---
 bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx  |  360 -
 bridges/source/cpp_uno/gcc3_macosx_intel/share.hxx   |   94 ---
 bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx |  481 -
 configure.ac |5 
 filter/qa/cppunit/xslt-test.cxx  |2 
 sal/qa/osl/process/osl_process.cxx   |2 
 vcl/osx/salframe.cxx |4 
 11 files changed, 1 insertion(+), 1818 deletions(-)

New commits:
commit 66feae0c9171a9a366dc6af3b3690358a1ef11e8
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Oct 1 11:06:44 2014 +0300

Bin leftover stray variable assignment

Change-Id: I75baf1f8b49e05702528af72b2f364a9b152d50c

diff --git a/configure.ac b/configure.ac
index 4e7c55b..93fc825 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3942,7 +3942,6 @@ darwin*)
 PLATFORMID=ios_arm
 OUTPATH=unxiosr
 OS=IOS
-SDKDIR=sdk
 ;;
 i*86)
 AC_MSG_ERROR([Can't build 64-bit code in 32-bit OS])
commit f49ff3f5769e231c08781a7598e85dca5fb8dbc9
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Oct 1 10:59:26 2014 +0300

We always build 64-bit OS X code

Change-Id: I527c66c7be1372ab5ddf86625667d2f315e9b5d3

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index 5991021..5b7377a 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -71,10 +71,6 @@ bridges_SELECTED_BRIDGE := gcc3_linux_intel
 bridge_asm_objects := call
 bridge_exception_objects := cpp2uno except uno2cpp
 bridge_noncallexception_objects := callvirtualmethod
-else ifeq ($(OS),MACOSX)
-bridges_SELECTED_BRIDGE := gcc3_macosx_intel
-bridge_asm_objects := call
-bridge_exception_objects := cpp2uno except uno2cpp
 else ifeq ($(OS),SOLARIS)
 bridges_SELECTED_BRIDGE := gcc3_solaris_intel
 bridge_exception_objects := cpp2uno except uno2cpp
diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/call.s 
b/bridges/source/cpp_uno/gcc3_macosx_intel/call.s
deleted file mode 100644
index a39a855..000
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/call.s
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the License); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-.text
-
-.align 1, 0x90
-.globl _privateSnippetExecutorGeneral
-_privateSnippetExecutorGeneral:
-LFBg:
-movl%esp,%ecx
-pushl   %ebp  # proper stack frame needed for exception 
handling
-LCFIg0:
-movl%esp,%ebp
-LCFIg1:
-subl$0x8,%esp # padding + 32bit returnValue
-pushl   %esp  # 32bit returnValue
-pushl   %ecx  # 32bit pCallStack
-pushl   %edx  # 32bit nVtableOffset
-pushl   %eax  # 32bit nFunctionIndex
-callL_cpp_vtable_call$stub
-movl16(%esp),%eax # 32bit returnValue
-leave
-ret
-LFEg:
-.long   .-_privateSnippetExecutorGeneral
-
-.align 1, 0x90
-.globl _privateSnippetExecutorVoid
-_privateSnippetExecutorVoid:
-LFBv:
-movl%esp,%ecx
-pushl   %ebp  # proper stack frame needed for exception 
handling
-LCFIv0:
-movl%esp,%ebp
-LCFIv1:
-sub $8,%esp   # padding
-pushl   $0# 32bit null pointer (returnValue not used)
-pushl   %ecx  # 32bit pCallStack
-pushl   %edx  # 32bit nVtableOffset
-pushl   %eax  # 32bit nFunctionIndex
-callL_cpp_vtable_call$stub
-leave
-ret
-LFEv:
-.long   .-_privateSnippetExecutorVoid
-
-.align 1, 0x90
-.globl _privateSnippetExecutorHyper
-_privateSnippetExecutorHyper:
-LFBh:
-movl%esp,%ecx
-pushl   %ebp  # proper stack frame needed for exception 
handling
-LCFIh0:
-movl%esp,%ebp
-LCFIh1:
-subl$0x8,%esp # 64bit returnValue
-pushl   %esp  # 32bit returnValue
-pushl   %ecx  # 32bit pCallStack

[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress3' - android/experimental configure.ac

2014-10-01 Thread Jan Holesovsky

 android/experimental/LOAndroid3/AndroidManifest.xml|   84 -
 android/experimental/LOAndroid3/AndroidManifest.xml.in |   84 +
 configure.ac   |8 +
 3 files changed, 91 insertions(+), 85 deletions(-)

New commits:
commit 1f3505f01bf62cfb6885258c1babb06f61811ca8
Author: Jan Holesovsky ke...@collabora.com
Date:   Wed Oct 1 17:01:59 2014 +0200

android: android:debuggable setting now depends on configure options.

Change-Id: I12d9c05fb05e4cf202c5c0d7b7e87c145d163fea

diff --git a/android/experimental/LOAndroid3/AndroidManifest.xml 
b/android/experimental/LOAndroid3/AndroidManifest.xml.in
similarity index 99%
rename from android/experimental/LOAndroid3/AndroidManifest.xml
rename to android/experimental/LOAndroid3/AndroidManifest.xml.in
index 83608b8..cfd369a 100644
--- a/android/experimental/LOAndroid3/AndroidManifest.xml
+++ b/android/experimental/LOAndroid3/AndroidManifest.xml.in
@@ -11,7 +11,7 @@
 uses-permission android:name=android.permission.WRITE_EXTERNAL_STORAGE/
 
 application
-android:debuggable=true
+@ANDROID_DEBUGGABLE@
 android:allowBackup=true
 android:icon=@drawable/main
 android:label=@string/app_name
diff --git a/configure.ac b/configure.ac
index 4bb0b5b..ed5b1ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3779,15 +3779,19 @@ if test -n $ENABLE_DBGUTIL; then
 AC_MSG_ERROR([--disable-debug cannot be used with --enable-dbgutil])
 fi
 ENABLE_DEBUG=TRUE
+ANDROID_DEBUGGABLE='android:debuggable=true'
 AC_MSG_RESULT([yes (dbgutil)])
 elif test -n $enable_debug  test $enable_debug != no; then
 ENABLE_DEBUG=TRUE
+ANDROID_DEBUGGABLE='android:debuggable=true'
 AC_MSG_RESULT([yes])
 else
 ENABLE_DEBUG=
+ANDROID_DEBUGGABLE=
 AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_DEBUG)
+AC_SUBST(ANDROID_DEBUGGABLE)
 
 dnl Selective debuginfo
 ENABLE_DEBUGINFO_FOR=
@@ -4443,6 +4447,7 @@ if test $cross_compiling = yes; then
 bin/get_config_variables \
 solenv/bin/getcompver.awk \
 solenv/inc/langlist.mk \
+android/experimental/LOAndroid3/AndroidManifest.xml.in \
 config_host.mk.in \
 Makefile.in \
 lo.xcent.in \
@@ -12789,7 +12794,8 @@ if test -f config_host.mk; then
 config_md5=`$MD5SUM config_host.mk | sed s/ .*//`
 fi
 
-AC_CONFIG_FILES([config_host.mk
+AC_CONFIG_FILES([android/experimental/LOAndroid3/AndroidManifest.xml
+ config_host.mk
  Makefile
  lo.xcent
  instsetoo_native/util/openoffice.lst
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: android/experimental configure.ac

2014-10-01 Thread Jan Holesovsky

 android/experimental/LOAndroid3/AndroidManifest.xml|   84 -
 android/experimental/LOAndroid3/AndroidManifest.xml.in |   84 +
 configure.ac   |8 +
 3 files changed, 91 insertions(+), 85 deletions(-)

New commits:
commit 25b110cd13b63310a41d5edbda36a8871349858d
Author: Jan Holesovsky ke...@collabora.com
Date:   Wed Oct 1 17:01:59 2014 +0200

android: android:debuggable setting now depends on configure options.

Change-Id: I12d9c05fb05e4cf202c5c0d7b7e87c145d163fea

diff --git a/android/experimental/LOAndroid3/AndroidManifest.xml 
b/android/experimental/LOAndroid3/AndroidManifest.xml.in
similarity index 99%
rename from android/experimental/LOAndroid3/AndroidManifest.xml
rename to android/experimental/LOAndroid3/AndroidManifest.xml.in
index 83608b8..cfd369a 100644
--- a/android/experimental/LOAndroid3/AndroidManifest.xml
+++ b/android/experimental/LOAndroid3/AndroidManifest.xml.in
@@ -11,7 +11,7 @@
 uses-permission android:name=android.permission.WRITE_EXTERNAL_STORAGE/
 
 application
-android:debuggable=true
+@ANDROID_DEBUGGABLE@
 android:allowBackup=true
 android:icon=@drawable/main
 android:label=@string/app_name
diff --git a/configure.ac b/configure.ac
index 93fc825..4e2eec9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3760,15 +3760,19 @@ if test -n $ENABLE_DBGUTIL; then
 AC_MSG_ERROR([--disable-debug cannot be used with --enable-dbgutil])
 fi
 ENABLE_DEBUG=TRUE
+ANDROID_DEBUGGABLE='android:debuggable=true'
 AC_MSG_RESULT([yes (dbgutil)])
 elif test -n $enable_debug  test $enable_debug != no; then
 ENABLE_DEBUG=TRUE
+ANDROID_DEBUGGABLE='android:debuggable=true'
 AC_MSG_RESULT([yes])
 else
 ENABLE_DEBUG=
+ANDROID_DEBUGGABLE=
 AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_DEBUG)
+AC_SUBST(ANDROID_DEBUGGABLE)
 
 dnl Selective debuginfo
 ENABLE_DEBUGINFO_FOR=
@@ -4419,6 +4423,7 @@ if test $cross_compiling = yes; then
 bin/get_config_variables \
 solenv/bin/getcompver.awk \
 solenv/inc/langlist.mk \
+android/experimental/LOAndroid3/AndroidManifest.xml.in \
 config_host.mk.in \
 Makefile.in \
 lo.xcent.in \
@@ -12779,7 +12784,8 @@ if test -f config_host.mk; then
 config_md5=`$MD5SUM config_host.mk | sed s/ .*//`
 fi
 
-AC_CONFIG_FILES([config_host.mk
+AC_CONFIG_FILES([android/experimental/LOAndroid3/AndroidManifest.xml
+ config_host.mk
  Makefile
  lo.xcent
  instsetoo_native/util/openoffice.lst
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-01 Thread Kohei Yoshida

 sc/Library_sc.mk |1 
 sc/inc/column.hxx|1 
 sc/inc/document.hxx  |2 
 sc/inc/documentimport.hxx|   19 +
 sc/inc/numformat.hxx |   46 ++
 sc/inc/table.hxx |4 -
 sc/source/core/data/column.cxx   |5 -
 sc/source/core/data/column2.cxx  |4 +
 sc/source/core/data/document.cxx |8 --
 sc/source/core/data/documentimport.cxx   |   82 +++--
 sc/source/core/data/table2.cxx   |   86 ++-
 sc/source/core/tool/numformat.cxx|   82 +
 sc/source/filter/excel/xistyle.cxx   |   24 ---
 sc/source/filter/excel/xlroot.cxx|   21 ++
 sc/source/filter/inc/numberformatsbuffer.hxx |4 -
 sc/source/filter/inc/stylesbuffer.hxx|   16 -
 sc/source/filter/inc/xlroot.hxx  |   10 ++-
 sc/source/filter/oox/numberformatsbuffer.cxx |   16 +++--
 sc/source/filter/oox/sheetdatabuffer.cxx |   28 +---
 sc/source/filter/oox/stylesbuffer.cxx|   34 +++---
 sc/source/filter/xml/xmlimprt.cxx|   29 -
 sc/source/ui/view/viewfun2.cxx   |2 
 22 files changed, 391 insertions(+), 133 deletions(-)

New commits:
commit 2ef1124f78c063a8dccff19ecbbc9eb480584243
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Oct 1 11:12:49 2014 -0400

Exit early in case the column has no cell notes to copy to destination.

Change-Id: Ifca77ccda7b2065b00ee29f29f377da599929843

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index e038da3b..5a6b50b 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1695,6 +1695,10 @@ public:
 void ScColumn::CopyCellNotesToDocument(
 SCROW nRow1, SCROW nRow2, ScColumn rDestCol, bool bCloneCaption, SCROW 
nRowOffsetDest ) const
 {
+if (IsNotesEmptyBlock(nRow1, nRow2))
+// The column has no cell notes to copy between specified rows.
+return;
+
 ScDrawLayer *pDrawLayer = rDestCol.GetDoc().GetDrawLayer();
 bool bWasLocked = bool();
 if (pDrawLayer)
commit 67eb4b77305205e3495d6542e947404d37a190ae
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Tue Sep 30 23:28:41 2014 -0400

Set latin script to numeric blocks of applicable columns.

Change-Id: Ib81ef144f168fed38100127bd63f43ea5a835a13

diff --git a/sc/source/core/data/documentimport.cxx 
b/sc/source/core/data/documentimport.cxx
index e27a38a..29f912f 100644
--- a/sc/source/core/data/documentimport.cxx
+++ b/sc/source/core/data/documentimport.cxx
@@ -23,6 +23,27 @@
 #include attarray.hxx
 
 #include svl/sharedstringpool.hxx
+#include svl/languageoptions.hxx
+
+#include vector
+
+namespace {
+
+struct ColAttr
+{
+bool mbLatinNumFmtOnly;
+
+ColAttr() : mbLatinNumFmtOnly(false) {}
+};
+
+struct TabAttr
+{
+std::vectorColAttr maCols;
+};
+
+typedef std::vectorTabAttr TabAttrsType;
+
+}
 
 struct ScDocumentImportImpl
 {
@@ -31,11 +52,28 @@ struct ScDocumentImportImpl
 sc::ColumnBlockPositionSet maBlockPosSet;
 sal_uInt16 mnDefaultScriptNumeric;
 
+TabAttrsType maTabAttrs;
+
 ScDocumentImportImpl(ScDocument rDoc) :
 mrDoc(rDoc),
 maListenCxt(rDoc),
 maBlockPosSet(rDoc),
 mnDefaultScriptNumeric(SC_SCRIPTTYPE_UNKNOWN) {}
+
+ColAttr* getColAttr( size_t nTab, size_t nCol )
+{
+if (nTab  static_castsize_t(MAXTAB) || nCol  
static_castsize_t(MAXCOL))
+return NULL;
+
+if (nTab = maTabAttrs.size())
+maTabAttrs.resize(nTab+1);
+
+TabAttr rTab = maTabAttrs[nTab];
+if (nCol = rTab.maCols.size())
+rTab.maCols.resize(nCol+1);
+
+return rTab.maCols[nCol];
+}
 };
 
 ScDocumentImport::Attrs::Attrs() : mpData(NULL), mnSize(0), 
mbLatinNumFmtOnly(false) {}
@@ -421,6 +459,10 @@ void ScDocumentImport::setAttrEntries( SCTAB nTab, SCCOL 
nCol, Attrs rAttrs )
 if (!pCol)
 return;
 
+ColAttr* pColAttr = mpImpl-getColAttr(nTab, nCol);
+if (pColAttr)
+pColAttr-mbLatinNumFmtOnly = rAttrs.mbLatinNumFmtOnly;
+
 pCol-pAttrArray-SetAttrEntries(rAttrs.mpData, rAttrs.mnSize);
 }
 
@@ -450,14 +492,16 @@ class CellStoreInitializer
 {}
 };
 
-ScDocument mrDoc;
-sc::StartListeningContext mrListenCxt;
+ScDocumentImportImpl mrDocImpl;
+SCTAB mnTab;
+SCCOL mnCol;
 
 public:
-CellStoreInitializer(ScDocument rDoc, sc::StartListeningContext rCxt, 
sal_uInt16 nScriptNumeric) :
-mrDoc(rDoc),
-mrListenCxt(rCxt),
-mpImpl(new Impl(MAXROWCOUNT, nScriptNumeric))
+CellStoreInitializer( ScDocumentImportImpl rDocImpl, SCTAB nTab, SCCOL 
nCol ) :
+mrDocImpl(rDocImpl),
+mnTab(nTab),
+mnCol(nCol),
+mpImpl(new

[Bug 65675] LibreOffice 4.2 most annoying bugs

2014-10-01 Thread bugzilla-daemon

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

Joel Madero jmadero@gmail.com changed:

   What|Removed |Added

 Depends on||84556

-- 
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 65675] LibreOffice 4.2 most annoying bugs

2014-10-01 Thread bugzilla-daemon

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

--- Comment #220 from Joel Madero jmadero@gmail.com ---
Added bug 84556 - regression + loss of data + bibisected
Savings a relatively straight forward spreadsheet as xls causes loss of data
screwing up formulas

-- 
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 'feature/droid_calcimpress3' - 2 commits - android/experimental

2014-10-01 Thread Tomaž Vajngerl

 android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java   
  |5 
 android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java  
  |5 ++--
 
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java
 |7 +
 
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
 |   12 +-
 4 files changed, 11 insertions(+), 18 deletions(-)

New commits:
commit 65bf7c7e0bdeb6c59edd081695ea4092a81d24b9
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Wed Oct 1 17:46:03 2014 +0200

android: fix redrawing everyting on part change (via sidebar)

Change-Id: If7aeeca3da65f44dfe1f9a5bc347baf4e3cadd82

diff --git 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index 54478bf..31b9eb5 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -46,10 +46,11 @@ public class LOKitThread extends Thread {
 
mApplication.getLayerController().getView().changeCheckerboardBitmap(bitmap, 
mTileProvider.getPageWidth(), mTileProvider.getPageHeight());
 }
 
-mLayerClient.clearAllTiles();
-
+mLayerClient.clearAndResetlayers();
+draw();
 RectF rect = new RectF(0, 0, mTileProvider.getPageWidth(), 
mTileProvider.getPageHeight());
 mController.setPageRect(rect, rect);
+mController.setViewportMetrics(mController.getViewportMetrics());
 mController.setForceRedraw();
 }
 
diff --git 
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java
 
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java
index c6c7d7938..1ad8d38 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java
@@ -195,7 +195,7 @@ public class DynamicTileLayer extends Layer {
 }
 }
 
-public void clearAllTiles() {
+public void clearAndReset() {
 tiles.clear();
 currentViewport = new RectF();
 }
diff --git 
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
 
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
index 5905d4a..23095ef 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
@@ -264,8 +264,8 @@ public class GeckoLayerClient implements LayerView.Listener 
{
 mRootLayer.reevaluateTiles(mLayerController.getViewportMetrics());
 }
 
-public void clearAllTiles() {
-mRootLayer.clearAllTiles();
+public void clearAndResetlayers() {
+mRootLayer.clearAndReset();
 }
 
 private class AdjustRunnable implements Runnable {
commit ecd6cc3014d9039f48b2bbd7bfcea3e6d433c15c
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Wed Oct 1 17:41:02 2014 +0200

android: null safeguards and cleanup unneeded calls

Change-Id: I0ffcfb0fbaa03e5035bec9dd1ffed21f85972470

diff --git 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
index 859a3d8..332e0f8 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
@@ -3,7 +3,6 @@ package org.libreoffice;
 
 import android.os.Handler;
 import android.util.DisplayMetrics;
-import android.util.Log;
 
 
 public class LOKitShell {
@@ -20,10 +19,6 @@ public class LOKitShell {
 }
 }
 
-public static void viewSizeChanged() {
-Log.i(LOGTAG, viewSizeChanged);
-}
-
 // Get a Handler for the main java thread
 public static Handler getMainHandler() {
 return LibreOfficeMainActivity.mAppContext.mMainHandler;
diff --git 
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java
 
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java
index 03da4bf..c6c7d7938 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java
@@ -131,6 +131,10 @@ public class DynamicTileLayer extends Layer {
 }
 
 public void reevaluateTiles(ImmutableViewportMetrics viewportMetrics) {
+if (tileProvider == null) {
+return;
+}
+
 RectF newCurrentViewPort = 
inflate(roundToTileSize(viewportMetrics.getViewport(), tileSize), tileSize);
 
 if

Main-loop / idle handler bits ...

2014-10-01 Thread Michael Meeks

Hi Florian,

On Wed, 2014-10-01 at 16:55 +0200, Florian Haftmann wrote:
 The current matter of affairs is now documented in the Wiki.
 https://wiki.documentfoundation.org/Development/LHM_LiMux#Priority_Main_Loop

 To be continued…

Yep - a very helpful table there. I've asked to have that sorted by
timeout not source-location; and to have all the UI related timeouts
split to their own section - clearly we don't want to screw with those -
humans don't get faster reactions with better CPUs ;-)

Then we should rank and prioritise all the small value timeouts into a
series of grouped 'idle' priorities [ some integer ranking I guess cf.
glib idle handlers ] which we can use in place of any timeout to ensure
these are executed as quickly as possible (absent any other timeout) but
in a way that makes reasonable sense =)

Does that make sense ?

Thanks !

Michael.

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

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

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

2014-10-01 Thread Michael Stahl

 chart2/qa/extras/charttest.hxx |   16 +---
 svx/source/unodraw/unomod.cxx  |2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 3dc108c8e3df0ec26ef33e83c481eff6d629e5b7
Author: Michael Stahl mst...@redhat.com
Date:   Wed Oct 1 18:27:03 2014 +0200

svx: little more verbose exception message

Change-Id: I93d5d899fa073cd7ed18e9176b50679b0be95f70

diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 80999d4..4559088 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -191,7 +191,7 @@ css::uno::Referencecss::uno::XInterface create(
 
 uno::Reference uno::XInterface  xRet( 
SvxUnoDrawMSFactory::createTextField( rServiceSpecifier ) );
 if( !xRet.is() )
-throw lang::ServiceNotRegisteredException();
+throw lang::ServiceNotRegisteredException(unknown service:  + 
rServiceSpecifier);
 
 return xRet;
 }
commit 610544eda1f1add0ba9b184fe7c2bed56f050fc1
Author: Michael Stahl mst...@redhat.com
Date:   Wed Oct 1 18:25:47 2014 +0200

chart2: fix the testDataLabelBordersDOCX on Mac

This test failed on Mac because it depends on the layout being finished,
since for SwXTextEmbeddedObjects the corresponding SwVirtFlyDrawObj are
inserted in the draw page not on import, but in layout.

Change-Id: I731b9b92838252ff50135f97343357992bc1933f

diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx
index a76a76c..ad2cd55 100644
--- a/chart2/qa/extras/charttest.hxx
+++ b/chart2/qa/extras/charttest.hxx
@@ -49,6 +49,7 @@
 #include com/sun/star/drawing/XDrawPageSupplier.hpp
 #include com/sun/star/drawing/FillStyle.hpp
 #include com/sun/star/chart/XChartDocument.hpp
+#include com/sun/star/text/XTextEmbeddedObjectsSupplier.hpp
 #include com/sun/star/util/XNumberFormatsSupplier.hpp
 #include com/sun/star/util/NumberFormat.hpp
 
@@ -458,13 +459,14 @@ uno::Referencechart::XChartDocument 
ChartTest::getChartDocFromDrawImpress(
 
 uno::Referencechart::XChartDocument ChartTest::getChartDocFromWriter( 
sal_Int32 nShape )
 {
-Referencedrawing::XDrawPageSupplier xPageSupp(mxComponent, 
uno::UNO_QUERY);
-CPPUNIT_ASSERT(xPageSupp.is());
-
-Referencedrawing::XDrawPage xPage = xPageSupp-getDrawPage();
-CPPUNIT_ASSERT(xPage.is());
-
-Referencebeans::XPropertySet xShapeProps(xPage-getByIndex(nShape), 
uno::UNO_QUERY);
+// DO NOT use XDrawPageSupplier since SwVirtFlyDrawObj are not created
+// during import, only in layout!
+Referencetext::XTextEmbeddedObjectsSupplier xEOS(mxComponent, 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xEOS.is());
+Referencecontainer::XIndexAccess xEmbeddeds(xEOS-getEmbeddedObjects(), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xEmbeddeds.is());
+
+Referencebeans::XPropertySet xShapeProps(xEmbeddeds-getByIndex(nShape), 
uno::UNO_QUERY);
 CPPUNIT_ASSERT(xShapeProps.is());
 
 Referenceframe::XModel xDocModel;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cppcanvas/source lotuswordpro/source sc/source sd/source ucb/source

2014-10-01 Thread Stephan Bergmann

 cppcanvas/source/mtfrenderer/transparencygroupaction.cxx |4 
 lotuswordpro/source/filter/lwppara1.cxx  |2 --
 sc/source/filter/html/htmlpars.cxx   |4 
 sc/source/ui/unoobj/servuno.cxx  |2 --
 sd/source/ui/framework/factories/ChildWindowPane.cxx |2 --
 sd/source/ui/sidebar/MasterPagesSelector.cxx |2 --
 ucb/source/ucp/webdav-neon/webdavcontent.cxx |2 --
 7 files changed, 18 deletions(-)

New commits:
commit 1eb35713bc985dea2e8db7a082f03b34fd4b45d2
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Oct 1 18:44:15 2014 +0200

Remove leftover SAL_WNODEPRECATED_DECLARATIONS_PUSH/POP

...from times when code used std::auto_ptr.

Change-Id: Ia4eca8b0b95a8846886884404009e895daba8a22

diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx 
b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index a326308..fa91a85 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -144,7 +144,6 @@ namespace cppcanvas
   aLocalTransformation );
 }
 
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
 TransparencyGroupAction::TransparencyGroupAction( MtfAutoPtr 
 rGroupMtf,
   
GradientAutoPtr rAlphaGradient,
   const 
Renderer::Parameters   rParms,
@@ -176,7 +175,6 @@ namespace cppcanvas
 maLastSubset.mnSubsetBegin = 0;
 maLastSubset.mnSubsetEnd = -1;
 }
-SAL_WNODEPRECATED_DECLARATIONS_POP
 
 // TODO(P3): The whole float transparency handling is a mess,
 // this should be refactored. What's more, the old idea of
@@ -478,7 +476,6 @@ namespace cppcanvas
 
 }
 
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
 ActionSharedPtr 
TransparencyGroupActionFactory::createTransparencyGroupAction( MtfAutoPtr 
rGroupMtf,

GradientAutoPtrrAlphaGradient,

const Renderer::Parameters  rParms,
@@ -495,7 +492,6 @@ namespace cppcanvas
 rCanvas,
 rState ) );
 }
-SAL_WNODEPRECATED_DECLARATIONS_POP
 
 }
 }
diff --git a/lotuswordpro/source/filter/lwppara1.cxx 
b/lotuswordpro/source/filter/lwppara1.cxx
index 834174f..c9a83d9 100644
--- a/lotuswordpro/source/filter/lwppara1.cxx
+++ b/lotuswordpro/source/filter/lwppara1.cxx
@@ -354,13 +354,11 @@ void LwpPara::OverrideParaBorder(LwpParaProperty* pProps, 
XFParaStyle* pOverStyl
 }
 
 LwpOverride* pBorder = pParaStyle-GetParaBorder();
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
 boost::scoped_ptrLwpParaBorderOverride pFinalBorder(
 pBorder
 ? polymorphic_downcastLwpParaBorderOverride*(pBorder-clone())
 : new LwpParaBorderOverride)
 ;
-SAL_WNODEPRECATED_DECLARATIONS_POP
 
 // get local border
 pBorder = 
static_castLwpParaBorderProperty*(pProps)-GetLocalParaBorder();
diff --git a/sc/source/filter/html/htmlpars.cxx 
b/sc/source/filter/html/htmlpars.cxx
index 48e1d96..139ac8f 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -2373,7 +2373,6 @@ void ScHTMLTable::CreateNewEntry( const ImportInfo rInfo 
)
 mxCurrEntry-aSel = rInfo.aSelection;
 }
 
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
 void ScHTMLTable::ImplPushEntryToList( ScHTMLEntryList rEntryList, 
ScHTMLEntryPtr rxEntry )
 {
 // HTML entry list does not own the entries
@@ -2381,9 +2380,7 @@ void ScHTMLTable::ImplPushEntryToList( ScHTMLEntryList 
rEntryList, ScHTMLEntryP
 // mrEEParseList (reference to member of ScEEParser) owns the entries
 mrEEParseList.push_back( rxEntry.release() );
 }
-SAL_WNODEPRECATED_DECLARATIONS_POP
 
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
 bool ScHTMLTable::PushEntry( ScHTMLEntryPtr rxEntry )
 {
 bool bPushed = false;
@@ -2411,7 +2408,6 @@ bool ScHTMLTable::PushEntry( ScHTMLEntryPtr rxEntry )
 }
 return bPushed;
 }
-SAL_WNODEPRECATED_DECLARATIONS_POP
 
 bool ScHTMLTable::PushEntry( const ImportInfo rInfo, bool bLastInCell )
 {
diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx
index 0d88e64..946c3e1 100644
--- a/sc/source/ui/unoobj/servuno.cxx
+++ b/sc/source/ui/unoobj/servuno.cxx
@@ -584,9 +584,7 @@ uno::Referenceuno::XInterface 
ScServiceProvider::MakeInstance(
 ScAddress aAddress;
 ScCompiler* pComp = new ScCompiler(rDoc,aAddress);

[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress3' - 2 commits - android/experimental

2014-10-01 Thread Tomaž Vajngerl

 android/experimental/LOAndroid3/res/layout/about.xml   
   |   13 +-
 android/experimental/LOAndroid3/res/values/strings.xml 
   |   10 ---
 
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
 |   10 +--
 3 files changed, 20 insertions(+), 13 deletions(-)

New commits:
commit 13ecf84e85d7511dce76238b4fcc1f1dc0b5c29b
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Wed Oct 1 19:56:01 2014 +0200

android: about dialog description, app names - viewer  browser

Change-Id: I4f759b6a004ca8f12974f3d0daa9f1d78c015f2a

diff --git a/android/experimental/LOAndroid3/res/layout/about.xml 
b/android/experimental/LOAndroid3/res/layout/about.xml
index f1222dc..ec014a0 100644
--- a/android/experimental/LOAndroid3/res/layout/about.xml
+++ b/android/experimental/LOAndroid3/res/layout/about.xml
@@ -12,17 +12,18 @@
 android:layout_height=wrap_content
 android:text=@string/app_description
 android:textColor=@android:color/secondary_text_light
-android:textSize=16sp/
+android:textSize=18sp/
 
 TextView
 android:id=@+id/about_credits
 android:layout_width=match_parent
 android:layout_height=wrap_content
 android:autoLink=web
+android:paddingBottom=20dip
 android:paddingTop=20dip
 android:text=@string/app_credits
 android:textColor=@android:color/secondary_text_light
-android:textSize=16dip/
+android:textSize=18dip/
 
 LinearLayout xmlns:android=http://schemas.android.com/apk/res/android;
   android:layout_width=match_parent
@@ -33,15 +34,15 @@
 android:id=@+id/about_license_button
 android:layout_width=wrap_content
 android:layout_height=wrap_content
-android:text=License
-/
+android:layout_marginRight=12dp
+android:text=License/
 
 Button
 android:id=@+id/about_notice_button
 android:layout_width=wrap_content
 android:layout_height=wrap_content
-android:text=Notice
-/
+android:layout_marginRight=12dp
+android:text=Notice/
 /LinearLayout
 
 /LinearLayout
\ No newline at end of file
diff --git a/android/experimental/LOAndroid3/res/values/strings.xml 
b/android/experimental/LOAndroid3/res/values/strings.xml
index 74dee00..d04f92e 100644
--- a/android/experimental/LOAndroid3/res/values/strings.xml
+++ b/android/experimental/LOAndroid3/res/values/strings.xml
@@ -1,11 +1,13 @@
 ?xml version=1.0 encoding=utf-8?
 resources
 
-string name=app_nameLibreOffice/string
-string name=app_descriptionDescription/string
-string name=app_creditsCredits/string
+string name=app_nameLibreOffice Viewer/string
 
-string name=browser_app_nameLibreOfficeUI/string
+string name=app_about_namebLibreOffice Viewer \'Beta\'/b/string
+string name=app_descriptionLibreOffice Viewer is an document viewer 
based on LibreOffice/string
+string name=app_creditshttp://www.libreoffice.com/string
+
+string name=browser_app_nameLibreOffice Browser/string
 string name=menu_searchSearch/string
 string name=list_viewList/string
 string name=grid_viewGrid/string
commit c733d163136de22c73a9c25bdb05a90a342f7bd4
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Wed Oct 1 19:54:08 2014 +0200

android: clicking Parts in preferences opens the side drawer

Change-Id: I3cfd0a31409f6a798c933dae4a47b75e93601f6b

diff --git 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index a37438e..1fce7d4 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -63,9 +63,13 @@ public class LibreOfficeMainActivity extends Activity {
 @Override
 public boolean onOptionsItemSelected(MenuItem item) {
 int id = item.getItemId();
-if (id == R.id.action_about) {
-showAbout();
-return true;
+switch (id) {
+case R.id.action_about:
+showAbout();
+return true;
+case R.id.action_parts:
+mDrawerLayout.openDrawer(mDrawerList);
+return true;
 }
 return super.onOptionsItemSelected(item);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 75025] LibreOffice 4.3 most annoying bugs

2014-10-01 Thread bugzilla-daemon

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

Norbert X nrb...@gmail.com changed:

   What|Removed |Added

 Depends on||37960

--- Comment #70 from Norbert X nrb...@gmail.com ---
nominate bug 37960 Shift click to select multiple drawings does not work if
picture there

-- 
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: forms/qa

2014-10-01 Thread Robert Antoni Buj i Gelonch

 forms/qa/complex/forms/CheckOGroupBoxModel.java |8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 4173bc5f7e1849a706c7cb9dcb34f7edfa9e7d1f
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date:   Tue Sep 30 16:58:51 2014 +0200

forms: enhanced for loop

Change-Id: I0c83d6fce9440f5d8b23e5f1bfca71d8f61d056b
Reviewed-on: https://gerrit.libreoffice.org/11719
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/forms/qa/complex/forms/CheckOGroupBoxModel.java 
b/forms/qa/complex/forms/CheckOGroupBoxModel.java
index b76cda3..03eb496 100644
--- a/forms/qa/complex/forms/CheckOGroupBoxModel.java
+++ b/forms/qa/complex/forms/CheckOGroupBoxModel.java
@@ -129,11 +129,8 @@ public class CheckOGroupBoxModel
 Property[] properties = 
m_xPropSet.getPropertySetInfo().getProperties();
 ArrayListString tNames = new ArrayListString();
 
-for (int i = 0; i  properties.length; i++)
+for (Property property : properties)
 {
-
-Property property = properties[i];
-String name = property.Name;
 boolean isWritable = ((property.Attributes
  PropertyAttribute.READONLY) == 0);
 boolean isNotNull = ((property.Attributes
@@ -143,9 +140,8 @@ public class CheckOGroupBoxModel
 
 if (isWritable  isNotNull  isBound)
 {
-tNames.add(name);
+tNames.add(property.Name);
 }
-
 } // endfor
 
 //get a array of bound properties
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-01 Thread bugzilla-daemon

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

--- Comment #41 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Takeshi Abe committed a patch related to this issue.
It has been pushed to master:

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

fdo#75757: remove inheritance to std::vector



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

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

[Bug 47653] Create VirtualBox image to generate stacktraces for crashes

2014-10-01 Thread bugzilla-daemon

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

--- Comment #7 from Philipp Weissenbacher p.weissenbac...@gmail.com ---
(In reply to comment #6)
 I can create these images, if you can tell me which OS version and which
 Libre Office version you want to install?

I think we would want to replicate the user's system as much as possible. So,
the OS and LO version would depend on the bug report.

For Linux, we could put http://www.vagrantup.com/ to good use.

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

2014-10-01 Thread Takeshi Abe

 sfx2/source/control/shell.cxx |   23 +++
 1 file changed, 7 insertions(+), 16 deletions(-)

New commits:
commit af046d12d27bc4f87a3c0142dba749d21c8eec7d
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Mon Sep 29 23:33:31 2014 +0900

fdo#75757: remove inheritance to std::map

from SfxItemPtrMap.

Change-Id: Id7e9667f9b918afaf92d9e71bf0e2c2e9c296474
Reviewed-on: https://gerrit.libreoffice.org/11696
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 29b2d1a..9ad1b8a 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -44,19 +44,11 @@
 #include sfx2/msgpool.hxx
 #include sidebar/ContextChangeBroadcaster.hxx
 
-#include map
+#include boost/ptr_container/ptr_map.hpp
 #include boost/ptr_container/ptr_vector.hpp
 
 // Maps the Which() field to a pointer to a SfxPoolItem
-class SfxItemPtrMap : public std::mapsal_uInt16, SfxPoolItem*
-{
-public:
-~SfxItemPtrMap()
-{
-for(iterator it = begin(); it != end(); ++it)
-delete it-second;
-}
-};
+typedef boost::ptr_mapsal_uInt16, SfxPoolItem SfxItemPtrMap;
 
 TYPEINIT0(SfxShell);
 
@@ -164,7 +156,7 @@ const SfxPoolItem* SfxShell::GetItem
 sal_uInt16  nSlotId // Slot-Id of the querying SfxPoolItems
 )   const
 {
-SfxItemPtrMap::iterator it = pImp-aItems.find( nSlotId );
+SfxItemPtrMap::const_iterator it = pImp-aItems.find( nSlotId );
 if( it != pImp-aItems.end() )
 return it-second;
 return 0;
@@ -183,15 +175,14 @@ void SfxShell::PutItem
 // MSC made a mess here of WNT/W95, beware of changes
 SfxPoolItem *pItem = rItem.Clone();
 SfxPoolItemHint aItemHint( pItem );
-const sal_uInt16 nWhich = rItem.Which();
+sal_uInt16 nWhich = rItem.Which();
 
 SfxItemPtrMap::iterator it = pImp-aItems.find( nWhich );
 if( it != pImp-aItems.end() )
 {
-SfxPoolItem *pLoopItem = it-second;
 // Replace Item
-delete pLoopItem;
-it-second = pItem;
+pImp-aItems.erase( it );
+pImp-aItems.insert( nWhich, pItem );
 
 // if active, notify Bindings
 SfxDispatcher *pDispat = GetDispatcher();
@@ -212,7 +203,7 @@ void SfxShell::PutItem
 else
 {
 Broadcast( aItemHint );
-pImp-aItems[ pItem-Which() ] = pItem;
+pImp-aItems.insert( nWhich, pItem );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-01 Thread bugzilla-daemon

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

--- Comment #42 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Takeshi Abe committed a patch related to this issue.
It has been pushed to master:

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

fdo#75757: remove inheritance to std::map



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: qadevOOo/runner

2014-10-01 Thread Robert Antoni Buj i Gelonch

 qadevOOo/runner/base/java_fat_service.java |   35 +++--
 1 file changed, 14 insertions(+), 21 deletions(-)

New commits:
commit 58d07a1e9574c1ecdd09e924357caaebc82cac62
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date:   Wed Oct 1 21:12:34 2014 +0200

runner: Avoid a possible NullPointerException with tCase Object

Change-Id: Ie1202b7fa89306ea2a99031b9347b657039b839e
Reviewed-on: https://gerrit.libreoffice.org/11750
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/qadevOOo/runner/base/java_fat_service.java 
b/qadevOOo/runner/base/java_fat_service.java
index f9eefaa..27ae90a 100644
--- a/qadevOOo/runner/base/java_fat_service.java
+++ b/qadevOOo/runner/base/java_fat_service.java
@@ -217,32 +217,25 @@ public class java_fat_service implements TestBase {
 log = (LogWriter)dcl.getInstance((String)param.get(LogWriter));
 param.getMSF();
 
-TestCase tCase = null;
+TestEnvironment tEnv = null;
 
-try
-{
-tCase = (TestCase) dcl.getInstance(mod._+entry.entryName);
-}
-catch (java.lang.IllegalArgumentException ie)
-{
+try {
+TestCase tCase = (TestCase) 
dcl.getInstance(mod._+entry.entryName);
+log.println(Creating:  + tCase.getObjectName());
+log.initialize(entry, true);
+entry.UserDefinedParams = param;
+tCase.setLogWriter((PrintWriter) log);
+try {
+tCase.initializeTestCase(param);
+tEnv = tCase.getTestEnvironment(param);
+} catch (com.sun.star.lang.DisposedException de) {
+log.println(Office disposed);
+}
+} catch (java.lang.IllegalArgumentException ie) {
 entry.ErrorMsg=ie.getMessage();
 entry.hasErrorMsg=true;
 }
 
-log.println(Creating: +tCase.getObjectName());
-log.initialize(entry,true);
-entry.UserDefinedParams = param;
-tCase.setLogWriter((PrintWriter) log);
-TestEnvironment tEnv = null;
-try
-{
-tCase.initializeTestCase(param);
-tEnv = tCase.getTestEnvironment(param);
-}
-catch (com.sun.star.lang.DisposedException de)
-{
-log.println(Office disposed);
-}
 return tEnv;
 }
 
___
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' - translations

2014-10-01 Thread Christian Lohmaier

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a3cbe9f6d4f897c8b3bce7c30dabffe027c5aa27
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Oct 1 22:15:25 2014 +0200

Updated core
Project: translations  b46b770e58cacc52491dbaf74bc14c7bf310de8a

diff --git a/translations b/translations
index ade9b0b..b46b770 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit ade9b0b52531db428b25b36dc3e3bfcfe880a06d
+Subproject commit b46b770e58cacc52491dbaf74bc14c7bf310de8a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-4-2' - source/br source/cs source/de source/ja source/lv source/nb source/nl source/nn source/pl source/pt-BR source/sk source/sv source/ta

2014-10-01 Thread Christian Lohmaier

 source/br/scaddins/source/analysis.po |   
10 
 source/cs/instsetoo_native/inc_openoffice/windows/msi_languages.po|
6 
 source/de/cui/uiconfig/ui.po  |   
14 
 source/de/formula/source/core/resource.po |   
44 -
 source/de/helpcontent2/source/text/shared/guide.po|   
10 
 source/de/instsetoo_native/inc_openoffice/windows/msi_languages.po|   
10 
 source/de/librelogo/source/pythonpath.po  |   
14 
 source/de/sw/uiconfig/swriter/ui.po   |
6 
 source/ja/helpcontent2/source/text/shared/00.po   |   
10 
 source/ja/svx/uiconfig/ui.po  |   
12 
 source/lv/svx/source/sidebar/paragraph.po |   
15 
 source/nb/librelogo/source/pythonpath.po  |
8 
 source/nb/scaddins/source/pricing.po  |   
10 
 source/nb/sw/source/ui/inc.po |   
14 
 source/nl/officecfg/registry/data/org/openoffice/Office/UI.po |
8 
 source/nl/readlicense_oo/docs.po  |   
12 
 source/nl/sc/uiconfig/scalc/ui.po |   
16 
 source/nl/sw/source/ui/inc.po |   
14 
 source/nn/helpcontent2/source/text/simpress/guide.po  |
8 
 source/nn/scaddins/source/pricing.po  |   
10 
 source/nn/scp2/source/accessories.po  |   
22 
 source/nn/starmath/source.po  |   
17 
 source/nn/svl/source/misc.po  |   
10 
 source/nn/svx/source/unodialogs/textconversiondlgs.po |   
10 
 source/nn/sw/source/ui/config.po  |   
12 
 source/nn/sw/source/ui/inc.po |   
14 
 source/nn/sw/uiconfig/swriter/ui.po   |
6 
 source/pl/sc/source/ui/src.po |
8 
 source/pt-BR/formula/source/core/resource.po  |
8 
 source/pt-BR/helpcontent2/source/text/scalc/01.po |
8 
 source/pt-BR/officecfg/registry/data/org/openoffice/Office/UI.po  |
6 
 source/pt-BR/svx/inc.po   |   
12 
 source/pt-BR/sw/source/ui/utlui.po|
8 
 source/sk/basctl/source/basicide.po   |
2 
 source/sk/basic/source/classes.po |
8 
 source/sk/chart2/source/controller/dialogs.po |   
58 -
 source/sk/chart2/uiconfig/ui.po   |
4 
 source/sk/connectivity/source/resource.po |   
12 
 source/sk/cui/source/customize.po |
4 
 source/sk/cui/source/dialogs.po   |   
14 
 source/sk/cui/source/options.po   |
4 
 source/sk/cui/uiconfig/ui.po  |   
26 
 source/sk/dbaccess/cui/uiconfig/ui.po |   
26 
 source/sk/dbaccess/officecfg/registry/data/org/openoffice/Office/UI.po|  
196 ++--
 source/sk/dbaccess/source/core/resource.po|   
22 
 source/sk/dbaccess/source/ui/app.po   |   
14 
 source/sk/dbaccess/source/ui/browser.po   |   
14 
 source/sk/dbaccess/source/ui/control.po   |
6 
 source/sk/dbaccess/source/ui/dlg.po   |   
38 
 source/sk/dbaccess/source/ui/misc.po  |
8 
 source/sk/dbaccess/source/ui/querydesign.po   |   
10 
 source/sk/dbaccess/source/ui/relationdesign.po|
2 
 source/sk/dbaccess/source/ui/tabledesign.po   |   
30 
 source/sk/dbaccess/source/ui/uno.po   |
2 
 source/sk/dbaccess/uiconfig/ui.po |
8 
 source/sk/desktop/source/app.po   |
8 
 source/sk/desktop/source/deployment/registry/configuration.po |
2 
 source/sk/desktop/source/deployment/unopkg.po |
2 
 source/sk/editeng/source/editeng.po   |
6

[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress3' - android/experimental

2014-10-01 Thread Tomaž Vajngerl

 android/experimental/LOAndroid3/res/layout/activity_main.xml   
   |3 +
 android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java   
   |   20 +-
 android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java  
   |   11 ++---
 
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
 |4 +-
 4 files changed, 27 insertions(+), 11 deletions(-)

New commits:
commit d39e83c2c3478efd83601ca2403ff27895848728
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Wed Oct 1 23:08:27 2014 +0200

android: show progress spinner also when switching parts

Change-Id: Ie21e71aa03eddef620d470e01daf6f1936a5d7c7

diff --git a/android/experimental/LOAndroid3/res/layout/activity_main.xml 
b/android/experimental/LOAndroid3/res/layout/activity_main.xml
index 9ada4d3..fd7d63b 100644
--- a/android/experimental/LOAndroid3/res/layout/activity_main.xml
+++ b/android/experimental/LOAndroid3/res/layout/activity_main.xml
@@ -22,7 +22,8 @@
 android:id=@+id/loadingPanel
 android:layout_width=match_parent
 android:layout_height=match_parent
-android:gravity=center 
+android:gravity=center
+android:background=#9333
 
 ProgressBar
 android:layout_width=wrap_content
diff --git 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
index 332e0f8..7161f14 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
@@ -10,7 +10,7 @@ public class LOKitShell {
 
 public static float getDpi() {
 DisplayMetrics metrics = 
LibreOfficeMainActivity.mAppContext.getResources().getDisplayMetrics();
-return  metrics.density * 160;
+return metrics.density * 160;
 }
 
 public static void sendEvent(LOEvent event) {
@@ -27,4 +27,22 @@ public class LOKitShell {
 public static void queueRedraw() {
 LOKitShell.sendEvent(LOEventFactory.redraw());
 }
+
+public static void showProgressSpinner() {
+getMainHandler().post(new Runnable() {
+@Override
+public void run() {
+LibreOfficeMainActivity.mAppContext.showProgressSpinner();
+}
+});
+}
+
+public static void hideProgressSpinner() {
+getMainHandler().post(new Runnable() {
+@Override
+public void run() {
+LibreOfficeMainActivity.mAppContext.hideProgressSpinner();
+}
+});
+}
 }
diff --git 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index 31b9eb5..398389b 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -55,8 +55,10 @@ public class LOKitThread extends Thread {
 }
 
 private void changePart(int partIndex) {
+LOKitShell.showProgressSpinner();
 mTileProvider.changePart(partIndex);
 refresh();
+LOKitShell.hideProgressSpinner();
 }
 
 private boolean load(String filename) {
@@ -76,14 +78,9 @@ public class LOKitThread extends Thread {
 
 boolean isReady = mTileProvider.isReady();
 if (isReady) {
+LOKitShell.showProgressSpinner();
 refresh();
-LOKitShell.getMainHandler().post(new Runnable() {
-@Override
-public void run() {
-LibreOfficeMainActivity.mAppContext.hideProgressBar();
-}
-});
-
+LOKitShell.hideProgressSpinner();
 }
 return isReady;
 }
diff --git 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 1fce7d4..8607ebf 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -199,11 +199,11 @@ public class LibreOfficeMainActivity extends Activity {
 
 }
 
-public void showProgressBar() {
+public void showProgressSpinner() {
 findViewById(R.id.loadingPanel).setVisibility(View.VISIBLE);
 }
 
-public void hideProgressBar() {
+public void hideProgressSpinner() {
 findViewById(R.id.loadingPanel).setVisibility(View.GONE);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'libreoffice-4-2-7'

2014-10-01 Thread Christian Lohmaier

New branch 'libreoffice-4-2-7' available with the following commits:
commit 67e3b429795ab367e73cb5a86de0541a55835d97
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Oct 1 23:08:42 2014 +0200

Branch libreoffice-4-2-7

This is 'libreoffice-4-2-7' - the stable branch for the 4.2.7 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.2.x release,
please use the 'libreoffice-4-2' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I34070cd73d4398ad0e8c2ae5ba65ff60efe46c8b

___
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-7' - configure.ac

2014-10-01 Thread Christian Lohmaier

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 787672019447b787c8ef8343f30f181be87c2517
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Oct 1 23:15:38 2014 +0200

bump product version to 4.2.7.1.0+

Change-Id: I28d6c529bc3c71119fccb019e378a7c654727efc

diff --git a/configure.ac b/configure.ac
index 2560a0d..4800ade 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.2.7.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.2.7.1.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.2.7.1'

2014-10-01 Thread Christian Lohmaier

Tag 'libreoffice-4.2.7.1' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2014-10-01 22:15 -0700

Tag libreoffice-4.2.7.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJULG7ZAAoJEPQ0oe+v7q6ju14QAILUdsqYhKMojiQCoy6F0xWM
lstDW9vGP9dSQWeYG/e8FkQAeQiBANwC6Jr+62MGsVBPwayKInHkggP/3A/5VYos
wpdhPMkLGCSfoZG5/02AnSY1VnwiXwNDKERsRnjppbNU4r6FyQGmmdo9dzq1Mj/s
DUETElc3mszNbHT8pvoj0H4bNGWLYP6dICcaCBQfulPdn9/p+crp6JjH01SKyBmU
wz2eU7hPCASfosgl04Nf+//PqpjiWNpRCgQcvZ9Mi+iDhSJ5gaD4me8WzMAihcOe
ZADWF32FTosN4qJQL5HvxHHWIMqHY/WqxwIUGLoHxVGhxmgCoLO84z1s6uPIdh9Z
VuLkLmh74K2snQKEpeb8PXkWnQaQN0fOQ4QHUgL6yzYvVy4Q05xT2l/3Uflq5wdi
7vGnRhn60X5PxhP1Q9XMfS1w+zZAF3w+rzDSXbrcI5/qpNrlcJcKsKOaRVuAR6XN
0Gmm+E3aiy2B+1DfnPNvkCqgfdTkHmolpwiq/clSgZ5wtPDe7JnvMFRk8H1RbPh0
gzn8O5UI8flcqygRwsC+wI3p89kQDfYTFhzAvnmMAJccyoe8l3JAhLQTdg3stXlh
ju9bX5NDkMIBT+prHoaf4zp/NpN6ZdOtuvnmGHsiNAkpvPBDbmWqfBvSTMds3AiY
VNBi00RTrBNDZTw/CzeI
=WWue
-END PGP SIGNATURE-

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

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.2.7.1'

2014-10-01 Thread Christian Lohmaier

Tag 'libreoffice-4.2.7.1' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2014-10-01 22:14 -0700

Tag libreoffice-4.2.7.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJULG7OAAoJEPQ0oe+v7q6jSLAP/jYfFfWpgtHJI51yYrGAbiSQ
sudMzacmLxd47tdlV2ypmFCSGW0ovyhC0rYcmG9bRzvNFsLIUxW8Y2KXw4HiiQe/
3NcZXsRGyKYBwFmE5LDt1/EoBI0sbnxtLneNxRsSZXfby+BpZv2mzW+WQ2STnGY9
BcPZwayfVi1FYhVF4ak/OOyFiMMVLTjUbf529gKP51Zl26pPE5OdYQvEfHmHauba
NeYbHV5p8TuauBOZIQjhMSni7c+C64zqVgDwXxuKcUE1jyoBSl2KLikepyVBSwTY
lBJuwvhKK+LCSJN2y4pXCwd+Q5tB6SjKHDhVm12GLF8Hpsqzd3Dyb4EYgJzeW7AT
DTaQgBUjO1gPHcbcXW/NsBblc8FQgPtaAdo2irOpc/rHvDnwiPoRair+a/I6rwlk
i32uhpRr5SGd7zpDWUZGTbifxol1BtIMo90/MvAvtu6kjqAB4TASMHle1mSmvBgj
00MfI/qMvvecnZPAsz8w1IKekul2O1PlkJTPOKwjHQ/51fws+KQIHgGsAK3BMUN7
D02RsUL8iyC+gID3WW9AS+MIr0N/qFSMw1zvr300NipyvWi/L3qOzeVxP0y9wgY0
3rVKuEpPzzU7no7mSA7mlhbMjMxjGd2bFoglElEl+oDVbFd1R4WHq/XL4ihcVGnB
vlr0r5TnnPAAxU1sol6n
=nVKa
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: configure.ac

2014-10-01 Thread Michael Stahl

 configure.ac |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit d08110c0be9e5290240082d899d45938730684eb
Author: Michael Stahl mst...@redhat.com
Date:   Mon Sep 29 17:30:13 2014 +0200

configure: limit JunitTest VM usage

By default JVM will allocate a significant chunk of the available system
VM, but our JunitTest run well for me with just 64 MB of max heap,
so set this as a limit at least for Sun JVMs, to have tests running more
smoothly on OS that lack VM over-commit.

Change-Id: I5e4b5595decc3a133e7e285dfd7463d436fa458d
Reviewed-on: https://gerrit.libreoffice.org/11698
Reviewed-by: David Ostrovsky da...@ostrovsky.org
Tested-by: David Ostrovsky da...@ostrovsky.org

diff --git a/configure.ac b/configure.ac
index 4e2eec9..af2bda8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6712,6 +6712,9 @@ you must use the --with-jdk-home configure option 
explicitly])
 if test $_os = WINNT; then
 JAVA_HOME=`echo $JAVA_HOME | $SED s,\.[[eE]][[xX]][[eE]]$,,`
 fi
+
+# set to limit VM usage for JunitTests
+JAVAIFLAGS=-Xmx64M
 fi
 else
 AC_MSG_ERROR([Java not found. You need at least jdk-1.5, or gcj-4])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac

2014-10-01 Thread Michael Stahl

 config_host.mk.in |1 +
 configure.ac  |3 +++
 2 files changed, 4 insertions(+)

New commits:
commit 13cb02ce1046779864109646a105c09c2e27249a
Author: Michael Stahl mst...@redhat.com
Date:   Mon Sep 29 17:35:57 2014 +0200

configure: limit javac VM usage

Similarly, restrict javac to 128M, which is enough for me with JDK 1.7
on Linux x86_64.

Change-Id: I5b1e3435026b8b69bf7afe8b5236c3dc09857f49

diff --git a/config_host.mk.in b/config_host.mk.in
index 605bb6b..11f8523 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -289,6 +289,7 @@ export JAVACISGCJ=@JAVACISGCJ@
 export JAVACOMPILER=@JAVACOMPILER@
 export JAVADOC=@JAVADOC@
 export JAVADOCISGJDOC=@JAVADOCISGJDOC@
+export JAVAFLAGS=@JAVAFLAGS@
 export JAVAIFLAGS=@JAVAIFLAGS@
 export JAVA_CLASSPATH_NOT_SET=@JAVA_CLASSPATH_NOT_SET@
 export JAVAINTERPRETER=@JAVAINTERPRETER@
diff --git a/configure.ac b/configure.ac
index af2bda8..f4f6ceb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6715,6 +6715,8 @@ you must use the --with-jdk-home configure option 
explicitly])
 
 # set to limit VM usage for JunitTests
 JAVAIFLAGS=-Xmx64M
+# set to limit VM usage for javac
+JAVAFLAGS=-J-Xmx128M
 fi
 else
 AC_MSG_ERROR([Java not found. You need at least jdk-1.5, or gcj-4])
@@ -7033,6 +7035,7 @@ AC_SUBST(JAVACOMPILER)
 AC_SUBST(JAVADOC)
 AC_SUBST(JAVAINTERPRETER)
 AC_SUBST(JAVAIFLAGS)
+AC_SUBST(JAVAFLAGS)
 AC_SUBST(JAVA_CLASSPATH_NOT_SET)
 AC_SUBST(JAVA_HOME)
 AC_SUBST(JAVA_SOURCE_VER)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress3' - android/experimental

2014-10-01 Thread Tomaž Vajngerl

 
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java 
|4 
 1 file changed, 4 insertions(+)

New commits:
commit 76ea22920c749f9f9252d20f576fb1a3b09a333e
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Wed Oct 1 23:37:14 2014 +0200

android: Log calls to createTile

Change-Id: Ia0e92c24f771d47235fee7a9dbddc65631af9082

diff --git 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
index 073876e..4fdf84f 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
@@ -141,7 +141,11 @@ public class LOKitTileProvider implements TileProvider {
 float twipY = pixelToTwip(y, mDPI) / zoom;
 float twipWidth = mTileWidth / zoom;
 float twipHeight = mTileHeight / zoom;
+long start = System.currentTimeMillis();
+Log.i(LOGTAG, paintTile TOP @  + start + ( + TILE_SIZE +   + 
TILE_SIZE +   + (int)twipX +   + (int)twipY +   + (int) twipWidth +   + 
(int) twipHeight + ));
 mDocument.paintTile(buffer, TILE_SIZE, TILE_SIZE, (int) twipX, 
(int) twipY, (int) twipWidth, (int) twipHeight);
+long stop = System.currentTimeMillis();
+Log.i(LOGTAG, paintTile TAIL @  + stop +  - elapsed:  + (stop 
- start) +  );
 } else {
 Log.e(LOGTAG, Document is null!!);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ANNOUNCE] Branch libreoffice-4-2-7 and Tag libreoffice-4.2.7.1 created

2014-10-01 Thread Christian Lohmaier

Hi all,

The tag libreoffice-4.2.7.1 (AKA 4.2.7 RC1) and the corresponding
branch libreoffice-4-2-7 have been created.
The branch will be used for fine tuning of the 4.2.7 release. (there
is one additional RC planned).

The following rules apply:

+ preferably just translation or blocker fixes
+ only cherry-picking from libreoffice-4-2 branch
+ 2 additional reviews needed; 2nd reviewer pushes
+ no regular merges back to anything

LibreOffice 4.2.7 is the last scheduled release of the 4.2 codeline.
 Please read more at
   http://wiki.documentfoundation.org/ReleasePlan/4.2#4.2.7_release
   http://wiki.documentfoundation.org/Development/Branches
   http://wiki.documentfoundation.org/Release_Criteria

Now, if you want to switch your clone to the branch, please do:

./g pull -r
./g checkout -b libreoffice-4-2-7 origin/libreoffice-4-2-7

To checkout the tag, use

./g fetch --tags
./g checkout -b tag-libreoffice-4.2.7.1 libreoffice-4.2.7.1

Hopefully it will work for you :-)  Most probably, you will also want to
do (if you haven't done it yet):

git config --global push.default tracking

When you do git push with this, git will push only the branch you are
on; e.g. libreoffice-4-2-7 when you have switched to it.  This will
save you some git shouting at you.

Linux distro packages might find source tarballs at
http://dev-builds.libreoffice.org/pre-releases/src/
They will soon be available from the official page together with the builds.

Attached is the list of changes against 4.2.6.3 (4.2.6-secfix)

Happy hacking,
Christian
+ core
+ (related: writerfilter: RTF import: fix invalid string copy (fdo#78502) [Michael Stahl]
+ : Delete any control on Dialog editing window crashes LO (fdo#80906) [Julien Nabet]
+ : Mediawiki doesn't recognize underlining (fdo#81581) [Julien Nabet]
+ absent value cell values are not NaN, set to 0.0 (fdo#62250) [Eike Rathke]
+ Access2Base - PATCH-01 Field.setValue [Jean-Pierre Ledure]
+ adapt to sal/log.hxx [Stephan Bergmann]
+ add GetAddressConvention to RefButton (fdo#83848) [Laurent Balland-Poirier]
+ added missing media extensions (fdo#82994) [Daniel Sikeler]
+ adjust for the splitting of number format properties in chart. [Kohei Yoshida]
+ adjust references during sort. (fdo#81309) [Kohei Yoshida]
+ adjust xlsx export of revisions to get it to work in Excel. (bnc#885548) [Kohei Yoshida]
+ always use theme color for hyperlinks in Impress (bnc#887230) [Matúš Kukan]
+ avoid buffer overflow by using wrong buffer [Markus Mohrhard]
+ avoid crash on document ending before contained table ends [Caolán McNamara]
+ avoid opening embedded OLE object as text (bnc#648251) [Tor Lillqvist]
+ avoid use of invalidated pointers (fdo#78598) [David Tardon]
+ be sure to update the sheet index when moving the sort range. (fdo#84009) [Kohei Yoshida]
+ better fix for this. (bnc#883684) [Kohei Yoshida]
+ bool improvements [Stephan Bergmann]
+ branch libreoffice-4-2-7 [Christian Lohmaier]
+ bump product version to 4.2.7.0.0+ [Christian Lohmaier]
+ bump product version to 4.2.7.1 [Christian Lohmaier]
+ check for empty m_aStates [Caolán McNamara]
+ check for empty slots' valid NULL pointer, (fdo#79441) [Eike Rathke]
+ check len before memcpying into it [Caolán McNamara]
+ check that AddToTable can be done validly [Caolán McNamara]
+ check TRG_HasMasterPage before TRG_GetMasterPage [Caolán McNamara]
+ clip PolyPolygon::Insert on .svm load [Caolán McNamara]
+ configure: don't try to use Win32 make on release branch [Michael Stahl]
+ correct references after sort, (fdo#79441) [Eike Rathke]
+ corrected default style for draw objects... (i#119287) [Armin Le Grand]
+ crash in DomainMapper_Impl::CloseFieldCommand (fdo#79130) [Caolán McNamara]
+ crash in EnhancedCustomShapeTypeNames::Get (fdo#79131) [Caolán McNamara]
+ crash in oox::drawingml::LayoutNode::setupShape (fdo#79129) [Caolán McNamara]
+ crash on closing shrunk validity window (rhbz#1121341) [Caolán McNamara]
+ crash on loading ppt (fdo#82355) [Caolán McNamara]
+ crash on opening wikipedia ODT Book (fdo#82747) [Julien Nabet]
+ default chart background for pptx docs should be transparent. (bnc#886540) [Kohei Yoshida]
+ detect * with no character following as invalid format code [Eike Rathke]
+ disable highlight DOCX import (fdo#80986) [Zolnai Tamás]
+ disambiguate NOT LIKE 'foo' (fdo#82427) [Lionel Elie Mamane]
+ display correct label for empty cell. (fdo#81445) [Kohei Yoshida]
+ display data description in pivot table. (bnc#592918) [Kohei Yoshida]
+ do apply possible changed GraphicStreamURL... (i#125289) [Oliver-Rainer Wittmann]
+ do not compress WMF / EMF file incase of OOXML export (fdo#65836, bnc#621241) [Nikhil Walvekar]
+ do not prefer bandRow over firstCol/lastCol, nor the same with bandCol. [Matúš Kukan]
+ do not reset

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

2014-10-01 Thread David Ostrovsky

 bin/gbuild-to-ide |  117 +-
 1 file changed, 63 insertions(+), 54 deletions(-)

New commits:
commit 213be0be8e41480e0036c0e30a8be93369aa743a
Author: David Ostrovsky da...@ostrovsky.org
Date:   Thu Oct 2 00:09:09 2014 +0200

gbuild-to-ide: Make it work for GNU make 4.x

Since GNU make 4.0 the output of --print-data-base command has been
slightly changed, so that class specific attributed aren'tt prefixed
with # char any more. To prevent the duplication of used regexs or
discontinuation of supporting widely used GNU make version 3.8x detect
the case that matches this regex:

target : VAR := VALUE

pand repend '#' character to retry the match for pseudo hash-starting
line. This way the same script works for both worlds.

Test Plan:

* have full build of LibreOffice
* install GNU make 4
* verify that gbuild-to-ide is able to parse and emit sane debug project
  configuration for both GNU make versions:
  $ make-3.8 debug-ide-integration
  $ make-4 debug-ide-integration

Change-Id: I7d760d9570f2df510571cc1e8fd7f31115d43b92
Reviewed-on: https://gerrit.libreoffice.org/11751
Tested-by: Peter Foley pefol...@verizon.net
Reviewed-by: Peter Foley pefol...@verizon.net

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index c63ba59..b4932d4 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -111,10 +111,65 @@ class GbuildParser:
 mapping_dict[target] = library
 return mapping_dict
 
+def _parse_hash(self, line, state):
+libmatch = GbuildParser.libpattern.match(line)
+if libmatch:
+libname = self.libnames.get(state.ilib, None)
+self.libs.append(
+GbuildLib(libmatch.group(2), libname, libmatch.group(1),
+  state.include, state.include_sys, state.defs, 
state.cxxobjects,
+  state.cxxflags, state.linked_libs))
+state = GbuildParserState()
+return state
+exematch = GbuildParser.exepattern.match(line)
+if exematch:
+exename = self.exenames.get(state.target, None)
+self.exes.append(
+GbuildExe(exematch.group(2), exename, exematch.group(1),
+  state.include, state.include_sys, state.defs, 
state.cxxobjects,
+  state.cxxflags, state.linked_libs))
+state = GbuildParserState()
+return state
+if line.find('# INCLUDE :=') == 0:
+isystemmatch = GbuildParser.isystempattern.findall(line)
+if isystemmatch:
+state.include_sys = isystemmatch
+state.include = [includeswitch.strip() for includeswitch in 
GbuildParser.includepattern.findall(line) if
+ len(includeswitch)  2]
+return state
+defsmatch = GbuildParser.defspattern.match(line)
+if defsmatch:
+alldefs = [defswitch.strip()[2:] for defswitch in 
defsmatch.group(1).split(' ') if len(defswitch)  2]
+for d in alldefs:
+defparts = d.split('=')
+if len(defparts) == 1:
+defparts.append(None)
+state.defs[defparts[0]] = defparts[1]
+return state
+cxxmatch = GbuildParser.cxxpattern.match(line)
+if cxxmatch:
+state.cxxobjects = [obj for obj in cxxmatch.group(1).split(' ') if 
len(obj)  0]
+return state
+linkedlibsmatch = GbuildParser.linkedlibspattern.match(line)
+if linkedlibsmatch:
+state.linked_libs = linkedlibsmatch.group(1).strip().split(' ')
+return state
+ilibmatch = GbuildParser.ilibpattern.match(line)
+if ilibmatch:
+state.ilib = os.path.basename(ilibmatch.group(1))
+return state
+if line.find('# T_CXXFLAGS :=') == 0:
+state.cxxflags = [cxxflag.strip() for cxxflag in 
GbuildParser.warningpattern.sub('', line.replace('# T_CXXFLAGS :=', 
'')).split(' ') if len(cxxflag)  1]
+return state
+# we could match a lot of other stuff here if needed for integration 
rpaths etc.
+return state
+
 def parse(self, gbuildstate):
 state = GbuildParserState()
 for line in gbuildstate:
-if not line.startswith('#'):
+if line.startswith('#'):
+state = self._parse_hash(line, state)
+else:
 makecmdmatch = GbuildParser.makecmdpattern.match(line)
 if makecmdmatch:
 self.makecmd = makecmdmatch.group(1)
@@ -140,7 +195,13 @@ class GbuildParser:
 continue
 rulematch = self.rulepattern.match(line)
 if rulematch:
-state.target = os.path.basename(rulematch.group(1))
+if

[Libreoffice-commits] core.git: 2 commits - android/mobile-config.py libreofficekit/Executable_tilebench.mk libreofficekit/Module_libreofficekit.mk libreofficekit/qa Repository.mk

2014-10-01 Thread Michael Meeks

 Repository.mk |1 
 android/mobile-config.py  |   99 +
 libreofficekit/Executable_tilebench.mk|   32 +
 libreofficekit/Module_libreofficekit.mk   |4 
 libreofficekit/qa/tilebench/tilebench.cxx |  172 ++
 5 files changed, 308 insertions(+)

New commits:
commit a131feddd07bcb75112b1f80a16b8733458338e4
Author: Michael Meeks michael.me...@collabora.com
Date:   Thu Oct 2 00:21:30 2014 +0100

LOK: Excercise tiled-rendering harder in the test-bench.

Change-Id: I13a93991050cc25d06f2836d85ec1d0a0bc574f1

diff --git a/libreofficekit/qa/tilebench/tilebench.cxx 
b/libreofficekit/qa/tilebench/tilebench.cxx
index 80d5c16..edb6889 100644
--- a/libreofficekit/qa/tilebench/tilebench.cxx
+++ b/libreofficekit/qa/tilebench/tilebench.cxx
@@ -13,6 +13,9 @@
 
 #include vector
 #include osl/time.h
+
+#define LOK_USE_UNSTABLE_API
+
 #include LibreOfficeKit/LibreOfficeKitInit.h
 #include LibreOfficeKit/LibreOfficeKit.hxx
 
@@ -66,6 +69,85 @@ int main( int argc, char* argv[] )
 Document *pDocument(pOffice-documentLoad(argv[2]));
 aTimes.push_back(TimeRecord());
 
+aTimes.push_back(TimeRecord(getparts));
+int nParts = pDocument-getParts();
+aTimes.push_back(TimeRecord());
+
+aTimes.push_back(TimeRecord(get size of parts));
+for (int nPart = 0; nPart  nParts; nPart++)
+{
+char* pName = pDocument-getPartName(nPart);
+pDocument-setPart(nPart);
+long nWidth = 0, nHeight = 0;
+pDocument-getDocumentSize(nWidth, nHeight);
+fprintf (stderr,   '%s' - %ld, %ld\n, pName, nWidth, nHeight);
+free (pName);
+}
+aTimes.push_back(TimeRecord());
+
+unsigned char pPixels[256*256*4];
+for (int nPart = 0; nPart  nParts; nPart++)
+{
+{
+char* pName = pDocument-getPartName(nPart);
+fprintf (stderr, render '%s'\n, pName);
+free (pName);
+}
+pDocument-setPart(nPart);
+long nWidth = 0, nHeight = 0;
+pDocument-getDocumentSize(nWidth, nHeight);
+
+{ // whole document
+aTimes.push_back(TimeRecord(render whole document));
+int nRowStride = 256;
+pDocument-paintTile(pPixels, 256, 256, nRowStride,
+ 0, 0, nWidth, nHeight); // not square
+aTimes.push_back(TimeRecord());
+}
+
+{ // 1:1
+aTimes.push_back(TimeRecord(render sub-region at 1:1));
+int nTiles = 0;
+int nSplit = nWidth / 4;
+for (int nX = 0; nX  4; nX++)
+{
+for (int nY = 0; nY  nHeight / nSplit; nY++)
+{
+int nRowStride = 256;
+int nTilePosX = nX * nSplit;
+int nTilePosY = nY * nSplit;
+pDocument-paintTile(pPixels, 256, 256, nRowStride,
+ nTilePosX, nTilePosY, 256, 256);
+nTiles++;
+fprintf (stderr,rendered tile %d at %d, %d\n,
+ nTiles, nTilePosX, nTilePosY);
+}
+}
+aTimes.push_back(TimeRecord());
+}
+
+{ // scaled
+aTimes.push_back(TimeRecord(render sub-regions at scale));
+int nTiles = 0;
+int nSplit = nWidth / 4;
+for (int nX = 0; nX  4; nX++)
+{
+for (int nY = 0; nY  nHeight / nSplit; nY++)
+{
+int nRowStride = 256;
+int nTilePosX = nX * nSplit;
+int nTilePosY = nY * nSplit;
+pDocument-paintTile(pPixels, 256, 256, nRowStride,
+ nTilePosX, nTilePosY, nSplit, 
nSplit);
+nTiles++;
+fprintf (stderr,rendered tile %d at %d, %d\n,
+ nTiles, nTilePosX, nTilePosY);
+}
+}
+aTimes.push_back(TimeRecord());
+}
+}
+
 aTimes.push_back(TimeRecord(destroy document));
 delete pDocument;
 aTimes.push_back(TimeRecord());
commit 87fad21582fceb200e3630e9ec10a873f7d7a3ed
Author: Michael Meeks michael.me...@collabora.com
Date:   Wed Oct 1 22:14:49 2014 +0100

LOK: Add a tiled rendering testbench.

Change-Id: I631c0506f427d974c3dd4c75484aa25603100895

diff --git a/Repository.mk b/Repository.mk
index 7b86d58..29dbf6e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -86,6 +86,7 @@ $(eval $(call

[Libreoffice-commits] core.git: Branch 'private/mmeeks/tilebench' - 0 commits -

2014-10-01 Thread Unknown

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-01 Thread Kohei Yoshida

 sc/inc/formulacell.hxx |3 ++
 sc/source/core/data/column.cxx |   36 +++-
 sc/source/core/data/column3.cxx|   41 +++--
 sc/source/core/data/documentimport.cxx |   41 -
 sc/source/core/data/formulacell.cxx|   25 
 5 files changed, 133 insertions(+), 13 deletions(-)

New commits:
commit 3f96f44be8048c112766819f990c3bb18366c874
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Oct 1 20:34:36 2014 -0400

Be sure to copy the cell text attributes values to and from clip.

Otherwise we'd have to unnecessarily re-calculate the script types again
which is not cheap...

Change-Id: Ie589fb4a7e5ec9b5ef646dabea4e6bd0c0aca560

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 939069b..656d53c 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -983,6 +983,31 @@ public:
 }
 };
 
+class CopyTextAttrToClipHandler
+{
+sc::CellTextAttrStoreType mrDestAttrs;
+sc::CellTextAttrStoreType::iterator miPos;
+
+public:
+CopyTextAttrToClipHandler( sc::CellTextAttrStoreType rAttrs ) :
+mrDestAttrs(rAttrs), miPos(mrDestAttrs.begin()) {}
+
+void operator() ( const sc::CellTextAttrStoreType::value_type aNode, 
size_t nOffset, size_t nDataSize )
+{
+if (aNode.type != sc::element_type_celltextattr)
+return;
+
+sc::celltextattr_block::const_iterator it = 
sc::celltextattr_block::begin(*aNode.data);
+std::advance(it, nOffset);
+sc::celltextattr_block::const_iterator itEnd = it;
+std::advance(itEnd, nDataSize);
+
+size_t nPos = aNode.position + nOffset;
+miPos = mrDestAttrs.set(miPos, nPos, it, itEnd);
+}
+};
+
+
 }
 
 void ScColumn::CopyToClip(
@@ -991,8 +1016,15 @@ void ScColumn::CopyToClip(
 pAttrArray-CopyArea( nRow1, nRow2, 0, *rColumn.pAttrArray,
   rCxt.isKeepScenarioFlags() ? (SC_MF_ALL  
~SC_MF_SCENARIO) : SC_MF_ALL );
 
-CopyToClipHandler aFunc(*this, rColumn, 
rCxt.getBlockPosition(rColumn.nTab, rColumn.nCol), rCxt.isCloneNotes());
-sc::ParseBlock(maCells.begin(), maCells, aFunc, nRow1, nRow2);
+{
+CopyToClipHandler aFunc(*this, rColumn, 
rCxt.getBlockPosition(rColumn.nTab, rColumn.nCol), rCxt.isCloneNotes());
+sc::ParseBlock(maCells.begin(), maCells, aFunc, nRow1, nRow2);
+}
+
+{
+CopyTextAttrToClipHandler aFunc(rColumn.maCellTextAttrs);
+sc::ParseBlock(maCellTextAttrs.begin(), maCellTextAttrs, aFunc, nRow1, 
nRow2);
+}
 
 rColumn.CellStorageModified();
 }
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 5723b73..225276a 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -950,6 +950,31 @@ public:
 }
 };
 
+class CopyTextAttrsFromClipHandler
+{
+sc::CellTextAttrStoreType mrAttrs;
+sc::CellTextAttrStoreType::iterator miPos;
+size_t mnDelta;
+
+public:
+CopyTextAttrsFromClipHandler( sc::CellTextAttrStoreType rAttrs, size_t 
nDelta ) :
+mrAttrs(rAttrs), miPos(mrAttrs.begin()), mnDelta(nDelta) {}
+
+void operator() ( const sc::CellTextAttrStoreType::value_type aNode, 
size_t nOffset, size_t nDataSize )
+{
+if (aNode.type != sc::element_type_celltextattr)
+return;
+
+sc::celltextattr_block::const_iterator it = 
sc::celltextattr_block::begin(*aNode.data);
+std::advance(it, nOffset);
+sc::celltextattr_block::const_iterator itEnd = it;
+std::advance(itEnd, nDataSize);
+
+size_t nPos = aNode.position + nOffset + mnDelta;
+miPos = mrAttrs.set(miPos, nPos, it, itEnd);
+}
+};
+
 }
 
 //  rColumn = source
@@ -1001,6 +1026,10 @@ void ScColumn::CopyFromClip(
 SetFormulaCell(nDestRow, new ScFormulaCell(pDocument, aDestPos, 
aArr));
 }
 
+// Don't forget to copy the cell text attributes.
+CopyTextAttrsFromClipHandler aFunc(maCellTextAttrs, nDy);
+sc::ParseBlock(rColumn.maCellTextAttrs.begin(), 
rColumn.maCellTextAttrs, aFunc, nRow1-nDy, nRow2-nDy);
+
 return;
 }
 
@@ -1011,8 +1040,16 @@ void ScColumn::CopyFromClip(
 
 // nRow1 to nRow2 is for destination (this) column. Subtract nDy to get 
the source range.
 // Copy all cells in the source column (rColumn) from nRow1-nDy to 
nRow2-nDy to this column.
-CopyCellsFromClipHandler aFunc(rCxt, rColumn, *this, nTab, nCol, nDy, 
pSharedStringPool);
-sc::ParseBlock(rColumn.maCells.begin(), rColumn.maCells, aFunc, nRow1-nDy, 
nRow2-nDy);
+{
+CopyCellsFromClipHandler aFunc(rCxt, rColumn, *this, nTab, nCol, nDy, 
pSharedStringPool);
+sc::ParseBlock(rColumn.maCells.begin(), rColumn.maCells, aFunc, 
nRow1-nDy, nRow2-nDy);
+}
+
+{
+// Don't forget to copy the cell text attributes.
+

[Libreoffice-commits] core.git: 2 commits - jurt/source sal/Library_sal.mk sal/osl

2014-10-01 Thread Stephan Bergmann

 jurt/source/pipe/staticsalhack_c.c |1 
 jurt/source/pipe/staticsalhack_cxx.cxx |1 
 sal/Library_sal.mk |2 
 sal/osl/unx/thread.c   | 1011 ---
 sal/osl/unx/thread.cxx | 1044 +
 5 files changed, 1046 insertions(+), 1013 deletions(-)

New commits:
commit 4b0197627dcd031758b6ced994f718ce777e69eb
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Oct 1 09:02:08 2014 +0200

Use sal/log.hxx

Change-Id: I54fd66b8788171884c6d3d6e7645871615d48080

diff --git a/sal/osl/unx/thread.cxx b/sal/osl/unx/thread.cxx
index fc0ff87..1f0a587 100644
--- a/sal/osl/unx/thread.cxx
+++ b/sal/osl/unx/thread.cxx
@@ -16,18 +16,21 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include assert.h
+
+#include sal/config.h
+
+#include cassert
 #include system.h
 #include string.h
 #if defined(OPENBSD)
 #include sched.h
 #endif
 #include config_options.h
-#include osl/diagnose.h
 #include osl/thread.h
 #include osl/nlsupport.h
 #include rtl/textenc.h
 #include rtl/alloc.h
+#include sal/log.hxx
 #include sal/macros.h
 #ifdef ANDROID
 #include jni.h
@@ -157,7 +160,7 @@ Thread_Impl* osl_thread_construct_Impl (void)
 
 static void osl_thread_destruct_Impl (Thread_Impl ** ppImpl)
 {
-OSL_ASSERT(ppImpl);
+assert(ppImpl);
 if (*ppImpl)
 {
 pthread_cond_destroy  (((*ppImpl)-m_Cond));
@@ -295,8 +298,10 @@ static oslThread osl_thread_create_Impl (
 osl_thread_start_Impl,
 (void*)(pImpl))) != 0)
 {
-OSL_TRACE(osl_thread_create_Impl(): errno: %d, %s\n,
-  nRet, strerror(nRet));
+SAL_WARN(
+sal.osl,
+pthread_create failed with   nRet   \  strerror(nRet)
+ \);
 
 pthread_mutex_unlock ((pImpl-m_Lock));
 osl_thread_destruct_Impl (pImpl);
@@ -360,9 +365,11 @@ void SAL_CALL osl_resumeThread(oslThread Thread)
 {
 Thread_Impl* pImpl= (Thread_Impl*)Thread;
 
-OSL_ASSERT(pImpl);
 if (!pImpl)
+{
+SAL_WARN(sal.osl, invalid osl_resumeThread(nullptr) call);
 return; /* EINVAL */
+}
 
 pthread_mutex_lock ((pImpl-m_Lock));
 
@@ -380,9 +387,11 @@ void SAL_CALL osl_suspendThread(oslThread Thread)
 {
 Thread_Impl* pImpl= (Thread_Impl*)Thread;
 
-OSL_ASSERT(pImpl);
 if (!pImpl)
+{
+SAL_WARN(sal.osl, invalid osl_suspendThread(nullptr) call);
 return; /* EINVAL */
+}
 
 pthread_mutex_lock ((pImpl-m_Lock));
 
@@ -450,9 +459,11 @@ void SAL_CALL osl_terminateThread(oslThread Thread)
 {
 Thread_Impl* pImpl= (Thread_Impl*)Thread;
 
-OSL_ASSERT(pImpl);
 if (!pImpl)
+{
+SAL_WARN(sal.osl, invalid osl_terminateThread(nullptr) call);
 return; /* EINVAL */
+}
 
 pthread_mutex_lock ((pImpl-m_Lock));
 
@@ -473,13 +484,17 @@ sal_Bool SAL_CALL osl_scheduleThread(oslThread Thread)
 bool terminate;
 Thread_Impl* pImpl= (Thread_Impl*)Thread;
 
-OSL_ASSERT(pImpl);
 if (!pImpl)
+{
+SAL_WARN(sal.osl, invalid osl_scheduleThread(nullptr) call);
 return sal_False; /* EINVAL */
+}
 
-OSL_ASSERT(pthread_equal (pthread_self(), pImpl-m_hThread));
 if (!(pthread_equal (pthread_self(), pImpl-m_hThread)))
+{
+SAL_WARN(sal.osl, invalid osl_scheduleThread(non-self) call);
 return sal_False; /* EINVAL */
+}
 
 pthread_mutex_lock ((pImpl-m_Lock));
 
@@ -524,9 +539,8 @@ void SAL_CALL osl_yieldThread()
 void SAL_CALL osl_setThreadName(char const * name) {
 #if defined LINUX  ! defined __FreeBSD_kernel__
 if (prctl(PR_SET_NAME, (unsigned long) name, 0, 0, 0) != 0) {
-OSL_TRACE(
-%s prctl(PR_SET_NAME) failed with errno %d, OSL_LOG_PREFIX,
-errno);
+int e = errno;
+SAL_WARN(sal.osl, prctl(PR_SET_NAME) failed with errno   e);
 }
 #else
 (void) name;
@@ -689,7 +703,10 @@ static void osl_thread_priority_init_Impl (void)
 
 if ((nRet = pthread_getschedparam(pthread_self(), policy, param)) != 0)
 {
-OSL_TRACE(failed to get priority of thread [%s],strerror(nRet));
+SAL_WARN(
+sal.osl,
+pthread_getschedparam failed with   nRet   \
+ strerror(nRet)  \);
 return;
 }
 
@@ -705,27 +722,33 @@ static void osl_thread_priority_init_Impl (void)
 
 if ((nRet = sched_get_priority_min(policy) ) != -1)
 {
-OSL_TRACE(Min Prioriy for policy '%i' == '%i',policy,nRet);
+SAL_INFO(
+sal.osl, Min Prioriy for policy   policy   ==   nRet);
 g_thread.m_priority.m_Lowest=nRet;
 }
-#if OSL_DEBUG_LEVEL  1
 else
 {
-fprintf(stderr,failed to get min sched param [%s]\n,strerror(errno));
+int e = errno;
+SAL_WARN(
+sal.osl,
+sched_get_priority_min

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

2014-10-01 Thread Stephan Bergmann

 sc/source/filter/excel/xiescher.cxx |   60 +---
 1 file changed, 15 insertions(+), 45 deletions(-)

New commits:
commit 25fbd8410ad05d2f4bdf03b658ac8ce5bec6faf8
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Oct 1 08:21:07 2014 +0200

Replace TSdrObjectPtr with unique_ptr with custom deleter

Change-Id: If15e1bab07ee5e9c70a6a0f1961ec2db0c946eb5

diff --git a/sc/source/filter/excel/xiescher.cxx 
b/sc/source/filter/excel/xiescher.cxx
index b6d9578..933cd1e 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -146,41 +146,11 @@ using ::com::sun::star::table::CellRangeAddress;
 
 namespace {
 
-/** Helper class which mimics the auto_ptr SdrObject  semantics, but calls
-SdrObject::Free instead of deleting the SdrObject directly. */
-template typename SdrObjType 
-class TSdrObjectPtr
-{
-public:
-inline explicit TSdrObjectPtr( SdrObjType* pObj = 0 ) : mpObj( pObj ) 
{}
-inline  ~TSdrObjectPtr() { free(); }
-
-inline const SdrObjType* operator-() const { return mpObj; }
-inline SdrObjType*  operator-() { return mpObj; }
-
-inline const SdrObjType* get() const { return mpObj; }
-inline SdrObjType*  get() { return mpObj; }
-
-inline const SdrObjType operator*() const { return *mpObj; }
-inline SdrObjType operator*() { return *mpObj; }
-
-inline bool is() const { return mpObj != 0; }
-inline bool operator!() const { return mpObj == 0; }
-
-inline void reset( SdrObjType* pObj = 0 ) { free(); mpObj = pObj; }
-inline SdrObjType*  release() { SdrObjType* pObj = mpObj; mpObj = 0; 
return pObj; }
-
-private:
-TSdrObjectPtr( const TSdrObjectPtr );// not 
implemented
-TSdrObjectPtr  operator=( TSdrObjectPtr rxObj );// not 
implemented
-
-inline void free() { SdrObject* pObj = mpObj; mpObj = 0; 
SdrObject::Free( pObj ); }
-
-private:
-SdrObjType* mpObj;
+struct SdrObjectFree {
+void operator ()(SdrObject * obj) { SdrObject::Free(obj); }
 };
 
-typedef TSdrObjectPtr SdrObject  SdrObjectPtr;
+typedef std::unique_ptrSdrObject, SdrObjectFree SdrObjectPtr;
 
 } // namespace
 
@@ -457,7 +427,7 @@ SdrObject* XclImpDrawObjBase::CreateSdrObject( 
XclImpDffConverter rDffConv, con
 else
 {
 xSdrObj.reset( DoCreateSdrObj( rDffConv, rAnchorRect ) );
-if( xSdrObj.is() )
+if( xSdrObj )
 xSdrObj-SetModel( rDffConv.GetModel() );
 //added for exporting OCX control
 /*  mnObjType value set should be as below table:
@@ -477,7 +447,7 @@ SdrObject* XclImpDrawObjBase::CreateSdrObject( 
XclImpDffConverter rDffConv, con
 +-+
 0x0019  Note0x001E  OfficeArt 
object
 */
-if( xSdrObj.is()  xSdrObj-IsUnoObj() 
+if( xSdrObj  xSdrObj-IsUnoObj() 
 ( (mnObjType  25  mnObjType  10) || mnObjType == 7 || 
mnObjType == 8 ) )
 {
 SdrUnoObj* pSdrUnoObj = dynamic_cast SdrUnoObj* ( xSdrObj.get() 
);
@@ -1033,7 +1003,7 @@ sal_Size XclImpGroupObj::DoGetProgressSize() const
 
 SdrObject* XclImpGroupObj::DoCreateSdrObj( XclImpDffConverter rDffConv, const 
Rectangle /*rAnchorRect*/ ) const
 {
-TSdrObjectPtr SdrObjGroup  xSdrObj( new SdrObjGroup );
+std::unique_ptrSdrObjGroup, SdrObjectFree xSdrObj( new SdrObjGroup );
 // child objects in BIFF2-BIFF5 have absolute size, not needed to pass own 
anchor rectangle
 SdrObjList rObjList = *xSdrObj-GetSubList();  // SdrObjGroup always 
returns existing sublist
 for( ::std::vector XclImpDrawObjRef ::const_iterator aIt = 
maChildren.begin(), aEnd = maChildren.end(); aIt != aEnd; ++aIt )
@@ -1430,7 +1400,7 @@ void XclImpTextObj::DoReadObj5( XclImpStream rStrm, 
sal_uInt16 nNameLen, sal_uI
 
 SdrObject* XclImpTextObj::DoCreateSdrObj( XclImpDffConverter rDffConv, const 
Rectangle rAnchorRect ) const
 {
-TSdrObjectPtr SdrObjCustomShape  xSdrObj( new SdrObjCustomShape );
+std::unique_ptrSdrObjCustomShape, SdrObjectFree xSdrObj( new 
SdrObjCustomShape );
 xSdrObj-NbcSetSnapRect( rAnchorRect );
 OUString aRectType = rectangle;
 xSdrObj-MergeDefaultAttributes( aRectType );
@@ -1826,7 +1796,7 @@ SdrObject* XclImpControlHelper::CreateSdrObjectFromShape(
 {
 mxShape = rxShape;
 SdrObjectPtr xSdrObj( SdrObject::getSdrObjectFromXShape( rxShape ) );
-if( xSdrObj.is() )
+if( xSdrObj )
 {
 xSdrObj-NbcSetSnapRect( rAnchorRect );
 // #i30543# insert into control layer
@@ -3288,7 +3258,7 @@ void XclImpDffConverter::ProcessObject( SdrObjList 
rObjList, const XclImpDrawOb
 {
 // CreateSdrObject() recursively creates embedded child objects
 SdrObjectPtr xSdrObj( rDrawObj.CreateSdrObject( *this, 
aAnchorRect, false ) );
-if( xSdrObj.is() )

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

2014-10-01 Thread Stephan Bergmann

 mysqlc/source/mysqlc_preparedstatement.cxx |2 +-
 mysqlc/source/mysqlc_resultset.cxx |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 2bb99ca189358065104e99fa4933d6b28ab10025
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Oct 1 10:35:19 2014 +0200

mysqlc: These shall be plain Time not tools::Time apparently

Change-Id: Id96a75bb8a07ea3b9701b9fe4692dfc81dbd8295

diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx 
b/mysqlc/source/mysqlc_preparedstatement.cxx
index b3e0bbd..6ec219d 100644
--- a/mysqlc/source/mysqlc_preparedstatement.cxx
+++ b/mysqlc/source/mysqlc_preparedstatement.cxx
@@ -374,7 +374,7 @@ void SAL_CALL OPreparedStatement::setDate(sal_Int32 
parameter, const Date aData
 
 
 /* {{{ OPreparedStatement::setTime() -I- */
-void SAL_CALL OPreparedStatement::setTime(sal_Int32 parameter, const 
tools::Time aVal)
+void SAL_CALL OPreparedStatement::setTime(sal_Int32 parameter, const Time 
aVal)
 throw(SQLException, RuntimeException, std::exception)
 {
 OSL_TRACE(OPreparedStatement::setTime);
diff --git a/mysqlc/source/mysqlc_resultset.cxx 
b/mysqlc/source/mysqlc_resultset.cxx
index 3291600..3541ec2 100644
--- a/mysqlc/source/mysqlc_resultset.cxx
+++ b/mysqlc/source/mysqlc_resultset.cxx
@@ -524,7 +524,7 @@ Time SAL_CALL OResultSet::getTime(sal_Int32 column)
 MutexGuard aGuard(m_aMutex);
 
 checkColumnIndex(column);
-tools::Time t;
+Time t;
 OUString timeString = getString(column);
 OUString token;
 sal_Int32 nIndex, i=0;
@@ -562,7 +562,7 @@ DateTime SAL_CALL OResultSet::getTimestamp(sal_Int32 column)
 checkColumnIndex(column);
 DateTime dt;
 Date d = getDate(column);
-tools::Time t = getTime(column);
+Time t = getTime(column);
 
 dt.Year = d.Year;
 dt.Month = d.Month;
@@ -1088,7 +1088,7 @@ void SAL_CALL OResultSet::updateDate(sal_Int32 column, 
const Date /* x */)
 /* }}} */
 
 /* {{{ OResultSet::updateTime() -U- */
-void SAL_CALL OResultSet::updateTime(sal_Int32 column, const tools::Time /* x 
*/)
+void SAL_CALL OResultSet::updateTime(sal_Int32 column, const Time /* x */)
 throw(SQLException, RuntimeException, std::exception)
 {
 OSL_TRACE(OResultSet::updateTime);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LibreOffice Gerrit News for core on 2014-10-01

2014-10-01 Thread gerrit

Moin!

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

 First time contributors doing great things! 
+ fdo#84504: UI- LineNumbering for header/footer
  in https://gerrit.libreoffice.org/11730 from Charu Tyagi
  about module sw
+ fdo#55903 - add new large zoom mode icons to galaxy and tango icon sets
  in https://gerrit.libreoffice.org/11729 from Yousuf Philips
  about module icon-themes
+ fdo#71248 Excel VBA: ActiveDocument is not tracking currently selected D
  in https://gerrit.libreoffice.org/11725 from Justin Luth
  about module sfx2, sw
+ collada2gltf: drop tr1 support
  in https://gerrit.libreoffice.org/11695 from Jan-Marek Glogowski
  about module external
+ forms: enhanced for loop
  in https://gerrit.libreoffice.org/11719 from Robert Antoni Buj i Gelonch
  about module forms
+ forms: The if statement is redundant
  in https://gerrit.libreoffice.org/11713 from Robert Antoni Buj i Gelonch
  about module forms
 End of freshness 

+ fdo#75757: remove inheritance to std::vector
  in https://gerrit.libreoffice.org/11731 from Takeshi Abe
  about module sw
+ gbild-to-ide: Add support for vs2013
  in https://gerrit.libreoffice.org/11728 from David Ostrovsky
  about module bin, build
+ configure: limit javac VM usage
  in https://gerrit.libreoffice.org/11699 from Michael Stahl
  about module build
+ optimise UNO Sequence destructor
  in https://gerrit.libreoffice.org/11718 from Noel Grandin
  about module cppu, include
+ fdo#82577: Handle Time
  in https://gerrit.libreoffice.org/11684 from Noel Grandin
  about module avmedia, basic, connectivity, cui, editeng, extensions, filter, 
forms, fpicker, framework, i18npool, include, lotuswordpro, mysqlc, odk, oox, 
reportdesign, sal, salhelper, sc, sd, sfx2, shell, slideshow, svl, svtools, 
svx, sw, toolkit, tools, ucb, unotest, unotools, uui, vbahelper, vcl, xmloff, 
xmlscript, xmlsecurity
+ fdo#82577: Handle Icon
  in https://gerrit.libreoffice.org/11715 from Noel Grandin
  about module include
+ fdo#75757: remove inheritance to std::vector
  in https://gerrit.libreoffice.org/11707 from Takeshi Abe
  about module sfx2
+ vcl: Merge ImpFontCharMap with FontCharMap, use intrusive_ptr to manage
  in https://gerrit.libreoffice.org/11565 from Chris Sherlock
  about module cui, include, sc, starmath, svtools, svx, vcl


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

+ Improve SvTreeListBox class
  in https://gerrit.libreoffice.org/11663 from Mihály Palenik
+ forms: use Arrays.toString in integration.forms.RadioButtons
  in https://gerrit.libreoffice.org/11721 from Robert Antoni Buj i Gelonch
+ forms: replace StringBuffer with StringBuilder
  in https://gerrit.libreoffice.org/11720 from Robert Antoni Buj i Gelonch
+ clean up some weird type-casting in SvxRTFParser
  in https://gerrit.libreoffice.org/11705 from Noel Grandin
+ fdo#38884 Fix setting X position with dbgutil enabled
  in https://gerrit.libreoffice.org/11717 from juegen funk
+ Fix fdo#58161 UI: White Paragraph style invisible in Styles Drop-Down
  in https://gerrit.libreoffice.org/11716 from juegen funk
+ fdo#53920 Switch back tab at RefButton closure time
  in https://gerrit.libreoffice.org/11660 from Laurent BP
+ Avoid leaking a GtkMenu
  in https://gerrit.libreoffice.org/11682 from Matthew Francis
+ forms: the assigned value is never used
  in https://gerrit.libreoffice.org/11712 from Robert Antoni Buj i Gelonch
+ forms: remove import from the same package
  in https://gerrit.libreoffice.org/11714 from Robert Antoni Buj i Gelonch
+ fdo#82577: Handle PolyPolygon
  in https://gerrit.libreoffice.org/11683 from Noel Grandin
+ fdo#84405 TRACK CHANGES: New icons for the changes toolbar
  in https://gerrit.libreoffice.org/11681 from Yousuf Philips
+ loplugin: cstylecast
  in https://gerrit.libreoffice.org/11692 from Noel Grandin
+ fdo#82577: Handle Region
  in https://gerrit.libreoffice.org/11664 from Noel Grandin


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

+  Fix fdo#58161 UI: White Paragraph style invisible in Styles Drop-Down
  in https://gerrit.libreoffice.org/11636 from juegen funk
+ fdo#84008: kill c++11 code from collada2gltf
  in https://gerrit.libreoffice.org/11697 from Zolnai Tamás


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

+ fdo#82335.
  in https://gerrit.libreoffice.org/11555 from Sudarshan Rao
+ HIG-ification of GSoC Color Picker dialog
  in https://gerrit.libreoffice.org/11494 from Olivier Hallot
+ l10ntools-transex3: convert 'int' to 'bool' where it's logical
  in https://gerrit.libreoffice.org/11317 from Douglas Mencken
+ Perftest for loading autocorrect dictionaries (fdo#79761)
  in https://gerrit.libreoffice.org/11296 from Matúš Kukan
+ fdo#81956 : Rendering of vml group shape was wrong.
  in https://gerrit.libreoffice.org/11013 from sushil_shinde
+ fdo#79018: LO hangs while opening file.
  in https://gerrit.libreoffice.org/9564 from Yogesh Bharate
+

[Bug 82577] get rid of prex.h / postx.h wrapper headers

2014-10-01 Thread bugzilla-daemon

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

--- Comment #14 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Noel Grandin committed a patch related to this issue.
It has been pushed to master:

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

fdo#82577: Handle Icon



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

Re: Anti-Virus vendors warnings

2014-10-01 Thread Christian Lohmaier

On Wed, Oct 1, 2014 at 11:55 AM, Michael Meeks
michael.me...@collabora.com wrote:
 Dear Nicholas,

 On Tue, 2014-09-30 at 17:19 -0400, nicholas ferguson wrote:
 I duplicated their directory structure.  And my build still failed.

 Grief; we should certainly document turning off AV more prominently.

Listed quite prominently in the windows build instructions. And *any*
AV-solution that blocks access should popup a corresponding
message/indicator that it did so.

 Ideally we could find a reproducer that we could check during configure
 and print out:

Nope, that won't help. If the user is ignoring the system's messages,
why should he read ours?

And checking whether virus solution xy is running probably is a
surefire way to get detected as malicious beforehand so you won't be
able to show that message :-)

 It'd be great to isolate exactly what is causing the problem, so we 
 can
 save other people this suffering; I'd love to invest in that.

BitDefender/Security Essentials blocks some of the CVE test-files. I
assume that to be no difference here. And there's no way to have
av-vendors whitelist those files, as after all they can exploit
vulnerabilities in other/older software.

If it needs forensics to find out what was blocked, then the
av-solution is crap, or the user unwilling to look at the software's
logs.

 On Tue, 2014-09-30 at 17:50 -0400, nicholas ferguson wrote:
 I think that is a bad idea.  A good idea is to turn on anti virus
 where work is done.  you can't tell developers to turn off their
 anti virus when working on windows.  That’s  crazy talk

Either you disable monitoring for the build-directories, or you
whitelist stuff in another way. Or use a different AV-solution.

Of course false-detection in the result is another story - Symantec
(Norton AV) offers a whitelisting form that I use for the official
builds, so regular users don't get warning when downloading/installing
the finished product. But building is a different story.

I see no way to have the build free of AV-detection unless we remove
all of the CVE testdocuments.
In fact any AV-solution that doesn't block/break the build in a way is
not tightly monitoring the system..

So only way is to do as already written in the buildinstructions and
common sense when actually looking at the AV-solutions' reports:
Disable monitoring for the build. Not only will that not break the
build, but also save some cycles for actually compiling stuff instead
of checking lots of intermediate files.

Your build-account surely is not an administrative account, and not
even the one you do your office work with (as the tests pop up lots of
windows that would otherwise be very distracting) - so I absolutely
don't see this as a huge problem.

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

[Bug 82577] get rid of prex.h / postx.h wrapper headers

2014-10-01 Thread bugzilla-daemon

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

--- Comment #15 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Noel Grandin committed a patch related to this issue.
It has been pushed to master:

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

fdo#82577: Handle KeyPress



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

[Bug 65675] LibreOffice 4.2 most annoying bugs

2014-10-01 Thread bugzilla-daemon

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

Bug 65675 depends on bug 40780, which changed state.

Bug 40780 Summary: Impress Custom Animation Sound Effect not audible in Slide 
Show
https://bugs.freedesktop.org/show_bug.cgi?id=40780

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |FIXED

-- 
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: 2 commits - sal/osl scripting/source

2014-10-01 Thread Stephan Bergmann

 sal/osl/unx/thread.cxx   |4 ++--
 scripting/source/dlgprov/dlgprov.hxx |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c8ae1787c6315bd7a8513656626132f1140e77f9
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Oct 1 12:17:31 2014 +0200

Blind fix for Android

Change-Id: If997720635f99726e14c00132308529f96e639c8

diff --git a/sal/osl/unx/thread.cxx b/sal/osl/unx/thread.cxx
index 739dd18..f23f55b 100644
--- a/sal/osl/unx/thread.cxx
+++ b/sal/osl/unx/thread.cxx
@@ -233,14 +233,14 @@ static void* osl_thread_start_Impl (void* pData)
 {
 #ifdef ANDROID
 JNIEnv* env = 0;
-int res = (*lo_get_javavm())-AttachCurrentThread(lo_get_javavm(), 
env, NULL);
+int res = (*lo_get_javavm()).AttachCurrentThread(env, NULL);
 __android_log_print(ANDROID_LOG_INFO, LibreOffice, New sal thread 
started and attached res=%d, res);
 #endif
 /* call worker function */
 pImpl-m_WorkerFunction(pImpl-m_pData);
 
 #ifdef ANDROID
-res = (*lo_get_javavm())-DetachCurrentThread(lo_get_javavm());
+res = (*lo_get_javavm()).DetachCurrentThread();
 __android_log_print(ANDROID_LOG_INFO, LibreOffice, Detached 
finished sal thread res=%d, res);
 #endif
 }
commit 609e22b0dcbadc0501847fd574f58085b0891d75
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Oct 1 11:50:04 2014 +0200

scripting: std::auto_ptr - std::unique_ptr

Change-Id: I91f4a037dfcfbea83cb1ea546ea73880f0480961

diff --git a/scripting/source/dlgprov/dlgprov.hxx 
b/scripting/source/dlgprov/dlgprov.hxx
index 3246070..2c690ad 100644
--- a/scripting/source/dlgprov/dlgprov.hxx
+++ b/scripting/source/dlgprov/dlgprov.hxx
@@ -78,7 +78,7 @@ namespace dlgprov
  ::com::sun::star::uno::Reference 
::com::sun::star::container::XNameContainer  mxDlgLib;
  ::com::sun::star::uno::Reference 
::com::sun::star::script::XScriptListener  mxBasicRTLListener;
 };
-std::auto_ptr BasicRTLParams  m_BasicInfo;
+std::unique_ptr BasicRTLParams  m_BasicInfo;
 ::com::sun::star::uno::Reference 
::com::sun::star::uno::XComponentContext m_xContext;
 ::com::sun::star::uno::Reference ::com::sun::star::frame::XModel 
 m_xModel;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-01 Thread Miklos Vajna

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

New commits:
commit 54b26b23cef7ae11006244d0d1479c81b99b4619
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Tue Sep 23 17:06:58 2014 +0200

error C2782: template parameter '_Ty' is ambiguous

Change-Id: Ieb8f91a629b9e14480c0372e747fea326c549833
(cherry picked from commit 02e0bac73be8d11abf539130f3d3541fa72af93a)
Signed-off-by: Andras Timar andras.ti...@collabora.com

diff --git a/sw/source/core/bastyp/breakit.cxx 
b/sw/source/core/bastyp/breakit.cxx
index 8a4c40e..0e3aeea 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -175,7 +175,7 @@ sal_Int32 SwBreakIt::getGraphemeCount(const OUString rText,
 {
 sal_Int32 nGraphemeCount = 0;
 
-sal_Int32 nCurPos = std::max(0, nStart);
+sal_Int32 nCurPos = std::max(static_castsal_Int32(0), nStart);
 while (nCurPos  nEnd)
 {
 // fdo#49208 cheat and assume that nothing can combine with a space
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 8 commits - basic/source cppcanvas/source drawinglayer/source editeng/source embeddedobj/source extensions/source framework/source hwpfilter/source include/editeng incl

2014-10-01 Thread Noel Grandin

 basic/source/basmgr/basmgr.cxx  |   24 +-
 basic/source/runtime/methods.cxx|   18 -
 basic/source/runtime/runtime.cxx|   36 +--
 cppcanvas/source/mtfrenderer/emfplus.cxx|   16 -
 cppcanvas/source/uno/uno_mtfrenderer.cxx|2 
 drawinglayer/source/primitive2d/controlprimitive2d.cxx  |2 
 drawinglayer/source/primitive2d/graphicprimitive2d.cxx  |2 
 drawinglayer/source/primitive2d/mediaprimitive2d.cxx|2 
 editeng/source/accessibility/AccessibleEditableTextPara.cxx |4 
 editeng/source/editeng/editattr.cxx |   44 ++--
 editeng/source/editeng/editdbg.cxx  |   78 
 editeng/source/editeng/editdoc.cxx  |  102 +-
 editeng/source/editeng/editeng.cxx  |2 
 editeng/source/editeng/editobj.cxx  |   17 -
 editeng/source/editeng/editsel.cxx  |2 
 editeng/source/editeng/editundo.cxx |   10 -
 editeng/source/editeng/edtspell.cxx |8 
 editeng/source/editeng/eeobj.cxx|2 
 editeng/source/editeng/eerdll.cxx   |6 
 editeng/source/editeng/eertfpar.cxx |   22 +-
 editeng/source/editeng/impedit.cxx  |4 
 editeng/source/editeng/impedit2.cxx |   36 +--
 editeng/source/editeng/impedit3.cxx |   52 ++---
 editeng/source/editeng/impedit4.cxx |   76 +++
 editeng/source/editeng/impedit5.cxx |4 
 editeng/source/editeng/textconv.cxx |2 
 editeng/source/items/bulitem.cxx|2 
 editeng/source/items/flditem.cxx|   12 -
 editeng/source/items/frmitems.cxx   |   59 +++---
 editeng/source/items/numitem.cxx|6 
 editeng/source/items/optitems.cxx   |6 
 editeng/source/items/paraitem.cxx   |   29 +--
 editeng/source/items/svdfield.cxx   |2 
 editeng/source/items/textitem.cxx   |   30 +--
 editeng/source/items/writingmodeitem.cxx|2 
 editeng/source/items/xmlcnitm.cxx   |4 
 editeng/source/misc/svxacorr.cxx|2 
 editeng/source/outliner/outliner.cxx|   22 +-
 editeng/source/outliner/outlvw.cxx  |2 
 editeng/source/rtf/rtfitem.cxx  |   22 +-
 editeng/source/rtf/svxrtf.cxx   |4 
 editeng/source/uno/unofdesc.cxx |4 
 editeng/source/uno/unofield.cxx |   50 ++---
 editeng/source/uno/unonrule.cxx |2 
 editeng/source/uno/unotext.cxx  |8 
 editeng/source/xml/xmltxtimp.cxx|2 
 embeddedobj/source/commonembedding/embedobj.cxx |4 
 embeddedobj/source/commonembedding/miscobj.cxx  |6 
 embeddedobj/source/general/dummyobject.cxx  |6 
 embeddedobj/source/msole/oleembed.cxx   |6 
 embeddedobj/source/msole/olemisc.cxx|6 
 extensions/source/logging/logger.cxx|2 
 extensions/source/plugin/base/multiplx.cxx  |2 
 extensions/source/plugin/base/nfuncs.cxx|4 
 extensions/source/plugin/base/xplugin.cxx   |2 
 extensions/source/propctrlr/cellbindinghelper.cxx   |4 
 extensions/source/propctrlr/formcomponenthandler.cxx|8 
 extensions/source/propctrlr/propertyhandler.cxx |2 
 extensions/source/propctrlr/standardcontrol.cxx |2 
 extensions/source/propctrlr/taborder.cxx|4 
 extensions/source/propctrlr/usercontrol.cxx |2 
 framework/source/classes/fwktabwindow.cxx   |2 
 framework/source/helper/persistentwindowstate.cxx   |6 
 framework/source/helper/titlebarupdate.cxx  |6 
 framework/source/inc/pattern/window.hxx |6 
 framework/source/layoutmanager/layoutmanager.cxx|   36 +--
 framework/source/layoutmanager/toolbarlayoutmanager.cxx |   24 +-
 framework/source/services/autorecovery.cxx  |4 
 framework/source/services/frame.cxx |8 
 framework/source/services/tabwindowservice.cxx  |   10 -
 hwpfilter/source/hwpreader.cxx  |   28 +-

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

2014-10-01 Thread Caolán McNamara

 sw/source/core/bastyp/breakit.cxx |2 +-
 sw/source/core/txtnode/txtedt.cxx |6 --
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 1e32a66897dea37c40bbad4d0e23987e54be5332
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Sep 23 15:03:38 2014 +0100

with show changes on we can have negative offsets

for counting words in a range of text which has redline deleted
text at the start

Change-Id: I34149822d43f8ee3fbde58a166dad408fb588fce
(cherry picked from commit 93e7ae6f5719c56c90679e46a6e817dedf5c54c6)
Reviewed-on: https://gerrit.libreoffice.org/11610
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/sw/source/core/bastyp/breakit.cxx 
b/sw/source/core/bastyp/breakit.cxx
index b4caeb3..8a4c40e 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -175,7 +175,7 @@ sal_Int32 SwBreakIt::getGraphemeCount(const OUString rText,
 {
 sal_Int32 nGraphemeCount = 0;
 
-sal_Int32 nCurPos = nStart;
+sal_Int32 nCurPos = std::max(0, nStart);
 while (nCurPos  nEnd)
 {
 // fdo#49208 cheat and assume that nothing can combine with a space
diff --git a/sw/source/core/txtnode/txtedt.cxx 
b/sw/source/core/txtnode/txtedt.cxx
index dd531b8..aa6f7d6 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -723,6 +723,8 @@ SwScanner::SwScanner( const SwTxtNode rNd, const OUString 
rTxt,
 OUStringBuffer aBuf(aPreDashReplacementText);
 for (sal_Int32 i = nStartPos; i  nEndPos; ++i)
 {
+if (i  0)
+continue;
 sal_Unicode cChar = aBuf[i];
 if (sDashes.indexOf(cChar) != -1)
 {
@@ -798,9 +800,9 @@ bool SwScanner::NextWord()
 while ( true )
 {
 // skip non-letter characters:
-while ( nBegin  aText.getLength() )
+while (nBegin  aText.getLength())
 {
-if ( !u_isspace( aText[nBegin] ) )
+if (nBegin = 0  !u_isspace(aText[nBegin]))
 {
 if ( !pLanguage )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-01 Thread Luboš Luňák

 basic/source/comp/scanner.cxx |   37 -
 1 file changed, 20 insertions(+), 17 deletions(-)

New commits:
commit dc7ca91a0494713a057da33cf33f1a83640f6a75
Author: LuboÅ¡ LuÅÃ¡k l.lu...@collabora.com
Date:   Tue Sep 30 19:21:10 2014 +0200

avoid calling OUString::copy() with length being -1

Which asserts in dbgutil build.

Change-Id: I0f8205ae98c5a57c430b7d8a574e4c0019855841

diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index 042518d..6065e26 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -491,25 +491,28 @@ bool SbiScanner::NextSym()
 if( *pLine == cSep )
 {
 pLine++; nCol++;
-if( *pLine != cSep || cSep == ']' ) break;
+if( *pLine != cSep || cSep == ']' )
+{
+// If VBA Interop then doen't eat the [] chars
+if ( cSep == ']'  bVBASupportOn )
+aSym = aLine.copy( n - 1, nCol - n  + 1);
+else
+aSym = aLine.copy( n, nCol - n - 1 );
+// get out duplicate string delimiters
+OUStringBuffer aSymBuf;
+for ( sal_Int32 i = 0, len = aSym.getLength(); i  len; 
++i )
+{
+aSymBuf.append( aSym[i] );
+if ( aSym[i] == cSep  ( i+1  len )  aSym[i+1] == 
cSep )
+++i;
+}
+aSym = aSymBuf.makeStringAndClear();
+if( cSep != ']' )
+eScanType = ( cSep == '#' ) ? SbxDATE : SbxSTRING;
+break;
+}
 } else aError = OUString(cSep), GenError( SbERR_EXPECTED );
 }
-// If VBA Interop then doen't eat the [] chars
-if ( cSep == ']'  bVBASupportOn )
-aSym = aLine.copy( n - 1, nCol - n  + 1);
-else
-aSym = aLine.copy( n, nCol - n - 1 );
-// get out duplicate string delimiters
-OUStringBuffer aSymBuf;
-for ( sal_Int32 i = 0, len = aSym.getLength(); i  len; ++i )
-{
-aSymBuf.append( aSym[i] );
-if ( aSym[i] == cSep  ( i+1  len )  aSym[i+1] == cSep )
-++i;
-}
-aSym = aSymBuf.makeStringAndClear();
-if( cSep != ']' )
-eScanType = ( cSep == '#' ) ? SbxDATE : SbxSTRING;
 }
 // invalid characters:
 else if( ( *pLine  0xFF ) = 0x7F )
___
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

2014-10-01 Thread Miklos Vajna

 sw/qa/core/data/rtf/pass/fdo84536.rtf   |   16 
 writerfilter/source/rtftok/rtfsdrimport.cxx |5 -
 2 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 53b9a9bc7c84738545b5c7b791cea1e3d6a16c72
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Oct 1 16:45:03 2014 +0200

fdo#84536 RTF import: don't try to rotate TextFrames

Regression from 818d80eb0cee65d1bcc4fdb74b32a7c42cc1336e (RTF import:
support shapes inside tables, 2013-06-28).

Change-Id: I05eb2f4f2e3467e35f96b280e3a79f69906a56de

diff --git a/sw/qa/core/data/rtf/pass/fdo84536.rtf 
b/sw/qa/core/data/rtf/pass/fdo84536.rtf
new file mode 100644
index 000..a8eaacf
--- /dev/null
+++ b/sw/qa/core/data/rtf/pass/fdo84536.rtf
@@ -0,0 +1,16 @@
+{\rtf1
+{\shp
+{\*\shpinst\shpleft0\shptop0\shpright10557\shpbottom2639\shpfhdr0\shpbxmargin\shpbxignore\shpbymargin\shpbyignore\shpwr3\shpwrk0\shpfblwtxt1\shpz2\shplid2054
+{\sp
+{\sn shapeType}
+{\sv 202}
+}
+{\sp
+{\sn rotation}
+{\sv -2949120}
+}
+{\shptxt hello\par}
+}
+}
+\par
+}
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx 
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 3b530bf..facae3f 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -15,6 +15,7 @@
 #include com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp
 #include com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp
 #include com/sun/star/drawing/FillStyle.hpp
+#include com/sun/star/lang/XServiceInfo.hpp
 #include com/sun/star/table/BorderLine2.hpp
 #include com/sun/star/text/HoriOrientation.hpp
 #include com/sun/star/text/RelOrientation.hpp
@@ -198,7 +199,9 @@ void 
RTFSdrImport::applyProperty(uno::Referencedrawing::XShape const xShape,
 // See DffPropertyReader::Fix16ToAngle(): in RTF, positive rotation 
angles are clockwise, we have them as counter-clockwise.
 // Additionally, RTF type is 0..360*2^16, our is 0..360*100.
 sal_Int32 nRotation = aValue.toInt32()*100/65536;
-xPropertySet-setPropertyValue(RotateAngle, 
uno::makeAny(sal_Int32(NormAngle360(nRotation * -1;
+uno::Referencelang::XServiceInfo xServiceInfo(xShape, 
uno::UNO_QUERY);
+if (!xServiceInfo-supportsService(com.sun.star.text.TextFrame))
+xPropertySet-setPropertyValue(RotateAngle, 
uno::makeAny(sal_Int32(NormAngle360(nRotation * -1;
 }
 
 if (nHoriOrient != 0  xPropertySet.is())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-01 Thread Caolán McNamara

 svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx |2 +-
 sw/qa/core/data/ooxml/pass/fdo79131.docx |binary
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3c8eb2fe90622afce3ee935000f8f549b5d0efa7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Sep 29 20:38:18 2014 +0100

Resolves: fdo#79131 crash in EnhancedCustomShapeTypeNames::Get

Change-Id: Ib21a4a1574119120f09d4ecac73b93a0f2f6739f
(cherry picked from commit 65277f994ae25d930c15aebba0ed19f8de0abba1)
Reviewed-on: https://gerrit.libreoffice.org/11703
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx 
b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
index 8e79662..6eca6e9 100644
--- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
@@ -300,7 +300,7 @@ MSO_SPT EnhancedCustomShapeTypeNames::Get( const OUString 
rShapeType )
 
 OUString EnhancedCustomShapeTypeNames::Get( const MSO_SPT eShapeType )
 {
-return eShapeType = mso_sptTextBox
+return (eShapeType = mso_sptTextBox  eShapeType = mso_sptMin)
 ? OUString::createFromAscii( pNameTypeTableArray[ eShapeType ].pS )
 : OUString();
 }
diff --git a/sw/qa/core/data/ooxml/pass/fdo79131.docx 
b/sw/qa/core/data/ooxml/pass/fdo79131.docx
new file mode 100644
index 000..5f10d9c
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/fdo79131.docx differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-01 Thread Michael Stahl

 sw/qa/extras/odfimport/data/fdo79269.odt|binary
 sw/qa/extras/odfimport/data/fdo79269_header.odt |binary
 sw/qa/extras/odfimport/odfimport.cxx|   35 
 sw/source/core/unocore/unostyle.cxx |   35 +---
 4 files changed, 55 insertions(+), 15 deletions(-)

New commits:
commit 902de8a1cbdb86c1eb1a05c8307b109fd75f493c
Author: Michael Stahl mst...@redhat.com
Date:   Tue Sep 30 17:59:08 2014 +0200

fdo#79269: fix ODF import of style:footer-first

The implementation of SwXStyle's FirstIsShared property is busted, and
that causes xmloff to write the footer-first content into the master
footer.

This is a re-implementation of 0f21f932081471b2a5eda820fa1a194fbf3ab85c
because unostyle.cxx is very different on master...

Change-Id: I485d8089c1fb5ba3ca369fbfe8f3115bf700ba13
Reviewed-on: https://gerrit.libreoffice.org/11722
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/sw/qa/extras/odfimport/data/fdo79269.odt 
b/sw/qa/extras/odfimport/data/fdo79269.odt
new file mode 100644
index 000..2e3bf1e
Binary files /dev/null and b/sw/qa/extras/odfimport/data/fdo79269.odt differ
diff --git a/sw/qa/extras/odfimport/data/fdo79269_header.odt 
b/sw/qa/extras/odfimport/data/fdo79269_header.odt
new file mode 100644
index 000..6f1a839
Binary files /dev/null and b/sw/qa/extras/odfimport/data/fdo79269_header.odt 
differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index 8cd4b09..36aa437 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -272,6 +272,41 @@ DECLARE_ODFIMPORT_TEST(testFdo60842, fdo60842.odt)
 getCell(xTable, E1, 01/04/2012);
 }
 
+DECLARE_ODFIMPORT_TEST(testFdo79269, fdo79269.odt)
+{
+uno::Referenceframe::XModel xModel(mxComponent, uno::UNO_QUERY);
+uno::Referencetext::XTextViewCursorSupplier 
xTextViewCursorSupplier(xModel-getCurrentController(), uno::UNO_QUERY);
+uno::Referencetext::XPageCursor 
xCursor(xTextViewCursorSupplier-getViewCursor(), uno::UNO_QUERY);
+xCursor-jumpToLastPage();
+CPPUNIT_ASSERT_EQUAL(sal_Int16(2), xCursor-getPage());
+
+// The problem was that the first-footer was shared.
+uno::Referencebeans::XPropertySet 
xPropSet(getStyles(PageStyles)-getByName(DEFAULT_STYLE), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(false, getPropertybool(xPropSet, FirstIsShared));
+
+uno::Referencetext::XTextRange xFooter1 = getProperty 
uno::Referencetext::XTextRange (xPropSet, FooterTextFirst);
+CPPUNIT_ASSERT_EQUAL(OUString(forst), xFooter1-getString());
+uno::Referencetext::XTextRange xFooter = getProperty 
uno::Referencetext::XTextRange (xPropSet, FooterText);
+CPPUNIT_ASSERT_EQUAL(OUString(second), xFooter-getString());
+}
+
+DECLARE_ODFIMPORT_TEST(testFdo79269_header, fdo79269_header.odt)
+{
+uno::Referenceframe::XModel xModel(mxComponent, uno::UNO_QUERY);
+uno::Referencetext::XTextViewCursorSupplier 
xTextViewCursorSupplier(xModel-getCurrentController(), uno::UNO_QUERY);
+uno::Referencetext::XPageCursor 
xCursor(xTextViewCursorSupplier-getViewCursor(), uno::UNO_QUERY);
+xCursor-jumpToLastPage();
+CPPUNIT_ASSERT_EQUAL(sal_Int16(2), xCursor-getPage());
+
+uno::Referencebeans::XPropertySet 
xPropSet(getStyles(PageStyles)-getByName(DEFAULT_STYLE), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(false, getPropertybool(xPropSet, FirstIsShared));
+
+uno::Referencetext::XTextRange xFooter1 = getProperty 
uno::Referencetext::XTextRange (xPropSet, HeaderTextFirst);
+CPPUNIT_ASSERT_EQUAL(OUString(forst), xFooter1-getString());
+uno::Referencetext::XTextRange xFooter = getProperty 
uno::Referencetext::XTextRange (xPropSet, HeaderText);
+CPPUNIT_ASSERT_EQUAL(OUString(second), xFooter-getString());
+}
+
 DECLARE_ODFIMPORT_TEST(testFdo56272, fdo56272.odt)
 {
 uno::Referencedrawing::XShape xShape = getShape(1);
diff --git a/sw/source/core/unocore/unostyle.cxx 
b/sw/source/core/unocore/unostyle.cxx
index 5c24b91..4ed26e0 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -462,6 +462,24 @@ SwXStyleFamily::~SwXStyleFamily()
 
 }
 
+static bool lcl_GetHeaderFooterItem(
+SfxItemSet const rSet, OUString const rPropName, bool const bFooter,
+SvxSetItem const* o_rpItem)
+{
+SfxItemState eState = rSet.GetItemState(
+(bFooter) ? SID_ATTR_PAGE_FOOTERSET : SID_ATTR_PAGE_HEADERSET,
+false, reinterpret_castconst SfxPoolItem**(o_rpItem));
+if (SFX_ITEM_SET != eState 
+rPropName == UNO_NAME_FIRST_IS_SHARED)
+{   // fdo#79269 header may not exist, check footer then
+eState = rSet.GetItemState(
+(!bFooter) ? SID_ATTR_PAGE_FOOTERSET : SID_ATTR_PAGE_HEADERSET,
+false, reinterpret_castconst SfxPoolItem**(o_rpItem));
+}
+return SFX_ITEM_SET == eState;
+}

[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress3' - android/experimental

2014-10-01 Thread Jan Holesovsky

 android/experimental/LOAndroid3/res/values/strings.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 43fc93053a6bbb24550cd9a9b0110e9fef01b02c
Author: Jan Holesovsky ke...@collabora.com
Date:   Wed Oct 1 22:48:38 2014 +0200

android: Fix typo.

Change-Id: I22f7bbcc5bc5f58c30a5915c876736f664a42a61

diff --git a/android/experimental/LOAndroid3/res/values/strings.xml 
b/android/experimental/LOAndroid3/res/values/strings.xml
index d04f92e..f913e5e 100644
--- a/android/experimental/LOAndroid3/res/values/strings.xml
+++ b/android/experimental/LOAndroid3/res/values/strings.xml
@@ -4,8 +4,8 @@
 string name=app_nameLibreOffice Viewer/string
 
 string name=app_about_namebLibreOffice Viewer \'Beta\'/b/string
-string name=app_descriptionLibreOffice Viewer is an document viewer 
based on LibreOffice/string
-string name=app_creditshttp://www.libreoffice.com/string
+string name=app_descriptionLibreOffice Viewer is a document viewer 
based on LibreOffice/string
+string name=app_creditshttp://www.libreoffice.org/string
 
 string name=browser_app_nameLibreOffice Browser/string
 string name=menu_searchSearch/string
___
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' - configure.ac

2014-10-01 Thread Christian Lohmaier

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cb2af94684b0f6c161bd6d241a10f58e61afd468
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Oct 1 23:11:11 2014 +0200

bump product version to 4.2.8.0.0+

Change-Id: Icc0653847dbe1bf64d23326634246eee0242d24d

diff --git a/configure.ac b/configure.ac
index 2560a0d..ce1c0b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.2.7.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.2.8.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-01 Thread Samuel Mehrbrodt

 cui/source/options/optaboutconfig.cxx   |2 -
 include/svtools/treelistbox.hxx |6 ++---
 include/vcl/settings.hxx|6 ++---
 svtools/source/contnr/treelistbox.cxx   |   35 
 svtools/source/contnr/treelistentry.cxx |7 --
 vcl/source/app/settings.cxx |   24 ++---
 6 files changed, 42 insertions(+), 38 deletions(-)

New commits:
commit 0c2b43b70776ea49655a7f18c6c11dc64a5f25b2
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date:   Thu Oct 2 00:58:08 2014 +0200

Improved striped rows implementation

Some renaming, use variable for row background when not striped

Change-Id: I5b36fc751aa163dbb127406d7aefad01974fa371

diff --git a/cui/source/options/optaboutconfig.cxx 
b/cui/source/options/optaboutconfig.cxx
index 7b3c0d6..d66a369 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -157,7 +157,7 @@ CuiAboutConfigTabPage::CuiAboutConfigTabPage( vcl::Window* 
pParent/*, const SfxI
 aTabs[4] = aTabs[3] + fWidth * 8;
 
 m_pPrefBox-SetTabs(aTabs, MAP_PIXEL);
-m_pPrefBox-SetAlternatingRow( true );
+m_pPrefBox-SetAlternatingRowColors( true );
 }
 
 void CuiAboutConfigTabPage::InsertEntry(const OUString rProp, const OUString 
rStatus, const OUString rType, const OUString rValue)
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index f54f324..fb69656 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -236,7 +236,7 @@ class SVT_DLLPUBLIC SvTreeListBox
 sal_uInt16  nLastSelTab;
 long mnCheckboxItemWidth;
 bool mbContextBmpExpanded;
-bool mbAlternatingRowColor;
+bool mbAlternatingRowColors;
 
 SvTreeListEntry*pHdlEntry;
 SvLBoxItem* pHdlItem;
@@ -780,8 +780,8 @@ public:
 
 virtual Size GetOptimalSize() const SAL_OVERRIDE;
 
-void SetAlternatingRow( const bool bEnable );
-bool IsRowAlternating() const { return mbAlternatingRowColor; }
+void SetAlternatingRowColors( const bool bEnable );
+bool IsAlternatingRowColors() const { return mbAlternatingRowColors; }
 };
 
 #define SV_LBOX_DD_FORMAT SV_LBOX_DD_FORMAT
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index bb454a3..9650828 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -358,12 +358,12 @@ public:
 voidSetInactiveTabColor( const Color rColor );
 const ColorGetInactiveTabColor() const;
 
+voidSetRowColor( const Color rColor );
+const ColorGetRowColor() const;
+
 voidSetAlternatingRowColor( const Color 
rColor );
 const ColorGetAlternatingRowColor() const;
 
-voidSetAlternatingRowColor2( const Color 
rColor );
-const ColorGetAlternatingRowColor2() const;
-
 voidSetHighContrastMode(bool bHighContrast );
 boolGetHighContrastMode() const;
 
diff --git a/svtools/source/contnr/treelistbox.cxx 
b/svtools/source/contnr/treelistbox.cxx
index c7d610c..b991693 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -380,7 +380,7 @@ SvTreeListBox::SvTreeListBox(vcl::Window* pParent, WinBits 
nWinStyle) :
 DragSourceHelper(this),
 mpImpl(new SvTreeListBoxImpl(*this)),
 mbContextBmpExpanded(false),
-mbAlternatingRowColor(false),
+mbAlternatingRowColors(false),
 eSelMode(NO_SELECTION),
 nMinWidthInChars(0)
 {
@@ -410,7 +410,7 @@ SvTreeListBox::SvTreeListBox(vcl::Window* pParent, const 
ResId rResId) :
 DragSourceHelper(this),
 mpImpl(new SvTreeListBoxImpl(*this)),
 mbContextBmpExpanded(false),
-mbAlternatingRowColor(false),
+mbAlternatingRowColors(false),
 eSelMode(NO_SELECTION),
 nMinWidthInChars(0)
 {
@@ -470,14 +470,14 @@ IMPL_LINK_INLINE_END( SvTreeListBox, CloneHdl_Impl, 
SvTreeListEntry*, pEntry )
 sal_uLong SvTreeListBox::Insert( SvTreeListEntry* pEntry, SvTreeListEntry* 
pParent, sal_uLong nPos )
 {
 sal_uLong nInsPos = pModel-Insert( pEntry, pParent, nPos );
-if(mbAlternatingRowColor)
+if(mbAlternatingRowColors)
 {
 if(nPos == TREELIST_APPEND)
-pEntry-SetBackColor( Prev(pEntry)  Prev(pEntry)-GetBackColor() 
== GetSettings().GetStyleSettings().GetAlternatingRowColor() ?
-
GetSettings().GetStyleSettings().GetAlternatingRowColor2() :
-
GetSettings().GetStyleSettings().GetAlternatingRowColor() );
+pEntry-SetBackColor( Prev(pEntry)  Prev(pEntry)-GetBackColor() 
== GetSettings().GetStyleSettings().GetRowColor() ?
+
GetSettings().GetStyleSettings().GetAlternatingRowColor() :
+

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

2014-10-01 Thread Matúš Kukan

 sax/source/tools/CachedOutputStream.hxx |   46 -
 sax/source/tools/fastserializer.cxx |9 +--
 sc/source/core/tool/address.cxx |   86 
 3 files changed, 60 insertions(+), 81 deletions(-)

New commits:
commit 077b5381570c5bea2281267ad1d2b3f5ab2beac6
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Tue Sep 30 15:13:22 2014 +0200

Use OUStringBuffers for performance reasons.

Saves 120m pcycles in just 250k calls to ScAddress::Format.

Change-Id: Ibf20cf0843a47cf0fa37a38c4fecf1ae1560412c

diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index 6a37952..c8c8f18 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -1656,50 +1656,50 @@ sal_uInt16 ScRange::ParseRows( const OUString rStr, 
ScDocument* pDoc,
 return (p != NULL  *p == '\0') ? nRes : 0;
 }
 
-static inline void lcl_a1_append_c ( OUString rString, int nCol, bool bIsAbs )
+static inline void lcl_a1_append_c ( OUStringBuffer rString, int nCol, bool 
bIsAbs )
 {
 if( bIsAbs )
-rString += $;
+rString.append($);
 ScColToAlpha( rString, sal::static_int_castSCCOL(nCol) );
 }
 
-static inline void lcl_a1_append_r ( OUString rString, int nRow, bool bIsAbs )
+static inline void lcl_a1_append_r ( OUStringBuffer rString, int nRow, bool 
bIsAbs )
 {
 if ( bIsAbs )
-rString += $;
-rString += OUString::number( nRow+1 );
+rString.append($);
+rString.append(OUString::number( nRow+1 ));
 }
 
-static inline void lcl_r1c1_append_c ( OUString rString, int nCol, bool 
bIsAbs,
+static inline void lcl_r1c1_append_c ( OUStringBuffer rString, int nCol, bool 
bIsAbs,
const ScAddress::Details rDetails )
 {
-rString += C;
+rString.append(C);
 if (bIsAbs)
 {
-rString += OUString::number( nCol + 1 );
+rString.append(OUString::number( nCol + 1 ));
 }
 else
 {
 nCol -= rDetails.nCol;
 if (nCol != 0) {
-rString += [ + OUString::number( nCol ) + ];
+rString.append([).append(OUString::number( nCol )).append(]);
 }
 }
 }
 
-static inline void lcl_r1c1_append_r ( OUString rString, int nRow, bool 
bIsAbs,
+static inline void lcl_r1c1_append_r ( OUStringBuffer rString, int nRow, bool 
bIsAbs,
const ScAddress::Details rDetails )
 {
-rString += R;
+rString.append(R);
 if (bIsAbs)
 {
-rString += OUString::number( nRow + 1 );
+rString.append(OUString::number( nRow + 1 ));
 }
 else
 {
 nRow -= rDetails.nRow;
 if (nRow != 0) {
-rString += [ + OUString::number( nRow ) + ];
+rString.append([).append(OUString::number( nRow )).append(]);
 }
 }
 }
@@ -1732,7 +1732,7 @@ static OUString getFileNameFromDoc( const ScDocument* 
pDoc )
 OUString ScAddress::Format(sal_uInt16 nFlags, const ScDocument* pDoc,
const Details rDetails) const
 {
-OUString r;
+OUStringBuffer r;
 if( nFlags  SCA_VALID )
 nFlags |= ( SCA_VALID_ROW | SCA_VALID_COL | SCA_VALID_TAB );
 if( pDoc  (nFlags  SCA_VALID_TAB ) )
@@ -1770,11 +1770,11 @@ OUString ScAddress::Format(sal_uInt16 nFlags, const 
ScDocument* pDoc,
 {
 default :
 case formula::FormulaGrammar::CONV_OOO:
-r += aDocName;
+r.append(aDocName);
 if( nFlags  SCA_TAB_ABSOLUTE )
-r += $;
-r += aTabName;
-r += .;
+r.append($);
+r.append(aTabName);
+r.append(.);
 break;
 
 case formula::FormulaGrammar::CONV_XL_A1:
@@ -1782,10 +1782,10 @@ OUString ScAddress::Format(sal_uInt16 nFlags, const 
ScDocument* pDoc,
 case formula::FormulaGrammar::CONV_XL_OOX:
 if (!aDocName.isEmpty())
 {
-r += [ + aDocName + ];
+r.append([).append(aDocName).append(]);
 }
-r += aTabName;
-r += !;
+r.append(aTabName);
+r.append(!);
 break;
 }
 }
@@ -1809,7 +1809,7 @@ OUString ScAddress::Format(sal_uInt16 nFlags, const 
ScDocument* pDoc,
 lcl_r1c1_append_c ( r, nCol, (nFlags  SCA_COL_ABSOLUTE) != 0, 
rDetails );
 break;
 }
-return r;
+return r.makeStringAndClear();
 }
 
 static void lcl_Split_DocTab( const ScDocument* pDoc,  SCTAB nTab,
@@ -1841,7 +1841,7 @@ static void lcl_Split_DocTab( const ScDocument* pDoc,  
SCTAB nTab,
 ScCompiler::CheckTabQuotes( rTabName, rDetails.eConv);
 }
 
-static void lcl_ScRange_Format_XL_Header( OUString rString, const ScRange 
rRange,
+static void lcl_ScRange_Format_XL_Header( OUStringBuffer rString, const

[Libreoffice-commits] core.git: Changes to 'libreoffice-4-2-7'

2014-10-01 Thread Christian Lohmaier

New branch 'libreoffice-4-2-7' available with the following commits:
commit 5205a18c141c143b3c084e036789f05069b622a1
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Oct 1 23:08:58 2014 +0200

Branch libreoffice-4-2-7

This is 'libreoffice-4-2-7' - the stable branch for the 4.2.7 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.2.x release,
please use the 'libreoffice-4-2' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Ie9e30559b5c9dce6c1426726dca6eef830704338

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

RE: examples to manage docs using LibreOffice as a major component

2014-10-01 Thread nicholas ferguson

but what are you referring to in your post? I don't see top post or bottom post 
for your rant.  So I guess you did 'heresy' post.

-Original Message-
From: Christian Lohmaier [mailto:lohma...@googlemail.com] 
Sent: Wednesday, October 01, 2014 7:28 AM
To: nicholas ferguson
Cc: Robinson Tryon; Michael Meeks; libreoffice-dev; jonathon
Subject: Re: examples to manage docs using LibreOffice as a major component

Hi Nicholas,

your mail client's quoting sucks...  And while you already wrote that in 
business text above with fullquote below is common - the reason for that is 
that it goes to different people that didn't hear about the exchange before. On 
a mailinglist it is different, everyone got the older messages.

From my experience it has proven again and again that people who fullquote and 
write above are those who don't take their time to actually read the 
replies/don't try to understand what was written.

If you cannot spend 30 seconds to clean up your post, why should anyone spend a 
couple of minutes with a reply?

You cannot teach something to someone who is unwilling to read/learn,

On Tue, Sep 30, 2014 at 11:50 PM, nicholas ferguson 
nicholasfergu...@wingarch.com wrote:
[...]
-Original Message-
From: Robinson Tryon [mailto:bishop.robin...@gmail.com]
Sent: Tuesday, September 30, 2014 5:48 PM
To: nicholas ferguson
Cc: Michael Meeks; libreoffice-dev; jonathon
Subject: Re: examples to manage docs using LibreOffice as a major componen
 [...]
 It sounds like antivirus software may cause problems with Windows builds. 
 That's useful information. Could you please document the specifics on the 
 wiki?
 https://wiki.documentfoundation.org/Development/BuildingOnWindows#Fail
 ures

https://wiki.documentfoundation.org/Development/Windows_Build_Dependencies#BitDefender_.2F_other_Anti-Virus_.2F_security_tools_breaking_the_build

ciao
Christian

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

[Bug 75025] LibreOffice 4.3 most annoying bugs

2014-10-01 Thread bugzilla-daemon

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

--- Comment #69 from V Stuart Foote vstuart.fo...@utsa.edu ---
moved bug 84352 from mab4.2 to mab4.3

-- 
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: Anti-Virus vendors warnings

2014-10-01 Thread David Tardon

On Wed, Oct 01, 2014 at 08:50:50AM -0400, nicholas ferguson wrote:
  Where is it mentioned how not to keep downloading the tar files? for 
  3rd party dependencies.  That alone is a HUGE COST OF ENTRY...to 
  discover how to turn that off.
 
 The automatic download saves manually downloading 70 or so individual 
  dependencies; you can argue that it sucks (and it does) - but doing that 
  manually sucks more =)
 
 A build for a newcomer has to be run three or four times?  Why should the tar 
 files get downloaded four times?  How does a newcomer turn it off after the 
 first download?  Tor had to explain that to me.

There is no need to turn it off. The tarballs are only downloaded
_once_. It has always been that way. If it does not work for you, there
is something seriously wrong on your end.

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

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

2014-10-01 Thread Robert Antoni Buj i Gelonch

 connectivity/qa/complex/connectivity/HsqlDriverTest.java  |   13 +++---
 connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java |6 +---
 2 files changed, 7 insertions(+), 12 deletions(-)

New commits:
commit a30022e17cbf5b378c1074ce587b3ff40ac6f92c
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date:   Wed Oct 1 16:12:26 2014 +0200

connectivity: the assigned value is never used

Change-Id: I6e4d2fc6563f0ff1a65e114d018675c314a04fd6
Reviewed-on: https://gerrit.libreoffice.org/11741
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/connectivity/qa/complex/connectivity/HsqlDriverTest.java 
b/connectivity/qa/complex/connectivity/HsqlDriverTest.java
index a0ff160..5a399a2 100644
--- a/connectivity/qa/complex/connectivity/HsqlDriverTest.java
+++ b/connectivity/qa/complex/connectivity/HsqlDriverTest.java
@@ -88,17 +88,15 @@ public class HsqlDriverTest extends ComplexTestCase {
 xComp.dispose();
 } catch(Exception e){}
 
-com.sun.star.beans.PropertyValue[] info = null;
-XDriver drv = null;
 try{
 XDocumentSubStorageSupplier doc = 
UnoRuntime.queryInterface(XDocumentSubStorageSupplier.class,ds);
 XModel mod = UnoRuntime.queryInterface(XModel.class,ds);
 XStorage stor = doc.getDocumentSubStorage(database,4);
-info = new com.sun.star.beans.PropertyValue[]{
+com.sun.star.beans.PropertyValue[] info = new 
com.sun.star.beans.PropertyValue[]{
 new 
com.sun.star.beans.PropertyValue(Storage,0,stor,PropertyState.DIRECT_VALUE)
 ,new 
com.sun.star.beans.PropertyValue(URL,0,mod.getURL(),PropertyState.DIRECT_VALUE)
 };
-drv = 
UnoRuntime.queryInterface(XDriver.class,param.getMSF().createInstance(com.sun.star.sdbcx.comp.hsqldb.Driver));
+XDriver drv = 
UnoRuntime.queryInterface(XDriver.class,param.getMSF().createInstance(com.sun.star.sdbcx.comp.hsqldb.Driver));
 
 
 TestCacheSize test = new TestCacheSize((param.getMSF()),info,drv);
@@ -119,17 +117,16 @@ public class HsqlDriverTest extends ComplexTestCase {
 } catch(Exception e){}
 }catch(Exception e){}
 }
+
 public void test2(){
 System.gc();
 
-com.sun.star.beans.PropertyValue[] info = null;
-XDriver drv = null;
 try{
-info = new com.sun.star.beans.PropertyValue[]{
+com.sun.star.beans.PropertyValue[] info = new 
com.sun.star.beans.PropertyValue[]{
 new 
com.sun.star.beans.PropertyValue(JavaDriverClass,0,org.hsqldb.jdbcDriver,PropertyState.DIRECT_VALUE)
 ,new 
com.sun.star.beans.PropertyValue(ParameterNameSubstitution,0, 
false,PropertyState.DIRECT_VALUE)
 };
-drv = 
UnoRuntime.queryInterface(XDriver.class,param.getMSF().createInstance(com.sun.star.comp.sdbc.JDBCDriver));
+XDriver drv = 
UnoRuntime.queryInterface(XDriver.class,param.getMSF().createInstance(com.sun.star.comp.sdbc.JDBCDriver));
 TestCacheSize test = new TestCacheSize((param.getMSF()),info,drv);
 test.setURL(jdbc:hsqldb:g:\\hsql\\db);
 
diff --git a/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java 
b/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java
index 9b82752..a44f1b9 100644
--- a/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java
+++ b/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java
@@ -58,7 +58,6 @@ public class JdbcLongVarCharTest extends ComplexTestCase
 System.out.println(== Start testing ==);
 
 String url = jdbc:mysql://localhost:3306/mysql?user=root;
-com.sun.star.sdbc.XConnection xConnection = null;
 com.sun.star.beans.PropertyValue prop[] = new PropertyValue[1];
 prop[0] = new PropertyValue(JavaDriverClass, 0, 
com.mysql.jdbc.Driver, PropertyState.DIRECT_VALUE);
 
@@ -67,7 +66,7 @@ public class JdbcLongVarCharTest extends ComplexTestCase
 Object x = 
xServiceManager.createInstance(com.sun.star.sdbc.DriverManager);
 com.sun.star.sdbc.XDriverAccess xDriverAccess = 
UnoRuntime.queryInterface(XDriverAccess.class, x);
 com.sun.star.sdbc.XDriver xDriver = 
xDriverAccess.getDriverByURL(url);
-xConnection = xDriver.connect(url, prop);
+com.sun.star.sdbc.XConnection xConnection = xDriver.connect(url, 
prop);
 
 Object prepStmnt = xConnection.prepareStatement(SELECT * FROM 
i90114 WHERE i90114.c1 = ?);
 UnoRuntime.queryInterface(XParameters.class, 
prepStmnt).clearParameters();
@@ -91,8 +90,7 @@ public class JdbcLongVarCharTest extends ComplexTestCase
 {
 String str = not set;
 
-XClob xClob = null;
-xClob = xRow.getClob(2);
+XClob xClob = xRow.getClob(2);
 if

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.2.7.1'

2014-10-01 Thread Christian Lohmaier

Tag 'libreoffice-4.2.7.1' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2014-10-01 22:15 -0700

Tag libreoffice-4.2.7.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJULG7VAAoJEPQ0oe+v7q6jtQoQAJCXFLMJ/rbSqwuOG/jtv68s
GR4BMXRFE1meuhf+jMvUXZquKhEwuRFmMazjuu30knhAlhwwF5HSOlPSfHG8wyy6
lNnYkneGfDUCYCFJnQNe7hli3x0892qkbtkhI5f0HPX1C0SbzKCP4oGfj9rzw6hh
c4wLSBfTq7v1a7RN44oyUqQbEp1TMk4QQmaqohJMQkd0xHLd1MW+rWpjwjZv+OMi
IaweH7w8iPIot77tPoeauxRn61ps/v10fHTDhw+DXYqlJQHuQwphIeF367px1LuQ
pKMgyMQNlZwYycty9mQO2t7ZAOvtCXFFPntmFUc1RoN6qlsiuoG1JS8kmPGTUaEx
3dya9XXkMvSVF8q/Cdswin2JS/Qmpmo6eFzSR+TC58S3SKKi0ZInpG0wtuN0ES+y
JXnmkxC5MIwBK+U0bZe74OSYSCPfugGVZWjARFUCBn0x2vGmx+v7BRLC9a8BlYZA
dcBkZwPkNKvVCAoIk+8MFYsQ67RMLnR6Ov9NxrDK9oPbgoPLMxn8hN32mk/5hMMp
L+iM1l1mO6+nVqDDtBH0CTdiDVwTmyDtzdVOaraMo3YfH0NyH0U008n77R5kCTzL
sGfM3WgzWW5GRAS1tmGf8lB57UOnXBvCX8XuwwlpK0/ADeJXsPAd95vLaZxhRxwZ
ozNerHq90iVnlt8vlqTd
=OrBJ
-END PGP SIGNATURE-

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

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

2014-10-01 Thread Robert Antoni Buj i Gelonch

 unotest/source/java/org/openoffice/test/OfficeConnection.java |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 2d1e026e7a148761d30db77c57f36cceff3d327d
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date:   Wed Oct 1 17:17:58 2014 +0200

unotest: the assigned value is never used

Change-Id: I73c4945dec1db4c206948f27ba3d19fa08eedd46
Reviewed-on: https://gerrit.libreoffice.org/11742
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/unotest/source/java/org/openoffice/test/OfficeConnection.java 
b/unotest/source/java/org/openoffice/test/OfficeConnection.java
index 0c6ed32..6cc00d1 100644
--- a/unotest/source/java/org/openoffice/test/OfficeConnection.java
+++ b/unotest/source/java/org/openoffice/test/OfficeConnection.java
@@ -106,7 +106,6 @@ public final class OfficeConnection {
 boolean cleanTermination = false;
 int code = 0;
 try {
-boolean desktopTerminated = true;
 if (process != null) {
 if (context != null) {
 XDesktop desktop = null;
@@ -125,7 +124,7 @@ public final class OfficeConnection {
 context = null;
 if (desktop != null) {
 try {
-desktopTerminated = desktop.terminate();
+boolean desktopTerminated = desktop.terminate();
 if (!desktopTerminated) {
 // in case terminate() fails we would wait
 // forever for the process to die, so kill it
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Anti-Virus vendors warnings

2014-10-01 Thread Christian Lohmaier

Hi Nicholas, *,

On Wed, Oct 1, 2014 at 2:50 PM, nicholas ferguson
nicholasfergu...@wingarch.com wrote:
 [...]
 Where is it mentioned how not to keep downloading the tar files? for
 3rd party dependencies.  That alone is a HUGE COST OF ENTRY...to
 discover how to turn that off.

  The automatic download saves manually downloading 70 or so individual 
 dependencies; you can argue that it sucks (and it does) - but doing that 
 manually sucks more =)

The high cost of entry only comes because you just didn't follow the
instructions on setting up a windows build system.
https://wiki.documentfoundation.org/Development/Windows_Build_Dependencies

Yes, you need to install some stuff. But all you have to do is to read
and copy'n'paste the commands.

 A build for a newcomer has to be run three or four times?  Why should the tar 
 files get downloaded four times?  How does a newcomer turn it off after the 
 first download?

The page suggests default parameters, amogst them is:
--with-external-tar=/cygdrive/c/sources/lo-externalsrc

And also: If you just go wild and delete everything from your sources
again and again, then even when not using a separate directory, the
files would not be redownloaded over and over.

Don't blame the buildsystem or the documentation when you deliberately
chose to do your own thing/actively work against it.

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

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

2014-10-01 Thread Giuseppe Bilotta

 sw/source/uibase/dbui/dbmgr.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit aa39d4946222f8b43703acb0a132c103272ef3f6
Author: Giuseppe Bilotta giuseppe.bilo...@gmail.com
Date:   Wed Oct 1 15:46:43 2014 +0200

dbmgr: consistently initialize colum type to DataType::SQLNULL

Fixes a warning about use uninitialized in
SwDBManager::FillCalcWithMergeData().

Change-Id: I03954f6d47a699e3a694269757ad9613b92c5695
Reviewed-on: https://gerrit.libreoffice.org/11740
Reviewed-by: Jan-Marek Glogowski glo...@fbihome.de
Tested-by: Jan-Marek Glogowski glo...@fbihome.de

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 49a714f..623b933 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1763,7 +1763,7 @@ OUString 
SwDBManager::GetDBField(uno::ReferenceXPropertySet xColumnProps,
 return sRet;
 
 Any aType = xColumnProps-getPropertyValue(Type);
-sal_Int32 eDataType = 0;
+sal_Int32 eDataType = DataType::SQLNULL;
 aType = eDataType;
 switch(eDataType)
 {
@@ -1966,7 +1966,7 @@ bool SwDBManager::FillCalcWithMergeData( 
SvNumberFormatter *pDocFormatter,
 if( lcl_GetColumnCnt(pImpl-pMergeData, rColName, nLanguage, 
aString, aNumber) )
 {
 // get the column type
-sal_Int32 nColumnType;
+sal_Int32 nColumnType = DataType::SQLNULL;
 Any aCol = xCols-getByName( pColNames[nCol] );
 uno::ReferenceXPropertySet xCol;
 aCol = xCol;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

RE: Anti-Virus vendors warnings

2014-10-01 Thread nicholas ferguson

http://stackoverflow.com/questions/1331887/detect-antivirus-on-windows-using-c-sharp

At the end of the Windows configure; and warning hard may have helped people 
like Nicholas save quite a chunk of time.


[nicholas ferguson] 
This is an example of the high cost of doing a build and development work with 
LibreOffie. 

Most developers,download the sofware.  Look at the ReadME file and then proceed.

when I started I had to search for something to clear up issues. I asked 
Michael, where's the wiki that I read for windows development.  He said it was 
not updated, but maybe I could update it.  

Community, that translates, you'll have to ask us questions.  So I had to ask 
questions to Michael and Tor.  I had to work at it.

That is a symptom of a high cost of entry.

Instead, there should be a call to the community to update the wiki pages for 
developing LibreOffice on windows. Then someone like me would get and answer 
like..go to this wiki and follow it.  The wiki would contain even FAQ about 
failures.

Then when I ask about spinning off cppunit tests into independent apps.  I know 
that there has been a group of people that have done that.  I don't hear...oh 
go to this github..we have uploaded work there.  I don't even hear .. go to 
this wiki and follow instructions and read the FAQ. What I hear instead is... 
yeah lots of people did that..this is their point of focus...some vague answer 
like that.

That is a high cost of entry.

I just checked the wiki page for building a release version on windows.  I see 
it has been updated. Where is the info for a debug version?
why isn't this wiki page referenced in the readme?  Isn't that wiki a page for 
develpers.  What kind of developer in your world, doesn't build a debug 
version, first?

Where is it mentioned how not to keep downloading the tar files? for 3rd party 
dependencies.  That alone is a HUGE COST OF ENTRY...to discover how to turn 
that off.









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

[Libreoffice-commits] core.git: external/collada2gltf

2014-10-01 Thread Jan-Marek Glogowski

 external/collada2gltf/UnpackedTarball_collada2gltf.mk  |1 
 external/collada2gltf/patches/drop_tr1_support.patch.1 |  403 +
 2 files changed, 404 insertions(+)

New commits:
commit e3883cc2a9e1edc61b23525d2daddccac9ab14b0
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Mon Sep 29 15:21:05 2014 +0200

collada2gltf: drop tr1 support

The detection code is wrong for gcc 4.6 and the tr1 code actually
conflicts with the OpenCOLLADA code, because it creates an ambiguity
of shared_ptr in the cpp files.

Additionally most of the headers already use std::shared_ptr or
std::unordered_map.

Change-Id: Ibfe80e45687d34ec6fcd23339fd3f968fae402ba
Reviewed-on: https://gerrit.libreoffice.org/11695
Reviewed-by: Zolnai TamÃ¡s tamas.zol...@collabora.com
Tested-by: Zolnai TamÃ¡s tamas.zol...@collabora.com

diff --git a/external/collada2gltf/UnpackedTarball_collada2gltf.mk 
b/external/collada2gltf/UnpackedTarball_collada2gltf.mk
index 439e86b..16b7fed 100644
--- a/external/collada2gltf/UnpackedTarball_collada2gltf.mk
+++ b/external/collada2gltf/UnpackedTarball_collada2gltf.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,collada2gltf,\
external/collada2gltf/patches/collada2gltf.fix-memory-leak.patch.1 \
external/collada2gltf/patches/collada2gltf.fix-memory-leak2.patch.1 \
external/collada2gltf/patches/shader_compatibility.patch.1 \
+   external/collada2gltf/patches/drop_tr1_support.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/collada2gltf/patches/drop_tr1_support.patch.1 
b/external/collada2gltf/patches/drop_tr1_support.patch.1
new file mode 100644
index 000..0d15897
--- /dev/null
+++ b/external/collada2gltf/patches/drop_tr1_support.patch.1
@@ -0,0 +1,403 @@
+diff -urN -U 4 COLLADA2GLTF/assetModifiers/GLTFFlipUVModifier.cpp 
COLLADA2GLTF_/assetModifiers/GLTFFlipUVModifier.cpp
+--- COLLADA2GLTF/assetModifiers/GLTFFlipUVModifier.cpp 2014-05-25 
11:30:45.116840301 +0200
 COLLADA2GLTF_/assetModifiers/GLTFFlipUVModifier.cpp2014-09-29 
14:35:52.315612818 +0200
+@@ -25,9 +25,6 @@
+ #include GLTFFlipUVModifier.h
+ 
+ using namespace rapidjson;
+-#if __cplusplus = 199711L
+-using namespace std::tr1;
+-#endif
+ using namespace std;
+ 
+ namespace GLTF
+diff -urN -U 4 COLLADA2GLTF/COLLADA2GLTFWriter.cpp 
COLLADA2GLTF_/COLLADA2GLTFWriter.cpp
+--- COLLADA2GLTF/COLLADA2GLTFWriter.cpp2014-05-25 11:30:45.111840284 
+0200
 COLLADA2GLTF_/COLLADA2GLTFWriter.cpp   2014-09-29 14:35:52.299612815 
+0200
+@@ -35,9 +35,6 @@
+ #include algorithm
+ 
+ 
+-#if __cplusplus = 199711L
+-using namespace std::tr1;
+-#endif
+ using namespace std;
+ using namespace COLLADAFW;
+ using namespace COLLADABU;
+diff -urN -U 4 COLLADA2GLTF/convert/animationConverter.cpp 
COLLADA2GLTF_/convert/animationConverter.cpp
+--- COLLADA2GLTF/convert/animationConverter.cpp2014-05-25 
11:30:45.116840301 +0200
 COLLADA2GLTF_/convert/animationConverter.cpp   2014-09-29 
14:35:52.315612818 +0200
+@@ -9,9 +9,6 @@
+ #include GLTF-Open3DGC.h
+ 
+ using namespace rapidjson;
+-#if __cplusplus = 199711L
+-using namespace std::tr1;
+-#endif
+ using namespace std;
+ 
+ namespace GLTF
+diff -urN -U 4 COLLADA2GLTF/convert/meshConverter.cpp 
COLLADA2GLTF_/convert/meshConverter.cpp
+--- COLLADA2GLTF/convert/meshConverter.cpp 2014-05-25 11:30:45.117840304 
+0200
 COLLADA2GLTF_/convert/meshConverter.cpp2014-09-29 14:35:52.311612817 
+0200
+@@ -23,9 +23,6 @@
+ //--- X3DGC
+ 
+ using namespace rapidjson;
+-#if __cplusplus = 199711L
+-using namespace std::tr1;
+-#endif
+ using namespace std;
+ 
+ 
+diff -urN -U 4 COLLADA2GLTF/extensions/o3dgc-compression/GLTF-Open3DGC.cpp 
COLLADA2GLTF_/extensions/o3dgc-compression/GLTF-Open3DGC.cpp
+--- COLLADA2GLTF/extensions/o3dgc-compression/GLTF-Open3DGC.cpp
2014-05-25 11:30:45.143840389 +0200
 COLLADA2GLTF_/extensions/o3dgc-compression/GLTF-Open3DGC.cpp   
2014-09-29 14:35:52.299612815 +0200
+@@ -40,9 +40,6 @@
+ 
+ using namespace o3dgc;
+ using namespace rapidjson;
+-#if __cplusplus = 199711L
+-using namespace std::tr1;
+-#endif
+ using namespace std;
+ 
+ namespace GLTF
+diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFAccessor.cpp 
COLLADA2GLTF_/GLTF/GLTFAccessor.cpp
+--- COLLADA2GLTF/GLTF/GLTFAccessor.cpp 2014-05-25 11:30:45.111840284 +0200
 COLLADA2GLTF_/GLTF/GLTFAccessor.cpp2014-09-29 14:35:52.307612816 
+0200
+@@ -27,9 +27,6 @@
+ #include GLTF.h
+ 
+ using namespace rapidjson;
+-#if __cplusplus = 199711L
+-using namespace std::tr1;
+-#endif
+ using namespace std;
+ 
+ namespace GLTF 
+diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFAnimation.cpp 
COLLADA2GLTF_/GLTF/GLTFAnimation.cpp
+--- COLLADA2GLTF/GLTF/GLTFAnimation.cpp2014-05-25 11:30:45.112840287 
+0200
 COLLADA2GLTF_/GLTF/GLTFAnimation.cpp   2014-09-29 14:35:52.311612817 
+0200
+@@ -28,9 +28,6 @@
+ 
+ using namespace rapidjson;
+ using namespace rapidjson;
+-#if __cplusplus =

[Bug 65675] LibreOffice 4.2 most annoying bugs

2014-10-01 Thread bugzilla-daemon

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

V Stuart Foote vstuart.fo...@utsa.edu changed:

   What|Removed |Added

 Depends on|84352   |

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

Removing conditional formats via UNO in LibreOffice

2014-10-01 Thread Florian Haftmann

Hi all,

I am locked up in a situation where I want to *remove* an existing
conditional format from a cell range. The minimal example (supposed to
be run in a spreadsheet context) looks as follows:

sub remove
  dim sheet as variant
  dim cell as variant
  dim cond as object

  sheet = thisComponent.sheets.getByIndex(0)
  cell = sheet.getCellByPosition(3, 0)

  cond = cell.conditionalFormat
  cond.clear()
  cell.conditionalFormat = cond
end sub

In OpenOffice.org 3.21, this last three lines would effectively
*replace* the pre-existing conditional format attached to cell (3, 0).
In the meantime (since LibreOffice 4.1.6.2.0 and still in 4.3.1.2) the
semantics has changed such that the re-assignment in the last line does
not replace pre-existing conditional formats but *adds* another (here,
empty) conditional format entry to the cell.  Btw. the same occurs if I
operate on a whole cell range rather than a single cell.

I guess this change is mainly due to conditional formats now applying to
whole cell ranges rather then single cells.

So, my question:
a) Is this subtle change above a breakdown or a deliberate change of the
API semantics?
b) If the change is deliberate, how am I supposed to remove existing
conditional formats now?
c) If the change is a breakdown, I am willing to examine further details
also.

Thanks a lot,
Florian

-- 

PGP available:
http://home.informatik.tu-muenchen.de/haftmann/pgp/florian_haftmann_at_informatik_tu_muenchen_de
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 82577] get rid of prex.h / postx.h wrapper headers

2014-10-01 Thread bugzilla-daemon

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

--- Comment #13 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Noel Grandin committed a patch related to this issue.
It has been pushed to master:

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

fdo#82577: Handle Time



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

Re: Anti-Virus vendors warnings

2014-10-01 Thread Michael Meeks


On Wed, 2014-10-01 at 08:21 -0400, nicholas ferguson wrote:
 This is an example of the high cost of doing a build and development
 work with LibreOffie. 

Great example.

 Most developers,download the sofware.  Look at the ReadME file and then 
 proceed.

I don't think we have a README.Windows - and that's an obvious gap; and
one that you can easily close. Please do send a suitable file and I'll
check it in in your name - your first commit =) the first commit is
always the hardest.

 Instead, there should be a call to the community

Sure; let me call you to get stuck into fixing this problem =)

 Then when I ask about spinning off cppunit tests into independent
 apps.  I know that there has been a group of people that have done
 that.

Why do you think a group of people have done that ? If that existed in
an easy-to-share form, someone would have shared it with you.

 That is a high cost of entry.

I don't disagree - for Windows certainly; it's a difficult platform to
provide a pre-canned solution for due its proprietary nature.

 why isn't this wiki page referenced in the readme?  Isn't that wiki a
 page for develpers.  What kind of developer in your world, doesn't
 build a debug version, first?

We used to recommend a debug version AFAIR, but the build tree on Linux
with debuginfo is 30Gb small - and with debug symbols it takes forages
to link. Often it's more feasible to re-build just a single module with
debuginfo.

 Where is it mentioned how not to keep downloading the tar files? for
 3rd party dependencies.  That alone is a HUGE COST OF ENTRY...to
 discover how to turn that off.

The automatic download saves manually downloading 70 or so individual
dependencies; you can argue that it sucks (and it does) - but doing that
manually sucks more =)

Again - the expectation gap here seems to be focused on your hope that
someone else will improve all of this for you, whereas my expectation is
that if you don't do it - no-one will =) hopefully that makes you feel
responsible.

All the best,

Michael.

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

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

Re: examples to manage docs using LibreOffice as a major component

2014-10-01 Thread Christian Lohmaier

Hi Nicholas,

your mail client's quoting sucks...  And while you already wrote that
in business text above with fullquote below is common - the reason
for that is that it goes to different people that didn't hear about
the exchange before. On a mailinglist it is different, everyone got
the older messages.

From my experience it has proven again and again that people who
fullquote and write above are those who don't take their time to
actually read the replies/don't try to understand what was written.

If you cannot spend 30 seconds to clean up your post, why should
anyone spend a couple of minutes with a reply?

You cannot teach something to someone who is unwilling to read/learn,

On Tue, Sep 30, 2014 at 11:50 PM, nicholas ferguson
nicholasfergu...@wingarch.com wrote:
[...]
-Original Message-
From: Robinson Tryon [mailto:bishop.robin...@gmail.com]
Sent: Tuesday, September 30, 2014 5:48 PM
To: nicholas ferguson
Cc: Michael Meeks; libreoffice-dev; jonathon
Subject: Re: examples to manage docs using LibreOffice as a major componen
 [...]
 It sounds like antivirus software may cause problems with Windows builds. 
 That's useful information. Could you please document the specifics on the 
 wiki?
 https://wiki.documentfoundation.org/Development/BuildingOnWindows#Failures

https://wiki.documentfoundation.org/Development/Windows_Build_Dependencies#BitDefender_.2F_other_Anti-Virus_.2F_security_tools_breaking_the_build

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

1 2 3 4 >

1 - 100 of 392 matches

Mail list logo