date:20111123

 binfilter/bf_starmath/source/starmath_mathml.cxx  |3 ++-
 binfilter/bf_starmath/source/starmath_utility.cxx |3 ++-
 binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx   |   19 ++-
 3 files changed, 14 insertions(+), 11 deletions(-)

New commits:
commit 8e457595bea4ebccafc71c8ce71bc19696d70c40
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Nov 22 23:40:45 2011 +

use stripStart

diff --git a/binfilter/bf_starmath/source/starmath_mathml.cxx 
b/binfilter/bf_starmath/source/starmath_mathml.cxx
index e81a8f2..dd64eb9 100644
--- a/binfilter/bf_starmath/source/starmath_mathml.cxx
+++ b/binfilter/bf_starmath/source/starmath_mathml.cxx
@@ -76,6 +76,7 @@ one go*/
 #include com/sun/star/task/XStatusIndicatorFactory.hpp
 #include com/sun/star/beans/PropertyAttribute.hpp
 #include comphelper/genericpropertyset.hxx
+#include comphelper/string.hxx
 
 #include bf_svtools/itemprop.hxx
 
@@ -630,7 +631,7 @@ void SmXMLImport::endDocument(void)
 //Make up some editable text
 aText = pDocShell-GetText();
 pTree-CreateTextFromNode(aText);
-aText.EraseTrailingChars();
+aText = comphelper::string::stripEnd(aText, ' ');
 if((aText.GetChar(0) == '{') 
 (aText.GetChar(aText.Len()-1) == '}'))
 {
diff --git a/binfilter/bf_starmath/source/starmath_utility.cxx 
b/binfilter/bf_starmath/source/starmath_utility.cxx
index 735b22a..68aa269 100644
--- a/binfilter/bf_starmath/source/starmath_utility.cxx
+++ b/binfilter/bf_starmath/source/starmath_utility.cxx
@@ -26,6 +26,7 @@
  *
  /
 
+#include comphelper/string.hxx
 #include tools/tenccvt.hxx
 #include osl/thread.h
 
@@ -217,7 +218,7 @@ int GetTextEncodingTabIndex( const String rTxt, xub_StrLen 
nPos )
 /*N*/ // in old 2.0 or 3.0 formulas the strings to be imported do have an
 /*N*/ // additional '\0' character at the end that gets removed here.
 /*N*/ if (aString.Len())
-/*N*/ aString.EraseTrailingChars( '\0' );
+/*N*/ aString = comphelper::string::stripEnd(aString, '\0');
 /*N*/
 /*N*/   aString.ConvertLineEnd();
 /*N*/ return aString;
diff --git a/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx 
b/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
index dcb93f6..99b2e9d 100644
--- a/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
+++ b/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
@@ -3366,7 +3366,7 @@ void Sw6Layout::AddXForm(sal_Char cLead, ByteString 
rTmp, String rStr)
 // Kurzform, wird oefter benoetigt
 {
 rTmp = comphelper::string::stripStart(rTmp, ' ');
-rTmp.EraseTrailingChars();
+rTmp = comphelper::string::stripEnd(rTmp, ' ');
 rTmp.Insert((sal_Char)rTmp.Len(),0);
 rTmp.Insert(cLead,0);
 AddHForm(rTmp.GetBuffer(),rStr.Len(),rTmp.Len(),1);
@@ -3498,7 +3498,7 @@ size_t Sw6Layout::PutRest(String rStr,sal_Char *pCtrl)
 rtl::OStringToOUString(aTmp, RTL_TEXTENCODING_IBM_850),
 osl_getThreadTextEncoding());
 aTmp = comphelper::string::stripStart(aTmp, ' ');
-aTmp.EraseTrailingChars();
+aTmp = comphelper::string::stripEnd(aTmp, ' ');
 aTmp.Insert('}');// Mache versteckten Text
 aTmp.Insert('{',0);
 AddXForm('-',aTmp,rStr);
@@ -5320,7 +5320,7 @@ BOOL SwSw6Parser::ReadDocInfo(void)
 if (ReadLn(rTmp))
 {
 rTmp = comphelper::string::stripStart(rTmp, ' ');
-rTmp.EraseTrailingChars();
+rTmp = comphelper::string::stripEnd(rTmp, ' ');
 }
 else
 break;
@@ -5331,7 +5331,7 @@ BOOL SwSw6Parser::ReadDocInfo(void)
 if (ReadLn(rTmp))
 {
 rTmp = comphelper::string::stripStart(rTmp, ' ');
-rTmp.EraseTrailingChars();
+rTmp = comphelper::string::stripEnd(rTmp, ' ');
 }
 else
 break;
commit 1318e3ab271d62a2dc1ff2691b836c3b6da9a2de
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Nov 22 17:18:15 2011 +

use stripStart

diff --git a/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx 
b/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
index 73b6671..dcb93f6 100644
--- a/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
+++ b/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
@@ -57,6 +57,7 @@
 #include bf_svx/cntritem.hxx
 #include bf_svx/shdditem.hxx
 #include bf_svx/colritem.hxx
+#include comphelper/string.hxx
 
 
 #include fmtpdsc.hxx
@@ -3361,10 +3362,10 @@ BOOL Sw6Layout::TextBefehl(const sal_Char *pPatt,const 
sal_Char *pOrig)
 return !*pPatt  (!cLen || *pOrig'A' || *pOrig'Z');
 }
 
-void Sw6Layout::AddXForm(sal_Char cLead,ByteString rTmp,String rStr)
+void Sw6Layout::AddXForm(sal_Char cLead, ByteString

[Libreoffice-commits] .: 2 commits - svx/source writerfilter/source

2011-11-23 Thread Cédric Bosdonnat

 svx/source/unodraw/unoshape.cxx|5 -
 writerfilter/source/filter/RtfFilter.cxx   |7 ++-
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit e846db644868651556b38f91737b81c43f3c4f3c
Author: CÃ©dric Bosdonnat cedric.bosdonnat@free.fr
Date:   Wed Nov 23 11:22:28 2011 +0100

RTF: OLE object import with graphic result fixed, the file can now be opened

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 2a46fb0..2e31bc7 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -597,7 +597,7 @@ int RTFDocumentImpl::resolvePict(bool bInline)
 m_xContext),
 uno::UNO_QUERY_THROW);
 uno::Referencegraphic::XGraphic xGraphic = 
xGraphicProvider-queryGraphic(aMediaProperties);
-
xPropertySet-setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Bitmap)),
 uno::Any(xGraphic));
+
xPropertySet-setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Graphic)),
 uno::Any(xGraphic));
 
 RTFValue::Pointer_t pShapeValue(new RTFValue(xShape));
 m_aObjectAttributes-push_back(make_pair(NS_ooxml::LN_shape, 
pShapeValue));
commit a45c82f930c1224928fd0a8f9ca3690ddd162366
Author: CÃ©dric Bosdonnat cedric.bosdonnat@free.fr
Date:   Tue Nov 22 18:01:32 2011 +0100

Show some exception message when getting one in RtfFilter

diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index e3bfaf3..b676551 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1720,7 +1720,10 @@ void SAL_CALL SvxShape::_setPropertyValue( const 
OUString rPropertyName, const
 throw beans::UnknownPropertyException();
 
 if( (pMap-nFlags  beans::PropertyAttribute::READONLY ) != 0 )
-throw beans::PropertyVetoException();
+throw beans::PropertyVetoException( rtl::OUString::createFromAscii(
+OSL_FORMAT( Readonly property can't be set: %s,
+rtl::OUStringToOString( rPropertyName, 
RTL_TEXTENCODING_UTF8 ).getStr() ) ),
+uno::Reference drawing::XShape ( this ) );
 
 mpModel-SetChanged();
 
diff --git a/writerfilter/source/filter/RtfFilter.cxx 
b/writerfilter/source/filter/RtfFilter.cxx
index 4b214ab..8786539 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -99,8 +99,13 @@ sal_Bool RtfFilter::filter( const uno::Sequence 
beans::PropertyValue  aDescri
 #endif
 return sal_True;
 }
-catch (const uno::Exception)
+catch (const uno::Exception e)
 {
+#if OSL_DEBUG_LEVEL  1
+OSL_TRACE( Exception caught: %s,
+rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 
).getStr() );
+#endif
+(void)e;
 return sal_False;
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - connectivity/source

 connectivity/source/drivers/ado/Aservices.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit da6cd222d3c72b102cead739686fd5ca71a84861
Author: Lionel Elie Mamane lionel.mam...@gestman.lu
Date:   Tue Nov 22 14:25:10 2011 +0100

fdo#36555: pImplementationName is not a compile-time constant

Signed-off-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/connectivity/source/drivers/ado/Aservices.cxx 
b/connectivity/source/drivers/ado/Aservices.cxx
index 68600ba..69bd7c6 100644
--- a/connectivity/source/drivers/ado/Aservices.cxx
+++ b/connectivity/source/drivers/ado/Aservices.cxx
@@ -59,7 +59,7 @@ struct ProviderRequest
 sal_Char const* pImplementationName
 )
 : xServiceManager(reinterpret_castXMultiServiceFactory*(pServiceManager))
