[Libreoffice-commits] .: Branch 'libreoffice-3-5' - instsetoo_native/util solenv/bin

[Andras Timar]

 instsetoo_native/util/openoffice.lst |6 +++---
 solenv/bin/modules/installer/download.pm |6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit ea0bc3c3d48ff750dc76442b1e4f1ac4d2e9a42d
Author: Andras Timar ati...@suse.com
Date:   Mon Dec 12 10:00:41 2011 +0100

change PRODUCTNAME back to LOdev, because prev. change broke Linux packaging

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 3f9b12d..93c3686 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -164,7 +164,7 @@ LibreOffice_Dev
{
variables
{
-   PRODUCTNAME LibO-dev
+   PRODUCTNAME LOdev
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
@@ -311,7 +311,7 @@ LibreOffice_Dev_SDK
 downloadname LibO-Dev-SDK_{packageversion}_{os}_install_{languages}
 variables
 {
-PRODUCTNAME LibO-dev
+PRODUCTNAME LOdev
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
@@ -403,7 +403,7 @@ LibreOffice_Dev_Test
 downloadname LO-Dev-Test_{packageversion}_{os}_install_{languages}
 variables
 {
-PRODUCTNAME LibO-dev
+PRODUCTNAME LOdev
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
diff --git a/solenv/bin/modules/installer/download.pm 
b/solenv/bin/modules/installer/download.pm
index 246adea..5f186b7 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -394,15 +394,15 @@ sub get_downloadname_productname
 
 if ( $allvariables-{'PRODUCTNAME'} eq LibreOffice ) { $start = LibO; }
 
-if ( $allvariables-{'PRODUCTNAME'} eq LibO-dev ) { $start = LibO-Dev; 
}
+if ( $allvariables-{'PRODUCTNAME'} eq LOdev ) { $start = LibO-Dev; }
 
 if (( $allvariables-{'PRODUCTNAME'} eq LibreOffice )  ( 
$allvariables-{'POSTVERSIONEXTENSION'} eq SDK )) { $start = LibO-SDK; }
 
-if (( $allvariables-{'PRODUCTNAME'} eq LibO-dev )  ( 
$allvariables-{'POSTVERSIONEXTENSION'} eq SDK )) { $start = LibO-Dev-SDK; }
+if (( $allvariables-{'PRODUCTNAME'} eq LOdev )  ( 
$allvariables-{'POSTVERSIONEXTENSION'} eq SDK )) { $start = LibO-Dev-SDK; }
 
 if (( $allvariables-{'PRODUCTNAME'} eq LibreOffice )  ( 
$allvariables-{'POSTVERSIONEXTENSION'} eq TEST )) { $start = LibO-Test; }
 
-if (( $allvariables-{'PRODUCTNAME'} eq LibO-dev )  ( 
$allvariables-{'POSTVERSIONEXTENSION'} eq TEST )) { $start = 
LibO-Dev-Test; }
+if (( $allvariables-{'PRODUCTNAME'} eq LOdev )  ( 
$allvariables-{'POSTVERSIONEXTENSION'} eq TEST )) { $start = 
LibO-Dev-Test; }
 
 if ( $allvariables-{'PRODUCTNAME'} eq URE ) { $start = LibO-URE; }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 solenv/bin/modules/installer/windows/msiglobal.pm |   20 ++--
 1 file changed, 2 insertions(+), 18 deletions(-)

New commits:
commit fb8c93b5aa90501bf33dffe075390cc7f1e71c22
Author: Andras Timar ati...@suse.com
Date:   Sat Dec 10 22:10:35 2011 +0100

use PACKAGEVERSION as the base of MSI ProductVersion

Formerly PRODUCTVERSION was used but that did not contain
the microversion digit. It is better to have it in MSI
ProductVersion, because a higher build number of a lower
microversion looked newer from the MSI point of view, and
update failed.

MSI ProductVersion is now major.minor.micro.build, e.g.
3.6.1.1206 (build number is taken from minor.mk)

diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm 
b/solenv/bin/modules/installer/windows/msiglobal.pm
index a90698a..43e6ee3 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1805,27 +1805,11 @@ sub set_msiproductversion
 {
 my ( $allvariables ) = @_;
 
-my $productversion = $allvariables-{'PRODUCTVERSION'};
-
-if (( $productversion =~ /^\s*\d+\s*$/ )  ( $productversion  255 )) { 
$productversion = $productversion%256; }
+my $productversion = $allvariables-{'PACKAGEVERSION'};
 
 if ( $productversion =~ /^\s*(\d+)\.(\d+)\.(\d+)\s*$/ )
 {
-$productversion = $1 . \. . $2 . $3 . \. . 
$installer::globals::buildid;
-}
-elsif  ( $productversion =~ /^\s*(\d+)\.(\d+)\s*$/ )
-{
-$productversion = $1 . \. . $2 . \. . $installer::globals::buildid;
-}
-else
-{
-my $productminor = 00;
-if (( $allvariables-{'PACKAGEVERSION'} )  ( 
$allvariables-{'PACKAGEVERSION'} ne  ))
-{
-if ( $allvariables-{'PACKAGEVERSION'} =~ 
/^\s*(\d+)\.(\d+)\.(\d+)\s*$/ ) { $productminor = $2; }
-}
-
-$productversion = $productversion . \. . $productminor . \. . 
$installer::globals::buildid;
+$productversion = $1 . \. . $2 . \. . $3 . \. . 
$installer::globals::buildid;
 }
 
 $installer::globals::msiproductversion = $productversion;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: connectivity/source postgresql/makefile.mk

[Fridrich Strba]

 connectivity/source/drivers/postgresql/makefile.mk |1 +
 postgresql/makefile.mk |9 ++---
 2 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit f5501498eb4dae84146b8ad7372656bfe4b6ea35
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Dec 12 10:16:32 2011 +0100

Enable OpenSSL support in the internal libpq

diff --git a/connectivity/source/drivers/postgresql/makefile.mk 
b/connectivity/source/drivers/postgresql/makefile.mk
index 29f2029..68837d9 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -151,6 +151,7 @@ SHL2STDLIBS= \
 $(CPPUHELPERLIB)   \
 $(SALLIB)  \
 $(SALHELPERLIB)\
+   $(OPENSSLLIB)   \
 $(POSTGRESQL_LIB)  \
 $(LIBPQ_LINK)
 
diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index 2979779..898471b 100644
--- a/postgresql/makefile.mk
+++ b/postgresql/makefile.mk
@@ -52,17 +52,12 @@ CONFIGURE_DIR=.
 BUILD_DIR=src
 
 CONFIGURE_ACTION =
-BUILD_ACTION = nmake -f win32.mak
+BUILD_ACTION = nmake -f win32.mak USE_SSL=1
 .ELSE
 CONFIGURE_DIR=.
 BUILD_DIR=src/interfaces/libpq
 
-# TODO:
-# --datarootdir changes where libpq expects internationalisation of its 
messages
-#   (which we don't install anyway for now...)
-# --sysconfdir: config files. Ideally, we would like that to be the same as 
the platform default,
-#   but that's quite some guessing work.
-CONFIGURE_ACTION = ./configure --without-readline --disable-shared
+CONFIGURE_ACTION = ./configure --without-readline --disable-shared 
--with-openssl
 BUILD_ACTION = make -j$(GMAKE_MODULE_PARALLELISM) all-static-lib
 .ENDIF
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - connectivity/source postgresql/makefile.mk

[Fridrich Strba]

 connectivity/source/drivers/postgresql/makefile.mk |1 +
 postgresql/makefile.mk |9 ++---
 2 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 9b7a7ba72880fe90a0139ddca4bfc9ad180a6d4d
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Dec 12 10:16:32 2011 +0100

Enable OpenSSL support in the internal libpq

Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch

diff --git a/connectivity/source/drivers/postgresql/makefile.mk 
b/connectivity/source/drivers/postgresql/makefile.mk
index 29f2029..68837d9 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -151,6 +151,7 @@ SHL2STDLIBS= \
 $(CPPUHELPERLIB)   \
 $(SALLIB)  \
 $(SALHELPERLIB)\
+   $(OPENSSLLIB)   \
 $(POSTGRESQL_LIB)  \
 $(LIBPQ_LINK)
 
diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index 2979779..898471b 100644
--- a/postgresql/makefile.mk
+++ b/postgresql/makefile.mk
@@ -52,17 +52,12 @@ CONFIGURE_DIR=.
 BUILD_DIR=src
 
 CONFIGURE_ACTION =
-BUILD_ACTION = nmake -f win32.mak
+BUILD_ACTION = nmake -f win32.mak USE_SSL=1
 .ELSE
 CONFIGURE_DIR=.
 BUILD_DIR=src/interfaces/libpq
 
-# TODO:
-# --datarootdir changes where libpq expects internationalisation of its 
messages
-#   (which we don't install anyway for now...)
-# --sysconfdir: config files. Ideally, we would like that to be the same as 
the platform default,
-#   but that's quite some guessing work.
-CONFIGURE_ACTION = ./configure --without-readline --disable-shared
+CONFIGURE_ACTION = ./configure --without-readline --disable-shared 
--with-openssl
 BUILD_ACTION = make -j$(GMAKE_MODULE_PARALLELISM) all-static-lib
 .ENDIF
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 svtools/source/brwbox/brwbox2.cxx |   40 +-
 1 file changed, 27 insertions(+), 13 deletions(-)

New commits:
commit 09400837349f3f42d47ff570abb3c2d5f50b3e50
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Dec 12 09:17:17 2011 +

Resolves: fdo#42694 crash inserting table control
(cherry picked from commit 4521fc855b319bd8aa6583900d97c026bcc5f32f)

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

diff --git a/svtools/source/brwbox/brwbox2.cxx 
b/svtools/source/brwbox/brwbox2.cxx
index 30937db..92c29de 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -599,8 +599,10 @@ void BrowseBox::Resize()
 nSBSize = (sal_uLong)(nSBSize * (double)GetZoom());
 
 DoHideCursor( Resize );
-sal_uInt16 nOldVisibleRows =
-(sal_uInt16)(pDataWin-GetOutputSizePixel().Height() / 
GetDataRowHeight() + 1);
+sal_uInt16 nOldVisibleRows = 0;
+//fdo#42694, post #i25# GetDataRowHeight() can be 0
+if (GetDataRowHeight())
+nOldVisibleRows = (sal_uInt16)(pDataWin-GetOutputSizePixel().Height() 
/ GetDataRowHeight() + 1);
 
 // did we need a horiz. scroll bar oder gibt es eine Control Area?
 if ( !getDataWindow()-bNoHScroll 
@@ -623,8 +625,10 @@ void BrowseBox::Resize()
 Point( 0, GetTitleHeight() ),
 Size( nDataWidth, nDataHeight ) );
 
-sal_uInt16 nVisibleRows =
-(sal_uInt16)(pDataWin-GetOutputSizePixel().Height() / 
GetDataRowHeight() + 1);
+sal_uInt16 nVisibleRows = 0;
+
+if (GetDataRowHeight())
+nVisibleRows = (sal_uInt16)(pDataWin-GetOutputSizePixel().Height() / 
GetDataRowHeight() + 1);
 
 // TopRow ist unveraendert, aber die Anzahl sichtbarer Zeilen hat sich
 // geaendert
@@ -911,8 +915,13 @@ void BrowseBox::ImplPaintData(OutputDevice _rOut, const 
Rectangle _rRect, sal_
 long nDataRowHeigt = GetDataRowHeight();
 
 // compute relative rows to redraw
-sal_uLong nRelTopRow = _bForeignDevice ? 0 : ((sal_uLong)_rRect.Top() / 
nDataRowHeigt);
-sal_uLong nRelBottomRow = (sal_uLong)(_bForeignDevice ? 
aOverallAreaSize.Height() : _rRect.Bottom()) / nDataRowHeigt;
+sal_uLong nRelTopRow = 0;
+sal_uLong nRelBottomRow = aOverallAreaSize.Height();
+if (!_bForeignDevice  nDataRowHeigt)
+{
+nRelTopRow = ((sal_uLong)_rRect.Top() / nDataRowHeigt);
+nRelBottomRow = (sal_uLong)(_rRect.Bottom()) / nDataRowHeigt;
+}
 
 // cache frequently used values
 Point aPos( aOverallAreaPos.X(), nRelTopRow * nDataRowHeigt + 
aOverallAreaPos.Y() );
@@ -1182,11 +1191,16 @@ void BrowseBox::UpdateScrollbars()
 if (IsZoom())
 nCornerSize = (sal_uLong)(nCornerSize * (double)GetZoom());
 
-// needs VScroll?
-long nMaxRows = (pDataWin-GetSizePixel().Height()) / GetDataRowHeight();
-sal_Bool bNeedsVScroll =getDataWindow()-bAutoVScroll
-?   nTopRow || ( nRowCount  nMaxRows )
-:   !getDataWindow()-bNoVScroll;
+sal_Bool bNeedsVScroll = sal_False;
+long nMaxRows = 0;
+if (GetDataRowHeight())
+{
+// needs VScroll?
+nMaxRows = (pDataWin-GetSizePixel().Height()) / GetDataRowHeight();
+bNeedsVScroll =getDataWindow()-bAutoVScroll
+?   nTopRow || ( nRowCount  nMaxRows )
+:   !getDataWindow()-bNoVScroll;
+}
 Size aDataWinSize = pDataWin-GetSizePixel();
 if ( !bNeedsVScroll )
 {
@@ -1269,8 +1283,8 @@ void BrowseBox::UpdateScrollbars()
 pVScroll-SetPosSizePixel(
 Point( aDataWinSize.Width(), GetTitleHeight() ),
 Size( nCornerSize, aDataWinSize.Height()) );
-if ( nRowCount 
- long( aDataWinSize.Height() / GetDataRowHeight() ) )
+long nLclDataRowHeight = GetDataRowHeight();
+if ( nLclDataRowHeight  0  nRowCount  long( aDataWinSize.Height() / 
nLclDataRowHeight ) )
 ScrollRows( -nTopRow );
 if ( bNeedsVScroll  !pVScroll-IsVisible() )
 pVScroll-Show();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: connectivity/source postgresql/makefile.mk postgresql/prj

[Fridrich Strba]

 connectivity/source/drivers/postgresql/makefile.mk |5 +++--
 postgresql/makefile.mk |3 +++
 postgresql/prj/build.lst   |2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit a7639b7b5a77a458433d113f1c4b076d4469536e
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Dec 12 11:03:22 2011 +0100

Enable pgsql LDAP support when building with OpenLDAP

diff --git a/connectivity/source/drivers/postgresql/makefile.mk 
b/connectivity/source/drivers/postgresql/makefile.mk
index 68837d9..4784d75 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -151,9 +151,10 @@ SHL2STDLIBS= \
 $(CPPUHELPERLIB)   \
 $(SALLIB)  \
 $(SALHELPERLIB)\
-   $(OPENSSLLIB)   \
 $(POSTGRESQL_LIB)  \
-$(LIBPQ_LINK)
+$(LIBPQ_LINK)  \
+$(OPENSSLLIB)  \
+$(LDAPSDKLIB)
 
 SHL2LIBS=  $(LIB2TARGET)
 SHL2DEF=   $(MISC)$/$(SHL2TARGET).def
diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index 898471b..0628d71 100644
--- a/postgresql/makefile.mk
+++ b/postgresql/makefile.mk
@@ -58,6 +58,9 @@ CONFIGURE_DIR=.
 BUILD_DIR=src/interfaces/libpq
 
 CONFIGURE_ACTION = ./configure --without-readline --disable-shared 
--with-openssl
+.IF $(WITH_LDAP) == YES  $(WITH_OPENLDAP) == YES
+CONFIGURE_ACTION += --with-ldap
+.ENDIF
 BUILD_ACTION = make -j$(GMAKE_MODULE_PARALLELISM) all-static-lib
 .ENDIF
 
diff --git a/postgresql/prj/build.lst b/postgresql/prj/build.lst
index 756db8a..5059f95 100644
--- a/postgresql/prj/build.lst
+++ b/postgresql/prj/build.lst
@@ -1,3 +1,3 @@
-my postgresql  :   solenv sal NULL
+my postgresql  :   solenv sal OPENSSL:openssl MOZ:moz NULL
 my postgresqlnmake -   all my_mkout NULL
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - connectivity/source postgresql/makefile.mk postgresql/prj

[Fridrich Strba]

 connectivity/source/drivers/postgresql/makefile.mk |5 +++--
 postgresql/makefile.mk |3 +++
 postgresql/prj/build.lst   |2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit d8583566f20389ddfbe662615f27671178e6fd0e
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Dec 12 11:03:22 2011 +0100

Enable pgsql LDAP support when building with OpenLDAP

Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch

diff --git a/connectivity/source/drivers/postgresql/makefile.mk 
b/connectivity/source/drivers/postgresql/makefile.mk
index 68837d9..4784d75 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -151,9 +151,10 @@ SHL2STDLIBS= \
 $(CPPUHELPERLIB)   \
 $(SALLIB)  \
 $(SALHELPERLIB)\
-   $(OPENSSLLIB)   \
 $(POSTGRESQL_LIB)  \
-$(LIBPQ_LINK)
+$(LIBPQ_LINK)  \
+$(OPENSSLLIB)  \
+$(LDAPSDKLIB)
 
 SHL2LIBS=  $(LIB2TARGET)
 SHL2DEF=   $(MISC)$/$(SHL2TARGET).def
diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index 898471b..0628d71 100644
--- a/postgresql/makefile.mk
+++ b/postgresql/makefile.mk
@@ -58,6 +58,9 @@ CONFIGURE_DIR=.
 BUILD_DIR=src/interfaces/libpq
 
 CONFIGURE_ACTION = ./configure --without-readline --disable-shared 
--with-openssl
+.IF $(WITH_LDAP) == YES  $(WITH_OPENLDAP) == YES
+CONFIGURE_ACTION += --with-ldap
+.ENDIF
 BUILD_ACTION = make -j$(GMAKE_MODULE_PARALLELISM) all-static-lib
 .ENDIF
 
diff --git a/postgresql/prj/build.lst b/postgresql/prj/build.lst
index 756db8a..5059f95 100644
--- a/postgresql/prj/build.lst
+++ b/postgresql/prj/build.lst
@@ -1,3 +1,3 @@
-my postgresql  :   solenv sal NULL
+my postgresql  :   solenv sal OPENSSL:openssl MOZ:moz NULL
 my postgresqlnmake -   all my_mkout NULL
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 5 commits - set_soenv.in solenv/gbuild solenv/inc tools/Library_tl.mk

[Tor Lillqvist]

 set_soenv.in|   37 ++--
 solenv/gbuild/gbuild.mk |1 
 solenv/gbuild/platform/WNT_INTEL_GCC.mk |1 
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |1 
 solenv/inc/set_wntx64.mk|2 -
 solenv/inc/settings.mk  |4 +--
 solenv/inc/startup/startup.mk   |2 -
 tools/Library_tl.mk |1 
 8 files changed, 11 insertions(+), 38 deletions(-)

New commits:
commit 4cb5e2e08163d44990e67648e6ad09186c297a5d
Author: Tor Lillqvist t...@iki.fi
Date:   Mon Dec 12 11:16:57 2011 +0200

Drop some unused variables

diff --git a/set_soenv.in b/set_soenv.in
index 7c2e5fc..2f32cb8 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -34,11 +34,11 @@ use File::Basename;
 #
 #
 my ( $oldoutfile, $outfile, $bootfile, $newline, $comment,
- $compiler, $ds, $ps,
+ $ds, $ps,
  $wps, $cur_dir, $par_dir, $I, $L, $tmp, $MINGW,
  $platform,
- $cygwinver, $empty, $no_ant, $no_gcc_include,
- $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $exportvars, 
$win_format_var, @mingw_lib_include_paths, $mingw_lib_include_path);
+ $empty,
+ $warnfile, $Warning, $result, $unsetvars, $exportvars);
 #
 #-
 # IIb. Declaring environment values (constants).
commit 13876ef22f42256ab575d5678b7a4165c7388076
Author: Tor Lillqvist t...@iki.fi
Date:   Mon Dec 12 11:14:05 2011 +0200

We only support Cygwin Perl on Windows

diff --git a/set_soenv.in b/set_soenv.in
index ea815b7..7c2e5fc 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -38,7 +38,7 @@ my ( $oldoutfile, $outfile, $bootfile, $newline, $comment,
  $wps, $cur_dir, $par_dir, $I, $L, $tmp, $MINGW,
  $platform,
  $cygwinver, $empty, $no_ant, $no_gcc_include,
- $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $exportvars, 
$win_format_var, $perl_os, @mingw_lib_include_paths, $mingw_lib_include_path);
+ $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $exportvars, 
$win_format_var, @mingw_lib_include_paths, $mingw_lib_include_path);
 #
 #-
 # IIb. Declaring environment values (constants).
@@ -146,11 +146,6 @@ print (Setting up the environment for building 
LibreOffice $newline);
 # V. Setting the environment variables/values.
 #--
 #
-# A. Checking the platform first.
-#
-# get perls idea for OS
-# needed to differentiate cygwin/native perl on windows
-$perl_os = $^O;
 
 #
 # B. Gathering information from the system.
@@ -798,9 +793,6 @@ if ( @WITH_MOZILLA@ eq YES and @BUILD_MOZAB@ ne 
TRUE and @SYSTEM_MOZILL
 {
print(Checking for prebuilt Mozilla libraries ...);
my $mozbinfile = $SRC_ROOT./moz/zipped/;
-   if ( $^O eq 'MSWin32' ) {
-   chomp( $mozbinfile = qx{cygpath -d $mozbinfile} );
-   }
$mozbinfile .= $OS.$COM.$CPU;
if ( -e $mozbinfile.inc.zip
 and -e $mozbinfile.lib.zip
@@ -2137,7 +2129,7 @@ sub CheckPathName
 #-
 sub CheckPathExist
 {  my $dir = $_[ 0 ];
-   if ( !( -d $dir ) and $^O ne 'MSWin32' )
+   if ( !( -d $dir ) )
{  print ( The directory $_[ 0 ] does not exist. Please create first.\n );
   exit 1;
}
commit abb06e33756e9a3cc5fd77d7b14bb2e7e7ec5b2f
Author: Tor Lillqvist t...@iki.fi
Date:   Mon Dec 12 10:59:19 2011 +0200

The VCL environment variable, always TRUE, is not used

diff --git a/set_soenv.in b/set_soenv.in
index 8f95941..ea815b7 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -46,7 +46,6 @@ my ( $oldoutfile, $outfile, $bootfile, $newline, $comment,
 #
 # Platform independent constant values.
 my ( $SOLAR_JAVA,
- $VCL,
  $CC, $CXX);
 #
 # Platform dependent constant values.
@@ -165,7 +164,6 @@ chomp( $oldPATH );  # cut off new line
 # Setting platform independent constant values.
 # NB: Language options now set at 'ToFile' stage.
 $SOLAR_JAVA   = @SOLAR_JAVA@;
-$VCL  = TRUE;
 $comment  = #;   # UNIX script comment character
 $TARFILE_LOCATION = @TARFILE_LOCATION@; # where to find tarballs with 
external sources
 
@@ -1418,7 +1416,6 @@ ToFile( OOODMAKEMODE,  YES,  e );
 ToFile( PRODUCTVERSION,@PRODUCTVERSION@, e );
 ToFile( WITH_POOR_HELP_LOCALIZATIONS, $WITH_POOR_HELP_LOCALIZATIONS, e );
 
-ToFile( VCL,   $VCL,   e );
 if (@ENABLE_DEBUG@ eq TRUE) {
 ToFile( debug, true, e );
 }
commit 026ce875672f1e02dd5931372d169891eb92aff7
Author: Tor Lillqvist t...@iki.fi
Date:   Mon Dec 12 10:57:12 2011 +0200

Drop two unused variables

diff --git a/set_soenv.in b/set_soenv.in
index 36c0ba0..8f95941 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -66,10 +66,10 @@ my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, 
$OPT, $LOCAL, 

[Libreoffice-commits] .: postgresql/postgresql-9.1.1.patch

[Fridrich Strba]

 postgresql/postgresql-9.1.1.patch |   25 -
 1 file changed, 20 insertions(+), 5 deletions(-)

New commits:
commit 7d7496bd4c152ad1746809800f1298169052320e
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Dec 12 11:24:27 2011 +0100

Allow building with LDAP support on windows

diff --git a/postgresql/postgresql-9.1.1.patch 
b/postgresql/postgresql-9.1.1.patch
index 54ac388..5d4c29d 100644
--- a/postgresql/postgresql-9.1.1.patch
+++ b/postgresql/postgresql-9.1.1.patch
@@ -1,5 +1,5 @@
 --- misc/postgresql-9.1.1/src/interfaces/libpq/win32.mak   2011-09-22 
23:57:57.0 +0200
-+++ misc/build/postgresql-9.1.1/src/interfaces/libpq/win32.mak 2011-12-09 
10:44:54.151291450 +0100
 misc/build/postgresql-9.1.1/src/interfaces/libpq/win32.mak 2011-12-12 
11:21:08.796898284 +0100
 @@ -11,18 +11,19 @@
  
  # CPU=i386 or CPU environment of nmake.exe (AMD64 or IA64)
@@ -46,11 +46,11 @@
 -INTDIR=.\Release
 -CPP_OBJS=.\Release/
 -!ENDIF
--
 +OUTDIR=.
 +INTDIR=.
 +CPP_OBJS=./
  
+-
 -ALL : config $(OUTDIR)\$(OUTFILENAME).lib $(OUTDIR)\$(OUTFILENAME).dll
 +ALL : config $(OUTDIR)\$(OUTFILENAME).lib
  
@@ -65,16 +65,31 @@
   /D FRONTEND $(DEBUGDEF) \
   /D WIN32 /D _WINDOWS /Fp$(INTDIR)\libpq.pch \
   /Fo$(INTDIR)\\ /Fd$(INTDIR)\\ /FD /c  \
-@@ -205,7 +199,7 @@
+@@ -189,6 +183,11 @@
+ SSL_LIBS=ssleay32.lib libeay32.lib gdi32.lib
+ !ENDIF
+ 
++!IFDEF USE_LDAP
++CPP_PROJ=$(CPP_PROJ) /D USE_LDAP
++LDAP_LIBS=wldap32.lib
++!ENDIF
++
+ !IFDEF USE_KFW
+ CPP_PROJ=$(CPP_PROJ) /D KRB5
+ KFW_LIBS=krb5_32.lib comerr32.lib gssapi32.lib
+@@ -203,9 +202,9 @@
+ RSC_PROJ=/l 0x409 /fo$(INTDIR)\libpq.res
+ 
  LINK32=link.exe
- LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib shfolder.lib wsock32.lib 
ws2_32.lib secur32.lib $(SSL_LIBS)  $(KFW_LIB) $(ADD_SECLIB) \
+-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib shfolder.lib wsock32.lib 
ws2_32.lib secur32.lib $(SSL_LIBS)  $(KFW_LIB) $(ADD_SECLIB) \
++LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib shfolder.lib wsock32.lib 
ws2_32.lib secur32.lib $(SSL_LIBS) $(LDAP_LIBS) $(KFW_LIB) $(ADD_SECLIB) \
   /nologo /subsystem:windows /dll $(LOPT) /incremental:no \
 - /pdb:$(OUTDIR)\libpqdll.pdb /machine:$(CPU) \
 + /pdb:$(OUTDIR)\libpqdll.pdb /machine:$(MACHINE) \
   /out:$(OUTDIR)\$(OUTFILENAME).dll\
   /implib:$(OUTDIR)\$(OUTFILENAME)dll.lib  \
   /libpath:$(SSL_LIB_PATH) /libpath:$(KFW_LIB_PATH) \
-@@ -222,7 +216,7 @@
+@@ -222,7 +221,7 @@
  
  
  $(INTDIR)\libpq.res : $(INTDIR) libpq-dist.rc
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - postgresql/postgresql-9.1.1.patch

[Fridrich Strba]

 postgresql/postgresql-9.1.1.patch |   25 -
 1 file changed, 20 insertions(+), 5 deletions(-)

New commits:
commit b427fe8d14e1f25be12381fd891d16ee978952dc
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Dec 12 11:24:27 2011 +0100

Allow building with LDAP support on windows

Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch

diff --git a/postgresql/postgresql-9.1.1.patch 
b/postgresql/postgresql-9.1.1.patch
index 54ac388..5d4c29d 100644
--- a/postgresql/postgresql-9.1.1.patch
+++ b/postgresql/postgresql-9.1.1.patch
@@ -1,5 +1,5 @@
 --- misc/postgresql-9.1.1/src/interfaces/libpq/win32.mak   2011-09-22 
23:57:57.0 +0200
-+++ misc/build/postgresql-9.1.1/src/interfaces/libpq/win32.mak 2011-12-09 
10:44:54.151291450 +0100
 misc/build/postgresql-9.1.1/src/interfaces/libpq/win32.mak 2011-12-12 
11:21:08.796898284 +0100
 @@ -11,18 +11,19 @@
  
  # CPU=i386 or CPU environment of nmake.exe (AMD64 or IA64)
@@ -46,11 +46,11 @@
 -INTDIR=.\Release
 -CPP_OBJS=.\Release/
 -!ENDIF
--
 +OUTDIR=.
 +INTDIR=.
 +CPP_OBJS=./
  
+-
 -ALL : config $(OUTDIR)\$(OUTFILENAME).lib $(OUTDIR)\$(OUTFILENAME).dll
 +ALL : config $(OUTDIR)\$(OUTFILENAME).lib
  
@@ -65,16 +65,31 @@
   /D FRONTEND $(DEBUGDEF) \
   /D WIN32 /D _WINDOWS /Fp$(INTDIR)\libpq.pch \
   /Fo$(INTDIR)\\ /Fd$(INTDIR)\\ /FD /c  \
-@@ -205,7 +199,7 @@
+@@ -189,6 +183,11 @@
+ SSL_LIBS=ssleay32.lib libeay32.lib gdi32.lib
+ !ENDIF
+ 
++!IFDEF USE_LDAP
++CPP_PROJ=$(CPP_PROJ) /D USE_LDAP
++LDAP_LIBS=wldap32.lib
++!ENDIF
++
+ !IFDEF USE_KFW
+ CPP_PROJ=$(CPP_PROJ) /D KRB5
+ KFW_LIBS=krb5_32.lib comerr32.lib gssapi32.lib
+@@ -203,9 +202,9 @@
+ RSC_PROJ=/l 0x409 /fo$(INTDIR)\libpq.res
+ 
  LINK32=link.exe
- LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib shfolder.lib wsock32.lib 
ws2_32.lib secur32.lib $(SSL_LIBS)  $(KFW_LIB) $(ADD_SECLIB) \
+-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib shfolder.lib wsock32.lib 
ws2_32.lib secur32.lib $(SSL_LIBS)  $(KFW_LIB) $(ADD_SECLIB) \
++LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib shfolder.lib wsock32.lib 
ws2_32.lib secur32.lib $(SSL_LIBS) $(LDAP_LIBS) $(KFW_LIB) $(ADD_SECLIB) \
   /nologo /subsystem:windows /dll $(LOPT) /incremental:no \
 - /pdb:$(OUTDIR)\libpqdll.pdb /machine:$(CPU) \
 + /pdb:$(OUTDIR)\libpqdll.pdb /machine:$(MACHINE) \
   /out:$(OUTDIR)\$(OUTFILENAME).dll\
   /implib:$(OUTDIR)\$(OUTFILENAME)dll.lib  \
   /libpath:$(SSL_LIB_PATH) /libpath:$(KFW_LIB_PATH) \
-@@ -222,7 +216,7 @@
+@@ -222,7 +221,7 @@
  
  
  $(INTDIR)\libpq.res : $(INTDIR) libpq-dist.rc
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/unx

[Caolán McNamara]

 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 96e3f652ad0c02140fea42790e2d0a2baabb45d8
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Dec 12 11:35:49 2011 +

stop saying 15 on stdout
(cherry picked from commit 6765b2b71544a1ca0957fbd5e04062c274a24f45)

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

diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index f9e5906..d064f83 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -2103,7 +2103,6 @@ static Rectangle NWGetSpinButtonRect( int nScreen,
 buttonRect.Left()   = buttonRect.Right()+1;
 buttonRect.Right()  = aAreaRect.Right();
 } else {
-printf(%ld\n, buttonRect.GetWidth());
 buttonRect.Right()  = buttonRect.Left()-1;
 buttonRect.Left()   = aAreaRect.Left();
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - postgresql/makefile.mk

[Fridrich Strba]

 postgresql/makefile.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d047aaa574ddb6878e17b5ab0507ed9d61301d5b
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Dec 12 13:12:29 2011 +0100

fix mac build of pgsql

Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch

diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index 810e46f..6b687b4 100644
--- a/postgresql/makefile.mk
+++ b/postgresql/makefile.mk
@@ -57,7 +57,7 @@ BUILD_ACTION = nmake -f win32.mak USE_SSL=1 USE_LDAP=1 
USE_MOZLDAP=1
 CONFIGURE_DIR=.
 BUILD_DIR=src/interfaces/libpq
 
-CONFIGURE_ACTION = ./configure --without-readline --disable-shared 
--with-openssl
+CONFIGURE_ACTION = CPPFLAGS=-I$(SOLARVER)$/$(INPATH)$/inc ./configure 
--without-readline --disable-shared --with-openssl
 .IF $(WITH_LDAP) == YES
 CONFIGURE_ACTION += --with-ldap
 .ENDIF
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: tools/inc

[Caolán McNamara]

 tools/inc/tools/rtti.hxx |9 -
 1 file changed, 9 deletions(-)

New commits:
commit 37785dde4be04375e83a477a0f5670c6490f4f93
Author: Rafael Dominguez venccsra...@gmail.com
Date:   Sat Dec 10 14:42:29 2011 -0430

Remove unused macros.

diff --git a/tools/inc/tools/rtti.hxx b/tools/inc/tools/rtti.hxx
index 34f14c5..7f279f1 100644
--- a/tools/inc/tools/rtti.hxx
+++ b/tools/inc/tools/rtti.hxx
@@ -63,7 +63,6 @@ typedef void* (*TypeId)();
 
 //-
 
-#define TYPEINIT_AUTOFACTORY(sType) TYPEINIT_FACTORY(sType, new sType)
 #define TYPEINIT(sType) TYPEINIT_FACTORY(sType, 0)
 
 #define SUPERTYPE(sSuper) \
@@ -107,8 +106,6 @@ typedef void* (*TypeId)();
 SUPERTYPE(sSuper2); \
 SUPERTYPE(sSuper3); \
 TYPEINIT_END(sType)
-#define TYPEINIT3_AUTOFACTORY(sType, sSuper1, sSuper2, sSuper3) \
-TYPEINIT3_FACTORY(sType, sSuper1, sSuper2, sSuper3, new sType)
 #define TYPEINIT3(sType, sSuper1, sSuper2, sSuper3) \
 TYPEINIT3_FACTORY(sType, sSuper1, sSuper2, sSuper3, 0)
 
@@ -120,12 +117,6 @@ typedef void* (*TypeId)();
 //-
 // On-Demand-faehige persistent-TypeId Version
 
-#define TYPEINFO_ID(id) \
-static  TypeId StaticType() { return (TypeId) ( id | 0xF00L ); } \
-static  sal_Bool   IsOf( TypeId aSameOrSuperType ); \
-virtual TypeId Type() const; \
-virtual sal_Bool   IsA( TypeId aSameOrSuperType ) const
-
 #define TYPEINIT_ID(sType) \
 TypeId sType::Type() const { return StaticType(); } \
 sal_Bool   sType::IsOf( TypeId aSameOrSuperType ) \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - postgresql/makefile.mk

[Fridrich Strba]

 postgresql/makefile.mk |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit cea479492ad6515969d1452345bc4d8c1ac6e54b
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Dec 12 14:19:07 2011 +0100

Fix a thinko in makefile.mk

diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index 6b687b4..6f2931e 100644
--- a/postgresql/makefile.mk
+++ b/postgresql/makefile.mk
@@ -60,10 +60,9 @@ BUILD_DIR=src/interfaces/libpq
 CONFIGURE_ACTION = CPPFLAGS=-I$(SOLARVER)$/$(INPATH)$/inc ./configure 
--without-readline --disable-shared --with-openssl
 .IF $(WITH_LDAP) == YES
 CONFIGURE_ACTION += --with-ldap
-.ENDIF
 .IF $(WITH_OPENLDAP) != YES
 CONFIGURE_ACTION += --with-mozldap
-.ELSE
+.ENDIF
 .ENDIF
 BUILD_ACTION = make -j$(GMAKE_MODULE_PARALLELISM) all-static-lib
 .ENDIF
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: postgresql/postgresql-9.1.1.patch

[Fridrich Strba]

 postgresql/postgresql-9.1.1.patch |  106 --
 1 file changed, 102 insertions(+), 4 deletions(-)

New commits:
commit f2f31cbd245b19b18d044cec6f6df5d4d7a71348
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Dec 12 15:01:57 2011 +0100

Complete the pgsql patch

diff --git a/postgresql/postgresql-9.1.1.patch 
b/postgresql/postgresql-9.1.1.patch
index 1037ef9..6a3f562 100644
--- a/postgresql/postgresql-9.1.1.patch
+++ b/postgresql/postgresql-9.1.1.patch
@@ -46,8 +46,8 @@
  static int ldapServiceLookup(const char *purl, PQconninfoOption *options,
  PQExpBuffer errorMessage);
  #endif
 misc/postgresql-9.1.1/configure2011-09-22 23:57:57.0 +0200
-+++ misc/build/postgresql-9.1.1/configure  2011-12-12 12:26:58.368351739 
+0100
+--- misc/postgresql-9.1.1/configure2011-12-12 14:54:25.053159648 +0100
 misc/build/postgresql-9.1.1/configure  2011-12-12 14:54:03.010060700 
+0100
 @@ -718,6 +718,7 @@
  with_selinux
  with_openssl
@@ -76,8 +76,8 @@
  $as_echo $with_ldap 6; }
  
  
-+{ $as_echo $as_me:$LINENO: checking whether to use Mozilla LDAP 
implementation 5
-+$as_echo_n checking whether to use Mozilla LDAP implementation...  6; }
++{ $as_echo $as_me:$LINENO: checking whether to build with Mozilla LDAP 
support 5
++$as_echo_n checking whether to build with Mozilla LDAP support...  6; }
 +
 +
 +
@@ -375,6 +375,104 @@
fi
LIBS=$_LIBS
  fi
+--- misc/postgresql-9.1.1/configure.in 2011-09-22 23:57:57.0 +0200
 misc/build/postgresql-9.1.1/configure.in   2011-12-12 14:53:09.022369189 
+0100
+@@ -662,6 +662,13 @@
+ AC_MSG_RESULT([$with_ldap])
+ AC_SUBST(with_ldap)
+ 
++AC_MSG_CHECKING([whether to build with Mozilla LDAP support])
++PGAC_ARG_BOOL(with, mozldap, no,
++  [build with Mozilla LDAP support],
++  [AC_DEFINE([USE_MOZLDAP], 1, [Define to 1 to build with Mozilla 
LDAP support. (--with-mozldap)])])
++AC_MSG_RESULT([$with_mozldap])
++AC_SUBST(with_mozldap)
++
+ 
+ #
+ # Bonjour
+@@ -1077,15 +1084,12 @@
+ fi
+ 
+ if test $with_ldap = yes ; then
+-  if test $PORTNAME != win32; then
++  if test $with_mozldap != yes; then
+  AC_CHECK_HEADERS(ldap.h, [],
+   [AC_MSG_ERROR([header file ldap.h is required for 
LDAP])])
+   else
+- AC_CHECK_HEADERS(winldap.h, [],
+-  [AC_MSG_ERROR([header file winldap.h is required for 
LDAP])],
+-  [AC_INCLUDES_DEFAULT
+-#include windows.h
+-  ])
++ AC_CHECK_HEADERS(mozilla/ldap/ldap.h, [],
++  [AC_MSG_ERROR([header file mozilla/ldap/ldap.h is 
required for LDAP])])
+   fi
+ fi
+ 
+@@ -1498,7 +1502,7 @@
+ # We can test for libldap_r only after we know PTHREAD_LIBS
+ if test $with_ldap = yes ; then
+   _LIBS=$LIBS
+-  if test $PORTNAME != win32; then
++  if test $with_mozldap != yes; then
+ AC_CHECK_LIB(ldap, ldap_bind, [],
+[AC_MSG_ERROR([library 'ldap' is required for LDAP])],
+[$EXTRA_LDAP_LIBS])
+@@ -1513,9 +1517,8 @@
+   LDAP_LIBS_FE=-lldap $EXTRA_LDAP_LIBS
+ fi
+   else
+-AC_CHECK_LIB(wldap32, ldap_bind, [], [AC_MSG_ERROR([library 'wldap32' is 
required for LDAP])])
+-LDAP_LIBS_FE=-lwldap32
+-LDAP_LIBS_BE=-lwldap32
++LDAP_LIBS_FE=
++LDAP_LIBS_BE=
+   fi
+   LIBS=$_LIBS
+ fi
+--- misc/postgresql-9.1.1/src/include/pg_config.h.in   2011-09-22 
23:57:57.0 +0200
 misc/build/postgresql-9.1.1/src/include/pg_config.h.in 2011-12-12 
14:57:55.0 +0100
+@@ -314,9 +314,6 @@
+ /* Define to 1 if you have the `ssleay32' library (-lssleay32). */
+ #undef HAVE_LIBSSLEAY32
+ 
+-/* Define to 1 if you have the `wldap32' library (-lwldap32). */
+-#undef HAVE_LIBWLDAP32
+-
+ /* Define to 1 if you have the `xml2' library (-lxml2). */
+ #undef HAVE_LIBXML2
+ 
+@@ -351,6 +348,9 @@
+ /* Define to 1 if the system has the type `MINIDUMP_TYPE'. */
+ #undef HAVE_MINIDUMP_TYPE
+ 
++/* Define to 1 if you have the mozilla/ldap/ldap.h header file. */
++#undef HAVE_MOZILLA_LDAP_LDAP_H
++
+ /* Define to 1 if you have the netinet/in.h header file. */
+ #undef HAVE_NETINET_IN_H
+ 
+@@ -659,9 +659,6 @@
+ /* Define to 1 if you have the wctype.h header file. */
+ #undef HAVE_WCTYPE_H
+ 
+-/* Define to 1 if you have the winldap.h header file. */
+-#undef HAVE_WINLDAP_H
+-
+ /* Define to the appropriate snprintf format for 64-bit ints. */
+ #undef INT64_FORMAT
+ 
+@@ -785,6 +782,9 @@
+(--with-libxslt) */
+ #undef USE_LIBXSLT
+ 
++/* Define to 1 to build with Mozilla LDAP support. (--with-mozldap) */
++#undef USE_MOZLDAP
++
+ /* Define to select named POSIX semaphores. */
+ #undef USE_NAMED_POSIX_SEMAPHORES
+ 
 --- misc/postgresql-9.1.1/src/interfaces/libpq/win32.mak   2011-09-22 
23:57:57.0 +0200
 +++ misc/build/postgresql-9.1.1/src/interfaces/libpq/win32.mak 2011-12-12 
11:21:08.796898284 +0100
 @@ -11,18 +11,19 @@
___

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - postgresql/postgresql-9.1.1.patch

[Fridrich Strba]

 postgresql/postgresql-9.1.1.patch |  106 --
 1 file changed, 102 insertions(+), 4 deletions(-)

New commits:
commit 63312d34051cc849151897b8e0220e5a5e3fcdf2
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Dec 12 15:01:57 2011 +0100

Complete the pgsql patch

Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch

diff --git a/postgresql/postgresql-9.1.1.patch 
b/postgresql/postgresql-9.1.1.patch
index 1037ef9..6a3f562 100644
--- a/postgresql/postgresql-9.1.1.patch
+++ b/postgresql/postgresql-9.1.1.patch
@@ -46,8 +46,8 @@
  static int ldapServiceLookup(const char *purl, PQconninfoOption *options,
  PQExpBuffer errorMessage);
  #endif
 misc/postgresql-9.1.1/configure2011-09-22 23:57:57.0 +0200
-+++ misc/build/postgresql-9.1.1/configure  2011-12-12 12:26:58.368351739 
+0100
+--- misc/postgresql-9.1.1/configure2011-12-12 14:54:25.053159648 +0100
 misc/build/postgresql-9.1.1/configure  2011-12-12 14:54:03.010060700 
+0100
 @@ -718,6 +718,7 @@
  with_selinux
  with_openssl
@@ -76,8 +76,8 @@
  $as_echo $with_ldap 6; }
  
  
-+{ $as_echo $as_me:$LINENO: checking whether to use Mozilla LDAP 
implementation 5
-+$as_echo_n checking whether to use Mozilla LDAP implementation...  6; }
++{ $as_echo $as_me:$LINENO: checking whether to build with Mozilla LDAP 
support 5
++$as_echo_n checking whether to build with Mozilla LDAP support...  6; }
 +
 +
 +
@@ -375,6 +375,104 @@
fi
LIBS=$_LIBS
  fi
+--- misc/postgresql-9.1.1/configure.in 2011-09-22 23:57:57.0 +0200
 misc/build/postgresql-9.1.1/configure.in   2011-12-12 14:53:09.022369189 
+0100
+@@ -662,6 +662,13 @@
+ AC_MSG_RESULT([$with_ldap])
+ AC_SUBST(with_ldap)
+ 
++AC_MSG_CHECKING([whether to build with Mozilla LDAP support])
++PGAC_ARG_BOOL(with, mozldap, no,
++  [build with Mozilla LDAP support],
++  [AC_DEFINE([USE_MOZLDAP], 1, [Define to 1 to build with Mozilla 
LDAP support. (--with-mozldap)])])
++AC_MSG_RESULT([$with_mozldap])
++AC_SUBST(with_mozldap)
++
+ 
+ #
+ # Bonjour
+@@ -1077,15 +1084,12 @@
+ fi
+ 
+ if test $with_ldap = yes ; then
+-  if test $PORTNAME != win32; then
++  if test $with_mozldap != yes; then
+  AC_CHECK_HEADERS(ldap.h, [],
+   [AC_MSG_ERROR([header file ldap.h is required for 
LDAP])])
+   else
+- AC_CHECK_HEADERS(winldap.h, [],
+-  [AC_MSG_ERROR([header file winldap.h is required for 
LDAP])],
+-  [AC_INCLUDES_DEFAULT
+-#include windows.h
+-  ])
++ AC_CHECK_HEADERS(mozilla/ldap/ldap.h, [],
++  [AC_MSG_ERROR([header file mozilla/ldap/ldap.h is 
required for LDAP])])
+   fi
+ fi
+ 
+@@ -1498,7 +1502,7 @@
+ # We can test for libldap_r only after we know PTHREAD_LIBS
+ if test $with_ldap = yes ; then
+   _LIBS=$LIBS
+-  if test $PORTNAME != win32; then
++  if test $with_mozldap != yes; then
+ AC_CHECK_LIB(ldap, ldap_bind, [],
+[AC_MSG_ERROR([library 'ldap' is required for LDAP])],
+[$EXTRA_LDAP_LIBS])
+@@ -1513,9 +1517,8 @@
+   LDAP_LIBS_FE=-lldap $EXTRA_LDAP_LIBS
+ fi
+   else
+-AC_CHECK_LIB(wldap32, ldap_bind, [], [AC_MSG_ERROR([library 'wldap32' is 
required for LDAP])])
+-LDAP_LIBS_FE=-lwldap32
+-LDAP_LIBS_BE=-lwldap32
++LDAP_LIBS_FE=
++LDAP_LIBS_BE=
+   fi
+   LIBS=$_LIBS
+ fi
+--- misc/postgresql-9.1.1/src/include/pg_config.h.in   2011-09-22 
23:57:57.0 +0200
 misc/build/postgresql-9.1.1/src/include/pg_config.h.in 2011-12-12 
14:57:55.0 +0100
+@@ -314,9 +314,6 @@
+ /* Define to 1 if you have the `ssleay32' library (-lssleay32). */
+ #undef HAVE_LIBSSLEAY32
+ 
+-/* Define to 1 if you have the `wldap32' library (-lwldap32). */
+-#undef HAVE_LIBWLDAP32
+-
+ /* Define to 1 if you have the `xml2' library (-lxml2). */
+ #undef HAVE_LIBXML2
+ 
+@@ -351,6 +348,9 @@
+ /* Define to 1 if the system has the type `MINIDUMP_TYPE'. */
+ #undef HAVE_MINIDUMP_TYPE
+ 
++/* Define to 1 if you have the mozilla/ldap/ldap.h header file. */
++#undef HAVE_MOZILLA_LDAP_LDAP_H
++
+ /* Define to 1 if you have the netinet/in.h header file. */
+ #undef HAVE_NETINET_IN_H
+ 
+@@ -659,9 +659,6 @@
+ /* Define to 1 if you have the wctype.h header file. */
+ #undef HAVE_WCTYPE_H
+ 
+-/* Define to 1 if you have the winldap.h header file. */
+-#undef HAVE_WINLDAP_H
+-
+ /* Define to the appropriate snprintf format for 64-bit ints. */
+ #undef INT64_FORMAT
+ 
+@@ -785,6 +782,9 @@
+(--with-libxslt) */
+ #undef USE_LIBXSLT
+ 
++/* Define to 1 to build with Mozilla LDAP support. (--with-mozldap) */
++#undef USE_MOZLDAP
++
+ /* Define to select named POSIX semaphores. */
+ #undef USE_NAMED_POSIX_SEMAPHORES
+ 
 --- misc/postgresql-9.1.1/src/interfaces/libpq/win32.mak   2011-09-22 
23:57:57.0 +0200
 +++ misc/build/postgresql-9.1.1/src/interfaces/libpq/win32.mak 2011-12-12 
11:21:08.796898284 +0100
 @@ 

[Libreoffice-commits] .: 2 commits - oox/source

[Radek Doulík]

 oox/source/drawingml/customshapepresets1.cxx   |   20 ++--
 oox/source/drawingml/customshapepresets2.cxx   |4 ++--
 oox/source/drawingml/customshapepresets3.cxx   |   18 +-
 oox/source/drawingml/customshapepresets4.cxx   |   14 +++---
 oox/source/drawingml/customshapepresets5.cxx   |8 
 oox/source/drawingml/customshapeproperties.cxx |   10 ++
 6 files changed, 38 insertions(+), 36 deletions(-)

New commits:
commit cd77642f2b2aa9a0f07a7b161b16b34d2b511828
Author: Radek Doulik r...@novell.com
Date:   Mon Dec 12 15:04:36 2011 +0100

pptx: updated custom shapes presets after latest fix in equations import

diff --git a/oox/source/drawingml/customshapepresets1.cxx 
b/oox/source/drawingml/customshapepresets1.cxx
index 2075b4e..faf8841 100644
--- a/oox/source/drawingml/customshapepresets1.cxx
+++ b/oox/source/drawingml/customshapepresets1.cxx
@@ -6312,8 +6312,8 @@ void CustomShapeProperties::initializePresetsMap1()
 aStringSequence[183] = CREATE_OUSTRING (?16 *cos(pi*(?4 )/1080));
 aStringSequence[184] = CREATE_OUSTRING (?15 *(cos(atan2(?182 ,?183 
;
 aStringSequence[185] = CREATE_OUSTRING (?16 *(sin(atan2(?182 ,?183 
;
-aStringSequence[186] = CREATE_OUSTRING (?21 +?123 -0);
-aStringSequence[187] = CREATE_OUSTRING (?23 +?124 -0);
+aStringSequence[186] = CREATE_OUSTRING (?21 +?184 -0);
+aStringSequence[187] = CREATE_OUSTRING (?23 +?185 -0);
 aStringSequence[188] = CREATE_OUSTRING (?4 +0-540);
 aStringSequence[189] = CREATE_OUSTRING (?49 +540-0);
 aStringSequence[190] = CREATE_OUSTRING (?49 +1080-0);
@@ -7568,14 +7568,14 @@ void CustomShapeProperties::initializePresetsMap1()
 aStringSequence[42] = CREATE_OUSTRING (?29 +0-?40 );
 aStringSequence[43] = CREATE_OUSTRING (sqrt(?41 *?41 +?42 *?42 
+0*0));
 aStringSequence[44] = CREATE_OUSTRING ((1080*atan2(?41 ,?42 
))/pi);
-aStringSequence[45] = CREATE_OUSTRING (?4 *sin(pi*(?0 )/1080));
-aStringSequence[46] = CREATE_OUSTRING (?4 *cos(pi*(?0 )/1080));
+aStringSequence[45] = CREATE_OUSTRING (?4 *sin(pi*(?44 )/1080));
+aStringSequence[46] = CREATE_OUSTRING (?4 *cos(pi*(?44 )/1080));
 aStringSequence[47] = CREATE_OUSTRING (?39 +?45 -0);
 aStringSequence[48] = CREATE_OUSTRING (?40 +?46 -0);
 aStringSequence[49] = CREATE_OUSTRING (?27 +0-?45 );
 aStringSequence[50] = CREATE_OUSTRING (?29 +0-?46 );
-aStringSequence[51] = CREATE_OUSTRING (?3 *sin(pi*(?0 )/1080));
-aStringSequence[52] = CREATE_OUSTRING (?3 *cos(pi*(?0 )/1080));
+aStringSequence[51] = CREATE_OUSTRING (?3 *sin(pi*(?44 )/1080));
+aStringSequence[52] = CREATE_OUSTRING (?3 *cos(pi*(?44 )/1080));
 aStringSequence[53] = CREATE_OUSTRING (?48 +?51 -0);
 aStringSequence[54] = CREATE_OUSTRING (?47 +0-?52 );
 aStringSequence[55] = CREATE_OUSTRING (?50 +?51 -0);
@@ -7608,14 +7608,14 @@ void CustomShapeProperties::initializePresetsMap1()
 aStringSequence[82] = CREATE_OUSTRING (?69 +0-?80 );
 aStringSequence[83] = CREATE_OUSTRING (sqrt(?81 *?81 +?82 *?82 
+0*0));
 aStringSequence[84] = CREATE_OUSTRING ((1080*atan2(?81 ,?82 
))/pi);
-aStringSequence[85] = CREATE_OUSTRING (?4 *sin(pi*(?1 )/1080));
-aStringSequence[86] = CREATE_OUSTRING (?4 *cos(pi*(?1 )/1080));
+aStringSequence[85] = CREATE_OUSTRING (?4 *sin(pi*(?84 )/1080));
+aStringSequence[86] = CREATE_OUSTRING (?4 *cos(pi*(?84 )/1080));
 aStringSequence[87] = CREATE_OUSTRING (?79 +?85 -0);
 aStringSequence[88] = CREATE_OUSTRING (?80 +?86 -0);
 aStringSequence[89] = CREATE_OUSTRING (?68 +0-?85 );
 aStringSequence[90] = CREATE_OUSTRING (?69 +0-?86 );
-aStringSequence[91] = CREATE_OUSTRING (?3 *sin(pi*(?1 )/1080));
-aStringSequence[92] = CREATE_OUSTRING (?3 *cos(pi*(?1 )/1080));
+aStringSequence[91] = CREATE_OUSTRING (?3 *sin(pi*(?84 )/1080));
+aStringSequence[92] = CREATE_OUSTRING (?3 *cos(pi*(?84 )/1080));
 aStringSequence[93] = CREATE_OUSTRING (?88 +?91 -0);
 aStringSequence[94] = CREATE_OUSTRING (?87 +0-?92 );
 aStringSequence[95] = CREATE_OUSTRING (?90 +?91 -0);
diff --git a/oox/source/drawingml/customshapepresets2.cxx 
b/oox/source/drawingml/customshapepresets2.cxx
index 58f62ff..2dda792 100644
--- a/oox/source/drawingml/customshapepresets2.cxx
+++ b/oox/source/drawingml/customshapepresets2.cxx
@@ -14498,7 +14498,7 @@ void CustomShapeProperties::initializePresetsMap2()
 aStringSequence[12] = CREATE_OUSTRING ((1+?11 )/12);
 aStringSequence[13] = CREATE_OUSTRING (?12 *logwidth/1);
 aStringSequence[14] = CREATE_OUSTRING (?12 *logheight/1);
-aStringSequence[15] = CREATE_OUSTRING (logwidth+0-?10 );
+

[Libreoffice-commits] .: pyuno/source

[Caolán McNamara]

 pyuno/source/loader/pythonloader.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fb37327df4153a31d7ba28e2bc3f742f4efc9f34
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Dec 12 14:17:08 2011 +

Let's not have debug spew all the time

diff --git a/pyuno/source/loader/pythonloader.py 
b/pyuno/source/loader/pythonloader.py
index c4fa69d..da3efa7 100644
--- a/pyuno/source/loader/pythonloader.py
+++ b/pyuno/source/loader/pythonloader.py
@@ -35,7 +35,7 @@ from com.sun.star.loader import XImplementationLoader
 from com.sun.star.lang import XServiceInfo
 
 MODULE_PROTOCOL = vnd.openoffice.pymodule:
-DEBUG = 1
+DEBUG = 0
 
 g_supportedServices  = com.sun.star.loader.Python,  # referenced by the 
native C++ loader !
 g_implementationName = org.openoffice.comp.pyuno.Loader # referenced by the 
native C++ loader !
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - postgresql/makefile.mk

[Lionel Elie Mamane]

 postgresql/makefile.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 46269163c3db74a59b9e4e46202b6e4d42228ea5
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Mon Dec 12 15:18:40 2011 +0100

postgresql: go look for includes and libs in solver

diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index 6f2931e..9ec3ec1 100644
--- a/postgresql/makefile.mk
+++ b/postgresql/makefile.mk
@@ -57,7 +57,7 @@ BUILD_ACTION = nmake -f win32.mak USE_SSL=1 USE_LDAP=1 
USE_MOZLDAP=1
 CONFIGURE_DIR=.
 BUILD_DIR=src/interfaces/libpq
 
-CONFIGURE_ACTION = CPPFLAGS=-I$(SOLARVER)$/$(INPATH)$/inc ./configure 
--without-readline --disable-shared --with-openssl
+CONFIGURE_ACTION = CPPFLAGS=-I$(SOLARVER)$/$(INPATH)$/inc 
-I$(SOLARVER)$/$(INPATH)$/inc$/external 
LDFLAGS=-L$(SOLARVER)$/$(INPATH)$/lib ./configure --without-readline 
--disable-shared --with-openssl
 .IF $(WITH_LDAP) == YES
 CONFIGURE_ACTION += --with-ldap
 .IF $(WITH_OPENLDAP) != YES
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 pyuno/source/loader/pythonloader.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4a7ba0cbaf5311342c48faeb0dc7269c47560fde
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Dec 12 14:17:08 2011 +

Let's not have debug spew all the time
(cherry picked from commit fb37327df4153a31d7ba28e2bc3f742f4efc9f34)

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

diff --git a/pyuno/source/loader/pythonloader.py 
b/pyuno/source/loader/pythonloader.py
index c4fa69d..da3efa7 100644
--- a/pyuno/source/loader/pythonloader.py
+++ b/pyuno/source/loader/pythonloader.py
@@ -35,7 +35,7 @@ from com.sun.star.loader import XImplementationLoader
 from com.sun.star.lang import XServiceInfo
 
 MODULE_PROTOCOL = vnd.openoffice.pymodule:
-DEBUG = 1
+DEBUG = 0
 
 g_supportedServices  = com.sun.star.loader.Python,  # referenced by the 
native C++ loader !
 g_implementationName = org.openoffice.comp.pyuno.Loader # referenced by the 
native C++ loader !
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: pyuno/source

[Caolán McNamara]

 pyuno/source/loader/pythonloader.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9e8ac5c91e8bd42467b130b3cd53da44f7b736f6
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Dec 12 15:21:19 2011 +

more debug spew in non-debug product

diff --git a/pyuno/source/loader/pythonloader.py 
b/pyuno/source/loader/pythonloader.py
index da3efa7..eef1bd6 100644
--- a/pyuno/source/loader/pythonloader.py
+++ b/pyuno/source/loader/pythonloader.py
@@ -139,8 +139,8 @@ class Loader( XImplementationLoader, XServiceInfo, 
unohelper.Base ):
 
 mod = self.getModuleFromUrl( locationUrl )
 implHelper = mod.__dict__.get( g_ImplementationHelper , None )
-print (dump stuff)
 if DEBUG:
+print (dump stuff)
 print (Fetched ImplHelper as  + str(implHelper))
 if implHelper == None:
 return mod.getComponentFactory( implementationName, 
self.ctx.ServiceManager, regKey )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/source

[Caolán McNamara]

 vcl/source/window/accel.cxx |   20 
 1 file changed, 12 insertions(+), 8 deletions(-)

New commits:
commit 26c0c9d404a65d5ab7a5a9c227132594e467cef4
Author: Marcel Metz mm...@adrian-broher.net
Date:   Mon Dec 12 16:02:22 2011 +

Related: fdo#38832 Replace ImplAccesTable with std::map

diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index f45b145..e755d48 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.cxx
@@ -27,18 +27,18 @@
  /
 
 
-#include tools/table.hxx
 #include tools/debug.hxx
 #include tools/rc.h
 
 #include vcl/svapp.hxx
 #include accel.h
 #include vcl/accel.hxx
+#include map
 #include vector
 
 // ===
 
-DECLARE_TABLE( ImplAccelTable, ImplAccelEntry* )
+typedef ::std::map sal_uLong, ImplAccelEntry*  ImplAccelMap;
 typedef ::std::vector ImplAccelEntry*  ImplAccelList;
 
 #define ACCELENTRY_NOTFOUND ((sal_uInt16)0x)
@@ -48,8 +48,8 @@ typedef ::std::vector ImplAccelEntry*  ImplAccelList;
 class ImplAccelData
 {
 public:
-ImplAccelTable  maKeyTable; // for keycodes, generated with a code
-ImplAccelList   maIdList;   // Id-List
+ImplAccelMap  maKeyMap; // for keycodes, generated with a code
+ImplAccelList maIdList; // Id-List
 };
 
 // ===
@@ -179,7 +179,11 @@ void Accelerator::ImplInit()
 
 ImplAccelEntry* Accelerator::ImplGetAccelData( const KeyCode rKeyCode ) const
 {
-return mpData-maKeyTable.Get( rKeyCode.GetFullKeyCode() );
+ImplAccelMap::iterator it = mpData-maKeyMap.find( 
rKeyCode.GetFullKeyCode() );
+if( it != mpData-maKeyMap.end() )
+return it-second;
+else
+return NULL;
 }
 
 // ---
@@ -200,7 +204,7 @@ void Accelerator::ImplCopyData( ImplAccelData rAccelData )
 else
 pEntry-mpAutoAccel = NULL;
 
-mpData-maKeyTable.Insert( 
(sal_uLong)pEntry-maKeyCode.GetFullKeyCode(), pEntry );
+mpData-maKeyMap.insert( std::make_pair( 
pEntry-maKeyCode.GetFullKeyCode(), pEntry ) );
 mpData-maIdList.push_back( pEntry );
 }
 }
@@ -267,7 +271,7 @@ void Accelerator::ImplInsertAccel( sal_uInt16 nItemId, 
const KeyCode rKeyCode,
 OSL_FAIL( Accelerator::InsertItem(): KeyCode with KeyCode 0 not 
allowed );
 delete pEntry;
 }
-else if ( !mpData-maKeyTable.Insert( nCode, pEntry ) )
+else if ( mpData-maKeyMap.insert( std::make_pair( nCode, pEntry ) 
).second )
 {
 OSL_TRACE( Accelerator::InsertItem(): KeyCode (Key: %lx) already 
exists, nCode );
 delete pEntry;
@@ -470,7 +474,7 @@ Accelerator Accelerator::operator=( const Accelerator 
rAccel )
 
 // delete and copy tables
 ImplDeleteData();
-mpData-maKeyTable.Clear();
+mpData-maKeyMap.clear();
 ImplCopyData( *((ImplAccelData*)(rAccel.mpData)) );
 
 return *this;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/source

[Caolán McNamara]

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

New commits:
commit 20d6bd273c43a9b8573fa077f6d9d631bd2d53cc
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Dec 12 16:18:37 2011 +

pair::second is false if element with same key already existed

The pair::second element in the pair is set to true if a new element was
inserted or false if an element with the same value existed

diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index e755d48..50afd2b 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.cxx
@@ -271,7 +271,7 @@ void Accelerator::ImplInsertAccel( sal_uInt16 nItemId, 
const KeyCode rKeyCode,
 OSL_FAIL( Accelerator::InsertItem(): KeyCode with KeyCode 0 not 
allowed );
 delete pEntry;
 }
-else if ( mpData-maKeyMap.insert( std::make_pair( nCode, pEntry ) 
).second )
+else if ( !mpData-maKeyMap.insert( std::make_pair( nCode, pEntry ) 
).second )
 {
 OSL_TRACE( Accelerator::InsertItem(): KeyCode (Key: %lx) already 
exists, nCode );
 delete pEntry;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - cui/source

[Caolán McNamara]

 cui/source/dialogs/pastedlg.cxx |   26 --
 cui/source/inc/pastedlg.hxx |4 ++--
 2 files changed, 14 insertions(+), 16 deletions(-)

New commits:
commit d6e21fd53cda06460f2c1611ef5d0744132d87bc
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Dec 12 16:32:34 2011 +

now with an STL map we don't have to do our own mem allocation

diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index 656a813..99cb187 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -112,11 +112,6 @@ void SvPasteObjectDialog::SetDefault()
 
 SvPasteObjectDialog::~SvPasteObjectDialog()
 {
-::std::map SotFormatStringId, String* ::iterator it;
-for(it = aSupplementMap.begin(); it != aSupplementMap.end(); ++it)
-{
-delete it-second;
-}
 }
 
 /*
@@ -124,9 +119,7 @@ SvPasteObjectDialog::~SvPasteObjectDialog()
 */
 void SvPasteObjectDialog::Insert( SotFormatStringId nFormat, const String 
rFormatName )
 {
-String * pStr = new String( rFormatName );
-if( !aSupplementMap.insert( ::std::make_pair( nFormat, pStr ) ).second )
-delete pStr;
+aSupplementMap.insert( ::std::make_pair( nFormat, rFormatName ) );
 }
 
 sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper 
rHelper,
@@ -155,15 +148,15 @@ sal_uLong SvPasteObjectDialog::GetFormat( const 
TransferableDataHelper rHelper,
 ::com::sun::star::datatransfer::DataFlavor aFlavor( *aIter );
 SotFormatStringId nFormat = (*aIter++).mnSotId;
 
-String* pName = NULL;
-String aName;
-::std::map SotFormatStringId, String* ::iterator itName;
-itName = aSupplementMap.find( nFormat );
+::std::map SotFormatStringId, String ::iterator itName =
+aSupplementMap.find( nFormat );
 
 // if there is an Embed Source or and Embedded Object on the
 // Clipboard we read the Description and the Source of this object
 // from an accompanied Object Descriptor format on the clipboard
 // Remember: these formats mostly appear together on the clipboard
+String aName;
+const String* pName = NULL;
 if ( itName == aSupplementMap.end() )
 {
 
SvPasteObjectHelper::GetEmbeddedName(rHelper,aName,aSourceName,nFormat);
@@ -172,7 +165,7 @@ sal_uLong SvPasteObjectDialog::GetFormat( const 
TransferableDataHelper rHelper,
 }
 else
 {
-pName = itName-second;
+pName = (itName-second);
 }
 
 if( pName )
@@ -181,7 +174,8 @@ sal_uLong SvPasteObjectDialog::GetFormat( const 
TransferableDataHelper rHelper,
 
 if( SOT_FORMATSTR_ID_EMBED_SOURCE == nFormat )
 {
-if( aDesc.maClassName != aEmptyNm )
{
+if( aDesc.maClassName != aEmptyNm )
+{
 aSourceName = aDesc.maDisplayName;
 
 if( aDesc.maClassName == aObjClassName )
diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx
index ddf4ccb..21dee34 100644
--- a/cui/source/inc/pastedlg.hxx
+++ b/cui/source/inc/pastedlg.hxx
@@ -60,7 +60,7 @@ class SvPasteObjectDialog : public ModalDialog
 OKButton aOKButton1;
 CancelButton aCancelButton1;
 HelpButton aHelpButton1;
-::std::map SotFormatStringId, String*  aSupplementMap;
+::std::map SotFormatStringId, String  aSupplementMap;
 SvGlobalNameaObjClassName;
 String  aObjName;
 sal_uInt16  nAspect;
commit 57054f84f66c4d2db8d117a4043e0fbcbd0ee528
Author: Marcel Metz mm...@adrian-broher.net
Date:   Mon Dec 12 16:25:22 2011 +

Related: fdo#38832 Replace Table with std::map

diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index 47fdf2f..656a813 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -112,11 +112,10 @@ void SvPasteObjectDialog::SetDefault()
 
 SvPasteObjectDialog::~SvPasteObjectDialog()
 {
-void * pStr = aSupplementTable.First();
-while( pStr )
+::std::map SotFormatStringId, String* ::iterator it;
+for(it = aSupplementMap.begin(); it != aSupplementMap.end(); ++it)
 {
-delete (String *)pStr;
-pStr = aSupplementTable.Next();
+delete it-second;
 }
 }
 
@@ -126,7 +125,7 @@ SvPasteObjectDialog::~SvPasteObjectDialog()
 void SvPasteObjectDialog::Insert( SotFormatStringId nFormat, const String 
rFormatName )
 {
 String * pStr = new String( rFormatName );
-if( !aSupplementTable.Insert( nFormat, pStr ) )
+if( !aSupplementMap.insert( ::std::make_pair( nFormat, pStr ) ).second )
 delete pStr;
 }
 
@@ -156,20 +155,25 @@ sal_uLong SvPasteObjectDialog::GetFormat( const 
TransferableDataHelper rHelper,
 

[Libreoffice-commits] .: svl/source

[Caolán McNamara]

 svl/source/misc/inettype.cxx |   38 ++
 1 file changed, 22 insertions(+), 16 deletions(-)

New commits:
commit 9fd35cc973e12a07d82e5ca14ec1f4307dbbada9
Author: Marcel Metz mm...@adrian-broher.net
Date:   Mon Dec 12 16:50:32 2011 +

Related: fdo#38832 Replace Table with std::map

diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx
index 1cba9dc..b043f06 100644
--- a/svl/source/misc/inettype.cxx
+++ b/svl/source/misc/inettype.cxx
@@ -85,8 +85,9 @@ class Registration
 {
 typedef boost::ptr_mapUniString, TypeNameMapEntry  TypeNameMap;
 typedef boost::ptr_mapUniString, ExtensionMapEntry ExtensionMap;
+typedef std::mapINetContentType, TypeIDMapEntry*   TypeIDMap;
 
-Table m_aTypeIDMap; // map TypeID to TypeName, Presentation
+TypeIDMapm_aTypeIDMap;// map ContentType to TypeID
 TypeNameMap  m_aTypeNameMap;  // map TypeName to TypeID, Extension
 ExtensionMap m_aExtensionMap; // map Extension to TypeID
 sal_uInt32 m_nNextDynamicID;
@@ -127,8 +128,13 @@ namespace
 // static
 inline TypeIDMapEntry * Registration::getEntry(INetContentType eTypeID)
 {
-return static_cast TypeIDMapEntry * (theRegistration::get().
-m_aTypeIDMap.Get(eTypeID));
+Registration rRegistration = theRegistration::get();
+
+TypeIDMap::iterator it = rRegistration.m_aTypeIDMap.find( eTypeID );
+if( it != rRegistration.m_aTypeIDMap.end() )
+return it-second;
+else
+return NULL;
 }
 
 //
@@ -526,10 +532,8 @@ MediaTypeEntry const aStaticPresentationMap[]
 //
 Registration::~Registration()
 {
-{for (sal_uLong i = 0; i  m_aTypeIDMap.Count(); ++i)
-delete static_cast TypeIDMapEntry * (m_aTypeIDMap.GetObject(i));
-}
-m_aTypeIDMap.Clear();
+for ( TypeIDMap::iterator it = m_aTypeIDMap.begin(); it != 
m_aTypeIDMap.end(); ++it )
+delete it-second;
 }
 
 //
@@ -571,7 +575,7 @@ INetContentType Registration::RegisterContentType(UniString 
const  rTypeName,
 pTypeIDMapEntry-m_aPresentation = rPresentation;
 if (pSystemFileType)
 pTypeIDMapEntry-m_aSystemFileType = *pSystemFileType;
-rRegistration.m_aTypeIDMap.Insert(eTypeID, pTypeIDMapEntry);
+rRegistration.m_aTypeIDMap.insert( ::std::make_pair( eTypeID, 
pTypeIDMapEntry ) );
 
 std::auto_ptrTypeNameMapEntry pTypeNameMapEntry(new TypeNameMapEntry());
 if (pExtension)
@@ -609,10 +613,11 @@ UniString Registration::GetContentType(INetContentType 
eTypeID)
 {
 Registration rRegistration = theRegistration::get();
 
-TypeIDMapEntry * pEntry
-= static_cast TypeIDMapEntry * (rRegistration.
-  m_aTypeIDMap.Get(eTypeID));
-return pEntry ? pEntry-m_aTypeName : UniString();
+TypeIDMap::iterator pEntry = rRegistration.m_aTypeIDMap.find( eTypeID );
+if( pEntry != rRegistration.m_aTypeIDMap.end() )
+return pEntry-second-m_aTypeName;
+else
+return  UniString();
 }
 
 //
@@ -621,10 +626,11 @@ UniString Registration::GetPresentation(INetContentType 
eTypeID)
 {
 Registration rRegistration = theRegistration::get();
 
-TypeIDMapEntry * pEntry
-= static_cast TypeIDMapEntry * (rRegistration.
-  m_aTypeIDMap.Get(eTypeID));
-return pEntry ? pEntry-m_aPresentation : UniString();
+TypeIDMap::iterator pEntry = rRegistration.m_aTypeIDMap.find( eTypeID );
+if( pEntry != rRegistration.m_aTypeIDMap.end() )
+return pEntry-second-m_aPresentation;
+else
+return  UniString();
 }
 
 //
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.4.99.1'

[Petr Mladek]

Tag 'libreoffice-3.4.99.1' created by Petr Mladek pmla...@suse.cz at 
2011-12-12 17:13 +0100

Tag $lo_version_tag (${vendor_use:+$vendor LO }$lo_version_app-$lo_release_id)
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJO5jYtAAoJEPQ0oe+v7q6j5hgP/iB64zDUmhSR1AyKE/zQx6Vp
It37DHBPXtc7Mlar05UyS2i/Z0b6v7kye8aOAe96v1QAI2fDifFnyw2PX5lFCuEz
f9QBvZrkYcH690+Byt1arADI6ZQASmhhr7bvhg4A6GGd+LU/m2cQMiB6+kXs/+/q
d3Kp7bw7uHLEi8Db1MMJC/sAxIqcybSYsORUtHGRWR+TZZBL9+9SGvkT9pumuV8t
pVESBwA86LPObsLItoHn5/US+ybLXlFDjs0qeREWwhjfAZbvjsrRoO/HgCDJWXT8
Yu259Po2J29f/k5D0OTokpJJ0woX8O9kfu9zK5P0m/ITmr1yp62QKSzwcuMvufQ0
SjoFweVFneIX4rAa/CREuZZvKDypz7N7Lf4yM50lIrP4dPfNpV8fRaKyw5aUfeLG
40giYI8zvx8j07LGuD9MNlFe/hCKg+9R6TnblJkrhG0J5fvc4NhV5Q7rbwccVhuJ
E5CR3MtTjcBbodSBZB+Cp5jcV/uwq8W4eYocmyY76oZPvUwMxguFqOEDlfg1dTdU
ix+BxEAJ+rkQxRSTtv6/NdplAIKuTbzKaEW7aDqSZEk65mPhXU1a+cC699lJ3DJT
OreU+MdFr5aImPiDNdUT1ZkfSH1STHGkrhddM9/3y3bXYoKJPZW8c/OJmJSj1UO2
OTiJv10KglN1iZBLGS86
=QbqJ
-END PGP SIGNATURE-

Changes since libreoffice-3-5-branch-point-139:
---
 0 files changed
---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.4.99.1'

[Petr Mladek]

Tag 'libreoffice-3.4.99.1' created by Petr Mladek pmla...@suse.cz at 
2011-12-12 17:13 +0100

Tag $lo_version_tag (${vendor_use:+$vendor LO }$lo_version_app-$lo_release_id)
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJO5jYtAAoJEPQ0oe+v7q6jUQoP/0dqDAKTrpZ+oNhjyy6Cifwk
5610e46w69lUaBCAtW6RDVsOd7xPXCsT7RpUbYReGxuN27k8g+ogXoa+PgYeyg0r
qZd1enPEwgHfn1xuicYNmQvhkNhjQ5dcs8tb5dh1YCiDrAtHVKBjmt6m8lsb2FtX
XYhI5kT4emG/ssBMuTccVm2culU/3qAE+DC7gTcnWWdXkXIpIO038nl3R/VKH4rh
4B71KOwVQhglugYl419/MLSUXHc9ux3grNpcG9kLF33DPIQ0U7wu9pINjGNVE0ke
AlCAaHhPu/TNht+j1+DB2MApbuPMQdMqdu2gY0PLXPKDgqkpXkAxqBGHjjNED1Eb
O6o7tih8PnLfAm3pQ2p9kZlqT1fQeK7anBRYWYqpncZosFuvthz5/j5JTIfsszHM
wZ9mwByoxHW0fv9YFMv/6yiWHAi4m31Oum1EISxmLbnvlzHYKFOzUx0Dup6Opvl+
7+DFQoPifOSzV/vcf8r925UndrR8Uf8E5tTg+uZ4/YLaatyVslwHgDaSf4tdmssh
glc4ynEGM7o9nQVXGqf1t5msAj59G2NGJOBOCqswWgbmPZRb1Lgs1beIovTSsDIv
+7e3hKtUyuYRr1QzHikJuvFLle089jbOXX1B79ed1wGhyGboLjnIxm9QqcoDcRae
+8cG6fX8dNJiTlfQ4gEa
=tnyu
-END PGP SIGNATURE-

Changes since libreoffice-3-5-branch-point-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.4.99.1'

[Petr Mladek]

Tag 'libreoffice-3.4.99.1' created by Petr Mladek pmla...@suse.cz at 
2011-12-12 17:13 +0100

Tag $lo_version_tag (${vendor_use:+$vendor LO }$lo_version_app-$lo_release_id)
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJO5jYuAAoJEPQ0oe+v7q6jzvQQAK4V+GjPLXt9cJue13wukRfj
A4+VXw4TTwElUv+XB5YaGasZR9jfPR6OzDe9nRM1ZrTm8VOfOjPSLW6c/+TgpN4C
qYieuLlaVQSwDhM4ndqdEPNuNpI6iUYar7m1srBS7K7GiXuAFryJbYMqEYClk3P4
d9AsUdrDSFMajrFqF2Qe42Mp8BfHs2px7WbaKFcIjPwJBcXJg1g1Ug8bLHRJ9UrY
MoUUajBG1ChN63XKjTpMNF2mmtfRbHe8VwRQPhadGwnMO4dGJEqqkodR/M6OiI/6
d9Vb0kgRJz3vBaRIjbBDmMDcAWXvQF2Cw+xvevIsp9zBgAqiS1/QqBFrb3QNIcys
546xd7vzV7duf0gGg3NRV+7cJH0qnR3VSgcgq7kLtuV6S4h1fY6mX9B2guCeYsDO
8UweTc0LMgYTCb3RzD6lYNGAAnxr46An5FopU15dyBr1wM/Z+UGB9mFsjHvrSWZy
ERgnpTy9sR8orN1UH4PwuH/Q0Ryxrrq4N5kCAfmND832pEF9oyo5Q6WigvpMJaB0
3Zpq/ChNZEwTJpChH850FKkuE4alF3ktEW5oZsHOxSukeyB/PxbJ7M5fVKD2N4Pu
2ywuPN2tAlQ1P8dgkXQ83MmuNuVzfhKmJ5sK/osKmGJTs7Ui5U6F2PA8qS52lpID
fZ4kGhWAF6p8NNuVsdFA
=c5sB
-END PGP SIGNATURE-

Changes since libreoffice-3-5-branch-point-1:
---
 0 files changed
---
___
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

[Lubos Lunak]

 sw/source/filter/ww8/docxattributeoutput.cxx |   28 ++-
 sw/source/filter/ww8/docxattributeoutput.hxx |   10 +
 2 files changed, 17 insertions(+), 21 deletions(-)

New commits:
commit 5cd2ae45c3da7b018b45ce00153f7ca4791a5d11
Author: Luboš Luňák l.lu...@suse.cz
Date:   Mon Dec 12 18:11:17 2011 +0100

fix docx hyperlink writing

This is a rewrite of the fix for fdo#35826, needed for writing
the document from bnc#706138 as docx. The sequence there is
startURL(), runText(), endRun(), endUrl(), startUrl(), runText(), endUrl(), 
endRun(),
so by the second endRun(), it is needed to close both the previous
and current hyperlink run.

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 42a132d..d9f3376 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -516,8 +516,6 @@ void DocxAttributeOutput::StartRun( const SwRedlineData* 
pRedlineData )
 
 void DocxAttributeOutput::EndRun()
 {
-if ( m_nCloseHyperlinkStatus == Detected )
-m_nCloseHyperlinkStatus = EndInThisRun;
 // Write field starts
 for ( std::vectorFieldInfos::iterator pIt = m_Fields.begin(); pIt != 
m_Fields.end(); ++pIt )
 {
@@ -543,6 +541,11 @@ void DocxAttributeOutput::EndRun()
 // before postponed run start)
 m_pSerializer-mark(); // let's call it actual run start
 
+if ( m_closeHyperlinkInPreviousRun )
+{
+m_pSerializer-endElementNS( XML_w, XML_hyperlink );
+m_closeHyperlinkInPreviousRun = false;
+}
 // prepend the actual run start
 if ( m_pHyperlinkAttrList )
 {
@@ -551,11 +554,6 @@ void DocxAttributeOutput::EndRun()
 m_pSerializer-startElementNS( XML_w, XML_hyperlink, xAttrList );
 m_pHyperlinkAttrList = NULL;
 }
-if ( m_nCloseHyperlinkStatus == EndInPrevRun)
-{
-m_pSerializer-endElementNS( XML_w, XML_hyperlink );
-m_nCloseHyperlinkStatus = Undetected;
-}
 
 // Write the hyperlink and toc fields starts
 for ( std::vectorFieldInfos::iterator pIt = m_Fields.begin(); pIt != 
m_Fields.end(); )
@@ -592,10 +590,10 @@ void DocxAttributeOutput::EndRun()
 EndField_Impl( m_Fields.front( ) );
 m_Fields.erase( m_Fields.begin( ) );
 }
-if ( m_nCloseHyperlinkStatus == EndInThisRun)
+if ( m_closeHyperlinkInThisRun )
 {
 m_pSerializer-endElementNS( XML_w, XML_hyperlink );
-m_nCloseHyperlinkStatus = Undetected;
+m_closeHyperlinkInThisRun = false;
 }
 
 // if there is some redlining in the document, output it
@@ -1043,8 +1041,11 @@ static void impl_WriteRunText( FSHelperPtr pSerializer, 
sal_Int32 nTextToken,
 
 void DocxAttributeOutput::RunText( const String rText, rtl_TextEncoding 
/*eCharSet*/ )
 {
-if ( m_nCloseHyperlinkStatus == Detected )
-m_nCloseHyperlinkStatus = EndInPrevRun;
+if( m_closeHyperlinkInThisRun )
+{
+m_closeHyperlinkInPreviousRun = true;
+m_closeHyperlinkInThisRun = false;
+}
 OUString aText( rText );
 
 // one text can be split into more w:tblah/w:t's by line breaks etc.
@@ -1232,7 +1233,7 @@ bool DocxAttributeOutput::StartURL( const String rUrl, 
const String rTarget )
 
 bool DocxAttributeOutput::EndURL()
 {
-m_nCloseHyperlinkStatus = Detected;
+m_closeHyperlinkInThisRun = true;
 return true;
 }
 
@@ -4350,7 +4351,8 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport 
rExport, FSHelperPtr pSeri
   m_bParagraphOpened( false ),
   m_nColBreakStatus( COLBRK_NONE ),
   m_pParentFrame( NULL ),
-  m_nCloseHyperlinkStatus( Undetected ),
+  m_closeHyperlinkInThisRun( false ),
+  m_closeHyperlinkInPreviousRun( false ),
   m_postponedGraphic( NULL ),
   m_postponedMath( NULL ),
   m_postitFieldsMaxId( 0 )
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 10ee7cd..79c8b02 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -588,14 +588,8 @@ private:
 
 const sw::Frame *m_pParentFrame;
 // close of hyperlink needed
-enum HyperLinkCloseState
-{
-Undetected = 0,
-Detected,
-EndInPrevRun,
-EndInThisRun
-};
-HyperLinkCloseState m_nCloseHyperlinkStatus;
+bool m_closeHyperlinkInThisRun;
+bool m_closeHyperlinkInPreviousRun;
 
 struct PostponedGraphic
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

[Lubos Lunak]

 sw/source/filter/ww8/docxattributeoutput.cxx |   28 ++-
 sw/source/filter/ww8/docxattributeoutput.hxx |   10 +
 2 files changed, 17 insertions(+), 21 deletions(-)

New commits:
commit f176c9ba7be7f3051a52b9f57b56124038c0cfd6
Author: Luboš Luňák l.lu...@suse.cz
Date:   Mon Dec 12 18:11:17 2011 +0100

fix docx hyperlink writing

This is a rewrite of the fix for fdo#35826, needed for writing
the document from bnc#706138 as docx. The sequence there is
startURL(), runText(), endRun(), endUrl(), startUrl(), runText(), endUrl(), 
endRun(),
so by the second endRun(), it is needed to close both the previous
and current hyperlink run.

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 42a132d..d9f3376 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -516,8 +516,6 @@ void DocxAttributeOutput::StartRun( const SwRedlineData* 
pRedlineData )
 
 void DocxAttributeOutput::EndRun()
 {
-if ( m_nCloseHyperlinkStatus == Detected )
-m_nCloseHyperlinkStatus = EndInThisRun;
 // Write field starts
 for ( std::vectorFieldInfos::iterator pIt = m_Fields.begin(); pIt != 
m_Fields.end(); ++pIt )
 {
@@ -543,6 +541,11 @@ void DocxAttributeOutput::EndRun()
 // before postponed run start)
 m_pSerializer-mark(); // let's call it actual run start
 
+if ( m_closeHyperlinkInPreviousRun )
+{
+m_pSerializer-endElementNS( XML_w, XML_hyperlink );
+m_closeHyperlinkInPreviousRun = false;
+}
 // prepend the actual run start
 if ( m_pHyperlinkAttrList )
 {
@@ -551,11 +554,6 @@ void DocxAttributeOutput::EndRun()
 m_pSerializer-startElementNS( XML_w, XML_hyperlink, xAttrList );
 m_pHyperlinkAttrList = NULL;
 }
-if ( m_nCloseHyperlinkStatus == EndInPrevRun)
-{
-m_pSerializer-endElementNS( XML_w, XML_hyperlink );
-m_nCloseHyperlinkStatus = Undetected;
-}
 
 // Write the hyperlink and toc fields starts
 for ( std::vectorFieldInfos::iterator pIt = m_Fields.begin(); pIt != 
m_Fields.end(); )
@@ -592,10 +590,10 @@ void DocxAttributeOutput::EndRun()
 EndField_Impl( m_Fields.front( ) );
 m_Fields.erase( m_Fields.begin( ) );
 }
-if ( m_nCloseHyperlinkStatus == EndInThisRun)
+if ( m_closeHyperlinkInThisRun )
 {
 m_pSerializer-endElementNS( XML_w, XML_hyperlink );
-m_nCloseHyperlinkStatus = Undetected;
+m_closeHyperlinkInThisRun = false;
 }
 
 // if there is some redlining in the document, output it
@@ -1043,8 +1041,11 @@ static void impl_WriteRunText( FSHelperPtr pSerializer, 
sal_Int32 nTextToken,
 
 void DocxAttributeOutput::RunText( const String rText, rtl_TextEncoding 
/*eCharSet*/ )
 {
-if ( m_nCloseHyperlinkStatus == Detected )
-m_nCloseHyperlinkStatus = EndInPrevRun;
+if( m_closeHyperlinkInThisRun )
+{
+m_closeHyperlinkInPreviousRun = true;
+m_closeHyperlinkInThisRun = false;
+}
 OUString aText( rText );
 
 // one text can be split into more w:tblah/w:t's by line breaks etc.
@@ -1232,7 +1233,7 @@ bool DocxAttributeOutput::StartURL( const String rUrl, 
const String rTarget )
 
 bool DocxAttributeOutput::EndURL()
 {
-m_nCloseHyperlinkStatus = Detected;
+m_closeHyperlinkInThisRun = true;
 return true;
 }
 
@@ -4350,7 +4351,8 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport 
rExport, FSHelperPtr pSeri
   m_bParagraphOpened( false ),
   m_nColBreakStatus( COLBRK_NONE ),
   m_pParentFrame( NULL ),
-  m_nCloseHyperlinkStatus( Undetected ),
+  m_closeHyperlinkInThisRun( false ),
+  m_closeHyperlinkInPreviousRun( false ),
   m_postponedGraphic( NULL ),
   m_postponedMath( NULL ),
   m_postitFieldsMaxId( 0 )
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 10ee7cd..79c8b02 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -588,14 +588,8 @@ private:
 
 const sw::Frame *m_pParentFrame;
 // close of hyperlink needed
-enum HyperLinkCloseState
-{
-Undetected = 0,
-Detected,
-EndInPrevRun,
-EndInThisRun
-};
-HyperLinkCloseState m_nCloseHyperlinkStatus;
+bool m_closeHyperlinkInThisRun;
+bool m_closeHyperlinkInPreviousRun;
 
 struct PostponedGraphic
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/core/tool/scmatrix.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fbdddb784108b9f4e5e3d76c50b9aac81c73a019
Author: Eike Rathke er...@redhat.com
Date:   Mon Dec 12 19:01:42 2011 +0100

fixed rhbz#754051 Libreoffice calc crashes when re-opening a xlxs file

ScMatrixImpl lacked initialization of pErrorInterpreter=NULL.

Signed-off-by: Kohei Yoshida kohei.yosh...@suse.com

diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 912eef1..e53ca6b 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -244,6 +244,7 @@ private:
 ScMatrixImpl::ScMatrixImpl(SCSIZE nC, SCSIZE nR, ScMatrix::DensityType eType) :
 maMat(nR, nC, toMddsDensityType(eType)),
 meType(eType),
+pErrorInterpreter(NULL),
 mbCloneIfConst(true)
 {
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

[Kohei Yoshida]

 sc/source/ui/dbgui/filtdlg.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit f162980219bb6ab01d099eda57897c5b0a9aa6fe
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Mon Dec 12 14:08:27 2011 -0500

Fix filtering by inequality operators e.g. 5, =3, etc.

diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 26616eb..2bb76ea 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -1157,7 +1157,11 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd )
 {
 rItem.maString = aStrVal;
 rItem.mfVal = 0.0;
-rItem.meType = ScQueryEntry::ByString;
+
+sal_uInt32 nIndex;
+bool bNumber = pDoc-GetFormatTable()-IsNumberFormat(
+rItem.maString, nIndex, rItem.mfVal);
+rItem.meType = bNumber ? ScQueryEntry::ByValue : 
ScQueryEntry::ByString;
 }
 
 sal_uInt16  nField  = pLbField-GetSelectEntryPos();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

[Kohei Yoshida]

 sc/source/core/data/table3.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 99977d7864f632a6fd74d3e0490f545905ac4b96
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Mon Dec 12 14:18:59 2011 -0500

fdo#35539: Don't evaluate error cells as values during filtering.

E.g., if filtering for cells  5, we should skip error cells.  Previously,
error cells are unintentionally treated as having a numeric value of 0.

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index ffd5d6f..b0d261f 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1157,7 +1157,13 @@ public:
 return false;
 
 if (pCell)
+{
+if (pCell-GetErrorCode())
+// Error values are compared as string.
+return false;
+
 return pCell-HasValueData();
+}
 
 return mrTab.HasValueData(nCol, nRow);
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basic/source binaryurp/source bridges/source

[Ivan Timofeev]

 basic/source/uno/scriptcont.cxx |4 ++--
 binaryurp/source/bridge.cxx |8 
 binaryurp/source/bridgefactory.cxx  |4 ++--
 binaryurp/source/reader.cxx |4 ++--
 binaryurp/source/unmarshal.cxx  |4 ++--
 binaryurp/source/writer.cxx |2 +-
 bridges/source/cpp_uno/shared/vtablefactory.cxx |4 ++--
 bridges/source/jni_uno/jni_data.cxx |2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 9201704ede70498a850bee6d15f0340d58f3889c
Author: Olivier Hallot olivier.hal...@alta.org.br
Date:   Sat Dec 10 17:29:21 2011 -0200

Fix for fdo43460 Part IV getLength to isEmpty

Part IV
Module
basic (small fix per demand from Ivan Timofeev)
binaryurp
bridges

diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index c6fbc5d..9dd01a1 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -473,8 +473,8 @@ void SAL_CALL 
SfxScriptLibraryContainer::changeLibraryPassword( const OUString
 if( OldPassword == NewPassword )
 return;
 
-sal_Bool bOldPassword = ( !OldPassword.isEmpty() );
-sal_Bool bNewPassword = ( !NewPassword.isEmpty() );
+sal_Bool bOldPassword = !OldPassword.isEmpty();
+sal_Bool bNewPassword = !NewPassword.isEmpty();
 sal_Bool bStorage = mxStorage.is()  !pImplLib-mbLink;
 
 if( pImplLib-mbReadOnly || (bOldPassword  
!pImplLib-mbPasswordProtected) )
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index b491a2a..389284d 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -345,7 +345,7 @@ css::uno::UnoInterfaceReference 
Bridge::registerIncomingInterface(
 rtl::OUString const  oid, css::uno::TypeDescription const  type)
 {
 assert(type.is());
-if (oid.getLength() == 0) {
+if (oid.isEmpty()) {
 return css::uno::UnoInterfaceReference();
 }
 css::uno::UnoInterfaceReference obj(findStub(oid, type));
@@ -427,7 +427,7 @@ rtl::OUString Bridge::registerOutgoingInterface(
 css::uno::UnoInterfaceReference Bridge::findStub(
 rtl::OUString const  oid, css::uno::TypeDescription const  type)
 {
-assert(oid.getLength() != 0  type.is());
+assert(!oid.isEmpty()  type.is());
 osl::MutexGuard g(mutex_);
 Stubs::iterator i(stubs_.find(oid));
 if (i != stubs_.end()) {
@@ -449,7 +449,7 @@ css::uno::UnoInterfaceReference Bridge::findStub(
 void Bridge::releaseStub(
 rtl::OUString const  oid, css::uno::TypeDescription const  type)
 {
-assert(oid.getLength() != 0  type.is());
+assert(!oid.isEmpty()  type.is());
 css::uno::UnoInterfaceReference obj;
 bool unused;
 {
@@ -814,7 +814,7 @@ Bridge::~Bridge() {
 css::uno::Reference css::uno::XInterface  Bridge::getInstance(
 rtl::OUString const  sInstanceName) throw (css::uno::RuntimeException)
 {
-if (sInstanceName.getLength() == 0) {
+if (sInstanceName.isEmpty()) {
 throw css::uno::RuntimeException(
 rtl::OUString(
 RTL_CONSTASCII_USTRINGPARAM(
diff --git a/binaryurp/source/bridgefactory.cxx 
b/binaryurp/source/bridgefactory.cxx
index 5c91055..0edbaa0 100644
--- a/binaryurp/source/bridgefactory.cxx
+++ b/binaryurp/source/bridgefactory.cxx
@@ -80,7 +80,7 @@ void BridgeFactory::removeBridge(
 assert(bridge.is());
 rtl::OUString n(bridge-getName());
 osl::MutexGuard g(*this);
-if (n.getLength() == 0) {
+if (n.isEmpty()) {
 BridgeList::iterator i(
 std::find(unnamed_.begin(), unnamed_.end(), bridge));
 if (i != unnamed_.end()) {
@@ -154,7 +154,7 @@ css::uno::Reference css::bridge::XBridge  
BridgeFactory::createBridge(
 static_cast cppu::OWeakObject * (this), -1);
 }
 b.set(new Bridge(this, sName, aConnection, anInstanceProvider));
-if (sName.getLength() == 0) {
+if (sName.isEmpty()) {
 unnamed_.push_back(
 css::uno::Reference css::bridge::XBridge (b.get()));
 } else {
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index c052fad..e6b6f06 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -215,7 +215,7 @@ void Reader::readMessage(Unmarshal  unmarshal) {
 rtl::OUString oid;
 if (newOid) {
 oid = unmarshal.readOid();
-if (oid.getLength() == 0) {
+if (oid.isEmpty()) {
 throw css::io::IOException(
 rtl::OUString(
 RTL_CONSTASCII_USTRINGPARAM(
@@ -224,7 +224,7 @@ void Reader::readMessage(Unmarshal  unmarshal) {
 }
 lastOid_ = oid;
 } else {
-if (lastOid_.getLength() == 0) {
+if (lastOid_.isEmpty()) {
 throw css::uno::RuntimeException(
 rtl::OUString(
 RTL_CONSTASCII_USTRINGPARAM(
diff --git 

[Libreoffice-commits] .: codemaker/source

[Ivan Timofeev]

 codemaker/source/codemaker/global.cxx|8 ++---
 codemaker/source/codemaker/unotype.cxx   |2 -
 codemaker/source/cppumaker/cppumaker.cxx |2 -
 codemaker/source/cppumaker/cpputype.cxx  |   46 +++
 codemaker/source/cppumaker/includes.cxx  |2 -
 codemaker/source/javamaker/classfile.cxx |8 ++---
 codemaker/source/javamaker/javamaker.cxx |2 -
 7 files changed, 35 insertions(+), 35 deletions(-)

New commits:
commit fd866ac8f184c0910883963c9c12b45a239a9227
Author: Olivier Hallot olivier.hal...@alta.org.br
Date:   Mon Dec 12 18:19:01 2011 -0200

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

Part VI
Module
codemaker

diff --git a/codemaker/source/codemaker/global.cxx 
b/codemaker/source/codemaker/global.cxx
index 36d06f0..af87ee8 100644
--- a/codemaker/source/codemaker/global.cxx
+++ b/codemaker/source/codemaker/global.cxx
@@ -116,7 +116,7 @@ OString createFileNameFromType( const OString destination,
 fileNameBuf.append(/, 1);
 
 OString tmpStr(type);
-if (prefix.getLength()  0)
+if (!prefix.isEmpty())
 {
 tmpStr = type.replaceAt(type.lastIndexOf('/')+1, 0, prefix);
 }
@@ -298,7 +298,7 @@ FileStream::FileStream()
 FileStream::FileStream(const OString name, FileAccessMode mode)
 : m_file(NULL)
 {
-if ( name.getLength()  0 )
+if ( !name.isEmpty() )
 {
 OUString sUrl(convertToFileUrl(name));
 #ifdef SAL_UNX
@@ -338,7 +338,7 @@ void FileStream::createTempFile(const OString sPath)
 OUString sTmpPath;
 OUString sTmpName;
 
-if (sPath.getLength()  0)
+if (!sPath.isEmpty())
 sTmp = sPath;
 
 sTmpPath = convertToFileUrl(sTmp);
@@ -364,7 +364,7 @@ void FileStream::createTempFile(const OString sPath)
 
 void FileStream::open(const OString name, FileAccessMode mode)
 {
-if ( name.getLength()  0 )
+if ( !name.isEmpty() )
 {
 oslFileError ret =  osl_File_E_None;
 if ((ret = osl_openFile(convertToFileUrl(name).pData, m_file, 
checkAccessMode(mode))) == osl_File_E_None)
diff --git a/codemaker/source/codemaker/unotype.cxx 
b/codemaker/source/codemaker/unotype.cxx
index 0432a29..0ae8e43 100644
--- a/codemaker/source/codemaker/unotype.cxx
+++ b/codemaker/source/codemaker/unotype.cxx
@@ -56,7 +56,7 @@ codemaker::UnoType::Sort 
codemaker::UnoType::getSort(rtl::OString const  type)
 }
 
 bool codemaker::UnoType::isSequenceType(rtl::OString const  type) {
-return type.getLength()  0  type[0] == '[';
+return !type.isEmpty()  type[0] == '[';
 }
 
 rtl::OString codemaker::UnoType::decompose(
diff --git a/codemaker/source/cppumaker/cppumaker.cxx 
b/codemaker/source/cppumaker/cppumaker.cxx
index e6cee20..0b9d8c0 100644
--- a/codemaker/source/cppumaker/cppumaker.cxx
+++ b/codemaker/source/cppumaker/cppumaker.cxx
@@ -202,7 +202,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 } else
 {
 tmpName = typeName.copy(0, 
typeName.lastIndexOf('.')).replace('.', '/');
-if (tmpName.getLength() == 0)
+if (tmpName.isEmpty())
 tmpName = /;
 else
 tmpName.replace('.', '/');
diff --git a/codemaker/source/cppumaker/cpputype.cxx 
b/codemaker/source/cppumaker/cpputype.cxx
index f2007e5..3a436ca 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -253,7 +253,7 @@ sal_Bool CppuType::dumpFile(CppuOptions* pOptions,
 }
 
 OString sFileName = createFileNameFromType(sOutPath, sName, sExtension);
-if (sFileName.getLength() == 0)
+if (sFileName.isEmpty())
 return sal_False;
 
 sal_Bool bFileExists = fileExists( sFileName );
@@ -539,7 +539,7 @@ void CppuType::dumpNormalGetCppuType(FileStream o)
 m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8);
 }
 sal_Bool bIsBaseException = sal_False;
-if (superType.getLength()  0)
+if (!superType.isEmpty())
 {
 if ( superType.equals(com/sun/star/uno/Exception) )
 {
@@ -599,7 +599,7 @@ void CppuType::dumpNormalGetCppuType(FileStream o)
 
 o  indent()  typelib_static_compound_type_init( the_type, 
getTypeClass(m_typeName, sal_True)  , \  
m_typeName.replace('/', '.')  \, ;
-if ( superType.getLength()  0 || bIsBaseException )
+if ( !superType.isEmpty() || bIsBaseException )
 {
 if ( bIsBaseException )
 {
@@ -658,7 +658,7 @@ void CppuType::dumpComprehensiveGetCppuType(FileStream o)
 superType = rtl::OUStringToOString(
 m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8);
 }
-if (superType.getLength()  0) {
+if (!superType.isEmpty()) {
 o  indent()
const ::com::sun::star::uno::Type rSuperType = ::cppu::UnoType 
;
 dumpType(o, superType, false, false, false, true);
@@ -712,7 +712,7 @@ void 

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

[Kohei Yoshida]

 sc/source/ui/inc/output.hxx   |1 
 sc/source/ui/view/output2.cxx |   50 --
 2 files changed, 45 insertions(+), 6 deletions(-)

New commits:
commit 69efe76f07796323012d2c65e8c89996c77ea2d9
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Mon Dec 12 15:45:04 2011 -0500

fdo#32530: Correct default horizontal alignment for complex script.

diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index 72934cf..9a81555 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -102,6 +102,7 @@ private:
 longmnPosX;
 longmnPosY;
 longmnInitPosX;
+sal_uInt8   mnScript;
 boolmbBreak;
 boolmbCellIsValue;
 boolmbAsianVertical;
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index de1506a..82a9905 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -1561,9 +1561,27 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic )
 bCellIsValue = pFCell-IsRunning() || 
pFCell-IsValue();
 }
 
-eOutHorJust = ( aVars.GetHorJust() != 
SVX_HOR_JUSTIFY_STANDARD ) ?
-  aVars.GetHorJust() :
-  ( bCellIsValue ? SVX_HOR_JUSTIFY_RIGHT : 
SVX_HOR_JUSTIFY_LEFT );
+if (aVars.GetHorJust() == SVX_HOR_JUSTIFY_STANDARD)
+{
+// fdo#32530: Default alignment depends on value vs
+// string, and the script type of the 1st letter.
+sal_uInt8 nScript1st = 0;
+rtl::OUString aStr = aVars.GetString();
+if (!aStr.isEmpty())
+{
+aStr = aStr.copy(0, 1);
+nScript1st = pDoc-GetStringScriptType(aStr);
+if (!nScript1st)
+nScript1st = ScGlobal::GetDefaultScriptType();
+}
+
+if (nScript1st == SCRIPTTYPE_COMPLEX)
+eOutHorJust = bCellIsValue ? SVX_HOR_JUSTIFY_LEFT 
: SVX_HOR_JUSTIFY_RIGHT;
+else
+eOutHorJust = bCellIsValue ? SVX_HOR_JUSTIFY_RIGHT 
: SVX_HOR_JUSTIFY_LEFT;
+}
+else
+eOutHorJust = aVars.GetHorJust();
 
 if ( eOutHorJust == SVX_HOR_JUSTIFY_BLOCK || eOutHorJust 
== SVX_HOR_JUSTIFY_REPEAT )
 eOutHorJust = SVX_HOR_JUSTIFY_LEFT; // repeat is 
not yet implemented
@@ -2137,6 +2155,7 @@ ScOutputData::DrawEditParam::DrawEditParam(const 
ScPatternAttr* pPattern, const
 mnArrY(0),
 mnX(0), mnY(0), mnCellX(0), mnCellY(0),
 mnPosX(0), mnPosY(0), mnInitPosX(0),
+mnScript(0),
 mbBreak( (meHorJust == SVX_HOR_JUSTIFY_BLOCK) || 
lcl_GetBoolValue(*pPattern, ATTR_LINEBREAK, pCondSet) ),
 mbCellIsValue(bCellIsValue),
 mbAsianVertical(false),
@@ -2567,9 +2586,16 @@ void ScOutputData::DrawEditStandard(DrawEditParam 
rParam)
 bHidden = true; // gedreht wird getrennt ausgegeben
 }
 
-SvxCellHorJustify eOutHorJust =
-( rParam.meHorJust != SVX_HOR_JUSTIFY_STANDARD ) ? rParam.meHorJust :
-( rParam.mbCellIsValue ? SVX_HOR_JUSTIFY_RIGHT : SVX_HOR_JUSTIFY_LEFT 
);
+SvxCellHorJustify eOutHorJust = rParam.meHorJust;
+if (eOutHorJust == SVX_HOR_JUSTIFY_STANDARD)
+{
+// fdo#32530: Default alignment depends on value vs string, and the
+// script type of the 1st letter.
+if (rParam.mnScript == SCRIPTTYPE_COMPLEX)
+eOutHorJust = rParam.mbCellIsValue ? SVX_HOR_JUSTIFY_LEFT : 
SVX_HOR_JUSTIFY_RIGHT;
+else
+eOutHorJust = rParam.mbCellIsValue ? SVX_HOR_JUSTIFY_RIGHT : 
SVX_HOR_JUSTIFY_LEFT;
+}
 
 if ( eOutHorJust == SVX_HOR_JUSTIFY_BLOCK || eOutHorJust == 
SVX_HOR_JUSTIFY_REPEAT )
 eOutHorJust = SVX_HOR_JUSTIFY_LEFT; // repeat is not yet 
implemented
@@ -4570,6 +4596,17 @@ void ScOutputData::DrawEdit(sal_Bool bPixelToLogic)
 else
 lcl_ClearEdit( *pEngine );  // also calls 
SetUpdateMode(sal_False)
 
+// fdo#32530: Get the script type of the first letter.
+sal_uInt8 nScript = 0;
+rtl::OUString aStr = pDoc-GetString(nCellX, nCellY, 
nTab);
+if (!aStr.isEmpty())
+{
+aStr = aStr.copy(0, 1);
+nScript = pDoc-GetStringScriptType(aStr);
+}
+if (nScript == 0)
+

[Libreoffice-commits] .: 3 commits - editeng/inc slideshow/source solenv/gbuild svl/inc svx/inc svx/source

[Michael Stahl]

 editeng/inc/editeng/eeitem.hxx|8 +---
 slideshow/source/engine/shapes/viewmediashape.cxx |   18 ++
 solenv/gbuild/extensions/post_BuildplTargets.mk   |   16 +++-
 svl/inc/svl/solar.hrc |2 +-
 svx/inc/svx/unoshprp.hxx  |6 +-
 svx/source/unodraw/unoprov.cxx|3 ++-
 svx/source/unodraw/unoshap4.cxx   |9 +++--
 7 files changed, 45 insertions(+), 17 deletions(-)

New commits:
commit 5924454a867bd500fdc696bb9939c84425c5e025
Author: Michael Stahl mst...@redhat.com
Date:   Mon Dec 12 19:40:38 2011 +0100

slideshow: play back embedded media:

The slideshow uses the UNO API to access the drawing objects,
so add a property to get the temp file URL from the media object.

diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx 
b/slideshow/source/engine/shapes/viewmediashape.cxx
index ebd4343..5957cf6 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -286,11 +286,21 @@ namespace slideshow
 xPropSet.set( mxShape, uno::UNO_QUERY );
 
 // create Player
-if( xPropSet.is() 
-( xPropSet-getPropertyValue(
-  ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( MediaURL ) ) ) =aURL ) )
+if (xPropSet.is())
 {
-implInitializeMediaPlayer( aURL );
+if ((xPropSet-getPropertyValue(
+  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+  PrivateTempFileURL))) = aURL)
+ aURL.getLength())
+{
+implInitializeMediaPlayer( aURL );
+}
+else if (xPropSet-getPropertyValue(
+  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+  MediaURL))) = aURL)
+{
+implInitializeMediaPlayer( aURL );
+}
 }
 
 // create visible object
diff --git a/svl/inc/svl/solar.hrc b/svl/inc/svl/solar.hrc
index 6d13d46..3dc3363 100644
--- a/svl/inc/svl/solar.hrc
+++ b/svl/inc/svl/solar.hrc
@@ -31,7 +31,7 @@
 // defines --
 
 #define OWN_ATTR_VALUE_START3900
-#define OWN_ATTR_VALUE_END  3988
+#define OWN_ATTR_VALUE_END  3990
 
 #define CREATERESMGR_NAME( Name )   #Name
 #define CREATERESMGR( Name )ResMgr::CreateResMgr( CREATERESMGR_NAME( 
Name ) )
diff --git a/svx/inc/svx/unoshprp.hxx b/svx/inc/svx/unoshprp.hxx
index 5e4bdf5..6cf3619 100644
--- a/svx/inc/svx/unoshprp.hxx
+++ b/svx/inc/svx/unoshprp.hxx
@@ -187,7 +187,11 @@
 
 #define OWN_ATTR_STYLE  (OWN_ATTR_VALUE_START+87)
 
-#define OWN_ATTR_EDGE_POLYPOLYGONBEZIER (OWN_ATTR_VALUE_START+88)   // 
maximum is OWN_ATTR_VALUE_START+88, see svl/inc/svl/solar.hrc
+#define OWN_ATTR_EDGE_POLYPOLYGONBEZIER (OWN_ATTR_VALUE_START+88)
+
+#define OWN_ATTR_MEDIA_STREAM   (OWN_ATTR_VALUE_START+89)
+#define OWN_ATTR_MEDIA_TEMPFILEURL  (OWN_ATTR_VALUE_START+90)
+// ATTENTION: maximum is OWN_ATTR_VALUE_START+90, see svl/inc/svl/solar.hrc
 
 // #FontWork#
 #define FONTWORK_PROPERTIES \
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index f800afb..c469672 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -761,7 +761,8 @@ SfxItemPropertyMapEntry* ImplGetSvxMediaShapePropertyMap()
 // #i68101#
 { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_TITLE),
OWN_ATTR_MISC_OBJ_TITLE , ::getCppuType((const ::rtl::OUString*)0),
0,  0},
 { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_DESCRIPTION),  
OWN_ATTR_MISC_OBJ_DESCRIPTION   , ::getCppuType((const ::rtl::OUString*)0),
0,  0},
-{MAP_CHAR_LEN(PrivateStream), OWN_ATTR_GRAPHIC_STREAM, 
::com::sun::star::io::XInputStream::static_type(), 
::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+{MAP_CHAR_LEN(PrivateStream), OWN_ATTR_MEDIA_STREAM, 
::com::sun::star::io::XInputStream::static_type(), 
::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+{MAP_CHAR_LEN(PrivateTempFileURL), OWN_ATTR_MEDIA_TEMPFILEURL, 
::getCppuType((const ::rtl::OUString*)0), 
::com::sun::star::beans::PropertyAttribute::READONLY, 0},
 {0,0,0,0,0,0}
 
 };
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index c4c7e68..ad517c2 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ 

[Libreoffice-commits] .: connectivity/source

[Julien Nabet]

 connectivity/source/drivers/dbase/DIndex.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 84a3f11c7a0cce586c15246079ea807aec38a439
Author: Julien Nabet serval2...@yahoo.fr
Date:   Mon Dec 12 22:00:26 2011 +0100

Remove ByteString

diff --git a/connectivity/source/drivers/dbase/DIndex.cxx 
b/connectivity/source/drivers/dbase/DIndex.cxx
index 0e22387..c5a0e4c 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -443,7 +443,7 @@ sal_Bool ODbaseIndex::DropImpl()
 Config aInfFile(sPhysicalPath);
 aInfFile.SetGroup(dBASE_III_GROUP);
 sal_uInt16 nKeyCnt = aInfFile.GetKeyCount();
-ByteString aKeyName;
+rtl::OString aKeyName;
 String sEntry = m_Name;
 sEntry += String::CreateFromAscii(.ndx);
 
@@ -452,7 +452,7 @@ sal_Bool ODbaseIndex::DropImpl()
 {
 // References the Key to an Index-file?
 aKeyName = aInfFile.GetKeyName( nKey );
-if (aKeyName.Copy(0,3) == NDX)
+if (aKeyName.copy(0,3) == NDX)
 {
 if(sEntry == 
String(rtl::OStringToOUString(aInfFile.ReadKey(aKeyName),m_pTable-getConnection()-getTextEncoding(
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: pyuno/source wizards/com

[Lionel Elie Mamane]

 pyuno/source/loader/pythonloader.py |   11 ++-
 wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py |1 -
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 7f4cb27518ec9d0916a4d6508d9f720771859c22
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Mon Dec 12 22:12:40 2011 +0100

fix loading of python-uno module by package.module name

diff --git a/pyuno/source/loader/pythonloader.py 
b/pyuno/source/loader/pythonloader.py
index eef1bd6..7a66cfa 100644
--- a/pyuno/source/loader/pythonloader.py
+++ b/pyuno/source/loader/pythonloader.py
@@ -111,16 +111,18 @@ class Loader( XImplementationLoader, XServiceInfo, 
unohelper.Base ):
 g_loadedComponents[url] = mod
 return mod
 elif vnd.openoffice.pymodule == protocol:
-# the failure is on symbol lookup later in the parent ...
-print (Warning: Python module loading is almost certainly 
pre-broken)
 nSlash = dependent.rfind('/')
 if -1 != nSlash:
 path = unohelper.fileUrlToSystemPath( dependent[0:nSlash] )
 dependent = dependent[nSlash+1:len(dependent)]
 if not path in sys.path:
 sys.path.append( path )
-var =  __import__( dependent )
-return var
+mod =  __import__( dependent )
+path_component, dot, rest = dependent.partition('.')
+while dot == '.':
+path_component, dot, rest = rest.partition('.')
+mod = getattr(mod, path_component)
+return mod
 else:
 if DEBUG:
 print(Unknown protocol ' + protocol + ');
@@ -140,7 +142,6 @@ class Loader( XImplementationLoader, XServiceInfo, 
unohelper.Base ):
 mod = self.getModuleFromUrl( locationUrl )
 implHelper = mod.__dict__.get( g_ImplementationHelper , None )
 if DEBUG:
-print (dump stuff)
 print (Fetched ImplHelper as  + str(implHelper))
 if implHelper == None:
 return mod.getComponentFactory( implementationName, 
self.ctx.ServiceManager, regKey )
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py 
b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
index c6b1a08..37ec3b1 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
@@ -59,7 +59,6 @@ class FaxWizardDialogImpl(FaxWizardDialog):
 def startWizard(self, xMSF):
 self.running = True
 try:
-print entra
 #Number of steps on WizardDialog
 self.nMaxStep = 5
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - pyuno/source wizards/com

[Lionel Elie Mamane]

 pyuno/source/loader/pythonloader.py |   11 ++-
 wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py |1 -
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit a94660eaaad9b662812fe0d3aee7179cf41c0ad9
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Mon Dec 12 22:12:40 2011 +0100

fix loading of python-uno module by package.module name

diff --git a/pyuno/source/loader/pythonloader.py 
b/pyuno/source/loader/pythonloader.py
index eef1bd6..7a66cfa 100644
--- a/pyuno/source/loader/pythonloader.py
+++ b/pyuno/source/loader/pythonloader.py
@@ -111,16 +111,18 @@ class Loader( XImplementationLoader, XServiceInfo, 
unohelper.Base ):
 g_loadedComponents[url] = mod
 return mod
 elif vnd.openoffice.pymodule == protocol:
-# the failure is on symbol lookup later in the parent ...
-print (Warning: Python module loading is almost certainly 
pre-broken)
 nSlash = dependent.rfind('/')
 if -1 != nSlash:
 path = unohelper.fileUrlToSystemPath( dependent[0:nSlash] )
 dependent = dependent[nSlash+1:len(dependent)]
 if not path in sys.path:
 sys.path.append( path )
-var =  __import__( dependent )
-return var
+mod =  __import__( dependent )
+path_component, dot, rest = dependent.partition('.')
+while dot == '.':
+path_component, dot, rest = rest.partition('.')
+mod = getattr(mod, path_component)
+return mod
 else:
 if DEBUG:
 print(Unknown protocol ' + protocol + ');
@@ -140,7 +142,6 @@ class Loader( XImplementationLoader, XServiceInfo, 
unohelper.Base ):
 mod = self.getModuleFromUrl( locationUrl )
 implHelper = mod.__dict__.get( g_ImplementationHelper , None )
 if DEBUG:
-print (dump stuff)
 print (Fetched ImplHelper as  + str(implHelper))
 if implHelper == None:
 return mod.getComponentFactory( implementationName, 
self.ctx.ServiceManager, regKey )
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py 
b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
index c6b1a08..37ec3b1 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
@@ -59,7 +59,6 @@ class FaxWizardDialogImpl(FaxWizardDialog):
 def startWizard(self, xMSF):
 self.running = True
 try:
-print entra
 #Number of steps on WizardDialog
 self.nMaxStep = 5
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

[Julien Nabet]

 dbaccess/source/core/resource/core_resource.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 444eb68e8a6b35752bac4ff12fc83e44f36bb44b
Author: Julien Nabet serval2...@yahoo.fr
Date:   Mon Dec 12 22:31:09 2011 +0100

Remove ByteString

diff --git a/dbaccess/source/core/resource/core_resource.cxx 
b/dbaccess/source/core/resource/core_resource.cxx
index 975096e..a7cd085 100644
--- a/dbaccess/source/core/resource/core_resource.cxx
+++ b/dbaccess/source/core/resource/core_resource.cxx
@@ -56,9 +56,9 @@ namespace dbaccess
 
 ::com::sun::star::lang::Locale aLocale = 
Application::GetSettings().GetUILocale();
 
-ByteString sFileName(dba);
+rtl::OString sFileName(dba);
 
-m_pImpl = ResMgr::CreateResMgr(sFileName.GetBuffer(), aLocale);
+m_pImpl = ResMgr::CreateResMgr(sFileName.getStr(), aLocale);
 }
 
 //--
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: autodoc/source basctl/source basic/source

[Stefan Knorr]

 autodoc/source/parser/cpp/all_toks.hxx |4 ++--
 basctl/source/basicide/baside2.cxx |2 +-
 basctl/source/basicide/macrodlg.cxx|2 +-
 basic/source/classes/sb.cxx|2 +-
 basic/source/classes/sbunoobj.cxx  |   10 +-
 basic/source/classes/sbxmod.cxx|2 +-
 basic/source/inc/parser.hxx|2 +-
 basic/source/runtime/methods.cxx   |6 +++---
 basic/source/runtime/runtime.cxx   |2 +-
 basic/source/sbx/sbxobj.cxx|2 +-
 basic/source/sbx/sbxvalue.cxx  |2 +-
 basic/source/sbx/sbxvar.cxx|4 ++--
 12 files changed, 20 insertions(+), 20 deletions(-)

New commits:
commit 583582c5bf11abf04393c378131be75f14a46922
Author: Noel Grandin n...@peralex.com
Date:   Mon Dec 12 22:35:05 2011 +0100

German translations

By Mike Whiteley/Noel Grandin, some smaller changes by myself; changes to 
binfilter removed from patch

diff --git a/autodoc/source/parser/cpp/all_toks.hxx 
b/autodoc/source/parser/cpp/all_toks.hxx
index 4aeae6e..1531dd7 100644
--- a/autodoc/source/parser/cpp/all_toks.hxx
+++ b/autodoc/source/parser/cpp/all_toks.hxx
@@ -189,8 +189,8 @@ class Tok_UnblockMacro : public ::TextToken
 class Tok_TypeKey : public cpp::Token  // file-type-PE
 class Tok_Template : public cpp::Token // file
 class Tok_Namespace : public cpp::Token// file
-class Tok_Bracket : public cpp::Token  // ueberall
-class Tok_Separator : public cpp::Token// ueberall
+class Tok_Bracket : public cpp::Token  // everywhere
+class Tok_Separator : public cpp::Token// everywhere
 
 class Tok_Identifier : public cpp::Token   // ueberall
 class Tok_NameSeparator : public cpp::Token// Type, Name
diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index cf245ca..7adc866 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -248,7 +248,7 @@ void ModulWindow::Resize()
 }
 
 
-// Import von baside4.cxx
+// Import of baside4.cxx
 void CreateEngineForBasic( StarBASIC* pBasic );
 
 void ModulWindow::CheckCompileBasic()
diff --git a/basctl/source/basicide/macrodlg.cxx 
b/basctl/source/basicide/macrodlg.cxx
index 0ddc22d..dea7cc0 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -36,7 +36,7 @@
 #include macrodlg.hrc
 #include basidesh.hrc
 #include basidesh.hxx
-#include baside2.hrc  // ID's fuer Imagese
+#include baside2.hrc  // ID's for Images
 #include basobj.hxx
 #include baside3.hxx
 
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 0256f88..09be4c7 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1455,7 +1455,7 @@ sal_Bool StarBASIC::IsCompilerError()   { return 
GetSbData()-bCompiler; }
 // through the table SFX_VB_ErrorTab[]. This is indeed not with good 
performance,
 // but it consumes much less memory than corresponding switch blocs.
 // Because the conversion of error codes has not to be fast. there is no
-// binaere search by VB-Error - SFX-Error.
+// binary search by VB Error - Error SFX.
 
 // Map back new error codes to old, Sbx-compatible
 sal_uInt16 StarBASIC::GetVBErrorCode( SbError nError )
diff --git a/basic/source/classes/sbunoobj.cxx 
b/basic/source/classes/sbunoobj.cxx
index 605de05..b2b6ffd 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -2471,7 +2471,7 @@ void SbUnoObject::doIntrospection( void )
 
 if( !mxUnoAccess.is() )
 {
-// #51475 mark an invalid objekt kennzeichnen (no mxMaterialHolder)
+// #51475 mark to indicate an invalid object (no mxMaterialHolder)
 return;
 }
 
@@ -2701,9 +2701,9 @@ SbxVariable* SbUnoObject::Find( const String rName, 
SbxClassType t )
 {
 Any aAny = xNameAccess-getByName( aUName2 );
 
-// ATTENTION: Die hier erzeugte Variable darf wegen 
bei XNameAccess
-// nicht als feste Property in das Object aufgenommen 
werden und
-// wird daher nirgendwo gehalten.
+// ATTENTION: Because of XNameAccess, the variable 
generated here
+// may not be included as a fixed property in the 
object and therefore
+// won't be stored anywhere.
 // If this leads to problems, it has to be created 
synthetically or
 // a class SbUnoNameAccessProperty, whose existence 
had to be checked
 // constantly and which were if necessary thrown away
@@ -2972,7 +2972,7 @@ void RTL_Impl_CreateUnoStruct( StarBASIC* pBasic, 
SbxArray rPar, sal_Bool bWrit
 if( !xUnoObj )
 return;
 
-// return the objekt
+// return the object
 SbxVariableRef refVar 

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

[Lionel Elie Mamane]

 connectivity/source/drivers/postgresql/makefile.mk |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit e984a1627ed205423167066e78943f783b8e87e4
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Mon Dec 12 23:07:03 2011 +0100

postgresql-sdbc: do not use GNU ld-specific options on MacOS X

diff --git a/connectivity/source/drivers/postgresql/makefile.mk 
b/connectivity/source/drivers/postgresql/makefile.mk
index 7506efd..3f9bfb5 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -91,10 +91,17 @@ LIBPQ_DEP_LIBS+=\
 .ENDIF
 .ELSE
 LIBPQ_LINK=$(OUTDIR)/lib/libpq.a
+.IF $(GUI)==MAC
+LIBPQ_DEP_LIBS += -Wl,-dead_strip_dylibs
+.ELSE
 LIBPQ_DEP_LIBS += -Wl,--as-needed
+.ENDIF
 .INCLUDE : $(OUTDIR_FOR_BUILD)/inc/postgresql/libpq-flags.mk
+.IF $(GUI)==MAC
+.ELSE
 LIBPQ_DEP_LIBS += -Wl,--no-as-needed
 .ENDIF
+.ENDIF
 POSTGRESQL_INC=-I$(OUTDIR)/inc/postgresql
 POSTGRESQL_LIB=
 .ENDIF # SYSTEM_POSTGRESQL
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: connectivity/source

[Lionel Elie Mamane]

 connectivity/source/drivers/postgresql/makefile.mk |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 1a658dda70d2e139d124d60d64691356c9414f3e
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Mon Dec 12 23:07:03 2011 +0100

postgresql-sdbc: do not use GNU ld-specific options on MacOS X

diff --git a/connectivity/source/drivers/postgresql/makefile.mk 
b/connectivity/source/drivers/postgresql/makefile.mk
index 7506efd..3f9bfb5 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -91,10 +91,17 @@ LIBPQ_DEP_LIBS+=\
 .ENDIF
 .ELSE
 LIBPQ_LINK=$(OUTDIR)/lib/libpq.a
+.IF $(GUI)==MAC
+LIBPQ_DEP_LIBS += -Wl,-dead_strip_dylibs
+.ELSE
 LIBPQ_DEP_LIBS += -Wl,--as-needed
+.ENDIF
 .INCLUDE : $(OUTDIR_FOR_BUILD)/inc/postgresql/libpq-flags.mk
+.IF $(GUI)==MAC
+.ELSE
 LIBPQ_DEP_LIBS += -Wl,--no-as-needed
 .ENDIF
+.ENDIF
 POSTGRESQL_INC=-I$(OUTDIR)/inc/postgresql
 POSTGRESQL_LIB=
 .ENDIF # SYSTEM_POSTGRESQL
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lior Kaplan]

 cui/source/options/treeopt.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d8be0409037279154d6ae619e04f97e45018326d
Author: Lior Kaplan kaplanl...@gmail.com
Date:   Tue Dec 13 00:55:01 2011 +0200

fdo#39452: 'Back' is misleading, use 'Revert' instead

diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src
index 62be8ce..1de1ca6 100644
--- a/cui/source/options/treeopt.src
+++ b/cui/source/options/treeopt.src
@@ -67,7 +67,7 @@ ModalDialog RID_OFADLG_OPTIONS_TREE
 Pos = MAP_APPFONT ( COL_10, ROW_3 ) ;
 Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , 
RSC_CD_PUSHBUTTON_HEIGHT ) ;
 TabStop = TRUE ;
-Text [ en-US ] = ~Back ;
+Text [ en-US ] = ~Revert ;
 };
 //TreeListBox
 Control TLB_PAGES
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Lior Kaplan]

 cui/source/options/treeopt.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9b98c4a8d780ec62f346d9d39cc61e45d0e38a17
Author: Lior Kaplan kaplanl...@gmail.com
Date:   Tue Dec 13 00:58:29 2011 +0200

fdo#39452: 'Back' is misleading, use 'Revert' instead

diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src
index acfc312..93ea0c2 100644
--- a/cui/source/options/treeopt.src
+++ b/cui/source/options/treeopt.src
@@ -67,7 +67,7 @@ ModalDialog RID_OFADLG_OPTIONS_TREE
 Pos = MAP_APPFONT ( COL_10, ROW_3 ) ;
 Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , 
RSC_CD_PUSHBUTTON_HEIGHT ) ;
 TabStop = TRUE ;
-Text [ en-US ] = ~Back ;
+Text [ en-US ] = ~Revert ;
 };
 //TreeListBox
 Control TLB_PAGES
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 chart2/source/view/axes/ScaleAutomatism.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 8216e8551dad8a3bbedb4b8e663b2d96570270a0
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Mon Dec 12 23:51:48 2011 +0100

don't try to use Inf for axes calculation fdo#43703

diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx 
b/chart2/source/view/axes/ScaleAutomatism.cxx
index 2ac44fc..ba10366 100644
--- a/chart2/source/view/axes/ScaleAutomatism.cxx
+++ b/chart2/source/view/axes/ScaleAutomatism.cxx
@@ -909,6 +909,12 @@ void 
ScaleAutomatism::calculateExplicitIncrementAndScaleForLinear(
 fDistanceNormalized = 1.0;
 fDistanceMagnitude = 1.0e-307;
 }
+else if ( !rtl::math::isFinite(fDistance) )
+{
+// fdo#43703: Handle values bigger than limits correctly
+fDistanceNormalized = 1.0;
+fDistanceMagnitude = std::numeric_limitsdouble::max();
+}
 else
 {
 // distance magnitude (a power of 10)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: connectivity/source cppuhelper/test lingucomponent/source

[Christian Lohmaier]

 connectivity/source/drivers/postgresql/makefile.mk |   11 ++-
 cppuhelper/test/bootstrap/makefile.mk  |2 +-
 lingucomponent/source/languageguessing/makefile.mk |6 +++---
 3 files changed, 6 insertions(+), 13 deletions(-)

New commits:
commit 89b4260fc9ddc39ebc36ea44723f101aabf1d043
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Tue Dec 13 01:59:12 2011 +0100

GUI is also UNX for Mac, to check for Mac use either OS→MACOSX or 
GUIBASE→aqua

diff --git a/connectivity/source/drivers/postgresql/makefile.mk 
b/connectivity/source/drivers/postgresql/makefile.mk
index 3f9bfb5..1fd0481 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -91,16 +91,9 @@ LIBPQ_DEP_LIBS+=\
 .ENDIF
 .ELSE
 LIBPQ_LINK=$(OUTDIR)/lib/libpq.a
-.IF $(GUI)==MAC
-LIBPQ_DEP_LIBS += -Wl,-dead_strip_dylibs
-.ELSE
-LIBPQ_DEP_LIBS += -Wl,--as-needed
-.ENDIF
+LIBPQ_DEP_LIBS+=$(eq,$(OS),MACOSX -Wl,-dead_strip_dylibs -Wl,--as-needed)
 .INCLUDE : $(OUTDIR_FOR_BUILD)/inc/postgresql/libpq-flags.mk
-.IF $(GUI)==MAC
-.ELSE
-LIBPQ_DEP_LIBS += -Wl,--no-as-needed
-.ENDIF
+LIBPQ_DEP_LIBS+=$(eq,$(OS),MACOSX $(NULL) -Wl,--no-as-needed)
 .ENDIF
 POSTGRESQL_INC=-I$(OUTDIR)/inc/postgresql
 POSTGRESQL_LIB=
diff --git a/cppuhelper/test/bootstrap/makefile.mk 
b/cppuhelper/test/bootstrap/makefile.mk
index 86665df..d1caeba 100644
--- a/cppuhelper/test/bootstrap/makefile.mk
+++ b/cppuhelper/test/bootstrap/makefile.mk
@@ -37,7 +37,7 @@ USE_DEFFILE:= TRUE
 .INCLUDE :  settings.mk
 
 
-.IF $(GUI)==UNX || $(GUI)==MAC
+.IF $(GUI)==UNX
 PURPENVHELPERLIB := -luno_purpenvhelper$(COMID)
 
 .ELSE
diff --git a/lingucomponent/source/languageguessing/makefile.mk 
b/lingucomponent/source/languageguessing/makefile.mk
index 5fe1945..65036db 100644
--- a/lingucomponent/source/languageguessing/makefile.mk
+++ b/lingucomponent/source/languageguessing/makefile.mk
@@ -39,19 +39,19 @@ VISIBILITY_HIDDEN=TRUE
 
 # --- Files 
 
-.IF $(GUI)==UNX || $(GUI)==MAC
+.IF $(GUI)==UNX
 .IF $(SYSTEM_LIBEXTTEXTCAT) == YES
 LIBTEXTCATLIB=$(LIBEXTTEXTCAT_LIBS)
 .ELSE
 LIBTEXTCATLIB=-lexttextcat
 .ENDIF
-.ELSE   # $(GUI)==UNX || $(GUI)==MAC
+.ELSE   # $(GUI)==UNX
 .IF $(COM)==GCC
 LIBTEXTCATLIB=-lilibexttextcat
 .ELSE
 LIBTEXTCATLIB=ilibexttextcat.lib
 .ENDIF
-.ENDIF  # $(GUI)==UNX || $(GUI)==MAC
+.ENDIF  # $(GUI)==UNX
 
 SLOFILES = \
 $(SLO)$/altstrfunc.obj \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 chart2/source/view/axes/ScaleAutomatism.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 893552129e0eb82c0bfbcac750a068258720adaf
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Dec 13 04:15:27 2011 +0100

missing #include

diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx 
b/chart2/source/view/axes/ScaleAutomatism.cxx
index ba10366..896caf9 100644
--- a/chart2/source/view/axes/ScaleAutomatism.cxx
+++ b/chart2/source/view/axes/ScaleAutomatism.cxx
@@ -36,6 +36,7 @@
 
 #include rtl/math.hxx
 #include tools/debug.hxx
+#include limits
 
 //.
 namespace chart
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 connectivity/source/drivers/postgresql/makefile.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1ce79958fbaeb5fc58b0d4d525380133e4e9c1e5
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Dec 13 04:20:30 2011 +0100

postgresql-sdbc: correctly recognise MacOS X build

diff --git a/connectivity/source/drivers/postgresql/makefile.mk 
b/connectivity/source/drivers/postgresql/makefile.mk
index 3f9bfb5..c99deae 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -91,13 +91,13 @@ LIBPQ_DEP_LIBS+=\
 .ENDIF
 .ELSE
 LIBPQ_LINK=$(OUTDIR)/lib/libpq.a
-.IF $(GUI)==MAC
+.IF $(OS)==MACOSX
 LIBPQ_DEP_LIBS += -Wl,-dead_strip_dylibs
 .ELSE
 LIBPQ_DEP_LIBS += -Wl,--as-needed
 .ENDIF
 .INCLUDE : $(OUTDIR_FOR_BUILD)/inc/postgresql/libpq-flags.mk
-.IF $(GUI)==MAC
+.IF $(OS)==MACOSX
 .ELSE
 LIBPQ_DEP_LIBS += -Wl,--no-as-needed
 .ENDIF
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dictionaries/en

[Andras Timar]

 dictionaries/en/dialog/en_en_US.properties |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6e2048553f98b3bc3280e1ce66a68ec1aa2fcaf1
Author: Andras Timar ati...@suse.com
Date:   Tue Dec 13 08:42:15 2011 +0100

typo

diff --git a/dictionaries/en/dialog/en_en_US.properties 
b/dictionaries/en/dialog/en_en_US.properties
index 6bc215e..c25a6e0 100644
--- a/dictionaries/en/dialog/en_en_US.properties
+++ b/dictionaries/en/dialog/en_en_US.properties
@@ -16,7 +16,7 @@ hlp_ndash=Force spaced en dash instead of unspaced em dash.
 ndash=En dash
 hlp_quotation=Check double quotation marks: x \u2192 \u201cx\u201d
 quotation=Quotation marks
-hlp_times=Check true multipliction sign: 5x5 \u2192 5\u00d75
+hlp_times=Check true multiplication sign: 5x5 \u2192 5\u00d75
 times=Multiplication sign
 hlp_spaces2=Check single spaces between sentences.
 spaces2=Sentence spacing
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - l10ntools/prj l10ntools/scripts l10ntools/source

[Andras Timar]

 l10ntools/prj/d.lst   |1 
 l10ntools/scripts/propex  |   63 ++
 l10ntools/source/localize.cxx |1 
 l10ntools/source/srciter.cxx  |4 ++
 4 files changed, 68 insertions(+), 1 deletion(-)

New commits:
commit d5b25bdd1247363c5745dd5fcbc2ec784063b6bd
Author: Andras Timar ati...@suse.com
Date:   Tue Dec 13 08:43:13 2011 +0100

introducing propex tool for string extranction from .properties files

diff --git a/l10ntools/prj/d.lst b/l10ntools/prj/d.lst
index b3e48cf..0d39719 100644
--- a/l10ntools/prj/d.lst
+++ b/l10ntools/prj/d.lst
@@ -38,6 +38,7 @@ mkdir: %_DEST%\bin\help\com\sun\star\help
 ..\scripts\keyidGen.pl %_DEST%\bin\keyidGen.pl
 ..\scripts\addkeyid2pot.pl %_DEST%\bin\addkeyid2pot.pl
 ..\scripts\po2lo %_DEST%\bin\po2lo
+..\scripts\propex %_DEST%\bin\propex
 ..\inc\export.hxx %_DEST%\inc\l10ntools\export.hxx
 ..\inc\l10ntools\directory.hxx %_DEST%\inc\l10ntools\directory.hxx
 ..\inc\l10ntools\file.hxx %_DEST%\inc\l10ntools\file.hxx
diff --git a/l10ntools/scripts/propex b/l10ntools/scripts/propex
new file mode 100755
index 000..e7ee7e9
--- /dev/null
+++ b/l10ntools/scripts/propex
@@ -0,0 +1,63 @@
+:
+eval 'exec perl -S $0 ${1+$@}'
+if 0;
+# 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 or as specified alternatively below. 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 the
+# License.
+#
+# The Initial Developer of the Original Code is
+#   Andras Timar ati...@suse.com
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the GPLv3+), or
+# the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+# extracts strings from Java properties files
+#
+
+use strict;
+use Getopt::Std;
+use Cwd;
+
+my %options=();
+getopts(ep:r:i:o:l:, \%options);
+
+unless ( $options{i} =~ m/en_US/ ) {exit 1;}
+
+my $file = substr ( Cwd::abs_path($options{i}), 
length(Cwd::abs_path($options{r})) + 1 );
+$file =~ s|/|\\|g;
+
+open (INFILE, $options{i}) || die propex: cannot open input file: 
$options{i};
+open (OUTFILE, $options{o}) || die propex: cannot open output file: 
$options{o};
+
+while (INFILE) {
+chomp;
+if (/=/) {
+my ($id, $value) = split /=/;
+$value =~ s/^\s+//; #remove leading spaces
+$value =~ s/\s+$//; #remove trailing spaces
+$value =~ s/(\\u([0-9a-fA-F]{4}))/pack(C0U1,hex($2))/ge; #convert 
ascii escaped unicode to utf-8
+print OUTFILE 
$options{p}\t$file\t0\tproperty\t$id\t\t\t\t0\ten-US\t$value\t\t\t\t20020202 
02:02:02\n;
+}
+}
+
+close (INFILE);
+close (OUTFILE);
+
+exit 0;
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 992683a..a857a65 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -58,6 +58,7 @@ const char *ExeTable[][4] = {
 { xrm, xrmex,  -e, negative },
 { xml, xrmex,  -e, positive },
 { xhp, helpex,  -e, negative },
+{ properties, propex,  -e, negative },
 { NULL, NULL, NULL, NULL }
 };
 
commit c0b0cbe1a7ce5e71de57aa3908441026dedccaab
Author: Andras Timar ati...@suse.com
Date:   Mon Dec 12 18:59:03 2011 +0100

exclude wntgcc* directories from searching for translatable files

diff --git a/l10ntools/source/srciter.cxx b/l10ntools/source/srciter.cxx
index 4b89c65..c3e4988 100644
--- a/l10ntools/source/srciter.cxx
+++ b/l10ntools/source/srciter.cxx
@@ -64,6 +64,7 @@ void SourceTreeIterator::ExecuteDirectory( 
transex::Directory aDirectory )
 static rtl::OUString WCARD7 ( RTL_CONSTASCII_USTRINGPARAM(.git) );
 static rtl::OUString WCARD8 ( RTL_CONSTASCII_USTRINGPARAM(clone) );
 static rtl::OUString WCARD9 ( RTL_CONSTASCII_USTRINGPARAM(install) );
+static rtl::OUString WCARDA ( RTL_CONSTASCII_USTRINGPARAM(wntgcc) );
 
 
 if( sDirName.indexOf( WCARD1 , 0 )  -1 ||
@@ -76,7 +77,8 @@ void SourceTreeIterator::ExecuteDirectory( 
transex::Directory aDirectory )
 #ifndef WNT
 sDirName.indexOf( WCARD8 , 0 )  -1 ||
 #endif
-sDirName.indexOf( WCARD9 , 0 )  -1
+sDirName.indexOf( WCARD9 , 0 )  -1 ||
+sDirName.indexOf( WCARDA , 0 )  -1
)return;
 //printf( %s \n, OUStringToOString( sDirName