date:20120309

[Libreoffice-commits] .: officecfg/registry

2012-03-09 Thread Jan Holesovsky

 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit effe82efb67a3b444c3be5f978aef82b8e709165
Author: Cameron Paul cpau...@gmail.com
Date:   Fri Mar 9 08:33:48 2012 +0100

Disable auto-numbering by default.

diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 700d213..e797988 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -4704,7 +4704,7 @@
descSpecifies 
if a numbered or bulleted text is created automatically while typing./desc
labelApply 
numbering/label
/info
-   valuetrue/value
+   valuefalse/value
/prop
group 
oor:name=SpecialCharacter
info
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

2012-03-09 Thread Stephan Bergmann

 dbaccess/source/core/dataaccess/documenteventnotifier.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 490f83d4807a4223bae61d34913e5bd2bf952f3a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Mar 9 09:12:54 2012 +0100

fdo#47021: the naive join attempt leads to deadlock

...something better is required (getting rid of the solar mutex?).

diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx 
b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
index 2b7cf9b..2c10ff1 100644
--- a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
+++ b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
@@ -165,7 +165,12 @@ namespace dbaccess
 {
 m_pEventBroadcaster-removeEventsForProcessor( this );
 m_pEventBroadcaster-terminate();
-m_pEventBroadcaster-join();
+//TODO: a protocol is missing how to join with the thread 
before
+// exit(3), to ensure the thread is no longer relying on any
+// infrastructure while that infrastructure is being shut down
+// in atexit handlers; simply calling join here leads to
+// deadlock, as this thread holds the solar mutex while the
+// other thread is typically blocked waiting for the solar 
mutex
 m_pEventBroadcaster.clear();
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sal/inc

2012-03-09 Thread Stephan Bergmann

 sal/inc/osl/file.hxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 8840765e2927d036b6c8b4481eabbd4f4fb460a9
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Mar 9 09:23:08 2012 +0100

Fixed @since tags

diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx
index 0ad8922..ee3ac1f 100644
--- a/sal/inc/osl/file.hxx
+++ b/sal/inc/osl/file.hxx
@@ -739,7 +739,7 @@ public:
 @see getFileType
 @see isRegular
 @see isLink
-@since 3.6
+@since LibreOffice 3.6
 */
 inline sal_Bool isFile() const
 {
@@ -753,7 +753,7 @@ public:
 True if it's a directory, False otherwise.
 
 @see getFileType
-@since 3.6
+@since LibreOffice 3.6
 */
 inline sal_Bool isDirectory() const
 {
@@ -768,7 +768,7 @@ public:
 @see getFileType
 @see isFile
 @see isLink
-@since 3.6
+@since LibreOffice 3.6
 */
 inline sal_Bool isRegular() const
 {
@@ -781,7 +781,7 @@ public:
 True if it's a link, False otherwise.
 
 @see getFileType
-@since 3.6
+@since LibreOffice 3.6
 */
 inline sal_Bool isLink() const
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: writerfilter/source

2012-03-09 Thread Miklos Vajna

 writerfilter/source/dmapper/NumberingManager.cxx |   12 
 1 file changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 401a834e0bb5b9a1fdf4d8648cb7c630ce452459
Author: Miklos Vajna vmik...@suse.cz
Date:   Fri Mar 9 09:26:05 2012 +0100

writerfilter: ifdef + fprintf - SAL_INFO

diff --git a/writerfilter/source/dmapper/NumberingManager.cxx 
b/writerfilter/source/dmapper/NumberingManager.cxx
index a3b0e7e..85ef2f2 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -16,9 +16,7 @@
 #include com/sun/star/text/PositionAndSpaceMode.hpp
 #include com/sun/star/text/XChapterNumberingSupplier.hpp
 
-#if DEBUG
-#include stdio.h
-#endif
+#include rtl/oustringostreaminserter.hxx
 
 #include dmapperLoggers.hxx
 
@@ -53,11 +51,7 @@ void lcl_printProperties( uno::Sequence 
beans::PropertyValue  aProps )
 if ( !( aValue = sValue )  ( aValue = nValue ) )
 sValue = OUString::valueOf( nValue );
 
-#if DEBUG
-fprintf( stderr, Property %s: %s\n,
-OUSTR_TO_C( aProps[i].Name ),
-OUSTR_TO_C( sValue ) );
-#endif
+SAL_INFO(writerfilter, Property   aProps[i].Name  :   
sValue);
 }
 }
 
@@ -534,7 +528,9 @@ void ListDef::CreateNumberingRules( DomainMapper rDMapper,
 // Get the merged level properties
 uno::Sequence beans::PropertyValue  aLvlProps = 
aProps[sal_Int32( nLevel )];
 
+#if DEBUG
 lcl_printProperties( aLvlProps );
+#endif
 
 // Get the char style
 uno::Sequence beans::PropertyValue  aAbsCharStyleProps = 
pAbsLevel-GetCharStyleProperties( );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: writerperfect/Library_cdrimport.mk

2012-03-09 Thread Fridrich Strba

 writerperfect/Library_cdrimport.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 50e02e19efc37ad94646fd4bb7b7eda74bb4952c
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Mar 8 13:07:15 2012 +0100

With the new libcdr, writerperfect will depend on lcms2

diff --git a/writerperfect/Library_cdrimport.mk 
b/writerperfect/Library_cdrimport.mk
index f05990d..7904b3c 100644
--- a/writerperfect/Library_cdrimport.mk
+++ b/writerperfect/Library_cdrimport.mk
@@ -59,6 +59,7 @@ $(eval $(call gb_Library_use_externals,cdrimport,\
wpd \
wpg \
cdr \
+   lcms2 \
zlib \
 ))
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: libcdr/prj

2012-03-09 Thread Fridrich Strba

 libcdr/prj/build.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b64b955a38021c70b06c97c9d31b516b5e0fa3a1
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Fri Mar 9 09:55:53 2012 +0100

libcdr will depend on lcms2

diff --git a/libcdr/prj/build.lst b/libcdr/prj/build.lst
index 30487b1..a3a0e2c 100644
--- a/libcdr/prj/build.lst
+++ b/libcdr/prj/build.lst
@@ -1,3 +1,3 @@
-cdrlibcdr  : LIBWPD:libwpd LIBWPG:libwpg ZLIB:zlib soltools NULL
+cdrlibcdr  : LIBWPD:libwpd LIBWPG:libwpg LCMS2:lcms2 ZLIB:zlib soltools 
NULL
 cdrlibcdr  usr1-   all cdr_mkout NULL
 cdrlibcdr  nmake   -   all cdr_libcdr NULL
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: tail_build/prj writerperfect/prj

2012-03-09 Thread Fridrich Strba

 tail_build/prj/build.lst|2 +-
 writerperfect/prj/build.lst |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 699b8a45d81f59e29b4b06936fb0a8538722acbf
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Fri Mar 9 09:58:52 2012 +0100

Make sure that the right libraries are there in all cases

diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index d827820..9b0442b 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb  tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell 
BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig 
FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu 
DESKTOP:l10ntools JPEG:jpeg LIBCDR:libcdr LIBCMIS:libcmis 
LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt 
LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve 
MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python 
REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain 
VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges 
comphelper DBCONNECTIVITY:connectivity cppu cppuhelper cpputools i18npool 
i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi 
QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal 
salhelper sax shell solenv soltools sot stoc svl sysui tools ucbhelper udkapi 
unoil unotest unotool
 s ure DESKTOP:xmlhelp xmlreader xsltml NULL
+tb  tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell 
BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig 
FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu 
DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis 
LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt 
LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve 
MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python 
REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain 
VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges 
comphelper DBCONNECTIVITY:connectivity cppu cppuhelper cpputools i18npool 
i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi 
QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal 
salhelper sax shell solenv soltools sot stoc svl sysui tools ucbhelper udkapi 
unoil uno
 test unotools ure DESKTOP:xmlhelp xmlreader xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL
diff --git a/writerperfect/prj/build.lst b/writerperfect/prj/build.lst
index e680fea..22a822e 100644
--- a/writerperfect/prj/build.lst
+++ b/writerperfect/prj/build.lst
@@ -1,3 +1,3 @@
-wp  writerperfect : LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd 
LIBVISIO:libvisio LIBCDR:libcdr sot comphelper xmloff svtools sfx2 
LIBXSLT:libxslt NULL
+wp  writerperfect : LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd 
LIBVISIO:libvisio LIBCDR:libcdr LCMS2:lcms2 ZLIB:zlib sot comphelper xmloff 
svtools sfx2 LIBXSLT:libxslt NULL
 wp  writerperfect  usr1-   all wp_mkout NULL
 wp  writerperfect\prj  nmake   -   all wp_prj NULL
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 4 commits - oowintool

2012-03-09 Thread Tor Lillqvist

 oowintool |  145 ++
 1 file changed, 72 insertions(+), 73 deletions(-)

New commits:
commit dcc9096b857fa2b22eee1f4e025e82c0f4320f16
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Fri Mar 9 10:35:20 2012 +0200

Add mode lines, untabify, clean up indentation

diff --git a/oowintool b/oowintool
index 3515ccd..ce55e88 100755
--- a/oowintool
+++ b/oowintool
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl -w # -*- tab-width: 4; cperl-indent-level: 4; 
indent-tabs-mode: nil -*-
 
 use File::Copy;
 
@@ -20,7 +20,7 @@ sub reg_get_value($)
 if ( defined $value ) {
 chomp ($value);
 $value =~ s|\r\n||;
-#print Value '$value' at '$key'\n;
+# print Value '$value' at '$key'\n;
 }
 
 return $value;
@@ -64,20 +64,20 @@ sub cygpath($$$)
 return $path if ( ! defined $path );
 # Strip trailing path separators
 if ($input_format eq 'u') {
-   $path =~ s|/*\s*$||;
+$path =~ s|/*\s*$||;
 } else {
-   $path =~ s|\\*\s*$||;
+$path =~ s|\\*\s*$||;
 }
 
 # 'Unterminated quoted string errors' from 'ash' when 
 # forking cygpath  so - reimplement cygpath in perl [ gack ]
 if ($format eq 'u'  $input_format eq 'w') {
-   $path =~ s|\\|/|g;
-   $path =~ s|([a-zA-Z]):/|/cygdrive/$1/|g;
+$path =~ s|\\|/|g;
+$path =~ s|([a-zA-Z]):/|/cygdrive/$1/|g;
 }
 elsif ($format eq 'w'  $input_format eq 'u') {
-   $path =~ s|/cygdrive/([a-zA-Z])/|/$1/|g;
-   $path =~ s|/|\\|g;
+$path =~ s|/cygdrive/([a-zA-Z])/|/$1/|g;
+$path =~ s|/|\\|g;
 }
 
 return $path;
@@ -88,33 +88,34 @@ sub print_path($$)
 my ($path, $unix) = @_;
 
 $path = cygpath ($path, $unix, $output_format);
-
+
 print $path;
 }
 
 sub print_windows_sdk_home()
 {
 my ($value, $key);
+
 $value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/Windows/v6.1/InstallationFolder');
-if (!defined $value)
-{
+
+if (!defined $value) {
 $value = reg_get_value 
('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/Windows/v7.1/InstallationFolder');
-   }
-if (!defined $value)
-{
+}
+
+if (!defined $value) {
 $value = reg_get_value 
('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/Windows/CurrentInstallFolder');
-   }
-if (!defined $value)
-{
-   $value = reg_get_value 
('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/Directories/Install Dir');
-   }
-if (!defined $value)
-{
-   $key = reg_find_key 
('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install 
Dir');
-   $value = reg_get_value ($key);
-   }
-
-defined $value || die Windows Sdk not found;
+}
+
+if (!defined $value) {
+$value = reg_get_value 
('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/Directories/Install Dir');
+}
+
+if (!defined $value) {
+$key = reg_find_key 
('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install 
Dir');
+$value = reg_get_value ($key);
+}
+
+defined $value || die Windows SDK not found;
 
 print cygpath ($value, 'w', $output_format);
 }
@@ -160,13 +161,12 @@ sub find_msvs()
 {
 my @ms_versions = ( \%msvs_2008, \%msvs_express_2008, \%msvs_2010 );
 
-for $ver (@ms_versions)
-{
-   my $install = reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/ . 
$ver-{'key'});
-   if (defined $install  $install ne '') {
-   $ver-{'product_dir'} = $install;
-   return $ver;
-   }
+for $ver (@ms_versions) {
+my $install = reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/ . 
$ver-{'key'});
+if (defined $install  $install ne '') {
+$ver-{'product_dir'} = $install;
+return $ver;
+}
 }
 die Can't find MS Visual Studio / VC++;
 }
@@ -175,13 +175,12 @@ sub find_msvc()
 {
 my @ms_versions = ( \%msvc_2008, \%msvc_express_2008, \%msvc_2010 );
 
-for $ver (@ms_versions)
-{
-   my $install = reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/ . 
$ver-{'key'});
-   if (defined $install  $install ne '') {
-   $ver-{'product_dir'} = $install;
-   return $ver;
-   }
+for $ver (@ms_versions) {
+my $install = reg_get_value (HKEY_LOCAL_MACHINE/SOFTWARE/ . 
$ver-{'key'});
+if (defined $install  $install ne '') {
+$ver-{'product_dir'} = $install;
+return $ver;
+}
 }
 die Can't find MS Visual Studio / VC++;
 }
@@ -219,7 +218,7 @@ sub print_dotnetsdk_dir()
   reg_get_value 
(HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv1.1) ||
   reg_get_value 
(HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv2.0);
 if ($dir) {
-  print cygpath ($dir, 'w', $output_format);
+print cygpath ($dir, 'w', $output_format);
 }
 }
 
@@ -228,9

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

2012-03-09 Thread Cédric Bosdonnat

 sc/source/ui/view/formatsh.cxx   |9 +
 svx/source/tbxctrls/tbcontrl.cxx |4 
 2 files changed, 13 insertions(+)

New commits:
commit 0466a30ca52dc531887c75e2d42b007cc83778f3
Author: Winfried Donkers o...@dci-electronics.nl
Date:   Wed Mar 7 17:39:03 2012 +0100

fdo#45671 fix for transparent colour split button

diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 61522d6..dc75138 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -1435,6 +1435,15 @@ void ScFormatShell::ExecuteAttr( SfxRequest rReq )
 pTabViewShell-ExecuteCellFormatDlg( rReq, TP_FONT );   // 
wenn ToolBar vertikal
 break;
 
+case SID_BACKGROUND_COLOR:
+{
+SvxBrushItem aBrushItem( (const SvxBrushItem)
+ 
pTabViewShell-GetSelectionPattern()-GetItem( ATTR_BACKGROUND ) );
+aBrushItem.SetColor( COL_TRANSPARENT );
+pTabViewShell-ApplyAttr( aBrushItem );
+}
+break;
+
 case SID_ATTR_ALIGN_LINEBREAK:  // ohne Parameter 
als Toggle
 {
 const ScPatternAttr* pAttrs = 
pTabViewShell-GetSelectionPattern();
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index b434e00..0ecf87d 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2250,6 +2250,10 @@ SvxColorExtToolBoxControl::SvxColorExtToolBoxControl(
 switch( nSlotId )
 {
 case SID_ATTR_CHAR_COLOR:
+addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( 
.uno:Color )));
+nMode = TBX_UPDATER_MODE_CHAR_COLOR_NEW;
+break;
+
 case SID_ATTR_CHAR_COLOR2:
 addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( 
.uno:CharColorExt )));
 nMode = TBX_UPDATER_MODE_CHAR_COLOR_NEW;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/branding

2012-03-09 Thread Matus Kukan

 desktop/branding/Makefile |   50 --
 1 file changed, 50 deletions(-)

New commits:
commit ac26f6871061554db77a393cb1886a71b668a580
Author: MatÃºÅ¡ Kukan matus.ku...@gmail.com
Date:   Fri Mar 9 10:47:39 2012 +0100

remove unused Makefile

diff --git a/desktop/branding/Makefile b/desktop/branding/Makefile
deleted file mode 100644
index 85d5769..000
--- a/desktop/branding/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# 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.
-#
-# Major Contributor(s):
-# Copyright (C) 2011 Red Hat, Inc., David Tardon dtar...@redhat.com
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# 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.
-
-SRCDIR := $(realpath $(dir $(firstword $(MAKEFILE_LIST)))/../..)
-
-ifeq ($(strip $(ABOUT_BITMAP)),)
-ABOUT_BITMAP := $(SRCDIR)/icon-themes/galaxy/brand/about.png
-endif
-
-ifeq ($(strip $(INTRO_BITMAP)),)
-INTRO_BITMAP := $(SRCDIR)/icon-themes/galaxy/brand/intro.png
-endif
-
-$(WORKDIR)/CustomTarget/desktop/branding/about.png : $(ABOUT_BITMAP)
-   mkdir -p $(dir $@)  cp -p $ $@
-
-$(WORKDIR)/CustomTarget/desktop/branding/intro.png : $(INTRO_BITMAP)
-   mkdir -p $(dir $@)  cp -p $ $@
-
-.DEFAULT_GOAL := all
-.PHONY : all
-all : \
-   $(WORKDIR)/CustomTarget/desktop/branding/about.png \
-   $(WORKDIR)/CustomTarget/desktop/branding/intro.png
-
-# vim: set ts=4 sw=4 et:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Makefile

2012-03-09 Thread Matus Kukan

 Makefile |2 --
 1 file changed, 2 deletions(-)

New commits:
commit fa97b8ac234c34618d8dca4329bc13e8454b47b4
Author: MatÃºÅ¡ Kukan matus.ku...@gmail.com
Date:   Fri Mar 9 11:21:39 2012 +0100

Do not remove the whole  workdir/* on 'make clean'

Also solver/$INPATH is subset of */$INPATH.

diff --git a/Makefile b/Makefile
index 84d8c46..df5b638 100644
--- a/Makefile
+++ b/Makefile
@@ -300,8 +300,6 @@ clean: clean-host clean-build
 
 clean-host:
rm -fr $(SRCDIR)/*/$(INPATH)
-   rm -fr $(SRCDIR)/workdir/*
-   rm -fr $(SRCDIR)/solver/$(INPATH)
rm -fr install
 
 clean-build:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - lcms2/makefile.mk

2012-03-09 Thread Tor Lillqvist

 lcms2/makefile.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f3f6c9be9864088b94f874c6ef2ce8ab1dd45f2a
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Fri Mar 9 12:36:15 2012 +0200

Pass /useenv to vcbuild so that rc and link find SDK headers and libs

diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk
index 028a3f6..10ba736 100644
--- a/lcms2/makefile.mk
+++ b/lcms2/makefile.mk
@@ -54,7 +54,7 @@ BUILD_DIR=Projects/VC2010/lcms2_DLL
 BUILD_ACTION=MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release 
/p:Platform=Win32
 .ELSE
 BUILD_DIR=Projects/VC2008/lcms2_DLL
-BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe lcms2_DLL.vcproj 
Release|Win32
+BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe /useenv lcms2_DLL.vcproj 
Release|Win32
 .ENDIF
 
 .ELSE #$(GUI)$(COM)!=WNTMSC
commit 4839f974925a6da50be9cd0dc7ab907182abbb93
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Fri Mar 9 12:07:35 2012 +0200

VC2008 and 2010 were swapped

diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk
index 68b939f..028a3f6 100644
--- a/lcms2/makefile.mk
+++ b/lcms2/makefile.mk
@@ -46,14 +46,14 @@ TARFILE_MD5=327348d67c979c88c2dec59a23a17d85
 
 .IF $(GUI)$(COM)==WNTMSC
 CONFIGURE_DIR=.
-BUILD_DIR=Projects/VC2010/lcms2_DLL
 
 CONFIGURE_ACTION =
 
 .IF $(CCNUMVER) = 0016
-BUILD_DIR=Projects/VC2008/lcms2_DLL
+BUILD_DIR=Projects/VC2010/lcms2_DLL
 BUILD_ACTION=MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release 
/p:Platform=Win32
 .ELSE
+BUILD_DIR=Projects/VC2008/lcms2_DLL
 BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe lcms2_DLL.vcproj 
Release|Win32
 .ENDIF
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sal/inc tools/source

2012-03-09 Thread Stephan Bergmann

 sal/inc/osl/file.hxx|   47 ++--
 tools/source/stream/strmunx.cxx |4 +--
 2 files changed, 29 insertions(+), 22 deletions(-)

New commits:
commit 608fe962cc649ad62c489811d3a8666e0e06e5e7
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Mar 9 11:52:09 2012 +0100

Let osl::FileStatus getters assert programming errors

...instead of arbitrarily returning certain values when the requested
information is not available.

This reveals a problem in strmunx.cxx that is apparently a regression 
introduced
with 4a086fca7b0a77c20bc9f1c97507966e2861f3da fix SvStream to not require a
custom open or lstat method.

diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx
index ee3ac1f..2cc43d0 100644
--- a/sal/inc/osl/file.hxx
+++ b/sal/inc/osl/file.hxx
@@ -29,14 +29,16 @@
 #ifndef _OSL_FILE_HXX_
 #define _OSL_FILE_HXX_
 
-#ifdef __cplusplus
+#include sal/config.h
+
+#include cassert
 
 #include osl/time.h
-#   include rtl/memory.h
-#   include rtl/ustring.hxx
+#include rtl/memory.h
+#include rtl/ustring.hxx
 
 #include osl/file.h
-#   include rtl/byteseq.hxx
+#include rtl/byteseq.hxx
 
 #include stdio.h
 
@@ -723,11 +725,12 @@ public:
 /** Get the file type.
 
 @return
-The file type if this information is valid, Unknown otherwise.
+The file type.
 */
 inline Type getFileType() const
 {
-return (_aStatus.uValidFields  osl_FileStatus_Mask_Type) ?  (Type) 
_aStatus.eType : Unknown;
+assert(isValid(osl_FileStatus_Mask_Type));
+return static_cast Type (_aStatus.eType);
 }
 
 /** Is it a file?
@@ -796,88 +799,93 @@ public:
 
 inline sal_uInt64 getAttributes() const
 {
+assert(isValid(osl_FileStatus_Mask_Attributes));
 return _aStatus.uAttributes;
 }
 
 /** Get the creation time of this file.
 
 @return
-The creation time if this information is valid,
-an uninitialized TimeValue otherwise.
+The creation time.
 */
 
 inline TimeValue getCreationTime() const
 {
+assert(isValid(osl_FileStatus_Mask_CreationTime));
 return _aStatus.aCreationTime;
 }
 
 /** Get the file access time.
 
 @return
-The last access time if this information is valid,
-an uninitialized TimeValue otherwise.
+The last access time.
 */
 
 inline TimeValue getAccessTime() const
 {
+assert(isValid(osl_FileStatus_Mask_AccessTime));
 return _aStatus.aAccessTime;
 }
 
 /** Get the file modification time.
 
 @return
-The last modified time if this information is valid,
-an uninitialized TimeValue otherwise.
+The last modified time.
 */
 
 inline TimeValue getModifyTime() const
 {
+assert(isValid(osl_FileStatus_Mask_ModifyTime));
 return _aStatus.aModifyTime;
 }
 
 /** Get the size of the file.
 
 @return
-The actual file size if this information is valid, 0 otherwise.
+The actual file size.
 */
 
 inline sal_uInt64 getFileSize() const
 {
+assert(isValid(osl_FileStatus_Mask_FileSize));
 return _aStatus.uFileSize;
 }
 
 /** Get the file name.
 
 @return
-The file name if this information is valid, an empty string otherwise.
+The file name.
 */
 
 inline ::rtl::OUString getFileName() const
 {
-return _aStatus.ustrFileName ? ::rtl::OUString(_aStatus.ustrFileName) 
: ::rtl::OUString();
+assert(isValid(osl_FileStatus_Mask_FileName));
+return rtl::OUString(_aStatus.ustrFileName);
 }
 
 
 /** Get the URL of the file.
 
 @return
-The full qualified URL of the file if this information is valid, an 
empty string otherwise.
+The full qualified URL of the file.
 */
 
 inline ::rtl::OUString getFileURL() const
 {
-return _aStatus.ustrFileURL ? ::rtl::OUString(_aStatus.ustrFileURL) : 
::rtl::OUString();
+assert(isValid(osl_FileStatus_Mask_FileURL));
+return rtl::OUString(_aStatus.ustrFileURL);
 }
 
 /** Get the link target URL.
 
 @return
-The link target URL if this information is valid, an empty string 
otherwise.
+The link target URL.
 */
 
 inline ::rtl::OUString getLinkTargetURL() const
 {
-return _aStatus.ustrLinkTargetURL ? 
::rtl::OUString(_aStatus.ustrLinkTargetURL) : ::rtl::OUString();
+assert(isValid(osl_FileStatus_Mask_LinkTargetURL));
+return rtl::OUString(_aStatus.ustrLinkTargetURL);
 }
 
 friend class DirectoryItem;
@@ -1947,7 +1955,6 @@ public:
 
 } /* namespace osl */
 
-#endif  /* __cplusplus */
 #endif  /* _OSL_FILE_HXX_ */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index cb55ddc..2317120 100644
---

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

2012-03-09 Thread Miklos Vajna

 sw/inc/fmtcol.hxx  |1 +
 sw/source/core/inc/flowfrm.hxx |1 +
 sw/source/core/inc/txtfrm.hxx  |1 +
 3 files changed, 3 insertions(+)

New commits:
commit 5191ee9800d53c8ebb6f56222eb81a1e4bce9925
Author: Miklos Vajna vmik...@suse.cz
Date:   Fri Mar 9 13:08:10 2012 +0100

sw: doxygen comments for SwTxtFmtColl, SwFlowFrm, SwTxtFrm

diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 16db7c6..3451a4b 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -57,6 +57,7 @@ private:
 const SwFmtColl operator=(const SwFmtColl );
 };
 
+/// Represents the style of a paragraph.
 class SW_DLLPUBLIC SwTxtFmtColl: public SwFmtColl
 {
 friend class SwDoc;
diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx
index 7104060..c10e7b3 100644
--- a/sw/source/core/inc/flowfrm.hxx
+++ b/sw/source/core/inc/flowfrm.hxx
@@ -58,6 +58,7 @@ class SwObjectFormatterTxtFrm;
 
 void MakeFrms( SwDoc *, const SwNodeIndex , const SwNodeIndex  );
 
+/// Base class for frames that are allowed at page breaks and shall continue 
on the next page, e.g. paragraphs, tables.
 class SwFlowFrm
 {
 //PrepareMake darf Locken/Unlocken (Robustheit)
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index c42be69..e8da527 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -62,6 +62,7 @@ class SwWrongList;
 #define RUBY_TOP3
 #define GRID_CELLS  4
 
+/// Represents the visualization of a paragraph.
 class SwTxtFrm: public SwCntntFrm
 {
 friend class SwTxtIter;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - libcdr/libcdr-0.0.3.patch libcdr/libcdr-0.0.3-warning.patch libcdr/libcdr-0.0.4.patch libcdr/makefile.mk scp2/source

2012-03-09 Thread Fridrich Strba

 libcdr/libcdr-0.0.3-warning.patch |   31 ---
 libcdr/libcdr-0.0.3.patch |   34 --
 libcdr/libcdr-0.0.4.patch |   20 
 libcdr/makefile.mk|   18 +++---
 scp2/source/ooo/makefile.mk   |4 
 5 files changed, 35 insertions(+), 72 deletions(-)

New commits:
commit 8b0be97f13ea550fc5dae7a7b6a76ddb30218278
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Fri Mar 9 13:56:18 2012 +0100

Define SYSTEM_LCMS2 in scp2 when appropriate

diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk
index b671288..a78c669 100644
--- a/libcdr/makefile.mk
+++ b/libcdr/makefile.mk
@@ -60,7 +60,7 @@ INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/lcms2
 .ENDIF
 
 TARFILE_NAME=libcdr-0.0.4
-TARFILE_MD5=6b39b6b799b0fde2b6045a9acede6d0a
+TARFILE_MD5=b94897199a84055b57fa00af46b059ec
 
 PATCH_FILES=\
 $(TARFILE_NAME).patch
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index e7e57db..0987f6f 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -113,6 +113,10 @@ SCPDEFS+=-DSYSTEM_EXPAT
 SCPDEFS+=-DSYSTEM_CAIRO
 .ENDIF
 
+.IF $(SYSTEM_LCMS2) == YES
+SCPDEFS+=-DSYSTEM_LCMS2
+.ENDIF
+
 .IF $(SYSTEM_LIBXML) == YES
 SCPDEFS+=-DSYSTEM_LIBXML
 .ENDIF
commit 4147de18731c7637ab5654797c21b39069695ff5
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Mar 8 13:05:43 2012 +0100

Upload new libcdr-0.0.4 release

diff --git a/libcdr/libcdr-0.0.3-warning.patch 
b/libcdr/libcdr-0.0.3-warning.patch
deleted file mode 100644
index b98459c..000
--- a/libcdr/libcdr-0.0.3-warning.patch
+++ /dev/null
@@ -1,31 +0,0 @@
 misc/libcdr-0.0.3/src/lib/CDRParser.cpp2012-02-23 07:42:39.0 
+0100
-+++ misc/build/libcdr-0.0.3/src/lib/CDRParser.cpp  2012-02-23 
13:44:27.970033236 +0100
-@@ -215,7 +215,7 @@
-   else if (fourCC == mcfg)
- readMcfg(input);
-   else if (fourCC == bmp )
--readBmp(input, length);
-+readBmp(input);
-   input-seek(recordStart + length, WPX_SEEK_CUR);
- }
- 
-@@ -770,7 +770,7 @@
-   m_collector-collectPolygonTransform(numAngles, nextPoint, rx, ry, cx, cy);
- }
- 
--void libcdr::CDRParser::readBmp(WPXInputStream *input, unsigned length)
-+void libcdr::CDRParser::readBmp(WPXInputStream *input)
- {
-   unsigned imageId = readU32(input);
-   input-seek(50, WPX_SEEK_CUR);
 misc/libcdr-0.0.3/src/lib/CDRParser.h  2012-02-09 08:36:51.0 
+0100
-+++ misc/build/libcdr-0.0.3/src/lib/CDRParser.h2012-02-23 
13:45:50.667974573 +0100
-@@ -70,7 +70,7 @@
-   void readPath(WPXInputStream *input);
-   void readPolygonCoords(WPXInputStream *input);
-   void readPolygonTransform(WPXInputStream *input);
--  void readBmp(WPXInputStream *input, unsigned length);
-+  void readBmp(WPXInputStream *input);
- 
-   WPXInputStream *m_input;
-   CDRCollector *m_collector;
diff --git a/libcdr/libcdr-0.0.3.patch b/libcdr/libcdr-0.0.3.patch
deleted file mode 100644
index 53bc613..000
--- a/libcdr/libcdr-0.0.3.patch
+++ /dev/null
@@ -1,34 +0,0 @@
 misc/libcdr-0.0.3/src/lib/libcdr_utils.h
-+++ misc/build/libcdr-0.0.3/src/lib/libcdr_utils.h
-@@ -41,17 +41,8 @@
- 
- #else
- 
--#ifdef HAVE_CONFIG_H
--#include config.h
--#endif
--
--#ifdef HAVE_STDINT_H
- #include stdint.h
--#endif
--
--#ifdef HAVE_INTTYPES_H
- #include inttypes.h
--#endif
- 
- #endif
- 
 misc/libcdr-0.0.3/src/lib/makefile.mk
-+++ misc/build/libcdr-0.0.3/src/lib/makefile.mk
-@@ -28,6 +28,10 @@
- INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg
- .ENDIF
- 
-+.IF $(SYSTEM_ZLIB) != YES
-+INCPRE+=-I$(SOLARVER)$/$(INPATH)$/inc$/external/zlib
-+.ENDIF
-+
- SLOFILES= \
- $(SLO)$/CDRCollector.obj \
- $(SLO)$/CDRDocument.obj \
-
diff --git a/libcdr/libcdr-0.0.4.patch b/libcdr/libcdr-0.0.4.patch
new file mode 100644
index 000..9e9079d
--- /dev/null
+++ b/libcdr/libcdr-0.0.4.patch
@@ -0,0 +1,20 @@
+--- misc/libcdr-0.0.4/src/lib/libcdr_utils.h   2012-03-07 13:51:21.0 
+0100
 misc/build/libcdr-0.0.4/src/lib/libcdr_utils.h 2012-03-08 
12:46:38.194534604 +0100
+@@ -54,17 +54,8 @@
+ 
+ #else
+ 
+-#ifdef HAVE_CONFIG_H
+-#include config.h
+-#endif
+-
+-#ifdef HAVE_STDINT_H
+ #include stdint.h
+-#endif
+-
+-#ifdef HAVE_INTTYPES_H
+ #include inttypes.h
+-#endif
+ 
+ #endif
+ 
diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk
index 18e73ed..b671288 100644
--- a/libcdr/makefile.mk
+++ b/libcdr/makefile.mk
@@ -27,8 +27,8 @@
 
 PRJ=.
 
-PRJNAME=visio
-TARGET=visio
+PRJNAME=cdr
+TARGET=cdr
 
 # --- Settings -
 
@@ -41,7 +41,7 @@ TARGET=visio
 @echo Using system libcdr...
 .ENDIF
 
-# libcdr depends on the libwpd and libwpg
+# libcdr depends on the libwpd, libwpg and lcms2
 .IF $(SYSTEM_LIBWPD) == YES
 INCPRE+=$(WPD_CFLAGS)
 .ELSE
@@ -53,13 +53,17 @@ INCPRE+=$(WPG_CFLAGS)
 .ELSE
 INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg
 .ENDIF
+.IF $(SYSTEM_LCMS2) == YES
+INCPRE+=$(LCMS2_CFLAGS)
+.ELSE

[Libreoffice-commits] .: libcdr/makefile.mk

2012-03-09 Thread Fridrich Strba

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

New commits:
commit 055f8eaf1276c585b06ca01c28a6fe4aee900a31
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Fri Mar 9 14:30:00 2012 +0100

Reverting accidental commit

diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk
index a78c669..b671288 100644
--- a/libcdr/makefile.mk
+++ b/libcdr/makefile.mk
@@ -60,7 +60,7 @@ INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/lcms2
 .ENDIF
 
 TARFILE_NAME=libcdr-0.0.4
-TARFILE_MD5=b94897199a84055b57fa00af46b059ec
+TARFILE_MD5=6b39b6b799b0fde2b6045a9acede6d0a
 
 PATCH_FILES=\
 $(TARFILE_NAME).patch
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: download

2012-03-09 Thread Stephan Bergmann

 download |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit bda0b068b8b6a4dadf18b46098192d52be6cb963
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Mar 9 14:34:00 2012 +0100

Enable Bash pipefail so that e.g. wget failure leads to download failure

diff --git a/download b/download
index 55e0622..89efbbe 100755
--- a/download
+++ b/download
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #*
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,6 +26,8 @@
 #
 #*
 
+set -o pipefail
+
 # environment setup yet?
 if [ -z $TARFILE_LOCATION ]; then
 . ./config_host.mk
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-03-09 Thread Tomáš Chvátal

 fpicker/source/unx/kde4/KDE4FilePicker.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 14dfa9de27ddab9bb0bbe64e6c0a4b5e4caab742
Author: David Tardon dtar...@redhat.com
Date:   Thu Mar 8 14:15:09 2012 +0100

yet another clash with macro name

Signed-off-by: Tomas Chvatal tchva...@suse.cz

diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx 
b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
index 69be3b1..9c3ded3 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
@@ -60,6 +60,8 @@
 #undef SETTINGS_MOUSE
 #define LO_SETTINGS_LOCALE SETTINGS_LOCALE
 #undef SETTINGS_LOCALE
+#define LO_SETTINGS_STYLE SETTINGS_STYLE
+#undef SETTINGS_STYLE
 
 #include kfiledialog.h
 #include kwindowsystem.h
@@ -77,6 +79,8 @@
 #undef LO_SETTINGS_MOUSE
 #define SETTINGS_LOCALE LO_SETTINGS_LOCALE
 #undef LO_SETTINGS_LOCALE
+#define SETTINGS_STYLE LO_SETTINGS_STYLE
+#undef LO_SETTINGS_STYLE
 
 using namespace ::com::sun::star;
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: extensions/source

2012-03-09 Thread Caolán McNamara

 extensions/source/bibliography/bibload.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bd1088567bafa6293ffecf5331a9016b6d0438e3
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Mar 9 14:09:30 2012 +

Fix tools-bibliography database, brown paper bag over head commit :-)

diff --git a/extensions/source/bibliography/bibload.cxx 
b/extensions/source/bibliography/bibload.cxx
index d20d34c..9c84cdb 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -249,7 +249,7 @@ namespace
 static bool lcl_isBaseAvailable()
 {
 Reference XMultiServiceFactory   xMgr = 
comphelper::getProcessServiceFactory();
-Reference XAggregation  xAggregate = Reference XAggregation ( 
xMgr-createInstance(C2U(com.sun.star.sbd.RowSet)), UNO_QUERY);
+Reference XAggregation  xAggregate = Reference XAggregation ( 
xMgr-createInstance(C2U(com.sun.star.sdbc.RowSet)), UNO_QUERY);
 return xAggregate.is();
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - cppcanvas/source pyuno/source

2012-03-09 Thread Michael Stahl

 cppcanvas/source/inc/implrenderer.hxx|2 +-
 cppcanvas/source/mtfrenderer/emfplus.cxx |6 +++---
 pyuno/source/module/pyuno.cxx|2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 24b449b7fcaaee20ef8feebfd64fc761535f77a8
Author: Michael Stahl mst...@redhat.com
Date:   Fri Mar 9 15:35:36 2012 +0100

cppcanvas: processEMFPlus: fix valgrind warning:

When reading EmfPlusRecordTypeDrawImagePoints, handle the variant where
points are stored as 16-bit integers instead of floats correctly.
Found via valgrind on loading bugdoc from fdo#42252.

diff --git a/cppcanvas/source/inc/implrenderer.hxx 
b/cppcanvas/source/inc/implrenderer.hxx
index d41d504..034af02 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -215,7 +215,7 @@ static float GetSwapFloat( SvStream rSt )
 
 /* EMF+ */
 void ReadRectangle (SvStream s, float x, float y, float width, 
float height, sal_uInt32 flags = 0);
-void ReadPoint (SvStream s, float x, float y, sal_uInt32 flags 
= 0);
+void ReadPoint (SvStream s, float x, float y, sal_uInt32 flags);
 void MapToDevice (double x, double y);
 ::basegfx::B2DPoint Map (double ix, double iy);
 ::basegfx::B2DSize MapSize (double iwidth, double iheight);
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx 
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 953a0c8..4c92728 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1406,9 +1406,9 @@ namespace cppcanvas
 if (unknown == 3) { // it probably means number of 
points defining destination rectangle
 float x1, y1, x2, y2, x3, y3;
 
-ReadPoint (rMF, x1, y1);
-ReadPoint (rMF, x2, y2);
-ReadPoint (rMF, x3, y3);
+ReadPoint (rMF, x1, y1, flags);
+ReadPoint (rMF, x2, y2, flags);
+ReadPoint (rMF, x3, y3, flags);
 
 BitmapEx aBmp( image.graphic.GetBitmapEx () );
 const Rectangle aCropRect 
(::vcl::unotools::pointFromB2DPoint (Map (sx, sy)),
commit 06484b6946ac6a974c24af6624fb75bbe298c1e8
Author: Michael Stahl mst...@redhat.com
Date:   Fri Mar 9 11:28:28 2012 +0100

fdo#46926: fix the fix for Python 3

Thanks to Maxime de Roucy for the hint that the cmpfunc type doesn't 
exist.

diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index 555fefd..d51ad3b 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -661,7 +661,7 @@ static PyTypeObject PyUNOType =
 (printfunc) 0,
 (getattrfunc) PyUNO_getattr,
 (setattrfunc) PyUNO_setattr,
-(cmpfunc) 0,
+/* this type does not exist in Python 3: (cmpfunc) */ 0,
 (reprfunc) PyUNO_repr,
 0,
 0,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-03-09 Thread Miklos Vajna

 extensions/source/bibliography/bibload.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 285b3a4fe0b5b21abe061dfb664800b7e537471e
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Mar 9 14:09:30 2012 +

Fix tools-bibliography database, brown paper bag over head commit :-)

(cherry picked from commit bd1088567bafa6293ffecf5331a9016b6d0438e3)

Signed-off-by: Miklos Vajna vmik...@suse.cz

diff --git a/extensions/source/bibliography/bibload.cxx 
b/extensions/source/bibliography/bibload.cxx
index 9159124..8b581fd 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -250,7 +250,7 @@ namespace
 static bool lcl_isBaseAvailable()
 {
 Reference XMultiServiceFactory   xMgr = 
comphelper::getProcessServiceFactory();
-Reference XAggregation  xAggregate = Reference XAggregation ( 
xMgr-createInstance(C2U(com.sun.star.sbd.RowSet)), UNO_QUERY);
+Reference XAggregation  xAggregate = Reference XAggregation ( 
xMgr-createInstance(C2U(com.sun.star.sdbc.RowSet)), UNO_QUERY);
 return xAggregate.is();
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/CppunitTest_sw_regression_test.mk sw/qa unotest/inc unotest/source

2012-03-09 Thread Markus Mohrhard

 sw/CppunitTest_sw_regression_test.mk |  141 ++
 sw/qa/extras/data/odt/test.odt   |binary
 sw/qa/extras/regression-test.cxx |  173 +++
 unotest/inc/unotest/bootstrapfixturebase.hxx |3 
 unotest/source/cpp/bootstrapfixturebase.cxx  |5 
 5 files changed, 322 insertions(+)

New commits:
commit b8d86729799d0494ca0a4d5ee659541d3d81f775
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri Mar 9 15:33:55 2012 +0100

add regression test for writer

use the hidden layout dump export filter to export the state of the
layout and compare it against a reference file

Still a work in progress.

diff --git a/sw/CppunitTest_sw_regression_test.mk 
b/sw/CppunitTest_sw_regression_test.mk
new file mode 100644
index 000..2e989ec
--- /dev/null
+++ b/sw/CppunitTest_sw_regression_test.mk
@@ -0,0 +1,141 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+# 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Red Hat, Inc., CaolÃ¡n McNamara caol...@redhat.com
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# 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.
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_regression_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_regression_test, \
+sw/qa/extras/regression-test \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,sw_regression_test, \
+avmedia \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+drawinglayer \
+editeng \
+fileacc \
+for \
+forui \
+i18nisolang1 \
+msfilter \
+oox \
+sal \
+salhelper \
+sax \
+sb \
+sw \
+sfx \
+sot \
+svl \
+svt \
+svx \
+svxcore \
+   test \
+tl \
+tk \
+ucbhelper \
+   unotest \
+utl \
+vbahelper \
+vcl \
+xo \
+   $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_regression_test,\
+-I$(realpath $(SRCDIR)/sw/source/ui/inc) \
+-I$(realpath $(SRCDIR)/sw/inc) \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_add_api,sw_regression_test,\
+offapi \
+oovbaapi \
+udkapi \
+))
+
+$(eval $(call gb_CppunitTest_uses_ure,sw_regression_test))
+
+$(eval $(call gb_CppunitTest_add_type_rdbs,sw_regression_test,\
+oovbaapi \
+types \
+))
+
+$(eval $(call gb_CppunitTest_add_components,sw_regression_test,\
+basic/util/sb \
+comphelper/util/comphelp \
+configmgr/source/configmgr \
+dbaccess/util/dba \
+fileaccess/source/fileacc \
+filter/source/config/cache/filterconfig1 \
+forms/util/frm \
+framework/util/fwk \
+i18npool/util/i18npool \
+oox/util/oox \
+package/source/xstor/xstor \
+package/util/package2 \
+sax/source/expatwrap/expwrap \
+sax/source/fastparser/fastsax \
+sw/util/sw \
+sw/util/swd \
+sw/util/msword \
+sw/util/vbaswobj \
+scripting/source/basprov/basprov \
+scripting/util/scriptframe \
+sfx2/util/sfx \
+sot/util/sot \
+svl/source/fsstor/fsstorage \
+toolkit/util/tk \
+ucb/source/core/ucb1 \
+ucb/source/ucp/file/ucpfile1 \
+ucb/source/ucp/tdoc/ucptdoc1 \
+unotools/util/utl \
+unoxml/source/rdf/unordf \
+unoxml/source/service/unoxml \
+))
+
+$(eval $(call gb_CppunitTest_set_args,sw_regression_test,\
+--headless \
+--protector unoexceptionprotector$(gb_Library_DLLEXT) 
unoexceptionprotector \
+-env:CONFIGURATION_LAYERS=xcsxcu:$(call 
gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call 
gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call 
gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry) \
+))
+# .../spool is required for the (somewhat strange) filter configuration
+
+# we need to
+# a) explicitly depend on library msword because it is not implied by a link
+#relation
+# b) explicitly depend on the sw resource files

[Libreoffice-commits] .: fpicker/source vcl/inc

2012-03-09 Thread Lubos Lunak

 fpicker/source/unx/kde4/KDE4FilePicker.cxx |   15 ---
 vcl/inc/vcl/settings.hxx   |   26 +-
 2 files changed, 13 insertions(+), 28 deletions(-)

New commits:
commit 77ee92a6bd8f40022ab03325d158de4b67a41dd0
Author: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Date:   Fri Mar 9 15:50:17 2012 +0100

change vcl's SETTINGS_* #define's to const int

They pollute not only the global namespace, but all namespaces,
given they're are #define's. I bet they'd eventually all conflict
with the namespaced enum in kdelibs headers.

diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx 
b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
index 8e8b3e8..d8df515 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
@@ -55,14 +55,6 @@
 /* * Hack, but needed because of conflicting types... */
 #define Region QtXRegion
 
-//kde has an enum that uses this...OO does too
-#define LO_SETTINGS_MOUSE SETTINGS_MOUSE
-#undef SETTINGS_MOUSE
-#define LO_SETTINGS_LOCALE SETTINGS_LOCALE
-#undef SETTINGS_LOCALE
-#define LO_SETTINGS_STYLE SETTINGS_STYLE
-#undef SETTINGS_STYLE
-
 #include kfiledialog.h
 #include kwindowsystem.h
 #include kapplication.h
@@ -75,13 +67,6 @@
 
 #undef Region
 
-#define SETTINGS_MOUSE LO_SETTINGS_MOUSE
-#undef LO_SETTINGS_MOUSE
-#define SETTINGS_LOCALE LO_SETTINGS_LOCALE
-#undef LO_SETTINGS_LOCALE
-#define SETTINGS_STYLE LO_SETTINGS_STYLE
-#undef LO_SETTINGS_STYLE
-
 using namespace ::com::sun::star;
 
 using namespace ::com::sun::star::ui::dialogs;
diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx
index 2f333ca..f69f91f 100644
--- a/vcl/inc/vcl/settings.hxx
+++ b/vcl/inc/vcl/settings.hxx
@@ -990,19 +990,19 @@ private:
 // - AllSettings -
 // ---
 
-#define SETTINGS_MOUSE  ((sal_uLong)0x0001)
-#define SETTINGS_STYLE  ((sal_uLong)0x0002)
-#define SETTINGS_MISC   ((sal_uLong)0x0004)
-#define SETTINGS_SOUND  ((sal_uLong)0x0008)
-#define SETTINGS_HELP   ((sal_uLong)0x0010)
-#define SETTINGS_LOCALE ((sal_uLong)0x0020)
-#define SETTINGS_UILOCALE   ((sal_uLong)0x0040)
-#define SETTINGS_ALLSETTINGS(SETTINGS_MOUSE |\
- SETTINGS_STYLE | SETTINGS_MISC |\
- SETTINGS_SOUND |\
- SETTINGS_HELP |\
- SETTINGS_LOCALE | SETTINGS_UILOCALE )
-#define SETTINGS_IN_UPDATE_SETTINGS ((sal_uLong)0x0800)   // this flag 
indicates that the data changed event was created
+const int SETTINGS_MOUSE = 0x0001;
+const int SETTINGS_STYLE = 0x0002;
+const int SETTINGS_MISC = 0x0004;
+const int SETTINGS_SOUND = 0x0008;
+const int SETTINGS_HELP = 0x0010;
+const int SETTINGS_LOCALE = 0x0020;
+const int SETTINGS_UILOCALE = 0x0040;
+const int SETTINGS_ALLSETTINGS =   ( SETTINGS_MOUSE |
+ SETTINGS_STYLE | SETTINGS_MISC |
+ SETTINGS_SOUND |
+ SETTINGS_HELP |
+ SETTINGS_LOCALE | SETTINGS_UILOCALE );
+const int SETTINGS_IN_UPDATE_SETTINGS = 0x0800;   // this flag indicates 
that the data changed event was created
   // in 
Windows::UpdateSettings probably because of a global
   // settings changed
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: extras/source

2012-03-09 Thread Caolán McNamara

 extras/source/database/biblio.dbf |binary
 extras/source/database/biblio.dbt |binary
 2 files changed

New commits:
commit c9af2604214a1bff261ced86343eb32de5f18443
Author: Italo Vignoli it...@italovignoli.com
Date:   Fri Mar 9 15:07:02 2012 +

Resolves: fdo#45033 use LibreOffice references in bibliography

diff --git a/extras/source/database/biblio.dbf 
b/extras/source/database/biblio.dbf
index 8a3a6aa..4161cea 100644
Binary files a/extras/source/database/biblio.dbf and 
b/extras/source/database/biblio.dbf differ
diff --git a/extras/source/database/biblio.dbt 
b/extras/source/database/biblio.dbt
index 4c9cc53..e17daea 100644
Binary files a/extras/source/database/biblio.dbt and 
b/extras/source/database/biblio.dbt differ
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: extras/source

2012-03-09 Thread Caolán McNamara

 extras/source/database/biblio.README |   21 +
 1 file changed, 21 insertions(+)

New commits:
commit c7de2ddf67158733ba15cea4cb8f1786e83776d9
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Mar 9 15:09:47 2012 +

document how to update the damn bibliography database

diff --git a/extras/source/database/biblio.README 
b/extras/source/database/biblio.README
new file mode 100644
index 000..8a25c5d
--- /dev/null
+++ b/extras/source/database/biblio.README
@@ -0,0 +1,21 @@
+When updating biblio.odb be aware that biblio.odb *does not* embed the data of
+the database inside the .odb, instead it is configured to store its data in the
+per-user database/biblio/biblio.dbf and database/biblio/biblio.dbt files. i.e.
+the contents of the ~/.libreoffice/3/user/database/biblio dir.
+
+If you edit biblio.odb in base you will really just be changing your local 
data
+store.
+
+So, to really change the bibliography the easiest thing to do is to launch 
writer and
+use tools-bibliography database and edit your local one through that UI [1]
+
+Then *copy* ~/.libreoffice/3/user/database/biblio/biblio.db* to
+extras/source/database/ in order to overwrite biblio.dbf and biblio.dbt and
+copy ~/.libreoffice/3/user/database/biblio.odb to
+extras/source/database/biblio.odb
+
+[1] a) oddly base doesn't show the same fields that the bibliography widget 
does,
+   possibly a bug worth fixing ?
+b) oddly base doesn't seem to PACK the dbase III files after editing, so
+   deleted records still take up space in the file, possibly a bug worth
+   fixing ?
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: lcms2/makefile.mk

2012-03-09 Thread Fridrich Strba

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

New commits:
commit 347de4170751f99d92fb4f014586cd606e30887f
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Fri Mar 9 16:13:19 2012 +0100

The project files for vs2008 are identical in the two directories

diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk
index 10ba736..9369c75 100644
--- a/lcms2/makefile.mk
+++ b/lcms2/makefile.mk
@@ -48,12 +48,11 @@ TARFILE_MD5=327348d67c979c88c2dec59a23a17d85
 CONFIGURE_DIR=.
 
 CONFIGURE_ACTION =
+BUILD_DIR=Projects/VC2010/lcms2_DLL
 
 .IF $(CCNUMVER) = 0016
-BUILD_DIR=Projects/VC2010/lcms2_DLL
 BUILD_ACTION=MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release 
/p:Platform=Win32
 .ELSE
-BUILD_DIR=Projects/VC2008/lcms2_DLL
 BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe /useenv lcms2_DLL.vcproj 
Release|Win32
 .ENDIF
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configmgr/source

2012-03-09 Thread Stephan Bergmann

 configmgr/source/writemodfile.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c7ad399a535d21cc73f0e99fbea361e559b34d4f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Mar 9 16:32:57 2012 +0100

Line breaks in registrymodifications.xcu

diff --git a/configmgr/source/writemodfile.cxx 
b/configmgr/source/writemodfile.cxx
index 8683302..272e739 100644
--- a/configmgr/source/writemodfile.cxx
+++ b/configmgr/source/writemodfile.cxx
@@ -509,7 +509,7 @@ void writeModifications(
 break;
 }
 }
