date:20130524

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - vcl/source

2013-05-24 Thread Caolán McNamara

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

New commits:
commit 627a9d087163ff98e966c01f625b09fb766c837a
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed May 22 09:26:32 2013 +0100

WaE: signed/unsigned comparison

Change-Id: Iaa439c268eda24d700471560927d8f4c0f2e017b
(cherry picked from commit 6a0a33444255fcdbe16500de24fc5bfd74adca4b)

diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 8a99bb4..1190408 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -594,7 +594,7 @@ gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs 
rArgs)
 nSegCharLimit - rArgs.mnEndCharPos, bRtl);
 }
 }
-size_t numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + 
mnSegCharOffset,
+int numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + 
mnSegCharOffset,
 rArgs.mpStr + (rArgs.mnLength  limit + 64 ? limit + 64 : 
rArgs.mnLength), NULL);
 if (rArgs.mnMinCharPos + numchars  limit) numchars = limit - 
rArgs.mnMinCharPos; // fdo#52540
 if (mpFeatures)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: minutes of ESC call ...

2013-05-24 Thread Alex Waite


On 05/23/2013 05:04 PM, Michael Meeks wrote:

[ would be great to have a 10.6 build-bot (Stephan)
+ came with 10.8 - havn't found one (Norbert) ]


Are you looking for a computer with 10.6 on it, or an original 10.6 
install disk? I might have the latter.



+ budget left for hosted Linux boxes - volunteers appreciated.


We might have some space in our rack here at the university (OvGU) that 
you can occupy. If you're interested, contact me off-list.


---Alex

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

Re: vclplug_svp build error with --enable-headless

2013-05-24 Thread Riccardo Magliocchetti


Hi Matus,

Il 23/05/2013 22:10, Matúš Kukan ha scritto:

On 23 May 2013 17:21, Riccardo Magliocchetti
riccardo.magliocche...@gmail.com  wrote:

i need this to unbreak --enable-headless compilation (still compiling) with
latest master but it puzzles me the other vclplug entries doesn't need the
same check, any hint on what --enable-headless is doing wrong since this
does not break other GUIBASEs?

diff --git a/Repository.mk b/Repository.mk
index c6a779d..97bcece 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -431,7 +431,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
  vclplug_tde \
  vclplug_kde \
  vclplug_kde4 \
-vclplug_svp \
+$(if $(filter unx,$(GUIBASE)),vclplug_svp) \


Why do you need this ? What does it fix ?
I don't see any obvious reason for this... nor how it could be related
to --enable-headless


Yeah, sorry the error is something like there's not an entry for 
vclplug_svp to deliver, the path of the missing file is in solenv.


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

[PATCH libreoffice-4-0] rhbz#961460: Don't needlessly pass URLs through INetURLObjec...

2013-05-24 Thread Stephan Bergmann (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4019

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/19/4019/1

rhbz#961460: Don't needlessly pass URLs through INetURLObject

The WebDAV UCP uses https/davs URLs that may contain a userinfo (cf. RFC 3986)
part, and INetURLObject does not support that (in accordance with RFCs 2818 and
2616) and thus creates an empty INET_PROT_NOT_VALID INetURLObject for such a
URL, leading to failure when trying to save a document to such a URL.
(Regression introduced with 966d20e35d5a2be2fce6c204af5c156c3ead7063 CMIS ucp:
write documents back to CMIS server.)

Change-Id: Ifd396852b211cab1d29575da7fccb32306479f93
(cherry picked from commit 3f5c45b70864af95a6362acf4684fb57eb85e348)
---
M sfx2/source/doc/docfile.cxx
1 file changed, 7 insertions(+), 8 deletions(-)



diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 3ce8ab7..d08f3fc 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1936,6 +1936,7 @@
 
 ::ucbhelper::Content aDestContent;
 ::ucbhelper::Content::create( aDestURL, xComEnv, 
comphelper::getProcessComponentContext(), aDestContent );
+// For checkin, we need the object URL, not the parent folder:
 if ( !IsInCheckIn( ) )
 {
 // Get the parent URL from the XChild if possible: why would 
the URL necessarily have
@@ -1951,13 +1952,11 @@
 }
 }
 
-if ( !sParentUrl.isEmpty() )
-aDest = INetURLObject( sParentUrl );
-}
-else
-{
-// For checkin, we need the object URL, not the parent folder
-aDest = INetURLObject( aDestURL );
+if ( sParentUrl.isEmpty() )
+aDestURL = aDest.GetMainURL( INetURLObject::NO_DECODE );
+// adjust to above aDest.removeSegment()
+else
+aDestURL = sParentUrl;
 }
 
 // LongName wasn't defined anywhere, only used here... get the 
Title instead
@@ -1970,7 +1969,7 @@
 
 try
 {
-aTransferContent = ::ucbhelper::Content( aDest.GetMainURL( 
INetURLObject::NO_DECODE ), xComEnv, comphelper::getProcessComponentContext() );
+aTransferContent = ::ucbhelper::Content( aDestURL, xComEnv, 
comphelper::getProcessComponentContext() );
 }
 catch (const ::com::sun::star::ucb::ContentCreationException ex)
 {

-- 
To view, visit https://gerrit.libreoffice.org/4019
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd396852b211cab1d29575da7fccb32306479f93
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Stephan Bergmann sberg...@redhat.com

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

Re: minutes of ESC call ...

2013-05-24 Thread Lionel Elie Mamane

On Fri, May 17, 2013 at 12:49:03PM +0200, Eike Rathke wrote:

 On Thursday, 2013-05-16 16:25:40 +0100, Michael Meeks wrote:

  + double check Lionel's list-box / API change (Eike)

 Done. The two properties added to
 com.sun.star.form.component.DataBaseListBox are marked optional which
 doesn't harm existing clients.

I did that on advice of ... Michael Stahl? ... on IRC to shut up the
incompatible API change error the build was giving me.

My understanding was that this was for the benefit of putative
existing *providers* of this service, that since the properties are
optional, we did not change the requirements under their feet and they
still conform to the service specification.

I don't understand how the properties being not optional would harm
*clients* (users of the service): clients written against the old
specification would simply not use the new properties, would they?

I toyed with the idea of adding a
com.sun.star.form.component.DataBaseListBox2 that makes them
non-optional so that users can be assured to have those properties,
but in the end I did not bother, and now we are past the 4.1 new
feature freeze.

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

[PATCH] Fix memory leak in DrawViewShell::GetAttrState().

2013-05-24 Thread Mark Wielaard (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4020

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/20/4020/1

Fix memory leak in DrawViewShell::GetAttrState().

DrawViewShell::GetAttrState() might create a temporary new SvxNumRule
object. Make sure it gets deleted when done.

Change-Id: I33ddd9df983193fe87dd076267043d202cdfc3d5
---
M sd/source/ui/view/drviewsf.cxx
1 file changed, 2 insertions(+), 1 deletion(-)



diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index 4989cd2..89c90d0 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -630,9 +630,10 @@
 }
 }
 }
+  delete pNumRule;
 }
 }
-break;
+break;
 //End
 // Added by Li Hui for story 179.
 case FN_NUM_BULLET_ON:

-- 
To view, visit https://gerrit.libreoffice.org/4020
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I33ddd9df983193fe87dd076267043d202cdfc3d5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mark Wielaard m...@klomp.org

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

[PATCH libreoffice-3-6] rhbz#961460: Don't needlessly pass URLs through INetURLObjec...

2013-05-24 Thread Stephan Bergmann (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4021

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/21/4021/1

rhbz#961460: Don't needlessly pass URLs through INetURLObject

The WebDAV UCP uses https/davs URLs that may contain a userinfo (cf. RFC 3986)
part, and INetURLObject does not support that (in accordance with RFCs 2818 and
2616) and thus creates an empty INET_PROT_NOT_VALID INetURLObject for such a
URL, leading to failure when trying to save a document to such a URL.
(Regression introduced with 966d20e35d5a2be2fce6c204af5c156c3ead7063 CMIS ucp:
write documents back to CMIS server.)

(cherry picked from commit 3f5c45b70864af95a6362acf4684fb57eb85e348)
Conflicts:
sfx2/source/doc/docfile.cxx

Change-Id: Ifd396852b211cab1d29575da7fccb32306479f93
---
M sfx2/source/doc/docfile.cxx
1 file changed, 6 insertions(+), 3 deletions(-)



diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 6271acd..563d809 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1956,8 +1956,11 @@
 }
 }
 
-if ( !sParentUrl.isEmpty() )
-aDest = INetURLObject( sParentUrl );
+if ( sParentUrl.isEmpty() )
+aDestURL = aDest.GetMainURL( INetURLObject::NO_DECODE );
+// adjust to above aDest.removeSegment()
+else
+aDestURL = sParentUrl;
 
 // LongName wasn't defined anywhere, only used here... get the 
Title instead
 // as it's less probably empty
@@ -1969,7 +1972,7 @@
 
 try
 {
-aTransferContent = ::ucbhelper::Content( aDest.GetMainURL( 
INetURLObject::NO_DECODE ), xComEnv );
+aTransferContent = ::ucbhelper::Content( aDestURL, xComEnv );
 }
 catch (const ::com::sun::star::ucb::ContentCreationException ex)
 {

-- 
To view, visit https://gerrit.libreoffice.org/4021
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd396852b211cab1d29575da7fccb32306479f93
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Stephan Bergmann sberg...@redhat.com

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

[Libreoffice-commits] mso-dumper.git: 2 commits - src/docdirstream.py src/docrecord.py

2013-05-24 Thread Miklos Vajna

 src/docdirstream.py |6 +-
 src/docrecord.py|   23 +--
 2 files changed, 18 insertions(+), 11 deletions(-)

New commits:
commit 6aa111f33ba2bf6872bc1cd339d43b7d9a22f924
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu May 23 18:19:51 2013 +0200

SttbfAssoc, SttbSavedBy: tolare if table was cleared, but FIB was not 
updated

fdo40686-1.doc requires this.

diff --git a/src/docrecord.py b/src/docrecord.py
index 67f9035..8d90b51 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -2062,7 +2062,9 @@ class SttbfAssoc(DOCDirStream):
 print 'string value=%s/' % 
globals.encodeName(self.bytes[self.pos:self.pos+2*cchData].decode('utf-16'), 
lowOnly = True)
 self.pos += 2*cchData
 print '/cchData'
-assert self.pos == self.mainStream.fcSttbfAssoc + self.size
+# Probably this was cleared manually.
+if self.cData != 0:
+assert self.pos == self.mainStream.fcSttbfAssoc + self.size
 print '/sttbfAssoc'
 
 class SttbfRMark(DOCDirStream):
@@ -3049,7 +3051,9 @@ class SttbSavedBy(DOCDirStream):
 print 'string value=%s/' % 
globals.encodeName(self.bytes[self.pos:self.pos+2*cchData].decode('utf-16'), 
lowOnly = True)
 self.pos += 2*cchData
 print '/cchData'
-assert self.pos == self.mainStream.fcSttbSavedBy + self.size
+# Probably this was cleared manually.
+if self.cData != 0:
+assert self.pos == self.mainStream.fcSttbSavedBy + self.size
 print '/sttbSavedBy'
 
 class SttbfBkmk(DOCDirStream):
commit ef4b0109c17f88cd7ec66704b2dfd0423ddebf21
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu May 23 17:57:10 2013 +0200

DopTypography: dump rgxchFPunct / rgxchLPunct

diff --git a/src/docdirstream.py b/src/docdirstream.py
index 18c7453..4e29943 100644
--- a/src/docdirstream.py
+++ b/src/docdirstream.py
@@ -114,9 +114,12 @@ class DOCDirStream:
 self.pos += 8
 return ret
 
-def getString(self):
+def getString(self, limit = None):
 bytes = []
+count = 0
 while True:
+if (not limit is None) and count == limit:
+break
 i = self.readuInt8()
 j = self.readuInt8()
 if i != 0 or j != 0:
@@ -124,6 +127,7 @@ class DOCDirStream:
 bytes.append(j)
 else:
 break
+count += 1
 return globals.getUTF8FromUTF16(.join(map(lambda x: chr(x), bytes)))
 
 def getBit(self, byte, bitNumber):
diff --git a/src/docrecord.py b/src/docrecord.py
index a14f81e..67f9035 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -1517,14 +1517,13 @@ class DopTypography(DOCDirStream):
 
 self.printAndSet(cchFollowingPunct, self.readInt16())
 self.printAndSet(cchLeadingPunct, self.readInt16())
-if self.cchFollowingPunct != 0:
-print 'todo what=DopTypography::dump(): cchFollowingPunct != 0 
not handled/'
-else:
-self.pos += 202
-if self.cchLeadingPunct != 0:
-print 'todo what=DopTypography::dump(): cchLeadingPunct != 0 not 
handled/'
-else:
-self.pos += 102
+
+self.printAndSet(rgxchFPunct, 
self.getString(self.cchFollowingPunct), hexdump = False)
+self.pos += (202 - 2 * self.cchFollowingPunct)
+
+self.printAndSet(rgxchLPunct, self.getString(self.cchLeadingPunct), 
hexdump = False)
+self.pos += (102 - 2 * self.cchLeadingPunct)
+
 print '/dopTypography'
 assert self.pos == self.dop.pos + DopTypography.size
 self.dop.pos = self.pos
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

2013-05-24 Thread Michael Meeks

 solenv/bin/packimages.pl |   68 ++-
 1 file changed, 67 insertions(+), 1 deletion(-)

New commits:
commit 75ed8ae7e5b1eb1e6b53515ef5c8c5e6798986b6
Author: Michael Meeks michael.me...@suse.com
Date:   Thu May 23 16:34:23 2013 +0100

combine and layer links.txt files into the images*.zip archives.

Change-Id: I0dd6730ac3bef95843de25d6813678273cf09832

diff --git a/solenv/bin/packimages.pl b/solenv/bin/packimages.pl
index 11fc9cf..5c84dc6 100644
--- a/solenv/bin/packimages.pl
+++ b/solenv/bin/packimages.pl
@@ -27,6 +27,8 @@ use strict;
 use Getopt::Long;
 use File::Find;
 use File::Basename;
+require File::Temp;
+use File::Temp ();
 use Archive::Zip qw(:ERROR_CODES :CONSTANTS);
 
  globals 
@@ -64,10 +66,18 @@ $do_rebuild = is_file_newer(\%image_lists_hash) if 
$do_rebuild == 0;
 my ($global_hash_ref, $module_hash_ref, $custom_hash_ref) = 
iterate_image_lists($image_lists_ref);
 # custom_hash filled from filesystem lookup
 find_custom($custom_hash_ref);
+
+# build a consolidated set of links
+my %links;
+read_links(\%links, $global_path);
+for my $path (@custom_path) {
+read_links(\%links, $path);
+}
+
 my $zip_hash_ref = create_zip_list($global_hash_ref, $module_hash_ref, 
$custom_hash_ref);
 $do_rebuild = is_file_newer($zip_hash_ref) if $do_rebuild == 0;
 if ( $do_rebuild == 1 ) {
-create_zip_archive($zip_hash_ref);
+create_zip_archive($zip_hash_ref, \%links);
 replace_file($tmp_out_file, $out_file);
 print_message(packing  $out_file finished.) if $verbose;
 } else {
@@ -333,10 +343,19 @@ sub optimize_zip_layout($)
 sub create_zip_archive
 {
 my $zip_hash_ref = shift;
+my $links_hash_ref = shift;
 
 print_message(creating image archive ...) if $verbose;
 my $zip = Archive::Zip-new();
 
+if (keys %{$links_hash_ref}) {
+my $linktmp = write_links($links_hash_ref);
+my $member = $zip-addFile($linktmp-filename, links.txt, 
COMPRESSION_DEFLATED);
+if (!$member) {
+print_error(failed to add links file: $!, 5);
+}
+}
+
 # FIXME: test - $member = addfile ... $member-desiredCompressionMethod( 
COMPRESSION_STORED );
 # any measurable performance win/loss ?
 foreach ( optimize_zip_layout($zip_hash_ref) ) {
@@ -425,3 +444,50 @@ sub print_error
 }
 return;
 }
+
+sub read_links($$)
+{
+my $links = shift;
+my $path = shift;
+
+my $fname = $path/links.txt;
+if (!-f $fname) {
+print STDERR no links in $fname\n;
+return;
+}
+
+my $fh;
+open ($fh, $fname) || die Can't open: $fname: $!;
+# Syntax of links file:
+# # comment
+# missing-image image-to-load-instead
+while ($fh) {
+my $line = $_;
+$line =~ s/\r//g;   # DOS line-feeds
+$line =~ s/\#.*$//; # kill comments
+$line =~ m/^\s*$/  next; # blank lines
+if ($line =~ m/^([^\s]+)\s+(.*)$/) {
+my ($missing, $replace) = ($1, $2);
+# enter into hash, and overwrite previous layer if necessary
+$links-{$1} = $2;
+} else {
+die Malformed links line: '$line'\n;
+}
+}
+close ($fh);
+}
+
+# write out the links to a tmp file
+sub write_links($)
+{
+my $links = shift;
+my $tmp = File::Temp-new( TEMPLATE = linksXXX,
+   UNLINK = 0 );
+$tmp || die can't create tmp: $!;
+for my $missing (sort keys %{$links}) {
+my $line = $missing .   . $links-{$missing} . \n;
+print $tmp $line;
+}
+binmode $tmp; # force flush
+return $tmp;
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 89/ff84f110be2f91af8fb17d315fb79080e67155 9e/7d83d14ff28ec3ddb0dea6821e46b1bc80f904

2013-05-24 Thread Caolán McNamara

 89/ff84f110be2f91af8fb17d315fb79080e67155 |1 +
 9e/7d83d14ff28ec3ddb0dea6821e46b1bc80f904 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 95e2105306eccaa311227f409ec62cbad5f3c97f
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 24 11:00:18 2013 +0100

Notes added by 'git notes add'

diff --git a/89/ff84f110be2f91af8fb17d315fb79080e67155 
b/89/ff84f110be2f91af8fb17d315fb79080e67155
new file mode 100644
index 000..ae5975f
--- /dev/null
+++ b/89/ff84f110be2f91af8fb17d315fb79080e67155
@@ -0,0 +1 @@
+prefer: 503b248127a92b9ad190e05f6a1d50574183cd47
commit 2a783cc40e3694c3ba50e49f376eb11ad29f7c6b
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 24 11:00:09 2013 +0100

Notes added by 'git notes add'

diff --git a/9e/7d83d14ff28ec3ddb0dea6821e46b1bc80f904 
b/9e/7d83d14ff28ec3ddb0dea6821e46b1bc80f904
new file mode 100644
index 000..ae5975f
--- /dev/null
+++ b/9e/7d83d14ff28ec3ddb0dea6821e46b1bc80f904
@@ -0,0 +1 @@
+prefer: 503b248127a92b9ad190e05f6a1d50574183cd47
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 1c/68970da527b5e83ea7c4436984de483596346c

2013-05-24 Thread Caolán McNamara

 1c/68970da527b5e83ea7c4436984de483596346c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 70f612d3fe62c1a4b91b4a5d958ae4ae3357d2de
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 24 11:00:29 2013 +0100

Notes added by 'git notes add'

diff --git a/1c/68970da527b5e83ea7c4436984de483596346c 
b/1c/68970da527b5e83ea7c4436984de483596346c
new file mode 100644
index 000..ae5975f
--- /dev/null
+++ b/1c/68970da527b5e83ea7c4436984de483596346c
@@ -0,0 +1 @@
+prefer: 503b248127a92b9ad190e05f6a1d50574183cd47
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 35/75698905d97dd550112bdc4256bedeb9daf9d1 ca/dc6e9b8ba3b9cd7499d33e10c5984d5f20e97c

2013-05-24 Thread Caolán McNamara

 35/75698905d97dd550112bdc4256bedeb9daf9d1 |1 +
 ca/dc6e9b8ba3b9cd7499d33e10c5984d5f20e97c |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 11cad98393be1f0d7b17b75e8e8dd8fcc328b06f
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 24 11:02:03 2013 +0100

Notes added by 'git notes add'

diff --git a/35/75698905d97dd550112bdc4256bedeb9daf9d1 
b/35/75698905d97dd550112bdc4256bedeb9daf9d1
new file mode 100644
index 000..ae5975f
--- /dev/null
+++ b/35/75698905d97dd550112bdc4256bedeb9daf9d1
@@ -0,0 +1 @@
+prefer: 503b248127a92b9ad190e05f6a1d50574183cd47
commit 885ef688c4f63b237e5e3d9837b9fb8f00efbdac
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 24 11:01:51 2013 +0100

Notes added by 'git notes add'

diff --git a/ca/dc6e9b8ba3b9cd7499d33e10c5984d5f20e97c 
b/ca/dc6e9b8ba3b9cd7499d33e10c5984d5f20e97c
new file mode 100644
index 000..ae5975f
--- /dev/null
+++ b/ca/dc6e9b8ba3b9cd7499d33e10c5984d5f20e97c
@@ -0,0 +1 @@
+prefer: 503b248127a92b9ad190e05f6a1d50574183cd47
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 4 commits - download.lst libcdr/ExternalPackage_libcdr.mk libcdr/ExternalProject_libcdr.mk libcdr/libcdr-0.0.13.patch libcdr/UnpackedTar

2013-05-24 Thread Joren De Cuyper

 download.lst |4 ++--
 libcdr/ExternalPackage_libcdr.mk |8 
 libcdr/ExternalProject_libcdr.mk |1 +
 libcdr/UnpackedTarball_cdr.mk|6 --
 libcdr/libcdr-0.0.13.patch   |   12 
 starmath/source/smres.src|4 ++--
 svx/source/svdraw/svdundo.cxx|2 +-
 7 files changed, 10 insertions(+), 27 deletions(-)

New commits:
commit bd05db796bffc5ad84f5bd6f5ecc0ca808c890ec
Author: Joren De Cuyper joren.libreoff...@telenet.be
Date:   Tue May 21 20:17:15 2013 +0200

fdo#62483 missing default button in format - aligment dialog at math

The default button was missing because the dialog was to small (it fell 
off).
Also the default button was placed a bit to far from the help button IMHO.

Change-Id: I05a079cacf6e5ac73861aff4a7dab7a455f3f181
Reviewed-on: https://gerrit.libreoffice.org/3995
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index 4836fbd..33ade5e 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -874,7 +874,7 @@ ModalDialog RID_ALIGNDIALOG
 OutputSize = TRUE ;
 SVLook = TRUE ;
 HelpId = CMD_SID_ALIGN ;
-Size = MAP_APPFONT ( 139 , 66 ) ;
+Size = MAP_APPFONT ( 139 , 80 ) ;
 Text [ en-US ] = Alignment ;
 RadioButton 1
 {
@@ -931,7 +931,7 @@ ModalDialog RID_ALIGNDIALOG
 {
 HelpID = starmath:PushButton:RID_ALIGNDIALOG:1;
 TabStop = TRUE ;
-Pos = MAP_APPFONT ( 83 , 69 ) ;
+Pos = MAP_APPFONT ( 83 , 63 ) ;
 Size = MAP_APPFONT ( 50 , 14 ) ;
 Text [ en-US ] = ~Default ;
 };
commit c50c7f7449429f277d9772fa77087f6e6afca96c
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Fri May 17 14:29:43 2013 +0200

Make libcdr build a little bit less verbose

(cherry picked from commit 4c3ad94c70f98f5062bf96a6f1339992b7ec2bd1)

Conflicts:
libcdr/ExternalProject_libcdr.mk

Change-Id: I8e70cd72e8c7934b2a04fbe6b9ed5f662c494960
Reviewed-on: https://gerrit.libreoffice.org/3943
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
index d7e7693..56378ab 100644
--- a/libcdr/ExternalProject_libcdr.mk
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -73,6 +73,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
--without-docs \
--disable-debug \
--disable-werror \
+   --disable-weffc \
$(if $(filter 
NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(OUTDIR)/inc/external) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
 (cd $(EXTERNAL_WORKDIR)/src/lib  $(MAKE)) \
commit 6d5f3411ed66d9a447c9fb234b8422b9e38c4bc6
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Fri May 17 14:29:27 2013 +0200

Uploading new libcdr 0.0.14

(cherry picked from commit 0f28a2a5e29499b62074dad4442fafa57858677d)

Conflicts:
download.lst
libcdr/UnpackedTarball_libcdr.mk
libcdr/libcdr-0.0.13.patch

Change-Id: Ifb3f8a7b0e40ee8b33fab4dded3f75f040e75f72
Reviewed-on: https://gerrit.libreoffice.org/3942
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/download.lst b/download.lst
index 657a418..aa1f98c 100644
--- a/download.lst
+++ b/download.lst
@@ -1,5 +1,5 @@
-CDR_MD5SUM := 75700c61b3a8e7d49a1f04c62048ff00
-export CDR_TARBALL := libcdr-0.0.13.tar.bz2
+CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112
+export CDR_TARBALL := libcdr-0.0.14.tar.bz2
 MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e
 export MSPUB_TARBALL := libmspub-0.0.6.tar.bz2
 VISIO_MD5SUM := 4e9a029d8390a1707eb49a1a918797ff
diff --git a/libcdr/ExternalPackage_libcdr.mk b/libcdr/ExternalPackage_libcdr.mk
index d032e8f..b163eed 100644
--- a/libcdr/ExternalPackage_libcdr.mk
+++ b/libcdr/ExternalPackage_libcdr.mk
@@ -10,10 +10,10 @@
 $(eval $(call gb_ExternalPackage_ExternalPackage,libcdr,cdr))
 
 $(eval $(call 
gb_ExternalPackage_add_unpacked_files,libcdr,inc/external/libcdr,\
-   src/lib/libcdr.h \
-   src/lib/CDRDocument.h \
-   src/lib/CDRStringVector.h \
-   src/lib/CMXDocument.h \
+   inc/libcdr/libcdr.h \
+   inc/libcdr/CDRDocument.h \
+   inc/libcdr/CDRStringVector.h \
+   inc/libcdr/CMXDocument.h \
 ))
 
 $(eval $(call gb_ExternalPackage_use_external_project,libcdr,libcdr))
diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk
index a4a427d..be1e7d7 100644
--- a/libcdr/UnpackedTarball_cdr.mk
+++ b/libcdr/UnpackedTarball_cdr.mk
@@ -11,10 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cdr))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL)))

[Libreoffice-commits] core.git: 2 commits - sc/source