-, 
sImplementationName(OUString(RTL_CONSTASCII_USTRINGPARAM(pImplementationName)))
+, sImplementationName(OUString::createFromAscii(pImplementationName))
 {
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: svx/source

 svx/source/unodraw/unoshape.cxx |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 6cdbf1cc9bc3fd97acdba981bad04d552dafc627
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Nov 23 11:44:55 2011 +0100

No more OSL_FORMAT.

diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index b676551..eef6c80 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1720,10 +1720,12 @@ void SAL_CALL SvxShape::_setPropertyValue( const 
OUString rPropertyName, const
 throw beans::UnknownPropertyException();
 
 if( (pMap-nFlags  beans::PropertyAttribute::READONLY ) != 0 )
-throw beans::PropertyVetoException( rtl::OUString::createFromAscii(
-OSL_FORMAT( Readonly property can't be set: %s,
-rtl::OUStringToOString( rPropertyName, 
RTL_TEXTENCODING_UTF8 ).getStr() ) ),
-uno::Reference drawing::XShape ( this ) );
+throw beans::PropertyVetoException(
+( rtl::OUString(
+RTL_CONSTASCII_USTRINGPARAM(
+Readonly property can't be set:  ) )
+  + rPropertyName ),
+uno::Reference drawing::XShape ( this ) );
 
 mpModel-SetChanged();
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: autodoc/source rdbmaker/source registry/tools sal/inc sal/osl solenv/gbuild solenv/inc

2011-11-23 Thread Jan Holesovsky

 autodoc/source/exes/adc_uni/main.cxx|2 +-
 rdbmaker/source/rdbmaker/rdbmaker.cxx   |2 +-
 registry/tools/regmerge.cxx |2 +-
 registry/tools/regview.cxx  |2 +-
 sal/inc/sal/mathconf.h  |8 +++-
 sal/osl/w32/module.cxx  |2 +-
 sal/osl/w32/procimpl.cxx|8 
 solenv/gbuild/platform/WNT_INTEL_GCC.mk |5 +
 solenv/inc/wntgcci.mk   |5 +
 9 files changed, 26 insertions(+), 10 deletions(-)

New commits:
commit 832e6d22935040fe61504c90838415fa55feb24d
Author: Jan Holesovsky ke...@suse.cz
Date:   Wed Nov 23 11:27:05 2011 +0100

Some trivial fixes for MinGW with -std=c++0x enabled; not finished.

diff --git a/autodoc/source/exes/adc_uni/main.cxx 
b/autodoc/source/exes/adc_uni/main.cxx
index 6e5a11a..c119bb6 100644
--- a/autodoc/source/exes/adc_uni/main.cxx
+++ b/autodoc/source/exes/adc_uni/main.cxx
@@ -37,7 +37,7 @@
 
 int
 #ifdef WNT
-_cdecl
+__cdecl
 #endif
 main( intargc,
   char * argv[] )
diff --git a/rdbmaker/source/rdbmaker/rdbmaker.cxx 
b/rdbmaker/source/rdbmaker/rdbmaker.cxx
index b20043e..fba8469 100644
--- a/rdbmaker/source/rdbmaker/rdbmaker.cxx
+++ b/rdbmaker/source/rdbmaker/rdbmaker.cxx
@@ -300,7 +300,7 @@ sal_Bool produceAllTypes(const OString typeName,
 #if (defined UNX)
 int main( int argc, char * argv[] )
 #else
-int _cdecl main( int argc, char * argv[] )
+int __cdecl main( int argc, char * argv[] )
 #endif
 {
 RdbOptions options;
diff --git a/registry/tools/regmerge.cxx b/registry/tools/regmerge.cxx
index 193209b..7b5997d 100644
--- a/registry/tools/regmerge.cxx
+++ b/registry/tools/regmerge.cxx
@@ -95,7 +95,7 @@ bool Options_Impl::initOptions_Impl (std::vector std::string 
  rArgs)
 #if (defined UNX)
 int main( int argc, char * argv[] )
 #else
-int _cdecl main( int argc, char * argv[] )
+int __cdecl main( int argc, char * argv[] )
 #endif
 {
 Options_Impl options(argv[0]);
diff --git a/registry/tools/regview.cxx b/registry/tools/regview.cxx
index 2cb11b8..57ebcea 100644
--- a/registry/tools/regview.cxx
+++ b/registry/tools/regview.cxx
@@ -43,7 +43,7 @@ using namespace registry::tools;
 #if (defined UNX)
 int main( int argc, char * argv[] )
 #else
-int _cdecl main( int argc, char * argv[] )
+int __cdecl main( int argc, char * argv[] )
 #endif
 {
 RegHandle   hReg;
diff --git a/sal/inc/sal/mathconf.h b/sal/inc/sal/mathconf.h
index d673f34..1e4b11b 100644
--- a/sal/inc/sal/mathconf.h
+++ b/sal/inc/sal/mathconf.h
@@ -37,6 +37,10 @@
 #include ieeefp.h
 #endif /* SOLARIS */
 
+#if defined(__cplusplus)  ( defined(__GXX_EXPERIMENTAL_CXX0X__) || 
__cplusplus = 201103L )
+#include cmath
+#endif
+
 #if defined __cplusplus
 extern C {
 #endif /* __cplusplus */
@@ -59,7 +63,9 @@ extern C {
 
 
 /* SAL_MATH_FINITE(d): test double d on INFINITY, NaN et al. */
-#if defined( WNT)
+#if defined(__cplusplus)  ( defined(__GXX_EXPERIMENTAL_CXX0X__) || 
__cplusplus = 201103L )
+#define SAL_MATH_FINITE(d) std::isfinite(d)
+#elif defined( WNT)
 #define SAL_MATH_FINITE(d) _finite(d)
 #elif defined IOS
 /* C++ is so nice. This is the only way I could come up with making
diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx
index 07f750e..026cf51 100644
--- a/sal/osl/w32/module.cxx
+++ b/sal/osl/w32/module.cxx
@@ -79,7 +79,7 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, 
sal_Int32 /*nRtldM
 //on Windows XP and ERROR_INSUFFICIENT_BUFFER on Windows 7 (64bit)
 if (hInstance == NULL  Module-length  260)
 {
-std::vectorsal_Unicode, rtl::Allocatorsal_Unicode  
vec(Module-length + 1);
+std::vectorsal_Unicode vec(Module-length + 1);
 DWORD len = 
GetShortPathNameW(reinterpret_castLPCWSTR(Module-buffer),
   reinterpret_castLPWSTR(vec[0]), 
Module-length + 1);
 if (len )
diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx
index 7ef6fb6..676c0e8 100644
--- a/sal/osl/w32/procimpl.cxx
+++ b/sal/osl/w32/procimpl.cxx
@@ -68,11 +68,11 @@ const rtl::OUString 
QUOTE(RTL_CONSTASCII_USTRINGPARAM(\));
 namespace /* private */
 {
 //#
-typedef std::listrtl::OUString, rtl::Allocatorrtl::OUString  
string_container_t;
+typedef std::listrtl::OUString string_container_t;
 typedef string_container_t::iterator string_container_iterator_t;
 typedef string_container_t::const_iterator 
string_container_const_iterator_t;
 typedef std::pairstring_container_iterator_t, 
string_container_iterator_t iterator_pair_t;
-typedef std::vectorsal_Unicode, rtl::Allocatorsal_Unicode  
environment_container_t;
+typedef std::vectorsal_Unicode environment_container_t;
 
 //#
 /* Function object that compares two strings that are
@@ -312,7 +312,7 @@ namespace /* private */
 rtl::OUString ret(path);
 if (path.getLength()

[Libreoffice-commits] .: i18npool/source

 i18npool/source/localedata/data/gd_GB.xml |  274 +-
 1 file changed, 194 insertions(+), 80 deletions(-)

New commits:
commit d197a4d99ccdc2e7971363b6c5a7004f714a6238
Author: Michael Bauer f...@akerbeltz.org
Date:   Wed Nov 23 12:47:40 2011 +0100

added Gaelic (Scotland) [gd-GB] genitive case month names

diff --git a/i18npool/source/localedata/data/gd_GB.xml 
b/i18npool/source/localedata/data/gd_GB.xml
index 0a1c64a..b08f61e 100644
--- a/i18npool/source/localedata/data/gd_GB.xml
+++ b/i18npool/source/localedata/data/gd_GB.xml
@@ -19,8 +19,8 @@
 TimeSeparator:/TimeSeparator
 Time100SecSeparator./Time100SecSeparator
 ListSeparator;/ListSeparator
-LongDateDayOfWeekSeparator, /LongDateDayOfWeekSeparator
-LongDateDaySeparator, /LongDateDaySeparator
+LongDateDayOfWeekSeparator /LongDateDayOfWeekSeparator
+LongDateDaySeparator /LongDateDaySeparator
 LongDateMonthSeparator /LongDateMonthSeparator
 LongDateYearSeparator /LongDateYearSeparator
 /Separators
@@ -32,148 +32,200 @@
 /Markers
 TimeAMm/TimeAM
 TimePMf/TimePM
-MeasurementSystemmetric/MeasurementSystem
+MeasurementSystemMetric/MeasurementSystem
 /LC_CTYPE
 LC_FORMAT replaceFrom=[CURRENCY] replaceTo=[$Â£-43C]
-FormatElement msgid=FixedFormatskey1 default=true type=medium 
usage=FIXED_NUMBER formatindex=0
+FormatElement msgid=FixedFormatskey1 default=true type=medium 
usage=FIXED_NUMBER  formatindex=0
 FormatCodeGeneral/FormatCode
+DefaultName/DefaultName
 /FormatElement
-FormatElement msgid=FixedFormatskey2 default=true type=short 
usage=FIXED_NUMBER formatindex=1
+FormatElement msgid=FixedFormatskey2 default=true type=short 
usage=FIXED_NUMBER  formatindex=1
 FormatCode0/FormatCode
+DefaultName/DefaultName
 /FormatElement
-FormatElement msgid=FixedFormatskey3 default=false type=medium 
usage=FIXED_NUMBER formatindex=2
+FormatElement msgid=FixedFormatskey3 default=false type=medium 
usage=FIXED_NUMBER  formatindex=2
 FormatCode0.00/FormatCode
+DefaultName/DefaultName
 /FormatElement
-FormatElement msgid=FixedFormatskey4 default=false type=short 
usage=FIXED_NUMBER formatindex=3
+FormatElement msgid=FixedFormatskey4 default=false type=short 
usage=FIXED_NUMBER  formatindex=3
 FormatCode#,##0/FormatCode
+DefaultName/DefaultName
 /FormatElement
-FormatElement msgid=FixedFormatskey5 default=false type=medium 
usage=FIXED_NUMBER formatindex=4
+FormatElement msgid=FixedFormatskey5 default=false type=medium 
usage=FIXED_NUMBER  formatindex=4
 FormatCode#,##0.00/FormatCode
+DefaultName/DefaultName
 /FormatElement
-FormatElement msgid=FixedFormatskey6 default=false type=medium 
usage=FIXED_NUMBER formatindex=5
+FormatElement msgid=FixedFormatskey6 default=false type=medium 
usage=FIXED_NUMBER  formatindex=5
 FormatCode#,###.00/FormatCode
-/FormatElement
-FormatElement msgid=ScientificFormatskey1 default=true type=medium 
usage=SCIENTIFIC_NUMBER formatindex=6
-FormatCode0.00E+00/FormatCode
-/FormatElement
-FormatElement msgid=ScientificFormatskey2 default=false type=medium 
usage=SCIENTIFIC_NUMBER formatindex=7
-FormatCode0.00E+000/FormatCode
-/FormatElement
-FormatElement msgid=PercentFormatskey1 default=true type=short 
usage=PERCENT_NUMBER formatindex=8
-FormatCode0%/FormatCode
-/FormatElement
-FormatElement msgid=PercentFormatskey2 default=true type=long 
usage=PERCENT_NUMBER formatindex=9
-FormatCode0.00%/FormatCode
-/FormatElement
-FormatElement msgid=CurrencyFormatskey1 default=true type=short 
usage=CURRENCY formatindex=12
+DefaultName/DefaultName
+/FormatElement
+ FormatElement msgid=FixedFormatskey7 default=false type=short 
usage=FIXED_NUMBER formatindex=70
+ FormatCode#,##0_);(#,##0)/FormatCode
+ DefaultName/DefaultName
+ /FormatElement
+ FormatElement msgid=FixedFormatskey8 default=false type=medium 
usage=FIXED_NUMBER formatindex=71
+ FormatCode#,##0.00_);(#,##0.00)/FormatCode
+ DefaultName/DefaultName
+ /FormatElement
+FormatElement msgid=CurrencyFormatskey1 default=true type=short 
usage=CURRENCY  formatindex=12
 FormatCode[CURRENCY]#,##0;-[CURRENCY]#,##0/FormatCode
+DefaultName/DefaultName
 /FormatElement
-FormatElement msgid=CurrencyFormatskey2 default=false type=medium 
usage=CURRENCY formatindex=13
+FormatElement msgid=CurrencyFormatskey2 default=false type=medium 
usage=CURRENCY  formatindex=13
 FormatCode[CURRENCY]#,##0.00;-[CURRENCY]#,##0.00/FormatCode
+DefaultName/DefaultName
 /FormatElement
-FormatElement msgid=CurrencyFormatskey3 default=false type=medium 
usage=CURRENCY formatindex=14
+FormatElement msgid=CurrencyFormatskey3 default=false type=medium 
usage=CURRENCY  formatindex=14
 FormatCode[CURRENCY]#,##0;[RED]-[CURRENCY]#,##0/FormatCode
+DefaultName/DefaultName
 /FormatElement
-FormatElement msgid=CurrencyFormatskey4 default=true type=medium 
usage=CURRENCY formatindex=15
+FormatElement msgid=CurrencyFormatskey4 default=true type=medium 
usage=CURRENCY  formatindex=15
 FormatCode[CURRENCY]#,##0.00;[RED]-[CURRENCY]#,##0.00/FormatCode
+DefaultName/DefaultName
 /FormatElement
-FormatElement

[Libreoffice-commits] .: i18npool/source

 i18npool/source/localedata/data/ast_ES.xml |  150 -
 1 file changed, 106 insertions(+), 44 deletions(-)

New commits:
commit cc2ec946ef4a3d4c4e86cfb17f3a890b2b2ad077
Author: Xuacu Saturio xuacu...@gmail.com
Date:   Wed Nov 23 12:57:55 2011 +0100

added Asturian [ast-ES] genitive case month names

diff --git a/i18npool/source/localedata/data/ast_ES.xml 
b/i18npool/source/localedata/data/ast_ES.xml
index 05c6360..1c2b5e5 100644
--- a/i18npool/source/localedata/data/ast_ES.xml
+++ b/i18npool/source/localedata/data/ast_ES.xml
@@ -20,7 +20,7 @@
   Time100SecSeparator,/Time100SecSeparator
   ListSeparator;/ListSeparator
   LongDateDayOfWeekSeparator, /LongDateDayOfWeekSeparator
-  LongDateDaySeparator, /LongDateDaySeparator
+  LongDateDaySeparator /LongDateDaySeparator
   LongDateMonthSeparator /LongDateMonthSeparator
   LongDateYearSeparator /LongDateYearSeparator
 /Separators
@@ -200,102 +200,164 @@
   DaysOfWeek
 Day
   DayIDsun/DayID
-  DefaultAbbrvNameDom/DefaultAbbrvName
-  DefaultFullNameDomingu/DefaultFullName
+  DefaultAbbrvNamedom/DefaultAbbrvName
+  DefaultFullNamedomingu/DefaultFullName
 /Day
 Day
   DayIDmon/DayID
-  DefaultAbbrvNameLlu/DefaultAbbrvName
-  DefaultFullNameLlunes/DefaultFullName
+  DefaultAbbrvNamellu/DefaultAbbrvName
+  DefaultFullNamellunes/DefaultFullName
 /Day
 Day
   DayIDtue/DayID
-  DefaultAbbrvNameMar/DefaultAbbrvName
-  DefaultFullNameMartes/DefaultFullName
+  DefaultAbbrvNamemar/DefaultAbbrvName
+  DefaultFullNamemartes/DefaultFullName
 /Day
 Day
   DayIDwed/DayID
-  DefaultAbbrvNameMiÃ©/DefaultAbbrvName
-  DefaultFullNameMiÃ©rcoles/DefaultFullName
+  DefaultAbbrvNamemiÃ©/DefaultAbbrvName
+  DefaultFullNamemiÃ©rcoles/DefaultFullName
 /Day
 Day
   DayIDthu/DayID
-  DefaultAbbrvNameXue/DefaultAbbrvName
-  DefaultFullNameXueves/DefaultFullName
+  DefaultAbbrvNamexue/DefaultAbbrvName
+  DefaultFullNamexueves/DefaultFullName
 /Day
 Day
   DayIDfri/DayID
-  DefaultAbbrvNameVie/DefaultAbbrvName
-  DefaultFullNameVienres/DefaultFullName
+  DefaultAbbrvNamevie/DefaultAbbrvName
+  DefaultFullNamevienres/DefaultFullName
 /Day
 Day
   DayIDsat/DayID
-  DefaultAbbrvNameSÃ¡b/DefaultAbbrvName
-  DefaultFullNameSÃ¡badu/DefaultFullName
+  DefaultAbbrvNamesÃ¡b/DefaultAbbrvName
+  DefaultFullNamesÃ¡badu/DefaultFullName
 /Day
   /DaysOfWeek
   MonthsOfYear
 Month
   MonthIDjan/MonthID
-  DefaultAbbrvNameXin/DefaultAbbrvName
-  DefaultFullNameXineru/DefaultFullName
+  DefaultAbbrvNamexin/DefaultAbbrvName
+  DefaultFullNamexineru/DefaultFullName
 /Month
 Month
   MonthIDfeb/MonthID
-  DefaultAbbrvNameFeb/DefaultAbbrvName
-  DefaultFullNameFebreru/DefaultFullName
+  DefaultAbbrvNamefeb/DefaultAbbrvName
+  DefaultFullNamefebreru/DefaultFullName
 /Month
 Month
   MonthIDmar/MonthID
-  DefaultAbbrvNameMar/DefaultAbbrvName
-  DefaultFullNameMarzu/DefaultFullName
+  DefaultAbbrvNamemar/DefaultAbbrvName
+  DefaultFullNamemarzu/DefaultFullName
 /Month
 Month
   MonthIDapr/MonthID
-  DefaultAbbrvNameAbr/DefaultAbbrvName
-  DefaultFullNameAbril/DefaultFullName
+  DefaultAbbrvNameabr/DefaultAbbrvName
+  DefaultFullNameabril/DefaultFullName
 /Month
 Month
   MonthIDmay/MonthID
-  DefaultAbbrvNameMay/DefaultAbbrvName
-  DefaultFullNameMayu/DefaultFullName
+  DefaultAbbrvNamemay/DefaultAbbrvName
+  DefaultFullNamemayu/DefaultFullName
 /Month
 Month
   MonthIDjun/MonthID
-  DefaultAbbrvNameXun/DefaultAbbrvName
-  DefaultFullNameXunu/DefaultFullName
+  DefaultAbbrvNamexun/DefaultAbbrvName
+  DefaultFullNamexunu/DefaultFullName
 /Month
 Month
   MonthIDjul/MonthID
-  DefaultAbbrvNameXnt/DefaultAbbrvName
-  DefaultFullNameXunetu/DefaultFullName
+  DefaultAbbrvNamexnt/DefaultAbbrvName
+  DefaultFullNamexunetu/DefaultFullName
 /Month
 Month
   MonthIDaug/MonthID
-  DefaultAbbrvNameAgo/DefaultAbbrvName
-  DefaultFullNameAgostu/DefaultFullName
+  DefaultAbbrvNameago/DefaultAbbrvName
+  DefaultFullNameagostu/DefaultFullName
 /Month
 Month
   MonthIDsep/MonthID
-  DefaultAbbrvNameSet/DefaultAbbrvName
-  DefaultFullNameSetiembre/DefaultFullName
+

[Libreoffice-commits] .: scp2/source

 scp2/source/ooo/common_brand.scp |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 92181d3e510fb0ef09d5688cc0eade4ad2743f76
Author: Andras Timar ati...@suse.com
Date:   Wed Nov 23 13:40:17 2011 +0100

create this dir so uninstall can remove it

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 7630602..791eb6d 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -414,6 +414,12 @@ Directory gid_Brand_Dir_Share_Uno_Packages_Cache
 Styles = (CREATE);
 End
 
+Directory gid_Brand_Dir_Share_Uno_Packages_Cache_Uno_Packages
+ParentID = gid_Brand_Dir_Share_Uno_Packages_Cache;
+DosName = uno_packages;
+Styles = (CREATE);
+End
+
 Directory gid_Brand_Dir_Share_Registry
 ParentID = gid_Brand_Dir_Share;
 DosName = registry;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: connectivity/source

 connectivity/source/drivers/evoab/LServices.cxx |  114 
 connectivity/source/drivers/evoab/exports.dxp   |1 
 2 files changed, 115 deletions(-)

New commits:
commit e04361c897c08374c7be54ff3ae09d789ca7627f
Author: Michael Meeks michael.me...@suse.com
Date:   Wed Nov 23 12:50:45 2011 +

fully remove obsolete evolution 1.x connector

diff --git a/connectivity/source/drivers/evoab/LServices.cxx 
b/connectivity/source/drivers/evoab/LServices.cxx
deleted file mode 100644
index bd2b5f5..000
--- a/connectivity/source/drivers/evoab/LServices.cxx
+++ /dev/null
@@ -1,114 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include precompiled_connectivity.hxx
-#include LDriver.hxx
-#include cppuhelper/factory.hxx
-
-using namespace connectivity::evoab;
-using ::rtl::OUString;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::lang::XSingleServiceFactory;
-using ::com::sun::star::lang::XMultiServiceFactory;
-
-typedef Reference XSingleServiceFactory  (SAL_CALL *createFactoryFunc)
-(
-const Reference XMultiServiceFactory   rServiceManager,
-const OUString  rComponentName,
-::cppu::ComponentInstantiation pCreateFunction,
-const Sequence OUString   rServiceNames,
-rtl_ModuleCount* _pT
-);
-
-//---
-struct ProviderRequest
-{
-Reference XSingleServiceFactory  xRet;
-Reference XMultiServiceFactory  const xServiceManager;
-OUString const sImplementationName;
-
-ProviderRequest(
-void* pServiceManager,
-sal_Char const* pImplementationName
-)
-: xServiceManager(reinterpret_castXMultiServiceFactory*(pServiceManager))
-, sImplementationName(OUString::createFromAscii(pImplementationName))
-{
-}
-
-inline
-sal_Bool CREATE_PROVIDER(
-const OUString Implname,
-const Sequence OUString   Services,
-::cppu::ComponentInstantiation Factory,
-createFactoryFunc creator
-)
-{
-if (!xRet.is()  (Implname == sImplementationName))
-try
-{
-xRet = creator( xServiceManager, sImplementationName,Factory, 
Services,0);
-}
-catch(...)
-{
-}
-return xRet.is();
-}
-
-void* getProvider() const { return xRet.get(); }
-};
-
-//---
-extern C SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
-const sal_Char* pImplementationName,
-void* pServiceManager,
-void* /*pRegistryKey*/)
-{
-void* pRet = 0;
-if (pServiceManager)
-{
-ProviderRequest aReq(pServiceManager,pImplementationName);
-
-aReq.CREATE_PROVIDER(
-OEvoabDriver::getImplementationName_Static(),
-OEvoabDriver::getSupportedServiceNames_Static(),
-OEvoabDriver_CreateInstance, ::cppu::createSingleFactory)
-;
-
-if(aReq.xRet.is())
-aReq.xRet-acquire();
-
-pRet = aReq.getProvider();
-}
-
-return pRet;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/evoab/exports.dxp 
b/connectivity/source/drivers/evoab/exports.dxp
deleted file mode 100755
index 7003307..000
--- a/connectivity/source/drivers/evoab/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
___
Libreoffice-commits mailing list

[Libreoffice-commits] .: i18npool/source

 i18npool/source/localedata/data/pt_PT.xml |  102 ++
 1 file changed, 48 insertions(+), 54 deletions(-)

New commits:
commit d3951ad0503a9d1c78570984fd8d483d8fb95a8c
Author: Olivier Hallot olivier.hal...@alta.org.br
Date:   Wed Nov 23 13:52:13 2011 +0100

i18n corrections for pt-PT (dates)

diff --git a/i18npool/source/localedata/data/pt_PT.xml 
b/i18npool/source/localedata/data/pt_PT.xml
index 88e8ed6..df6ce1d 100644
--- a/i18npool/source/localedata/data/pt_PT.xml
+++ b/i18npool/source/localedata/data/pt_PT.xml
@@ -34,7 +34,7 @@
 TimePMPM/TimePM
 MeasurementSystemMetric/MeasurementSystem
 /LC_CTYPE
-LC_FORMAT
+LC_FORMAT replaceFrom=[CURRENCY] replaceTo=[$Esc.-816]
 FormatElement msgid=DateFormatskey1 default=true type=short 
usage=DATE formatindex=18
 FormatCodeDD-MM-/FormatCode
 DefaultName/DefaultName
@@ -179,29 +179,23 @@
 FormatCode#.###,00/FormatCode
 DefaultName/DefaultName
 /FormatElement
-FormatElement msgid=CurrencyFormatskey1 default=true type=short 
usage=CURRENCY  formatindex=12
-FormatCode#.##0 [$Esc.-816];-#.##0 [$Esc.-816]/FormatCode
-DefaultName/DefaultName
+FormatElement msgid=CurrencyFormatskey1 default=true type=short 
usage=CURRENCY formatindex=12
+FormatCode#.##0 [CURRENCY];-#.##0 [CURRENCY]/FormatCode
 /FormatElement
-FormatElement msgid=CurrencyFormatskey2 default=false type=medium 
usage=CURRENCY  formatindex=13
-FormatCode#.##0,00 [$Esc.-816];-#.##0,00 [$Esc.-816]/FormatCode
-DefaultName/DefaultName
+FormatElement msgid=CurrencyFormatskey2 default=false type=medium 
usage=CURRENCY formatindex=13
+FormatCode#.##0,00 [CURRENCY];-#.##0,00 [CURRENCY]/FormatCode
 /FormatElement
-FormatElement msgid=CurrencyFormatskey3 default=false type=medium 
usage=CURRENCY  formatindex=14
-FormatCode#.##0 [$Esc.-816];[RED]-#.##0 [$Esc.-816]/FormatCode
-DefaultName/DefaultName
+FormatElement msgid=CurrencyFormatskey3 default=false type=medium 
usage=CURRENCY formatindex=14
+FormatCode#.##0 [CURRENCY];[RED]-#.##0 [CURRENCY]/FormatCode
 /FormatElement
-FormatElement msgid=CurrencyFormatskey4 default=true type=medium 
usage=CURRENCY  formatindex=15
-FormatCode#.##0,00 [$Esc.-816];[RED]-#.##0,00 [$Esc.-816]/FormatCode
-DefaultName/DefaultName
+FormatElement msgid=CurrencyFormatskey4 default=true type=medium 
usage=CURRENCY formatindex=15
+FormatCode#.##0,00 [CURRENCY];[RED]-#.##0,00 [CURRENCY]/FormatCode
 /FormatElement
-FormatElement msgid=CurrencyFormatskey5 default=false type=medium 
usage=CURRENCY  formatindex=16
+FormatElement msgid=CurrencyFormatskey5 default=false type=medium 
usage=CURRENCY formatindex=16
 FormatCode#.##0,00 CCC/FormatCode
-DefaultName/DefaultName
 /FormatElement
-FormatElement msgid=CurrencyFormatskey6 default=false type=medium 
usage=CURRENCY  formatindex=17
-FormatCode#.##0,-- [$Esc.-816];[RED]-#.##0,-- [$Esc.-816]/FormatCode
-DefaultName/DefaultName
+FormatElement msgid=CurrencyFormatskey6 default=false type=medium 
usage=CURRENCY formatindex=17
+FormatCode#.##0,-- [CURRENCY];[RED]-#.##0,-- [CURRENCY]/FormatCode
 /FormatElement
 FormatElement msgid=PercentFormatskey1 default=true type=short 
usage=PERCENT_NUMBER  formatindex=8
 FormatCode0%/FormatCode
@@ -265,75 +259,75 @@
 MonthsOfYear
 Month
 MonthIDjan/MonthID
-DefaultAbbrvNameJan/DefaultAbbrvName
-DefaultFullNameJaneiro/DefaultFullName
+DefaultAbbrvNamejan/DefaultAbbrvName
+DefaultFullNamejaneiro/DefaultFullName
 /Month
 Month
 MonthIDfeb/MonthID
-DefaultAbbrvNameFev/DefaultAbbrvName
-DefaultFullNameFevereiro/DefaultFullName
+DefaultAbbrvNamefev/DefaultAbbrvName
+DefaultFullNamefevereiro/DefaultFullName
 /Month
 Month
 MonthIDmar/MonthID
-DefaultAbbrvNameMar/DefaultAbbrvName
-DefaultFullNameMarÃ§o/DefaultFullName
+DefaultAbbrvNamemar/DefaultAbbrvName
+DefaultFullNamemarÃ§o/DefaultFullName
 /Month
 Month
 MonthIDapr/MonthID
-DefaultAbbrvNameAbr/DefaultAbbrvName
-DefaultFullNameAbril/DefaultFullName
+DefaultAbbrvNameabr/DefaultAbbrvName
+DefaultFullNameabril/DefaultFullName
 /Month
 Month
 MonthIDmay/MonthID
-DefaultAbbrvNameMai/DefaultAbbrvName
-DefaultFullNameMaio/DefaultFullName
+DefaultAbbrvNamemai/DefaultAbbrvName
+DefaultFullNamemaio/DefaultFullName
 /Month
 Month
 MonthIDjun/MonthID
-DefaultAbbrvNameJun/DefaultAbbrvName
-DefaultFullNameJunho/DefaultFullName
+DefaultAbbrvNamejun/DefaultAbbrvName
+DefaultFullNamejunho/DefaultFullName
 /Month
 Month
 MonthIDjul/MonthID
-DefaultAbbrvNameJul/DefaultAbbrvName
-DefaultFullNameJulho/DefaultFullName
+DefaultAbbrvNamejul/DefaultAbbrvName
+DefaultFullNamejulho/DefaultFullName
 /Month
 Month
 MonthIDaug/MonthID
-DefaultAbbrvNameAgo/DefaultAbbrvName
-DefaultFullNameAgosto/DefaultFullName
+DefaultAbbrvNameago/DefaultAbbrvName
+DefaultFullNameagosto/DefaultFullName
 /Month
 Month
 MonthIDsep/MonthID
-DefaultAbbrvNameSet/DefaultAbbrvName
-DefaultFullNameSetembro/DefaultFullName
+DefaultAbbrvNameset/DefaultAbbrvName
+DefaultFullNamesetembro/DefaultFullName
 /Month
 Month
 MonthIDoct/MonthID
-DefaultAbbrvNameOut/DefaultAbbrvName

[Libreoffice-commits] .: embeddedobj/inc embeddedobj/source embeddedobj/test

2011-11-23 Thread Joseph Powers

 embeddedobj/inc/pch/precompiled_embeddedobj.cxx  |   31 -
 embeddedobj/inc/pch/precompiled_embeddedobj.hxx  |   34 ---
 embeddedobj/source/commonembedding/embedobj.cxx  |2 -
 embeddedobj/source/commonembedding/inplaceobj.cxx|2 -
 embeddedobj/source/commonembedding/miscobj.cxx   |3 -
 embeddedobj/source/commonembedding/persistence.cxx   |3 -
 embeddedobj/source/commonembedding/register.cxx  |4 --
 embeddedobj/source/commonembedding/specialobject.cxx |2 -
 embeddedobj/source/commonembedding/visobj.cxx|2 -
 embeddedobj/source/commonembedding/xfactory.cxx  |2 -
 embeddedobj/source/general/docholder.cxx |2 -
 embeddedobj/source/general/dummyobject.cxx   |1 
 embeddedobj/source/general/intercept.cxx |3 -
 embeddedobj/source/general/xcreator.cxx  |2 -
 embeddedobj/source/msole/advisesink.cxx  |3 -
 embeddedobj/source/msole/closepreventer.cxx  |3 -
 embeddedobj/source/msole/graphconvert.cxx|2 -
 embeddedobj/source/msole/olecomponent.cxx|2 -
 embeddedobj/source/msole/oleembed.cxx|3 -
 embeddedobj/source/msole/olemisc.cxx |2 -
 embeddedobj/source/msole/olepersist.cxx  |3 -
 embeddedobj/source/msole/oleregister.cxx |4 --
 embeddedobj/source/msole/olevisual.cxx   |2 -
 embeddedobj/source/msole/olewrapclient.cxx   |3 -
 embeddedobj/source/msole/ownview.cxx |2 -
 embeddedobj/source/msole/xdialogcreator.cxx  |3 -
 embeddedobj/source/msole/xolefactory.cxx |2 -
 embeddedobj/test/MainThreadExecutor/register.cxx |4 --
 embeddedobj/test/MainThreadExecutor/xexecutor.cxx|3 -
 embeddedobj/test/mtexecutor/bitmapcreator.cxx|3 -
 embeddedobj/test/mtexecutor/mainthreadexecutor.cxx   |3 -
 embeddedobj/test/mtexecutor/mteregister.cxx  |4 --
 32 files changed, 144 deletions(-)

New commits:
commit 8d876c993e1f54c1a015e4a66eea47ad407bc142
Author: Joseph Powers jpower...@cox.net
Date:   Tue Nov 22 20:36:34 2011 -0800

Yet another empty pch file; in embeddedobj this time.

diff --git a/embeddedobj/inc/pch/precompiled_embeddedobj.cxx 
b/embeddedobj/inc/pch/precompiled_embeddedobj.cxx
deleted file mode 100644
index 7b17fa7..000
--- a/embeddedobj/inc/pch/precompiled_embeddedobj.cxx
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-#include precompiled_embeddedobj.hxx
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embeddedobj/inc/pch/precompiled_embeddedobj.hxx 
b/embeddedobj/inc/pch/precompiled_embeddedobj.hxx
deleted file mode 100644
index 758cd7a..000
--- a/embeddedobj/inc/pch/precompiled_embeddedobj.hxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more

[Libreoffice-commits] .: sc/source

2011-11-23 Thread Jan Holesovsky

 sc/source/ui/namedlg/namemgrtable.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 039cbb09351c133df81c4303ce30b327e07ff40a
Author: Jan Holesovsky ke...@suse.cz
Date:   Wed Nov 23 14:44:11 2011 +0100

'const_iterator' instead of 'iterator' to fix Windows build.

diff --git a/sc/source/ui/namedlg/namemgrtable.cxx 
b/sc/source/ui/namedlg/namemgrtable.cxx
index dc894a0..ad9ca9a 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -125,7 +125,7 @@ void ScRangeManagerTable::Init(const 
boost::ptr_maprtl::OUString, ScRangeName
 aLine.aScope = maGlobalString;
 else
 aLine.aScope = itr-first;
-for (ScRangeName::iterator it = pLocalRangeName-begin();
+for (ScRangeName::const_iterator it = pLocalRangeName-begin();
 it != pLocalRangeName-end(); ++it)
 {
 if (!it-HasType(RT_DATABASE)  !it-HasType(RT_SHARED))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

 configure.in |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 06fe563b1a9a38b9c0057e90f934435125b89605
Author: Andras Timar ati...@suse.com
Date:   Wed Nov 23 15:09:18 2011 +0100

don't enable java extensions without java

diff --git a/configure.in b/configure.in
index eebcc78..0d1ca1b 100644
--- a/configure.in
+++ b/configure.in
@@ -7565,7 +7565,7 @@ AC_SUBST(COMMONS_LOGGING_JAR)
 
 # scripting provider for BeanShell extension?
 AC_MSG_CHECKING([whether to build extension for support of scripts in 
BeanShell])
-if test x$enable_ext_scripting_beanshell = xyes -a 
x$enable_extension_integration != xno; then
+if test x$enable_ext_scripting_beanshell = xyes -a 
x$enable_extension_integration != xno -a x$with_java != xno; then
AC_MSG_RESULT([yes])
ENABLE_SCRIPTING_BEANSHELL=YES
 else
@@ -7577,7 +7577,7 @@ AC_SUBST(ENABLE_SCRIPTING_BEANSHELL)
 
 # scripting provider for JavaScript extension?
 AC_MSG_CHECKING([whether to build extension for support of scripts in 
JavaScript])
-if test x$enable_ext_scripting_javascript = xyes -a 
x$enable_extension_integration != xno; then
+if test x$enable_ext_scripting_javascript = xyes -a 
x$enable_extension_integration != xno -a x$with_java != xno; then
AC_MSG_RESULT([yes])
ENABLE_SCRIPTING_JAVASCRIPT=YES
 else
@@ -8196,7 +8196,7 @@ dnl 
===
 dnl Test whether to include NLPSolver extension
 dnl ===
 AC_MSG_CHECKING([for NLPSolver extension integration])
-if test x$enable_ext_nlpsolver = xyes -a x$enable_extension_integration 
!= xno; then
+if test x$enable_ext_nlpsolver = xyes -a x$enable_extension_integration 
!= xno -a x$with_java != no; then
 BUILD_TYPE=$BUILD_TYPE NLPSOLVER
 SCPDEFS=$SCPDEFS -DWITH_EXTENSION_NLPSOLVER
 AC_MSG_RESULT([yes])
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

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

New commits:
commit ff1b70c92aed555ecdbe424aac29373142c8fcb6
Author: Andras Timar ati...@suse.com
Date:   Wed Nov 23 15:11:31 2011 +0100

don't enable java extensions without java - fixup

diff --git a/configure.in b/configure.in
index 0d1ca1b..6abcc22 100644
--- a/configure.in
+++ b/configure.in
@@ -8196,7 +8196,7 @@ dnl 
===
 dnl Test whether to include NLPSolver extension
 dnl ===
 AC_MSG_CHECKING([for NLPSolver extension integration])
-if test x$enable_ext_nlpsolver = xyes -a x$enable_extension_integration 
!= xno -a x$with_java != no; then
+if test x$enable_ext_nlpsolver = xyes -a x$enable_extension_integration 
!= xno -a x$with_java != xno; then
 BUILD_TYPE=$BUILD_TYPE NLPSOLVER
 SCPDEFS=$SCPDEFS -DWITH_EXTENSION_NLPSOLVER
 AC_MSG_RESULT([yes])
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/bin

 solenv/bin/build.pl |   86 +---
 1 file changed, 42 insertions(+), 44 deletions(-)

New commits:
commit f4573ceb2965ccc8abc1f5165b0fa63f5d63649f
Author: Daisuke Nishino niboshi...@gmail.com
Date:   Sun Nov 13 17:19:30 2011 +0900

Fix bug in build.pl option parser

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index d402092..4957627 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1342,51 +1342,49 @@ sub usage {
 sub get_options {
 my $arg;
 while ($arg = shift @ARGV) {
-$arg =~ /^-P$/and $processes_to_run = shift @ARGV and 
next;
-$arg =~ /^-P(\d+)$/and $processes_to_run = $1 and next;
-$arg =~ /^--all$/and $build_all_parents = 1 and 
next;
-$arg =~ /^-a$/and $build_all_parents = 1 and next;
-$arg =~ /^--show$/and $show = 1 and 
next;
-$arg =~ /^--checkmodules$/   and $checkparents = 1 and $ignore = 1 
and next;
-$arg =~ /^-s$/and $show = 1 and next;
-$arg =~ /^--deliver$/and $deliver = 1 and next;
-$arg =~ /^(--job=)/   and $custom_job = $' and next;
-$arg =~ /^(--pre_job=)/   and $pre_custom_job = $' and next;
-$arg =~ /^(--post_job=)/   and $post_custom_job = $' and next; #'
-$arg =~ /^-d$/and $deliver = 1 and next;
-$arg =~ /^--dlv_switch$/and $dlv_switch = shift @ARGVand next;
-$arg =~ /^--file$/and $cmd_file = shift @ARGV and 
next;
-$arg =~ /^-F$/and $cmd_file = shift @ARGV and next;
-$arg =~ /^--skip$/and get_modules_passed(\%skip_modules)  and 
next;
-
-$arg =~ /^--all:(\S+)$/ and $build_all_parents = 1
-and $build_all_cont = $1and next;
-$arg =~ /^-a:(\S+)$/ and $build_all_parents = 1
-and $build_all_cont = $1and next;
+if ($arg =~ /^-P$/)  { $processes_to_run = shift @ARGV;
 next; }
+if ($arg =~ /^-P(\d+)$/) { $processes_to_run = $1; 
 next; }
+if ($arg =~ /^--all$/)   { $build_all_parents = 1; 
 next; }
+if ($arg =~ /^-a$/)  { $build_all_parents = 1; 
 next; }
+if ($arg =~ /^--show$/)  { $show = 1;  
 next; }
+if ($arg =~ /^--checkmodules$/)  { $checkparents = 1; $ignore = 1; 
 next; }
+if ($arg =~ /^-s$/)  { $show = 1;  
 next; }
+if ($arg =~ /^--deliver$/)   { $deliver = 1;   
 next; }
+if ($arg =~ /^(--job=)/) { $custom_job = $';   
 next; }
+if ($arg =~ /^(--pre_job=)/) { $pre_custom_job = $';   
 next; }
+if ($arg =~ /^(--post_job=)/){ $post_custom_job = $';  
 next; } #'
+if ($arg =~ /^-d$/)  { $deliver = 1;   
 next; }
+if ($arg =~ /^--dlv_switch$/){ $dlv_switch = shift @ARGV;  
 next; }
+if ($arg =~ /^--file$/)  { $cmd_file = shift @ARGV;
 next; }
+if ($arg =~ /^-F$/)  { $cmd_file = shift @ARGV;
 next; }
+if ($arg =~ /^--skip$/)  { get_modules_passed(\%skip_modules); 
 next; }
+
+if ($arg =~ /^--all:(\S+)$/) { $build_all_parents = 1;
+   $build_all_cont = $1;   
 next; }
+if ($arg =~ /^-a:(\S+)$/){ $build_all_parents = 1;
+   $build_all_cont = $1;   
 next; }
 if ($arg =~ /^--from$/ || $arg =~ /^-f$/) {
-$build_all_parents = 1;
-get_modules_passed(\%incompatibles);
-next;
-};
-$arg =~ /^--since$/and $build_all_parents = 1
-and $build_since = shift @ARGV and 
next;
-$arg =~ /^-c$/and $build_all_parents = 1
-and $build_since = shift @ARGV and 
next;
-$arg =~ /^-s$/and $build_all_parents = 1
-and $build_since = shift @ARGV and 
next;
-$arg =~ /^--help$/and usage()and 
do_exit(0);
-$arg =~ /^-h$/and usage()and 
do_exit(0);
-$arg =~ /^--ignore$/and $ignore = 1
and next;
-$arg =~ /^--html$/and $html = 1and 
next;
-$arg =~ /^--html_path$/ and $html_path = shift @ARGV  and next;
-

[Libreoffice-commits] .: binfilter/bf_basic binfilter/bf_svtools binfilter/legacysmgr

 binfilter/bf_basic/source/sbx/sbxbase.cxx |4 +-
 binfilter/bf_svtools/source/items1/svt_poolio.cxx |6 +--
 binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx |   20 --
 3 files changed, 14 insertions(+), 16 deletions(-)

New commits:
commit 74de99e98d3b5ef5df0717debc70e2b33da43ea9
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Nov 23 15:50:07 2011 +0100

Changed sal/log.h - sal/log.hxx, drop _S from C++ streaming log macros.

A compile time check ensures the common case of streaming just a plain
C-style string literal still produces reasonably compact call-site code.
The format-string variants are still available in sal/detail/log.h, but
only to be used in obsolete osl/diagnose.h etc., and going to be removed
again eventually.

diff --git a/binfilter/bf_basic/source/sbx/sbxbase.cxx 
b/binfilter/bf_basic/source/sbx/sbxbase.cxx
index 691030b..2a380c1 100644
--- a/binfilter/bf_basic/source/sbx/sbxbase.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxbase.cxx
@@ -27,7 +27,7 @@
  /
 
 #include rtl/oustringostreaminserter.hxx
-#include sal/log.h
+#include sal/log.hxx
 #include tools/stream.hxx
 
 #include sbx.hxx
@@ -214,7 +214,7 @@ SbxObject* SbxBase::CreateObject( const rtl::OUString 
rClass )
 if( pNew )
 break;
 }
-SAL_WARN_IF_S(!pNew, binfilter, No factory for object class   
rClass);
+SAL_WARN_IF(!pNew, binfilter, No factory for object class   rClass);
 return pNew;
 }
 
diff --git a/binfilter/bf_svtools/source/items1/svt_poolio.cxx 
b/binfilter/bf_svtools/source/items1/svt_poolio.cxx
index cd2426e..712846d 100644
--- a/binfilter/bf_svtools/source/items1/svt_poolio.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_poolio.cxx
@@ -31,7 +31,7 @@
 #include string.h
 #include stdio.h
 
-#include sal/log.h
+#include sal/log.hxx
 #include bf_svtools/bf_solar.h
 #include bf_svtools/itempool.hxx
 #include whassert.hxx
@@ -669,11 +669,11 @@ SvStream SfxItemPool::Load1_Impl(SvStream rStream)
 delete rpNewItem;
 rpNewItem = pOldItem;
 bFound = TRUE;
-SAL_INFO_S(
+SAL_INFO(
 binfilter, reusing item  pOldItem);
 }
 }
-SAL_INFO_IF_S(
+SAL_INFO_IF(
 !bFound, binfilter,
 item not found:   pOldItem);
 }
diff --git a/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx 
b/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx
index e4ade6f..bde5994 100644
--- a/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx
+++ b/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx
@@ -40,7 +40,7 @@
 #include rtl/oustringostreaminserter.hxx
 #include rtl/ustrbuf.hxx
 #include rtl/unload.h
-#include sal/log.h
+#include sal/log.hxx
 
 #include uno/dispatcher.h
 
@@ -491,12 +491,12 @@ void OServiceManager_Listener::disposing(const 
EventObject  rEvt )
 }
 catch( const IllegalArgumentException  e )
 {
-SAL_WARN_S(
+SAL_WARN(
 binfilter, IllegalArgumentException caught:   e.Message);
 }
 catch( const NoSuchElementException  e )
 {
-SAL_WARN_S(
+SAL_WARN(
 binfilter, NoSuchElementException caught:   e.Message);
 }
 }
@@ -804,7 +804,7 @@ void OServiceManager::disposing()
 }
 catch (const RuntimeException  e)
 {
-SAL_WARN_S(
+SAL_WARN(
 binfilter,
 RuntimeException occurred upon disposing factory: 
  e.Message);
@@ -1003,7 +1003,7 @@ Reference XInterface  
OServiceManager::createInstanceWithContext(
 Reference XSingleServiceFactory  xFac2( xFactory, 
UNO_QUERY );
 if (xFac2.is())
 {
-SAL_INFO_S(
+SAL_INFO(
 binfilter,
 ignoring given context raising service 
  rServiceSpecifier);
@@ -1014,8 +1014,7 @@ Reference XInterface  
OServiceManager::createInstanceWithContext(
 }
 catch (const lang::DisposedException  e)
 {
-SAL_WARN_S(
-binfilter, DisposedException occurred:   e.Message);
+SAL_WARN(binfilter, DisposedException occurred:   e.Message);
 }
 }
 
@@ -1050,7 +1049,7 @@ Reference XInterface  
OServiceManager::createInstanceWithArgumentsAndContext(
 Reference XSingleServiceFactory  xFac2( xFactory, 
UNO_QUERY );

[Libreoffice-commits] .: dbaccess/Library_dbu.mk dbaccess/Library_dbui.mk dbaccess/source

 dbaccess/Library_dbu.mk |6 --
 dbaccess/Library_dbui.mk|   17 -
 dbaccess/source/ui/dlg/ConnectionHelper.cxx |4 
 3 files changed, 4 insertions(+), 23 deletions(-)

New commits:
commit 538190e0ea142d0a7da244809c66241379d4d91b
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Wed Nov 23 14:34:24 2011 +0100

fdo#32347: reenable ADO URL helper UI

cleanup obsolete DISABLE_ADO/WINDOWS_VISTA_PSDK logic

diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 0419c29..6c645c9 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -50,12 +50,6 @@ $(eval $(call gb_Library_add_defs,dbu,\
 $(if $(filter YES,$(SYSTEM_ODBC_HEADERS)),-DSYSTEM_ODBC_HEADERS) \
 ))
 
-ifeq (,$(strip $(PROF_EDITION)))
-$(eval $(call gb_Library_add_defs,dbu,\
--DWINDOWS_VISTA_PSDK \
-))
-endif
-
 ifeq ($(GUI)$(COM),WNTGCC) # for adoint.h
 $(eval $(call gb_Library_add_cxxflags,dbu,\
 -fpermissive \
diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk
index 3c6bfb2..0808896 100644
--- a/dbaccess/Library_dbui.mk
+++ b/dbaccess/Library_dbui.mk
@@ -51,34 +51,17 @@ $(eval $(call gb_Library_add_cflags,dbui,\
 ))
 endif
 
-ifneq ($(WINDOWS_VISTA_PSDK),)
-ifeq ($(PROF_EDITION),)
-$(eval $(call gb_Library_add_defs,dbui,\
-   -DDBACCESS_DLLIMPLEMENTATION\
-   -DWINDOWS_VISTA_PSDK \
-))
-endif
-endif
-
 ifeq ($(GUI)$(COM),WNTGCC)
 $(eval $(call gb_Library_add_cflags,dbui,\
-fpermissive \
 ))
 endif
 
-ifeq ($(PROF_EDITION),)
-ifneq ($(WINDOWS_VISTA_PSDK),)
-DISABLE_ADO=TRUE
-endif
-endif
-
 ifeq ($(OS),WNT)
-ifeq ($(DISABLE_ADO),)
 $(eval $(call gb_Library_add_exception_objects,dbui,\
dbaccess/source/ui/dlg/adodatalinks \
 ))
 endif
-endif
 
 $(eval $(call gb_Library_add_defs,dbui,\
-DDBACCESS_DLLIMPLEMENTATION\
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx 
b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index bc03951..7ec94ad 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -71,6 +71,10 @@
 #include tools/diagnose_ex.h
 #include sfx2/docfilt.hxx
 
+#if defined(WNT)
+#define _ADO_DATALINK_BROWSE_
+#endif
+
 #ifdef _ADO_DATALINK_BROWSE_
 #include vcl/sysdata.hxx
 #include adodatalinks.hxx
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sal/osl

 sal/osl/unx/system.c |4 
 1 file changed, 4 insertions(+)

New commits:
commit f1ef1ed6900fa2caf7c5997e8b764c3f82c0a125
Author: Michael Meeks michael.me...@suse.com
Date:   Wed Nov 23 15:30:06 2011 +

version information from Arnaud on deprecating the getpid workaround.

diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c
index 4041edb..478fdaf 100644
--- a/sal/osl/unx/system.c
+++ b/sal/osl/unx/system.c
@@ -205,6 +205,10 @@ int macxp_resolveAlias(char *path, int buflen)
 /* The linux kernel thread implemention, always return the pid of the
thread subprocess and not of the main process. So we save the main
pid at startup
+   FIXME: when our Linux base-line is above:
++ Linux kernel version 2.6.18 or higher; - clone() for NTPL
++ glibc2 version 2.5 or higher; - NPTL
+   Then we get a working getpid() and can remove this hack.
 */
 
 // Directly from libc.so.6, obviously missing from some unistd.h:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - sw/inc sw/source unusedcode.easy

 sw/inc/swcrsr.hxx |4 ++--
 sw/source/core/crsr/swcrsr.cxx|9 +
 sw/source/core/fields/cellfml.cxx |4 ++--
 unusedcode.easy   |7 ---
 4 files changed, 13 insertions(+), 11 deletions(-)

New commits:
commit b2e84f9a40fda7821d4e658f9102bcbc783a1ba3
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Nov 23 15:32:43 2011 +

std::map::erase takes a nonconst iterator

diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index f7bb248..9bb433a 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -283,8 +283,8 @@ public:
 virtual sal_Bool GotoTable( const String rName );
 
 void InsertBox( const SwTableBox rTblBox );
-void DeleteBox( SwSelBoxes::const_iterator it ) { aSelBoxes.erase( it ); 
bChg = sal_True; }
-void DeleteBox( SwSelBoxes::const_iterator itFirst, 
SwSelBoxes::const_iterator itLast ) { aSelBoxes.erase( itFirst, itLast ); bChg 
= sal_True; }
+void DeleteBox( SwSelBoxes::iterator it ) { aSelBoxes.erase( it ); bChg = 
sal_True; }
+void DeleteBox( SwSelBoxes::iterator itFirst, SwSelBoxes::iterator itLast 
) { aSelBoxes.erase( itFirst, itLast ); bChg = sal_True; }
 void DeleteAllBoxes() { DeleteBox(aSelBoxes.begin(), aSelBoxes.end()); }
 sal_uInt16 GetBoxesCount() const { return aSelBoxes.size(); }
 const SwSelBoxes GetBoxes() const { return aSelBoxes; }
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 8b4fab8..650b01d 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -2165,8 +2165,9 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr )
 
 else
 {
-SwSelBoxes::const_iterator it = aTmp.find(pSttNd-GetIndex());
-if( it != aTmp.end() ) {
+SwSelBoxes::iterator it = aTmp.find(pSttNd-GetIndex());
+if( it != aTmp.end() )
+{
 SwNodeIndex aIdx( *pSttNd, 1 );
 const SwNode* pNd = aIdx.GetNode();
 if( !pNd-IsCntntNode() )
@@ -2272,7 +2273,7 @@ bool SwTableCursor::NewTableSelection()
 
 void SwTableCursor::ActualizeSelection( const SwSelBoxes rNew )
 {
-SwSelBoxes::const_iterator itOld = aSelBoxes.begin();
+SwSelBoxes::iterator itOld = aSelBoxes.begin();
 SwSelBoxes::const_iterator itNew = rNew.begin();
 while ( itOld != aSelBoxes.end()  itNew != rNew.end() )
 {
@@ -2285,7 +2286,7 @@ void SwTableCursor::ActualizeSelection( const SwSelBoxes 
rNew )
 }
 else if( pPOld-GetSttIdx()  pPNew-GetSttIdx() )
 {
-SwSelBoxes::const_iterator it = itOld;
+SwSelBoxes::iterator it = itOld;
 ++itOld;
 DeleteBox( it ); // this box has to go
 }
diff --git a/sw/source/core/fields/cellfml.cxx 
b/sw/source/core/fields/cellfml.cxx
index 5e7c1e4..17d3db2 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -349,7 +349,7 @@ void SwTableFormula::_MakeFormel( const SwTable rTbl, 
String rNewStr,
 
 rNewStr += '(';
 bool bDelim = false;
-for( SwSelBoxes::const_iterator it = aBoxes.begin();
+for( SwSelBoxes::iterator it = aBoxes.begin();
  it != aBoxes.end()  !pCalcPara-rCalc.IsCalcError();
  ++it )
 {
@@ -960,7 +960,7 @@ void SwTableFormula::GetBoxes( const SwTableBox rSttBox,
 break;
 
 // dann mal die Tabellenkoepfe raus:
-for( SwSelBoxes::const_iterator it = rBoxes.begin(); it != 
rBoxes.end(); ++it )
+for( SwSelBoxes::iterator it = rBoxes.begin(); it != rBoxes.end(); 
++it )
 {
 pLine = it-second-GetUpper();
 while( pLine-GetUpper() )
commit 7434fa5bbd051dc4842bc76d33f27e07f10e0053
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Nov 23 15:21:13 2011 +

update list post SwSelBoxes conversion

diff --git a/unusedcode.easy b/unusedcode.easy
index 6bb28a2..77d915b 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -387,6 +387,7 @@ ScDPItemData::GetNumFormat() const
 
ScDPSaveData::Refresh(com::sun::star::uno::Referencecom::sun::star::sheet::XDimensionsSupplier
 const)
 ScDdeLink::ResetValue()
 ScDocRowHeightUpdater::TabRanges::TabRanges()
+ScDocument::SetAllTabRangeNames(std::__debug::mapshort, ScRangeName const*, 
std::lessshort, std::allocatorstd::pairshort const, ScRangeName const*   
const)
 ScDocument::ValidNewTabName(std::__debug::vectorrtl::OUString, 
std::allocatorrtl::OUString  const) const
 
ScFilterDetect::impl_createFactory(com::sun::star::uno::Referencecom::sun::star::lang::XMultiServiceFactory
 const)
 ScFormulaCell::IsRangeNameInUse(unsigned short) const
@@ -408,7 +409,9 @@ ScMultiTextWnd::GetLineCount()
 ScMyCellInfo::ScMyCellInfo()
 ScMyStyleRanges::SetStylesToRanges(ScRangeList*, rtl::OUString const*, short, 
rtl::OUString const*, ScXMLImport)

[Libreoffice-commits] .: icc/prj icc/source

2011-11-23 Thread Tomáš Chvátal

 icc/prj/build.lst  |4 ++--
 icc/source/create_sRGB_profile/makefile.mk |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ce2a78b4efe5c62d4aa13109401dc820e3891e71
Author: Tomas Chvatal tchva...@suse.cz
Date:   Wed Nov 23 17:05:19 2011 +0100

Whitespace and expand comment, drop useless rm.

diff --git a/icc/prj/build.lst b/icc/prj/build.lst
index 45fbe5a..ac7cf32 100644
--- a/icc/prj/build.lst
+++ b/icc/prj/build.lst
@@ -1,4 +1,4 @@
-ip icc :   solenv external sal NULL
+ip icc :   solenv external sal NULL
 ip icc usr1-   all ip_mkout
NULL
 ip icc nmake   -   all ip_icc  
NULL
-ip  icc/source/create_sRGB_profile nmake   -   all ip_profile 
ip_icc   NULL 
+ip icc/source/create_sRGB_profile  nmake   -   all ip_profile 
ip_icc   NULL 
diff --git a/icc/source/create_sRGB_profile/makefile.mk 
b/icc/source/create_sRGB_profile/makefile.mk
index d3dc3f9..56a9a67 100644
--- a/icc/source/create_sRGB_profile/makefile.mk
+++ b/icc/source/create_sRGB_profile/makefile.mk
@@ -68,6 +68,7 @@ APP1STDLIBS=\
 -lICC_utils
 # this library is not in pkgconfig but in the same dir
 # so no need to cry for it and just hardcode it here
+# bug also opened upstream about this
 .ELSE
 APP1LIBS=\
 $(SLB)$/proflib.lib \
@@ -81,5 +82,4 @@ APP1OBJS= $(OBJFILES)
 ALLTAR: $(TARGET)$(EXECPOST)
 
 $(TARGET)$(EXECPOST): $(BIN)$/$(TARGET)$(EXECPOST)
-rm -rf $@
 cd $(BIN)$/  $(BIN)$/$(TARGET)$(EXECPOST)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-11-23 Thread Noel Power

 sc/inc/sc.hrc |4 -
 sc/source/ui/app/inputwin.cxx |  146 --
 sc/source/ui/inc/inputwin.hxx |   19 +++--
 sc/source/ui/src/toolbox.src  |   11 +++
 4 files changed, 140 insertions(+), 40 deletions(-)

New commits:
commit 6151ec073e86be2fccffd5bf46d31a8261a232d3
Author: Noel Power noel.po...@novell.com
Date:   Wed Nov 23 16:27:17 2011 +

add mouse resize (and other bits ) to gsoc formulabar

diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 2edba1e..6ca8544 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1006,7 +1006,9 @@
 #define SCSTR_SET_TAB_BG_COLOR  (STR_START + 403)
 #define SCSTR_NO_TAB_BG_COLOR   (STR_START + 404)
 #define SCSTR_DDEDOC_NOT_LOADED (STR_START + 405)
-#define SCSTR_EXTDOC_NOT_LOADED (STR_START + 406)
+#define SCSTR_QHELP_EXPAND_FORMULA   (STR_START + 406)
+#define SCSTR_QHELP_COLLAPSE_FORMULA (STR_START + 407)
+#define SCSTR_EXTDOC_NOT_LOADED (STR_START + 408)
 
 
 #define STR_END (SCSTR_EXTDOC_NOT_LOADED)
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 82d9253..da067b8 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -88,7 +88,7 @@
 #define THESIZE 100 //!!! langt... :-)
 #define TBX_WINDOW_HEIGHT   22 // in Pixeln - fuer alle Systeme gleich?
 #define LEFT_OFFSET 5
-#define INPUTWIN_MULTILINES 10
+#define INPUTWIN_MULTILINES 6
 
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::UNO_QUERY;
@@ -179,7 +179,8 @@ ScInputWindow::ScInputWindow( Window* pParent, SfxBindings* 
pBind ) :
 aTextSum( ScResId( SCSTR_QHELP_BTNSUM ) ),
 aTextEqual  ( ScResId( SCSTR_QHELP_BTNEQUAL ) ),
 bIsOkCancelMode ( false ),
-bIsMultiLine( false )
+bIsMultiLine( false ),
+bInResize   ( false )
 {
 ScModule*pScMod  = SC_MOD();
 SfxImageManager* pImgMgr = SfxImageManager::GetImageManager( pScMod );
@@ -516,7 +517,7 @@ void ScInputWindow::Select()
 
 void ScInputWindow::Resize()
 {
-
+ToolBox::Resize();
 if ( lcl_isExperimentalMode() )
 {
 Size aSize = GetSizePixel();
@@ -536,7 +537,6 @@ void ScInputWindow::Resize()
 aTextWindow.SetSizePixel( aSize );
 aTextWindow.Invalidate();
 }
-ToolBox::Resize();
 }
 
 void ScInputWindow::SetFuncString( const String rString, sal_Bool bDoEdit )
@@ -749,14 +749,72 @@ void ScInputWindow::DataChanged( const DataChangedEvent 
rDCEvt )
 ToolBox::DataChanged( rDCEvt );
 }
 
-bool ScInputWindow::GetMultiLineStatus()
+void ScInputWindow::MouseMove( const MouseEvent rMEvt )
 {
-return bIsMultiLine;
+if ( lcl_isExperimentalMode() )
+{
+Point aPosPixel = GetPointerPosPixel();
+Point aPnt = PixelToLogic( aPosPixel );
+
+ScInputBarGroup* pGroupBar = dynamic_cast ScInputBarGroup*  ( 
pRuntimeWindow.get() );
+if ( bInResize || ( GetOutputSizePixel().Height() - aPosPixel.Y() = 4 
 ) )
+{
+SetPointer( Pointer( POINTER_WINDOW_SSIZE ) );
+
+if ( rMEvt.IsLeft() )
+{
+// Don't leave the mouse pointer leave *this* window
+CaptureMouse();
+bInResize = true;
+}
+else
+{
+ReleaseMouse();
+bInResize = false;
+}
+
+if ( bInResize )
+{
+// Trigger resize
+long nResizeThreshold = ( (long)TBX_WINDOW_HEIGHT * 0.7 );
+bool bResetPointerPos = false;
+if ( GetOutputSizePixel().Height() - aPosPixel.Y()  
-nResizeThreshold  )
+{
+pGroupBar-IncrementVerticalSize();
+bResetPointerPos = true;
+}
+else if ( ( GetOutputSizePixel().Height() - aPosPixel.Y()  )  
nResizeThreshold )
+{
+bResetPointerPos = true;
+pGroupBar-DecrementVerticalSize();
+}
+
+if ( bResetPointerPos )
+{
+aPosPixel.Y() =  GetOutputSizePixel().Height();
+SetPointerPosPixel( aPosPixel );
+}
+
+}
+}
+else
+{
+ReleaseMouse();
+SetPointer( Pointer( POINTER_ARROW ) );
+}
+}
+ToolBox::MouseMove( rMEvt );
 }
 
-void ScInputWindow::SetMultiLineStatus(bool bMode)
+void ScInputWindow::MouseButtonUp( const MouseEvent rMEvt )
 {
-bIsMultiLine=bMode;
+if ( lcl_isExperimentalMode() )
+{
+ReleaseMouse();
+if ( rMEvt.IsLeft() )
+bInResize = false;
+}
+ToolBox::MouseButtonUp( rMEvt );
 }
 
 
@@ -783,9 +841,9 @@ ScInputBarGroup::ScInputBarGroup(Window* pParent)
   
aButton.SetSizePixel(Size(GetSettings().GetStyleSettings().GetScrollBarSize(), 
TBX_WINDOW_HEIGHT) );

[Libreoffice-commits] .: sw/source

 sw/source/core/doc/doccomp.cxx |2 
 sw/source/core/doc/docdde.cxx  |   52 ++---
 sw/source/core/doc/docdesc.cxx |  153 ++---
 3 files changed, 97 insertions(+), 110 deletions(-)

New commits:
commit ed870efe80397042d8f51d2ca7002025ba4e111f
Author: Philipp Weissenbacher p.weissenbac...@gmail.com
Date:   Sat Nov 19 12:05:18 2011 +0100

Translated German comments to English.

diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 169fa4d..6962621 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -1510,7 +1510,7 @@ void SwCompareData::SetRedlinesToDoc( sal_Bool 
bUseDocInfo )
 }
 else
 {
-// liegen hintereinander also zusammen fassen
+// are consecutive, so combine
 rSttEnd = *((SwPaM*)pTmp-GetNext())-End();
 delete pTmp-GetNext();
 }
diff --git a/sw/source/core/doc/docdde.cxx b/sw/source/core/doc/docdde.cxx
index 10892ca..f364f8c 100644
--- a/sw/source/core/doc/docdde.cxx
+++ b/sw/source/core/doc/docdde.cxx
@@ -42,11 +42,11 @@
 #include unotools/charclass.hxx
 #include fmtcntnt.hxx
 #include doc.hxx
-#include swserv.hxx   // fuer Server-Funktionalitaet
+#include swserv.hxx   // for server functionality
 #include IMark.hxx
 #include bookmrk.hxx
-#include section.hxx  // fuer SwSectionFmt
-#include swtable.hxx  // fuer SwTable
+#include section.hxx  // for SwSectionFmt
+#include swtable.hxx  // for SwTable
 #include node.hxx
 #include ndtxt.hxx
 #include pam.hxx
@@ -106,20 +106,20 @@ sal_Bool lcl_FindSection( const SwSectionFmtPtr 
rpSectFmt, void* pArgs, bool bC
 : GetAppCharClass().lower( pItem-m_Item ) );
 if( sNm == sCompare )
 {
-// gefunden, als erfrage die Daten
+// found, so get the data
 const SwNodeIndex* pIdx;
 if( 0 != (pIdx = rpSectFmt-GetCntnt().GetCntntIdx() ) 
 rpSectFmt-GetDoc()-GetNodes() == pIdx-GetNodes() )
 {
-// eine Tabelle im normalen NodesArr
+// a table in the normal NodesArr
 pItem-pSectNd = pIdx-GetNode().GetSectionNode();
 return sal_False;
 }
-//nein!!// sollte der Namen schon passen, der Rest aber nicht, 
dann haben wir
-// sie nicht. Die Namen sind immer eindeutig.
+// If the name is already correct, but not the rest then we don't 
have them.
+// The names are always unique.
 }
 }
-return sal_True;// dann weiter
+return sal_True;
 }
 sal_Bool lcl_FindSectionCaseSensitive( const SwSectionFmtPtr rpSectFmt, void* 
pArgs )
 {
@@ -145,15 +145,15 @@ sal_Bool lcl_FindTable( const SwFrmFmtPtr rpTableFmt, 
void* pArgs )
 pFBox-GetSttNd() 
 rpTableFmt-GetDoc()-GetNodes() == 
pFBox-GetSttNd()-GetNodes() )
 {
-// eine Tabelle im normalen NodesArr
+// a table in the normal NodesArr
 pItem-pTblNd = (SwTableNode*)
 pFBox-GetSttNd()-FindTableNode();
 return sal_False;
 }
-//nein! // sollte der Namen schon passen, der Rest aber nicht, dann haben 
wir
-// sie nicht. Die Namen sind immer eindeutig.
+// If the name is already correct, but not the rest then we don't have 
them.
+// The names are always unique.
 }
-return sal_True;// dann weiter
+return sal_True;
 }
 
 
@@ -161,7 +161,7 @@ sal_Bool lcl_FindTable( const SwFrmFmtPtr rpTableFmt, 
void* pArgs )
 bool SwDoc::GetData( const String rItem, const String rMimeType,
  uno::Any  rValue ) const
 {
-//search for bookmarks and sections case senstive at first. If nothing is 
found then try again case insensitive
+// search for bookmarks and sections case senstive at first. If nothing is 
found then try again case insensitive
 bool bCaseSensitive = true;
 while( true )
 {
@@ -169,14 +169,14 @@ bool SwDoc::GetData( const String rItem, const String 
rMimeType,
 if(pBkmk)
 return SwServerObject(*pBkmk).GetData(rValue, rMimeType);
 
-// haben wir ueberhaupt das Item vorraetig?
+// Do we already have the Item?
 String sItem( bCaseSensitive ? rItem : GetAppCharClass().lower(rItem));
 _FindItem aPara( sItem );
 ((SwSectionFmts)*pSectionFmtTbl).ForEach( 0, pSectionFmtTbl-Count(),
 bCaseSensitive ? 
lcl_FindSectionCaseSensitive : lcl_FindSectionCaseInsensitive, aPara );
 if( aPara.pSectNd )
 {
-// gefunden, als erfrage die Daten
+// found, so get the data
 return SwServerObject( *aPara.pSectNd

[Libreoffice-commits] .: sw/source

 sw/source/core/doc/docdesc.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 23daad00e0fdea88edb746dffaf12d684dec6909
Author: Petr Mladek pmla...@suse.cz
Date:   Wed Nov 23 18:07:27 2011 +0100

fixed the German translations

RÃ¤nder means margins
Umrandung means borders

diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index c8b7a73..30f 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -92,9 +92,9 @@ static void lcl_DefaultPageFmt( sal_uInt16 nPoolFmtId,
 const Size aPhysSize = SvxPaperInfo::GetDefaultPaperSize();
 aFrmSize.SetSize( aPhysSize );
 
-// Prepare for default borders.
-// Borders have a default minimum size.
-// If the printer forces a larger border, that's ok too.
+// Prepare for default margins.
+// Margins have a default minimum size.
+// If the printer forces a larger margins, that's ok too.
 // The HTML page desc had A4 as page size always.
 // This has been changed to take the page size from the printer.
 // Unfortunately, the margins of the HTML page desc are smaller than
@@ -117,7 +117,7 @@ static void lcl_DefaultPageFmt( sal_uInt16 nPoolFmtId,
 nMinLeft = nMinRight = 1800;//  1,25 Inch
 }
 
-// Set borders.
+// set margins
 SvxLRSpaceItem aLR( RES_LR_SPACE );
 SvxULSpaceItem aUL( RES_UL_SPACE );
 
@@ -262,7 +262,7 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc 
rChged )
 {
 SwFmtHeader aHead( MakeLayoutFmt( RND_STD_HEADERL, 0 ) );
 pDesc-GetLeft().SetFmtAttr( aHead );
-// Take over additional attributes (borders, border strips ...).
+// take over additional attributes (margins, borders ...)
 ::lcl_DescSetAttr( *rHead.GetHeaderFmt(), *aHead.GetHeaderFmt(), 
sal_False);
 }
 else
@@ -322,7 +322,7 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc 
rChged )
 {
 SwFmtFooter aFoot( MakeLayoutFmt( RND_STD_FOOTER, 0 ) );
 pDesc-GetLeft().SetFmtAttr( aFoot );
-// Take over additional attributes (borders, border strips ...).
+// Take over additional attributes (margins, borders ...).
 ::lcl_DescSetAttr( *rFoot.GetFooterFmt(), *aFoot.GetFooterFmt(), 
sal_False);
 }
 else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

 sc/source/ui/app/inputwin.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 5d7964a5c4f7fbb41df05042229d540feb32de8c
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Nov 23 18:20:53 2011 +0100

-Werror=unused-but-set-variable fix

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index da067b8..4818785 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -754,7 +754,6 @@ void ScInputWindow::MouseMove( const MouseEvent rMEvt )
 if ( lcl_isExperimentalMode() )
 {
 Point aPosPixel = GetPointerPosPixel();
-Point aPnt = PixelToLogic( aPosPixel );
 
 ScInputBarGroup* pGroupBar = dynamic_cast ScInputBarGroup*  ( 
pRuntimeWindow.get() );
 if ( bInResize || ( GetOutputSizePixel().Height() - aPosPixel.Y() = 4 
 ) )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sal/inc

 sal/inc/sal/log.hxx |   16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 364a3d2864973935b2cd18b328392d1b556456dd
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Nov 23 20:26:52 2011 +0100

Silence bogus MSC must return a value errors.

diff --git a/sal/inc/sal/log.hxx b/sal/inc/sal/log.hxx
index be71d02..cf22519 100644
--- a/sal/inc/sal/log.hxx
+++ b/sal/inc/sal/log.hxx
@@ -91,25 +91,39 @@ template typename T  inline StreamIgnore operator (
 StreamStart const , T const )
 {
 std::abort();
+#if defined _MSC_VER
+return StreamIgnore();
+#endif
 }
 
 template typename T  inline StreamIgnore operator (
 StreamString const , T const )
 {
 std::abort();
+#if defined _MSC_VER
+return StreamIgnore();
+#endif
 }
 
 template typename T  inline StreamIgnore operator (
 StreamIgnore const , T const )
 {
 std::abort();
+#if defined _MSC_VER
+return StreamIgnore();
+#endif
 }
 
 template typename T  typename T::Result getResult(T const );
 
 inline char const * unwrapStream(StreamString const  s) { return s.string; }
 
-inline char const * unwrapStream(StreamIgnore const ) { std::abort(); }
+inline char const * unwrapStream(StreamIgnore const ) {
+std::abort();
+#if defined _MSC_VER
+return 0;
+#endif
+}
 
 } }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - offapi/com offapi/UnoApi_offapi.mk sc/inc sc/source sc/xml

 offapi/UnoApi_offapi.mk  |1 
 offapi/com/sun/star/sheet/XSpreadsheets2.idl |   75 +++
 sc/inc/docuno.hxx|   13 
 sc/source/ui/unoobj/docuno.cxx   |   59 +
 sc/xml/ScTableSheetsObj.xml  |1 
 5 files changed, 137 insertions(+), 12 deletions(-)

New commits:
commit ba897375db27a2b74ead5251516824572260b029
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Wed Nov 23 15:27:51 2011 -0500

Let's throw out-of-bound exception on out-of-bound destination position.

diff --git a/offapi/com/sun/star/sheet/XSpreadsheets2.idl 
b/offapi/com/sun/star/sheet/XSpreadsheets2.idl
index c4f8af1..c3635b9 100644
--- a/offapi/com/sun/star/sheet/XSpreadsheets2.idl
+++ b/offapi/com/sun/star/sheet/XSpreadsheets2.idl
@@ -27,7 +27,7 @@
 #include com/sun/star/sheet/XSpreadsheets.idl
 #include com/sun/star/sheet/XSpreadsheetDocument.idl
 #include com/sun/star/lang/IllegalArgumentException.idl
-#include com/sun/star/uno/RuntimeException.idl
+#include com/sun/star/lang/IndexOutOfBoundsException.idl
 
 //=
 
@@ -64,7 +64,7 @@ interface XSpreadsheets2: com::sun::star::sheet::XSpreadsheets
 [in] string srcName,
 [in] long  nDestPosition)
 raises (com::sun::star::lang::IllegalArgumentException,
-com::sun::star::uno::RuntimeException);
+com::sun::star::lang::IndexOutOfBoundsException);
 };
 
 //=
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 1ca0d71..35296da 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -406,7 +406,9 @@ public:
 ::com::sun::star::sheet::XSpreadsheetDocument   xDocSrc,
 const rtl::OUString srcName,
 const sal_Int32 nDestPosition)
-throw(::com::sun::star::lang::IllegalArgumentException, 
::com::sun::star::uno::RuntimeException);
+throw(::com::sun::star::lang::IllegalArgumentException,
+  ::com::sun::star::lang::IndexOutOfBoundsException,
+  ::com::sun::star::uno::RuntimeException);
 
 // XCellRangesAccess
 
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 95632e6..3bc1018 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -2632,7 +2632,7 @@ void SAL_CALL ScTableSheetsObj::removeByName( const 
rtl::OUString aName )
 sal_Int32 ScTableSheetsObj::importSheet(
 const uno::Reference  sheet::XSpreadsheetDocument   xDocSrc,
 const rtl::OUString srcName, const sal_Int32 nDestPosition )
-throw( lang::IllegalArgumentException, uno::RuntimeException )
+throw( lang::IllegalArgumentException, 
lang::IndexOutOfBoundsException, uno::RuntimeException )
 {
 //pDocShell is the destination
 ScDocument* pDocDest = pDocShell-GetDocument();
@@ -2655,11 +2655,11 @@ sal_Int32 ScTableSheetsObj::importSheet(
 SCTAB nCount = pDocDest-GetTableCount();
 nIndexDest = static_castSCTAB(nDestPosition);
 if ( nIndexDest  nCount )
-nIndexDest = nCount;
+throw lang::IndexOutOfBoundsException();
 
 // control nDestPosition  0
-if ( nIndexDest  0)
-nIndexDest = 0;
+if (nIndexDest  0)
+throw lang::IndexOutOfBoundsException();
 
 // Transfert Tab
 bool bInsertNew = true;
commit 2ee55872ebc5aeb71041c3267d9b3baa9607b85b
Author: Laurent Godard lgodard.li...@laposte.net
Date:   Mon Nov 21 17:32:13 2011 +0100

importSheet from an external provided document

define a new interface XSpreadsheets2
clean some String in docuno.cxx while i'm at it.

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 4328206..f63ddd3 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -3458,6 +3458,7 @@ $(eval $(call 
gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sheet,\
XSpreadsheetDocument \
XSpreadsheetView \
XSpreadsheets \
+   XSpreadsheets2 \
XSubTotalCalculatable \
XSubTotalDescriptor \
XSubTotalField \
diff --git a/offapi/com/sun/star/sheet/XSpreadsheets2.idl 
b/offapi/com/sun/star/sheet/XSpreadsheets2.idl
new file mode 100644
index 000..c4f8af1
--- /dev/null
+++ b/offapi/com/sun/star/sheet/XSpreadsheets2.idl
@@ -0,0 +1,75 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an AS IS basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under

[Libreoffice-commits] .: i18npool/source

 i18npool/source/localedata/data/la_VA.xml |  172 --
 1 file changed, 117 insertions(+), 55 deletions(-)

New commits:
commit 0b00165c300c6fe4cbdc952d49d050121d3d0063
Author: Roman Eisele p...@roman-eisele.de
Date:   Wed Nov 23 21:45:31 2011 +0100

updated Latin [la-VA] locale data

diff --git a/i18npool/source/localedata/data/la_VA.xml 
b/i18npool/source/localedata/data/la_VA.xml
index 693ced4..042e9f4 100644
--- a/i18npool/source/localedata/data/la_VA.xml
+++ b/i18npool/source/localedata/data/la_VA.xml
@@ -30,8 +30,8 @@
   DoubleQuotationStartâ/DoubleQuotationStart
   DoubleQuotationEndâ/DoubleQuotationEnd
 /Markers
-TimeAMm./TimeAM
-TimePMp./TimePM
+TimeAMa.m./TimeAM
+TimePMp.m./TimePM
 MeasurementSystemmetric/MeasurementSystem
   /LC_CTYPE
   LC_FORMAT
@@ -182,124 +182,186 @@
 IndexKey phonetic=false default=true 
unoid=alphanumericA-Z/IndexKey
 UnicodeScript0/UnicodeScript
 UnicodeScript1/UnicodeScript
-FollowPageWord e seg./FollowPageWord
-FollowPageWord e segg./FollowPageWord
+FollowPageWord et seq./FollowPageWord
+FollowPageWord et seqq./FollowPageWord
   /LC_INDEX
   LC_CALENDAR
 Calendar unoid=gregorian default=true
   DaysOfWeek
 Day
   DayIDsun/DayID
-  DefaultAbbrvNamedom/DefaultAbbrvName
-  DefaultFullNamedominicus dies/DefaultFullName
+  DefaultAbbrvNameDom/DefaultAbbrvName
+  DefaultFullNameDominicus dies/DefaultFullName
 /Day
 Day
   DayIDmon/DayID
-  DefaultAbbrvNamelun/DefaultAbbrvName
-  DefaultFullNamelunae dies/DefaultFullName
+  DefaultAbbrvNameLun/DefaultAbbrvName
+  DefaultFullNameLunae dies/DefaultFullName
 /Day
 Day
   DayIDtue/DayID
-  DefaultAbbrvNamemar/DefaultAbbrvName
-  DefaultFullNamemartis dies/DefaultFullName
+  DefaultAbbrvNameMar/DefaultAbbrvName
+  DefaultFullNameMartis dies/DefaultFullName
 /Day
 Day
   DayIDwed/DayID
-  DefaultAbbrvNamemer/DefaultAbbrvName
-  DefaultFullNamemercuri dies/DefaultFullName
+  DefaultAbbrvNameMer/DefaultAbbrvName
+  DefaultFullNameMercurii dies/DefaultFullName
 /Day
 Day
   DayIDthu/DayID
-  DefaultAbbrvNamejov/DefaultAbbrvName
-  DefaultFullNamejovis dies/DefaultFullName
+  DefaultAbbrvNameIov/DefaultAbbrvName
+  DefaultFullNameIovis dies/DefaultFullName
 /Day
 Day
   DayIDfri/DayID
-  DefaultAbbrvNameven/DefaultAbbrvName
-  DefaultFullNameveneris dies/DefaultFullName
+  DefaultAbbrvNameVen/DefaultAbbrvName
+  DefaultFullNameVeneris dies/DefaultFullName
 /Day
 Day
   DayIDsat/DayID
-  DefaultAbbrvNamesab/DefaultAbbrvName
-  DefaultFullNamesabbatum/DefaultFullName
+  DefaultAbbrvNameSab/DefaultAbbrvName
+  DefaultFullNameSabbatum/DefaultFullName
 /Day
   /DaysOfWeek
   MonthsOfYear
 Month
   MonthIDjan/MonthID
-  DefaultAbbrvNamejan/DefaultAbbrvName
-  DefaultFullNamejanuarius/DefaultFullName
+  DefaultAbbrvNameIan/DefaultAbbrvName
+  DefaultFullNameIanuarius/DefaultFullName
 /Month
 Month
   MonthIDfeb/MonthID
-  DefaultAbbrvNamefeb/DefaultAbbrvName
-  DefaultFullNamefebruarius/DefaultFullName
+  DefaultAbbrvNameFeb/DefaultAbbrvName
+  DefaultFullNameFebruarius/DefaultFullName
 /Month
 Month
   MonthIDmar/MonthID
-  DefaultAbbrvNamemar/DefaultAbbrvName
-  DefaultFullNamemartius/DefaultFullName
+  DefaultAbbrvNameMar/DefaultAbbrvName
+  DefaultFullNameMartius/DefaultFullName
 /Month
 Month
   MonthIDapr/MonthID
-  DefaultAbbrvNameapr/DefaultAbbrvName
-  DefaultFullNameaprilis/DefaultFullName
+  DefaultAbbrvNameApr/DefaultAbbrvName
+  DefaultFullNameAprilis/DefaultFullName
 /Month
 Month
   MonthIDmay/MonthID
-  DefaultAbbrvNamemai/DefaultAbbrvName
-  DefaultFullNamemaius/DefaultFullName
+  DefaultAbbrvNameMai/DefaultAbbrvName
+  DefaultFullNameMaius/DefaultFullName
 /Month
 Month
   MonthIDjun/MonthID
-  DefaultAbbrvNamejun/DefaultAbbrvName
-  DefaultFullNamejunius/DefaultFullName
+  DefaultAbbrvNameIun/DefaultAbbrvName
+  DefaultFullNameIunius/DefaultFullName
 /Month
 Month
   MonthIDjul/MonthID
-  DefaultAbbrvNamejul/DefaultAbbrvName
-  DefaultFullNamejulius/DefaultFullName
+  DefaultAbbrvNameIul/DefaultAbbrvName
+  DefaultFullNameIulius/DefaultFullName
 /Month
 Month
   MonthIDaug/MonthID
-  DefaultAbbrvNameaug/DefaultAbbrvName
-

[Libreoffice-commits] .: sal/inc

 sal/inc/sal/log.hxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0a1f03544a72596b5022985f2367bdcd0699adeb
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Nov 23 21:55:59 2011 +0100

Call getResult with fully qualified name.

diff --git a/sal/inc/sal/log.hxx b/sal/inc/sal/log.hxx
index cf22519..2e09c29 100644
--- a/sal/inc/sal/log.hxx
+++ b/sal/inc/sal/log.hxx
@@ -131,7 +131,8 @@ inline char const * unwrapStream(StreamIgnore const ) {
 #define SAL_DETAIL_LOG_STREAM(condition, level, area, where, stream) \
 do { \
 if (condition) { \
-if (sizeof getResult(::sal::detail::StreamStart()  stream) == 1) 
\
+if (sizeof ::sal::detail::getResult( \
+::sal::detail::StreamStart()  stream) == 1) \
 { \
 ::sal_detail_log( \
 (level), (area), (where), \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: src/xlsrecord.py src/xlsstream.py

 src/xlsrecord.py |   38 ++
 src/xlsstream.py |4 ++--
 2 files changed, 40 insertions(+), 2 deletions(-)

New commits:
commit 9d825cc43815bd9accabe792abca76f3cc1fb18f
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Wed Nov 23 16:57:05 2011 -0500

Handlers for WINDOW2 and PANE records.

Handler for WINDOW2 is still incomplete.

diff --git a/src/xlsrecord.py b/src/xlsrecord.py
index 6927836..11c2fce 100644
--- a/src/xlsrecord.py
+++ b/src/xlsrecord.py
@@ -2347,6 +2347,44 @@ class Font(BaseRecordHandler):
 self.appendLine(font family: %s%Font.getFontFamily(fontFamily))
 self.appendLine(font name: %s (%d)%(fontName, nameLen))
 
+class Window2(BaseRecordHandler):
+def __parseBytes (self):
+flag = self.readUnsignedInt(2)
+self.displayFormula =  (flag  0x0001) != 0
+self.displayGrid = (flag  0x0002) != 0
+self.displayHeadings = (flag  0x0004) != 0
+self.frozen =  (flag  0x0008) != 0
+
+def parseBytes (self):
+self.__parseBytes()
+self.appendLineBoolean(display formula, self.displayFormula)
+self.appendLineBoolean(display grid, self.displayGrid)
+self.appendLineBoolean(display headings, self.displayHeadings)
+self.appendLineBoolean(frozen window, self.frozen)
+
+class Pane(BaseRecordHandler):
+
+activePanes = [
+bottom-right,
+top-right,
+bottom-left,
+top-left
+]
+
+def __parseBytes (self):
+self.x = self.readUnsignedInt(2)
+self.y = self.readUnsignedInt(2)
+self.bottomRow = self.readUnsignedInt(2)
+self.rightCol  = self.readUnsignedInt(2)
+self.activePane = self.readUnsignedInt(1)
+
+def parseBytes (self):
+self.__parseBytes()
+self.appendLine(split position: (x=%d,y=%d)%(self.x,self.y))
+self.appendLine(top-left position of SE pane: (row=%d,col=%d)%
+(self.bottomRow,self.rightCol))
+self.appendLine(active pane: %s%
+globals.getValueOrUnknown(Pane.activePanes, self.activePane))
 
 class XF(BaseRecordHandler):
 
diff --git a/src/xlsstream.py b/src/xlsstream.py
index d000840..bb9f6ae 100644
--- a/src/xlsstream.py
+++ b/src/xlsstream.py
@@ -71,7 +71,7 @@ recData = {
 0x003C: [CONTINUE, Continues Long Records],
 0x003D: [WINDOW1, Window Information],
 0x0040: [BACKUP, Save Backup Version of the File],
-0x0041: [PANE, Number of Panes and Their Position],
+0x0041: [PANE, Number of Panes and Their Position, xlsrecord.Pane],
 0x0042: [CODEPAGE/CODENAME, Default Code Page/VBE Object Name],
 0x004D: [PLS, Environment-Specific Print Record, xlsrecord.Pls],
 0x0050: [DCON, Data Consolidation Information],
@@ -216,7 +216,7 @@ recData = {
 0x0225: [DEFAULTROWHEIGHT, Default Row Height, xlsrecord.DefRowHeight],
 0x0231: [FONT, Font Description, xlsrecord.Font],
 0x0236: [TABLE, Data Table],
-0x023E: [WINDOW2, Sheet Window Information],
+0x023E: [WINDOW2, Sheet Window Information, xlsrecord.Window2],
 0x027E: [RK, Cell with Encoded Integer or Floating-Point, 
xlsrecord.RK],
 0x0293: [STYLE, Style Information, xlsrecord.Style],
 0x041E: [FORMAT, Number Format, xlsrecord.Format],
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 11 commits - filter/inc filter/source sc/source sd/source svtools/source svx/source vcl/inc vcl/source

2011-11-23 Thread Thorsten Behrens

 filter/inc/filter/msfilter/escherex.hxx |   16 +++-
 filter/source/msfilter/escherex.cxx |   15 
 filter/source/msfilter/msdffimp.cxx |   52 +---
 filter/source/pdf/pdfexport.cxx |6 +
 sc/source/filter/xcl97/xcl97esc.cxx |2 
 sd/source/filter/eppt/eppt.cxx  |   19 -
 sd/source/filter/eppt/eppt.hxx  |4 -
 sd/source/filter/eppt/epptbase.hxx  |4 -
 sd/source/filter/eppt/epptso.cxx|   13 +++-
 sd/source/filter/eppt/escherex.cxx  |3 
 sd/source/filter/eppt/escherex.hxx  |2 
 sd/source/filter/eppt/pptx-epptbase.cxx |4 -
 sd/source/filter/eppt/pptx-epptooxml.cxx|9 ++
 sd/source/filter/sdpptwrp.cxx   |   11 ++-
 sd/source/ui/animations/CustomAnimationCreateDialog.cxx |2 
 sd/source/ui/animations/CustomAnimationCreateDialog.src |2 
 sd/source/ui/unoidl/unomodel.cxx|4 -
 svtools/source/filter/filter.cxx|   14 +---
 svx/source/svdraw/svdograf.cxx  |   27 +++-
 vcl/inc/vcl/pdfextoutdevdata.hxx|4 +
 vcl/source/gdi/pdfextoutdevdata.cxx |9 ++
 21 files changed, 139 insertions(+), 83 deletions(-)

New commits:
commit 825839b24d4ad04df17269ef407c844fd6b2cc81
Author: Thorsten Behrens tbehr...@suse.com
Date:   Wed Nov 23 23:23:23 2011 +0100

Fixup pptx export after impress212 merges.

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index 71d4ac6..d81caf1 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -1411,7 +1411,7 @@ sal_Bool EscherPropertyContainer::CreateGraphicProperties(
 delete pIn;
 }
 }
-if ( !aUniqueId.Len() )
+if ( !aUniqueId.getLength() )
 {
 if ( pGraphicProvider )
 {
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 26fcd2c..d76fb52 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -74,7 +74,7 @@ using ::com::sun::star::beans::XPropertySet;
 
 // PPTWriter ==
 
-PPTWriter::PPTWriter( const std::vector com::sun::star::beans::PropertyValue 
 rMediaData, SvStorageRef rSvStorage,
+PPTWriter::PPTWriter( SvStorageRef rSvStorage,
 ::com::sun::star::uno::Reference ::com::sun::star::frame::XModel 
  rXModel,
 ::com::sun::star::uno::Reference 
::com::sun::star::task::XStatusIndicator   rXStatInd,
 SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags ) :
@@ -97,7 +97,7 @@ PPTWriter::PPTWriter( const std::vector 
com::sun::star::beans::PropertyValue 
 {
 }
 
-void PPTWriter::exportPPTPre()
+void PPTWriter::exportPPTPre( const std::vector 
com::sun::star::beans::PropertyValue  rMediaData )
 {
 if ( !mrStg.Is() )
 return;
@@ -132,7 +132,6 @@ void PPTWriter::exportPPTPre()
 {
 if ( (*aIter).Name.equals( sBaseURI ) )
 {
-rtl::OUString sBaseURI;
 (*aIter).Value = maBaseURI;
 break;
 }
@@ -1498,10 +1497,10 @@ extern C SAL_DLLPUBLIC_EXPORT sal_Bool 
__LOADONCALLAPI ExportPPT( const std::v
 PPTWriter*  pPPTWriter;
 sal_Bool bStatus = sal_False;
 
-pPPTWriter = new PPTWriter( rMediaData, rSvStorage, rXModel, rXStatInd, 
pVBA, nCnvrtFlags );
+pPPTWriter = new PPTWriter( rSvStorage, rXModel, rXStatInd, pVBA, 
nCnvrtFlags );
 if ( pPPTWriter )
 {
-pPPTWriter-exportPPT();
+pPPTWriter-exportPPT(rMediaData);
 bStatus = ( pPPTWriter-IsValid() == sal_True );
 delete pPPTWriter;
 }
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index 6096276..96f19c4 100644
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -296,7 +296,7 @@ class PPTWriter : public PPTWriterBase, public 
PPTExBulletProvider
 
 sal_BoolIsValid() const { return mbStatus; };
 
-virtual voidexportPPTPre();
+virtual voidexportPPTPre( const std::vector 
com::sun::star::beans::PropertyValue  );
 virtual voidexportPPTPost( );
 };
 
diff --git a/sd/source/filter/eppt/epptbase.hxx 
b/sd/source/filter/eppt/epptbase.hxx
index f21db68..33a43d3 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -378,7 +378,7 @@ protected:
 virtual void ImplWriteSlideMaster( sal_uInt32 /* nPageNum */, 
::com::sun::star::uno::Reference ::com::sun::star::beans::XPropertySet  /* 
aXBackgroundPropSet */ ) {}
 virtual void ImplWriteLayout(

[Libreoffice-commits] .: 2 commits - sd/source svx/source

2011-11-23 Thread Thorsten Behrens

 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx  |4 ++--
 sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx |4 +++-
 svx/source/sdr/properties/attributeproperties.cxx   |3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit c8e7d34e3a238c9383151a09f99e7951877a6821
Author: alg a...@apache.org
Date:   Thu Oct 6 14:55:24 2011 +

118414: applied patch, added forcing that SfxItemSet inside 
AttributeProperties::SetModel

 * found as LGPLv3-only fix at svn rev 1179654 
(http://svn.apache.org/viewvc?view=revisionrevision=1179654)

diff --git a/svx/source/sdr/properties/attributeproperties.cxx 
b/svx/source/sdr/properties/attributeproperties.cxx
index 9edc2a4..cece99f 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -479,8 +479,9 @@ namespace sdr
 }
 
 // each object gets the default Style if there is none set yet.
-if(mpItemSet  !GetStyleSheet()  pNewModel  
!pNewModel-IsLoading())
+if(!GetStyleSheet()  pNewModel  !pNewModel-IsLoading())
 {
+GetObjectItemSet(); // i#118414 force ItemSet to allow 
style to be set
 SetStyleSheet(pNewModel-GetDefaultStyleSheet(), sal_True);
 }
 }
commit f82da782158d8f5b89a6a9057df1a4695425ed75
Author: awf a...@openoffice.org
Date:   Tue Nov 1 16:18:25 2011 +

i118560 - slide sorter: pass PageSelector object by reference

 * found as LGPLv3-only fix at svn rev 1196092 
(http://svn.apache.org/viewvc?view=revisionrevision=1196092)

diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx 
b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index f3a0074..e3a86bb 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -1156,8 +1156,8 @@ void SlotManager::DuplicateSelectedSlides (SfxRequest 
rRequest)
 aPagesToSelect.end(),
 ::boost::bind(
 static_castvoid (PageSelector::*)(const 
SdPage*)(PageSelector::SelectPage),
-rSelector,
-_1));
+::boost::ref(rSelector),
+_1));
 }
 
 IMPL_LINK(SlotManager, UserEventCallback, void*, EMPTYARG)
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx 
b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
index 42ab151..394dd89 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
@@ -34,6 +34,8 @@
 #include com/sun/star/drawing/XDrawPage.hpp
 #include vector
 #include memory
+#include boost/noncopyable.hpp
+
 
 class SdPage;
 
@@ -63,7 +65,7 @@ class SlideSorterController;
 Indices of pages relate allways to the number of all pages in the model
 (as returned by GetPageCount()) not just the selected pages.
 */
-class PageSelector
+class PageSelector : private ::boost::noncopyable
 {
 public:
 PageSelector (SlideSorter rSlideSorter);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: binfilter/bf_svtools

 binfilter/bf_svtools/source/config/svt_useroptions.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 1761e9c96eb2d673d77712c840a51c2679d169f1
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Nov 23 22:17:54 2011 +

remove EraseLeadingAndTrailingChars

diff --git a/binfilter/bf_svtools/source/config/svt_useroptions.cxx 
b/binfilter/bf_svtools/source/config/svt_useroptions.cxx
index 00f870a..976fa42 100644
--- a/binfilter/bf_svtools/source/config/svt_useroptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_useroptions.cxx
@@ -27,7 +27,7 @@
  /
 
 #include bf_svtools/useroptions.hxx
-
+#include comphelper/string.hxx
 #include tools/debug.hxx
 #include com/sun/star/uno/Any.hxx
 #include com/sun/star/uno/Sequence.hxx
@@ -179,8 +179,7 @@ void SvtUserOptions_Impl::InitUserPropertyNames()
 
 void SvtUserOptions_Impl::InitFullName()
 {
-m_aFullName = GetFirstName();
-m_aFullName.EraseLeadingAndTrailingChars();
+m_aFullName = comphelper::string::strip(GetFirstName(), ' ');
 if ( m_aFullName.Len() )
 m_aFullName += ' ';
 m_aFullName += GetLastName();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

 sc/source/filter/excel/xeview.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0215f8b19451ab67c7fdaf91f2da8298a9b89c47
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Wed Nov 23 18:23:14 2011 -0500

fdo#39589: Avoid using ulimit_cast between signed and unsigned.

If you do, things go very very wrong.  These *limit_cast try to be
clever and check ranges of various types before casting, but they
fail to do the right thing when casting a signed integer into unsigned.

diff --git a/sc/source/filter/excel/xeview.cxx 
b/sc/source/filter/excel/xeview.cxx
index 37d075e..94f082a 100644
--- a/sc/source/filter/excel/xeview.cxx
+++ b/sc/source/filter/excel/xeview.cxx
@@ -368,8 +368,8 @@ XclExpTabViewSettings::XclExpTabViewSettings( const 
XclExpRoot rRoot, SCTAB nSc
 else
 {
 // split window: position is in twips
-maData.mnSplitX = ulimit_cast sal_uInt16 ( 
rTabSett.maSplitPos.X() );
-maData.mnSplitY = ulimit_cast sal_uInt32 ( 
rTabSett.maSplitPos.Y() );
+maData.mnSplitX = static_castsal_uInt16(rTabSett.maSplitPos.X());
+maData.mnSplitY = static_castsal_uInt32(rTabSett.maSplitPos.Y());
 }
 
 // selection
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/inc/markdata.hxx  |   40 +++---
 sc/inc/scmod.hxx |2 
 sc/source/core/data/markdata.cxx |   54 +--
 sc/source/core/tool/chgtrack.cxx |1 
 sc/source/ui/Accessibility/AccessibleCell.cxx|1 
 sc/source/ui/Accessibility/AccessibleDocument.cxx|2 
 sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx |1 
 sc/source/ui/app/inputhdl.cxx|1 
 sc/source/ui/app/inputwin.cxx|1 
 sc/source/ui/app/scmod.cxx   |1 
 sc/source/ui/app/seltrans.cxx|1 
 sc/source/ui/docshell/dbdocfun.cxx   |1 
 sc/source/ui/docshell/docsh.cxx  |1 
 sc/source/ui/docshell/docsh3.cxx |1 
 sc/source/ui/docshell/editable.cxx   |1 
 sc/source/ui/drawfunc/fuins2.cxx |1 
 sc/source/ui/drawfunc/fumark.cxx |1 
 sc/source/ui/inc/AccessibleSpreadsheet.hxx   |1 
 sc/source/ui/inc/undodat.hxx |7 +-
 sc/source/ui/inc/undotab.hxx |6 +-
 sc/source/ui/inc/viewdata.hxx|   10 +--
 sc/source/ui/navipi/content.cxx  |1 
 sc/source/ui/navipi/navipi.cxx   |1 
 sc/source/ui/pagedlg/areasdlg.cxx|1 
 sc/source/ui/undo/undodat.cxx|9 +--
 sc/source/ui/undo/undotab.cxx|7 +-
 sc/source/ui/undo/undoutil.cxx   |1 
 sc/source/ui/unoobj/viewuno.cxx  |1 
 sc/source/ui/vba/vbarange.cxx|1 
 sc/source/ui/vba/vbawindow.cxx   |1 
 sc/source/ui/vba/vbaworksheet.cxx|1 
 sc/source/ui/vba/vbaworksheets.cxx   |1 
 sc/source/ui/view/cellsh.cxx |1 
 sc/source/ui/view/cellsh1.cxx|1 
 sc/source/ui/view/cellsh2.cxx|1 
 sc/source/ui/view/cellsh3.cxx|2 
 sc/source/ui/view/cliputil.cxx   |1 
 sc/source/ui/view/colrowba.cxx   |1 
 sc/source/ui/view/dbfunc.cxx |1 
 sc/source/ui/view/dbfunc3.cxx|1 
 sc/source/ui/view/formatsh.cxx   |1 
 sc/source/ui/view/gridwin.cxx|1 
 sc/source/ui/view/gridwin4.cxx   |1 
 sc/source/ui/view/hdrcont.cxx|1 
 sc/source/ui/view/preview.cxx|1 
 sc/source/ui/view/select.cxx |1 
 sc/source/ui/view/selectionstate.cxx |1 
 sc/source/ui/view/spelleng.cxx   |2 
 sc/source/ui/view/tabcont.cxx|1 
 sc/source/ui/view/tabview2.cxx   |1 
 sc/source/ui/view/tabview3.cxx   |1 
 sc/source/ui/view/tabvwsh3.cxx   |1 
 sc/source/ui/view/tabvwsha.cxx   |1 
 sc/source/ui/view/tabvwshc.cxx   |1 
 sc/source/ui/view/tabvwshf.cxx   |1 
 sc/source/ui/view/viewdata.cxx   |   38 -
 sc/source/ui/view/viewfun5.cxx   |1 
 sc/source/ui/view/viewfun6.cxx   |1 
 58 files changed, 145 insertions(+), 80 deletions(-)

New commits:
commit c4a3e29626126658cfb9e8755e9f98cfc4500abd
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Wed Nov 23 21:32:01 2011 -0500

Reducing header dependency on markdata.hxx.

diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index e90936b..5a51b08 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -34,7 +34,6 @@
 #include vcl/timer.hxx
 #include svl/lstner.hxx
 #include global.hxx   // ScInputMode
-#include markdata.hxx // ScMarkData
 #include shellids.hxx
 #include unotools/options.hxx
 #include tools/shl.hxx
@@ -79,6 +78,7 @@ class ScTransferObj;
 class ScDrawTransferObj;
 class ScSelectionTransferObj;
 class ScFormEditData;
+class ScMarkData;
 struct ScDragData;
 struct ScClipData;
 
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index dc5b097..3a4fcf7 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -51,6 +51,7 @@
 #include inputopt.hxx // GetExpandRefs
 #include patattr.hxx
 #include hints.hxx
+#include markdata.hxx
 
 #include globstr.hrc
 
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx 
b/sc/source/ui/Accessibility/AccessibleCell.cxx
index 881a895..6ca5585 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++

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

 sc/inc/table.hxx  |   35 +++
 sc/qa/unit/ucalc.cxx  |1 +
 sc/source/core/data/cell.cxx  |2 ++
 sc/source/core/data/table1.cxx|1 +
 sc/source/core/data/table2.cxx|1 +
 sc/source/ui/vba/vbaworksheet.cxx |1 +
 6 files changed, 21 insertions(+), 20 deletions(-)

New commits:
commit 92e03b82880ab1c83a1bfd59e179e3fb9f565257
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Wed Nov 23 23:34:18 2011 -0500

Cleaned up the ScTable declaration a bit.

* make it officially non-copyable. It was never copied anyway.
* retire std::auto_ptr which is deprecated.  Let's use boost::scoped_ptr.
* some unused typedef's.

diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 906d306..af57e62 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -30,7 +30,6 @@
 #define SC_TABLE_HXX
 
 #include vector
-#include memory
 #include utility
 #include tools/gen.hxx
 #include tools/color.hxx
@@ -38,11 +37,10 @@
 #include column.hxx
 #include sortparam.hxx
 #include compressedarray.hxx
-#include dbdata.hxx
 
-#include memory
 #include set
-#include boost/shared_ptr.hpp
+#include boost/scoped_ptr.hpp
+#include boost/noncopyable.hpp
 
 namespace utl {
 class TextSearch;
@@ -89,28 +87,25 @@ struct ScSetStringParam;
 struct ScColWidthParam;
 struct ScColWidthParam;
 class ScRangeName;
+class ScDBData;
 
-typedef boost::unordered_map ::rtl::OUString, rtl::OUString, 
::rtl::OUStringHash, ::std::equal_to ::rtl::OUString   NameToNameMap;
-
-class ScTable
+class ScTable : boost::noncopyable
 {
 private:
 typedef ::std::vector ScRange  ScRangeVec;
 typedef ::std::pair SCCOL, SCROW  ScAddress2D;
 typedef ::std::vector ScAddress2D  ScAddress2DVec;
-typedef ::std::auto_ptr ScAddress2DVec  ScAddress2DVecPtr;
 
-//  data per table
 ScColumnaCol[MAXCOLCOUNT];
 
 rtl::OUString aName;
 rtl::OUString aCodeName;
 rtl::OUString aComment;
 
-rtl::OUString  aLinkDoc;
-rtl::OUString  aLinkFlt;
-rtl::OUString  aLinkOpt;
-rtl::OUString  aLinkTab;
+rtl::OUString   aLinkDoc;
+rtl::OUString   aLinkFlt;
+rtl::OUString   aLinkOpt;
+rtl::OUString   aLinkTab;
 sal_uLong   nLinkRefreshDelay;
 sal_uInt8   nLinkMode;
 
@@ -122,17 +117,17 @@ private:
 SCROW   nRepeatStartY;
 SCROW   nRepeatEndY;
 
-::std::auto_ptrScTableProtection pTabProtection;
+boost::scoped_ptrScTableProtection pTabProtection;
 
 sal_uInt16* pColWidth;
-::boost::shared_ptrScFlatUInt16RowSegments mpRowHeights;
+boost::scoped_ptrScFlatUInt16RowSegments mpRowHeights;
 
 sal_uInt8*  pColFlags;
 ScBitMaskCompressedArray SCROW, sal_uInt8* pRowFlags;
-::boost::shared_ptrScFlatBoolColSegments  mpHiddenCols;
-::boost::shared_ptrScFlatBoolRowSegments  mpHiddenRows;
-::boost::shared_ptrScFlatBoolColSegments  mpFilteredCols;
-::boost::shared_ptrScFlatBoolRowSegments  mpFilteredRows;
+boost::scoped_ptrScFlatBoolColSegments  mpHiddenCols;
+boost::scoped_ptrScFlatBoolRowSegments  mpHiddenRows;
+boost::scoped_ptrScFlatBoolColSegments  mpFilteredCols;
+boost::scoped_ptrScFlatBoolRowSegments  mpFilteredRows;
 
 ::std::setSCROW  maRowPageBreaks;
 ::std::setSCROW  maRowManualBreaks;
@@ -153,7 +148,7 @@ private:
 
 mutable rtl::OUString aUpperName; // #i62977# filled only on 
demand, reset in SetName
 
-ScAddress2DVecPtr mxUninitNotes;
+boost::scoped_ptrScAddress2DVec mxUninitNotes;
 
 // sort parameter to minimize stack size of quicksort
 ScSortParam aSortParam;
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 9b0cbcc..21914d9 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -46,6 +46,7 @@
 #include queryentry.hxx
 #include postit.hxx
 #include attrib.hxx
+#include dbdata.hxx
 
 #include docsh.hxx
 #include docfunc.hxx
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index 88fcbfd..9267133 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -53,6 +53,8 @@
 #include postit.hxx
 #include externalrefmgr.hxx
 #include macromgr.hxx
+#include dbdata.hxx
+
 #include editeng/editobj.hxx
 #include svl/intitem.hxx
 #include editeng/flditem.hxx
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 0505da7..e88fba6 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -55,6 +55,7 @@
 #include tabprotection.hxx
 #include sheetevents.hxx
 #include segmenttree.hxx
+#include dbdata.hxx
 
 #include vector
 
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index beb638b..75b5c44 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -62,6 +62,7 @@
 #include

[Libreoffice-commits] .: sc/source

 sc/source/core/data/document.cxx  |   17 ++---
 sc/source/filter/xml/xmlsubti.cxx |   14 --
 2 files changed, 10 insertions(+), 21 deletions(-)

New commits:
commit 5992e15796131f9814d9fb22cf807a2ee530d264
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Thu Nov 24 01:19:10 2011 -0500

i#97680, fdo#43152: Load this file without crashing.

The document contains invalid sheet names.  We check it on load, sees
it invalid, decide not to append sheet.  The next time the importer
tries to put cell data into it thinking the sheet has already been
created, the sheet instance is not there, and it crashes.

The solution I used is to go ahead and append new sheet with a default
name in case the supplied sheet name is invalid.

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 5a50aef..52dc4ce 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -334,14 +334,15 @@ void ScDocument::CreateValidTabName(rtl::OUString rName) 
const
 
 for ( SCTAB i = static_castSCTAB(maTabs.size())+1; !bOk ; i++ )
 {
-rName  = aStrTable;
-rName += rtl::OUString::valueOf(static_castsal_Int32(i));
+rtl::OUStringBuffer aBuf;
+aBuf.append(aStrTable);
+aBuf.append(static_castsal_Int32(i));
+rName = aBuf.makeStringAndClear();
 if (bPrefix)
 bOk = ValidNewTabName( rName );
 else
 bOk = !GetTable( rName, nDummy );
 }
-
 }
 else
 {
@@ -398,11 +399,13 @@ void 
ScDocument::CreateValidTabNames(std::vectorrtl::OUString aNames, SCTAB n
 void ScDocument::AppendTabOnLoad(const rtl::OUString rName)
 {
 SCTAB nTabCount = static_castSCTAB(maTabs.size());
+if (!ValidTab(nTabCount))
+// max table count reached.  No more tables.
+return;
 
-if (ValidTab(nTabCount)  ValidNewTabName(rName))
-{
-maTabs.push_back( new ScTable(this, nTabCount, rName) );
-}
+rtl::OUString aName = rName;
+CreateValidTabName(aName);
+maTabs.push_back( new ScTable(this, nTabCount, aName) );
 }
 
 
diff --git a/sc/source/filter/xml/xmlsubti.cxx 
b/sc/source/filter/xml/xmlsubti.cxx
index 315bf2b..3ea979f 100644
--- a/sc/source/filter/xml/xmlsubti.cxx
+++ b/sc/source/filter/xml/xmlsubti.cxx
@@ -648,20 +648,6 @@ void ScMyTables::DeleteTable()
 pProtect-setOption(ScTableProtection::SELECT_UNLOCKED_CELLS, 
maProtectionData.mbSelectUnprotectedCells);
 rImport.GetDocument()-SetTabProtection(nCurrentSheet, pProtect.get());
 }
-
-//#95582#; find out whether it was possible to set the sheet name
-// test it here, because if it is a linked table the name is changed by 
importing
-// the linking informations
-uno::Reference  container::XNamed  xNamed(xCurrentSheet, uno::UNO_QUERY 
);
-if ( xNamed.is() )
-{
-rtl::OUString sCurrentName(xNamed-getName());
-if (sCurrentName != sCurrentSheetName  rImport.GetDocument())
-{
-rImport.GetDocument()-RenameTab( nCurrentSheet,
-sCurrentSheetName, false, true);
-}
-}
 }
 
 table::CellAddress ScMyTables::GetRealCellPos()
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/inc/document.hxx   |1 +
 sc/source/core/data/document.cxx  |   10 ++
 sc/source/filter/xml/xmlsubti.cxx |6 --
 3 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 808ca6d894630f3375ed6fda1f27f4c6cec9e67d
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Thu Nov 24 02:06:06 2011 -0500

We still need to set the name to the 1st sheet.

This should fix the filters-test breakage.

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 8157929..3db0dc6 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -578,6 +578,7 @@ public:
 SC_DLLPUBLIC void   
CreateValidTabNames(std::vectorrtl::OUString aNames, SCTAB nCount) const;
 
 void AppendTabOnLoad(const rtl::OUString rName);
+void SetTabNameOnLoad(SCTAB nTab, const rtl::OUString rName);
 
 SC_DLLPUBLIC bool   InsertTab( SCTAB nPos, const rtl::OUString 
rName,
 bool bExternalDocument = false );
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 52dc4ce..8f277c6 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -408,6 +408,16 @@ void ScDocument::AppendTabOnLoad(const rtl::OUString 
rName)
 maTabs.push_back( new ScTable(this, nTabCount, aName) );
 }
 
+void ScDocument::SetTabNameOnLoad(SCTAB nTab, const rtl::OUString rName)
+{
+if (!ValidTab(nTab) || static_castSCTAB(maTabs.size()) = nTab)
+return;
+
+if (!ValidTabName(rName))
+return;
+
+maTabs[nTab]-SetName(rName);
+}
 
 bool ScDocument::InsertTab( SCTAB nPos, const rtl::OUString rName,
 bool bExternalDocument )
diff --git a/sc/source/filter/xml/xmlsubti.cxx 
b/sc/source/filter/xml/xmlsubti.cxx
index 3ea979f..97aa9a5 100644
--- a/sc/source/filter/xml/xmlsubti.cxx
+++ b/sc/source/filter/xml/xmlsubti.cxx
@@ -186,10 +186,12 @@ void ScMyTables::NewSheet(const rtl::OUString 
sTableName, const rtl::OUString
 maProtectionData = rProtectData;
 ScDocument *pDoc = ScXMLConverter::GetScDocument(rImport.GetModel());
 
+// The document contains one sheet when created. So for the first
+// sheet, we only need to set its name.
 if (nCurrentSheet  0)
-{
 pDoc-AppendTabOnLoad(sTableName);
-}
+else
+pDoc-SetTabNameOnLoad(nCurrentSheet, sTableName);
 
 rImport.SetTableStyle(sStyleName);
 SetTableStyle(sStyleName);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice] help asked/offered for bug 36555

2011-11-23 Thread Winfried Donkers

This looks like a incompatibility between autoconf-generated boilerplate 
code and your environment. 
Check that configure has been regenerated; 
it should says at approx line 3: 
Generated by GNU Autoconf 2.6x with 2.6x being the version of autoconf you 
installed; 

It says now Generated by GNU Autoconf 2.68 for dmake 4.12.
Unfortunately, make still gives the same error messages (with a different line 
numebr).

Else, I think it leaves behind a file named confNsubs.sed with N being 
digits? 
Show us that file, as well as the lines of configure before the error line up 
to assignment of ac_delim

I can't find a *.sed file, neither in libreoffice_build_tree/., nor in 
libreoffice_build_tree /dmake
The lines in libo/dmake/configure are
6248 ac_delim_num=`echo $ac_subst_vars | grep -c '^'`
6249 ac_delim='%!_!# '
6250 for ac_last_try in false false false false false :; do
6251   . ./conf$$subs.sh ||
6252 as_fn_error $? could not make $CONFIG_STATUS $LINENO 5
6253
6354   ac_delim_n=`sed -n s/.*$ac_delim\$/X/p conf$$subs.awk | grep -c X`
6255   if test $ac_delim_n = $ac_delim_num; then


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

Re: [Libreoffice] Assertions and Logging

2011-11-23 Thread Miklos Vajna

On Wed, Nov 23, 2011 at 08:28:18AM +0100, Stephan Bergmann 
sberg...@redhat.com wrote:
 My understanding is as follows:
 
 - There is a large number of OSL_TRACE calls all over the code base, 
 producing large amounts of output at runtime.

Agreed.

 - Nobody wants to see all that output at once.  People are generally 
 only interested in the OSL_TRACE output from some specific module etc.
 
 - For that, in the past it was necessary to recompile the relevant code 
 with dbglevel=2.  Now, no recompilation is necessary any longer, you 
 just need to add +INFO.area to SAL_LOG at runtime.
 
 Your patch would imply that you either (a) routinely build the whole 
 code base with dbglevel=2 (do you really do that? does the amount of 
 resulting output not intimidate you?),

Of course no, just the relavant module.

 or (b) need to recompile just sal 
 with dbglevel=2 before automatically (without setting SAL_LOG) seeing 
 any (but again, also all) OSL_TRACE output.

Oh, indeed, I missed the fact that with the patch not only the given
module, but sal has to be rebuilt.

Then forget the patch, all we need is to update
http://wiki.documentfoundation.org/Development/How_to_debug#Useful_macros
to reflect that now SAL_LOG controls OSL_TRACE messages, not dbglevel 
1.


pgpHqHerLdF7x.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Windows build breakage

2011-11-23 Thread Noel Power


On 23/11/11 04:41, Kohei Yoshida wrote:

Hi there,

So, not having been able to build master on Windows for almost 2
months, I've decided to give it another go.  But it fails in scripting
this time, and I have no clue.

The build log is attached.  Hopefully this will ring a bell for someone...

Kohei

first error

symbol  : class ScriptEditor
location: package com.sun.star.script.framework.provider
import com.sun.star.script.framework.provider.ScriptEditor;

indicates some problem with the build of that module itself ( since the 
ScriptEditor class should have been built in the this module ) I saw 
something like this a long time ago, I looked and realised that  'ant' 
has been removed from build and now some gbuild handles the building the 
java classes, in my case a (full) clean build solved it ( but probably 
there is a less violent solution )


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

Re: [Libreoffice] [Libreoffice-qa] Improving the QA and Release for 3.5

Rob Snelders píše v Út 22. 11. 2011 v 20:12 +0100:
 No those days aren't the only way to test. But it is a way to get more 
 people to test the software and to test the software in ways that the 
 developers won't think about.
 I think there are enough people that want to help but don't know how, 
 and testing is a easy way to step in.
 
 At last I also hear from people around me that LO tests way to little 
 because of all the bugs that have pleaged the 3.4-series. When we shout 
 this around people can see we do test and are doing our best to get 
 bugs out of the software.
 
 All in all I would say it is needed to organise these events..

I fully agree. I was just a bit scared by Cor's mail. It made me feel
that Janury 21 would be the only day when people should test LO-3.5. I
am happy to hear that it is not true. :-)

Thanks for explanation.


Best Regards,
Petr

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

Re: [Libreoffice] Windows build breakage

2011-11-23 Thread Noel Power


On 23/11/11 09:27, Noel Power wrote:
in my case a (full) clean build solved it 

has to be said this was on linux though
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] EuroOffice Barcode

2011-11-23 Thread Brenner Tibor


Hi LibreOffice Team,

I'm Tibor Brenner from MultiRcio Ltd. We are the developer team of 
EuroOffice software package and extensions. I've written to András Tímár 
from your team about a request with our Barcode extension, and he 
suggested to use your mailing list.
Since LibreOffice has an online help system, when somebody installs our 
Barcode extension, he won't have its help page. So, we would like to ask 
your help to built in our help files into your online help system. I can 
upload our extension to your extensions webpage, as it's an absolutely 
free one for everyone. In this case you will have all help files, or I 
can send you the whole extension, if it's a better way.

We are looking forward to your reply.

Have a nice day,
Tibor Brenner
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] help asked/offered for bug 36555

On Wed, Nov 23, 2011 at 09:22:40AM +0100, Winfried Donkers wrote:

 This looks like a incompatibility between autoconf-generated
 boilerplate code and your environment.

 It says now Generated by GNU Autoconf 2.68 for dmake 4.12.
 Unfortunately, make still gives the same error messages (with a
 different line numebr).

Rats.

 Else, I think it leaves behind a file named confNsubs.sed with
 N being digits?
 Show us that file, as well as the lines of configure before the
 error line up to assignment of ac_delim

 I can't find a *.sed file, neither in libreoffice_build_tree/., nor in 
 libreoffice_build_tree /dmake
 The lines in libo/dmake/configure are
 6248 ac_delim_num=`echo $ac_subst_vars | grep -c '^'`
 6249 ac_delim='%!_!# '
 6250 for ac_last_try in false false false false false :; do
 6251   . ./conf$$subs.sh ||
 6252 as_fn_error $? could not make $CONFIG_STATUS $LINENO 5
 6253
 6354   ac_delim_n=`sed -n s/.*$ac_delim\$/X/p conf$$subs.awk | grep -c X`
 6255   if test $ac_delim_n = $ac_delim_num; then

Ah, that piece of code looks very different from the one of autoconf
2.61 :)

So, just to check I understand right, when you say the error messages are
the same with different line numbers, it means the following?

 ./configure: line 6251: could not make ./config.status
 ./configure: line 6255: test: too many arguments

Then, I'd like to look at the values of $ac_delim_n and
$ac_delim_num; insert

  printf %s: '%s'\\n '* ac_delim_n' ${ac_delim_n}
  printf %s: '%s'\\n '* ac_delim_num' ${ac_delim_num}

just before the line:

 if test $ac_delim_n = $ac_delim_num; then

My guess is that $ac_delim_n or ac_delim_num contain spaces, but given
how they are defined, I don't see how this can happen, unless your
grep does funny things. Can you try in a shell:

printf 'a\nb\na\nb\na\nb\na\nb\na\nb\n' | grep -c a

It should output just 5 (and a newline) and nothing else.

If I'm right, then an immediate fix for the test: too many arguments
error is to replace the line

  if test $ac_delim_n = $ac_delim_num; then

by

  if test $ac_delim_n = $ac_delim_num; then

But I would like to understand how they come to have a weird value.

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

Re: [Libreoffice] Windows build breakage

2011-11-23 Thread Michael Stahl

On 23/11/11 05:41, Kohei Yoshida wrote:
 Hi there,
 
 So, not having been able to build master on Windows for almost 2
 months, I've decided to give it another go.  But it fails in scripting
 this time, and I have no clue.
 
 The build log is attached.  Hopefully this will ring a bell for someone...

you have exactly the same problem as Noel Grandin:

the makefile adds ScriptingFramework.jar to the classpath:

 $(eval $(call gb_Jar_add_jars,ScriptProviderForBeanShell,\
   $(OUTDIR)/bin/juh.jar \
   $(OUTDIR)/bin/jurt.jar \
   $(OUTDIR)/bin/ridl.jar \
   $(OUTDIR)/bin/unoil.jar \
   $(OUTDIR)/bin/ScriptFramework.jar \
 ))

but it does not appear in the command:

 R=c:/libo  O=$R/core-master/solver/wntmsci12.pro  
 W=$R/core-master/workdir/wntmsci12.pro  S=$R/core-master   mkdir -p 
 $W/JavaClassSet/Jar/ScriptProviderForBeanShell/  
 RESPONSEFILE=C:/cygwin/tmp/gbuild.VIrScQ  
 C:/PROGRA~1/Java/JDK16~1.0_1/bin/javac.exe  -cp 
 C:/PROGRA~1/Java/JDK16~1.0_1/jre/lib/rt.jar;.;$O/bin/juh.jar;$O/bin/jurt.jar;$O/bin/ridl.jar;$O/bin/unoil.jar;$O/bin/bsh.jar;$W/JavaClassSet/Jar/ScriptProviderForBeanShell
  -d $W/JavaClassSet/Jar/ScriptProviderForBeanShell @$RESPONSEFILE  rm -f 
 $RESPONSEFILE  touch $W/JavaClassSet/Jar/ScriptProviderForBeanShell/done

i still have no idea what causes this, but it seems to happen only on
windows; if i understood Noel correctly it does not happen every time,
and when he added some debug output it seemed to work always...

regards,
 michael

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

Re: [Libreoffice] Windows build breakage

2011-11-23 Thread Noel Grandin

Hi

I tried to debug this with Michael Stahl's help, and I came to the conclusion 
that it is some kind of timing bug in make.
Sometimes it works, sometimes not.
In the end I gave up and disabled java. (--without-java).

Regards, Noel Grandin.

Kohei Yoshida wrote:
 Hi there,

 So, not having been able to build master on Windows for almost 2
 months, I've decided to give it another go.  But it fails in scripting
 this time, and I have no clue.

 The build log is attached.  Hopefully this will ring a bell for someone...

 Kohei

 Disclaimer: http://www.peralex.com/disclaimer.html




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

Disclaimer: http://www.peralex.com/disclaimer.html


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

Re: [Libreoffice] Windows build breakage

2011/11/23 Noel Grandin n...@peralex.com:
 Hi

 I tried to debug this with Michael Stahl's help, and I came to the
 conclusion that it is some kind of timing bug in make.
 Sometimes it works, sometimes not.
 In the end I gave up and disabled java. (--without-java).

--disable-ext-scripting-javascript and
--disable-ext-scripting-beanshell is less invasive and it is also a
good workaround.

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

Re: [Libreoffice] help asked/offered for bug 36555

2011-11-23 Thread Winfried Donkers


So, just to check I understand right, when you say the error messages are the 
same with different line numbers, it means the following?
The rror messages are
configure: creating ./config,status
./configure: line 6255: test: too many arguments (6 identical lines)
configure: error: could not make ./config.status
make: *** [dmake/dmake.exe] Error 1

Then, I'd like to look at the values of $ac_delim_n and $ac_delim_num; 
insert
 printf %s: '%s'\\n '* ac_delim_n' ${ac_delim_n}
 printf %s: '%s'\\n '* ac_delim_num' ${ac_delim_num}
just before the line:
 if test $ac_delim_n = $ac_delim_num; then
result is (appart from error messages as above) 6 times
* ac_delim_n: 'File STDIN:
'8 lines match
* ac_delim_num: 'File STDIN:
'8 lines match

Can you try in a shell:
printf 'a\nb\na\nb\na\nb\na\nb\na\nb\n' | grep -c a
It should output just 5 (and a newline) and nothing else.
correct :)

If I'm right, then an immediate fix for the test: too many arguments
error is to replace the line
  if test $ac_delim_n = $ac_delim_num; then
by
  if test $ac_delim_n = $ac_delim_num; then
I did, result is that it passed this part of configure.
Now I get the following:
...
config.status: executing depfiles commands
MAKE version 5.2 Copyright (c) 1987, 2000 Borland
Error makefile 871: Colon expected
*** 1 errors during make ***
make: *** [dmake/dmake.exe] Error 1

(On the machine is installed (it was already there) Borland C++Builder and 
QtCreator, with paths to Borland directories)

But I would like to understand how they come to have a weird value.
I hope my information helps...

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

[Libreoffice] sw: serial numbers

2011-11-23 Thread Michael Stahl


hi all,

i am currently wondering:
in sw, a bunch of classes define serial numbers, e.g. SwIndex, SwNode, etc.

in a DBG_UTIL build, there is a global counter, and the ctor increments
the counter and assigns its value to a member, so every instance has a
unique serial.

what is the point of this? how would this help in debugging, given that
the pointer values of the instances ought to be unique as long as they live?

in other words, any reason why i shouldn't remove serials?

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

Re: [Libreoffice] help asked/offered for bug 36555

2011-11-23 Thread Michael Stahl

On 23/11/11 11:14, Winfried Donkers wrote:
 Now I get the following:
 
 config.status: executing depfiles commands
 MAKE version 5.2 Copyright (c) 1987, 2000 Borland
 Error makefile 871: Colon expected

you shouldn't be using Borland make :)

 *** 1 errors during make ***
 make: *** [dmake/dmake.exe] Error 1
 
 (On the machine is installed (it was already there) Borland C++Builder and 
 QtCreator, with paths to Borland directories)

you probably want to remove this Borland stuff from your path, building
LO with it is certainly not supported.

e.g. make should be GNU make

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

Re: [Libreoffice] how to print into .ps

On Tue, 2011-11-22 at 14:30 +0100, Németh László wrote:
 Hi,
 
 Maybe you can change the printer language to Postscript on the Device
 page of the Printer settings in the Printing dialog (it works for me
 on Linux).
 
 By the way, there is an important difference within PDF printing and
 PDF exporting. PDF printing supports EPS embedding (fortunately, like
 the old default PostScript printing),
 but PDF exports have contained only the bitmap preview of the original
 EPS images, yet. Is there any reason to limit EPS embedding to PDF
 printing, eg. PDF compatibility or different PDF creation mechanisms?

It might just be an oversight with the pdf from the printing path going
down the classic printing logic, while the pdf from export to pdf goes
down a render-to-canvas style route where the eps preview is taken. If
we can get embedded eps in the export to pdf route that'd probably be
far more desirable if you want to have a go at that ?

C.

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

Re: [Libreoffice] [PATCH] [REVIEW 3-4] fdo#36555 connect to ADO (MS Access, ...)

On Tue, 2011-11-22 at 17:52 +0100, Lionel Elie Mamane wrote:
 See also
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=2c46cde2edf25e8c9ae6f591b52a6b7c086fe166
 for another place where support for C++11 is used.

That's just a little workbench program that I stuck together to
(somewhat pitifully) demo what costs the various OUString/OString
construction paths take, i.e. doesn't get built unless an explicit dmake
is run in that dir.

C.

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

[Libreoffice] [PUSHED][PATCH] [REVIEW 3-4] fdo#36555 connect to ADO (MS Access, ...)

On Tue, 2011-11-22 at 15:14 +0100, Lionel Elie Mamane wrote:
  - It is obviously correct, independent of the bug.

Yes, indeed. Pushed to 3-4 now.

C.

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

Re: [Libreoffice] help asked/offered for bug 36555

On Wed, Nov 23, 2011 at 11:14:33AM +0100, Winfried Donkers wrote:

 Then, I'd like to look at the values of $ac_delim_n and
 $ac_delim_num;

 result is (appart from error messages as above) 6 times
 * ac_delim_n: 'File STDIN:
 '8 lines match
 * ac_delim_num: 'File STDIN:
 '8 lines match

 Can you try in a shell:
 printf 'a\nb\na\nb\na\nb\na\nb\na\nb\n' | grep -c a
 It should output just 5 (and a newline) and nothing else.

 correct :)

So it does *not* output:

 File STDIN: 5 lines match

Then I think you (from your shell) and ./configure use a different
grep, and the grep that ./dmake/configure uses behaves differently
than expected: configure expects that grep -c FOO outputs JUST the
number, but the grep it uses outputs:

 File BAR: N lines match

You can test which grep is being used by inserting in configure:

printf '* grep is: %s\n' '$(command -v grep)'
printf '* PATH is: %s\n' '$PATH'


Compare that from your shell and from ./dmake/configure, find why the
PATH is wrong from within ./dmake/configure and you will hopefully
be on your way :)

 (On the machine is installed (it was already there) Borland
 C++Builder and QtCreator, with paths to Borland directories)

Hmm... Do the Borland directories and/or QtCreator include a grep?
That could be it, remove them from PATH; you don't have to do that
session-wide, only in the shell that you build LibreOffice from.

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

Re: [Libreoffice] Assertions and Logging


On 11/23/2011 10:05 AM, Miklos Vajna wrote:

Then forget the patch, all we need is to update
http://wiki.documentfoundation.org/Development/How_to_debug#Useful_macros
to reflect that now SAL_LOG controls OSL_TRACE messages, not dbglevel
1.


Thanks for the pointer.  I will update that wiki page.

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

Re: [Libreoffice] [Libreoffice-qa] Improving the QA and Release for 3.5

2011-11-23 Thread Cor Nouws


Hi Petr,

Petr Mladek wrote (23-11-11 10:28)


All in all I would say it is needed to organise these events..


I fully agree. I was just a bit scared by Cor's mail. It made me feel
that Janury 21 would be the only day when people should test LO-3.5. I
am happy to hear that it is not true. :-)


Indeed. But it seems you missed my mail from  Mon, 21 Nov 2011 10:59:09 
+0100 :-)

http://lists.freedesktop.org/archives/libreoffice-qa/2011-November/000476.html

I've just posted to TDF discuss list to get some more people interested.
I mean: not so difficult to invite people at l10n lists and sit on irc, 
but maybe more is possible/needed...


Cheers,

--
 - Cor
 - http://nl.libreoffice.org

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

Re: [Libreoffice] sw: serial numbers


On 11/23/2011 11:16 AM, Michael Stahl wrote:

in other words, any reason why i shouldn't remove serials?


...because you do not want to become a serial killer?  ;)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] LO and address book wizard

2011-11-23 Thread Alex Thurgood


Le 21/11/2011 17:39, Arno Teigseth a écrit :

Hi Arno,



Anyone else having trouble with adding address books to Libreoffice
(File-Wizard-Address book).

I'm getting SDBC error on my system, _git master LO_ on linux mint
11. Have both thunderbird (repo) and evolution (repo) installed.

The more button says 'A connection for the following URL was
requested sdbc:address:evolution:local.'

Funny, since I did select Thunderbird.


I'm wondering if this is a result of the Mozilla build changes that have 
occurred recently.



Alex

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

Re: [Libreoffice] [PATCH] [REVIEW 3-4] fdo#36555 connect to ADO (MS Access, ...)

2011-11-23 Thread Jan Holesovsky

Hi Lionel,

On 2011-11-22 at 17:52 +0100, Lionel Elie Mamane wrote:

 Kendy, would you consider having your MinGW tinderbox compile with
 -std=c++0x or -std=gnu++0x? That would ensure coverage of Windows-only
 code.

I tried, but there were several places that were broken.  After I found
out that M_PI is not defined when you build with -std=c++0x, I kind of
lost interest for now ;-) - and pushed what I have so far:

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

Ie. unfortunately, it's not enabled there yet.

Regards,
Kendy

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

Re: [Libreoffice] help asked/offered for bug 36555

2011-11-23 Thread Noel Grandin

Maybe we need a check in configure to make sure we are running the correct 
version of make?

Michael Stahl wrote:
 On 23/11/11 11:14, Winfried Donkers wrote:
 Now I get the following:
 
 config.status: executing depfiles commands
 MAKE version 5.2 Copyright (c) 1987, 2000 Borland
 Error makefile 871: Colon expected
 you shouldn't be using Borland make :)

 *** 1 errors during make ***
 make: *** [dmake/dmake.exe] Error 1

 (On the machine is installed (it was already there) Borland C++Builder and 
 QtCreator, with paths to Borland directories)
 you probably want to remove this Borland stuff from your path, building
 LO with it is certainly not supported.

 e.g. make should be GNU make

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


Disclaimer: http://www.peralex.com/disclaimer.html


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

Re: [Libreoffice] help asked/offered for bug 36555

2011-11-23 Thread Winfried Donkers

So it does *not* output:
 File STDIN: 5 lines match
No, it did not.
Then I think you (from your shell) and ./configure use a different grep, and 
the grep that ./dmake/configure uses behaves differently than expected: 
configure expects that grep -c FOO outputs JUST the number, but the grep it 
uses outputs:
 File BAR: N lines match

You can test which grep is being used by inserting in configure:
I did remove all Borland paths from PATH since my last mail, so I cannot 
compare easily.


printf '* grep is: %s\n' '$(command -v grep)'
gives /usr/bin/grep (when run from commandline in cygwin)
printf '* PATH is: %s\n' '$PATH'
gives a lot, but no longer anything with Borland

Hmm... Do the Borland directories and/or QtCreator include a grep?
That could be it, remove them from PATH; you don't have to do that 
session-wide, only in the shell that you build LibreOffice from.


I had to rename make.exe and grep in Borland directory (and in 
Windows/prefetch) before cygwin stopped using it.
I did make clean, now make is running... :)

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

Re: [Libreoffice] Setting up a non-intrusive build cluster

2011-11-23 Thread Marc-André Laverdière

Working on that... it looks simple, but the code isn't giving me what I
expected...
/me grumbles looking at unknown APIs...

Marc-André LAVERDIÈRE
Perseverance must finish its work so that you may be mature and complete,
not lacking anything. -James 1:4
http://asimplediscipleslife.blogspot.com/
mlaverd.theunixplace.com




On Mon, Nov 21, 2011 at 7:15 AM, Lionel Elie Mamane lio...@mamane.luwrote:

 On Mon, Nov 21, 2011 at 11:50:52AM +, Michael Meeks wrote:
  On Sat, 2011-11-19 at 16:15 -0500, Marc-André Laverdière wrote:

  I am convincing some powers-that-be that having a build farm would
  be good, and they are starting to listen. This would really help me
  write patches for LO, as my poor computer is having impossibly long
  compile cycles.

  There is a bunch of somewhat old Linux workstations that could
  contribute to it. The concern is mostly that it should be so that the
  systems should not accept jobs when users are logged in, as it may
  interfere with whatever work it is that they are doing.

 Maybe more interesting than nobody logged on would be system load
 very low, e.g. load = 0.1*(number of cores), possibly combined
 with free memory + memory used for cache = threshold.

I'm sure they'd accept a patch to add a config option to use some
  system heuristic before accepting a job. Of course, reliably detecting a
  login session is prolly quite fun in itself ;-) ps ax | grep
  gnome-session | kdeinit or something ?

 Nah:

   #include utmpx.h

   struct utmpx *getutxent(void);
   struct utmpx *getutxid(const struct utmpx *);
   struct utmpx *getutxline(const struct utmpx *);
   struct utmpx *pututxline(const struct utmpx *);
   void setutxent(void);
   void endutxent(void);

 is the POSIX/SUS interface to do that. Or just run /usr/bin/who -q
 :)

 --
 Lionel

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

Re: [Libreoffice] Bug 38811 - [EasyHack] default to SQLite not HSQLDB in Base

Hi Mohsin,

Of course, https://bugs.freedesktop.org/show_bug.cgi?id=38811 is a
great place for some pointers on this topic; but I prefer E-mail for its
friendliness and ease; so - first, welcome !

On Tue, 2011-11-22 at 19:10 +1100, Mohsin Mansur wrote:
 I am interested in writing the SQLite driver code for Base. 

It's a key piece we need working on, so you're much appreciated.

 * What classes/services/interfaces at a minimum have to be
 implemented? I browsed through the drivers tree and it appears that
 not all drivers implement all services (except for some basic ones
 such as tables and columns). How does one decide what to implement and
 what not to implement?

I guess starting with the most minimal one you can find ;-) I imagine
something like the evolution connector might show something like that.
As/when something works grow it I guess.

 * Are the code skeletons for the drivers usually auto-generated or
 written by hand ? There is some documentation for generating code
 skeletons from UNOIDL files on the LibreOffice SDK API page but I
 don't know if that's relevant to this case or not (once again, driver
 developers can let me know what they did).

That is certainly possible. It seems sub-classing the sdbc base-classes
is the way to go to implement most of the UNO interfaces you need.

 * Are there any existing unit tests for testing Base functionality
 with new drivers? If not, how were the existing drivers tested?

I strongly suspect the answer is 'no' :-) one of the reasons we want an
sqlite database backend present in the build is in order to be able to
have fast, during-compile unit testing of 'base' so ...

Often there are useful things in the workben/ directory that, while not
unit tests, may help. eg.
connectivity/workben/skeleton/how_to_write_a_driver.txt - of course
these tend to be somewhat outdated as well (as a bonus).

 * (a simple one) How will I set the default driver to SQLite in the
 source code?

That is a good question too. So this should prolly done by UNO service
names; you can see the service names in:

connectivity/source/drivers/hsqldb/hsqldb.component

a quick git grep for them reveals that this is not how it is done ;-)

dbaccess/source/core/misc/dsntypes.cxx

has a URL scheme, with this:

::rtl::OUString ODsnTypeCollection::getEmbeddedDatabase() const
{
::rtl::OUString sEmbeddedDatabaseURL;
static const ::rtl::OUString 
s_sNodeName(RTL_CONSTASCII_USTRINGPARAM(org.openoffice.Office.DataAccess)); 
///Installed
const ::utl::OConfigurationTreeRoot aInstalled = 
::utl::OConfigurationTreeRoot::createWithServiceFactory(m_xFactory, 
s_sNodeName, -1, ::utl::OConfigurationTreeRoot::CM_READONLY);
if ( aInstalled.isValid() )
{
if ( 
aInstalled.hasByName(EmbeddedDatabases/DefaultEmbeddedDatabase/Value) )
{
static const ::rtl::OUString 
s_sValue(RTL_CONSTASCII_USTRINGPARAM(EmbeddedDatabases/DefaultEmbeddedDatabase/Value));

aInstalled.getNodeValue(s_sValue) = sEmbeddedDatabaseURL;
if ( sEmbeddedDatabaseURL.getLength() )
aInstalled.getNodeValue(s_sValue + 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/)) + sEmbeddedDatabaseURL + 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/URL))) = sEmbeddedDatabaseURL;
}
}
if ( !sEmbeddedDatabaseURL.getLength() )
sEmbeddedDatabaseURL = 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sdbc:embedded:hsqldb));
return sEmbeddedDatabaseURL;
}

That looks like it might well be what you want; I'd compile that with
debug and/or an fprintf  step through it...

I -assume- that there is some setting that can be set for this in the
UI, but perhaps this is a hidden setting.

Hope that helps !

Michael.

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

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

Re: [Libreoffice] compiling with C++0x support

On Wed, Nov 23, 2011 at 12:27:20PM +0100, Jan Holesovsky wrote:

 On 2011-11-22 at 17:52 +0100, Lionel Elie Mamane wrote:

 Kendy, would you consider having your MinGW tinderbox compile with
 -std=c++0x or -std=gnu++0x? That would ensure coverage of Windows-only
 code.

 I tried, but there were several places that were broken.  After I found
 out that M_PI is not defined when you build with -std=c++0x, I kind of
 lost interest for now ;-)


$ cat foo.c
#include math.h
$ g++-4.4 -std=c++0x -E -dM foo.c|grep 'M_PI '
#define M_PI 3.14159265358979323846
$ /usr/bin/i586-mingw32msvc-g++ -std=c++0x -E -dM foo.c|grep 'M_PI '
$

Sneaky, sneaky. Apparently, it is a bug that it is defined in *any*
strict ANSI/ISO mode, be it C or C++. Related to
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=11196

But for this particular issue, note:

$ /usr/bin/i586-mingw32msvc-g++ -std=gnu++0x -E -dM foo.c|grep -i 'M_PI '
#define M_PI 3.14159265358979323846

So maybe you would have more luck with -std=gnu++0x than with
-std=c++0x?

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

Re: [Libreoffice] [PUSHED][PATCH] i18n corrections for pt-PT

Hi Olivier,

On Tuesday, 2011-11-22 14:29:56 -0200, Olivier Hallot wrote:

 I will provide anothe patch. Please wait.

Not necessary anymore. I resolved that by changing the attachment's
Conten-Type charset to utf-8 before saving, in fact the data was
correct, but declared wrong.

 However, these
 
 -FormatElement msgid=CurrencyFormatskey1 default=true type=short 
 usage=CURRENCY  formatindex=12
 -FormatCode#.##0 [$Esc.-816];-#.##0 [$Esc.-816]/FormatCode
 -DefaultName/DefaultName
 -/FormatElement
 +FormatElement msgid=CurrencyFormatskey1 default=true type=short 
 usage=CURRENCY formatindex=12
 +FormatCode#??##0 [CURRENCY];-#??##0 [CURRENCY]/FormatCode
 +/FormatElement
 made me wonder why there would be question marks instead of the decimal
 separator that should be a '.' dot instead. Did you type anything
 different?

Not decimal separator, but group separator.. now it's revealed that you
used a non-breaking space character as group separator, whereas other
formats use the '.' dot that is also defined with ThousandSeparator.
I changed that back.

Pushed to master
http://cgit.freedesktop.org/libreoffice/core/commit/?id=d3951ad0503a9d1c78570984fd8d483d8fb95a8c

Thanks
  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpI6qHKKd9xX.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] message construction bloat ...

So,

While the discussion on logging goes on; I knocked up a little test to
compare the difference between a couple of styles of string creation,
orthogonally for eg. exception message construction.

One of LibreOffice's -big- problems is size: we're too big. There are
lots of reasons for that, but little bits of bloat everywhere would be a
major cause of that.

The attached test contrasts:

fprintf (stderr, P is %s and b is %d\n, p, b);
vs.
std::cout  P is   p   and b is   b  \n;

Discarding the extra symbols + plt entries, ioinit  destruction, extra
string termination overhead from fragmented strings etc. and just
looking at the size of complete compiled 'main' .text

I get 61 bytes vs. 102 bytes in favour of fprintf.

Given that the real per-site difference is larger. Add to this the
issue that there are real translation problems with the 2nd approach
(that it cannot be appropriately re-ordered), and IMHO the argument here
is overwhelmingly against 'cute' operator-overloading approaches - where
each 'little' operator turns into a chunky function call at compile
time. Clearly if we introduce operators / allocations that can throw -
we also end up with some chunky eh_frame / exception unwind tables too.

If we can choose a way of constructing message, IMHO it should not be
one that has this problem; concatenation by '+' operator shares this of
course.

I know C++ doesn't like var-args, and I know var-args is type-unsafe,
and thus per-se 'evil' :-) but it also happens to be really easy to use
 read, better to translate, very familiar to most developers, and ...

Anyhow - just to throw some data at the problem.

ATB,

Michael.

-- 
michael.me...@suse.com  , Pseudo Engineer, itinerant idiot
/* to compile:
g++ -DSTDARG -Os -S -o stdarg.s ~/a.cxx
g++ -Os -S -o iostream.s ~/a.cxx
*/

#ifdef STDARG
#  include stdio.h
#else
#  include iostream
#  include fstream
#endif

int main (int argc, char **argv)
{
  volatile const char *p = foo;
  volatile int b = 42;
#ifdef STDARG
  fprintf (stderr, P is %s and b is %d\n, p, b);
#else
  std::cout  P is   p   and b is   b  \n;
#endif
  return 1;
}
.file   a.cxx
.section.rodata.str1.1,aMS,@progbits,1
.LC0:
.string foo
.LC1:
.string P is %s and b is %d\n
.text
.globl main
.type   main, @function
main:
.LFB0:
.cfi_startproc
leal4(%esp), %ecx
.cfi_def_cfa 1, 0
andl$-16, %esp
pushl   -4(%ecx)
pushl   %ebp
movl%esp, %ebp
.cfi_escape 0x10,0x5,0x2,0x75,0x0
pushl   %ecx
.cfi_escape 0xf,0x3,0x75,0x7c,0x6
subl$20, %esp
movl$42, -12(%ebp)
movl-12(%ebp), %eax
pushl   %eax
pushl   $.LC0
pushl   $.LC1
pushl   stderr
.cfi_escape 0x2e,0x10
callfprintf
movl-4(%ebp), %ecx
.cfi_def_cfa 1, 0
movl$1, %eax
leave
leal-4(%ecx), %esp
.cfi_def_cfa 4, 4
ret
.cfi_endproc
.LFE0:
.size   main, .-main
.ident  GCC: (SUSE Linux) 4.5.1 20101208 [gcc-4_5-branch revision 
167585]
.section.comment.SUSE.OPTs,MS,@progbits,1
.string OSpwg
.section.note.GNU-stack,,@progbits
.file   a.cxx
.section.rodata.str1.1,aMS,@progbits,1
.LC0:
.string P is 
.LC1:
.string  and b is 
.LC2:
.string \n
.text
.globl main
.type   main, @function
main:
.LFB1026:
.cfi_startproc
leal4(%esp), %ecx
.cfi_def_cfa 1, 0
andl$-16, %esp
pushl   -4(%ecx)
pushl   %ebp
movl%esp, %ebp
.cfi_escape 0x10,0x5,0x2,0x75,0x0
pushl   %ebx
pushl   %ecx
.cfi_escape 0xf,0x3,0x75,0x78,0x6
subl$24, %esp
pushl   $.LC0
pushl   $_ZSt4cout
movl$42, -12(%ebp)
movl-12(%ebp), %ebx
.cfi_escape 0x10,0x3,0x2,0x75,0x7c
.cfi_escape 0x2e,0x10
call_ZStlsISt11char_traitsIcEERSt13basic_ostreamIcT_ES5_PKc
popl%edx
popl%ecx
pushl   $1
pushl   %eax
call_ZNSo9_M_insertIbEERSoT_
popl%edx
popl%ecx
pushl   $.LC1
pushl   %eax
call_ZStlsISt11char_traitsIcEERSt13basic_ostreamIcT_ES5_PKc
popl%edx
popl%ecx
pushl   %ebx
pushl   %eax
call_ZNSolsEi
popl%edx
popl%ecx
pushl   $.LC2
pushl   %eax
call_ZStlsISt11char_traitsIcEERSt13basic_ostreamIcT_ES5_PKc
leal-8(%ebp), %esp
movl$1, %eax
popl%ecx
.cfi_def_cfa 1, 0
popl%ebx
.cfi_restore 3
popl%ebp
.cfi_restore 5
leal-4(%ecx), %esp

Re: [Libreoffice] [PUSHED][PATCH] remove NfShCurrencyEntries and NfShCurrencyEntryPtr types

2011-11-23 Thread Daniel Di Marco

Hi Eike,

thanks. All my patches are contributed under LGPLv3+ and MPL 1.1 licenses.


Best regards,
Daniel

 Original-Nachricht 
 Datum: Tue, 22 Nov 2011 17:03:38 +0100
 Von: Eike Rathke er...@redhat.com
 An: Daniel Di Marco d.dima...@gmx.de
 CC: libreoffice@lists.freedesktop.org
 Betreff: Re: [Libreoffice] [PUSHED][PATCH] remove NfShCurrencyEntries and 
 NfShCurrencyEntryPtr types

 Hi Daniel,
 
 On Monday, 2011-11-21 23:20:02 +0100, Daniel Di Marco wrote:
 
  attached is a simple patch to remove 2 obsolete datatypes.
 
 Thanks, good one. Pushed to master
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=33a8ac0750d4ee7800b9faccdee3fffb850a04b1
 
 I didn't find your license statement, please confirm that you contribute
 this and further patches under LGPLv3+ and MPL 1.1 licenses.
 
 Thanks
   Eike
 
 -- 
 LibreOffice Calc developer. Number formatter stricken i18n
 transpositionizer.
 GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD

-- 
NEU: FreePhone - 0ct/min Handyspartarif mit Geld-zurück-Garantie!   
Jetzt informieren: http://www.gmx.net/de/go/freephone
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] [REVIEWED 3-4] fdo#36555 connect to ADO (MS Access, ...)


On Wed, 2011-11-23 at 11:47 +0100, Michael Stahl wrote:
  Wow - nice chasing, as you say - obviously correct, I've pushed it to
  libreoffice-3-4; good to get fixed.
 
 i was just going to write a mail that you had in fact pushed it to
 Branch 'feature/sqlite', but now i see Caolan has pushed it to
 libreoffice-3-4 just now...

Lol - I should learn to pay more attention.

Thanks for the catch,

Michael.

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

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

Re: [Libreoffice] message construction bloat ...

2011-11-23 Thread Noel Grandin



Michael Meeks wrote:
  and I know var-args is type-unsafe,
Don't all of the major compilers have extensions for compile-time checking of 
printf-style strings?


Disclaimer: http://www.peralex.com/disclaimer.html


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

Re: [Libreoffice] [PUSHED][PATCH] remove NfShCurrencyEntries and NfShCurrencyEntryPtr types

Hi Daniel,

On Wednesday, 2011-11-23 13:58:56 +0100, Daniel Di Marco wrote:

 thanks. All my patches are contributed under LGPLv3+ and MPL 1.1 licenses.

Great, would you like to add yourself to
https://wiki.documentfoundation.org/Development/Developers and for the
license reference use
http://lists.freedesktop.org/archives/libreoffice/2011-November/021157.html
?

Thanks
  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgplka21c2nm0.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] compiling with C++0x support

2011-11-23 Thread Tor Lillqvist

 After I found
 out that M_PI is not defined when you build with -std=c++0x, I kind of
 lost interest for now ;-)

Welcome to the world of multiple implementations of standards.

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

Re: [Libreoffice] message construction bloat ...


On 11/23/2011 01:59 PM, Michael Meeks wrote:

Given that the real per-site difference is larger. Add to this the
issue that there are real translation problems with the 2nd approach
(that it cannot be appropriately re-ordered), and IMHO the argument here
is overwhelmingly against 'cute' operator-overloading approaches - where
each 'little' operator turns into a chunky function call at compile
time. Clearly if we introduce operators / allocations that can throw -
we also end up with some chunky eh_frame / exception unwind tables too.


Translatability should be a non-issue here, no?  (Given the way we 
localize the LO UI.)



If we can choose a way of constructing message, IMHO it should not be
one that has this problem; concatenation by '+' operator shares this of
course.


This problem being code size or translatability?


I know C++ doesn't like var-args, and I know var-args is type-unsafe,
and thus per-se 'evil' :-) but it also happens to be really easy to use
  read, better to translate, very familiar to most developers, and ...


Not sure whether

  Value is % SAL_PRIdINT32, n

compared to

  Value is   n

is really more easy to use  read and very familiar to most 
developers.  ;)  Another problem with printf is that it requires less 
natural ways to get OUStrings into the output (either we implement the 
format scanner ourselves, supporting %S; or you need to decorate 
call-sites with some sort of to-char* conversion).


But sure, the drawback of stream-style is the increased call-site code size.

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

Re: [Libreoffice] message construction bloat ...

2011-11-23 Thread Tor Lillqvist

  Value is % SAL_PRIdINT32, n

(presumably n here is then sal_Int32?)

On which of the platforms that we support is %d not a proper format
for sal_Int32?

Even in the unlikely case that on some platform int indeed is larger
(for instance 64 bits) than sal_Int32, won't the usual conversions
take care of extending the sal_Int32 to the int that %d expects?

And anyway, one more reason to just use int instead of sal_Int32 in
most cases...

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

Re: [Libreoffice] message construction bloat ...


On 11/23/2011 02:36 PM, Tor Lillqvist wrote:

On which of the platforms that we support is %d not a proper format
for sal_Int32?


On all those that use

  typedef signed long sal_Int32;

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

Re: [Libreoffice] [PUSHED] Some OSL cleanup

Hi Caolan,

On Tue, 2011-11-22 at 22:17 +0100, Arnaud Versini wrote:
   * Linux kernel version 2.6.18 or higher; - clone() for NTPL 
   * glibc2 version 2.5 or higher; - NPTL

IIRC you did some work on nailing down our Linux minimum base-line. How
does this compare vs. the above ?

Thanks,

Michael.

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

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

Re: [Libreoffice] {LibreOffice] bug 34425 hints asked


On Wed, 2011-11-23 at 07:52 +0100, Winfried Donkers wrote:
 You made bug 34425 an easy hack; I would like to give it a  try, but
 can you give me a hint where I can find the relevant code for these
 buttons (in scalc and swriter)?

Found Bjoern had replied to this mail in the bug ;-)

Ho hum,

Michael.

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

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

Re: [Libreoffice] Windows build breakage

On Wed, Nov 23, 2011 at 4:37 AM, Noel Power nopo...@suse.com wrote:
 On 23/11/11 09:27, Noel Power wrote:

 in my case a (full) clean build solved it

 has to be said this was on linux though

Well, that was a full clean build when I saw that error message.  Each
time I build on windows I do a full clean build, so... :-/

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

[Libreoffice] REMINDER: Release 3.5.0-beta0 from master

Hi,

please note that the commit deadline for 3.5.0-beta0 is on Monday,
November 28, 2011.

The main purpose of this build is to make sure that we are able to
produce usable builds in release configuration.

Please, do you best to keep master buildable and usable. Note that the
feature freeze and the commit deadline for beta1 is just one week later
on December 5, 2011.

See also
http://wiki.documentfoundation.org/ReleasePlan#3.5_release
http://wiki.documentfoundation.org/Release_Criteria
http://wiki.documentfoundation.org/Development/Branches


Best Regards,
Petr


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

Re: [Libreoffice] message construction bloat ...

2011-11-23 Thread Tor Lillqvist

 On all those that use
  typedef signed long sal_Int32;

Ah, but it still *works*, doesn't it? int is *also* 32 bits on these
platforms, isn't it?

But yeah, I guess you do get a warning from gcc.

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

Re: [Libreoffice] message construction bloat ...

On Wed, Nov 23, 2011 at 12:59:00PM +, Michael Meeks wrote:

   The attached test contrasts:

   fprintf (stderr, P is %s and b is %d\n, p, b);
 vs.
   std::cout  P is   p   and b is   b  \n;

   Given that the real per-site difference is larger. Add to this
 the issue that there are real translation problems with the 2nd
 approach (that it cannot be appropriately re-ordered), and IMHO the
 argument here is overwhelmingly against 'cute' operator-overloading
 approaches

Translation? Isn't that for debug logging? Do we translate the strings
in OSL_TRACE et al? That seems like wasted time...

Anyway, for a developer not already well acquainted with the code, the
C++ streams approach has the *huge* advantage that (s)he can add
debugging printfs without finding out how to transform *this* object
into a zero-terminated array of characters. If it makes sense to do
it, just use  and it will do the right thing. *Much* easier.

Also, more generally, in the face of platform-dependent typedefs of
integer types, *I*, for one, never really know which length modifier
to use in the format string :-( %d? %ld? Look at how glibc had to
solve this issue with an extension length modifier 'z' just so that
people can print the size of something!

If I were dictator, the printf-like format string approach would be
proscribed. I'm not dictator ;-)

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

Re: [Libreoffice] Windows build breakage

On Wed, Nov 23, 2011 at 1:18 AM, Noel Grandin n...@peralex.com wrote:
 Hi

 I tried to debug this with Michael Stahl's help, and I came to the
 conclusion that it is some kind of timing bug in make.
 Sometimes it works, sometimes not.
 In the end I gave up and disabled java. (--without-java).

Yup, in the end I did exactly the same.  However, I got another build
error in postprocess.

The build log attached.

P.S. This was also a full clean build, but --without-java used.


build.log.bz2
Description: BZip2 compressed data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] message construction bloat ...

2011-11-23 Thread Lubos Lunak

On Wednesday 23 of November 2011, Michael Meeks wrote:
   I know C++ doesn't like var-args, and I know var-args is type-unsafe,
 and thus per-se 'evil' :-) but it also happens to be really easy to use
  read, better to translate, very familiar to most developers, and ...

 ... and they abort at runtime with anything that's not a plain type, most 
notably C++ strings.

 And some of the arguments are rather weak as well, I can get you easy to use 
and read, better to translate and similarly space efficient without var-args. 
Wanna bet :) ?

 Also, string usage in LO is rather cumbersome as it is and in general it'd be 
probably a good trade-off to waste a couple of bytes on each string operation 
that doesn't need a whole line of code to express a trivial operation.

-- 
 Lubos Lunak
 l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] [PUSHED][PATCH] SwSelBoxes: svarray - std::map

On Wed, 2011-11-23 at 18:32 +0900, Daisuke Nishino wrote:
 Hi,
 
 This patch makes SwSelBoxes derived from std::map, getting rid of use
 of SV_DECL_PTRARR_SORT.
 The patch is available under LGPLv3+/MPL.

Phew, this is a real big patch. Looks ok to me, though always tricky to
get these conversions right. Hopefully nothing slipped past me. Here's
some thoughts as I went through it.

a) // dann die Positionen der neuen Size anpasse hunk

I initially wondered why this block got removed, but looking at the
code in place where there's more context I see

aPosArr.clear();
...
// dann die Positionen der neuen Size anpassen
for( n = 0; n  aPosArr.size(); ++n )
{
...
}

i.e. aPosArr always empty, so block never run, so your change looks
good. But looking backwards with git blame, I see that in a0a1c3f4 

- aPosArr.Remove( 0, n );
+ aPosArr.clear();

and looking where n came from...

for( n = 0; n  aPosArr.size(); ++n )
if( aPosArr[ n ] == nOffset )
break;
else if( aPosArr[ n ]  nOffset )
{
if( n )
--n;
break;
}

so that *prior* change (nothing to do with you) wasn't right IMO. So
changed that code and dropped your hunk which was based off aPosArr
being always empty. Looks like we found and fixed a bug in a previous
round of conversions.

b) SwSelBoxes_SAR is now a std::vector, so

- aBoxes.Remove( 0, n );
+ for( sal_uInt16 i = 0; i  n; ++i )
+ aBoxes.erase( aBoxes.begin() );

can just be

- aBoxes.Remove( 0, n );
+ aBoxes.erase(aBoxes.begin(), aBoxes.begin()+n);

right ?

Please have a look at my changes in sw that differ from the original
patch to see if they make sense.

C.

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

Re: [Libreoffice] sw: serial numbers

2011-11-23 Thread Lubos Lunak

On Wednesday 23 of November 2011, Michael Stahl wrote:
 hi all,

 i am currently wondering:
 in sw, a bunch of classes define serial numbers, e.g. SwIndex, SwNode, etc.

 in a DBG_UTIL build, there is a global counter, and the ctor increments
 the counter and assigns its value to a member, so every instance has a
 unique serial.

 what is the point of this? how would this help in debugging, given that
 the pointer values of the instances ought to be unique as long as they
 live?

 That is not the case with multiple inheritance, e.g. SwCntntNode does not 
have SwNode as its first base class (and trying to change that goes horribly 
wrong).  But I myself wouldn't consider that a good reason for keeping the 
serials.

-- 
 Lubos Lunak
 l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] [PUSHED] Some OSL cleanup