-writeData(handle, RTL_CONSTASCII_STRINGPARAM(/item));
+writeData(handle, RTL_CONSTASCII_STRINGPARAM(/item\n));
 } else {
 assert(node.is());
 rtl::OUString pathRep(
@@ -573,10 +573,10 @@ void writeModFile(
 writeData(
 tmp.handle,
 RTL_CONSTASCII_STRINGPARAM(
-?xml version=\1.0\ encoding=\UTF-8\?oor:items
+?xml version=\1.0\ encoding=\UTF-8\?\noor:items
  xmlns:oor=\http://openoffice.org/2001/registry\;
  xmlns:xs=\http://www.w3.org/2001/XMLSchema\;
- xmlns:xsi=\http://www.w3.org/2001/XMLSchema-instance\;));
+ xmlns:xsi=\http://www.w3.org/2001/XMLSchema-instance\;\n));
 //TODO: Do not write back information about those removed items that did 
not
 // come from the .xcs/.xcu files, anyway (but had been added dynamically
 // instead):
@@ -590,7 +590,7 @@ void writeModFile(
 Data::findNode(Data::NO_LAYER, data.getComponents(), j-first),
 j-second);
 }
-writeData(tmp.handle, RTL_CONSTASCII_STRINGPARAM(/oor:items));
+writeData(tmp.handle, RTL_CONSTASCII_STRINGPARAM(/oor:items\n));
 oslFileError e = osl_closeFile(tmp.handle);
 tmp.closed = true;
 if (e != osl_File_E_None) {
___
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

2012-03-09 Thread Michael Stahl

 sw/source/filter/ww8/docxattributeoutput.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 6eea398000f04c68f422ab07353ea4631f4edb5e
Author: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Date:   Mon Jan 9 15:51:10 2012 +0100

fdo#46337: don't use an invalidated iterator

(cherry picked from commit 2df1c40b4b7cb3107a68984db644f10097f04c3c)

Signed-off-by: Michael Stahl mst...@redhat.com

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index d9f3376..0ea06b7 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -517,7 +517,7 @@ void DocxAttributeOutput::StartRun( const SwRedlineData* 
pRedlineData )
 void DocxAttributeOutput::EndRun()
 {
 // Write field starts
-for ( std::vectorFieldInfos::iterator pIt = m_Fields.begin(); pIt != 
m_Fields.end(); ++pIt )
+for ( std::vectorFieldInfos::iterator pIt = m_Fields.begin(); pIt != 
m_Fields.end(); )
 {
 // Add the fields starts for all but hyperlinks and TOCs
 if ( pIt-bOpen  pIt-pField )
@@ -528,10 +528,11 @@ void DocxAttributeOutput::EndRun()
 // Unknown fields sould be removed too
 if ( !pIt-bClose || ( pIt-eType == ww::eUNKNOWN ) )
 {
-m_Fields.erase( pIt );
---pIt;
+pIt = m_Fields.erase( pIt );
+continue;
 }
 }
+++pIt;
 }
 
 // write the run properties + the text, already in the correct order
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-03-09 Thread Michael Meeks

 desktop/source/deployment/manager/dp_manager.cxx |   64 +++
 ucb/source/ucp/file/shell.cxx|4 +
 2 files changed, 36 insertions(+), 32 deletions(-)

New commits:
commit d3192948fe968fc4d6a8ec0e6fda232f265b3c4c
Author: Michael Meeks michael.me...@suse.com
Date:   Fri Mar 9 17:02:32 2012 +

fdo#40607 - osl_syncFile having written, and avoid doing that on start

diff --git a/desktop/source/deployment/manager/dp_manager.cxx 
b/desktop/source/deployment/manager/dp_manager.cxx
index 4f6f6c0..0efa4c0 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -311,6 +311,36 @@ void PackageManagerImpl::initRegistryBackends()
  m_xComponentContext ) );
 }
 
+// this overcomes previous rumours that the sal API is misleading
+// as to whether a directory is truly read-only or not
+static bool isMacroURLWriteable( const OUString rMacro )
+{
+if (rMacro.getLength()  (sal_Int32)sizeof (vnd.sun.star.expand:))
+return true;
+rtl::OUString aURL( rMacro.copy( sizeof (vnd.sun.star.expand:) - 1 ) );
+::rtl::Bootstrap::expandMacros( aURL );
+
+bool bError;
+sal_uInt64 nWritten = 0;
+::osl::File aFile( aURL );
+
+bError = aFile.open( osl_File_OpenFlag_Read |
+ osl_File_OpenFlag_Write |
+ osl_File_OpenFlag_Create ) != ::osl::FileBase::E_None;
+if (!bError)
+bError = aFile.write( 1, 1, nWritten ) != ::osl::FileBase::E_None;
+if (aFile.close() != ::osl::FileBase::E_None)
+bError = true;
+if (osl::File::remove( aURL ) != ::osl::FileBase::E_None)
+bError = true;
+
+OSL_TRACE (local url '%s' - '%s' %s readonly\n,
+   rtl::OUStringToOString( rMacro, RTL_TEXTENCODING_UTF8 
).getStr(),
+   rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ).getStr(),
+   bError ? is : is not);
+return bError;
+}
+
 
//__
 Referencedeployment::XPackageManager PackageManagerImpl::create(
 ReferenceXComponentContext const  xComponentContext,
@@ -406,39 +436,9 @@ Referencedeployment::XPackageManager 
PackageManagerImpl::create(
 ReferenceXCommandEnvironment xCmdEnv;
 
 try {
-//There is no stampURL for the bundled folder
+// There is no stampURL for the bundled folder
 if (!stampURL.isEmpty())
-{
-#define CURRENT_STAMP 1
-try {
-//The osl file API does not allow to find out if one can write
-//into a folder. Therefore we try to write a file. Then we 
delete
-//it, so that it does not hinder uninstallation of OOo
-// probe writing:
-::ucbhelper::Content ucbStamp( stampURL, xCmdEnv );
-::rtl::OString stamp(
-RTL_CONSTASCII_STRINGPARAM(CURRENT_STAMP) );
-Referenceio::XInputStream xData(
-::xmlscript::createInputStream(
-::rtl::ByteSequence(
-reinterpret_castsal_Int8 const *(stamp.getStr()),
-stamp.getLength() ) ) );
-ucbStamp.writeStream( xData, true /* replace existing */ );
-that-m_readOnly = false;
-erase_path( stampURL, xCmdEnv );
-}
-catch (const RuntimeException ) {
-try {
-erase_path( stampURL, xCmdEnv );
-} catch (...)
-{
-}
-throw;
-}
-catch (const Exception ) {
-that-m_readOnly = true;
-}
-}
+that-m_readOnly = !isMacroURLWriteable( stampURL );
 
 if (!that-m_readOnly  !logFile.isEmpty())
 {
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index 725820d..86236f0 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -1909,6 +1909,10 @@ shell::write( sal_Int32 CommandId,
 }
 } while( nReadBytes == nRequestedBytes );
 
+aFile.sync(); // fsync / flush it to disk.
+OSL_TRACE( fsync'd file '%s'\n,
+   rtl::OUStringToOString( aUnqPath, RTL_TEXTENCODING_UTF8 
).getStr() );
+
 err = aFile.close();
 if( err != osl::FileBase::E_None  )
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: afms/README wizards/README xmlhelp/README xmlreader/README xpdf/README

2012-03-09 Thread Michael Meeks

 afms/README  |2 +-
 wizards/README   |3 +++
 xmlhelp/README   |2 +-
 xmlreader/README |7 +++
 xpdf/README  |3 +++
 5 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit eea51b762236fa4c24da82e691a67527eac6a157
Author: Michael Meeks michael.me...@suse.com
Date:   Fri Mar 9 17:03:17 2012 +

minor documentation tweaks

diff --git a/afms/README b/afms/README
index c149c1a..78be83a 100644
--- a/afms/README
+++ b/afms/README
@@ -1 +1 @@
-External package containing font metrics
+External package containing font metrics.
diff --git a/wizards/README b/wizards/README
index c36091f..332c535 100644
--- a/wizards/README
+++ b/wizards/README
@@ -1 +1,4 @@
 Java wizards for db setup, importing, tutorials, etc.
+
+There are also partially converted python copies of each wizard, which
+we are hoping to migrate to in order to remove the Java dependency here.
\ No newline at end of file
diff --git a/xmlhelp/README b/xmlhelp/README
index b4c1f05..3e54ddc 100644
--- a/xmlhelp/README
+++ b/xmlhelp/README
@@ -1 +1 @@
-Help reader and viewer for online help.
+Help reader and viewer for online help.
\ No newline at end of file
diff --git a/xmlreader/README b/xmlreader/README
new file mode 100644
index 000..92a624d
--- /dev/null
+++ b/xmlreader/README
@@ -0,0 +1,7 @@
+fast/small XML pull parser.
+
+Implements a simple, fast pull parser, currently used by [[configmgr]] and
+[[stoc]]'s simpleregistry code (used to register UNO components in
+services.rdb files). It supports a subset of XML features, but is fast
+and small.
+
diff --git a/xpdf/README b/xpdf/README
index dffe106..0c73365 100644
--- a/xpdf/README
+++ b/xpdf/README
@@ -1 +1,4 @@
 PDF-viewer library from [http://www.foolabs.com/xpdf/].
+
+This code is -used by [[sdext/source/pdfimport]] to implement the PDF
+import functionality, that allows PDF's to be edited.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-03-09 Thread Stephan Bergmann

 sc/inc/dpgroup.hxx   |2 +-
 sc/inc/dptablecache.hxx  |2 +-
 sc/source/core/data/dpgroup.cxx  |7 ++-
 sc/source/core/data/dptablecache.cxx |   10 ++
 4 files changed, 10 insertions(+), 11 deletions(-)

New commits:
commit 59e4ac4c3e55562856cdab04435489f9dc67d318
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Mar 9 18:22:00 2012 +0100

-Werror={deprecated-declarations,sign-compare,unused-parameter}

diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx
index 5340b70..be7d39c 100644
--- a/sc/inc/dpgroup.hxx
+++ b/sc/inc/dpgroup.hxx
@@ -107,7 +107,7 @@ public:
 longGetGroupDim() const { return nGroupDim; }
 const  String GetName() const   { return aGroupName; }
 
-const std::vector SCROW   GetColumnEntries( const ScDPCacheTable  
rCacheTable, const std::vector SCROW  rOriginal ) const;
+const std::vector SCROW   GetColumnEntries( const ScDPCacheTable  
rCacheTable ) const;
 const ScDPGroupItem* GetGroupForData( const ScDPItemData rData ) const;  
// rData = entry in original dim.
 const ScDPGroupItem* GetGroupForName( const ScDPItemData rName ) const;  
// rName = entry in group dim.
 const ScDPGroupItem* GetGroupByIndex( size_t nIndex ) const;
diff --git a/sc/inc/dptablecache.hxx b/sc/inc/dptablecache.hxx
index 62af398..661c5cd 100644
--- a/sc/inc/dptablecache.hxx
+++ b/sc/inc/dptablecache.hxx
@@ -149,7 +149,7 @@ public:
 
 SCROW  GetRowCount() const;
 SCROW  GetItemDataId( sal_uInt16 nDim, SCROW nRow, bool bRepeatIfEmpty ) 
const;
-rtl::OUString GetDimensionName(long nDim) const;
+rtl::OUString GetDimensionName(LabelsType::size_type nDim) const;
 bool IsRowEmpty( SCROW nRow ) const;
 bool IsValid() const;
 bool ValidQuery(SCROW nRow, const ScQueryParam rQueryParam) const;
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index a2eb282..98816b0 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -450,7 +450,7 @@ void ScDPGroupDimension::SetGroupDim( long nDim )
 }
 
 const std::vectorSCROW ScDPGroupDimension::GetColumnEntries(
-const ScDPCacheTable rCacheTable, const std::vectorSCROW rOriginal) 
const
+const ScDPCacheTable rCacheTable) const
 {
 if (!maMemberEntries.empty())
 return maMemberEntries;
@@ -635,10 +635,7 @@ const std::vector SCROW  
ScDPGroupTableData::GetColumnEntries( long  nColumn
 else
 {
 const ScDPGroupDimension rGroupDim = aGroups[nColumn - 
nSourceCount];
-long nSourceDim = rGroupDim.GetSourceDim();
-// collection is cached at pSourceData, GetColumnEntries can be 
called every time
-const  std::vector SCROW  rOriginal = 
pSourceData-GetColumnEntries( nSourceDim );
-return rGroupDim.GetColumnEntries( GetCacheTable(), rOriginal );
+return rGroupDim.GetColumnEntries( GetCacheTable() );
 }
 }
 
diff --git a/sc/source/core/data/dptablecache.cxx 
b/sc/source/core/data/dptablecache.cxx
index ff12648..c01e132 100644
--- a/sc/source/core/data/dptablecache.cxx
+++ b/sc/source/core/data/dptablecache.cxx
@@ -626,7 +626,9 @@ bool ScDPCache::AddData(long nDim, ScDPItemData* pData, 
sal_uLong nNumFormat)
 OSL_ENSURE( nDim  mnColumnCount  nDim =0 , dimension out of bound );
 
 // Wrap this instance with scoped pointer to ensure proper deletion.
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 auto_ptrScDPItemData p(pData);
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 SCROW nIndex = 0;
 Field rField = maFields[nDim];
@@ -636,7 +638,7 @@ bool ScDPCache::AddData(long nDim, ScDPItemData* pData, 
sal_uLong nNumFormat)
 rField.maItems.push_back(p);
 rField.maGlobalOrder.insert(
 rField.maGlobalOrder.begin()+nIndex, rField.maItems.size()-1);
-OSL_ENSURE(rField.maGlobalOrder[nIndex] == rField.maItems.size()-1, 
ScDPTableDataCache::AddData );
+OSL_ENSURE(rField.maGlobalOrder[nIndex] == 
sal::static_int_castSCROW(rField.maItems.size())-1, 
ScDPTableDataCache::AddData );
 rField.maData.push_back(rField.maItems.size()-1);
 rField.maNumFormats.push_back(nNumFormat);
 }
@@ -671,12 +673,12 @@ const ScDPCache::GroupItems* 
ScDPCache::GetGroupItems(long nDim) const
 return NULL;
 }
 
-rtl::OUString ScDPCache::GetDimensionName(long nDim) const
+rtl::OUString ScDPCache::GetDimensionName(LabelsType::size_type nDim) const
 {
 OSL_ENSURE(nDim  maLabelNames.size()-1 , 
ScDPTableDataCache::GetDimensionName);
 OSL_ENSURE(maLabelNames.size() == static_cast sal_uInt16 
(mnColumnCount+1), ScDPTableDataCache::GetDimensionName);
 
-if ( static_castsize_t(nDim+1)  maLabelNames.size() )
+if ( nDim+1  maLabelNames.size() )
 {
 return maLabelNames[nDim+1];
 }
@@ -1099,7 +1101,7 @@ SCROW ScDPCache::GetOrder(long nDim, SCROW nIndex) const
 }
 }
 