2013-05-24 Thread Noel Power

 sc/source/filter/inc/sheetdatabuffer.hxx |   19 
 sc/source/filter/inc/stylesbuffer.hxx|4 +
 sc/source/filter/oox/sheetdatabuffer.cxx |  122 +++
 sc/source/filter/oox/stylesbuffer.cxx|   64 
 4 files changed, 193 insertions(+), 16 deletions(-)

New commits:
commit 9ae9b2f665b3caa9cc584512c26dfa899e1d2d45
Author: Noel Power noel.po...@suse.com
Date:   Fri May 24 09:52:12 2013 +0100

reorg styles code slightly, process normal (and row ) style in own method

Change-Id: I701d12cf8f672824d7cfca1e995f02040fdd3095

diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx 
b/sc/source/filter/inc/sheetdatabuffer.hxx
index 103418a..563145e 100644
--- a/sc/source/filter/inc/sheetdatabuffer.hxx
+++ b/sc/source/filter/inc/sheetdatabuffer.hxx
@@ -192,7 +192,7 @@ private:
 /** Writes all cell formatting attributes to the passed cell range list. 
(depreciates writeXfIdRangeProperties) */
 voidwriteXfIdRangeListProperties( sal_Int32 nXfId, 
sal_Int32 nNumFmtId, const ApiCellRangeList rRanges ) const;
 voidapplyCellMerging( const 
::com::sun::star::table::CellRangeAddress rRange );
-
+voidaddColXfStyle( sal_Int32 nXfId, sal_Int32 nFormatId, 
const ::com::sun::star::table::CellRangeAddress rAddress, bool 
bProcessRowRange = false );
 private:
 /** Stores cell range address and formula token array of an array formula. 
*/
 typedef ::std::pair ::com::sun::star::table::CellRangeAddress, 
ApiTokenSequence  ArrayFormula;
@@ -217,6 +217,22 @@ private:
 typedef ::std::pair sal_Int32, sal_Int32  XfIdNumFmtKey;
 typedef ::std::map XfIdNumFmtKey, ApiCellRangeList  XfIdRangeListMap;
 
+typedef ::std::pair sal_Int32, sal_Int32  RowRange;
+struct RowRangeStyle
+{
+sal_Int32 mnStartRow;
+sal_Int32 mnEndRow;
+XfIdNumFmtKey mnNumFmt;
+};
+struct StyleRowRangeComp
+{
+bool operator() (const RowRangeStyle lhs, const RowRangeStyle rhs) 
const
+{
+return lhs.mnEndRowrhs.mnStartRow;
+}
+};
+typedef ::std::set RowRangeStyle, StyleRowRangeComp  RowStyles;
+typedef ::std::map sal_Int32, RowStyles  ColStyles;
 /** Stores information about a merged cell range. */
 struct MergedRange
 {
@@ -230,6 +246,7 @@ private:
 };
 typedef ::std::list MergedRange  MergedRangeList;
 
+ColStyles   maStylesPerColumn;  /// Stores cell styles by 
column ( in row ranges )
 CellBlockBuffer maCellBlocks;   /// Manages all open cell 
blocks.
 ArrayFormulaListmaArrayFormulas;/// All array formulas in the 
sheet.
 TableOperationList  maTableOperations;  /// All table operations in 
the sheet.
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx 
b/sc/source/filter/oox/sheetdatabuffer.cxx
index 48b5e8e..174842a 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -346,6 +346,66 @@ void addIfNotInMyMap( StylesBuffer rStyles, std::map 
std::pair sal_Int32, sal
 }
 }
 
+void SheetDataBuffer::addColXfStyle( sal_Int32 nXfId, sal_Int32 nFormatId, 
const ::com::sun::star::table::CellRangeAddress rAddress, bool 
bProcessRowRange )
+{
+RowRangeStyle aStyleRows;
+aStyleRows.mnNumFmt.first = nXfId;
+aStyleRows.mnNumFmt.second = nFormatId;
+aStyleRows.mnStartRow = rAddress.StartRow;
+aStyleRows.mnEndRow = rAddress.EndRow;
+for ( sal_Int32 nCol = rAddress.StartColumn; nCol = rAddress.EndColumn; 
++nCol )
+{
+if ( !bProcessRowRange )
+maStylesPerColumn[ nCol ].insert( aStyleRows );
+else
+{
+RowStyles rRowStyles =  maStylesPerColumn[ nCol ];
+// If the rowrange style includes rows already
+// allocated to a style then we need to split
+// the range style Rows into sections ( to
+// occupy only rows that have no style definition )
+
+// We dont want to set any rowstyle 'rows'
+// for rows where there is an existing 'style' )
+std::vector RowRangeStyle  aRangeRowsSplits;
+
+RowStyles::iterator rows_it = rRowStyles.begin();
+RowStyles::iterator rows_end = rRowStyles.end();
+bool bAddRange = true;
+for ( ; rows_it != rows_end; ++rows_it )
+{
+const RowRangeStyle r = *rows_it;
+// if row is completely within existing style, discard it
+if ( aStyleRows.mnStartRow = r.mnStartRow  
aStyleRows.mnEndRow = r.mnEndRow )
+bAddRange = false;
+else if ( aStyleRows.mnStartRow = r.mnStartRow )
+{
+// not intersecting at all?, if so finish as none left
+// to check ( row ranges are in ascending order
+if ( aStyleRows.mnEndRow  r.mnStartRow )
+

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - dictionaries

2013-05-24 Thread Petr Mladek

 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4650d164da4cc5241514106710c6bc68df71ad35
Author: Petr Mladek pmla...@suse.cz
Date:   Fri May 24 12:17:15 2013 +0200

Updated core
Project: dictionaries  e69808eefb45d900195a1c6a29bb28d15917c81c

diff --git a/dictionaries b/dictionaries
index e8ed1b3..e69808e 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit e8ed1b39dd1d5911395bb70c8ea375bba96f417c
+Subproject commit e69808eefb45d900195a1c6a29bb28d15917c81c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Add Corel Draw and MS Publisher MIME Types to Draw

2013-05-24 Thread Samuel Mehrbrodt (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4022

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/22/4022/1

Add Corel Draw and MS Publisher MIME Types to Draw

Change-Id: Idbaa8cea7427db3103954c6c60aa7caa6784a3ba
---
M sysui/desktop/menus/draw.desktop
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
index 7de198b..9e56d05 100755
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
@@ -22,7 +22,7 @@
 Type=Application
 
Categories=Office;FlowChart;Graphics;2DGraphics;VectorGraphics;X-Red-Hat-Base;X-MandrivaLinux-Office-Drawing;
 Exec=${UNIXBASISROOTNAME} --draw %%FILE%%
-MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.visio;application/x-wpg;
+MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.visio;application/x-wpg;application/vnd.corel-draw;application/vnd.ms-publisher;
 Name=%PRODUCTNAME Draw
 GenericName=Drawing Program
 Comment=Create and edit drawings, flow charts and logos by using Draw.

-- 
To view, visit https://gerrit.libreoffice.org/4022
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idbaa8cea7427db3103954c6c60aa7caa6784a3ba
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Samuel Mehrbrodt s.mehrbr...@gmail.com

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 54/b984f7f33609f693ba99c24552d2261658ff5e

2013-05-24 Thread Caolán McNamara

 54/b984f7f33609f693ba99c24552d2261658ff5e |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 682786514b6dee328791ad2c2ad7be36eb79d8f4
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 24 11:35:27 2013 +0100

Notes added by 'git notes add'

diff --git a/54/b984f7f33609f693ba99c24552d2261658ff5e 
b/54/b984f7f33609f693ba99c24552d2261658ff5e
new file mode 100644
index 000..ae5975f
--- /dev/null
+++ b/54/b984f7f33609f693ba99c24552d2261658ff5e
@@ -0,0 +1 @@
+prefer: 503b248127a92b9ad190e05f6a1d50574183cd47
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 89/b56a902c5a4ca455208a0e76a7b6258acb9907

2013-05-24 Thread Caolán McNamara

 89/b56a902c5a4ca455208a0e76a7b6258acb9907 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 582a7b291008887a378893fda8dd2b0a2903f153
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 24 11:35:46 2013 +0100

Notes added by 'git notes add'

diff --git a/89/b56a902c5a4ca455208a0e76a7b6258acb9907 
b/89/b56a902c5a4ca455208a0e76a7b6258acb9907
new file mode 100644
index 000..ae5975f
--- /dev/null
+++ b/89/b56a902c5a4ca455208a0e76a7b6258acb9907
@@ -0,0 +1 @@
+prefer: 503b248127a92b9ad190e05f6a1d50574183cd47
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: 3 commits - include/xmloff sw/source xmloff/source

2013-05-24 Thread Lubos Lunak

On Wednesday 15 of May 2013, Michael Stahl wrote:
  include/xmloff/xmlimp.hxx  |1
  sw/source/core/bastyp/init.cxx |2 -
  sw/source/core/doc/poolfmt.cxx |4 ---
  sw/source/core/unocore/unoframe.cxx|   16 
  sw/source/filter/html/swhtml.cxx   |5 +++
  sw/source/filter/ww8/ww8par.cxx|4 ---
  sw/source/ui/app/docshini.cxx  |   11 
  xmloff/source/core/xmlimp.cxx  |   33
 + xmloff/source/draw/XMLGraphicsDefaultStyle.cxx | 
   8 ++
  9 files changed, 43 insertions(+), 41 deletions(-)

 New commits:
 commit d278cc769e484b0452b1fb6000e213561d8d955d
 Author: Michael Stahl mst...@redhat.com
 Date:   Wed May 15 18:33:48 2013 +0200

 sw: change pool default of RES_FOLLOW_TEXT_FLOW to false

 For a new document the default is already effectively false due to
 SwDocShell::InitNew() and the ODF and WW8 filters set it explicitly to
 false... which is also the appropriate value for RTF and DOCX.

 But only OOoXML and (perhaps) HTML (not sure) want true as the
 default.

 +mpImpl-mbIsOOoXML =
 +::comphelper::OStorageHelper::GetXStorageFormat(xStor)
 +SOFFICE_FILEFORMAT_8;

 Was the old OOo format really called OOoXML? Seeing this commit made me 
pretty confused until I figured out after a while that it has in fact nothing 
to do with OOXML.

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

[Libreoffice-commits] core.git: include/svx reportdesign/inc reportdesign/source svx/source

2013-05-24 Thread David Tardon

 include/svx/svdobj.hxx |   10 ++
 reportdesign/inc/RptObject.hxx |6 ++
 reportdesign/source/core/sdr/RptObject.cxx |   24 
 svx/source/svdraw/svdobj.cxx   |   19 ++-
 svx/source/unodraw/unopage.cxx |   14 --
 5 files changed, 70 insertions(+), 3 deletions(-)

New commits:
commit 02d03eb4ad6e64744659c5fe04282b25b66c28d8
Author: David Tardon dtar...@redhat.com
Date:   Thu May 16 15:27:08 2013 +0200

fdo#64279 do not crash opening report for editing

There are two problems:

1) The classes derived from SdrObject cache their SvxShape, but do not
   implement impl_setUnoShape().

2) There is a lifetime issue in association of a SdrObject and its
   SvxShape. SvxDrawPage::CreateSdrObject not only creates a new SdrObject
   for a shape, but also inserts it into the page. At this point, the shape
   has not been attached to the object yet. That means that the object
   creates another shape at one point during the InsertObject call,
   which is then destroyed again. But reportdesign shapes own their
   objects, which means that destuction of the shape causes destruction
   of the object too...

   My first idea was to disable the insertion in
   SvxDrawPage::CreateSdrObject, but it has been there since the dawn of
   time, so I did not gather the courage to do that. Instead, I put in a
   hack to allow to skip the insertion.

Change-Id: I888a54067be1934578434d8b476a13a7ff8d02b3

diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index d3047b8..081fe76 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -1055,6 +1055,11 @@ public:
 Rectangle GetBLIPSizeRectangle() const;
 void SetBLIPSizeRectangle( const Rectangle aRect );
 
+/// @see mbDoNotInsertIntoPageAutomatically
+void SetDoNotInsertIntoPageAutomatically(bool bSet);
+/// @see mbDoNotInsertIntoPageAutomatically
+bool IsDoNotInsertIntoPageAutomatically() const;
+
 protected:
 /** Sets a new UNO shape
   *
@@ -1082,6 +1087,11 @@ private:
 SvxShape*   mpSvxShape;
 ::com::sun::star::uno::WeakReference ::com::sun::star::uno::XInterface 
 maWeakUnoShape;
+/** HACK: Do not automatically insert newly created object into a page.
+  *
+  * The user needs to do it manually later.
+  */
+bool mbDoNotInsertIntoPageAutomatically;
 };
 
 //
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index ac22e47..9de4b13 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -169,6 +169,9 @@ public:
 virtual ::com::sun::star::uno::Reference 
::com::sun::star::uno::XInterface  getUnoShape();
 virtual sal_uInt16 GetObjIdentifier() const;
 virtual sal_uInt32 GetObjInventor() const;
+
+private:
+virtual void impl_setUnoShape( const ::com::sun::star::uno::Reference 
::com::sun::star::uno::XInterface  rxUnoShape );
 };
 
 //
@@ -182,6 +185,8 @@ class REPORTDESIGN_DLLPUBLIC OOle2Obj: public SdrOle2Obj , 
public OObjectBase
 sal_uInt16 m_nType;
 boolm_bOnlyOnce;
 void impl_createDataProvider_nothrow( const 
::com::sun::star::uno::Reference ::com::sun::star::frame::XModel _xModel);
+virtual void impl_setUnoShape( const ::com::sun::star::uno::Reference 
::com::sun::star::uno::XInterface  rxUnoShape );
+
 public:
 static OOle2Obj* Create( const ::com::sun::star::uno::Reference 
::com::sun::star::report::XReportComponent _xComponent,sal_uInt16 _nType )
 {
@@ -271,6 +276,7 @@ public:
 OUnoObject operator=(const OUnoObject rObj);
 
 private:
+virtual void impl_setUnoShape( const ::com::sun::star::uno::Reference 
::com::sun::star::uno::XInterface  rxUnoShape );
 voidimpl_setReportComponent_nothrow();
 voidimpl_initializeModel_nothrow();
 };
diff --git a/reportdesign/source/core/sdr/RptObject.cxx 
b/reportdesign/source/core/sdr/RptObject.cxx
index 280f3de..ad81cdc 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -166,6 +166,9 @@ SdrObject* OObjectBase::createObject(const uno::Reference 
report::XReportCompon
 break;
 }
 
+if ( pNewObj )
+pNewObj-SetDoNotInsertIntoPageAutomatically( true );
+
 ensureSdrObjectOwnership( _xComponent );
 
 return pNewObj;
@@ -609,6 +612,13 @@ uno::Reference uno::XInterface  
OCustomShape::getUnoShape()
 return xShape;
 }
 
+void OCustomShape::impl_setUnoShape( const uno::Reference uno::XInterface  
rxUnoShape )
+{
+SdrObjCustomShape::impl_setUnoShape( rxUnoShape );
+releaseUnoShape();
+m_xReportComponent.clear();
+}
+
 //

[PATCH] scripting: get CreateUnoDialog() work again

2013-05-24 Thread Miklos Vajna (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4023

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/23/4023/1

scripting: get CreateUnoDialog() work again

Trivial reproducer:

Dim Dlg As Object
DialogLibraries.LoadLibrary(Standard)
Dlg = CreateUnoDialog(DialogLibraries.Standard.Dialog1)
Dlg.Execute()
Dlg.dispose()

Regression from 6c61b20a8d4a6dcac28801cde82a211fb7e30654.

Change-Id: Ia62778c6d94f54e6097a307701e5c81be847665d
---
M scripting/source/dlgprov/dlgprov.cxx
1 file changed, 2 insertions(+), 1 deletion(-)



diff --git a/scripting/source/dlgprov/dlgprov.cxx 
b/scripting/source/dlgprov/dlgprov.cxx
index 8c645a3..2d96b9d 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -149,9 +149,10 @@
 // Set resource property
 if( xStringResourceManager.is() )
 {
+Reference beans::XPropertySet  xDlgPSet( xDialogModel, UNO_QUERY 
);
 Any aStringResourceManagerAny;
 aStringResourceManagerAny = xStringResourceManager;
-xDialogModel-setPropertyValue( aResourceResolverPropName, 
aStringResourceManagerAny );
+xDlgPSet-setPropertyValue( aResourceResolverPropName, 
aStringResourceManagerAny );
 }
 
 return xDialogModel;

-- 
To view, visit https://gerrit.libreoffice.org/4023
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia62778c6d94f54e6097a307701e5c81be847665d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Miklos Vajna vmik...@suse.cz

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

[Libreoffice-commits] core.git: scripting/source

2013-05-24 Thread Miklos Vajna

 scripting/source/dlgprov/dlgprov.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 2e2a4827ce6708f0e8677dba9cc92e1479a44086
Author: Miklos Vajna vmik...@suse.cz
Date:   Fri May 24 12:52:25 2013 +0200

scripting: get CreateUnoDialog() work again

Trivial reproducer:

Dim Dlg As Object
DialogLibraries.LoadLibrary(Standard)
Dlg = CreateUnoDialog(DialogLibraries.Standard.Dialog1)
Dlg.Execute()
Dlg.dispose()

Regression from 6c61b20a8d4a6dcac28801cde82a211fb7e30654.

Change-Id: Ia62778c6d94f54e6097a307701e5c81be847665d
Reviewed-on: https://gerrit.libreoffice.org/4023
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/scripting/source/dlgprov/dlgprov.cxx 
b/scripting/source/dlgprov/dlgprov.cxx
index 8c645a3..2d96b9d 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -149,9 +149,10 @@ static OUString 
aResourceResolverPropName(ResourceResolver);
 // Set resource property
 if( xStringResourceManager.is() )
 {
+Reference beans::XPropertySet  xDlgPSet( xDialogModel, UNO_QUERY 
);
 Any aStringResourceManagerAny;
 aStringResourceManagerAny = xStringResourceManager;
-xDialogModel-setPropertyValue( aResourceResolverPropName, 
aStringResourceManagerAny );
+xDlgPSet-setPropertyValue( aResourceResolverPropName, 
aStringResourceManagerAny );
 }
 
 return xDialogModel;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] scripting: get CreateUnoDialog() work again

2013-05-24 Thread Miklos Vajna (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/4023

Approvals:
  Miklos Vajna: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/4023
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia62778c6d94f54e6097a307701e5c81be847665d
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Miklos Vajna vmik...@suse.cz
Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz

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

[PATCH] fdo#63254 UI:Horizontal scroll bar isn't displayed when RTL ...

2013-05-24 Thread Abdulaziz A Alayed (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4024

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/24/4024/1

fdo#63254 UI:Horizontal scroll bar isn't displayed when RTL tab

opened with LTR UI.

Change-Id: Iff6899539fe0b1788df7b09f91f850b91bcdb811
---
M vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
1 file changed, 3 insertions(+), 2 deletions(-)



diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 29f7542..e3b1275 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -1048,8 +1048,9 @@
 rNativeContentRegion.Right() = rNativeContentRegion.Left() + 1;
 if (!rNativeContentRegion.GetHeight())
 rNativeContentRegion.Bottom() = rNativeContentRegion.Top() + 1;
-
-returnVal = true;
+//fdo#63254 horizontal scrool bar isn't displayed in RTL tab
+// with LTR UI in calc
+returnVal =!Application::GetSettings().GetLayoutRTL() ? false : true;
 
 //See fdo#44582, Horizontal scrollbar in navigator window is broken
 if ((nPart==PART_BUTTON_LEFT || nPart==PART_BUTTON_RIGHT)  
Application::GetSettings().GetLayoutRTL())

-- 
To view, visit https://gerrit.libreoffice.org/4024
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff6899539fe0b1788df7b09f91f850b91bcdb811
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Abdulaziz A Alayed aala...@kacst.edu.sa

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

[Libreoffice-commits] core.git: scripting/source

2013-05-24 Thread Pedro Giffuni

 scripting/source/pyprov/pythonscript.py |   82 
 1 file changed, 41 insertions(+), 41 deletions(-)

New commits:
commit 7a6cc8bb59bf1cae6adabdf76e0bebd3f04f5e39
Author: Pedro Giffuni p...@apache.org
Date:   Sun Jul 29 19:53:48 2012 +

Resolves: #i55055# Simplify pythonscript.py code

author: hanya
(cherry picked from commit e945b49105bab50700274f797e41d1446a70641d)

Conflicts:
scripting/source/pyprov/pythonscript.py

Change-Id: Ia019a737c5f80d3af9fc50aefcda6f5b00987513

diff --git a/scripting/source/pyprov/pythonscript.py 
b/scripting/source/pyprov/pythonscript.py
index c92d212..789b6a6 100755
--- a/scripting/source/pyprov/pythonscript.py
+++ b/scripting/source/pyprov/pythonscript.py
@@ -177,7 +177,7 @@ class MyUriHelper:
 else:
 self.m_baseUri = expandUri( self.s_UriMap[location] )
 self.m_scriptUriLocation = location
-log.isDebugLevel() and log.debug( initialized urihelper with 
baseUri=+self.m_baseUri + ,m_scriptUriLocation=+self.m_scriptUriLocation )
+log.debug( initialized urihelper with baseUri=+self.m_baseUri + 
,m_scriptUriLocation=+self.m_scriptUriLocation )
 
 def getRootStorageURI( self ):
 return self.m_baseUri
@@ -191,20 +191,20 @@ class MyUriHelper:
 def storageURI2ScriptUri( self, storageURI ):
 if not storageURI.startswith( self.m_baseUri ):
 message = pythonscript: storage uri ' + storageURI + ' not in 
base uri ' + self.m_baseUri + '
-log.isDebugLevel() and log.debug( message )
+log.debug( message )
 raise RuntimeException( message )
 
 ret = vnd.sun.star.script: + \
   storageURI[len(self.m_baseUri)+1:].replace(/,|) + \
   ?language= + LANGUAGENAME + location= + 
self.m_scriptUriLocation
-log.isDebugLevel() and log.debug( converting storageURI=+storageURI 
+  to scriptURI= + ret )
+log.debug( converting storageURI=+storageURI +  to scriptURI= + 
ret )
 return ret
 
 def scriptURI2StorageUri( self, scriptURI ):
 try:
 myUri = self.m_uriRefFac.parse(scriptURI)
 ret = self.m_baseUri + / + myUri.getName().replace( |, / )
-log.isDebugLevel() and log.debug( converting 
scriptURI=+scriptURI +  to storageURI= + ret )
+log.debug( converting scriptURI=+scriptURI +  to storageURI= + 
ret )
 return ret
 except UnoException as e:
 log.error( error during converting scriptURI=+scriptURI + :  + 
e.Message)
@@ -285,12 +285,12 @@ class ScriptContext(unohelper.Base):
 #lastRead = sfa.getDateTimeModified( url )
 #if entry:
 #if hasChanged( entry.lastRead, lastRead ):
-#log.isDebugLevel() and log.debug(file  + url +  has changed, 
reloading)
+#log.debug(file  + url +  has changed, reloading)
 #else:
 #load = False
 #
 #if load:
-#log.isDebugLevel() and log.debug( opening  + url +  )
+#log.debug( opening  + url +  )
 #
 #code = readTextFromStream( sfa.openFileRead( url ) )
 
@@ -300,7 +300,7 @@ class ScriptContext(unohelper.Base):
 #entry.module.__file__ = url
 #exec code in entry.module.__dict__
 #g_modules[ url ] = entry
-#log.isDebugLevel() and log.debug( mapped  + url +  to  + str( 
entry.module ) )
+#log.debug( mapped  + url +  to  + str( entry.module ) )
 #return entry.module
 
 class ProviderContext:
@@ -333,7 +333,7 @@ class ProviderContext:
 def addPackageByUrl( self, url ):
 packageName = self.getPackageNameFromUrl( url )
 transientPart = self.getTransientPartFromUrl( url )
-log.isDebugLevel() and log.debug( addPackageByUrl :  + packageName + 
,  + transientPart + (+url+) + , rootUrl=+self.rootUrl )
+log.debug( addPackageByUrl :  + packageName + ,  + transientPart + 
(+url+) + , rootUrl=+self.rootUrl )
 if packageName in self.mapPackageName2Path:
 package = self.mapPackageName2Path[ packageName ]
 package.paths = package.paths + (url, )
@@ -360,7 +360,7 @@ class ProviderContext:
 if self.rootUrl:
 pos = len( self.rootUrl) +1
 ret = url[0:pos]+url[url.find(/,pos)+1:len(url)]
-log.isDebugLevel() and log.debug( getPersistentUrlFromStorageUrl  + 
url +   - + ret)
+log.debug( getPersistentUrlFromStorageUrl  + url +   - + ret)
 return ret
 
 def getStorageUrlFromPersistentUrl( self, url):
@@ -370,7 +370,7 @@ class ProviderContext:
 packageName = url[pos:url.find(/,pos+1)]
 package = self.mapPackageName2Path[ packageName ]
 ret = url[0:pos]+ package.transientPathElement + / + 
