date:20120715

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

--- Comment #346 from Rainer Bielefeld  
2012-07-15 07:29:05 UTC ---
Add "Bug 52108 - CRASH on any action for particular big .odt". 7000 pages
document is nothing affecting many users, but we had it working in 3.4, and who
can know whether we also have an increased vulnerability with some hundreds
pages documents?

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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

[Libreoffice-commits] .: 2 commits - vcl/generic

 vcl/generic/glyphs/gcach_layout.cxx |   17 ++---
 1 file changed, 14 insertions(+), 3 deletions(-)

New commits:
commit d7e5f9b315b5cbe6195504a4bb94b99e6f1b7d99
Author: CaolÃ¡n McNamara 
Date:   Sat Jul 14 21:41:11 2012 +0100

Resolves: fdo#31821 always process ZW[N]J in the font regardless of script

Change-Id: Icd309199b393d89e202fa9d1aba1a1ace51c6c6e

diff --git a/vcl/generic/glyphs/gcach_layout.cxx 
b/vcl/generic/glyphs/gcach_layout.cxx
index d04cebe..cd6b96c 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -187,6 +187,7 @@ public:
 
 using LEFontInstance::mapCharToGlyph;
 virtual LEGlyphID   mapCharToGlyph( LEUnicode32 ch ) const;
+virtual LEGlyphID   mapCharToGlyph( LEUnicode32 ch, const LECharMapper 
*mapper, le_bool filterZeroWidth ) const;
 
 virtual le_int32getAscent() const;
 virtual le_int32getDescent() const;
@@ -263,6 +264,18 @@ LEGlyphID IcuFontFromServerFont::mapCharToGlyph( 
LEUnicode32 ch ) const
 return nGlyphIndex;
 }
 
+LEGlyphID IcuFontFromServerFont::mapCharToGlyph( LEUnicode32 ch, const 
LECharMapper *mapper, le_bool /*filterZeroWidth*/ ) const
+{
+/*
+ fdo#31821, icu has...
+  >â93  if (filterZeroWidth && (mappedChar == 0x200C || 
mappedChar == 0x200D)) {â
+   â94  return canDisplay(mappedChar) ? 0x0001 : 0x; 
â
+   â95  }
+ so only the Indic layouts allow the joiners to get mapped to glyphs
+*/
+return LEFontInstance::mapCharToGlyph( ch, mapper, false );
+}
+
 // ---
 
 le_int32 IcuFontFromServerFont::getAscent() const
commit f4d20a400b5c06959fd5a362a350bb4d9a6e4bd1
Author: CaolÃ¡n McNamara 
Date:   Sat Jul 14 21:21:15 2012 +0100

Resolves: fdo#31821 use icu layout whenever possible

because icu knows all about otf so we don't have to, which makes
things its problem and not ours.

This is the default route for all "ctl" languages already so if
we suffer performance issues here we should try and fix that before
just reverting

Change-Id: I68c8d9929ca48388f61951344f2cfc195045166f

diff --git a/vcl/generic/glyphs/gcach_layout.cxx 
b/vcl/generic/glyphs/gcach_layout.cxx
index 0e8cd64..d04cebe 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -61,9 +61,7 @@ void ServerFontLayout::DrawText( SalGraphics& rSalGraphics ) 
const
 
 bool ServerFontLayout::LayoutText( ImplLayoutArgs& rArgs )
 {
-ServerFontLayoutEngine* pLE = NULL;
-if( !(rArgs.mnFlags & SAL_LAYOUT_COMPLEX_DISABLED) )
-pLE = mrServerFont.GetLayoutEngine();
+ServerFontLayoutEngine* pLE = mrServerFont.GetLayoutEngine();
 if( !pLE )
 pLE = &SimpleLayoutEngine::get();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/filter/html/htmlpars.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 02e0c1b0e8e0b798694445bfa84383dd8d44216a
Author: Markus Mohrhard 
Date:   Sun Jul 15 03:42:27 2012 +0200

prevent double delete in calc's html parser, fdo#52107

Change-Id: I0a203a39697d3b12304e4b9dc99714cd7b2a008c
(cherry picked from commit 0d21d9ddbe0561f45419ae4fc376c312565b413b)

Signed-off-by: CaolÃ¡n McNamara 

diff --git a/sc/source/filter/html/htmlpars.cxx 
b/sc/source/filter/html/htmlpars.cxx
index 6395fb6..0566f66 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -554,6 +554,7 @@ void ScHTMLLayoutParser::Adjust()
 nCurRow = pS->nCurRow;
 }
 delete pS;
+pS = NULL;
 nTab = pE->nTab;
 if (pTables)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/filter/html/htmlpars.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5a86dee80fed8470213186294169582b89cf497f
Author: Markus Mohrhard 
Date:   Sun Jul 15 03:42:27 2012 +0200

prevent double delete in calc's html parser, fdo#52107

Change-Id: I0a203a39697d3b12304e4b9dc99714cd7b2a008c
(cherry picked from commit 0d21d9ddbe0561f45419ae4fc376c312565b413b)

Signed-off-by: CaolÃ¡n McNamara 

diff --git a/sc/source/filter/html/htmlpars.cxx 
b/sc/source/filter/html/htmlpars.cxx
index 323e1a2..d9363e4 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -554,6 +554,7 @@ void ScHTMLLayoutParser::Adjust()
 nCurRow = pS->nCurRow;
 }
 delete pS;
+pS = NULL;
 nTab = pE->nTab;
 pTab = (pTables ? (Table*) pTables->Get( nTab ) : NULL);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED-3-6][PUSHED-3-5] fix for fdo#52107

On Sun, 2012-07-15 at 03:51 +0200, Markus Mohrhard wrote:
> Hey,
> 
> [1] fixes a crash when pasting a html table into calc. The problem is
> that in case of aStack being empty we are double deleting pS.

Pushed to 3-5 and 3-6

C.

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

Re: [REVIEW 3-6] fdo#52013: Writer will crash when the undo-redoing if it contains dummy text in history

On Sun, 2012-07-15 at 08:32 +0900, Takeshi Abe wrote:
> Hi,
> 
> Having reproduced fdo#52013 on master, I would like to ask for a favor of 
> reviewing
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=7b689371cc344f14af783f87c7fe37f5350c10ab
> for 3.6.

Seems to me that the original conversion of
9c0ca924446933431d736ee0dd37e6852b4947dc should have used vector::insert
rather than std::copy ?, i.e. like the attached

C.
diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx
index 982d26e..9bd1214 100644
--- a/sw/source/core/inc/rolbck.hxx
+++ b/sw/source/core/inc/rolbck.hxx
@@ -400,8 +400,7 @@ public:
 SwpHstry::iterator itSourceBegin = pIns->m_SwpHstry.begin() + nStart;
 SwpHstry::iterator itSourceEnd = pIns->m_SwpHstry.end();
 if (itSourceBegin == itSourceEnd) return;
-m_SwpHstry.reserve(nPos + static_cast(itSourceEnd - itSourceBegin));
-std::copy( itSourceBegin, itSourceEnd, m_SwpHstry.begin() + nPos );
+m_SwpHstry.insert(m_SwpHstry.begin() + nPos, itSourceBegin, itSourceEnd);
 pIns->m_SwpHstry.erase( itSourceBegin, itSourceEnd );
 }
 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Impress test is now working in master

Hey,

I recently merged Artur's feature branch into master and was prepared
to deal with all the differences between different systems when it
come to rendering shapes. Luckily and unexpected this did not occure
so we I think we can suppose we can now use the new sd regression-test
with more documents to prevent regressions in impress import and
impress rendering. Adding a new test case is quite easy: Generate a
test document, add it to the regression test, generate the reference
xml files and let the test compare the dump and the reference file.
The test will check for a lot of properties of shape objects and can
be easily extended by extending the dumper code in
drawinglyer/source/dumper/

Artur already created a nice test document that you can find at
sd/qa/unit/data/ods/shapes-test.odp

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

[Bug 44446] LibreOffice 3.6 most annoying bugs

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

Roman Eisele  changed:

   What|Removed |Added

 Depends on||52028

--- Comment #42 from Roman Eisele  2012-07-15 09:03:23 PDT ---
Add bug 52028 - "Writer 3.6 creates and applies empty automatic styles
everywhere, leading to needless file complexity and size".

I don't know why nobody tries to confirm (or disprove) this bug, maybe my
explanation is just too lengthy ;-), but if this bug is reproducible (even if
it is just partially reproducible), this is an important regression which needs
to get fixed soon.

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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

[Libreoffice-commits] .: Branch 'feature/svg-export' - filter/source

2012-07-15 Thread Marco Cecchetti

 filter/source/svg/presentation_engine.js |  486 +--
 1 file changed, 406 insertions(+), 80 deletions(-)

New commits:
commit e9718383879ebea87c32fae11d71ead57b7adf81
Author: Marco Cecchetti 
Date:   Sun Jul 15 10:54:49 2012 +0200

JavaScript engine: added support for skipping/rewinding an effect belonging 
to an interactive animation sequence.

Moreover now when the mouse pointer is over an event-source shape, through 
which the
user can start an interactive animation, the cursor appearance is changed 
to a hand

diff --git a/filter/source/svg/presentation_engine.js 
b/filter/source/svg/presentation_engine.js
index cccbcd0..88d8de0 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -3006,7 +3006,7 @@ function skipEffects(dir)
 {
 if( dir == 1 )
 {
-var bRet = aSlideShow.skipEffect();
+var bRet = aSlideShow.skipPlayingOrNextEffect();
 
 if( !bRet )
 {
@@ -5145,6 +5145,7 @@ function BaseNode( aAnimElem, aParentNode, aNodeContext )
 this.aDuration = null;
 this.aEnd = null;
 this.bMainSequenceRootNode = false;
+this.bInteractiveSequenceRootNode = false;
 this.eFillMode = FILL_MODE_FREEZE;
 this.eRestartMode = RESTART_MODE_NEVER;
 this.nReapeatCount = undefined;
@@ -5462,6 +5463,11 @@ BaseNode.prototype.isMainSequenceRootNode = function()
 return this.bMainSequenceRootNode;
 };
 
+BaseNode.prototype.isInteractiveSequenceRootNode = function()
+{
+return this.bInteractiveSequenceRootNode;
+};
+
 BaseNode.prototype.makeDeactivationEvent = function( nDelay )
 {
 if( this.aDeactivationEvent )
@@ -5528,6 +5534,8 @@ BaseNode.prototype.notifyEndListeners = function()
 }
 
 this.aContext.aEventMultiplexer.notifyEvent( EVENT_TRIGGER_END_EVENT, 
this.getId() );
+if( this.getParentNode() && this.getParentNode().isMainSequenceRootNode() )
+this.aContext.aEventMultiplexer.notifyNextEffectEndEvent();
 };
 
 BaseNode.prototype.getContext = function()
@@ -6123,6 +6131,7 @@ BaseContainerNode.prototype.parseElement= function()
 if( sNodeTypeAttr && aImpressNodeTypeInMap[ sNodeTypeAttr ] )
 this.eImpressNodeType = aImpressNodeTypeInMap[ sNodeTypeAttr ];
 this.bMainSequenceRootNode = ( this.eImpressNodeType == 
IMPRESS_MAIN_SEQUENCE_NODE );
+this.bInteractiveSequenceRootNode = ( this.eImpressNodeType == 
IMPRESS_INTERACTIVE_SEQUENCE_NODE );
 
 // preset-class attribute
 this.ePresetClass =  undefined;
@@ -6554,6 +6563,7 @@ SequentialTimeContainer.prototype.rewindCurrentEffect = 
function( aChildNode )
 // resolve it again.
 aChildNode.init();
 this.resolveChild( aChildNode );
+this.notifyRewindedEvent( aChildNode );
 this.bIsRewinding = false;
 }
 else
@@ -6582,12 +6592,17 @@ SequentialTimeContainer.prototype.rewindLastEffect = 
function( aChildNode )
 // immediately without increment the finished children counter and
 // resolve the next child.
 this.bIsRewinding = true;
-// We end the current effect and remove any change it applies on the
-// animated shape.
+// We end the current effect.
 this.getContext().aTimerEventQueue.forceEmpty();
 this.getContext().aActivityQueue.clear();
 aChildNode.end();
-aChildNode.removeEffect();
+// Invoking the end method on the current child node that has not yet
+// been activated should not lead to any change on the animated shape.
+// However for safety we used to call the removeEffect method but
+// lately we noticed that when interactive animation sequences are
+// involved into the shape effect invoking such a method causes
+// some issue.
+//aChildNode.removeEffect();
 
 // As we rewind the previous effect we need to decrease the finished
 // children counter.
@@ -6603,6 +6618,7 @@ SequentialTimeContainer.prototype.rewindLastEffect = 
function( aChildNode )
 // in ENDED state now, On the contrary it cannot be resolved again 
later.
 aChildNode.init();
 this.resolveChild( aPreviousChildNode );
+this.notifyRewindedEvent( aChildNode );
 this.bIsRewinding = false;
 }
 else