-OSL_ENSURE(nIndex = 0  nIndex

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

2012-03-09 Thread Kohei Yoshida

 sc/inc/dpitemdata.hxx  |4 +---
 sc/source/core/data/dpitemdata.cxx |   27 +++
 2 files changed, 12 insertions(+), 19 deletions(-)

New commits:
commit 1bb7875f275d95a0a764df5d8d6954b7e8841152
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Fri Mar 9 12:37:30 2012 -0500

Correct equality check  disable Dump() for normal build.

diff --git a/sc/inc/dpitemdata.hxx b/sc/inc/dpitemdata.hxx
index 4aac20c..3e09d89 100644
--- a/sc/inc/dpitemdata.hxx
+++ b/sc/inc/dpitemdata.hxx
@@ -40,7 +40,7 @@
 
 #include boost/unordered_map.hpp
 
-#define DEBUG_DP_ITEM_DATA 1
+#define DEBUG_DP_ITEM_DATA 0
 
 class ScDocument;
 
diff --git a/sc/source/core/data/dpitemdata.cxx 
b/sc/source/core/data/dpitemdata.cxx
index f0ac5d5..2870a5c 100644
--- a/sc/source/core/data/dpitemdata.cxx
+++ b/sc/source/core/data/dpitemdata.cxx
@@ -186,8 +186,17 @@ bool ScDPItemData::IsCaseInsEqual(const ScDPItemData r) 
const
 if (meType != r.meType)
 return false;
 
-if (meType == Value)
-return rtl::math::approxEqual(mfValue, r.mfValue);
+switch (meType)
+{
+case Value:
+case RangeStart:
+return rtl::math::approxEqual(mfValue, r.mfValue);
+case GroupValue:
+return maGroupValue.mnGroupType == r.maGroupValue.mnGroupType 
+maGroupValue.mnValue == r.maGroupValue.mnValue;
+default:
+;
+}
 
 return ScGlobal::GetpTransliteration()-isEqual(GetString(), 
r.GetString());
 }