On Wed, 2011-11-23 at 13:48 +, Michael Meeks wrote:
 Hi Caolan,
 
 On Tue, 2011-11-22 at 22:17 +0100, Arnaud Versini wrote:
* Linux kernel version 2.6.18 or higher; - clone() for NTPL 
* glibc2 version 2.5 or higher; - NPTL
 
   IIRC you did some work on nailing down our Linux minimum base-line. How
 does this compare vs. the above ?

My understanding is that our practical baseline is the RHEL-4.9 x86
build machine, which is...

glibc: glibc-2.3.4-2.54
kernel: uname -r - 2.6.9-101.plus.c4smp

C.

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

[Libreoffice] [Bug 37361] LibreOffice 3.5 most annoying bugs

2011-11-23 Thread bugzilla-daemon

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

Lionel Elie Mamane lio...@mamane.lu changed:

   What|Removed |Added

 Depends on||40447

--- Comment #28 from Lionel Elie Mamane lio...@mamane.lu 2011-11-23 06:14:14 
PST ---
Nominating bug 40447: cannot change macro security settings: UI does not open

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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] [PUSHED] Enable :first-letter CSS pseudo-class for all browsers in HTML export

Hi Harri,

On Tue, 2011-11-22 at 21:39 +0200, Harri Pitkänen wrote:
 Previously when drop caps were specified in a paragraph style (not
 as direct formatting) export to HTML was implemented with :first-letter
 pseudo-class for LibreOffice Writer and through styling individual
 characters for other browsers. Since all browsers used these days (even
 obsolete ones like IE 5.5) support :first-letter there seems to be no
 reason to maintain this difference. This patch unifies all export
 modes to use :first-letter in such cases.

