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

[Libreoffice Gerrit user]

 sw/inc/hintids.hxx|2 -
 sw/inc/tabcol.hxx |2 -
 sw/source/core/attr/format.cxx|   12 -
 sw/source/core/attr/swatrset.cxx  |6 ++--
 sw/source/core/bastyp/calc.cxx|   48 +++---
 sw/source/core/bastyp/swcache.cxx |4 +--
 sw/source/core/bastyp/tabcol.cxx  |6 ++--
 7 files changed, 40 insertions(+), 40 deletions(-)

New commits:
commit 38b29bbc39efc74f4c6086378df7b9cc31440390
Author: Takeshi Abe 
Date:   Tue Sep 25 11:39:07 2012 +0900

sal_Bool to bool

Change-Id: Ib9a6f3ecbe38cdad6e28b4d8a9ae13d1f5bc4265

diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 9ea4bc4..46204f1 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -469,7 +469,7 @@ extern sal_uInt16 aCharAutoFmtSetRange[];
 extern sal_uInt16 aPgFrmFmtSetRange[];
 
 // check if ID is InRange of AttrSet-Ids
-sal_Bool IsInRange( const sal_uInt16* pRange, const sal_uInt16 nId );
+bool IsInRange( const sal_uInt16* pRange, const sal_uInt16 nId );
 
 #endif
 
diff --git a/sw/inc/tabcol.hxx b/sw/inc/tabcol.hxx
index 6b896a6..9457d8f 100644
--- a/sw/inc/tabcol.hxx
+++ b/sw/inc/tabcol.hxx
@@ -68,7 +68,7 @@ public:
 SwTabCols( sal_uInt16 nSize = 0 );
 SwTabCols( const SwTabCols& );
 SwTabCols &operator=( const SwTabCols& );
-sal_Bool operator==( const SwTabCols& rCmp ) const;
+bool operator==( const SwTabCols& rCmp ) const;
 long& operator[]( sal_uInt16 nPos ) { return aData[nPos].nPos; }
 long operator[]( sal_uInt16 nPos ) const { return aData[nPos].nPos; }
 sal_uInt16 Count() const { return sal::static_int_cast< sal_uInt16 
>(aData.size()); }
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 083b923..c2e4fbe 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -249,7 +249,7 @@ SwFmt::~SwFmt()
 
 void SwFmt::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue 
)
 {
-sal_Bool bContinue = sal_True; // sal_True = pass on to dependent ones
+bool bContinue = true; // true = pass on to dependent ones
 
 sal_uInt16 nWhich = pOldValue ? pOldValue->Which() :
 pNewValue ? pNewValue->Which() : 0 ;
@@ -293,7 +293,7 @@ void SwFmt::Modify( const SfxPoolItem* pOldValue, const 
SfxPoolItem* pNewValue )
 
 if( aNew.Count() )
 NotifyClients( &aOld, &aNew );
-bContinue = sal_False;
+bContinue = false;
 }
 break;
 case RES_FMT_CHG:
@@ -318,7 +318,7 @@ void SwFmt::Modify( const SfxPoolItem* pOldValue, const 
SfxPoolItem* pNewValue )
 
 // pass Hint only to dependent formats (no Frames)
 ModifyBroadcast( pOldValue, pNewValue, TYPE(SwFmt) );
-bContinue = sal_False;
+bContinue = false;
 }
 break;
 default:
@@ -328,7 +328,7 @@ void SwFmt::Modify( const SfxPoolItem* pOldValue, const 
SfxPoolItem* pNewValue )
 {
 // DropCaps might come into this block
 OSL_ENSURE( RES_PARATR_DROP == nWhich, "Modify was sent 
without sender" );
-bContinue = sal_False;
+bContinue = false;
 }
 }
 }
@@ -529,7 +529,7 @@ sal_uInt16 SwFmt::ResetAllFmtAttr()
 
 SwAttrSet aOld( *aSet.GetPool(), aSet.GetRanges() ),
   aNew( *aSet.GetPool(), aSet.GetRanges() );