commit 5e9d811ab8a1c0481c67e3d4589e0a16fb781120
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Fri Mar 9 12:35:33 2012 -0500

Apparently nobody uses Hash() anymore.

diff --git a/sc/inc/dpitemdata.hxx b/sc/inc/dpitemdata.hxx
index 926ce7a..4aac20c 100644
--- a/sc/inc/dpitemdata.hxx
+++ b/sc/inc/dpitemdata.hxx
@@ -93,8 +93,6 @@ public:
 void SetErrorString(const rtl::OUString rS);
 bool IsCaseInsEqual(const ScDPItemData r) const;
 
-size_t Hash() const;
-
 // exact equality
 bool operator==(const ScDPItemData r) const;
 
diff --git a/sc/source/core/data/dpitemdata.cxx 
b/sc/source/core/data/dpitemdata.cxx
index 8f16a33..f0ac5d5 100644
--- a/sc/source/core/data/dpitemdata.cxx
+++ b/sc/source/core/data/dpitemdata.cxx
@@ -192,20 +192,6 @@ bool ScDPItemData::IsCaseInsEqual(const ScDPItemData r) 
const
 return ScGlobal::GetpTransliteration()-isEqual(GetString(), 
r.GetString());
 }
 
-size_t ScDPItemData::Hash() const
-{
-if (meType == Value)
-return static_castsize_t(rtl::math::approxFloor(mfValue));
-
-// If we do unicode safe case insensitive hash we can drop
-// ScDPItemData::operator== and use ::IsCasInsEqual
-rtl::OUString aStr = GetString();
-if (aStr.isEmpty())
-return 0;
-
-return rtl_ustr_hashCode_WithLength(aStr.getStr(), aStr.getLength());
-}
-
 bool ScDPItemData::operator== (const ScDPItemData r) const
 {
 if (meType != r.meType)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-03-09 Thread Kohei Yoshida

 sc/source/core/data/dpdimsave.cxx  |   14 +++---
 sc/source/core/data/dpgroup.cxx|   77 -
 sc/source/core/data/dpitemdata.cxx |   23 ++-
 3 files changed, 23 insertions(+), 91 deletions(-)

New commits:
commit 4c2370c0a5dd20c226ce0f12823c125f0c07589f
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Fri Mar 9 13:29:31 2012 -0500

Fix infinite looping memory devouring on refreshing table with date 
grouping.

It so happens that both group info and date info can be enabled, in which
case the date info takes precedence.

diff --git a/sc/source/core/data/dpdimsave.cxx 
b/sc/source/core/data/dpdimsave.cxx
index cc02b15..9d02594 100644
--- a/sc/source/core/data/dpdimsave.cxx
+++ b/sc/source/core/data/dpdimsave.cxx
@@ -466,7 +466,13 @@ void ScDPSaveNumGroupDimension::AddToData( 
ScDPGroupTableData rData ) const
 void ScDPSaveNumGroupDimension::AddToCache(ScDPCache rCache) const
 {
 long nDim = rCache.GetDimensionIndex(aDimensionName);
-if (aGroupInfo.mbEnable)
+if (aDateInfo.mbEnable)
+{
+// Date grouping
+SvNumberFormatter* pFormatter = rCache.GetDoc()-GetFormatTable();
+fillDateGroupDimension(rCache, aDateInfo, nDim, nDim, nDatePart, 
pFormatter);
+}
+else if (aGroupInfo.mbEnable)
 {
 // Number-range grouping
 
@@ -558,12 +564,6 @@ void ScDPSaveNumGroupDimension::AddToCache(ScDPCache 
rCache) const
 aItem.SetRangeLast();
 rCache.SetGroupItem(nDim, aItem);
 }
-else if (aDateInfo.mbEnable)
-{
-// Date grouping
-SvNumberFormatter* pFormatter = rCache.GetDoc()-GetFormatTable();
-fillDateGroupDimension(rCache, aDateInfo, nDim, nDim, nDatePart, 
pFormatter);
-}
 }
 
 void ScDPSaveNumGroupDimension::SetGroupInfo( const ScDPNumGroupInfo rNew )
commit 0ee9a1c07ed69e21d0dad4f71791f51ae4c13bc0
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Fri Mar 9 13:13:33 2012 -0500

Use the common method over the local clone.

diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index 98816b0..73a9d10 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -217,78 +217,6 @@ ScDPDateGroupHelper::~ScDPDateGroupHelper()
 
 namespace {
 
-sal_Int32 lcl_GetDatePartValue( double fValue, sal_Int32 nDatePart, 
SvNumberFormatter* pFormatter,
-const ScDPNumGroupInfo* pNumInfo )
-{
-// Start and end are inclusive
-// (End date without a time value is included, with a time value it's not)
-
-if ( pNumInfo )
-{
-if ( fValue  pNumInfo-mfStart  !rtl::math::approxEqual( fValue, 
pNumInfo-mfStart ) )
-return ScDPItemData::DateFirst;
-if ( fValue  pNumInfo-mfEnd  !rtl::math::approxEqual( fValue, 
pNumInfo-mfEnd ) )
-return ScDPItemData::DateLast;
-}
-
-sal_Int32 nResult = 0;
-
-if ( nDatePart == com::sun::star::sheet::DataPilotFieldGroupBy::HOURS || 
nDatePart == com::sun::star::sheet::DataPilotFieldGroupBy::MINUTES || nDatePart 
== com::sun::star::sheet::DataPilotFieldGroupBy::SECONDS )
-{
-// handle time
-// (as in the cell functions, ScInterpreter::ScGetHour etc.: seconds 
are rounded)
-
-double fTime = fValue - ::rtl::math::approxFloor(fValue);
-long nSeconds = (long)::rtl::math::approxFloor(fTime*D_TIMEFACTOR+0.5);
-
-switch ( nDatePart )
-{
-case com::sun::star::sheet::DataPilotFieldGroupBy::HOURS:
-nResult = nSeconds / 3600;
-break;
-case com::sun::star::sheet::DataPilotFieldGroupBy::MINUTES:
-nResult = ( nSeconds % 3600 ) / 60;
-break;
-case com::sun::star::sheet::DataPilotFieldGroupBy::SECONDS:
-nResult = nSeconds % 60;
-break;
-}
-}
-else
-{
-Date aDate = *(pFormatter-GetNullDate());
-aDate += (long)::rtl::math::approxFloor( fValue );
-
-switch ( nDatePart )
-{
-case com::sun::star::sheet::DataPilotFieldGroupBy::YEARS:
-nResult = aDate.GetYear();
-break;
-case com::sun::star::sheet::DataPilotFieldGroupBy::QUARTERS:
-nResult = 1 + ( aDate.GetMonth() - 1 ) / 3; // 1..4
-break;
-case com::sun::star::sheet::DataPilotFieldGroupBy::MONTHS:
-nResult = aDate.GetMonth(); // 1..12
-break;
-case com::sun::star::sheet::DataPilotFieldGroupBy::DAYS:
-{
-Date aYearStart( 1, 1, aDate.GetYear() );
-nResult = ( aDate - aYearStart ) + 1;   // Jan 01 has 
value 1
-if ( nResult = 60  !aDate.IsLeapYear() )
-{
-// days are counted from 1 to 366 - if not from a leap 
year, adjust
-++nResult;
-

[Libreoffice-commits] .: desktop/source

2012-03-09 Thread Stephan Bergmann

 desktop/source/deployment/manager/dp_manager.cxx |   32 ++-
 1 file changed, 14 insertions(+), 18 deletions(-)

New commits:
commit bee742eb7a0d5dfe23e61d9ee49a29286de90256
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Mar 9 19:42:48 2012 +0100

Fix sense of r/o detection code, and clean up

diff --git a/desktop/source/deployment/manager/dp_manager.cxx 
b/desktop/source/deployment/manager/dp_manager.cxx
index 0efa4c0..126aa04 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -32,6 +32,7 @@
 #include dp_platform.hxx
 #include dp_manager.h
 #include dp_identifier.hxx
+#include rtl/oustringostreaminserter.hxx
 #include rtl/ustrbuf.hxx
 #include rtl/string.hxx
 #include rtl/uri.hxx
@@ -313,11 +314,9 @@ void PackageManagerImpl::initRegistryBackends()
 
 // this overcomes previous rumours that the sal API is misleading
 // as to whether a directory is truly read-only or not
-static bool isMacroURLWriteable( const OUString rMacro )
+static bool isMacroURLReadOnly( const OUString rMacro )
 {
-if (rMacro.getLength()  (sal_Int32)sizeof (vnd.sun.star.expand:))
-return true;
-rtl::OUString aURL( rMacro.copy( sizeof (vnd.sun.star.expand:) - 1 ) );
+rtl::OUString aURL( rMacro );
 ::rtl::Bootstrap::expandMacros( aURL );
 
 bool bError;
@@ -334,10 +333,10 @@ static bool isMacroURLWriteable( const OUString rMacro )
 if (osl::File::remove( aURL ) != ::osl::FileBase::E_None)
 bError = true;
 
-OSL_TRACE (local url '%s' - '%s' %s readonly\n,
-   rtl::OUStringToOString( rMacro, RTL_TEXTENCODING_UTF8 
).getStr(),
-   rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ).getStr(),
-   bError ? is : is not);
+SAL_INFO(
+desktop.deployment,
+local url '  rMacro  ' - '  aURL  ' 
+ (bError ? is : is not)   readonly\n);
 return bError;
 }
 
@@ -350,7 +349,7 @@ Referencedeployment::XPackageManager 
PackageManagerImpl::create(
 xComponentContext, context );
 Referencedeployment::XPackageManager xPackageManager( that );
 
-OUString packages, logFile, stampURL;
+OUString packages, logFile, stamp;
 if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(user) )) {
 that-m_activePackages = OUSTR(
 vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/uno_packages);
@@ -371,8 +370,7 @@ Referencedeployment::XPackageManager 
PackageManagerImpl::create(
 //using virtualization it appears that he/she can. Then a shared 
extension can
 //be installed but is only visible for the user (because the extension 
is in
 //the virtual store).
-stampURL = OUSTR(
-vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/stamp.sys);
+stamp = OUSTR($UNO_USER_PACKAGES_CACHE/stamp.sys);
 }
 else if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(shared) )) {
 that-m_activePackages = OUSTR(
@@ -383,8 +381,7 @@ Referencedeployment::XPackageManager 
PackageManagerImpl::create(
 vnd.sun.star.expand:$SHARED_EXTENSIONS_USER/registry);
 logFile = OUSTR(
 vnd.sun.star.expand:$SHARED_EXTENSIONS_USER/log.txt);
-stampURL = OUSTR(
-vnd.sun.star.expand:$UNO_SHARED_PACKAGES_CACHE/stamp.sys);
+stamp = OUSTR($UNO_SHARED_PACKAGES_CACHE/stamp.sys);
 }
 else if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(bundled) )) {
 that-m_activePackages = OUSTR(
@@ -423,8 +420,7 @@ Referencedeployment::XPackageManager 
PackageManagerImpl::create(
 vnd.sun.star.expand:$TMP_EXTENSIONS);
 that-m_registryCache = OUSTR(
 vnd.sun.star.expand:$TMP_EXTENSIONS/registry);
-stampURL = OUSTR(
-vnd.sun.star.expand:$TMP_EXTENSIONS/stamp.sys);
+stamp = OUSTR($TMP_EXTENSIONS/stamp.sys);
 }
 else if (! context.matchAsciiL(
  RTL_CONSTASCII_STRINGPARAM(vnd.sun.star.tdoc:/) )) {
@@ -436,9 +432,9 @@ Referencedeployment::XPackageManager 
PackageManagerImpl::create(
 ReferenceXCommandEnvironment xCmdEnv;
 
 try {
-// There is no stampURL for the bundled folder
-if (!stampURL.isEmpty())
-that-m_readOnly = !isMacroURLWriteable( stampURL );
+// There is no stamp for the bundled folder:
+if (!stamp.isEmpty())
+that-m_readOnly = isMacroURLReadOnly( stamp );
 
 if (!that-m_readOnly  !logFile.isEmpty())
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-03-09 Thread Norbert Thiebaud

New branch 'feature/submodules' available with the following commits:
commit 08ef890439805f5fdf21b05d60e6a28f63cb9eb3
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Fri Mar 9 10:11:38 2012 -0600

submodules: move all files one directory up

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

[Libreoffice-commits] .: basic/source

2012-03-09 Thread Noel Power

 basic/source/classes/sbunoobj.cxx |   16 ++--
 basic/source/inc/sbunoobj.hxx |5 +++--
 basic/source/runtime/step1.cxx|8 +++-
 3 files changed, 20 insertions(+), 9 deletions(-)

New commits:
commit 7dafa7a3b14441c6a27ab051db01f53e2c434f0a
Author: Noel Power noel.po...@novell.com
Date:   Fri Mar 9 18:44:44 2012 +

fix error comparing a struct vs an uno prop containing a struct fdo#42819

hack to fix the scenario where sometimes we get Object required error 
when comparing an uno property containing a struct with another struct ( if 
that property is MAYBEVOID )

diff --git a/basic/source/classes/sbunoobj.cxx 
b/basic/source/classes/sbunoobj.cxx
index 0988d79..9fb8b10 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -2616,6 +2616,7 @@ SbUnoProperty::SbUnoProperty
 (
 const rtl::OUString aName_,
 SbxDataType eSbxType,
+SbxDataType eRealSbxType,
 const Property aUnoProp_,
 sal_Int32 nId_,
 bool bInvocation
@@ -2624,6 +2625,7 @@ SbUnoProperty::SbUnoProperty
 , aUnoProp( aUnoProp_ )
 , nId( nId_ )
 , mbInvocation( bInvocation )
+, mRealType( eRealSbxType )
 {
 // as needed establish an dummy array so that SbiRuntime::CheckArray() 
works
 static SbxArrayRef xDummyArray = new SbxArray( SbxVARIANT );
@@ -2670,8 +2672,9 @@ SbxVariable* SbUnoObject::Find( const String rName, 
SbxClassType t )
 else
 eSbxType = unoToSbxType( rProp.Type.getTypeClass() );
 
+SbxDataType eRealSbxType = ( ( rProp.Attributes  
PropertyAttribute::MAYBEVOID ) ? unoToSbxType( rProp.Type.getTypeClass() ) : 
eSbxType );
 // create the property and superimpose it
-SbxVariableRef xVarRef = new SbUnoProperty( rProp.Name, 
eSbxType, rProp, 0, false );
+SbxVariableRef xVarRef = new SbUnoProperty( rProp.Name, 
eSbxType, eRealSbxType, rProp, 0, false );
 QuickInsert( (SbxVariable*)xVarRef );
 pRes = xVarRef;
 }
@@ -2740,7 +2743,7 @@ SbxVariable* SbUnoObject::Find( const String rName, 
SbxClassType t )
 if( mxInvocation-hasProperty( aUName ) )
 {
 // create a property and superimpose it
-SbxVariableRef xVarRef = new SbUnoProperty( aUName, 
SbxVARIANT, aDummyProp, 0, true );
+SbxVariableRef xVarRef = new SbUnoProperty( aUName, 
SbxVARIANT, SbxVARIANT, aDummyProp, 0, true );
 QuickInsert( (SbxVariable*)xVarRef );
 pRes = xVarRef;
 }
@@ -2799,15 +2802,15 @@ void SbUnoObject::implCreateDbgProperties( void )
 Property aProp;
 
 // Id == -1: display the implemented interfaces corresponding the 
ClassProvider
-SbxVariableRef xVarRef = new SbUnoProperty( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ID_DBG_SUPPORTEDINTERFACES)), 
SbxSTRING, aProp, -1, false );
+SbxVariableRef xVarRef = new SbUnoProperty( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ID_DBG_SUPPORTEDINTERFACES)), 
SbxSTRING, SbxSTRING, aProp, -1, false );
 QuickInsert( (SbxVariable*)xVarRef );
 
 // Id == -2: output the properties
-xVarRef = new SbUnoProperty( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ID_DBG_PROPERTIES)), SbxSTRING, 
aProp, -2, false );
+xVarRef = new SbUnoProperty( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ID_DBG_PROPERTIES)), SbxSTRING, 
SbxSTRING, aProp, -2, false );
 QuickInsert( (SbxVariable*)xVarRef );
 
 // Id == -3: output the Methods