Looks lovely; thanks for that,

Pushed :-)

Michael.

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

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

Re: [Libreoffice] Solving an introduced runtime dependency on unreleased Qt version (KDE4 vcl backend)

2011-11-23 Thread Lubos Lunak

On Tuesday 22 of November 2011, Michael Meeks wrote:
 On Tue, 2011-11-22 at 18:26 +0100, Lubos Lunak wrote:
   Since 3.4 at least, when run with KDE4 integration, LO kind of happens
  to have a runtime dependency on a yet unreleased Qt version, otherwise LO
  will abort during some reasonably commonplace operations

  That doesn't quite fit with LO, which occassionally will do UI stuff even
  from other threads.

   Right - but we guarentee that only one thread at a time will do that -
 protected by the solar mutex. So there should never be two threads
 concurrently inside the X libraries or the Qt toolkit.

   Are you suggesting that Qt stores the thread-id of the thread it is
 initialized in, and then compares that all over the shop to check it is
 the same one ? If so, that seems heinously broken - is there a way we
 can turn that off more generally ?, if not - we shouldn't have a problem
 - vcl should -never- enter Qt or X from more than one thread
 concurrently.

 It's not really broken as such, especially historically (it wasn't that long 
ago when threads in UI apps were just an unnecessary complication and even 
just calling XInitThreads() was a bad idea). It's at least not more broken 
than having one huge global mutex :).

 And the check seems to exist only in QPixmap and LO's Solar Mutex should 