@@ -6629,29 +6645,50 @@ SequentialTimeContainer.prototype.resolveChild = 
function( aChildNode )
 {
 var bResolved = aChildNode.resolve();
 
-if( bResolved && this.isMainSequenceRootNode() )
+if( bResolved && ( this.isMainSequenceRootNode() || 
this.isInteractiveSequenceRootNode() ) )
 {
 if( this.aCurrentSkipEvent )
 this.aCurrentSkipEvent.dispose();
-
 this.aCurrentSkipEvent = makeEvent( bind2( 
SequentialTimeContainer.prototype.skipEffect, this, aChildNode ) );
-this.aContext.aEventMultiplexer.registerSkipEffectEvent( 
this.aCurrentSkipEvent );
 
 if( this.aRewindCurrentEffectEvent )
 t

Feature comparison: LibreOffice - Microsoft Office in the Wiki

2012-07-15 Thread Gerry T.


Dear all,

please find a first draft of a comprehensive feature comparison between 
LibreOffice 3.6 and Microsoft Office 2010 in the Documentfoundation wiki:

https://wiki.documentfoundation.org/Feature_Comparison:_LibreOffice_-_Microsoft_Office

Please feel free to use or change the information in any way you like.

Best greetings,
Gerry
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [REVIEW 3-6] fdo#52013: Writer will crash when the undo-redoing if it contains dummy text in history

2012-07-15 Thread Takeshi Abe

Hi Caolán,

Thank you for your review!

On Sun, 15 Jul 2012 08:43:38 +0100, Caolán McNamara  wrote:
> On Sun, 2012-07-15 at 08:32 +0900, Takeshi Abe wrote:
>> Having reproduced fdo#52013 on master, I would like to ask for a favor of 
>> reviewing
>> http://cgit.freedesktop.org/libreoffice/core/commit/?id=7b689371cc344f14af783f87c7fe37f5350c10ab
>> for 3.6.
> 
> Seems to me that the original conversion of
> 9c0ca924446933431d736ee0dd37e6852b4947dc should have used vector::insert
> rather than std::copy ?, i.e. like the attached
Exactly, I stand corrected.
Please push it to master, and do we need another ack for the 3.6 branch?

Cheers,
-- Takeshi Abe

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

Re: Gtk-WARNING **: /opt/libreoffice3.6/program/../ure-link/lib/libstdc++.so.6: version `GLIBCXX_3.4.11' not found (required by /usr/lib/i386-linux-gnu/gtk-2.0/2.10.0/engines/liboxygen-gtk.so)

2012-07-15 Thread Lionel Elie Mamane

On Sat, Jul 14, 2012 at 04:56:03PM +0300, Nikola Yanev wrote:
> I will try it tonight, but the same system with lo 3.5.5 gives me no
> problem. I will try the one tou are telling me and will write down.

It is probably worth double-checking you have uninstalled the
libreoffice3.6-stdlibs package.

> On Jul 14, 2012 3:51 PM, "Ruslan Kabatsayev"  wrote:

>> What if you set SAL_USE_VCLPLUGIN=gen before starting soffice? What
>> if you remove oxygen-gtk having stdlibs installed?

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

Re: fdo#36187 Swedish accelerators

2012-07-15 Thread Lionel Elie Mamane

On Sat, Jul 14, 2012 at 04:55:15PM +0200, Andras Timar wrote:

> Swedish localizers asked for special accelerator keys, because Ctrl +
> [ and ] are not accessible from Swedish keyboard.

> http://cgit.freedesktop.org/libreoffice/core/commit/?id=4090ec5c4c8c68783ef94460d0809377769944e7

This looks to me like it enables these alternate shortcuts
independently of the keyboard layout, but depending on one of LibO UI
language or maybe document language.

Maybe that's the least bad we can easily do, but it is the wrong
conditional: Think of people using an English UI to work on a document
written in Danish (or Portuguese).

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

Re: gerrit for 3-6, LibreOffice gerrit bot & wrong Merged status

2012-07-15 Thread Bjoern Michaelsen

Hi,

On Sat, Jul 14, 2012 at 08:02:37PM +0400, Ivan Timofeev wrote:
> I am trying to use the following workflow on master:
> 
> 1. git commit
> 2. ./logerrit submit libreoffice-3-6
> 3. git push
> 
> and then the LibreOffice gerrit bot changes the status of the change:
> 
>  Status: Merged
> 
>  "Change has been successfully pushed into branch master."
> 
> ok, into master, but I want it for libreoffice-3-6, please do not
> close it, my dear bot!

Indeed, and once again a proof that the slogan "LibreOffice -- based on
technology breaking your tools since 1984" isnt that far off.

> Should I first push to master, then cherry-pick, then submit?

The 'official' solution by the gerrit team is 'generate a new Change-Id'.

However there are two bugs:

 https://code.google.com/p/gerrit/issues/detail?id=1142
 https://code.google.com/p/gerrit/issues/detail?id=1195

and a proposed patch:

 https://gerrit-review.googlesource.com/#/c/32881/

about it. Since the gerrit team seems to be struck in the philosophical
question if a change is still the same on a different branch, I guess we should
patch our gerrit(*).

Best,

Bjoern

(*) Well, there is one alternative:
If we get the maildrop set up quickly, it could take command for that --
e.g. sending a mail with subject:
review d3bfd982137dcfc90ca922e2471a07e58b1c0164 for libreoffice-3-5
would:
- cherry-pick d3bfd982137dcfc90ca922e2471a07e58b1c0164 on branch 
libreoffice-3-5
- recreate a new Change-Id for it
- submit it for review
The only cornercase with it would be amiss is if the commit doesnt apply
...
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: fdo#36187 Swedish accelerators

Hi Lionel,

2012/7/15 Lionel Elie Mamane :
> On Sat, Jul 14, 2012 at 04:55:15PM +0200, Andras Timar wrote:
>
>> Swedish localizers asked for special accelerator keys, because Ctrl +
>> [ and ] are not accessible from Swedish keyboard.
>
>> http://cgit.freedesktop.org/libreoffice/core/commit/?id=4090ec5c4c8c68783ef94460d0809377769944e7
>
> This looks to me like it enables these alternate shortcuts
> independently of the keyboard layout, but depending on one of LibO UI
> language or maybe document language.
>
> Maybe that's the least bad we can easily do, but it is the wrong
> conditional: Think of people using an English UI to work on a document
> written in Danish (or Portuguese).

It depends on the UI language. I admit that this is not a perfect
solution, e.g. I use English UI with Hungarian keyboard layout, but I
cannot think of anything better at the moment. For the minority, who
use different UI localization and keyboard layout, it is still
possible to manually re-define accelerators.

Best regards,
Andras
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Gtk-WARNING **: /opt/libreoffice3.6/program/../ure-link/lib/libstdc++.so.6: version `GLIBCXX_3.4.11' not found (required by /usr/lib/i386-linux-gnu/gtk-2.0/2.10.0/engines/liboxygen-gtk.so)

2012-07-15 Thread Nikola Yanev

Ofcourse i did it, ill make some research about it.
On Jul 15, 2012 1:13 PM, "Lionel Elie Mamane"  wrote:

> On Sat, Jul 14, 2012 at 04:56:03PM +0300, Nikola Yanev wrote:
> > I will try it tonight, but the same system with lo 3.5.5 gives me no
> > problem. I will try the one tou are telling me and will write down.
>
> It is probably worth double-checking you have uninstalled the
> libreoffice3.6-stdlibs package.
>
> > On Jul 14, 2012 3:51 PM, "Ruslan Kabatsayev" 
> wrote:
>
> >> What if you set SAL_USE_VCLPLUGIN=gen before starting soffice? What
> >> if you remove oxygen-gtk having stdlibs installed?
>
> --
> Lionel
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Feature comparison: LibreOffice - Microsoft Office in the Wiki

2012-07-15 Thread Philipp Riemer

2012/7/15 Gerry T. :
> Dear all,
>
> please find a first draft of a comprehensive feature comparison between
> LibreOffice 3.6 and Microsoft Office 2010 in the Documentfoundation wiki:
> https://wiki.documentfoundation.org/Feature_Comparison:_LibreOffice_-_Microsoft_Office
>
> Please feel free to use or change the information in any way you like.
>
> Best greetings,
> Gerry

Thank you for your work so far! Pretty impressive! Might also help the
marketing guys a lot for their next big advertisement campain (LO4?).

Coming from academia, most of the texts are too long for me to read
;-) Would it be possible to make a TL;DR version? Maybe a table with
LO on the left and MSO on the right and green background for a column
where A outperforms B? Next weekend I have some spare time again and
could help with that/ provide a draft if you like.

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

[Libreoffice-commits] .: scripting/source

 scripting/source/stringresource/stringresource.cxx |   26 ++---
 1 file changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 350de508cfb0b3c9a471744f1b4ce440ae2edd44
Author: Julien Nabet 
Date:   Sun Jul 15 15:21:12 2012 +0200

Prefer prefix ++/-- operators for non-primitive types

Change-Id: Iedb58cade2bc7cdbce2e8d40b0e3502bf3df4fa9

diff --git a/scripting/source/stringresource/stringresource.cxx 
b/scripting/source/stringresource/stringresource.cxx
index c26492b..b0d4eb6 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -113,13 +113,13 @@ StringResourceImpl::StringResourceImpl( const Reference< 
XComponentContext >& rx
 
 StringResourceImpl::~StringResourceImpl()
 {
-for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != 
m_aLocaleItemVector.end(); it++ )
+for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != 
m_aLocaleItemVector.end(); ++it )
 {
 LocaleItem* pLocaleItem = *it;
 delete pLocaleItem;
 }
 
-for( LocaleItemVectorIt it = m_aDeletedLocaleItemVector.begin(); it != 
m_aDeletedLocaleItemVector.end(); it++ )
+for( LocaleItemVectorIt it = m_aDeletedLocaleItemVector.begin(); it != 
m_aDeletedLocaleItemVector.end(); ++it )
 {
 LocaleItem* pLocaleItem = *it;
 delete pLocaleItem;
@@ -316,7 +316,7 @@ Sequence< Locale > StringResourceImpl::getLocales(  )
 Sequence< Locale > aLocalSeq( nSize );
 Locale* pLocales = aLocalSeq.getArray();
 int iTarget = 0;
-for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != 
m_aLocaleItemVector.end(); it++ )
+for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != 
m_aLocaleItemVector.end(); ++it )
 {
 LocaleItem* pLocaleItem = *it;
 pLocales[iTarget] = pLocaleItem->m_locale;
@@ -556,7 +556,7 @@ void StringResourceImpl::removeLocale( const Locale& locale 
)
 if( m_pCurrentLocaleItem == pRemoveItem ||
 m_pDefaultLocaleItem  == pRemoveItem )
 {
-for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it 
!= m_aLocaleItemVector.end(); it++ )
+for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it 
!= m_aLocaleItemVector.end(); ++it )
 {
 LocaleItem* pLocaleItem = *it;
 if( pLocaleItem != pRemoveItem )
@@ -576,7 +576,7 @@ void StringResourceImpl::removeLocale( const Locale& locale 
)
 }
 }
 }
-for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != 
m_aLocaleItemVector.end(); it++ )
+for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != 
m_aLocaleItemVector.end(); ++it )
 {
 LocaleItem* pLocaleItem = *it;
 if( pLocaleItem == pRemoveItem )
@@ -656,7 +656,7 @@ LocaleItem* StringResourceImpl::getItemForLocale
 LocaleItem* pRetItem = NULL;
 
 // Search for locale
-for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != 
m_aLocaleItemVector.end(); it++ )
+for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != 
m_aLocaleItemVector.end(); ++it )
 {
 LocaleItem* pLocaleItem = *it;
 if( pLocaleItem )
@@ -689,7 +689,7 @@ LocaleItem* 
StringResourceImpl::getClosestMatchItemForLocale( const Locale& loca
 // Search for locale
 for( sal_Int32 iPass = 0 ; iPass <= 2 ; ++iPass )
 {
-for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != 
m_aLocaleItemVector.end(); it++ )
+for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != 
m_aLocaleItemVector.end(); ++it )
 {
 LocaleItem* pLocaleItem = *it;
 if( pLocaleItem )
@@ -1048,7 +1048,7 @@ void StringResourcePersistenceImpl::implStoreAtStorage
 }
 }
 