url[pos:len(url)]
-log.isDebugLevel() and log.debug( getStorageUrlFromPersistentUrl  + 
url +  - + ret)
+log.debug( getStorageUrlFromPersistentUrl

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e9/45b49105bab50700274f797e41d1446a70641d

2013-05-24 Thread Caolán McNamara

 e9/45b49105bab50700274f797e41d1446a70641d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 747827e44b9466fceed840663fe63dcfc4e4c45f
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 24 12:18:44 2013 +0100

Notes added by 'git notes add'

diff --git a/e9/45b49105bab50700274f797e41d1446a70641d 
b/e9/45b49105bab50700274f797e41d1446a70641d
new file mode 100644
index 000..d06474c
--- /dev/null
+++ b/e9/45b49105bab50700274f797e41d1446a70641d
@@ -0,0 +1 @@
+merged as: 7a6cc8bb59bf1cae6adabdf76e0bebd3f04f5e39
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c2/968f4101089a8e1c159fb17a5cdf73d681806d

2013-05-24 Thread Caolán McNamara

 c2/968f4101089a8e1c159fb17a5cdf73d681806d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 662839a8d0122a20ec689089f21546a5ccf62485
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 24 12:21:24 2013 +0100

Notes added by 'git notes add'

diff --git a/c2/968f4101089a8e1c159fb17a5cdf73d681806d 
b/c2/968f4101089a8e1c159fb17a5cdf73d681806d
new file mode 100644
index 000..873ee14
--- /dev/null
+++ b/c2/968f4101089a8e1c159fb17a5cdf73d681806d
@@ -0,0 +1 @@
+prefer: db2522b7323fab4d570b23aa7a39be9994cbbb0c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

fdo#46808, Convert awt::UnoControlDialogModel to new style problem

2013-05-24 Thread Noel Grandin


Hi

OK, so it turns out that my change
fdo#46808, Convert awt::UnoControlDialogModel to new style
http://cgit.freedesktop.org/libreoffice/core/commit/?id=6c61b20a8d4a6dcac28801cde82a211fb7e30654
has been causing some problems, notably around getting and setting 
properties.


Miklos did all of the debugging, and figuring out how to work-around the 
problem.


I'm writing down my notes in case anyone can shed light on WHY this is 
happening.


The problem is that after my change, this:
  Reference beans::XPropertySet  xDlgPSet( xDialogModel, UNO_QUERY )
  Any aStringResourceManagerAny;
  aStringResourceManagerAny = xStringResourceManager;
  xDlgPSet-setPropertyValue( aResourceResolverPropName, 
aStringResourceManagerAny );

is not equivalent to this:
 Any aStringResourceManagerAny;
 aStringResourceManagerAny = xStringResourceManager;
 xDialogModel-setPropertyValue( aResourceResolverPropName, 
aStringResourceManagerAny );


For context the type hierarchy looks like this:
   UnoControlDialogModel -- ControlModelContainerBase -- 
UnoControlModel -- ::cppu::OPropertySetHelper


So when my new code calls setPropertyValue, it ends up here:
// overrides to resolve ambiguity
virtual void  UnoControlDialogModel::setPropertyValue(const 
OUString p1, Any p2)  throw (some stuff)

{
return 
UnoControlDialogModel_Base::ControlModelContainerBase::setPropertyValue(p1, 
p2);

}
which calls into this:
void UnoControlModel::setPropertyValue( const OUString 
rPropertyName, :Any rValue ) throw(some stuff)

{
sal_Int32 nPropId = 0;
{
::osl::Guard ::osl::Mutex  aGuard( GetMutex() );
nPropId = (sal_Int32) GetPropertyId( rPropertyName );
DBG_ASSERT( nPropId, Invalid ID in 
UnoControlModel::setPropertyValue );

 }
 if( nPropId )
 setFastPropertyValue( nPropId, rValue );
 else
 throw ::com::sun::star::beans::UnknownPropertyException();
}
but if we first cast to ReferenceXPropertySet, and then do the call, 
we end up in

cppu::OPropertySetHelper::setPropertyValue()
and all is well.

Now why on earth UnoControlModel feels that it needs to override that, 
instead of just letting OPropertySetHelper handle it, I do not know.
It appears to be doing some weird stuff with font properties, but that 
does not explain the need for this override.




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


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

[Libreoffice-commits] core.git: 2 commits - sc/source

2013-05-24 Thread Noel Power

 sc/source/filter/inc/sheetdatabuffer.hxx |   19 
 sc/source/filter/inc/stylesbuffer.hxx|4 -
 sc/source/filter/oox/sheetdatabuffer.cxx |  122 +++
 sc/source/filter/oox/stylesbuffer.cxx|   64 
 4 files changed, 16 insertions(+), 193 deletions(-)

New commits:
commit eb9bf904b58aede41b06a5c14335eec6565af202
Author: Noel Power noel.po...@suse.com
Date:   Fri May 24 12:34:27 2013 +0100

Revert improve cell style xls[x|m] import performance

This reverts commit 4190fd92c6426f40e5ef65a77f3d31e7527db0b9.

diff --git a/sc/source/filter/inc/stylesbuffer.hxx 
b/sc/source/filter/inc/stylesbuffer.hxx
index 2195ab0..77654c7 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -35,8 +35,6 @@
 #include stlsheet.hxx
 #include editeng/svxenum.hxx
 #include editeng/frmdir.hxx
-#include attarray.hxx
-#include list
 
 class ScMarkData;
 namespace com { namespace sun { namespace star {
@@ -721,8 +719,6 @@ public:
 inline const Protection getProtection() const { return maProtection; }
 
 void  writeToMarkData( ::ScMarkData rMarkData, sal_Int32 nNumFmtId  );
-void  applyPatternToAttrList( ::std::listScAttrEntry rAttrs, SCROW 
nRow1, SCROW nRow2,
-  sal_uInt32 nForceScNumFmt );
 /** Writes all formatting attributes to the passed property map. */
 voidwriteToPropertyMap( PropertyMap rPropMap ) const;
 /** Writes all formatting attributes to the passed property set. */
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx 
b/sc/source/filter/oox/sheetdatabuffer.cxx
index 48b5e8e..11a057d 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -361,50 +361,6 @@ void SheetDataBuffer::finalizeImport()
 
 // write default formatting of remaining row range
 maXfIdRowRangeList[ maXfIdRowRange.mnXfId ].push_back( 
maXfIdRowRange.maRowRange );
-
-typedef ::std::pair sal_Int32, sal_Int32  RowRange;
-struct RowRangeStyle
-{
-sal_Int32 mnStartRow;
-sal_Int32 mnEndRow;
-XfIdNumFmtKey mnNumFmt;
-};
-struct StyleRowRangeComp
-{
-bool operator() (const RowRangeStyle lhs, const RowRangeStyle rhs) 
const
-{
-return lhs.mnEndRowrhs.mnStartRow;
-}
-};
-
-typedef ::std::set RowRangeStyle, StyleRowRangeComp  RowStyles;
-typedef ::std::map sal_Int32, RowStyles  ColStyles;
-
-ColStyles aStylesPerColumn;
-StylesBuffer rStyles = getStyles();
-
-std::map std::pair sal_Int32, sal_Int32 , ApiCellRangeList  
rangeStyleListMap;
-
-for( XfIdRangeListMap::const_iterator aIt = maXfIdRangeLists.begin(), aEnd 
= maXfIdRangeLists.end(); aIt != aEnd; ++aIt )
-addIfNotInMyMap( getStyles(), rangeStyleListMap, aIt-first.first, 
aIt-first.second, aIt-second );
-
-// gather all ranges that have the same style and apply them in bulk
-for (  std::map std::pair sal_Int32, sal_Int32 , ApiCellRangeList 
::iterator it = rangeStyleListMap.begin(), it_end = rangeStyleListMap.end(); 
it != it_end; ++it )
-{
-const ApiCellRangeList rRanges( it-second );
-for ( ApiCellRangeList::const_iterator it_range = rRanges.begin(), 
it_rangeend = rRanges.end(); it_range!=it_rangeend; ++it_range )
-{
-RowRangeStyle aStyleRows;
-aStyleRows.mnNumFmt.first = it-first.first;
-aStyleRows.mnNumFmt.second = it-first.second;
-aStyleRows.mnStartRow = it_range-StartRow;
-aStyleRows.mnEndRow = it_range-EndRow;
-for ( sal_Int32 nCol = it_range-StartColumn; nCol = 
it_range-EndColumn; ++nCol )
-aStylesPerColumn[ nCol ].insert( aStyleRows );
-}
-}
-
-// process row ranges for each column, don't overwrite any existing row 
entries for a column
 for ( std::map sal_Int32, std::vector ValueRange  ::iterator it = 
maXfIdRowRangeList.begin(), it_end =  maXfIdRowRangeList.end(); it != it_end; 
++it )
 {
 ApiCellRangeList rangeList;
@@ -412,91 +368,27 @@ void SheetDataBuffer::finalizeImport()
 // get all row ranges for id
 for ( std::vector ValueRange ::iterator rangeIter = 
it-second.begin(), rangeIter_end = it-second.end(); rangeIter != 
rangeIter_end; ++rangeIter )
 {
-RowRangeStyle aStyleRows;
-aStyleRows.mnNumFmt.first = it-first;
-if ( aStyleRows.mnNumFmt.first == -1 ) // dud
-continue;
-aStyleRows.mnNumFmt.second = -1;
-aStyleRows.mnStartRow = rangeIter-mnFirst;
-aStyleRows.mnEndRow = rangeIter-mnLast;
-for ( sal_Int32 nCol = 0; nCol = 
rAddrConv.getMaxApiAddress().Column; ++nCol )
-{
-RowStyles rRowStyles =  aStylesPerColumn[ nCol ];
-// If the rowrange style includes rows already
-// allocated to a style then we

[Libreoffice-commits] core.git: 2 commits - boost/boost.endian.patch boost/boost.wundef.patch boost/UnpackedTarball_boost.mk

2013-05-24 Thread Tor Lillqvist

 boost/UnpackedTarball_boost.mk |1 +
 boost/boost.endian.patch   |   22 ++
 boost/boost.wundef.patch   |   11 +++
 3 files changed, 34 insertions(+)

New commits:
commit 58b9060b5f325f611dd7d5748dfa41b897aa09eb
Author: Tor Lillqvist t...@iki.fi
Date:   Fri May 24 14:57:20 2013 +0300

Fix Boost endianness detection for Android

Change-Id: I88006cced5975fc0748b33094ae39197daba49cc

diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
index 75eb479..bcec8b9 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/boost/UnpackedTarball_boost.mk
@@ -37,6 +37,7 @@ boost_patches += boost_1_44_0-clang-warnings.patch
 boost_patches += boost_1_44_0-gcc4.8.patch
 
 boost_patches += boost.auto_link.patch
+boost_patches += boost.endian.patch
 boost_patches += boost.loplugin.patch
 boost_patches += boost.std.move.patch
 boost_patches += boost.wundef.patch
diff --git a/boost/boost.endian.patch b/boost/boost.endian.patch
new file mode 100644
index 000..bf129f7
--- /dev/null
+++ b/boost/boost.endian.patch
@@ -0,0 +1,22 @@
+--- foo/foo/foo/boost/detail/endian.hpp
 foo/foo/foo/boost/detail/endian.hpp
+@@ -28,16 +28,16 @@
+ #ifndef BOOST_DETAIL_ENDIAN_HPP
+ #define BOOST_DETAIL_ENDIAN_HPP
+ 
+-// GNU libc offers the helpful header endian.h which defines
++// GNU libc and Android's bionic offer the helpful header endian.h which 
defines
+ // __BYTE_ORDER
+ 
+-#if defined (__GLIBC__)
++#if defined (__GLIBC__) || defined(__ANDROID__)
+ # include endian.h
+ # if (__BYTE_ORDER == __LITTLE_ENDIAN)
+ #  define BOOST_LITTLE_ENDIAN
+ # elif (__BYTE_ORDER == __BIG_ENDIAN)
+ #  define BOOST_BIG_ENDIAN
+-# elif (__BYTE_ORDER == __PDP_ENDIAN)
++# elif defined(__PDP_ENDIAN)  (__BYTE_ORDER == __PDP_ENDIAN)
+ #  define BOOST_PDP_ENDIAN
+ # else
+ #  error Unknown machine endianness detected.
commit d972b212f6f7a2b40ed85ba2ec08a228decc3f70
Author: Tor Lillqvist t...@iki.fi
Date:   Fri May 24 14:50:03 2013 +0300

WaE: __GXX_EXPERIMENTAL_CXX0X__ is not defined

Change-Id: I66447ffe1a5f364377b80756f6c08f6986ce4eef

diff --git a/boost/boost.wundef.patch b/boost/boost.wundef.patch
index a389d50..c4928ed 100644
--- a/boost/boost.wundef.patch
+++ b/boost/boost.wundef.patch
@@ -9,6 +9,17 @@
  namespace {
multi_array_types::extent_gen extents;
multi_array_types::index_gen indices;
+--- foo/foo/foo/boost/preprocessor/config/config.hpp
 foo/foo/foo/boost/preprocessor/config/config.hpp
+@@ -90,7 +90,7 @@
+ #define BOOST_PP_VARIADICS 0
+ #endif
+ #/* Wave (C/C++), GCC (C++) */
+-#elif defined __WAVE__  __WAVE_HAS_VARIADICS__ || defined __GNUC__  
__GXX_EXPERIMENTAL_CXX0X__
++#elif defined __WAVE__  __WAVE_HAS_VARIADICS__ || defined __GNUC__  
defined __GXX_EXPERIMENTAL_CXX0X__  __GXX_EXPERIMENTAL_CXX0X__
+ #define BOOST_PP_VARIADICS 1
+ #/* EDG-based (C/C++), GCC (C), and unknown (C/C++) */
+ #elif !defined __cplusplus  __STDC_VERSION__ = 199901L || __cplusplus 
= 201103L
 --- foo/foo/foo/boost/preprocessor/tuple/elem.hpp
 +++ foo/foo/foo/boost/preprocessor/tuple/elem.hpp
 @@ -22,7 +22,7 @@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Track0001:Build fail on formula-core-rework branch 05/24/2013.

2013-05-24 Thread Caolán McNamara

On Thu, 2013-05-23 at 21:33 -0700, leo2013 wrote:
 /home/leo/libreproj/zlibreoffice/core/sfx2/source/view/viewfrm.cxx: In
 static member function ‘static bool SfxViewFrame::IsSidebarEnabled()’:
 /home/leo/libreproj/zlibreoffice/core/sfx2/source/view/viewfrm.cxx:3416:57:
 error: ‘officecfg::Office::Common::Misc::ExperimentalSidebar’ has not been
 declared

I think this is because of an incremental build where the old
generated headers from the officecfg dir are in solver while the new
ones are in workdir/someplace and you're building against the old ones.

The easiest solution is make clean  make

C.

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 2 commits - include/toolkit offapi/com scripting/source toolkit/source

2013-05-24 Thread Miklos Vajna

 include/toolkit/controls/dialogcontrol.hxx   |3 ---
 offapi/com/sun/star/awt/XUnoControlDialogModel.idl   |3 ---
 offapi/com/sun/star/resource/XStringResourceManager.idl  |2 +-
 offapi/com/sun/star/resource/XStringResourceResolver.idl |2 +-
 scripting/source/dlgprov/dlgprov.cxx |7 ++-
 toolkit/source/controls/dialogcontrol.cxx|8 
 6 files changed, 8 insertions(+), 17 deletions(-)

New commits:
commit f983c6f9eeded013a62e9ffbbf98fe68755a1361
Author: Miklos Vajna vmik...@suse.cz
Date:   Fri May 24 12:52:25 2013 +0200

scripting: get CreateUnoDialog() work again

Trivial reproducer:

Dim Dlg As Object
DialogLibraries.LoadLibrary(Standard)
Dlg = CreateUnoDialog(DialogLibraries.Standard.Dialog1)
Dlg.Execute()
Dlg.dispose()

Regression from 6c61b20a8d4a6dcac28801cde82a211fb7e30654.

Change-Id: Ia62778c6d94f54e6097a307701e5c81be847665d
Reviewed-on: https://gerrit.libreoffice.org/4023
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
(cherry picked from commit 2e2a4827ce6708f0e8677dba9cc92e1479a44086)

diff --git a/scripting/source/dlgprov/dlgprov.cxx 
b/scripting/source/dlgprov/dlgprov.cxx
index 3584394..21ec3ef 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -149,9 +149,10 @@ static OUString 
aResourceResolverPropName(ResourceResolver);
 // Set resource property
 if( xStringResourceManager.is() )
 {
+Reference beans::XPropertySet  xDlgPSet( xDialogModel, UNO_QUERY 
);
 Any aStringResourceManagerAny;
 aStringResourceManagerAny = xStringResourceManager;
-xDialogModel-setPropertyValue( aResourceResolverPropName, 
aStringResourceManagerAny );
+xDlgPSet-setPropertyValue( aResourceResolverPropName, 
aStringResourceManagerAny );
 }
 
 return xDialogModel;
commit 5e0e21f083b034d78d1d24377ce4e7bd2d6b1ef3
Author: Noel Grandin n...@peralex.com
Date:   Thu May 23 16:38:15 2013 +0200

fix awt::UnoControlModelDialog crash

...in commit 6c61b20a8d4a6dcac28801cde82a211fb7e30654,
Convert awt::UnoControlDialogModel to new style
I added an attribute ResourceResolver because some of the client
code was setting it using the property interface.

It turns out that this was a bad idea because the ResourceResolver
property is doing some very interesting stuff, so revert that part
of the change.

Change-Id: I62b890e60164e005867ced49c3e407a49ed09441
Reviewed-on: https://gerrit.libreoffice.org/4013
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
(cherry picked from commit 2ce6828bbbf6ba181bb2276adeec279e74151ef6)

diff --git a/include/toolkit/controls/dialogcontrol.hxx 
b/include/toolkit/controls/dialogcontrol.hxx
index f92652a..a749c24 100644
--- a/include/toolkit/controls/dialogcontrol.hxx
+++ b/include/toolkit/controls/dialogcontrol.hxx
@@ -166,9 +166,6 @@ public:
{ return getPropertyString(ImageURL); }
 virtual void SAL_CALL setImageURL(const rtl::OUString p1) 
throw(::com::sun::star::uno::RuntimeException)
{ setPropertyString(ImageURL, p1); }
-virtual 
com::sun::star::uno::Referencecom::sun::star::resource::XStringResourceManager
 SAL_CALL getResourceResolver() throw(::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL setResourceResolver(const 
com::sun::star::uno::Referencecom::sun::star::resource::XStringResourceManager
 p1) throw(::com::sun::star::uno::RuntimeException)
-{ setPropertyValue( ResourceResolver, css::uno::Any(p1) ); }
 virtual com::sun::star::awt::FontDescriptor SAL_CALL getFontDescriptor() 
throw(::com::sun::star::uno::RuntimeException);
 virtual void SAL_CALL setFontDescriptor(const 
com::sun::star::awt::FontDescriptor p1) 
throw(::com::sun::star::uno::RuntimeException)
 { setPropertyValue( FontDescriptor, css::uno::Any(p1) ); }
diff --git a/offapi/com/sun/star/awt/XUnoControlDialogModel.idl 
b/offapi/com/sun/star/awt/XUnoControlDialogModel.idl
index 81cd2b1..9032a37 100644
--- a/offapi/com/sun/star/awt/XUnoControlDialogModel.idl
+++ b/offapi/com/sun/star/awt/XUnoControlDialogModel.idl
@@ -28,7 +28,6 @@
 #include com/sun/star/lang/XMultiServiceFactory.idl
 #include com/sun/star/util/Color.idl
 #include com/sun/star/graphic/XGraphic.idl
-#include com/sun/star/resource/XStringResourceManager.idl
 
 
 module com {  module sun {  module star {  module awt {
@@ -67,8 +66,6 @@ published interface XUnoControlDialogModel
 
 [attribute] string DialogSourceURL;
 
-[attribute] com::sun::star::resource::XStringResourceManager 
ResourceResolver;
-
 /** specifies the text that is displayed in the caption bar of the dialog.
  */
 [attribute] string Title;
diff --git

[Libreoffice-commits] core.git: 2 commits - boost/Module_boost.mk boost/StaticLibrary_boost_date_time.mk boost/StaticLibrary_boostdatetime.mk boost/StaticLibrary_boost_system.mk boost/StaticLibrary_bo

2013-05-24 Thread Fridrich Štrba

 Library_merged.mk  |2 
 RepositoryExternal.mk  |   22 ++--
 boost/Module_boost.mk  |4 
 boost/StaticLibrary_boost_date_time.mk |   30 --
 boost/StaticLibrary_boost_system.mk|   27 -
 boost/StaticLibrary_boostdatetime.mk   |   30 ++
 boost/StaticLibrary_boostsystem.mk |   27 +
 liborcus/ExternalProject_liborcus.mk   |5 -
 m4/README  |4 
 m4/ax_boost_thread.m4  |  149 -
 sc/Library_scfilt.mk   |2 
 ucb/Library_ucpcmis1.mk|2 
 12 files changed, 77 insertions(+), 227 deletions(-)

New commits:
commit 6874228b090b9d910651ddf6ec82b16ac9ecb6de
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Fri May 24 14:47:11 2013 +0200

Different, less intrusive fix for the boostsystem goodness

Change-Id: Icab27a0a8195f5a0fb81a51c4609dfb93036343d

diff --git a/liborcus/ExternalProject_liborcus.mk 
b/liborcus/ExternalProject_liborcus.mk
index b6ae1ee..a65ae39 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_ExternalProject_use_autoconf,liborcus,build))
 
 $(eval $(call gb_ExternalProject_use_externals,liborcus, \
 boost_headers \
-   boostsystem \
+boostsystem \
 zlib \
 ))
 
@@ -92,6 +92,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
--disable-spreadsheet-model \
--disable-werror \
$(if $(filter 
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+   $(if $(filter 
NO,$(SYSTEM_BOOST)),--with-boost-system=boostsystem) \
 $(MAKE) \
)
 
commit cdabc886f68c0a8e510c7795dcab9c192cb6b5c8
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Fri May 24 14:46:28 2013 +0200

Revert Rename Boost libraries when built internally to match conventions

This reverts commit 3aeecc525c76797801e9e2b24c2ebff6ac81adac.

diff --git a/Library_merged.mk b/Library_merged.mk
index 64262ca..6e404df 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Library_use_libraries,merged,\
 ))
 
 $(eval $(call gb_Library_use_externals,merged,\
-   boost_date_time \
+   boostdatetime \
$(call gb_Helper_optional,DESKTOP,clucene) \
cups \
curl \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index c3b0d66..0be2054 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -540,7 +540,7 @@ endif # SYSTEM_HUNSPELL
 
 ifeq ($(SYSTEM_BOOST),YES)
 
-define gb_LinkTarget__use_boost_date_time
+define gb_LinkTarget__use_boostdatetime
 $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(BOOST_CPPFLAGS) \
@@ -556,7 +556,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
 
 endef
 
-define gb_LinkTarget__use_boost_system
+define gb_LinkTarget__use_boostsystem
 $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(BOOST_CPPFLAGS) \
@@ -572,7 +572,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
 
 endef
 
-gb_ExternalProject__use_boost_system :=
+gb_ExternalProject__use_boostsystem :=
 
 define gb_LinkTarget__use_boost_headers
 $(call gb_LinkTarget_set_include,$(1),\
@@ -587,8 +587,8 @@ gb_ExternalProject__use_boost_headers:=
 else # !SYSTEM_BOOST
 
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
-   boost_date_time \
-   boost_system \
+   boostdatetime \
+   boostsystem \
 ))
 
 ifeq ($(OS),WNT)
@@ -608,30 +608,30 @@ endef
 
 endif # WNT
 
-define gb_LinkTarget__use_boost_date_time
+define gb_LinkTarget__use_boostdatetime
 $(call gb_LinkTarget_add_defs,$(1),\
-DBOOST_ALL_NO_LIB \
 )
 
 $(call gb_LinkTarget_use_static_libraries,$(1),\
-   boost_date_time \
+   boostdatetime \
 )
 
 endef
 
-define gb_LinkTarget__use_boost_system
+define gb_LinkTarget__use_boostsystem
 $(call gb_LinkTarget_add_defs,$(1),\
-DBOOST_ALL_NO_LIB \
 )
 
 $(call gb_LinkTarget_use_static_libraries,$(1),\
-   boost_system \
+   boostsystem \
 )
 
 endef
 
-define gb_ExternalProject__use_boost_system
-$(call gb_LinkTarget_use_static_libraries,$(1),boost_system)
+define gb_ExternalProject__use_boostsystem
+$(call gb_LinkTarget_use_static_libraries,$(1),boostsystem)
 endef
 
 define gb_LinkTarget__use_boost_headers
diff --git a/boost/Module_boost.mk b/boost/Module_boost.mk
index b4b3aa1..9274e4a 100644
--- a/boost/Module_boost.mk
+++ b/boost/Module_boost.mk
@@ -12,8 +12,8 @@ $(eval $(call gb_Module_Module,boost))
 ifeq ($(SYSTEM_BOOST),NO)
 
 $(eval $(call gb_Module_add_targets,boost,\
-   StaticLibrary_boost_date_time \
-   StaticLibrary_boost_system \
+   StaticLibrary_boostdatetime \
+   StaticLibrary_boostsystem \
UnpackedTarball_boost \
 ))
 
diff --git a/boost/StaticLibrary_boost_date_time.mk

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - instsetoo_native/util solenv/inc

2013-05-24 Thread Petr Mladek

 instsetoo_native/util/openoffice.lst |   22 +++---
 solenv/inc/minor.mk  |4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 7d7504439679b0567de0d9d48baeab1925efc0cc
Author: Petr Mladek pmla...@suse.cz
Date:   Fri May 24 14:56:28 2013 +0200

bump product version to 4.0-3, release number to 303

Change-Id: I8f34926f8517932fc7fec983ef3053bffd82b603

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 0ae22b0..26ca787 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -50,13 +50,13 @@ LibreOffice
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -1
+PRODUCTEXTENSION -3
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 4.0
 USERDIRPRODUCTVERSION 4
 ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-201
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-303
 BASEPRODUCTVERSION 4.0
 PCPFILENAME libreoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
@@ -100,14 +100,14 @@ LibreOffice_Dev
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -1
+PRODUCTEXTENSION -3
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 4.0
 USERDIRPRODUCTVERSION 4
 ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-201
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-303
 BASEPRODUCTVERSION 4.0
 DEVELOPMENTPRODUCT 1
 BASISPACKAGEPREFIX lodevbasis
@@ -161,7 +161,7 @@ URE
 PRODUCTVERSION 4.0
 PACKAGEVERSION 4.0
 PACKAGEREVISION 1
-PRODUCTEXTENSION -1
+PRODUCTEXTENSION -3
 BRANDPACKAGEVERSION 4.0
 LICENSENAME LGPL
 NOVERSIONINDIRNAME 1
@@ -192,7 +192,7 @@ LibreOffice_SDK
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -1
+PRODUCTEXTENSION -3
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 4.0
@@ -231,7 +231,7 @@ LibreOffice_Dev_SDK
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -1
+PRODUCTEXTENSION -3
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
@@ -276,7 +276,7 @@ LibreOffice_Test
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -1
+PRODUCTEXTENSION -3
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 4.0
@@ -315,7 +315,7 @@ LibreOffice_Dev_Test
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -1
+PRODUCTEXTENSION -3
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
@@ -359,13 +359,13 @@ OxygenOffice
 {
 PRODUCTNAME OxygenOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -1
+PRODUCTEXTENSION -3
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 4.0
 USERDIRPRODUCTVERSION 4
 ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-201
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-303
 BASEPRODUCTVERSION 4.0
 PCPFILENAME openoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 927533e..31cf9e8 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
 RSCVERSION=400
-RSCREVISION=400m1(Build:201)
-BUILD=201
+RSCREVISION=400m1(Build:303)
+BUILD=303
 LAST_MINOR=m0
 SOURCEVERSION=OOO400
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Track0001:Build fail on formula-core-rework branch 05/24/2013.

2013-05-24 Thread David Tardon

Hi,

On Fri, May 24, 2013 at 01:07:38PM +0100, Caolán McNamara wrote:
 On Thu, 2013-05-23 at 21:33 -0700, leo2013 wrote:
  /home/leo/libreproj/zlibreoffice/core/sfx2/source/view/viewfrm.cxx: In
  static member function ‘static bool SfxViewFrame::IsSidebarEnabled()’:
  /home/leo/libreproj/zlibreoffice/core/sfx2/source/view/viewfrm.cxx:3416:57:
  error: ‘officecfg::Office::Common::Misc::ExperimentalSidebar’ has not been
  declared
 
 I think this is because of an incremental build where the old
 generated headers from the officecfg dir are in solver while the new
 ones are in workdir/someplace and you're building against the old ones.

Yes, exactly. I am going to push a workaround for that shortly.

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

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/suse-4.0-3'

2013-05-24 Thread Petr Mladek

Tag 'suse-4.0-3' created by Petr Mladek pmla...@suse.cz at 2013-05-24 13:57 
-0700

Tag suse-4.0-3
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAlGfY8IACgkQKZC06p8y5oM5oACfQRKttIDv3uEtA3eLyIjXWMG2
iTMAn1+1gW5kNWQpfdoxsHoHdBVuHjc+
=jfoM
-END PGP SIGNATURE-

Changes since libreoffice-4.0.2.2-10:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/suse-4.0-3'

2013-05-24 Thread Petr Mladek

Tag 'suse-4.0-3' created by Petr Mladek pmla...@suse.cz at 2013-05-24 13:57 
-0700

Tag suse-4.0-3
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAlGfY8IACgkQKZC06p8y5oO8ZQCeMiWN9HMADI7Jx0p1kO0M/1vS
2q0An0s0NVH0r/IPP1jve4+FzsAAGVHz
=S5Te
-END PGP SIGNATURE-

Changes since libreoffice-4.0.2.2-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/suse-4.0-3'

2013-05-24 Thread Petr Mladek

Tag 'suse-4.0-3' created by Petr Mladek pmla...@suse.cz at 2013-05-24 13:57 
-0700

Tag suse-4.0-3
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAlGfY8IACgkQKZC06p8y5oOdFwCfWLgBresSYYR9qRRAgLWxP6rA
2uQAoIhNxV7GwKhHkku+IE2m7WrnJ3Vq
=9Cf7
-END PGP SIGNATURE-

Changes since libreoffice-4.0.2.2-5:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/suse-4.0-3'

2013-05-24 Thread Petr Mladek

Tag 'suse-4.0-3' created by Petr Mladek pmla...@suse.cz at 2013-05-24 13:57 
-0700

Tag suse-4.0-3
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAlGfY8IACgkQKZC06p8y5oP+/wCffiLIjEA2kUGDBk/U66zeJbWE
Au0An23yvS5zlnK45f65Gqqo2B6Jre1n
=hnUV
-END PGP SIGNATURE-

Changes since libreoffice-4.0.3.2-306:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Track0001:Build fail on formula-core-rework branch 05/24/2013.

2013-05-24 Thread Kohei Yoshida

You shouldn't be building from the formula-core-rework branch. Use the 
master branch.  I frequently push work in progress commits to it which 
may not even build.


--
Kohei Yoshida, LibreOffice Calc hacker, SUSE.

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

Re: minutes of ESC call ...

2013-05-24 Thread Fernand Vanrie


 Lionel ,

i did a lot of googling, but still not know what are this extra properties ?

Greetz

Fernansd

On Fri, May 17, 2013 at 12:49:03PM +0200, Eike Rathke wrote:


On Thursday, 2013-05-16 16:25:40 +0100, Michael Meeks wrote:

+ double check Lionel's list-box / API change (Eike)

Done. The two properties added to
com.sun.star.form.component.DataBaseListBox are marked optional which
doesn't harm existing clients.

I did that on advice of ... Michael Stahl? ... on IRC to shut up the
incompatible API change error the build was giving me.

My understanding was that this was for the benefit of putative
existing *providers* of this service, that since the properties are
optional, we did not change the requirements under their feet and they
still conform to the service specification.

I don't understand how the properties being not optional would harm
*clients* (users of the service): clients written against the old
specification would simply not use the new properties, would they?

I toyed with the idea of adding a
com.sun.star.form.component.DataBaseListBox2 that makes them
non-optional so that users can be assured to have those properties,
but in the end I did not bother, and now we are past the 4.1 new
feature freeze.



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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 81/b961cfbc1089aab8d3100eaffe41ca7e599498

2013-05-24 Thread Caolán McNamara

 81/b961cfbc1089aab8d3100eaffe41ca7e599498 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6d3a926b236a163cd1ffbe65fdc2fe190163dd6c
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 24 14:22:56 2013 +0100

Notes added by 'git notes add'

diff --git a/81/b961cfbc1089aab8d3100eaffe41ca7e599498 
b/81/b961cfbc1089aab8d3100eaffe41ca7e599498
new file mode 100644
index 000..5d63124
--- /dev/null
+++ b/81/b961cfbc1089aab8d3100eaffe41ca7e599498
@@ -0,0 +1 @@
+prefer: 018a1661fd9053ccdd89c48fa4eff59651d3aa45
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 07/09c33a12eed67da62994948106212463a949af

2013-05-24 Thread Caolán McNamara

 07/09c33a12eed67da62994948106212463a949af |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e2cbfd4a5d369d4847563b4bf933a27251dd9ff1
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 24 14:23:41 2013 +0100

Notes added by 'git notes add'

diff --git a/07/09c33a12eed67da62994948106212463a949af 
b/07/09c33a12eed67da62994948106212463a949af
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/07/09c33a12eed67da62994948106212463a949af
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 9d/3ee32d8eb4b66db15ab0e253df60c99c959172

2013-05-24 Thread Caolán McNamara

 9d/3ee32d8eb4b66db15ab0e253df60c99c959172 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5ca601d681f96c5cc38b79ab118acd216833d0f0
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 24 14:25:21 2013 +0100

Notes added by 'git notes add'

diff --git a/9d/3ee32d8eb4b66db15ab0e253df60c99c959172 
b/9d/3ee32d8eb4b66db15ab0e253df60c99c959172
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/9d/3ee32d8eb4b66db15ab0e253df60c99c959172
@@ -0,0 +1 @@
+ignore: obsolete
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: boost/boost.wunused.patch boost/UnpackedTarball_boost.mk

2013-05-24 Thread Tor Lillqvist

 boost/UnpackedTarball_boost.mk |1 +
 boost/boost.wunused.patch  |   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit f2b31d29581890b9913c5e85a6833d9906bc7aa4
Author: Tor Lillqvist t...@iki.fi
Date:   Fri May 24 16:34:04 2013 +0300

WaE: unused parameter Â´otherÂ´

Change-Id: I13dc9ac0fcbf515df3f44ab18e0fee9cfb8ef239

diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
index bcec8b9..99fb92a 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/boost/UnpackedTarball_boost.mk
@@ -41,6 +41,7 @@ boost_patches += boost.endian.patch
 boost_patches += boost.loplugin.patch
 boost_patches += boost.std.move.patch
 boost_patches += boost.wundef.patch
+boost_patches += boost.wunused.patch
 boost_patches += boost.wshadow.patch
 
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
diff --git a/boost/boost.wunused.patch b/boost/boost.wunused.patch
new file mode 100644
index 000..89abb53
--- /dev/null
+++ b/boost/boost.wunused.patch
@@ -0,0 +1,11 @@
+--- foo/foo/foo/boost/unordered/detail/table.hpp
 foo/foo/foo/boost/unordered/detail/table.hpp
+@@ -458,6 +458,7 @@
+ // According to 23.2.1.8, if propagate_on_container_swap is
+ // false the behaviour is undefined unless the allocators
+ // are equal.
++(void) other;
+ BOOST_ASSERT(node_alloc() == other.node_alloc());
+ }
+ 
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2013-05-24 Thread Caolán McNamara

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7766874d7180b17ab0901b1540db9ffe33991cec
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 24 13:44:38 2013 +0100

Updated core
Project: help  9d599487454a75a8076f2e40eace959ac58824fb

diff --git a/helpcontent2 b/helpcontent2
index e5ca2e8..9d59948 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e5ca2e81fcd42d619b728374f9c4e25b66032eac
+Subproject commit 9d599487454a75a8076f2e40eace959ac58824fb
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

2013-05-24 Thread Caolán McNamara

 helpers/help_hid.lst  |8 
 source/text/smath/01/0503.xhp |   15 ---
 2 files changed, 8 insertions(+), 15 deletions(-)

New commits:
commit 9d599487454a75a8076f2e40eace959ac58824fb
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 24 13:44:38 2013 +0100

update help ids for math spacing dialog .ui conversion

Change-Id: I2793fa6cb567423c9b75d5ea9ff8b421b449b4d3

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 5d2e045..c9b18f9 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3548,7 +3548,6 @@ HID_SMA_DDDOTX,63211,
 HID_SMA_DDOTX,63210,
 HID_SMA_DEFAULT_DIST,63809,
 HID_SMA_DENOMINATOR_DIST,63815,
-HID_SMA_DISTANCEDIALOG,63029,
 HID_SMA_DLARROW,63175,
 HID_SMA_DLRARROW,63176,
 HID_SMA_DOTSAXIS,63262,
@@ -7078,7 +7077,6 @@ sfx2_PushButton_TP_HELP_BOOKMARKS_PB_BOOKMARKS,547017228,
 sfx2_PushButton_TP_HELP_INDEX_PB_OPEN_INDEX,546984460,
 sfx2_PushButton_TP_HELP_SEARCH_PB_OPEN_SEARCH,547000849,
 sfx2_PushButton_TP_HELP_SEARCH_PB_SEARCH,547000844,
-starmath_CheckBox_RID_DISTANCEDIALOG_1,1401504769,
 starmath_CheckBox_RID_FONTDIALOG_1,1401455617,
 starmath_CheckBox_RID_FONTDIALOG_2,1401455618,
 starmath_CheckBox_RID_PRINTOPTIONPAGE_CB_EQUATION_TEXT,86436,
@@ -7100,12 +7098,7 @@ starmath_ListBox_RID_FONTTYPEDIALOG_6,1401490950,
 starmath_ListBox_RID_FONTTYPEDIALOG_7,1401490951,
 starmath_ListBox_RID_SYMDEFINEDIALOG_1,1401572865,
 starmath_ListBox_RID_SYMDEFINEDIALOG_LB_FONTS_SUBSET,1401572975,
-starmath_MenuButton_RID_DISTANCEDIALOG_1,1401516033,
 starmath_MenuButton_RID_FONTTYPEDIALOG_1,1401499649,
-starmath_MetricField_RID_DISTANCEDIALOG_1,1401510401,
-starmath_MetricField_RID_DISTANCEDIALOG_2,1401510402,
-starmath_MetricField_RID_DISTANCEDIALOG_3,1401510403,
-starmath_MetricField_RID_DISTANCEDIALOG_4,1401510404,
 starmath_MetricField_RID_FONTSIZEDIALOG_1,1401477633,
 starmath_MetricField_RID_FONTSIZEDIALOG_4,1401477636,
 starmath_MetricField_RID_FONTSIZEDIALOG_5,1401477637,
@@ -7115,7 +7108,6 @@ starmath_MetricField_RID_FONTSIZEDIALOG_8,1401477640,
 starmath_MetricField_RID_PRINTOPTIONPAGE_MF_ZOOM,864672280,
 starmath_ModalDialog_RID_FONTDIALOG,1401454592,
 starmath_ModalDialog_RID_SYMDEFINEDIALOG,1401569280,
-starmath_PushButton_RID_DISTANCEDIALOG_1,1401508353,
 starmath_PushButton_RID_FONTSIZEDIALOG_1,1401475585,
 starmath_PushButton_RID_FONTTYPEDIALOG_2,1401491970,
 starmath_PushButton_RID_SYMDEFINEDIALOG_1,1401573889,
diff --git a/source/text/smath/01/0503.xhp 
b/source/text/smath/01/0503.xhp
index 6a1b99d..92ee774 100644
--- a/source/text/smath/01/0503.xhp
+++ b/source/text/smath/01/0503.xhp
@@ -33,16 +33,17 @@
 bookmark_valueformulas;element spacing/bookmark_value
 /bookmark
 bookmark xml-lang=en-US branch=hid/.uno:ChangeDistance id=bm_id3150346 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/smath/ui/spacingdialog/SpacingDialog id=bm_id3150356 
localize=false/
 paragraph role=heading id=hd_id3154658 xml-lang=en-US level=1 
l10n=U oldref=1Spacing/paragraph
-paragraph role=paragraph id=par_id3153818 xml-lang=en-US l10n=U 
oldref=2variable id=abstaendetextahelp hid=SID_DISTANCEUse this 
dialog to determine the spacing between formula elements. The spacing is 
specified as a percentage in relation to the base size defined under 
emphFormat - Font Size/emph./ahelp
+paragraph role=paragraph id=par_id3153818 xml-lang=en-US l10n=U 
oldref=2variable id=abstaendetextahelp 
hid=modules/smath/ui/spacingdialog/SpacingDialogUse this dialog to determine 
the spacing between formula elements. The spacing is specified as a percentage 
in relation to the base size defined under emphFormat - Font 
Size/emph./ahelp
 /variable/paragraph
 section id=howtoget
   embed href=text/smath/00/0004.xhp#fmtabs/
 /section
 paragraph role=paragraph id=par_id3143228 xml-lang=en-US l10n=U 
oldref=3Use the emphCategory/emph button to determine the formula 
element for which you would like to specify the spacing. The appearance of the 
dialog depends on the selected category. A preview window shows you which 
spacing is modified through the respective boxes./paragraph
-bookmark xml-lang=en-US 
branch=hid/starmath:MenuButton:RID_DISTANCEDIALOG:1 id=bm_id3153811 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/smath/ui/spacingdialog/category id=bm_id3153811 
localize=false/
 paragraph role=heading id=hd_id3154653 xml-lang=en-US level=2 
l10n=U oldref=5Category/paragraph
-paragraph role=paragraph id=par_id3149873 xml-lang=en-US l10n=U 
oldref=6ahelp hid=STARMATH:MENUBUTTON:RID_DISTANCEDIALOG:1This button 
allows you to select the category for which you would like to change the 
spacing./ahelp/paragraph
+paragraph role=paragraph id=par_id3149873 xml-lang=en-US l10n=U 
oldref=6ahelp hid=modules/smath/ui/spacingdialog/categoryThis button 
allows you to select the category for which you would like to change the 
spacing./ahelp/paragraph
 paragraph role=heading id=hd_id3150391 xml-lang=en-US level=2

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source

2013-05-24 Thread Bjoern Michaelsen

 sw/source/filter/ww8/ww8par.cxx |  172 
 1 file changed, 88 insertions(+), 84 deletions(-)

New commits:
commit 8bccae5d816abace259c9a1d0249e7195a2490d0
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Feb 13 02:49:57 2013 +0100

fdo#43105: apply old sw-nested-positionned-tables-ww8-import-fix.diff

- replaced the really ugly goto hack though

(cherry picked from commit ee1db992b98378b5e2f5e9aa8af0e36c375e582f)

Change-Id: I14dfbe414dc16b634fbaca0a365e2e9ec37ab08e
Reviewed-on: https://gerrit.libreoffice.org/2133
Reviewed-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com
Tested-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com
Signed-off-by: Miklos Vajna vmik...@suse.cz

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 26cfd3e..09d31b0 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2229,113 +2229,117 @@ bool SwWW8ImplReader::ProcessSpecial(bool rbReSync, 
WW8_CP nStartCp)
 if (!nCellLevel)
 nCellLevel = 0 != pPlcxMan-HasParaSprm(0x244B);
 }
-
-WW8_TablePos *pTabPos=0;
-WW8_TablePos aTabPos;
-if (nCellLevel  !bVer67)
+do
 {
-WW8PLCFxSave1 aSave;
-pPlcxMan-GetPap()-Save( aSave );
-rbReSync = true;
-WW8PLCFx_Cp_FKP* pPap = pPlcxMan-GetPapPLCF();
-WW8_CP nMyStartCp=nStartCp;
+WW8_TablePos *pTabPos=0;
+WW8_TablePos aTabPos;
+if(nCellLevel  !bVer67)
+{
+WW8PLCFxSave1 aSave;
+pPlcxMan-GetPap()-Save( aSave );
+rbReSync = true;
+WW8PLCFx_Cp_FKP* pPap = pPlcxMan-GetPapPLCF();
+WW8_CP nMyStartCp=nStartCp;
 
-if (const sal_uInt8 *pLevel = pPlcxMan-HasParaSprm(0x6649))
-nCellLevel = *pLevel;
+if (const sal_uInt8 *pLevel = pPlcxMan-HasParaSprm(0x6649))
+nCellLevel = *pLevel;
 
-bool bHasRowEnd = SearchRowEnd(pPap, nMyStartCp, nCellLevel-1);
+bool bHasRowEnd = SearchRowEnd(pPap, nMyStartCp, 
(nInTablenCellLevel?nInTable:nCellLevel-1));
 
-//Bad Table, remain unchanged in level, e.g. #i19667#
-if (!bHasRowEnd)
-nCellLevel = static_cast sal_uInt8 (nInTable);
+//Bad Table, remain unchanged in level, e.g. #i19667#
+if (!bHasRowEnd)
+nCellLevel = static_cast sal_uInt8 (nInTable);
 
-if (bHasRowEnd  ParseTabPos(aTabPos,pPap))
-pTabPos = aTabPos;
+if (bHasRowEnd  ParseTabPos(aTabPos,pPap))
+pTabPos = aTabPos;
 
-pPlcxMan-GetPap()-Restore( aSave );
-}
+pPlcxMan-GetPap()-Restore( aSave );
+}
 
-//  then look if we are in an Apo
+//  then look if we are in an Apo
 
-ApoTestResults aApo = TestApo(nCellLevel, bTableRowEnd, pTabPos);
+ApoTestResults aApo = TestApo(nCellLevel, bTableRowEnd, pTabPos);
 
-//look to see if we are in a Table, but Table in foot/end note not allowed
-bool bStartTab = (nInTable  nCellLevel)  !bFtnEdn;
+//look to see if we are in a Table, but Table in foot/end note not 
allowed
+bool bStartTab = (nInTable  nCellLevel)  !bFtnEdn;
 
-bool bStopTab = bWasTabRowEnd  (nInTable  nCellLevel)  !bFtnEdn;
+bool bStopTab = bWasTabRowEnd  (nInTable  nCellLevel)  !bFtnEdn;
 
-bWasTabRowEnd = false;  // must be deactivated right here to prevent next
-// WW8TabDesc::TableCellEnd() from making nonsense
+bWasTabRowEnd = false;  // must be deactivated right here to prevent 
next
+// WW8TabDesc::TableCellEnd() from making 
nonsense
 
-if (nInTable  !bTableRowEnd  !bStopTab  (nInTable == nCellLevel  
aApo.HasStartStop()))
-bStopTab = bStartTab = true;// Required to stop and start table
+if (nInTable  !bTableRowEnd  !bStopTab  (nInTable == nCellLevel 
 aApo.HasStartStop()))
+bStopTab = bStartTab = true;// Required to stop and start table
 
-//  Dann auf Anl (Nummerierung) testen
-//  und dann alle Ereignisse in der richtigen Reihenfolge bearbeiten
+//  Dann auf Anl (Nummerierung) testen
+//  und dann alle Ereignisse in der richtigen Reihenfolge bearbeiten
 
-if( bAnl  !bTableRowEnd )
-{
-const sal_uInt8* pSprm13 = pPlcxMan-HasParaSprm( 13 );
-if( pSprm13 )
-{   // Noch Anl ?
-sal_uInt8 nT = static_cast sal_uInt8 (GetNumType( *pSprm13 ));
-if( ( nT != WW8_Pause  nT != nWwNumType ) // Anl-Wechsel
-|| aApo.HasStartStop()  // erzwungenes Anl-Ende
-|| bStopTab || bStartTab )
-{
-StopAnlToRestart(nT);  // Anl-Restart ( = Wechsel ) ueber sprms
+if( bAnl  !bTableRowEnd )
+{
+const sal_uInt8* pSprm13 =

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - sw/source

2013-05-24 Thread Bjoern Michaelsen

 sw/source/filter/ww8/ww8par.cxx |  172 
 1 file changed, 88 insertions(+), 84 deletions(-)

New commits:
commit a4247dc704f4f1aef3f994f1e561365eb3e7c0b0
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Feb 13 02:49:57 2013 +0100

fdo#43105: apply old sw-nested-positionned-tables-ww8-import-fix.diff

- replaced the really ugly goto hack though

(cherry picked from commit ee1db992b98378b5e2f5e9aa8af0e36c375e582f)

Change-Id: I14dfbe414dc16b634fbaca0a365e2e9ec37ab08e
Reviewed-on: https://gerrit.libreoffice.org/2133
Reviewed-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com
Tested-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com
Signed-off-by: Miklos Vajna vmik...@suse.cz

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 3cd43f9..57ca4f5 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2229,113 +2229,117 @@ bool SwWW8ImplReader::ProcessSpecial(bool rbReSync, 
WW8_CP nStartCp)
 if (!nCellLevel)
 nCellLevel = 0 != pPlcxMan-HasParaSprm(0x244B);
 }
-
-WW8_TablePos *pTabPos=0;
-WW8_TablePos aTabPos;
-if (nCellLevel  !bVer67)
+do
 {
-WW8PLCFxSave1 aSave;
-pPlcxMan-GetPap()-Save( aSave );
-rbReSync = true;
-WW8PLCFx_Cp_FKP* pPap = pPlcxMan-GetPapPLCF();
-WW8_CP nMyStartCp=nStartCp;
+WW8_TablePos *pTabPos=0;
+WW8_TablePos aTabPos;
+if(nCellLevel  !bVer67)
+{
+WW8PLCFxSave1 aSave;
+pPlcxMan-GetPap()-Save( aSave );
+rbReSync = true;
+WW8PLCFx_Cp_FKP* pPap = pPlcxMan-GetPapPLCF();
+WW8_CP nMyStartCp=nStartCp;
 
-if (const sal_uInt8 *pLevel = pPlcxMan-HasParaSprm(0x6649))
-nCellLevel = *pLevel;
+if (const sal_uInt8 *pLevel = pPlcxMan-HasParaSprm(0x6649))
+nCellLevel = *pLevel;
 
-bool bHasRowEnd = SearchRowEnd(pPap, nMyStartCp, nCellLevel-1);
+bool bHasRowEnd = SearchRowEnd(pPap, nMyStartCp, 
(nInTablenCellLevel?nInTable:nCellLevel-1));
 
-//Bad Table, remain unchanged in level, e.g. #i19667#
-if (!bHasRowEnd)
-nCellLevel = static_cast sal_uInt8 (nInTable);
+//Bad Table, remain unchanged in level, e.g. #i19667#
+if (!bHasRowEnd)
+nCellLevel = static_cast sal_uInt8 (nInTable);
 
-if (bHasRowEnd  ParseTabPos(aTabPos,pPap))
-pTabPos = aTabPos;
+if (bHasRowEnd  ParseTabPos(aTabPos,pPap))
+pTabPos = aTabPos;
 
-pPlcxMan-GetPap()-Restore( aSave );
-}
+pPlcxMan-GetPap()-Restore( aSave );
+}
 
-//  then look if we are in an Apo
+//  then look if we are in an Apo
 
-ApoTestResults aApo = TestApo(nCellLevel, bTableRowEnd, pTabPos);
+ApoTestResults aApo = TestApo(nCellLevel, bTableRowEnd, pTabPos);
 
-//look to see if we are in a Table, but Table in foot/end note not allowed
-bool bStartTab = (nInTable  nCellLevel)  !bFtnEdn;
+//look to see if we are in a Table, but Table in foot/end note not 
allowed
+bool bStartTab = (nInTable  nCellLevel)  !bFtnEdn;
 
-bool bStopTab = bWasTabRowEnd  (nInTable  nCellLevel)  !bFtnEdn;
+bool bStopTab = bWasTabRowEnd  (nInTable  nCellLevel)  !bFtnEdn;
 
-bWasTabRowEnd = false;  // must be deactivated right here to prevent next
-// WW8TabDesc::TableCellEnd() from making nonsense
+bWasTabRowEnd = false;  // must be deactivated right here to prevent 
next
+// WW8TabDesc::TableCellEnd() from making 
nonsense
 
-if (nInTable  !bTableRowEnd  !bStopTab  (nInTable == nCellLevel  
aApo.HasStartStop()))
-bStopTab = bStartTab = true;// Required to stop and start table
+if (nInTable  !bTableRowEnd  !bStopTab  (nInTable == nCellLevel 
 aApo.HasStartStop()))
+bStopTab = bStartTab = true;// Required to stop and start table
 
-//  Dann auf Anl (Nummerierung) testen
-//  und dann alle Ereignisse in der richtigen Reihenfolge bearbeiten
+//  Dann auf Anl (Nummerierung) testen
+//  und dann alle Ereignisse in der richtigen Reihenfolge bearbeiten
 
-if( bAnl  !bTableRowEnd )
-{
-const sal_uInt8* pSprm13 = pPlcxMan-HasParaSprm( 13 );
-if( pSprm13 )
-{   // Noch Anl ?
-sal_uInt8 nT = static_cast sal_uInt8 (GetNumType( *pSprm13 ));
-if( ( nT != WW8_Pause  nT != nWwNumType ) // Anl-Wechsel
-|| aApo.HasStartStop()  // erzwungenes Anl-Ende
-|| bStopTab || bStartTab )
-{
-StopAnlToRestart(nT);  // Anl-Restart ( = Wechsel ) ueber sprms
+if( bAnl  !bTableRowEnd )
+{
+const sal_uInt8* pSprm13 =

[Libreoffice-commits] core.git: vcl/aqua

2013-05-24 Thread Andre Fischer

 vcl/aqua/source/dtrans/DataFlavorMapping.cxx |   27 ++-
 vcl/aqua/source/dtrans/DataFlavorMapping.hxx |2 ++
 2 files changed, 20 insertions(+), 9 deletions(-)

New commits:
commit e31d408ca6bdaaa3eef9fc2eaa50e4745ebd33ff
Author: Andre Fischer a...@apache.org
Date:   Wed Aug 22 07:37:16 2012 +

Resolves: #i120481# Add registered transferable flavor...

to make the Writer accept column headers dragged from database tables.
(cherry picked from commit a32aabba57b53f581691f60e5484a6ddf3deb9f2)

Change-Id: I63d41c8000cdfc7f0b2ca28e83aaedf2e822e64d

diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx 
b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
index 7b57871..d61d09b 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
@@ -564,14 +564,17 @@ NSString* 
DataFlavorMapper::openOfficeToSystemFlavor(const DataFlavor oOOFlavor
 }
 }
 
-if( ! sysFlavor )
-{
-OfficeOnlyTypes::const_iterator it = maOfficeOnlyTypes.find( 
oOOFlavor.MimeType );
-if( it == maOfficeOnlyTypes.end() )
-sysFlavor = maOfficeOnlyTypes[ oOOFlavor.MimeType ] = 
OUStringToNSString( oOOFlavor.MimeType );
-else
-sysFlavor = it-second;
-}
+return sysFlavor;
+}
+
+NSString* DataFlavorMapper::internalOpenOfficeToSystemFlavor(const DataFlavor 
oOOFlavor) const
+{
+NSString* sysFlavor = NULL;
+OfficeOnlyTypes::const_iterator it = maOfficeOnlyTypes.find( 
oOOFlavor.MimeType );
+if( it == maOfficeOnlyTypes.end() )
+sysFlavor = maOfficeOnlyTypes[ oOOFlavor.MimeType ] = 
OUStringToNSString( oOOFlavor.MimeType );
+else
+sysFlavor = it-second;
 
 return sysFlavor;
 }
@@ -699,6 +702,8 @@ NSArray* DataFlavorMapper::flavorSequenceToTypesArray(const 
com::sun::star::uno:
   sal_uInt32 nFlavors = flavors.getLength();
   NSMutableArray* array = [[NSMutableArray alloc] initWithCapacity: 1];
 
+  bool bNeedDummyInternalFlavor (true);
+
   for (sal_uInt32 i = 0; i  nFlavors; i++)
   {
   if( flavors[i].MimeType.startsWith(image/bmp) )
@@ -709,6 +714,10 @@ NSArray* 
DataFlavorMapper::flavorSequenceToTypesArray(const com::sun::star::uno:
   else
   {
   NSString* str = openOfficeToSystemFlavor(flavors[i]);
+  if (str == NULL)
+  str = internalOpenOfficeToSystemFlavor(flavors[i]);
+  else
+  bNeedDummyInternalFlavor = false;
 
   if (str != NULL)
   {
@@ -721,7 +730,7 @@ NSArray* DataFlavorMapper::flavorSequenceToTypesArray(const 
com::sun::star::uno:
// #i89462# #i90747#
// in case no system flavor was found to report
// report at least one so DD between OOo targets works
-  if( [array count] == 0 )
+  if( [array count] == 0 || bNeedDummyInternalFlavor)
   {
   [array addObject: PBTYPE_DUMMY_INTERNAL];
   }
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx 
b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
index ed78689..3c1ee87 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
@@ -128,6 +128,8 @@ private:
*/
   bool isValidMimeContentType(const OUString contentType) const;
 
+  NSString* internalOpenOfficeToSystemFlavor(const 
com::sun::star::datatransfer::DataFlavor oooDataFlavor) const;
+
 private:
   ::com::sun::star::uno::Reference 
::com::sun::star::datatransfer::XMimeContentTypeFactory mrXMimeCntFactory;
   typedef boost::unordered_map OUString, NSString*, OUStringHash  
OfficeOnlyTypes;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a3/2aabba57b53f581691f60e5484a6ddf3deb9f2

2013-05-24 Thread Caolán McNamara

 a3/2aabba57b53f581691f60e5484a6ddf3deb9f2 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a9c444a680acb79e13bcaca7a02b2863ac9758de
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 24 14:58:58 2013 +0100

Notes added by 'git notes add'

diff --git a/a3/2aabba57b53f581691f60e5484a6ddf3deb9f2 
b/a3/2aabba57b53f581691f60e5484a6ddf3deb9f2
new file mode 100644
index 000..19fc9aaa
--- /dev/null
+++ b/a3/2aabba57b53f581691f60e5484a6ddf3deb9f2
@@ -0,0 +1 @@
+merged as: e31d408ca6bdaaa3eef9fc2eaa50e4745ebd33ff
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH libreoffice-4-0] fix fdo#64872 infinite loop saving as doc

2013-05-24 Thread Luke Deller (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4026

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/26/4026/1

fix fdo#64872 infinite loop saving as doc

When loading from odt, table cells which are covered (due to merging of
cells) are replaced with an empty cell by
SwXMLTableContext::ReplaceWithEmptyCell.  However if there is a sequence
of cells covered from above then their replacements are accidentally
inserted in reverse order, which produces this infinite loop problem when
saving as doc.

The reverse ordering in SwXMLTableContext::ReplaceWithEmptyCell was because
the insert position came from SwXMLTableContext::GetPrevStartNode which was
very careful to skip previous covered cells.  However those cells have
already been replaced with an empty cell so they should not be skipped.

Change-Id: I6a022cd1490afa181dbc3e4b2d6ed4af3077b363
---
M sw/source/filter/xml/xmltbli.cxx
1 file changed, 6 insertions(+), 20 deletions(-)



diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 6cd2cdc..50d5e99 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -1807,29 +1807,15 @@
 // The last cell is the right one here.
 pPrevCell = GetCell( pRows-size()-1U, GetColumnCount()-1UL );
 }
-else if( 0UL == nRow )
+else if( nCol  0UL )
 {
-// There are no vertically merged cells within the first row, so the
-// previous cell is the right one always.
-if( nCol  0UL )
-pPrevCell = GetCell( nRow, nCol-1UL );
+// The previous cell in this row.
+pPrevCell = GetCell( nRow, nCol-1UL );
 }
-else
+else if( nRow  0UL )
 {
-// If there is a previous cell in the current row that is not spanned
-// from the previous row, its the right one.
-const SwXMLTableRow_Impl *pPrevRow = (*pRows)[(sal_uInt16)nRow-1U];
-sal_uInt32 i = nCol;
-while( !pPrevCell   i  0UL )
-{
-i--;
-if( 1UL == pPrevRow-GetCell( i )-GetRowSpan() )
-pPrevCell = GetCell( nRow, i );
-}
-
-// Otherwise, the last cell from the previous row is the right one.
-if( !pPrevCell )
-pPrevCell = pPrevRow-GetCell( GetColumnCount()-1UL );
+// The last cell from the previous row.
+pPrevCell = GetCell( nRow-1UL, GetColumnCount()-1UL );
 }
 
 const SwStartNode *pSttNd = 0;

-- 
To view, visit https://gerrit.libreoffice.org/4026
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a022cd1490afa181dbc3e4b2d6ed4af3077b363
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Luke Deller l...@deller.id.au

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

[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - sw/source

2013-05-24 Thread Bjoern Michaelsen

 sw/source/filter/ww8/ww8par.cxx |  172 
 1 file changed, 88 insertions(+), 84 deletions(-)

New commits:
commit b14f6849f297406e9308576d2a5ad22d295cc125
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Feb 13 02:49:57 2013 +0100

fdo#43105: apply old sw-nested-positionned-tables-ww8-import-fix.diff

- replaced the really ugly goto hack though

(cherry picked from commit ee1db992b98378b5e2f5e9aa8af0e36c375e582f)

Change-Id: I14dfbe414dc16b634fbaca0a365e2e9ec37ab08e
Reviewed-on: https://gerrit.libreoffice.org/2133
Reviewed-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com
Tested-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com
Signed-off-by: Miklos Vajna vmik...@suse.cz

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 1d245c2..5cf410f 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2251,113 +2251,117 @@ bool SwWW8ImplReader::ProcessSpecial(bool rbReSync, 
WW8_CP nStartCp)
 if (!nCellLevel)
 nCellLevel = 0 != pPlcxMan-HasParaSprm(0x244B);
 }
-
-WW8_TablePos *pTabPos=0;
-WW8_TablePos aTabPos;
-if (nCellLevel  !bVer67)
+do
 {
-WW8PLCFxSave1 aSave;
-pPlcxMan-GetPap()-Save( aSave );
-rbReSync = true;
-WW8PLCFx_Cp_FKP* pPap = pPlcxMan-GetPapPLCF();
-WW8_CP nMyStartCp=nStartCp;
+WW8_TablePos *pTabPos=0;
+WW8_TablePos aTabPos;
+if(nCellLevel  !bVer67)
+{
+WW8PLCFxSave1 aSave;
+pPlcxMan-GetPap()-Save( aSave );
+rbReSync = true;
+WW8PLCFx_Cp_FKP* pPap = pPlcxMan-GetPapPLCF();
+WW8_CP nMyStartCp=nStartCp;
 
-if (const sal_uInt8 *pLevel = pPlcxMan-HasParaSprm(0x6649))
-nCellLevel = *pLevel;
+if (const sal_uInt8 *pLevel = pPlcxMan-HasParaSprm(0x6649))
+nCellLevel = *pLevel;
 
-bool bHasRowEnd = SearchRowEnd(pPap, nMyStartCp, nCellLevel-1);
+bool bHasRowEnd = SearchRowEnd(pPap, nMyStartCp, 
(nInTablenCellLevel?nInTable:nCellLevel-1));
 
-//Bad Table, remain unchanged in level, e.g. #i19667#
-if (!bHasRowEnd)
-nCellLevel = static_cast sal_uInt8 (nInTable);
+//Bad Table, remain unchanged in level, e.g. #i19667#
+if (!bHasRowEnd)
+nCellLevel = static_cast sal_uInt8 (nInTable);
 
-if (bHasRowEnd  ParseTabPos(aTabPos,pPap))
-pTabPos = aTabPos;
+if (bHasRowEnd  ParseTabPos(aTabPos,pPap))
+pTabPos = aTabPos;
 
-pPlcxMan-GetPap()-Restore( aSave );
-}
+pPlcxMan-GetPap()-Restore( aSave );
+}
 
-//  then look if we are in an Apo
+//  then look if we are in an Apo
 
-ApoTestResults aApo = TestApo(nCellLevel, bTableRowEnd, pTabPos);
+ApoTestResults aApo = TestApo(nCellLevel, bTableRowEnd, pTabPos);
 
-//look to see if we are in a Table, but Table in foot/end note not allowed
-bool bStartTab = (nInTable  nCellLevel)  !bFtnEdn;
+//look to see if we are in a Table, but Table in foot/end note not 
allowed
+bool bStartTab = (nInTable  nCellLevel)  !bFtnEdn;
 
-bool bStopTab = bWasTabRowEnd  (nInTable  nCellLevel)  !bFtnEdn;
+bool bStopTab = bWasTabRowEnd  (nInTable  nCellLevel)  !bFtnEdn;
 
-bWasTabRowEnd = false;  // must be deactivated right here to prevent next
-// WW8TabDesc::TableCellEnd() from making nonsense
+bWasTabRowEnd = false;  // must be deactivated right here to prevent 
next
+// WW8TabDesc::TableCellEnd() from making 
nonsense
 
-if (nInTable  !bTableRowEnd  !bStopTab  (nInTable == nCellLevel  
aApo.HasStartStop()))
-bStopTab = bStartTab = true;// Required to stop and start table
+if (nInTable  !bTableRowEnd  !bStopTab  (nInTable == nCellLevel 
 aApo.HasStartStop()))
+bStopTab = bStartTab = true;// Required to stop and start table
 
-//  Dann auf Anl (Nummerierung) testen
-//  und dann alle Ereignisse in der richtigen Reihenfolge bearbeiten
+//  Dann auf Anl (Nummerierung) testen
+//  und dann alle Ereignisse in der richtigen Reihenfolge bearbeiten
 
-if( bAnl  !bTableRowEnd )
-{
-const sal_uInt8* pSprm13 = pPlcxMan-HasParaSprm( 13 );
-if( pSprm13 )
-{   // Noch Anl ?
-sal_uInt8 nT = static_cast sal_uInt8 (GetNumType( *pSprm13 ));
-if( ( nT != WW8_Pause  nT != nWwNumType ) // Anl-Wechsel
-|| aApo.HasStartStop()  // erzwungenes Anl-Ende
-|| bStopTab || bStartTab )
-{
-StopAnlToRestart(nT);  // Anl-Restart ( = Wechsel ) ueber sprms
+if( bAnl  !bTableRowEnd )
+{
+const sal_uInt8* pSprm13 =

[Bug 44446] LibreOffice 3.6 most annoying bugs

2013-05-24 Thread bugzilla-daemon

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

Bug 6 depends on bug 43105, which changed state.

Bug 43105 Summary: regression: WW8 nested table import
https://bugs.freedesktop.org/show_bug.cgi?id=43105

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Show only filename in Recent Files list on Start Center

2013-05-24 Thread Prashant Pandey (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4027

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/27/4027/1

Show only filename in Recent Files list on Start Center

Change-Id: I57f7564aae035ce158b819ca1495a547754a95f8
---
M framework/source/services/backingwindow.cxx
1 file changed, 6 insertions(+), 16 deletions(-)



diff --git a/framework/source/services/backingwindow.cxx 
b/framework/source/services/backingwindow.cxx
index f18152b..2cb9f0f 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -353,25 +353,15 @@
 
 if ( aURLObj.GetProtocol() == INET_PROT_FILE )
 {
-// Do handle file URL differently = convert it to a system
-// path and abbreviate it with a special function:
-String aFileSystemPath( aURLObj.getFSysPath( 
INetURLObject::FSYS_DETECT ) );
-
-OUString   aSystemPath( aFileSystemPath );
-OUString   aCompactedSystemPath;
-
-oslFileError nError = osl_abbreviateSystemPath( 
aSystemPath.pData, aCompactedSystemPath.pData, 46, NULL );
-if ( !nError )
-aMenuTitle = String( aCompactedSystemPath );
-else
-aMenuTitle = aSystemPath;
+// Do handle file URL differently: don't show the protocol, 
just the file name
+aMenuTitle = 
aURLObj.GetLastName(INetURLObject::DECODE_WITH_CHARSET, RTL_TEXTENCODING_UTF8);
 }
 else
 {
-// Use INetURLObject to abbreviate all other URLs
-Reference util::XStringWidth  xStringLength( new 
RecentFilesStringLength() );
-aMenuTitle = aURLObj.getAbbreviated( xStringLength, 46, 
INetURLObject::DECODE_UNAMBIGUOUS );
+// In all other URLs show the protocol name before the file 
name
+aMenuTitle = aURLObj.GetSchemeName(aURLObj.GetProtocol()) + : 
 + aURLObj.getName();
 }
+
 OUStringBuffer aBuf( aMenuTitle.getLength() + 5 );
 if( i  9 )
 {
@@ -382,7 +372,7 @@
 aBuf.appendAscii( 1~0 );
 else
 aBuf.append( i+1 );
-aBuf.appendAscii( :  );
+aBuf.appendAscii( .  );
 aBuf.append( aMenuTitle );
 mpRecentMenu-InsertItem( static_castsal_uInt16(i+1), 
aBuf.makeStringAndClear() );
 }

-- 
To view, visit https://gerrit.libreoffice.org/4027
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I57f7564aae035ce158b819ca1495a547754a95f8
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Prashant Pandey prashant3.yi...@gmail.com

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

[Libreoffice-commits] core.git: wizards/com

2013-05-24 Thread David Tardon

 wizards/com/sun/star/wizards/web/LogTaskListener.py|2 +-
 wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.py |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit cdad97557a729ecbbe0236f7998647c5249a005f
Author: David Tardon dtar...@redhat.com
Date:   Fri May 24 09:54:20 2013 +0200

fix syntax errors in python wizards

Change-Id: Ia237a0095c2cc783f52224bdde5d525baafacc52

diff --git a/wizards/com/sun/star/wizards/web/LogTaskListener.py 
b/wizards/com/sun/star/wizards/web/LogTaskListener.py
index 13b7e59..a1fba5f 100644
--- a/wizards/com/sun/star/wizards/web/LogTaskListener.py
+++ b/wizards/com/sun/star/wizards/web/LogTaskListener.py
@@ -35,7 +35,7 @@ class LogTaskListener(TaskListener, ErrorHandler):
 out.println(TASK  + te.getTask().getTaskName() +  FINISHED:  + 
te.getTask().getSuccessfull() + / + te.getTask().getMax() + Succeeded.)
 
 #@see 
com.sun.star.wizards.web.status.TaskListener#taskStatusChanged(com.sun.star.wizards.web.status.TaskEvent)
-def taskStatusChanged(te)
+def taskStatusChanged(te):
 out.println(TASK  + te.getTask().getTaskName() +  status :  + 
te.getTask().getSuccessfull() + (+ + te.getTask().getFailed() + )/ + 
te.getTask().getMax())
 
 #@see 
com.sun.star.wizards.web.status.TaskListener#subtaskNameChanged(com.sun.star.wizards.web.status.TaskEvent)
diff --git a/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.py 
b/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.py
index c60a6dd..0b620c1 100644
--- a/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.py
+++ b/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.py
@@ -60,11 +60,11 @@ class ImpressHTMLExporter(ConfiguredExporter):
 size = session.cp_Design.cp_OptimizeDisplaySize
 if (size ==  0):
 return self.SMALL_IMAGE
-elif (size ==  1)
+elif (size ==  1):
 return self.MEDIUM_IMAGE
-elif (size ==  2)
+elif (size ==  2):
 return self.LARGE_IMAGE
 return self.MEDIUM_IMAGE
 
-def getSession(doc)
+def getSession(doc):
 return doc.getSettings().cp_DefaultSession
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 2 commits - include/svx reportdesign/inc reportdesign/source svx/source wizards/com

2013-05-24 Thread David Tardon

 include/svx/svdobj.hxx |   10 
 reportdesign/inc/RptObject.hxx |6 ++
 reportdesign/source/core/sdr/RptObject.cxx |   24 
++
 svx/source/svdraw/svdobj.cxx   |   19 +++
 svx/source/unodraw/unopage.cxx |   14 +
 wizards/com/sun/star/wizards/web/LogTaskListener.py|2 
 wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.py |6 +-
 7 files changed, 74 insertions(+), 7 deletions(-)

New commits:
commit 1a4893d7620e06c09a19e97887355b46aee4c2c6
Author: David Tardon dtar...@redhat.com
Date:   Fri May 24 09:54:20 2013 +0200

fix syntax errors in python wizards

Change-Id: Ia237a0095c2cc783f52224bdde5d525baafacc52
(cherry picked from commit cdad97557a729ecbbe0236f7998647c5249a005f)

Signed-off-by: David Tardon dtar...@redhat.com

diff --git a/wizards/com/sun/star/wizards/web/LogTaskListener.py 
b/wizards/com/sun/star/wizards/web/LogTaskListener.py
index 13b7e59..a1fba5f 100644
--- a/wizards/com/sun/star/wizards/web/LogTaskListener.py
+++ b/wizards/com/sun/star/wizards/web/LogTaskListener.py
@@ -35,7 +35,7 @@ class LogTaskListener(TaskListener, ErrorHandler):
 out.println(TASK  + te.getTask().getTaskName() +  FINISHED:  + 
te.getTask().getSuccessfull() + / + te.getTask().getMax() + Succeeded.)
 
 #@see 
com.sun.star.wizards.web.status.TaskListener#taskStatusChanged(com.sun.star.wizards.web.status.TaskEvent)
-def taskStatusChanged(te)
+def taskStatusChanged(te):
 out.println(TASK  + te.getTask().getTaskName() +  status :  + 
te.getTask().getSuccessfull() + (+ + te.getTask().getFailed() + )/ + 
te.getTask().getMax())
 
 #@see 
com.sun.star.wizards.web.status.TaskListener#subtaskNameChanged(com.sun.star.wizards.web.status.TaskEvent)
diff --git a/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.py 
b/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.py
index c60a6dd..0b620c1 100644
--- a/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.py
+++ b/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.py
@@ -60,11 +60,11 @@ class ImpressHTMLExporter(ConfiguredExporter):
 size = session.cp_Design.cp_OptimizeDisplaySize
 if (size ==  0):
 return self.SMALL_IMAGE
-elif (size ==  1)
+elif (size ==  1):
 return self.MEDIUM_IMAGE
-elif (size ==  2)
+elif (size ==  2):
 return self.LARGE_IMAGE
 return self.MEDIUM_IMAGE
 
-def getSession(doc)
+def getSession(doc):
 return doc.getSettings().cp_DefaultSession
commit ec2f66b51fe5a3874c21d4f386552cb05d9c
Author: David Tardon dtar...@redhat.com
Date:   Thu May 16 15:27:08 2013 +0200

fdo#64279 do not crash opening report for editing

There are two problems:

1) The classes derived from SdrObject cache their SvxShape, but do not
   implement impl_setUnoShape().

2) There is a lifetime issue in association of a SdrObject and its
   SvxShape. SvxDrawPage::CreateSdrObject not only creates a new SdrObject
   for a shape, but also inserts it into the page. At this point, the shape
   has not been attached to the object yet. That means that the object
   creates another shape at one point during the InsertObject call,
   which is then destroyed again. But reportdesign shapes own their
   objects, which means that destuction of the shape causes destruction
   of the object too...

   My first idea was to disable the insertion in
   SvxDrawPage::CreateSdrObject, but it has been there since the dawn of
   time, so I did not gather the courage to do that. Instead, I put in a
   hack to allow to skip the insertion.

Change-Id: I888a54067be1934578434d8b476a13a7ff8d02b3
(cherry picked from commit 02d03eb4ad6e64744659c5fe04282b25b66c28d8)

Signed-off-by: David Tardon dtar...@redhat.com

diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index d3047b8..081fe76 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -1055,6 +1055,11 @@ public:
 Rectangle GetBLIPSizeRectangle() const;
 void SetBLIPSizeRectangle( const Rectangle aRect );
 
+/// @see mbDoNotInsertIntoPageAutomatically
+void SetDoNotInsertIntoPageAutomatically(bool bSet);
+/// @see mbDoNotInsertIntoPageAutomatically
+bool IsDoNotInsertIntoPageAutomatically() const;
+
 protected:
 /** Sets a new UNO shape
   *
@@ -1082,6 +1087,11 @@ private:
 SvxShape*   mpSvxShape;
 ::com::sun::star::uno::WeakReference ::com::sun::star::uno::XInterface 
 maWeakUnoShape;
+/** HACK: Do not automatically insert newly created object into a page.
+  *
+  * The user needs to do it manually later.
+  */
+bool mbDoNotInsertIntoPageAutomatically;
 };

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - basctl/uiconfig include/svx officecfg/registry sc/uiconfig sd/uiconfig svx/inc svx/source svx/util sw/uiconfig

2013-05-24 Thread Andrzej J . R . Hunt

 basctl/uiconfig/basicide/toolbar/findbar.xml |1 
 include/svx/dialogs.hrc  |1 
 officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu  |   11 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |5 
 sc/uiconfig/scalc/toolbar/findbar.xml|1 
 sd/uiconfig/sdraw/toolbar/findbar.xml|1 
 sd/uiconfig/simpress/toolbar/findbar.xml |1 
 svx/inc/tbunosearchcontrollers.hxx   |   43 ++
 svx/source/tbxctrls/tbunosearchcontrollers.cxx   |  213 
--
 svx/source/tbxctrls/tbunosearchcontrollers.src   |5 
 svx/source/unodraw/unoctabl.cxx  |7 
 svx/util/svx.component   |3 
 sw/uiconfig/sglobal/toolbar/findbar.xml  |1 
 sw/uiconfig/sweb/toolbar/findbar.xml |1 
 sw/uiconfig/swriter/toolbar/findbar.xml  |1 
 sw/uiconfig/swxform/toolbar/findbar.xml  |1 
 16 files changed, 254 insertions(+), 42 deletions(-)

New commits:
commit 0eccb0d1618b7e00856e778ed9c2e785ef3af3ce
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Mon May 20 14:08:48 2013 +0100

fdo#63035 Add Match Case to Find bar.

Change-Id: I1339767de7980426d32960bf5ee60e2f5c011be4
Signed-off-by: Michael Meeks michael.me...@suse.com

diff --git a/basctl/uiconfig/basicide/toolbar/findbar.xml 
b/basctl/uiconfig/basicide/toolbar/findbar.xml
index 42baa21..57aec06 100644
--- a/basctl/uiconfig/basicide/toolbar/findbar.xml
+++ b/basctl/uiconfig/basicide/toolbar/findbar.xml
@@ -22,6 +22,7 @@
   toolbar:toolbaritem xlink:href=.uno:FindText/
   toolbar:toolbaritem xlink:href=.uno:DownSearch/
   toolbar:toolbaritem xlink:href=.uno:UpSearch/
+  toolbar:toolbaritem xlink:href=.uno:MatchCase/
   toolbar:toolbarseparator/
   toolbar:toolbaritem xlink:href=.uno:SearchDialog/
 /toolbar:toolbar
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 9950f2c..e714c39 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -961,6 +961,7 @@
 
 #define RID_SVXSTR_TEXTCOLOR(RID_SVX_START + 
1178)
 
+#define RID_SVXSTR_FINDBAR_MATCHCASE(RID_SVX_START + 
1189)
 #define RID_SVXSTR_FINDBAR_FIND (RID_SVX_START + 
1190)
 
 #define RID_SVXSTR_NUMBULLET_NONE   (RID_SVX_START + 
1191)
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 5abc0a8..64fa7b0 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -429,6 +429,17 @@
   valuecom.sun.star.svx.UpSearchToolboxController/value
 /prop
   /node
+  node oor:name=com.sun.star.svx.MatchCaseToolboxController 
oor:op=replace
+prop oor:name=Command
+  value.uno:MatchCase/value
+/prop
+prop oor:name=Module
+  value/
+/prop
+prop oor:name=Controller
+  valuecom.sun.star.svx.MatchCaseToolboxController/value
+/prop
+  /node
   node oor:name=c4 oor:op=replace install:module=reportbuilder
 prop oor:name=Command
   value.uno:FontColor/value
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 7b01925..74fbeeb 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1478,6 +1478,11 @@
   value1/value
 /prop
   /node
+  node oor:name=.uno:MatchCase oor:op=replace
+prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-USMatch Case/value
+/prop
+  /node
   node oor:name=.uno:ExitSearch oor:op=replace
 prop oor:name=Label oor:type=xs:string
   value xml:lang=en-USExit Search/value
diff --git a/sc/uiconfig/scalc/toolbar/findbar.xml 
b/sc/uiconfig/scalc/toolbar/findbar.xml
index a0e6037..f8052a1 100644
--- a/sc/uiconfig/scalc/toolbar/findbar.xml
+++ b/sc/uiconfig/scalc/toolbar/findbar.xml
@@ -22,6 +22,7 @@
   toolbar:toolbaritem xlink:href=.uno:FindText/
   toolbar:toolbaritem xlink:href=.uno:DownSearch/
   toolbar:toolbaritem xlink:href=.uno:UpSearch/
+  toolbar:toolbaritem xlink:href=.uno:MatchCase/
   toolbar:toolbarseparator/
   toolbar:toolbaritem xlink:href=.uno:SearchDialog/
 /toolbar:toolbar
diff --git a/sd/uiconfig/sdraw/toolbar/findbar.xml 
b/sd/uiconfig/sdraw/toolbar/findbar.xml
index a0e6037..f8052a1 100644

[Libreoffice-commits] core.git: cui/Library_cui.mk cui/source cui/uiconfig

2013-05-24 Thread Caolán McNamara

 cui/Library_cui.mk |3 -
 cui/source/options/optjava.cxx |   68 ++---
 cui/source/options/optjava.hxx |4 ++
 cui/source/options/treeopt.cxx |2 -
 cui/uiconfig/ui/optadvancedpage.ui |2 -
 5 files changed, 55 insertions(+), 24 deletions(-)

New commits:
commit 1d95129bdc48cd93d1aba2591bdf87ee6ab7b296
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 24 15:21:22 2013 +0100

show the 'java' options page when java disabled

because there are now a bunch of unrelated to java things in there in its 
new
incarnation as the advanced tabpage

this removes the weird empty tabpage in options
in the java-disabled-at-build-time configuration

Change-Id: Ie59d8362d440c41e746b67a0195e4159848f162a

diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index ade10e4..fc27d59 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -146,8 +146,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
 cui/source/options/optHeaderTabListbox \
 cui/source/options/opthtml \
 cui/source/options/optinet2 \
-$(if $(filter TRUE,$(SOLAR_JAVA)), \
-cui/source/options/optjava) \
+cui/source/options/optjava \
 cui/source/options/optjsearch \
 cui/source/options/optlingu \
 cui/source/options/optmemory \
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 1c03981..50428e34 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -43,7 +43,9 @@
 #include com/sun/star/ui/dialogs/TemplateDescription.hpp
 #include com/sun/star/ui/dialogs/FolderPicker.hpp
 #include com/sun/star/ucb/XContentProvider.hpp
+#ifdef SOLAR_JAVA
 #include jvmfwk/framework.h
+#endif
 
 // define 
 
@@ -180,7 +182,11 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, 
const SfxItemSet rSet
 xDialogListener-SetDialogClosedLink( LINK( this, SvxJavaOptionsPage, 
DialogClosedHdl ) );
 
 EnableHdl_Impl(m_pJavaEnableCB);
+#ifdef SOLAR_JAVA
 jfw_lock();
+#else
+getWindow(javaframe)-Disable();
+#endif
 }
 
 // ---
@@ -191,6 +197,7 @@ SvxJavaOptionsPage::~SvxJavaOptionsPage()
 delete m_pParamDlg;
 delete m_pPathDlg;
 ClearJavaInfo();
+#ifdef SOLAR_JAVA
 std::vector JavaInfo* ::iterator pIter;
 for ( pIter = m_aAddedInfos.begin(); pIter != m_aAddedInfos.end(); ++pIter 
)
 {
@@ -199,6 +206,7 @@ SvxJavaOptionsPage::~SvxJavaOptionsPage()
 }
 
 jfw_unlock();
+#endif
 }
 
 // ---
@@ -269,6 +277,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, AddHdl_Impl)
 
 IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl)
 {
+#ifdef SOLAR_JAVA
 Sequence OUString  aParameterList;
 if ( !m_pParamDlg )
 {
@@ -309,7 +318,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl)
 }
 else
 m_pParamDlg-SetParameters( aParameterList );
-
+#endif
 return 0;
 }
 
@@ -317,6 +326,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl)
 
 IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl)
 {
+#ifdef SOLAR_JAVA
 String sClassPath;
 
 if ( !m_pPathDlg )
@@ -353,7 +363,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl)
 }
 else
 m_pPathDlg-SetClassPath( sClassPath );
-
+#endif
 return 0;
 }
 
@@ -402,6 +412,7 @@ IMPL_LINK( SvxJavaOptionsPage, DialogClosedHdl, 
DialogClosedEvent*, pEvt )
 
 void SvxJavaOptionsPage::ClearJavaInfo()
 {
+#ifdef SOLAR_JAVA
 if ( m_parJavaInfo )
 {
 JavaInfo** parInfo = m_parJavaInfo;
@@ -415,6 +426,7 @@ void SvxJavaOptionsPage::ClearJavaInfo()
 m_parJavaInfo = NULL;
 m_nInfoSize = 0;
 }
+#endif
 }
 
 // ---
@@ -435,6 +447,7 @@ void SvxJavaOptionsPage::ClearJavaList()
 
 void SvxJavaOptionsPage::LoadJREs()
 {
+#ifdef SOLAR_JAVA
 WaitObject aWaitObj(m_pJavaList);
 javaFrameworkError eErr = jfw_findAllJREs( m_parJavaInfo, m_nInfoSize );
 if ( JFW_E_NONE == eErr  m_parJavaInfo )
@@ -473,12 +486,14 @@ void SvxJavaOptionsPage::LoadJREs()
 }
 
 jfw_freeJavaInfo( pSelectedJava );
+#endif
 }
 
 // ---
 
 void SvxJavaOptionsPage::AddJRE( JavaInfo* _pInfo )
 {
+#ifdef SOLAR_JAVA
 OUStringBuffer sEntry;
 sEntry.append('\t');
 sEntry.append(_pInfo-sVendor);
@@ -491,6 +506,9 @@ void SvxJavaOptionsPage::AddJRE( JavaInfo* _pInfo )
 INetURLObject aLocObj( OUString( _pInfo-sLocation ) );
 String* pLocation = new String( aLocObj.getFSysPath( 
INetURLObject::FSYS_DETECT ) );
 pEntry-SetUserData( pLocation );
+#else
+(void)_pInfo;
+#endif
 }
 
 // ---
@@ -519,6 +537,7 @@ void

Re: Empty Advanced options page on Windows

2013-05-24 Thread Caolán McNamara

On Wed, 2013-04-24 at 20:26 +0200, Thomas Arnhold wrote:
 On 24.04.2013 17:12, Stephan Bergmann wrote:
  On Linux with no JRE installed it works. The list is just empty.
 
  But maybe Kohei's Windows build was configure --without-java, and that
  would make the difference?  (Seeing that SOLAR_JAVA does get mentioned
  in the relevant parts of module cui.)
 
 Indeed that's the problem! With ./autogen.sh --without-java the dialog 
 is empty.
 
 warn:legacy.tools:31230:1:cui/source/options/treeopt.cxx:1099: tabpage 
 could not created

Now fixed as
http://cgit.freedesktop.org/libreoffice/core/commit/?id=1d95129bdc48cd93d1aba2591bdf87ee6ab7b296

C.

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

[Libreoffice-commits] core.git: 11 commits - basctl/AllLangResTarget_basctl.mk config_host.mk.in configure.ac dbaccess/AllLangResTarget_dbu.mk fontconfig/ExternalPackage_fontconfig.mk freetype/Externa

2013-05-24 Thread David Tardon

 Makefile.in  |1 
 RepositoryExternal.mk|   69 ++-
 basctl/AllLangResTarget_basctl.mk|5 --
 config_host.mk.in|2 
 configure.ac |   22 +++--
 dbaccess/AllLangResTarget_dbu.mk |5 --
 fontconfig/ExternalPackage_fontconfig.mk |6 --
 freetype/ExternalPackage_freetype.mk |   57 -
 libcdr/ExternalPackage_libcdr.mk |7 ---
 libodfgen/ExternalPackage_libodfgen.mk   |7 ---
 libwpg/ExternalPackage_libwpg.mk |6 --
 libwpg/UnpackedTarball_libwpg.mk |7 +++
 libwps/ExternalPackage_libwps.mk |5 --
 libwps/UnpackedTarball_libwps.mk |7 +++
 redland/ExternalProject_raptor.mk|2 
 redland/ExternalProject_redland.mk   |3 -
 reportdesign/AllLangResTarget_rpt.mk |5 --
 reportdesign/AllLangResTarget_rptui.mk   |5 --
 sc/AllLangResTarget_sc.mk|5 --
 sd/AllLangResTarget_sd.mk|5 --
 solenv/gbuild/AllLangResTarget.mk|2 
 solenv/gbuild/Executable.mk  |2 
 solenv/gbuild/Library.mk |2 
 solenv/gbuild/Module.mk  |3 -
 solenv/gbuild/Package.mk |3 -
 solenv/gbuild/Postprocess.mk |   16 +++
 solenv/gbuild/TargetLocations.mk |3 -
 solenv/gbuild/UIConfig.mk|2 
 solenv/gbuild/gbuild.mk  |2 
 starmath/AllLangResTarget_sm.mk  |5 --
 svx/Module_svx.mk|1 
 svx/Package_globlmn_hrc.mk   |   14 --
 sw/AllLangResTarget_sw.mk|5 --
 vcl/Library_vclplug_svp.mk   |5 --
 vcl/StaticLibrary_headless.mk|   34 ---
 35 files changed, 138 insertions(+), 192 deletions(-)

New commits:
commit 07e1da75a4ee94910ceb5e72d8ff20ac52a51a8d
Author: David Tardon dtar...@redhat.com
Date:   Fri May 24 15:16:58 2013 +0200

kill and bury $(OUTDIR)/inc

Change-Id: Ifaac9bd368cb62abba5ebea315939c91856d0ee0

diff --git a/configure.ac b/configure.ac
index a7eaa93..4f422ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3964,7 +3964,7 @@ else
 INSTDIR=${BUILDDIR}/instdir/${INPATH}
 fi
 OUTDIR=${SOLARVER}/${INPATH}
-SOLARINC=-I. -I$SRC_ROOT/include -I${SOLARVER}/$INPATH/inc/external 
-I${SOLARVER}/$INPATH/inc $SOLARINC
+SOLARINC=-I. -I$SRC_ROOT/include $SOLARINC
 AC_SUBST(COM)
 AC_SUBST(CPU)
 AC_SUBST(CPUNAME)
diff --git a/redland/ExternalProject_raptor.mk 
b/redland/ExternalProject_raptor.mk
index 88b8a0e..a26ec7a 100644
--- a/redland/ExternalProject_raptor.mk
+++ b/redland/ExternalProject_raptor.mk
@@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
LDFLAGS=-L$(OUTDIR)/lib \
$(if $(filter LINUX 
FREEBSD,$(OS)),-Wl$(COMMA)-rpath-link$(COMMA)$(OUTDIR)/lib 
-Wl$(COMMA)-z$(COMMA)origin 
-Wl$(COMMA)-rpath$(COMMA)\\\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \
$(if $(SYSBASE),$(if $(filter LINUX 
SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl)) \
-   CPPFLAGS=-I$(OUTDIR)/inc/external $(if 
$(SYSBASE),-I$(SYSBASE)/usr/include) \
+   CPPFLAGS=$(if $(SYSBASE),-I$(SYSBASE)/usr/include) \
./configure --disable-gtk-doc \
 --enable-parsers=rdfxml ntriples turtle trig guess 
rss-tag-soup \
--with-www=xml \
diff --git a/redland/ExternalProject_redland.mk 
b/redland/ExternalProject_redland.mk
index 8e3..927e8f5 100644
--- a/redland/ExternalProject_redland.mk
+++ b/redland/ExternalProject_redland.mk
@@ -24,7 +24,6 @@ ifeq ($(OS),WNT)
 $(call gb_ExternalProject_get_state_target,redland,build):
$(call gb_ExternalProject_run,build,\
CC=$(CC) -mthreads $(if $(filter 
YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc) \
-   CPPFLAGS=-I$(OUTDIR)/inc/external \
LDFLAGS=-Wl$(COMMA)--no-undefined 
-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols 
-L$(OUTDIR)/lib \
OBJDUMP=$(HOST_PLATFORM)-objdump \
PKG_CONFIG= \
@@ -48,7 +47,7 @@ $(call gb_ExternalProject_get_state_target,redland,build):
LDFLAGS=-L$(OUTDIR)/lib \
$(if $(filter LINUX 
FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin 
-Wl$(COMMA)-rpath$(COMMA)\\\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \
$(if $(SYSBASE),$(if $(filter LINUX 
SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl)) \
-   CPPFLAGS=-I$(OUTDIR)/inc/external $(if 
$(SYSBASE),-I$(SYSBASE)/usr/include) \
+   CPPFLAGS=$(if $(SYSBASE),-I$(SYSBASE)/usr/include) \
PKG_CONFIG= \
RAPTOR2_CFLAGS=-I$(call 
gb_UnpackedTarball_get_dir,raptor)/src \

[PATCH libreoffice-4-1] fix fdo#64872 infinite loop saving as doc

2013-05-24 Thread Luke Deller (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4028

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/28/4028/1

fix fdo#64872 infinite loop saving as doc

When loading from odt, table cells which are covered (due to merging of
cells) are replaced with an empty cell by
SwXMLTableContext::ReplaceWithEmptyCell.  However if there is a sequence
of cells covered from above then their replacements are accidentally
inserted in reverse order, which produces this infinite loop problem when
saving as doc.

The reverse ordering in SwXMLTableContext::ReplaceWithEmptyCell was because
the insert position came from SwXMLTableContext::GetPrevStartNode which was
very careful to skip previous covered cells.  However those cells have
already been replaced with an empty cell so they should not be skipped.

Change-Id: I6a022cd1490afa181dbc3e4b2d6ed4af3077b363
---
M sw/source/filter/xml/xmltbli.cxx
1 file changed, 6 insertions(+), 20 deletions(-)



diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 5a367cd..617faf4 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -1804,29 +1804,15 @@
 // The last cell is the right one here.
 pPrevCell = GetCell( pRows-size()-1U, GetColumnCount()-1UL );
 }
-else if( 0UL == nRow )
+else if( nCol  0UL )
 {
-// There are no vertically merged cells within the first row, so the
-// previous cell is the right one always.
-if( nCol  0UL )
-pPrevCell = GetCell( nRow, nCol-1UL );
+// The previous cell in this row.
+pPrevCell = GetCell( nRow, nCol-1UL );
 }
-else
+else if( nRow  0UL )
 {
-// If there is a previous cell in the current row that is not spanned
-// from the previous row, its the right one.
-const SwXMLTableRow_Impl *pPrevRow = (*pRows)[(sal_uInt16)nRow-1U];
-sal_uInt32 i = nCol;
-while( !pPrevCell   i  0UL )
-{
-i--;
-if( 1UL == pPrevRow-GetCell( i )-GetRowSpan() )
-pPrevCell = GetCell( nRow, i );
-}
-
-// Otherwise, the last cell from the previous row is the right one.
-if( !pPrevCell )
-pPrevCell = pPrevRow-GetCell( GetColumnCount()-1UL );
+// The last cell from the previous row.
+pPrevCell = GetCell( nRow-1UL, GetColumnCount()-1UL );
 }
 
 const SwStartNode *pSttNd = 0;

-- 
To view, visit https://gerrit.libreoffice.org/4028
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a022cd1490afa181dbc3e4b2d6ed4af3077b363
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-1
Gerrit-Owner: Luke Deller l...@deller.id.au

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

[Libreoffice-commits] core.git: RepositoryExternal.mk

2013-05-24 Thread David Tardon

 RepositoryExternal.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 61695f1aef7c00df01292003ea3aaf8cca393c08
Author: David Tardon dtar...@redhat.com
Date:   Fri May 24 17:15:20 2013 +0200

add missing endef

Change-Id: Idf448a865ad49eb67684589d9d669bff5911b0d6

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 95a5012..6347169 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1057,6 +1057,8 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
 )
 
+endef
+
 define gb_LinkTarget__use_freetype
 $(call gb_LinkTarget_use_external,$(1),freetype_headers)
 $(call gb_LinkTarget_use_static_libraries,$(1),freetype)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sysui/desktop

2013-05-24 Thread Samuel Mehrbrodt

 sysui/desktop/menus/draw.desktop |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aa360797608efd5b03e9eccf0ab934410e042734
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date:   Fri May 24 12:28:27 2013 +0200

Add Corel Draw and MS Publisher MIME Types to Draw

Change-Id: Idbaa8cea7427db3103954c6c60aa7caa6784a3ba
Reviewed-on: https://gerrit.libreoffice.org/4022
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
index 7de198b..9e56d05 100755
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
@@ -22,7 +22,7 @@ Icon=draw
 Type=Application
 
Categories=Office;FlowChart;Graphics;2DGraphics;VectorGraphics;X-Red-Hat-Base;X-MandrivaLinux-Office-Drawing;
 Exec=${UNIXBASISROOTNAME} --draw %%FILE%%
-MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.visio;application/x-wpg;
+MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.visio;application/x-wpg;application/vnd.corel-draw;application/vnd.ms-publisher;
 Name=%PRODUCTNAME Draw
 GenericName=Drawing Program
 Comment=Create and edit drawings, flow charts and logos by using Draw.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Add Corel Draw and MS Publisher MIME Types to Draw

2013-05-24 Thread David Tardon (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/4022

Approvals:
  David Tardon: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/4022
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idbaa8cea7427db3103954c6c60aa7caa6784a3ba
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Samuel Mehrbrodt s.mehrbr...@gmail.com
Gerrit-Reviewer: David Tardon dtar...@redhat.com

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

[Libreoffice-commits] core.git: RepositoryExternal.mk

2013-05-24 Thread David Tardon

 RepositoryExternal.mk |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit ca370e425adc7c1f8b0190b654e9d9909e905d54
Author: David Tardon dtar...@redhat.com
Date:   Fri May 24 17:42:47 2013 +0200

gbuild: don't register fontconfig and freetype twice

Change-Id: I090d7d99a1f618c73a8d82fe2e95932d61ea1099

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6347169..5facd16 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -469,13 +469,6 @@ $(call gb_LinkTarget__use_expat_impl,$(1),expat_x64)
 
 endef
 
-ifeq ($(OS),ANDROID)
-$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
-   fontconfig \
-   freetype \
-))
-endif
-
 ifeq ($(SYSTEM_HYPH),YES)
 
 define gb_LinkTarget__use_hyphen
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

2013-05-24 Thread David Tardon

 RepositoryExternal.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit ef07d314638d04e0979545f0fd4778d0858c96f6
Author: David Tardon dtar...@redhat.com
Date:   Fri May 24 17:57:29 2013 +0200

gbuild: register freetype

Change-Id: I2b586e37906cf633d035e28fbf279eeffd17ef6c

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 5facd16..363d33c 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1044,6 +1044,10 @@ endef
 
 else # ! SYSTEM_FREETYPE
 
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\
+   freetype \
+))
+
 define gb_LinkTarget__use_freetype_headers
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,freetype)/include \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] mso-dumper.git: 2 commits - src/docdirstream.py src/docrecord.py

2013-05-24 Thread Miklos Vajna

 src/docdirstream.py |3 +++
 src/docrecord.py|5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 7918464989883ee64b7dd0bb5b602b6b791e100d
Author: Miklos Vajna vmik...@suse.cz
Date:   Fri May 24 17:37:17 2013 +0200

Selsf: check for the size from the spec

E.g. fdo45983-1.doc has some additional bytes after the documented struct.

diff --git a/src/docrecord.py b/src/docrecord.py
index 0563cb2..c2a73d0 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -337,6 +337,7 @@ class Sty(DOCDirStream):
 self.parent.pos = self.pos
 
 class Selsf(DOCDirStream):
+size = 36 # defined by 2.9.241
 The Selsf structure specifies the last selection that was made to the 
document.
 def __init__(self, mainStream):
 DOCDirStream.__init__(self, mainStream.getTableStream().bytes)
@@ -380,7 +381,7 @@ class Selsf(DOCDirStream):
 self.printAndSet(cpAnchorShrink, self.readuInt32())
 self.printAndSet(xaTableLeft, self.readInt16())
 self.printAndSet(xaTableRight, self.readInt16())
-assert self.pos == self.mainStream.fcWss + self.size
+assert self.pos == self.mainStream.fcWss + Selsf.size
 print '/selsf'
 
 class BRC(DOCDirStream):
commit aad5403441fed65a8fecefc10d147a066c0a521f
Author: Miklos Vajna vmik...@suse.cz
Date:   Fri May 24 17:06:22 2013 +0200

Sprm: don't read 4 bytes when operand size is 3

Triggered by fdo45100-1.doc

diff --git a/src/docdirstream.py b/src/docdirstream.py
index 4e29943..c3e4207 100644
--- a/src/docdirstream.py
+++ b/src/docdirstream.py
@@ -78,6 +78,9 @@ class DOCDirStream:
 self.pos += 2
 return ret
 
+def getuInt24(self):
+return struct.unpack(I, self.bytes[self.pos:self.pos+3] + \x00)[0]
+
 def getuInt32(self, bytes = None, pos = None):
 if not bytes:
 bytes = self.bytes
diff --git a/src/docrecord.py b/src/docrecord.py
index 8d90b51..0563cb2 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -732,7 +732,7 @@ class Sprm(DOCDirStream):
 elif self.getOperandSize() == 2:
 self.operand = self.getuInt16()
 elif self.getOperandSize() == 3:
-self.operand = self.getuInt32()  0x0fff
+self.operand = self.getuInt24()
 elif self.getOperandSize() == 4:
 self.operand = self.getuInt32()
 elif self.getOperandSize() == 7:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - distro-configs/SUSEWin32.conf icon-themes/galaxy

2013-05-24 Thread Petr Mladek

 distro-configs/SUSEWin32.conf|1 
 icon-themes/galaxy/brand_suse_bw/shell/about.svg |   99 +++
 2 files changed, 100 insertions(+)

New commits:
commit dd5fa48bf345c9be6374557b48a8c850765e9dd2
Author: Petr Mladek pmla...@suse.cz
Date:   Fri May 24 17:57:40 2013 +0200

[SUSE] use white background also in the about dialog

The green stuff does not look good together with the blackwhite
SUSE logo.

Change-Id: I2696db0e8ff2a18787f036be8aa9790595b108c6

diff --git a/distro-configs/SUSEWin32.conf b/distro-configs/SUSEWin32.conf
index 3e0d8b7..920ee9d 100644
--- a/distro-configs/SUSEWin32.conf
+++ b/distro-configs/SUSEWin32.conf
@@ -5,6 +5,7 @@
 --with-intro-progressbar-position=115,225
 --with-intro-progressbar-frame-color=138,154,137
 --with-flat-logo-svg=$(SRC_ROOT)/icon-themes/galaxy/brand_suse_bw/about.svg
+--with-about-background-svg=$(SRC_ROOT)/icon-themes/galaxy/brand_suse_bw/shell/about.svg
 
--with-startcenter-left-bitmap=$(SRC_ROOT)/icon-themes/galaxy/brand_suse_bw/shell/backing_left.png
 
--with-startcenter-right-bitmap=$(SRC_ROOT)/icon-themes/galaxy/brand_suse_bw/shell/backing_right.png
 
--with-startcenter-rtl-left-bitmap=$(SRC_ROOT)/icon-themes/galaxy/brand_suse_bw/shell/backing_left.png
diff --git a/icon-themes/galaxy/brand_suse_bw/shell/about.svg 
b/icon-themes/galaxy/brand_suse_bw/shell/about.svg
new file mode 100644
index 000..1d30719
--- /dev/null
+++ b/icon-themes/galaxy/brand_suse_bw/shell/about.svg
@@ -0,0 +1,99 @@
+?xml version=1.0 encoding=UTF-8 standalone=no?
+!-- Created with Inkscape (http://www.inkscape.org/) --
+svg
+   xmlns:dc=http://purl.org/dc/elements/1.1/;
+   xmlns:cc=http://creativecommons.org/ns#;
+   xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#;
+   xmlns:svg=http://www.w3.org/2000/svg;
+   xmlns=http://www.w3.org/2000/svg;
+   xmlns:xlink=http://www.w3.org/1999/xlink;
+   xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd;
+   xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape;
+   version=1.1
+   width=486
+   height=322
+   id=svg1604
+   sodipodi:version=0.32
+   inkscape:version=0.46
+   sodipodi:docname=about.svg
+   inkscape:output_extension=org.inkscape.output.svg.inkscape
+  sodipodi:namedview
+ inkscape:window-height=714
+ inkscape:window-width=640
+ inkscape:pageshadow=2
+ inkscape:pageopacity=0.0
+ guidetolerance=10.0
+ gridtolerance=10.0
+ objecttolerance=10.0
+ borderopacity=1.0
+ bordercolor=#66
+ pagecolor=#ff
+ id=base
+ showgrid=false
+ inkscape:zoom=1.1316872
+ inkscape:cx=243
+ inkscape:cy=161
+ inkscape:window-x=3
+ inkscape:window-y=25
+ inkscape:current-layer=svg1604 /
+  defs
+ id=defs1606
+inkscape:perspective
+   sodipodi:type=inkscape:persp3d
+   inkscape:vp_x=0 : 161 : 1
+   inkscape:vp_y=0 : 1000 : 0
+   inkscape:vp_z=486 : 161 : 1
+   inkscape:persp3d-origin=243 : 107.3 : 1
+   id=perspective58 /
+linearGradient
+   id=linearGradient11370
+  stop
+ id=stop11372
+ style=stop-color:#e9b913;stop-opacity:1
+ offset=0 /
+  stop
+ id=stop11374
+ style=stop-color:#e9b913;stop-opacity:0
+ offset=1 /
+/linearGradient
+clipPath
+   id=clipPath12000
+  rect
+ width=486
+ height=322
+ x=108.62851
+ y=137.47647
+ id=rect12002
+ style=fill:#530260;fill-opacity:1;stroke:none /
+/clipPath
+radialGradient
+   cx=487.36145
+   cy=334.23981
+   r=97.501144
+   fx=487.36145
+   fy=334.23981
+   id=radialGradient11378
+   xlink:href=#linearGradient11370
+   gradientUnits=userSpaceOnUse
+   gradientTransform=matrix(1,0,0,0.88685305,0,26.649594) /
+  /defs
+  metadata
+ id=metadata1609
+rdf:RDF
+  cc:Work
+ rdf:about=
+dc:formatimage/svg+xml/dc:format
+dc:type
+   rdf:resource=http://purl.org/dc/dcmitype/StillImage; /
+dc:title /
+  /cc:Work
+/rdf:RDF
+  /metadata
+  rect
+ width=486
+ height=322
+ x=-4.7851563e-07
+ y=-1.4311523e-05
+ id=rect10696
+ style=fill:#ff;fill-opacity:1;stroke:none /
+/svg
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - svx/source

2013-05-24 Thread Muthu Subramanian

 svx/source/svdraw/svdotxed.cxx |   11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 84093cceb624eab7d956caebdaaf2ac10397900b
Author: Muthu Subramanian sumu...@suse.com
Date:   Thu May 9 16:27:06 2013 +0530

fdo#63311: Unable to delete text from Shape.

This avoids setting null as text to the shape.
[empty_text seems to be the initial value of text for shape
 rather than null - something recent? We also seem to
 export empty text entries because of this]
(cherry picked from commit 19b217505d094577392d8712b9d07f29b3de2081)

Signed-off-by: David Tardon dtar...@redhat.com

diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index eea4907..a92b17c 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -231,14 +231,11 @@ void SdrTextObj::EndTextEdit(SdrOutliner rOutl)
 {
 OutlinerParaObject* pNewText = NULL;
 
-if(HasTextImpl( rOutl ) )
-{
-// to make the gray field background vanish again
-rOutl.UpdateFields();
+// to make the gray field background vanish again
+rOutl.UpdateFields();
 
-sal_uInt16 nParaAnz = static_cast sal_uInt16 ( 
rOutl.GetParagraphCount() );
-pNewText = rOutl.CreateParaObject( 0, nParaAnz );
-}
+sal_uInt16 nParaAnz = static_cast sal_uInt16 ( 
rOutl.GetParagraphCount() );
+pNewText = rOutl.CreateParaObject( 0, nParaAnz );
 
 // need to end edit mode early since SetOutlinerParaObject already
 // uses GetCurrentBoundRect() which needs to take the text into account
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54157] LibreOffice 4.0 most annoying bugs

2013-05-24 Thread bugzilla-daemon

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

Bug 54157 depends on bug 63311, which changed state.

Bug 63311 Summary: EDITING: value of the property String is not set to  for 
completely deleted text in Shapes (reappears after 'save - close - reopen')
https://bugs.freedesktop.org/show_bug.cgi?id=63311

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: fdo#46808, Convert awt::UnoControlDialogModel to new style problem

2013-05-24 Thread Stephan Bergmann


[had inadvertently dropped the ML]

On 05/24/2013 05:46 PM, Stephan Bergmann wrote:

On 05/24/2013 01:30 PM, Noel Grandin wrote:

OK, so it turns out that my change
 fdo#46808, Convert awt::UnoControlDialogModel to new style
http://cgit.freedesktop.org/libreoffice/core/commit/?id=6c61b20a8d4a6dcac28801cde82a211fb7e30654


has been causing some problems, notably around getting and setting
properties.

[...]

The problem is that after my change, this:
   Reference beans::XPropertySet  xDlgPSet( xDialogModel,
UNO_QUERY )
   Any aStringResourceManagerAny;
   aStringResourceManagerAny = xStringResourceManager;
   xDlgPSet-setPropertyValue( aResourceResolverPropName,
aStringResourceManagerAny );
is not equivalent to this:
  Any aStringResourceManagerAny;
  aStringResourceManagerAny = xStringResourceManager;
  xDialogModel-setPropertyValue( aResourceResolverPropName,
aStringResourceManagerAny );

For context the type hierarchy looks like this:
UnoControlDialogModel -- ControlModelContainerBase --
UnoControlModel -- ::cppu::OPropertySetHelper

So when my new code calls setPropertyValue, it ends up here:
 // overrides to resolve ambiguity
 virtual void  UnoControlDialogModel::setPropertyValue(const
OUString p1, Any p2)  throw (some stuff)
 {

[...]

 }
but if we first cast to ReferenceXPropertySet, and then do the call,
we end up in
 cppu::OPropertySetHelper::setPropertyValue()
and all is well.


The problem is that the implementation of the
css.awt.UnoControlDialogModel involves UNO aggregation
(IMPL_CREATE_INSTANCE_WITH_GEOMETRY(UnoControlDialogModel) in
toolkit/soruce/helper/registerservices.cxx creating a
OGeometryControlModelUnoControlDialogModel instance that aggregates a
UnoControlDialogModel instance).  That means that queryInterface can
return a reference to something that is technically a different object,
and that's what's happening here, and explains why calling
setPropertyValue in two different ways on what logically appears to be a
single object can end up calling two different implementations (of two
different physical objects).  (UNO aggregation is known to be broken and
should not be used.  Nevertheless, there's still code that does---code
that is a horrible mess and hard to clean up.)

That all this worked as intended in the past is just sheer luck, but any
way of substantially touching it is asking for trouble.  I'm going to
revert 6c61b20a8d4a6dcac28801cde82a211fb7e30654 again.

Stephan


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

[Libreoffice-commits] core.git: svx/source

2013-05-24 Thread Tor Lillqvist

 svx/source/svdraw/svdobj.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f55c6464fb9ee3ff8c011e815e0b75162ebea3fd
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Fri May 24 20:10:58 2013 +0300

WaE: 'static_cast' : truncation of constant value

Change-Id: Icbb624b1441330406c0930aa6f1f15ffc9b138b8

diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 0577860..11032ad 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -499,7 +499,7 @@ SdrObject::~SdrObject()
 mpViewContact = 0L;
 }
 
-mnLayerID = static_castSdrLayerID(0xdead);
+mnLayerID = 59; // random value
 }
 
 void SdrObject::Free( SdrObject* _rpObject )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH libreoffice-4-0] fdo#51296 Patch modifies ctrl+click behaviour to be like wri...

2013-05-24 Thread Akash Shetye (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4029

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/29/4029/1

fdo#51296 Patch modifies ctrl+click behaviour to be like writer.

ctrl+click on hyperlink does not open link if the ctrl+click security setting 
is disabled.

Change-Id: I2754b0c3d977208e28daa25502145bb29c3ef4c8
---
M sc/source/core/data/global.cxx
1 file changed, 2 insertions(+), 1 deletion(-)



diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 74ba29b..53cba0b 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -934,9 +934,10 @@
 //Ctrl key is pressed and ctrl+click hyperlink security control is set
 bProceedHyperlink = true;
 }
-else if( !aSecOpt.IsOptionSet( SvtSecurityOptions::E_CTRLCLICK_HYPERLINK ) 
)
+else if( !(nScClickMouseModifier  KEY_MOD1)  !aSecOpt.IsOptionSet( 
SvtSecurityOptions::E_CTRLCLICK_HYPERLINK ) )
 {
 //ctrl+click hyperlink security control is disabled just click will do
+//However if ctrl+click happens the condition fails
 bProceedHyperlink = true;
 }
 if ( !bProceedHyperlink )

-- 
To view, visit https://gerrit.libreoffice.org/4029
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2754b0c3d977208e28daa25502145bb29c3ef4c8
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Akash Shetye shetyeak...@gmail.com

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

[Libreoffice-commits] core.git: include/vcl

2013-05-24 Thread Pedro Giffuni

 include/vcl/bitmap.hxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit f31e6debfa7e330f985a0846a6ca91130d3dab20
Author: Pedro Giffuni p...@apache.org
Date:   Fri Feb 8 15:35:48 2013 +

A miscellaneous use of boost.

Sinc(x) is a simple function used in communications. boost
happens to use it for quaternion math. The implementation is
simple, however it looks fun to re-use the boost function
even if just to say we are using quaternion math somewhere ;).

The performance difference is not likely to be huge but JIC,
set up a specific Boost math policy to limit type promotion
with it's corresponding impact.
(cherry picked from commit d1f61b3f3564ca5421a13b77e4c7c78bb409e9e1)

Conflicts:
vcl/inc/vcl/bitmap.hxx

Change-Id: I5f01db1688eedee25a2943ca3aa6e957b400c759

diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index bacec11..4ca9cc1 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -20,6 +20,7 @@
 #ifndef _SV_BITMAP_HXX
 #define _SV_BITMAP_HXX
 
+#include boost/math/special_functions/sinc.hpp
 #include tools/color.hxx
 #include tools/link.hxx
 #include tools/solar.h
@@ -207,7 +208,8 @@ public:
 
 class Lanczos3Kernel : public Kernel
 {
-
+typedef boost::math::policies::policy
+boost::math::policies::promote_doublefalse  SincPolicy;
 public:
 Lanczos3Kernel() : Kernel () {}
 virtual double GetWidth() const { return 3.0; }
@@ -223,7 +225,7 @@ public:
 return 1.0;
 }
 x = x * M_PI;
-return sin(x) / x;
+return boost::math::sinc_pi(x, SincPolicy());
 }
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 57/fdcdd79d1682ee7d5e88fbab3803631496afa2

2013-05-24 Thread Caolán McNamara

 57/fdcdd79d1682ee7d5e88fbab3803631496afa2 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8fbddb51251529d515dc8759496ab499bd0030eb
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 24 19:02:19 2013 +0100

Notes added by 'git notes add'

diff --git a/57/fdcdd79d1682ee7d5e88fbab3803631496afa2 
b/57/fdcdd79d1682ee7d5e88fbab3803631496afa2
new file mode 100644
index 000..a15f367
--- /dev/null
+++ b/57/fdcdd79d1682ee7d5e88fbab3803631496afa2
@@ -0,0 +1 @@
+merged as: 54c679f481647890f18151f4db05cfc3eff5d98b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - filter/source include/filter sd/source vcl/inc vcl/source

2013-05-24 Thread Caolán McNamara

 filter/source/msfilter/svdfppt.cxx  |  139 
 include/filter/msfilter/svdfppt.hxx |3 
 sd/source/filter/ppt/pptin.cxx  |2 
 vcl/inc/window.h|3 
 vcl/source/window/window.cxx|6 -
 vcl/source/window/window3.cxx   |   22 -
 6 files changed, 147 insertions(+), 28 deletions(-)

New commits:
commit 5f88e8e6492cbd62b990cc18ebdb71a62be52c72
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 24 19:00:30 2013 +0100

this themeing thing doesn't actually do anything

both branches are the same and the set/get aren't
called anyway.

originally introduced with d02f75a8c36705924ddd6a5921fe3012fafce812

Change-Id: I94399bba0fa259bfafcc214e2df15f172d32374f

diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 34fe78c..230e1b0 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -396,8 +396,7 @@ public:
 mbVexpand:1,
 mbExpand:1,
 mbFill:1,
-mbSecondary:1,
-mbIsThemingEnabled:1;
+mbSecondary:1;
 
 ::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface  
mxDNDListenerContainer;
 };
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index b50ca25..e69dd35 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -297,7 +297,6 @@ WindowImpl::WindowImpl( WindowType nType )
 mbExpand = false;
 mbFill = true;
 mbSecondary = false;
-mbIsThemingEnabled = true;
 }
 
 WindowImpl::~WindowImpl()
@@ -758,10 +757,7 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, 
SystemParentData* pSyste
 nBorderTypeStyle |= BORDERWINDOW_STYLE_FRAME;
 nStyle |= WB_BORDER;
 }
-ImplBorderWindow* pBorderWin =
-mpWindowImpl-mbIsThemingEnabled
-? CreateBorderWindow( pParent, nStyle  (WB_BORDER | 
WB_DIALOGCONTROL | WB_NODIALOGCONTROL | WB_NEEDSFOCUS), nBorderTypeStyle )
-: new ImplBorderWindow( pParent, nStyle  (WB_BORDER | 
WB_DIALOGCONTROL | WB_NODIALOGCONTROL | WB_NEEDSFOCUS), nBorderTypeStyle );
+ImplBorderWindow* pBorderWin = new ImplBorderWindow( pParent, nStyle  
(WB_BORDER | WB_DIALOGCONTROL | WB_NODIALOGCONTROL | WB_NEEDSFOCUS), 
nBorderTypeStyle );
 ((Window*)pBorderWin)-mpWindowImpl-mpClientWindow = this;
 pBorderWin-GetBorder( mpWindowImpl-mnLeftBorder, 
mpWindowImpl-mnTopBorder, mpWindowImpl-mnRightBorder, 
mpWindowImpl-mnBottomBorder );
 mpWindowImpl-mpBorderWindow  = pBorderWin;
diff --git a/vcl/source/window/window3.cxx b/vcl/source/window/window3.cxx
index fd656f96..00919ac 100644
--- a/vcl/source/window/window3.cxx
+++ b/vcl/source/window/window3.cxx
@@ -18,11 +18,9 @@
  */
 
 
-#include vcl/button.hxx
 #include vcl/window.hxx
 #include vcl/waitobj.hxx
-#include brdwin.hxx
-#include window.h
+#include vcl/button.hxx
 
 // ---
 
@@ -65,22 +63,4 @@ void Window::ImplAdjustNWFSizes()
 }
 }
 
