[Libreoffice-commits] .: avmedia/source

2011-09-29 Thread Tor Lillqvist
 avmedia/source/quicktime/player.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 021a3772323092a03b5f24000b35ed6a6daf481b
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Sep 29 10:00:35 2011 +0300

Use NSString's UTF8String method instead of the deprecated cString

diff --git a/avmedia/source/quicktime/player.cxx 
b/avmedia/source/quicktime/player.cxx
index 8b623e9..f7efb51 100644
--- a/avmedia/source/quicktime/player.cxx
+++ b/avmedia/source/quicktime/player.cxx
@@ -152,7 +152,7 @@ bool Player::create( const ::rtl::OUString rURL )
 {
 OSL_TRACE( NSMovie create failed with error %ld (%s),
(long)[pErr code],
-   [[pErr localizedDescription] cString]
+   [[pErr localizedDescription] UTF8String]
);
 }
 [pool release];
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: binfilter/bf_sfx2

2011-09-29 Thread Stephan Bergmann
 binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2a1f2dc8b3e1d0a7fc468f6c25a18d7fc2baccee
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Sep 29 09:18:18 2011 +0200

Some more warning cleanup (Mac OS X).

diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx 
b/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx
index bacb3f7..bb2a1e5 100644
--- a/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx
+++ b/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx
@@ -154,7 +154,7 @@ namespace binfilter {
 /*N*/ void SfxPtrArr::Insert( USHORT nPos, void* rElem )
 /*N*/ {
 /*N*/   DBG_MEMTEST();
-/*N*/   DBG_ASSERT( (nUsed+1)  ( USHRT_MAX / sizeof(void*) ), array too 
large );
+/*N*/   DBG_ASSERT( sal_Int32(nUsed+1)  sal_Int32( USHRT_MAX / sizeof(void*) 
), array too large );
 /*N*/   // musz das Array umkopiert werden?
 /*N*/   if ( nUnused == 0 )
 /*N*/   {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: xmloff/source

2011-09-29 Thread Tor Lillqvist
 xmloff/source/core/xmlexp.cxx |2 +-
 xmloff/source/core/xmlimp.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 42fe8b9f11da41530a6d914397b6301a72db3800
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Sep 29 10:48:57 2011 +0300

WaE: Mark SvXMLExport_Impl and SvXMLImport_Impl as SAL_DLLPRIVATE

Fixes warnings: 'SvXML*_Impl' declared with greater visibility than
the type of its field 'SvXMLExport_Impl::mpRDFaHelper'.

diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 2777f61..54b02a4 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -260,7 +260,7 @@ void SAL_CALL SvXMLExportEventListener::disposing( const 
lang::EventObject )
 
 
//==
 
-class SvXMLExport_Impl
+class SAL_DLLPRIVATE SvXMLExport_Impl
 {
 public:
 SvXMLExport_Impl();
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 1f9f87a..9574bd7 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -169,7 +169,7 @@ void SAL_CALL SvXMLImportEventListener::disposing( const 
lang::EventObject )
 
 
//==
 
-class SvXMLImport_Impl
+class SAL_DLLPRIVATE SvXMLImport_Impl
 {
 public:
 FontToSubsFontConverter hBatsFontConv;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: 5 commits - binfilter/bf_basic binfilter/bf_goodies binfilter/bf_sc binfilter/bf_svx binfilter/bf_sw binfilter/inc

2011-09-29 Thread Caolán McNamara
 binfilter/bf_basic/source/sbx/sbxscan.cxx   |   12 +-
 binfilter/bf_goodies/source/base3d/goodies_b3dtrans.cxx |4 
 binfilter/bf_sc/source/ui/app/sc_sclib.cxx  |3 
 binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx|   11 --
 binfilter/bf_svx/source/xml/svx_xmlxtimp.cxx|4 
 binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx   |   25 ++---
 binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx  |1 
 binfilter/bf_sw/source/ui/app/sw_swcomlib.cxx   |   13 --
 binfilter/inc/bf_goodies/b3dtrans.hxx   |6 -
 binfilter/inc/bf_sw/iodetect.hxx|   80 ++--
 binfilter/inc/bf_sw/shellio.hxx |1 
 11 files changed, 39 insertions(+), 121 deletions(-)

New commits:
commit c6a8c64cfedc1a062060fb604aea0b60b2cd9238
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Sep 29 09:10:54 2011 +0100

WaE: various windows warnings

diff --git a/binfilter/bf_goodies/source/base3d/goodies_b3dtrans.cxx 
b/binfilter/bf_goodies/source/base3d/goodies_b3dtrans.cxx
index f2b468b..26e94d1 100644
--- a/binfilter/bf_goodies/source/base3d/goodies_b3dtrans.cxx
+++ b/binfilter/bf_goodies/source/base3d/goodies_b3dtrans.cxx
@@ -109,11 +109,7 @@ void B3dTransformationSet::PostSetObjectTrans()
 |*
 \/
 
-#if ! defined ICC  ! defined __GNUC__
-void B3dTransformationSet::SetOrientation( Vector3D aVRP, Vector3D aVPN, 
Vector3D aVUP)
-#else
 void B3dTransformationSet::SetOrientation( Vector3D aVRP, Vector3D aVPN, 
Vector3D aVUP)
-#endif
 {
 aOrientation.Identity();
 aOrientation.Orientation(Point4D(aVRP), aVPN, aVUP);
diff --git a/binfilter/bf_svx/source/xml/svx_xmlxtimp.cxx 
b/binfilter/bf_svx/source/xml/svx_xmlxtimp.cxx
index e4708d8..bab341f 100644
--- a/binfilter/bf_svx/source/xml/svx_xmlxtimp.cxx
+++ b/binfilter/bf_svx/source/xml/svx_xmlxtimp.cxx
@@ -154,7 +154,7 @@ private:
 /*N*/   }
 /*N*/   }
 /*N*/   }
-/*N*/   catch( uno::Exception e )
+/*N*/   catch (const uno::Exception)
 /*N*/   {
 /*N*/   }
 /*N*/   }
@@ -313,7 +313,7 @@ private:
 /*N*/   if( pGraphicHelper )
 /*N*/   SvXMLGraphicHelper::Destroy( pGraphicHelper );
 /*N*/   }
-/*N*/   catch( uno::Exception e )
+/*N*/   catch (const uno::Exception)
 /*N*/   {
 /*N*/   bRet = sal_False;
 /*N*/   }
diff --git a/binfilter/inc/bf_goodies/b3dtrans.hxx 
b/binfilter/inc/bf_goodies/b3dtrans.hxx
index 4c157a3..9fec7e2 100644
--- a/binfilter/inc/bf_goodies/b3dtrans.hxx
+++ b/binfilter/inc/bf_goodies/b3dtrans.hxx
@@ -153,15 +153,9 @@ public:
 const Matrix4D GetInvObjectTrans() { return aInvObjectTrans; }
 
 // Orientation
-#if ! defined ICC  ! defined __GNUC__
-void SetOrientation(Vector3D aVRP = Vector3D(0.0,0.0,1.0),
-Vector3D aVPN = Vector3D(0.0,0.0,1.0),
-Vector3D aVUP = Vector3D(0.0,1.0,0.0));
-#else
 void SetOrientation(Vector3D aVRP = Vector3D(0.0,0.0,1.0),
 Vector3D aVPN = Vector3D(0.0,0.0,1.0),
 Vector3D aVUP = Vector3D(0.0,1.0,0.0));
-#endif
 const Matrix4D GetOrientation() { return aOrientation; }
 const Matrix4D GetInvOrientation() { return aInvOrientation; }
 
commit 48fb6d55281fb5d4054832987495967f55acdef4
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Sep 28 23:16:32 2011 +0100

ByteString-rtl::OStringBuffer

diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx 
b/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
index f175981..171539a 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
@@ -55,6 +55,7 @@
 #include bf_sch/memchrt.hxx
 #include bf_svtools/zformat.hxx
 #include rtl/uuid.h
+#include rtl/strbuf.hxx
 #include float.h  // DBL_MIN
 
 #include com/sun/star/awt/XBitmap.hpp
@@ -108,9 +109,7 @@
 #include rangeseq.hxx
 #include unowids.hxx
 
-#ifndef __SGI_STL_LIST
 #include list
-#endif
 
 namespace binfilter {
 
@@ -783,11 +782,9 @@ void lcl_TestMap( const SfxItemPropertyMap* pMap )
 int nDiff = strcmp( pMap-pName, pNext-pName );
 if ( nDiff = 0 )
 {
-ByteString aErr(Reihenfolge: );
-aErr += pMap-pName;
-aErr += '/';
-aErr += pNext-pName;
-OSL_FAIL( aErr.GetBuffer() );
+rtl::OStringBuffer aErr(Reihenfolge: );
+aErr.append(pMap-pName).append('/').append(pNext-pName);
+OSL_FAIL(aErr.getStr());
 }
 }
 pMap = pNext;
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx 
b/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
index 60681a0..d25118a 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
@@ -278,6 +278,7 @@ sal_Unicode Sw3IoImp::ConvStarMathCharToStarSymbol( 
sal_Char c )
 

[Libreoffice-commits] .: bug/bug

2011-09-29 Thread Loic Dachary
 bug/bug/bug.js  |6 ++
 bug/bug/test.js |5 -
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 07706f06bf47fde2dce9b853583afa3b577f00a5
Author: Loic Dachary l...@dachary.org
Date:   Thu Sep 29 11:15:38 2011 +0200

Prevent double submission of the form.
  https://freedesktop.dachary.org/show_bug.cgi?id=41269
  https://freedesktop.dachary.org/show_bug.cgi?id=41270
are most likely examples of what happens when the form is submitted twice 
because of a double click.

diff --git a/bug/bug/bug.js b/bug/bug/bug.js
index d391adb..3429bcf 100644
--- a/bug/bug/bug.js
+++ b/bug/bug/bug.js
@@ -179,6 +179,11 @@
 var element = $('.state_submit');
 if(!element.hasClass('initialized')) {
 $('.go', element).click(function() {
+if($(element).hasClass('inprogress')) {
+return;
+} else {
+$(element).addClass('inprogress');
+}
 var version = $('.state_version .chosen').attr('data');
 var component = $('.state_component 
.chosen').attr('data').replace('_',' ');
 var short_desc = $('.state_subcomponent 
.active_subcomponent .chosen').attr('data') + ': ' + $('.state_description 
.short').val();
@@ -199,6 +204,7 @@
 comment: comment,
 status_whiteboard: 'BSA'
 }).pipe(function(data) {
+$(element).removeClass('inprogress');
 $(body).css(cursor, default);
 return $.bug.lookup_result(data,

$.bug.state_submit_error_regexps,
diff --git a/bug/bug/test.js b/bug/bug/test.js
index 55db48c..56f0ddb 100644
--- a/bug/bug/test.js
+++ b/bug/bug/test.js
@@ -200,7 +200,7 @@ test(state_description, function() {
 });
 
 test(state_submit, function() {
-expect(14);
+expect(16);
 
 var state_success = $.bug.state_success;
 $.bug.state_success = function() { ok(true, 'state_success'); };
@@ -226,6 +226,8 @@ test(state_submit, function() {
 $('.state_description .long').val(comment);
 var bug = '40763';
 $.bug.ajax = function(type, url, data) {
+ok(element.hasClass('inprogress'), 'is in progress');
+$('.go', element).click(); // noop
 if(data.component == component_text 
data.version == version 
data.short_desc == subcomponent + ': ' + short_desc 
@@ -235,6 +237,7 @@ test(state_submit, function() {
 };
 $('.go', element).click();
 equal($('.bug', element).text(), bug, 'bug number');
+ok(!element.hasClass('inprogress'), 'is no longer progress');
 
 var error = ' ERROR ';
 equal($('.error').text(), '', 'error is not set');
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: libtextcat/libexttextcat-3.0.1.patch libtextcat/makefile.mk libtextcat/prj lingucomponent/source ooo.lst.in scp2/source

2011-09-29 Thread Caolán McNamara
 libtextcat/libexttextcat-3.0.1.patch |4 
 libtextcat/makefile.mk   |   19 
 libtextcat/prj/d.lst |5 
 lingucomponent/source/languageguessing/guesslang.cxx |   16 
 ooo.lst.in   |2 
 scp2/source/ooo/file_ooo.scp |  503 ---
 scp2/source/ooo/module_hidden_ooo.scp|   72 --
 7 files changed, 33 insertions(+), 588 deletions(-)

New commits:
commit 61b5ee916edcf655a3127ab4aa9ce25a232d913e
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Sep 29 12:02:40 2011 +0100

bump to libexttextcat 3.1.0, enable previously broken languages

diff --git a/libtextcat/libexttextcat-3.0.1.patch 
b/libtextcat/libexttextcat-3.0.1.patch
index 3128560..2d55979 100644
--- a/libtextcat/libexttextcat-3.0.1.patch
+++ b/libtextcat/libexttextcat-3.0.1.patch
@@ -1,5 +1,5 @@
 misc/libexttextcat-3.0.1/config.sub2011-09-20 17:14:22.0 
+0200
-+++ misc/build/libexttextcat-3.0.1/config.sub  2011-09-26 16:05:16.0 
+0200
+--- misc/libexttextcat-3.1.0/config.sub2011-09-20 17:14:22.0 
+0200
 misc/build/libexttextcat-3.1.0/config.sub  2011-09-26 16:05:16.0 
+0200
 @@ -320,7 +320,7 @@
  basic_machine=$basic_machine-pc
  ;;
diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk
index d7f7f1b..c7e4d1b 100644
--- a/libtextcat/makefile.mk
+++ b/libtextcat/makefile.mk
@@ -42,9 +42,11 @@ all:
 
 # --- Files 
 
-TARFILE_NAME=libexttextcat-3.0.1
-TARFILE_MD5=131b91de2d1df0ff5f0a8284b5417f8b
-TARFILE_ROOTDIR=libexttextcat-3.0.1
+# See http://cgit.freedesktop.org/libreoffice/libexttextcat/ for upstream
+# sources, far better to commit your changes in there
+TARFILE_NAME=libexttextcat-3.1.0
+TARFILE_MD5=8dc93ffd48cb80b738075ce37df8f915
+TARFILE_ROOTDIR=libexttextcat-3.1.0
 
 PATCH_FILES=\
 libexttextcat-3.0.1.patch
@@ -71,9 +73,18 @@ OUT2LIB=$(BUILD_DIR)$/src$/.libs$/libtextcat.a
 BUILD_ACTION=cd src  dmake $(MAKEMACROS)
 .ENDIF # $(GUI)==WNT
 
+ALLTAR: $(BIN)/fingerprint.zip
+
 # --- Targets --
 
 .INCLUDE : set_ext.mk
-.INCLUDE : target.mk
 .INCLUDE : tg_ext.mk
+.INCLUDE : target.mk
 
+$(BIN)/fingerprint.zip: $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE)
+   @-rm -f $@
+   @echo creating ../../../../../$@
+   $(COMMAND_ECHO)zip -j $(ZIP_VERBOSITY) $@ 
$(MISC)/build$/$(TARFILE_ROOTDIR)$/langclass$/fpdb.conf
+   $(COMMAND_ECHO)find $(MISC)/build$/$(TARFILE_ROOTDIR)$/langclass$/LM \
+   -name *.lm -print0 | \
+xargs -0 zip -j $(ZIP_VERBOSITY) $@
diff --git a/libtextcat/prj/d.lst b/libtextcat/prj/d.lst
index 70a07bd..e52e342 100644
--- a/libtextcat/prj/d.lst
+++ b/libtextcat/prj/d.lst
@@ -4,8 +4,7 @@
 ..\%__SRC%\bin\l*.dll %_DEST%\bin\*.dll
 
 mkdir: %_DEST%\inc\external\libtextcat
-..\%__SRC%\misc\build\libexttextcat-3.0.1\src\*.h 
%_DEST%\inc\external\libtextcat\*.h
+..\%__SRC%\misc\build\libexttextcat-3.1.0\src\*.h 
%_DEST%\inc\external\libtextcat\*.h
 
 # data for language guessing
-..\%__SRC%\misc\build\libexttextcat-3.0.1\langclass\fpdb.conf 
%COMMON_DEST%\pck\fpdb.conf
-..\%__SRC%\misc\build\libexttextcat-3.0.1\langclass\LM\*.lm 
%COMMON_DEST%\pck\*.lm
+..\%COMMON_OUTDIR%\bin\*.zip %COMMON_DEST%\pck\*.zip
diff --git a/lingucomponent/source/languageguessing/guesslang.cxx 
b/lingucomponent/source/languageguessing/guesslang.cxx
index 2318da1..fff3e72 100644
--- a/lingucomponent/source/languageguessing/guesslang.cxx
+++ b/lingucomponent/source/languageguessing/guesslang.cxx
@@ -51,6 +51,8 @@
 
 #include sal/macros.h
 
+#include libtextcat/textcat.h
+
 using namespace ::rtl;
 using namespace ::osl;
 using namespace ::cppu;
@@ -156,6 +158,7 @@ void LangGuess_Impl::EnsureInitialized()
 
 SetFingerPrintsDB( aPhysPath );
 
+#if !defined(EXTTEXTCAT_VERSION_MAJOR)
 //
 // disable currently not functional languages...
 //
@@ -166,12 +169,12 @@ void LangGuess_Impl::EnsureInitialized()
 };
 LangCountry aDisable[] =
 {
-{gv, }, {sco, },// no lang-id 
available yet...
-//{hy, }, {drt, },  // 0 bytes 
fingerprints...
-{zh, CN}, {zh, TW}, {ja, }, {ko, }, // not yet 
correct functional...
-{ka, }, {hi, }, {mr, }, {ne, },
-{sa, }, {ta, }, {th, },
-{qu, }, {yi, }
+// not functional in modified libtextcat, but fixed in = 
libexttextcat 3.1.0
+// which is the first with EXTTEXTCAT_VERSION_MAJOR defined
+
+{sco, }, {zh, CN}, {zh, TW}, {ja, }, {ko, },
+{ka, }, {hi, }, {mr, }, {ne, }, {sa, },
+{ta, }, {th, }, {qu, }, {yi, }
 };
 sal_Int32 nNum = SAL_N_ELEMENTS(aDisable);
 Sequence Locale  aDisableSeq( 

[Libreoffice-commits] .: slideshow/source

2011-09-29 Thread Stephan Bergmann
 slideshow/source/inc/tools.hxx |   17 -
 1 file changed, 8 insertions(+), 9 deletions(-)

New commits:
commit a08df51f64757e5c785d89b9fdd55a9dbe32bd6d
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Sep 29 14:01:20 2011 +0200

Reverted std::hash map part of previous fix trunk gcc compile errors.

diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx
index ad3e79a..0293fb8 100644
--- a/slideshow/source/inc/tools.hxx
+++ b/slideshow/source/inc/tools.hxx
@@ -78,6 +78,13 @@ namespace slideshow
 
 // xxx todo: remove with boost::hash when 1.33 is available
 template typename T
+struct hash : ::std::unary_functionT, ::std::size_t
+{
+::std::size_t operator()( T const val ) const {
+return hash_value(val);
+}
+};
+template typename T
 inline ::std::size_t hash_value( T * const p )
 {
 ::std::size_t d = static_cast ::std::size_t (
@@ -96,17 +103,9 @@ namespace slideshow
 ::com::sun::star::uno::Reference
   ::com::sun::star::uno::XInterface const xRoot(
   x, ::com::sun::star::uno::UNO_QUERY );
-return ::std::hashvoid *()(xRoot.get());
+return hashvoid *()(xRoot.get());
 }
 
-template typename T
-struct hash : ::std::unary_functionT, ::std::size_t
-{
-::std::size_t operator()( T const val ) const {
-return hash_value(val);
-}
-};
-
 /** Cycle mode of intrinsic animations
  */
 enum CycleMode
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: sw/source

2011-09-29 Thread Tomáš Chvátal
 sw/source/core/doc/docsort.cxx |5 +++--
 sw/source/ui/app/docshini.cxx  |4 ++--
 sw/source/ui/dbui/dbinsdlg.cxx |6 +++---
 sw/source/ui/index/cnttab.cxx  |2 +-
 sw/source/ui/misc/srtdlg.cxx   |3 ++-
 5 files changed, 11 insertions(+), 9 deletions(-)

New commits:
commit db3a8faba14e89be39df5fb98f5535c1ca295f62
Author: Tomas Chvatal tchva...@suse.cz
Date:   Thu Sep 29 15:14:34 2011 +0200

Solve more ambiguous issues with Locale from sun::star.. and icu::.

diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index d76dcec..518860f 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -59,12 +59,13 @@
 #include unochart.hxx
 
 using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star;
 
 SwSortOptions*  SwSortElement::pOptions = 0;
 SwDoc*  SwSortElement::pDoc = 0;
 const FlatFndBox*   SwSortElement::pBox = 0;
 CollatorWrapper*SwSortElement::pSortCollator = 0;
-com::sun::star::lang::Locale* SwSortElement::pLocale = 0;
+lang::Locale* SwSortElement::pLocale = 0;
 String* SwSortElement::pLastAlgorithm = 0;
 LocaleDataWrapper*  SwSortElement::pLclData = 0;
 
@@ -89,7 +90,7 @@ void SwSortElement::Init( SwDoc* pD, const SwSortOptions 
rOpt,
 nLang = (LanguageType)GetAppLanguage();
 break;
 }
-pLocale = new Locale( SvxCreateLocale( nLang ) );
+pLocale = new lang::Locale( SvxCreateLocale( nLang ) );
 
 pSortCollator = new CollatorWrapper(
 ::comphelper::getProcessServiceFactory() );
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx
index 5c43206..350cf74 100644
--- a/sw/source/ui/app/docshini.cxx
+++ b/sw/source/ui/app/docshini.cxx
@@ -135,10 +135,10 @@ sal_Bool SwDocShell::InitNew( const uno::Reference  
embed::XStorage  xStor )
 
 // set forbidden characters if necessary
 SvxAsianConfig aAsian;
-SequenceLocale aLocales =  aAsian.GetStartEndCharLocales();
+Sequencelang::Locale aLocales =  aAsian.GetStartEndCharLocales();
 if(aLocales.getLength())
 {
-const com::sun::star::lang::Locale* pLocales = 
aLocales.getConstArray();
+const lang::Locale* pLocales = aLocales.getConstArray();
 for(sal_Int32 i = 0; i  aLocales.getLength(); i++)
 {
 ForbiddenCharacters aForbidden;
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 33a053b..e059ab1 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -275,7 +275,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView 
rView,
 if(xColSupp.is())
 {
 SwWrtShell rSh = pView-GetWrtShell();
-Locale aDocLocale( SvxCreateLocale( rSh.GetCurLang() ));
+lang::Locale aDocLocale( SvxCreateLocale( rSh.GetCurLang() ));
 SvNumberFormatter* pNumFmtr = rSh.GetNumberFormatter();
 SvNumberFormatsSupplierObj* pNumFmt = new SvNumberFormatsSupplierObj( 
pNumFmtr );
 Reference util::XNumberFormatsSupplier   xDocNumFmtsSupplier = 
pNumFmt;
@@ -1705,7 +1705,7 @@ void SwInsertDBColAutoPilot::Commit()
 
 if( eLang != ePrevLang )
 {
-Locale aLocale;
+lang::Locale aLocale;
 aLocale = SvxLanguageToLocale( aLocale, eLang );
 (( sPrevLang = aLocale.Country ) += rtl::OUString( '-' )) += 
aLocale.Language;
 ePrevLang = eLang;
@@ -1790,7 +1790,7 @@ void SwInsertDBColAutoPilot::Load()
 rtl::OUString sNumberFormatLocale;
 pSubProps[5] = sNumberFormatLocale;
 
-Locale aLocale;
+lang::Locale aLocale;
 aLocale.Language = sNumberFormatLocale.copy(0, 2);
 aLocale.Country = sNumberFormatLocale.copy(3, 2);
 pInsDBColumn-eUsrNumFmtLng = SvxLocaleToLanguage( aLocale );
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index d5c2838..9f0f60f 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -1516,7 +1516,7 @@ IMPL_LINK(SwTOXSelectTabPage, RadioButtonHdl, 
RadioButton*, EMPTYARG )
 
 IMPL_LINK(SwTOXSelectTabPage, LanguageHdl, ListBox*, pBox)
 {
-Locale aLcl( SvxCreateLocale( aLanguageLB.GetSelectLanguage() ) );
+lang::Locale aLcl( SvxCreateLocale( aLanguageLB.GetSelectLanguage() ) );
 Sequence OUString  aSeq = pIndexEntryWrapper-GetAlgorithmList( aLcl );
 
 if( !pIndexRes )
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index 8027638..06c15a5 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -83,6 +83,7 @@ static sal_UnicodecDeli  = '\t';
 
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star;
 using ::rtl::OUString;
 
 void lcl_ClearLstBoxAndDelUserData( ListBox rLstBox )
@@ -462,7 

[Libreoffice-commits] .: lingucomponent/source

2011-09-29 Thread Caolán McNamara
 lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx |   38 
--
 1 file changed, 18 insertions(+), 20 deletions(-)

New commits:
commit 5f04439b17f20ba3b3aeb3432fe90e6d11c34161
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Sep 29 14:16:27 2011 +0100

Resolves: fdo#41083 honour minimum word hyphenation length

diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx 
b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
index 1f8a508..615c488 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
@@ -549,23 +549,21 @@ Reference XPossibleHyphens  SAL_CALL 
Hyphenator::createPossibleHyphens( const
 const ::com::sun::star::beans::PropertyValues aProperties )
 throw(::com::sun::star::lang::IllegalArgumentException, 
::com::sun::star::uno::RuntimeException)
 {
-int wordlen;
-char *hyphens;
-char *lcword;
-int k;
-
 PropertyHelper_Hyphenation rHelper = GetPropHelper();
 rHelper.SetTmpPropVals(aProperties);
 sal_Int16 minTrail = rHelper.GetMinTrailing();
 sal_Int16 minLead = rHelper.GetMinLeading();
+sal_Int16 minLen = rHelper.GetMinWordLength();
 
-HyphenDict *dict = NULL;
-rtl_TextEncoding eEnc = RTL_TEXTENCODING_DONTKNOW;
-CharClass* pCC = NULL;
-
-Reference XPossibleHyphens  xRes;
+//Resolves: fdo#41083 honour MinWordLength in createPossibleHyphens as
+//well as hyphenate
+if (aWord.getLength()  minLen)
+{
+return PossibleHyphens::CreatePossibleHyphens( aWord, 
LocaleToLanguage( aLocale ),
+  aWord, Sequence sal_Int16 () );
+}
 
-k = -1;
+int k = -1;
 for (int j = 0; j  numdict; j++)
 {
 if (aLocale == aDicts[j].aLoc) k = j;
@@ -574,6 +572,7 @@ Reference XPossibleHyphens  SAL_CALL 
Hyphenator::createPossibleHyphens( const
 // if we have a hyphenation dictionary matching this locale
 if (k != -1)
 {
+HyphenDict *dict = NULL;
 // if this dictioanry has not been loaded yet do that
 if (!aDicts[k].aPtr)
 {
@@ -602,8 +601,8 @@ Reference XPossibleHyphens  SAL_CALL 
Hyphenator::createPossibleHyphens( const
 
 // other wise hyphenate the word with that dictionary
 dict = aDicts[k].aPtr;
-eEnc = aDicts[k].eEnc;
-pCC  = aDicts[k].apCC;
+rtl_TextEncoding eEnc = aDicts[k].eEnc;
+CharClass* pCC = aDicts[k].apCC;
 
 // we don't want to work with a default text encoding since following 
incorrect
 // results may occur only for specific text and thus may be hard to 
notice.
@@ -633,9 +632,9 @@ Reference XPossibleHyphens  SAL_CALL 
Hyphenator::createPossibleHyphens( const
 // now convert word to needed encoding
 OString encWord(OU2ENC(nTerm,eEnc));
 
-wordlen = encWord.getLength();
-lcword = new char[wordlen+1];
-hyphens = new char[wordlen+5];
+int wordlen = encWord.getLength();
+char *lcword = new char[wordlen+1];
+char *hyphens = new char[wordlen+5];
 char ** rep = NULL; // replacements of discretionary hyphenation
 int * pos = NULL; // array of [hyphenation point] minus [deletion 
position]
 int * cut = NULL; // length of deletions in original word
@@ -690,7 +689,6 @@ Reference XPossibleHyphens  SAL_CALL 
Hyphenator::createPossibleHyphens( const
 Sequence sal_Int16  aHyphPos(nHyphCount);
 sal_Int16 *pPos = aHyphPos.getArray();
 OUStringBuffer hyphenatedWordBuffer;
-OUString hyphenatedWord;
 nHyphCount = 0;
 
 for (i = 0; i  nWord.getLength(); i++)
@@ -705,10 +703,10 @@ Reference XPossibleHyphens  SAL_CALL 
Hyphenator::createPossibleHyphens( const
 }
 }
 
-hyphenatedWord = hyphenatedWordBuffer.makeStringAndClear();
+OUString hyphenatedWord = hyphenatedWordBuffer.makeStringAndClear();
 
-xRes = PossibleHyphens::CreatePossibleHyphens( aWord, 
LocaleToLanguage( aLocale ),
-  hyphenatedWord, aHyphPos );
+Reference XPossibleHyphens  xRes = 
PossibleHyphens::CreatePossibleHyphens(
+aWord, LocaleToLanguage( aLocale ), hyphenatedWord, aHyphPos);
 
 delete[] hyphens;
 delete[] lcword;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: tools/source

2011-09-29 Thread Andras Timar
 tools/source/rc/resmgr.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 05239e246346598a3cdffc7febcfaad41f1dabd5
Author: Andras Timar ati...@suse.com
Date:   Thu Sep 29 15:17:42 2011 +0200

OSL_TRACE: Remove trailing newlines

diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 4d9d749..1973419 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -183,7 +183,7 @@ ResMgrContainer::~ResMgrContainer()
 for( boost::unordered_map OUString, ContainerElement, OUStringHash 
::iterator it =
 m_aResFiles.begin(); it != m_aResFiles.end(); ++it )
 {
-OSL_TRACE( Resource file %s loaded %d times\n,
+OSL_TRACE( Resource file %s loaded %d times,
  OUStringToOString( it-second.aFileURL, 
osl_getThreadTextEncoding() ).getStr(),
  it-second.nLoadCount );
 delete it-second.pResMgr;
@@ -268,7 +268,7 @@ void ResMgrContainer::init()
 for( boost::unordered_map OUString, ContainerElement, OUStringHash 
::const_iterator it =
 m_aResFiles.begin(); it != m_aResFiles.end(); ++it )
 {
-OSL_TRACE( ResMgrContainer: %s - %s\n,
+OSL_TRACE( ResMgrContainer: %s - %s,
  OUStringToOString( it-first, osl_getThreadTextEncoding() 
).getStr(),
  OUStringToOString( it-second.aFileURL, 
osl_getThreadTextEncoding() ).getStr() );
 }
@@ -1017,7 +1017,7 @@ void ResMgr::decStack()
 if( (rTop.Flags  RC_FALLBACK_DOWN) )
 {
 #if OSL_DEBUG_LEVEL  1
-OSL_TRACE( returning from fallback %s\n,
+OSL_TRACE( returning from fallback %s,
  OUStringToOString(pFallbackResMgr-GetFileName(), 
osl_getThreadTextEncoding() ).getStr() );
 #endif
 delete pFallbackResMgr;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: README.cross

2011-09-29 Thread Jan Holesovsky
 README.cross |1 -
 1 file changed, 1 deletion(-)

New commits:
commit d717c18c5b62583ba4fc770ff51ceebd9f21be83
Author: Jan Holesovsky ke...@suse.cz
Date:   Thu Sep 29 18:02:06 2011 +0200

Don't recommend --enable-symbols, it makes it huge.

diff --git a/README.cross b/README.cross
index 1aaf88c..9f7b6e1 100644
--- a/README.cross
+++ b/README.cross
@@ -209,7 +209,6 @@ CXX_FOR_BUILD=ccache g++
 --disable-directx
 --disable-activex
 --disable-extension-integration
---enable-symbols
 
 Once you have compiled it, you may want to try to run it:
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'feature/gtk3' - vcl/generic vcl/headless

2011-09-29 Thread Michael Meeks
 vcl/generic/print/printerjob.cxx |   53 +--
 vcl/headless/svpdummies.cxx  |   17 +++-
 vcl/headless/svpframe.cxx|   13 +++--
 vcl/headless/svpgdi.cxx  |2 +
 vcl/headless/svpprn.cxx  |4 --
 5 files changed, 19 insertions(+), 70 deletions(-)

New commits:
commit 6736cf693f4afd93bbd043cef283eb45179e4ba7
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Sep 29 17:27:46 2011 +0100

misc cross-platform dependency / build issue redux

diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx
index dc06e3b..7509259 100644
--- a/vcl/generic/print/printerjob.cxx
+++ b/vcl/generic/print/printerjob.cxx
@@ -34,7 +34,6 @@
 #include sys/stat.h
 #include fcntl.h
 #include unistd.h
-#include pwd.h
 
 #include psputil.hxx
 #include glyphset.hxx
@@ -49,8 +48,9 @@
 #include rtl/strbuf.hxx
 #include rtl/ustrbuf.hxx
 
-#include osl/thread.h
-#include sal/alloca.h
+#include osl/thread.h
+#include osl/security.hxx
+#include sal/alloca.h
 #include sal/macros.h
 
 #include algorithm
@@ -215,44 +215,6 @@ PrinterJob::PrinterJob () :
 {
 }
 
-namespace psp
-{
-
-/* return the username in the given buffer */
-sal_Bool
-getUserName (char* pName, int nSize)
-{
-struct passwd *pPWEntry;
-struct passwd  aPWEntry;
-sal_Char   pPWBuffer[256];
-
-sal_Bool bSuccess = sal_False;
-
-#ifdef FREEBSD
-pPWEntry = getpwuid( getuid());
-#else
-if (getpwuid_r(getuid(), aPWEntry, pPWBuffer, sizeof(pPWBuffer), 
pPWEntry) != 0)
-pPWEntry = NULL;
-#endif
-
-if (pPWEntry != NULL  pPWEntry-pw_name != NULL)
-{
-sal_Int32 nLen = strlen(pPWEntry-pw_name);
-if (nLen  0  nLen  nSize)
-{
-memcpy (pName, pPWEntry-pw_name, nLen);
-pName[nLen] = '\0';
-
-bSuccess = sal_True;
-}
-}
-
-// wipe the passwd off the stack
-memset (pPWBuffer, 0, sizeof(pPWBuffer));
-
-return bSuccess;
-}
-
 /* remove all our temporary files, uses external program rm, since
osl functionality is inadequate */
 void
@@ -310,8 +272,6 @@ createSpoolDir ()
 return rtl::OUString();
 }
 
-} // namespace psp
-
 PrinterJob::~PrinterJob ()
 {
 std::list osl::File* ::iterator pPage;
@@ -406,11 +366,12 @@ PrinterJob::StartJob (
 WritePS (mpJobHeader, )\n);
 
 // For (user name)
-sal_Char pUserName[64];
-if (getUserName(pUserName, sizeof(pUserName)))
+osl::Security aSecurity;
+rtl::OUString aUserName;
+if( aSecurity.getUserName( aUserName ) )
 {
 WritePS (mpJobHeader, %%For: ();
-WritePS (mpJobHeader, pUserName);
+WritePS (mpJobHeader, aUserName);
 WritePS (mpJobHeader, )\n);
 }
 
diff --git a/vcl/headless/svpdummies.cxx b/vcl/headless/svpdummies.cxx
index 272f06c..32646b8 100644
--- a/vcl/headless/svpdummies.cxx
+++ b/vcl/headless/svpdummies.cxx
@@ -26,24 +26,17 @@
  *
  /
 
+#include string.h
+#include rtl/ustrbuf.hxx
 #include headless/svpdummies.hxx
 #include headless/svpinst.hxx
-#include rtl/ustrbuf.hxx
 
 // SalObject
 SvpSalObject::SvpSalObject()
 {
-m_aSystemChildData.nSize= sizeof( SystemChildData );
-m_aSystemChildData.pDisplay = NULL;
-m_aSystemChildData.aWindow  = 0;
-m_aSystemChildData.pSalFrame= 0;
-m_aSystemChildData.pWidget  = 0;
-m_aSystemChildData.pVisual  = 0;
-m_aSystemChildData.nDepth   = 0;
-m_aSystemChildData.aColormap= 0;
-m_aSystemChildData.pAppContext  = NULL;
-m_aSystemChildData.aShellWindow = 0;
-m_aSystemChildData.pShellWidget = NULL;
+// fast and easy cross-platform wiping of the data
+memset( (void *)m_aSystemChildData, 0, sizeof( SystemChildData ) );
+m_aSystemChildData.nSize = sizeof( SystemChildData );
 }
 
 SvpSalObject::~SvpSalObject()
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 8ff0e5e..864dd2c 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -26,6 +26,7 @@
  *
  /
 
+#include string.h
 #include headless/svpframe.hxx
 #include headless/svpinst.hxx
 #include headless/svpgdi.hxx
@@ -51,17 +52,13 @@ SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance,
 m_nMaxWidth( 0 ),
 m_nMaxHeight( 0 )
 {
+// fast and easy cross-platform wiping of the data
+memset( (void *)m_aSystemChildData, 0, sizeof( SystemChildData ) );
 m_aSystemChildData.nSize= sizeof( SystemChildData );
-m_aSystemChildData.pDisplay = NULL;
-m_aSystemChildData.aWindow  = 0;
+#if defined( UNX ) // FIXME: prolly redundant
 m_aSystemChildData.pSalFrame= this;
-m_aSystemChildData.pWidget  = NULL;
-m_aSystemChildData.pVisual  = NULL;
 m_aSystemChildData.nDepth   = 24;
-m_aSystemChildData.aColormap= 0;
-

[Libreoffice-commits] .: 2 commits - bridges/source gettext/makefile.mk

2011-09-29 Thread Tor Lillqvist
 bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx |   65 +++-
 gettext/makefile.mk |3 
 2 files changed, 66 insertions(+), 2 deletions(-)

New commits:
commit b94aa65357bb7c9e7da8ef3b4dc4ed98ab70ec2f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Sep 29 17:33:27 2011 +0300

Fix gettext build against MacOSX SDK 10.7

diff --git a/gettext/makefile.mk b/gettext/makefile.mk
index b6443f5..50d294f 100644
--- a/gettext/makefile.mk
+++ b/gettext/makefile.mk
@@ -47,7 +47,8 @@ GETTEXTVERSION=0.18.1.1
 TARFILE_NAME=$(PRJNAME)-$(GETTEXTVERSION)
 TARFILE_MD5=3dd55b952826d2b32f51308f2f91aa89
 
-PATCH_FILES=
+# see https://savannah.gnu.org/bugs/index.php?33999
+PATCH_FILES=gettext-0.18.1.1.stpncpy.patch
 
 
 .IF $(OS)==MACOSX
commit 229efd7754227277b9b4ec050783b7ca9b17b9a5
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Sep 29 15:51:54 2011 +0300

Make the C++/UNO bridge compile against the MacOSX 10.7 SDK

Old work in progress by sberg, committed by tml.

diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx 
b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
index 888e6f8..b5ba92a 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
@@ -31,7 +31,11 @@
 
 #include stdio.h
 #include dlfcn.h
+#if MAC_OS_X_VERSION_MIN_REQUIRED  1070
 #include cxxabi.h
+#else
+#include typeinfo
+#endif
 #include boost/unordered_map.hpp
 
 #include rtl/instance.hxx
@@ -52,12 +56,62 @@ using namespace ::std;
 using namespace ::osl;
 using namespace ::rtl;
 using namespace ::com::sun::star::uno;
+#if MAC_OS_X_VERSION_MIN_REQUIRED  1070
 using namespace ::__cxxabiv1;
-
+#endif
 
 namespace CPPU_CURRENT_NAMESPACE
 {
 
+#if MAC_OS_X_VERSION_MIN_REQUIRED = 1070
+
+// MacOSX10.4u.sdk/usr/include/c++/4.0.0/cxxabi.h defined
+// __cxxabiv1::__class_type_info and __cxxabiv1::__si_class_type_info but
+// MacOSX10.7.sdk/usr/include/cxxabi.h no longer does, so instances of those
+// classes need to be created manually:
+
+// std::type_info defined in typeinfo offers a protected ctor:
+struct FAKE_type_info: public std::type_info {
+FAKE_type_info(char const * name): type_info(name) {}
+};
+
+// Modeled after __cxxabiv1::__si_class_type_info defined in
+// MacOSX10.4u.sdk/usr/include/c++/4.0.0/cxxabi.h (i.e.,
+// abi::__si_class_type_info documented at
+// http://www.codesourcery.com/public/cxx-abi/abi.html#rtti):
+struct FAKE_si_class_type_info: public FAKE_type_info {
+FAKE_si_class_type_info(char const * name, std::type_info const * theBase):
+FAKE_type_info(name), base(theBase) {}
+
+std::type_info const * base;
+// actually a __cxxabiv1::__class_type_info pointer
+};
+
+struct Base {};
+struct Derived: Base {};
+
+std::type_info * create_FAKE_class_type_info(char const * name) {
+std::type_info * p = new FAKE_type_info(name);
+// cxxabiv1::__class_type_info has no data members in addition to
+// std::type_info
+*reinterpret_cast void ** (p) = *reinterpret_cast void * const * (
+typeid(Base));
+// copy correct __cxxabiv1::__class_type_info vtable into place
+return p;
+}
+
+std::type_info * create_FAKE_si_class_type_info(
+char const * name, std::type_info const * base)
+{
+std::type_info * p = new FAKE_si_class_type_info(name, base);
+*reinterpret_cast void ** (p) = *reinterpret_cast void * const * (
+typeid(Derived));
+// copy correct __cxxabiv1::__si_class_type_info vtable into place
+return p;
+}
+
+#endif
+
 void dummy_can_throw_anything( char const * )
 {
 }
@@ -180,13 +234,22 @@ type_info * RTTI::getRTTI( 
typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
 // ensure availability of base
 type_info * base_rtti = getRTTI(
 (typelib_CompoundTypeDescription 
*)pTypeDescr-pBaseTypeDescription );
+#if MAC_OS_X_VERSION_MIN_REQUIRED  1070
 rtti = new __si_class_type_info(
 strdup( rttiName ), (__class_type_info *)base_rtti );
+#else
+rtti = create_FAKE_si_class_type_info(
+strdup( rttiName ), base_rtti );
+#endif
 }
 else
 {
 // this class has no base class
+#if MAC_OS_X_VERSION_MIN_REQUIRED  1070
 rtti = new __class_type_info( strdup( rttiName ) );
+#else
+rtti = create_FAKE_class_type_info( strdup( rttiName ) );
+#endif
 }
 
 pair t_rtti_map::iterator, bool  insertion(
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: vcl/Library_vcl.mk

2011-09-29 Thread Jan Holesovsky
 vcl/Library_vcl.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b1920bed1b9ef4a779539647208b333a4dc6712e
Author: Jan Holesovsky ke...@suse.cz
Date:   Thu Sep 29 19:04:46 2011 +0200

Fix MinGW runtime; we need only the DLLPOSTFIX, no other magic.

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 07da2dd..0d479f0 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -56,7 +56,7 @@ $(eval $(call gb_Library_set_include,vcl,\
 $(eval $(call gb_Library_add_defs,vcl,\
 -DVCL_DLLIMPLEMENTATION \
 -DCUI_DLL_NAME=\$(call gb_Library_get_runtime_filename,cui)\ \
--DDLLPOSTFIX=$(subst $(or 
$(gb_Library_DLLEXT),$(gb_Library_PLAINEXT)),,$(gb_Library_OOOEXT)) \
+-DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \
 ))
 
 $(eval $(call gb_Library_add_api,vcl,\
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: sw/source

2011-09-29 Thread Tor Lillqvist
 sw/source/core/docnode/nodedump.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 5e4a7452c8f96192a420704b12090e871d8b25dd
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Sep 29 21:12:45 2011 +0300

Allow for lack of LIBXML_ATTR_FORMAT

diff --git a/sw/source/core/docnode/nodedump.cxx 
b/sw/source/core/docnode/nodedump.cxx
index f5b85dc..52f61ce 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -47,7 +47,11 @@ public:
 xmlTextWriterPtr operator-();
 void startElement( const char* element );
 void endElement();
-void writeFormatAttribute( const char* attribute, const char* format, ... 
) LIBXML_ATTR_FORMAT(3,4);
+void writeFormatAttribute( const char* attribute, const char* format, ... )
+#ifdef LIBXML_ATTR_FORMAT
+LIBXML_ATTR_FORMAT(3,4)
+#endif
+;
 private:
 xmlTextWriterPtr writer;
 bool owns;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Makefile.in solenv/bin

2011-09-29 Thread Stephan Bergmann
 Makefile.in |3 +--
 solenv/bin/install-gdb-printers |   14 --
 2 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 235a5e6c323432bf44db8de6cd05d1a5cc526022
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Sep 29 20:55:27 2011 +0200

Make install-gdb-printers work on Mac OS X.

diff --git a/Makefile.in b/Makefile.in
index ec38633..2b5eb5c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,8 +32,7 @@ dev-install: build
 ln -s $$SOLARVER/$$INPATH/installation/opt/ \
 @abs_builddir@/install  \
 printf '\n'  \
-install-gdb-printers -a $$SOLARVER/$$INPATH/installation/opt \
--L  \
+install-gdb-printers -L  \
 printf \
 '\nDeveloper installation finished, you can now execute:\n\n' \
  \
diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index 3606dca..b4dcd0d 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -29,6 +29,7 @@
 GDBDIR=${SOLARENV}/gdb
 SOLVERLIBDIR=${SOLARVER}/${INPATH}/lib
 INSTALLDIR=${SOLARVER}/${INPATH}/installation/opt
+[ $(uname) = Darwin ]  INSTALLDIR=$INSTALLDIR/LibreOffice.app/Contents
 
 die() {
 echo $1 2
@@ -82,7 +83,8 @@ make_autoload() {
 local lib=${dir}/$3
 
 if ! ${flat}; then
-lib=$(readlink -f ${DESTDIR}${installdir}/$2/$3)
+local resolved=$(readlink ${DESTDIR}${installdir}/$2/$3)
+[ -n $resolved ]  lib=$resolved
 dir=${lib%/*}
 fi
 
@@ -163,10 +165,10 @@ if [[ ${DESTDIR}${pythondir} != ${GDBDIR} ]]; then
 cp -r ${GDBDIR}/libreoffice ${DESTDIR}${pythondir}
 fi
 
-make_autoload cppu basis-link/ure-link/lib libuno_cppu.so.3
-make_autoload sal basis-link/ure-link/lib libuno_sal.so.3
-make_autoload svl basis-link/program libsvllo.so
-make_autoload sw basis-link/program libswlo.so
-make_autoload tl basis-link/program libtllo.so
+make_autoload cppu basis-link/ure-link/lib libuno_cppu.{dylib,so}.3
+make_autoload sal basis-link/ure-link/lib libuno_sal.{dylib,so}.3
+make_autoload svl program libsvllo.{dylib,so}
+make_autoload sw program libswlo.{dylib,so}
+make_autoload tl program libtllo.{dylib,so}
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: 2 commits - desktop/source slideshow/source

2011-09-29 Thread Tor Lillqvist
 desktop/source/pkgchk/unopkg/unopkg_app.cxx   |3 ++-
 slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit eeefce57c8a415c8bc5a4b044849d1e85ba20447
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Sep 29 21:54:00 2011 +0300

Fix error: invalid conversion from 'long int*' to 'const GLint*'

diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm 
b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
index 346808b..d67355f 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
@@ -822,7 +822,7 @@ void SAL_CALL OGLTransitionerImpl::update( double nTime ) 
throw (uno::RuntimeExc
 */
 // works but not mandatory
 #if defined(MAC_OS_X_VERSION_10_5)
-long int swapInt = 1;
+GLint swapInt = 1;
 #else /* build target 10.4 */ 
 long swapInt = 1;
 #endif
commit 50ce26da1431d4695af24827679799c7a20c507b
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Sep 29 21:53:29 2011 +0300

WaE: suggest a space before ';' or explicit braces around empty body in 
'while' statement

diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx 
b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index 82af6dc..ec156d3 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -277,7 +277,8 @@ extern C DESKTOP_DLLPUBLIC int unopkg_main()
 return 0;
 }
 //consume all bootstrap variables which may occur before the 
subcommannd
-while(isBootstrapVariable(nPos));
+while(isBootstrapVariable(nPos))
+;
 
 if(nPos = nCount)
 return 0;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: test/user-template

2011-09-29 Thread Markus Mohrhard
 test/user-template/user/psprint/pspfontcache | 1198 ---
 1 file changed, 1198 deletions(-)

New commits:
commit b8d6626a13d2cc61623376a2b9498ec0d11d707d
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Sep 29 23:09:45 2011 +0200

remove file from unit test user dir that gets modified

diff --git a/test/user-template/user/psprint/pspfontcache 
b/test/user-template/user/psprint/pspfontcache
deleted file mode 100644
index aadf16e..000
--- a/test/user-template/user/psprint/pspfontcache
+++ /dev/null
@@ -1,1198 +0,0 @@
-PspFontCacheFile format 4
-EmptyFontCacheDirectory:1317234604:/devel/libo/libo1/test/user-template/user/fonts
-FontCacheDirectory:1310697283:/usr/share/fonts/URW
-File:b018012l.pfb
-1;1
-URW Bookman L
--1;URWBookmanL-Ligh;0;6;0;2;91;942;268;210;0;1266;681;1266;681;0;0;0;b018012l.afm;Light
-
-File:n022004l.pfb
-1;1
-Nimbus Mono L
--1;NimbusMonL-Bold;0;8;0;1;91;1029;278;307;0;888;583;888;583;0;0;0;n022004l.afm;Bold
-
-File:p052003l.pfb
-1;1
-URW Palladio L
--1;URWPalladioL-Roma;0;6;0;2;91;993;283;276;0;1079;692;1079;692;0;0;0;p052003l.afm;Roman
-
-File:s05l.pfb
-1;1
-Standard Symbols L
--1;StandardSymL;0;5;0;2;10;1010;293;303;0;1090;673;1090;673;0;0;0;s05l.afm;Regular
-
-File:bchr.pfa
-1;1
-Bitstream Charter
--1;CharterBT-Roman;0;5;0;2;91;963;237;200;0;1194;672;1194;672;0;0;0;bchr.afm;Regular
-
-File:z003034l.pfb
-1;1
-URW Chancery L
--1;URWChanceryL-MediItal;2;6;0;2;91;829;242;71;0;915;477;915;477;0;0;0;z003034l.afm;Medium
 Italic
-
-File:n019043l.pfb
-1;1
-Nimbus Sans L
--1;NimbusSanL-ReguCond;0;5;0;2;91;959;282;241;0;893;718;893;718;0;0;0;n019043l.afm;Regular
-
-File:n021024l.pfb
-1;1
-Nimbus Roman No9 L
--1;NimbusRomNo9L-MediItal;2;8;0;2;91;964;324;288;0;1230;669;1230;669;0;0;0;n021024l.afm;Medium
 Italic
-
-File:c059016l.pfb
-1;1
-Century Schoolbook L
--1;CenturySchL-Bold;0;8;0;2;91;1011;372;383;0;1230;722;1230;722;0;0;0;c059016l.afm;Bold
-
-File:n022023l.pfb
-1;1
-Nimbus Mono L
--1;NimbusMonL-ReguObli;1;5;0;1;91;970;240;210;0;902;563;902;563;0;0;0;n022023l.afm;Regular
 Oblique
-
-File:c059033l.pfb
-1;1
-Century Schoolbook L
--1;CenturySchL-Ital;2;5;0;2;91;994;329;323;0;1289;722;1289;722;0;0;0;c059033l.afm;Italic
-
-File:n019003l.pfb
-1;1
-Nimbus Sans L
--1;NimbusSanL-Regu;0;5;0;2;91;953;285;238;0;1028;729;1028;729;0;0;0;n019003l.afm;Regular
-
-File:a010013l.pfb
-1;1
-URW Gothic L
--1;URWGothicL-Book;0;4;0;2;91;1009;240;249;0;1151;739;1151;739;0;0;0;a010013l.afm;Book
-
-File:p052024l.pfb
-1;1
-URW Palladio L
--1;URWPalladioL-BoldItal;2;8;0;2;91;1000;300;300;0;1127;681;1127;681;0;0;0;p052024l.afm;Bold
 Italic
-
-File:b018035l.pfb
-1;1
-URW Bookman L
--1;URWBookmanL-DemiBoldItal;2;8;0;2;91;1002;332;334;0;1333;681;1333;681;0;0;0;b018035l.afm;Demi
 Bold Italic
-
-File:a010015l.pfb
-1;1
-URW Gothic L
--1;URWGothicL-Demi;0;7;0;2;91;1051;251;302;0;1248;739;1248;739;0;0;0;a010015l.afm;Demi
-
-File:n019064l.pfb
-1;1
-Nimbus Sans L
--1;NimbusSanL-BoldCondItal;2;8;0;2;91;989;298;287;0;1001;718;1001;718;0;0;0;n019064l.afm;Bold
 Italic
-
-File:d05l.pfb
-1;1
-Dingbats
--1;Dingbats;0;5;0;2;10;819;143;-38;0;981;691;981;691;0;0;0;d05l.afm;Regular
-
-File:a010033l.pfb
-1;1
-URW Gothic L
--1;URWGothicL-BookObli;1;4;0;2;91;1007;232;239;0;1275;739;1275;739;0;0;0;a010033l.afm;Book
 Oblique
-
-File:n021004l.pfb
-1;1
-Nimbus Roman No9 L
--1;NimbusRomNo9L-Medi;0;8;0;2;91;960;341;301;0;1093;676;1093;676;0;0;0;n021004l.afm;Medium
-
-File:n022003l.pfb
-1;1
-Nimbus Mono L
--1;NimbusMonL-Regu;0;5;0;1;91;820;273;93;0;650;563;650;563;0;0;0;n022003l.afm;Regular
-
-File:n019024l.pfb
-1;1
-Nimbus Sans L
--1;NimbusSanL-BoldItal;2;8;0;2;91;979;309;288;0;1199;729;1199;729;0;0;0;n019024l.afm;Bold
 Italic
-
-File:c059013l.pfb
-1;1
-Century Schoolbook L
--1;CenturySchL-Roma;0;6;0;2;91;993;302;295;0;1188;722;1188;722;0;0;0;c059013l.afm;Roman
-
-File:a010035l.pfb
-1;1
-URW Gothic L
--1;URWGothicL-DemiObli;1;7;0;2;91;1054;251;305;0;1281;739;1281;739;0;0;0;a010035l.afm;Demi
 Oblique
-
-File:bchbi.pfa
-1;1
-Bitstream Charter
--1;CharterBT-BoldItalic;2;8;0;2;91;972;237;209;0;1243;672;1243;672;0;0;0;bchbi.afm;Bold
 Italic
-
-File:n021023l.pfb
-1;1
-Nimbus Roman No9 L
--1;NimbusRomNo9L-ReguItal;2;5;0;2;91;924;270;194;0;1112;653;1112;653;0;0;0;n021023l.afm;Regular
 Italic
-
-File:p052004l.pfb
-1;1
-URW Palladio L
--1;URWPalladioL-Bold;0;8;0;2;91;995;301;296;0;1177;681;1177;681;0;0;0;p052004l.afm;Bold
-
-File:b018015l.pfb
-1;1
-URW Bookman L
--1;URWBookmanL-DemiBold;0;8;0;2;91;1000;306;306;0;1346;681;1346;681;0;0;0;b018015l.afm;Demi
 Bold
-
-File:n019044l.pfb
-1;1
-Nimbus Sans L
--1;NimbusSanL-BoldCond;0;8;0;2;91;975;307;282;0;878;718;878;718;0;0;0;n019044l.afm;Bold
-
-File:b018032l.pfb
-1;1
-URW Bookman L
--1;URWBookmanL-LighItal;2;5;0;2;91;962;281;243;0;1269;681;1269;681;0;0;0;b018032l.afm;Light
 Italic
-
-File:n022024l.pfb
-1;1
-Nimbus Mono L
--1;NimbusMonL-BoldObli;1;8;0;1;91;1029;278;307;0;914;583;914;583;0;0;0;n022024l.afm;Bold
 Oblique
-
-File:p052023l.pfb
-1;1
-URW 

[Libreoffice-commits] .: 2 commits - sc/qa test/user-template

2011-09-29 Thread Markus Mohrhard
 sc/qa/unit/filters-test.cxx  |4 ++--
 test/user-template/user/basic/dialog.xlc |   10 --
 test/user-template/user/basic/script.xlc |   10 --
 3 files changed, 2 insertions(+), 22 deletions(-)

New commits:
commit eea06c00ab4ea0e26259a1e9f732076709d1026c
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri Sep 30 00:43:50 2011 +0200

enable the registration for vba unit test again

diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 03a1f5e..8611df0 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -195,8 +195,8 @@ ScDocShellRef FiltersTest::load(const rtl::OUString 
rFilter, const rtl::OUStrin
 if (!xDocShRef-DoLoad(aSrcMed))
 // load failed.
 xDocShRef.Clear();
-//else if (nFormatType)
-//SfxObjectShell::SetCurrentComponent( xDocShRef-GetModel() );
+else if (nFormatType)
+SfxObjectShell::SetCurrentComponent( xDocShRef-GetModel() );
 
 return xDocShRef;
 }
commit 5e733c781fb1344d1906c6b4f3d9c4f032305bbd
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri Sep 30 00:42:04 2011 +0200

remove library entries for now

maybe add them later and adapt path to something useful

diff --git a/test/user-template/user/basic/dialog.xlc 
b/test/user-template/user/basic/dialog.xlc
index b63ebd6..aed4ac2 100644
--- a/test/user-template/user/basic/dialog.xlc
+++ b/test/user-template/user/basic/dialog.xlc
@@ -1,13 +1,4 @@
 ?xml version=1.0 encoding=UTF-8?
 !DOCTYPE library:libraries PUBLIC -//OpenOffice.org//DTD OfficeDocument 
1.0//EN libraries.dtd
 library:libraries xmlns:library=http://openoffice.org/2000/library; 
xmlns:xlink=http://www.w3.org/1999/xlink;
- library:library library:name=FormWizard 
xlink:href=$(INST)/share/basic/FormWizard/dialog.xlb/ xlink:type=simple 
library:link=true library:readonly=false/
- library:library library:name=Template 
xlink:href=$(INST)/share/basic/Template/dialog.xlb/ xlink:type=simple 
library:link=true library:readonly=false/
- library:library library:name=Tools 
xlink:href=$(INST)/share/basic/Tools/dialog.xlb/ xlink:type=simple 
library:link=true library:readonly=false/
- library:library library:name=Schedule 
xlink:href=$(INST)/share/basic/Schedule/dialog.xlb/ xlink:type=simple 
library:link=true library:readonly=false/
- library:library library:name=Gimmicks 
xlink:href=$(INST)/share/basic/Gimmicks/dialog.xlb/ xlink:type=simple 
library:link=true library:readonly=false/
- library:library library:name=ImportWizard 
xlink:href=$(INST)/share/basic/ImportWizard/dialog.xlb/ xlink:type=simple 
library:link=true library:readonly=false/
- library:library library:name=Euro 
xlink:href=$(INST)/share/basic/Euro/dialog.xlb/ xlink:type=simple 
library:link=true library:readonly=false/
- library:library library:name=Depot 
xlink:href=$(INST)/share/basic/Depot/dialog.xlb/ xlink:type=simple 
library:link=true library:readonly=false/
- library:library library:name=ScriptBindingLibrary 
xlink:href=$(INST)/share/basic/ScriptBindingLibrary/dialog.xlb/ 
xlink:type=simple library:link=true library:readonly=false/
-/library:libraries
\ No newline at end of file
+/library:libraries
diff --git a/test/user-template/user/basic/script.xlc 
b/test/user-template/user/basic/script.xlc
index aaf1b0d..aed4ac2 100644
--- a/test/user-template/user/basic/script.xlc
+++ b/test/user-template/user/basic/script.xlc
@@ -1,13 +1,4 @@
 ?xml version=1.0 encoding=UTF-8?
 !DOCTYPE library:libraries PUBLIC -//OpenOffice.org//DTD OfficeDocument 
1.0//EN libraries.dtd
 library:libraries xmlns:library=http://openoffice.org/2000/library; 
xmlns:xlink=http://www.w3.org/1999/xlink;
- library:library library:name=FormWizard 
xlink:href=$(INST)/share/basic/FormWizard/script.xlb/ xlink:type=simple 
library:link=true library:readonly=false/
- library:library library:name=Template 
xlink:href=$(INST)/share/basic/Template/script.xlb/ xlink:type=simple 
library:link=true library:readonly=false/
- library:library library:name=Tools 
xlink:href=$(INST)/share/basic/Tools/script.xlb/ xlink:type=simple 
library:link=true library:readonly=false/
- library:library library:name=Schedule 
xlink:href=$(INST)/share/basic/Schedule/script.xlb/ xlink:type=simple 
library:link=true library:readonly=false/
- library:library library:name=Gimmicks 
xlink:href=$(INST)/share/basic/Gimmicks/script.xlb/ xlink:type=simple 
library:link=true library:readonly=false/
- library:library library:name=ImportWizard 
xlink:href=$(INST)/share/basic/ImportWizard/script.xlb/ xlink:type=simple 
library:link=true library:readonly=false/
- library:library library:name=Euro 
xlink:href=$(INST)/share/basic/Euro/script.xlb/ xlink:type=simple 
library:link=true library:readonly=false/
- library:library library:name=Depot 
xlink:href=$(INST)/share/basic/Depot/script.xlb/ xlink:type=simple 
library:link=true library:readonly=false/
- library:library library:name=ScriptBindingLibrary