ensure there's no other problem if this check is avoided. So that looks like 
this solves the problem, if people can fix their installed Qt library.

   which means that Qt usage from it should be safe, if the way to
  avoid the QPixmap check is avoided. But there are other UI elements in
  LO, such as the fpicker, which AFAIK are not triggered using VCL and I
  don't know how that is supposed to work.

   IIRC the fpicker for KDE is (was) an out-of-process helper
 (program/kdefilepicker), so that should not be an issue.

 Only the KDE3 one, the KDE4 one is handled in-process. But other Qt UI code 
does not seem to have that check and the Solar mutex should again take care 
of this.

   What do you suggest to do about it?
 
  PS: I've attached a backport of the Qt change to
  https://bugs.freedesktop.org/show_bug.cgi?id=40298 .

   Reading the patch, we shouldn't need to XInitThreads, IIRC vcl does
 this for us.

 That is Qt-4.8 code and it makes sense that way, Qt code doesn't really care 
that somebody else somewhere randomly called XInitThreads() themselves. And 
calling it twice is no-op anyway.

   I suspect that what we really want to do is to do a:

   qApp-moveToThread(QThread::currentThread());

   before we start calling Qt methods each time. Hopefully that is
 reasonably efficient (surely it's just a member variable).

 No, it is not and I expect moving QApplication instances between threads 
really wouldn't work. Additionally this is inherently thread-unsafe and as 
such it's allowed only to move objects from the current thread to a different 
one, not this other way around.

-- 
 Lubos Lunak
 l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] [PUSHED] Fix bug in build.pl option parser