-void Window::EnableThemeSupport (void)
-{
-mpWindowImpl-mbIsThemingEnabled = sal_True;
-}
-
-void Window::DisableThemeSupport (void)
-{
-mpWindowImpl-mbIsThemingEnabled = sal_False;
-}
-
-ImplBorderWindow* Window::CreateBorderWindow (
-Window* pParent,
-const WinBits nStyle,
-const sal_uInt16 nTypeStyle)
-{
-return new ImplBorderWindow(pParent, nStyle, nTypeStyle);
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 54c679f481647890f18151f4db05cfc3eff5d98b
Author: Andre Fischer a...@apache.org
Date:   Fri Jul 13 07:55:43 2012 +

Resolves: #i119874 Fixed text alignment in RTL layout.

Reported by: Li Feng Wang
Patch by: Jianyuan Li
Review by: Andre Fischer
(cherry picked from commit 57fdcdd79d1682ee7d5e88fbab3803631496afa2)

Conflicts:
filter/inc/filter/msfilter/svdfppt.hxx
filter/source/msfilter/svdfppt.cxx

Change-Id: I6adae6d40ff106caeea2b9310a57228257d79404

Related: #i119874# Missing part of patch.

Patch by: Jianyuan Li
(cherry picked from commit a7dc3e8b82c87b138c973f1434717d634ed8dc67)

Change-Id: Icff3e1167ab780612ad47775aaa39c9baa99c70f

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index e4e1ae1..91891c9 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -7627,4 +7627,143 @@ SdrObject* SdrPowerPointImport::CreateTable( SdrObject* 
pGroup, sal_uInt32* pTab
 return pRet;
 }
 
+sal_Bool SdrPowerPointImport::IsVerticalText() const
+{
+sal_Bool bVerticalText = sal_False;
+if ( IsProperty( DFF_Prop_txflTextFlow ) )
+{
+MSO_TextFlow eTextFlow = (MSO_TextFlow)( GetPropertyValue( 
DFF_Prop_txflTextFlow )  0x );
+switch( eTextFlow )
+{
+case mso_txflTtoBA :

[PATCH] prevent increase indent from running outside the cell

2013-05-24 Thread abdulmajeed ahmed (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4030

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/30/4030/1

prevent increase indent from running outside the cell

i have take ColWidth value and take out 200 to keep at lesat on letter inside 
the cell

Change-Id: I8d4518845f64044dea2f4ecd393cc625eebc6302
---
M sc/source/core/data/attarray.cxx
1 file changed, 5 insertions(+), 2 deletions(-)



diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 7ef3103..dc3ab8a 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -1656,12 +1656,15 @@
 || ((const SvxHorJustifyItem*)pItem)-GetValue() != 
SVX_HOR_JUSTIFY_LEFT );
 sal_uInt16 nOldValue = ((const SfxUInt16Item)rOldSet.Get( ATTR_INDENT 
)).GetValue();
 sal_uInt16 nNewValue = nOldValue;
+//to keep Increment indent from running outside the cell
+long nColWidth = (long)pDocument-GetColWidth(nCol,nTab);
+
 if ( bIncrement )
 {
-if ( nNewValue  SC_MAX_INDENT )
+if ( nNewValue  nColWidth-200 )
 {
 nNewValue += SC_INDENT_STEP;
-if ( nNewValue  SC_MAX_INDENT ) nNewValue = SC_MAX_INDENT;
+if ( nNewValue  nColWidth-200 ) nNewValue = nColWidth-200;
 }
 }
 else

-- 
To view, visit https://gerrit.libreoffice.org/4030
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d4518845f64044dea2f4ecd393cc625eebc6302
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa

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

[Libreoffice-commits] core.git: include/vcl

2013-05-24 Thread Caolán McNamara

 include/vcl/window.hxx |8 
 1 file changed, 8 deletions(-)

New commits:
commit fd6da32cb1cba42be795f01574a86700677ec78a
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 24 20:14:25 2013 +0100

blasted headers in new locations thinko

Change-Id: Iab62e87ed59061ee05daeae4ecd691c119a96b82

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 381b3e6..d1c783b 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1273,14 +1273,6 @@ public:
 
 virtual OUString GetSurroundingText() const;
 virtual Selection GetSurroundingTextSelection() const;
-
-void EnableThemeSupport (void);
-void DisableThemeSupport (void);
-
-virtual ImplBorderWindow* CreateBorderWindow (
-Window* pParent,
-const WinBits nStyle,
-const sal_uInt16 nTypeStyle);
 };
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/source

2013-05-24 Thread Mark Wielaard

 sd/source/ui/view/drviewsf.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a602bd1a69db5c6b4e0fa818324cdf4e0088778c
Author: Mark Wielaard m...@klomp.org
Date:   Fri May 24 08:55:45 2013 +0200

Fix memory leak in DrawViewShell::GetAttrState().

DrawViewShell::GetAttrState() might create a temporary new SvxNumRule
object. Make sure it gets deleted when done.

Change-Id: I33ddd9df983193fe87dd076267043d202cdfc3d5
Reviewed-on: https://gerrit.libreoffice.org/4020
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index 4989cd2..89c90d0 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -630,9 +630,10 @@ void DrawViewShell::GetAttrState( SfxItemSet rSet )
 }
 }
 }
