[Libreoffice-commits] .: svtools/source

[Matus Kukan]

 svtools/source/graphic/graphic.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3744cd818383fd954125a6567856e92198792cf1
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Dec 17 13:29:50 2011 +0100

gcc-trunk: avoid confusion

diff --git a/svtools/source/graphic/graphic.hxx 
b/svtools/source/graphic/graphic.hxx
index 7b4f5e0..a1efca0 100644
--- a/svtools/source/graphic/graphic.hxx
+++ b/svtools/source/graphic/graphic.hxx
@@ -58,7 +58,7 @@ public:
 Graphic();
 ~Graphic() throw();
 
-using unographic::GraphicDescriptor::init;
+using ::unographic::GraphicDescriptor::init;
 void init( const ::Graphic rGraphic ) throw();
 
 static const ::Graphic* getImplementation( const 
::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface  rxIFace 
) throw();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/bin

[Norbert Thiebaud]

 solenv/bin/concat-deps.c |   39 ++-
 1 file changed, 30 insertions(+), 9 deletions(-)

New commits:
commit 3adb006b526b8469bd98ea7b8d02ebd083e1f49c
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Sat Dec 17 07:06:42 2011 -0600

concat-deps.c deal with /../ in dep path

diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index d699e82..f3ecdef 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -684,9 +684,11 @@ int rc;
 char* buffer;
 char* end;
 char* cursor;
+char* cursor_out;
 char* base;
 int continuation = 0;
 char last_ns = 0;
+char* last_slash = NULL;
 off_t size;
 
 buffer = file_load(fn, size, rc);
@@ -697,20 +699,38 @@ off_t size;
  */
 if(!rc)
 {
-base = cursor = end = buffer;
+base = cursor_out = cursor = end = buffer;
 end += size;
 while(cursor  end)
 {
 if(*cursor == '\\')
 {
 continuation = 1;
-cursor += 1;
+*cursor_out++ = *cursor++;
+}
+else if(*cursor == '/')
+{
+if(cursor + 3  end)
+{
+if(!memcmp(cursor, /../, 4))
+{
+if(last_slash != NULL)
+{
+/* bactrack to the previous '/' */
+cursor_out = last_slash;
+/* skip the /.. section */
+cursor += 3;
+}
+}
+}
+last_slash = cursor_out;
+*cursor_out++ = *cursor++;
 }
 else if(*cursor == '\n')
 {
 if(!continuation)
 {
-*cursor = 0;
+*cursor_out = 0;
 if(base  cursor)
 {
 /* here we have a complete rule */
@@ -720,7 +740,7 @@ off_t size;
  * these are the one for which we want to filter
  * duplicate out
  */
-if(hash_store(dep_hash, base, (int)(cursor - 
base)))
+if(hash_store(dep_hash, base, (int)(cursor_out - 
base)))
 {
 puts(base);
 putc('\n', stdout);
@@ -734,14 +754,15 @@ off_t size;
 }
 }
 cursor += 1;
-base = cursor;
+base = cursor_out = cursor;
 }
 else
 {
 /* here we have a '\' followed by \n this is a continuation
  * i.e not a complete rule yet
  */
-cursor += 1;
+last_slash = NULL;
+*cursor_out++ = *cursor++;
 }
 }
 else
@@ -752,15 +773,15 @@ off_t size;
 {
 last_ns = *cursor;
 }
-cursor += 1;
+*cursor_out++ = *cursor++;
 }
 }
 /* just in case the file did not end with a \n, there may be a pending 
rule */
-if(base  cursor)
+if(base  cursor_out)
 {
 if(last_ns == ':')
 {
-if(hash_store(dep_hash, base, (int)(cursor - base)))
+if(hash_store(dep_hash, base, (int)(cursor_out - base)))
 {
 puts(base);
 putc('\n', stdout);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/source

[Ivan Timofeev]

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

New commits:
commit f26635c3869a85ae03dba3dfb833276f13ffc478
Author: Ivan Timofeev timofeev@gmail.com
Date:   Sat Dec 17 17:11:54 2011 +0400

fix decoration drawing

diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index 38dbe74..6b6bc1a 100644
--- a/vcl/source/window/decoview.cxx
+++ b/vcl/source/window/decoview.cxx
@@ -747,7 +747,7 @@ void ImplDrawFrame( OutputDevice *const pDev, Rectangle 
rRect,
 rRect.Right(), rRect.Bottom() ) );
 pDev-SetLineColor( rStyleSettings.GetShadowColor() );
 pDev-DrawRect( Rectangle( rRect.Left(), rRect.Top(),
-rRect.Right()+1, rRect.Bottom()+1 
) );
+rRect.Right()-1, rRect.Bottom()-1 
) );
 
 // adjust target rectangle
 rRect.Left()   += 2;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cppuhelper/source cppu/source cpputools/source