-xVarRef = new SbUnoProperty( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ID_DBG_METHODS)), SbxSTRING, aProp, 
-3, false );
+xVarRef = new SbUnoProperty( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ID_DBG_METHODS)), SbxSTRING, 
SbxSTRING, aProp, -3, false );
 QuickInsert( (SbxVariable*)xVarRef );
 }
 
@@ -2848,8 +2851,9 @@ void SbUnoObject::implCreateAll( void )
 else
 eSbxType = unoToSbxType( rProp.Type.getTypeClass() );
 
+SbxDataType eRealSbxType = ( ( rProp.Attributes  
PropertyAttribute::MAYBEVOID ) ? unoToSbxType( rProp.Type.getTypeClass() ) : 
eSbxType );
 // Create property and superimpose it
-SbxVariableRef xVarRef = new SbUnoProperty( rProp.Name, eSbxType, 
rProp, i, false );
+SbxVariableRef xVarRef = new SbUnoProperty( rProp.Name, eSbxType, 
eRealSbxType, rProp, i, false );
 QuickInsert( (SbxVariable*)xVarRef );
 }
 
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index 5e833c2..f27e99a 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -138,15 +138,16 @@ class SbUnoProperty : public SbxProperty
 sal_Int32 nId;
 
 bool mbInvocation;  // Property is based on invocation