-sal_Bool bRet = 0 != aSet.ClearItem_BC( 0, &aOld, &aNew );
+bool bRet = 0 != aSet.ClearItem_BC( 0, &aOld, &aNew );
 if( bRet )
 {
 SwAttrSetChg aChgOld( aSet, aOld );
@@ -566,7 +566,7 @@ void SwFmt::DelDiffs( const SfxItemSet& rSet )
 
 SwAttrSet aOld( *aSet.GetPool(), aSet.GetRanges() ),
   aNew( *aSet.GetPool(), aSet.GetRanges() );
-sal_Bool bRet = 0 != aSet.Intersect_BC( rSet, &aOld, &aNew );
+bool bRet = 0 != aSet.Intersect_BC( rSet, &aOld, &aNew );
 if( bRet )
 {
 SwAttrSetChg aChgOld( aSet, aOld );
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index 8eb1daf..363abe2 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -373,15 +373,15 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
 }
 
 /// check if ID is in range of attribute set IDs
-sal_Bool IsInRange( const sal_uInt16* pRange, const sal_uInt16 nId )
+bool IsInRange( const sal_uInt16* pRange, const sal_uInt16 nId )
 {
 while( *pRange )
 {
 if( *pRange <= nId && nId <= *(pRange+1) )
-return sal_True;
+return true;
 pRange += 2;
 }
-return sal_False;
+return false;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 47a6f78..8de93ef 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -671,13 +671,13 @@ SwCalcOper SwCalc::GetToken()
   

[PUSHED] use intrinsict to inline InterlockCount() on Windows too

[Norbert Thiebaud (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/672

Approvals:
  Norbert Thiebaud: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/672
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I93949cc37821c5306514c8ce2f21519550f33775
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Norbert Thiebaud 
Gerrit-Reviewer: Norbert Thiebaud 

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

[PUSHED] replace remaining InterlockedCount() with inlined version

[Norbert Thiebaud (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/671

Approvals:
  Norbert Thiebaud: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/671
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifcfa48fc87f905a91470a5b0fd597b02f220784c
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Norbert Thiebaud 
Gerrit-Reviewer: Norbert Thiebaud 

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

[Libreoffice-commits] .: sal/inc

[Libreoffice Gerrit user]

 sal/inc/osl/interlck.h |4 
 sal/inc/sal/config.h   |2 ++
 2 files changed, 6 insertions(+)

New commits:
commit 5ae27819974e3492b6f4d33fa51ef2a9d77b5ce5
Author: Norbert Thiebaud 
Date:   Sat Sep 22 04:38:32 2012 -0500

use intrinsict to inline InterlockCount() on Windows too

Change-Id: I93949cc37821c5306514c8ce2f21519550f33775
Reviewed-on: https://gerrit.libreoffice.org/672
Reviewed-by: Norbert Thiebaud 
Tested-by: Norbert Thiebaud 

diff --git a/sal/inc/osl/interlck.h b/sal/inc/osl/interlck.h
index 792ea55..22ff985 100644
--- a/sal/inc/osl/interlck.h
+++ b/sal/inc/osl/interlck.h
@@ -67,6 +67,8 @@ SAL_DLLPUBLIC oslInterlockedCount SAL_CALL 
osl_decrementInterlockedCount(oslInte
 */
 #if defined( HAVE_GCC_BUILTIN_ATOMIC )
 #define osl_atomic_increment(p)  __sync_add_and_fetch((p), 1)
+#elif defined( _MSC_VER )
+#define osl_atomic_increment(p) _InterlockedIncrement((p))
 #else
 #define osl_atomic_increment(p) osl_incrementInterlockedCount((p))
 #endif
@@ -84,6 +86,8 @@ SAL_DLLPUBLIC oslInterlockedCount SAL_CALL 
osl_decrementInterlockedCount(oslInte
 */
 #if defined( HAVE_GCC_BUILTIN_ATOMIC )
 #define osl_atomic_decrement(p) __sync_sub_and_fetch((p), 1)
+#elif defined( _MSC_VER )
+#define osl_atomic_decrement(p) _InterlockedDecrement((p))
 #else
 #define osl_atomic_decrement(p) osl_decrementInterlockedCount((p))
 #endif
diff --git a/sal/inc/sal/config.h b/sal/inc/sal/config.h
index aee8e82..e81250a 100644
--- a/sal/inc/sal/config.h
+++ b/sal/inc/sal/config.h
@@ -44,6 +44,8 @@
 
 #ifdef _MSC_VER
 
+#include  // define intrinsic functions supported by the compiler
+
 #ifndef _USE_MATH_DEFINES
 #define _USE_MATH_DEFINES // needed by Visual C++ for math constants
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - chart2/source sc/inc

[Libreoffice Gerrit user]

 chart2/source/inc/ExplicitCategoriesProvider.hxx   |2 -
 chart2/source/tools/ExplicitCategoriesProvider.cxx |9 ++--
 chart2/source/view/axes/VCartesianAxis.cxx |   39 +
 sc/inc/conditio.hxx|2 +
 4 files changed, 32 insertions(+), 20 deletions(-)

New commits:
commit bcd2b017088822ea95e9d33d1d0dc360c0ec8d74
Author: Kohei Yoshida 
Date:   Mon Sep 24 21:19:43 2012 -0400

Build fix.

Change-Id: I2faebd74a1908c0a11e0e876055352716e54f5ca

diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 93c89ac..ae7bcb9 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -37,6 +37,8 @@
 
 #include 
 
+#include 
+
 #include 
 #include 
 #include 
commit fad417fe49d9da0fdef7447521a4bcd962d5c9eb
Author: Kohei Yoshida 
Date:   Mon Sep 24 21:19:09 2012 -0400

Prevent so many copying of vector instances.

Change-Id: I2d74fe70411fb1a12387458d170a4a6b603755a3

diff --git a/chart2/source/inc/ExplicitCategoriesProvider.hxx 
b/chart2/source/inc/ExplicitCategoriesProvider.hxx
index b83052b..d96ef67 100644
--- a/chart2/source/inc/ExplicitCategoriesProvider.hxx
+++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx
@@ -84,7 +84,7 @@ public:
 ::com::sun::star::chart2::data::XDataSequence > 
getOriginalCategories();
 
 ::com::sun::star::uno::Sequence< ::rtl::OUString > getSimpleCategories();
-::std::vector< ComplexCategory > getCategoriesByLevel( sal_Int32 nLevel );
+const std::vector* getCategoriesByLevel( sal_Int32 nLevel 
);
 
 static ::rtl::OUString getCategoryByIndex(
   const ::com::sun::star::uno::Reference<
diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx 
b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index 9cc82b6..e3d800f 100644
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -556,14 +556,13 @@ Sequence< ::rtl::OUString > 
ExplicitCategoriesProvider::getSimpleCategories()
 return m_aExplicitCategories;
 }
 
-std::vector< ComplexCategory >  
ExplicitCategoriesProvider::getCategoriesByLevel( sal_Int32 nLevel )
+const std::vector* 
ExplicitCategoriesProvider::getCategoriesByLevel( sal_Int32 nLevel )
 {
-std::vector< ComplexCategory > aRet;
 init();
 sal_Int32 nMaxIndex = m_aComplexCats.size()-1;
-if( nLevel >= 0 && nLevel <= nMaxIndex  )
-aRet = m_aComplexCats[nMaxIndex-nLevel];
-return aRet;
+if (nLevel >= 0 && nLevel <= nMaxIndex)
+return &m_aComplexCats[nMaxIndex-nLevel];
+return NULL;
 }
 
 OUString ExplicitCategoriesProvider::getCategoryByIndex(
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx 
b/chart2/source/view/axes/VCartesianAxis.cxx
index 6c0dd04..f394ef8 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -463,10 +463,16 @@ void 
VCartesianAxis::createAllTickInfosFromComplexCategories( ::std::vector< ::s
 for( ; nLevel aTickInfoVector;
-std::vector< ComplexCategory > aComplexCategories( 
m_aAxisProperties.m_pExplicitCategoriesProvider->getCategoriesByLevel( nLevel ) 
);
+const std::vector* pComplexCategories =
+
m_aAxisProperties.m_pExplicitCategoriesProvider->getCategoriesByLevel(nLevel);
+
+if (!pComplexCategories)
+continue;
+
 sal_Int32 nCatIndex = 0;
-std::vector< ComplexCategory >::const_iterator 
aIt(aComplexCategories.begin());
-std::vector< ComplexCategory >::const_iterator 
aEnd(aComplexCategories.end());
+std::vector::const_iterator aIt = 
pComplexCategories->begin();
+std::vector::const_iterator aEnd = 
pComplexCategories->end();
+
 for(;aIt!=aEnd;++aIt)
 {
 TickInfo aTickInfo(0);
@@ -497,20 +503,25 @@ void 
VCartesianAxis::createAllTickInfosFromComplexCategories( ::std::vector< ::s
 for( ; nLevel aTickInfoVector;
-std::vector< ComplexCategory > aComplexCategories( 
m_aAxisProperties.m_pExplicitCategoriesProvider->getCategoriesByLevel( nLevel ) 
);
+const std::vector* pComplexCategories =
+
m_aAxisProperties.m_pExplicitCategoriesProvider->getCategoriesByLevel(nLevel);
 sal_Int32 nCatIndex = 0;
-std::vector< ComplexCategory >::const_iterator 
aIt(aComplexCategories.begin());
-std::vector< ComplexCategory >::const_iterator 
aEnd(aComplexCategories.end());
-for(;aIt!=aEnd;++aIt)
+if (pComplexCategories)
 {
-TickInfo aTickInfo(0);
-ComplexCategory aCat(*aIt);
-aTickInfo.fScaledTickValue = nCatIndex + 1.0;
-aTickInfoVector.push_back(aTickInfo);
-nCatIndex += aCat.Count;
-if( nCatIndex + 1.0 > m_aScale.Maximum )
-break;
+std::vector::const_iterator aIt =

[REVIEW 3-6] Proper placements of complex categories (fdo#55298)

[Kohei Yoshida]

Hi there,

Here is another request for backport related to chart.

I'd like

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

backported to 3-6 to fix

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

Our chart code currently treats both empty cell values as well as 
repeated values equally and interpret them as continuation of the 
previous categories.  But this creates an interoperability issue with 
Excel's chart engine which treats the latter case differently.  This 
commit improves the situation there.


Review and backport would be appreciated.

Thanks,

Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[REVIEW 3-6] Fix for fdo#55297 - chart complex category regression

[Kohei Yoshida]

Hi,

I'd like

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

backported to 3-6 in order to fix

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

which is a regression against 3.5.

Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: chart2/source

[Libreoffice Gerrit user]

 chart2/source/tools/ExplicitCategoriesProvider.cxx |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 8baaff5c798984b0fa7fe7a764491ca27765623e
Author: Kohei Yoshida 
Date:   Mon Sep 24 16:09:10 2012 -0400

fdo#55298: We should only treat empty values as continuation of previous 
ones.

For better Excel compatibility.

Change-Id: I3bc44f65127d3f020894dc29e5c6549bb257f218

diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx 
b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index 5bb991a..9cc82b6 100644
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -284,7 +284,7 @@ std::vector< ComplexCategory > 
lcl_DataSequenceToComplexCategoryVector(
 sal_Int32 nCurrentCount=0;
 for( sal_Int32 nN=0; nN 
lcl_DataSequenceToComplexCategoryVector(
 }
 else
 {
-if( !aCurrent.isEmpty() && aPrevious != aCurrent )
+// Empty value is interpreted as a continuation of the previous
+// category. Note that having the same value as the previous one
+// does not equate to a continuation of the category.
+
+if (aCurrent.isEmpty())
+++nCurrentCount;
+else
 {
 aResult.push_back( ComplexCategory(aPrevious,nCurrentCount) );
 nCurrentCount=1;
 aPrevious = aCurrent;
 }
-else
-nCurrentCount++;
 }
 }
 if( nCurrentCount )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: chart2/source

[Libreoffice Gerrit user]

 chart2/source/view/axes/VCartesianAxis.cxx |   15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

New commits:
commit b174048ebd041175efd121751fddfb053d476c80
Author: Kohei Yoshida 
Date:   Mon Sep 24 15:29:01 2012 -0400

fdo#55297: Fix regression in chart complex category placements.

This is effectively a revert of a769fd1ec076b61c1ce2f84da87283cc637dd5d5
and a1be31fd8bf830a4f5961e690bcffd050782e210 which unfortunately caused
regression in complex category placements.

This unfortunately re-introduces fdo#44832. We need to re-think how to
fix that one without breaking the multi-level category feature.

Change-Id: I1ed8364a46174ac6c29aa0b027a33f84bcca51fa

diff --git a/chart2/source/view/axes/VCartesianAxis.cxx 
b/chart2/source/view/axes/VCartesianAxis.cxx
index 016c3e2..6c0dd04 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -460,11 +460,11 @@ void 
VCartesianAxis::createAllTickInfosFromComplexCategories( ::std::vector< ::s
 rAllTickInfos.clear();
 sal_Int32 nLevel=0;
 sal_Int32 nLevelCount = 
m_aAxisProperties.m_pExplicitCategoriesProvider->getCategoryLevelCount();
-sal_Int32 nCatIndex = 0;
 for( ; nLevel aTickInfoVector;
 std::vector< ComplexCategory > aComplexCategories( 
m_aAxisProperties.m_pExplicitCategoriesProvider->getCategoriesByLevel( nLevel ) 
);
+sal_Int32 nCatIndex = 0;
 std::vector< ComplexCategory >::const_iterator 
aIt(aComplexCategories.begin());
 std::vector< ComplexCategory >::const_iterator 
aEnd(aComplexCategories.end());
 for(;aIt!=aEnd;++aIt)
@@ -1314,13 +1314,18 @@ void VCartesianAxis::doStaggeringOfLabels( const 
AxisLabelProperties& rAxisLabel
 B2DVector aCummulatedLabelsDistance(0,0);
 for( sal_Int32 nTextLevel=0; nTextLevel apTickIter(createLabelTickIterator( 
nTextLevel ));
-if(apTickIter)
+boost::scoped_ptr 
apTickIter(createLabelTickIterator(nTextLevel));
+if (apTickIter)
 {
 double fRotationAngleDegree = 
m_aAxisLabelProperties.fRotationAngleDegree;
+if( nTextLevel>0 )
+{
+lcl_shiftLables( *apTickIter.get(), 
aCummulatedLabelsDistance );
+fRotationAngleDegree = 0.0;
+}
 aCummulatedLabelsDistance += lcl_getLabelsDistance( 
*apTickIter.get()
-, pTickFactory2D->getDistanceAxisTickToText( 
m_aAxisProperties )
-, fRotationAngleDegree );
+, pTickFactory2D->getDistanceAxisTickToText( 
m_aAxisProperties )
+, fRotationAngleDegree );
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/inc

[Libreoffice Gerrit user]

 sc/inc/conditio.hxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit dd9e17b88d6eee80d5b89084cc938a859ddbbb1b
Author: Markus Mohrhard 
Date:   Tue Sep 25 00:11:38 2012 +0200

try to explicitly include map for tinderbox

diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index ae16d6b..93c89ac 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -41,6 +41,8 @@
 #include 
 #include 
 
+#include 
+
 class ScBaseCell;
 class ScFormulaCell;
 class ScTokenArray;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/inc sc/source

[Libreoffice Gerrit user]

 sc/inc/conditio.hxx  |   41 +
 sc/source/core/data/conditio.cxx |  168 +--
 sc/source/core/data/fillinfo.cxx |5 +
 3 files changed, 171 insertions(+), 43 deletions(-)

New commits:
commit af0c93da33f2bf39a673c2dc29fb44b90322d137
Author: Markus Mohrhard 
Date:   Mon Sep 24 23:19:41 2012 +0200

kill O(N^2) algorithm generating cond format render information, fdo#54396

Change-Id: I63536625eaf9b73c8e63d3cf88b6b798a6bf017b

diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 7b1cf17..ae16d6b 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -35,8 +35,11 @@
 #include "scdllapi.h"
 #include "rangelst.hxx"
 
+#include 
+
 #include 
 #include 
+#include 
 
 class ScBaseCell;
 class ScFormulaCell;
@@ -116,11 +119,26 @@ public:
 #if DUMP_FORMAT_INFO
 virtual void dumpInfo(rtl::OUStringBuffer& rBuf) const = 0;
 #endif
+
+virtual void startRendering();
+virtual void endRendering();
 protected:
 ScDocument* mpDoc;
 
 };
 
+class approx_less : public std::binary_function
+{
+public:
+bool operator() (double nVal1, double nVal2)
+{
+if(nVal1 < nVal2 && !rtl::math::approxEqual(nVal1, nVal2))
+return true;
+
+return false;
+}
+};
+
 class SC_DLLPUBLIC ScConditionEntry : public ScFormatEntry
 {
 // stored data:
@@ -216,10 +234,27 @@ public:
 virtual void dumpInfo(rtl::OUStringBuffer& ) const {}
 #endif
 
+virtual void endRendering();
+virtual void startRendering();
+
 protected:
 virtual voidDataChanged( const ScRange* pModified ) const;
 ScDocument* GetDocument() const { return mpDoc; }
 ScConditionalFormat*pCondFormat;
+
+private:
+
+bool IsDuplicate(double nArg, const rtl::OUString& rStr, const ScAddress& 
rAddr, const ScRangeList& rRanges) const;
+
+struct ScConditionEntryCache
+{
+typedef std::map StringCacheType;
+StringCacheType maStrings;
+typedef std::map ValueCacheType;
+ValueCacheType maValues;
+};
+
+mutable boost::scoped_ptr mpCache;
 };
 
 //
@@ -326,6 +361,9 @@ public:
 //  operator== only for sorting
 bool operator ==( const ScConditionalFormat& r ) const  { return nKey == 
r.nKey; }
 bool operator < ( const ScConditionalFormat& r ) const  { return nKey <  
r.nKey; }
+
+void startRendering();
+void endRendering();
 };
 
 //
@@ -371,6 +409,9 @@ public:
 size_t size() const;
 
 void erase(sal_uLong nIndex);
+
+void startRendering();
+void endRendering();
 };
 
 // see 
http://www.boost.org/doc/libs/1_49_0/libs/ptr_container/doc/tutorial.html#cloneability
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index c8e2dbc..f7b6b86 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -72,6 +72,14 @@ bool ScFormatEntry::operator==( const ScFormatEntry& r ) 
const
 }
 }
 
+void ScFormatEntry::startRendering()
+{
+}
+
+void ScFormatEntry::endRendering()
+{
+}
+
 bool lcl_HasRelRef( ScDocument* pDoc, ScTokenArray* pFormula, sal_uInt16 
nRecursion = 0 )
 {
 if (pFormula)
@@ -716,7 +724,7 @@ void ScConditionEntry::Interpret( const ScAddress& rPos )
 bFirstRun = false;
 }
 
-static bool lcl_GetCellContent( ScBaseCell* pCell, bool bIsStr1, double& rArg, 
String& rArgStr )
+static bool lcl_GetCellContent( ScBaseCell* pCell, bool bIsStr1, double& rArg, 
rtl::OUString& rArgStr )
 {
 bool bVal = true;
 
@@ -760,53 +768,84 @@ static bool lcl_GetCellContent( ScBaseCell* pCell, bool 
bIsStr1, double& rArg, S
 return bVal;
 }
 
-static bool lcl_IsDuplicate( ScDocument *pDoc, double nArg, const String& 
rStr, const ScAddress& rAddr, const ScRangeList& rRanges )
+bool ScConditionEntry::IsDuplicate( double nArg, const rtl::OUString& rStr, 
const ScAddress& rAddr, const ScRangeList& rRanges ) const
 {
-size_t nListCount = rRanges.size();
-for( size_t i = 0; i < nListCount; i++ )
+if(!mpCache)
 {
-const ScRange *aRange = rRanges[i];
-SCROW nRow = aRange->aEnd.Row();
-SCCOL nCol = aRange->aEnd.Col();
-SCCOL nColStart = aRange->aStart.Col();
-SCROW nRowStart = aRange->aEnd.Row();
-SCTAB nTab = aRange->aStart.Tab();
-
-// temporary fix to workaorund slow duplicate entry
-// conditions, prevent to use a whole row
-if(nRow == MAXROW)
+mpCache.reset(new ScConditionEntryCache);
+size_t nListCount = rRanges.size();
+for( size_t i = 0; i < nListCount; i++ )
 {
-bool bShrunk = false;
-pDoc->ShrinkToUsedDataArea(bShrunk, nTab, nColStart, nRowStart,
-nCol, nRow, false);
-}
-
-for( SCROW r = nRowStart; r <= nRow; r++ )
-for( SCCOL c = nColStart; c <= nCol; c++ )
+const ScRange *aRange = rRanges[i];
+SCROW nRow = aRang

Re: [PUSHED-3-6-2] fix for fdo#54498 in 3-6-2

[Fridrich Strba]

Pushed with Kohei's, Noel's and my signoffs.

f.

On 24/09/12 19:59, Noel Power wrote:
> changed the subject to show the approval rate
> On 24/09/12 16:32, Kohei Yoshida wrote:
>> On 09/24/2012 11:16 AM, Markus Mohrhard wrote:
>>> Hey,
>>>
>>> the attached patch is a simple fix for the crash in calc when
>>> modifying the range of a conditional format. IT opens a again an older
>>> bug that deleting the last column/row will not delete the range but
>>> this is a minor issue compared to the crash. A correct fix for all the
>>> problems is currently under review for 3-6 but it is too complex for
>>> 3-6-2.
>>
>> +1 from me.  We need two more sign-off's to commit this into 3.6.2.
>>
>> Kohei
>>
> +1 seen to work
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice-commits] .: Branch 'libreoffice-3-6-2' - sc/source

[Libreoffice Gerrit user]

 sc/source/core/tool/rangelst.cxx |8 
 1 file changed, 8 deletions(-)

New commits:
commit 5343c2fc6d00c75226ddb78b5300d3e34db53ddb
Author: Markus Mohrhard 
Date:   Mon Sep 24 17:09:31 2012 +0200

fix crash when updating conditional formats, fdo#54498

This opens an old bug that deleting the last column/row will not work
but this is a minor bug compared to the crash. A fix for all bugs will
be hopefully available in 3.6.3

Change-Id: Icc38e4987905062b9780292f0480428411db5f3a
Signed-off-by: Fridrich Å trba 
Signed-off-by: Kohei Yoshida 
Signed-off-by: Noel Power 

diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index 88f9727..60505d7 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -407,14 +407,6 @@ bool ScRangeList::UpdateReference(
 SCTAB nTab2;
 rWhere.GetVars( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );
 
-// delete all entries that are fully deleted
-if( eUpdateRefMode == URM_INSDEL && (nDx < 0 || nDy < 0) )
-{
-vector::iterator itr = std::remove_if(maRanges.begin(), 
maRanges.end(), FindDeletedRange(nDx, nDy));
-for_each(itr, maRanges.end(), ScDeleteObjectByPtr());
-maRanges.erase(itr, maRanges.end());
-}
-
 vector::iterator itr = maRanges.begin(), itrEnd = maRanges.end();
 for (; itr != itrEnd; ++itr)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: libwpd/ExternalProject_libwpd.mk libwpd/Module_libwpd.mk libwpd/StaticLibrary_wpd.mk

[Libreoffice Gerrit user]

 libwpd/ExternalProject_libwpd.mk |   43 +++
 libwpd/Module_libwpd.mk  |2 -
 libwpd/StaticLibrary_wpd.mk  |   43 ---
 3 files changed, 44 insertions(+), 44 deletions(-)

New commits:
commit bc63efc586c1a3b9ba5af7087093174b0d6aeb97
Author: Fridrich Å trba 
Date:   Mon Sep 24 22:18:20 2012 +0200

Trying to consolidate the libwpd module

Change-Id: I3ce8cd24eee7f2256f2a4b1d1220562a84bf5fac

diff --git a/libwpd/ExternalProject_libwpd.mk b/libwpd/ExternalProject_libwpd.mk
new file mode 100644
index 000..16ddad5
--- /dev/null
+++ b/libwpd/ExternalProject_libwpd.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalProject_ExternalProject,libwpd))
+
+$(eval $(call gb_ExternalProject_use_unpacked,libwpd,wpd))
+
+$(eval $(call gb_ExternalProject_register_targets,libwpd,\
+   build \
+))
+
+ifeq ($(OS)$(COM),WNTMSC)
+
+$(call gb_ExternalProject_get_state_target,libwpd,build) :
+   cd $(EXTERNAL_WORKDIR)/build/win32 \
+   && $(COMPATH)/vcpackages/vcbuild.exe libwpd.vcproj "Release|Win32" \
+   && touch $@
+
+else
+
+$(call gb_ExternalProject_get_state_target,libwpd,build) :
+   cd $(EXTERNAL_WORKDIR) \
+   && ./configure \
+   --with-pic \
+   --enable-static \
+   --disable-shared \
+   --without-stream \
+   --without-docs \
+   --disable-debug \
+   $(if $(filter MACOSX,$(OS)),--disable-werror) \
+   $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
+   && $(GNUMAKE) -j$(EXTMAXPROCESS) \
+   && touch $@
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/libwpd/Module_libwpd.mk b/libwpd/Module_libwpd.mk
index 74ff85e..bd74b12 100644
--- a/libwpd/Module_libwpd.mk
+++ b/libwpd/Module_libwpd.mk
@@ -12,8 +12,8 @@ $(eval $(call gb_Module_Module,libwpd))
 ifeq ($(SYSTEM_LIBWPD),NO)
 
 $(eval $(call gb_Module_add_targets,libwpd,\
+   ExternalProject_libwpd \
ExternalPackage_libwpd \
-   StaticLibrary_wpd \
UnpackedTarball_wpd \
 ))
 
diff --git a/libwpd/StaticLibrary_wpd.mk b/libwpd/StaticLibrary_wpd.mk
deleted file mode 100644
index adecdd3..000
--- a/libwpd/StaticLibrary_wpd.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalProject_ExternalProject,libwpd))
-
-$(eval $(call gb_ExternalProject_use_unpacked,libwpd,wpd))
-
-$(eval $(call gb_ExternalProject_register_targets,libwpd,\
-   build \
-))
-
-ifeq ($(OS)$(COM),WNTMSC)
-
-$(call gb_ExternalProject_get_state_target,libwpd,build) :
-   cd $(EXTERNAL_WORKDIR)/build/win32 \
-   && $(COMPATH)/vcpackages/vcbuild.exe libwpd.vcproj "Release|Win32" \
-   && touch $@
-
-else
-
-$(call gb_ExternalProject_get_state_target,libwpd,build) :
-   cd $(EXTERNAL_WORKDIR) \
-   && ./configure \
-   --with-pic \
-   --enable-static \
-   --disable-shared \
-   --without-stream \
-   --without-docs \
-   --disable-debug \
-   $(if $(filter MACOSX,$(OS)),--disable-werror) \
-   $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
-   && $(GNUMAKE) \
-   && touch $@
-
-endif
-
-# vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: wizards/com

[Libreoffice Gerrit user]

 wizards/com/sun/star/wizards/common/ConfigSet.py |2 +-
 wizards/com/sun/star/wizards/common/Configuration.py |3 ++-
 wizards/com/sun/star/wizards/common/FileAccess.py|2 +-
 wizards/com/sun/star/wizards/common/NumberFormatter.py   |4 ++--
 wizards/com/sun/star/wizards/common/PropertySetHelper.py |3 +--
 wizards/com/sun/star/wizards/common/Resource.py  |6 --
 wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py  |2 +-
 wizards/com/sun/star/wizards/ui/ControlScroller.py   |1 -
 wizards/com/sun/star/wizards/ui/ImageList.py |2 +-
 wizards/com/sun/star/wizards/ui/PathSelection.py |4 ++--
 10 files changed, 11 insertions(+), 18 deletions(-)

New commits:
commit 9351d0e4181924c3f72be24081fc7af027aa41f7
Author: Xisco Fauli 
Date:   Mon Sep 24 22:15:09 2012 +0200

pywizards: get rid of import * (3)

Change-Id: Ibf7c6fc7863b6eccb28e5396587f2ec00ffcbe43

diff --git a/wizards/com/sun/star/wizards/common/ConfigSet.py 
b/wizards/com/sun/star/wizards/common/ConfigSet.py
index b5ff836..00b3331 100644
--- a/wizards/com/sun/star/wizards/common/ConfigSet.py
+++ b/wizards/com/sun/star/wizards/common/ConfigSet.py
@@ -16,7 +16,7 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 import traceback
-from .ConfigNode import *
+from .ConfigNode import ConfigNode
 from .Configuration import Configuration
 
 class ConfigSet(ConfigNode):
diff --git a/wizards/com/sun/star/wizards/common/Configuration.py 
b/wizards/com/sun/star/wizards/common/Configuration.py
index d76cad4..8f50558 100644
--- a/wizards/com/sun/star/wizards/common/Configuration.py
+++ b/wizards/com/sun/star/wizards/common/Configuration.py
@@ -15,9 +15,10 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
+import uno
 import traceback
 from .PropertyNames import PropertyNames
-from .Helper import *
+from .Helper import Helper
 
 '''
 This class gives access to the OO configuration api.
diff --git a/wizards/com/sun/star/wizards/common/FileAccess.py 
b/wizards/com/sun/star/wizards/common/FileAccess.py
index 6fa8493..6b91bc4 100644
--- a/wizards/com/sun/star/wizards/common/FileAccess.py
+++ b/wizards/com/sun/star/wizards/common/FileAccess.py
@@ -18,7 +18,7 @@
 import traceback
 import types
 from os import path as osPath
-from .NoValidPathException import *
+from .NoValidPathException import NoValidPathException
 
 from com.sun.star.ucb import CommandAbortedException
 from com.sun.star.awt.VclWindowPeerAttribute import OK, YES_NO
diff --git a/wizards/com/sun/star/wizards/common/NumberFormatter.py 
b/wizards/com/sun/star/wizards/common/NumberFormatter.py
index 1a8d3a6..67d9d98 100644
--- a/wizards/com/sun/star/wizards/common/NumberFormatter.py
+++ b/wizards/com/sun/star/wizards/common/NumberFormatter.py
@@ -16,9 +16,9 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 import traceback
-import uno
 from com.sun.star.lang import Locale
-from com.sun.star.util.NumberFormat import DATE, LOGICAL, DATETIME, TEXT, 
NUMBER
+from com.sun.star.util.NumberFormat import \
+   DATE, LOGICAL, DATETIME, TEXT, NUMBER
 
 class NumberFormatter(object):
 
diff --git a/wizards/com/sun/star/wizards/common/PropertySetHelper.py 
b/wizards/com/sun/star/wizards/common/PropertySetHelper.py
index 3a2be35..c7d75a5 100644
--- a/wizards/com/sun/star/wizards/common/PropertySetHelper.py
+++ b/wizards/com/sun/star/wizards/common/PropertySetHelper.py
@@ -15,8 +15,7 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-from .DebugHelper import *
-from .DebugHelper import *
+from .DebugHelper import DebugHelper
 
 class PropertySetHelper(object):
 
diff --git a/wizards/com/sun/star/wizards/common/Resource.py 
b/wizards/com/sun/star/wizards/common/Resource.py
index 8d6837a..68f60a7 100644
--- a/wizards/com/sun/star/wizards/common/Resource.py
+++ b/wizards/com/sun/star/wizards/common/Resource.py
@@ -22,12 +22,6 @@ from .SystemDialog import SystemDialog
 from com.sun.star.awt.VclWindowPeerAttribute import OK
 
 class Resource(object):
-'''
-Creates a new instance of Resource
-@param _xMSF
-@param _Unit
-@param _Module
-'''
 
 @classmethod
 def __init__(self, _xMSF, _Module):
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py 
b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
index e55f01a..e008aeb 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
@@ -182,7 +182,7 @@ class FaxWizardDialogImpl(FaxWizardDialog):
 (self.chkUseCommunicationType.State is not 0)
 self.myFaxDoc.killEmptyFrames()
 self.bSaveSuccess = OfficeDocument.store(self.xMSF,
-   TextDocument.xTextDocument, self.sPath, 
"

[Libreoffice-commits] .: 3 commits - libwpd/ExternalPackage_libwpd.mk RepositoryExternal.mk

[Libreoffice Gerrit user]

 RepositoryExternal.mk|   20 +++-
 libwpd/ExternalPackage_libwpd.mk |   12 +---
 2 files changed, 8 insertions(+), 24 deletions(-)

New commits:
commit 342954349875ec4c22f6d2dcb9979f4f16eef92e
Author: Michael Stahl 
Date:   Mon Sep 24 22:25:28 2012 +0200

RepositoryExternal: for libraries not built with gbuild,

such as wpd, it is necessary to depend on the package in the "use".
(for libraries built with gbuilt that is done automagically).

Change-Id: I022b66f679fe168de77c2481e6889cddbb0aac3c

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 1f22af9..05880d9 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1025,6 +1025,9 @@ $(eval $(call 
gb_Helper_register_static_libraries,PLAINLIBS, \
 ))
 
 define gb_LinkTarget__use_wpd
+$(call gb_LinkTarget_use_package,$(1),\
+   libwpd \
+)
 $(call gb_LinkTarget_use_static_libraries,$(1),\
wpd-0.9 \
 )
commit 4b43f23ba10aa7c3751dead7c309bc065f7c78be
Author: Michael Stahl 
Date:   Mon Sep 24 22:24:54 2012 +0200

libwpd: invalid to have both ExternalPackage and Package in one makefile

Change-Id: Ia695c0a1fff265360bee57f9b6063178856b7f82

diff --git a/libwpd/ExternalPackage_libwpd.mk b/libwpd/ExternalPackage_libwpd.mk
index 34622fb..f2375d1 100644
--- a/libwpd/ExternalPackage_libwpd.mk
+++ b/libwpd/ExternalPackage_libwpd.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,libwpd_inc,wpd))
+$(eval $(call gb_ExternalPackage_ExternalPackage,libwpd,wpd))
 
-$(eval $(call 
gb_ExternalPackage_add_unpacked_files,libwpd_inc,inc/external/libwpd,\
+$(eval $(call 
gb_ExternalPackage_add_unpacked_files,libwpd,inc/external/libwpd,\
src/lib/libwpd.h \
src/lib/WPDocument.h \
src/lib/WPXBinaryData.h \
@@ -20,15 +20,13 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,libwpd_inc,inc/external/libw
src/lib/WPXPropertyListVector.h \
 ))
 
-$(eval $(call 
gb_ExternalPackage_add_unpacked_files,libwpd_inc,inc/external/libwpd-stream,\
+$(eval $(call 
gb_ExternalPackage_add_unpacked_files,libwpd,inc/external/libwpd-stream,\
src/lib/libwpd-stream.h \
src/lib/WPXStream.h \
src/lib/WPXStreamImplementation.h \
 ))
 
-$(eval $(call gb_Package_Package,libwpd,$(call 
gb_UnpackedTarball_get_dir,wpd)))
-
-$(eval $(call gb_Package_use_external_project,libwpd,libwpd))
+$(eval $(call gb_ExternalPackage_use_external_project,libwpd,libwpd))
 
 ifeq ($(OS)$(COM),WNTMSC)
 $(eval $(call 
gb_ExternalPackage_add_file,libwpd,lib/wpd-0.9.lib,build/win32/Release/lib/libwpd-0.9.lib))
commit 4901a28271ad83a2af6e970e9ba170eb0004c66c
Author: Michael Stahl 
Date:   Mon Sep 24 22:05:01 2012 +0200

libwpd: rename library on deliver to have only one MSVC special case

Change-Id: I3d0f899b5c8e8605d1cfd3a7d717da999f0f2350

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 1c030fd..1f22af9 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1020,21 +1020,6 @@ endef
 
 else # !SYSTEM_LIBWPD
 
-ifeq ($(OS)$(COM),WNTMSC)
-
-$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
-   libwpd-0.9 \
-))
-
-define gb_LinkTarget__use_wpd
-$(call gb_LinkTarget_use_static_libraries,$(1),\
-   libwpd-0.9 \
-)
-
-endef
-
-else # !WNTMSC
-
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
wpd-0.9 \
 ))
@@ -1046,8 +1031,6 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
 
 endef
 
-endif # WNTMSC
-
 endif # SYSTEM_LIBWPD
 
 
diff --git a/libwpd/ExternalPackage_libwpd.mk b/libwpd/ExternalPackage_libwpd.mk
index 053e107..34622fb 100644
--- a/libwpd/ExternalPackage_libwpd.mk
+++ b/libwpd/ExternalPackage_libwpd.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Package_Package,libwpd,$(call 
gb_UnpackedTarball_get_dir,wpd)))
 $(eval $(call gb_Package_use_external_project,libwpd,libwpd))
 
 ifeq ($(OS)$(COM),WNTMSC)
-$(eval $(call 
gb_ExternalPackage_add_file,libwpd,lib/libwpd-0.9.lib,build/win32/Release/lib/libwpd-0.9.lib))
+$(eval $(call 
gb_ExternalPackage_add_file,libwpd,lib/wpd-0.9.lib,build/win32/Release/lib/libwpd-0.9.lib))
 else
 $(eval $(call 
gb_ExternalPackage_add_file,libwpd,lib/libwpd-0.9.a,src/lib/.libs/libwpd-0.9.a))
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54157] LibreOffice 3.7 most annoying bugs

[bugzilla-daemon]

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

tommy27  changed:

   What|Removed |Added

 Depends on||55290

--- Comment #10 from tommy27  ---
adding Bug 55290 - LOdev 3.7 won't install. Error 1935. 

this affects 24 Sep build. previous 3 buils did install.

-- 
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] .: libwpd/StaticLibrary_wpd.mk

[Libreoffice Gerrit user]

 libwpd/StaticLibrary_wpd.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fa0aa5603b756e0612fab19d979741e2c22c03a5
Author: Michael Stahl 
Date:   Mon Sep 24 21:42:35 2012 +0200

libwpd: Apple gcc gives spurious warnings in , disable werror

Change-Id: I396b3613762290d673ce3a40bf76b47683b2dd45

diff --git a/libwpd/StaticLibrary_wpd.mk b/libwpd/StaticLibrary_wpd.mk
index b8784d5..adecdd3 100644
--- a/libwpd/StaticLibrary_wpd.mk
+++ b/libwpd/StaticLibrary_wpd.mk
@@ -33,6 +33,7 @@ $(call gb_ExternalProject_get_state_target,libwpd,build) :
--without-stream \
--without-docs \
--disable-debug \
+   $(if $(filter MACOSX,$(OS)),--disable-werror) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
&& $(GNUMAKE) \
&& touch $@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Regarding RadioButton

[Caolán McNamara]

On Mon, 2012-09-24 at 15:07 +0300, Sagar Srivastava wrote:
> Dear All,
> 
> Greetings of the day !!!
> 
> In the following class : 
> 
> RadioButton::RadioButton 
> (
> Window * 
> pParent, 
> 
> 
> 
> 
> const ResId & 
> rResId 
> 
> 
> )
> 
> 
> 
> 
> Is there any function to change / update Resource ID .

No, not really. Once the RadioButton has been constructed from a given
id there isn't a sort of "reload" from another id. 

You can generally tweak the individual things that get loaded from an
ID, e.g. SetText to change the text of the button, SetStyle to tweak
alignment and so forth. And/or the "have two buttons and hide one" hack

C.


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

Re: Need some direction / Guidance

[Caolán McNamara]

On Wed, 2012-09-19 at 09:03 +0300, Sagar Srivastava wrote:
> Dear All,
> 
> Greetings of the day !!!
> 
> In the following file : 
> 
> filter/source/pdf/impdialog.cxx
> 
> Check out the piece of code inside the following method : 
> 
>
> I want to change the macro "RB_RANGE" to another e.g.
> RB_RANGE_IMPRESS  at runtime, if the source document is a presentation
> document implying "if (mbIsPresentation)".

ImpPDFTabGeneralPage::ImpPDFTabGeneralPage( Window* pParent,
  const SfxItemSet& rCoreSet, bool bIsPresentation ) :
...
  maRbRange( this, 
PDFFilterResId( bIsPresentation ? RB_RANGE : RB_RANGE_IMPRESS) )
...

would work.

Another option is...

ImpPDFTabGeneralPage::ImpPDFTabGeneralPage( Window* pParent,
  const SfxItemSet& rCoreSet) :
...
  maRbRange( this, PDFFilterResId( RB_RANGE ) )
  maImpressRbRange( this, PDFFilterResId( RB_RANGE_IMPRESS) )
...

if (mbIsPresentation)
   maRbRange.Hide();
else
   maImpressRbRange.Hide();

and change the .src file to have both RB_RANGE and RB_RANGE_IMPRESS
widgets of the same size and position.

C.


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

Re: [REVIEW-3-6] trivial cups thread init issue ...

[Caolán McNamara]

On Mon, 2012-09-24 at 11:55 -0400, Kohei Yoshida wrote:
> On Thu, Sep 20, 2012 at 7:02 AM, Michael Meeks  wrote:
> > As attached,
> >
> > I've noticed a number of these straying in. Did we disable a 
> > warning on
> > un-initialized members for some reason ? I could swear the compiler used
> > to complain helpfully about this.
> 
> Hi Michael,
> 
> CUPSManager in 3.6 doesn't seem to have m_bPPDThreadRunning as its
> member. 

Yeah, this was a recent cockup of mine when I did away with CUPSWrapper
and merged it into CUPSManager so master only

C.

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

Re: [TRIAGE] Weekly Update

[Joel Madero]

Forgot to include the link to the TRIAGE spreadsheet:

https://docs.google.com/spreadsheet/ccc?key=0ApS-XtOUGGH5dDIwaXN1YnNsM0h4RXFKdVhvb2RRb0E#gid=1


On Mon, Sep 24, 2012 at 11:12 AM, Joel Madero  wrote:

> #'s were down this week but we've recruited a few new people to help out
> so hopefully we see an increase in activity in the next week. Date Number
> of Unconfirmed Bugs > 30 Days Old Average Length of Days Since Opened Average
> Length of time Since Last Change Median Length of Days Since Opened Median
> Length of time Since Last Change  4/9/2012 893 100 64 87 52  10/9/2012 845
> 103 65 86 50  17/9/2012 847 102 62 81 44  24/9/2012 890 110 66 82 46
> We've seen in increase in every category (no good).
>
> I am a bit concerned that our # of bugs from 2011 jumped a lot, I'm not
> sure if there's a bug with FDO - before I think we had 11 bugs from 2011,
> now we have a lot more than that.
>
>
> Can we get a volunteer to tackle these triages (all from BASIC):
>
>  36827 BASIC majmedium
> Linu libreoffice-b...@lists.free...unco ---Cant save Libreoffice file
> into SSHFS share 
> 2011-05-042012-09-04 37641
> BASIC trilow Wind libreoffice-b...@lists.free...unco ---By using Rowset I
> get not full output 
> 2011-05-262012-09-06 37720
> BASIC trilow Wind libreoffice-b...@lists.free...unco ---Error by
> RowSet.execute() 
> 2011-05-292012-09-07 42135
> BASIC normedium Linu libreoffice-b...@lists.free...unco ---Appending a
> Library functionality in Macro Programming missing or 
> misdocumented
> 2011-10-232012-06-27 42978
> BASIC normedium Wind libreoffice-b...@lists.free...unco ---Changed
> strings not immediately displayed in dialog 
> form
> 2011-11-162012-04-20 43147
> BASIC normedium alllibreoffice-b...@lists.free... UNCO ---error - symbol
> ... already defined 
> differently
> 2011-11-212012-02-15 43447
> BASIC normedium alllibreoffice-b...@lists.free... UNCO 
> ---app-office/libreoffice-3.5.0.0:
> python segfault on pyuno
> 2011-12-012012-01-15 45677
> BASIC normedium alllibreoffice-b...@lists.free... UNCO ---Macros:
> TexMaths extension produce 
> error2012-02-06
> 2012-05-15 45933 BASIC
> majmedium Wind libreoffice-b...@lists.free...unco ---Macro to do a PDF
> Export does not apply filter settings - Calc & 
> Writer
> 2012-02-112012-09-07 46705
> BASIC majmedium Linu libreoffice-b...@lists.free...unco ---CDBL truncates
> the mantissa 
> 2012-02-272012-03-05 46736
> BASIC normedium alllibreoffice-b...@lists.free... UNCO ---Macros: Macro
> won't save for .xls 
> format2012-02-28
> 2012-09-06 47946 BASIC
> normedium alllibreoffice-b...@lists.free... UNCO ---IDE: save on close
> show popup for 
> forcequit2012-03-27
> 2012-06-22 48049 BASIC
> normedium alllibreoffice-b...@lists.free... UNCO ---BASIC: Arch Linux
> error_code 5 request_code 17 minor_code 
> 0
> 2012-03-292012-06-22
>
>
> Best Regards,
> Joel
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[TRIAGE] Weekly Update

[Joel Madero]

#'s were down this week but we've recruited a few new people to help out so
hopefully we see an increase in activity in the next week. Date Number
of Unconfirmed Bugs > 30 Days Old Average Length of Days Since Opened Average
Length of time Since Last Change Median Length of Days Since Opened Median
Length of time Since Last Change  4/9/2012 893 100 64 87 52  10/9/2012 845
103 65 86 50  17/9/2012 847 102 62 81 44  24/9/2012 890 110 66 82 46
We've seen in increase in every category (no good).

I am a bit concerned that our # of bugs from 2011 jumped a lot, I'm not
sure if there's a bug with FDO - before I think we had 11 bugs from 2011,
now we have a lot more than that.


Can we get a volunteer to tackle these triages (all from BASIC):

36827 BASICmajmediumLinu
libreoffice-b...@lists.free...unco---Cant save Libreoffice file into SSHFS
share 2011-05-04
2012-09-0437641 BASICtri
lowwindlibreoffice-b...@lists.free...unco---By using Rowset I get not full
output 2011-05-26
2012-09-0637720 BASICtri
lowwindlibreoffice-b...@lists.free...unco---Error by
RowSet.execute()
2011-05-292012-09-0742135
basicnormediumlinulibreoffice-b...@lists.free...unco---Appending a Library
functionality in Macro Programming missing or
misdocumented
2011-10-232012-06-2742978
basicnormediumwindlibreoffice-b...@lists.free...unco---Changed strings not
immediately displayed in dialog
form
2011-11-162012-04-2043147
basicnormediumalllibreoffice-b...@lists.free...unco---error - symbol ...
already defined differently
2011-11-212012-02-1543447
basicnormediumalllibreoffice-b...@lists.free...unco---app-office/libreoffice-3.5.0.0:
python segfault on pyuno
2011-12-012012-01-1545677
basicnormediumalllibreoffice-b...@lists.free...unco---Macros: TexMaths
extension produce error 
2012-02-062012-05-1545933
basicmajmediumwindlibreoffice-b...@lists.free...unco---Macro to do a PDF
Export does not apply filter settings - Calc &
Writer
2012-02-112012-09-0746705
basicmajmediumlinulibreoffice-b...@lists.free...unco---CDBL truncates the
mantissa 2012-02-27
2012-03-0546736 BASICnor
mediumalllibreoffice-b...@lists.free...unco---Macros: Macro won't save for
.xls format 2012-02-28
2012-09-0647946 BASICnor
mediumalllibreoffice-b...@lists.free...unco---IDE: save on close show popup
for forcequit 2012-03-27
2012-06-2248049 BASICnor
mediumalllibreoffice-b...@lists.free...unco---BASIC: Arch Linux error_code
5 request_code 17 minor_code
0
2012-03-292012-06-22


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

Re: [REVIEW-3-6-2 2/3] fix for fdo#54498 in 3-6-2

[Noel Power]

changed the subject to show the approval rate
On 24/09/12 16:32, Kohei Yoshida wrote:

On 09/24/2012 11:16 AM, Markus Mohrhard wrote:

Hey,

the attached patch is a simple fix for the crash in calc when
modifying the range of a conditional format. IT opens a again an older
bug that deleting the last column/row will not delete the range but
this is a minor issue compared to the crash. A correct fix for all the
problems is currently under review for 3-6 but it is too complex for
3-6-2.


+1 from me.  We need two more sign-off's to commit this into 3.6.2.

Kohei


+1 seen to work
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 3 commits - android/sdremote

[Libreoffice Gerrit user]

 android/sdremote/AndroidManifest.xml   
|   11 
 android/sdremote/res/drawable/libreoffice_logo.9.png   
|binary
 android/sdremote/res/layout/dialog_about.xml   
|  113 +-
 android/sdremote/res/values/strings.xml
|1 
 android/sdremote/res/xml/preferences.xml   
|6 
 
android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
 |7 
 dev/null   
|binary
 7 files changed, 79 insertions(+), 59 deletions(-)

New commits:
commit 58c32f1f59173e8538e89db111c5be7fa69eb50e
Author: Andrzej J.R. Hunt 
Date:   Fri Sep 21 13:59:38 2012 +0200

Fix about dialog image, Fix null device name.

Change-Id: I487582592d468c83030202241d67296a0a1b6aa8

diff --git a/android/sdremote/AndroidManifest.xml 
b/android/sdremote/AndroidManifest.xml
index 4a5811f..bd38fab 100644
--- a/android/sdremote/AndroidManifest.xml
+++ b/android/sdremote/AndroidManifest.xml
@@ -36,10 +36,16 @@
 android:noHistory="true" >
 
 
-
+
 
 
-
+
 
 
 
 Then input this PIN:
 No presentation is currently 
running.
 Start Presentation
+Start Presentation
 About
 Close
 Version: {0} (Build ID: {1})
diff --git 
a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
 
b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
index 511f07f..aa1cd9d 100644
--- 
a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
+++ 
b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
@@ -40,10 +40,11 @@ public class CommunicationService extends Service 
implements Runnable {
 public static String getDeviceName() {
 BluetoothAdapter aAdapter = BluetoothAdapter.getDefaultAdapter();
 if (aAdapter != null) {
-return aAdapter.getName();
-} else {
-return android.os.Build.MODEL;
+String aName = aAdapter.getName();
+if (aName != null)
+return aName;
 }
+return android.os.Build.MODEL;
 }
 
 /**
commit b29ae2b97528e43dd9563645a178025cbfc50529
Author: Andrzej J.R. Hunt 
Date:   Fri Sep 21 12:31:40 2012 +0200

Improve About Dialog for small or very large screens.

Change-Id: Iec8b67dd4e59ca8a1c17119cae5be91fceecf1b1

diff --git a/android/sdremote/res/drawable/libreoffice_logo.9.png 
b/android/sdremote/res/drawable/libreoffice_logo.9.png
new file mode 100644
index 000..6f0294c
Binary files /dev/null and 
b/android/sdremote/res/drawable/libreoffice_logo.9.png differ
diff --git a/android/sdremote/res/drawable/libreoffice_logo.png 
b/android/sdremote/res/drawable/libreoffice_logo.png
deleted file mode 100644
index f4f826b..000
Binary files a/android/sdremote/res/drawable/libreoffice_logo.png and /dev/null 
differ
diff --git a/android/sdremote/res/layout/dialog_about.xml 
b/android/sdremote/res/layout/dialog_about.xml
index ce30a25..d81b3a4 100644
--- a/android/sdremote/res/layout/dialog_about.xml
+++ b/android/sdremote/res/layout/dialog_about.xml
@@ -8,65 +8,75 @@
 
 
 
-
+
 
-
+
 
-
+
 
-
+
 
-
+
 
-
+
+
 
-android:text="@string/about_libraries" />
+
+
+
 
 
\ No newline at end of file
commit c31e0a0b189505e2f9d5319a033f3cd237720dd6
Author: Andrzej J.R. Hunt 
Date:   Fri Sep 21 12:16:50 2012 +0200

Change a SwitchPreference to CheckBoxPreference for Android 2 compatibility.

(SwitchPreference requires android api >= 14, i.e. Android 4.)

Change-Id: I69d83946407d008b8e47b320b5a4f5120c0ff35d

diff --git a/android/sdremote/AndroidManifest.xml 
b/android/sdremote/AndroidManifest.xml
index 80a2541..4a5811f 100644
--- a/android/sdremote/AndroidManifest.xml
+++ b/android/sdremote/AndroidManifest.xml
@@ -32,6 +32,7 @@
 
 
 
diff --git a/android/sdremote/res/xml/preferences.xml 
b/android/sdremote/res/xml/preferences.xml
index 5d7e68b..0a10063 100644
--- a/android/sdremote/res/xml/preferences.xml
+++ b/android/sdremote/res/xml/preferences.xml
@@ -2,11 +2,11 @@
 http://schemas.android.com/apk/res/android"; >
 
 
-
+android:summary="@string/options_volumeswitching_descripton"
+android:title="@string/options_volumeswitching" />
 
 http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [REVIEW-3-6-2 1/3] fix for fdo#54498 in 3-6-2

[Noel Power]

On 24/09/12 16:32, Kohei Yoshida wrote:

On 09/24/2012 11:16 AM, Markus Mohrhard wrote:

Hey,

the attached patch is a simple fix for the crash in calc when
modifying the range of a conditional format. IT opens a again an older
bug that deleting the last column/row will not delete the range but
this is a minor issue compared to the crash. A correct fix for all the
problems is currently under review for 3-6 but it is too complex for
3-6-2.


+1 from me.  We need two more sign-off's to commit this into 3.6.2.

Kohei


+1 seen to work
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: libwpd/libwpd-0.9.5-msc.patch

[Libreoffice Gerrit user]

 libwpd/libwpd-0.9.5-msc.patch |   65 ++
 1 file changed, 65 insertions(+)

New commits:
commit 7ed1d7a42d7faa9094cfda76f7351cd4951ae4dd
Author: Fridrich Å trba 
Date:   Mon Sep 24 18:53:18 2012 +0200

Fix some obscurous windows linking problems

Change-Id: I6dc82bcb2e5997623b6b0e5b846cedfc7e223912

diff --git a/libwpd/libwpd-0.9.5-msc.patch b/libwpd/libwpd-0.9.5-msc.patch
index 4fd979d..d417687 100644
--- a/libwpd/libwpd-0.9.5-msc.patch
+++ b/libwpd/libwpd-0.9.5-msc.patch
@@ -104,3 +104,68 @@ index 8c02ed1..f4ae836 100644
PrecompiledHeaderFile=".\Release/wpd2text.pch"
AssemblerListingLocation=".\Release/"
ObjectFile=".\Release/"
+--- src/lib/WP6BoxGroup.cpp
 src/lib/WP6BoxGroup.cpp
+@@ -304,8 +304,8 @@ void WP6BoxGroup::parse(WP6Listener *listener)
+   if (!m_nativeHeight && gbsPacket)
+   m_nativeHeight = gbsPacket->getNativeHeight();
+ 
+-  std::vector graphicsDataIds;
+-  std::vector::iterator gdiIter;
++  std::vector graphicsDataIds;
++  std::vector::iterator gdiIter;
+   WP6SubDocument *subDocument = 0;
+ 
+   // Get the box content
+@@ -389,7 +389,7 @@ void WP6BoxGroup::parse(WP6Listener *listener)
+   if (tmpContentType == 0x03)
+   {
+   for (gdiIter = graphicsDataIds.begin(); gdiIter != 
graphicsDataIds.end(); gdiIter++)
+-  listener->insertGraphicsData((*gdiIter));
++  listener->insertGraphicsData(((uint16_t)*gdiIter));
+   }
+   if ((tmpContentType == 0x01) && (subDocument))
+   {
+--- src/lib/WP6BoxGroup.h
 src/lib/WP6BoxGroup.h
+@@ -28,7 +28,6 @@
+ #define WP6BOXGROUP_H
+ 
+ #include "WP6VariableLengthGroup.h"
+-#include 
+ #include "libwpd_internal.h"
+ 
+ class WPXInputStream;
+--- src/lib/WP6GraphicsFilenamePacket.cpp
 src/lib/WP6GraphicsFilenamePacket.cpp
+@@ -50,4 +50,9 @@ void WP6GraphicsFilenamePacket::_readContents(WPXInputStream 
*input, WPXEncrypti
+   m_childIds.push_back(readU16(input, encryption));
+ }
+ 
++const std::vector WP6GraphicsFilenamePacket::getChildIds() const
++{
++  return m_childIds;
++}
++
+ /* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
+--- src/lib/WP6GraphicsFilenamePacket.h
 src/lib/WP6GraphicsFilenamePacket.h
+@@ -39,16 +39,12 @@ public:
+   ~WP6GraphicsFilenamePacket();
+   void _readContents(WPXInputStream *input, WPXEncryption *encryption);
+   void parse(WP6Listener * /*listener */) const {}
+-  const std::vector &getChildIds() const
+-  {
+-  return m_childIds;
+-  }
+-
++  const std::vector getChildIds() const;
+ 
+ private:
+   WP6GraphicsFilenamePacket(const WP6GraphicsFilenamePacket &);
+   WP6GraphicsFilenamePacket &operator=(const WP6GraphicsFilenamePacket &);
+-  std::vector m_childIds;
++  std::vector m_childIds;
+   const uint8_t m_flags;
+ 
+ };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/inc sc/source

[Libreoffice Gerrit user]

 sc/inc/document.hxx   |2 +-
 sc/source/filter/inc/stylesbuffer.hxx |5 -
 sc/source/filter/oox/stylesbuffer.cxx |   28 
 3 files changed, 29 insertions(+), 6 deletions(-)

New commits:
commit d233567f716594a6b33983e76c537e47a0fade74
Author: Noel Power 
Date:   Mon Sep 24 09:57:57 2012 +0100

fix parent style import xlsx fdo#55198

Change-Id: I77d38eba69ad7aa89b0f9b692e40fd365d002071
(cherry picked from commit 72d3539e26f0485743126301c438bcb05b02643d)

Signed-off-by: Markus Mohrhard 

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 916bd3e..7a8cf20 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1240,7 +1240,7 @@ public:
 SCCOL nEndCol, SCROW nEndRow, SCTAB 
nTab,
 const ScStyleSheet& rStyle);
 
-voidApplySelectionStyle( const ScStyleSheet& rStyle, const 
ScMarkData& rMark );
+SC_DLLPUBLIC voidApplySelectionStyle( const ScStyleSheet& 
rStyle, const ScMarkData& rMark );
 voidApplySelectionLineStyle( const ScMarkData& rMark,
 const ::editeng::SvxBorderLine* 
pLine, bool bColorOnly );
 
diff --git a/sc/source/filter/inc/stylesbuffer.hxx 
b/sc/source/filter/inc/stylesbuffer.hxx
index 5257f04..43b22a9 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -831,7 +831,7 @@ public:
 inline const CellStyleModel& getModel() const { return maModel; }
 /** Returns the final style name used in the document. */
 inline const ::rtl::OUString& getFinalStyleName() const { return 
maFinalName; }
-
+inline ::ScStyleSheet* getStyleSheet() { return mpStyleSheet; }
 private:
 CellStyleModel  maModel;
 ::rtl::OUString maFinalName;/// Final style name used in API.
@@ -863,12 +863,14 @@ public:
 ::rtl::OUString getDefaultStyleName() const;
 /** Creates the style sheet described by the style XF with the passed 
identifier. */
 ::rtl::OUString createCellStyle( sal_Int32 nXfId ) const;
+::ScStyleSheet* getCellStyleSheet( sal_Int32 nXfId ) const;
 
 private:
 /** Inserts the passed cell style object into the internal maps. */
 voidinsertCellStyle( CellStyleRef xCellStyle );
 /** Creates the style sheet described by the passed cell style object. */
 ::rtl::OUString createCellStyle( const CellStyleRef& rxCellStyle ) 
const;
+::ScStyleSheet* getCellStyleSheet( const CellStyleRef& rxCellStyle ) 
const;
 
 private:
 typedef RefVector< CellStyle >  CellStyleVector;
@@ -967,6 +969,7 @@ public:
 ::rtl::OUString getDefaultStyleName() const;
 /** Creates the style sheet described by the style XF with the passed 
identifier. */
 ::rtl::OUString createCellStyle( sal_Int32 nXfId ) const;
+::ScStyleSheet* getCellStyleSheet( sal_Int32 nXfId ) const;
 /** Creates the style sheet described by the DXF with the passed 
identifier. */
 ::rtl::OUString createDxfStyle( sal_Int32 nDxfId ) const;
 
diff --git a/sc/source/filter/oox/stylesbuffer.cxx 
b/sc/source/filter/oox/stylesbuffer.cxx
index 1ac390a..cb1ce6e 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -2260,10 +2260,13 @@ void Xf::writeToMarkData( ::ScMarkData& rMarkData, 
sal_Int32 nNumFmtId  )
 ScDocument& rDoc = getScDocument();
 if ( isCellXf() )
 {
+StylesBuffer& rStyles = getStyles();
+rStyles.createCellStyle( maModel.mnStyleXfId );
+
+mpStyleSheet = rStyles.getCellStyleSheet( maModel.mnStyleXfId );
 if ( mpStyleSheet )
 {
-// Apply style sheet.  Don't clear the direct formats.
-rPat.SetStyleSheet(mpStyleSheet, false);
+rDoc.ApplySelectionStyle( 
static_cast(*mpStyleSheet), rMarkData );
 }
 else
 {
@@ -2275,7 +2278,7 @@ void Xf::writeToMarkData( ::ScMarkData& rMarkData, 
sal_Int32 nNumFmtId  )
 ScGlobal::GetRscString(STR_STYLENAME_STANDARD), 
SFX_STYLE_FAMILY_PARA));
 
 if (pStyleSheet)
-rPat.SetStyleSheet(pStyleSheet, false);
+rDoc.ApplySelectionStyle( 
static_cast(*pStyleSheet), rMarkData );
 }
 }
 }
@@ -2329,7 +2332,6 @@ Xf::createPattern( bool bSkipPoolDefs )
 {
 if( mpPattern.get() )
 return *mpPattern;
-// create new pattern attribute set
 mpPattern.reset( new ::ScPatternAttr( getScDocument().GetPool() ) );
 SfxItemSet& rItemSet = mpPattern->GetItemSet();
 /*  Enables the used flags, if the formatting attributes differ from the
@@ -2858,6 +2860,11 @@ OUString CellStyleBuffer::createCellStyle( sal_Int32 
nXfId ) const
 return createCellStyle( maStylesByXf.get( nXfId ) );
 }
 
+::ScStyleSheet*   CellStyleBuffer::getCellSt

Re: [PUSHED-3-6] fix for regression fdo#55198

[Markus Mohrhard]

2012/9/24 Noel Power :
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=72d3539e26f0485743126301c438bcb05b02643d
>

Looks good to me. Pushed to 3-6 with my sign-off.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Change in core[libreoffice-3-6-2]: fdo#54385: Displaying help/version early on UNX requires ser...

[Stephan Bergmann (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/695

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/95/695/1

fdo#54385: Displaying help/version early on UNX requires service manager

This regression was introduced with 6c6358a6822d3562b9b8c7668a7d60d6c644dfe8
"Related fdo#53006: Do not instantiate service manager too early."

(cherry picked from commit 2f14e2e67c58fe6948501d57a38cd0d2ad84dfff)
(cherry picked from commit 7b33d564bc0079e5d8309e4b5081b1d44e1efd12)

Conflicts:
desktop/inc/app.hxx
desktop/source/app/app.cxx
desktop/source/app/appinit.cxx
desktop/source/app/sofficemain.cxx
(with ensureProcessServiceManager still available in libreoffice-3-6-2, this
cherry-pick shrinks up dramatically)

Change-Id: If22ea3ac6474188bf0792246620e5c705a813445
---
M desktop/source/app/sofficemain.cxx
1 file changed, 2 insertions(+), 0 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/695
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If22ea3ac6474188bf0792246620e5c705a813445
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6-2
Gerrit-Owner: Stephan Bergmann 

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

[PATCH] Change in core[libreoffice-3-6]: fdo#54385: Displaying help/version early on UNX requires ser...

[Stephan Bergmann (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/694

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/94/694/1

fdo#54385: Displaying help/version early on UNX requires service manager

This regression was introduced with 6c6358a6822d3562b9b8c7668a7d60d6c644dfe8
"Related fdo#53006: Do not instantiate service manager too early."

Change-Id: If22ea3ac6474188bf0792246620e5c705a813445
(cherry picked from commit 2f14e2e67c58fe6948501d57a38cd0d2ad84dfff)
---
M desktop/inc/app.hxx
M desktop/source/app/app.cxx
M desktop/source/app/appinit.cxx
M desktop/source/app/sofficemain.cxx
4 files changed, 11 insertions(+), 8 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/694
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If22ea3ac6474188bf0792246620e5c705a813445
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Stephan Bergmann 

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

[PUSHED] Autocorrection improvements for pt-BR

[Andras Timar (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/674

Approvals:
  Andras Timar: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/674
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I55d48590333e7d60fdc34c44c4c9102be6c52f08
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Olivier Hallot 
Gerrit-Reviewer: Andras Timar 

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

[PUSHED] Change in core[feature/killsdf]: Use PoEntry and PoHeader more like an interface

[Andras Timar (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/681

Approvals:
  Andras Timar: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/681
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I97665b406467053fce8b4864b47456762887e715
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: feature/killsdf
Gerrit-Owner: Zolnai Tamás 
Gerrit-Reviewer: Andras Timar 

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

[PUSHED] Change in core[feature/killsdf]: Correct dependancies in makefiles

[Andras Timar (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/693

Approvals:
  Andras Timar: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/693
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6345144f1b5a998a4a8fd70b51c9a40342a69582
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: feature/killsdf
Gerrit-Owner: Zolnai Tamás 
Gerrit-Reviewer: Andras Timar 

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

[Libreoffice-commits] .: Branch 'feature/killsdf' - solenv/gbuild

[Libreoffice Gerrit user]

 solenv/gbuild/AllLangResTarget.mk|   29 +++-
 solenv/gbuild/Configuration.mk   |   17 +++---
 solenv/gbuild/ExtensionTarget.mk |   41 +++
 solenv/gbuild/InstallModuleTarget.mk |   14 ++-
 4 files changed, 53 insertions(+), 48 deletions(-)

New commits:
commit 822ac662c758916af546a293a408ee6fbb9cfe7e
Author: Zolnai Tamás 
Date:   Mon Sep 24 01:07:22 2012 +0200

Correct dependancies in makefiles

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

diff --git a/solenv/gbuild/AllLangResTarget.mk 
b/solenv/gbuild/AllLangResTarget.mk
index f03a410..24f9c67 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -51,32 +51,26 @@ gb_SrsPartMergeTarget_TRANSEXTARGET := $(call 
gb_Executable_get_target_for_build
 gb_SrsPartMergeTarget_TRANSEXCOMMAND := \
$(gb_Helper_set_ld_path) $(gb_SrsPartMergeTarget_TRANSEXTARGET)
 
-
-define gb_GetPoFiles
-echo $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)), 
$(gb_POLOCATION)/$(lang)/$(1)) > $(2)
-endef
-
 define gb_SrsPartMergeTarget__command
 $(call gb_Output_announce,$(3),$(true),srs,1)
-POFILES=`$(gb_MKTEMP)` && \
-$(call gb_GetPoFiles,$(PO),$${POFILES}) && \
+MERGEINPUT=`$(gb_MKTEMP)` && \
+echo $(POFILES) > $${MERGEINPUT} && \
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
$(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
-p $(firstword $(subst /, ,$(2))) \
-i $(3) \
-o $(1) \
-   -m $${POFILES} \
+   -m $${MERGEINPUT} \
-l all) && \
-rm -rf $${POFILES}
+rm -rf $${MERGEINPUT}
 
 endef
 
 $(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% 
$(gb_Helper_MISCDUMMY)  $(gb_SrsPartMergeTarget_TRANSEXTARGET)
-   $(if $(strip $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(if 
$(wildcard $(gb_POLOCATION)/$(lang)/$(PO)),,x))),\
-   mkdir -p $(dir $@) && cp $< $@,\
-   $(call gb_SrsPartMergeTarget__command,$@,$*,$<))
-
+   $(if $(filter $(words $(POFILES)),$(words $(wildcard $(POFILES,\
+   $(call gb_SrsPartMergeTarget__command,$@,$*,$<),\
+   mkdir -p $(dir $@) && cp $< $@)
 
 # SrsPartTarget class
 
@@ -120,7 +114,8 @@ $(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE :=
 else
 $(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := $(call 
gb_SrsPartMergeTarget_get_target,$(1))
 $(call gb_SrsPartTarget_get_target,$(1)) : $(call 
gb_SrsPartMergeTarget_get_target,$(1))
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : PO := $(patsubst %/,%,$(dir 
$(1))).po
+$(call gb_SrsPartMergeTarget_get_target,$(1)) : \
+   POFILES := $(foreach lang,$(filter-out 
en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)
 endif
 
 endef
@@ -133,8 +128,10 @@ $(call gb_SrsTemplatePartTarget_get_target,$(1)) : $(call 
gb_SrsPartMergeTarget_
mkdir -p $$(dir $$@) && \
cp $$< $$@)
 ifneq ($(strip $(WITH_LANG)),)
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : PO := $(patsubst %/,%,$(dir 
$(1))).po
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : $$(PO)
+$(call gb_SrsPartMergeTarget_get_target,$(1)) : \
+   POFILES := $(foreach lang,$(filter-out 
en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)
+$(call gb_SrsPartMergeTarget_get_target,$(1)) : \
+   $(wildcard $(foreach lang,$(filter-out 
en-US,$(gb_WITH_LANG)),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir 
$(1))).po))
 endif
 
 endef
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 2ae4275..240c4ab 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -249,24 +249,24 @@ gb_XcuMergeTarget_CFGEXCOMMAND := 
$(gb_Helper_set_ld_path) $(gb_XcuMergeTarget_C
 # PRJNAME is computed from the stem (parameter $(2))
 define gb_XcuMergeTarget__command
 $(call gb_Output_announce,$(2),$(true),XCU,5)
-POFILES=`$(gb_MKTEMP)` && \
-$(call gb_GetPoFiles,$(PO),$${POFILES}) && \
+MERGEINPUT=`$(gb_MKTEMP)` && \
+echo $(POFILES) > $${MERGEINPUT} && \
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
$(gb_XcuMergeTarget_CFGEXCOMMAND) \
-p $(firstword $(subst /, ,$(2))) \
-i $(call gb_Helper_symlinked_native,$(3)) \
-o $(1) \
-   -m $${POFILES} \
+   -m $${MERGEINPUT} \
-l all) && \
-rm -rf $${POFILES}
+rm -rf $${MERGEINPUT}
 
 endef
 
 $(call gb_XcuMergeTarget_get_target,%) : $(gb_XcuMergeTarget_CFGEXTARGET)
-   $(if $(strip $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),$(if 
$(wildcard $(gb_POLOCATION)/$(lang)/$(PO)),,x))),\
-   mkdir -p $(dir $@) && cp $(filter %.xcu,$^) $@,\
-   $(call gb_XcuMergeTarget__command,$@,$*,$(filter %.xcu,$^)))
+

[Libreoffice-commits] .: Branch 'feature/killsdf' - l10ntools/inc l10ntools/source

[Libreoffice Gerrit user]

 l10ntools/inc/po.hxx |   60 ++---
 l10ntools/source/po.cxx  |  261 ++-
 l10ntools/source/renewpo.cxx |   17 +-
 3 files changed, 136 insertions(+), 202 deletions(-)

New commits:
commit 27335522a2bfccb7254e146e1b35aa406772508d
Author: Zolnai Tamás 
Date:   Sun Sep 23 11:10:45 2012 +0200

Use PoEntry and PoHeader more like an interface

Delete all members except member with type
GenPoEntry and use getter methods to define
them.
Plus correct renewpo.

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

diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx
index 81bafe7..686c9f3 100644
--- a/l10ntools/inc/po.hxx
+++ b/l10ntools/inc/po.hxx
@@ -15,9 +15,7 @@
 
 class GenPoEntry
 {
-
 private:
-
 OStringm_sWhiteSpace;
 OStringm_sExtractCom;
 OStringm_sReference;
@@ -57,40 +55,30 @@ public:
 
 class PoEntry
 {
+private:
+GenPoEntry m_aGenPo;
+
 public:
 enum SDFPARTS { PROJECT, SOURCEFILE, DUMMY, RESOURCETYPE, GROUPID,
 LOCALID, HELPID, PLATFORM, WIDTH, LANGUAGEID,
 TEXT, HELPTEXT, QUICKHELPTEXT, TITLE, TIMESTAMP };
 enum TYPE { TTEXT=TEXT, TQUICKHELPTEXT=QUICKHELPTEXT, TTITLE=TITLE };
-private:
-
-GenPoEntry  m_aGenPo;
-OString m_sSourceFile;
-OString m_sGroupId;
-OString m_sLocalId;
-OString m_sResourceType;
-TYPEm_eType;
-OString m_sHelpText;
-
-voidSetMembers();
-public:
 
 PoEntry();
-PoEntry(const OString& i_rSDFLine,
+PoEntry(const OString& rSDFLine,
 const TYPE eType = TTEXT);
-virtual ~PoEntry();
-
-OString getSourceFile() const   { return m_sSourceFile; }
-OString getGroupId() const  { return m_sGroupId; }
-OString getLocalId() const  { return m_sLocalId; }
-OString getResourceType() const { return m_sResourceType; }
-TYPEgetType() const { return m_eType; }
-OString getHelpText() const { return m_sHelpText; }
+~PoEntry();
+
+OString getSourceFile() const;
+OString getGroupId() const;
+OString getLocalId() const;
+OString getResourceType() const;
+TYPEgetType() const;
 OString getUnTransStr() const;
 OString getTransStr() const;
-boolgetFuzzy() const{ return m_aGenPo.getFuzzy(); }
-boolisNull() const  { return m_aGenPo.isNull(); }
-OString getKeyId() const{ return m_aGenPo.getKeyId(); }
+boolgetFuzzy() const;
+boolisNull() const;
+OString getKeyId() const;
 voidsetUnTransStr(const OString& rUnTransStr);
 voidsetTransStr(const OString& rTransStr);
 voidsetFuzzy(const bool bFuzzy);
@@ -104,31 +92,15 @@ public:
 
 class PoHeader
 {
-
 private:
 GenPoEntry m_aGenPo;
-OStringm_sExtractionSource;
-OStringm_sProjectIdVersion;
-OStringm_sReportMsgidBugsTo;
-OStringm_sPotCreationDate;
-OStringm_sPoRevisionDate;
-OStringm_sLastTranslator;
-OStringm_sLanguageTeam;
-OStringm_sLanguage;
-OStringm_sMimeVersion;
-OStringm_sContentType;
-OStringm_sEncoding;
-OStringm_sPluralForms;
-OStringm_sXGenerator;
-OStringm_sXAcceleratorMarker;
-
-voidSetMembers();
+
 public:
 PoHeader();
 PoHeader( const OString& rExtSrc );
 ~PoHeader();
 
-OString getLanguage() const { return m_sLanguage; }
+OString getLanguage() const;
 voidwriteToFile(std::ofstream& rOFStream);
 voidreadFromFile(std::ifstream& rIFStream);
 };
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index 3be13fc..f433aab 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -382,37 +382,38 @@ OString ImplEscapeSDFText(const OString& rText,const bool 
bHelpText = false)
 //Default constructor
 PoEntry::PoEntry()
 : m_aGenPo( GenPoEntry() )
-, m_sSourceFile( OString() )
-, m_sGroupId( OString() )
-, m_sLocalId( OString() )
-, m_sResourceType( OString() )
-, m_eType( TTEXT )
-, m_sHelpText( OString() )
 {
 }
 
 //Construct PoEntry from sdfline
 PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType)
 : m_aGenPo( GenPoEntry() )
-, m_sSourceFile( OString() )
-, m_sGroupId( OString() )
-, m_sLocalId( OString() )
-, m_sResourceType(OString() )
-, m_eType( TTEXT )
-, m_sHelpText( OString() )
 {
 std::v

[Libreoffice-commits] .: sc/qa

[Libreoffice Gerrit user]

 sc/qa/unit/subsequent_filters-test.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a358d0799657c9630ea90d10443dfeb8fbdd0208
Author: Markus Mohrhard 
Date:   Mon Sep 24 17:47:22 2012 +0200

disable the color scale test

Problem with rounding errors resulting in different colors. The solution
to it is to treat both files as csv files and compare them like that.
Then we can compare color values +-1

diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index e48b302..e9f6b66 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -194,8 +194,8 @@ public:
 CPPUNIT_TEST(testCellValueXLSX);
 CPPUNIT_TEST(testControlImport);
 
-CPPUNIT_TEST(testColorScaleODS);
-CPPUNIT_TEST(testColorScaleXLSX);
+//CPPUNIT_TEST(testColorScaleODS);
+//CPPUNIT_TEST(testColorScaleXLSX);
 CPPUNIT_TEST(testDataBarODS);
 CPPUNIT_TEST(testNewCondFormat);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [REVIEW-3-6] trivial cups thread init issue ...

[Kohei Yoshida]

On Thu, Sep 20, 2012 at 7:02 AM, Michael Meeks  wrote:
> As attached,
>
> I've noticed a number of these straying in. Did we disable a warning 
> on
> un-initialized members for some reason ? I could swear the compiler used
> to complain helpfully about this.

Hi Michael,

CUPSManager in 3.6 doesn't seem to have m_bPPDThreadRunning as its
member. So, your patch is not applicable there.

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

[PATCH] Change in core[feature/killsdf]: Correct dependancies in makefiles

[via Code Review]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/693

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/93/693/1

Correct dependancies in makefiles

Change-Id: I6345144f1b5a998a4a8fd70b51c9a40342a69582
---
M solenv/gbuild/AllLangResTarget.mk
M solenv/gbuild/Configuration.mk
M solenv/gbuild/ExtensionTarget.mk
M solenv/gbuild/InstallModuleTarget.mk
4 files changed, 53 insertions(+), 48 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/693
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6345144f1b5a998a4a8fd70b51c9a40342a69582
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: feature/killsdf
Gerrit-Owner: Zolnai Tamás 

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

[Libreoffice-commits] .: 2 commits - desktop/source unoxml/source wizards/com

[Libreoffice Gerrit user]

 desktop/source/app/main.c   |   14 ++
 unoxml/source/rdf/librdf_repository.cxx |6 ++
 wizards/com/sun/star/wizards/remote.py  |8 
 3 files changed, 20 insertions(+), 8 deletions(-)

New commits:
commit d68113f3229d0ec8c84f77dcac3b64a3fd7e03e4
Author: Michael Stahl 
Date:   Mon Sep 24 17:29:21 2012 +0200

soffice.bin: add a hack to detect calls to xmlCleanupParser

xmlCleanupParser frees libxml2's global variables, accessing those later
on leads to hard to debug crashes.  Because libxml2 is used indirectly
by lots of different components, nobody is allwed to free its globals.

Change-Id: I05381d3dada217db44e96445d6f6d63014f57241

diff --git a/desktop/source/app/main.c b/desktop/source/app/main.c
index ae016b4..c18fabd 100644
--- a/desktop/source/app/main.c
+++ b/desktop/source/app/main.c
@@ -25,4 +25,18 @@ SAL_IMPLEMENT_MAIN() {
 return soffice_main();
 }
 
+#ifdef DBG_UTIL
+#ifdef __gnu_linux__
+#include 
+#include 
+
+/* HACK: detect calls to xmlCleanupParser, which causes hard to debug crashes 
*/
+__attribute__ ((visibility("default"))) void xmlCleanupParser(void)
+{
+fprintf(stderr, "\n*** ERROR: DO NOT call xmlCleanupParser()\n\n");
+abort();
+}
+#endif
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unoxml/source/rdf/librdf_repository.cxx 
b/unoxml/source/rdf/librdf_repository.cxx
index 733b313..1e98ee5 100644
--- a/unoxml/source/rdf/librdf_repository.cxx
+++ b/unoxml/source/rdf/librdf_repository.cxx
@@ -127,7 +127,13 @@ bool isInternalContext(librdf_node *i_pNode) throw ()
 //   so they need to be wrapped to be usable with boost::shared_ptr.
 static void safe_librdf_free_world(librdf_world *const world)
 {
+#if 1
+(void)world; // leak it
+#else
+// disable this for now: it calls xmlCleanupParser, which now aborts
+// (see desktop/source/app/main.c)
 if (world) { librdf_free_world(world); }
+#endif
 }
 static void safe_librdf_free_model(librdf_model *const model)
 {
commit e5d64a0c5c5a49c55f51a1fcfed18bbb0436cc56
Author: Xisco Fauli 
Date:   Mon Sep 24 17:01:08 2012 +0200

remove remote.py, which was intended to be removed...

...in cf939a858b625982ee5c361b88c5121648859dd0 but apparently the
removal had an accident.

Change-Id: Ifea1deebaf8c49eb72aa688f2b161f13b6a25844

diff --git a/wizards/com/sun/star/wizards/remote.py 
b/wizards/com/sun/star/wizards/remote.py
deleted file mode 100755
index db54e82..000
--- a/wizards/com/sun/star/wizards/remote.py
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-
-import uno
-from fax.FaxWizardDialogImpl import FaxWizardDialogImpl
-import sys
-
-if __name__ == "__main__":
-   FaxWizardDialogImpl.main(sys.argv)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED 3-6] fix for fdo#54555, set the cond format range during xls import

[Kohei Yoshida]

On Fri, Sep 21, 2012 at 7:52 PM, Markus Mohrhard
 wrote:

> [1] fixes a problem with cond format import from xls. With the patch
> we set the range correctly so that the conditional format is correctly
> updated and exported again. Import works also without this code but
> during export and updating we need the information.
...
> [1] 
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=880773208305b15b521df58245367bc3001d2ce1

Pushed to 3-6 with my sign-off.

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

[Libreoffice-commits] .: desktop/inc desktop/source

[Libreoffice Gerrit user]

 desktop/inc/app.hxx|6 +++---
 desktop/source/app/app.cxx |2 +-
 desktop/source/app/appinit.cxx |9 +
 desktop/source/app/sofficemain.cxx |2 ++
 4 files changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 2f14e2e67c58fe6948501d57a38cd0d2ad84dfff
Author: Stephan Bergmann 
Date:   Mon Sep 24 17:41:51 2012 +0200

fdo#54385: Displaying help/version early on UNX requires service manager

This regression was introduced with 6c6358a6822d3562b9b8c7668a7d60d6c644dfe8
"Related fdo#53006: Do not instantiate service manager too early."

Change-Id: If22ea3ac6474188bf0792246620e5c705a813445

diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index b1577b2..7b8359d 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -136,11 +136,11 @@ class Desktop : public Application
 voidSetSplashScreenText( const ::rtl::OUString& 
rText );
 voidSetSplashScreenProgress( sal_Int32 );
 
-private:
 // Bootstrap methods
-static ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory > 
CreateApplicationServiceManager();
-// returns a non-null reference or throws an exception
+static void InitApplicationServiceManager();
+// throws an exception upon failure
 
+private:
 voidRegisterServices();
 voidDeregisterServices();
 
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index fad9908..0a13e56 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -600,7 +600,7 @@ void Desktop::Init()
 // something to enforce this gotcha
 try
 {
-
comphelper::setProcessServiceFactory(CreateApplicationServiceManager());
+InitApplicationServiceManager();
 }
 catch (css::uno::Exception & e)
 {
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 64a8829..367b77a 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -111,20 +111,21 @@ static void configureUcb()
 #endif // GNOME_VFS_ENABLED
 }
 
-Reference< XMultiServiceFactory > Desktop::CreateApplicationServiceManager()
+void Desktop::InitApplicationServiceManager()
 {
 RTL_LOGFILE_CONTEXT( aLog, "desktop (cd13) 
::createApplicationServiceManager" );
-
+Reference sm;
 #ifdef ANDROID
 rtl::OUString aUnoRc( OUString( "file:///assets/program/unorc"  ) );
-return Reference(
+sm.set(
 cppu::defaultBootstrap_InitialComponentContext( aUnoRc 
)->getServiceManager(),
 UNO_QUERY_THROW);
 #else
-return Reference(
+sm.set(
 cppu::defaultBootstrap_InitialComponentContext()->getServiceManager(),
 UNO_QUERY_THROW);
 #endif
+comphelper::setProcessServiceFactory(sm);
 }
 
 void Desktop::DestroyApplicationServiceManager( Reference< 
XMultiServiceFactory >& xSMgr )
diff --git a/desktop/source/app/sofficemain.cxx 
b/desktop/source/app/sofficemain.cxx
index e867601..9463b51 100755
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -62,11 +62,13 @@ extern "C" int DESKTOP_DLLPUBLIC soffice_main()
 const desktop::CommandLineArgs& rCmdLineArgs = 
aDesktop.GetCommandLineArgs();
 if ( rCmdLineArgs.IsHelp() )
 {
+desktop::Desktop::InitApplicationServiceManager();
 desktop::displayCmdlineHelp();
 return EXIT_SUCCESS;
 }
 else if ( rCmdLineArgs.IsVersion() )
 {
+desktop::Desktop::InitApplicationServiceManager();
 desktop::displayVersion();
 return EXIT_SUCCESS;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

[Libreoffice Gerrit user]

 sc/source/filter/excel/xicontent.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4a3cd86f894334dcef9ab2edb59d167a77fbdf85
Author: Markus Mohrhard 
Date:   Sat Sep 22 01:34:38 2012 +0200

set conditional format range for xls import, fdo#54555

Change-Id: I43d1834d28534fc0ec8cb406e1be7e9f48074da2
Signed-off-by: Kohei Yoshida 

diff --git a/sc/source/filter/excel/xicontent.cxx 
b/sc/source/filter/excel/xicontent.cxx
index a6bb268..72bb839 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -635,6 +635,7 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm )
 {
 sal_uLong nKey = 0;
 mxScCondFmt.reset( new ScConditionalFormat( nKey, GetDocPtr() ) );
+mxScCondFmt->AddRange(maRanges);
 }
 
 ScCondFormatEntry* pEntry = new ScCondFormatEntry( eMode, xTokArr1.get(), 
pTokArr2.get(), GetDocPtr(), rPos, aStyleName );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED 3-6] several patches for bugs in conditional formats/ ScRangeList

[Kohei Yoshida]

All three patches pushed to 3-6.

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

[Libreoffice-commits] .: basctl/source Makefile.top sfx2/source unusedcode.easy

[Libreoffice Gerrit user]

 Makefile.top |1 +
 basctl/source/basicide/basdoc.cxx|1 -
 sfx2/source/control/thumbnailviewacc.cxx |   14 --
 sfx2/source/control/thumbnailviewacc.hxx |2 --
 unusedcode.easy  |   23 ---
 5 files changed, 21 insertions(+), 20 deletions(-)

New commits:
commit 7528e11e372e43556cb7169f98aad39ac1e07332
Author: Caolán McNamara 
Date:   Mon Sep 24 08:51:47 2012 +0100

callcatcher: update unused code lists

Change-Id: I58bad0806354eff2e91370ab3395199fa8691764

diff --git a/Makefile.top b/Makefile.top
index 6cbce02..2bc885a 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -526,6 +526,7 @@ findunusedcode:
   | grep -v ^WPG \
   | grep -v ^WPS \
   | grep -v WPX \
+  | grep -v ^WSObject \
   > unusedcode.easy
 
 check: dev-install subsequentcheck
diff --git a/basctl/source/basicide/basdoc.cxx 
b/basctl/source/basicide/basdoc.cxx
index 6f64fbc..119657c 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -36,7 +36,6 @@ namespace basctl
 {
 
 TYPEINIT1(DocShell, SfxObjectShell);
-DBG_NAME(DocShell);
 
 SFX_IMPL_OBJECTFACTORY( DocShell, SvGlobalName(), SFXOBJECTSHELL_STD_NORMAL, 
"sbasic" )
 
diff --git a/sfx2/source/control/thumbnailviewacc.cxx 
b/sfx2/source/control/thumbnailviewacc.cxx
index 5ba12d3..901cf41 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -668,20 +668,6 @@ const uno::Sequence< sal_Int8 >& 
ThumbnailViewItemAcc::getUnoTunnelId()
 return theValueItemAccUnoTunnelId::get().getSeq();
 }
 
-ThumbnailViewItemAcc* ThumbnailViewItemAcc::getImplementation( const 
uno::Reference< uno::XInterface >& rxData )
-throw()
-{
-try
-{
-uno::Reference< lang::XUnoTunnel > xUnoTunnel( rxData, uno::UNO_QUERY 
);
-return( xUnoTunnel.is() ? 
reinterpret_cast(sal::static_int_cast(xUnoTunnel->getSomething(
 ThumbnailViewItemAcc::getUnoTunnelId() ))) : NULL );
-}
-catch(const ::com::sun::star::uno::Exception&)
-{
-return NULL;
-}
-}
-
 uno::Reference< accessibility::XAccessibleContext > SAL_CALL 
ThumbnailViewItemAcc::getAccessibleContext()
 throw (uno::RuntimeException)
 {
diff --git a/sfx2/source/control/thumbnailviewacc.hxx 
b/sfx2/source/control/thumbnailviewacc.hxx
index cb061c7..e29f987 100644
--- a/sfx2/source/control/thumbnailviewacc.hxx
+++ b/sfx2/source/control/thumbnailviewacc.hxx
@@ -201,8 +201,6 @@ public:
 voidFireAccessibleEvent( short nEventId, const 
::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& 
rNewValue );
 sal_BoolHasAccessibleListeners() const { return( 
mxEventListeners.size() > 0 ); }
 
-static ThumbnailViewItemAcc* getImplementation( const 
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) 
throw();
-
 public:
 
 // XAccessible
diff --git a/unusedcode.easy b/unusedcode.easy
index 65239d1..9a307b0 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,5 +1,6 @@
 FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&, 
float, int, bool)
 PopupMenu::SetSelectedEntry(unsigned short)
+RelatedMultipart::getIds()
 SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, 
unsigned int, unsigned char)
 ScMenuFloatingWindow::getDoc()
 
ScVbaFormat::setNumberFormat(com::sun::star::lang::Locale,
 rtl::OUString const&)
@@ -19,11 +20,9 @@ ThumbnailView::GetItemCount() const
 ThumbnailView::ImplScroll(Point const&)
 ThumbnailView::InsertItem(unsigned short, BitmapEx const&, rtl::OUString 
const&, unsigned long)
 ThumbnailViewItemAcc::FireAccessibleEvent(short, com::sun::star::uno::Any 
const&, com::sun::star::uno::Any const&)
-ThumbnailViewItemAcc::getImplementation(com::sun::star::uno::Reference
 const&)
 VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer(Size const&, Fraction 
const&, Point const&, boost::shared_array const&)
 Window::PostUserEvent(unsigned long&, unsigned long, void*)
 XclExpPivotCache::GetFieldAcc(rtl::OUString const&)
-basctl::DbgName_DocShell()
 binfilter::ImpSvtData::~ImpSvtData()
 binfilter::PCodeBuffConvertor::GetBuffer()
 binfilter::PCodeBuffConvertor::GetSize()
@@ -71,6 +70,13 @@ 
comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr
 const&, rtl::OUString const&, com::sun::star::uno::Any const&) const
 connectivity::file::OStatement_Base::reset()
+connectivity::mork::MQueryHelper::next()
+connectivity::mork::MQueryHelperResultEntry::insert(rtl::OString const&, 
rtl::OUString&)
+connectivity::mork::OColumnAlias::isColumnSearchable(rtl::OUString) const
+connectivity::mork::ProfileAccess::getProfileCount(com::sun::star::mozilla::MozillaProductType)
+connectivity::mork::ProfileAccess::getProfileExists(com::sun::star::mozilla::MozillaProductType,
 rtl::OUString const&)
+connectivity::mork::ProfileAccess::getProfileList(com::

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 3 commits - sc/inc sc/source

[Libreoffice Gerrit user]

 sc/inc/conditio.hxx  |2 
 sc/inc/rangelst.hxx  |8 
 sc/source/core/data/conditio.cxx |   22 +
 sc/source/core/data/table2.cxx   |5 
 sc/source/core/tool/rangelst.cxx |  545 ++-
 5 files changed, 577 insertions(+), 5 deletions(-)

New commits:
commit ae584d265c59c54608c63697559c0ed911601aeb
Author: Markus Mohrhard 
Date:   Sat Sep 22 04:44:35 2012 +0200

some more fixes for ScRangeList::DeleteArea

Change-Id: I7f4cf6b053d7cff85e46ecf51cbf8a327530de67
Signed-off-by: Kohei Yoshida 

diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index f33659d..8214c50 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -608,7 +608,7 @@ bool handleTwoRanges( const ScRange& rDeleteRange, ScRange* 
p, std::vectoraEnd.SetRow(nDeleteRow1-1); // 1
 return true;
 }
-else if (nRow1 < nDeleteRow2 && nDeleteRow2 < nRow2 && nDeleteRow1 <= 
nRow1)
+else if (nRow1 <= nDeleteRow2 && nDeleteRow2 < nRow2 && nDeleteRow1 <= 
nRow1)
 {
 // row deleted:  |--|
 // row original:|--|
@@ -651,7 +651,7 @@ bool handleTwoRanges( const ScRange& rDeleteRange, ScRange* 
p, std::vectoraEnd.SetRow(nDeleteRow1-1); // 1
 return true;
 }
-else if (nRow1 < nDeleteRow2 && nDeleteRow2 < nRow2 && nDeleteRow1 <= 
nRow1)
+else if (nRow1 <= nDeleteRow2 && nDeleteRow2 < nRow2 && nDeleteRow1 <= 
nRow1)
 {
 // row deleted:  |---|
 // row original: ||
@@ -755,10 +755,10 @@ template
 bool checkForThreeRanges(
X nDeleteX1, X nDeleteX2, Y nDeleteY1, Y nDeleteY2, X nX1, X nX2, Y nY1, Y 
nY2)
 {
-if (nX1 < nDeleteX1 && nX2 <= nDeleteX2 && nY1 < nDeleteY1 && nDeleteY2 < 
nY2)
+if (nX1 <= nDeleteX1 && nX2 <= nDeleteX2 && nY1 < nDeleteY1 && nDeleteY2 < 
nY2)
 return true;
 
-if (nDeleteX1 <= nX1 && nDeleteX2 < nX2 && nY1 < nDeleteY1 && nDeleteY2 < 
nY2)
+if (nDeleteX1 <= nX1 && nDeleteX2 <= nX2 && nY1 < nDeleteY1 && nDeleteY2 < 
nY2)
 return true;
 
 return false;
commit 34fa2a6763a6f17ffa4f38984d5beac13805515e
Author: Kohei Yoshida 
Date:   Fri Sep 21 20:39:40 2012 -0400

Backported fixes for several bugs found in ScRangeList::DeleteArea().

Change-Id: I9875485008d021dd7a0605e4b7e350345d367a69
Signed-off-by: Markus Mohrhard 

diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index edf2d69..f33659d 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -464,16 +464,31 @@ bool ScRangeList::UpdateReference(
 }
 
 namespace {
-//
-// r.aStart.X() <= p.aStart.X() && r.aEnd.X() >= p.aEnd.X()
-// && ( r.aStart.Y() <= p.aStart.Y() || r.aEnd.Y() >= r.aEnd.Y() )
 
+/**
+ * Check if the deleting range cuts the test range exactly into a single
+ * piece.
+ *
+ * X = column ; Y = row
+ * +--++--+
+ * |xx||  |
+ * +--+ or +--+
+ * |  ||xx|
+ * +--++--+
+ *
+ * X = row; Y = column
+ * +--+--++--+--+
+ * |xx|  ||  |xx|
+ * |xx|  | or |  |xx|
+ * |xx|  ||  |xx|
+ * +--+--++--+--+
+ * where xxx is the deleted region.
+ */
 template
-bool checkForOneRange( X rStartX, X rEndX, Y rStartY, Y rEndY,
-X pStartX, X pEndX, Y pStartY, Y pEndY )
+bool checkForOneRange(
+   X nDeleteX1, X nDeleteX2, Y nDeleteY1, Y nDeleteY2, X nX1, X nX2, Y nY1, Y 
nY2)
 {
-if( rStartX <= pStartX && rEndX >= pEndX
-&& ( rStartY <= pStartY || rEndY >= pEndY ) )
+if (nDeleteX1 <= nX1 && nX2 <= nDeleteX2 && (nDeleteY1 <= nY1 || nY2 <= 
nDeleteY2))
 return true;
 
 return false;
@@ -481,142 +496,269 @@ bool checkForOneRange( X rStartX, X rEndX, Y rStartY, Y 
rEndY,
 
 bool handleOneRange( const ScRange& rDeleteRange, ScRange* p )
 {
-ScAddress rDelStart = rDeleteRange.aStart;
-ScAddress rDelEnd = rDeleteRange.aEnd;
-ScAddress rPStart = p->aStart;
-ScAddress rPEnd = p->aEnd;
-if(checkForOneRange(rDelStart.Col(), rDelEnd.Col(), rDelStart.Row(), 
rDelEnd.Row(),
-rPStart.Col(), rPEnd.Col(), rPStart.Row(), rPEnd.Row()))
+const ScAddress& rDelStart = rDeleteRange.aStart;
+const ScAddress& rDelEnd = rDeleteRange.aEnd;
+ScAddress aPStart = p->aStart;
+ScAddress aPEnd = p->aEnd;
+SCCOL nDeleteCol1 = rDelStart.Col();
+SCCOL nDeleteCol2 = rDelEnd.Col();
+SCROW nDeleteRow1 = rDelStart.Row();
+SCROW nDeleteRow2 = rDelEnd.Row();
+SCCOL nCol1 = aPStart.Col();
+SCCOL nCol2 = aPEnd.Col();
+SCROW nRow1 = aPStart.Row();
+SCROW nRow2 = aPEnd.Row();
+
+if (checkForOneRange(nDeleteCol1, nDeleteCol2, nDeleteRow1, nDeleteRow2, 
nCol1, nCol2, nRow1, nRow2))
 {
-// X = Col
-// Y = Row
-if(rDelStart.Row() <= rPStart.Row())
+// Deleting range fully overlaps

[Libreoffice-commits] .: writerfilter/source

[Libreoffice Gerrit user]

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

New commits:
commit a88a84658c4a981a9d1ef77a8bce53d2253013be
Author: Stephan Bergmann 
Date:   Mon Sep 24 17:34:29 2012 +0200

warning C4482: nonstandard extension used: enum used in qualified name

Change-Id: If00750b312cd4a13e85c5f9b083161d5eb30157d

diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index 8a0ece4..682a3d7 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -304,7 +304,7 @@ SectionPropertyMap::SectionPropertyMap(bool 
bIsFirstSection) :
 //page bottom margin, default 0x5a0 (1440) twip -> 2540 1/100 mm
 Insert( PROP_BOTTOM_MARGIN, false, uno::makeAny( (sal_Int32) 2540 ) );
 //page style layout
-Insert(PROP_PAGE_STYLE_LAYOUT, false, 
uno::makeAny(style::PageStyleLayout::PageStyleLayout_ALL));
+Insert(PROP_PAGE_STYLE_LAYOUT, false, 
uno::makeAny(style::PageStyleLayout_ALL));
 uno::Any aFalse( ::uno::makeAny( false ) );
 Insert( PROP_GRID_DISPLAY, false, aFalse);
 Insert( PROP_GRID_PRINT, false, aFalse);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [REVIEW-3-6-2 1/3] fix for fdo#54498 in 3-6-2

[Kohei Yoshida]

On 09/24/2012 11:16 AM, Markus Mohrhard wrote:

Hey,

the attached patch is a simple fix for the crash in calc when
modifying the range of a conditional format. IT opens a again an older
bug that deleting the last column/row will not delete the range but
this is a minor issue compared to the crash. A correct fix for all the
problems is currently under review for 3-6 but it is too complex for
3-6-2.


+1 from me.  We need two more sign-off's to commit this into 3.6.2.

Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/unitymenus' - 2 commits - vcl/inc vcl/source vcl/unx

[Libreoffice Gerrit user]

 vcl/inc/salmenu.hxx   |4 +-
 vcl/inc/unx/gtk/gtksalmenu.hxx|9 +++--
 vcl/source/window/menu.cxx|3 +
 vcl/unx/gtk/window/gtksalmenu.cxx |   60 +++---
 4 files changed, 60 insertions(+), 16 deletions(-)

New commits:
commit 548f323d08683ee52cfc6655b93b2a245000105e
Author: Antonio Fernandez 
Date:   Mon Sep 24 16:20:57 2012 +0100

Extra menu items are removed when needed, but not their actions.

Change-Id: If817b03cc7b30bfeb751e47fff4aa571fdaaafdc

diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx 
b/vcl/unx/gtk/window/gtksalmenu.cxx
index 5b8c46e..b3976ec 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -253,17 +253,14 @@ static void on_registrar_available( GDBusConnection* 
/*connection*/,
 pSalMenu->SetActionGroup( pActionGroup );
 }
 
-//PublishMenu( gdkWindow );
-g_timeout_add_full( G_PRIORITY_HIGH, 0, PublishMenu, (gpointer) 
gdkWindow, NULL );
+PublishMenu( gdkWindow );
 
 bDBusIsAvailable = sal_True;
 
 if ( pMenuBar )
 pMenuBar->SetDisplayable( sal_False );
-//;
 
-//GenerateMenu( pSalMenu );
-g_timeout_add_full( G_PRIORITY_HIGH, 0, GenerateMenu, pSalMenu, 
NULL );
+GenerateMenu( pSalMenu );
 }
 }
 }
@@ -478,12 +475,12 @@ static void UpdateNativeSubMenu( GtkSalMenu *pMenu )
 if ( nLOMenuSize == 0 )
 g_lo_menu_new_section( pLOMenu, 0, NULL );
 
-sal_uInt16 nSection = 0;
-sal_uInt16 nItemPos = 0;
-sal_uInt16 validItems = 0;
-sal_uInt16 nItem;
+sal_Int32 nSection = 0;
+sal_Int32 nItemPos = 0;
+sal_Int32 validItems = 0;
+sal_Int32 nItem;
 
-for ( nItem = 0; nItem < pMenu->GetItemCount(); nItem++ ) {
+for ( nItem = 0; nItem < ( sal_Int32 ) pMenu->GetItemCount(); nItem++ ) {
 if ( pMenu->IsItemVisible( nItem ) == sal_False )
 continue;
 
@@ -492,12 +489,12 @@ static void UpdateNativeSubMenu( GtkSalMenu *pMenu )
 
 if ( pSalMenuItem->mnType == MENUITEM_SEPARATOR )
 {
+// Delete extra items from current section.
 sal_uInt16 nSectionItems = g_lo_menu_get_n_items_from_section( 
pLOMenu, nSection );
-sal_Int32 nItemsToDelete = nSectionItems - validItems;
 
-if ( nItemsToDelete > 0 )
-for ( sal_uInt16 i = nSectionItems - 1; i >= validItems; i-- )
-g_lo_menu_remove_from_section( pLOMenu, nSection, i );
+while ( nSectionItems > validItems )
+// FIXME Remove associated command if needed.
+g_lo_menu_remove_from_section( pLOMenu, nSection, 
--nSectionItems );
 
 nSection++;
 nItemPos = 0;
@@ -576,6 +573,17 @@ static void UpdateNativeSubMenu( GtkSalMenu *pMenu )
 nItemPos++;
 validItems++;
 }
+
+// Delete extra items in last section.
+sal_Int32 nSectionItems = (sal_Int32) g_lo_menu_get_n_items_from_section( 
pLOMenu, nSection );
+
+while ( nSectionItems > validItems )
+g_lo_menu_remove_from_section( pLOMenu, nSection, --nSectionItems );
+
+// Delete extra sections.
+for ( sal_Int32 n = nLOMenuSize - 1; n > nSection; )
+// FIXME Remove associated command if needed.
+g_lo_menu_remove( pLOMenu, n-- );
 }
 
 static void UpdateNativeMenu( GtkSalMenu* pMenu )
@@ -684,8 +692,7 @@ GtkSalMenu::~GtkSalMenu()
 
 sal_Bool GtkSalMenu::VisibleMenuBar()
 {
-//return bDBusIsAvailable;
-return sal_False;
+return bDBusIsAvailable;
 }
 
 void GtkSalMenu::InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos )
@@ -732,8 +739,7 @@ void GtkSalMenu::SetFrame( const SalFrame* pFrame )
 mpActionGroup = G_ACTION_GROUP( g_object_get_data( G_OBJECT( gdkWindow 
), "g-lo-action-group" ) );
 
 if ( mpMenuModel == NULL && mpActionGroup == NULL )
-//InitNativeMenu( ( GtkSalFrame* ) pFrame );
-g_idle_add_full( G_PRIORITY_HIGH_IDLE, InitNativeMenu, (gpointer) 
pFrame, NULL );
+InitNativeMenu( ( GtkSalFrame* ) pFrame );
 else
 // Generate the main menu structure.
 GenerateMenu( this );
@@ -837,7 +843,7 @@ void GtkSalMenu::EnableItem( unsigned, sal_Bool )
 void GtkSalMenu::ShowItem( unsigned nPos, sal_Bool bShow )
 {
 if ( nPos < maItems.size() )
-( ( GtkSalMenuItem* ) maItems[ nPos ])->mbVisible = bShow;
+( ( GtkSalMenuItem* ) maItems[ nPos ] )->mbVisible = bShow;
 }
 
 void GtkSalMenu::SetItemText( unsigned, SalMenuItem*, const rtl::OUString& )
commit ce402ba79e48f0e62bfd339da9df5a488a1acab0
Author: Antonio Fernandez 
Date:   Mon Sep 24 13:11:45 2012 +0100

Hidden items are not shown anymore.

Change-Id: I957c8c7690321be58e8daaf2fb65ebef136d95bc

diff --git a/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx
index e09b7ce..3411cb2 100644
--- a/vcl/inc/salm

[REVIEW-3-6-2] fix for fdo#54498 in 3-6-2

[Markus Mohrhard]

Hey,

the attached patch is a simple fix for the crash in calc when
modifying the range of a conditional format. IT opens a again an older
bug that deleting the last column/row will not delete the range but
this is a minor issue compared to the crash. A correct fix for all the
problems is currently under review for 3-6 but it is too complex for
3-6-2.

Regards,
Markus


0001-fix-crash-when-updating-conditional-formats-fdo-5449.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: cli_ure/Library_cli_cppuhelper_native.mk

[Libreoffice Gerrit user]

 cli_ure/Library_cli_cppuhelper_native.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7e57c7670b81e820f8a3561d9cdbbbfdca5a390f
Author: Stephan Bergmann 
Date:   Mon Sep 24 17:02:26 2012 +0200

Typo

Change-Id: Ibd19e82a41ceac76ec5c3d6059f497926b8b5d0e

diff --git a/cli_ure/Library_cli_cppuhelper_native.mk 
b/cli_ure/Library_cli_cppuhelper_native.mk
index 2b6e419..2298575 100644
--- a/cli_ure/Library_cli_cppuhelper_native.mk
+++ b/cli_ure/Library_cli_cppuhelper_native.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Library_Library,cli_cppuhelper_native))
 $(eval $(call gb_Library_add_cxxflags,cli_cppuhelper_native,\
-AI $(gb_Helper_OUTDIRLIBDIR) \
-clr:oldSyntax \
-   -wd4449 \
+   -wd4339 \
 ))
 
 # TODO do not encode filenames here
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED 3-6] speed up packaging on Windows significantly

[Andras Timar]

pushed with your signoff.

thanks

2012/9/24 Fridrich Strba :
> +1 from me, just cannot merge it now, since I am using the virtual
> machine for master :/
>
> F.
>
> On 24/09/12 12:25, Andras Timar wrote:
>> Hi,
>>
>> Until now we merged merge modules into all temporary language msi
>> files, that were used only for creation of language transforms. It was
>> a big waste of time, now we only merge once, after creating language
>> transforms. It has been already pushed to master, backport for
>> libreoffice-3-6 is attached.
>>
>> Please review.
>>
>> By the way, a new NYTProf v4 based analysis of make_installer.pl has
>> been published to http://people.freedesktop.org/~timar/nytprof/ if
>> someone is interested.
>>
>> Best regards,
>> Andras
>>
>>
>>
>> ___
>> LibreOffice mailing list
>> LibreOffice@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - solenv/bin

[Libreoffice Gerrit user]

 solenv/bin/make_installer.pl|   12 
 solenv/bin/modules/installer/windows/mergemodule.pm |2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 4de0fe45570ec04303d955e153592d45851c7b4b
Author: Andras Timar 
Date:   Mon Sep 24 12:12:33 2012 +0200

fdo#54276 speed up packaging on Windows significantly

See the bug for more details.

Change-Id: If77544f2fbec2793b6edb015d9447569c6a4e215
Signed-off-by: Fridrich Strba 

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 06ff6b9..fb23d97 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -1796,10 +1796,6 @@ for ( my $n = 0; $n <= 
$#installer::globals::languageproducts; $n++ )
 
 
installer::windows::msiglobal::write_summary_into_msi_database($msifilename, 
$onelanguage, $languagefile, $allvariableshashref);
 
-# if there are Merge Modules, they have to be integrated now
-$filesinproductlanguageresolvedarrayref = 
installer::windows::mergemodule::merge_mergemodules_into_msi_database($mergemodulesarrayref,
 $filesinproductlanguageresolvedarrayref, $msifilename, $languagestringref, 
$onelanguage, $languagefile, $allvariableshashref, $includepatharrayref, 
$allupdatesequences, $allupdatelastsequences, $allupdatediskids);
-if ( $installer::globals::use_packages_for_cabs ) { 
installer::windows::media::create_media_table($filesinproductlanguageresolvedarrayref,
 $newidtdir, $allvariableshashref, $allupdatelastsequences, $allupdatediskids); 
}
-
 # copy msi database into installation directory
 
 my $msidestfilename = $installdir . 
$installer::globals::separator . $msidatabasename;
@@ -1818,6 +1814,14 @@ for ( my $n = 0; $n <= 
$#installer::globals::languageproducts; $n++ )
 {
 
installer::windows::msiglobal::create_transforms($languagesarrayref, 
$defaultlanguage, $installdir, $allvariableshashref);
 }
+# if there are Merge Modules, they have to be integrated now
+my $mergedbname = 
installer::windows::msiglobal::get_msidatabasename($allvariableshashref, 
$defaultlanguage);
+my $mergeidtdir = $idtdirbase . $installer::globals::separator . 
"mergemodules";
+if ( -d $mergeidtdir ) { 
installer::systemactions::remove_complete_directory($mergeidtdir, 1); }
+installer::systemactions::create_directory($mergeidtdir);
+installer::systemactions::copy_one_file($installdir . 
$installer::globals::separator . $mergedbname, $mergeidtdir . 
$installer::globals::separator . $mergedbname);
+$filesinproductlanguageresolvedarrayref = 
installer::windows::mergemodule::merge_mergemodules_into_msi_database($mergemodulesarrayref,
 $filesinproductlanguageresolvedarrayref, $mergeidtdir . 
$installer::globals::separator . $mergedbname, $languagestringref, 
$allvariableshashref, $includepatharrayref, $allupdatesequences, 
$allupdatelastsequences, $allupdatediskids);
+installer::systemactions::copy_one_file($mergeidtdir . 
$installer::globals::separator . $mergedbname, $installdir . 
$installer::globals::separator . $mergedbname);
 
 
installer::windows::msiglobal::rename_msi_database_in_installset($defaultlanguage,
 $installdir, $allvariableshashref);
 }
diff --git a/solenv/bin/modules/installer/windows/mergemodule.pm 
b/solenv/bin/modules/installer/windows/mergemodule.pm
index bc12e11..f4e5951 100755
--- a/solenv/bin/modules/installer/windows/mergemodule.pm
+++ b/solenv/bin/modules/installer/windows/mergemodule.pm
@@ -48,7 +48,7 @@ use installer::windows::language;
 
 sub merge_mergemodules_into_msi_database
 {
-my ($mergemodules, $filesref, $msifilename, $languagestringref, $language, 
$languagefile, $allvariables, $includepatharrayref, $allupdatesequences, 
$allupdatelastsequences, $allupdatediskids) = @_;
+my ($mergemodules, $filesref, $msifilename, $languagestringref, 
$allvariables, $includepatharrayref, $allupdatesequences, 
$allupdatelastsequences, $allupdatediskids) = @_;
 
 my $domerge = 0;
 if (( $#{$mergemodules} > -1 ) && ( ! $installer::globals::patch ) && ( ! 
$installer::globals::languagepack ) && ( ! $installer::globals::helppack )) { 
$domerge = 1; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

[Libreoffice Gerrit user]

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

New commits:
commit dee38dd178fce6bfe97865e6a2a67bdfde1ad6fe
Author: Michael Stahl 
Date:   Mon Sep 24 16:39:38 2012 +0200

LinkTarget: d'oh, forgot to escape $

Change-Id: I817c9e1f3f712a802e167e50478931f0a975a1ec

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index f7fa86b..6d371fa 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -752,7 +752,7 @@ $$(eval $$(call gb_Output_info, currently known static 
libraries are: $(sort $(g
 $$(eval $$(call gb_Output_error,Cannot link against static library/libraries 
$$(filter-out $(gb_StaticLibrary_KNOWNLIBS),$(2)). Static libraries must be 
registered in Repository.mk))
 endif
 
-$(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS += $(if 
$(filter-out StaticLibrary,$(TARGETTYPE)),$(2))
+$(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS += $$(if 
$$(filter-out StaticLibrary,$$(TARGETTYPE)),$(2))
 
 $(call gb_LinkTarget_get_target,$(1)) : $$(foreach lib,$(2),$$(call 
gb_StaticLibrary_get_target,$$(lib)))
 $(call gb_LinkTarget_get_external_headers_target,$(1)) : \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - helpcontent2/helpers helpcontent2/source

[Libreoffice Gerrit user]

 helpcontent2/helpers/help_hid.lst   |   18 -
 helpcontent2/source/text/shared/01/05020100.xhp |   44 
 helpcontent2/source/text/shared/01/05020200.xhp |1 
 3 files changed, 22 insertions(+), 41 deletions(-)

New commits:
commit 68ec9307651f5f17421ca59e73e83309579cd12a
Author: Caolán McNamara 
Date:   Fri Sep 21 09:45:17 2012 +0100

update Char Name tabpage help ids for .ui conversion

Change-Id: I5261bd9a55b56e29b3a7505321f989d9017409cb

diff --git a/helpcontent2/helpers/help_hid.lst 
b/helpcontent2/helpers/help_hid.lst
index b995119..f905561 100644
--- a/helpcontent2/helpers/help_hid.lst
+++ b/helpcontent2/helpers/help_hid.lst
@@ -4139,7 +4139,6 @@ HID_STYLIST_DELETE,33178,
 HID_STYLIST_EDIT,33177,
 HID_STYLIST_NEW,33176,
 HID_SVXDLG_FILTER_WARNING,34195,
-HID_SVXPAGE_CHAR_NAME,34160,
 HID_SVXPAGE_GRFCROP,34143,
 HID_SVXPAGE_JSEARCH_OPTIONS,34188,
 HID_SVXPAGE_NUM_OPTIONS,34057,
@@ -8273,14 +8272,6 @@ svx_ComboBox_RID_SVXDLG_IMAPURL_CBB_TARGETS,1244991489,
 svx_ComboBox_RID_SVXDLG_IMAP_CBB_URL,2318700545,
 svx_ComboBox_RID_SVXDLG_SEARCH_ED_REPLACE,2311655440,
 svx_ComboBox_RID_SVXDLG_SEARCH_ED_SEARCH,2311655435,
-svx_ComboBox_RID_SVXPAGE_CHAR_NAME_LB_CTL_NAME,704630906,
-svx_ComboBox_RID_SVXPAGE_CHAR_NAME_LB_CTL_STYLE,704630908,
-svx_ComboBox_RID_SVXPAGE_CHAR_NAME_LB_EAST_NAME,704630896,
-svx_ComboBox_RID_SVXPAGE_CHAR_NAME_LB_EAST_STYLE,704630898,
-svx_ComboBox_RID_SVXPAGE_CHAR_NAME_LB_WEST_NAME,704630886,
-svx_ComboBox_RID_SVXPAGE_CHAR_NAME_LB_WEST_NAME_NOCJK,704631208,
-svx_ComboBox_RID_SVXPAGE_CHAR_NAME_LB_WEST_STYLE,704630888,
-svx_ComboBox_RID_SVXPAGE_CHAR_NAME_LB_WEST_STYLE_NOCJK,704631210,
 svx_ComboBox_RID_SVXPAGE_HYPERLINK_DOCUMENT_CB_FRAME,704483360,
 svx_ComboBox_RID_SVXPAGE_HYPERLINK_INTERNET_CB_FRAME,704450592,
 svx_ComboBox_RID_SVXPAGE_HYPERLINK_MAIL_CB_FRAME,704466976,
@@ -8590,11 +8581,6 @@ svx_ListBox_RID_SVXPAGE_BORDER_LB_SHADOWCOLOR,700796452,
 svx_ListBox_RID_SVXPAGE_CAPTION_LB_ANSATZ,703172098,
 svx_ListBox_RID_SVXPAGE_CAPTION_LB_ANSATZ_REL,703172099,
 svx_ListBox_RID_SVXPAGE_CAPTION_LB_WINKEL,703172097,
-svx_ListBox_RID_SVXPAGE_CHAR_NAME_LB_COLOR2,704630414,
-svx_ListBox_RID_SVXPAGE_CHAR_NAME_LB_CTL_LANG,704630400,
-svx_ListBox_RID_SVXPAGE_CHAR_NAME_LB_EAST_LANG,704630390,
-svx_ListBox_RID_SVXPAGE_CHAR_NAME_LB_WEST_LANG,704630380,
-svx_ListBox_RID_SVXPAGE_CHAR_NAME_LB_WEST_LANG_NOCJK,704630702,
 svx_ListBox_RID_SVXPAGE_COLORCONFIG_LB_COLORSCHEME,704794115,
 svx_ListBox_RID_SVXPAGE_COLOR_LB_COLOR,701697537,
 svx_ListBox_RID_SVXPAGE_COLOR_LB_COLORMODEL,701697538,
@@ -8673,10 +8659,6 @@ 
svx_MenuButton_RID_SVXPAGE_MENUS_BTN_CHANGE_ENTRY,705507646,
 svx_MenuButton_RID_SVXPAGE_NUM_OPTIONS_MB_BITMAP,704311480,
 svx_Menu_RID_SVXPAGE_LINE_MB_SYMBOL_BITMAP,537296896,
 svx_Menu_RID_SVXPAGE_NUM_OPTIONS_MB_BITMAP,539885568,
-svx_MetricBox_RID_SVXPAGE_CHAR_NAME_LB_CTL_SIZE,704636542,
-svx_MetricBox_RID_SVXPAGE_CHAR_NAME_LB_EAST_SIZE,704636532,
-svx_MetricBox_RID_SVXPAGE_CHAR_NAME_LB_WEST_SIZE,704636522,
-svx_MetricBox_RID_SVXPAGE_CHAR_NAME_LB_WEST_SIZE_NOCJK,704636844,
 svx_MetricBox_RID_SVXPAGE_TABULATOR_ED_TABPOS,700753418,
 svx_MetricField_OFA_TP_VIEW_MF_SELECTION,810523208,
 svx_MetricField_OFA_TP_VIEW_MF_WINDOWSIZE,810523158,
diff --git a/helpcontent2/source/text/shared/01/05020100.xhp 
b/helpcontent2/source/text/shared/01/05020100.xhp
index 26ae242..b32afbf 100644
--- a/helpcontent2/source/text/shared/01/05020100.xhp
+++ b/helpcontent2/source/text/shared/01/05020100.xhp
@@ -52,11 +52,11 @@
 languages; spellchecking and formatting
 characters; enabling CTL and Asian characters
 
-
+
 Characters
 Font
 
-Specify the 
formatting and the font that you want to apply.
+Specify the formatting and the font that 
you want to apply.
 
 
   
@@ -77,39 +77,39 @@
 
 
 To enable support for complex text layout and Asian character sets, 
choose %PRODUCTNAME - 
PreferencesTools - 
Options - Language Settings - Languages, 
and then select the Enabled box in the corresponding 
area.
-
-
-
-
+
+
+
+
 Font
-Enter 
the name of an installed font that you want to use, or select a font from the 
list.
+Enter the name of an 
installed font that you want to use, or select a font from the 
list.
 
 
 
-
-
-
-
+
+
+
+
 Typeface
-Select 
the formatting that you want to apply.
+Select the formatting 
that you want to apply.
 
 
 
-
-
-
-
+
+
+
+
 Size
-Enter 
or select the font size that you want to apply. For scalable fonts, you can 
also enter decimal values.
+Enter or select the font 
size that you want to apply. For scalable fonts, you can also enter decimal 
values.
 If you are creating a Style that is based on another Style, you can 
enter a percentage value or a point value (for example, -2pt or 
+5pt).
 
 
-
-
-
-
+
+
+
+
 Language
-Sets the 
language that the spellchecker uses for the selected text or the text that you 
type. Available language modules have a check mark in front of 
them.
+Sets the language that 
the spellchecker uses for the selecte

[Libreoffice-commits] Changes to 'private/tml/android-use-bionic-linker-copy'

[Libreoffice Gerrit user]

New branch 'private/tml/android-use-bionic-linker-copy' available with the 
following commits:
commit bc9a4133af3cf49495f616bf3eff9d56e55ed214
Author: Tor Lillqvist 
Date:   Thu Sep 13 13:02:53 2012 +0300

Further hacks to use an add-on Bionic linker copy, unfinished

Change-Id: I7c7e06ad172fc95912958c1f46baa74071f5d613

commit d08fa24320cd4c6ad16e88eaa2f7c2d03ac4bbe1
Author: Tor Lillqvist 
Date:   Tue Sep 11 11:49:36 2012 +0300

Call our own version of the run-time linker instead of the system one

Change-Id: I39b7312e33d731e24445eb98b281e04d5c427f7e

commit 57ab2bab4711baee74a650a02fc5eceb0e65cddf
Author: Tor Lillqvist 
Date:   Tue Sep 11 11:48:59 2012 +0300

This isn't the real system run-time linker so no problem calling malloc() 
etc

Change-Id: I7320a2744bcf094c99042e59b1c5a68a126868f8

commit 3b8571045ef6183c80a79737b27f513168d844da
Author: Tor Lillqvist 
Date:   Tue Sep 11 11:46:15 2012 +0300

We don't need visibility markup here

The __lo_dl* functions are called only from lo-bootstrap.c in the same
lo-bootstrap library.

Change-Id: I6f3ae6c6e2be2e6c4c9217b778760766694ef33a

commit 92b808b8e50dc61cbbffd1d287fe54b058e4220a
Author: Tor Lillqvist 
Date:   Fri Sep 7 12:57:16 2012 +0300

Make the Bionic linker stuff compile (but don't use it yet)

Tweaks for C90 and -Werror.

Bin stuff that doesn't compile and is relevant only in the real
Android run-time linker. We are not trying to replace that completely
in our apps. That would be impossible of course, as app processes are
just forks of the Zygote process and already contain the real run-time
linker and it has been initialized etc. There is probably still lots
of stuff in there that doesn't make sense for our use case.

Change-Id: I73a22eb9561a6b27439b0d7db2a3b4a8e3753495

commit ff84b5f02689761473a707cb15be6cebbf300012
Author: Tor Lillqvist 
Date:   Fri Sep 7 10:48:40 2012 +0300

Import Android's run-time linker for furter hacking and use

Will try to use a tweaked copy of this then on Android, to get around
the silly low limit on the number of shared libraries in the system
run.time linker. No idea yet whether this will work or not, and how
much hacking is needed.

From https://android.googlesource.com/platform/bionic ,
e8f815473ba463b875cea757bc0a52fc32f10748 .

Change-Id: I523761cc9a18495dc7be8e84c41fc58590f3c029

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

[PUSHED] add gb_StaticLibrary_use_static_libraries

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/692

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/692
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5bd8edb97454f89ed33b041460019738e9552f18
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Michael Stahl 
Gerrit-Reviewer: Fridrich Strba 

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

Re: [REVIEW 3-6] speed up packaging on Windows significantly

[Fridrich Strba]

+1 from me, just cannot merge it now, since I am using the virtual
machine for master :/

F.

On 24/09/12 12:25, Andras Timar wrote:
> Hi,
> 
> Until now we merged merge modules into all temporary language msi
> files, that were used only for creation of language transforms. It was
> a big waste of time, now we only merge once, after creating language
> transforms. It has been already pushed to master, backport for
> libreoffice-3-6 is attached.
> 
> Please review.
> 
> By the way, a new NYTProf v4 based analysis of make_installer.pl has
> been published to http://people.freedesktop.org/~timar/nytprof/ if
> someone is interested.
> 
> Best regards,
> Andras
> 
> 
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
> 

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

[Libreoffice-commits] .: solenv/gbuild

[Libreoffice Gerrit user]

 solenv/gbuild/LinkTarget.mk|3 ++-
 solenv/gbuild/StaticLibrary.mk |1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 8b6ea31961fedc3e94d8d1bb0d599b14bcaaa618
Author: Michael Stahl 
Date:   Mon Sep 24 16:16:10 2012 +0200

add gb_StaticLibrary_use_static_libraries

... which is probably not needed for LO internal code, but
very useful for RepositoryExternals.

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

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index dae1138..f7fa86b 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -745,13 +745,14 @@ $$(call gb_Output_error,\
  gb_LinkTarget_add_linked_static_libs: use gb_LinkTarget_use_static_libraries 
instead.)
 endef
 
+# for a StaticLibrary, dependent libraries are not actually linked in
 define gb_LinkTarget_use_static_libraries
 ifneq (,$$(filter-out $(gb_StaticLibrary_KNOWNLIBS),$(2)))
 $$(eval $$(call gb_Output_info, currently known static libraries are: $(sort 
$(gb_StaticLibrary_KNOWNLIBS)),ALL))
 $$(eval $$(call gb_Output_error,Cannot link against static library/libraries 
$$(filter-out $(gb_StaticLibrary_KNOWNLIBS),$(2)). Static libraries must be 
registered in Repository.mk))
 endif
 
-$(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS += $(2)
+$(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS += $(if 
$(filter-out StaticLibrary,$(TARGETTYPE)),$(2))
 
 $(call gb_LinkTarget_get_target,$(1)) : $$(foreach lib,$(2),$$(call 
gb_StaticLibrary_get_target,$$(lib)))
 $(call gb_LinkTarget_get_external_headers_target,$(1)) : \
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index dd972fd..12834d8 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -125,6 +125,7 @@ $(eval $(foreach method,\
use_package \
use_packages \
use_unpacked \
+   use_static_libraries \
add_sdi_headers \
set_warnings_not_errors \
set_generated_cxx_suffix \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] add gb_StaticLibrary_use_static_libraries

[Michael Stahl (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/692

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/692/1

add gb_StaticLibrary_use_static_libraries

... which is probably not needed for LO internal code, but
very useful for RepositoryExternals.

Change-Id: I5bd8edb97454f89ed33b041460019738e9552f18
---
M solenv/gbuild/LinkTarget.mk
M solenv/gbuild/StaticLibrary.mk
2 files changed, 3 insertions(+), 1 deletion(-)


--
To view, visit https://gerrit.libreoffice.org/692
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5bd8edb97454f89ed33b041460019738e9552f18
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Michael Stahl 

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

[Libreoffice-commits] Changes to 'private/tml/android-use-faulty.lib'

[Libreoffice Gerrit user]

New branch 'private/tml/android-use-faulty.lib' available with the following 
commits:
commit b4bb54dbc6b0b7f5a0a06b7a8d3c6c76beb3f75a
Author: Tor Lillqvist 
Date:   Wed Aug 29 12:07:14 2012 +0300

To avoid __dso_handle problems, use android-8, says Mike Hommey

Change-Id: I29e85f963ec01d52014d9f7917c2deefd149d6ae

commit cff0c7d492432842c45a9628e579a60b2ca5d542
Author: Tor Lillqvist 
Date:   Tue Aug 28 16:23:16 2012 +0300

Further changes for an attempt to use the faulty.lib linker on Android

Change-Id: Ib9422711e981ff63d6e4f197c2e04a25c22e8adc

commit add80cede10c3f4afb811cdbc9d5c151a0fbf412
Author: Tor Lillqvist 
Date:   Tue Aug 28 16:22:04 2012 +0300

_PTHREADS is meaningless in Android headers

Change-Id: Ic6ada5f5b54e53a8eb2826a6036c95fd2409

commit 25d61bd3ddcd7400192d0669b1d9ebfaaa13004c
Author: Tor Lillqvist 
Date:   Tue Aug 28 14:31:39 2012 +0300

Make the faulty.lib code actually compile and link

Change-Id: I81614321ef29bff647c7c4e4b356d5f115ccb3f3

commit e8037c7074dce14cd31c93d2f8c5d07a3a753a0c
Author: Tor Lillqvist 
Date:   Tue Aug 28 13:56:55 2012 +0300

Import the "faulty.lib" linker for Android

From https://github.com/glandium/faulty.lib at commit
5afe2a7377c5c35c67c3c2a74c403b5ca64cf3b3 . Renamed .cpp files to .cxx
to match gbuild's expectations.

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

[PUSHED] pywizards: remove unused methods

[Michael Stahl (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/687

Approvals:
  Michael Stahl: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/687
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1803b7b4bbfed1e3509a8561ba82fae9ccf4412e
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Xisco Faulí 
Gerrit-Reviewer: Michael Meeks 
Gerrit-Reviewer: Michael Stahl 

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

[PUSHED] pyfax: get rid of import * (2)

[Michael Stahl (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/686

Approvals:
  Michael Stahl: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/686
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd988812d96f7f539c1e888be9ee25c0c895f358
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Xisco Faulí 
Gerrit-Reviewer: Michael Meeks 
Gerrit-Reviewer: Michael Stahl 

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

[Libreoffice-commits] .: wizards/com

[Libreoffice Gerrit user]

 wizards/com/sun/star/wizards/common/Desktop.py |   79 -
 1 file changed, 79 deletions(-)

New commits:
commit 46325e3a2ea376ea2d8b641051a5cbde20596aeb
Author: Xisco Fauli 
Date:   Sun Sep 23 17:39:48 2012 +0200

pywizards: remove unused methods

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

diff --git a/wizards/com/sun/star/wizards/common/Desktop.py 
b/wizards/com/sun/star/wizards/common/Desktop.py
index 8f38f99..914be17 100644
--- a/wizards/com/sun/star/wizards/common/Desktop.py
+++ b/wizards/com/sun/star/wizards/common/Desktop.py
@@ -50,16 +50,6 @@ class Desktop(object):
 return xFrame.getController().getModel()
 
 @classmethod
-def getActiveTextDocument(self, _xMSF):
-xComponent = getActiveComponent(_xMSF)
-return xComponent #Text
-
-@classmethod
-def getActiveSpreadsheetDocument(self, _xMSF):
-xComponent = getActiveComponent(_xMSF)
-return xComponent
-
-@classmethod
 def getDispatcher(self, xMSF, xFrame, _stargetframe, oURL):
 try:
 oURLArray = range(1)
@@ -167,16 +157,6 @@ class OfficePathRetriever:
 return sTemplatePath
 
 @classmethod
-def getUserTemplatePath(self, _xMSF):
-sUserTemplatePath = ""
-try:
-sUserTemplatePath = FileAccess.getOfficePath(_xMSF,
-"Template", "user", "")
-except NoValidPathException, nopathexception:
-pass
-return sUserTemplatePath
-
-@classmethod
 def getBitmapPath(self, _xMSF):
 sBitmapPath = ""
 try:
@@ -186,62 +166,3 @@ class OfficePathRetriever:
 pass
 
 return sBitmapPath
-
-@classmethod
-def getWorkPath(self, _xMSF):
-sWorkPath = ""
-try:
-sWorkPath = FileAccess.getOfficePath(_xMSF, "Work", "", "")
-
-except NoValidPathException, nopathexception:
-pass
-
-return sWorkPath
-
-@classmethod
-def createStringSubstitution(self, xMSF):
-xPathSubst = None
-try:
-xPathSubst = xMSF.createInstance(
-"com.sun.star.util.PathSubstitution")
-except Exception, e:
-traceback.print_exc()
-
-if xPathSubst != None:
-return xPathSubst
-else:
-return None
-
-'''This method searches (and hopefully finds...) a frame
-with a componentWindow.
-It does it in three phases:
-1. Check if the given desktop argument has a componentWindow.
-If it is null, the myFrame argument is taken.
-2. Go up the tree of frames and search a frame with a component window.
-3. Get from the desktop all the components, and give the first one
-which has a frame.
-@param xMSF
-@param myFrame
-@param desktop
-@return
-@throws NoSuchElementException
-@throws WrappedTargetException
-'''
-
-@classmethod
-def findAFrame(self, xMSF, myFrame, desktop):
-if desktop == None:
-desktop = myFrame
-#we go up in the tree...
-
-while desktop != None and desktop.getComponentWindow() == None:
-desktop = desktop.findFrame("_parent", FrameSearchFlag.PARENT)
-if desktop == None:
-e = Desktop.getDesktop(xMSF).getComponents().createEnumeration()
-while e.hasMoreElements():
-xModel = (e.nextElement()).getObject()
-xFrame = xModel.getCurrentController().getFrame()
-if xFrame != None and xFrame.getComponentWindow() != None:
-return xFrame
-
-return desktop
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: wizards/com

[Libreoffice Gerrit user]

 wizards/com/sun/star/wizards/common/ConfigGroup.py  |3 --
 wizards/com/sun/star/wizards/common/Desktop.py  |   12 +--
 wizards/com/sun/star/wizards/fax/CGFax.py   |3 --
 wizards/com/sun/star/wizards/fax/CGFaxWizard.py |3 --
 wizards/com/sun/star/wizards/fax/CallWizard.py  |1 
 wizards/com/sun/star/wizards/fax/FaxDocument.py |4 ++-
 wizards/com/sun/star/wizards/fax/FaxWizardDialog.py |   17 ++--
 wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py |   12 ---
 wizards/com/sun/star/wizards/ui/UnoDialog.py|1 
 wizards/com/sun/star/wizards/ui/UnoDialog2.py   |8 ---
 wizards/com/sun/star/wizards/ui/WizardDialog.py |9 ++--
 11 files changed, 40 insertions(+), 33 deletions(-)

New commits:
commit 90c128e090da5ed0047a3d43bafc33f32d8b27b7
Author: Xisco Fauli 
Date:   Sun Sep 23 15:58:45 2012 +0200

pyfax: get rid of import * (2)

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

diff --git a/wizards/com/sun/star/wizards/common/ConfigGroup.py 
b/wizards/com/sun/star/wizards/common/ConfigGroup.py
index 0491c81..44fc675 100644
--- a/wizards/com/sun/star/wizards/common/ConfigGroup.py
+++ b/wizards/com/sun/star/wizards/common/ConfigGroup.py
@@ -15,9 +15,8 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-import traceback
 import inspect
-from .ConfigNode import *
+from .ConfigNode import ConfigNode
 from .Configuration import Configuration
 
 class ConfigGroup(ConfigNode):
diff --git a/wizards/com/sun/star/wizards/common/Desktop.py 
b/wizards/com/sun/star/wizards/common/Desktop.py
index 86f76e9..8f38f99 100644
--- a/wizards/com/sun/star/wizards/common/Desktop.py
+++ b/wizards/com/sun/star/wizards/common/Desktop.py
@@ -17,7 +17,7 @@
 #
 import uno
 import traceback
-from .NoValidPathException import *
+from .NoValidPathException import NoValidPathException
 
 from com.sun.star.frame.FrameSearchFlag import ALL, PARENT
 from com.sun.star.util import URL
@@ -67,7 +67,7 @@ class Desktop(object):
 xDispatch = xFrame.queryDispatch(oURLArray[0], _stargetframe, ALL)
 return xDispatch
 except Exception, e:
-e.printStackTrace(System.out)
+traceback.print_exc()
 
 return None
 
@@ -75,7 +75,7 @@ class Desktop(object):
 def connect(self, connectStr):
 localContext = uno.getComponentContext()
 resolver = localContext.ServiceManager.createInstanceWithContext(
-   "com.sun.star.bridge.UnoUrlResolver", 
localContext)
+"com.sun.star.bridge.UnoUrlResolver", localContext)
 ctx = resolver.resolve( connectStr )
 orb = ctx.ServiceManager
 return orb
@@ -111,7 +111,7 @@ class Desktop(object):
 _sString, 0, _aLocale, nStartFlags, "", nStartFlags, " ")
 return aResult.EndPos
 except Exception, e:
-e.printStackTrace(System.out)
+traceback.print_exc()
 return -1
 
 @classmethod
@@ -204,8 +204,8 @@ class OfficePathRetriever:
 try:
 xPathSubst = xMSF.createInstance(
 "com.sun.star.util.PathSubstitution")
-except com.sun.star.uno.Exception, e:
-e.printStackTrace()
+except Exception, e:
+traceback.print_exc()
 
 if xPathSubst != None:
 return xPathSubst
diff --git a/wizards/com/sun/star/wizards/fax/CGFax.py 
b/wizards/com/sun/star/wizards/fax/CGFax.py
index 868aa8b..ff69cf1 100644
--- a/wizards/com/sun/star/wizards/fax/CGFax.py
+++ b/wizards/com/sun/star/wizards/fax/CGFax.py
@@ -15,8 +15,7 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-from ..common.ConfigGroup import *
-from ..common.ConfigGroup import *
+from ..common.ConfigGroup import ConfigGroup
 
 class CGFax(ConfigGroup):
 
diff --git a/wizards/com/sun/star/wizards/fax/CGFaxWizard.py 
b/wizards/com/sun/star/wizards/fax/CGFaxWizard.py
index 0cfbeb3..30f211a 100644
--- a/wizards/com/sun/star/wizards/fax/CGFaxWizard.py
+++ b/wizards/com/sun/star/wizards/fax/CGFaxWizard.py
@@ -16,8 +16,7 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 from .CGFax import CGFax
-from ..common.ConfigGroup import *
-from ..common.ConfigGroup import *
+from ..common.ConfigGroup import ConfigGroup
 
 class CGFaxWizard(ConfigGroup):
 
diff --git a/wizards/com/sun/star/wizards/fax/CallWizard.py 
b/wizards/com/sun/star/wizards/fax/CallWizard.py
index 3fbbac1..427a703 100644
--- a/wizards/com/sun/star/wizards/fax/CallWizard.py
+++ b/wizards/com/sun/star/wizards/fax/CallWizard.py
@@ -15,7 +15,6 @@
 #   except i

[PUSHED] Pyfax: Get rid of import * (1)

[Michael Stahl (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/685

Approvals:
  Michael Stahl: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/685
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifeb2fca16ef572a7cb1d1aabb651b3cea87ecbea
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Xisco Faulí 
Gerrit-Reviewer: Michael Meeks 
Gerrit-Reviewer: Michael Stahl 

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

[Libreoffice-commits] .: wizards/com

[Libreoffice Gerrit user]

 wizards/com/sun/star/wizards/fax/FaxWizardDialog.py  |  219 ---
 wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py |  154 +-
 wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py  |4 
 3 files changed, 203 insertions(+), 174 deletions(-)

New commits:
commit dbdca385fcdb53d14677e2db40debeb26420da63
Author: Xisco Fauli 
Date:   Sun Sep 23 14:45:40 2012 +0200

Pyfax: Get rid of import * (1)

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

diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py 
b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
index 4da2c4c..c28d1e8 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
@@ -15,9 +15,13 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
+import uno
 from .FaxWizardDialogResources import FaxWizardDialogResources
-from .FaxWizardDialogConst import *
-from ..ui.WizardDialog import *
+from .FaxWizardDialogConst import FaxWizardDialogConst, HIDMAIN
+from ..ui.WizardDialog import WizardDialog
+from ..ui.UIConsts import UIConsts
+from ..common.Helper import Helper
+from ..common.PropertyNames import PropertyNames
 
 from com.sun.star.awt.FontUnderline import SINGLE
 
@@ -59,7 +63,7 @@ class FaxWizardDialog(WizardDialog):
 '''
 def buildStep1(self):
 self.optBusinessFax = self.insertRadioButton("optBusinessFax",
-OPTBUSINESSFAX_ITEM_CHANGED,
+FaxWizardDialogConst.OPTBUSINESSFAX_ITEM_CHANGED,
 (PropertyNames.PROPERTY_HEIGHT,
 PropertyNames.PROPERTY_HELPURL,
 PropertyNames.PROPERTY_LABEL,
@@ -68,10 +72,12 @@ class FaxWizardDialog(WizardDialog):
 PropertyNames.PROPERTY_STEP,
 PropertyNames.PROPERTY_TABINDEX,
 PropertyNames.PROPERTY_WIDTH),
-(8, OPTBUSINESSFAX_HID, self.resources.resoptBusinessFax_value,
-97, 28, 1, 1, 184), self)
+(8, FaxWizardDialogConst.OPTBUSINESSFAX_HID, 
+   self.resources.resoptBusinessFax_value, 97, 28, 
1, 1, 184),
+   self)
 self.lstBusinessStyle = self.insertListBox("lstBusinessStyle",
-LSTBUSINESSSTYLE_ACTION_PERFORMED, LSTBUSINESSSTYLE_ITEM_CHANGED,
+FaxWizardDialogConst.LSTBUSINESSSTYLE_ACTION_PERFORMED, 
+FaxWizardDialogConst.LSTBUSINESSSTYLE_ITEM_CHANGED,
 ("Dropdown", PropertyNames.PROPERTY_HEIGHT,
 PropertyNames.PROPERTY_HELPURL,
 PropertyNames.PROPERTY_POSITION_X,
@@ -79,9 +85,10 @@ class FaxWizardDialog(WizardDialog):
 PropertyNames.PROPERTY_STEP,
 PropertyNames.PROPERTY_TABINDEX,
 PropertyNames.PROPERTY_WIDTH),
-(True, 12, LSTBUSINESSSTYLE_HID, 180, 40, 1, 3, 74), self)
+(True, 12, FaxWizardDialogConst.LSTBUSINESSSTYLE_HID,
+   180, 40, 1, 3, 74), self)
 self.optPrivateFax = self.insertRadioButton("optPrivateFax",
-OPTPRIVATEFAX_ITEM_CHANGED,
+FaxWizardDialogConst.OPTPRIVATEFAX_ITEM_CHANGED,
 (PropertyNames.PROPERTY_HEIGHT,
 PropertyNames.PROPERTY_HELPURL,
 PropertyNames.PROPERTY_LABEL,
@@ -90,11 +97,11 @@ class FaxWizardDialog(WizardDialog):
 PropertyNames.PROPERTY_STEP,
 PropertyNames.PROPERTY_TABINDEX,
 PropertyNames.PROPERTY_WIDTH),
-(8, OPTPRIVATEFAX_HID, self.resources.resoptPrivateFax_value,
-97, 81, 1, 2, 184), self)
+(8, FaxWizardDialogConst.OPTPRIVATEFAX_HID, 
+   self.resources.resoptPrivateFax_value,97, 81, 
1, 2, 184), self)
 self.lstPrivateStyle = self.insertListBox("lstPrivateStyle",
-LSTPRIVATESTYLE_ACTION_PERFORMED,
-LSTPRIVATESTYLE_ITEM_CHANGED,
+FaxWizardDialogConst.LSTPRIVATESTYLE_ACTION_PERFORMED,
+FaxWizardDialogConst.LSTPRIVATESTYLE_ITEM_CHANGED,
 ("Dropdown", PropertyNames.PROPERTY_HEIGHT,
 PropertyNames.PROPERTY_HELPURL,
 PropertyNames.PROPERTY_POSITION_X,
@@ -102,8 +109,8 @@ class FaxWizardDialog(WizardDialog):
 PropertyNames.PROPERTY_STEP,
 PropertyNames.PROPERTY_TABINDEX,
 PropertyNames.PROPERTY_WIDTH),
-(True, 12, LSTPRIVATESTYLE_HID, 180, 95, 1,
-4, 74), self)
+(True, 12, FaxWizardDialogConst.LSTPRIVATESTYLE_HID,
+   180, 95, 1, 4, 74), self)
 self.insertLabel("lblBusinessStyle",
 (PropertyNames.PROPERTY_HEIGHT,
 PropertyNames.PROPERT

[Libreoffice-commits] .: Branch 'feature/android-single-dso' - android/experimental

[Libreoffice Gerrit user]

 android/experimental/DocumentLoader/Makefile|6 ++
 android/experimental/DocumentLoader/native-code.cxx |4 
 2 files changed, 10 insertions(+)

New commits:
commit 6b8ba1fc8c19a33c76fab182be08db44da8e0f43
Author: Tor Lillqvist 
Date:   Mon Sep 24 16:35:50 2012 +0300

Add some more components/libraries

Change-Id: I2dba9bceee4c68b551ed8ed9239e93ea9ae93117

diff --git a/android/experimental/DocumentLoader/Makefile 
b/android/experimental/DocumentLoader/Makefile
index a357e6b..95251be 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -142,8 +142,14 @@ LIBS = \
vbahelperlo \
vbaswobj.uno \
vcllo \
+   visiolib \
+   wpdlib \
wpftdrawlo \
wpftwriterlo \
+   wpglib \
+   wpslib \
+   writerfilterlo \
+   writerperfect \
xml2 \
xmlfalo \
xmlfdlo \
diff --git a/android/experimental/DocumentLoader/native-code.cxx 
b/android/experimental/DocumentLoader/native-code.cxx
index 415c673..c85fc3c 100644
--- a/android/experimental/DocumentLoader/native-code.cxx
+++ b/android/experimental/DocumentLoader/native-code.cxx
@@ -18,6 +18,8 @@ extern "C"
 extern void * sw_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * swd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * unoxml_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * wpftdraw_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
+extern void * wpftwriter_component_getFactory( const char * pImplName, 
void * pServiceManager, void * pRegistryKey );
 extern void * xmlfd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * xo_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * xof_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
@@ -36,6 +38,8 @@ lo_get_libmap(void)
 { "libswdlo.a", swd_component_getFactory },
 { "libswlo.a", sw_component_getFactory },
 { "libunoxmllo.a", unoxml_component_getFactory },
+{ "libwpftdrawlo.a", wpftdraw_component_getFactory },
+{ "libwpftwriterlo.a", wpftwriter_component_getFactory },
 { "libxmlfdlo.a", xmlfd_component_getFactory },
 { "libxoflo.a", xof_component_getFactory },
 { "libxolo.a", xo_component_getFactory },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'private/tml/android-single-dso' - android/experimental

[Libreoffice Gerrit user]

 android/experimental/DocumentLoader/Makefile|6 ++
 android/experimental/DocumentLoader/native-code.cxx |4 
 2 files changed, 10 insertions(+)

New commits:
commit 6b8ba1fc8c19a33c76fab182be08db44da8e0f43
Author: Tor Lillqvist 
Date:   Mon Sep 24 16:35:50 2012 +0300

Add some more components/libraries

Change-Id: I2dba9bceee4c68b551ed8ed9239e93ea9ae93117

diff --git a/android/experimental/DocumentLoader/Makefile 
b/android/experimental/DocumentLoader/Makefile
index a357e6b..95251be 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -142,8 +142,14 @@ LIBS = \
vbahelperlo \
vbaswobj.uno \
vcllo \
+   visiolib \
+   wpdlib \
wpftdrawlo \
wpftwriterlo \
+   wpglib \
+   wpslib \
+   writerfilterlo \
+   writerperfect \
xml2 \
xmlfalo \
xmlfdlo \
diff --git a/android/experimental/DocumentLoader/native-code.cxx 
b/android/experimental/DocumentLoader/native-code.cxx
index 415c673..c85fc3c 100644
--- a/android/experimental/DocumentLoader/native-code.cxx
+++ b/android/experimental/DocumentLoader/native-code.cxx
@@ -18,6 +18,8 @@ extern "C"
 extern void * sw_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * swd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * unoxml_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * wpftdraw_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
+extern void * wpftwriter_component_getFactory( const char * pImplName, 
void * pServiceManager, void * pRegistryKey );
 extern void * xmlfd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * xo_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * xof_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
@@ -36,6 +38,8 @@ lo_get_libmap(void)
 { "libswdlo.a", swd_component_getFactory },
 { "libswlo.a", sw_component_getFactory },
 { "libunoxmllo.a", unoxml_component_getFactory },
+{ "libwpftdrawlo.a", wpftdraw_component_getFactory },
+{ "libwpftwriterlo.a", wpftwriter_component_getFactory },
 { "libxmlfdlo.a", xmlfd_component_getFactory },
 { "libxoflo.a", xof_component_getFactory },
 { "libxolo.a", xo_component_getFactory },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: using bool in rtl::OUStringBuffer::append

[Michael Stahl]

On 23/09/12 22:49, Markus Mohrhard wrote:
> Hey,
> 
> after I got tinderbox mail complaining about ambiguous overload for
> rtl::OUStringBuffer::append(bool) I wanted to ask if we could add a
> rtl::OUStringBuffer::append(bool) method or if there are reasons
> against it. From what I can see it could in the end even share the
> implementation with the sal_Bool variant just needs an own method in
> rtl::OUStringBuffer.

the overloads of OUStringBuffer::append are pretty horrible already
(e.g. append(sal_Bool) vs. append(char) or append(sal_Unicode) which is
always accidentally invoked when you pass a short);  but adding
append(bool) won't make that any worse than it is.


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

[Libreoffice-commits] .: libwpd/StaticLibrary_wpd.mk

[Libreoffice Gerrit user]

 libwpd/StaticLibrary_wpd.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 99df35a621aab3b4b92360bb2cab79aca53c25c6
Author: Tor Lillqvist 
Date:   Mon Sep 24 16:13:09 2012 +0300

Pass --build and --host when cross-compiling

Change-Id: Ia7c7a5626f2e81de9af65897e18f7d174a6e08c7

diff --git a/libwpd/StaticLibrary_wpd.mk b/libwpd/StaticLibrary_wpd.mk
index b9108c5..b8784d5 100644
--- a/libwpd/StaticLibrary_wpd.mk
+++ b/libwpd/StaticLibrary_wpd.mk
@@ -33,6 +33,7 @@ $(call gb_ExternalProject_get_state_target,libwpd,build) :
--without-stream \
--without-docs \
--disable-debug \
+   $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
&& $(GNUMAKE) \
&& touch $@
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: libwpd/libwpd-0.9.5-msc.patch libwpd/UnpackedTarball_wpd.mk

[Libreoffice Gerrit user]

 libwpd/UnpackedTarball_wpd.mk |2 
 libwpd/libwpd-0.9.5-msc.patch |  106 ++
 2 files changed, 108 insertions(+)

New commits:
commit a147095aee3d1b1e4ee937944cf253ab61f96da1
Author: Fridrich Å trba 
Date:   Mon Sep 24 15:00:48 2012 +0200

Link the windows build of libwpd against the shared library runtimes

Change-Id: I9dfa2ffb8aeb5b57435f6d67ab662174b794e5b4

diff --git a/libwpd/UnpackedTarball_wpd.mk b/libwpd/UnpackedTarball_wpd.mk
index 2383948..61f0ffa 100644
--- a/libwpd/UnpackedTarball_wpd.mk
+++ b/libwpd/UnpackedTarball_wpd.mk
@@ -16,6 +16,8 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,wpd,0))
 wpd_patches :=
 # By mistake libwpd-0.9.5 changed ABI, change back
 wpd_patches += libwpd-0.9.5-ABI.patch
+# Link the static library against the dll runtime and not the static one
+wpd_patches += libwpd-0.9.5-msc.patch
 
 $(eval $(call gb_UnpackedTarball_add_patches,wpd,\
$(foreach patch,$(wpd_patches),libwpd/$(patch)) \
diff --git a/libwpd/libwpd-0.9.5-msc.patch b/libwpd/libwpd-0.9.5-msc.patch
new file mode 100644
index 000..4fd979d
--- /dev/null
+++ b/libwpd/libwpd-0.9.5-msc.patch
@@ -0,0 +1,106 @@
+--- build/win32/libwpd.vcproj
 build/win32/libwpd.vcproj
+@@ -42,7 +42,7 @@
+   Optimization="0"
+   
PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS"
+   BasicRuntimeChecks="3"
+-  RuntimeLibrary="1"
++  RuntimeLibrary="3"
+   RuntimeTypeInfo="true"
+   PrecompiledHeaderFile=".\Debug/libwpd.pch"
+   AssemblerListingLocation=".\Debug/"
+@@ -115,7 +115,7 @@
+   InlineFunctionExpansion="1"
+   
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS"
+   StringPooling="true"
+-  RuntimeLibrary="0"
++  RuntimeLibrary="2"
+   EnableFunctionLevelLinking="true"
+   RuntimeTypeInfo="true"
+   PrecompiledHeaderFile=".\Release/libwpd.pch"
+--- build/win32/libwpdstream.vcproj
 build/win32/libwpdstream.vcproj
+@@ -43,7 +43,7 @@
+   InlineFunctionExpansion="1"
+   
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE"
+   StringPooling="true"
+-  RuntimeLibrary="0"
++  RuntimeLibrary="2"
+   EnableFunctionLevelLinking="true"
+   
PrecompiledHeaderFile=".\Release/libwpdstream.pch"
+   AssemblerListingLocation=".\Release/"
+@@ -114,7 +114,7 @@
+   Optimization="0"
+   
PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE"
+   BasicRuntimeChecks="3"
+-  RuntimeLibrary="1"
++  RuntimeLibrary="3"
+   PrecompiledHeaderFile=".\Debug/libwpdstream.pch"
+   AssemblerListingLocation=".\Debug/"
+   ObjectFile=".\Debug/"
+diff --git a/build/win32/wpd2html.vcproj b/build/win32/wpd2html.vcproj
+index a41eef2..bdc44cc 100644
+--- build/win32/wpd2html.vcproj
 build/win32/wpd2html.vcproj
+@@ -46,7 +46,7 @@
+   Optimization="4"
+   AdditionalIncludeDirectories="..\..\src\lib"
+   PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
+-  RuntimeLibrary="0"
++  RuntimeLibrary="2"
+   PrecompiledHeaderFile=".\Release/wpd2html.pch"
+   AssemblerListingLocation=".\Release/"
+   ObjectFile=".\Release/"
+@@ -134,7 +134,7 @@
+   AdditionalIncludeDirectories="..\..\src\lib"
+   
PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_CONSOLE"
+   BasicRuntimeChecks="3"
+-  RuntimeLibrary="1"
++  RuntimeLibrary="3"
+   PrecompiledHeaderFile=".\Debug/wpd2html.pch"
+   AssemblerListingLocation=".\Debug/"
+   ObjectFile=".\Debug/"
+diff --git a/build/win32/wpd2raw.vcproj b/build/win32/wpd2raw.vcproj
+index a41318a..9a057e5 100644
+--- build/win32/wpd2raw.vcproj
 build/win32/wpd2raw.vcproj
+@@ -47,7 +47,7 @@
+   Optimization="4"
+   Addition

[Libreoffice-commits] .: 3 commits - RepositoryExternal.mk solenv/gbuild solenv/inc

[Libreoffice Gerrit user]

 RepositoryExternal.mk |2 +-
 solenv/gbuild/UnoApiTarget.mk |4 ++--
 solenv/inc/_tg_shl.mk |   20 ++--
 solenv/inc/tg_shl.mk  |2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 084db5f74e9d9c32632df6d15e6cff1c43c2c5a7
Author: Tor Lillqvist 
Date:   Mon Sep 24 10:37:25 2012 +0300

Don't use gb_ICU_suffix on Android when DISABLE_DYNLOADING

Change-Id: Ie4a76ddb1db8d45e32d64d13aca01a0b29b519d2

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 914b97b..1c030fd 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -804,7 +804,7 @@ endef
 
 else # !SYSTEM_ICU
 
-ifeq ($(OS),ANDROID)
+ifeq ($(OS)$(DISABLE_DYNLOADING),ANDROID)
 gb_ICU_suffix:=lo
 else
 gb_ICU_suffix:=
commit 1e605fcd4e4e68c5795ad98c9775a15308ccb6f5
Author: Tor Lillqvist 
Date:   Mon Sep 24 10:35:20 2012 +0300

Check DISABLE_DYNLOADING, not just iOS

Change-Id: I839137b19c802c45eed73bae57beac81973d8da3

diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index e666042..4aed3be 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -449,7 +449,7 @@ $(SHL1TARGETN) : \
 .IF "$(SHL1NOCHECK)"==""
 $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) 
$(SHL1TARGETN)
 .ENDIF # "$(SHL1NOCHECK)"!=""
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(DISABLE_DYNLOADING)"=="TRUE"
 $(COMMAND_ECHO)$(AR) $(LIB1FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o 
$(SHL1OBJS)) $(shell cat /dev/null $(LIB1TARGET) $(SHL1LIBS) | sed 
s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
 $(COMMAND_ECHO)$(RANLIB) $@
 .ELSE  # "$(OS)"=="MACOSX"
@@ -934,7 +934,7 @@ $(SHL2TARGETN) : \
 .IF "$(SHL2NOCHECK)"==""
 $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) 
$(SHL2TARGETN)
 .ENDIF # "$(SHL2NOCHECK)"!=""
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(DISABLE_DYNLOADING)"=="TRUE"
 $(COMMAND_ECHO)$(AR) $(LIB2FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o 
$(SHL2OBJS)) $(shell cat /dev/null $(LIB2TARGET) $(SHL2LIBS) | sed 
s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
 $(COMMAND_ECHO)$(RANLIB) $@
 .ELSE  # "$(OS)"=="MACOSX"
@@ -1419,7 +1419,7 @@ $(SHL3TARGETN) : \
 .IF "$(SHL3NOCHECK)"==""
 $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) 
$(SHL3TARGETN)
 .ENDIF # "$(SHL3NOCHECK)"!=""
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(DISABLE_DYNLOADING)"=="TRUE"
 $(COMMAND_ECHO)$(AR) $(LIB3FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o 
$(SHL3OBJS)) $(shell cat /dev/null $(LIB3TARGET) $(SHL3LIBS) | sed 
s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
 $(COMMAND_ECHO)$(RANLIB) $@
 .ELSE  # "$(OS)"=="MACOSX"
@@ -1904,7 +1904,7 @@ $(SHL4TARGETN) : \
 .IF "$(SHL4NOCHECK)"==""
 $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) 
$(SHL4TARGETN)
 .ENDIF # "$(SHL4NOCHECK)"!=""
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(DISABLE_DYNLOADING)"=="TRUE"
 $(COMMAND_ECHO)$(AR) $(LIB4FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o 
$(SHL4OBJS)) $(shell cat /dev/null $(LIB4TARGET) $(SHL4LIBS) | sed 
s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
 $(COMMAND_ECHO)$(RANLIB) $@
 .ELSE  # "$(OS)"=="MACOSX"
@@ -2389,7 +2389,7 @@ $(SHL5TARGETN) : \
 .IF "$(SHL5NOCHECK)"==""
 $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) 
$(SHL5TARGETN)
 .ENDIF # "$(SHL5NOCHECK)"!=""
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(DISABLE_DYNLOADING)"=="TRUE"
 $(COMMAND_ECHO)$(AR) $(LIB5FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o 
$(SHL5OBJS)) $(shell cat /dev/null $(LIB5TARGET) $(SHL5LIBS) | sed 
s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
 $(COMMAND_ECHO)$(RANLIB) $@
 .ELSE  # "$(OS)"=="MACOSX"
@@ -2874,7 +2874,7 @@ $(SHL6TARGETN) : \
 .IF "$(SHL6NOCHECK)"==""
 $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) 
$(SHL6TARGETN)
 .ENDIF # "$(SHL6NOCHECK)"!=""
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(DISABLE_DYNLOADING)"=="TRUE"
 $(COMMAND_ECHO)$(AR) $(LIB6FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o 
$(SHL6OBJS)) $(shell cat /dev/null $(LIB6TARGET) $(SHL6LIBS) | sed 
s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
 $(COMMAND_ECHO)$(RANLIB) $@
 .ELSE  # "$(OS)"=="MACOSX"
@@ -3359,7 +3359,7 @@ $(SHL7TARGETN) : \
 .IF "$(SHL7NOCHECK)"==""
 $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) 
$(SHL7TARGETN)
 .ENDIF # "$(SHL7NOCHECK)"!=""
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(DISABLE_DYNLOADING)"=="TRUE"
 $(COMMAND_ECHO)$(AR) $(LIB7FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o 
$(SHL7OBJS)) $(shell cat /dev/null $(LIB7TARGET) $(SHL7LIBS) | sed 
s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g)
 $(COMMAND_ECHO)$(RANLIB) $@
 .ELSE  # "$(OS)"=="MACOSX"
@@ -3844,7 +3844,7 @@ $(SHL8TARGETN) : \
 .IF "$(SHL8NOCHECK)"==""
 $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) 
$(SHL8TARGETN)
 .ENDIF   

[Libreoffice-commits] .: libwpd/libwpd-0.9.5-ABI.patch libwpd/UnpackedTarball_wpd.mk

[Libreoffice Gerrit user]

 libwpd/UnpackedTarball_wpd.mk |   10 ++
 libwpd/libwpd-0.9.5-ABI.patch |   22 ++
 2 files changed, 32 insertions(+)

New commits:
commit 76d100d3bd78a10886a971c122da496e1a1b2c9e
Author: Fridrich Å trba 
Date:   Mon Sep 24 14:40:02 2012 +0200

Reverting libwpd 0.9.5 to 0.9.4 ABI

Change-Id: I7056c68f87c88086ef8024b8284a734823e2f808

diff --git a/libwpd/UnpackedTarball_wpd.mk b/libwpd/UnpackedTarball_wpd.mk
index d47f502..2383948 100644
--- a/libwpd/UnpackedTarball_wpd.mk
+++ b/libwpd/UnpackedTarball_wpd.mk
@@ -11,4 +11,14 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,wpd))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,wpd,$(WPD_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,wpd,0))
+
+wpd_patches :=
+# By mistake libwpd-0.9.5 changed ABI, change back
+wpd_patches += libwpd-0.9.5-ABI.patch
+
+$(eval $(call gb_UnpackedTarball_add_patches,wpd,\
+   $(foreach patch,$(wpd_patches),libwpd/$(patch)) \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/libwpd/libwpd-0.9.5-ABI.patch b/libwpd/libwpd-0.9.5-ABI.patch
new file mode 100755
index 000..4998721
--- /dev/null
+++ b/libwpd/libwpd-0.9.5-ABI.patch
@@ -0,0 +1,22 @@
+--- src/lib/WPXPropertyList.cpp2012-09-24 11:55:06.0 +0200
 src/lib/WPXPropertyList.cpp2012-09-24 14:25:10.401619900 +0200
+@@ -171,7 +171,7 @@
+   m_mapImpl->remove(name);
+ }
+ 
+-WPXPropertyList &WPXPropertyList::operator=(const WPXPropertyList &propList)
++const WPXPropertyList &WPXPropertyList::operator=(const WPXPropertyList 
&propList)
+ {
+   WPXPropertyList tmp(propList);
+   std::swap(m_mapImpl, tmp.m_mapImpl);
+--- src/lib/WPXPropertyList.h  2012-09-24 13:48:08.667113100 +0200
 src/lib/WPXPropertyList.h  2012-09-24 14:25:10.401619900 +0200
+@@ -50,7 +50,7 @@
+ 
+   void remove(const char *name);
+   const WPXProperty *operator[](const char *name) const;
+-  WPXPropertyList &operator=(const WPXPropertyList &propList);
++  const WPXPropertyList &operator=(const WPXPropertyList &propList);
+   void clear();
+ 
+   class Iter
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Change in core[libreoffice-3-6]: fdo#49655 fix RTF import of text in the middle of table defi...

[Noel Power (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/689

Approvals:
  Noel Power: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/689
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I34f1df7e171316a7d926179689627301860d492f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Miklos Vajna 
Gerrit-Reviewer: Noel Power 

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

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - writerfilter/source

[Libreoffice Gerrit user]

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 94ca682d70afc707c4c560e7a4a62546ae7c5669
Author: Miklos Vajna 
Date:   Fri Sep 21 19:14:01 2012 +0200

fdo#49655 fix RTF import of text in the middle of table definition

Usually table text comes after the \intbl control word, but it turns out
text is allowed earlier. Make sure such text is buffered, otherwise
we'll send paragraph / run properties to the dmapper in the middle of
table properties, which is obviously not allowed.

(cherry picked from commit af6b7d8ba30d395e5f4a17876526434cf0a06005)

Change-Id: I34f1df7e171316a7d926179689627301860d492f
Reviewed-on: https://gerrit.libreoffice.org/689
Reviewed-by: Noel Power 
Tested-by: Noel Power 

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 35d42c7..2d918f4 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -991,6 +991,14 @@ void RTFDocumentImpl::text(OUString& rString)
 return;
 }
 
+// Are we in the middle of the table definition? (No cell defs yet, but we 
already have some cell props.)
+if 
(m_aStates.top().aTableCellSprms.find(NS_ooxml::LN_CT_TcPrBase_vAlign).get() &&
+m_aStates.top().nCells == 0)
+{
+m_aTableBuffer.push_back(make_pair(BUFFER_UTEXT, 
RTFValue::Pointer_t(new RTFValue(rString;
+return;
+}
+
 checkFirstRun();
 checkNeedPap();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: using bool in rtl::OUStringBuffer::append

[Stephan Bergmann]

On 09/23/2012 10:49 PM, Markus Mohrhard wrote:

after I got tinderbox mail complaining about ambiguous overload for
rtl::OUStringBuffer::append(bool) I wanted to ask if we could add a
rtl::OUStringBuffer::append(bool) method or if there are reasons
against it. From what I can see it could in the end even share the
implementation with the sal_Bool variant just needs an own method in
rtl::OUStringBuffer.


I see no reason against adding such an overload.  (I would assume 
appending the string representation of a boolean is a feature rarely 
used, so this demand did not arise earlier.)


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

[Libreoffice-commits] .: helpcontent2/source

[Libreoffice Gerrit user]

 helpcontent2/source/text/sbasic/shared/03030101.xhp |   18 
 helpcontent2/source/text/sbasic/shared/03030102.xhp |8 ++-
 helpcontent2/source/text/sbasic/shared/03030103.xhp |   12 +++--
 helpcontent2/source/text/sbasic/shared/03030104.xhp |   12 +++--
 helpcontent2/source/text/sbasic/shared/03030105.xhp |   44 ++--
 helpcontent2/source/text/sbasic/shared/03030106.xhp |   12 +++--
 6 files changed, 62 insertions(+), 44 deletions(-)

New commits:
commit 7175bf45cdd40029d33213fe559525b185b6db78
Author: Andras Timar 
Date:   Mon Sep 24 14:02:05 2012 +0200

format a few Basic code examples

Change-Id: I6c1563eb7f1b3d8b353da963ab7521e17c57e24f

diff --git a/helpcontent2/source/text/sbasic/shared/03030101.xhp 
b/helpcontent2/source/text/sbasic/shared/03030101.xhp
index 0024d71..c088a10 100644
--- a/helpcontent2/source/text/sbasic/shared/03030101.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030101.xhp
@@ -66,13 +66,15 @@
 
 
 Example:
-Sub ExampleDateSerial
-Dim lDate as Long
-Dim sDate as String
-lDate = DateSerial(1964, 4, 9)
-sDate = DateSerial(1964, 4, 9)
-msgbox lDate REM returns 23476
-msgbox sDate REM returns 04/09/1964
-end sub
+
+Sub ExampleDateSerial
+Dim lDate As Long
+Dim sDate As String
+lDate = DateSerial(1964, 4, 9)
+sDate = DateSerial(1964, 4, 9)
+MsgBox lDate 
' returns 23476
+MsgBox sDate 
' returns 04/09/1964
+End Sub
+
 
 
diff --git a/helpcontent2/source/text/sbasic/shared/03030102.xhp 
b/helpcontent2/source/text/sbasic/shared/03030102.xhp
index 917e95e..78b8e8e 100644
--- a/helpcontent2/source/text/sbasic/shared/03030102.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030102.xhp
@@ -61,8 +61,10 @@
 
 
 Example:
-Sub ExampleDateValue
-msgbox DateValue("12/02/1997")
-end sub
+
+Sub ExampleDateValue
+MsgBox DateValue("12/02/2011")
+End Sub
+
 
 
diff --git a/helpcontent2/source/text/sbasic/shared/03030103.xhp 
b/helpcontent2/source/text/sbasic/shared/03030103.xhp
index 045f688..38c735e 100644
--- a/helpcontent2/source/text/sbasic/shared/03030103.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030103.xhp
@@ -54,13 +54,17 @@
 
 Number: A numeric expression that contains a serial date number 
from which you can determine the day of the month.
 This function is basically the opposite of the DateSerial function, 
returning the day of the month from a serial date number generated by the 
DateSerial or the DateValue function. For example, 
the expression
-Print Day (DateSerial(1994, 12, 20))
+
+Print Day (DateSerial(1994, 12, 20))
+
 returns the value 20.
 
 
 Example:
-sub ExampleDay
-Print "Day " & Day(DateSerial(1994, 12, 20)) & " of the 
month"
-end sub
+
+Sub ExampleDay
+Print "Day " & Day(DateSerial(1994, 12, 20)) & " of the 
month"
+End Sub
+
 
 
diff --git a/helpcontent2/source/text/sbasic/shared/03030104.xhp 
b/helpcontent2/source/text/sbasic/shared/03030104.xhp
index 989f0af..6addc46 100644
--- a/helpcontent2/source/text/sbasic/shared/03030104.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030104.xhp
@@ -54,13 +54,17 @@
 
 Number: Numeric expression that contains the serial date number 
that is used to determine the month of the year.
 This function is the opposite of the DateSerial 
function. It returns the month in the year that corresponds to the 
serial date that is generated by DateSerial or 
DateValue. For example, the expression
-Print Month(DateSerial(1994, 12, 20))
+
+Print Month(DateSerial(1994, 12, 20))
+
 returns the value 12.
 
 
 Example:
-Sub ExampleMonth
-MsgBox "" & Month(Now) ,64,"The current month"
-End sub
+
+Sub ExampleMonth
+MsgBox "" & Month(Now) ,64,"The current month"
+End Sub
+
 
 
diff --git a/helpcontent2/source/text/sbasic/shared/03030105.xhp 
b/helpcontent2/source/text/sbasic/shared/03030105.xhp
index aa9070c..10245b3 100644
--- a/helpcontent2/source/text/sbasic/shared/03030105.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03030105.xhp
@@ -57,26 +57,28 @@
 
 
 Example:
-Sub ExampleWeekDay
-Dim sDay As String
-REM Return and display the day of the week
-Select Case WeekDay( Now )
-case 1
-sDay="Sunday"
-case 2
-sDay="Monday"
-case 3
-sDay="Tuesday"
-case 4
-sDay="Wednesday"
-case 5
-sDay="Thursday"
-case 6
-sDay="Friday"
-case 7
-sDay="Saturday"
-End Select
-msgbox "" + sDay,64,"Today is"
-End Sub
+
+Sub ExampleWeekDay
+Dim sDay As String
+' Return And display the day of the week
+Select Case WeekDay( Now )
+Case 1
+sDay="Sunday"
+Case 2
+sDay="Monday"
+Case 3
+sDay="Tuesday"
+Case 4
+sDay="Wednesday"
+Case 5
+sDay="Thursday"
+Case 6
+sDay="Friday"
+Case 7
+sDay="Saturday"
+End Select
+MsgBox "" + sDay,64,"Today Is"
+End Sub
+
 
 
diff --git a/helpcontent2/source/text/sbasic/shared/03030106.xhp 
b/helpcontent2/source/text/sbasic/shared/03030106.xhp
index e1690c6..544c63f 100644
--- a/helpcontent2/source/text/sbasic/shared/030301

Re: Build error in offapi module

[Stephan Bergmann]

On 09/23/2012 05:46 AM, LOH KOK HOE wrote:

BTW, after finishing the make, and make dev-install. I got this message
at end of the build, may I know what does it mean by last statement?

*Trace from Terminal output*

***
Successful packaging process!
***
... creating log file log_OOO370_en-US.log
Sun Sep 23 11:37:50 2012 (00:13 min.)
Installer finished
...
...
linkoo finished, please don't forget to source ooenv before ./soffice.


You can ignore that, as the soffice script already sources in ooenv 
automatically when present.


Somebody who cares about linkoo (which I don't) would probably want to 
clean that message up.


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

[PATCH] Change in core[libreoffice-3-6]: rhbz#820283: fix crashes in DOCX table import:

[Michael Stahl (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/691

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/91/691/1

rhbz#820283: fix crashes in DOCX table import:

It is apparently possible that writerfilter creates a table with
irregular structure, where the lines have varying numbers of boxes in
them.  This may cause crashes on later editing operations, e.g.
when SwTable::NewInsertCol() is unable to find boxes covering a
particular column.  To prevent this, add missing boxes in
SwNodes::TextToTable().

Change-Id: I423821645baeaf55595e4933e1ab8fb89b2099f3
(cherry picked from commit 6d2e09db4a677068095b0bebd08fbbb96620d60c)
---
M sw/source/core/docnode/ndtbl.cxx
1 file changed, 14 insertions(+), 0 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/691
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I423821645baeaf55595e4933e1ab8fb89b2099f3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Stahl 

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

[Libreoffice-commits] .: 3 commits - sw/source

[Libreoffice Gerrit user]

 sw/source/core/docnode/ndtbl.cxx|  247 
 sw/source/core/table/swnewtable.cxx |   34 +++-
 2 files changed, 137 insertions(+), 144 deletions(-)

New commits:
commit 5e21ad82ef769b944927b498a196ec82476e17e8
Author: Michael Stahl 
Date:   Mon Sep 24 13:44:50 2012 +0200

de-duplicate SwNodes::TextToTable()

Change-Id: I8a61b67cb5bd1333c05f9a98c7af6e3ed05c8fd0

diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 22e44f5..cc7e88f 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -889,6 +889,112 @@ const SwTable* SwDoc::TextToTable( const 
SwInsertTableOptions& rInsTblOpts,
 return pNdTbl;
 }
 
+static void lcl_RemoveBreaks(SwCntntNode & rNode, SwTableFmt *const pTableFmt)
+{
+// delete old layout frames, new ones need to be created...
+rNode.DelFrms();
+
+if (!rNode.IsTxtNode())
+{
+return;
+}
+
+SwTxtNode & rTxtNode = static_cast(rNode);
+// remove PageBreaks/PageDesc/ColBreak
+SfxItemSet const* pSet = rTxtNode.GetpSwAttrSet();
+if (pSet)
+{
+const SfxPoolItem* pItem;
+if (SFX_ITEM_SET == pSet->GetItemState(RES_BREAK, false, &pItem))
+{
+if (pTableFmt)
+{
+pTableFmt->SetFmtAttr(*pItem);
+}
+rTxtNode.ResetAttr(RES_BREAK);
+pSet = rTxtNode.GetpSwAttrSet();
+}
+
+if (pSet
+&& (SFX_ITEM_SET == pSet->GetItemState(RES_PAGEDESC, false, 
&pItem))
+&& static_cast(pItem)->GetPageDesc())
+{
+if (pTableFmt)
+{
+pTableFmt->SetFmtAttr(*pItem);
+}
+rTxtNode.ResetAttr(RES_PAGEDESC);
+}
+}
+}
+
+static void
+lcl_BalanceTable(SwTable & rTable, size_t const nMaxBoxes,
+SwTableNode & rTblNd, SwTableBoxFmt & rBoxFmt, SwTxtFmtColl & rTxtColl,
+SwUndoTxtToTbl *const pUndo, std::vector *const pPositions)
+{
+// balance lines in table, insert empty boxes so all lines have the size
+for (size_t n = 0; n < rTable.GetTabLines().size(); ++n)
+{
+SwTableLine *const pCurrLine = rTable.GetTabLines()[ n ];
+size_t const nBoxes = pCurrLine->GetTabBoxes().size();
+if (nMaxBoxes != nBoxes)
+{
+rTblNd.GetNodes().InsBoxen(&rTblNd, pCurrLine, &rBoxFmt, &rTxtColl,
+0, nBoxes, nMaxBoxes - nBoxes);
+
+if (pUndo)
+{
+for (size_t i = nBoxes; i < nMaxBoxes; ++i)
+{
+pUndo->AddFillBox( *pCurrLine->GetTabBoxes()[i] );
+}
+}
+
+// if the first line is missing boxes, the width array is useless!
+if (!n && pPositions)
+{
+pPositions->clear();
+}
+}
+}
+}
+
+static void
+lcl_SetTableBoxWidths(SwTable & rTable, size_t const nMaxBoxes,
+SwTableBoxFmt & rBoxFmt, SwDoc & rDoc,
+std::vector *const pPositions)
+{
+if (pPositions && !pPositions->empty())
+{
+SwTableLines& rLns = rTable.GetTabLines();
+sal_uInt16 nLastPos = 0;
+for (size_t n = 0; n < pPositions->size(); ++n)
+{
+SwTableBoxFmt *pNewFmt = rDoc.MakeTableBoxFmt();
+pNewFmt->SetFmtAttr(
+SwFmtFrmSize(ATT_VAR_SIZE, (*pPositions)[n] - nLastPos));
+for (size_t nTmpLine = 0; nTmpLine < rLns.size(); ++nTmpLine)
+{
+//JP 24.06.98: have to do an Add here, because the BoxFormat is
+// still needed by the caller
+pNewFmt->Add( rLns[ nTmpLine ]->GetTabBoxes()[ n ] );
+}
+
+nLastPos = (*pPositions)[ n ];
+}
+
+// propagate size upwards from format, so the table gets the right size
+SAL_WARN_IF(rBoxFmt.GetDepends(), "sw.core",
+"who is still registered in the format?");
+rBoxFmt.SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, nLastPos ));
+}
+else
+{
+rBoxFmt.SetFmtAttr(SwFmtFrmSize(ATT_VAR_SIZE, USHRT_MAX / nMaxBoxes));
+}
+}
+
 SwTableNode* SwNodes::TextToTable( const SwNodeRange& rRange, sal_Unicode cCh,
 SwTableFmt* pTblFmt,
 SwTableLineFmt* pLineFmt,
@@ -945,31 +1051,7 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange& 
rRange, sal_Unicode cCh,
 }
 }
 
-// die alten Frames loeschen, es werden neue erzeugt
-pTxtNd->DelFrms();
-
-// PageBreaks/PageDesc/ColBreak rausschmeissen.
-const SfxItemSet* pSet = pTxtNd->GetpSwAttrSet();
-if( pSet )
-{
-const SfxPoolItem* pItem;
-if( SFX_ITEM_SET == pSet->GetItemState( RES_BREAK, sal_False, 
&pItem ) )
-{
-if( !nLines )
-pTblFmt->SetFmtAttr( *

[Libreoffice-commits] .: libwpd/ExternalPackage_libwpd.mk

[Libreoffice Gerrit user]

 libwpd/ExternalPackage_libwpd.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c803f693163c327b7a2fdfab0897a4f70fe3e802
Author: Fridrich Å trba 
Date:   Mon Sep 24 13:37:29 2012 +0200

Fix windows build of libwpd

Change-Id: I22db3f6bf435e54f0d264b18bd6b53c784756fe8

diff --git a/libwpd/ExternalPackage_libwpd.mk b/libwpd/ExternalPackage_libwpd.mk
index 138f7f0..053e107 100644
--- a/libwpd/ExternalPackage_libwpd.mk
+++ b/libwpd/ExternalPackage_libwpd.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Package_Package,libwpd,$(call 
gb_UnpackedTarball_get_dir,wpd)))
 $(eval $(call gb_Package_use_external_project,libwpd,libwpd))
 
 ifeq ($(OS)$(COM),WNTMSC)
-$(eval $(call 
gb_ExternalPackage_add_file,libwpd,lib/libwpd-0.9.lib,build/win32/Release/libwpd-0.9.lib))
+$(eval $(call 
gb_ExternalPackage_add_file,libwpd,lib/libwpd-0.9.lib,build/win32/Release/lib/libwpd-0.9.lib))
 else
 $(eval $(call 
gb_ExternalPackage_add_file,libwpd,lib/libwpd-0.9.a,src/lib/.libs/libwpd-0.9.a))
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in libwpd/ExternalPackage_libwpd.mk libwpd/libwpd-0.9.4-gcc-osldebug2-warning.patch libwpd/libwpd-0.9.4-msvc-warning.patch libwpd/libwpd-0.9.4.patch libwpd/libwpd-0.

[Libreoffice Gerrit user]

 RepositoryExternal.mk   |   21 ++
 configure.in|2 
 libwpd/ExternalPackage_libwpd.mk|   10 +
 libwpd/StaticLibrary_wpd.mk |  204 +++-
 libwpd/UnpackedTarball_wpd.mk   |   16 -
 libwpd/libwpd-0.9.4-gcc-osldebug2-warning.patch |   65 ---
 libwpd/libwpd-0.9.4-msvc-warning.patch  |   24 --
 libwpd/libwpd-0.9.4-warning.patch   |   74 
 libwpd/libwpd-0.9.4.patch   |   18 --
 9 files changed, 56 insertions(+), 378 deletions(-)

New commits:
commit 4425db6b67f6cb60a54b4c82dad87095cba62e7b
Author: Fridrich Å trba 
Date:   Mon Sep 24 13:17:45 2012 +0200

Uploading the new libwpd 0.9.5

Change-Id: I0949b85f7c2ffbb5c00cce24949b21cc616135db

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 618f62b..914b97b 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1020,17 +1020,34 @@ endef
 
 else # !SYSTEM_LIBWPD
 
+ifeq ($(OS)$(COM),WNTMSC)
+
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
-   wpdlib \
+   libwpd-0.9 \
 ))
 
 define gb_LinkTarget__use_wpd
 $(call gb_LinkTarget_use_static_libraries,$(1),\
-   wpdlib \
+   libwpd-0.9 \
 )
 
 endef
 
+else # !WNTMSC
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+   wpd-0.9 \
+))
+
+define gb_LinkTarget__use_wpd
+$(call gb_LinkTarget_use_static_libraries,$(1),\
+   wpd-0.9 \
+)
+
+endef
+
+endif # WNTMSC
+
 endif # SYSTEM_LIBWPD
 
 
diff --git a/configure.in b/configure.in
index 16b81fc..02ad841 100644
--- a/configure.in
+++ b/configure.in
@@ -6780,7 +6780,7 @@ elif test $_os = iOS; then
 else
 AC_MSG_RESULT([internal])
 SYSTEM_LIBWPD=NO
-WPD_TARBALL=c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2
+WPD_TARBALL=9a48f87fe205a5418aaa1a564c51e992-libwpd-0.9.5.tar.bz2
 fi
 AC_SUBST(SYSTEM_LIBWPD)
 AC_SUBST(WPD_CFLAGS)
diff --git a/libwpd/ExternalPackage_libwpd.mk b/libwpd/ExternalPackage_libwpd.mk
index 9e2bd20..138f7f0 100644
--- a/libwpd/ExternalPackage_libwpd.mk
+++ b/libwpd/ExternalPackage_libwpd.mk
@@ -26,4 +26,14 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,libwpd_inc,inc/external/libw
src/lib/WPXStreamImplementation.h \
 ))
 
+$(eval $(call gb_Package_Package,libwpd,$(call 
gb_UnpackedTarball_get_dir,wpd)))
+
+$(eval $(call gb_Package_use_external_project,libwpd,libwpd))
+
+ifeq ($(OS)$(COM),WNTMSC)
+$(eval $(call 
gb_ExternalPackage_add_file,libwpd,lib/libwpd-0.9.lib,build/win32/Release/libwpd-0.9.lib))
+else
+$(eval $(call 
gb_ExternalPackage_add_file,libwpd,lib/libwpd-0.9.a,src/lib/.libs/libwpd-0.9.a))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/libwpd/StaticLibrary_wpd.mk b/libwpd/StaticLibrary_wpd.mk
index 9464225..b9108c5 100644
--- a/libwpd/StaticLibrary_wpd.mk
+++ b/libwpd/StaticLibrary_wpd.mk
@@ -7,187 +7,35 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_StaticLibrary_StaticLibrary,wpdlib))
+$(eval $(call gb_ExternalProject_ExternalProject,libwpd))
 
-$(eval $(call gb_StaticLibrary_use_unpacked,wpdlib,wpd))
+$(eval $(call gb_ExternalProject_use_unpacked,libwpd,wpd))
 
-$(eval $(call gb_StaticLibrary_use_package,wpdlib,libwpd_inc))
+$(eval $(call gb_ExternalProject_register_targets,libwpd,\
+   build \
+))
 
-$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,wpdlib,cpp))
+ifeq ($(OS)$(COM),WNTMSC)
 
-$(eval $(call gb_StaticLibrary_add_generated_exception_objects,wpdlib,\
-   UnpackedTarball/wpd/src/lib/libwpd_internal \
-   UnpackedTarball/wpd/src/lib/libwpd_math \
-   UnpackedTarball/wpd/src/lib/WP1BottomMarginGroup \
-   UnpackedTarball/wpd/src/lib/WP1CenterTextGroup \
-   UnpackedTarball/wpd/src/lib/WP1ContentListener \
-   UnpackedTarball/wpd/src/lib/WP1ExtendedCharacterGroup \
-   UnpackedTarball/wpd/src/lib/WP1FileStructure \
-   UnpackedTarball/wpd/src/lib/WP1FixedLengthGroup \
-   UnpackedTarball/wpd/src/lib/WP1FlushRightGroup \
-   UnpackedTarball/wpd/src/lib/WP1FontIdGroup \
-   UnpackedTarball/wpd/src/lib/WP1FootnoteEndnoteGroup \
-   UnpackedTarball/wpd/src/lib/WP1HeaderFooterGroup \
-   UnpackedTarball/wpd/src/lib/WP1Heuristics \
-   UnpackedTarball/wpd/src/lib/WP1JustificationGroup \
-   UnpackedTarball/wpd/src/lib/WP1LeftIndentGroup \
-   UnpackedTarball/wpd/src/lib/WP1LeftRightIndentGroup \
-   UnpackedTarball/wpd/src/lib/WP1Listener \
-   UnpackedTarball/wpd/src/lib/WP1MarginReleaseGroup \
-   UnpackedTarball/wpd/src/lib/WP1MarginResetGroup \
-   UnpackedTarball/wpd/src/lib/WP1Parser \
-   UnpackedTarball/wpd/src/lib/WP1Part \
-   UnpackedTarball/wpd/src/lib/WP1PictureGroup \
-   UnpackedTarball/wpd/src/lib/WP1PointSizeGroup \
-   UnpackedTarball/wpd/src/lib/WP1SetTabsGroup \
-   UnpackedTarball/wpd/src/lib/WP1SpacingResetGroup \
-   UnpackedTarball/wpd/src/lib/WP1Styl

[PUSHED] refactor code with

[Noel Power (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/677

Approvals:
  Noel Power: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/677
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I774492928a909a0768ebcdc9cb56651146659351
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Takeshi Abe 
Gerrit-Reviewer: Noel Power 

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

[Libreoffice-commits] .: sw/source

[Libreoffice Gerrit user]

 sw/source/core/access/accmap.cxx   |   10 --
 sw/source/core/access/acctable.cxx |   15 ++-
 2 files changed, 6 insertions(+), 19 deletions(-)

New commits:
commit 5a23e1c62898ee432858a11733d1765a2075948c
Author: Takeshi Abe 
Date:   Sun Sep 23 23:39:56 2012 +0900

refactor code with 

Change-Id: I774492928a909a0768ebcdc9cb56651146659351
Reviewed-on: https://gerrit.libreoffice.org/677
Reviewed-by: Noel Power 
Tested-by: Noel Power 

diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index f47346c..a96de1a 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -32,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -70,6 +71,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
@@ -2283,12 +2285,8 @@ void SwAccessibleMap::FireEvents()
 if( mpEvents )
 {
 mpEvents->SetFiring();
-SwAccessibleEventList_Impl::iterator aIter = mpEvents->begin();
-while( aIter != mpEvents->end() )
-{
-FireEvent( *aIter );
-++aIter;
-}
+::std::for_each(mpEvents->begin(), mpEvents->end(),
+boost::bind(&SwAccessibleMap::FireEvent, this, 
_1));
 
 delete mpEventMap;
 mpEventMap = 0;
diff --git a/sw/source/core/access/acctable.cxx 
b/sw/source/core/access/acctable.cxx
index 9c39db2..fd5d984 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -409,19 +410,7 @@ sal_Bool SwAccessibleTableData_Impl::CompareExtents(
 if( maExtents.size() != rCmp.maExtents.size() )
 return sal_False;
 
-Int32PairList_Impl::const_iterator aIter( maExtents.begin() );
-Int32PairList_Impl::const_iterator aEndIter( maExtents.end() );
-Int32PairList_Impl::const_iterator aCmpIter( rCmp.maExtents.begin() );
-while( aIter != aEndIter )
-{
-if( *aIter != *aCmpIter )
-return sal_False;
-
-++aIter;
-++aCmpIter;
-}
-
-return sal_True;
+return ::std::equal(maExtents.begin(), maExtents.end(), 
rCmp.maExtents.begin()) ? sal_True : sal_False;
 }
 
 SwAccessibleTableData_Impl::SwAccessibleTableData_Impl( SwAccessibleMap& 
rAccMap,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] ::rtl::OUString to OUString in basctl

[Noel Power (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/678

Approvals:
  Noel Power: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/678
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3fc3d463fbaefe31b3541502c9f3dfbd4d1db4f9
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ricardo Montania 
Gerrit-Reviewer: Noel Power 

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

[Libreoffice-commits] .: basctl/source

[Libreoffice Gerrit user]

 basctl/source/accessibility/accessibledialogcontrolshape.cxx |   44 +--
 basctl/source/accessibility/accessibledialogwindow.cxx   |   36 -
 2 files changed, 40 insertions(+), 40 deletions(-)

New commits:
commit 57d2f9b7744eea76496af1f4101398ec4f6caf70
Author: Ricardo Montania 
Date:   Sun Sep 23 15:05:17 2012 -0300

::rtl::OUString to OUString in basctl

Change-Id: I3fc3d463fbaefe31b3541502c9f3dfbd4d1db4f9
Reviewed-on: https://gerrit.libreoffice.org/678
Reviewed-by: Noel Power 
Tested-by: Noel Power 

diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx 
b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
index 6e720ea..afc4558 100644
--- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
+++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
@@ -59,7 +59,7 @@ AccessibleDialogControlShape::AccessibleDialogControlShape 
(DialogWindow* pDialo
 m_xControlModel = Reference< XPropertySet >( 
m_pDlgEdObj->GetUnoControlModel(), UNO_QUERY );
 
 if ( m_xControlModel.is() )
-m_xControlModel->addPropertyChangeListener( ::rtl::OUString(), 
static_cast< beans::XPropertyChangeListener* >( this ) );
+m_xControlModel->addPropertyChangeListener( OUString(), static_cast< 
beans::XPropertyChangeListener* >( this ) );
 
 m_bFocused = IsFocused();
 m_bSelected = IsSelected();
@@ -71,7 +71,7 @@ AccessibleDialogControlShape::AccessibleDialogControlShape 
(DialogWindow* pDialo
 AccessibleDialogControlShape::~AccessibleDialogControlShape()
 {
 if ( m_xControlModel.is() )
-m_xControlModel->removePropertyChangeListener( ::rtl::OUString(), 
static_cast< beans::XPropertyChangeListener* >( this ) );
+m_xControlModel->removePropertyChangeListener( OUString(), 
static_cast< beans::XPropertyChangeListener* >( this ) );
 
 delete m_pExternalLock;
 m_pExternalLock = NULL;
@@ -191,15 +191,15 @@ Window* AccessibleDialogControlShape::GetWindow() const
 
 // 
-
 
-::rtl::OUString AccessibleDialogControlShape::GetModelStringProperty( const 
sal_Char* pPropertyName )
+OUString AccessibleDialogControlShape::GetModelStringProperty( const sal_Char* 
pPropertyName )
 {
-::rtl::OUString sReturn;
+OUString sReturn;
 
 try
 {
 if ( m_xControlModel.is() )
 {
-::rtl::OUString sPropertyName( ::rtl::OUString::createFromAscii( 
pPropertyName ) );
+OUString sPropertyName( OUString::createFromAscii( pPropertyName ) 
);
 Reference< XPropertySetInfo > xInfo = 
m_xControlModel->getPropertySetInfo();
 if ( xInfo.is() && xInfo->hasPropertyByName( sPropertyName ) )
 m_xControlModel->getPropertyValue( sPropertyName ) >>= sReturn;
@@ -269,7 +269,7 @@ void AccessibleDialogControlShape::disposing()
 m_pDlgEdObj = NULL;
 
 if ( m_xControlModel.is() )
-m_xControlModel->removePropertyChangeListener( ::rtl::OUString(), 
static_cast< beans::XPropertyChangeListener* >( this ) );
+m_xControlModel->removePropertyChangeListener( OUString(), 
static_cast< beans::XPropertyChangeListener* >( this ) );
 m_xControlModel.clear();
 }
 
@@ -280,7 +280,7 @@ void AccessibleDialogControlShape::disposing()
 void AccessibleDialogControlShape::disposing( const lang::EventObject& ) throw 
(RuntimeException)
 {
 if ( m_xControlModel.is() )
-m_xControlModel->removePropertyChangeListener( ::rtl::OUString(), 
static_cast< beans::XPropertyChangeListener* >( this ) );
+m_xControlModel->removePropertyChangeListener( OUString(), 
static_cast< beans::XPropertyChangeListener* >( this ) );
 m_xControlModel.clear();
 }
 
@@ -313,18 +313,18 @@ void AccessibleDialogControlShape::propertyChange( const 
beans::PropertyChangeEv
 // XServiceInfo
 // 
-
 
-::rtl::OUString AccessibleDialogControlShape::getImplementationName() throw 
(RuntimeException)
+OUString AccessibleDialogControlShape::getImplementationName() throw 
(RuntimeException)
 {
-return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
"com.sun.star.comp.basctl.AccessibleShape" ));
+return OUString( "com.sun.star.comp.basctl.AccessibleShape" );
 }
 
 // 
-
 
-sal_Bool AccessibleDialogControlShape::supportsService( const ::rtl::OUString& 
rServiceName ) throw (RuntimeException)
+sal_Bool AccessibleDialogControlShape::supportsService( const OUString& 
rServiceName ) throw (RuntimeException)
 {
-Sequence< ::rtl::OUString > aNames( getSupportedServiceNames() );
-const ::rtl::OUString* pNames = aNames.getConstArray();
-const ::rtl::OUString* pEnd = pNames + aNames.getLength();
+Sequence< OUString > aNames( getSupportedServiceNames() );
+const OUString* pNames = aNames.getConstArray();
+const OU

[PUSHED] Remove unused code

[Noel Power (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/682

Approvals:
  Noel Power: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/682
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I31edd26d8ee7934b47ed7bf5ec6c07e1b8c5c5e9
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Olivier Hallot 
Gerrit-Reviewer: Noel Power 

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

[Libreoffice-commits] .: sd/source

[Libreoffice Gerrit user]

 sd/source/ui/dlg/RemoteDialogClientBox.cxx |  194 -
 1 file changed, 194 deletions(-)

New commits:
commit 56cb4b705e63addcc550d53a6f70c1c871d47472
Author: Olivier Hallot 
Date:   Sun Sep 23 18:18:38 2012 -0300

Remove unused code

According to unusedcode.easy

Change-Id: I31edd26d8ee7934b47ed7bf5ec6c07e1b8c5c5e9
Reviewed-on: https://gerrit.libreoffice.org/682
Reviewed-by: Noel Power 
Tested-by: Noel Power 

diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx 
b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index c809ecb..05b1432 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -146,17 +146,6 @@ ClientBox::~ClientBox()
 m_xRemoveListener.clear();
 }
 
-
-//--
-void ClientBox::checkIndex( sal_Int32 nIndex ) const
-{
-if ( nIndex < 0 )
-throw lang::IllegalArgumentException( "The list index starts with 
0",0, 0 );
-if ( static_cast< sal_uInt32 >( nIndex ) >= m_vEntries.size())
-throw lang::IllegalArgumentException( "There is no element at the 
provided position."
-"The position exceeds the number of available list entries",0, 0 );
-}
-
 
//--
 // Title + description
 void ClientBox::CalcActiveHeight( const long nPos )
@@ -191,12 +180,6 @@ void ClientBox::CalcActiveHeight( const long nPos )
 }
 
 
//--
-const Size ClientBox::GetMinOutputSizePixel() const
-{
-return Size( 200, 80 );
-}
-
-//--
 Rectangle ClientBox::GetEntryRect( const long nPos ) const
 {
 const ::osl::MutexGuard aGuard( m_entriesMutex );
@@ -719,183 +702,6 @@ long ClientBox::addEntry( ClientInfo* pClientInfo )
 return nPos;
 }
 
-//--
-void ClientBox::updateEntry( const ClientInfo* pClientInfo )
-{
-(void) pClientInfo;
-// typedef std::vector< TClientBoxEntry >::iterator ITER;
-// for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); 
++iIndex )
-// {
-// if ( (*iIndex)->m_xPackage == xPackage )
-// {
-// PackageState eState = m_pManager->getPackageState( xPackage );
-// (*iIndex)->m_bHasOptions = m_pManager->supportsOptions( 
xPackage );
-// (*iIndex)->m_eState = eState;
-// (*iIndex)->m_sTitle = xPackage->getDisplayName();
-// (*iIndex)->m_sVersion = xPackage->getVersion();
-// (*iIndex)->m_sDescription = xPackage->getDescription();
-//
-// if ( eState == REGISTERED )
-// (*iIndex)->m_bMissingLic = false;
-//
-// if ( eState == AMBIGUOUS )
-// (*iIndex)->m_sErrorText = DialogHelper::getResourceString( 
RID_STR_ERROR_UNKNOWN_STATUS );
-// else if ( ! (*iIndex)->m_bMissingLic )
-// (*iIndex)->m_sErrorText = String();
-//
-// if ( IsReallyVisible() )
-// Invalidate();
-// break;
-// }
-// }
-}
-
-//--
-void ClientBox::removeEntry( const ClientInfo* pClientInfo )
-{
-(void) pClientInfo;
-// if ( ! m_bInDelete )
-// {
-// ::osl::ClearableMutexGuard aGuard( m_entriesMutex );
-//
-// typedef std::vector< TClientBoxEntry >::iterator ITER;
-//
-// for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); 
++iIndex )
-// {
-// if ( (*iIndex)->m_xPackage == xPackage )
-// {
-// long nPos = iIndex - m_vEntries.begin();
-//
-// // Entries mustn't removed here, because they contain a 
hyperlink control
-// // which can only be deleted when the thread has the solar 
mutex. Therefor
-// // the entry will be moved into the m_vRemovedEntries list 
which will be
-// // cleared on the next paint event
-// m_vRemovedEntries.push_back( *iIndex );
-// m_vEntries.erase( iIndex );
-//
-// m_bNeedsRecalc = true;
-//
-// if ( IsReallyVisible() )
-// Invalidate();
-//
-// if ( m_bHasActive )
-// {
-// if ( nPos < m_nActive )
-// m_nActive -= 1;
-// else if ( ( nPos == m_nActive ) &&
-//   ( nPos == (long) m_vEntries.size() ) )
-// m_nActive -= 1;
-//
-// m_bHasActive = false;
-// //clear before calling out of this method
-// aGuard.clear();
-// sel

[PUSHED] pyfax: Added by mistake

[Michael Meeks (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/684

Approvals:
  Michael Meeks: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/684
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I484d64aab55aef2992d6c2f656cab68f398936d2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Xisco Faulí 
Gerrit-Reviewer: Michael Meeks 

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

[PUSHED] pywizards: add a name textbox to the filepicker

[Michael Meeks (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/688

Approvals:
  Michael Meeks: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/688
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I482466e7c006a38a1eab543872101c029d5e2d65
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Xisco Faulí 
Gerrit-Reviewer: Michael Meeks 

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

[PUSHED] pyfax: Use relative imports so we can call the wizard remote...

[Michael Meeks (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/683

Approvals:
  Michael Meeks: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/683
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8ed98ff5125caf28680f94865ab2fe122f124182
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Xisco Faulí 
Gerrit-Reviewer: Michael Meeks 

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

[Libreoffice-commits] .: wizards/com

[Libreoffice Gerrit user]

 wizards/com/sun/star/wizards/common/SystemDialog.py |   27 +---
 wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py |4 +-
 2 files changed, 12 insertions(+), 19 deletions(-)

New commits:
commit ad895bc43aafc1589ed0ca239fb0c966dd0589eb
Author: Xisco 
Date:   Sun Sep 23 23:07:09 2012 +0200

pywizards: add a name textbox to the filepicker

Now it's possible to change the name of the file that is going to be saved

Change-Id: I482466e7c006a38a1eab543872101c029d5e2d65
Reviewed-on: https://gerrit.libreoffice.org/688
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/wizards/com/sun/star/wizards/common/SystemDialog.py 
b/wizards/com/sun/star/wizards/common/SystemDialog.py
index 21756fc..3a89f98 100644
--- a/wizards/com/sun/star/wizards/common/SystemDialog.py
+++ b/wizards/com/sun/star/wizards/common/SystemDialog.py
@@ -15,14 +15,15 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-import uno
 import traceback
 from .Configuration import Configuration
 from .Desktop import Desktop
 from .Helper import Helper
 
-from com.sun.star.ui.dialogs.TemplateDescription import 
FILESAVE_AUTOEXTENSION, FILEOPEN_SIMPLE
-from com.sun.star.ui.dialogs.ExtendedFilePickerElementIds import 
CHECKBOX_AUTOEXTENSION
+from com.sun.star.ui.dialogs.TemplateDescription import \
+FILESAVE_AUTOEXTENSION, FILEOPEN_SIMPLE
+from com.sun.star.ui.dialogs.ExtendedFilePickerElementIds import \
+CHECKBOX_AUTOEXTENSION
 from com.sun.star.awt import WindowDescriptor
 from com.sun.star.awt.WindowClass import MODALTOP
 from com.sun.star.lang import IllegalArgumentException
@@ -30,25 +31,24 @@ from com.sun.star.awt.VclWindowPeerAttribute import OK
 
 class SystemDialog(object):
 
-'''
-@param xMSF
-@param ServiceName
-@param type  according to com.sun.star.ui.dialogs.TemplateDescription
-'''
-
 def __init__(self, xMSF, ServiceName, Type):
 try:
 self.xMSF = xMSF
 self.systemDialog = xMSF.createInstance(ServiceName)
 self.xStringSubstitution = self.createStringSubstitution(xMSF)
 
+   # Add a name textbox to the filepicker
+if self.systemDialog is not None:
+   self.systemDialog.initialize((Type,))
+
 except Exception, exception:
 traceback.print_exc()
 
 @classmethod
 def createStoreDialog(self, xmsf):
 return SystemDialog(
-xmsf, "com.sun.star.ui.dialogs.FilePicker",FILESAVE_AUTOEXTENSION)
+xmsf, "com.sun.star.ui.dialogs.FilePicker",
+FILESAVE_AUTOEXTENSION)
 
 @classmethod
 def createOpenDialog(self, xmsf):
@@ -73,13 +73,6 @@ class SystemDialog(object):
 traceback.print_exc()
 return path
 
-'''
-@param displayDir
-@param defaultName
-given url to a local path.
-@return
-'''
-
 def callStoreDialog(self, displayDir, defaultName, sDocuType=None):
 if sDocuType is not None:
 self.addFilterToDialog(defaultName[-3:], sDocuType, True)
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py 
b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
index 980a28f..a475fa5 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
@@ -173,8 +173,8 @@ class FaxWizardDialogImpl(FaxWizardDialog):
 self.myFaxDoc.keepTypeFrame = \
 (self.chkUseCommunicationType.State is not 0)
 self.myFaxDoc.killEmptyFrames()
-self.bSaveSuccess = OfficeDocument.store(self.xMSF, 
TextDocument.xTextDocument,
-self.sPath, "writer8_template")
+self.bSaveSuccess = OfficeDocument.store(self.xMSF,
+   TextDocument.xTextDocument, self.sPath, 
"writer8_template")
 if self.bSaveSuccess:
 self.saveConfiguration()
 xIH = self.xMSF.createInstance( \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: wizards/com

[Libreoffice Gerrit user]

 wizards/com/sun/star/wizards/RemoteWebWizard |   15 
 wizards/com/sun/star/wizards/common/ConfigGroup.py   |4 -
 wizards/com/sun/star/wizards/common/ConfigSet.py |4 -
 wizards/com/sun/star/wizards/common/Configuration.py |5 -
 wizards/com/sun/star/wizards/common/Desktop.py   |2 
 wizards/com/sun/star/wizards/common/FileAccess.py|2 
 wizards/com/sun/star/wizards/common/Helper.py|2 
 wizards/com/sun/star/wizards/common/NumberFormatter.py   |2 
 wizards/com/sun/star/wizards/common/PropertySetHelper.py |4 -
 wizards/com/sun/star/wizards/common/Resource.py  |4 -
 wizards/com/sun/star/wizards/common/SystemDialog.py  |6 -
 wizards/com/sun/star/wizards/document/OfficeDocument.py  |4 -
 wizards/com/sun/star/wizards/fax/CGFax.py|4 -
 wizards/com/sun/star/wizards/fax/CGFaxWizard.py  |6 -
 wizards/com/sun/star/wizards/fax/CallWizard.py   |   37 +--
 wizards/com/sun/star/wizards/fax/FaxDocument.py  |7 --
 wizards/com/sun/star/wizards/fax/FaxWizardDialog.py  |7 --
 wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py |3 
 wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py  |   27 +++-
 wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py |2 
 wizards/com/sun/star/wizards/fax/__init__.py |3 
 wizards/com/sun/star/wizards/remote.py   |8 ++
 wizards/com/sun/star/wizards/text/TextDocument.py|   12 +--
 wizards/com/sun/star/wizards/text/TextFieldHandler.py|2 
 wizards/com/sun/star/wizards/text/TextSectionHandler.py  |2 
 wizards/com/sun/star/wizards/ui/ImageList.py |8 +-
 wizards/com/sun/star/wizards/ui/PathSelection.py |6 -
 wizards/com/sun/star/wizards/ui/PeerConfig.py|2 
 wizards/com/sun/star/wizards/ui/UnoDialog.py |7 --
 wizards/com/sun/star/wizards/ui/UnoDialog2.py|9 +-
 wizards/com/sun/star/wizards/ui/WizardDialog.py  |   13 +--
 wizards/com/sun/star/wizards/ui/event/CommonListener.py  |4 -
 wizards/com/sun/star/wizards/ui/event/DataAware.py   |4 -
 wizards/com/sun/star/wizards/ui/event/ListModelBinder.py |2 
 wizards/com/sun/star/wizards/ui/event/RadioDataAware.py  |   11 ---
 wizards/com/sun/star/wizards/ui/event/UnoDataAware.py|6 -
 36 files changed, 109 insertions(+), 137 deletions(-)

New commits:
commit 293a144126b13a78aef01bd72586432056b8ca80
Author: Xisco Fauli 
Date:   Sat Sep 22 19:16:38 2012 +0200

pyfax: Use relative imports so we can call the wizard remotely

Change-Id: I8ed98ff5125caf28680f94865ab2fe122f124182
Reviewed-on: https://gerrit.libreoffice.org/683
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/wizards/com/sun/star/wizards/RemoteWebWizard 
b/wizards/com/sun/star/wizards/RemoteWebWizard
deleted file mode 100755
index d9916a0..000
--- a/wizards/com/sun/star/wizards/RemoteWebWizard
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env python
-#
-# 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/.
-#
-
-from web.WWD_Events import WWD_Events
-import sys
-
-if __name__ == "__main__":
-
-WWD_Events.main(sys.argv)
diff --git a/wizards/com/sun/star/wizards/common/ConfigGroup.py 
b/wizards/com/sun/star/wizards/common/ConfigGroup.py
index bb5d95f..0491c81 100644
--- a/wizards/com/sun/star/wizards/common/ConfigGroup.py
+++ b/wizards/com/sun/star/wizards/common/ConfigGroup.py
@@ -17,8 +17,8 @@
 #
 import traceback
 import inspect
-from wizards.common.ConfigNode import *
-from wizards.common.Configuration import Configuration
+from .ConfigNode import *
+from .Configuration import Configuration
 
 class ConfigGroup(ConfigNode):
 
diff --git a/wizards/com/sun/star/wizards/common/ConfigSet.py 
b/wizards/com/sun/star/wizards/common/ConfigSet.py
index 8ba6635..b5ff836 100644
--- a/wizards/com/sun/star/wizards/common/ConfigSet.py
+++ b/wizards/com/sun/star/wizards/common/ConfigSet.py
@@ -16,8 +16,8 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 import traceback
-from wizards.common.ConfigNode import *
-from wizards.common.Configuration import Configuration
+from .ConfigNode import *
+from .Configuration import Configuration
 
 class ConfigSet(ConfigNode):
 '''
diff --git a/wizards/com/sun/star/wizards/common/Configuration.py 
b/wizards/com/sun/star/wizards/common/Configuration.py
index cd8a018..d76cad4 100644
--- a/wizards/com/sun/star/wizards/common/Configuration.py
+++ b/wizards/com/sun/star/wizards/common/Configuration.py
@@ -15,10 +

[Libreoffice-commits] .:

[Libreoffice Gerrit user]

 0 files changed

New commits:
commit cf939a858b625982ee5c361b88c5121648859dd0
Author: Xisco Fauli 
Date:   Sat Sep 22 19:18:21 2012 +0200

pyfax: Added by mistake

Change-Id: I484d64aab55aef2992d6c2f656cab68f398936d2
Reviewed-on: https://gerrit.libreoffice.org/684
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[REVIEW 3-6] speed up packaging on Windows significantly

[Andras Timar]

Hi,

Until now we merged merge modules into all temporary language msi
files, that were used only for creation of language transforms. It was
a big waste of time, now we only merge once, after creating language
transforms. It has been already pushed to master, backport for
libreoffice-3-6 is attached.

Please review.

By the way, a new NYTProf v4 based analysis of make_installer.pl has
been published to http://people.freedesktop.org/~timar/nytprof/ if
someone is interested.

Best regards,
Andras


0001-fdo-54276-speed-up-packaging-on-Windows-significantl.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Change in core[libreoffice-3-6]: rhbz#836827: SQLFeatureNotSupportedException only in Java 6

[Noel Power (via Code Review)]

Hi,

Thank you for your patch! :-)  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/690

Approvals:
  Noel Power: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/690
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id1fddc9cbdd8c88cd68fb5877ec59fe8d61e1562
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Stephan Bergmann 
Gerrit-Reviewer: Noel Power 

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

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - hsqldb/patches

[Libreoffice Gerrit user]

 hsqldb/patches/jdbc-4.1.patch |   14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 48ce1376909e0d122df041f8b3dd0a49f576c15c
Author: Stephan Bergmann 
Date:   Mon Sep 24 09:35:56 2012 +0200

rhbz#836827: SQLFeatureNotSupportedException only in Java 6

...so if the patched hsqldb.jar is compiled with Java 7, it creates 
instances of
SQLFeatureNotSupportedException, and when at LO runtime a Java 5 gcj is 
used,
loading the relevant hsqldb.jar classes will fail with a 
NoClassDefFoundError
caused by a ClassNotFoundException.

Adding java.sql.Driver.getParentLogger in Java 7 was an incompatible 
change, but
it appears that the java.sql framework is prepared to handle old 
implementations
(for which the JVM will throw AbstractMethodError), so it appears that it 
works
to fake that AbstractMethodError here.

Change-Id: Id1fddc9cbdd8c88cd68fb5877ec59fe8d61e1562
(cherry picked from commit 93a0d9eee0f4dced348b040961f44f977e9504a7)
Reviewed-on: https://gerrit.libreoffice.org/690
Reviewed-by: Noel Power 
Tested-by: Noel Power 

diff --git a/hsqldb/patches/jdbc-4.1.patch b/hsqldb/patches/jdbc-4.1.patch
index 4c4eb85..68180a2 100644
--- a/hsqldb/patches/jdbc-4.1.patch
+++ b/hsqldb/patches/jdbc-4.1.patch
@@ -231,7 +231,7 @@
  // boucherb@users 20040411 - doc 1.7.2 - javadoc updates toward 1.7.2 final
  
  /**
-@@ -323,4 +328,12 @@
+@@ -323,4 +328,15 @@
  }
  
  //#endif JAVA6
@@ -239,7 +239,10 @@
 +//#ifdef JAVA7
 +public Logger getParentLogger() throws SQLFeatureNotSupportedException
 +{
-+throw new SQLFeatureNotSupportedException("Not supported yet.");
++throw new AbstractMethodError(
++"org.hsqldb.jdbc.jdbcDataSource.getParentLogger should throw" +
++" SQLFeatureNotSupportedException, but that is not yet available" 
+
++" in Java 5");
 +}
 +
 +//#endif JAVA7
@@ -299,7 +302,7 @@
  // fredt@users 20011220 - patch 1.7.0 by fredt
  // new version numbering scheme
  // fredt@users 20020320 - patch 1.7.0 - JDBC 2 support and error trapping
-@@ -321,4 +326,12 @@
+@@ -321,4 +326,15 @@
  DriverManager.registerDriver(new jdbcDriver());
  } catch (Exception e) {}
  }
@@ -307,7 +310,10 @@
 +//#ifdef JAVA7
 +public Logger getParentLogger() throws SQLFeatureNotSupportedException
 +{
-+throw new SQLFeatureNotSupportedException("Not supported yet.");
++throw new AbstractMethodError(
++"org.hsqldb.jdbcDriver.getParentLogger should throw" +
++" SQLFeatureNotSupportedException, but that is not yet available" 
+
++" in Java 5");
 +}
 +
 +//#endif JAVA7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: l10ntools/inc l10ntools/source

[Libreoffice Gerrit user]

 l10ntools/inc/tokens.h|2 +-
 l10ntools/source/cfglex.l |8 
 l10ntools/source/srclex.l |6 +++---
 l10ntools/source/xrmlex.l |6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 13148009769be7619bdd34b2ce56e6fbfb65c809
Author: Andras Timar 
Date:   Mon Sep 24 12:06:10 2012 +0200

typo: COMMEND->COMMENT

Change-Id: I1bac574d44b1fbbdd2cde41ba1af033e952d811a

diff --git a/l10ntools/inc/tokens.h b/l10ntools/inc/tokens.h
index 1d035a7..694bead 100644
--- a/l10ntools/inc/tokens.h
+++ b/l10ntools/inc/tokens.h
@@ -26,7 +26,7 @@
 /*--*/
 /*--*/
 #define IGNOREDTOKENS   400 /* #include | #pragma | //... | ... */
-#define COMMEND 401 /*...   */
+#define COMMENT 401 /*...   */
 #define DEFINEDRES  402 /* Text = { */
 #define ANYTOKEN404 /* XYZ  */
 #define UNKNOWNTOKEN405 /* XYZ[ \t]$*/
diff --git a/l10ntools/source/cfglex.l b/l10ntools/source/cfglex.l
index 7476cbf..16ddf28 100644
--- a/l10ntools/source/cfglex.l
+++ b/l10ntools/source/cfglex.l
@@ -89,8 +89,8 @@ int bText=0;
pChar[1] = 0x00;
pChar[0] = c3;
 
-   workOnTokenSet( COMMEND, yytext );
-   workOnTokenSet( COMMEND, pChar );
+   workOnTokenSet( COMMENT, yytext );
+   workOnTokenSet( COMMENT, pChar );
 
for(;;) {
if ( c3 == EOF )
@@ -102,7 +102,7 @@ int bText=0;
c3 = yyinput();
 
pChar[0] = c3;
-   workOnTokenSet( COMMEND, pChar );
+   workOnTokenSet( COMMENT, pChar );
}
 }
 
@@ -114,7 +114,7 @@ int bText=0;
 \<[^\>\!]*\> {
bText = 0;
if ( yytext[ 1 ] == '!' && yytext[ 2 ] == '-' && yytext[ 3 ] == '-' )
-   workOnTokenSet( COMMEND, yytext );
+   workOnTokenSet( COMMENT, yytext );
else
workOnTokenSet( CFG_UNKNOWNTAG, yytext );
 }
diff --git a/l10ntools/source/srclex.l b/l10ntools/source/srclex.l
index e99eea4..01be0df 100644
--- a/l10ntools/source/srclex.l
+++ b/l10ntools/source/srclex.l
@@ -82,8 +82,8 @@ void YYWarning();
pChar[1] = 0x00;
pChar[0] = c2;
 
-   WorkOnTokenSet( COMMEND, yytext );
-   WorkOnTokenSet( COMMEND, pChar );
+   WorkOnTokenSet( COMMENT, yytext );
+   WorkOnTokenSet( COMMENT, pChar );
for(;;) {
if ( c2 == EOF )
break;
@@ -92,7 +92,7 @@ void YYWarning();
c1 = c2;
c2 = yyinput();
pChar[0] = c2;
-   WorkOnTokenSet( COMMEND, pChar );
+   WorkOnTokenSet( COMMENT, pChar );
}
 }
 
diff --git a/l10ntools/source/xrmlex.l b/l10ntools/source/xrmlex.l
index 9e9aa5c..eadb19f 100644
--- a/l10ntools/source/xrmlex.l
+++ b/l10ntools/source/xrmlex.l
@@ -144,8 +144,8 @@ int bText=0;
pChar[1] = 0x00;
pChar[0] = c3;
 
-   WorkOnTokenSet( COMMEND, yytext );
-   WorkOnTokenSet( COMMEND, pChar );
+   WorkOnTokenSet( COMMENT, yytext );
+   WorkOnTokenSet( COMMENT, pChar );
 
for(;;) {
if ( c3 == EOF )
@@ -156,7 +156,7 @@ int bText=0;
c2 = c3;
c3 = yyinput();
pChar[0] = c3;
-   WorkOnTokenSet( COMMEND, pChar );
+   WorkOnTokenSet( COMMENT, pChar );
}
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Regarding PDF export

[Michael Meeks]

Hi Sagar,

On Mon, 2012-09-24 at 08:52 +0300, Sagar Srivastava wrote:
> Consider the following file  : 
> 
> filter/source/pdf/impdialog.cxx

Ok ? :-)

> Is there any way I can check if the source document is a Presentation
> Document. It is already checked in the following method : 

Right - that is the constructor; and has all you need in it to do
this :-)

> However, I need to use the value of "mbIsPresentation" (After being
> checked If the source document is a presentation document) in another
> method. Therefore, any mechanism through which I can find this value
> globally so that I could use it in another method.

The prefix 'm' indicates that this is a member variable (and a boolean)
- if you checkout the header and see:

//class tabbed dialog
class ImpPDFTabDialog : public SfxTabDialog
{
...
protected:
//the following data are the configuration used throughout the dialog and pages
sal_BoolmbIsPresentation;
sal_BoolmbIsWriter;


That should jump out at you. ie. you can use 'if (mbIsPresentation)'
in any of the ImplPDFTabDialog:: member functions that you like.

> Waiting for responses towards fixing another bug.

Hope that helps - sorry for the delay :-)

ATB,

Michael.

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

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