[Ivan Timofeev]

 cppu/source/uno/EnvStack.cxx |2 -
 cppu/source/uno/lbenv.cxx|4 +--
 cppu/source/uno/lbmap.cxx|6 ++---
 cppuhelper/source/bootstrap.cxx  |8 +++---
 cppuhelper/source/component_context.cxx  |2 -
 cppuhelper/source/factory.cxx|2 -
 cppuhelper/source/propertysetmixin.cxx   |2 -
 cppuhelper/source/propshlp.cxx   |8 +++---
 cppuhelper/source/servicefactory.cxx |   14 +--
 cppuhelper/source/shlib.cxx  |4 +--
 cpputools/source/registercomponent/registercomponent.cxx |   16 ++---
 cpputools/source/regsingleton/regsingleton.cxx   |2 -
 cpputools/source/unoexe/unoexe.cxx   |   18 +++
 13 files changed, 44 insertions(+), 44 deletions(-)

New commits:
commit 1b99d8800e399f45404ab62827163a873d2a1aec
Author: Olivier Hallot olivier.hal...@alta.org.br
Date:   Thu Dec 15 17:29:53 2011 -0200

Fix for fdo43460 Part X getLength() to isEmpty()

Part X
Module
cppu
cppuhelper
cpputools

diff --git a/cppu/source/uno/EnvStack.cxx b/cppu/source/uno/EnvStack.cxx
index d1ff292..9542440 100644
--- a/cppu/source/uno/EnvStack.cxx
+++ b/cppu/source/uno/EnvStack.cxx
@@ -203,7 +203,7 @@ static int s_getNextEnv(uno_Environment ** ppEnv, 
uno_Environment * pCurrEnv, un
 res = 1;
 }
 