-
+SbxDataType mRealType;
 virtual ~SbUnoProperty();
 public:
 TYPEINFO();
-SbUnoProperty( const rtl::OUString aName_, SbxDataType

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

2012-03-09 Thread Norbert Thiebaud

New branch 'feature/submodules' available with the following commits:
commit e90993d4ee799a7e69ca84604e22472bb3a9734f
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Fri Mar 9 12:44:58 2012 -0600

submodule: convert help binfilter dictionaries. move translations

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

[Libreoffice-commits] .: Branch 'feature/submodules' - .gitattributes .gitignore

2012-03-09 Thread Norbert Thiebaud

 .gitattributes |2 ++
 .gitignore |   57 ++---
 2 files changed, 24 insertions(+), 35 deletions(-)

New commits:
commit 22d181f13854ea5fbb5eb685e50848a9edefdac1
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Fri Mar 9 13:03:25 2012 -0600

adjust .gitignore own its own attributes

irgnoring path related files like .orgi .rej and similar files
should not be done globally for eveyone

If someone what to hide these instead of cleaning-up their house
they should put it in .git/info/exclude
or at other user-level customization places.

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000..416fa8c
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+*.doc binary
+*.sdw binary
diff --git a/.gitignore b/.gitignore
index 0613205..cd48618 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,46 +29,33 @@
 # Backup files:
 *~
 .*sw?
-\#*
 .DS_Store
 
-# StGit
-.stgit-edit.txt
 
 # Build directories:
-/binfilter/unxlng??
-/binfilter/unxlng??.pro
-/binfilter/unxlng???
-/binfilter/unxlng???.pro
-/binfilter/wntmsc???
-/binfilter/wntmsc???.pro
-/binfilter/wntgcc?
-/binfilter/wntgcc?.pro
-/binfilter/unxmac??
-/binfilter/unxmac??.pro
-/binfilter/unx?bsd??
-/binfilter/unx?bsd??.pro
-/binfilter/unxdfly??
-/binfilter/unxdfly??.pro
-/binfilter/unxso???
-/binfilter/unxso???.pro
-/binfilter/unxaig??
-/binfilter/unxaig??.pro
-/binfilter/unxios?
-/binfilter/unxios?.pro
-/binfilter/unxand?
-/binfilter/unxand?.pro
-
-# libxslt debug memdump
-.memdump
+/unxlng??
+/unxlng??.pro
+/unxlng???
+/unxlng???.pro
+/wntmsc???
+/wntmsc???.pro
+/wntgcc?
+/wntgcc?.pro
+/unxmac??
+/unxmac??.pro
+/unx?bsd??
+/unx?bsd??.pro
+/unxdfly??
+/unxdfly??.pro
+/unxso???
+/unxso???.pro
+/unxaig??
+/unxaig??.pro
+/unxios?
+/unxios?.pro
+/unxand?
+/unxand?.pro
 
 # LibreOffice lock files
 .~lock.*#
 
-# Everyone loves patching
-*.orig
-*.rej
-
-# Somepeople love debugging
-gdbtrace.log
-valgrind.log
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/submodules' - .gitattributes .gitignore

2012-03-09 Thread Norbert Thiebaud

 .gitattributes |2 ++
 .gitignore |   44 ++--
 2 files changed, 24 insertions(+), 22 deletions(-)

New commits:
commit d5c8bc9c9bb578fdc2abc0888b611ff9ec80e36b
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Fri Mar 9 12:59:15 2012 -0600

adjust .gitignore, make the repo own its own attributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000..416fa8c
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+*.doc binary
+*.sdw binary
diff --git a/.gitignore b/.gitignore
index eb75b8c..1dc8424 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,26 +30,26 @@
 *~
 
 # Build directories:
-/dictionaries/unxlng??
-/dictionaries/unxlng??.pro
-/dictionaries/unxlng???
-/dictionaries/unxlng???.pro
-/dictionaries/wntmsc???
-/dictionaries/wntmsc???.pro
-/dictionaries/wntgcc?
-/dictionaries/wntgcc?.pro
-/dictionaries/unxmac??
-/dictionaries/unxmac??.pro
-/dictionaries/unx?bsd??
-/dictionaries/unx?bsd??.pro
-/dictionaries/unxdfly??
-/dictionaries/unxdfly??.pro
-/dictionaries/unxso???
-/dictionaries/unxso???.pro
-/dictionaries/unxaig??
-/dictionaries/unxaig??.pro
-/dictionaries/unxios?
-/dictionaries/unxios?.pro
-/dictionaries/unxand?
-/dictionaries/unxand?.pro
+/unxlng??
+/unxlng??.pro
+/unxlng???
+/unxlng???.pro
+/wntmsc???
+/wntmsc???.pro
+/wntgcc?
+/wntgcc?.pro
+/unxmac??
+/unxmac??.pro
+/unx?bsd??
+/unx?bsd??.pro
+/unxdfly??
+/unxdfly??.pro
+/unxso???
+/unxso???.pro
+/unxaig??
+/unxaig??.pro
+/unxios?
+/unxios?.pro
+/unxand?
+/unxand?.pro
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/submodules' - 2 commits - binfilter dictionaries .gitignore .gitmodules helpcontent2

2012-03-09 Thread Norbert Thiebaud

 .gitignore   |   14 +-
 .gitmodules  |3 ---
 binfilter|2 +-
 dictionaries |2 +-
 helpcontent2 |2 +-
 5 files changed, 4 insertions(+), 19 deletions(-)

New commits:
commit 7e49b6d37476f33803df1d12da90b3cb47b12810
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Fri Mar 9 13:05:51 2012 -0600

adjust .gitignore

If you want to hide your mess instead of cleaning-up your tree
please do that in your .git/info/exclude or similar
local places, and not in the shared/delivered settings

diff --git a/.gitignore b/.gitignore
index 65b2631..0b8463b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,14 +4,10 @@
 \#*
 .DS_Store
 
-# StGit
-.stgit-edit.txt
-
 # python generated file
 *.pyc
 
 # where the 'subrepos' and downloads are located
-/clone
 /src
 
 # the build directories
@@ -102,6 +98,7 @@ TAGS
 
 # other repositories
 /translations
+/clone
 
 # compiled python objects for gdb pretty printers
 /solenv/gdb/libreoffice/*.py[co]
@@ -111,18 +108,9 @@ TAGS
 /solenv/bin/concat-deps
 /solenv/bin/concat-deps.exe
 
-# test output files
-test/user-template/user/psprint/pspfontcache
-
 # MSVC debug information
 /*/vc90.pdb
 
-# libxslt debug memdump
-.memdump
-
 # LibreOffice lock files
 .~lock.*#
 
-# Somepeople love debugging
-gdbtrace.log
-valgrind.log
diff --git a/binfilter b/binfilter
index 08ef890..22d181f 16
--- a/binfilter
+++ b/binfilter
@@ -1 +1 @@
-Subproject commit 08ef890439805f5fdf21b05d60e6a28f63cb9eb3
+Subproject commit 22d181f13854ea5fbb5eb685e50848a9edefdac1
diff --git a/dictionaries b/dictionaries
index 2a71819..d5c8bc9 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 2a71819109ce2947340241d67ab0c248a746a6a5
+Subproject commit d5c8bc9c9bb578fdc2abc0888b611ff9ec80e36b
diff --git a/helpcontent2 b/helpcontent2
index d35c02f..3dedc91 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d35c02fb9d6a031c6374ed00f34f20f91ff921a7
+Subproject commit 3dedc91ca1f0bea001daac761265e9a1170079e4
commit e6eef06172e7d69bf3651b289ebd479974b80395
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Fri Mar 9 12:51:13 2012 -0600

clean-up .gitmodule. remove erroneous entry

diff --git a/.gitmodules b/.gitmodules
index 4696d63..8cdf2d4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule dictionaries]
path = dictionaries
url = git://anongit.freedesktop.org/libreoffice/dictionaries
-[submodule helcontent2]
-   path = helcontent2
-   url = git://anongit.freedesktop.org/libreoffice/help
 [submodule helpcontent2]
path = helpcontent2
url = git://anongit.freedesktop.org/libreoffice/help
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-03-09 Thread Kohei Yoshida

 sc/source/ui/attrdlg/condfrmt.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit ff3322a98f7817bd383a2d88fa5ba057648dfeaf
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri Mar 9 01:17:13 2012 +0100

Set entries correctly visible, fdo#47102

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