Hi Daisuke,

On Sun, 2011-11-13 at 17:51 +0900, Daisuke Nishino wrote:
 I'm not much familiar with perl, but I think the previous
 implementation of build.pl had bugs.

You're quite right, and your version looks nicer too :-) Thanks for
that, I just pushed it.

Incidentally, it'd be great if you could send a blanket MPL/LGPLv3+
license mail to the mailing list (you forgot it in this mail eg.), then
we can link that into:

http://wiki.documentfoundation.org/Development/Developers

And not worry about that :-)

Anyhow - thanks for the nice cleanup,

All the best,

Michael.

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

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

Re: [Libreoffice] message construction bloat ...


On 11/23/2011 02:52 PM, Tor Lillqvist wrote:

On all those that use
  typedef signed long sal_Int32;


Ah, but it still *works*, doesn't it? int is *also* 32 bits on these
platforms, isn't it?

But yeah, I guess you do get a warning from gcc.


Yes you do.  For real-life problems with printf-style format strings and 
our string types, witness the many uses of the SAL_PRI... macros, and 
the even more common occurrences of all sorts of casts (which are the 
poorer solution to that problem).


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

Re: [Libreoffice] [PUSHED][PATCH] i18n corrections for pt-PT

2011-11-23 Thread Olivier Hallot