+  delete pNumRule;
 }
 }
-break;
+break;
 //End
 // Added by Li Hui for story 179.
 case FN_NUM_BULLET_ON:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - sfx2/source

2013-05-24 Thread Stephan Bergmann

 sfx2/source/doc/docfile.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit e2cbb5eea18c419a162f5c18fe5df617cd57db27
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu May 23 17:17:09 2013 +0200

rhbz#961460: Don't needlessly pass URLs through INetURLObject

The WebDAV UCP uses https/davs URLs that may contain a userinfo (cf. RFC 
3986)
part, and INetURLObject does not support that (in accordance with RFCs 2818 
and
2616) and thus creates an empty INET_PROT_NOT_VALID INetURLObject for such a
URL, leading to failure when trying to save a document to such a URL.
(Regression introduced with 966d20e35d5a2be2fce6c204af5c156c3ead7063 CMIS 
ucp:
write documents back to CMIS server.)

(cherry picked from commit 3f5c45b70864af95a6362acf4684fb57eb85e348)
Conflicts:
sfx2/source/doc/docfile.cxx

Change-Id: Ifd396852b211cab1d29575da7fccb32306479f93
Reviewed-on: https://gerrit.libreoffice.org/4021
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 6271acd..563d809 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1956,8 +1956,11 @@ void SfxMedium::Transfer_Impl()
 }
 }
 