-for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != 
m_aLocaleItemVector.end(); it++ )
+for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != 
m_aLocaleItemVector.end(); ++it )
 {
 LocaleItem* pLocaleItem = *it;
 if( pLocaleItem != NULL && (bStoreAll || pLocaleItem->m_bModified) &&
@@ -1087,7 +1087,7 @@ void StringResourcePersistenceImpl::implStoreAtStorage
 if( bUsedForStore )
 {
 for( LocaleItemVectorIt it = m_aChangedDefaultLocaleVector.begin();
- it != m_aChangedDefaultLocaleVector.end(); it++ )
+ it != m_aChangedDefaultLocaleVector.end(); ++it )
 {
 LocaleItem* pLocaleItem = *it;
 if( pLocaleItem != NULL )
@@ -1182,7 +1182,7 @@ void 
StringResourcePersistenceImpl::implKillChangedDefaultFiles
 {
 // Delete files for changed defaults
 for( LocaleItemVectorIt it = m_aChangedDefaultLocaleVector.begin();
- it != m_aChangedDefaultLocaleVector.end(); it++ )
+ it != m_aChangedDefaultLocaleVector.end

[Libreoffice-commits] .: sfx2/source

 sfx2/source/appl/lnkbase2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 602445c1aae34c1770b627c60238f4f8ba8515ac
Author: Julien Nabet 
Date:   Sun Jul 15 15:24:09 2012 +0200

Prefer prefix ++/-- operators for non-primitive types

Change-Id: I6cfaf9f4623c67fcf9383426f04b32e095acbf42

diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index d22c4fd..8bc6704 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -620,7 +620,7 @@ static DdeTopic* FindTopic( const String & rLinkName, 
sal_uInt16* pItemStt )
 for( int i = 0; i < 2; ++i )
 {
 for( std::vector::iterator iterTopic = 
rTopics.begin();
- iterTopic != rTopics.end(); iterTopic++ )
+ iterTopic != rTopics.end(); ++iterTopic )
 if( (*iterTopic)->GetName() == sTopic )
 return *iterTopic;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/source

 sfx2/source/dialog/filtergrouping.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c64e33efb0f26c9bc9298c7e902efe9af22ca500
Author: Julien Nabet 
Date:   Sun Jul 15 15:26:06 2012 +0200

Possible inefficient checking for  emptiness

Change-Id: I049ebd41756ffdd73f534c3bf34f81106f8549a9

diff --git a/sfx2/source/dialog/filtergrouping.cxx 
b/sfx2/source/dialog/filtergrouping.cxx
index 2745d65..ce73733 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -1048,7 +1048,7 @@ namespace sfx2
 if ( xFilterGroupManager.is() )
 {
 // Add both html/pdf filter as a filter group to get a separator 
between both groups
-if ( aImportantFilterGroup.size() > 0 )
+if ( !aImportantFilterGroup.empty() )
 {
 Sequence< StringPair > aFilters( aImportantFilterGroup.size() 
);
 for ( sal_Int32 i = 0; i < 
(sal_Int32)aImportantFilterGroup.size(); i++ )
@@ -1068,7 +1068,7 @@ namespace sfx2
 }
 }
 
-if ( aFilterGroup.size() > 0 )
+if ( !aFilterGroup.empty() )
 {
 Sequence< StringPair > aFilters( aFilterGroup.size() );
 for ( sal_Int32 i = 0; i < (sal_Int32)aFilterGroup.size(); i++ 
)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: framework/source

 framework/source/lomenubar/MenuItemInfo.cxx |   10 +-
 framework/source/lomenubar/MenuItemInfo.hxx |   10 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 6c4838c13cdc1a6b127e08f1a46883da1b45cfbf
Author: Julien Nabet 
Date:   Sun Jul 15 15:41:15 2012 +0200

These methods can be const

Change-Id: Ia4aa8df3768923f7b5a31fb5158e4a744f4b9788

diff --git a/framework/source/lomenubar/MenuItemInfo.cxx 
b/framework/source/lomenubar/MenuItemInfo.cxx
index 18c159d..904f82a 100644
--- a/framework/source/lomenubar/MenuItemInfo.cxx
+++ b/framework/source/lomenubar/MenuItemInfo.cxx
@@ -74,31 +74,31 @@ MenuItemInfo::setVisible (gboolean is_visible)
 
 //Getters
 gchar*
-MenuItemInfo::getLabel ()
+MenuItemInfo::getLabel () const
 {
 return m_label;
 }
 
 gboolean
-MenuItemInfo::getEnabled ()
+MenuItemInfo::getEnabled () const
 {
 return m_is_enabled;
 }
 
 gint
-MenuItemInfo::getCheckState ()
+MenuItemInfo::getCheckState () const
 {
 return m_check_state;
 }
 
 const gchar*
-MenuItemInfo::getCheckType ()
+MenuItemInfo::getCheckType () const
 {
 return m_check_type;
 }
 
 gboolean
-MenuItemInfo::getVisible ()
+MenuItemInfo::getVisible () const
 {
 return m_is_visible;
 }
diff --git a/framework/source/lomenubar/MenuItemInfo.hxx 
b/framework/source/lomenubar/MenuItemInfo.hxx
index 72d411c..0171795 100644
--- a/framework/source/lomenubar/MenuItemInfo.hxx
+++ b/framework/source/lomenubar/MenuItemInfo.hxx
@@ -46,11 +46,11 @@ class MenuItemInfo {
 void setVisible (gboolean is_visible);
 
 //Getters
-gchar*   getLabel ();
-gboolean getEnabled ();
-gint getCheckState ();
-const gchar* getCheckType ();
-gboolean getVisible ();
+gchar*   getLabel () const;
+gboolean getEnabled () const;
+gint getCheckState () const;
+const gchar* getCheckType () const;
+gboolean getVisible () const;
 };
 #endif // __MENU_ITEM_INFO_HXX__
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-07-15 Thread Marco Cecchetti

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

[Bug 44446] LibreOffice 3.6 most annoying bugs

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

Hillar  changed:

   What|Removed |Added

 Depends on||40317, 33773

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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

[Bug 44446] LibreOffice 3.6 most annoying bugs

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

Hillar  changed:

   What|Removed |Added

 Depends on|33773   |

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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

[Bug 44446] LibreOffice 3.6 most annoying bugs

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

Rainer Bielefeld  changed:

   What|Removed |Added

 Depends on|40317   |

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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: What is bibisect? And what is it doing in my office?

2012-07-15 Thread Robinson Tryon

On Sat, Jul 7, 2012 at 10:19 AM, Robinson Tryon
 wrote:
>
> I'll set up a machine as a buildbot so that I can test my changes.
>

Here's my first shot at bibisect integration into tinbuild2. I threw
together a couple of test files to make it easier to test the bibisect
part without running a whole new build, I plundered Bjoern's bibisect
code to make the output more in line with the existing bibisect repos
(probably still needs improvements), and I added a number of tests
throughout the do_bibisect_push() function to ensure that all of the
steps of the tinbuild phase are executed properly.

I've tested these changes on Ubuntu 12.04, but I'd love to get
feedback from people running buildbots on other OSes.

Couple of notes:
The code currently adds every build to the bibisect repository, but
nightly builds might be often enough (or should we shoot for a "strict
64 commits interval" ?)

Git push to a local-filesystem remote (e.g. "fake-remote" made by
redo-repos.sh) is fast. It'll be interesting to see how slow push is
to a physically distant remote. Will there be a big repack hit as the
repository grows to include dozens of builds?

--R

0001-Bibisect-Add-basic-support-for-bibisect-repository-i.patch.gz
Description: GNU Zip compressed data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] fdo#50941: "Characters per line" will not change when changi...

>From Takeshi Abe :

Takeshi Abe has uploaded a new change for review.

Change subject: fdo#50941: "Characters per line" will not change when changing 
"Max base text size"
..

fdo#50941: "Characters per line" will not change when changing "Max base text 
size"

max characters per line follows max base text size in the squared mode of text 
grid

Change-Id: I47f8cd0db1ece5c940f31aada7d51d40058c7513
---
M sw/source/ui/misc/pggrid.cxx
1 file changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/12/312/1
--
To view, visit https://gerrit.libreoffice.org/312
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I47f8cd0db1ece5c940f31aada7d51d40058c7513
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Takeshi Abe 

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

[Bug 35673] LibreOffice 3.4 most annoying bugs

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

Rainer Bielefeld  changed:

   What|Removed |Added

 Depends on|39006   |

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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

[Libreoffice-commits] .: instsetoo_native/inc_openoffice solenv/bin

 instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf |2 +-
 solenv/bin/modules/installer/windows/msiglobal.pm |1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1b31d5fb52ebdf9c32ec50dd5521724bc1b1c73e
Author: Andras Timar 
Date:   Sun Jul 15 17:30:47 2012 +0200

fdo#52088 use [ProductName] placeholder instead of LibreOffice

Change-Id: I560139949c89798581ed7631eb5d0b3124c83002

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf
index 3376c3d..46e84bf 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf
@@ -2,7 +2,7 @@
 en-US = "Installation database"
 
 [OOO_SIS_COMMENT]
-en-US = "This installer database contains the logic and data required to 
install LibreOffice."
+en-US = "This installer database contains the logic and data required to 
install [ProductName]."
 
 [OOO_SIS_KEYWORDS]
 en-US = "Install,MSI"
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm 
b/solenv/bin/modules/installer/windows/msiglobal.pm
index c6a70ff..d4b626d 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -940,6 +940,7 @@ sub write_summary_into_msi_database
 my $author = get_author_for_sis();
 my $subject = get_subject_for_sis($allvariableshashref);
 my $comment = get_comment_for_sis($sislanguage,$languagefile, 
"OOO_SIS_COMMENT");
+$comment =~ s/\[ProductName\]/$allvariableshashref->{'PRODUCTNAME'}/;
 my $keywords = get_keywords_for_sis($sislanguage,$languagefile, 
"OOO_SIS_KEYWORDS");
 my $appname = get_appname_for_sis($sislanguage,$languagefile, 
"OOO_SIS_APPNAME");
 my $security = get_security_for_sis();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

 sw/source/core/inc/rolbck.hxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit c06fe7e201cdb0fa77da3067dc51a2c6e081d82a
Author: CaolÃ¡n McNamara 
Date:   Sun Jul 15 16:21:44 2012 +0100

Resolves: fdo#52013 use vector::insert instead

Change-Id: I3cbc0c0751c069ff9bc7d8b1b737fcfdc3be2b9d

diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx
index 982d26e..9bd1214 100644
--- a/sw/source/core/inc/rolbck.hxx
+++ b/sw/source/core/inc/rolbck.hxx
@@ -400,8 +400,7 @@ public:
 SwpHstry::iterator itSourceBegin = pIns->m_SwpHstry.begin() + nStart;
 SwpHstry::iterator itSourceEnd = pIns->m_SwpHstry.end();
 if (itSourceBegin == itSourceEnd) return;
-m_SwpHstry.reserve(nPos + static_cast(itSourceEnd - 
itSourceBegin));
-std::copy( itSourceBegin, itSourceEnd, m_SwpHstry.begin() + nPos );
+m_SwpHstry.insert(m_SwpHstry.begin() + nPos, itSourceBegin, 
itSourceEnd);
 pIns->m_SwpHstry.erase( itSourceBegin, itSourceEnd );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: l10ntools/source

 l10ntools/source/localize.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 7f4790388b5b3d09a364fa9d7ea10bd4765288ba
Author: Andras Timar 
Date:   Sun Jul 15 17:51:53 2012 +0200

fdo#52090 update Danish dictionaries (2012.07.14)

Change-Id: Ia05018afcfcba044e568e9262ccb90324c2807f5

diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 81d4875..a54d096 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -116,6 +116,9 @@ bool passesNegativeList(rtl::OUString const & url) {
 "/dictionaries/da_DK/help/da/"
 "org.openoffice.da.hunspell.dictionaries/page1.xhp") },
 { RTL_CONSTASCII_STRINGPARAM(
+"/dictionaries/da_DK/help/da/"
+"org.openoffice.da.hunspell.dictionaries/page2.xhp") },
+{ RTL_CONSTASCII_STRINGPARAM(
 "/dictionaries/hu_HU/help/hu/"
 "org.openoffice.hu.hunspell.dictionaries/page1.xhp") },
 { RTL_CONSTASCII_STRINGPARAM("/hidother.src") },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - l10ntools/source

 l10ntools/source/localize.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 525d2dab0e02c40dad8258958b2877e16f54976e
Author: Andras Timar 
Date:   Sun Jul 15 17:51:53 2012 +0200

fdo#52090 update Danish dictionaries (2012.07.14)

Change-Id: Ia05018afcfcba044e568e9262ccb90324c2807f5
Signed-off-by: Andras Timar 

diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 81d4875..a54d096 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -116,6 +116,9 @@ bool passesNegativeList(rtl::OUString const & url) {
 "/dictionaries/da_DK/help/da/"
 "org.openoffice.da.hunspell.dictionaries/page1.xhp") },
 { RTL_CONSTASCII_STRINGPARAM(
+"/dictionaries/da_DK/help/da/"
+"org.openoffice.da.hunspell.dictionaries/page2.xhp") },
+{ RTL_CONSTASCII_STRINGPARAM(
 "/dictionaries/hu_HU/help/hu/"
 "org.openoffice.hu.hunspell.dictionaries/page1.xhp") },
 { RTL_CONSTASCII_STRINGPARAM("/hidother.src") },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] move remotebridges to tail_build

>From David Tardon :

David Tardon has uploaded a new change for review.

Change subject: move remotebridges to tail_build
..

move remotebridges to tail_build

Change-Id: I54d0e708f00ecbd95f34a62b54768f15d263ec69
---
M Module_tail_build.mk
M tail_build/prj/build.lst
2 files changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/15/315/1
--
To view, visit https://gerrit.libreoffice.org/315
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I54d0e708f00ecbd95f34a62b54768f15d263ec69
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon 

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

[PATCH] move sysui to postprocess

>From David Tardon :

David Tardon has uploaded a new change for review.

Change subject: move sysui to postprocess
..

move sysui to postprocess

The only thing that sysui exports that is used by another package are
application icons, used in desktop (windows build only). But since
gbuildification of desktop they are included directly from
$(SRCDIR)/sysui/desktop/icons instead of $(OUTDIR)/inc/icons, so the
dependency is no longer necessary.

Change-Id: I6fa3153d3793e785c1ed602c3e67c86cead2bae2
---
M desktop/prj/build.lst
M postprocess/prj/build.lst
M tail_build/prj/build.lst
3 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/14/314/1
--
To view, visit https://gerrit.libreoffice.org/314
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6fa3153d3793e785c1ed602c3e67c86cead2bae2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon 

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

[PATCH] move l10ntools to cross_tail_build

>From David Tardon :

David Tardon has uploaded a new change for review.

Change subject: move l10ntools to cross_tail_build
..

move l10ntools to cross_tail_build

Change-Id: I3e47892002a0cf0d22d86e9da925c76ac2781579
---
M Module_cross_tail_build.mk
M cross_tail_build/prj/build.lst
2 files changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/17/317/1
--
To view, visit https://gerrit.libreoffice.org/317
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e47892002a0cf0d22d86e9da925c76ac2781579
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon 

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

[PATCH] move ulfconv to l10ntools

>From David Tardon :

David Tardon has uploaded a new change for review.

Change subject: move ulfconv to l10ntools
..

move ulfconv to l10ntools

This allows us to drop dependency on setup_native everywhere.

Change-Id: Ib033f8d5953682379c6c2ab53d5cf221e9d8cfec
---
M Repository.mk
M cross_toolset/prj/build.lst
A l10ntools/Executable_ulfconv.mk
M l10ntools/Module_l10ntools.mk
A l10ntools/Package_ulfconv.mk
R l10ntools/source/ulfconv/msi-encodinglist.txt
R l10ntools/source/ulfconv/ulfconv.cxx
M postprocess/prj/build.lst
M scp2/prj/build.lst
M setup_native/prj/build.lst
M setup_native/prj/d.lst
D setup_native/source/ulfconv/makefile.mk
M sysui/prj/build.lst
M tail_build/prj/build.lst
14 files changed, 43 insertions(+), 53 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/13/313/1
--
To view, visit https://gerrit.libreoffice.org/313
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib033f8d5953682379c6c2ab53d5cf221e9d8cfec
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon 

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

[PATCH] drop translations from build phase: not required anymore

>From David Tardon :

David Tardon has uploaded a new change for review.

Change subject: drop translations from build phase: not required anymore
..

drop translations from build phase: not required anymore

Change-Id: I70df41a8ed5ed7e6c614749125f19b80c5e03291
---
M cross_tail_build/prj/build.lst
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/16/316/1
--
To view, visit https://gerrit.libreoffice.org/316
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I70df41a8ed5ed7e6c614749125f19b80c5e03291
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon 

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

Re: Feature comparison: LibreOffice - Microsoft Office in the Wiki

2012-07-15 Thread julien2412

It's a very interesting link you gave!
I added this on your page :
"MS Excel allows to group and outline"
but had no fdo bug ref (put a link about a wikihow instead) and I don't know
if something is planned about this.

Anyone to bring some info about this ? 

Julien

--
View this message in context: 
http://nabble.documentfoundation.org/Feature-comparison-LibreOffice-Microsoft-Office-in-the-Wiki-tp3995567p3995620.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] [GSoC 2012][svg export filter] Weekly Report #8

2012-07-15 Thread Marco Cecchetti

Hi everybody,
I'm really happy to going on working on my project for the
second half of GSoC! Thanks to the whole LibreOffice community
for your support! :)

It follows my weekly report:

Report #8
-
This week I added support for skipping and rewinding effects
that belong to interactive animation sequences, that is those
effects started by clicking on a given shape. That required a
rework of some parts composing the skip/rewind feature
implementation. After several tries I succeeded in finding a
good solution. When a skip action is requested by the user all
playing effects are skipped, both the ones belonging to the main
animation sequence and the ones belonging to any interactive
animation sequence. In case no effect is playing, the next effect,
if any, belonging to the main animation sequence is skipped.
When a rewind action is requested by the user, any playing or
ended effect started later the oldest playing effect is rewinded,
if there is no playing effect, the last started (not ended!)
effect, indifferently from the animation sequence it belongs to,
is rewinded.

I also implemented a little nice feature: miming the behavior of
the C++ presentation player now when the mouse pointer is over
an event-source shape, through which the user can start an
interactive animation, the cursor appearance is changed to a hand.

Filed a new bug report (fdo#52120) for pointing out that in
the C++ implementation skipping an effect does not work as
expected when the hide after animation option is selected.
Merged the feature/svg-export branch to the master branch.
Now the skip/rewind effect support is available in the master
branch directly, the same is true for interactive effects.
---

You can read more details on my project log book (week 8):
https://docs.google.com/document/d/1GSLPSIWRGSDTSi69dT9Te8tRyTJcAekxT7scoCoGO2M/edit?pli=1#heading=h.3hsb6kvnww9l

You can download a sample presentation here:
https://docs.google.com/open?id=0BwS_9-CU4098bkY4bG51aHJMUkk
In order to download the zip files click on the Download item
under the File menu.

You can look at the source code in the feature branch:
feature/svg-export, that includes all new commits after the last
master branch merging.

Cheers,
-- Marco

--
Using Opera's revolutionary e-mail client: http://www.opera.com/mail/
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Feature comparison: LibreOffice - Microsoft Office in the Wiki

2012-07-15 Thread Olivier Hallot

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hi

On top of that, it makes sense for me if this page is under
Documentation tree.

Nice work! already under translation for pt-br.

Kind regards

Olivier

Em 15-07-2012 09:51, Philipp Riemer escreveu:
> 2012/7/15 Gerry T. :
>> Dear all,
>>
>> please find a first draft of a comprehensive feature comparison between
>> LibreOffice 3.6 and Microsoft Office 2010 in the Documentfoundation wiki:
>> https://wiki.documentfoundation.org/Feature_Comparison:_LibreOffice_-_Microsoft_Office
>>
>> Please feel free to use or change the information in any way you like.
>>
>> Best greetings,
>> Gerry
> 
> Thank you for your work so far! Pretty impressive! Might also help the
> marketing guys a lot for their next big advertisement campain (LO4?).
> 
> Coming from academia, most of the texts are too long for me to read
> ;-) Would it be possible to make a TL;DR version? Maybe a table with
> LO on the left and MSO on the right and green background for a column
> where A outperforms B? Next weekend I have some spare time again and
> could help with that/ provide a draft if you like.
> 
> Philipp
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
> 

- -- 
Olivier Hallot
Founder, Board of Directors Member - The Document Foundation
The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany
Fundação responsável civilmente, de acordo com o direito civil
Detalhes Legais: http://www.documentfoundation.org/imprint
LibreOffice translation leader for Brazilian Portuguese
+55-21-8822-8812


-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJQAu4aAAoJEJp3R7nH3vLxN0cIAKB+bQ9umTjr8mph5RnGb277
nGJSAnT3RP/vPvxE26Aj1cXyedk1+elm8EJ0r9PjGXI/nPGTYc4hzYsRZ01V/Bl7
iNqdptMCIJk629mAnllsFZyFUKoRzVxUg/ijDqtSJ8F1c53a1yC+4p7Zf8lTE/wg
Bm0yh3AH5/FTAZByHNgXPOy98OrXX8GdQyd/syRVa/tj25EdEACDQ927VO+CVJoL
2zcP48IbRdBQ8Jxmqb6AIY3NRARScY6eonV0+CMg6yLWGn44HVGrpR64j0toUen3
6/9ondEMyDCU6T7NnvypXqEFL7MMsaS5lDekxrLOzzbiIU/+9jbdfWViHPyIKMU=
=EB6K
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: gbuild migration

2012-07-15 Thread David Tardon

Hi,

On Thu, Jul 12, 2012 at 08:36:45AM +0200, David Tardon wrote:
> * setup_native builds the ulfconv executable that is needed for scp2
>   (yes, I already suggested at least once it should be moved elsewhere,
>   probably to l10ntools. Good time to do it? :-)

So I did that in https://gerrit.libreoffice.org/313 (with more cleanup
in following patches). The result is that setup_native and sysui are now
built from postprocess (so they do not block tail_build); as a bonus the
build phase of cross-compilation does not need to build translations
anymore.

I believe the main tail_build blocker is now cli_ure (immediately
followed by bridges) followed by readlicense_oo.

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

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

 l10ntools/source/gsicheck.cxx |4 ++--
 l10ntools/source/helper.hxx   |9 +
 l10ntools/source/tagtest.cxx  |   11 +++
 3 files changed, 18 insertions(+), 6 deletions(-)

New commits:
commit 9865dbc7af9331ccb1a8e55a09dd821fb014a5a4
Author: Stephan Bergmann 
Date:   Fri Jul 13 15:35:42 2012 +0200

fdo#51954: More tools->rtl string conversion regressions

Change-Id: If9c5b0a0876540e9546617faaa5dcb4ae1e5a2cb
Signed-off-by: Andras Timar 

diff --git a/l10ntools/source/gsicheck.cxx b/l10ntools/source/gsicheck.cxx
index 98e4b31..b2981a3 100644
--- a/l10ntools/source/gsicheck.cxx
+++ b/l10ntools/source/gsicheck.cxx
@@ -479,7 +479,7 @@ sal_Bool GSIBlock::HasSuspiciousChars( GSILine* pTestee, 
GSILine* pSource )
 rtl::OStringToOUString(
 pTestee->GetText().copy(0, nPos), RTL_TEXTENCODING_UTF8));
 sal_Int32 nErrorPos = aUTF8Tester.getLength();