Hi Eike

You must have received a file from Sergio Marques, of Portugal.

I was in touch with him and the correct data is in the file he sent you.

Can you revert my patch and apply his?

Thanks you

Olivier

Em 23-11-2011 10:55, Eike Rathke escreveu:

Hi Olivier,

On Tuesday, 2011-11-22 14:29:56 -0200, Olivier Hallot wrote:

I will provide anothe patch. Please wait.

Not necessary anymore. I resolved that by changing the attachment's
Conten-Type charset to utf-8 before saving, in fact the data was
correct, but declared wrong.

However, these

-FormatElement msgid=CurrencyFormatskey1 default=true type=short usage=CURRENCY
formatindex=12
-FormatCode#.##0 [$Esc.-816];-#.##0 [$Esc.-816]/FormatCode
-DefaultName/DefaultName
-/FormatElement
+FormatElement msgid=CurrencyFormatskey1 default=true type=short usage=CURRENCY
formatindex=12
+FormatCode#??##0 [CURRENCY];-#??##0 [CURRENCY]/FormatCode
+/FormatElement

made me wonder why there would be question marks instead of the decimal
separator that should be a '.' dot instead. Did you type anything
different?

Not decimal separator, but group separator.. now it's revealed that you
used a non-breaking space character as group separator, whereas other
formats use the '.' dot that is also defined with ThousandSeparator.
I changed that back.