-if ( !sParentUrl.isEmpty() )
-aDest = INetURLObject( sParentUrl );
+if ( sParentUrl.isEmpty() )
+aDestURL = aDest.GetMainURL( INetURLObject::NO_DECODE );
+// adjust to above aDest.removeSegment()
+else
+aDestURL = sParentUrl;
 
 // LongName wasn't defined anywhere, only used here... get the 
Title instead
 // as it's less probably empty
@@ -1969,7 +1972,7 @@ void SfxMedium::Transfer_Impl()
 
 try
 {
-aTransferContent = ::ucbhelper::Content( aDest.GetMainURL( 
INetURLObject::NO_DECODE ), xComEnv );
+aTransferContent = ::ucbhelper::Content( aDestURL, xComEnv );
 }
 catch (const ::com::sun::star::ucb::ContentCreationException ex)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Fix memory leak in DrawViewShell::GetAttrState().

2013-05-24 Thread via Code Review

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/4020

Approvals:
  Caolán McNamara: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/4020
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I33ddd9df983193fe87dd076267043d202cdfc3d5
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mark Wielaard m...@klomp.org
Gerrit-Reviewer: Caolán McNamara caol...@redhat.com

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

[PATCH] Robustify and fix leak in NBOTypeMgrBase::ImplLoad().