diff --git a/sc/source/ui/attrdlg/condfrmt.cxx 
b/sc/source/ui/attrdlg/condfrmt.cxx
index 4687bb8..c0fdf6b 100644
--- a/sc/source/ui/attrdlg/condfrmt.cxx
+++ b/sc/source/ui/attrdlg/condfrmt.cxx
@@ -647,6 +647,8 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond11Hdl, void *, 
EMPTYARG )
 aRbCond12.Hide();
 aRbCond11.SetPosPixel( aRBtn1Pos2 );
 aEdtCond11.SetPosSizePixel( aCond1Pos1, aCond1Size1 );
+aEdtCond11.Show();
+aRbCond11.Show();
 }
 
 ChangeCond12Hdl( NULL );
@@ -742,6 +744,8 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond21Hdl, void *, 
EMPTYARG )
 aRbCond22.Hide();
 aRbCond21.SetPosPixel( aRBtn2Pos2 );
 aEdtCond21.SetPosSizePixel( aCond2Pos1, aCond2Size1 );
+aEdtCond21.Show();
+aRbCond21.Show();
 }
 
 ChangeCond22Hdl( NULL );
@@ -839,6 +843,8 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond31Hdl, void *, 
EMPTYARG )
 aRbCond32.Hide();
 aRbCond31.SetPosPixel( aRBtn3Pos2 );
 aEdtCond31.SetPosSizePixel( aCond3Pos1, aCond3Size1 );
+aEdtCond31.Show();
+aRbCond31.Show();
 }
 
 ChangeCond32Hdl( NULL );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2012-03-09 Thread Michael Stahl

 sw/source/ui/docvw/edtwin.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 87279e0e812bac7f2c17f2758a39bcfd942214af
Author: Michael Stahl mst...@redhat.com
Date:   Fri Mar 9 20:30:56 2012 +0100

fdo#45962: fix context menu key yanking cursor out of header/footer

For the context menu key VCL synthesizes a cursor position that is the
center of the window, hence likely to be in the document body.
When SwEditWin::Command calls lcl_CheckHeaderFooterClick, it then moves
the document view cursor; prevent that by only calling that for actual
mouse events.  (regression from a6176612ff1a6a142a68964b2c0834d28125fc45)

diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 2613779..bb2daba 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -4733,7 +4733,7 @@ void SwEditWin::Command( const CommandEvent rCEvt )
 if (rView.GetPostItMgr()-IsHit(rCEvt.GetMousePosPixel()))
 return;
 
-if ( lcl_CheckHeaderFooterClick( rSh,
+if (rCEvt.IsMouseEvent()  lcl_CheckHeaderFooterClick( rSh,
 PixelToLogic( rCEvt.GetMousePosPixel() ), 1 ) )
 return;
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-03-09 Thread Kohei Yoshida

 sc/source/ui/dbgui/dbnamdlg.cxx |7 ---
 sc/source/ui/dbgui/filtdlg.cxx  |2 --
 sc/source/ui/dbgui/foptmgr.cxx  |   30 ++
 sc/source/ui/dbgui/sfiltdlg.cxx |2 --
 sc/source/ui/inc/filtdlg.hxx|1 -
 sc/source/ui/inc/foptmgr.hxx|2 --
 6 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit a1091d0dbddaf59d8e5dba74e7c7a2bbd9778e06
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri Mar 9 01:51:54 2012 +0100

don't show the anonymous db string, it is for internal use only

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

diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx
index eec3c88..61bd2ce 100644
--- a/sc/source/ui/dbgui/foptmgr.cxx
+++ b/sc/source/ui/dbgui/foptmgr.cxx
@@ -196,9 +196,17 @@ void ScFilterOptionsMgr::Init()
 }
 }
 
-theDbArea.appendAscii(RTL_CONSTASCII_STRINGPARAM( ());
-theDbArea.append(theDbName).append(')');
-rFtDbArea.SetText( theDbArea.makeStringAndClear() );
+if ( 
!theDbName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STR_DB_LOCAL_NONAME)) )
+{
+theDbArea.appendAscii(RTL_CONSTASCII_STRINGPARAM( ());
+theDbArea.append(theDbName).append(')');
+rFtDbArea.SetText( theDbArea.makeStringAndClear() );
+}
+else
+{
+rFtDbAreaLabel.SetText( rtl::OUString() );
+rFtDbArea.SetText( rtl::OUString() );
+}
 
 //--
 // Kopierposition:
commit 22289e0ac4782af17f80b442b65ffe5710c9479e
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri Mar 9 02:08:40 2012 +0100

remove one more reference to the anonymous db string

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

diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index c41f860..9db699b 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -245,7 +245,6 @@ void ScDbNameDlg::Init()
 pDBData = pDBColl-GetDBAtCursor( nStartCol, nStartRow, nStartTab, 
sal_True );
 if ( pDBData )
 {
-::rtl::OUString theDbName;
 ScAddress  rStart = theCurArea.aStart;
 ScAddress  rEnd   = theCurArea.aEnd;
 SCCOL nCol1;
@@ -260,7 +259,9 @@ void ScDbNameDlg::Init()
  (rStart.Col() == nCol1)  (rStart.Row() == nRow1)
  (rEnd.Col()   == nCol2)  (rEnd.Row()   == nRow2 ) )
 {
-aEdName.SetText(pDBData-GetName());
+rtl::OUString aDBName = pDBData-GetName();
+if 
(!aDBName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(STR_DB_LOCAL_NONAME)))
+aEdName.SetText(aDBName);
 
 aBtnHeader.Check( pDBData-HasHeader() );
 aBtnDoSize.Check( pDBData-IsDoSize() );
commit 2601f6cfaa34b636dbb6995f7be94d6ad4135f46
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri Mar 9 02:16:06 2012 +0100

prevent creating new db ranges with the internal anonymous db name

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

diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index d5bffbe..c41f860 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -468,7 +468,7 @@ IMPL_LINK( ScDbNameDlg, AddBtnHdl, void *, EMPTYARG )
 
 if ( aNewName.Len()  0  aNewArea.Len()  0 )
 {
-if ( ScRangeData::IsNameValid( aNewName, pDoc ) )
+if ( ScRangeData::IsNameValid( aNewName, pDoc )  
!aNewName.EqualsAscii(STR_DB_LOCAL_NONAME) )
 {
 //  weil jetzt editiert werden kann, muss erst geparst werden
 ScRange aTmpRange;
commit bbdd80a3812afc11d829ae7fa6ecc55f7b29586a
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri Mar 9 01:40:03 2012 +0100

use new anonymous db name in filter dlg, fdo#47105

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

diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 2bb76ea..93ad302 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -115,7 +115,6 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* 
pCW, Window* pParent,
 aFtDbAreaLabel  ( this, ScResId( FT_DBAREA_LABEL ) ),
 aFtDbArea   ( this, ScResId( FT_DBAREA ) ),
 aStrUndefined   ( ResId::toString(ScResId(SCSTR_UNDEFINED)) ),
-aStrNoName  ( ScGlobal::GetRscString(STR_DB_NONAME) ),
 aStrNone( ResId::toString(ScResId(SCSTR_NONE)) ),
 aStrEmpty   ( ResId::toString(ScResId(SCSTR_EMPTY)) ),
 aStrNotEmpty( ResId::toString(ScResId(SCSTR_NOTEMPTY)) ),
@@ -290,7 +289,6 @@ void ScFilterDlg::Init( const SfxItemSet rArgSet )

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

2012-03-09 Thread Kohei Yoshida

 sc/inc/dpcache.hxx  |6 +++---
 sc/source/core/data/dpcache.cxx |   29 -
 2 files changed, 15 insertions(+), 20 deletions(-)

New commits:
commit 3a28389d6713bf29e1da2fea07b663fdd9cc3faa
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Fri Mar 9 15:56:30 2012 -0500

Use flat_segment_tree to store the empty row flags.

diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx
index 31d5103..2880c5a 100644
--- a/sc/inc/dpcache.hxx
+++ b/sc/inc/dpcache.hxx
@@ -41,6 +41,7 @@
 #include boost/noncopyable.hpp
 #include boost/scoped_ptr.hpp
 #include boost/ptr_container/ptr_vector.hpp
+#include mdds/flat_segment_tree.hpp
 
 #include vector
 
@@ -119,7 +120,7 @@ private:
 GroupFieldsType maGroupFields;
 
 LabelsType maLabelNames;// Stores dimension names.
-std::vectorbool maEmptyRows; // Keeps track of empty rows.
+mdds::flat_segment_treeSCROW, bool maEmptyRows;
 
 bool mbDisposing;
 
@@ -150,7 +151,7 @@ public:
 SCROW  GetRowCount() const;
 SCROW  GetItemDataId( sal_uInt16 nDim, SCROW nRow, bool bRepeatIfEmpty ) 
const;
 rtl::OUString GetDimensionName(LabelsType::size_type nDim) const;
-bool IsRowEmpty( SCROW nRow ) const;
+bool IsRowEmpty(SCROW nRow) const;
 bool ValidQuery(SCROW nRow, const ScQueryParam rQueryParam) const;
 
 ScDocument* GetDoc() const;
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 9ae41a4..73e1819 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -228,6 +228,7 @@ ScDPCache::Field::Field() {}
 ScDPCache::ScDPCache(ScDocument* pDoc) :
 mpDoc( pDoc ),
 mnColumnCount ( 0 ),
+maEmptyRows(0, MAXROW, true),
 mbDisposing(false)
 {
 }
@@ -341,6 +342,9 @@ bool ScDPCache::InitFromDoc(ScDocument* pDoc, const 
ScRange rRange)
 
 maLabelNames.reserve(mnColumnCount+1);
 
+// Set all rows non-empty first, then only tag empty ones in AddData().
+maEmptyRows.insert_front(nStartRow, nEndRow+1, false);
+
 for (sal_uInt16 nCol = nStartCol; nCol = nEndCol; ++nCol)
 {
 AddLabel(createLabelString(pDoc, nCol, nStartRow, nDocTab));
@@ -352,6 +356,7 @@ bool ScDPCache::InitFromDoc(ScDocument* pDoc, const 
ScRange rRange)
 AddData(nCol - nStartCol, pData.release(), nNumFormat);
 }
 }
+maEmptyRows.build_tree();
 return true;
 }
 
@@ -409,6 +414,7 @@ bool ScDPCache::InitFromDataBase (const 
Referencesdbc::XRowSet xRowSet, const
 
 xRowSet-beforeFirst();
 
+maEmptyRows.build_tree();
 return true;
 }
 catch (const Exception)
@@ -610,9 +616,11 @@ bool ScDPCache::ValidQuery( SCROW nRow, const ScQueryParam 
rParam) const
 return bRet;
 }
 
-bool ScDPCache::IsRowEmpty( SCROW nRow ) const
+bool ScDPCache::IsRowEmpty(SCROW nRow) const
 {
-return maEmptyRows[nRow];
+bool bEmpty = true;
+maEmptyRows.search_tree(nRow, bEmpty);
+return bEmpty;
 }
 
 bool ScDPCache::AddData(long nDim, ScDPItemData* pData, sal_uLong nNumFormat)
@@ -639,14 +647,10 @@ bool ScDPCache::AddData(long nDim, ScDPItemData* pData, 
sal_uLong nNumFormat)
 else
 rField.maData.push_back(rField.maGlobalOrder[nIndex]);
 
-//init empty row tag
 size_t nCurRow = maFields[nDim].maData.size() - 1;
 
-while (maEmptyRows.size() = nCurRow)
-maEmptyRows.push_back(true);
-
-if (!pData-IsEmpty())
-maEmptyRows[nCurRow] = false;
+if (pData-IsEmpty())
+maEmptyRows.insert_back(nCurRow, nCurRow+1, true);
 
 return true;
 }
commit 2877147c477f064c213af53a8f250ce96ad1e5f2
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Fri Mar 9 15:13:36 2012 -0500

IsValid() is superfluous.

diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx
index 661c5cd..31d5103 100644
--- a/sc/inc/dpcache.hxx
+++ b/sc/inc/dpcache.hxx
@@ -151,7 +151,6 @@ public:
 SCROW  GetItemDataId( sal_uInt16 nDim, SCROW nRow, bool bRepeatIfEmpty ) 
const;
 rtl::OUString GetDimensionName(LabelsType::size_type nDim) const;
 bool IsRowEmpty( SCROW nRow ) const;
-bool IsValid() const;
 bool ValidQuery(SCROW nRow, const ScQueryParam rQueryParam) const;
 
 ScDocument* GetDoc() const;
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 33a0a25..9ae41a4 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -252,11 +252,6 @@ ScDPCache::~ScDPCache()
 std::for_each(maRefObjects.begin(), maRefObjects.end(), 
ClearObjectSource());
 }
 
