date:20120801

 solenv/gbuild/Executable.mk|2 +-
 solenv/gbuild/Library.mk   |2 +-
 solenv/gbuild/StaticLibrary.mk |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 624bcdc302df8cdee7172bc455aa5c4aa9a6710a
Author: Michael Stahl 
Date:   Wed Aug 1 23:12:08 2012 +0200

Revert "StaticLibrary too"

This reverts commit 23e5bb66436991d809d8d807f27d25f922fb062f.

Does not work, see previous commit

diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index c84e822..2d4a9d5 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -66,7 +66,7 @@ $(call gb_LinkTarget_set_targettype,$(2),StaticLibrary)
 $(call gb_LinkTarget_add_defs,$(2),\
$(gb_StaticLibrary_DEFS) \
 )
-$(call gb_StaticLibrary_get_target,$(1)) : $(call 
gb_LinkTarget_get_target,$(2)) $(gb_LinkTarget_get_dep_target,$(2)) \
+$(call gb_StaticLibrary_get_target,$(1)) : $(call 
gb_LinkTarget_get_target,$(2)) \
| $(dir $(call gb_StaticLibrary_get_target,$(1))).dir
 $(call gb_StaticLibrary_get_clean_target,$(1)) : $(call 
gb_LinkTarget_get_clean_target,$(2))
 $(call gb_StaticLibrary_StaticLibrary_platform,$(1),$(2))
commit 12981fd72b6128eae5850fcfeee9d3bb1630b521
Author: Michael Stahl 
Date:   Wed Aug 1 23:10:38 2012 +0200

Revert "force depfile concat on deliver"

This reverts commit b8f7cc3c26a95b7dfb41415b24f0e2a3a9f1e33c.

This does not work, because there is no dependency between the
*Object .d files and the *Objects, and so the concat-deps races with
the compiler writing the dep files.
Introducing such a dependency would of course be reverting
8b5a984d45005d3df1c89eae897d6e04612625d8

diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index f1d392a..9f56296 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -55,7 +55,7 @@ define gb_Executable__Executable_impl
 $(call gb_Executable_set_targettype_gui,$(2))
 $(call gb_LinkTarget_LinkTarget,$(2))
 $(call gb_LinkTarget_set_targettype,$(2),Executable)
-$(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) 
$(call gb_LinkTarget_get_dep_target,$(2)) \
+$(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) \
| $(dir $(call gb_Executable_get_target,$(1))).dir
 $(call gb_Executable_get_clean_target,$(1)) : $(call 
gb_LinkTarget_get_clean_target,$(2))
 $(call gb_Executable_Executable_platform,$(1),$(2))
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 5866b9b..157be8c 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -74,7 +74,7 @@ $(call gb_LinkTarget_add_defs,$(2),\
$(gb_Library_DEFS) \
 )
 $(call gb_Library__get_final_target,$(1)) : $(call gb_Library_get_target,$(1))
-$(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) 
$(call gb_LinkTarget_get_dep_target,$(2)) \
+$(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) \
| $(dir $(call gb_Library_get_target,$(1))).dir
 $(call gb_Library_get_clean_target,$(1)) : $(call 
gb_LinkTarget_get_clean_target,$(2))
 $(call gb_Library_Library_platform,$(1),$(2),$(gb_Library_DLLDIR)/$(call 
gb_Library_get_dllname,$(1)))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Issues involving dirty cell, recalculation, and xvolatileresult in Libreoffice Calc

2012-08-01 Thread anwen

Hi All,

Recently, I am working on a Calc extension which is for dynamically showing
streaming financial data. I observed a conflict involving dirty cell,
recalculation, and xvolatilresult in Calc. From my view, it will be a
potential error or at least affect the performance of Calc if many changes
are made with the spreadsheet.

I am not very aware of the mechanism of dirty cell / auto recalculation with
XVolatileResult. From my observation, I guess that a XVolatileResult object
which is associated with a set of arguments can access to a list of
registered cells and update all of them if changes happen. If I change a
cell value which is part of the arguments, the formulas in the affected
(dirty) cells are recalculated automatically. This schema works well with
non-volatile result. However, with XVolatileResult, it raises some issues.
Briefly, the affected cells are still kept in the original list, and at the
same time register a new list associated with a new XVolatileResult object.
Both the original and new XVolatileResult objects update the dirty cells
when changes happen. These unnecessary and wrong callbacks definitely lower
Calc's performance.

I would like to describe the issues with a XVolatileResult example which is
listed in the Libreoffice SDK
(sdk->examples->DeveloperGuide->Spreadsheet->ExampleAddIn.java). You can
also check out the code from this link:
http://c-cpp.r3dcode.com/files/LibreOffice/3/4.5.2/sdk/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java

Firstly, I added some trivial System.out.println() in this java file.
public void addResultListener(com.sun.star.sheet.XResultListener
aListener)
{
aListeners.addElement( aListener );
/*System.out.println("Adding a Listener. Total is " + 
aListeners.size());*/

// immediately notify of initial value
aListener.modified( getResult() );
}

public void removeResultListener(com.sun.star.sheet.XResultListener
aListener)
{
aListeners.removeElement( aListener );
/*System.out.println("removing a listener. Total is " +
aListeners.size());*/
}

public void incrementValue()
{
++nValue;
com.sun.star.sheet.ResultEvent aEvent = getResult();
/*System.out.println("In incrementValue " + aEvent.Value);*/

java.util.Enumeration aEnum = aListeners.elements();
while (aEnum.hasMoreElements())
   
((com.sun.star.sheet.XResultListener)aEnum.nextElement()).modified(
aEvent);
/*System.out.println("Done incrementValue " + aEvent.Value);*/
}

class ExampleAddInThread extends Thread
{
private java.util.Hashtable aCounters;

public ExampleAddInThread( java.util.Hashtable aResults )
{
aCounters = aResults;
}

public void run()
{
while ( true )
{
try
{
sleep(500);
}
catch( InterruptedException exception )
{
}

/*System.out.println("will call incrementValue");*/
// increment all counters
java.util.Enumeration aEnum = aCounters.elements();
while (aEnum.hasMoreElements())
((ExampleAddInResult)aEnum.nextElement()).incrementValue();
}
}
}

public com.sun.star.sheet.XVolatileResult getCounter(String aName)
{
   / *System.out.println("calling getCounter with " + aName);*/
if ( aResults == null )
{
// create the table of results, and start a thread to
increment
// all counters
aResults = new java.util.Hashtable();
ExampleAddInThread aThread = new ExampleAddInThread(
aResults );
aThread.start();
}

ExampleAddInResult aResult = (ExampleAddInResult)
aResults.get(aName);
if ( aResult == null )
{
aResult = new ExampleAddInResult(aName);
aResults.put( aName, aResult );
}
return aResult;
}

Secondly, I compiled this extension and installed it with LibreOffice. Then,
since I was working in Windows XP, I ran from command line console the
command: soffice.exe 2>&1 > log.txt . Afterwards, a LibreOffice window was
opened and the standard system out was written in log.txt.

Thirdly, I launched a spreadsheet and did the following cases:
(1) inserted "1" in A1 and "=counter(A1)" in A2. Here counter is an addin
function provided by ExampleAddIn.java. The corresponding log is
/calling getCounter with 1
Adding a Listener. Total is 1
will call incrementValue
In incrementValue 1
calling getCounter with 1
Done incrementValue 1
/

Everything is good. To avoid confusion, I deleted all the dynamic count
numbers in the log file.

(2) changed "1" to "2" in A1. The corresponding log is
/calling getCounter with 2
Adding a Listener. Total is 1
will call incrementValue
In incrementValue 2
calling getCo

[PATCH]fdo#53002:Turkish Default Currency to be changed YTL to TL

2012-08-01 Thread Efe Gürkan YALAMAN

Hi,

The currency for Turkish was TRL TL since 2005. After that the currency was
TRY YTL since 2009. Current currency is TRY TL.
I changed default currency to TRY TL for Turkish. There is two patches
because I could not decide whether to delete TRY YTL.

There is also a new currency sign for Turkish Lira. The sign can be
implemented later.

Should i do any other change and which patch is more appropriate?

For more details:
http://en.wikipedia.org/wiki/Currency_code
http://en.wikipedia.org/wiki/Turkish_lira

Sorry for my grammar mistakes.
Regards.

-- 
Efe Gürkan YALAMAN
http://about.me/efegurkan


0001-Fix-for-default-currency-settings-TRY-YTL-exists.patch
Description: Binary data


0001-Fix-for-default-currency-TRY-YTL-is-gone.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[REVIEW 3-6] Re: spurious IDL rebuilds on master fixed now

On 20/07/12 20:01, Michael Stahl wrote:
> this week there was a problem on master with the dependencies generated
> for IDL files, caused by adding of a "-I." option in an AOO rebase.
> this has caused spurious re-builds of all IDL files, which can happen
> during "make subsequentcheck" and will cause that to fail variously.

there was another problem that apparently happened only on Windows, the
ucpp would create relative paths for files included via #include "foo".

then there was another problem that is Windows only, which is a spurious
dep-target dependency in WinResTarget, fixed by the following commit,
which would make sense for libreoffice-3-6 as well (but not -3-5 because
the dependencies were different then):

8a05f1265e6307c34b2ffdb5fc5279870c8397b7

now it should hopefully be possible to run "make check" from scratch on
Windows without having spurious rebuilds in "make subsequentcheck".

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

Re: [PATCH]fdo#52636:VIEWING: unintuitive Heading for 'Enable experimental Features

2012-08-01 Thread Joel Madero

I'll fix both. I'll leave limited since it fits, I actually noticed that
right after I sent out the email.

I'll be moving a lot of stuff around when I move the measurement unit to
the general tree, maybe a good solution is moving the experimental stuff to
its own tab.

Joel

On Wed, Aug 1, 2012 at 3:48 PM, Stefan Knorr  wrote:

> Hi Joel,
>
> your idea sounds good [even though I think that if these features aren't
> ready yet, they shouldn't be so prominent in the options – but that's a
> fight for another day].
>
> However, please have a look at your patch again, it leaves in the
> "(limited)" and also changes the capitalisation to title case which we
> don't for elements on dialogue boxes (only for menus and toolbars).
>
> Astron.
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Definition of draw:angle in ODF1.2 does not fit to implementation

2012-08-01 Thread Fridrich Strba

Hello,

On 01/08/12 22:16, Michael Stahl wrote:
>>>   >> svg:x1="65.9558%" svg:x2="39.8039%" svg:y1="24.8957%" svg:y2="70.0815%">
>>>>> svg:offset="0.473324" svg:stop-color="#00ced1"/>>> svg:offset="0.589196" svg:stop-color="#00ff00"/>
>>>   
>>>   >> svg:x1="0%" svg:x2="166.923%" svg:y1="0%" svg:y2="164.085%">
>>>>> svg:offset="1" svg:stop-color="#00ff00"/>
>>>   
> 
> unfortunately it seems that OOo derived suites only support the _other_
> ODF specific gradient element(s) that have this draw:angle attribute.
> 
> i don't actually know anything about graphics, so i'll let Armin judge
> whether that SVG stuff in ODF 1.2 is sufficient  :)

There is a little tiny problem in there. The draw:gradient element is
more verbose then the svg:*Gradient semantics. You can express square,
elliptical, axial ... gradients that way. The down-side is that, due to
the implementation in the time of the specification, this allows only
bi-colour gradients.

SVG on the other hand is much less expressive in what the "shape" of the
gradient concerns, but it is allowing a multitude of stops with
different colours. The svg:*Gradient semantics in the ODF specification
is not exactly the corresponding to the SVG fully, but is only a subset
of the features. The specification allows also only 2 colours per
gradient. So first good thing would be to actually adopt the complete
gradient semantics from SVG. This would not be a huge burden for the
implementers I guess and would allow more complicated gradients then
what we have currently.

>> If there is a down-level concern, I would define the new element such that, 
>> when it and  are both present, the new element pre-empts 
>>  in ODF 1.3 and beyond.  This way, a down-level 
>> implementation will presumably process the  and ignore the 
>> element introduced in ODF 1.3, since it is not defined down-level.
>>
>> Would that break the knot better?
> 
> _if_ something new is needed in ODF then that would be my general
> approach as well: don't change semantics of existing markup in an
> incompatible way, but deprecate it and add new markup as necessary with
> improved semantics.
> 
> the advantage is that existing products can then write both
> representations in a new version, and the deprecated markup can still be
> understood by older versions.

Also, one could be pro-active and simply refer to SVG for this stuff.
Since in SVG 2.0, there will be some more gradient types that would be
nice to support if LO drawing application wants to look like a serious
tool to the graphics folks.

Cheers

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

Re: [PATCH]fdo#52636:VIEWING: unintuitive Heading for 'Enable experimental Features

2012-08-01 Thread Stefan Knorr

Hi Joel,

your idea sounds good [even though I think that if these features aren't
ready yet, they shouldn't be so prominent in the options – but that's a
fight for another day].

However, please have a look at your patch again, it leaves in the
"(limited)" and also changes the capitalisation to title case which we
don't for elements on dialogue boxes (only for menus and toolbars).

Astron.

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

[Libreoffice-commits] .: solenv/bin solenv/gbuild

2012-08-01 Thread Bjoern Michaelsen

 solenv/bin/concat-deps.c|   42 ++--
 solenv/gbuild/platform/com_GCC_class.mk |8 +++---
 2 files changed, 7 insertions(+), 43 deletions(-)

New commits:
commit 79e1b9cb2305bc00665e94afd6a00e9f18b76bf8
Author: Bjoern Michaelsen 
Date:   Wed Aug 1 19:44:04 2012 +0200

always compile from SRCDIR

* this helps getting nonbroken deps if using some ccache/CCACHE_BASEDIR 
combos

Change-Id: I401e55cc10b16aa5901348909237e97d05ab2761

diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 8c9354b..e68093b 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -111,10 +111,7 @@
 
 static char* base_dir_var = "$(SRCDIR)";
 #define kBASE_DIR_VAR_LENGTH 9
-static char* current_dir;
-static size_t current_dir_length;
 static char* base_dir;
-static size_t base_dir_length;
 
 #ifdef __GNUC__
 #define clz __builtin_clz
@@ -715,13 +712,10 @@ char* lastnondotdot;
 fputs(path, stdout);
 }
 
-static char* print_fullpaths_buffer = NULL;
-static size_t print_fullpaths_buffersize = 0;
 /* prefix paths to absolute */
 static inline void print_fullpaths(char* line)
 {
 char* token;
-size_t token_length;;
 
 token = strtok(line," ");
 while(token != NULL)
@@ -732,19 +726,9 @@ size_t token_length;;
 }
 else
 {
-token_length=strlen(token);
-if(print_fullpaths_buffersize < current_dir_length+token_length+2)
-{
-/* we really should avoid to get there more than once, so 
print a message to alert of the condition */
-if(print_fullpaths_buffersize)
-fprintf(stderr, "resize fullpaths buffer %d -> %d\n", 
((int)print_fullpaths_buffersize), 
((int)(current_dir_length+token_length))+1024);
-print_fullpaths_buffersize = 
current_dir_length+token_length+1024;
-print_fullpaths_buffer = realloc(print_fullpaths_buffer, 
print_fullpaths_buffersize);
-}
-memcpy(print_fullpaths_buffer, current_dir, current_dir_length);
-*(print_fullpaths_buffer+current_dir_length) = '/';
-memcpy(print_fullpaths_buffer+current_dir_length+1, token, 
token_length+1);
-print_nodotdot(print_fullpaths_buffer);
+fputs(base_dir_var, stdout);
+fputc('/', stdout);
+print_nodotdot(token);
 }
 fputc(' ', stdout);
 token = strtok(NULL," ");
@@ -882,26 +866,6 @@ struct hash* dep_hash;
 fputs("Error: SRCDIR is missing in the environement\n", stderr);
 return 1;
 }
-current_dir = getcwd(NULL, 0);
-base_dir_length = strlen(base_dir);
-current_dir_length = strlen(current_dir);
-if(strncmp(base_dir, current_dir, base_dir_length) == 0)
-{
-if(current_dir_length == base_dir_length)
-{
-current_dir = base_dir_var;
-current_dir_length = kBASE_DIR_VAR_LENGTH;
-}
-else
-{
-buffer = 
malloc(kBASE_DIR_VAR_LENGTH+current_dir_length-base_dir_length+1);
-memcpy(buffer, base_dir_var, kBASE_DIR_VAR_LENGTH);
-memcpy(buffer+kBASE_DIR_VAR_LENGTH, current_dir+base_dir_length, 
current_dir_length-base_dir_length+1);
-free(current_dir);
-current_dir=buffer;
-
current_dir_length=kBASE_DIR_VAR_LENGTH+current_dir_length-base_dir_length;
-}
-}
 
 in_list = file_load(argv[1], &in_list_size, &rc);
 if(!rc)
diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index b098c99..18a389e 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -36,7 +36,7 @@ gb_AsmObject_get_source = $(1)/$(2).s
 define gb_AsmObject__command
 $(call gb_Output_announce,$(2),$(true),ASM,3)
 $(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $(dir $(1)) $(dir $(4)) && \
+   mkdir -p $(dir $(1)) $(dir $(4)) && cd $(SRCDIR) && \
$(gb_CC) \
$(DEFS) \
$(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \
@@ -54,7 +54,7 @@ endef
 define gb_CObject__command
 $(call gb_Output_announce,$(2).c,$(true),C  ,3)
 $(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $(dir $(1)) $(dir $(4)) && \
+   mkdir -p $(dir $(1)) $(dir $(4)) && cd $(SRCDIR) && \
$(gb_CC) \
$(DEFS) \
$(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
@@ -75,7 +75,7 @@ endef
 define gb_CxxObject__command
 $(call gb_Output_announce,$(2).cxx,$(true),CXX,3)
 $(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $(dir $(1)) $(dir $(4)) && \
+   mkdir -p $(dir $(1)) $(dir $(4)) && cd $(SRCDIR) && \
$(gb_CXX) \
$(DEFS) \
$(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
@@ -92,7 +92,7 @@ endef
 
 define gb_SrsPartTarget__command_dep
 $(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $(

Re: double rendering of borders ...

Hi Ivan,

On Wed, 2012-08-01 at 22:18 +0400, Ivan Timofeev wrote:
> On 01.08.2012 20:59, Michael Meeks wrote:
> Well, now I have read about alpha compositing and cairo... :)

Oh ! nice :-)

> We use CAIRO_FORMAT_ARGB32 and the cairo manual says[1]:
> 
>   Pre-multiplied alpha is used. (That is, 50% transparent red is 
> 0x8080, not 0x80ff.)

So you're right, and I'm wrong then :-) good.

> so cairo_data elements already multiplied by alpha.

Lets get your patch to fix this in the - hopefully that makes
everything prettier.

Thanks !

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

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

Re: Definition of draw:angle in ODF1.2 does not fit to implementation

On 01/08/12 20:38, Dennis E. Hamilton wrote:
> Hi Armin,
> 
> Thanks for your valuable comment.
> 
> I had thought that the description using "clockwise" was in reference to the 
> page appearance and not the abstract treatment (with "right-hand rule").  
> Perhaps I misunderstand where the origin is understood in the projection onto 
> the page.
> 
> MORE IMPORTANT CONCERN
> 
> I think you raise a more important question concerning changing for ODF 1.3 
> and understanding a transformation between ODF 1.0/1.1/1.2/IS 26300 and ODF 
> 1.3.
> 
> I recommend that there be no breaking change of draw:angle between ODF 
> versions.  It is probably best to deprecate it while clarifying the 
> orientation of the angle-opening rotation and the units of the angle.  I 
> think preventing down-level breakage is impossible without that and the 
> support explanations will be a nightmare otherwise.  It seems to me that the 
> ODF 1.2 description is best corrected in an Errata and the problem made 
> immediately known in an OIC Advisory.  
> 
> To correct the geometry for transformations, I suggest that another, 
> rigorously-defined gradient element be introduced, preferably one from SVG.

there are already the svg:linearGradient and svg:radialGradient elements
in ODF 1.2, for example playing with Calligra Stage 2.4.3 i was able to
produce a ODF presentation document with this, which seems to do fine
without any explicit angle at all:

>>   > svg:x1="65.9558%" svg:x2="39.8039%" svg:y1="24.8957%" svg:y2="70.0815%">
>>> svg:offset="0.473324" svg:stop-color="#00ced1"/>> svg:offset="0.589196" svg:stop-color="#00ff00"/>
>>   
>>   > svg:x1="0%" svg:x2="166.923%" svg:y1="0%" svg:y2="164.085%">
>>> svg:offset="1" svg:stop-color="#00ff00"/>
>>   

unfortunately it seems that OOo derived suites only support the _other_
ODF specific gradient element(s) that have this draw:angle attribute.

i don't actually know anything about graphics, so i'll let Armin judge
whether that SVG stuff in ODF 1.2 is sufficient  :)

> If there is a down-level concern, I would define the new element such that, 
> when it and  are both present, the new element pre-empts 
>  in ODF 1.3 and beyond.  This way, a down-level implementation 
> will presumably process the  and ignore the element introduced 
> in ODF 1.3, since it is not defined down-level.
> 
> Would that break the knot better?

_if_ something new is needed in ODF then that would be my general
approach as well: don't change semantics of existing markup in an
incompatible way, but deprecate it and add new markup as necessary with
improved semantics.

the advantage is that existing products can then write both
representations in a new version, and the deprecated markup can still be
understood by older versions.

>  - Dennis
> 
> -Original Message-
> From: Armin Le Grand [mailto:armin.le.gr...@me.com] 
> Sent: Wednesday, August 01, 2012 02:21
> To: ooo-...@incubator.apache.org
> Subject: Re: Definition of draw:angle in ODF1.2 does not fit to implementation
> 
>   Hi Dennis,
> 
> On 30.07.2012 22:21, Dennis E. Hamilton wrote:
> [ ... ]
>> (This is anti-clockwise in the standard geometric orientation.  When 
>> projected onto the page, this appears to be clockwise because the origin 
>> tends to be in the upper left corner and the positive-Y direction is 
>> downward, the positve-X direction is rightward.)
> 
> It is consistent throughout all AOO/LO/OOo versions. Unfortunately, it 
> is mathematically wrong oriented (thus, projected on the page, 
> anti-clockwise).
> 
> Thus, when just want to stay compatible and extend/correct the 
> definitions, defining it as integer, 0.1 degrees and mathematically 
> (non-projected to page) clockwise rotation would describe the current 
> behaviour.
> 
> Unfortunately this 'wrong' orientation is problematic. As long as it is 
> only locally used it can simply be mirrored. The problem comes up when 
> working with transformations; when receiving the transformation of an 
> graphic object and decomposing it to extract rotation, that rotation 
> will be mathematically correctly oriented. It has to be since else 
> linear combination of transformations would not work.
> 
> This is not in the environment of gradients, but in general all angles 
> in ODF have this problem (probably for historical reasons, the UIs use 
> the same wrong orientation). Our competitor does not have that error.
> 
> Isn't this correctable for all angles e.g. for ODF1.3 and can be handled 
> by a XML transformation ODF1.2 <-> ODF1.3 by mirroring all angle values 
> easily? If yes, Shouldn't we take the chance to clean this up in ODF1.3?
> 
> [ ... ]
> 
> 

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

Re: make OUString::copy() clip

On 01/08/12 19:05, Eike Rathke wrote:
> Hi Stephan,
> 
> On Wednesday, 2012-08-01 18:17:12 +0200, Stephan Bergmann wrote:
> 
>> make rtl::OUString::copy(beginIndex, count) clip to [0..length)?
>> yeah, why not  (then again, -1's sentinel nature, cf. indexOf, might
>> mean that silent clipping of beginIndex=-1 to beginIndex=0 is
>> unfortunate)
> 
> We may step into more of these traps in transitions from String to
> OUString, so clipping IMHO is good.
> 
> I think beginIndex<0 or count<=0 should always return an empty string
> and output a SAL_WARN, maybe also SAL_WARN if clipping occurred as that
> may indicate a logic error.

no, it should assert().  passing in invalid indexes is clearly a bug
that must be fixed.


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

[Libreoffice-commits] .: solenv/gbuild

 solenv/gbuild/filter-showIncludes.pl |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit e9da4879384c15da84e26d137302ae1ccc30f86a
Author: Michael Stahl 
Date:   Wed Aug 1 20:52:50 2012 +0200

filter-showIncludes: filter out system headers

A blacklist based approach doesn't seem easy since there are various
different SDKs, MFC, ATL and whatnot each potentially with an own
include path; so simply whitelist the known source and build dirs.

Change-Id: I93b27bd0ffbd57237da2d23afa95dea7c0785774

diff --git a/solenv/gbuild/filter-showIncludes.pl 
b/solenv/gbuild/filter-showIncludes.pl
index d7082a2..1ed3679 100755
--- a/solenv/gbuild/filter-showIncludes.pl
+++ b/solenv/gbuild/filter-showIncludes.pl
@@ -43,6 +43,11 @@ while (  ) {
 chomp;
 s/\\/\//g;
 
+
+# skip system headers, i.e. everything not under source or build dirs
+if ( /$ENV{'SRCDIR'}|$ENV{'OUTDIR'}|$ENV{'WORKDIR'}/ )
+{
+
 # X: -> /cygdrive/x/
 s/^(.):/\/cygdrive\/\l\1/;
 
@@ -52,6 +57,7 @@ while (  ) {
 $seen{$_} = 1;
 print $OUT " \\\n  $_";
 }
+}
 }
 else {
 # skip the first line, it always just duplicates what is being
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

make OUString::copy() clip (was: [PUSHED 3-6] resolved fdo#53012 crash in CSV fixed width import)

Hi Stephan,

On Wednesday, 2012-08-01 18:17:12 +0200, Stephan Bergmann wrote:

> make rtl::OUString::copy(beginIndex, count) clip to [0..length)?
> yeah, why not  (then again, -1's sentinel nature, cf. indexOf, might
> mean that silent clipping of beginIndex=-1 to beginIndex=0 is
> unfortunate)

We may step into more of these traps in transitions from String to
OUString, so clipping IMHO is good.

I think beginIndex<0 or count<=0 should always return an empty string
and output a SAL_WARN, maybe also SAL_WARN if clipping occurred as that
may indicate a logic error.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD

pgpEvudevyOxi.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values

Hi anwen,

On Wednesday, 2012-08-01 07:57:00 -0700, anwen wrote:

> Here is a minor remind that modified() is a method
> of XResultListener (not XVolatileResult).

Bah, yes, of course, thanks.

> It is implemented in Calc by SCAddInListener class.

I know, see my .signature below ;-)

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgppUTdBpPnfF.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

RE: Definition of draw:angle in ODF1.2 does not fit to implementation

2012-08-01 Thread Dennis E. Hamilton

Hi Armin,

Thanks for your valuable comment.

I had thought that the description using "clockwise" was in reference to the 
page appearance and not the abstract treatment (with "right-hand rule").  
Perhaps I misunderstand where the origin is understood in the projection onto 
the page.

MORE IMPORTANT CONCERN

I think you raise a more important question concerning changing for ODF 1.3 and 
understanding a transformation between ODF 1.0/1.1/1.2/IS 26300 and ODF 1.3.

I recommend that there be no breaking change of draw:angle between ODF 
versions.  It is probably best to deprecate it while clarifying the orientation 
of the angle-opening rotation and the units of the angle.  I think preventing 
down-level breakage is impossible without that and the support explanations 
will be a nightmare otherwise.  It seems to me that the ODF 1.2 description is 
best corrected in an Errata and the problem made immediately known in an OIC 
Advisory.  

To correct the geometry for transformations, I suggest that another, 
rigorously-defined gradient element be introduced, preferably one from SVG.

If there is a down-level concern, I would define the new element such that, 
when it and  are both present, the new element pre-empts 
 in ODF 1.3 and beyond.  This way, a down-level implementation 
will presumably process the  and ignore the element introduced 
in ODF 1.3, since it is not defined down-level.

Would that break the knot better?

 - Dennis

-Original Message-
From: Armin Le Grand [mailto:armin.le.gr...@me.com] 
Sent: Wednesday, August 01, 2012 02:21
To: ooo-...@incubator.apache.org
Subject: Re: Definition of draw:angle in ODF1.2 does not fit to implementation

Hi Dennis,

On 30.07.2012 22:21, Dennis E. Hamilton wrote:
[ ... ]
> (This is anti-clockwise in the standard geometric orientation.  When 
> projected onto the page, this appears to be clockwise because the origin 
> tends to be in the upper left corner and the positive-Y direction is 
> downward, the positve-X direction is rightward.)

It is consistent throughout all AOO/LO/OOo versions. Unfortunately, it 
is mathematically wrong oriented (thus, projected on the page, 
anti-clockwise).

Thus, when just want to stay compatible and extend/correct the 
definitions, defining it as integer, 0.1 degrees and mathematically 
(non-projected to page) clockwise rotation would describe the current 
behaviour.

Unfortunately this 'wrong' orientation is problematic. As long as it is 
only locally used it can simply be mirrored. The problem comes up when 
working with transformations; when receiving the transformation of an 
graphic object and decomposing it to extract rotation, that rotation 
will be mathematically correctly oriented. It has to be since else 
linear combination of transformations would not work.

This is not in the environment of gradients, but in general all angles 
in ODF have this problem (probably for historical reasons, the UIs use 
the same wrong orientation). Our competitor does not have that error.

Isn't this correctable for all angles e.g. for ODF1.3 and can be handled 
by a XML transformation ODF1.2 <-> ODF1.3 by mirroring all angle values 
easily? If yes, Shouldn't we take the chance to clean this up in ODF1.3?

[ ... ]

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

Re: double rendering of borders ...


On 01.08.2012 20:59, Michael Meeks wrote:


On Wed, 2012-08-01 at 19:56 +0400, Ivan Timofeev wrote:

I solved the problem by the following change in renderAreaToPix:
cairo_data[x*4+0] * alpha


That appears to me to break the compositing :-) it might happen to
improve things for this case of course.


Well, now I have read about alpha compositing and cairo... :)

We use CAIRO_FORMAT_ARGB32 and the cairo manual says[1]:

 Pre-multiplied alpha is used. (That is, 50% transparent red is 
0x8080, not 0x80ff.)


so cairo_data elements already multiplied by alpha.

[1] 
http://www.cairographics.org/manual/cairo-Image-Surfaces.html#cairo-format-t

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

Re: [GSoC 2012][Collaboration] ScDocFunc and Collaboration

Hi Matúš,

On Tuesday, 2012-07-31 19:09:45 +0200, Matúš Kukan wrote:

> > To be able to
> > call the same methods from the view regardless of whether we have direct
> > or collaborative input we need ScDocFuncDirect and ScDocFuncSend,
> > otherwise we'd have to distinguish between direct and collab in each
> > method.
> 
> Right, it would be about adding one 'if' into each method.

And then call another method anyway (or have all code in the if block)
for collaboration.. to me a derived ScDocFuncSend looks cleaner.

> > For the receiver we need ScDocFuncRecv to process the command and send
> > it as input to ScDocFuncDirect. The functionality of ScDocFuncRecv
> > theoretically could be implemented anywhere, but deriving it from
> > ScDocFunc gives access to ScDocShell (currently available as member in
> > ScDocFuncRecv also, but see abstract base class below), and IMHO
> > deriving it clarifies the relation between ScDocFunc* classes.
> 
> But currently ScDocFuncRecv is not deriving from anything

Hum yes, sorry I mixed that up and got carried away..

> and there is just ~one method,
> which is possible to move into ScDocFuncSend.
> See attached diff as illustration for what I have in mind.

Sure, would work. Just why do it so and call methods of the base class
instead of having the little ScDocFuncRecv helper class with
a ScDocFuncDirect pointer?

Btw, we should not end up with yet another
if(string==...){}else if(string==...){}else ...
chain for the commands that looks ugly and slows down things again, I'd
like more a hashmap resolving to IDs that can be switch-cased on.

> > Chaining ScDocFuncRecv into ScDocFuncSend in real collab mode is only
> > needed for ScDocFuncSend::SetCollaboration() so could be passed there
> > instead, but in dev/demo mode it is also needed in
> > ScDocFuncSend::SendMessage() to emulate the broadcast, having it always
> > as member IMHO is fine.
> 
> I was ignoring demo mode for now, I believe it can be solved later.

I think it's good to keep an eye on it as it will come handy when
working on the send/recv commands.

> >> Also ScDocFuncDirect is just ScDocFunc with own costructor, not sure what 
> >> for.
> >
> > Ideally we'll have ScDocFunc as an abstract base class later, do not
> > construct the derived classes with an extra ScDocShell and have
> > ScDocFuncDirect implement the then abstract methods for which
> > implementation currently still lives at ScDocFunc. Just ignore that
> > little indirection for now.
> 
> Sorry if that's obvious but I don't understand why ScDocFunc should be 
> abstract.
> I've never understood the comment in sendfunc.cxx:
> // FIXME: really ScDocFunc should be an abstract base, so
> // we don't need the rDocSh hack/pointer
> ScDocFuncSend::ScDocFuncSend( ScDocShell& rDocSh, ScDocFuncRecv *pDirect )
> : ScDocFunc( rDocSh ),
> 
> How does that depend on whether ScDocFunc is abstract ( that means it
> has at least one pure virtual method I guess ?

yes

> ) or not ?

IMHO whether we need to pass rDocSh or not is not the point, but the
benefit of an abstract base class would be that a pure virtual method
forces the implementation of a derived class to implement exactly that
signature. Adding a parameter to a method of just one of the classes and
forgetting the other is not possible, it would need to be added to
ScDocFunc and both ScDocFuncDirect and ScDocFuncSend derivatives would
have to implement it. It helps the developer.

> > I actually see no benefit in having one ScDocFunc, why do you think it
> > would be nicer?
> 
> Hmm, because there would be only one but that may be also (ideo)logically bad.
> Depends where you want to distinguish between collaboration modes,
> what ScDocFunc means ...

ScDocFunc so far was the glue between view and document or API and
document, actually much of its functionality previously was in
ScViewFunc before it was extracted to work also with API calls. To me
having a derived ScDocFuncSend that implements virtual methods for the
collaboration case sounds logical, I think that in fact the receiving
end should act much like if it was called via API.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD

pgpOueLcq9vZK.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Problem building on Mac OS X 10.7


On 08/01/2012 06:15 PM, Niklas Johansson wrote:

unexpected otool -D output 
("/Volumes/hfs+/git/lo/core/solver/unxmacxi/lib/libuno_sal.dylib:
", expecting "/Volumes/hfs+/git/lo/core/solver/unxmacxi/lib/libuno_sal.dylib:") at 
/Volumes/hfs+/git/lo/core/solenv/bin/modules/macosxotoolhelper.pm line 38,  line 1.


Ha, that "+" in your path causes trouble there.  Please try again with 
 
"Proper quoting."


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

[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - bridges/Module_bridges.mk

2012-08-01 Thread David Tardon

 bridges/Module_bridges.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8f97d68bf87e4c6b5b28503c8c4923c34ebc6077
Author: David Tardon 
Date:   Wed Aug 1 19:12:47 2012 +0200

fix typo

Change-Id: I3e87f3cab8422a4b00e13eb182229e00dbd92660

diff --git a/bridges/Module_bridges.mk b/bridges/Module_bridges.mk
index 1e08ec0..195d306 100644
--- a/bridges/Module_bridges.mk
+++ b/bridges/Module_bridges.mk
@@ -81,7 +81,7 @@ $(eval $(call gb_Module_add_targets,bridges,\
$(if $(filter GCCSOLARISS,$(COM)$(OS)$(CPU)),\
Library_gcc3_solaris_sparc \
) \
-   $(if $(filter WINGCC,$(OS)$(COM)),\
+   $(if $(filter WNTGCC,$(OS)$(COM)),\
Library_mingw_intel \
) \
$(if $(filter MSCI,$(COM)$(CPU)),\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oovbaapi/ooo sc/source

 oovbaapi/ooo/vba/excel/XWindow.idl |1 +
 sc/source/ui/drawfunc/fusel.cxx|   17 ++---
 sc/source/ui/inc/tabview.hxx   |4 ++--
 sc/source/ui/vba/vbawindow.cxx |   22 ++
 sc/source/ui/vba/vbawindow.hxx |2 ++
 5 files changed, 37 insertions(+), 9 deletions(-)

New commits:
commit 3514df0f78c6cce2cc618e1c7c2728c759342bce
Author: Noel Power 
Date:   Wed Aug 1 18:25:32 2012 +0100

add TabRatio api and detect macro at group shape fixes bnc#770708

Change-Id: I73eb612edaba21aa5bb07577b42bd31f8de2dd2a

diff --git a/oovbaapi/ooo/vba/excel/XWindow.idl 
b/oovbaapi/ooo/vba/excel/XWindow.idl
index 660ca65..f685a8b 100644
--- a/oovbaapi/ooo/vba/excel/XWindow.idl
+++ b/oovbaapi/ooo/vba/excel/XWindow.idl
@@ -51,6 +51,7 @@ interface XWindow : com::sun::star::uno::XInterface
 [attribute, readonly] XRange VisibleRange;
 [attribute] any WindowState;
 [attribute] any Zoom;
+[attribute] double TabRatio;
 any SelectedSheets( [in] any Index );
 void SmallScroll( [in] any Down, [in] any Up, [in] any ToRight, [in] any 
ToLeft );
 void LargeScroll( [in] any Down, [in] any Up, [in] any ToRight, [in] any 
ToLeft );
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index d9fedb4..7665bf6 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -186,19 +186,22 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& 
rMEvt)
// associated with the clicked object is used only
 
// additionally you can also select a macro in Excel for a 
grouped
-   // objects and this results in the macro being set for the 
elements
-   // in the group and no macro is exported for the group
-
+   // objects and this *usually* results in the macro being set
+   // for the elements in the group and no macro is exported
+   // for the group itself ( this however is not always true )
// if a macro and hlink are defined favour the hlink
-
// If a group object has no hyperlink use the hyperlink of 
the
// object clicked
 
if ( pObj->IsGroupObject() )
{
-   SdrObject* pHit = NULL;
-   if ( pView->PickObj(aMDPos, pView->getHitTolLog(), 
pHit, pPV, SDRSEARCH_DEEP ) )
-   pObj = pHit;
+   ScMacroInfo* pTmpInfo = ScDrawLayer::GetMacroInfo( pObj 
);
+   if ( !pTmpInfo || pTmpInfo->GetMacro().isEmpty() )
+   {
+   SdrObject* pHit = NULL;
+   if ( pView->PickObj(aMDPos, pView->getHitTolLog(), 
pHit, pPV, SDRSEARCH_DEEP ) )
+   pObj = pHit;
+   }
}
 
ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj, true 
);
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index aadadc9..5a3e35b 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -255,14 +255,14 @@ public:
 voidSetTabBarWidth( long nNewWidth );
 /** Sets a relative tab bar width.
 @param fRelTabBarWidth  Tab bar width relative to frame window width 
(0.0 ... 1.0). */
-voidSetRelTabBarWidth( double fRelTabBarWidth );
+SC_DLLPUBLIC voidSetRelTabBarWidth( double fRelTabBarWidth );
 /** Sets a relative tab bar width. Tab bar is resized again in next 
DoResize().
 @param fRelTabBarWidth  Tab bar width relative to frame window width 
(0.0 ... 1.0). */
 voidSetPendingRelTabBarWidth( double fRelTabBarWidth );
 /** Returns the current tab bar width in pixels. */
 longGetTabBarWidth() const;
 /** Returns the current tab bar width relative to the frame window width 
(0.0 ... 1.0). */
-double  GetRelTabBarWidth() const;
+SC_DLLPUBLIC double  GetRelTabBarWidth() const;
 /** Returns the pending tab bar width relative to the frame window width 
(0.0 ... 1.0). */
 double  GetPendingRelTabBarWidth() const;
 
diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx
index f196a5c..f56c79f 100644
--- a/sc/source/ui/vba/vbawindow.cxx
+++ b/sc/source/ui/vba/vbawindow.cxx
@@ -851,6 +851,28 @@ ScVbaWindow::PrintPreview( const css::uno::Any& 
EnableChanges ) throw (css::scri
 PrintPreviewHelper( EnableChanges, excel::getBestViewShell( m_xModel ) );
 }
 
+double SAL_CALL ScVbaWindow::getTabRatio() throw (css::uno::RuntimeException)
+{
+ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
+if ( pViewShell && pViewShell->GetViewData() && 
pViewShell->GetViewData()->GetView() )
+{
+double fRatio = 
pViewShell->GetViewData()->GetView()->GetRelTabBarWidth();
+

Re: double rendering of borders ...


On Wed, 2012-08-01 at 19:56 +0400, Ivan Timofeev wrote:
> With gtk3 I see similar effect for normal (not toolbar) buttons, edits 
> etc. Why do you think this is related to toolbars?

Oh - quite probably it is a generic problem :-) but we noticed it in
toolbars first.

> I solved the problem by the following change in renderAreaToPix: 
> cairo_data[x*4+0] * alpha

That appears to me to break the compositing :-) it might happen to
improve things for this case of course.

Ultimately, we need to draw those widgets just once. With the attached
debug patch I get this:

paint 0x8cfe720: N9framework7ToolBarE
stack paint
paint 0x8d41e30: 16ImplBorderWindow
paint 20 1 combobox 425,37 75x25
stack paint
paint 0x8d41a90: N3svx19SvxFontSizeBox_ImplE
stack paint
paint 0x8d489c0: 4Edit
paint 20 1 combobox 425,37 75x25

Which seems like it renders the borders twice on that edit (AFAICS) -
although that is not what we want. It'd be great to work out why and
unwind that I think.

Thanks ! :-)

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index a39d855..550d16c 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -2421,8 +2421,10 @@ void Window::ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags )
 {
 // Paint from the bottom child window and frontward.
 Window* pTempWindow = mpWindowImpl->mpLastChild;
+fprintf (stderr, "stack paint\n");
 while ( pTempWindow )
 {
+fprintf (stderr, "paint %p: %s\n", pTempWindow, typeid(*pTempWindow).name());
 if ( pTempWindow->mpWindowImpl->mbVisible )
 pTempWindow->ImplCallPaint( pChildRegion, nPaintFlags );
 pTempWindow = pTempWindow->mpWindowImpl->mpPrev;
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 5e0972f..23115df 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -697,6 +697,11 @@ void GtkSalGraphics::PaintCombobox( GtkStyleContext *context,
 // plus its actual draw rect excluding adornment
 areaRect = rControlRectangle;
 
+fprintf (stderr, "paint %d %d combobox %d,%d %dx%d\n",
+ (int)nType, (int)nPart,
+ (int)areaRect.Left(), (int)areaRect.Top(),
+ (int)areaRect.GetWidth(), (int)areaRect.GetHeight());
+
 buttonRect = NWGetComboBoxButtonRect( nType, PART_BUTTON_DOWN, areaRect );
 if( nPart == PART_BUTTON_DOWN )
 buttonRect.Left() += 1;
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: solenv/bin

 solenv/bin/modules/macosxotoolhelper.pm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 13dc61da882e1e5800665f027894d1885c42def7
Author: Stephan Bergmann 
Date:   Wed Aug 1 18:43:17 2012 +0200

Proper quoting

Change-Id: Ib619ffc06d580acb5dc5f21ad6d0a439569bee2a

diff --git a/solenv/bin/modules/macosxotoolhelper.pm 
b/solenv/bin/modules/macosxotoolhelper.pm
index 96ad8b2..1a64447 100644
--- a/solenv/bin/modules/macosxotoolhelper.pm
+++ b/solenv/bin/modules/macosxotoolhelper.pm
@@ -35,7 +35,7 @@ sub otoolD($) {
 my $call = "otool -D $file";
 open(IN, "-|", $call) or die "cannot $call";
 my $line = ;
-$line =~ /^$file:\n$/ or
+$line =~ /^\Q$file\E:\n$/ or
 die "unexpected otool -D output (\"$line\", expecting \"$file:\")";
 $line = ;
  == undef or die "unexpected otool -D output";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: autodoc/inc basic/source idl/inc lotuswordpro/source sc/source sd/source sfx2/inc sfx2/source svl/inc sw/source

2012-08-01 Thread Thomas Arnhold

 autodoc/inc/ary/idl/i_namelookup.hxx |1 
 autodoc/inc/ary/itrange.hxx  |   74 
 basic/source/inc/runtime.hxx |   13 
 idl/inc/bastype.hxx  |   51 
 lotuswordpro/source/filter/lwpobjfactory.cxx |1 
 lotuswordpro/source/filter/lwpoleobject.hxx  |   51 
 lotuswordpro/source/filter/lwptemp.hxx   |   82 ---
 sc/source/ui/inc/printfun.hxx|   14 
 sd/source/ui/inc/ViewShellBase.hxx   |9 --
 sfx2/inc/sfx2/fcontnr.hxx|   11 ---
 sfx2/source/inc/sfxtypes.hxx |   15 
 svl/inc/svl/ondemand.hxx |   74 
 sw/source/core/text/txtpaint.hxx |   31 --
 13 files changed, 427 deletions(-)

New commits:
commit 791071825969a40a454ed2b9806ec8b5c3b08fe9
Author: Thomas Arnhold 
Date:   Wed Aug 1 18:34:24 2012 +0200

Remove unused code: those classes are unused

Change-Id: Ibf41655d40c9534629bbb0dd5ae600791b42922d

diff --git a/autodoc/inc/ary/idl/i_namelookup.hxx 
b/autodoc/inc/ary/idl/i_namelookup.hxx
index 9da313e..f962d48 100644
--- a/autodoc/inc/ary/idl/i_namelookup.hxx
+++ b/autodoc/inc/ary/idl/i_namelookup.hxx
@@ -25,7 +25,6 @@
 
 // USED SERVICES
 #include 
-#include 
 #include 
 #include 
 
diff --git a/autodoc/inc/ary/itrange.hxx b/autodoc/inc/ary/itrange.hxx
deleted file mode 100644
index 2cda9b7..000
--- a/autodoc/inc/ary/itrange.hxx
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef ARY_ITRANGE_HXX
-#define ARY_ITRANGE_HXX
-//  KORR_DEPRECATED_3.0
-
-
-// USED SERVICES
-// BASE CLASSES
-// COMPONENTS
-// PARAMETERS
-#include 
-
-
-
-
-namespace ary
-{
-
-template 
-class IteratorRange
-{
-  public:
-IteratorRange(
-ITERi_begin,
-ITERi_end )
-:   itCurrent(i_begin),
-itEnd(i_end)
-{}
-IteratorRange(
-std::pair
-i_range )
-:   itCurrent(i_range.first),
-itEnd(i_range.second)
-{}
-
-operator bool() const   { return itCurrent != itEnd; }
-IteratorRange & operator++(){ ++itCurrent; return *this; }
-
-ITERcur() const { return itCurrent; }
-ITERend() const { return itEnd; }
-
-
-  private:
-// DATA
-ITERitCurrent;
-ITERitEnd;
-};
-
-
-
-
-
-}   // namespace ary
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index 470b152..1fe346d 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -39,19 +39,6 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::container;
 
-
-namespace basicEncoder
-{
-
-// TODO: Use exported functionality (code is copied from deamons2/ucb)
-class AsciiEncoder
-{
-public:
-static ::rtl::OUString decodeUnoUrlParamValue(const rtl::OUString & 
rSource);
-};
-
-}
-
 class SbiInstance;  // active StarBASIC process
 class SbiRuntime;   // active StarBASIC procedure instance
 
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index 15a83d1..787c3ca 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -50,57 +50,6 @@ public:
 };
 
 
-class SvINT16
-{
-short   nVal;
-public:
-SvINT16() { nVal = 0; }
-SvINT16( short n ) : nVal( n ) {}
-SvINT16 &   operator = ( short n ) { nVal = n; return *this; }
-
-

Re: Problem building on Mac OS X 10.7

> Any help/pointers would be much appreciated.

The (mysterious) code in solenv/bin/modules/macosxotoolhelper.pm
doesn't cope with a file name that contains regexp metacharacters (the
'+' in your "/Volumes/hfs+/git").

I think the quickest solution might be to change the
$line =~ /^$file:\n$/
to
   $line =~ /^\Q$file\E:\n$/

in said macosxotoolhelper.pm. Try that and report back.

An even better thing would be to eventually figure out whether all
that special Mac OS X dylib crack is needed at all when building with
a current Xcode tool-chain for a current OS... and hopefully notice
that it isn't.

--tml

P.S. Anticipating the knee-jerk reaction from the more leet coders:
Yes, using Python instead of Perl this problem would go away, sure,
sure, you win, have a cookie.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: solenv/gbuild

2012-08-01 Thread Bjoern Michaelsen

 solenv/gbuild/StaticLibrary.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 23e5bb66436991d809d8d807f27d25f922fb062f
Author: Bjoern Michaelsen 
Date:   Wed Aug 1 18:28:26 2012 +0200

StaticLibrary too

Change-Id: I2bda0e3117fb70353c52d5998e7784b6123ab38e

diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index 2d4a9d5..c84e822 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -66,7 +66,7 @@ $(call gb_LinkTarget_set_targettype,$(2),StaticLibrary)
 $(call gb_LinkTarget_add_defs,$(2),\
$(gb_StaticLibrary_DEFS) \
 )
-$(call gb_StaticLibrary_get_target,$(1)) : $(call 
gb_LinkTarget_get_target,$(2)) \
+$(call gb_StaticLibrary_get_target,$(1)) : $(call 
gb_LinkTarget_get_target,$(2)) $(gb_LinkTarget_get_dep_target,$(2)) \
| $(dir $(call gb_StaticLibrary_get_target,$(1))).dir
 $(call gb_StaticLibrary_get_clean_target,$(1)) : $(call 
gb_LinkTarget_get_clean_target,$(2))
 $(call gb_StaticLibrary_StaticLibrary_platform,$(1),$(2))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - solenv/bin solenv/gbuild

2012-08-01 Thread Bjoern Michaelsen

 solenv/bin/concat-deps.c|1 +
 solenv/gbuild/Executable.mk |2 +-
 solenv/gbuild/Library.mk|2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b8f7cc3c26a95b7dfb41415b24f0e2a3a9f1e33c
Author: Bjoern Michaelsen 
Date:   Wed Aug 1 18:19:28 2012 +0200

force depfile concat on deliver

* in some scenarios gcc (or ccache) generate relative paths
* thus we need to concat the depfiles in the same makerun as the compiles
* stiil not foolproof:
  - cd sw && make and abort with Ctrl-C
  - cd .. && make sw
  - now we have deps from mixed workdirs
* in the end we should likely always cd to SRCDIR before all compiles

Change-Id: I007da96f38ed2cfe403b692400f447764f6d6988

diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 9f56296..f1d392a 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -55,7 +55,7 @@ define gb_Executable__Executable_impl
 $(call gb_Executable_set_targettype_gui,$(2))
 $(call gb_LinkTarget_LinkTarget,$(2))
 $(call gb_LinkTarget_set_targettype,$(2),Executable)
-$(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) \
+$(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) 
$(call gb_LinkTarget_get_dep_target,$(2)) \
| $(dir $(call gb_Executable_get_target,$(1))).dir
 $(call gb_Executable_get_clean_target,$(1)) : $(call 
gb_LinkTarget_get_clean_target,$(2))
 $(call gb_Executable_Executable_platform,$(1),$(2))
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 157be8c..5866b9b 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -74,7 +74,7 @@ $(call gb_LinkTarget_add_defs,$(2),\
$(gb_Library_DEFS) \
 )
 $(call gb_Library__get_final_target,$(1)) : $(call gb_Library_get_target,$(1))
-$(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) \
+$(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) 
$(call gb_LinkTarget_get_dep_target,$(2)) \
| $(dir $(call gb_Library_get_target,$(1))).dir
 $(call gb_Library_get_clean_target,$(1)) : $(call 
gb_LinkTarget_get_clean_target,$(2))
 $(call gb_Library_Library_platform,$(1),$(2),$(gb_Library_DLLDIR)/$(call 
gb_Library_get_dllname,$(1)))
commit 7917af89eb4901c9ed77c7847bc0e8588685fd83
Author: Bjoern Michaelsen 
Date:   Wed Aug 1 18:18:40 2012 +0200

brown paperbag: set current_path_length too

Change-Id: Ie8e8f0b42b05a7d99fc81ad3a57e661758c12533

diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index d2c1d7f..8c9354b 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -890,6 +890,7 @@ struct hash* dep_hash;
 if(current_dir_length == base_dir_length)
 {
 current_dir = base_dir_var;
+current_dir_length = kBASE_DIR_VAR_LENGTH;
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - bridges/source cppu/qa sal/qa

 bridges/source/cpp_uno/gcc3_ios_arm/except.cxx |8 -
 cppu/qa/cppu_cppunittester_all.cxx |  140 --
 cppu/qa/test_any.cxx   |4 
 cppu/qa/test_recursion.cxx |4 
 cppu/qa/test_reference.cxx |4 
 cppu/qa/test_unotype.cxx   |4 
 sal/qa/osl/file/osl_File.cxx   |4 
 sal/qa/osl/file/osl_old_test_file.cxx  |4 
 sal/qa/osl/file/test_cpy_wrt_file.cxx  |4 
 sal/qa/osl/process/osl_Thread.cxx  |4 
 sal/qa/static/makefile.mk  |   68 --
 sal/qa/static/sal_cppunittester_all.cxx|  159 -
 12 files changed, 6 insertions(+), 401 deletions(-)

New commits:
commit 55a8ae6cf6dc67085b78dd213d174ede69a788d5
Author: Tor Lillqvist 
Date:   Wed Aug 1 19:14:02 2012 +0300

WaE: unused variable

Change-Id: I75e195be6bcedc972bc7c820c8c8efb648c91526

diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx 
b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
index eba5d13..6f78313 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
@@ -157,7 +157,9 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription 
*pTypeDescr ) SAL_THR
 {
 pair< t_rtti_map::iterator, bool > insertion(
 m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" );
+SAL_WARN_IF( !insertion.second,
+ "bridges",
+ "inserting new rtti failed" );
 }
 else
 {
@@ -188,7 +190,9 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription 
*pTypeDescr ) SAL_THR
 
 pair< t_rtti_map::iterator, bool > insertion(
 m_generatedRttis.insert( t_rtti_map::value_type( unoName, 
rtti ) ) );
-OSL_ENSURE( insertion.second, "### inserting new generated 
rtti failed?!" );
+SAL_WARN_IF( !insertion.second,
+ "bridges",
+ "inserting new generated rtti failed" );
 }
 else // taking already generated rtti
 {
commit 850d9be56d50a1b143d6afe679808723d6164e21
Author: Tor Lillqvist 
Date:   Wed Aug 1 19:01:00 2012 +0300

Bin no longer used iOS cppunit stuff that breaks build even

Change-Id: I78c71b22816834c66c8283e3d85e357b7b8d2836

diff --git a/cppu/qa/cppu_cppunittester_all.cxx 
b/cppu/qa/cppu_cppunittester_all.cxx
deleted file mode 100644
index 49f1756..000
--- a/cppu/qa/cppu_cppunittester_all.cxx
+++ /dev/null
@@ -1,140 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include 
-#include 
-#include 
-#include 
-#include "protectorfactory.hxx"
-#include "osl/module.h"
-#include "osl/module.hxx"
-#include "osl/thread.h"
-#include "rtl/process.h"
-#include "rtl/string.h"
-#include "rtl/string.hxx"
-#include "rtl/textcvt.h"
-#include "rtl/ustring.hxx"
-#include "sal/main.h"
-#include "sal/types.h"
-
-#include "cppunit/CompilerOutputter.h"
-#include "cppunit/TestResult.h"
-#include "cppunit/TestResultCollector.h"
-#include "cppunit/TestRunner.h"
-#include "cppunit/plugin/TestPlugIn.h"
-#include "cppunit/plugin/PlugInParameters.h"
-#include "cppunit/extensions/TestFactoryRegistry.h"
-#include "cppunit/portability/Stream.h"
-#include "cppunit/plugin/DynamicLibraryManagerException.h"
-
-#include "boost/noncopyable.hpp"
-
-namespace {
-
-void usageFailure() {
-std::cerr
-<< ("Usage: cppunittester (--protector "
-" )* ")
-<< std::endl;
-std::exit(EXIT_FAILURE);
-}
-
-rtl::OUString getArgument(sal_Int32 index) {
-rtl::OUString arg;
-rtl_getAppCommandArg(index, &arg.pData);
-return arg;
-}
-
-std::string convertLazy(rtl::OUString const & s16) {
-rtl::OString s8(rtl::OUStringToOString(s16, osl_getThreadTextEncoding()));
-return std::string(
-s8.getStr(),
-((static_cast< sal_uInt32

Re: [PUSHED 3-6] resolved fdo#53012 crash in CSV fixed width import


On 08/01/2012 03:29 PM, Michael Meeks wrote:

That aside - I've never been a big fan of the "crash on bad input" mode
of OUString::copy() that seems incredibly lame to me. Is there any
convincing performance reason that anyone can work out for not just
returning an empty string in these cases ? ie. create a new rtl _copy
method that does the checking out-of-line in the method: I wonder how
common the case of copy() a full string is that we in-line the check for
that.


make rtl::OUString::copy(beginIndex, count) clip to [0..length)?  yeah, 
why not  (then again, -1's sentinel nature, cf. indexOf, might mean that 
silent clipping of beginIndex=-1 to beginIndex=0 is unfortunate)


Stephan

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

Problem building on Mac OS X 10.7

2012-08-01 Thread Niklas Johansson


Hi

I'm, having some troubles building LibreOffice on Mac OS X 10.7 using 
Xcode 4.3.3

with "Command line tools" installed.
I started out with Stephan Bergmans script [1]. Unfortunately I don't 
have much space
on my internal hard drive so I had to adapt the script a bit exchangeing 
${HOME?} with

"/Volumes/hfs+/git" see attachment for all of the changes I made.

Build breaks for me in officecfg see attached build_error.log. Not sure 
what I am missing.


Any help/pointers would be much appreciated.

Regards,
Niklas


[1] 
https://wiki.documentfoundation.org/index.php?title=Development/Building_LibreOffice_with_Clang&oldid=53881#Example_setup
log for /Volumes/hfs+/git/lo/core/officecfg/prj
/Volumes/hfs+/git/lo/core/solenv/gbuild/Package.mk:44: *** gb_Deliver_deliver: 
file does not exist in solver, and cannot be delivered: 
/Volumes/hfs+/git/lo/core/solver/unxmacxi/bin/cfgex.  Stop.
make[2]: *** Waiting for unfinished jobs
log for /Volumes/hfs+/git/lo/core/sal/prj
[ build DEP ] LNK:CppunitTest/libtest_sal_rtl_math.dylib
[ build DEP ] LNK:CppunitTest/libtest_sal_osl_setthreadname.dylib
[ build DEP ] LNK:CppunitTest/libtest_sal_osl_profile.dylib
[ build DEP ] LNK:CppunitTest/libtest_sal_osl_mutex.dylib
[ build DEP ] LNK:CppunitTest/libtest_sal_types.dylib
[ build DEP ] LNK:CppunitTest/libtest_sal_tcwf.dylib
[ build DEP ] LNK:CppunitTest/libtest_sal_rtl_strings.dylib
[ build DEP ] LNK:CppunitTest/libtest_sal_rtl_oustringbuffer.dylib
[ build DEP ] LNK:CppunitTest/libtest_sal_rtl_ostringbuffer.dylib
[ build DEP ] LNK:CppunitTest/libtest_sal_rtl_locale.dylib
[ build DEP ] LNK:CppunitTest/libtest_sal_rtl_doublelock.dylib
[ build DEP ] LNK:CppunitTest/libtest_sal_rtl_crc32.dylib
[ build DEP ] LNK:CppunitTest/libtest_sal_rtl_cipher.dylib
[ build DEP ] LNK:CppunitTest/libtest_sal_rtl_alloc.dylib
[ build DEP ] LNK:CppunitTest/libtest_sal_osl_process.dylib
[ build DEP ] LNK:CppunitTest/libtest_sal_osl_thread.dylib
[ build DEP ] LNK:CppunitTest/libtest_sal_osl_security.dylib
[ build DEP ] LNK:CppunitTest/libtest_sal_osl_old_test_file.dylib
[ build DEP ] LNK:CppunitTest/libtest_sal_osl_module.dylib
[ build DEP ] LNK:CppunitTest/libtest_sal_osl_file.dylib
[ build DEP ] LNK:CppunitTest/libtest_sal_osl_condition.dylib
[ build DEP ] LNK:CppunitTest/libtest_sal_checkapi.dylib
[ build DEP ] LNK:CppunitTest/libtest_sal_bytesequence.dylib
[ build DEP ] LNK:CppunitTest/libtest_Module_DLL.dylib
[ build DEP ] LNK:StaticLibrary/libsalcpprt.a
[ build DEP ] LNK:Library/libsal_textenc.dylib
[ build DEP ] LNK:Library/libuno_sal.dylib
[ build DEP ] LNK:Executable/cppunit/cppunittester
[ build DEP ] LNK:Executable/osl_process_child
[ info  ALL ] LinkTarget Library/libpthread.dylib not defined: Assuming headers 
to be there!
[ info  ALL ] LinkTarget Library/libcppunit.dylib not defined: Assuming headers 
to be there!
[ build SLC ] sal
[ build ECH ] CustomTarget/sal/generated/sal/udkversion.h
[ build ECH ] CustomTarget/sal/generated/sal/typesizes.h
[ build ECH ] CustomTarget/sal/allheaders/sal_allheaders.hxx
[ build SLC ] loaded modules: sal
[ build CUS ] sal/generated
[ build CUS ] sal/allheaders
[ build PKG ] sal_generated
[ build PKG ] sal_inc
[ build CXX ] sal/osl/all/debugbase.cxx
[ build CXX ] sal/osl/all/loadmodulerelative.cxx
[ build CXX ] sal/osl/all/log.cxx
[ build CXX ] sal/osl/all/trace.cxx
[ build CXX ] sal/osl/all/utility.cxx
[ build CXX ] sal/rtl/source/alloc_arena.cxx
[ build CXX ] sal/rtl/source/alloc_cache.cxx
[ build CXX ] sal/rtl/source/alloc_fini.cxx
[ build CXX ] sal/rtl/source/alloc_global.cxx
[ build CXX ] sal/rtl/source/bootstrap.cxx
[ build CXX ] sal/rtl/source/byteseq.cxx
[ build CXX ] sal/rtl/source/cipher.cxx
[ build CXX ] sal/rtl/source/cmdargs.cxx
[ build CXX ] sal/rtl/source/crc.cxx
[ build CXX ] sal/rtl/source/digest.cxx
[ build CXX ] sal/rtl/source/hash.cxx
[ build CXX ] sal/rtl/source/locale.cxx
[ build CXX ] sal/rtl/source/logfile.cxx
[ build CXX ] sal/rtl/source/math.cxx
[ build CXX ] sal/rtl/source/memory.cxx
[ build CXX ] sal/rtl/source/random.cxx
[ build CXX ] sal/rtl/source/rtl_process.cxx
[ build CXX ] sal/rtl/source/strbuf.cxx
[ build CXX ] sal/rtl/source/strimp.cxx
[ build CXX ] sal/rtl/source/string.cxx
[ build CXX ] sal/rtl/source/unload.cxx
[ build CXX ] sal/rtl/source/uri.cxx
[ build CXX ] sal/rtl/source/ustrbuf.cxx
[ build CXX ] sal/rtl/source/ustring.cxx
[ build CXX ] sal/rtl/source/uuid.cxx
[ build CXX ] sal/textenc/converter.cxx
[ build CXX ] sal/textenc/convertsimple.cxx
[ build CXX ] sal/textenc/handleundefinedunicodetotextchar.cxx
[ build CXX ] sal/textenc/tcvtutf8.cxx
[ build CXX ] sal/textenc/tencinfo.cxx
[ build CXX ] sal/textenc/textcvt.cxx
[ build CXX ] sal/textenc/textenc.cxx
[ build CXX ] sal/textenc/unichars.cxx
[ build C   ] sal/osl/all/filepath.c
[ build CXX ] sal/osl/unx/conditn.cxx
[ build CXX ] sal/osl/unx/file.cxx
[ build CXX ] sal/osl/unx/file_error_transl.cxx
[ build CXX ] sal/osl/unx/file_misc.cxx
[ build CXX ] sal/osl/unx/file_path_helper.cxx
[ build CXX ] sal/

[Libreoffice-commits] .: 3 commits - svtools/source vcl/inc vcl/source

 svtools/source/brwbox/ebbcontrols.cxx |   25 +--
 vcl/inc/vcl/button.hxx|   33 ++
 vcl/source/control/button.cxx |   43 --
 3 files changed, 36 insertions(+), 65 deletions(-)

New commits:
commit ff54a3c291b8aa104992a0285207166cf25ddd86
Author: Noel Power 
Date:   Wed Aug 1 17:01:44 2012 +0100

simpler fix fo fdo#51336 - change vcl checkbox no-label behaviour

Change-Id: I1563dc2afc49c7b1115192db00fbd08a7524154e

diff --git a/svtools/source/brwbox/ebbcontrols.cxx 
b/svtools/source/brwbox/ebbcontrols.cxx
index 1d7b025..fd607f2 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -268,6 +268,7 @@ namespace svt
 EnableChildTransparentMode();
 
 pBox = new TriStateBox(this,WB_CENTER|WB_VCENTER);
+pBox->SetLegacyNoTextAlign( true );
 pBox->EnableChildTransparentMode();
 pBox->SetPaintTransparent( sal_True );
 pBox->SetClickHdl( LINK( this, CheckBoxControl, OnClick ) );
diff --git a/vcl/inc/vcl/button.hxx b/vcl/inc/vcl/button.hxx
index 9c5d6a3..9daf41a 100644
--- a/vcl/inc/vcl/button.hxx
+++ b/vcl/inc/vcl/button.hxx
@@ -292,7 +292,11 @@ private:
 sal_BoolmbRadioCheck;
 sal_BoolmbStateChanged;
 LinkmaToggleHdl;
-
+// when mbLegacyNoTextAlign is set then the old behaviour where
+// the WB_LEFT, WB_RIGHT & WB_CENTER affect the image placement
+// occurs, otherwise the image ( radiobutton circle ) is placed
+// to the left or right ( depending on RTL or LTR settings )
+boolmbLegacyNoTextAlign;
 SAL_DLLPRIVATE void ImplInitRadioButtonData();
 SAL_DLLPRIVATE WinBits  ImplInitStyle( const Window* pPrevWindow, WinBits 
nStyle );
 SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool 
bForeground, sal_Bool bBackground );
@@ -409,7 +413,11 @@ private:
 TriStatemeSaveValue;
 sal_BoolmbTriState;
 LinkmaToggleHdl;
-
+// when mbLegacyNoTextAlign is set then the old behaviour where
+// the WB_LEFT, WB_RIGHT & WB_CENTER affect the image placement
+// occurs, otherwise the image ( checkbox box ) is placed
+// to the left or right ( depending on RTL or LTR settings )
+boolmbLegacyNoTextAlign;
 SAL_DLLPRIVATE void ImplInitCheckBoxData();
 SAL_DLLPRIVATE WinBits  ImplInitStyle( const Window* pPrevWindow, 
WinBits nStyle );
 SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool 
bForeground, sal_Bool bBackground );
@@ -481,6 +489,8 @@ public:
 
 voidSetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; }
 const Link& GetToggleHdl() const { return maToggleHdl; }
+boolIsLegacyNoTextAlign() { return mbLegacyNoTextAlign; }
+voidSetLegacyNoTextAlign( bool bVal ) { mbLegacyNoTextAlign = 
bVal; }
 };
 
 inline void CheckBox::Check( sal_Bool bCheck )
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 1770bf8..37752bb 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -2193,9 +2193,9 @@ void RadioButton::ImplDraw( OutputDevice* pDev, sal_uLong 
nDrawFlags,
 }
 else
 {
-if ( nWinStyle & WB_CENTER )
+if ( mbLegacyNoTextAlign && ( nWinStyle & WB_CENTER ) )
 rStateRect.Left() = 
rPos.X()+((rSize.Width()-rImageSize.Width())/2);
-else if ( nWinStyle & WB_RIGHT )
+else if ( mbLegacyNoTextAlign && ( nWinStyle & WB_RIGHT ) )
 rStateRect.Left() = rPos.X()+rSize.Width()-rImageSize.Width(); 
//-1;
 else
 rStateRect.Left() = rPos.X(); //+1;
@@ -2421,7 +2421,7 @@ void RadioButton::ImplCallClick( sal_Bool bGrabFocus, 
sal_uInt16 nFocusFlags )
 // ---
 
 RadioButton::RadioButton( Window* pParent, WinBits nStyle ) :
-Button( WINDOW_RADIOBUTTON )
+Button( WINDOW_RADIOBUTTON ), mbLegacyNoTextAlign( false )
 {
 ImplInitRadioButtonData();
 ImplInit( pParent, nStyle );
@@ -2430,7 +2430,7 @@ RadioButton::RadioButton( Window* pParent, WinBits nStyle 
) :
 // ---
 
 RadioButton::RadioButton( Window* pParent, const ResId& rResId ) :
-Button( WINDOW_RADIOBUTTON )
+Button( WINDOW_RADIOBUTTON ), mbLegacyNoTextAlign( false )
 {
 ImplInitRadioButtonData();
 rResId.SetRT( RSC_RADIOBUTTON );
@@ -3256,9 +3256,9 @@ void CheckBox::ImplDraw( OutputDevice* pDev, sal_uLong 
nDrawFlags,
 }
 else
 {
-if ( nWinStyle & WB_CENTER )
+if ( mbLegacyNoTextAlign && ( nWinStyle & WB_CENTER ) )
 rStateRect.Left() = 
rPos.X()+((rSize.Width()-rImageSize.Width())/2);
-else if ( nWinStyle & WB_RIGHT )
+else i

Re: double rendering of borders ...


Hi Michael,

On 01.08.2012 13:24, Michael Meeks wrote:

I was at GUADEC just now, and trying to get toolbar rendering sorted
out for gtk3 - which turned out to be quite 'fun' ;-) it seems that the
toolbar items we have have a WB_BORDER style set which appears to create
a strange border rendering widget; which renders the entire toolbar
combo-box (eg. the font selector) twice at least. Quite apart from the
wastefulness there, with the new alpha transparent borders - we get a
double compositing which over-darkens the pretty alpha effects there :-)


With gtk3 I see similar effect for normal (not toolbar) buttons, edits 
etc. Why do you think this is related to toolbars?


I solved the problem by the following change in renderAreaToPix: 
cairo_data[x*4+0] * alpha


@@ -972,9 +972,9 @@ void GtkSalGraphics::renderAreaToPix( cairo_t *cr,
 for (int x = 0; x < awidth && y < aheight; ++x)
 {
 double alpha = ((float)cairo_data[x*4 + 3])/255.0;
-src[x*3 + 0] = src[x*3 + 0] * (1.0 - alpha) + 
cairo_data[x*4+0] * alpha;
-src[x*3 + 1] = src[x*3 + 1] * (1.0 - alpha) + 
cairo_data[x*4+1] * alpha;
-src[x*3 + 2] = src[x*3 + 2] * (1.0 - alpha) + 
cairo_data[x*4+2] * alpha;
+src[x*3 + 0] = src[x*3 + 0] * (1.0 - alpha) + 
cairo_data[x*4+0];
+src[x*3 + 1] = src[x*3 + 1] * (1.0 - alpha) + 
cairo_data[x*4+1];
+src[x*3 + 2] = src[x*3 + 2] * (1.0 - alpha) + 
cairo_data[x*4+2];

 }
 src += nStride;
 cairo_data += cairo_stride;

no idea of what's going on though, because I'm not familiar with alpha 
blending.


HTH,

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

[Libreoffice-commits] .: Branch 'feature/unitymenus' - vcl/inc vcl/unx

2012-08-01 Thread Antonio Fernandez

 vcl/inc/unx/gtk/gtksalmenu.hxx|   25 ++
 vcl/unx/gtk/app/gtkinst.cxx   |9 -
 vcl/unx/gtk/window/gtksalmenu.cxx |  340 ++
 3 files changed, 264 insertions(+), 110 deletions(-)

New commits:
commit fd842d453953c44a30db6c46d7b63aca8994daeb
Author: Antonio Fernandez 
Date:   Wed Aug 1 16:52:50 2012 +0100

Internal native menu is created in steps, but is incomplete at the moment.

Change-Id: I323b80b74218be853fe2893b3f328ff3ef74d4cb

diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 69fcec8..65c2bc8 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -35,22 +35,29 @@
 #include 
 #include 
 
+#include 
+
+class GtkSalMenuItem;
+class GtkSalMenuSection;
 
 class GtkSalMenu : public SalMenu
 {
 private:
+
 sal_BoolmbMenuBar;
 
-virtual void publishMenu();
+virtual void publishMenu( GMenuModel* );
 
 public:
+std::vector< GtkSalMenuSection* >   maSections;
+std::vector< GtkSalMenuItem* >  maItems;
+GtkSalMenuSection*  mpCurrentSection;
+
 Menu*   mpVCLMenu;
 const GtkSalFrame*  mpFrame;
-GMenuModel* mpParentMenuModel;
-GMenuModel* mpMenuModel;
-GMenuModel* mpSectionMenuModel;
 gchar*  aDBusMenubarPath;
 GDBusConnection*pSessionBus;
+sal_Int32   mBusId;
 sal_Int32   mMenubarId;
 
 GtkSalMenu( sal_Bool bMenuBar );
@@ -72,6 +79,16 @@ public:
 virtual void Freeze();
 };
 
+class GtkSalMenuItem;
+
+class GtkSalMenuSection
+{
+public:
+std::vector< GtkSalMenuItem* >  maItems;
+
+virtual ~GtkSalMenuSection();
+};
+
 class GtkSalMenuItem : public SalMenuItem
 {
 public:
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index e8ec95a..dceca0d 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -530,23 +530,20 @@ SalMenu* GtkInstance::CreateMenu( sal_Bool bMenuBar, 
Menu* pVCLMenu )
 void GtkInstance::DestroyMenu( SalMenu* pMenu )
 {
 (void)pMenu;
+delete pMenu;
 OSL_ENSURE( pMenu == 0, "DestroyMenu called with non-native menus" );
 }
 
 SalMenuItem* GtkInstance::CreateMenuItem( const SalItemParams* pItemData )
 {
-GtkSalMenuItem *pMenuItem = NULL;
-
-//if (pItemData->eType != MENUITEM_SEPARATOR) {
-pMenuItem = new GtkSalMenuItem( pItemData );
-//}
-
+GtkSalMenuItem *pMenuItem = new GtkSalMenuItem( pItemData );
 return static_cast( pMenuItem );
 }
 
 void GtkInstance::DestroyMenuItem( SalMenuItem* pItem )
 {
 (void)pItem;
+//delete pItem;
 OSL_ENSURE( pItem == 0, "DestroyMenu called with non-native menus" );
 }
 
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx 
b/vcl/unx/gtk/window/gtksalmenu.cxx
index 9c3acdd..f612a23 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -20,35 +20,7 @@ quit (GSimpleAction *action,
 exit(1);
 }
 
-void
-gdk_x11_window_set_utf8_property  (GdkWindow *window,
-   const gchar *name,
-   const gchar *value)
-{
-  GdkDisplay *display;
-
-  //if (!WINDOW_IS_TOPLEVEL (window))
-//return;
-
-  display = gdk_window_get_display (window);
-
-  if (value != NULL)
-{
-  XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
-   GDK_WINDOW_XID (window),
-   gdk_x11_get_xatom_by_name_for_display (display, name),
-   gdk_x11_get_xatom_by_name_for_display (display, 
"UTF8_STRING"), 8,
-   PropModeReplace, (guchar *)value, strlen (value));
-}
-  else
-{
-  XDeleteProperty (GDK_DISPLAY_XDISPLAY (display),
-   GDK_WINDOW_XID (window),
-   gdk_x11_get_xatom_by_name_for_display (display, name));
-}
-}
-
-GMenuModel* generateMenuModel( Menu *pVCLMenu )
+GMenuModel* generateMenuModel2( Menu *pVCLMenu )
 {
 if (!pVCLMenu)
 return NULL;
@@ -65,13 +37,17 @@ GMenuModel* generateMenuModel( Menu *pVCLMenu )
 } else {
 sal_Int16 nId = pVCLMenu->GetItemId( i );
 
+// Menu item label
 rtl::OUString aTextLabel = pVCLMenu->GetItemText( nId );
 rtl::OUString aText = aTextLabel.replace( '~', '_' );
 rtl::OString aConvertedText = OUStringToOString(aText, 
RTL_TEXTENCODING_UTF8);
 
+// Menu item accelerator key
+//KeyCode accelKey = pVCLMenu->GetAccelKey( nId );
+
 GMenuItem *menuItem = g_menu_item_new( (char*) 
aConvertedText.getStr(), NULL);
 
-GMenuModel *pSubmenu = generateMenuModel( pVCLMenu->GetPopupMenu( 
nId ) );
+GMenuModel *pSubmenu = generateMenuModel2( pVCLMenu->GetPopupMenu( 
nId ) );
 
 g_menu_item_set_submenu( menuItem, pSubmenu );
 
@@ -84,16 +60,117 @@ GMenuModel* generat

Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values

2012-08-01 Thread anwen

Hi Eike,

Thank you for your quick and nice response. I am checking out the events and
classes you recommended. Here is a minor remind that modified() is a method
of XResultListener (not XVolatileResult). It is implemented in Calc by
SCAddInListener class.

Best,
Wendi


Eike Rathke-2 wrote
> 
> Hi anwen,
> 
> On Tuesday, 2012-07-31 08:30:30 -0700, anwen wrote:
> 
>> Eike, I agree with you that the listeners are destroyed during document
>> close. I observed it in my log file. However, the worker thread is
>> running
>> asynchronously if not calling the listeners' modified function. How can
>> it
>> know that the document is closed, stop calling the modified function, and
>> quit itself gracefully. So in the first post, I asked if there is a
>> signal
>> which announces that the document is closed.
> 
> There are two events that could be used, OnPrepareUnload that afair is
> vetoable so your application could finish something it needs the
> document for, and the unconditional OnUnload event. For both events you
> could switch off calling the corresponding modified() when received.
> 
> For general handling see
> http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Document_Events
> 
> However, that's a bit outdated and instead of the deprecated
> XEventBroadcaster and XEventListener the successors
> XDocumentEventBroadcaster and XDocumentEventListener interfaces should
> be used, see
> http://api.libreoffice.org/common/ref/com/sun/star/document/XDocumentEventBroadcaster.html
> 
> 
> Still, for the apparent race condition I'd like to see if Calc's
> XVolatileResult::modified() implementation could be changed such that in
> case the corresponding document is in close the mutex isn't attempted to
> be locked anymore.
> 
> 
>> Please correct me if there is something wrong with my thought.
> 
> No, nothing :-)
> 
>   Eike
> 
> -- 
> LibreOffice Calc developer. Number formatter stricken i18n
> transpositionizer.
> GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD
> 
> ___
> LibreOffice mailing list
> LibreOffice@.freedesktop
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
> 




--
View this message in context: 
http://nabble.documentfoundation.org/Solarmutex-Deadlock-when-Closing-Calc-which-contains-functions-with-XVolatileResult-return-values-tp3998056p3998808.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] .: oox/source

 oox/source/helper/propertymap.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e3c2e0fab67bbb812e8c693aab987fb5c374e5e0
Author: Stephan Bergmann 
Date:   Wed Aug 1 16:51:39 2012 +0200

-Werror,-Wformat

Change-Id: Ie6fbcb1a11f47b54d3c697716b03f9891a1dea49

diff --git a/oox/source/helper/propertymap.cxx 
b/oox/source/helper/propertymap.cxx
index 445125e..a7bace4 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -342,9 +342,9 @@ static void lclDumpAnyValue( Any value)
 } else if( value >>= aMatrix ) {
 fprintf (stderr,"Matrix\n%f %f %f\n%f %f %f\n%f %f %f\n", 
aMatrix.Line1.Column1, aMatrix.Line1.Column2, aMatrix.Line1.Column3, 
aMatrix.Line2.Column1, aMatrix.Line2.Column2, aMatrix.Line2.Column3, 
aMatrix.Line3.Column1, aMatrix.Line3.Column2, aMatrix.Line3.Column3);
 } else if( value >>= intValue )
-fprintf (stderr,"%d(hex: %x)\n", intValue, intValue);
+fprintf (stderr,"%" SAL_PRIdINT32 "(hex: %" 
SAL_PRIxUINT32 ")\n", intValue, intValue);
 else if( value >>= uintValue )
-fprintf (stderr,"%d(hex: %x)\n", uintValue, uintValue);
+fprintf (stderr,"%" SAL_PRIuUINT32 "(hex: %" 
SAL_PRIxUINT32 ")\n", uintValue, uintValue);
 else if( value >>= int16Value )
 fprintf (stderr,"%d(hex: %x)\n", int16Value, 
int16Value);
 else if( value >>= uint16Value )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Convert documents to follow the doxygen standard

2012-08-01 Thread Jan Holesovsky

Hi Norah,

On 2012-08-01 at 07:04 +, Gerrit wrote:

> Norah A. Abanumay has abandoned this change.

Not sure if you intended to throw the patch away completely ;-) I have
manually edited that to fit the needs, and pushed that, thank you a lot
for the patch! Please see here what went in:

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

Can you please send a license statement to this list, stating that your
work may be licensed under the dual MPL / LGPLv3+ license? I do not see
you here:

http://wiki.documentfoundation.org/Development/Developers

Regarding the commits, I recommend you to do

git log -p

before each push [to gerrit or elsewhere], and fix any problems that you
can see there yourself [because you can be sure the others will see the
same problems too ;-)]. Before you push, you can for example just edit
the file in question (eg. a.cxx), and do 'git commit --amend a.cxx' -
that will fix the commit immediately.

BTW, there is probably something wrong with your editor, because it
added the executable bit to the files (which is wrong). Also please do
not use google translate to translate the German comments, there are
German-speaking volunteers around who are willing to provide the
translations, no need for the machine translating :-)

Looking forward to more patches, it is great to see the correct
annotation of the comments coming in!

All the best,
Kendy

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

Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values

Hi anwen,

On Tuesday, 2012-07-31 08:30:30 -0700, anwen wrote:

> Eike, I agree with you that the listeners are destroyed during document
> close. I observed it in my log file. However, the worker thread is running
> asynchronously if not calling the listeners' modified function. How can it
> know that the document is closed, stop calling the modified function, and
> quit itself gracefully. So in the first post, I asked if there is a signal
> which announces that the document is closed.

There are two events that could be used, OnPrepareUnload that afair is
vetoable so your application could finish something it needs the
document for, and the unconditional OnUnload event. For both events you
could switch off calling the corresponding modified() when received.

For general handling see
http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Document_Events

However, that's a bit outdated and instead of the deprecated
XEventBroadcaster and XEventListener the successors
XDocumentEventBroadcaster and XDocumentEventListener interfaces should
be used, see
http://api.libreoffice.org/common/ref/com/sun/star/document/XDocumentEventBroadcaster.html


Still, for the apparent race condition I'd like to see if Calc's
XVolatileResult::modified() implementation could be changed such that in
case the corresponding document is in close the mutex isn't attempted to
be locked anymore.


> Please correct me if there is something wrong with my thought.

No, nothing :-)

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpcRdgliwxFa.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Proposal/Prototype support for "fill in character" in Calc Number Format Strings // final patch set // verbose edition

2012-08-01 Thread Johann Messner

hello Noel,
[Cc to Philipp],

I tried to prepare a more "verbose" edition of the 
patch set (and especially of the minor modifications
by myself) ... please see

   https://linux.jku.at/messner/LibreOffice/
   (-> patchInfo-31-Jul-2012__for_libreoffice.3.5.3-verbose.txt )

This file should be acceptable to the 'patch' command on a
box with the very same src tree (libreoffice 3.5.3). However,
since you're a developer you use a more advanced version of the libreoffice
source code. You will have to examine (and eventually adopt in a 
cleaned up fashion) some of the code pieces very carefully..

regards,
hans


Am Di, 31.Jul.12, KW31 (18:27:42 Uhr) schrieb Noel Power :
> On 31/07/12 16:59, Johann Messner wrote:
> >Hi Noel,
> >
> >I managed to use and learn from your patches published in the
> >thread 28410 on 
> >http://thread.gmane.org/gmane.comp.documentfoundation.libreoffice.devel/
> >Some minor modifications were useful to close some gaps (glitches).
> >
> >Please get my "final" patch info set for my local libreoffice-3.5.3
> >file tree on
> >
> >https://linux.jku.at/messner/LibreOffice/
> >(-> file:  patchInfo-31-Jul-2012__for_libreoffice.3.5.3.txt  )
> >
> >Please have a look at the modifications and adopt them if you
> >feel they are useful.
> I am sure your changes are useful :-)), however it would be just great 
> if possible that you could provide a diff that just shows the 
> differences between the patch set you based your changes on and what 
> your final version. That would allow me to really easily see what 
> changes you made. Any verbose to describe the changes would of course be 
> welcome too
> >
> >I will be on holiday for the next 2 weeks ...
> >
> enjoy !!
> 
> Noel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

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

New commits:
commit 58b45e3052938d55458cc0c1300bf234ca4f39d6
Author: Petr Mladek 
Date:   Wed Aug 1 16:14:31 2012 +0200

bump product version to 3.5.6-rc1+

Change-Id: Ib0bc5dc9ee9a8010e2b051ba44dc419edd4befec

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index a354d02..6e3652e 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -53,13 +53,13 @@ LibreOffice
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION rc0
+   SHORT_PRODUCTEXTENSION rc1
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.5.6
-   ABOUTBOXPRODUCTVERSIONSUFFIX .0+
+   ABOUTBOXPRODUCTVERSIONSUFFIX .1+
BASEPRODUCTVERSION 3.5
 PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
@@ -112,13 +112,13 @@ LibreOffice_wJRE
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION rc0
+   SHORT_PRODUCTEXTENSION rc1
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.5.6
-   ABOUTBOXPRODUCTVERSIONSUFFIX .0+
+   ABOUTBOXPRODUCTVERSIONSUFFIX .1+
BASEPRODUCTVERSION 3.5
UPDATEURL http://update.libreoffice.org/check.php
ADD_INCLUDE_FILES 
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
@@ -170,14 +170,14 @@ LibreOffice_Dev
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION rc0
+   SHORT_PRODUCTEXTENSION rc1
UNIXBASISROOTNAME lodev3.5
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.5.6
-   ABOUTBOXPRODUCTVERSIONSUFFIX .0+
+   ABOUTBOXPRODUCTVERSIONSUFFIX .1+
BASEPRODUCTVERSION 3.5
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
@@ -240,7 +240,7 @@ URE
 PRODUCTEXTENSION
 BRANDPACKAGEVERSION 3.5
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION rc0
+SHORT_PRODUCTEXTENSION rc1
 LICENSENAME LGPL
 SETSTATICPATH 1
 NOVERSIONINDIRNAME 1
@@ -275,7 +275,7 @@ LibreOffice_SDK
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION rc0
+SHORT_PRODUCTEXTENSION rc1
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.5
@@ -318,7 +318,7 @@ LibreOffice_Dev_SDK
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION rc0
+SHORT_PRODUCTEXTENSION rc1
 UNIXBASISROOTNAME lodev3.5
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
@@ -367,7 +367,7 @@ LibreOffice_Test
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION rc0
+SHORT_PRODUCTEXTENSION rc1
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 3.5
@@ -410,7 +410,7 @@ LibreOffice_Dev_Test
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION rc0
+SHORT_PRODUCTEXTENSION rc1
 UNIXBASISROOTNAME lodev3.5
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
@@ -458,13 +458,13 @@ OxygenOffice
PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-   SHORT_PRODUCTEXTENSION  rc0
+   SHORT_PRODUCTEXTENSION  rc1
 POSTVERSIONEXTENSION
 POSTVERSIONEXTEN

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

2012-08-01 Thread Jan Holesovsky

 sd/inc/anminfo.hxx |   40 
 sd/inc/drawdoc.hxx |   12 ++---
 sd/inc/pres.hxx|   32 ++---
 sd/inc/sdpage.hxx  |   60 -
 sd/inc/sdpptwrp.hxx|5 +-
 sd/inc/sdxmlwrp.hxx|6 +-
 sd/inc/shapelist.hxx   |4 -
 sd/source/filter/eppt/epptbase.hxx |2 
 sd/source/filter/eppt/pptexanimations.hxx  |3 -
 sd/source/filter/eppt/pptexsoundcollection.hxx |4 -
 sd/source/filter/ppt/ppt97animations.hxx   |   41 ++---
 sd/source/filter/ppt/pptatom.hxx   |   18 +++
 12 files changed, 121 insertions(+), 106 deletions(-)

New commits:
commit 15a79a36b129d51972c02992248eae88715ddccf
Author: Norah Abanimy 
Date:   Mon Jul 30 10:34:33 2012 +0300

Convert documents to follow the doxygen standard

Change-Id: I9086f6129f61afba6b7d0317248756cde34f075b

diff --git a/sd/inc/anminfo.hxx b/sd/inc/anminfo.hxx
index 2b8379a..605863b 100644
--- a/sd/inc/anminfo.hxx
+++ b/sd/inc/anminfo.hxx
@@ -37,26 +37,26 @@ public:
 PresObjKind mePresObjKind;
 
 /* deprecated animation infos */
-::com::sun::star::presentation::AnimationEffect meEffect;   // 
Animationseffekt
-::com::sun::star::presentation::AnimationEffect meTextEffect;   // 
Animationseffekt fuer Textinhalt
-::com::sun::star::presentation::AnimationSpeed  meSpeed;   
 // Geschwindigkeit der Animation
-sal_BoolmbActive;   // eingeschaltet ?
-sal_BoolmbDimPrevious;  // Objekt abblenden
-sal_BoolmbIsMovie;  // wenn Gruppenobjekt, dann 
Sequenz aus den
-sal_BoolmbDimHide;  // verstecken statt abblenden
-Color   maBlueScreen;   // identifiziert "Hintergrundpixel"
-Color   maDimColor; // zum Abblenden des Objekts
-String  maSoundFile;// Pfad zum Soundfile in 
MSDOS-Notation
-sal_BoolmbSoundOn;  // Sound ein/aus
-sal_BoolmbPlayFull; // Sound ganz abspielen
-SdrPathObj* mpPathObj;  // das Pfadobjekt
-::com::sun::star::presentation::ClickAction meClickAction;  // 
Aktion bei Mausklick
-::com::sun::star::presentation::AnimationEffect meSecondEffect; // 
fuer Objekt ausblenden
-::com::sun::star::presentation::AnimationSpeed  meSecondSpeed;  // 
fuer Objekt ausblenden
-String  maSecondSoundFile; // fuer Objekt ausblenden
-sal_BoolmbSecondSoundOn;// fuer Objekt ausblenden
-sal_BoolmbSecondPlayFull;// fuer Objekt ausblenden
-sal_uInt16  mnVerb; // fuer OLE-Objekt
+::com::sun::star::presentation::AnimationEffect meEffect;   ///< 
Animation effect
+::com::sun::star::presentation::AnimationEffect meTextEffect;   ///< 
Animation effect for text
+::com::sun::star::presentation::AnimationSpeed  meSpeed;///< Speed 
of the animation
+sal_BoolmbActive;   ///< turned on?
+sal_BoolmbDimPrevious;  ///< Object Dim
+sal_BoolmbIsMovie;  ///< wenn Gruppenobjekt, dann 
Sequenz aus den
+sal_BoolmbDimHide;  ///< hide rather than dim
+Color   maBlueScreen;   ///< identifies "background 
pixels"
+Color   maDimColor; ///< zum Abblenden des Objekts
+String  maSoundFile;///< Path to the sound file in 
MS DOS notation
+sal_BoolmbSoundOn;  ///< Sound on / off
+sal_BoolmbPlayFull; ///< Play sound quite
+SdrPathObj* mpPathObj;  ///< The path object
+::com::sun::star::presentation::ClickAction meClickAction;  ///< 
Action at mouse click
+::com::sun::star::presentation::AnimationEffect meSecondEffect; ///< for  
Hidden  object
+::com::sun::star::presentation::AnimationSpeed  meSecondSpeed;  ///< for  
Hidden  object
+String  maSecondSoundFile; ///< for  Hidden  object
+sal_BoolmbSecondSoundOn;///< for  Hidden  object
+sal_BoolmbSecondPlayFull;///< ffor  Hidden  object
+sal_uInt16  mnVerb; ///< for OLE object
 sal_uLong   mnPresOrder;
 SdrObject&  mrObject;
 
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 5063f4b..3e72443 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -146,8 +146,8 @@ namespace sd
 class SdDrawDocument : public FmFormModel
 {
 private:
-::sd::Outliner* mpOutliner;

Re: [PUSHED][REVIEW 3-6] resolved fdo#53012 crash in CSV fixed width import


seems it's pushed already to 3.6

On 01/08/12 13:14, Eike Rathke wrote:

Hi,

Please review and cherry-pick to 3-6
http://cgit.freedesktop.org/libreoffice/core/commit/?id=21cb8210c74e52896ce7fb063f1578b13672f4bd
that fixes https://bugs.freedesktop.org/show_bug.cgi?id=53012

In case we do 3.6.0.5rc we should have it in there as well.
I'd even say this is a blocker, because application crashes as soon as
one selects fixed width and from then on will crash on any CSV import
because the fixed width setting is remembered by the dialog.

Thanks
   Eike



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


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

[Libreoffice-commits] .: xmloff/source

 xmloff/source/style/xmlstyle.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0fc413a327242adc1eb4c196179fdf660229edc9
Author: CaolÃ¡n McNamara 
Date:   Wed Aug 1 15:04:02 2012 +0100

const SvXMLStyleIndexCmp_Impl up

Change-Id: I5bd75e73f2584364bbb749767529efc75aff3d15

diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index f881dec..380dd48 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -246,7 +246,7 @@ public:
 
 struct SvXMLStyleIndexCmp_Impl
 {
-bool operator()(const SvXMLStyleIndex_Impl& r1, const 
SvXMLStyleIndex_Impl& r2)
+bool operator()(const SvXMLStyleIndex_Impl& r1, const 
SvXMLStyleIndex_Impl& r2) const
 {
 sal_Int32 nRet;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [GSOC] Template Dialog - Report

2012-08-01 Thread David Nelson

Hi Rafael,

On Mon, Jul 30, 2012 at 6:04 PM, Rafael Dominguez  wrote:
> - Setup a local alfresco instante to work with the CMIS protocol.

I'm not sure if you're aware of this, but there is a functioning
Alfresco platform at http://alfresco.libreoffice.org running on an
independent VPS.

You'd be welcome to make use of it if you like...

Jeff Potts of the Alfresco project has developed a
publically-accessible interface at http://media.libreoffice.org:8081,
and Cedric Bosdonnat is also working on CMIS and has access to the
platform...

HTH...

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

[PUSHED] Modifying comments to meet doxygen standards

>From Philipp Riemer :

Philipp Riemer has submitted this change and it was merged.

Change subject: Modifying comments to meet doxygen standards
..


Modifying comments to meet doxygen standards

Change-Id: If7c4162a49a7c7b612b6f480f6fbba75727ae1df
---
M sw/inc/dbfld.hxx
M sw/inc/dbmgr.hxx
M sw/inc/dcontact.hxx
M sw/inc/ddefld.hxx
M sw/inc/dlelstnr.hxx
M sw/inc/doc.hxx
6 files changed, 415 insertions(+), 419 deletions(-)

Approvals:
  Philipp Riemer: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I555e029092b453b2276a57fb4d384b18696d6e48
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: abdulmajeed ahmed 
Gerrit-Reviewer: Philipp Riemer 
Gerrit-Reviewer: abdulmajeed ahmed 

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

[PUSHED 3-6] resolved fdo#53012 crash in CSV fixed width import

On Wed, 2012-08-01 at 14:14 +0200, Eike Rathke wrote:
> Please review and cherry-pick to 3-6
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=21cb8210c74e52896ce7fb063f1578b13672f4bd
> that fixes https://bugs.freedesktop.org/show_bug.cgi?id=53012

Done.

> In case we do 3.6.0.5rc we should have it in there as well.
> I'd even say this is a blocker, because application crashes as soon as
> one selects fixed width and from then on will crash on any CSV import
> because the fixed width setting is remembered by the dialog.

Sounds non-ideal :-) makes me wonder if some sort of unit test could be
constructed there, but I guess it's GUI code.

That aside - I've never been a big fan of the "crash on bad input" mode
of OUString::copy() that seems incredibly lame to me. Is there any
convincing performance reason that anyone can work out for not just
returning an empty string in these cases ? ie. create a new rtl _copy
method that does the checking out-of-line in the method: I wonder how
common the case of copy() a full string is that we in-line the check for
that.

ATB,

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

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

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

 sc/source/ui/dbgui/csvgrid.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9229d932de3bd406c58246293f7a12a88e19861c
Author: Eike Rathke 
Date:   Wed Aug 1 13:46:25 2012 +0200

resolved fdo#53012 crash in CSV fixed width import

8cd05e9cf1152b21528c6f1a5bda3d949dc49791 changed from using String to
OUString. ScCsvGrid::ImplSetTextLineFix() attempted to copy excess
characters (always CSV_MAXSTRLEN if greater than field width) where
String::Copy() silently ignored the excess length but OUString::copy()
may result in invalid memory accesses and asserts in dbgutil build.

Change-Id: Ic9f7f38d6f2bbd770d6356e1304de8e39c09e30b
Signed-off-by: Michael Meeks 

diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index 68c6fd9..280d77e 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -809,7 +809,8 @@ void ScCsvGrid::ImplSetTextLineFix( sal_Int32 nLine, const 
rtl::OUString& rTextL
 for( sal_uInt32 nColIx = 0; (nColIx < nColCount) && (nStrIx < nStrLen); 
++nColIx )
 {
 sal_Int32 nColWidth = GetColumnWidth( nColIx );
-rStrVec.push_back( rTextLine.copy( nStrIx, Max( nColWidth, 
static_cast(CSV_MAXSTRLEN) ) ) );
+sal_Int32 nLen = std::min( std::min( nColWidth, 
static_cast(CSV_MAXSTRLEN) ), nStrLen - nStrIx);
+rStrVec.push_back( rTextLine.copy( nStrIx, nLen ) );
 nStrIx = nStrIx + nColWidth;
 }
 InvalidateGfx();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH] gtk: listbox border was not rendered


Hi Luke,

On 01.08.2012 03:29, Luke Symes wrote:

I was the one who made the original patch that set listboxes to integer
heights of the list items, which was reverted for causing trouble. The
reason I wanted to fully show all list items was not because partially
shown list items looked bad. It was because of the work I was doing in
the list of custom animations: when a custom animation list item was
moved to the bottom of the visible list items, I wanted to scroll the
visible area so that the selected list item would remain fully visible.


Sorry, my brain quickly messes things up...


Right now, if the last item is half shown, moving a selected custom
animation list item to that position means it goes partly out of view,
which is bad.


This commit fixes that for me:
http://cgit.freedesktop.org/libreoffice/core/commit/?id=6657052e463b4ff9c8a005faadcf2289d32343a3
Does it look ok to you?


I'm sorry, but I think that the added border looks bad where it goes
beside the scroll bars - see other attached image.


That is how it already looks in Tools - Customize - Events, and how it 
always looked on Windows I guess. Of course in native gtk apps 
scrollbars seem to be always placed outside of a listbox...


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

Re: [PUSHED] gtk: listbox border was not rendered


On 27.07.2012 21:39, Ivan Timofeev wrote:

The problem is in gtk plugin which does some weird things when drawing
a listbox (see the description in the patch).
I have no idea why it does that, git blame shows that it is from the
initial import. It would be great if someone review the patch, I am
absolutely not sure.


tested with various themes, looks good => pushed.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 2 commits - svtools/source vcl/unx

 svtools/source/contnr/svtreebx.cxx   |2 -
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |   40 ---
 2 files changed, 12 insertions(+), 30 deletions(-)

New commits:
commit 6657052e463b4ff9c8a005faadcf2289d32343a3
Author: Ivan Timofeev 
Date:   Wed Aug 1 10:16:49 2012 +0400

consider only fully visible items

Change-Id: I32d88e5206a96b316f29cf4ede04a6ac951d86d5

diff --git a/svtools/source/contnr/svtreebx.cxx 
b/svtools/source/contnr/svtreebx.cxx
index ec7d135..8e37676 100644
--- a/svtools/source/contnr/svtreebx.cxx
+++ b/svtools/source/contnr/svtreebx.cxx
@@ -2308,7 +2308,7 @@ SvLBoxEntry* SvTreeListBox::GetLastEntryInView() const
 {
   Point aPos( GetEntryPosition(pNext) );
   const Size& rSize = pImp->GetOutputSize();
-  if( aPos.Y() < 0 || aPos.Y() >= rSize.Height() )
+  if( aPos.Y() < 0 || aPos.Y() + GetEntryHeight() >= rSize.Height() )
   break;
   else
   pEntry = pNext;
commit 09eb412b2c8c55c9b0a280a61d6fef18ab5c7c18
Author: Ivan Timofeev 
Date:   Fri Jul 27 20:53:32 2012 +0400

gtk: listbox border was not rendered

remove extending of pixmapRect in the nPart == PART_WINDOW branch
and simplify code, since rControlRectangle, pixmapRect and widgetRect
are the same.

Change-Id: I253851fad558e525cd533bb3576a9bba82187e53

diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 2f2158a..4d8ba82 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -2733,15 +2733,13 @@ sal_Bool GtkSalGraphics::NWPaintGTKListBox( 
GdkDrawable* gdkDrawable,
 const ImplControlValue& aValue,
 const OUString& rCaption )
 {
-RectanglepixmapRect;
-RectanglewidgetRect;
 RectangleaIndicatorRect;
 GtkStateTypestateType;
 GtkShadowTypeshadowType;
 gintbInteriorFocus;
 gintnFocusLineWidth;
 gintnFocusPadding;
-gintx,y;
+gintx,y,w,h;
 GdkRectangleclipRect;
 
 NWEnsureGTKButton( m_nXScreen );
@@ -2749,27 +2747,16 @@ sal_Bool GtkSalGraphics::NWPaintGTKListBox( 
GdkDrawable* gdkDrawable,
 NWEnsureGTKScrolledWindow( m_nXScreen );
 NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
 
-// Find the overall bounding rect of the buttons's drawing area,
-// plus its actual draw rect excluding adornment
-pixmapRect = rControlRectangle;
-if ( nPart == PART_WINDOW )
-{
-// Make the widget a _bit_ bigger
-pixmapRect.SetPos( Point( pixmapRect.Left() - 1,
-  pixmapRect.Top() - 1 ) );
-pixmapRect.SetSize( Size( pixmapRect.GetWidth() + 2,
-  pixmapRect.GetHeight() + 2 ) );
-}
-
-widgetRect = pixmapRect;
-x = pixmapRect.Left();
-y = pixmapRect.Top();
-
 // set up references to correct drawable and cliprect
 NWSetWidgetState( gWidgetData[m_nXScreen].gBtnWidget, nState, stateType );
 NWSetWidgetState( gWidgetData[m_nXScreen].gOptionMenuWidget, nState, 
stateType );
 NWSetWidgetState( gWidgetData[m_nXScreen].gScrolledWindowWidget, nState, 
stateType );
 
+x = rControlRectangle.Left();
+y = rControlRectangle.Top();
+w = rControlRectangle.GetWidth();
+h = rControlRectangle.GetHeight();
+
 if ( nPart != PART_WINDOW )
 {
 gtk_widget_style_get( gWidgetData[m_nXScreen].gOptionMenuWidget,
@@ -2790,19 +2777,15 @@ sal_Bool GtkSalGraphics::NWPaintGTKListBox( 
GdkDrawable* gdkDrawable,
 {
 // Listboxes must paint opaque since some themes have 
alpha-channel enabled bodies
 gtk_paint_flat_box( m_pWindow->style, gdkDrawable, 
GTK_STATE_NORMAL, GTK_SHADOW_NONE,
-&clipRect, m_pWindow, "base", x, y,
-pixmapRect.GetWidth(), pixmapRect.GetHeight() 
);
+&clipRect, m_pWindow, "base", x, y, w, h);
 gtk_paint_box( gWidgetData[m_nXScreen].gOptionMenuWidget->style, 
gdkDrawable, stateType, shadowType, &clipRect,
gWidgetData[m_nXScreen].gOptionMenuWidget, 
"optionmenu",
-   x+(widgetRect.Left() - pixmapRect.Left()),
-   y+(widgetRect.Top() - pixmapRect.Top()),
-   widgetRect.GetWidth(), widgetRect.GetHeight() );
-aIndicatorRect = NWGetListBoxIndicatorRect( m_nXScreen, nType, 
nPart, widgetRect, nState,
+   x, y, w, h);
+aIndicatorRect = NWGetListBoxIndicatorRect( m_nXScreen, nType, 
nPart, rControlRectangle, nState,
 aValue, rCaption );
 gtk_paint_tab( gWidgetData[m_nXScreen].gOptionMe

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

 o3tl/inc/o3tl/sorted_vector.hxx   |   11 +--
 o3tl/qa/test-sorted_vector.cxx|6 --
 sw/inc/docary.hxx |2 +-
 sw/inc/ndhints.hxx|4 ++--
 sw/source/filter/html/htmlfly.hxx |3 ++-
 sw/source/ui/utlui/content.cxx|3 ++-
 6 files changed, 16 insertions(+), 13 deletions(-)

New commits:
commit 8291d41667b1a63d35bf818aaf9d75529e1f12f0
Author: Michael Stahl 
Date:   Wed Aug 1 14:41:43 2012 +0200

Revert "sorted_vector: turn Find parameter into template"

This reverts commit 3e3acee762fac71f7356ed1305a64e0278278081.

It was a nice idea, but C++ is not yet ready for it; with the travesty
of parametric polymorphism in C++ the find_unique inside the definition
of find_unique actually refers to find_unique, so there
is no way to actually refer to template find_unique
inside its definition.  Thanks to LuboÅ¡ LuÅÃ¡k for explaining
the problem to me.  Somehow this does work in GCC 4.7 even with
-std=c++98, likely by accident.

diff --git a/o3tl/inc/o3tl/sorted_vector.hxx b/o3tl/inc/o3tl/sorted_vector.hxx
index 6f444d9..4d442dd 100644
--- a/o3tl/inc/o3tl/sorted_vector.hxx
+++ b/o3tl/inc/o3tl/sorted_vector.hxx
@@ -27,13 +27,12 @@ struct find_unique;
 @tpl Compare comparison method
 @tpl Find   look up index of a Value in the array
 */
-template,
- template class Find = find_unique >
+template,
+ class Find = find_unique >
 class sorted_vector
 : private std::vector
 {
 private:
-typedef Find Find_t;
 typedef typename std::vector base_t;
 typedef typename std::vector::iterator  iterator;
 public:
@@ -48,7 +47,7 @@ public:
 
 std::pair insert( const Value& x )
 {
-std::pair const ret(Find_t()(begin(), end(), x));
+std::pair const ret(Find()(begin(), end(), x));
 if (!ret.second)
 {
 const_iterator const it = base_t::insert(
@@ -60,7 +59,7 @@ public:
 
 size_type erase( const Value& x )
 {
-std::pair const ret(Find_t()(begin(), end(), x));
+std::pair const ret(Find()(begin(), end(), x));
 if (ret.second)
 {
 base_t::erase(begin_nonconst() + (ret.first - begin()));
@@ -130,7 +129,7 @@ public:
  */
 const_iterator find( const Value& x ) const
 {
-std::pair const ret(Find_t()(begin(), end(), x));
+std::pair const ret(Find()(begin(), end(), x));
 return (ret.second) ? ret.first : end();
 }
 
diff --git a/o3tl/qa/test-sorted_vector.cxx b/o3tl/qa/test-sorted_vector.cxx
index 8e9e719..1b321c9 100644
--- a/o3tl/qa/test-sorted_vector.cxx
+++ b/o3tl/qa/test-sorted_vector.cxx
@@ -136,7 +136,8 @@ public:
 void testBasics_FindPtr()
 {
 o3tl::sorted_vector,
-o3tl::find_partialorder_ptrequals> aVec;
+o3tl::find_partialorder_ptrequals > > aVec;
 SwContent *p1 = new SwContent(1);
 SwContent *p2 = new SwContent(2);
 SwContent *p2_2 = new SwContent(2);
@@ -194,7 +195,8 @@ public:
 void testErase_FindPtr()
 {
 o3tl::sorted_vector,
-o3tl::find_partialorder_ptrequals> aVec;
+o3tl::find_partialorder_ptrequals > > aVec;
 SwContent *p1 = new SwContent(1);
 SwContent *p1_2 = new SwContent(1);
 SwContent *p1_3 = new SwContent(1);
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 4f9b9af..7c9f928 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -145,7 +145,7 @@ struct CompareSwRedlineTbl
 };
 class _SwRedlineTbl
 : public o3tl::sorted_vector
+o3tl::find_partialorder_ptrequals >
 {
 public:
 ~_SwRedlineTbl();
diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx
index 773bb1f..154c957 100644
--- a/sw/inc/ndhints.hxx
+++ b/sw/inc/ndhints.hxx
@@ -76,14 +76,14 @@ struct CompareSwpHtStart
 bool operator()(SwTxtAttr* const lhs, SwTxtAttr* const rhs) const;
 };
 class SwpHtStart : public o3tl::sorted_vector {};
+o3tl::find_partialorder_ptrequals > {};
 
 struct CompareSwpHtEnd
 {
 bool operator()(SwTxtAttr* const lhs, SwTxtAttr* const rhs) const;
 };
 class SwpHtEnd : public o3tl::sorted_vector {};
+o3tl::find_partialorder_ptrequals > {};
 
 // Class SwpHintsArr
 
diff --git a/sw/source/filter/html/htmlfly.hxx 
b/sw/source/filter/html/htmlfly.hxx
index 8184d5c..19b14e0 100644
--- a/sw/source/filter/html/htmlfly.hxx
+++ b/sw/source/filter/html/htmlfly.hxx
@@ -130,7 +130,8 @@ public:
 class SwHTMLPosFlyFrms
 : public o3tl::sorted_vector,
-o3tl::find_partialorder_ptrequals>
+o3tl::find_partialorder_ptrequals > >
 {};
 
 #endif
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index 9330f46..f150239 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -106,7 +106,8 @@ using namespace ::com::sun::star::container;
 
 class SwContentArr
 : public o3tl::sorted_vector,
-o3tl::find_partialorder_pt

[Libreoffice-commits] .: 2 commits - svl/inc svl/source unusedcode.easy xmloff/inc xmloff/source

 svl/inc/svl/svdde.hxx   |2 
 svl/source/svdde/ddeimp.hxx |6 --
 unusedcode.easy |9 
 xmloff/inc/xmloff/XMLFontAutoStylePool.hxx  |5 +-
 xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx  |5 +-
 xmloff/source/style/XMLFontAutoStylePool.cxx|   22 +-
 xmloff/source/style/impastp1.cxx|   34 +---
 xmloff/source/style/impastp2.cxx|2 
 xmloff/source/style/impastp3.cxx|2 
 xmloff/source/style/impastp4.cxx|   13 ++
 xmloff/source/style/impastpl.hxx|   11 -
 xmloff/source/style/xmlstyle.cxx|   50 ++--
 xmloff/source/text/XMLTextListAutoStylePool.cxx |   26 +---
 13 files changed, 49 insertions(+), 138 deletions(-)

New commits:
commit 7e579295c8c07998d7e077fa7e1db24745726e5f
Author: CaolÃ¡n McNamara 
Date:   Wed Aug 1 10:56:00 2012 +0100

convert SvXMLAutoStylePoolNamesP_Impl to a std::set

Change-Id: I839edf8d0e941f78f6f6f9e6a9117f76587a5f39

diff --git a/unusedcode.easy b/unusedcode.easy
index 14faca2..5e27520 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -29,16 +29,11 @@ String::CreateFromAscii(char const*)
 String::CreateFromAscii(char const*, unsigned short)
 String::String(unsigned short const*)
 String::String(unsigned short const*, unsigned short)
-SvXMLAutoStylePoolNamesP_Impl::GetPos(rtl::OUString const*) const
-SvXMLAutoStylePoolNamesP_Impl::Remove(rtl::OUString*)
 SvXMLAutoStylePoolParentsP_Impl::GetPos(SvXMLAutoStylePoolParentP_Impl const*) 
const
 SvXMLAutoStylePoolParentsP_Impl::Remove(SvXMLAutoStylePoolParentP_Impl*)
-SvXMLStyleIndices_Impl::GetPos(SvXMLStyleIndex_Impl const*) const
-SvXMLStyleIndices_Impl::Remove(SvXMLStyleIndex_Impl*)
 SvtSlideSorterBarOptions::AddListenerLink(Link const&)
 SvtSlideSorterBarOptions::RemoveListenerLink(Link const&)
 SvxPositionSizeTabPage::GetRect()
-SwSortElements::Remove(unsigned short, unsigned short)
 SwXMLTableColumnsSortByWidth_Impl::GetPos(SwXMLTableColumn_Impl const*) const
 SwXMLTableColumnsSortByWidth_Impl::Remove(SwXMLTableColumn_Impl*)
 TempFile::IsValid() const
@@ -62,12 +57,8 @@ X11SalGraphics::SetMask(int&, int&, unsigned int&, unsigned 
int&, int&, int&, un
 
X509Certificate_NssImpl::getImplementation(com::sun::star::uno::Reference)
 XMLFamilyDataList_Impl::GetPos(XMLFamilyData_Impl const*) const
 XMLFamilyDataList_Impl::Remove(XMLFamilyData_Impl*)
-XMLFontAutoStylePoolNames_Impl::GetPos(rtl::OUString const*) const
-XMLFontAutoStylePoolNames_Impl::Remove(rtl::OUString*)
 XMLFontAutoStylePool_Impl::GetPos(XMLFontAutoStylePoolEntry_Impl const*) const
 XMLFontAutoStylePool_Impl::Remove(XMLFontAutoStylePoolEntry_Impl*)
-XMLTextListAutoStylePoolNames_Impl::GetPos(rtl::OUString const*) const
-XMLTextListAutoStylePoolNames_Impl::Remove(rtl::OUString*)
 XMLTextListAutoStylePool_Impl::GetPos(XMLTextListAutoStylePoolEntry_Impl 
const*) const
 XMLTextListAutoStylePool_Impl::Remove(XMLTextListAutoStylePoolEntry_Impl*)
 XclExpColorScale::XclExpColorScale(XclExpRoot const&, ScColorScaleFormat 
const&)
diff --git a/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx 
b/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx
index f96e533..4fd666b 100644
--- a/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx
+++ b/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx
@@ -24,9 +24,10 @@
 #include "xmloff/dllapi.h"
 #include 
 #include 
+#include 
 
 class XMLFontAutoStylePool_Impl;
-class XMLFontAutoStylePoolNames_Impl;
+typedef std::set XMLFontAutoStylePoolNames_Impl;
 class SvXMLExport;
 
 class XMLOFF_DLLPUBLIC XMLFontAutoStylePool : public UniRefBase
@@ -34,7 +35,7 @@ class XMLOFF_DLLPUBLIC XMLFontAutoStylePool : public 
UniRefBase
 SvXMLExport& rExport;
 
 XMLFontAutoStylePool_Impl *pPool;
-XMLFontAutoStylePoolNames_Impl *pNames;
+XMLFontAutoStylePoolNames_Impl m_aNames;
 sal_uInt32 nName;
 
 protected:
diff --git a/xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx 
b/xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx
index 8c39819..ff84c3a 100644
--- a/xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx
+++ b/xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx
@@ -34,6 +34,7 @@
 #include "sal/types.h"
 #include 
 #include 
+#include 
 
 namespace com { namespace sun { namespace star { namespace container {
 class XIndexReplace; } } } }
@@ -41,7 +42,7 @@ namespace rtl { class OUString; }
 
 
 class XMLTextListAutoStylePool_Impl;
-class XMLTextListAutoStylePoolNames_Impl;
+typedef std::set XMLTextListAutoStylePoolNames_Impl;
 class XMLTextListAutoStylePoolEntry_Impl;
 class SvXMLExport;
 
@@ -52,7 +53,7 @@ class XMLOFF_DLLPUBLIC XMLTextListAutoStylePool
 ::rtl::OUString sPrefix;
 
 XMLTextListAutoStylePool_Impl *pPool;
-XMLTextListAutoStylePoolNames_Impl *pNames;
+XMLTextListAutoStylePoolNames_Impl m_aNames;
 sal_uInt32 nName;
 
 /** this is an optional NumRule compare component for applica

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

2012-08-01 Thread Cédric Bosdonnat

 sw/inc/ftnidx.hxx |2 +-
 sw/source/core/doc/ftnidx.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9490643712a040a6f4433d145bc5d35d9d4335f5
Author: CÃ©dric Bosdonnat 
Date:   Wed Aug 1 14:36:54 2012 +0200

Fix for a236f8318a0e05caeec53ccbee8b134f44a98008

To get footnotes sorted properly one need to:
  * actually use the comparator class
  * compare on the offsets value (and not there pointers)

Change-Id: Ie86802c7a92602bfbb4d2a603afe06f621e392a3

diff --git a/sw/inc/ftnidx.hxx b/sw/inc/ftnidx.hxx
index 0cc2efa..e2801c4 100644
--- a/sw/inc/ftnidx.hxx
+++ b/sw/inc/ftnidx.hxx
@@ -47,7 +47,7 @@ struct CompareSwFtnIdxs
 bool operator()(SwTxtFtn* const& lhs, SwTxtFtn* const& rhs) const;
 };
 
-class SwFtnIdxs : public o3tl::sorted_vector
+class SwFtnIdxs : public o3tl::sorted_vector
 {
 public:
 SwFtnIdxs() {}
diff --git a/sw/source/core/doc/ftnidx.cxx b/sw/source/core/doc/ftnidx.cxx
index c47a4f9..50e7bde 100644
--- a/sw/source/core/doc/ftnidx.cxx
+++ b/sw/source/core/doc/ftnidx.cxx
@@ -43,7 +43,7 @@ bool CompareSwFtnIdxs::operator()(SwTxtFtn* const& lhs, 
SwTxtFtn* const& rhs) co
 {
 sal_uLong nIdxLHS = _SwTxtFtn_GetIndex( lhs );
 sal_uLong nIdxRHS = _SwTxtFtn_GetIndex( rhs );
-return ( nIdxLHS == nIdxRHS && lhs->GetStart() < rhs->GetStart() ) || 
nIdxLHS < nIdxRHS;
+return ( nIdxLHS == nIdxRHS && *lhs->GetStart() < *rhs->GetStart() ) || 
nIdxLHS < nIdxRHS;
 }
 
 void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ANNOUNCE] libreoffice-3.5.6.1 tag created (3.5.6-rc1)

Hi,

there have been created the libreoffice-3.5.6.1 tag (aka rc1). The
corresponding official builds will be available within next few days.

See the attached list of changes against 3.5.5[*].


Now, you might switch your current 3-5 source tree to it using:

./g fetch --tags
./g checkout -b tag-libreoffice-3.5.6.1 libreoffice-3.5.6.1

Linux distro packages might find source tarballs at
http://dev-builds.libreoffice.org/pre-releases/src/
They will be available from the official page together with the builds.


See also the schedule at 
http://wiki.documentfoundation.org/ReleasePlan#3.5_release
and release criteria at http://wiki.documentfoundation.org/Release_Criteria

[*] The list contains fixes from 3.5.5-rc2 and rc3. It is created using
libreoffice/core/bin/lo-commit-stat. It parses output from git log and
does not match cherry-picked commits. We might get better results with
'git cherry' or another approach. Feel free to send patches :-)


Best Regards,
Petr
bnc#760764 rtftok: don't ignore character properties of text fields [Miklos Vajna]
fdo#30519 Bad transitions if "use hardware acceleration" is enabled [David Tardon]
fdo#34093 Partial PDFEXPORT of particular Master Documents breaks hyperlinks [Ivan Timofeev]
fdo#35953 Solver localized/translated label strings are truncated [Andras Timar]
fdo#36824 embedded hsqldb; in view, computed row without alias makes whole file unusable [Lionel Elie Mamane]
fdo#37063 importing docx loses table in header/footer [Miklos Vajna]
fdo#37626 Page background could not be set in form wizard [Lionel Elie Mamane]
fdo#38056 ODF import: Page Borders handling broken [Michael Stahl]
fdo#39415 Painting of collapsing table borders broken in Writer [Michael Stahl]
fdo#39812 TABLE borders do not terminate where they should with merged cells [Michael Stahl]
fdo#41556 VIEWING: Incomplete font substitution when FontConfig matches italic font [Caolán McNamara]
fdo#43398 FORMATTING: Documents opened in LibreOffice Writer incorrectly appear as right justified [Muhammad Haggag]
fdo#43556 EDITING report design: lengths & positions shown rounded -> hides information, leads to seemingly unexplainable behaviour [Lionel Elie Mamane]
fdo#43967 VIEWING: legacy report designer wizard improperly formats dates [Lionel Elie Mamane]
fdo#44534 EDITING: Connectors cannot be selected [David Tardon]
fdo#45724 FILESAVE, FORMATTING, Text field data loss [Miklos Vajna]
fdo#46738 Cell background and border color formatting information of empty cells lost in particular document after FILESAVE as xls and xlsx [Petr Mladek]
fdo#46966 RTF reader overrides margins when \header is present [Miklos Vajna]
fdo#47071 UI: Undocked toolbars do not show all icons in special ratio [Ivan Timofeev]
fdo#47368 Many crashes when accessibility enabled on MacOS X [Michael Meeks]
fdo#47636 Extremely slow display with font fallback [Caolán McNamara]
fdo#47947 UI: Calc Data Form button width doesn't accommodate German text or German text too long. [Andras Timar]
fdo#48033 FILEOPEN : Import RTF file but pictures are not well positioned on table/cells [Miklos Vajna]
fdo#48335 FILESAVE: RTF export [Miklos Vajna]
fdo#48601 FILEOPEN: Open Visio's file with bitmap's blocks [Julien Nabet, Fridrich Štrba]
fdo#48602 FILEOPEN: The Greek codepage instead the Russian codepage (*.vsd by MS_Visio-2000) [Fridrich Štrba]
fdo#49178 CRASH when FILEOPEN particular RTF [Julien Nabet]
fdo#49486 Hyphenation problem with Graphite 2 [Martin Hosken]
fdo#49582 FILESAVE: Long delays saving in XP .XLS format [Petr Mladek]
fdo#49659 rtf header, tables, pagenumber are wrong [Miklos Vajna]
fdo#49666 CRASH while opening RTF document [David Tardon]
fdo#50087 FILEOPEN properties Title, Subject, Comments (File>Properties ..> Description) no longer imported in rtf document [Miklos Vajna]
fdo#50603 Unable to update LibreOffice without resetting user profile [Stephan Bergmann]
fdo#50665 \chpgn ignores formatting [Miklos Vajna]
fdo#50682 On MacOS X 10.7, 'import uno' crashes in the LibreOffice-provided Python [Stephan Bergmann]
fdo#50800 EDITING: queries do not filter when created with the query wizard [Lionel Elie Mamane]
fdo#50801 Wrong cross-reference text when Caption order is Numbering first [Uray M. János]
fdo#50831 RTF: FILESAVE empty lines get different font size after reopening document [Miklos Vajna]
fdo#50849 SIGSEGV: ODBC to PostgreSQL, renaming column in SELECT list [Lionel Elie Mamane]
fdo#50975 3.6.0b1: Segfault when accessing the LO About dialog with librsvg ≈ 2.16 [Caolán McNamara]
fdo#50988 Draw crashes on loading MS Logical Design Diagram example viso file. [Julien Nabet]
fdo#50990 MS Visio file displays as blanc page in Draw [Fridrich Štrba]
fdo#51074 Error parsing help strings with "|" chars [Stephan Bergmann]
fdo#51243 Trying to edit a report from new (but awful) Report Builder hangs libreoffice [Lionel Elie Mamane]
fdo#51249 Crash while saving a document with track-changes enabled [Pierre-Eric Pelloux-Prayer]
fdo#51270 On UNINSTALLING, LibreOf

[REVIEW 3-6] resolved fdo#53012 crash in CSV fixed width import

Hi,

Please review and cherry-pick to 3-6
http://cgit.freedesktop.org/libreoffice/core/commit/?id=21cb8210c74e52896ce7fb063f1578b13672f4bd
that fixes https://bugs.freedesktop.org/show_bug.cgi?id=53012

In case we do 3.6.0.5rc we should have it in there as well.
I'd even say this is a blocker, because application crashes as soon as
one selects fixed width and from then on will crash on any CSV import
because the fixed width setting is remembered by the dialog.

Thanks
  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgp7XQPNo1MqF.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sc/source

 sc/source/ui/dbgui/csvgrid.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 21cb8210c74e52896ce7fb063f1578b13672f4bd
Author: Eike Rathke 
Date:   Wed Aug 1 13:46:25 2012 +0200

resolved fdo#53012 crash in CSV fixed width import

8cd05e9cf1152b21528c6f1a5bda3d949dc49791 changed from using String to
OUString. ScCsvGrid::ImplSetTextLineFix() attempted to copy excess
characters (always CSV_MAXSTRLEN if greater than field width) where
String::Copy() silently ignored the excess length but OUString::copy()
may result in invalid memory accesses and asserts in dbgutil build.

Change-Id: Ic9f7f38d6f2bbd770d6356e1304de8e39c09e30b

diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index 5d99fb4..fbcecb7 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -806,7 +806,8 @@ void ScCsvGrid::ImplSetTextLineFix( sal_Int32 nLine, const 
rtl::OUString& rTextL
 for( sal_uInt32 nColIx = 0; (nColIx < nColCount) && (nStrIx < nStrLen); 
++nColIx )
 {
 sal_Int32 nColWidth = GetColumnWidth( nColIx );
-rStrVec.push_back( rTextLine.copy( nStrIx, Max( nColWidth, 
static_cast(CSV_MAXSTRLEN) ) ) );
+sal_Int32 nLen = std::min( std::min( nColWidth, 
static_cast(CSV_MAXSTRLEN) ), nStrLen - nStrIx);
+rStrVec.push_back( rTextLine.copy( nStrIx, nLen ) );
 nStrIx = nStrIx + nColWidth;
 }
 InvalidateGfx();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Modifying comments to meet doxygen standards

>From abdulmajeed ahmed :

abdulmajeed ahmed has abandoned this change.

Change subject: Modifying comments to meet doxygen standards
..


Patch Set 2: Abandoned

I have submit new one

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: Id963eb87e3e94a4c761321f0a51b3d3851b6fc6c
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: abdulmajeed ahmed 
Gerrit-Reviewer: Philipp Riemer 

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

[PATCH] Modifying comments to meet doxygen standards

>From abdulmajeed ahmed :

abdulmajeed ahmed has uploaded a new change for review.

Change subject: Modifying comments to meet doxygen standards
..

Modifying comments to meet doxygen standards

Change-Id: I555e029092b453b2276a57fb4d384b18696d6e48
---
M sw/inc/dbfld.hxx
M sw/inc/dbmgr.hxx
M sw/inc/dcontact.hxx
M sw/inc/ddefld.hxx
M sw/inc/dlelstnr.hxx
M sw/inc/doc.hxx
6 files changed, 415 insertions(+), 415 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I555e029092b453b2276a57fb4d384b18696d6e48
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: abdulmajeed ahmed 

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

Re: [PUSHED] Re: [PATCH] Final stretch of converting SV_DECL_PTRARR to STL containers stage 3/3

On 01/08/12 09:50, Stephan Bergmann wrote:
> On 07/31/2012 10:38 PM, Michael Stahl wrote:
>> by the way, is there any way to force a template parameter that itself
>> has template parameters to use the same type parameters as the type that
>> it's a template parameter to?  would be useful here...
> 
> by using template template parameters?
> 
> template class A {};
> template class T2> class B {
>  T2 x;
> };

thanks, that seems to work here.

though it took me some time to figure out that

 typedef typename Find Find_t;

is an error because Find is already declared as a class, so typename
keyword is _not_ allowed...


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

[Libreoffice-commits] .: 2 commits - o3tl/inc o3tl/qa sd/source sw/inc sw/source

 o3tl/inc/o3tl/sorted_vector.hxx   |   11 ++-
 o3tl/qa/test-sorted_vector.cxx|6 ++
 sd/source/filter/eppt/pptexanimations.cxx |6 +-
 sd/source/filter/eppt/pptx-epptooxml.cxx  |6 +-
 sw/inc/docary.hxx |2 +-
 sw/inc/ndhints.hxx|4 ++--
 sw/source/filter/html/htmlfly.hxx |3 +--
 sw/source/ui/utlui/content.cxx|3 +--
 8 files changed, 15 insertions(+), 26 deletions(-)

New commits:
commit 3e3acee762fac71f7356ed1305a64e0278278081
Author: Michael Stahl 
Date:   Wed Aug 1 12:52:09 2012 +0200

sorted_vector: turn Find parameter into template

Enforces same type parameters for sorted_vector and Find, and makes
it easier to use.

Change-Id: Ide456a48f015cb0a9dea7a0bf2bcf2ccad527fd1

diff --git a/o3tl/inc/o3tl/sorted_vector.hxx b/o3tl/inc/o3tl/sorted_vector.hxx
index 4d442dd..6f444d9 100644
--- a/o3tl/inc/o3tl/sorted_vector.hxx
+++ b/o3tl/inc/o3tl/sorted_vector.hxx
@@ -27,12 +27,13 @@ struct find_unique;
 @tpl Compare comparison method
 @tpl Find   look up index of a Value in the array
 */
-template,
- class Find = find_unique >
+template,
+ template class Find = find_unique >
 class sorted_vector
 : private std::vector
 {
 private:
+typedef Find Find_t;
 typedef typename std::vector base_t;
 typedef typename std::vector::iterator  iterator;
 public:
@@ -47,7 +48,7 @@ public:
 
 std::pair insert( const Value& x )
 {
-std::pair const ret(Find()(begin(), end(), x));
+std::pair const ret(Find_t()(begin(), end(), x));
 if (!ret.second)
 {
 const_iterator const it = base_t::insert(
@@ -59,7 +60,7 @@ public:
 
 size_type erase( const Value& x )
 {
-std::pair const ret(Find()(begin(), end(), x));
+std::pair const ret(Find_t()(begin(), end(), x));
 if (ret.second)
 {
 base_t::erase(begin_nonconst() + (ret.first - begin()));
@@ -129,7 +130,7 @@ public:
  */
 const_iterator find( const Value& x ) const
 {
-std::pair const ret(Find()(begin(), end(), x));
+std::pair const ret(Find_t()(begin(), end(), x));
 return (ret.second) ? ret.first : end();
 }
 
diff --git a/o3tl/qa/test-sorted_vector.cxx b/o3tl/qa/test-sorted_vector.cxx
index 1b321c9..8e9e719 100644
--- a/o3tl/qa/test-sorted_vector.cxx
+++ b/o3tl/qa/test-sorted_vector.cxx
@@ -136,8 +136,7 @@ public:
 void testBasics_FindPtr()
 {
 o3tl::sorted_vector,
-o3tl::find_partialorder_ptrequals > > aVec;
+o3tl::find_partialorder_ptrequals> aVec;
 SwContent *p1 = new SwContent(1);
 SwContent *p2 = new SwContent(2);
 SwContent *p2_2 = new SwContent(2);
@@ -195,8 +194,7 @@ public:
 void testErase_FindPtr()
 {
 o3tl::sorted_vector,
-o3tl::find_partialorder_ptrequals > > aVec;
+o3tl::find_partialorder_ptrequals> aVec;
 SwContent *p1 = new SwContent(1);
 SwContent *p1_2 = new SwContent(1);
 SwContent *p1_3 = new SwContent(1);
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 7c9f928..4f9b9af 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -145,7 +145,7 @@ struct CompareSwRedlineTbl
 };
 class _SwRedlineTbl
 : public o3tl::sorted_vector >
+o3tl::find_partialorder_ptrequals>
 {
 public:
 ~_SwRedlineTbl();
diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx
index 154c957..773bb1f 100644
--- a/sw/inc/ndhints.hxx
+++ b/sw/inc/ndhints.hxx
@@ -76,14 +76,14 @@ struct CompareSwpHtStart
 bool operator()(SwTxtAttr* const lhs, SwTxtAttr* const rhs) const;
 };
 class SwpHtStart : public o3tl::sorted_vector > {};
+o3tl::find_partialorder_ptrequals> {};
 
 struct CompareSwpHtEnd
 {
 bool operator()(SwTxtAttr* const lhs, SwTxtAttr* const rhs) const;
 };
 class SwpHtEnd : public o3tl::sorted_vector > {};
+o3tl::find_partialorder_ptrequals> {};
 
 // Class SwpHintsArr
 
diff --git a/sw/source/filter/html/htmlfly.hxx 
b/sw/source/filter/html/htmlfly.hxx
index 19b14e0..8184d5c 100644
--- a/sw/source/filter/html/htmlfly.hxx
+++ b/sw/source/filter/html/htmlfly.hxx
@@ -130,8 +130,7 @@ public:
 class SwHTMLPosFlyFrms
 : public o3tl::sorted_vector,
-o3tl::find_partialorder_ptrequals > >
+o3tl::find_partialorder_ptrequals>
 {};
 
 #endif
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index f150239..9330f46 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -106,8 +106,7 @@ using namespace ::com::sun::star::container;
 
 class SwContentArr
 : public o3tl::sorted_vector,
-o3tl::find_partialorder_ptrequals > >
+o3tl::find_partialorder_ptrequals>
 {
 public:
 ~SwContentArr() { DeleteAndDestroyAll(); }
commit 77165efb4eb4d9735f8dd4f8c99044a36d60a611
Author: Michael St

Re: Building on Mac OS X 10.7

> The build is against the 10.6 SDK, --with-macosx-version-min-required=10.6.

Ah ok, that explains it. In the current (since a few days) Xcode 4
(4.4), only 10.7 and 10.8 SDKs are included.

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

Re: compile failure

On Wed, 2012-08-01 at 12:41 +0200, John Smith wrote:
> 'rpm -qa | grep libcmis' gives me :
> 
> libcmis-0.2.3-2.fc18.i686
> libcmis-devel-0.2.3-2.fc18.i686
> 
> Do you happen to know if these are indeed too old, and what version I
> would need ?

The "internal" version seems to be 0.2.3 as well, so seems to be a valid
version. Maybe cedric knows ?

C.


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

Re: compile failure

2012-08-01 Thread John Smith

On Wed, Aug 1, 2012 at 12:37 PM, Caolán McNamara  wrote:
> On Wed, 2012-08-01 at 12:23 +0200, John Smith wrote:
>> Hi,
>>
>>
>> Im trying to build libreoffice master (using ./configure
>> --with-system-saxon=no --with-system-libs, if that matters), and im
>> running into a compile error. Unfortunately, I have no idea whats
>> wrong, or how to go about fixing this. Ive attached my
>> build_error.log, and the last screen output is pasted below. Any and
>> all help is appreciated.
>
>> /usr/local/src/libreoffice/ucb/source/ucp/cmis/cmis_repo_content.cxx:48:0:
>
> Possibly the system libcmis is too old to build with libreoffice master
> and the configure check didn't know that to warn/error out at configure
> time.
>
Thanks.

'rpm -qa | grep libcmis' gives me :

libcmis-0.2.3-2.fc18.i686
libcmis-devel-0.2.3-2.fc18.i686

Do you happen to know if these are indeed too old, and what version I
would need ?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: compile failure

On Wed, 2012-08-01 at 12:23 +0200, John Smith wrote:
> Hi,
> 
> 
> Im trying to build libreoffice master (using ./configure
> --with-system-saxon=no --with-system-libs, if that matters), and im
> running into a compile error. Unfortunately, I have no idea whats
> wrong, or how to go about fixing this. Ive attached my
> build_error.log, and the last screen output is pasted below. Any and
> all help is appreciated.

> /usr/local/src/libreoffice/ucb/source/ucp/cmis/cmis_repo_content.cxx:48:0:

Possibly the system libcmis is too old to build with libreoffice master
and the configure check didn't know that to warn/error out at configure
time.

C.

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

Re: [PUSHED][PATCH] cosmetic patch for conditional formatting

2012-08-01 Thread Jean-Baptiste Faure

Le 01/08/2012 12:11, Noel Power a écrit :
> looks fine for me, pushed
Thank you. I suggest to backport it to LO 3.6 for LO 3.6.1.

Best regards.
JBF

>
> On 31/07/12 09:17, Jean-Baptiste Faure wrote:
>> Hi,
>>
>> here is a small patch to vertically align the fields in the conditional
>> formatting dialog.
>> Additionnaly it give more room for several strings which is useful for
>> FR translation.
>> To easily understand the code, I reordered it according to the lines in
>> the dialog.
>>
>> Best regards.
>> JBF
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>


-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.

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

Re: Building on Mac OS X 10.7


On 08/01/2012 11:55 AM, Tor Lillqvist wrote:

I still don't understand how you managed to build against the 10.7 SDK


The build is against the 10.6 SDK, --with-macosx-version-min-required=10.6.

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

Re: About DECLARE_LIST fdo#38832

On Wed, 2012-05-02 at 12:24 +0100, Caolán McNamara wrote:
> Seeing as its the last DECLARE_LIST left in core it looks like a great
> candidate to convert it to vector/list and allow removal of DECLARE_LIST
> into binfilter. 

This got done now. After a few cockups that mstahl and fridrich sorted
out.

C.

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

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

Tag 'libreoffice-3.5.6.1' created by Petr Mladek  at 
2012-08-01 11:26 -0700

Tag libreoffice-3.5.6.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJQGQROAAoJEPQ0oe+v7q6j3DMP/A6wJNxsUkINWiRdk8PWMO5Z
GwKZcq4f+mI7x3oXhw0L5uSyjLzXxoWz1nBv0kUJDqvpcG1Sp60irzN98ciDpSPq
mcZaqha31Wqqz3x+FClqF+3f95TpzRX5JYnpj2be6krtpyg08Pmhe0/PpWrKctgs
ie21/CcODbAMqpSOPnZjAide4hPNlDoYUlapj3up1US4COArfUwixG/pKJgC1ppR
i51xFEuJftZNkSjKfnYUX0PFs54HuY7IMnFfEHCvnYq7NcmcAXcoMWwF5ubzitWH
n6XOUcHGkh9MURZal2ZOmPbSt6IaCk4eIKO7egymVt2+g4sX3zrN/B3PHC2zs5kl
+AdmzVAwCT7k2ymspoBviusgO0CNKduM9dk8dyHHRkrmm3GDagFlaQQIj3fR714r
+4qFlMCud2hVs9HESZQHIfzWFkEvFvA+oLavrJ/K/9ZUC5kpJ+SERweKe7CfT/lD
edv6Qgvzewh9uIkim96GQhlST7ngXeGWPYb7KeAsUkb+hRMiJ3p7b4O9hCaYCt6k
vjoB9i2P83Pe+2dblVdv+Y5qDVcygpZMs/8Lh9aFTjm0z4tN1tizFiEWAuOeUygS
t++1wZ0ryH2fOdnxVmXcsmQfCz53DxH1exYek91nxuMZPNweglPscYAkm+cu5m9W
JhOIkUdVNvKwp9uJyFPJ
=6B9o
-END PGP SIGNATURE-

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

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

Tag 'libreoffice-3.5.6.1' created by Petr Mladek  at 
2012-08-01 11:26 -0700

Tag libreoffice-3.5.6.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJQGQROAAoJEPQ0oe+v7q6jI48P/1gecgsEsPP8Ius/h48L+U1t
rKz4kyvuK7zHLGDCKGM6pkhAQkMrl9G6427IdKdaQKwkjTgAmC7l2q/gBFRO8y42
fWc3ZjE0QN6VeRsRQ5HnRC7um/CpSd79EJNNKFL7OembJQtQ4t75zeOOOadq7oPp
Gk6NPTT4pg/LL53WD5Mj4idYVV/LTA2nn58+LoBeZgwbcQMlXfdrONRJDVSHaSXC
BKF9o4GZX9dCO4MKt7i+O88l6vcfj0NWY9EOH9bz2C8qRYReBNspQuUyx3Hdb5N/
WIODAo/bzh6ppmdBh+IGf5tUNrWA/6lKLIEiz+sBdvNGOz8v+R/5fyO+GSJq4ea9
7liB2EXZAYEQRy+FiQDLMmUFOYrg/lMfG6LrEIaxN7w2QJc/eMTOFF0qCLno/Nvy
krJrg/wBwIGpiu5fNQ2J66fR7OoH1eWLAr0U0ARxbRuQtNoyn34j7DpUVvilQ9U9
bNKeCn+/h1V6oQpcg/BxB9cT8wTiT9YNrIqe4k9rV1Rdt6Td8GM1grbIaH501Yf6
6boZ6BFNIOtl3VI9dox9WDoSA+nBom/99xefKeoOb2w+xY9t8t9NOtW45GFP9ZdR
wfKRYcRAOUULArJ4oWL+/nEfWWEoeLvF6nX5I20srfk6pme2xC3cnUbWEuQu3TiJ
dcgWOp3yv+L4U7zaFQ+n
=W0OM
-END PGP SIGNATURE-

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

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

Tag 'libreoffice-3.5.6.1' created by Petr Mladek  at 
2012-08-01 11:26 -0700

Tag libreoffice-3.5.6.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJQGQROAAoJEPQ0oe+v7q6jfIIQAMC1zXBwACinTJVBC+wQonfd
XHggNOQfYLKBc2RFu4CuGkjxcgJ55F6h9MHIv07oZBocdd7/J31DbdlY7MQ2VU8i
Pu9PN2aVP8FstwqhYDfiQkxK/A2yf0Yuflax4unCtQU/ibFKgFdIqTdV/29Ieq5S
4q71r0tBM3pQ7eC67perlowOO9fja+0GYqiFtcw5Gi5W1jRXp/5c3r8VvZ7XjAQa
ncNnXpqztX+jmaCu/HncGOT3QES0U0ZUdoRB9bC4J/5hiTvfhYY7+8LgzRqAy92R
sbYJK+vT0jJAOydHcl54BJHt6+RSN2lcfb3I6fFZiTMqk+vaRbBuKuxFH0gxHEC+
a0ddC+f/LKhcVLDM/IZw45F/2Chcx8bgDQ49dGvVbC9fA7sFNZ9xaeHtfJaY5ZrN
06l2uDd1E6FARQNpqcOi7v+RYUWnqZj80QA9EDE8wWH0M9S44Cwj/LZQ1Ohwqp2Q
a+TkGjT1NOnPuLEVWulPr4YeO/lDjOncNJ3WSiY13EoMEWXhOJG6OaK3zoJ/wVbE
iwgJ16lsI/CJOJmZuaC8hO3V9i53GMhkUk4+h/7sHpfCGg48+h1X2n4y1+ewwMUJ
UeVSqKZC53uerc3L7B2HCJEWWBbOxXu4X7gBA9aUcsE3N48KZXRko5bOAJzI/P/8
OXYMCuZcUeaV8/0vQhUI
=Hhx5
-END PGP SIGNATURE-

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

Re: Proposal/Prototype support for "fill in character" in Calc Number Format Strings // final patch set

2012-08-01 Thread Philipp Riemer

2012/8/1 Noel Power :
> On 01/08/12 09:01, Philipp Riemer wrote:
>>
>> Hi Noel,
>> to my eyes the diffs are below the text description in the ".txt"
>> file. Correct me if I am wrong but with all comment lines starting
>> with "#" it should be a valid patch file even if the file extension is
>> ".txt" and not ".patch", or not? However, I did not try to apply it
>> since I have no source clone here.
>>
>> Or did I understand something wrong in your comment above?
>>
> I'm not disputing the validity of the patch format, but... Johann has
> created a patch that contains a large portion of existing patches that I
> already created ( that already either exist on master and/or in the mail
> thread referenced ) with I believe additional tweaks from himself. However
> since that patch is effectively a squash of his and my work it is rather
> difficult to see what changes he made exactly. A patch consisting solely of
> his changes against the source ( patched already with my patches ) would be
> much easier for me to read
>
> Noel

Ah, ok. Then I got you wrong. Sorry.

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

Re: Open Issues

On Wed, 2012-08-01 at 01:19 +0200, Bjoern Michaelsen wrote:
> On Tue, Jul 31, 2012 at 09:09:27AM -0700, Joel Madero wrote:
> > Do we have an ongoing list of "open issues" that we keep track of and up to
> > date? 
> 
> Yes, its called bugzilla. ;)

Heh - I guess it is a fair point that some discussions fizzle out. Then
again, they are not without their champions - I have high hopes that
they will come back in the end.

For CTL - it really needs someone to read through & summarise the
thinking from the experts in the code & UI arena, and to come up with a
proposal for it I think - will prod in the ESC call tomorrow.

HTH,

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

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

Re: [PUSHED][PATCH] cosmetic patch for conditional formatting


looks fine for me, pushed

On 31/07/12 09:17, Jean-Baptiste Faure wrote:

Hi,

here is a small patch to vertically align the fields in the conditional
formatting dialog.
Additionnaly it give more room for several strings which is useful for
FR translation.
To easily understand the code, I reordered it according to the lines in
the dialog.

Best regards.
JBF

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

[Libreoffice-commits] .: vcl/unx

2012-08-01 Thread Lubos Lunak

 vcl/unx/kde4/KDE4FilePicker.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 78f1e95df4b8bd1fbc32ed4192676fd4f176f5bf
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Wed Aug 1 12:08:03 2012 +0200

workaround for KFileDialog remembering its settings

Change-Id: I6f473c246408684c5d952a2161645e4fe76873ea

diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index 4917bf7..4bd2836 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -200,6 +200,11 @@ sal_Int16 SAL_CALL KDE4FilePicker::execute()
 mutexrelease = Application::ReleaseSolarMutex();
 //block and wait for user input
 int result = _dialog->exec();
+// HACK: KFileDialog uses KConfig("kdeglobals") for saving some settings
+// (such as the auto-extension flag), but that doesn't update 
KGlobal::config()
+// (which is probably a KDE bug), so force reading the new configuration,
+// otherwise the next opening of the dialog would use the old settings.
+KGlobal::config()->reparseConfiguration();
 if( !qApp->clipboard()->property( "useEventLoopWhenWaiting" ).toBool())
 Application::AcquireSolarMutex( mutexrelease );
 if( result == KFileDialog::Accepted)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

 sc/source/ui/src/condformatdlg.src |   56 ++---
 1 file changed, 28 insertions(+), 28 deletions(-)

New commits:
commit 63e0644040536558df92e7598e70a56bb5a3422f
Author: Jean-Baptiste FAURE 
Date:   Tue Jul 31 10:03:16 2012 +0200

vertically align and enlarge fields in cond.formatting dialog

add more room in several fields: usefull for FR translation
reorder the code by levels/lines in the dialog

Change-Id: I2c4cbaf926ade87b35a5900ab5461477e0157822

diff --git a/sc/source/ui/src/condformatdlg.src 
b/sc/source/ui/src/condformatdlg.src
index 174da1f..12d4ef9 100644
--- a/sc/source/ui/src/condformatdlg.src
+++ b/sc/source/ui/src/condformatdlg.src
@@ -95,7 +95,7 @@ Control RID_COND_ENTRY
 ListBox LB_TYPE
 {
 Pos = MAP_APPFONT( 5, 15 );
-Size = MAP_APPFONT( 60, 40 );
+Size = MAP_APPFONT( 80, 40 );
 Border = TRUE;
 DropDown = TRUE;
 StringList [ en-US ] =
@@ -107,7 +107,7 @@ Control RID_COND_ENTRY
 };
 ListBox LB_CELLIS_TYPE
 {
-Pos = MAP_APPFONT( 70, 15 );
+Pos = MAP_APPFONT( 90, 15 );
 Size = MAP_APPFONT( 80, 40 );
 Border = TRUE;
 DropDown = TRUE;
@@ -125,52 +125,52 @@ Control RID_COND_ENTRY
 "not duplicate";
 };
 };
-FixedText FT_STYLE
-{
-Pos = MAP_APPFONT( 10, 32 );
-Size = MAP_APPFONT( 35, 14 );
-Text [ en-US ] = "Apply Style";
-};
 Edit ED_VAL1
 {
-Pos = MAP_APPFONT( 155, 15 );
+Pos = MAP_APPFONT( 175, 15 );
 Size = MAP_APPFONT( 50, 12 );
 Border = TRUE;
 };
 Edit ED_VAL2
 {
-Pos = MAP_APPFONT( 210, 15 );
+Pos = MAP_APPFONT( 230, 15 );
 Size = MAP_APPFONT( 50, 12 );
 Border = TRUE;
 };
-ListBox LB_STYLE
+ListBox LB_COLOR_FORMAT
 {
-Pos = MAP_APPFONT( 50, 32 );
-Size = MAP_APPFONT( 50, 80 );
+Pos = MAP_APPFONT( 100, 15 );
+Size = MAP_APPFONT( 100, 60);
 Border = TRUE;
 DropDown = TRUE;
 StringList [ en-US ] =
 {
-"New Style...";
+"Color Scale (2 Entries)";
+"Color Scale (3 Entries)";
+"Data Bar";
 };
 };
-ListBox LB_COLOR_FORMAT
+FixedText FT_STYLE
 {
-Pos = MAP_APPFONT( 70, 15 );
-Size = MAP_APPFONT( 80, 60);
+Pos = MAP_APPFONT( 5, 32 );
+Size = MAP_APPFONT( 50, 14 );
+Text [ en-US ] = "Apply Style";
+};
+ListBox LB_STYLE
+{
+Pos = MAP_APPFONT( 90, 32 );
+Size = MAP_APPFONT( 80, 80 );
 Border = TRUE;
 DropDown = TRUE;
 StringList [ en-US ] =
 {
-"Color Scale (2 Entries)";
-"Color Scale (3 Entries)";
-"Data Bar";
+"New Style...";
 };
 };
 ListBox LB_TYPE_COL_SCALE
 {
 Pos = MAP_APPFONT( 5, 32 );
-Size = MAP_APPFONT( 60, 60 );
+Size = MAP_APPFONT( 80, 60 );
 Border = TRUE;
 DropDown = TRUE;
 StringList [ en-US ] =
@@ -183,17 +183,17 @@ Control RID_COND_ENTRY
 "Formula";
 };
 };
-Edit ED_COL_SCALE
+Window WD_PREVIEW
 {
-Pos = MAP_APPFONT( 5, 48 );
-Size = MAP_APPFONT( 60, 12 );
+Pos = MAP_APPFONT( 175, 32 );
+Size = MAP_APPFONT( 105, 14 );
+Text [ en-US ] = "Example";
 Border = TRUE;
 };
-Window WD_PREVIEW
+Edit ED_COL_SCALE
 {
-Pos = MAP_APPFONT( 150, 32 );
-Size = MAP_APPFONT( 60, 14 );
-Text [ en-US ] = "Example";
+Pos = MAP_APPFONT( 5, 48 );
+Size = MAP_APPFONT( 60, 12 );
 Border = TRUE;
 };
 ListBox LB_COL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/unitymenus' - vcl/inc vcl/source vcl/unx

2012-08-01 Thread Antonio Fernandez

 vcl/inc/salmenu.hxx   |3 
 vcl/inc/unx/gtk/gtksalmenu.hxx|7 +
 vcl/source/window/menu.cxx|   66 +
 vcl/unx/gtk/app/gtkinst.cxx   |   10 +
 vcl/unx/gtk/window/gtksalmenu.cxx |  191 +-
 5 files changed, 150 insertions(+), 127 deletions(-)

New commits:
commit 2ffb9baa6d69584bbc19b6e2c84a4d7cfc1a3956
Author: Antonio Fernandez 
Date:   Wed Aug 1 11:05:53 2012 +0100

Native menu is completely build in one step.

Change-Id: I772c267b3c136e6baab2623dbf5538b5076d43ff

diff --git a/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx
index 1d14a7e..b3dc25f 100644
--- a/vcl/inc/salmenu.hxx
+++ b/vcl/inc/salmenu.hxx
@@ -41,7 +41,7 @@ class SalFrame;
 
 struct SalItemParams
 {
-sal_uInt16  nId;// item Id
+sal_uInt16  nId;// item Id
 MenuItemTypeeType;  // MenuItem-Type
 MenuItemBitsnBits;  // MenuItem-Bits
 Menu*   pMenu;  // Pointer to Menu
@@ -90,6 +90,7 @@ public:
 virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& 
rRect, sal_uLong nFlags);
 virtual bool AddMenuBarButton( const SalMenuButtonItem& ); // return false 
if not implemented or failure
 virtual void RemoveMenuBarButton( sal_uInt16 nId );
+virtual void Freeze() {}
 
 // return an empty rectangle if not implemented
 // return Rectangle( Point( -1, -1 ), Size( 1, 1 ) ) if menu bar buttons 
implemented
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index c925a99..69fcec8 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -39,15 +39,19 @@
 class GtkSalMenu : public SalMenu
 {
 private:
-sal_BoolmbMenuBar;
+sal_BoolmbMenuBar;
+
+virtual void publishMenu();
 
 public:
 Menu*   mpVCLMenu;
 const GtkSalFrame*  mpFrame;
 GMenuModel* mpParentMenuModel;
 GMenuModel* mpMenuModel;
+GMenuModel* mpSectionMenuModel;
 gchar*  aDBusMenubarPath;
 GDBusConnection*pSessionBus;
+sal_Int32   mMenubarId;
 
 GtkSalMenu( sal_Bool bMenuBar );
 virtual ~GtkSalMenu();
@@ -65,6 +69,7 @@ public:
 virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const 
Image& rImage);
 virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, 
const KeyCode& rKeyCode, const rtl::OUString& rKeyName );
 virtual void GetSystemMenuData( SystemMenuData* pData );
+virtual void Freeze();
 };
 
 class GtkSalMenuItem : public SalMenuItem
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 6d02fc9..cc15191 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -6064,66 +6064,9 @@ ImplMenuDelData::~ImplMenuDelData()
 }
 
 #include 
-#include 
 
 using namespace std;
 
-GMenu* generateMenuBar( AbstractMenu *pMenu )
-{
-GMenu *menu = g_menu_new();
-
-g_menu_append(menu, "Submenu1", NULL);
-
-return menu;
-}
-
-#define BUS_NAME "org.libreoffice.LibreOffice"
-#define OBJ_PATH "/org/libreoffice/LibreOffice"
-
-void publishMenu( GMenuModel *menu )
-{
-GActionGroup *group;
-GDBusConnection *bus;
-GError *error = NULL;
-gchar *path;
-guint id;
-
-bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
-group = G_ACTION_GROUP( g_simple_action_group_new() );
-
-//g_print ("Exporting menus on the bus...\n");
-//if (!g_dbus_connection_export_menu_model (bus, OBJ_PATH, menu, 
&error))
-//{
-//g_warning ("Menu export failed: %s", error->message);
-//exit (1);
-//}
-//g_print ("Exporting actions on the bus...\n");
-//if (!g_dbus_connection_export_action_group (bus, OBJ_PATH, group, 
&error))
-//{
-//g_warning ("Action export failed: %s", error->message);
-//exit (1);
-//}
-
-g_bus_own_name_on_connection (bus, BUS_NAME, G_BUS_NAME_OWNER_FLAGS_NONE, 
NULL, NULL, NULL, NULL);
-
-
-/* export the new menu, if there is one */
-if (menu != NULL)
-{
-/* try getting the preferred name */
-path = g_strconcat (OBJ_PATH, "/menus/", "menubar", NULL);
-id = g_dbus_connection_export_menu_model (bus, path, menu, NULL);
-
-/* keep trying until we get a working name... */
-for (int i = 0; id == 0; i++)
-{
-g_free (path);
-path = g_strdup_printf ("%s/menus/%s%d",OBJ_PATH, "menubar", i);
-id = g_dbus_connection_export_menu_model (bus, path, menu, NULL);
-}
-}
-}
-
 void printMenu( AbstractMenu* pMenu ) {
 if ( pMenu ) {
 sal_uInt16 itemCount = pMenu->GetItemCount();
@@ -6152,10 +6095,13 @@ void printMenu( AbstractMenu* pMenu ) {
 
 void Menu::Freeze() {
 printMenu( this );
-
-//GMenuModel *menu

Re: [GSOC-UPDATE](31.07) Impress Remote


On Tue, 2012-07-31 at 22:37 +0200, Andrzej J. R. Hunt wrote:
> Today I was still working on the notes export:
> - Finally found which code is used to export XHTML

Nice work :-) - sorry I didn't get to your mail yesterday.

> - Eventually discovered that I should be using the UI name to load the 
> specific filter I needed, rather than trying to get an instance of an 
> XMLFilterAdapter as I had previously been attempting to do.

Yep - non-intuitive isn't it ;-)

> I still haven't managed to get the export to work, but am now in the 
> process of adapting working code to export a notes page rather than a 
> document. (I also now know quite a bit more about how saving and export 
> of documents to various formats works for the various parts of lo...)

:-) IIRC the XSLT filter is tacked on the end of a plain ODF export -
so if we can export only the notes at that level - hopefully / perhaps
the XSLT might look after itself ? ;-)

Anyhow - I'm back from GUADEC, and after recovering from a mail
overdose, should be around to help-out more :-)

Thanks !

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

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

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

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

New commits:
commit b658ec00ee23751ddbbeb46d0f25c4714787130f
Author: Petr Mladek 
Date:   Wed Aug 1 12:02:23 2012 +0200

bump product version to 3.5.7.0, build id to 0

Change-Id: I04f6411143d5921ccdee0609c612d4c0a4b82f11

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index a354d02..b305fde 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,7 +4,7 @@ Globals
{
variables
{
-   UREPACKAGEVERSION 3.5.6
+   UREPACKAGEVERSION 3.5.7
URELAYERVERSION 1
 REFERENCEOOOMAJORMINOR 3.4
UNIXBASISROOTNAME libreoffice3.5
@@ -58,7 +58,7 @@ LibreOffice
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
-   ABOUTBOXPRODUCTVERSION 3.5.6
+   ABOUTBOXPRODUCTVERSION 3.5.7
ABOUTBOXPRODUCTVERSIONSUFFIX .0+
BASEPRODUCTVERSION 3.5
 PCPFILENAME libreoffice.pcp
@@ -70,7 +70,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-   PACKAGEVERSION 3.5.6
+   PACKAGEVERSION 3.5.7
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -117,7 +117,7 @@ LibreOffice_wJRE
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
-   ABOUTBOXPRODUCTVERSION 3.5.6
+   ABOUTBOXPRODUCTVERSION 3.5.7
ABOUTBOXPRODUCTVERSIONSUFFIX .0+
BASEPRODUCTVERSION 3.5
UPDATEURL http://update.libreoffice.org/check.php
@@ -128,7 +128,7 @@ LibreOffice_wJRE
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-   PACKAGEVERSION 3.5.6
+   PACKAGEVERSION 3.5.7
PACKAGEREVISION {buildid}
LICENSENAME LGPL
WITHJREPRODUCT 1
@@ -176,7 +176,7 @@ LibreOffice_Dev
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
-   ABOUTBOXPRODUCTVERSION 3.5.6
+   ABOUTBOXPRODUCTVERSION 3.5.7
ABOUTBOXPRODUCTVERSIONSUFFIX .0+
BASEPRODUCTVERSION 3.5
DEVELOPMENTPRODUCT 1
@@ -192,7 +192,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-   PACKAGEVERSION 3.5.6
+   PACKAGEVERSION 3.5.7
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -279,7 +279,7 @@ LibreOffice_SDK
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.6
+PACKAGEVERSION 3.5.7
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 POOLPRODUCT 0
@@ -323,7 +323,7 @@ LibreOffice_Dev_SDK
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.6
+PACKAGEVERSION 3.5.7
 PACKAGEREVISION {buildid}
 BASISPACKAGEPREFIX lodevbasis
 UREPACKAGEPREFIX lodev
@@ -371,7 +371,7 @@ LibreOffice_Test
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.6
+PACKAGEVERSION 3.5.7
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 POOLPRODUCT 0
@@ -415,7 +415,7 @@ LibreOffice_Dev_Test
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.6
+PACKAGEVERSION 3.5.7
 PACKAGEREVISION {buildid}
 BASISPACKAGEPREFIX lodevbasis
 UREPACKAGEPREFIX lodev
@@ -463,7 +463,7 @@ OxygenOffice
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5

Re: Building on Mac OS X 10.7

I still don't understand how you managed to build against the 10.7 SDK
without getting undefined errors for FMGetATSFontRefFromFont() and
KillPicture(). These two functions are not declared in the 10.7 (or
10.8) SDK headers. (They are still present in the respective
frameworks (libraries).) I had to add the declarations "manually" to
get LO to compile against the 10.8 SDK.

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

[Libreoffice-commits] Changes to 'libreoffice-3-5-6'

New branch 'libreoffice-3-5-6' available with the following commits:
commit 3c51222c6aadeac39caeb653c110f596a224c698
Author: Petr Mladek 
Date:   Wed Aug 1 11:49:42 2012 +0200

Branch libreoffice-3-5-6

This is 'libreoffice-3-5-6' - the stable branch for the 3.5.6 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 3.5.x release,
please use the 'libreoffice-3-5' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I565abfc5bc2b530620a45c3e987b1ad38621f60d

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

[Libreoffice-commits] Changes to 'libreoffice-3-5-6'

New branch 'libreoffice-3-5-6' available with the following commits:
commit 7559e63879d7a183a715b7c3f3b455d9daf703ac
Author: Petr Mladek 
Date:   Wed Aug 1 11:49:42 2012 +0200

Branch libreoffice-3-5-6

This is 'libreoffice-3-5-6' - the stable branch for the 3.5.6 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 3.5.x release,
please use the 'libreoffice-3-5' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Ic6bddc69084620086817d4e2b672749520fe1986

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

[Libreoffice-commits] Changes to 'libreoffice-3-5-6'

New branch 'libreoffice-3-5-6' available with the following commits:
commit 5c7e4994da522cf5a30d21682ca36dd07a275d8a
Author: Petr Mladek 
Date:   Wed Aug 1 11:49:41 2012 +0200

Branch libreoffice-3-5-6

This is 'libreoffice-3-5-6' - the stable branch for the 3.5.6 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 3.5.x release,
please use the 'libreoffice-3-5' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Ic43e3ebf220017e34dc52ca111dcc45e2f41c534

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

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

2012-08-01 Thread Tomáš Chvátal

 vcl/unx/kde4/KDE4FilePicker.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit c921fc0ae2b20de1953e7558fce6b9ddb94c56d3
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Wed Aug 1 11:11:44 2012 +0200

do not let LO's autoextension handling interfere with 
KFileDialog's(fdo#52546)

Change-Id: I73263a74d7b9bbf4a99e86773854e69f747e19d5
Signed-off-by: Tomas Chvatal 

diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index df08ed7..4917bf7 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -398,9 +398,12 @@ uno::Any SAL_CALL KDE4FilePicker::getValue( sal_Int16 
controlId, sal_Int16 )
 switch (controlId)
 {
 case ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION:
-// we ignore this one and rely on KFileDialog to provide the 
function,
-// always return true, here meaning "it's been taken care of"
-res = uno::Any( true );
+// We ignore this one and rely on KFileDialog to provide the 
function.
+// Always return false, to pretend we do not support this, 
otherwise
+// LO core would try to be smart and cut the extension in some 
places,
+// interfering with KFileDialog's handling of it. KFileDialog also
+// saves the value of the setting, so LO core is not needed for 
that either.
+res = uno::Any( false );
 break;
 case ExtendedFilePickerElementIds::CHECKBOX_PASSWORD:
 case ExtendedFilePickerElementIds::CHECKBOX_FILTEROPTIONS:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/unx

2012-08-01 Thread Lubos Lunak

 vcl/unx/kde4/KDE4FilePicker.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit e62c67d8d47231e3ff0df440642dfcabac4f3f81
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Wed Aug 1 11:11:44 2012 +0200

do not let LO's autoextension handling interfere with 
KFileDialog's(fdo#52546)

Change-Id: I73263a74d7b9bbf4a99e86773854e69f747e19d5

diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index df08ed7..4917bf7 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -398,9 +398,12 @@ uno::Any SAL_CALL KDE4FilePicker::getValue( sal_Int16 
controlId, sal_Int16 )
 switch (controlId)
 {
 case ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION:
-// we ignore this one and rely on KFileDialog to provide the 
function,
-// always return true, here meaning "it's been taken care of"
-res = uno::Any( true );
+// We ignore this one and rely on KFileDialog to provide the 
function.
+// Always return false, to pretend we do not support this, 
otherwise
+// LO core would try to be smart and cut the extension in some 
places,
+// interfering with KFileDialog's handling of it. KFileDialog also
+// saves the value of the setting, so LO core is not needed for 
that either.
+res = uno::Any( false );
 break;
 case ExtendedFilePickerElementIds::CHECKBOX_PASSWORD:
 case ExtendedFilePickerElementIds::CHECKBOX_FILTEROPTIONS:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 oox/inc/oox/ole/axcontrol.hxx |3 ++-
 oox/source/ole/axcontrol.cxx  |   13 +
 sw/source/filter/ww8/wrtw8esh.cxx |2 ++
 3 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit 2909cf76a701b4860b849fc1aa90fc2046bfbe00
Author: Miklos Vajna 
Date:   Tue Jul 31 12:33:41 2012 +0200

fdo#45724 improve WW8 textbox export

If there is no default value, but there is a current one, export that
instead.

Change-Id: I01af5cfa641b061b0aeb959e579bca66340781e9

diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index b8a8f59..1d124ce 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -1718,6 +1718,9 @@ void AxTextBoxModel::convertFromProperties( PropertySet& 
rPropSet, const Control
 if ( rPropSet.getProperty( bRes,  PROP_HideInactiveSelection ) )
 setFlag( mnFlags, AX_FLAGS_HIDESELECTION, bRes );
 rPropSet.getProperty( maValue, ( mbAwtModel ? PROP_Text : PROP_DefaultText 
) );
+if (maValue.isEmpty() && !mbAwtModel)
+// No default value? Then try exporting the current one.
+rPropSet.getProperty( maValue, PROP_Text);
 sal_Int16 nTmp(0);
 if ( rPropSet.getProperty( nTmp, PROP_MaxTextLen ) )
 mnMaxLength = nTmp;
commit 88c0f4e9a28db4f2947c1c7469f54b76e88a3052
Author: Miklos Vajna 
Date:   Tue Jul 31 11:18:31 2012 +0200

fdo#45724 fix WW8 export of textbox default background color

regression from 5609c512cd4d2899300b432d88d93cff05a05c87

Change-Id: I5f3ce73943b2805b7de1ae41699e605af9086b15

diff --git a/oox/inc/oox/ole/axcontrol.hxx b/oox/inc/oox/ole/axcontrol.hxx
index b204b92..c2324aa 100644
--- a/oox/inc/oox/ole/axcontrol.hxx
+++ b/oox/inc/oox/ole/axcontrol.hxx
@@ -228,7 +228,8 @@ public:
 voidconvertToMSColor(
 PropertySet& rPropSet,
 sal_Int32 nPropId,
-sal_uInt32& nOleColor ) const;
+sal_uInt32& nOleColor,
+sal_uInt32 nDefault = 0 ) const;
 
 
 /** Converts the passed StdPic picture stream to UNO properties. */
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index eb5a205..b8a8f59 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -282,11 +282,13 @@ void ControlConverter::convertColor( PropertyMap& 
rPropMap, sal_Int32 nPropId, s
 rPropMap.setProperty( nPropId, OleHelper::decodeOleColor( mrGraphicHelper, 
nOleColor, mbDefaultColorBgr ) );
 }
 
-void ControlConverter::convertToMSColor( PropertySet& rPropSet, sal_Int32 
nPropId, sal_uInt32& nOleColor ) const
+void ControlConverter::convertToMSColor( PropertySet& rPropSet, sal_Int32 
nPropId, sal_uInt32& nOleColor, sal_uInt32 nDefault ) const
 {
 sal_uInt32 nRGB = 0;
-rPropSet.getProperty( nRGB, nPropId );
-nOleColor = OleHelper::encodeOleColor( nRGB );
+if (rPropSet.getProperty( nRGB, nPropId ))
+nOleColor = OleHelper::encodeOleColor( nRGB );
+else
+nOleColor = nDefault;
 }
 void ControlConverter::convertPicture( PropertyMap& rPropMap, const 
StreamDataSequence& rPicData ) const
 {
@@ -1726,7 +1728,7 @@ void AxTextBoxModel::convertFromProperties( PropertySet& 
rPropSet, const Control
 if ( rPropSet.getProperty( bRes,  PROP_VScroll ) )
 setFlag( mnScrollBars, AX_SCROLLBAR_VERTICAL, bRes );
 
-rConv.convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor );
+rConv.convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor, 
0x8005L );
 
 rConv.convertToAxBorder( rPropSet, mnBorderColor, mnBorderStyle, 
mnSpecialEffect );
 AxMorphDataModelBase::convertFromProperties( rPropSet, rConv );
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx 
b/sw/source/filter/ww8/wrtw8esh.cxx
index b951b32..cfaf64b 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -1662,6 +1662,8 @@ void SwBasicEscherEx::WriteBrushAttr(const SvxBrushItem 
&rBrush,
 bool lcl_isInHeader(const SwFrmFmt& rFmt)
 {
 const SwFlyFrmFmt* pFlyFrmFmt = dynamic_cast(&rFmt);
+if (!pFlyFrmFmt)
+return false;
 SwFlyFrm* pFlyFrm = const_cast(pFlyFrmFmt->GetFrm());
 SwPageFrm* pPageFrm = pFlyFrm->FindPageFrmOfAnchor();
 SwFrm* pHeader = pPageFrm->Lower();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Building on Mac OS X 10.7


On 06/08/2012 12:50 PM, Jan Holesovsky wrote:

On 2012-06-07 at 09:13 +0200, Stephan Bergmann wrote:

FYI, attached BUILD-lo script allowed me to build recent LO master on
Mac OS X 10.7 with Xcode 4.  A few comments:


Can you pleas add it to

http://wiki.documentfoundation.org/Development/Native_Build

too?


Added the script (slightly updated) as 
 
now.


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

double rendering of borders ...

On Fri, 2012-07-27 at 21:39 +0400, Ivan Timofeev wrote:
> there was a discussion about ugly listboxes in gtk theming, and we
> decided to draw a border:

I was at GUADEC just now, and trying to get toolbar rendering sorted
out for gtk3 - which turned out to be quite 'fun' ;-) it seems that the
toolbar items we have have a WB_BORDER style set which appears to create
a strange border rendering widget; which renders the entire toolbar
combo-box (eg. the font selector) twice at least. Quite apart from the
wastefulness there, with the new alpha transparent borders - we get a
double compositing which over-darkens the pretty alpha effects there :-)

I didn't nail that, but I have some interesting traces if anyone wants
to invest some time in the NWF code to try to unwind that :-) In better
news I also fixed a horrific lack of re-rendering issue around
native-widgets, so gtk3+ looks a -lot- better than it did (though we
still have some off-by-one issues with re-rendering).

HTH,

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

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

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - oox/inc oox/source

 oox/inc/oox/ole/axcontrol.hxx |3 ++-
 oox/source/ole/axcontrol.cxx  |   13 +
 2 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 76c05c56d19f0643fb99375ef8315e931f87de59
Author: Miklos Vajna 
Date:   Tue Jul 31 12:33:41 2012 +0200

fdo#45724 improve WW8 textbox export

If there is no default value, but there is a current one, export that
instead.

Change-Id: I01af5cfa641b061b0aeb959e579bca66340781e9

diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index ff86c8d..7756ebf 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -1717,6 +1717,9 @@ void AxTextBoxModel::convertFromProperties( PropertySet& 
rPropSet, const Control
 if ( rPropSet.getProperty( bRes,  PROP_HideInactiveSelection ) )
 setFlag( mnFlags, AX_FLAGS_HIDESELECTION, bRes );
 rPropSet.getProperty( maValue, ( mbAwtModel ? PROP_Text : PROP_DefaultText 
) );
+if (maValue.isEmpty() && !mbAwtModel)
+// No default value? Then try exporting the current one.
+rPropSet.getProperty( maValue, PROP_Text);
 sal_Int16 nTmp(0);
 if ( rPropSet.getProperty( nTmp, PROP_MaxTextLen ) )
 mnMaxLength = nTmp;
commit 1db74f95ca260b65e04f7ed3e11f2bb36d3d8414
Author: Miklos Vajna 
Date:   Tue Jul 31 11:18:31 2012 +0200

fdo#45724 fix WW8 export of textbox default background color

regression from 5609c512cd4d2899300b432d88d93cff05a05c87

Change-Id: I5f3ce73943b2805b7de1ae41699e605af9086b15

diff --git a/oox/inc/oox/ole/axcontrol.hxx b/oox/inc/oox/ole/axcontrol.hxx
index ee3a9ac..153aaf6 100644
--- a/oox/inc/oox/ole/axcontrol.hxx
+++ b/oox/inc/oox/ole/axcontrol.hxx
@@ -227,7 +227,8 @@ public:
 voidconvertToMSColor(
 PropertySet& rPropSet,
 sal_Int32 nPropId,
-sal_uInt32& nOleColor ) const;
+sal_uInt32& nOleColor,
+sal_uInt32 nDefault = 0 ) const;
 
 
 /** Converts the passed StdPic picture stream to UNO properties. */
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 6013f75..ff86c8d 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -281,11 +281,13 @@ void ControlConverter::convertColor( PropertyMap& 
rPropMap, sal_Int32 nPropId, s
 rPropMap.setProperty( nPropId, OleHelper::decodeOleColor( mrGraphicHelper, 
nOleColor, mbDefaultColorBgr ) );
 }
 
-void ControlConverter::convertToMSColor( PropertySet& rPropSet, sal_Int32 
nPropId, sal_uInt32& nOleColor ) const
+void ControlConverter::convertToMSColor( PropertySet& rPropSet, sal_Int32 
nPropId, sal_uInt32& nOleColor, sal_uInt32 nDefault ) const
 {
 sal_uInt32 nRGB = 0;
-rPropSet.getProperty( nRGB, nPropId );
-nOleColor = OleHelper::encodeOleColor( nRGB );
+if (rPropSet.getProperty( nRGB, nPropId ))
+nOleColor = OleHelper::encodeOleColor( nRGB );
+else
+nOleColor = nDefault;
 }
 void ControlConverter::convertPicture( PropertyMap& rPropMap, const 
StreamDataSequence& rPicData ) const
 {
@@ -1725,7 +1727,7 @@ void AxTextBoxModel::convertFromProperties( PropertySet& 
rPropSet, const Control
 if ( rPropSet.getProperty( bRes,  PROP_VScroll ) )
 setFlag( mnScrollBars, AX_SCROLLBAR_VERTICAL, bRes );
 
-rConv.convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor );
+rConv.convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor, 
0x8005L );
 
 rConv.convertToAxBorder( rPropSet, mnBorderColor, mnBorderStyle, 
mnSpecialEffect );
 AxMorphDataModelBase::convertFromProperties( rPropSet, rConv );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 37361] LibreOffice 3.5 most annoying bugs

2012-08-01 Thread bugzilla-daemon

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

Bug 37361 depends on bug 45724, which changed state.

Bug 45724 Summary: FILESAVE, FORMATTING, Text field data loss
https://bugs.freedesktop.org/show_bug.cgi?id=45724

   What|Old Value   |New Value

 Status|NEW |ASSIGNED
 Resolution||FIXED
 Status|ASSIGNED|RESOLVED

-- 
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: Proposal/Prototype support for "fill in character" in Calc Number Format Strings // final patch set


On 01/08/12 09:01, Philipp Riemer wrote:

Hi Noel,
to my eyes the diffs are below the text description in the ".txt"
file. Correct me if I am wrong but with all comment lines starting
with "#" it should be a valid patch file even if the file extension is
".txt" and not ".patch", or not? However, I did not try to apply it
since I have no source clone here.

Or did I understand something wrong in your comment above?

I'm not disputing the validity of the patch format, but... Johann has 
created a patch that contains a large portion of existing patches that I 
already created ( that already either exist on master and/or in the mail 
thread referenced ) with I believe additional tweaks from himself. 
However since that patch is effectively a squash of his and my work it 
is rather difficult to see what changes he made exactly. A patch 
consisting solely of his changes against the source ( patched already 
with my patches ) would be much easier for me to read


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

[Libreoffice-commits] .: 4 commits - oox/inc oox/source sw/CppunitTest_sw_subsequent_ww8export.mk sw/qa sw/source test/inc test/Library_test.mk test/source

2012-08-01 Thread Miklos Vajna

 oox/inc/oox/ole/axcontrol.hxx |3 ++-
 oox/source/ole/axcontrol.cxx  |   13 +
 sw/CppunitTest_sw_subsequent_ww8export.mk |1 +
 sw/qa/extras/ww8export/data/fdo45724.odt  |binary
 sw/qa/extras/ww8export/ww8export.cxx  |   15 +++
 sw/source/filter/ww8/wrtw8esh.cxx |2 ++
 test/Library_test.mk  |1 +
 test/inc/test/bootstrapfixture.hxx|3 +++
 test/source/bootstrapfixture.cxx  |9 +
 9 files changed, 42 insertions(+), 5 deletions(-)

New commits:
commit a69691ff8c1cfeca6b67973000d17fa01947a0a5
Author: Miklos Vajna 
Date:   Tue Jul 31 13:04:10 2012 +0200

fdo#45724 testcase

Change-Id: I27811a6e35cd07dd117831eb9dee177c54f9ff50

diff --git a/sw/CppunitTest_sw_subsequent_ww8export.mk 
b/sw/CppunitTest_sw_subsequent_ww8export.mk
index 8c051e3..e01da9b 100644
--- a/sw/CppunitTest_sw_subsequent_ww8export.mk
+++ b/sw/CppunitTest_sw_subsequent_ww8export.mk
@@ -85,6 +85,7 @@ $(eval $(call 
gb_CppunitTest_use_components,sw_subsequent_ww8export,\
 i18npool/util/i18npool \
 package/source/xstor/xstor \
 package/util/package2 \
+sax/source/expatwrap/expwrap \
 sw/util/msword \
 sw/util/sw \
 sw/util/swd \
diff --git a/sw/qa/extras/ww8export/data/fdo45724.odt 
b/sw/qa/extras/ww8export/data/fdo45724.odt
new file mode 100644
index 000..45c6d9a
Binary files /dev/null and b/sw/qa/extras/ww8export/data/fdo45724.odt differ
diff --git a/sw/qa/extras/ww8export/ww8export.cxx 
b/sw/qa/extras/ww8export/ww8export.cxx
index 4bf4a57..58692a6 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -27,7 +27,9 @@
 
 #include "../swmodeltestbase.hxx"
 
+#include 
 #include 
+#include 
 #include 
 #include 
 
@@ -39,10 +41,12 @@ class Test : public SwModelTestBase
 {
 public:
 void testN325936();
+void testFdo45724();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
 CPPUNIT_TEST(testN325936);
+CPPUNIT_TEST(testFdo45724);
 #endif
 CPPUNIT_TEST_SUITE_END();
 
@@ -80,6 +84,17 @@ void Test::testN325936()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(100), nValue);
 }
 
+void Test::testFdo45724()
+{
+roundtrip("fdo45724.odt");
+uno::Reference xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
+uno::Reference 
xControlShape(xDraws->getByIndex(0), uno::UNO_QUERY);
+uno::Reference 
xComponent(xControlShape->getControl(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(COL_WHITE, getProperty(xComponent, 
"BackgroundColor"));
+CPPUNIT_ASSERT_EQUAL(OUString("xxx"), 
xComponent->getCurrentValue().get());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
commit f5a98e08e7f12453c469b277554b0e45f0c2310f
Author: Miklos Vajna 
Date:   Wed Aug 1 10:05:05 2012 +0200

test::BootstrapFixture: make GraphicConverter work

Change-Id: I566448db441eaa324cf619630a2e87cb8cbaeb99

diff --git a/test/Library_test.mk b/test/Library_test.mk
index d641b9c..48ca6b0 100644
--- a/test/Library_test.mk
+++ b/test/Library_test.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_use_libraries,test,\
 cppuhelper \
i18nisolang1 \
 sal \
+svt \
tl \
utl \
ucbhelper \
diff --git a/test/inc/test/bootstrapfixture.hxx 
b/test/inc/test/bootstrapfixture.hxx
index feabafb..4896d8a 100644
--- a/test/inc/test/bootstrapfixture.hxx
+++ b/test/inc/test/bootstrapfixture.hxx
@@ -31,6 +31,8 @@
 #include 
 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -55,6 +57,7 @@ class OOO_DLLPUBLIC_TEST BootstrapFixture : public 
BootstrapFixtureBase
 {
   bool m_bNeedUCB;
   bool m_bAssertOnDialog;
+  DECL_LINK( ImplInitFilterHdl, ConvertData* );
 
 public:
   BootstrapFixture( bool bAssertOnDialog = true, bool bNeedUCB = true );
diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx
index edb7b63..86e2acb 100644
--- a/test/source/bootstrapfixture.cxx
+++ b/test/source/bootstrapfixture.cxx
@@ -41,6 +41,7 @@
 
 #include 
 #include 
+#include 
 #include 
 
 using namespace ::com::sun::star;
@@ -103,6 +104,9 @@ void test::BootstrapFixture::setUp()
 
 if( m_bAssertOnDialog )
 ErrorHandler::RegisterDisplay( aBasicErrorFunc );
+
+// Make GraphicConverter work, normally done in desktop::Desktop::Main()
+Application::SetFilterHdl( LINK( this, test::BootstrapFixture, 
ImplInitFilterHdl ) );
 }
 
 void test::BootstrapFixture::tearDown()
@@ -115,4 +119,9 @@ test::BootstrapFixture::~BootstrapFixture()
 {
 }
 
+IMPL_LINK( test::BootstrapFixture, ImplInitFilterHdl, ConvertData*, pData )
+{
+return GraphicFilter::GetGraphicFilter().GetFilterCallback().Call( pData );
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 12a35ec8905559a5f2e0e00f792489bbcf0095db
Author: Miklos Vajna 
Date:   Tue Jul 31 12:33:41 2012 +0200

fdo#45724 improve

[PATCH] Modifying comments to meet doxygen standards

>From abdulmajeed ahmed :

abdulmajeed ahmed has uploaded a new change for review.

Change subject: Modifying comments to meet doxygen standards
..

Modifying comments to meet doxygen standards

Change-Id: Id963eb87e3e94a4c761321f0a51b3d3851b6fc6c
---
M sw/inc/dbfld.hxx
M sw/inc/dbmgr.hxx
M sw/inc/dcontact.hxx
M sw/inc/ddefld.hxx
M sw/inc/dlelstnr.hxx
M sw/inc/doc.hxx
6 files changed, 412 insertions(+), 412 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id963eb87e3e94a4c761321f0a51b3d3851b6fc6c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: abdulmajeed ahmed 

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

[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - 2 commits - cli_ure/Package_version.mk solenv/gbuild

2012-08-01 Thread David Tardon

 cli_ure/Package_version.mk   |2 +-
 solenv/gbuild/InternalUnoApi.mk  |3 +++
 solenv/gbuild/TargetLocations.mk |2 ++
 solenv/gbuild/UnoApi.mk  |2 ++
 solenv/gbuild/UnoApiMerge.mk |3 +++
 solenv/gbuild/UnoApiTarget.mk|   11 ++-
 6 files changed, 21 insertions(+), 2 deletions(-)

New commits:
commit 79c8e862fbfba8e44801a69f7a7ce2d68469130b
Author: David Tardon 
Date:   Wed Aug 1 09:38:07 2012 +0200

ensure IDL files of used UnoApis are in place

Change-Id: I27740a60b9b5ff7ef5541713b2f85e03f8e70c7d

diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk
index a32984f..90249a5 100644
--- a/solenv/gbuild/InternalUnoApi.mk
+++ b/solenv/gbuild/InternalUnoApi.mk
@@ -52,6 +52,8 @@ $(call gb_InternalUnoApi_get_target,$(1)) : $(call 
gb_UnoApiTarget_get_target,$(
 $(call gb_InternalUnoApi_get_clean_target,$(1)) : $(call 
gb_UnoApiTarget_get_clean_target,$(1)_out)
 $(call gb_InternalUnoApi_get_clean_target,$(1)) : $(call 
gb_UnoApiHeadersTarget_get_clean_target,$(1))
 
+$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(gb_Helper_MISCDUMMY)
+
 $(call gb_Deliver_add_deliverable,$(call 
gb_InternalUnoApi_get_target,$(1)),$(call 
gb_UnoApiTarget_get_target,$(1)_out),$(1))
 
 $$(eval $$(call gb_Module_register_target,$(call 
gb_InternalUnoApi_get_target,$(1)),$(call 
gb_InternalUnoApi_get_clean_target,$(1
@@ -71,6 +73,7 @@ endef
 define gb_InternalUnoApi__use_api
 $(call gb_UnoApiHeadersTarget_use_api,$(1),$(2))
 $(call gb_InternalUnoApi_get_target,$(1)) : $(call 
gb_UnoApiTarget_get_target,$(2))
+$(call gb_UnoApiTarget_get_external_headers_target,$(1)) : $(call 
gb_UnoApiTarget_get_headers_target,$(2))
 
 endef
 
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 1a8bcda..c9e8b8c 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -153,6 +153,8 @@ gb_SrsTarget_get_target = $(WORKDIR)/SrsTarget/$(1).srs
 gb_SrsTemplatePartTarget_get_target = 
$(WORKDIR)/SrsTemplatePartTarget/$(firstword $(subst /, ,$(1)))/$(subst 
_tmpl,,$(notdir $(1)))
 gb_SrsTemplateTarget_get_include_dir = 
$(WORKDIR)/SrsTemplatePartTarget/$(firstword $(subst /, ,$(1)))
 gb_SrsTemplateTarget_get_target = $(WORKDIR)/SrsTemplateTarget/$(1)
+gb_UnoApiTarget_get_external_headers_target = 
$(WORKDIR)/UnoApiTarget/$(1).external
+gb_UnoApiTarget_get_headers_target = $(WORKDIR)/UnoApiTarget/$(1).headers
 gb_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).rdb
 gb_UnoApiHeadersTarget_get_bootstrap_dir = 
$(WORKDIR)/UnoApiHeadersTarget/$(1)/bootstrap$(2)
 gb_UnoApiHeadersTarget_get_comprehensive_dir = 
$(WORKDIR)/UnoApiHeadersTarget/$(1)/comprehensive$(2)
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index da9a4af..a5ecfda 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -47,6 +47,7 @@ $(call gb_UnoApi_get_clean_target,$(1)) : $(call 
gb_UnoApiHeadersTarget_get_clea
 $(call gb_UnoApi_get_clean_target,$(1)) : $(call 
gb_Package_get_clean_target,$(1)_idl)
 $(call gb_UnoApi_get_clean_target,$(1)) : $(call 
gb_Package_get_clean_target,$(1)_inc)
 
+$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(call 
gb_Package_get_target,$(1)_idl)
 $(call gb_Package_get_preparation_target,$(1)_inc) : $(call 
gb_UnoApiHeadersTarget_get_target,$(1))
 
 $(call gb_Deliver_add_deliverable,$(call gb_UnoApi_get_target,$(1)),$(call 
gb_UnoApiTarget_get_target,$(1)),$(1))
@@ -132,6 +133,7 @@ endef
 define gb_UnoApi__use_api
 $(call gb_UnoApiHeadersTarget_use_api,$(1),$(2))
 $(call gb_UnoApi_get_target,$(1)) :| $(call gb_UnoApi_get_target,$(2))
+$(call gb_UnoApiTarget_get_external_headers_target,$(1)) : $(call 
gb_UnoApiTarget_get_headers_target,$(2))
 
 endef
 
diff --git a/solenv/gbuild/UnoApiMerge.mk b/solenv/gbuild/UnoApiMerge.mk
index 3ce9ad5..d321219 100644
--- a/solenv/gbuild/UnoApiMerge.mk
+++ b/solenv/gbuild/UnoApiMerge.mk
@@ -38,6 +38,8 @@ $(call gb_UnoApiMerge_get_target,$(1)) :| $(dir $(call 
gb_UnoApiMerge_get_target
 $(call gb_UnoApiMerge_get_target,$(1)) : $(call 
gb_UnoApiTarget_get_target,$(1))
 $(call gb_UnoApiMerge_get_clean_target,$(1)) : $(call 
gb_UnoApiTarget_get_clean_target,$(1))
 
+$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(gb_Helper_MISCDUMMY)
+
 $(call gb_Deliver_add_deliverable,$(call 
gb_UnoApiMerge_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)),$(1))
 
 $$(eval $$(call gb_Module_register_target,$(call 
gb_UnoApiMerge_get_target,$(1)),$(call gb_UnoApiMerge_get_clean_target,$(1
@@ -50,6 +52,7 @@ endef
 
 define gb_UnoApiMerge__use_api
 $(call gb_UnoApiTarget_merge_api,$(1),$(2))
+$(call gb_UnoApiTarget_get_external_headers_target,$(1)) : $(call 
gb_UnoApiTarget_get_headers_target,$(2))
 
 endef
 
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index c473f6d..64c49b6 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -134,6 +134,12 @@ $(if $(or $(and $(1),$(2),$(3)),$(and $(1),$(

Modifying comments to meet doxygen standards

>From abdulmajeed ahmed :

abdulmajeed ahmed has abandoned this change.

Change subject: Modifying comments to meet doxygen standards
..


Patch Set 2: Abandoned

error in comitt

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: Iae9ad57b218c6d038c1fdc8eef01806b30fdab9a
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: abdulmajeed ahmed 

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

[PATCH] Modifying comments to meet doxygen standards

>From abdulmajeed ahmed :

abdulmajeed ahmed has uploaded a new change for review.

Change subject: Modifying comments to meet doxygen standards
..

Modifying comments to meet doxygen standards

Change-Id: Iae9ad57b218c6d038c1fdc8eef01806b30fdab9a
---
A LibreOffice
M sw/inc/dbfld.hxx
M sw/inc/dbmgr.hxx
M sw/inc/dcontact.hxx
M sw/inc/ddefld.hxx
M sw/inc/dlelstnr.hxx
M sw/inc/doc.hxx
A tail_build/core.18645
A tail_build/core.22318
A tail_build/core.22743
A tail_build/core.2793
A tail_build/core.29971
A tail_build/core.3279
A tail_build/core.8442
A tail_build/core.9858
15 files changed, 412 insertions(+), 412 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae9ad57b218c6d038c1fdc8eef01806b30fdab9a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: abdulmajeed ahmed 

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

Re: [PUSHED 3-5 3-6] Re: ./autogen.sh problem: 'configure: error: No compiler found.'

Michael Stahl píše v Po 30. 07. 2012 v 14:38 +0200:
> >> ok, the problem should be fixed now on master with
> >> c691d9643994956e8f17710625ccb989d428e1bf
> >>
> > Hmm, It removes AC_SUBST(COMPATH) but this variable is used in several
> > makefiles, mainly for Solaris or Windows.
> 
> argh that was an accident :( clearly the task was too difficult for me :)
> 
> put it back now with 59d4e47c62f4b21794eb9ba8ba634df978c3a38f
>
> i don't know, perhaps COMPATH is necessary for Windows, but checking it
> this late in configure seems silly in any case.

I agree. The two commits are fine => squashed and pushed into both 3-5
and 3-6 branches, see:

http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5&id=557e31707bccfaf0b1238a17242e32fbbddc8f1d
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6&id=35080734323dbd740042ff159d71368b3739e97d


Best regards,
Petr


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

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - configure.in

 configure.in |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 35080734323dbd740042ff159d71368b3739e97d
Author: Michael Stahl 
Date:   Mon Jul 30 12:46:50 2012 +0200

configure: remove check for empty $COMPATH

It would be extremely suprising if we could get to line 11075 in the
configure script if there isn't actually a C++ compiler available, and
the test does fail on Fedora 17 without ccache installed because $CC is
/bin/gcc.

Change-Id: I727ba171a3d647e2ba974d196794943b6450ce6e
Signed-off-by: Petr Mladek 

diff --git a/configure.in b/configure.in
index 0d96c27..2dd9390 100644
--- a/configure.in
+++ b/configure.in
@@ -11706,9 +11706,6 @@ dnl Setting up the environment.
 dnl ===
 echo "setting up the build environment variables..."
 
-if test -z "$COMPATH"; then
-AC_MSG_ERROR([No compiler found.])
-fi
 AC_SUBST(COMPATH)
 
 if test "$build_os" = "cygwin"; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - configure.in