2013-05-24 Thread Mark Wielaard (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4031

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/31/4031/1

Robustify and fix leak in NBOTypeMgrBase::ImplLoad().

The operator of SvStream doesn't initialize a variable if the stream
is faulty. So initialize the variables before usage. Also delete the
SvStream even if it was faulty.

Change-Id: I5a7f31016e060c3b9fb4f0fd1889f444877cb89d
---
M svx/source/sidebar/nbdtmg.cxx
1 file changed, 3 insertions(+), 3 deletions(-)



diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 0976150..a1eb0c1 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -184,8 +184,8 @@
 aFile.Append( filename);
 SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aFile.GetMainURL( 
INetURLObject::NO_DECODE ), STREAM_READ );
 if( pIStm ) {
-sal_uInt32  nVersion;
-sal_Int32   nNumIndex;
+sal_uInt32  nVersion = 0;
+sal_Int32   nNumIndex = 0;
 *pIStm  nVersion;
 if (nVersion==DEFAULT_NUMBERING_CACHE_FORMAT_VERSION) //first version
 {
@@ -209,8 +209,8 @@
 RelplaceNumRule(aNum,nNumIndex,mLevel);
 *pIStm  nNumIndex;
 }
-delete pIStm;
 }
+delete pIStm;
 }
 eCoreUnit = eOldCoreUnit;
 bIsLoading = false;

-- 
To view, visit https://gerrit.libreoffice.org/4031
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a7f31016e060c3b9fb4f0fd1889f444877cb89d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mark Wielaard m...@klomp.org

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sfx2/source

2013-05-24 Thread Stephan Bergmann

 sfx2/source/doc/docfile.cxx |   15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

New commits:
commit dfe24cc4b1eb623753840523efb62c73e2b44afa
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu May 23 17:17:09 2013 +0200

rhbz#961460: Don't needlessly pass URLs through INetURLObject

The WebDAV UCP uses https/davs URLs that may contain a userinfo (cf. RFC 
3986)
part, and INetURLObject does not support that (in accordance with RFCs 2818 
and
2616) and thus creates an empty INET_PROT_NOT_VALID INetURLObject for such a
URL, leading to failure when trying to save a document to such a URL.
(Regression introduced with 966d20e35d5a2be2fce6c204af5c156c3ead7063 CMIS 
ucp:
write documents back to CMIS server.)

Change-Id: Ifd396852b211cab1d29575da7fccb32306479f93
(cherry picked from commit 3f5c45b70864af95a6362acf4684fb57eb85e348)
Reviewed-on: https://gerrit.libreoffice.org/4019
Tested-by: CaolÃ¡n McNamara caol...@redhat.com
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 3ce8ab7..d08f3fc 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1936,6 +1936,7 @@ void SfxMedium::Transfer_Impl()
 
 ::ucbhelper::Content aDestContent;
 ::ucbhelper::Content::create( aDestURL, xComEnv, 
comphelper::getProcessComponentContext(), aDestContent );
+// For checkin, we need the object URL, not the parent folder:
 if ( !IsInCheckIn( ) )
 {
 // Get the parent URL from the XChild if possible: why would 
the URL necessarily have
@@ -1951,13 +1952,11 @@ void SfxMedium::Transfer_Impl()
 }
 }
 
-if ( !sParentUrl.isEmpty() )
-aDest = INetURLObject( sParentUrl );
-}
-else
-{
-// For checkin, we need the object URL, not the parent folder
-aDest = INetURLObject( aDestURL );
+if ( sParentUrl.isEmpty() )
+aDestURL = aDest.GetMainURL( INetURLObject::NO_DECODE );
+// adjust to above aDest.removeSegment()
+else
+aDestURL = sParentUrl;
 }
 
 // LongName wasn't defined anywhere, only used here... get the 
Title instead
@@ -1970,7 +1969,7 @@ void SfxMedium::Transfer_Impl()
 
 try
 {
-aTransferContent = ::ucbhelper::Content( aDest.GetMainURL( 
INetURLObject::NO_DECODE ), xComEnv, comphelper::getProcessComponentContext() );
+aTransferContent = ::ucbhelper::Content( aDestURL, xComEnv, 
comphelper::getProcessComponentContext() );
 }
 catch (const ::com::sun::star::ucb::ContentCreationException ex)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-3-6] rhbz#961460: Don't needlessly pass URLs through INetURLObjec...

2013-05-24 Thread via Code Review

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/4021

Approvals:
  Caolán McNamara: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/4021
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd396852b211cab1d29575da7fccb32306479f93
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Stephan Bergmann sberg...@redhat.com
Gerrit-Reviewer: Caolán McNamara caol...@redhat.com

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

[PUSHED libreoffice-4-0] rhbz#961460: Don't needlessly pass URLs through INetURLObjec...

2013-05-24 Thread via Code Review

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/4019

Approvals:
  Caolán McNamara: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/4019
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd396852b211cab1d29575da7fccb32306479f93
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Stephan Bergmann sberg...@redhat.com
Gerrit-Reviewer: Caolán McNamara caol...@redhat.com

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sd/source

2013-05-24 Thread Mark Wielaard

 sd/source/ui/view/drviewsf.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 43a57daeb458fe202b42d4c36a72f9d51f2732df
Author: Mark Wielaard m...@klomp.org
Date:   Fri May 24 08:55:45 2013 +0200

Fix memory leak in DrawViewShell::GetAttrState().

DrawViewShell::GetAttrState() might create a temporary new SvxNumRule
object. Make sure it gets deleted when done.

Change-Id: I33ddd9df983193fe87dd076267043d202cdfc3d5
Reviewed-on: https://gerrit.libreoffice.org/4020
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com
(cherry picked from commit a602bd1a69db5c6b4e0fa818324cdf4e0088778c)

diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index 4989cd2..89c90d0 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -630,9 +630,10 @@ void DrawViewShell::GetAttrState( SfxItemSet rSet )
 }
 }
 }
+  delete pNumRule;
 }
 }