-rtl::OString aContext( pTestee->GetText().copy( nPos, 20 ) );
+rtl::OString aContext( helper::abbreviate( pTestee->GetText(), 
nPos, 20 ) );
 PrintError(rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM("Found 
double questionmark in translation only. Looks like an encoding problem at 
Position "))
  .append(nErrorPos).getStr(),
 "Text format", aContext, pTestee->GetLineNumber(), 
pTestee->GetUniqId());
commit 025c3122716ea363545e04329d0ebc8f7bb65bc9
Author: Stephan Bergmann 
Date:   Wed Jul 11 19:09:44 2012 +0200

Regression fix correction

Change-Id: I03f020f474c198368aa3528870b0752752a3bd2c
Signed-off-by: Andras Timar 

diff --git a/l10ntools/source/tagtest.cxx b/l10ntools/source/tagtest.cxx
index 77b3be8..062c5c7 100644
--- a/l10ntools/source/tagtest.cxx
+++ b/l10ntools/source/tagtest.cxx
@@ -772,7 +772,10 @@ rtl::OUString SimpleParser::GetNextTokenString( 
ParserMessageList &rErrorList, s
 if (nStyle2StartPos == -1 && nStyle3StartPos == -1)
 return rtl::OUString();  // no more tokens
 
-if ( nStyle4StartPos != -1 && nStyle4StartPos < nStyle2StartPos && 
nStyle4StartPos <= nStyle3StartPos )  // <= to make sure \\ is always handled 
first
+if ( nStyle4StartPos != -1
+ && (nStyle2StartPos == -1 || nStyle4StartPos < nStyle2StartPos)
+ && (nStyle3StartPos == -1 || nStyle4StartPos < nStyle3StartPos ) )
+// to make sure \\ is always handled first
 {   // Skip quoted Backslash
 nPos = nStyle4StartPos +2;
 return GetNextTokenString( rErrorList, rTagStartPos );
commit fd4129ef6116adfcda39acac7fb6d28211464a72
Author: Michael Meeks 
Date:   Wed Jul 11 12:10:56 2012 +0100

fix std::max mismatched type compile snafu

Change-Id: Ia6572f8c648168053ae327fa995fc4f33029ab33
Signed-off-by: Andras Timar 

diff --git a/l10ntools/source/helper.hxx b/l10ntools/source/helper.hxx
index ee03eda..cc33b71 100644
--- a/l10ntools/source/helper.hxx
+++ b/l10ntools/source/helper.hxx
@@ -103,7 +103,7 @@ inline sal_Int32 indexOfAnyAsciiL(
 template< typename T > inline T abbreviate(
 T const & text, sal_Int32 start, sal_Int32 length)
 {
-start = std::max(0, start);
+start = std::max(sal_Int32(0), start);
 assert(start <= text.getLength());
 return text.copy(start, std::min(text.getLength() - start, length));
 }
commit 5085fb2b0a8e74e5cdc67487c05c605570e8c71b
Author: Stephan Bergmann 
Date:   Wed Jul 11 12:16:13 2012 +0200

fdo#51954: More tools->rtl string conversion regressions

Change-Id: I490cc82b60663d30fdc8e09d9d6021c964656bec
Signed-off-by: Andras Timar 

diff --git a/l10ntools/source/gsicheck.cxx b/l10ntools/source/gsicheck.cxx
index bb0e116..98e4b31 100644
--- a/l10ntools/source/gsicheck.cxx
+++ b/l10ntools/source/gsicheck.cxx
@@ -362,7 +362,7 @@ void GSIBlock::PrintList( ParserMessageList *pList, 
rtl::OString const & aPrefix
 if ( pMsg->GetTagBegin() == -1 )
 aContext = pLine->GetText().copy( 0, 300 );
 else
-aContext = pLine->data_.copy( pMsg->GetTagBegin()-150, 300 );
+aContext = helper::abbreviate( pLine->data_, 
pMsg->GetTagBegin()-150, 300 );
 aContext = aContext.trim();
 }
 
diff --git a/l10ntools/source/helper.hxx b/l10ntools/source/helper.hxx
index 59f8628..ee03eda 100644
--- a/l10ntools/source/helper.hxx
+++ b/l10ntools/source/helper.hxx
@@ -32,6 +32,7 @@
 
 #include "sal/config.h"
 
+#include 
 #include 
 
 #include "rtl/string.hxx"
@@ -99,6 +100,14 @@ inline sal_Int32 indexOfAnyAsciiL(
 return -1;
 }
 
+template< typename T > inline T abbreviate(
+T const & text, sal_Int32 start, sal_Int32 length)
+{
+start = std::max(0, start);
+assert(start <= text.getLength());
+return text.copy(start, std::min(text.getLength() - start, length));
+}
+
 }
 
 #endif
diff --git a/l10ntools/source/tagtest.cxx b/l10ntools/source/tagtest.cxx
index 2a29c3f..77b3be8 100644
--- a/l10ntools/source/tagtest.cxx
+++ b/l10nto

Re: gbuild migration

2012-07-15 Thread Matúš Kukan

Hi,

On 15 July 2012 18:35, David Tardon  wrote:
> So I did that in https://gerrit.libreoffice.org/313 (with more cleanup
> in following patches). The result is that setup_native and sysui are now
> built from postprocess (so they do not block tail_build); as a bonus the
> build phase of cross-compilation does not need to build translations
> anymore.

nice :-)

> I believe the main tail_build blocker is now cli_ure (immediately
> followed by bridges) followed by readlicense_oo.

So, only two more modules and even salhelper can be in tail_build, great.
We could then put almost everything relevant into libmerged but I
don't know who would link it ;-)

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

Re: Feature comparison: LibreOffice - Microsoft Office in the Wiki

2012-07-15 Thread Gerry T.


Dear Philipp,

[...] Thank you for your work so far! Pretty impressive! Might also 
help the marketing guys a lot for their next big advertisement campain 
(LO4?). Coming from academia, most of the texts are too long for me to 
read ;-) Would it be possible to make a TL;DR version? Maybe a table 
with LO on the left and MSO on the right and green background for a 
column where A outperforms B? Next weekend I have some spare time 
again and could help with that/ provide a draft if you like. Philipp 
This is a very good idea. Not many people read lengthy bullet point 
lists. My graphical skills are limited, though, so the provision of a 
draft sounds perfect. I assume that you want to limit the focus of a 
table on the major features (or even a selection out of it) or do you 
plan to cover all major and minor features in such a table?


Best greetings,
Gerry


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

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

 desktop/source/app/desktop.hrc |4 
 desktop/source/app/desktop.src |   14 --
 sc/source/ui/inc/datafdlg.hxx  |   13 +++--
 sc/source/ui/miscdlgs/datafdlg.cxx |   17 +++--
 sc/source/ui/src/datafdlg.src  |   36 +---
 svx/source/dialog/docrecovery.src  |4 ++--
 6 files changed, 37 insertions(+), 51 deletions(-)

New commits:
commit c61e3c941d46fe1ae6066f31e01786100e39da56
Author: Andras Timar 
Date:   Sun Jul 15 21:18:42 2012 +0200

fdo#47947 Data Form dialog layout fix

Change-Id: Ifa1689ff9be7afa14f5694825c506f7c8c3eff43

diff --git a/sc/source/ui/inc/datafdlg.hxx b/sc/source/ui/inc/datafdlg.hxx
index bfa3769..6f41ddb 100644
--- a/sc/source/ui/inc/datafdlg.hxx
+++ b/sc/source/ui/inc/datafdlg.hxx
@@ -43,12 +43,13 @@
 
 #define MAX_DATAFORM_COLS   256
 #define MAX_DATAFORM_ROWS   32000
-#define CTRL_HEIGHT 22
-#define FIXED_WIDTH 60
-#define EDIT_WIDTH  140
-#define FIXED_LEFT  12
-#define EDIT_LEFT   78
-#define LINE_HEIGHT 30
+#define FIXED_WIDTH 54
+#define EDIT_WIDTH  86
+#define FIXED_HEIGHT10
+#define EDIT_HEIGHT 12
+#define FIXED_LEFT  6
+#define EDIT_LEFT   62
+#define LINE_HEIGHT 16
 
 //zhangyun
 class ScDataFormDlg : public ModalDialog
diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx 
b/sc/source/ui/miscdlgs/datafdlg.cxx
index 9f0f318..d87d552 100644
--- a/sc/source/ui/miscdlgs/datafdlg.cxx
+++ b/sc/source/ui/miscdlgs/datafdlg.cxx
@@ -163,10 +163,15 @@ ScDataFormDlg::ScDataFormDlg( Window* pParent, 
ScTabViewShell*  pTabViewShellOri
 
 String  aFieldName;
 
-int nTop = 12;
+//align with LAB_DATAFORM_RECORDNO
+int nTop = LogicToPixel( Size(1,6), MapMode(MAP_APPFONT) ).getHeight();
+const int nOne = LogicToPixel( Size(1,1), MapMode(MAP_APPFONT) 
).getHeight();
+const int nLineHeight = LogicToPixel( Size(1, LINE_HEIGHT), 
MapMode(MAP_APPFONT) ).getHeight();
+const int nFixedLeft = LogicToPixel( Size(FIXED_LEFT, 1), 
MapMode(MAP_APPFONT) ).getWidth();
+const int nEditLeft = LogicToPixel( Size(EDIT_LEFT, 1), 
MapMode(MAP_APPFONT) ).getWidth();
 
-SizenFixedSize(FIXED_WIDTH, CTRL_HEIGHT );
-SizenEditSize(EDIT_WIDTH, CTRL_HEIGHT );
+SizenFixedSize(LogicToPixel( Size(FIXED_WIDTH, FIXED_HEIGHT), 
MapMode(MAP_APPFONT) ));
+SizenEditSize(LogicToPixel( Size(EDIT_WIDTH, EDIT_HEIGHT), 
MapMode(MAP_APPFONT) ));
 
 aColLength = nEndCol - nStartCol + 1;
 
@@ -185,13 +190,13 @@ ScDataFormDlg::ScDataFormDlg( Window* pParent, 
ScTabViewShell*  pTabViewShellOri
 
 maFixedTexts[nIndex].SetSizePixel(nFixedSize);
 maEdits[nIndex].SetSizePixel(nEditSize);
-maFixedTexts[nIndex].SetPosPixel(Point(FIXED_LEFT, nTop));
-maEdits[nIndex].SetPosPixel(Point(EDIT_LEFT, nTop));
+maFixedTexts[nIndex].SetPosPixel(Point(nFixedLeft, nTop + 
nOne));
+maEdits[nIndex].SetPosPixel(Point(nEditLeft, nTop));
 maFixedTexts[nIndex].SetText(aFieldName);
 maFixedTexts[nIndex].Show();
 maEdits[nIndex].Show();
 
-nTop += LINE_HEIGHT;
+nTop += nLineHeight;
 }
 else
 {
diff --git a/sc/source/ui/src/datafdlg.src b/sc/source/ui/src/datafdlg.src
index 5c0ee6d..0b6d01f 100644
--- a/sc/source/ui/src/datafdlg.src
+++ b/sc/source/ui/src/datafdlg.src
@@ -26,67 +26,66 @@
  */
 #include "datafdlg.hrc"
 
-//zhangyun, dataform
 ModalDialog RID_SCDLG_DATAFORM
 {
 OutputSize = TRUE ;
 SVLook = TRUE ;
-Size = MAP_APPFONT ( 191 , 180 ) ;
+Size = MAP_APPFONT ( 257 , 180 ) ;
 Text [ en-US ] = "Data Form" ;
 Moveable = TRUE ;
 Closeable = TRUE ;
 FixedText LAB_DATAFORM_RECORDNO
 {
-Pos = MAP_APPFONT ( 136 , 6 ) ;
-Size = MAP_APPFONT ( 50 , 12 ) ;
-Text [ en-US ] = "/" ;
+Pos = MAP_APPFONT ( 162 , 6 ) ;
+Size = MAP_APPFONT ( 60 , 12 ) ;
+Text = "/" ; //placeholder only
 };
 PushButton BTN_DATAFORM_NEW
 {
-Pos = MAP_APPFONT ( 135 , 23 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 161 , 23 ) ;
+Size = MAP_APPFONT ( 90 , 14 ) ;
 TabStop = TRUE ;
 DefButton = TRUE ;
 Text [ en-US ] = "New" ;
 };
 PushButton BTN_DATAFORM_DELETE
 {
-Pos = MAP_APPFONT ( 135 , 40 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 161 , 40 ) ;
+Size = MAP_APPFONT ( 90 , 14 ) ;
 TabStop = TRUE ;
 Text [ en-US ] = "Delete" ;
 };
 PushButton BTN_DATAFORM_RESTORE
 {
-Pos = MAP_APPFONT ( 135 , 57 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 161 , 57 ) ;
+Size = MAP_APPFONT ( 90 , 14 ) ;

[REVIEW 3-5][REVIEW 3-6] Data Form dialog layout (fdo#47947)

Hi,

There were two problems with this dialog. First, buttons on the right
were not wide enough for some languages (French, German, etc.) Second,
the original developer used hardcoded pixel coordinates instead of
logical coordinates, and it resulted in suboptimal layout.

http://cgit.freedesktop.org/libreoffice/core/commit/?id=c61e3c941d46fe1ae6066f31e01786100e39da56

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

Re: Feature comparison: LibreOffice - Microsoft Office in the Wiki

2012-07-15 Thread Philipp Riemer

Hi Gerry,

2012/7/15 Gerry T. :
> Dear Philipp,
>
>> [...] Thank you for your work so far! Pretty impressive! Might also help
>> the marketing guys a lot for their next big advertisement campain (LO4?).
>> Coming from academia, most of the texts are too long for me to read ;-)
>> Would it be possible to make a TL;DR version? Maybe a table with LO on the
>> left and MSO on the right and green background for a column where A
>> outperforms B? Next weekend I have some spare time again and could help with
>> that/ provide a draft if you like. Philipp
>
> This is a very good idea. Not many people read lengthy bullet point lists.
> My graphical skills are limited, though, so the provision of a draft sounds
> perfect. I assume that you want to limit the focus of a table on the major
> features (or even a selection out of it) or do you plan to cover all major
> and minor features in such a table?
>
> Best greetings,
> Gerry

I really appreciate your work. Since I think that you made a pretty
holistic comparison, I would suggest (kind of how you did already) to
group the pro and cons per product/ application type. As a result,
someone who is only interested in e.g. Calc vs. Excel might get the
info on one page. By linking each point/line to a more detailed
explanation further below, we might combine a quick overview with
fully phrased content... Will see what I can do next Friday.

When I wrote my mail I had something like
 in mind
which also links to
 and
.
Btw. maybe  gives you
also further ideas what might be useful to compare... Having only
MSO2007 I don't know how much some functionalities changed.

Sorry, just an idea, did not check that yet: Did you already include
the information from
 and
 in your list?

Have a nice week!
Philipp
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 sw/source/core/inc/rolbck.hxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 3669bb966f709089f43111b5ca1057bfe4a22697
Author: CaolÃ¡n McNamara 
Date:   Sun Jul 15 20:46:27 2012 +0100

Resolves: fdo#52013 use vector::insert instead

Change-Id: Ie12e5b11196b1b0f919bd18f28a0b86f60cc6513
Signed-off-by: Takeshi Abe 

diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx
index efb6f41..cd5a947 100644
--- a/sw/source/core/inc/rolbck.hxx
+++ b/sw/source/core/inc/rolbck.hxx
@@ -402,7 +402,8 @@ public:
 {
 SwpHstry::iterator itSourceBegin = pIns->m_SwpHstry.begin() + nStart;
 SwpHstry::iterator itSourceEnd = pIns->m_SwpHstry.end();
-std::copy( itSourceBegin, itSourceEnd, m_SwpHstry.begin() + nPos );
+if (itSourceBegin == itSourceEnd) return;
+m_SwpHstry.insert(m_SwpHstry.begin() + nPos, itSourceBegin, 
itSourceEnd);
 pIns->m_SwpHstry.erase( itSourceBegin, itSourceEnd );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: libmspub/libmspub-0.0.1.patch libmspub/makefile.mk ooo.lst.in

2012-07-15 Thread Fridrich Strba

 libmspub/libmspub-0.0.1.patch |  339 --
 libmspub/makefile.mk  |6 
 ooo.lst.in|2 
 3 files changed, 3 insertions(+), 344 deletions(-)

New commits:
commit 4dcac7b33bf3eb8125f5ae94c27980ea863c02e0
Author: Fridrich Å trba 
Date:   Sun Jul 15 21:55:36 2012 +0200

Uploading libmspub-0.0.2 release

Change-Id: I0f91e4a4d9c47d91637eac8c28d4ab3062269e35

diff --git a/libmspub/libmspub-0.0.1.patch b/libmspub/libmspub-0.0.1.patch
deleted file mode 100644
index 6067ed6..000
--- a/libmspub/libmspub-0.0.1.patch
+++ /dev/null
@@ -1,339 +0,0 @@
 misc/libmspub-0.0.1/src/lib/ColorReference.cpp 2012-07-11 
23:03:45.0 +0200
-+++ misc/build/libmspub-0.0.1/src/lib/ColorReference.cpp   2012-07-12 
15:13:47.840592701 +0200
-@@ -44,13 +44,13 @@
-   return l.m_baseColor == r.m_baseColor && l.m_modifiedColor == 
r.m_modifiedColor;
- }
- 
--// const unsigned char ColorReference::COLOR_PALETTE;
-+// const unsigned char ColorReference::COLOR_PALETTE = 0x8;
- 
--const unsigned char ColorReference::CHANGE_INTENSITY;
-+const unsigned char ColorReference::CHANGE_INTENSITY = 0x10;
- 
--const unsigned char ColorReference::BLACK_BASE;
-+const unsigned char ColorReference::BLACK_BASE = 0x1;
- 
--const unsigned char ColorReference::WHITE_BASE;
-+const unsigned char ColorReference::WHITE_BASE  = 0x2;
- 
- }
- 
 misc/libmspub-0.0.1/src/lib/ColorReference.h   2012-07-11 
23:03:07.0 +0200
-+++ misc/build/libmspub-0.0.1/src/lib/ColorReference.h 2012-07-12 
15:13:47.840592701 +0200
-@@ -37,10 +37,10 @@
- {
-   unsigned m_baseColor;
-   unsigned m_modifiedColor;
--//  static const unsigned char COLOR_PALETTE = 0x8;
--  static const unsigned char CHANGE_INTENSITY = 0x10;
--  static const unsigned char BLACK_BASE = 0x1;
--  static const unsigned char WHITE_BASE  = 0x2;
-+//  static const unsigned char COLOR_PALETTE;
-+  static const unsigned char CHANGE_INTENSITY;
-+  static const unsigned char BLACK_BASE;
-+  static const unsigned char WHITE_BASE;
-   Color getRealColor(unsigned c, const std::vector &palette) const;
- public:
-   explicit ColorReference(unsigned color) : m_baseColor(color), 
m_modifiedColor(color) { }
 misc/libmspub-0.0.1/src/lib/MSPUBCollector.cpp 2012-07-10 
08:13:15.0 +0200
-+++ misc/build/libmspub-0.0.1/src/lib/MSPUBCollector.cpp   2012-07-12 
15:13:47.841592676 +0200
-@@ -28,6 +28,7 @@
-  * instead of those above.
-  */
- 
-+#include 
- #include "MSPUBCollector.h"
- #include "ShapeGroupPainter.h"
- #include "libmspub_utils.h"
-@@ -35,6 +36,10 @@
- #include "MSPUBTypes.h"
- #include "PolygonUtils.h"
- 
-+#ifndef M_PI
-+#define M_PI 3.14159265358979323846
-+#endif
-+
- libmspub::MSPUBCollector::MSPUBCollector(libwpg::WPGPaintInterface *painter) :
-   m_painter(painter), m_contentChunkReferences(), m_width(0), m_height(0),
-   m_widthSet(false), m_heightSet(false),
-@@ -364,11 +369,11 @@
-   case 7:
- return sqrt(valOne * valTwo * valThree);
-   case 8:
--return atan2(valTwo, valOne) / (PI / 180);
-+return atan2(valTwo, valOne) / (M_PI / 180);
-   case 9:
--return valOne * sin(valTwo * (PI / 180) );
-+return valOne * sin(valTwo * (M_PI / 180) );
-   case 10:
--return valOne * cos(valTwo * (PI / 180) );
-+return valOne * cos(valTwo * (M_PI / 180) );
-   case 11:
- return valOne * cos(atan2(valThree, valTwo));
-   case 12:
-@@ -382,9 +387,9 @@
-   case 0x80:
- return sqrt(valThree * valThree - valOne * valOne);
-   case 0x81:
--return (cos(valThree * (PI / 180)) * (valOne - 10800) + sin(valThree * 
(PI / 180)) * (valTwo - 10800)) + 10800;
-+return (cos(valThree * (M_PI / 180)) * (valOne - 10800) + sin(valThree * 
(M_PI / 180)) * (valTwo - 10800)) + 10800;
-   case 0x82:
--return -(sin(valThree * (PI / 180)) * (valOne - 10800) - cos(valThree * 
(PI / 180)) * (valTwo - 10800)) + 10800;
-+return -(sin(valThree * (M_PI / 180)) * (valOne - 10800) - cos(valThree * 
(M_PI / 180)) * (valTwo - 10800)) + 10800;
-   default:
- return 0;
-   }
-@@ -623,10 +628,10 @@
- unsigned seqNum = i->first;
- double *ptr_rotation = getIfExists(m_shapeRotationsBySeqNum, seqNum);
- VectorTransformation2D rot = ptr_rotation ? 
VectorTransformation2D::fromCounterRadians((*ptr_rotation) * M_PI / 180.)
-- : IDENTITY_TRANSFORMATION;
-+ : VectorTransformation2D();
- std::pair *ptr_flips = getIfExists(m_shapeFlipsBySeqNum, 
seqNum);
- VectorTransformation2D flips = ptr_flips ? 
VectorTransformation2D::fromFlips(ptr_flips->second, ptr_flips->first) :
--   IDENTITY_TRANSFORMATION;
-+   VectorTransformation2D();
- group.m_transform = rot * flips;
- Coordinate *ptr_coords = getIfExists(m_shapeCoordinatesBySeqNum, seqNum);
- if (ptr_coords)
-@@ -655,9 +660,9 @@
-   shape->m_coordinatesRotated90 = true;
- }

Re: libmspub update, running out of virtual memory

2012-07-15 Thread Albert Thuswaldner

On Fri, Jul 13, 2012 at 1:41 AM, Rafael Dominguez  wrote:
> After the update to libmspub-0.0.1 a day ago, my gcc terminates with
> the error "running out of virtual memory" when compiling the
> PolygonUtils.cpp file (i got 4GB ram),
> im using gcc 4.4.5 in Gentoo Linux. My build parameters are
>
> --enable-python=system --disable-epm --with-system-boost
> --enable-crashdump --with-system-zlib --with-system-stdlibs
> --with-system-openssl --with-system-db --with-system-curl
> --with-system-cppunit --without-ppds --with-system-cairo
> --with-junit=/home/ralph/Proyectos/junit-4.10.jar --enable-symbols
> --enable-werror
>
>
> Could it be possible because the file is too big???

Hmm, After upgrading master for the first time in a while, my build
fails at the same spot.

log for /home/thuswa/work/libo2/libmspub
Compiling: 
libmspub/unxlngi6.pro/misc/build/libmspub-0.0.1/src/lib/PolygonUtils.cpp
g++: Internal error: Killed (program cc1plus)
Please submit a full bug report.
See  for instructions.
dmake:  Error code 1, while making
'../../../../../../unxlngi6.pro/slo/PolygonUtils.obj'
dmake:  Error code 255, while making './unxlngi6.pro/misc/build/so_built_mspub'

Does anyone know what's going on here?

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

Re: [PUSHED 3-6] fdo#52013: Writer will crash when the undo-redoing if it contains dummy text in history

On Sun, 2012-07-15 at 19:00 +0900, Takeshi Abe wrote:
> Please push it to master, and do we need another ack for the 3.6 branch?

Pushed to master, and pushed to 3-6 with your (forged) sign off :-)

C.

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

Re: Feature comparison: LibreOffice - Microsoft Office in the Wiki

2012-07-15 Thread Gerry T.


Hi Philipp,


[...]I would suggest (kind of how you did already) to
group the pro and cons per product/ application type. As a result,
someone who is only interested in e.g. Calc vs. Excel might get the
info on one page. By linking each point/line to a more detailed
explanation further below, we might combine a quick overview with
fully phrased content... Will see what I can do next Friday.
[...]

Your idea sounds very good.

[...]
Sorry, just an idea, did not check that yet: Did you already include
the information from
 and
 in your list?

[...]
Yes, everything relevant from the Release notes should be already in the 
list.


Greetings,
Gerry

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

Re: Feature comparison: LibreOffice - Microsoft Office in the Wiki

2012-07-15 Thread Gérard Fargeot

Hi,

julien2412 wrote
> 
> It's a very interesting link you gave!
> I added this on your page :
> "MS Excel allows to group and outline"
> but had no fdo bug ref (put a link about a wikihow instead) and I don't
> know if something is planned about this.
> 
> Anyone to bring some info about this ? 
> 
> Julien
> 
 I use this feature in LibO and previously in OOo for years. :)