Pushed to master
http://cgit.freedesktop.org/libreoffice/core/commit/?id=d3951ad0503a9d1c78570984fd8d483d8fb95a8c

Thanks
Eike

--
Olivier Hallot
Founder, Board of Directors Member - The Document Foundation
LibreOffice translation leader for Brazilian Portuguese
+55-21-8822-8812

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

Re: [Libreoffice] [PATCH] Easy hack regex compile infinite loop ( bug 41738 )

2011-11-23 Thread Niko Rönkkö

Hi Karl,

Seems that nobody has noticed your message:
http://lists.freedesktop.org/archives/libreoffice/2011-November/020211.html

You should always use [PATCH] in your Subject when sending patches to
the list to get needed attention from developers.

-- 
Kind regards

Niko, who is not a developer
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] QA for tech steering call 2011-11-24 Re: minutes of tech. steering call ...

2011-11-23 Thread Cor Nouws


Hi Michael, Rainer*,

Hmm, AFAICR, I'm not a frequent participant of the calls ;-)
And tomorrow I'll be busy all day training people with Writer.
So short two items via mail:

- FYI: I have posted a proposal for some QA actions
http://lists.freedesktop.org/archives/libreoffice-qa/2011-November/000476.html

- Noticed this in fdo#35673
Nominate bug 42772: LO-3.4.4 does not start on Windows 7, 64-bit.
So apparently we need to do something extra to make sure that all 
platforms for which we provide builds are *always* covered..


Have a good meeting!
(always encouraging to read all the amazing stuff that's being worked on 
/ finished!)


Cor

Michael Meeks wrote (17-11-11 16:42)

* Present:
+ Eike, Bjoern, Andras, Michael, Tor, Norbert, Stephan,
  Caolan, Kohei, Michael S, Thorsten, Lionel, Mitch



--
 - Cor
 - http://nl.libreoffice.org

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

[Libreoffice] doubts with UNO API and image size

2011-11-23 Thread Gabriel Monnerat

Hello,

I am using the last release of Libreoffice and now after convert some
images, I am checking that the images are more bigger

old: 640 x 409
new: 800 x 511

Sorry, I don't know the version of the old version.

But, my question is:

Is possible define custom sizes and custom fonts for this kind of
conversion?

Thanks in advance,

-- 
Gabriel M. Monnerat
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] [PUSHED] Docuview code cleanup

Hi Matteo,

On Sun, 2011-11-13 at 19:54 +0100, Matteo Casalin wrote:
  my name's Matteo and this is my first contribution [attempt] to 
 this wonderful piece of work, besides spreading the word.

Cool - welcome ! and I'm sorry it took so long to get to reviewing this
properly.

 The attached patch does a little code cleanup in Docuview::DrawSymbol 
 function and its helper, reducing local variables and calls to real 
 draw functions.

:-)

 Please note that:
 * the results of reworked code was not fully tested, since I really
don't know were all of those symbols are drawn, but those that I was
able to verify look OK to me;

Great. We see some 'symbols' drawn on buttons often next/previous
buttons that are hidden in various places. Personally I'd prefer to have
alpha transparent, themed bitmaps for all of them but ... ;-)

 * There are still other cleanups that can be done in that code, but I
would like to have some feedback before working on them. For example,
this patch could include too many changes.

So, I -think- (and I've inverted some of the senses here) that:

-if ( nMin  0x01 )
-nMin--;
...
-if ( !(nMin  0x01) )

Should be replaced by:

+const bool bMinSideIsOdd = nMin  1;
..
+if ( bMinSideIsOdd )

Rather than !bMinSideIsOdd, since the nMin-- alters the state ;-) yet
another reason why this unclear  unhelful code needs cleaning up
IMHO :-)

This code is quite amazing ;-)

pDev-DrawPixel( Point( nCenterX, nTop ) );
for ( long i = 1; i = n2; ++i )
{
nTop++;
pDev-DrawRect( Rectangle (Point( nCenterX-i, nTop ),
Point( nCenterX+i, nTop ) ) );
}

As a way to draw a triangle for an up-arrow is really quite amazing ...
Particularly when cut/pasted as the down arrow as well. I'd love to see
that stuff made common and replaced with pDev-DrawPolygon or similar
instead :-) cf. tools/inc/tools/gen.hxx and vcl/inc/vcl/outdev.hxx. We
should be able to use Polygon::Rotate() to evaporate lots of this code I
hope, possibly we could even set anti-aliasing transiently to get a
nicer rendered result too :-)

Anyhow - apart from changing the polarity of the bMinSideIsOdd later in
the code, I've pushed it as is; something so broken deserves all the
fixing it can get ASAP :-)

Sorry again for the delay; any chance you'd be interested in making
that function fully sane ? :-) it'd be much appreciated.

Thanks,

Michael.

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

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

Re: [Libreoffice] Solving an introduced runtime dependency on unreleased Qt version (KDE4 vcl backend)


On Wed, 2011-11-23 at 15:32 +0100, Lubos Lunak wrote:
 It's at least not more broken than having one huge global mutex :).

;-) not so convinced about that; but yes toolkit threading is quite a
fun problem.

  And the check seems to exist only in QPixmap and LO's Solar Mutex should 
 ensure there's no other problem if this check is avoided. So that looks like 
 this solves the problem, if people can fix their installed Qt library.

Great; so essentially removing that check prolly does it for us; but
your patch is fine too I guess.

  before we start calling Qt methods each time. Hopefully that is
  reasonably efficient (surely it's just a member variable).
 
  No, it is not and I expect moving QApplication instances between threads 
 really wouldn't work.

Right, now I read that method it's something of a nightmare for this
use-case. So your fix seems to be all we can do.

Thanks,

Michael.

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

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

Re: [Libreoffice] Assertions and Logging