-break;
+break;
 //End
 // Added by Li Hui for story 179.
 case FN_NUM_BULLET_ON:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source

2013-05-24 Thread Mark Wielaard

 svx/source/sidebar/nbdtmg.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 38de05c720693a9025ea77a7ccc5f2b56dda68cb
Author: Mark Wielaard m...@klomp.org
Date:   Fri May 24 21:24:00 2013 +0200

Robustify and fix leak in NBOTypeMgrBase::ImplLoad().

The operator of SvStream doesn't initialize a variable if the stream
is faulty. So initialize the variables before usage. Also delete the
SvStream even if it was faulty.

Change-Id: I5a7f31016e060c3b9fb4f0fd1889f444877cb89d
Reviewed-on: https://gerrit.libreoffice.org/4031
Tested-by: CaolÃ¡n McNamara caol...@redhat.com
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 0976150..a1eb0c1 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -184,8 +184,8 @@ void NBOTypeMgrBase::ImplLoad(String filename)
 aFile.Append( filename);
 SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aFile.GetMainURL( 
INetURLObject::NO_DECODE ), STREAM_READ );
 if( pIStm ) {
-sal_uInt32  nVersion;
-sal_Int32   nNumIndex;
+sal_uInt32  nVersion = 0;
+sal_Int32   nNumIndex = 0;
 *pIStm  nVersion;
 if (nVersion==DEFAULT_NUMBERING_CACHE_FORMAT_VERSION) //first version
 {
@@ -209,8 +209,8 @@ void NBOTypeMgrBase::ImplLoad(String filename)
 RelplaceNumRule(aNum,nNumIndex,mLevel);
 *pIStm  nNumIndex;
 }
-delete pIStm;
 }
+delete pIStm;
 }
 eCoreUnit = eOldCoreUnit;
 bIsLoading = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source

2013-05-24 Thread Mark Wielaard

 svx/source/sidebar/nbdtmg.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0699c4ee199e8d18b9e3b98967b3fd4bd1ee301c
Author: Mark Wielaard m...@klomp.org
Date:   Fri May 24 21:24:00 2013 +0200

Robustify and fix leak in NBOTypeMgrBase::ImplLoad().

The operator of SvStream doesn't initialize a variable if the stream
is faulty. So initialize the variables before usage. Also delete the
SvStream even if it was faulty.

Change-Id: I5a7f31016e060c3b9fb4f0fd1889f444877cb89d
Reviewed-on: https://gerrit.libreoffice.org/4031
Tested-by: CaolÃ¡n McNamara caol...@redhat.com
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
(cherry picked from commit 38de05c720693a9025ea77a7ccc5f2b56dda68cb)

diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 0976150..a1eb0c1 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -184,8 +184,8 @@ void NBOTypeMgrBase::ImplLoad(String filename)
 aFile.Append( filename);
 SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aFile.GetMainURL( 
INetURLObject::NO_DECODE ), STREAM_READ );
 if( pIStm ) {
-sal_uInt32  nVersion;
-sal_Int32   nNumIndex;
+sal_uInt32  nVersion = 0;
+sal_Int32   nNumIndex = 0;
 *pIStm  nVersion;
 if (nVersion==DEFAULT_NUMBERING_CACHE_FORMAT_VERSION) //first version
 {
@@ -209,8 +209,8 @@ void NBOTypeMgrBase::ImplLoad(String filename)
 RelplaceNumRule(aNum,nNumIndex,mLevel);
 *pIStm  nNumIndex;
 }
-delete pIStm;
 }
+delete pIStm;
 }
 eCoreUnit = eOldCoreUnit;
 bIsLoading = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Robustify and fix leak in NBOTypeMgrBase::ImplLoad().

2013-05-24 Thread via Code Review

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/4031

Approvals:
  Caolán McNamara: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/4031
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5a7f31016e060c3b9fb4f0fd1889f444877cb89d
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mark Wielaard m...@klomp.org
Gerrit-Reviewer: Caolán McNamara caol...@redhat.com

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

Re: fdo#41572 Making it possible to add custom animation to master slides

2013-05-24 Thread Janit Anjaria

Hey!
This seems to be a long awaited question i have been having in mind. As Tor
mentioned the name i dont think is a big deal for the header here,but what
i think is i need to understand the thing i asked earlier ,regarding the
matter at Line #148 . So it would be great if someone can help me out with
that.

Regards,
Janit


On Tue, May 14, 2013 at 6:17 PM, Janit Anjaria jani...@gmail.com wrote:

 Hey Thorsten!!!
 I obviously know that my work is solely based on self-interestit was
 just a way to answer Tor,and hence I am sure you know the way we have been
 working out this project since some time :) . This email is basically
 intended to let you know the progress of my work for the patch(as per what
 we had talked on the IRC that day) And it would be great if you could help
 me out with the same so we can surely continue our enthusiastic work
 towards the task .

 Hope this find you in good health.
 Regards,
 Janit


 On Tuesday, May 14, 2013, Thorsten Behrens wrote:

 Janit Anjaria wrote:
  It is actually a GSoC Task and i know it is a little early but
  Thorsten thinks starting a little early would surely help because
  this feature is something we dont want to compromise and more the
  time,better it is...
 
 Hi Janit, all,

 just to make one thing very clear - GSoC students will be announced
 Monday, May 27th, and it is at Google's sole discretion. Starting to
 work on tasks before is well appreciated, but it does in no event
 forestall or predetermine the student selection process. ;)

 Kind regards,

 -- Thorsten


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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - aa/d8d0b80c56b956ce674e713d4d09a077e20f68

2013-05-24 Thread Caolán McNamara

 aa/d8d0b80c56b956ce674e713d4d09a077e20f68 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 694991ff07754cb42a5b77e4ffa32d1635f99fa9
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 24 20:45:36 2013 +0100

Notes added by 'git notes add'

diff --git a/aa/d8d0b80c56b956ce674e713d4d09a077e20f68 
b/aa/d8d0b80c56b956ce674e713d4d09a077e20f68
new file mode 100644
index 000..485c21f
--- /dev/null
+++ b/aa/d8d0b80c56b956ce674e713d4d09a077e20f68
@@ -0,0 +1 @@
+merged as: 3bcbc800a5598854be473a7397eac384e0d8a07e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source

2013-05-24 Thread Oliver-Rainer Wittmann

 vcl/source/gdi/print3.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 3bcbc800a5598854be473a7397eac384e0d8a07e
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Fri Apr 19 10:41:08 2013 +

Resolves: #i120529# abort print controller job, if no pages will be printed

(cherry picked from commit aad8d0b80c56b956ce674e713d4d09a077e20f68)

Change-Id: I7c341961370ce12de1aeb8f0caed18f2dc496390

diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 7ea71cc..a3f976b 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -658,7 +658,13 @@ bool Printer::StartJob( const OUString i_rJobName, 
boost::shared_ptrvcl::Print
 {
 mbJobActive = sal_True;
 i_pController-createProgressDialog();
-int nPages = i_pController-getFilteredPageCount();
+const int nPages = i_pController-getFilteredPageCount();
+// abort job, if no pages will be printed.
+if ( nPages == 0 )
+{
+i_pController-abortJob();
+bAborted = true;
+}
 for( int nOuterIteration = 0; nOuterIteration  
nOuterRepeatCount  ! bAborted; nOuterIteration++ )
 {
 for( int nPage = 0; nPage  nPages  ! bAborted; nPage++ )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 2 commits - vcl/source

2013-05-24 Thread Mark Wielaard

 vcl/source/gdi/print3.cxx   |8 +++-
 vcl/source/window/split.cxx |   34 +-
 2 files changed, 24 insertions(+), 18 deletions(-)

New commits:
commit 8f34685654814a796f63b285b61fbeba2bd62ba3
Author: Mark Wielaard m...@klomp.org
Date:   Wed May 22 17:46:20 2013 +0200

Splitter::ImplInitHorVer(bool) should always initialize all state.

When creating a new Splitter ImplInitHorVer(bool) should always
init all state independent from the current state because some
variables might not be initialized yet.

 Conditional jump or move depends on uninitialised value(s)
at 0x8293625: Splitter::ImplInitHorVer(bool) (split.cxx:70)
by 0x82936DF: Splitter::ImplInit(Window*, long) (split.cxx:100)
by 0x8293CC3: Splitter::Splitter(Window*, long) (split.cxx:157)
by 0x2686BC48: ScTabSplitter::ScTabSplitter(Window*, long, ScViewData*) 
(tabsplit.cxx:28)
...
  Uninitialised value was created by a heap allocation
at 0x4A08361: operator new(unsigned long) (vg_replace_malloc.c:298)
by 0x2687D8F1: ScTabView::Init() (tabview5.cxx:90)
by 0x2686C5D3: ScTabView::ScTabView(Window*, ScDocShell, 
ScTabViewShell*) (tabview.cxx:261)
...

The public method to change the internal state is Splitter::SetHorizontal()
which does check the current state (and calls Splitter::ImplInitHorVer()
only when there is a real state change). So the bNew != mbHorzSplit was
redundant anyway.

Change-Id: If84e8bff4c87d208416de3583202ce88d6982a99
Reviewed-on: https://gerrit.libreoffice.org/4007
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
(cherry picked from commit 3fd6c700f85fdf775d64113aa027cc36db57a62a)

diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx
index 92a637e..13cc486 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.cxx
@@ -65,28 +65,28 @@ void Splitter::ImplInitSplitterData()
 
 // ---
 
+// Should only be called from a ImplInit method for initialization or
+// after checking bNew is different from the current mbHorzSplit value.
+// The public method that does that check is Splitter::SetHorizontal().
 void Splitter::ImplInitHorVer(bool bNew)
 {
-if(bNew != (bool)mbHorzSplit)
-{
-mbHorzSplit = bNew;
+mbHorzSplit = bNew;
 
-PointerStyle ePointerStyle;
-const StyleSettings rSettings = GetSettings().GetStyleSettings();
-
-if ( mbHorzSplit )
-{
-ePointerStyle = POINTER_HSPLIT;
-SetSizePixel( Size( rSettings.GetSplitSize(), 
rSettings.GetScrollBarSize() ) );
-}
-else
-{
-ePointerStyle = POINTER_VSPLIT;
-SetSizePixel( Size( rSettings.GetScrollBarSize(), 
rSettings.GetSplitSize() ) );
-}
+PointerStyle ePointerStyle;
+const StyleSettings rSettings = GetSettings().GetStyleSettings();
 
-SetPointer( Pointer( ePointerStyle ) );
+if ( mbHorzSplit )
+{
+ePointerStyle = POINTER_HSPLIT;
+SetSizePixel( Size( rSettings.GetSplitSize(), 
rSettings.GetScrollBarSize() ) );
 }
+else
+{
+ePointerStyle = POINTER_VSPLIT;
+SetSizePixel( Size( rSettings.GetScrollBarSize(), 
rSettings.GetSplitSize() ) );
+}
+
+SetPointer( Pointer( ePointerStyle ) );
 }
 
 // ---
commit 09e7888105b7f8ca3894cecee22766ee0939a6c2
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Fri Apr 19 10:41:08 2013 +

Resolves: #i120529# abort print controller job, if no pages will be printed

(cherry picked from commit aad8d0b80c56b956ce674e713d4d09a077e20f68)

Change-Id: I7c341961370ce12de1aeb8f0caed18f2dc496390
(cherry picked from commit 3bcbc800a5598854be473a7397eac384e0d8a07e)

diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 7ea71cc..a3f976b 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -658,7 +658,13 @@ bool Printer::StartJob( const OUString i_rJobName, 
boost::shared_ptrvcl::Print
 {
 mbJobActive = sal_True;
 i_pController-createProgressDialog();
-int nPages = i_pController-getFilteredPageCount();
+const int nPages = i_pController-getFilteredPageCount();
+// abort job, if no pages will be printed.
+if ( nPages == 0 )
+{
+i_pController-abortJob();
+bAborted = true;
+}
 for( int nOuterIteration = 0; nOuterIteration  
nOuterRepeatCount  ! bAborted; nOuterIteration++ )
 {
 for( int nPage = 0; nPage  nPages  ! bAborted; nPage++ )

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a7/dc3e8b82c87b138c973f1434717d634ed8dc67

2013-05-24 Thread Caolán McNamara

 a7/dc3e8b82c87b138c973f1434717d634ed8dc67 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e7ae5dd658c5d82b897d953e2b42e09892b6e954
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 24 20:56:56 2013 +0100

Notes added by 'git notes add'

diff --git a/a7/dc3e8b82c87b138c973f1434717d634ed8dc67 
b/a7/dc3e8b82c87b138c973f1434717d634ed8dc67
new file mode 100644
index 000..a15f367
--- /dev/null
+++ b/a7/dc3e8b82c87b138c973f1434717d634ed8dc67
@@ -0,0 +1 @@
+merged as: 54c679f481647890f18151f4db05cfc3eff5d98b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/source include/filter sd/source

2013-05-24 Thread Caolán McNamara

 filter/source/msfilter/svdfppt.cxx  |  139 
 include/filter/msfilter/svdfppt.hxx |3 
 sd/source/filter/ppt/pptin.cxx  |2 
 3 files changed, 144 deletions(-)

New commits:
commit 979def88090633bfee0e0445b1a1dac71ed4
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 24 20:58:32 2013 +0100

Revert Resolves: #i119874 Fixed text alignment in RTL layout.

This reverts commit 54c679f481647890f18151f4db05cfc3eff5d98b.

pushed that too soon before verifying if it does what it says
it does

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index 91891c9..e4e1ae1 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -7627,143 +7627,4 @@ SdrObject* SdrPowerPointImport::CreateTable( SdrObject* 
pGroup, sal_uInt32* pTab
 return pRet;
 }
 
-sal_Bool SdrPowerPointImport::IsVerticalText() const
-{
-sal_Bool bVerticalText = sal_False;
-if ( IsProperty( DFF_Prop_txflTextFlow ) )
-{
-MSO_TextFlow eTextFlow = (MSO_TextFlow)( GetPropertyValue( 
DFF_Prop_txflTextFlow )  0x );
-switch( eTextFlow )
-{
-case mso_txflTtoBA :// Top to Bottom @-font, above 
- below
-case mso_txflTtoBN :// Top to Bottom non-@, above 
- below
-case mso_txflVertN :// Vertical, non-@, above - 
below
-bVerticalText = !bVerticalText;
-break;
-default: break;
-}
-}
-
-return bVerticalText;
-}
-
-voidSdrPowerPointImport::ApplyTextAnchorAttributes( PPTTextObj rTextObj, 
SfxItemSet rSet ) const
-{
-SdrTextVertAdjust eTVA;
-SdrTextHorzAdjust eTHA;
-
-sal_uInt32 nTextFlags = rTextObj.GetTextFlags();
-
-nTextFlags = PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_LEFT   | 
PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_RIGHT
-| PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_CENTER | 
PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_BLOCK;
-
-if ( IsVerticalText() )
-{
-eTVA = SDRTEXTVERTADJUST_BLOCK;
-eTHA = SDRTEXTHORZADJUST_CENTER;
-
-// Textverankerung lesen
-MSO_Anchor eTextAnchor = (MSO_Anchor)GetPropertyValue( 
DFF_Prop_anchorText, mso_anchorTop );
-
-switch( eTextAnchor )
-{
-case mso_anchorTop:
-case mso_anchorTopCentered:
-eTHA = SDRTEXTHORZADJUST_RIGHT;
-break;
-
-case mso_anchorMiddle :
-case mso_anchorMiddleCentered:
-eTHA = SDRTEXTHORZADJUST_CENTER;
-break;
-
-case mso_anchorBottom:
-case mso_anchorBottomCentered:
-eTHA = SDRTEXTHORZADJUST_LEFT;
-break;
-
-default:
-break;
-}
-// if there is a 100% use of following attributes, the textbox can 
been aligned also in vertical direction
-switch ( eTextAnchor )
-{
-case mso_anchorTopCentered :
-case mso_anchorMiddleCentered :
-case mso_anchorBottomCentered :
-{
-// check if it is sensible to use the centered alignment
-sal_uInt32 nMask = PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_LEFT 
| PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_RIGHT;
-if ( ( nTextFlags  nMask ) != nMask )  // if the textobject 
has left or also right aligned pararagraphs
-eTVA = SDRTEXTVERTADJUST_CENTER;// the text has to be 
displayed using the full width;
-}
-break;
-
-default :
-{
-if ( nTextFlags == PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_LEFT )
-eTVA = SDRTEXTVERTADJUST_TOP;
-else if ( nTextFlags == 
PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_RIGHT )
-eTVA = SDRTEXTVERTADJUST_BOTTOM;
-}
-break;
-}
-}
-else
-{
-eTVA = SDRTEXTVERTADJUST_CENTER;
-eTHA = SDRTEXTHORZADJUST_BLOCK;
-
-// Textverankerung lesen
-MSO_Anchor eTextAnchor = (MSO_Anchor)GetPropertyValue( 
DFF_Prop_anchorText, mso_anchorTop );
-
-switch( eTextAnchor )
-{
-case mso_anchorTop:
-case mso_anchorTopCentered:
-eTVA = SDRTEXTVERTADJUST_TOP;
-break;
-
-case mso_anchorMiddle :
-case mso_anchorMiddleCentered:
-eTVA = SDRTEXTVERTADJUST_CENTER;
-break;
-
-case mso_anchorBottom:
-case mso_anchorBottomCentered:
-eTVA = SDRTEXTVERTADJUST_BOTTOM;
-break;
-
-default:
-break;
-}
-
-// if there is a 100% usage of following attributes, the textbox can 
be aligned also in horizontal direction
-switch ( eTextAnchor )
-{
-case mso_anchorTopCentered :
-case mso_anchorMiddleCentered :
-case mso_anchorBottomCentered :
-{
-// check

[Libreoffice-commits] core.git: Branch 'feature/inherited-number-format-removal' - 9 commits - sc/inc sc/source

2013-05-24 Thread Markus Mohrhard

 sc/inc/column.hxx   |3 +
 sc/inc/formulacell.hxx  |4 +-
 sc/source/core/data/column.cxx  |   20 +++---
 sc/source/core/data/column2.cxx |9 
 sc/source/core/data/column3.cxx |   13 +-
 sc/source/core/data/formulacell.cxx |   24 
 sc/source/filter/excel/xestream.cxx |   22 +--
 sc/source/filter/excel/xetable.cxx  |   70 
 sc/source/filter/inc/xetable.hxx|3 -
 sc/source/filter/xml/xmlcelli.cxx   |2 +
 sc/source/ui/view/output2.cxx   |8 ++--
 11 files changed, 88 insertions(+), 90 deletions(-)

New commits:
commit 7c0489cacd5bb86c6b268cf8dbea1cf6f84a7a38
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri May 24 22:41:44 2013 +0200

remove inherited number formats, related fdo#60215

Change-Id: I23d5e1b3baeb1499ada1fba1665027bdbe3fbb87

diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index e73a79c..49941f9 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -83,6 +83,7 @@ private:
 boolbInChangeTrack : 1; // Cell is in ChangeTrack
 boolbTableOpDirty  : 1; // Dirty flag for TableOp
 boolbNeedListening : 1; // Listeners need to be re-established 
after UpdateReference
+boolmbNeedsNumberFormat : 1; // set the calculated number 
format as hard number format
 
 enum ScInterpretTailParameter
 {
@@ -145,6 +146,7 @@ public:
 voidResetDirty() { bDirty = false; }
 boolNeedsListening() const { return bNeedListening; }
 voidSetNeedsListening( bool bVar ) { bNeedListening = bVar; }
+voidSetNeedNumberFormat( bool bVal ) { mbNeedsNumberFormat = 
bVal; }
 voidCompile(const OUString rFormula,
 bool bNoListening = false,
 const formula::FormulaGrammar::Grammar = 
formula::FormulaGrammar::GRAM_DEFAULT );
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 92b03ca..76f8fc6 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2319,7 +2319,14 @@ void ScColumn::CompileXML( ScProgress rProgress )
 if ( pCell-GetCellType() == CELLTYPE_FORMULA )
 {
 SCROW nRow = maItems[i].nRow;
-static_castScFormulaCell*(pCell)-CompileXML( rProgress );
+ScFormulaCell* pFCell = static_castScFormulaCell*(pCell);
+sal_uInt32 nCellFormat = GetNumberFormat( nRow );
+if( (nCellFormat % SV_COUNTRY_LANGUAGE_OFFSET) != 0)
+pFCell-SetNeedNumberFormat(false);
+else
+pFCell-SetDirty(true);
+
+pFCell-CompileXML( rProgress );
 if ( nRow != maItems[i].nRow )
 Search( nRow, i );  // Listener deleted/inserted?
 }
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index c93e043..9e489ac 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1507,6 +1507,15 @@ void ScColumn::CopyScriptTypesToDocument(SCROW nRow1, 
SCROW nRow2, ScColumn rDe
 
 void ScColumn::SetCell(SCROW nRow, ScBaseCell* pNewCell)
 {
+if(pNewCell-GetCellType() == CELLTYPE_FORMULA)
+{
+ScFormulaCell* pFCell = static_castScFormulaCell*(pNewCell);
+sal_uInt32 nCellFormat = GetNumberFormat( nRow );
+if( (nCellFormat % SV_COUNTRY_LANGUAGE_OFFSET) == 0)
+pFCell-SetNeedNumberFormat(true);
+
+}
+
 bool bIsAppended = false;
 if ( !maItems.empty() )
 {
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 63b3a5f..0b3c64f 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -1457,13 +1457,22 @@ void ScColumn::SetEditText( SCROW nRow, const 
EditTextObject rEditText, const S
 void ScColumn::SetFormula( SCROW nRow, const ScTokenArray rArray, 
formula::FormulaGrammar::Grammar eGram )
 {
 ScAddress aPos(nCol, nRow, nTab);
-Insert(nRow, new ScFormulaCell(pDocument, aPos, rArray, eGram));
+ScFormulaCell* pCell = new ScFormulaCell(pDocument, aPos, rArray, eGram);
+sal_uInt32 nCellFormat = GetNumberFormat( nRow );
+if( (nCellFormat % SV_COUNTRY_LANGUAGE_OFFSET) != 0)
+pCell-SetNeedNumberFormat(true);
+Insert(nRow, pCell);
 }
 
 void ScColumn::SetFormula( SCROW nRow, const OUString rFormula, 
formula::FormulaGrammar::Grammar eGram )
 {
 ScAddress aPos(nCol, nRow, nTab);
-Insert(nRow, new ScFormulaCell(pDocument, aPos, rFormula, eGram));
+ScFormulaCell* pCell = new ScFormulaCell(pDocument, aPos, rFormula, eGram);
+
+sal_uInt32 nCellFormat = GetNumberFormat( nRow );
+if( (nCellFormat % SV_COUNTRY_LANGUAGE_OFFSET) != 0)
+pCell-SetNeedNumberFormat(true);
+

[Libreoffice-commits] core.git: Branch 'feature/inherited-number-format-removal' - 2 commits - sc/qa sc/source

2013-05-24 Thread Markus Mohrhard

 sc/qa/unit/ucalc.cxx|2 +-
 sc/source/core/data/formulacell.cxx |5 -
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 5afb5253704c7ace10fc652ed349bb1330ad40e0
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri May 24 23:39:13 2013 +0200

CPPUNIT_ASSERT_EQUAL gives a more helpful error message

Change-Id: Ic7bc7d0298e6983e377b55f0362f34983de3df7a

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 3fcc260..091872f 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -1129,7 +1129,7 @@ void testFuncINDIRECT(ScDocument* pDoc)
 for (size_t i = 0; i  SAL_N_ELEMENTS(aChecks); ++i)
 {
 OUString aVal = pDoc-GetString(0, i, 0);
-CPPUNIT_ASSERT_MESSAGE(Wrong value!, aVal == *aChecks[i]);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(Wrong value!, *aChecks[i], aVal);
 }
 }
 
commit 8fa826d699f6ff4ed002011358872e14472a7252
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri May 24 23:38:08 2013 +0200

don't set hard format for text formats

Gets rid of some test failures that are the result of dirty test
environments.

Change-Id: I45ed4bbe46c8aa598e074c3eac7903811cbb2620

diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 446c89d..abb9561 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1298,7 +1298,10 @@ void ScFormulaCell::InterpretTail( 
ScInterpretTailParameter eTailParam )
 sal_uInt16 nFormatType = p-GetRetFormatType();
 sal_Int32 nFormatIndex = p-GetRetFormatIndex();
 
-if((nFormatIndex % SV_COUNTRY_LANGUAGE_OFFSET) == 0)
+// don't set text format as hard format
+if(nFormatType == NUMBERFORMAT_TEXT)
+nFormatIndex = 0;
+else if((nFormatIndex % SV_COUNTRY_LANGUAGE_OFFSET) == 0)
 nFormatIndex = 
ScGlobal::GetStandardFormat(*pDocument-GetFormatTable(),
 nFormatIndex, nFormatType);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-qa] minutes of ESC call ...

2013-05-24 Thread Lionel Elie Mamane

On Fri, May 17, 2013 at 12:49:03PM +0200, Eike Rathke wrote:

 On Thursday, 2013-05-16 16:25:40 +0100, Michael Meeks wrote:

  + double check Lionel's list-box / API change (Eike)

 Done. The two properties added to
 com.sun.star.form.component.DataBaseListBox are marked optional which
 doesn't harm existing clients.

I did that on advice of ... Michael Stahl? ... on IRC to shut up the
incompatible API change error the build was giving me.

My understanding was that this was for the benefit of putative
existing *providers* of this service, that since the properties are
optional, we did not change the requirements under their feet and they
still conform to the service specification.

I don't understand how the properties being not optional would harm
*clients* (users of the service): clients written against the old
specification would simply not use the new properties, would they?

I toyed with the idea of adding a
com.sun.star.form.component.DataBaseListBox2 that makes them
non-optional so that users can be assured to have those properties,
but in the end I did not bother, and now we are past the 4.1 new
feature freeze.

-- 
Lionel
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-bugs] [Bug 64831] EDITING: Serious lags in editing and copying cells

2013-05-24 Thread bugzilla-daemon

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

Cor Nouws c...@nouenoff.nl changed:

   What|Removed |Added

 Status|UNCONFIRMED |RESOLVED
 Resolution|--- |INVALID

--- Comment #3 from Cor Nouws c...@nouenoff.nl ---
thanks for reporting Thomas. Resolve this now.

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

1 2 3 >

1 - 100 of 256 matches

Mail list logo