Gérard

--
View this message in context: 
http://nabble.documentfoundation.org/Feature-comparison-LibreOffice-Microsoft-Office-in-the-Wiki-tp3995567p3995664.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2012-07-15 Thread Tomaž Vajngerl

 svx/inc/svx/compressgraphicdialog.hxx   |   37 +++-
 svx/source/dialog/compressgraphicdialog.cxx |  234 ++--
 svx/source/dialog/compressgraphicdialog.hrc |   56 +++---
 svx/source/dialog/compressgraphicdialog.src |  189 +-
 4 files changed, 365 insertions(+), 151 deletions(-)

New commits:
commit 660e3c1b204ac709e2acdace2a67f359505a1555
Author: TomaÅ¾ Vajngerl 
Date:   Sun Jul 15 22:22:45 2012 +0200

GUI improvements for CompressGraphicDialog.

In CompressGraphicDialog it is possible to set the target image width
and height besides resolution. Better lossless / JPEG compression
selection. Added Compression / Quality settings.

Change-Id: Ic8a6bfbe9dfbcd4acdfda4c0a856c3ea813a2702

diff --git a/svx/inc/svx/compressgraphicdialog.hxx 
b/svx/inc/svx/compressgraphicdialog.hxx
index a33bb76..bf93e62 100644
--- a/svx/inc/svx/compressgraphicdialog.hxx
+++ b/svx/inc/svx/compressgraphicdialog.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _COMPRESS_GRAPHICS_DIALOG_HXX
-#define _COMPRESS_GRAPHICS_DIALOG_HXX
+#ifndef _COMPRESS_GRAPHIC_DIALOG_HXX
+#define _COMPRESS_GRAPHIC_DIALOG_HXX
 
 #include 
 #include 
@@ -30,19 +30,32 @@
 class SVX_DLLPUBLIC CompressGraphicsDialog : public ModalDialog
 {
 private:
+FixedLine   m_aImageDetailsFL;
 FixedText   m_aFixedText2X;
 FixedText   m_aFixedText2;
 FixedText   m_aFixedText3X;
 FixedText   m_aFixedText3;
-FixedText   m_aFixedText4X;
-FixedText   m_aFixedText4;
 FixedText   m_aFixedText5X;
 FixedText   m_aFixedText5;
 FixedText   m_aFixedText6X;
 FixedText   m_aFixedText6;
+
+FixedLine   m_aSettingsFL;
+CheckBoxm_aReduceResolutionCB;
+FixedText   m_aNewWidthFT;
+MetricField m_aMFNewWidth;
+FixedText   m_aNewHeightFT;
+MetricField m_aMFNewHeight;
+FixedText   m_aResolutionFT;
 ComboBoxm_aResolutionLB;
-MetricField m_aMFQuality;
-CheckBoxm_aLossless;
+FixedText   m_aFixedTextDPI;
+RadioButton m_aLosslessRB;
+RadioButton m_aJpegCompRB;
+FixedText   m_aCompressionFT;
+MetricField m_aCompressionMF;
+FixedText   m_aQualityFT;
+MetricField m_aQualityMF;
+CheckBoxm_aCropCB;
 OKButtonm_aBtnOK;
 CancelButtonm_aBtnCancel;
 HelpButton  m_aBtnHelp;
@@ -52,10 +65,20 @@ private:
 Sizem_aViewSize100mm;
 SfxBindings&m_rBindings;
 
+double  m_dResolution;
+
+DECL_LINK( NewWidthModifiedHdl, void* );
+DECL_LINK( NewHeightModifiedHdl, void* );
 DECL_LINK( ResolutionModifiedHdl, void* );
-DECL_LINK( ClickHdl, void* );
+DECL_LINK( ToggleCompressionRB, void* );
+DECL_LINK( ToggleReduceResolutionRB, void* );
+
+DECL_LINK( CalculateClickHdl, void* );
 
 void Update();
+void UpdateNewWidthMF();
+void UpdateNewHeightMF();
+void UpdateResolutionLB();
 
 public:
 CompressGraphicsDialog( Window* pParent, const Graphic& rGraphic, const 
Size& rViewSize100mm, SfxBindings& rBindings );
diff --git a/svx/source/dialog/compressgraphicdialog.cxx 
b/svx/source/dialog/compressgraphicdialog.cxx
index b1bdb6a..637af17 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -35,35 +35,67 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
 
 CompressGraphicsDialog::CompressGraphicsDialog( Window* pParent, const 
Graphic& rGraphic, const Size& rViewSize100mm, SfxBindings& rBindings ) :
-ModalDialog   ( pParent, SVX_RES( RID_SVXDLG_COMPRESSGRAPHICS ) ),
-m_aFixedText2X( this,SVX_RES( FT_CG_2_X ) ),
-m_aFixedText2 ( this,SVX_RES( FT_CG_2 ) ),
-m_aFixedText3X( this,SVX_RES( FT_CG_3_X ) ),
-m_aFixedText3 ( this,SVX_RES( FT_CG_3 ) ),
-m_aFixedText4X( this,SVX_RES( FT_CG_4_X ) ),
-m_aFixedText4 ( this,SVX_RES( FT_CG_4 ) ),
-m_aFixedText5X( this,SVX_RES( FT_CG_5_X ) ),
-m_aFixedText5 ( this,SVX_RES( FT_CG_5 ) ),
-m_aFixedText6X( this,SVX_RES( FT_CG_6_X ) ),
-m_aFixedText6 ( this,SVX_RES( FT_CG_6 ) ),
-m_aResolutionLB   ( this,SVX_RES( LB_CG_RESOLUTION ) ),
-m_aMFQuality  ( this,SVX_RES( MF_CG_QUALITY ) ),
-m_aLossless   ( this,SVX_RES( CB_CG_LOSSLESS ) ),
-m_aBtnOK  ( this,SVX_RES( BUTTON_CG_OK ) ),
-m_aBtnCancel  ( this,SVX_RES( BUTTON_CG_CANCEL ) ),
-m_aBtnHelp( this,SVX_RES( BUTTON_CG_HELP ) ),
-m_aBtnCalculate   ( this,SVX_RES( BUTTON_CG_CALCULATE ) ),
-m_aGraphic( rGraphic ),
-m_aViewSize100mm  ( rViewSize100mm ),
-m_rBindings   ( rBindings )
+ModalDialog

Re: gerrit for 3-6, LibreOffice gerrit bot & wrong Merged status

2012-07-15 Thread David Ostrovsky

On 15.07.2012 12:29, Bjoern Michaelsen wrote:

On Sat, Jul 14, 2012 at 08:02:37PM +0400, Ivan Timofeev wrote:

>I am trying to use the following workflow on master:
>
>1. git commit
>2. ./logerrit submit libreoffice-3-6

just fine till now.

>3. git push
Huh?! What is that for? it makes no sense for me to simultaneously 
submit to gerrit and to push directly to master (and thus bypass gerrit).
Think about it: if your patch is going to be rejected or must be 
adjusted what is going on with your changes that already in master?
Note 1: we are going to turn on the automatic patch verification 
machinery (build + test). What is if your patch doesn't even compile, 
introduces WaE, beaks unit tests?
Note 2: in the long term (unsure how long, though ;-) there will be no 
way to push directly to master (and bypass gerrit) anyway.

Since the gerrit team seems to be struck in the philosophical
question if a change is still the same on a different branch, I guess we should
patch our gerrit(*).
I took a look into that patch: it closes the (first) gerrit patch only 
if in the submitted (second) master commit the branch information is the 
same.
But, as you pointed out gerrit can not handle it currently anyway (*), 
why not to follow this simple workflow:

*Either* to push the patch directly to the master and send a mail to ML 
with cgit link and ask for review -- my i add not recommended here? ;-) --,
*or* to submit it only to gerrit (master or specific branch), wait for 
verification and once approved and merged,
push it to all other branches (manually for now or even through gerrit 
later).

Regards
David

(*) I disagree with you to patch our gerrit because of that.

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