-bool ScDPCache::IsValid() const
-{
-return !maFields.empty()  mnColumnCount  0;
-}
-
 namespace {
 
 /**
@@ -622,7 +617,6 @@ bool ScDPCache::IsRowEmpty( SCROW nRow ) const
 
 bool ScDPCache::AddData(long nDim, ScDPItemData* pData, sal_uLong nNumFormat)
 {
-OSL_ENSURE( IsValid(),   IsValid() == false  );
 OSL_ENSURE( nDim  mnColumnCount  nDim =0 , dimension out of bound );
 
 // Wrap this instance with scoped pointer to ensure proper

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

2012-03-09 Thread Kohei Yoshida

 sc/inc/dpcache.hxx  |5 +-
 sc/source/core/data/dpcache.cxx |   91 +---
 2 files changed, 51 insertions(+), 45 deletions(-)

New commits:
commit 8d089c8e293a3366d9c0ac67cbfdf2a6deff5d98
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Fri Mar 9 17:46:48 2012 -0500

Use std::vector instead of boost::ptr_vector for ScDPItemData.

It's a small-size object, so using std::vector is slightly more
efficient.

diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx
index 2880c5a..4c5e1bf 100644
--- a/sc/inc/dpcache.hxx
+++ b/sc/inc/dpcache.hxx
@@ -57,7 +57,7 @@ struct ScDPNumGroupInfo;
 class SC_DLLPUBLIC ScDPCache : boost::noncopyable
 {
 public:
-typedef boost::ptr_vectorScDPItemData DataListType;
+typedef std::vectorScDPItemData DataListType;
 typedef std::setScDPObject* ObjectSetType;
 typedef std::vectorrtl::OUString LabelsType;
 typedef std::vectorSCROW IndexArrayType;
@@ -166,9 +166,10 @@ public:
 ~ScDPCache();
 
 private:
+void PostInit();
 void Clear();
 void AddLabel(const rtl::OUString rLabel);
-bool AddData(long nDim, ScDPItemData* pData, sal_uLong nNumFormat);
+bool AddData(long nDim, const ScDPItemData rData, sal_uLong nNumFormat);
 const GroupItems* GetGroupItems(long nDim) const;
 };
 
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 73e1819..09bce92 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -60,8 +60,6 @@ using ::com::sun::star::uno::Exception;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::UNO_QUERY;
 using ::com::sun::star::uno::UNO_QUERY_THROW;
-using ::std::vector;
-using ::std::auto_ptr;
 
 namespace {
 
@@ -76,7 +74,7 @@ namespace {
  *
  * @return true if the item is found, or false otherwise.
  */
-bool hasItemInDimension(const ScDPCache::DataListType rArray, const 
ScDPCache::IndexArrayType rOrder, const ScDPItemData item, SCROW rIndex)
+bool hasItemInDimension(const ScDPCache::DataListType rArray, const 
ScDPCache::IndexArrayType rOrder, const ScDPItemData rItem, SCROW rIndex)
 {
 rIndex = rArray.size();
 bool bFound = false;
@@ -86,7 +84,7 @@ bool hasItemInDimension(const ScDPCache::DataListType 
rArray, const ScDPCache::
 while (nLo = nHi)
 {
 SCROW nIndex = (nLo + nHi) / 2;
-nCompare = ScDPItemData::Compare( rArray[rOrder[nIndex]], item );
+nCompare = ScDPItemData::Compare(rArray[rOrder[nIndex]], rItem);
 if (nCompare  0)
 nLo = nIndex + 1;
 else
@@ -103,8 +101,9 @@ bool hasItemInDimension(const ScDPCache::DataListType 
rArray, const ScDPCache::
 return bFound;
 }
 
-ScDPItemData* lcl_GetItemValue(
-const Referencesdbc::XRow xRow, sal_Int32 nType, long nCol, const Date 
rNullDate, short rNumType)
+void getItemValue(
+ScDPItemData rData, const Referencesdbc::XRow xRow, sal_Int32 nType,
+long nCol, const Date rNullDate, short rNumType)
 {
 rNumType = NUMBERFORMAT_NUMBER;
 try
@@ -117,7 +116,8 @@ ScDPItemData* lcl_GetItemValue(
 {
 rNumType = NUMBERFORMAT_LOGICAL;
 fValue  = xRow-getBoolean(nCol) ? 1 : 0;
-return new ScDPItemData(fValue);
+rData.SetValue(fValue);
+break;
 }
 case sdbc::DataType::TINYINT:
 case sdbc::DataType::SMALLINT:
@@ -131,7 +131,8 @@ ScDPItemData* lcl_GetItemValue(
 {
 //! do the conversion here?
 fValue = xRow-getDouble(nCol);
-return new ScDPItemData(fValue);
+rData.SetValue(fValue);
+break;
 }
 case sdbc::DataType::DATE:
 {
@@ -139,7 +140,8 @@ ScDPItemData* lcl_GetItemValue(
 
 util::Date aDate = xRow-getDate(nCol);
 fValue = Date(aDate.Day, aDate.Month, aDate.Year) - rNullDate;
-return new ScDPItemData(fValue);
+rData.SetValue(fValue);
+break;
 }
 case sdbc::DataType::TIME:
 {
@@ -148,7 +150,8 @@ ScDPItemData* lcl_GetItemValue(
 util::Time aTime = xRow-getTime(nCol);
 fValue = ( aTime.Hours * 3600 + aTime.Minutes * 60 +
aTime.Seconds + aTime.HundredthSeconds / 100.0 ) / 
D_TIMEFACTOR;
-return new ScDPItemData(fValue);
+rData.SetValue(fValue);
+break;
 }
 case sdbc::DataType::TIMESTAMP:
 {
@@ -158,7 +161,8 @@ ScDPItemData* lcl_GetItemValue(
 fValue = ( Date( aStamp.Day, aStamp.Month, aStamp.Year ) - 
rNullDate ) +
  ( aStamp.Hours * 3600 + aStamp.Minutes * 60 +
aStamp.Seconds + aStamp.HundredthSeconds / 100.0 ) 
/ D_TIMEFACTOR;
-return new ScDPItemData(fValue);
+

[Libreoffice-commits] .: Branch 'feature/submodules' - .gitmodules

2012-03-09 Thread Norbert Thiebaud

 .gitmodules |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit acc0ca81477408dbeadcb121bc25e8e134b665b9
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Fri Mar 9 19:00:11 2012 -0600

have the submodules rebase by default

diff --git a/.gitmodules b/.gitmodules
index 8cdf2d4..c963415 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,12 @@
 [submodule binfilter]
path = binfilter
url = git://anongit.freedesktop.org/libreoffice/binfilter.git
+   update=rebase
 [submodule dictionaries]
path = dictionaries
url = git://anongit.freedesktop.org/libreoffice/dictionaries
+   update=rebase
 [submodule helpcontent2]
path = helpcontent2
url = git://anongit.freedesktop.org/libreoffice/help
+   update=rebase
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-03-09 Thread Kohei Yoshida

 sc/inc/dpcache.hxx   |   14 --
 sc/inc/dptabdat.hxx  |1 +
 sc/source/core/data/dpcache.cxx  |5 +++--
 sc/source/core/data/dpobject.cxx |1 +
 4 files changed, 13 insertions(+), 8 deletions(-)

New commits:
commit 3a30ced6bea3567bce2cc79adc6beb28f18b554b
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Fri Mar 9 20:06:45 2012 -0500

Some header cleanup.

diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx
index 4c5e1bf..a0e6a6d 100644
--- a/sc/inc/dpcache.hxx
+++ b/sc/inc/dpcache.hxx
@@ -31,12 +31,7 @@
 
 #include global.hxx
 #include dpnumgroupinfo.hxx
-
-#include svl/zforlist.hxx
-
-#include com/sun/star/sdbc/DataType.hpp
-#include com/sun/star/sdbc/XRow.hpp
-#include com/sun/star/sdbc/XRowSet.hpp
+#include tools/date.hxx
 
 #include boost/noncopyable.hpp
 #include boost/scoped_ptr.hpp
@@ -44,6 +39,13 @@
 #include mdds/flat_segment_tree.hpp
 
 #include vector
+#include set
+
+namespace com { namespace sun { namespace star {
+namespace sdbc {
+class XRowSet;
+}
+}}}
 
 struct ScQueryParam;
 class ScDPObject;
diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx
index 0fbad22..3951275 100644
--- a/sc/inc/dptabdat.hxx
+++ b/sc/inc/dptabdat.hxx
@@ -34,6 +34,7 @@
 #include dpcachetable.hxx
 #include dpcache.hxx
 #include tools/string.hxx
+#include svl/zforlist.hxx
 
 #include vector
 #include set
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 09bce92..0aa8224 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -43,12 +43,13 @@
 #include rtl/math.hxx
 #include unotools/textsearch.hxx
 #include unotools/localedatawrapper.hxx
+#include svl/zforlist.hxx
 
 #include com/sun/star/sdbc/DataType.hpp
-#include com/sun/star/sdbc/XRow.hpp
-#include com/sun/star/sdbc/XRowSet.hpp
 #include com/sun/star/sdbc/XResultSetMetaData.hpp
 #include com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp
+#include com/sun/star/sdbc/XRow.hpp
+#include com/sun/star/sdbc/XRowSet.hpp
 
 #include memory
 
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 8e1eff8..3b192b5 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -56,6 +56,7 @@
 
 #include com/sun/star/beans/XPropertySet.hpp
 #include com/sun/star/sdb/XCompletedExecution.hpp
+#include com/sun/star/sdbc/XRowSet.hpp
 #include com/sun/star/sheet/GeneralFunction.hpp
 #include com/sun/star/sheet/DataPilotFieldFilter.hpp
 #include com/sun/star/sheet/DataPilotFieldOrientation.hpp
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-03-09 Thread Kohei Yoshida

 sc/inc/dpcache.hxx  |2 +-
 sc/source/core/data/dpcache.cxx |   18 ++
 2 files changed, 7 insertions(+), 13 deletions(-)

New commits:
commit 372cfda4d6a4d49bb45cea0dc45b23ffd9dd5b3d
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Fri Mar 9 20:19:12 2012 -0500

Store only one number format per field.

diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx
index a0e6a6d..9f33db5 100644
--- a/sc/inc/dpcache.hxx
+++ b/sc/inc/dpcache.hxx
@@ -100,7 +100,7 @@ public:
  */
 mutable IndexArrayType maIndexOrder;
 
-std::vectorsal_uLong maNumFormats;
+sal_uLong mnNumFormat;
 
 Field();
 };
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 0aa8224..9ce9e25 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -226,7 +226,7 @@ bool ScDPCache::operator== ( const ScDPCache r ) const
 return true;
 }
 
-ScDPCache::Field::Field() {}
+ScDPCache::Field::Field() : mnNumFormat(0) {}
 
 ScDPCache::ScDPCache(ScDocument* pDoc) :
 mpDoc( pDoc ),
@@ -637,7 +637,6 @@ bool ScDPCache::AddData(long nDim, const ScDPItemData 
rData, sal_uLong nNumForm
 rField.maGlobalOrder.begin()+nIndex, rField.maItems.size()-1);
 OSL_ENSURE(rField.maGlobalOrder[nIndex] == 
sal::static_int_castSCROW(rField.maItems.size())-1, 
ScDPTableDataCache::AddData );
 rField.maData.push_back(rField.maItems.size()-1);
-rField.maNumFormats.push_back(nNumFormat);
 }
 else
 rField.maData.push_back(rField.maGlobalOrder[nIndex]);
@@ -645,7 +644,10 @@ bool ScDPCache::AddData(long nDim, const ScDPItemData 
rData, sal_uLong nNumForm
 size_t nCurRow = maFields[nDim].maData.size() - 1;
 
 if (!rData.IsEmpty())
+{
 maEmptyRows.insert_back(nCurRow, nCurRow+1, false);
+rField.mnNumFormat = nNumFormat;
+}
 
 return true;
 }
@@ -813,13 +815,9 @@ sal_uLong ScDPCache::GetNumberFormat( long nDim ) const
 if ( nDim = mnColumnCount )
 return 0;
 
-const std::vectorsal_uLong rNumFormats = maFields[nDim].maNumFormats;
-if (rNumFormats.empty())
-return 0;
-
 // TODO: Find a way to determine the dominant number format in presence of
 // multiple number formats in the same field.
-return *rNumFormats.begin();
+return maFields[nDim].mnNumFormat;
 }
 
 bool ScDPCache::IsDateDimension( long nDim ) const
@@ -831,11 +829,7 @@ bool ScDPCache::IsDateDimension( long nDim ) const
 if (!pFormatter)
 return false;
 
-const std::vectorsal_uLong rNumFormats = maFields[nDim].maNumFormats;
-if (rNumFormats.empty())
-return false;
-
-short eType = pFormatter-GetType(rNumFormats[0]);
+short eType = pFormatter-GetType(maFields[nDim].mnNumFormat);
 return (eType == NUMBERFORMAT_DATE) || (eType == NUMBERFORMAT_DATETIME);
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/submodules' - .gitmodules

2012-03-09 Thread Norbert Thiebaud

 .gitmodules |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit eda3cf7979b3f55ae150680dd965b248f5a4d369
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Fri Mar 9 19:43:41 2012 -0600

Revert have the submodules rebase by default

This reverts commit acc0ca81477408dbeadcb121bc25e8e134b665b9.

diff --git a/.gitmodules b/.gitmodules
index c963415..8cdf2d4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,9 @@
 [submodule binfilter]
path = binfilter
url = git://anongit.freedesktop.org/libreoffice/binfilter.git
-   update=rebase
 [submodule dictionaries]
path = dictionaries
url = git://anongit.freedesktop.org/libreoffice/dictionaries
-   update=rebase
 [submodule helpcontent2]
path = helpcontent2
url = git://anongit.freedesktop.org/libreoffice/help
-   update=rebase
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-03-09 Thread Kohei Yoshida

 sc/inc/dpgroup.hxx   |2 -
 sc/inc/dptabsrc.hxx  |8 --
 sc/source/core/data/dpgroup.cxx  |   27 +++---
 sc/source/core/data/dptabres.cxx |4 +--
 sc/source/core/data/dptabsrc.cxx |   47 +--
 5 files changed, 38 insertions(+), 50 deletions(-)

New commits:
commit 137b53e0e2763d41c43e62ecc85b38d7f3cb71f7
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Fri Mar 9 22:25:10 2012 -0500

vector and rtl::Reference over manual ref-counting.

diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx
index b43e795..b69846b 100644
--- a/sc/inc/dptabsrc.hxx
+++ b/sc/inc/dptabsrc.hxx
@@ -54,6 +54,7 @@
 #include cppuhelper/implbase3.hxx
 #include cppuhelper/implbase5.hxx
 #include cppuhelper/implbase6.hxx
+#include rtl/ref.hxx
 
 #include dptabdat.hxx
 #include dpglobal.hxx
@@ -683,12 +684,13 @@ class ScDPMembers : public cppu::WeakImplHelper2
 com::sun::star::lang::XServiceInfo 
 {
 private:
+typedef std::vectorrtl::ReferenceScDPMember  MembersType;
 ScDPSource* pSource;
 longnDim;
 longnHier;
 longnLev;
 longnMbrCount;
-ScDPMember**ppMbrs;
+mutable MembersType maMembers;
 mutable ScDPMembersHashMap aHashMap;
 
 public:
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 9514046..3d41f86 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -2284,8 +2284,7 @@ ScDPMembers::ScDPMembers( ScDPSource* pSrc, long nD, long 
nH, long nL ) :
 pSource( pSrc ),
 nDim( nD ),
 nHier( nH ),
-nLev( nL ),
-ppMbrs( NULL )
+nLev( nL )
 {
 //! hold pSource
 
@@ -2357,15 +2356,6 @@ ScDPMembers::ScDPMembers( ScDPSource* pSrc, long nD, 
long nH, long nL ) :
 
 ScDPMembers::~ScDPMembers()
 {
-//! release pSource
-
-if (ppMbrs)
-{
-for (long i=0; inMbrCount; i++)
-if ( ppMbrs[i] )
-ppMbrs[i]-release();   // ref-counted
-delete[] ppMbrs;
-}
 }
 
 // XNameAccess implementation using getCount/getByIndex
@@ -2451,13 +2441,14 @@ long ScDPMembers::getMinMembers() const
 // used in lcl_CountMinMembers
 
 long nVisCount = 0;
-if ( ppMbrs )
+if (!maMembers.empty())
 {
-for (long i=0; inMbrCount; i++)
+MembersType::const_iterator it = maMembers.begin(), itEnd = 
maMembers.end();
+for (; it != itEnd; ++it)
 {
 //  count only visible with details (default is true for both)
-const ScDPMember* pMbr = ppMbrs[i];
-if ( !pMbr || ( pMbr-isVisible()  pMbr-getShowDetails() ) )
+const rtl::ReferenceScDPMember pMbr = *it;
+if (!pMbr.get() || (pMbr-isVisible()  pMbr-getShowDetails()))
 ++nVisCount;
 }
 }
@@ -2474,20 +2465,17 @@ ScDPMember* ScDPMembers::getByIndex(long nIndex) const
 
 if ( nIndex = 0  nIndex  nMbrCount )
 {
-if ( !ppMbrs )
-{
-((ScDPMembers*)this)-ppMbrs = new ScDPMember*[nMbrCount];
-for (long i=0; inMbrCount; i++)
-ppMbrs[i] = NULL;
-}
-if ( !ppMbrs[nIndex] )
+if (maMembers.empty())
+maMembers.resize(nMbrCount);
+
+if (!maMembers[nIndex].get())
 {
-ScDPMember* pNew;
+rtl::ReferenceScDPMember pNew;
 long nSrcDim = pSource-GetSourceDim( nDim );
 if ( pSource-IsDataLayoutDimension(nSrcDim) )
 {
 // empty name (never shown, not used for lookup)
-pNew = new ScDPMember( pSource, nDim, nHier, nLev, 0 );
+pNew.set(new ScDPMember(pSource, nDim, nHier, nLev, 0));
 }
 else if ( nHier != SC_DAPI_HIERARCHY_FLAT  
pSource-IsDateDimension( nSrcDim ) )
 {
@@ -2549,20 +2537,17 @@ ScDPMember* ScDPMembers::getByIndex(long nIndex) const
 
 ScDPItemData aData(nGroupBy, nVal);
 SCROW nId = pSource-GetCache()-GetIdByItemData(nDim, aData);
-pNew = new ScDPMember(pSource, nDim, nHier, nLev, nId);
+pNew.set(new ScDPMember(pSource, nDim, nHier, nLev, nId));
 }
 else
 {
 const std::vectorSCROW memberIndexs = 
pSource-GetData()-GetColumnEntries(nSrcDim);
-pNew = new ScDPMember(pSource, nDim, nHier, nLev, 
memberIndexs[nIndex]);
+pNew.set(new ScDPMember(pSource, nDim, nHier, nLev, 
memberIndexs[nIndex]));
 }
-pNew-acquire();// ref-counted
-ppMbrs[nIndex] = pNew;
+maMembers[nIndex] = pNew;
 }
 
-OSL_ENSURE( ppMbrs[nIndex] , member is not initialized  );
-
-return ppMbrs[nIndex];
+return maMembers[nIndex].get();
 }
 
 return NULL;//! exception?
commit

50 matches

Mail list logo