-if (nextPurpose.getLength())
+if (!nextPurpose.isEmpty())
 {
 rtl::OUString next_envDcp(s_uno_envDcp);
 next_envDcp += nextPurpose;
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 08e7035..ba3465c 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -1031,7 +1031,7 @@ inline void EnvironmentsData::getRegisteredEnvironments(
   iPos != aName2EnvMap.end(); ++iPos )
 {
 uno_Environment * pWeak = iPos-second;
-if (!rEnvDcp.getLength() ||
+if (rEnvDcp.isEmpty() ||
 rEnvDcp.equals( pWeak-pTypeName ))
 {
 ppFound[nSize] = 0;
@@ -1116,7 +1116,7 @@ static uno_Environment * initDefaultEnvironment(
 that-releaseInterface = unoenv_releaseInterface;
 
 OUString envPurpose = cppu::EnvDcp::getPurpose(rEnvDcp);
-if (envPurpose.getLength())
+if (!envPurpose.isEmpty())
 {
 rtl::OUString libStem = 
envPurpose.copy(envPurpose.lastIndexOf(':') + 1);
 libStem += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(_uno_uno) 
);
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index ec56c05..84e2cc7 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -312,7 +312,7 @@ static inline OUString getBridgeName(
 SAL_THROW( () )
 {
 OUStringBuffer aBridgeName( 16 );
-if (rAddPurpose.getLength())
+if (!rAddPurpose.isEmpty())
 {
 aBridgeName.append( rAddPurpose );
 aBridgeName.append( (sal_Unicode)'_' );
@@ -469,7 +469,7 @@ static Mapping getMediateMapping(
 }
 
 // connect to uno
-if (rAddPurpose.getLength()) // insert purpose mapping between new ano_uno 
- uno
+if (!rAddPurpose.isEmpty()) // insert purpose mapping between new ano_uno 
- uno
 {
 // create anonymous uno env
 Environment aAnUno;
@@ -540,7 +540,7 @@ void SAL_CALL uno_getMapping(
 }
 
 // See if an identity mapping does fit.
-if (!aRet.is()  pFrom == pTo  !aAddPurpose.getLength())
+if (!aRet.is()  pFrom == pTo  aAddPurpose.isEmpty())
 aRet = createIdentityMapping(pFrom);
 
 if (!aRet.is())
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index 399af07..2fb8ccd 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -81,13 +81,13 @@ namespace cppu
 OUString const  get_this_libpath()
 {
 static OUString s_path;
-if (0 == s_path.getLength())
+if (s_path.isEmpty())
 {
 OUString path;
 Module::getUrlFromAddress( 
reinterpret_castoslGenericFunction(get_this_libpath), path );
 path = path.copy( 0, path.lastIndexOf( '/' ) );
 MutexGuard guard( Mutex::getGlobalMutex() );
-if (0 == s_path.getLength())
+if (s_path.isEmpty())
 s_path = path;
 }
 return s_path;
@@ -317,7 +317,7 @@ Reference registry::XSimpleRegistry  nestRegistries(
 sal_Int32 index;
 Reference registry::XSimpleRegistry  lastRegistry;
 
-if(write_rdb.getLength()) // is there a write registry given?
+if(!write_rdb.isEmpty()) // is there a write registry given?
 {
 lastRegistry.set(xSimRegFac-createInstance(), UNO_QUERY);
 
@@ -533,7 +533,7 @@ Reference XComponentContext  SAL_CALL bootstrap()
 throw BootstrapException(
 OUSTR(cannot convert soffice installation path to 

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

[Matus Kukan]

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

[Libreoffice-commits] Changes to 'feature/gbuild'

[Matus Kukan]

New branch 'feature/gbuild' available with the following commits:
commit f85fb6272fa1fd2d7c7820104a864ae01978e7d2
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Dec 17 14:18:58 2011 +0100

sal: add more unit tests

commit 9464e225225fbc01df914fc25f9364e79957ad03
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Dec 17 13:22:02 2011 +0100

sal: add visibility symbols

commit 006649cc2790b98e6f4d9f65be3d97fcdad0c5b6
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Dec 17 13:13:11 2011 +0100

sal: convert to gbuild

commit 0ff2a6697863f110fcf08d88f9914009d737bcaf
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Dec 17 16:46:22 2011 +0100

cppu: add visibility symbols

commit 05c20d7f582309e495f8e403060a38130d27ed45
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Dec 17 14:55:08 2011 +0100

cppu: convert to gbuild

There are missing unit tests

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

[Libreoffice-commits] .: bootstrap configure.in .gitignore solenv/bin solenv/gbuild

[Norbert Thiebaud]

 .gitignore  |3 +++
 bootstrap   |4 
 configure.in|2 +-
 solenv/bin/concat-deps.c|5 ++---
 solenv/gbuild/LinkTarget.mk |2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit e3e94f141e15f5501ed81402a70beb10b85ccd6f
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Sat Dec 17 10:54:24 2011 -0600

use a c-version of concat-deps.pl

This touch configure.in with a trivial space removal to force a
./bootstrap on the tinderboxes

This make ./bootstrap build a 'build-side' executable concat-deps
and modify LinkTarget.mk to use it instead of concat-deps.pl

The impact is a conservative x10 times improvement in both elapsed and
cpu time in overhead due to DEP generations.


time make -sr build in tail_build after removing
workdir/$INPATH/Dep/LinkTarget/Library/*

(all on Intel X3360, 2.83GHz, 4-core)

before:
elapsed: 116.5 cpu: 115.9
after
elapsed: 24.3 cpu: 23.9
base (no dep processing, i.e no rm of Dep/...)
elapsed: 17.5 cpu: 17.4
overhead ratio:
elapsed: 14.5x cpu: 15x

same with -j6
before:
elapsed: 47 cpu: 116
after:
elapsed: 20.8 cpu: 24
base:
elapsed: 17.5 cpu: 17.5
overhead ratio:
elapsed: 9x cpu: 15x

Note: for now the executable is generated directly in the source tree
(in solevn/bin ). That is not ideal. It and other similar polution
should be moved, to workdir most likely..
For now we just hide the mess under the .gitignore carpet

diff --git a/.gitignore b/.gitignore
index 3929c67..af084f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -108,6 +108,9 @@ TAGS
 /solenv/gdb/libreoffice/*.py[co]
 /solenv/gdb/libreoffice/util/*.py[co]
 
+# botstrap generated tool
+/solenv/bin/concat-deps
+
 # test output files
 test/user-template/user/psprint/pspfontcache
 
diff --git a/bootstrap b/bootstrap
index 1bf5068..da1192c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -74,6 +74,10 @@ if test $BUILD_DMAKE != NO; then
 echo dmake copied to $SOLARENV/$OUTPATH_FOR_BUILD/bin/dmake$EXEEXT
 fi
 
+# build concat-deps
+echo building concat-deps
+$CC_FOR_BUILD -O2 $SOLARENV/bin/concat-deps.c -o $SOLARENV/bin/concat-deps 
|| exit
+
 #make sure build.pl is executable
 
 chmod +x $SRC_ROOT/solenv/bin/build.pl
diff --git a/configure.in b/configure.in
index 433c523..1772116 100644
--- a/configure.in
+++ b/configure.in
@@ -1899,7 +1899,7 @@ fi
 
 dnl ===
 dnl Extra check for Windows. Cygwin builds need gcc to build dmake
-dnl although MSVC is used to build other build-time tools and 
+dnl although MSVC is used to build other build-time tools and
 dnl LibreOffice itself.
 dnl ===
 if test $build_os = cygwin ; then
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index f3ecdef..6cf9192 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -3,8 +3,8 @@
  *License: GPLv3
  */
 
-//* define to activate stats reporting on hash usage
-#define HASH_STAT
+/* define to activate stats reporting on hash usage*/
+/* #define HASH_STAT */
 
 /* ===
  * Set-up: defines to identify the system and system related properties
@@ -566,7 +566,6 @@ int cost = 0;
 {
 hash-collisions += 1;
 hash-cost += cost;
-//fprintf(stderr, key colision %s and %s\n, key, 
hash_elem-next-key);
 }
 #endif
 hash-array[hashed] = hash_elem;
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 4a7833c..eec7612 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -338,7 +338,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(8),$(call 
gb_GenCObject_get_dep_target,$(object))) \
$(foreach object,$(9),$(call 
gb_GenCxxObject_get_dep_target,$(object))) \
)  \
-   $(SOLARENV)/bin/concat-deps.pl $${RESPONSEFILE}  $(1))  \
+   $(SOLARENV)/bin/concat-deps $${RESPONSEFILE}  $(1))  \
rm -f $${RESPONSEFILE}
 
 endef
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/bin

[Norbert Thiebaud]

 solenv/bin/concat-deps.c |   26 --
 1 file changed, 16 insertions(+), 10 deletions(-)

New commits:
commit 05e787fb5e32880ff51902137cfd8da9820cd870
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Sat Dec 17 12:34:29 2011 -0600

oops... bad handling of multiple ../

diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 6cf9192..fc23433 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -677,6 +677,21 @@ int fd;
 return buffer;
 }
 
+static void _cancel_relative(char* base, char** ref_cursor, char** 
ref_cursor_out, char* end)
+{
+char* cursor = *ref_cursor;
+char* cursor_out = *ref_cursor_out;
+
+do
+{
+cursor += 3;
+while(cursor_out  base  *--cursor_out != '/');
+}
+while(cursor + 3  end  !memcmp(cursor, /../, 4));
+*ref_cursor = cursor;
+*ref_cursor_out = cursor_out;
+}
+
 static int _process(struct hash* dep_hash, char* fn)
 {
 int rc;
@@ -687,7 +702,6 @@ char* cursor_out;
 char* base;
 int continuation = 0;
 char last_ns = 0;
-char* last_slash = NULL;
 off_t size;
 
 buffer = file_load(fn, size, rc);
@@ -713,16 +727,9 @@ off_t size;
 {
 if(!memcmp(cursor, /../, 4))
 {
-if(last_slash != NULL)
-{
-/* bactrack to the previous '/' */
-cursor_out = last_slash;
-/* skip the /.. section */
-cursor += 3;
-}
+_cancel_relative(base, cursor, cursor_out, end);
 }
 }
-last_slash = cursor_out;
 *cursor_out++ = *cursor++;
 }
 else if(*cursor == '\n')
@@ -760,7 +767,6 @@ off_t size;
 /* here we have a '\' followed by \n this is a continuation
  * i.e not a complete rule yet
  */
-last_slash = NULL;
 *cursor_out++ = *cursor++;
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

 sc/source/ui/unoobj/filtuno.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 47a941847617fd232dc48947b82f2b6a9830a895
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Fri Dec 16 12:39:39 2011 -0600

WaE Mac unitialized value false positive

diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index 6c1a651..4fe9f0f 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -82,7 +82,7 @@ SC_SIMPLE_SERVICE_INFO( ScFilterOptionsObj, 
SCFILTEROPTIONSOBJ_IMPLNAME, SCFILTE
 
 static void load_CharSet( rtl_TextEncoding nCharSet, bool bExport )
 {
-sal_Int32 nChar;
+sal_Int32 nChar = 0;
 SequenceAny aValues;
 const Any *pProperties;
 SequenceOUString aNames(1);
@@ -101,7 +101,9 @@ static void load_CharSet( rtl_TextEncoding nCharSet, bool 
bExport )
 {
 pProperties[0] = nChar;
 if( nChar = 0)
+{
 nCharSet = (rtl_TextEncoding) nChar;
+}
 }
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'tinderbox' - local_conf/Error_Parse.pm

[Christian Lohmaier]

 local_conf/Error_Parse.pm |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 73e7270c6ee48533df3660b397ce625a72c8b7b9
Author: Christian Lohmaier lohmaier+git...@googlemail.com
Date:   Sun Dec 18 00:58:56 2011 +0100

add No rule to make target to error-flag-list

diff --git a/local_conf/Error_Parse.pm b/local_conf/Error_Parse.pm
index fcfe5ae..316bfa9 100644
--- a/local_conf/Error_Parse.pm
+++ b/local_conf/Error_Parse.pm
@@ -160,6 +160,7 @@ sub line_type {
 ($line =~ /jmake.MakerFailedException:/) || # Java error
 ($line =~ /  Warning:/)  || # dmake warning
 ($line =~ /  Error:/)|| # dmake error
+($line =~ /\*\*\* No rule to make target/) ||   # make error 
(no rule or failed to build)
 0);
 
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - configure.in solenv/gbuild

[Norbert Thiebaud]

 configure.in |1 +
 solenv/gbuild/platform/macosx.mk |5 +
 2 files changed, 6 insertions(+)

New commits:
commit 122940aba7392bfba17b04a4c166b28ebbc3bd1f
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Sat Dec 17 18:11:49 2011 -0600

do not package pything scripting extension when building --with-python=no

diff --git a/configure.in b/configure.in
index 1772116..40cf257 100644
--- a/configure.in
+++ b/configure.in
@@ -7690,6 +7690,7 @@ dnl Scripting provider for Python extension?
 dnl We always provide this unless we have disabled Python completely
 if test $enable_python = no; then
 ENABLE_SCRIPTING_PYTHON=NO
+SCPDEFS=$SCPDEFS -DWITHOUT_EXTENSION_SCRIPTING_PYTHON
 else
 ENABLE_SCRIPTING_PYTHON=YES
 fi
commit 8c0242d3a9689ff1c75693bd506b276f8fca75b3
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Sat Dec 17 18:11:18 2011 -0600

do not run cppunit on Mac when cross-compiling

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 3c8329b..f1187cc 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -339,7 +339,12 @@ endef
 
 # CppunitTest class
 
+ifeq ($(CROSS_COMPILING),YES)
+gb_CppunitTest_CPPTESTPRECOMMAND := :
+else
 gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path)
+endif
+
 gb_CppunitTest_SYSPRE := libtest_
 gb_CppunitTest_EXT := .dylib
 gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/pf_extensions'

[Matus Kukan]

New branch 'feature/pf_extensions' available with the following commits:
commit bce6369809b34ca579b8587b10c8992f1f4556af
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 18:43:20 2011 -0500

add idl to tail_build

commit 51bd9c68f65ada55865839582250747c121cc701
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 18:40:01 2011 -0500

add dtrans to tail_build

commit 8bb52eb018a940b4aa190ab5c8849a75d940facb
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 18:36:35 2011 -0500

add xmloff to tail_build

commit 2d107d13dd696d67c6d423dc3e1676d7fa833319
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 18:28:25 2011 -0500

add editeng to tail_build

commit 1a3bed66706b8737b2d6f6d1852e434e6f1bc28d
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 18:26:42 2011 -0500

add canvas to tail_build

commit 46dfd1fa94e643e899a67b71598724a1689e66e2
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 18:21:39 2011 -0500

add scaddins to tail_build

commit 40b7fdc9819d880a268a70e0454ddb8421969efa
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 18:18:06 2011 -0500

add cppcanvas to tail_build

commit 1ed556762e29c589eb3287d3552978ebc9ba2b1b
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 18:15:07 2011 -0500

add sfx2 to tail_build

commit eb27d8d430bc548ad9f298954101ee8ad567fc2d
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 18:09:19 2011 -0500

add avmedia to tail_build

commit e628947b98e2406bc8178ceb26eaefda85e15b90
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 16:53:06 2011 -0500

add drawinglayer to tail_build

commit 1bee8042851e8c3bc04bc66f028050889516ced5
Author: Peter Foley pefol...@verizon.net
Date:   Sat Dec 17 16:49:28 2011 -0500

add svx to tail_build

commit 65345b23fbe72c73ae92cbefbf988868339f4b7d
Author: Peter Foley pefol...@verizon.net
Date:   Mon Oct 10 00:39:06 2011 +

convert extensions to gbuild and add to tail_build

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

[Libreoffice-commits] .: sw/source

[Miklos Vajna]

 sw/source/filter/ww8/rtfattributeoutput.cxx |8 ++--
 sw/source/filter/ww8/rtfattributeoutput.hxx |4 
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 6ab183533ef543ea96e15fcc5155321298c758a8
Author: Miklos Vajna vmik...@frugalware.org
Date:   Sun Dec 18 02:33:54 2011 +0100

fdo#37498 RTF export: handle url fields without a field result

diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 2cd6033..17b2de3 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -460,6 +460,7 @@ bool RtfAttributeOutput::StartURL( const String rUrl, 
const String rTarget )
 }
 
 m_aStyles.append(});
+m_bHadFieldResult = false;
 return true;
 }
 
@@ -468,7 +469,8 @@ bool RtfAttributeOutput::EndURL()
 OSL_TRACE(%s, OSL_THIS_FUNC);
 
 // close the fldrslt group
-m_aRunText.append('}');
+if (m_bHadFieldResult)
+m_aRunText.append('}');
 // close the field group
 m_aRunText.append('}');
 return true;
@@ -2249,6 +2251,7 @@ void RtfAttributeOutput::TextINetFormat( const 
SwFmtINetFmt rURL )
 const SwTxtINetFmt* pTxtAtr = rURL.GetTxtINetFmt();
 
 m_aStyles.append({ OOO_STRING_SVTOOLS_RTF_FLDRSLT  );
+m_bHadFieldResult = true;
 if( pTxtAtr  0 != ( pFmt = pTxtAtr-GetCharFmt() ))
 {
 sal_uInt16 nStyle = m_rExport.GetId( *pFmt );
@@ -2989,7 +2992,8 @@ RtfAttributeOutput::RtfAttributeOutput( RtfExport 
rExport )
 m_bBufferSectionBreaks( false ),
 m_bBufferSectionHeaders( false ),
 m_bLastTable( true ),
-m_bWroteCellInfo( false )
+m_bWroteCellInfo( false ),
+m_bHadFieldResult( false )
 {
 OSL_TRACE(%s, OSL_THIS_FUNC);
 }
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx 
b/sw/source/filter/ww8/rtfattributeoutput.hxx
index 856b14f..c96de2c 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -529,6 +529,10 @@ private:
  */
 bool m_bWroteCellInfo;
 
+/*
+ * If we had a field result in the URL.
+ */
+bool m_bHadFieldResult;
 public:
 RtfAttributeOutput( RtfExport rExport );
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source

[Miklos Vajna]

 sw/source/filter/ww8/rtfattributeoutput.cxx |8 ++--
 sw/source/filter/ww8/rtfattributeoutput.hxx |4 
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit ddc7af3e7963d1a625ef939ad0cd9830eb3ddd99
Author: Miklos Vajna vmik...@frugalware.org
Date:   Sun Dec 18 02:33:54 2011 +0100

fdo#37498 RTF export: handle url fields without a field result

(cherry picked from commit 6ab183533ef543ea96e15fcc5155321298c758a8)

diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 2cd6033..17b2de3 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -460,6 +460,7 @@ bool RtfAttributeOutput::StartURL( const String rUrl, 
const String rTarget )
 }
 
 m_aStyles.append(});
+m_bHadFieldResult = false;
 return true;
 }
 
@@ -468,7 +469,8 @@ bool RtfAttributeOutput::EndURL()
 OSL_TRACE(%s, OSL_THIS_FUNC);
 
 // close the fldrslt group
-m_aRunText.append('}');
+if (m_bHadFieldResult)
+m_aRunText.append('}');
 // close the field group
 m_aRunText.append('}');
 return true;
@@ -2249,6 +2251,7 @@ void RtfAttributeOutput::TextINetFormat( const 
SwFmtINetFmt rURL )
 const SwTxtINetFmt* pTxtAtr = rURL.GetTxtINetFmt();
 
 m_aStyles.append({ OOO_STRING_SVTOOLS_RTF_FLDRSLT  );
+m_bHadFieldResult = true;
 if( pTxtAtr  0 != ( pFmt = pTxtAtr-GetCharFmt() ))
 {
 sal_uInt16 nStyle = m_rExport.GetId( *pFmt );
@@ -2989,7 +2992,8 @@ RtfAttributeOutput::RtfAttributeOutput( RtfExport 
rExport )
 m_bBufferSectionBreaks( false ),
 m_bBufferSectionHeaders( false ),
 m_bLastTable( true ),
-m_bWroteCellInfo( false )
+m_bWroteCellInfo( false ),
+m_bHadFieldResult( false )
 {
 OSL_TRACE(%s, OSL_THIS_FUNC);
 }
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx 
b/sw/source/filter/ww8/rtfattributeoutput.hxx
index 856b14f..c96de2c 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -529,6 +529,10 @@ private:
  */
 bool m_bWroteCellInfo;
 
+/*
+ * If we had a field result in the URL.
+ */
+bool m_bHadFieldResult;
 public:
 RtfAttributeOutput( RtfExport rExport );
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

[Norbert Thiebaud]

 solenv/gbuild/platform/macosx.mk |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 5ed43db9e8a574a0c66706deeb2feefb89958f96
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Sat Dec 17 20:21:31 2011 -0600

Revert gbuild: macosx.mk: remove salhelper hack

This reverts commit 1d90f180cd263d7f99039bada57b3655d6f399df.

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index f1187cc..6a2751e 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -149,8 +149,10 @@ gb_LinkTarget__RPATHS := \
SDKBIN: \
NONE:@__VIA_LIBRARY_PATH__@ \
 
+# The below contains a bad hack to set the correct install name for
+# libuno_salhepergcc3.dylib.3, with a trailing .3:
 define gb_LinkTarget__get_installname
-$(if $(2),-install_name '$(2)$(1)',$(error
+$(if $(2),-install_name '$(2)$(1)$(if $(filter 
$(1),libuno_salhelpergcc3.dylib),.3)',$(error
 cannot determine -install_name for $(2)))
 endef
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Matus Kukan]

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

[Libreoffice-commits] Changes to 'feature/gbuild'

[Matus Kukan]

New branch 'feature/gbuild' available with the following commits:
commit 9f5ecd7e390baff297f23c2bf0fae71d841c8b78
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Dec 17 14:18:58 2011 +0100

sal: add more unit tests

commit 4f9fd994d32a9984067f6c6696753c0b6bd27046
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Dec 17 13:22:02 2011 +0100

sal: add visibility symbols

commit b6359626a270503bb8d9774eac83a110d0207854
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Dec 17 13:13:11 2011 +0100

sal: convert to gbuild

commit 1ba3bb01fee63bd910ab9dca5280ca482d54e421
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sun Dec 18 04:56:57 2011 +0100

cppu: add visibility symbols

commit d3c7bdd31f3d9788c1f8c883f89d4e697e297a27
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sat Dec 17 14:55:08 2011 +0100

cppu: convert to gbuild

Because of unit tests is here custom target where are idl files
processed.

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