[Libreoffice-commits] .: 2 commits - dbaccess/source svtools/inc svtools/source svx/source

 dbaccess/source/ui/control/dbtreelistbox.cxx |2 -
 svtools/inc/svtools/svlbitm.hxx  |   41 +--
 svtools/source/contnr/svlbitm.cxx|   20 -
 svtools/source/contnr/svtabbx.cxx|4 +-
 svtools/source/contnr/svtreebx.cxx   |7 +---
 svtools/source/uno/treecontrolpeer.cxx   |   31 +---
 svx/source/dialog/ctredlin.cxx   |2 -
 svx/source/dialog/fontlb.cxx |2 -
 8 files changed, 39 insertions(+), 70 deletions(-)

New commits:
commit aa3eeb28bcba10d603c15ee850620bed638514f5
Author: CaolÃ¡n McNamara 
Date:   Sun Jul 15 21:59:04 2012 +0100

Resolves: fdo#37279 and #i78701# startEditingAtNode does nothing

inherit class UnoTreeListItem from SvLBoxString instead of SvLBoxItem so 
that
it really isa SvLBoxString and can be edited with startEditingAtNode

a) remove the unused SvLBoxEntry argument to SvLBoxString's SetText
b) used rtl::OUString instead of XubString
c) rename aStr to maText
d) inherit UnoTreeListItem from SvLBoxString and drop its maText in
   favour of that of SvLBoxEntry

Change-Id: Id78f43ae5be8cd6f581e6c2fd2bd6f46de9144ba

diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx 
b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 7e593f0..d73a435 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -120,7 +120,7 @@ SvLBoxEntry* DBTreeListBox::GetEntryPosByName( const 
String& aName, SvLBoxEntry*
 {
 pEntry = static_cast((*pChildren)[ i ]);
 SvLBoxString* pItem = 
(SvLBoxString*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING));
-if ( pItem->GetText().Equals(aName) )
+if ( pItem->GetText().equals(aName) )
 {
 if ( !_pFilter || _pFilter->includeEntry( pEntry ) )
 // found
diff --git a/svtools/inc/svtools/svlbitm.hxx b/svtools/inc/svtools/svlbitm.hxx
index 7299ec7..ae259ac 100644
--- a/svtools/inc/svtools/svlbitm.hxx
+++ b/svtools/inc/svtools/svlbitm.hxx
@@ -122,15 +122,16 @@ inline SvButtonState 
SvLBoxButtonData::GetActButtonState() const
 
 class SVT_DLLPUBLIC SvLBoxString : public SvLBoxItem
 {
-XubString aStr;
+protected:
+rtl::OUString maText;
 public:
-SvLBoxString( SvLBoxEntry*,sal_uInt16 nFlags,const 
XubString& rStr);
+SvLBoxString(SvLBoxEntry*, sal_uInt16 nFlags, const 
rtl::OUString& rStr);
 SvLBoxString();
 virtual ~SvLBoxString();
 virtual sal_uInt16  IsA();
-virtual voidInitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* );
-XubString   GetText() const { return aStr; }
-voidSetText( SvLBoxEntry*, const XubString& rStr );
+virtual voidInitViewData(SvLBox*, SvLBoxEntry*, SvViewDataItem*);
+rtl::OUString   GetText() const { return maText; }
+voidSetText( const rtl::OUString& rText ) { maText = rText; }
 virtual voidPaint( const Point&, SvLBox& rDev, sal_uInt16 
nFlags,SvLBoxEntry* );
 virtual SvLBoxItem* Create() const;
 virtual voidClone( SvLBoxItem* pSource );
diff --git a/svtools/source/contnr/svlbitm.cxx 
b/svtools/source/contnr/svlbitm.cxx
index f3a669f..509654a 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -197,11 +197,11 @@ sal_Bool SvLBoxButtonData::IsRadio() {
 
 DBG_NAME(SvLBoxString);
 
-SvLBoxString::SvLBoxString( SvLBoxEntry* pEntry,sal_uInt16 nFlags,const 
XubString& rStr) :
-SvLBoxItem( pEntry, nFlags )
+SvLBoxString::SvLBoxString(SvLBoxEntry* pEntry, sal_uInt16 nFlags, const 
rtl::OUString& rStr)
+: SvLBoxItem(pEntry, nFlags)
 {
 DBG_CTOR(SvLBoxString,0);
-SetText( pEntry, rStr );
+SetText(rStr);
 }
 
 SvLBoxString::SvLBoxString() : SvLBoxItem()
@@ -229,10 +229,10 @@ void SvLBoxString::Paint( const Point& rPos, SvLBox& 
rDev, sal_uInt16 /* nFlags
 sal_uInt16 nStyle = rDev.IsEnabled() ? 0 : TEXT_DRAW_DISABLE;
 if ( rDev.IsEntryMnemonicsEnabled() )
 nStyle |= TEXT_DRAW_MNEMONIC;
-rDev.DrawText( Rectangle(rPos,GetSize(&rDev,_pEntry)),aStr,nStyle);
+rDev.DrawText(Rectangle(rPos, GetSize(&rDev,_pEntry)), maText, nStyle);
 }
 else
-rDev.DrawText( rPos, aStr);
+rDev.DrawText(rPos, maText);
 
 }
 
@@ -245,13 +245,7 @@ SvLBoxItem* SvLBoxString::Create() const
 void SvLBoxString::Clone( SvLBoxItem* pSource )
 {
 DBG_CHKTHIS(SvLBoxString,0);
-aStr = ((SvLBoxString*)pSource)->aStr;
-}
-
-void SvLBoxString::SetText( SvLBoxEntry*, const XubString& rStr )
-{
-DBG_CHKTHIS(SvLBoxString,0);
-aStr = rStr;
+maText = ((SvLBoxString*)pSource)->maText;
 }
 
 void SvLBoxString::InitViewData( SvLBox* pView,SvLBoxEntry* pEntry,
@@ -260,7 +254,7 @@ void SvLBoxString::InitViewData( SvLBox* pView,SvLBoxEntry* 
pEntry,
 DBG_CHKTHIS(SvLBoxStri

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

 sc/source/ui/inc/datafdlg.hxx  |   13 +++--
 sc/source/ui/miscdlgs/datafdlg.cxx |   17 +++--
 sc/source/ui/src/datafdlg.src  |   36 +---
 3 files changed, 35 insertions(+), 31 deletions(-)

New commits:
commit e535c1f6d4d14c27b8d963758184b2fd025d10a9
Author: Andras Timar 
Date:   Sun Jul 15 21:18:42 2012 +0200

fdo#47947 Data Form dialog layout fix

Change-Id: Ifa1689ff9be7afa14f5694825c506f7c8c3eff43
(cherry picked from commit c61e3c941d46fe1ae6066f31e01786100e39da56)

Signed-off-by: CaolÃ¡n McNamara 

diff --git a/sc/source/ui/inc/datafdlg.hxx b/sc/source/ui/inc/datafdlg.hxx
index bfa3769..6f41ddb 100644
--- a/sc/source/ui/inc/datafdlg.hxx
+++ b/sc/source/ui/inc/datafdlg.hxx
@@ -43,12 +43,13 @@
 
 #define MAX_DATAFORM_COLS   256
 #define MAX_DATAFORM_ROWS   32000
-#define CTRL_HEIGHT 22
-#define FIXED_WIDTH 60
-#define EDIT_WIDTH  140
-#define FIXED_LEFT  12
-#define EDIT_LEFT   78
-#define LINE_HEIGHT 30
+#define FIXED_WIDTH 54
+#define EDIT_WIDTH  86
+#define FIXED_HEIGHT10
+#define EDIT_HEIGHT 12
+#define FIXED_LEFT  6
+#define EDIT_LEFT   62
+#define LINE_HEIGHT 16
 
 //zhangyun
 class ScDataFormDlg : public ModalDialog
diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx 
b/sc/source/ui/miscdlgs/datafdlg.cxx
index 9f0f318..d87d552 100644
--- a/sc/source/ui/miscdlgs/datafdlg.cxx
+++ b/sc/source/ui/miscdlgs/datafdlg.cxx
@@ -163,10 +163,15 @@ ScDataFormDlg::ScDataFormDlg( Window* pParent, 
ScTabViewShell*  pTabViewShellOri
 
 String  aFieldName;
 
-int nTop = 12;
+//align with LAB_DATAFORM_RECORDNO
+int nTop = LogicToPixel( Size(1,6), MapMode(MAP_APPFONT) ).getHeight();
+const int nOne = LogicToPixel( Size(1,1), MapMode(MAP_APPFONT) 
).getHeight();
+const int nLineHeight = LogicToPixel( Size(1, LINE_HEIGHT), 
MapMode(MAP_APPFONT) ).getHeight();
+const int nFixedLeft = LogicToPixel( Size(FIXED_LEFT, 1), 
MapMode(MAP_APPFONT) ).getWidth();
+const int nEditLeft = LogicToPixel( Size(EDIT_LEFT, 1), 
MapMode(MAP_APPFONT) ).getWidth();
 
-SizenFixedSize(FIXED_WIDTH, CTRL_HEIGHT );
-SizenEditSize(EDIT_WIDTH, CTRL_HEIGHT );
+SizenFixedSize(LogicToPixel( Size(FIXED_WIDTH, FIXED_HEIGHT), 
MapMode(MAP_APPFONT) ));
+SizenEditSize(LogicToPixel( Size(EDIT_WIDTH, EDIT_HEIGHT), 
MapMode(MAP_APPFONT) ));
 
 aColLength = nEndCol - nStartCol + 1;
 
@@ -185,13 +190,13 @@ ScDataFormDlg::ScDataFormDlg( Window* pParent, 
ScTabViewShell*  pTabViewShellOri
 
 maFixedTexts[nIndex].SetSizePixel(nFixedSize);
 maEdits[nIndex].SetSizePixel(nEditSize);
-maFixedTexts[nIndex].SetPosPixel(Point(FIXED_LEFT, nTop));
-maEdits[nIndex].SetPosPixel(Point(EDIT_LEFT, nTop));
+maFixedTexts[nIndex].SetPosPixel(Point(nFixedLeft, nTop + 
nOne));
+maEdits[nIndex].SetPosPixel(Point(nEditLeft, nTop));
 maFixedTexts[nIndex].SetText(aFieldName);
 maFixedTexts[nIndex].Show();
 maEdits[nIndex].Show();
 
-nTop += LINE_HEIGHT;
+nTop += nLineHeight;
 }
 else
 {
diff --git a/sc/source/ui/src/datafdlg.src b/sc/source/ui/src/datafdlg.src
index 5c0ee6d..0b6d01f 100644
--- a/sc/source/ui/src/datafdlg.src
+++ b/sc/source/ui/src/datafdlg.src
@@ -26,67 +26,66 @@
  */
 #include "datafdlg.hrc"
 
-//zhangyun, dataform
 ModalDialog RID_SCDLG_DATAFORM
 {
 OutputSize = TRUE ;
 SVLook = TRUE ;
-Size = MAP_APPFONT ( 191 , 180 ) ;
+Size = MAP_APPFONT ( 257 , 180 ) ;
 Text [ en-US ] = "Data Form" ;
 Moveable = TRUE ;
 Closeable = TRUE ;
 FixedText LAB_DATAFORM_RECORDNO
 {
-Pos = MAP_APPFONT ( 136 , 6 ) ;
-Size = MAP_APPFONT ( 50 , 12 ) ;
-Text [ en-US ] = "/" ;
+Pos = MAP_APPFONT ( 162 , 6 ) ;
+Size = MAP_APPFONT ( 60 , 12 ) ;
+Text = "/" ; //placeholder only
 };
 PushButton BTN_DATAFORM_NEW
 {
-Pos = MAP_APPFONT ( 135 , 23 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 161 , 23 ) ;
+Size = MAP_APPFONT ( 90 , 14 ) ;
 TabStop = TRUE ;
 DefButton = TRUE ;
 Text [ en-US ] = "New" ;
 };
 PushButton BTN_DATAFORM_DELETE
 {
-Pos = MAP_APPFONT ( 135 , 40 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 161 , 40 ) ;
+Size = MAP_APPFONT ( 90 , 14 ) ;
 TabStop = TRUE ;
 Text [ en-US ] = "Delete" ;
 };
 PushButton BTN_DATAFORM_RESTORE
 {
-Pos = MAP_APPFONT ( 135 , 57 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 161 , 57 ) ;
+Size = MAP_APPFONT ( 90 , 14 ) ;
 TabStop = TRUE ;
 Tex

[Libreoffice-commits] .: 9 commits - Makefile.top configure.in sc/qa smoketest/CppunitTest_smoketest.mk smoketest/smoketest_too.cxx solenv/gbuild svl/Module_svl.mk sw/JunitTest_sw_complex.mk

2012-07-15 Thread Michael Stahl

 Makefile.top|8 +++-
 configure.in|2 +-
 sc/qa/extras/scdatapilottableobj.cxx|2 +-
 smoketest/CppunitTest_smoketest.mk  |9 -
 smoketest/smoketest_too.cxx |1 +
 solenv/gbuild/JavaClassSet.mk   |6 +++---
 solenv/gbuild/JunitTest.mk  |6 +++---
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |4 +---
 solenv/gbuild/platform/windows.mk   |2 ++
 svl/Module_svl.mk   |3 +++
 sw/JunitTest_sw_complex.mk  |8 +++-
 11 files changed, 37 insertions(+), 14 deletions(-)

New commits:
commit 81af84c04fa7ef8c8c12d2a9d3899a9a75cb8260
Author: Michael Stahl 
Date:   Sun Jul 15 23:01:48 2012 +0200

gbuild: let JunitTests run with MSVC:

Apparently the long path name hack is no longer necessary; at least i
did not experience any obvious problem with a source tree rooted in
D:/lo/master.

Change-Id: I2fd1893a827c27b5dcee438eae6572c596ae907c

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 05d7628..9519a48 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -633,10 +633,8 @@ gb_JunitTest_JunitTest_platform_longpathname_hack =
 endif # OOO_TEST_SOFFICE
 
 define gb_JunitTest_JunitTest_platform
-$(call gb_JunitTest_JunitTest_platform_longpathname_hack,$(1))
-
 $(call gb_JunitTest_get_target,$(1)) : DEFS := \
-   -Dorg.openoffice.test.arg.soffice="{OOO_TEST_SOFFICE:-path:`cat 
$(call gb_JunitTest_get_target,$(1)).instpath`/opt/OpenOffice.org 
3/program/soffice.exe}" \
+   
-Dorg.openoffice.test.arg.soffice="{OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/program/soffice.exe}"
 \
-Dorg.openoffice.test.arg.env=PATH \
-Dorg.openoffice.test.arg.user=file:///$(call 
gb_JunitTest_get_userdir,$(1))
 
commit 0ec45dc41dd4872482b817387f253d6fab6bf20c
Author: Michael Stahl 
Date:   Sun Jul 15 22:58:52 2012 +0200

let make dev-install do something useful on MSVC

Forcing creation of second installation set is perhaps not ideal,
but i have no idea how that installer perl crud work and
at least it gives something to run tests against.

Change-Id: I506160013de23f76128c9e39b4f3bacc6e32cc7a

diff --git a/Makefile.top b/Makefile.top
index 15d27ba..a1090e2 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -394,7 +394,8 @@ endif
 
 build: build-packimages
 ifeq ($(OS_FOR_BUILD),WNT)
-   cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl
+   cd instsetoo_native && unset MAKEFLAGS && \
+   $(SOLARENV)/bin/build.pl FORCE2ARCHIVE=TRUE
 else
cd instsetoo_native && unset MAKEFLAGS && \
 $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) -- -P$(GMAKE_PARALLELISM)
@@ -425,12 +426,17 @@ install-strip:
 dev-install: build
@rm -rf $(DEVINSTALLDIR)
@mkdir $(DEVINSTALLDIR)
+ifeq ($(OS_FOR_BUILD),WNT)
+   unzip -d "$(DEVINSTALLDIR)" 
"$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice_Dev/archive/install/en-US/LibO*_install-arc_en-US.zip"
+   mv "$(DEVINSTALLDIR)"/LibO*_install-arc_en-US/* "$(DEVINSTALLDIR)"/opt
+else
 ifeq ($(DISABLE_LINKOO),TRUE)
@ooinstall $(DEVINSTALLDIR)/opt
@install-gdb-printers -L
 else
@ooinstall -l $(DEVINSTALLDIR)/opt
 endif
+endif
@rm -f $(SRCDIR)/install && ln -s $(DEVINSTALLDIR)/opt/ 
$(SRCDIR)/install
 
 distro-pack-install: install
commit 01550a7450f099c4016af53fef53c286040b1575
Author: Michael Stahl 
Date:   Sun Jul 15 22:34:48 2012 +0200

sw: disable CheckBookmarks on WNT

Change-Id: Ia52cbea28c832706cbfa74c2b1d9bca43df006d9

diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk
index fbfb740..c31b027 100644
--- a/sw/JunitTest_sw_complex.mk
+++ b/sw/JunitTest_sw_complex.mk
@@ -58,7 +58,6 @@ $(eval $(call gb_JunitTest_use_jars,sw_complex,\
 
 $(eval $(call gb_JunitTest_add_classes,sw_complex,\
 complex.accessibility.AccessibleRelationSet \
-complex.writer.CheckBookmarks \
 complex.checkColor.CheckChangeColor \
 complex.writer.CheckCrossReferences \
 complex.writer.CheckFields\
@@ -68,4 +67,11 @@ $(eval $(call gb_JunitTest_add_classes,sw_complex,\
 complex.writer.TextPortionEnumerationTest \
 ))
 
+# FIXME has never worked on windows, hashes are different
+ifneq ($(OS),WNT)
+$(eval $(call gb_JunitTest_add_classes,sw_complex,\
+complex.writer.CheckBookmarks \
+))
+endif
+
 # vim: set noet sw=4 ts=4:
commit 09b853e38b7a35d614caebd97116ca8a106148bd
Author: Michael Stahl 
Date:   Sun Jul 15 22:32:09 2012 +0200

CppunitTest_svl_urihelper fails on MSVC

Change-Id: Ia1154ab9e677ac0d27eb8cf671139d4e23f78794

diff --git a/svl/Module_svl.mk b/svl/Module_svl.mk
index da0cb1d..d12fa3a 100644
--- a/svl/Module_svl.mk
+++ b/svl/Module_svl.mk
@@ -32,10 +32,13 @@ $(eval $(call gb_Module_add_check_targets,svl,\
 ))
 #TODO:

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

 sc/source/ui/inc/datafdlg.hxx  |   13 +++--
 sc/source/ui/miscdlgs/datafdlg.cxx |   17 +++--
 sc/source/ui/src/datafdlg.src  |   36 +---
 3 files changed, 35 insertions(+), 31 deletions(-)

New commits:
commit 12b3bdea08062fb4ad8b11d63a117c50d60f5b93
Author: Andras Timar 
Date:   Sun Jul 15 21:18:42 2012 +0200

fdo#47947 Data Form dialog layout fix

Change-Id: Ifa1689ff9be7afa14f5694825c506f7c8c3eff43
(cherry picked from commit c61e3c941d46fe1ae6066f31e01786100e39da56)

Signed-off-by: CaolÃ¡n McNamara 

diff --git a/sc/source/ui/inc/datafdlg.hxx b/sc/source/ui/inc/datafdlg.hxx
index 5600d2c..ef80611 100644
--- a/sc/source/ui/inc/datafdlg.hxx
+++ b/sc/source/ui/inc/datafdlg.hxx
@@ -43,12 +43,13 @@
 
 #define MAX_DATAFORM_COLS   256
 #define MAX_DATAFORM_ROWS   32000
-#define CTRL_HEIGHT 22
-#define FIXED_WIDTH 60
-#define EDIT_WIDTH  140
-#define FIXED_LEFT  12
-#define EDIT_LEFT   78
-#define LINE_HEIGHT 30
+#define FIXED_WIDTH 54
+#define EDIT_WIDTH  86
+#define FIXED_HEIGHT10
+#define EDIT_HEIGHT 12
+#define FIXED_LEFT  6
+#define EDIT_LEFT   62
+#define LINE_HEIGHT 16
 
 //zhangyun
 class ScDataFormDlg : public ModalDialog
diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx 
b/sc/source/ui/miscdlgs/datafdlg.cxx
index 698eb7b..1cbb8d4 100644
--- a/sc/source/ui/miscdlgs/datafdlg.cxx
+++ b/sc/source/ui/miscdlgs/datafdlg.cxx
@@ -163,10 +163,15 @@ ScDataFormDlg::ScDataFormDlg( Window* pParent, 
ScTabViewShell*  pTabViewShellOri
 
 String  aFieldName;
 
-int nTop = 12;
+//align with LAB_DATAFORM_RECORDNO
+int nTop = LogicToPixel( Size(1,6), MapMode(MAP_APPFONT) ).getHeight();
+const int nOne = LogicToPixel( Size(1,1), MapMode(MAP_APPFONT) 
).getHeight();
+const int nLineHeight = LogicToPixel( Size(1, LINE_HEIGHT), 
MapMode(MAP_APPFONT) ).getHeight();
+const int nFixedLeft = LogicToPixel( Size(FIXED_LEFT, 1), 
MapMode(MAP_APPFONT) ).getWidth();
+const int nEditLeft = LogicToPixel( Size(EDIT_LEFT, 1), 
MapMode(MAP_APPFONT) ).getWidth();
 
-SizenFixedSize(FIXED_WIDTH, CTRL_HEIGHT );
-SizenEditSize(EDIT_WIDTH, CTRL_HEIGHT );
+SizenFixedSize(LogicToPixel( Size(FIXED_WIDTH, FIXED_HEIGHT), 
MapMode(MAP_APPFONT) ));
+SizenEditSize(LogicToPixel( Size(EDIT_WIDTH, EDIT_HEIGHT), 
MapMode(MAP_APPFONT) ));
 
 aColLength = nEndCol - nStartCol + 1;
 
@@ -185,13 +190,13 @@ ScDataFormDlg::ScDataFormDlg( Window* pParent, 
ScTabViewShell*  pTabViewShellOri
 
 maFixedTexts[nIndex].SetSizePixel(nFixedSize);
 maEdits[nIndex].SetSizePixel(nEditSize);
-maFixedTexts[nIndex].SetPosPixel(Point(FIXED_LEFT, nTop));
-maEdits[nIndex].SetPosPixel(Point(EDIT_LEFT, nTop));
+maFixedTexts[nIndex].SetPosPixel(Point(nFixedLeft, nTop + 
nOne));
+maEdits[nIndex].SetPosPixel(Point(nEditLeft, nTop));
 maFixedTexts[nIndex].SetText(aFieldName);
 maFixedTexts[nIndex].Show();
 maEdits[nIndex].Show();
 
-nTop += LINE_HEIGHT;
+nTop += nLineHeight;
 }
 else
 {
diff --git a/sc/source/ui/src/datafdlg.src b/sc/source/ui/src/datafdlg.src
index 5c0ee6d..0b6d01f 100644
--- a/sc/source/ui/src/datafdlg.src
+++ b/sc/source/ui/src/datafdlg.src
@@ -26,67 +26,66 @@
  */
 #include "datafdlg.hrc"
 
-//zhangyun, dataform
 ModalDialog RID_SCDLG_DATAFORM
 {
 OutputSize = TRUE ;
 SVLook = TRUE ;
-Size = MAP_APPFONT ( 191 , 180 ) ;
+Size = MAP_APPFONT ( 257 , 180 ) ;
 Text [ en-US ] = "Data Form" ;
 Moveable = TRUE ;
 Closeable = TRUE ;
 FixedText LAB_DATAFORM_RECORDNO
 {
-Pos = MAP_APPFONT ( 136 , 6 ) ;
-Size = MAP_APPFONT ( 50 , 12 ) ;
-Text [ en-US ] = "/" ;
+Pos = MAP_APPFONT ( 162 , 6 ) ;
+Size = MAP_APPFONT ( 60 , 12 ) ;
+Text = "/" ; //placeholder only
 };
 PushButton BTN_DATAFORM_NEW
 {
-Pos = MAP_APPFONT ( 135 , 23 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 161 , 23 ) ;
+Size = MAP_APPFONT ( 90 , 14 ) ;
 TabStop = TRUE ;
 DefButton = TRUE ;
 Text [ en-US ] = "New" ;
 };
 PushButton BTN_DATAFORM_DELETE
 {
-Pos = MAP_APPFONT ( 135 , 40 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 161 , 40 ) ;
+Size = MAP_APPFONT ( 90 , 14 ) ;
 TabStop = TRUE ;
 Text [ en-US ] = "Delete" ;
 };
 PushButton BTN_DATAFORM_RESTORE
 {
-Pos = MAP_APPFONT ( 135 , 57 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 161 , 57 ) ;
+Size = MAP_APPFONT ( 90 , 14 ) ;
 TabStop = TRUE ;
 Tex

Re: [PUSHED 3-5][PUSHED 3-6] Data Form dialog layout (fdo#47947)

On Sun, 2012-07-15 at 21:23 +0200, Andras Timar wrote:
> Hi,
> 
> There were two problems with this dialog. First, buttons on the right
> were not wide enough for some languages (French, German, etc.) Second,
> the original developer used hardcoded pixel coordinates instead of
> logical coordinates, and it resulted in suboptimal layout.
> 
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=c61e3c941d46fe1ae6066f31e01786100e39da56

pushed to 3-5 and 3-6.

C.

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

[Libreoffice-commits] .: 2 commits - drawinglayer/source vcl/aqua

2012-07-15 Thread Stephan Bergmann

 drawinglayer/source/dumper/XShapeDumper.cxx |   36 
 vcl/aqua/source/window/salframeview.mm  |1 
 2 files changed, 1 insertion(+), 36 deletions(-)

New commits:
commit 5e21857cd4f81ccf0c87a3f399adf29aac3a68d6
Author: Stephan Bergmann 
Date:   Sun Jul 15 23:14:54 2012 +0200

-Werror,-Wunused-function

Change-Id: Ie0e37aae9be1c6fcf3f8c0b8d571dc3786f38205

diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx 
b/drawinglayer/source/dumper/XShapeDumper.cxx
index 3c3d3f2..eca83e0 100644
--- a/drawinglayer/source/dumper/XShapeDumper.cxx
+++ b/drawinglayer/source/dumper/XShapeDumper.cxx
@@ -65,10 +65,8 @@ void 
dumpFillTransparenceGradientNameAsAttribute(rtl::OUString sTranspGradName,
 void dumpFillTransparenceGradientAsElement(com::sun::star::awt::Gradient 
aTranspGrad, xmlTextWriterPtr xmlWriter);
 void dumpFillGradientNameAsAttribute(rtl::OUString sGradName, xmlTextWriterPtr 
xmlWriter);
 void dumpFillGradientAsElement(com::sun::star::awt::Gradient aGradient, 
xmlTextWriterPtr xmlWriter);
-void dumpFillHatchNameAsAttribute(rtl::OUString sHatchName, xmlTextWriterPtr 
xmlWriter);
 void dumpFillHatchAsElement(com::sun::star::drawing::Hatch aHatch, 
xmlTextWriterPtr xmlWriter);
 void dumpFillBackgroundAsAttribute(sal_Bool bBackground, xmlTextWriterPtr 
xmlWriter);
-void dumpFillBitmapNameAsAttribute(rtl::OUString sBitmapName, xmlTextWriterPtr 
xmlWriter);
 void 
dumpFillBitmapAsElement(com::sun::star::uno::Reference
 xBitmap, xmlTextWriterPtr xmlWriter);
 void dumpFillBitmapURLAsAttribute(rtl::OUString sBitmapURL, xmlTextWriterPtr 
xmlWriter);
 void dumpFillBitmapPositionOffsetXAsAttribute(sal_Int32 
aBitmapPositionOffsetX, xmlTextWriterPtr xmlWriter);
@@ -151,10 +149,6 @@ void 
dumpTransformationAsElement(com::sun::star::drawing::HomogenMatrix3 aTransf
 void dumpNavigationOrderAsAttribute(sal_Int32 aNavigationOrder, 
xmlTextWriterPtr xmlWriter);
 void dumpHyperlinkAsAttribute(rtl::OUString sHyperlink, xmlTextWriterPtr 
xmlWriter);
 
-// PolyPolygonBezierDescriptor.idl
-void 
dumpPolyPolygonBezierAsElement(com::sun::star::drawing::PolyPolygonBezierCoords 
aPolyPolygonBezier, xmlTextWriterPtr xmlWriter);
-void dumpGeometryAsElement(com::sun::star::drawing::PolyPolygonBezierCoords 
aGeometry, xmlTextWriterPtr xmlWriter);
-
 // CustomShape.idl
 void dumpCustomShapeEngineAsAttribute(rtl::OUString sCustomShapeEngine, 
xmlTextWriterPtr xmlWriter);
 void dumpCustomShapeDataAsAttribute(rtl::OUString sCustomShapeData, 
xmlTextWriterPtr xmlWriter);
@@ -291,12 +285,6 @@ void dumpFillGradientAsElement(awt::Gradient aGradient, 
xmlTextWriterPtr xmlWrit
 xmlTextWriterEndElement( xmlWriter );
 }
 
-void dumpFillHatchNameAsAttribute(rtl::OUString sHatchName, xmlTextWriterPtr 
xmlWriter)
-{
-xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("fillHatchName"), 
"%s",
-rtl::OUStringToOString(sHatchName, RTL_TEXTENCODING_UTF8).getStr());
-}
-
 void dumpFillHatchAsElement(drawing::Hatch aHatch, xmlTextWriterPtr xmlWriter)
 {
 xmlTextWriterStartElement(xmlWriter, BAD_CAST( "FillHatch" ));
@@ -328,12 +316,6 @@ void dumpFillBackgroundAsAttribute(sal_Bool bBackground, 
xmlTextWriterPtr xmlWri
 xmlTextWriterWriteFormatAttribute( xmlWriter, 
BAD_CAST("fillBackground"), "%s", "false");
 }
 
-void dumpFillBitmapNameAsAttribute(rtl::OUString sBitmapName, xmlTextWriterPtr 
xmlWriter)
-{
-xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("fillGradientName"), 
"%s",
-rtl::OUStringToOString(sBitmapName, RTL_TEXTENCODING_UTF8).getStr());
-}
-
 void dumpFillBitmapAsElement(uno::Reference xBitmap, 
xmlTextWriterPtr xmlWriter)
 {
 xmlTextWriterStartElement(xmlWriter, BAD_CAST( "FillBitmap" ));
@@ -1096,24 +1078,6 @@ void dumpShapeDescriptorAsAttribute( uno::Reference< 
drawing::XShapeDescriptor >
 rtl::OUStringToOString(xDescr->getShapeType(), 
RTL_TEXTENCODING_UTF8).getStr());
 }
 
-// -
-// -- PolyPolygonBezierDescriptor.idl --
-// -
-
-void dumpPolyPolygonBezierAsElement(drawing::PolyPolygonBezierCoords 
aPolyPolygonBezier, xmlTextWriterPtr xmlWriter)
-{
-xmlTextWriterStartElement(xmlWriter, BAD_CAST( "PolyPolygonBezier" ));
-dumpPolyPolygonBezierCoords(aPolyPolygonBezier, xmlWriter);
-xmlTextWriterEndElement( xmlWriter );
-}
-
-void dumpGeometryAsElement(drawing::PolyPolygonBezierCoords aGeometry, 
xmlTextWriterPtr xmlWriter)
-{
-xmlTextWriterStartElement(xmlWriter, BAD_CAST( "Geometry" ));
-dumpPolyPolygonBezierCoords(aGeometry, xmlWriter);
-xmlTextWriterEndElement( xmlWriter );
-}
-
 // -
 // -- CustomShape.idl --
 // -
commit 27b1aa88c00fc425f658aba8e64567f6d2bfbd0f
Author: Stephan Bergmann 
Date:   Sun Jul 15 23:08:46 2012 +0200

#include "tools/helpers.hxx" for FRound

diff --git a/vcl/aqua/source/wind

[Libreoffice-commits] .: 2 commits - connectivity/inc connectivity/source svtools/inc svtools/source svx/source unusedcode.easy

 connectivity/inc/connectivity/dbconversion.hxx   |3 -
 connectivity/source/commontools/dbconversion.cxx |   23 -
 svtools/inc/svtools/svlbitm.hxx  |1 
 svtools/source/contnr/svlbitm.cxx|   12 
 svx/source/dialog/compressgraphicdialog.cxx  |7 --
 unusedcode.easy  |   56 +++
 6 files changed, 21 insertions(+), 81 deletions(-)

New commits:
commit afdb80205679937a4d7503dc3715f39a4774a201
Author: CaolÃ¡n McNamara 
Date:   Sun Jul 15 22:50:52 2012 +0100

WaE: unused variables and misordered initialization list

Change-Id: I2f49383d5c9e097edf52776818db4e89497aca5c

diff --git a/svx/source/dialog/compressgraphicdialog.cxx 
b/svx/source/dialog/compressgraphicdialog.cxx
index 637af17..bc6afa6 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -56,10 +56,10 @@ CompressGraphicsDialog::CompressGraphicsDialog( Window* 
pParent, const Graphic&
 m_aFixedTextDPI ( this,SVX_RES( FT_DPI ) ),
 m_aLosslessRB   ( this,SVX_RES( RB_LOSSLESS_COMPRESSION ) ),
 m_aJpegCompRB   ( this,SVX_RES( RB_JPEG_COMPRESSION ) ),
-m_aCompressionMF( this,SVX_RES( MF_COMPRESSION_FACTOR ) ),
 m_aCompressionFT( this,SVX_RES( FT_COMPRESSION ) ),
-m_aQualityMF( this,SVX_RES( MF_QUALITY_FACTOR ) ),
+m_aCompressionMF( this,SVX_RES( MF_COMPRESSION_FACTOR ) ),
 m_aQualityFT( this,SVX_RES( FT_QUALITY ) ),
+m_aQualityMF( this,SVX_RES( MF_QUALITY_FACTOR ) ),
 m_aCropCB   ( this,SVX_RES( CB_CROP ) ),
 m_aBtnOK( this,SVX_RES( BUTTON_CG_OK ) ),
 m_aBtnCancel( this,SVX_RES( BUTTON_CG_CANCEL ) ),
@@ -140,9 +140,6 @@ void CompressGraphicsDialog::Update()
 aViewSizeString += ( " DPI" ) ;
 m_aFixedText3.SetText(aViewSizeString);
 
-int nPixelX = 
(sal_Int32)((double)MetricField::ConvertValue(m_aViewSize100mm.Width(),   2, 
MAP_100TH_MM, FUNIT_INCH) / 100 * m_dResolution );
-int nPixelY = 
(sal_Int32)((double)MetricField::ConvertValue(m_aViewSize100mm.Height(),  2, 
MAP_100TH_MM, FUNIT_INCH) / 100 * m_dResolution );
-
 SvMemoryStream aMemStream;
 aMemStream.SetVersion( SOFFICE_FILEFORMAT_CURRENT );
 m_aGraphic.ExportNative(aMemStream);
commit bfcaa777c4a803c21208c8aeb8f2674943b243fb
Author: CaolÃ¡n McNamara 
Date:   Sun Jul 15 22:27:46 2012 +0100

callcatcher: update unused code list

Change-Id: I045ac2928d4b8cf99f9f76c20a9e489adc34ed66

diff --git a/connectivity/inc/connectivity/dbconversion.hxx 
b/connectivity/inc/connectivity/dbconversion.hxx
index 0f16414..78df8d0 100644
--- a/connectivity/inc/connectivity/dbconversion.hxx
+++ b/connectivity/inc/connectivity/dbconversion.hxx
@@ -115,9 +115,6 @@ namespace dbtools
 static ::com::sun::star::util::DateTime toDateTime(const 
::rtl::OUString& _sSQLDate);
 
 
-/** return the given DateTime as JDBC compliant 64 bit value
-*/
-static sal_Int64 toINT64(const ::com::sun::star::util::DateTime& rVal);
 static sal_Int32 getMsFromTime(const ::com::sun::star::util::Time& 
rVal);
 
 static sal_Int32 toDays(const ::com::sun::star::util::Date& _rVal, 
const ::com::sun::star::util::Date& _rNullDate = getStandardDate());
diff --git a/connectivity/source/commontools/dbconversion.cxx 
b/connectivity/source/commontools/dbconversion.cxx
index bed868c..087495d 100644
--- a/connectivity/source/commontools/dbconversion.cxx
+++ b/connectivity/source/commontools/dbconversion.cxx
@@ -137,29 +137,6 @@ namespace dbtools
 }
 
 
//--
-sal_Int64 DBTypeConversion::toINT64(const DateTime& rVal)
-{
-// normalize time
-sal_Int32 nSeconds  = rVal.Seconds + rVal.HundredthSeconds / 
100;
-sal_Int32 nHundredthSeconds = rVal.HundredthSeconds % 100;
-sal_Int32 nMinutes  = rVal.Minutes + nSeconds / 60;
-nSeconds= nSeconds % 60;
-sal_Int32 nHours= rVal.Hours + nMinutes / 60;
-nMinutes= nMinutes % 60;
-
-// assemble time
-sal_Int32 nTime = (sal_Int32)(nHundredthSeconds + (nSeconds*100) + 
(nMinutes*1) + (nHours*100));
-sal_Int32 nDate = ((sal_Int32)(rVal.Day%100)) + 
(((sal_Int32)(rVal.Month%100))*100) + (((sal_Int32) rVal.Year%1)*1);
-sal_Int64 nRet;
-
-nRet = (sal_Int64) nTime;
-nRet <<= 32;
-nRet += nDate;
-
-return nRet;
-}
-
-
//--
 sal_Int32 DBTypeConversion::getMsFromTime(const Time& rVal)
 {
 sal_Int32   nHour = rVal.Hours;
diff --git a/svtools/inc/svtools/svlbitm.hxx b/svtools

[PATCH] Undo Calc TabBar items native rendering

2012-07-15 Thread Ruslan Kabatsayev

Hello,

As my commit 17ea32a1a36d81a0a12df12adbe15e8eaf1c7c62 breaks tab
coloring functionality, and there's no good enough way to fix it, plus
it is likely to break Windows tabbar items look, this patch reverts
that commit.

Regards,
Ruslan


0004-Revert-Make-bottom-tabbar-items-follow-native-theme.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: libmspub update, running out of virtual memory

2012-07-15 Thread Rafael Dominguez

On Sun, Jul 15, 2012 at 3:45 PM, Albert Thuswaldner
 wrote:
> On Fri, Jul 13, 2012 at 1:41 AM, Rafael Dominguez  
> wrote:
>> After the update to libmspub-0.0.1 a day ago, my gcc terminates with
>> the error "running out of virtual memory" when compiling the
>> PolygonUtils.cpp file (i got 4GB ram),
>> im using gcc 4.4.5 in Gentoo Linux. My build parameters are
>>
>> --enable-python=system --disable-epm --with-system-boost
>> --enable-crashdump --with-system-zlib --with-system-stdlibs
>> --with-system-openssl --with-system-db --with-system-curl
>> --with-system-cppunit --without-ppds --with-system-cairo
>> --with-junit=/home/ralph/Proyectos/junit-4.10.jar --enable-symbols
>> --enable-werror
>>
>>
>> Could it be possible because the file is too big???
>
> Hmm, After upgrading master for the first time in a while, my build
> fails at the same spot.
>
> log for /home/thuswa/work/libo2/libmspub
> Compiling: 
> libmspub/unxlngi6.pro/misc/build/libmspub-0.0.1/src/lib/PolygonUtils.cpp
> g++: Internal error: Killed (program cc1plus)
> Please submit a full bug report.
> See  for instructions.
> dmake:  Error code 1, while making
> '../../../../../../unxlngi6.pro/slo/PolygonUtils.obj'
> dmake:  Error code 255, while making 
> './unxlngi6.pro/misc/build/so_built_mspub'
>
> Does anyone know what's going on here?
>
> Thanks!
> /Albert

Its fixed now, pull latest master
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] fdo#50269: bitmap area fill pattern reversed in LO3.5.x

>From Takeshi Abe :

Takeshi Abe has uploaded a new change for review.

Change subject: fdo#50269: bitmap area fill pattern reversed in LO3.5.x
..

fdo#50269: bitmap area fill pattern reversed in LO3.5.x

this partially reverted 619ea0c6d3b8fb4390bf5e82f1b44608c3cd878d
in order to retain a hack for non-black background color

Change-Id: I89d89cedb5e27e2a05b1ecc13569e4899d1743d2
---
M filter/source/msfilter/msdffimp.cxx
1 file changed, 11 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/18/318/1
--
To view, visit https://gerrit.libreoffice.org/318
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I89d89cedb5e27e2a05b1ecc13569e4899d1743d2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Takeshi Abe 

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

Re: gerrit for 3-6, LibreOffice gerrit bot & wrong Merged status

2012-07-15 Thread Bjoern Michaelsen

Hi David,

On Sun, Jul 15, 2012 at 10:53:42PM +0200, David Ostrovsky wrote:
> Huh?! What is that for? it makes no sense for me to simultaneously
> submit to gerrit and to push directly to master (and thus bypass
> gerrit).

Yes, it does make sense. You can push to master directly and still do the
(required) review for the release branch on gerrit.

> Note 2: in the long term (unsure how long, though ;-) there will be
> no way to push directly to master (and bypass gerrit) anyway.

Thats not true. There will always be a way to push directly to master for
Commiters. That might summon an instant forks-and-torches-mob in the future if
by doing so you break master (while everyone else does not and is reasonably
sure about that through means of gerrit), but it will still be possible.

> *or* to submit it only to gerrit (master or specific branch), wait
> for verification and once approved and merged,
> push it to all other branches (manually for now or even through
> gerrit later).

That wont work with gerrit as gerrit will reject the change as "I have already
seen this one" on any branch after that (which is the unfortunate behavior).
So without patching gerrit, we need tooling to regenerate the Change-Id upon
cherry-pick for review.

Best,

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

Re: [PUSHED 3-6] fdo#52013: Writer will crash when the undo-redoing if it contains dummy text in history

2012-07-15 Thread Takeshi Abe

On Sun, 15 Jul 2012 21:15:42 +0100, Caolán McNamara  wrote:
> On Sun, 2012-07-15 at 19:00 +0900, Takeshi Abe wrote:
>> Please push it to master, and do we need another ack for the 3.6 branch?
> 
> Pushed to master, and pushed to 3-6 with your (forged) sign off :-)
Thanks a lot :)

Cheers,
-- Takeshi Abe

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

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

 sc/source/ui/condformat/colorformat.cxx   |2 -
 sc/source/ui/condformat/condformatdlg.cxx |   40 ++
 sc/source/ui/inc/condformatdlg.hxx|1 
 3 files changed, 42 insertions(+), 1 deletion(-)

New commits:
commit b85a2af72e3ce0a4111972d51c8f1d43599dee5e
Author: Markus Mohrhard 
Date:   Mon Jul 16 04:21:40 2012 +0200

disable edit field for min and max type, fdo#51834

Change-Id: Id77c58f333bfab5446cf96d24cd9ccfc18802862

diff --git a/sc/source/ui/condformat/condformatdlg.cxx 
b/sc/source/ui/condformat/condformatdlg.cxx
index 2ec2dc7..f77fe37 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -173,6 +173,10 @@ ScCondFrmtEntry::ScCondFrmtEntry(Window* pParent, 
ScDocument* pDoc):
 SwitchToType(COLLAPSED);
 SetHeight();
 SetCondType();
+
+EntryTypeHdl(&maLbEntryTypeMin);
+EntryTypeHdl(&maLbEntryTypeMiddle);
+EntryTypeHdl(&maLbEntryTypeMax);
 }
 
 ScCondFrmtEntry::ScCondFrmtEntry(Window* pParent, ScDocument* pDoc, const 
ScFormatEntry* pFormatEntry):
@@ -297,6 +301,10 @@ ScCondFrmtEntry::ScCondFrmtEntry(Window* pParent, 
ScDocument* pDoc, const ScForm
 maClickHdl = LINK( pParent, ScCondFormatList, EntrySelectHdl );
 SwitchToType(COLLAPSED);
 SetHeight();
+
+EntryTypeHdl(&maLbEntryTypeMin);
+EntryTypeHdl(&maLbEntryTypeMiddle);
+EntryTypeHdl(&maLbEntryTypeMax);
 }
 
 ScCondFrmtEntry::~ScCondFrmtEntry()
@@ -307,6 +315,12 @@ void ScCondFrmtEntry::Init()
 {
 maLbType.SetSelectHdl( LINK( this, ScCondFrmtEntry, TypeListHdl ) );
 maLbColorFormat.SetSelectHdl( LINK( this, ScCondFrmtEntry, 
ColFormatTypeHdl ) );
+maLbEntryTypeMin.SetSelectHdl( LINK( this, ScCondFrmtEntry, EntryTypeHdl ) 
);
+maLbEntryTypeMax.SetSelectHdl( LINK( this, ScCondFrmtEntry, EntryTypeHdl ) 
);
+maLbEntryTypeMiddle.SetSelectHdl( LINK( this, ScCondFrmtEntry, 
EntryTypeHdl ) );
+
+
+
 SfxStyleSheetIterator aStyleIter( mpDoc->GetStyleSheetPool(), 
SFX_STYLE_FAMILY_PARA );
 for ( SfxStyleSheetBase* pStyle = aStyleIter.First(); pStyle; pStyle = 
aStyleIter.Next() )
 {
@@ -813,6 +827,31 @@ IMPL_LINK_NOARG(ScCondFrmtEntry, ColFormatTypeHdl)
 return 0;
 }
 
+IMPL_LINK( ScCondFrmtEntry, EntryTypeHdl, ListBox*, pBox )
+{
+bool bEnableEdit = true;
+sal_Int32 nPos = pBox->GetSelectEntryPos();
+if(nPos == 0 || nPos == 1)
+{
+bEnableEdit = false;
+}
+
+Edit* pEd = NULL;
+if(pBox == &maLbEntryTypeMin)
+pEd = &maEdMin;
+else if(pBox == &maLbEntryTypeMiddle)
+pEd = &maEdMiddle;
+else if(pBox == &maLbEntryTypeMax)
+pEd = &maEdMax;
+
+if(bEnableEdit)
+pEd->Enable();
+else
+pEd->Disable();
+
+return 0;
+}
+
 IMPL_LINK_NOARG(ScCondFrmtEntry, StyleSelectHdl)
 {
 if(maLbStyle.GetSelectEntryPos() == 0)
@@ -906,6 +945,7 @@ IMPL_LINK_NOARG( ScCondFrmtEntry, ConditionTypeSelectHdl )
 {
 maEdVal2.Hide();
 }
+
 return 0;
 }
 
diff --git a/sc/source/ui/inc/condformatdlg.hxx 
b/sc/source/ui/inc/condformatdlg.hxx
index 2c53ab0..46938b9 100644
--- a/sc/source/ui/inc/condformatdlg.hxx
+++ b/sc/source/ui/inc/condformatdlg.hxx
@@ -124,6 +124,7 @@ private:
 DECL_LINK( OptionBtnHdl, void* );
 DECL_LINK( DataBarTypeSelectHdl, void* );
 DECL_LINK( ConditionTypeSelectHdl, void* );
+DECL_LINK( EntryTypeHdl, ListBox* );
 
 public:
 ScCondFrmtEntry( Window* pParent, ScDocument* pDoc );
commit e11c88d999ad9cab8e309c87088d433fde0d4d9d
Author: Markus Mohrhard 
Date:   Mon Jul 16 04:02:23 2012 +0200

use correct value to check for min and max, fdo#51831

Change-Id: I8a5412bc9c22048dd8f6618b38e5a522b7ea02c2

diff --git a/sc/source/ui/condformat/colorformat.cxx 
b/sc/source/ui/condformat/colorformat.cxx
index 867f29f..daa14a8 100644
--- a/sc/source/ui/condformat/colorformat.cxx
+++ b/sc/source/ui/condformat/colorformat.cxx
@@ -288,7 +288,7 @@ IMPL_LINK_NOARG( ScDataBarSettingsDlg, OkBtnHdl )
 mpNumberFormatter->IsNumberFormat(aMinString, nIndex, nMinValue);
 nIndex = 0;
 double nMaxValue = 0;
-mpNumberFormatter->IsNumberFormat(aMaxString, nIndex, nMinValue);
+mpNumberFormatter->IsNumberFormat(aMaxString, nIndex, nMaxValue);
 if(rtl::math::approxEqual(nMinValue, nMaxValue) || nMinValue > 
nMaxValue)
 bWarn = true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[REVIEW-3-6] fix for fdo#51834, disable edit field for min and max type

Hey,

[1] prevents that the edit field is enabled as long as the selected
type is min or max. For min and max the value is automatically
calculated based on the selected range.

Regards,
Markus

[1] 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=b85a2af72e3ce0a4111972d51c8f1d43599dee5e
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[REVIEW-3-6] fix for fdo#51831, use correct entry to check for max value