Re: Missing service SvgWriter - forgotten when rebasing with AOO

[Fernand Vanrie]

 Michael ,

any change the SVG stuff and this repairs happens also for later 3.6 
releases ?

Greetz
Fernand

  I am looking why exporting SVG doesn't work when exporting charts
(fdo#60137). In [1] we need "com.sun.star.svg.SVGWriter" but it is not
present in LO. Looks to me like we missed to include changes in [2]
from AOO when rebasing. What should we do about this?

Will fix it, thanks ! :-)

Michael.



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

Re: [HELP] Java expert needed on fdo#61726

[David Ostrovsky]

On Tue Mar 5 Tor Lillqvist wrote:


/  to rectify that i renamed our class to be ReportEngine2.java

/

Wouldn't it have been appropriate to rename the package, too? If the
report-builder is an extension, not part of offapi, why are its
classes in com.sun.star?


done: https://gerrit.libreoffice.org/#/c/2578/

David

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

bibliographic styles

[Jonathan Aquilina]

I have a quick question I found a bundle of free bibliographic styles for
word, but they are all xml based, How are bibliographic styles handled in
LO, and if they are xml based what would be the best way to get this
included in what is already available?

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

[PATCH] fdo#61726: rename report-builder package org.libreoffice.ext...

[David Ostrovsky (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2578

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/78/2578/1

fdo#61726: rename report-builder package org.libreoffice.ext.report

To prevent future collisions with uno's own territory rename the
com.sun.star.report package to org.libreoffice.ext.report.

Change-Id: Ia06cb7ad8c1528c1d5b5eeb70f1e4b2aa854b70f
---
M Repository.mk
M connectivity/source/commontools/dbtools2.cxx
M dbaccess/source/ui/app/AppController.cxx
M reportbuilder/Configuration_reportbuilder.mk
M reportbuilder/Extension_reportbuilder.mk
M reportbuilder/Jar_reportbuilder.mk
D reportbuilder/java/com/sun/star/report/pentaho/configuration.properties
D reportbuilder/java/com/sun/star/report/pentaho/parser/selectors.properties
M reportbuilder/java/jfreereport.properties
M reportbuilder/java/libformula.properties
M reportbuilder/java/loader.properties
R reportbuilder/java/org/libreoffice/ext/report/DataRow.java
R reportbuilder/java/org/libreoffice/ext/report/DataSource.java
R reportbuilder/java/org/libreoffice/ext/report/DataSourceException.java
R reportbuilder/java/org/libreoffice/ext/report/DataSourceFactory.java
R reportbuilder/java/org/libreoffice/ext/report/ImageService.java
R reportbuilder/java/org/libreoffice/ext/report/InputRepository.java
R reportbuilder/java/org/libreoffice/ext/report/JobDefinitionException.java
R reportbuilder/java/org/libreoffice/ext/report/JobProgressIndicator.java
R reportbuilder/java/org/libreoffice/ext/report/JobProperties.java
R reportbuilder/java/org/libreoffice/ext/report/OfficeToken.java
R reportbuilder/java/org/libreoffice/ext/report/OutputRepository.java
R reportbuilder/java/org/libreoffice/ext/report/ParameterMap.java
R reportbuilder/java/org/libreoffice/ext/report/ReportAddIn.java
R reportbuilder/java/org/libreoffice/ext/report/ReportEngineMetaData.java
R reportbuilder/java/org/libreoffice/ext/report/ReportEngineParameterNames.java
R reportbuilder/java/org/libreoffice/ext/report/ReportExecutionException.java
R reportbuilder/java/org/libreoffice/ext/report/ReportExpression.java
R reportbuilder/java/org/libreoffice/ext/report/ReportExpressionMetaData.java
R reportbuilder/java/org/libreoffice/ext/report/ReportFunction.java
R reportbuilder/java/org/libreoffice/ext/report/ReportJob.java
R reportbuilder/java/org/libreoffice/ext/report/ReportJobDefinition.java
R reportbuilder/java/org/libreoffice/ext/report/ReportJobFactory.java
R reportbuilder/java/org/libreoffice/ext/report/SDBCReportData.java
R reportbuilder/java/org/libreoffice/ext/report/SDBCReportDataFactory.java
R reportbuilder/java/org/libreoffice/ext/report/SOImageService.java
R reportbuilder/java/org/libreoffice/ext/report/StorageRepository.java
R 
reportbuilder/java/org/libreoffice/ext/report/function/metadata/Author-Function.properties
R 
reportbuilder/java/org/libreoffice/ext/report/function/metadata/Author-Function_en_US.properties
R 
reportbuilder/java/org/libreoffice/ext/report/function/metadata/AuthorFunction.java
R 
reportbuilder/java/org/libreoffice/ext/report/function/metadata/AuthorFunctionDescription.java
R 
reportbuilder/java/org/libreoffice/ext/report/function/metadata/MetaDataFunctionCategory.java
R 
reportbuilder/java/org/libreoffice/ext/report/function/metadata/Title-Function.properties
R 
reportbuilder/java/org/libreoffice/ext/report/function/metadata/Title-Function_en_US.properties
R 
reportbuilder/java/org/libreoffice/ext/report/function/metadata/TitleFunction.java
R 
reportbuilder/java/org/libreoffice/ext/report/function/metadata/TitleFunctionDescription.java
R 
reportbuilder/java/org/libreoffice/ext/report/function/metadata/category.properties
R 
reportbuilder/java/org/libreoffice/ext/report/function/metadata/category_en_US.properties
R 
reportbuilder/java/org/libreoffice/ext/report/pentaho/DefaultNameGenerator.java
R reportbuilder/java/org/libreoffice/ext/report/pentaho/Manifest.mf
R reportbuilder/java/org/libreoffice/ext/report/pentaho/OfficeNamespaces.java
R 
reportbuilder/java/org/libreoffice/ext/report/pentaho/PentahoFormulaContext.java
R reportbuilder/java/org/libreoffice/ext/report/pentaho/PentahoReportAddIn.java
R reportbuilder/java/org/libreoffice/ext/report/pentaho/PentahoReportEngine.java
R 
reportbuilder/java/org/libreoffice/ext/report/pentaho/PentahoReportEngineMetaData.java
R reportbuilder/java/org/libreoffice/ext/report/pentaho/PentahoReportJob.java
R 
reportbuilder/java/org/libreoffice/ext/report/pentaho/SOFormulaOpCodeMapper.java
R reportbuilder/java/org/libreoffice/ext/report/pentaho/SOFormulaParser.java
R reportbuilder/java/org/libreoffice/ext/report/pentaho/SOFunctionManager.java
R reportbuilder/java/org/libreoffice/ext/report/pentaho/SOReportJobFactory.java
R 
reportbuilder/java/org/libreoffice/ext/report/pentaho/StarFunctionCategory.java
R 
reportbuilder/java/org/libreoffice/ext/report/pentaho/StarFunctionDescription.java
R reportbuilder/java/org/libreoffice/ext/report/pentaho/StarReportD

[Libreoffice-commits] core.git: libmariadb/my_config.h

[Fridrich Štrba]

 libmariadb/my_config.h |  113 -
 1 file changed, 11 insertions(+), 102 deletions(-)

New commits:
commit 7298b7c6866457dff111638cdce9207feb2580fa
Author: Fridrich Å trba 
Date:   Thu Mar 7 08:05:00 2013 +0100

make libmariadb/my_config.h much more generic

Change-Id: Iea153d6e1b648ac6a7bdf8978cfc1f8016158d6c

diff --git a/libmariadb/my_config.h b/libmariadb/my_config.h
index bdf86b3..83ff9cf 100644
--- a/libmariadb/my_config.h
+++ b/libmariadb/my_config.h
@@ -159,111 +159,20 @@
  * types and sizes
  */
 /* Types we may use */
-#define SIZEOF_CHAR 1
-#if SIZEOF_CHAR
-# define HAVE_CHAR 1
-#endif
-
-#define SIZEOF_CHARP 8
-#if SIZEOF_CHARP
-# define HAVE_CHARP 1
-#endif
-
-#define SIZEOF_SHORT 2
-#if SIZEOF_SHORT
-# define HAVE_SHORT 1
-#endif
+#define HAVE_CHAR 1
+#define HAVE_CHARP 1
+#define HAVE_SHORT 1
 
 #define SIZEOF_INT 4
-#if SIZEOF_INT
-# define HAVE_INT 1
-#endif
-
-#define SIZEOF_LONG 8
-#if SIZEOF_LONG
-# define HAVE_LONG 1
-#endif
-
-#define SIZEOF_LONG_LONG 8
-#if SIZEOF_LONG_LONG
-# define HAVE_LONG_LONG 1
-#endif
-
-#define SIZEOF_OFF_T 8
-#if SIZEOF_OFF_T
-# define HAVE_OFF_T 1
-#endif
-
-#define SIZEOF_SIGSET_T 128
-#if SIZEOF_SIGSET_T
-# define HAVE_SIGSET_T 1
-#endif
-
-#define SIZEOF_SIZE_T 8
-#if SIZEOF_SIZE_T
-# define HAVE_SIZE_T 1
-#endif
-
-/* #undef SIZEOF_UCHAR */
-#if SIZEOF_UCHAR
-# define HAVE_UCHAR 1
-#endif
-
-#define SIZEOF_UINT 4
-#if SIZEOF_UINT
-# define HAVE_UINT 1
-#endif
-
-#define SIZEOF_ULONG 8
-#if SIZEOF_ULONG
-# define HAVE_ULONG 1
-#endif
-
-/* #undef SIZEOF_INT8 */
-#if SIZEOF_INT8
-# define HAVE_INT8 1
-#endif
-/* #undef SIZEOF_UINT8 */
-#if SIZEOF_UINT8
-# define HAVE_UINT8 1
-#endif
-
-/* #undef SIZEOF_INT16 */
-#if SIZEOF_INT16
-# define HAVE_INT16 1
-#endif
-/* #undef SIZEOF_UINT16 */
-#if SIZEOF_UINT16
-# define HAVE_UINT16 1
-#endif
-
-/* #undef SIZEOF_INT32 */
-#if SIZEOF_INT32
-# define HAVE_INT32 1
-#endif
-/* #undef SIZEOF_UINT32 */
-#if SIZEOF_UINT32
-# define HAVE_UINT32 1
-#endif
-/* #undef SIZEOF_U_INT32_T */
-#if SIZEOF_U_INT32_T
-# define HAVE_U_INT32_T 1
-#endif
-
-/* #undef SIZEOF_INT64 */
-#if SIZEOF_INT64
-# define HAVE_INT64 1
-#endif
-/* #undef SIZEOF_UINT64 */
-#if SIZEOF_UINT64
-# define HAVE_UINT64 1
-#endif
-
-/* #undef SIZEOF_SOCKLEN_T */
-#if SIZEOF_SOCKLEN_T
-# define HAVE_SOCKLEN_T 1
-#endif
 
+#define HAVE_INT 1
+#define HAVE_LONG 1
+#define HAVE_LONG_LONG 1
+#define HAVE_OFF_T 1
+#define HAVE_SIGSET_T 1
+#define HAVE_SIZE_T 1
+#define HAVE_UINT 1
+#define HAVE_ULONG 1
 #define SOCKET_SIZE_TYPE socklen_t
 
 #define RETSIGTYPE void
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] fix Watermark bug by showing watermark image on Background

[Prasanna Barate (via Code Review)]

Hello Thorsten Behrens,

I'd like you to reexamine a change.  Please visit

https://gerrit.libreoffice.org/2102

to look at the new patch set (#2).

Change subject: fix Watermark bug by showing watermark image on Background
..

fix Watermark bug by showing watermark image on Background

Change-Id: Ie42b08cf7e2dd6b44288c7ebc5190c952ddd1a9d
---
M writerfilter/source/dmapper/DomainMapper_Impl.cxx
1 file changed, 44 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/02/2102/2
-- 
To view, visit https://gerrit.libreoffice.org/2102
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I7f1510f5d37eb310e9dca7c45d3ac988e5e1ee98
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Prasanna Barate 
Gerrit-Reviewer: LibreOffice gerrit bot 
Gerrit-Reviewer: Michael Meeks 
Gerrit-Reviewer: Thorsten Behrens 

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

[RESTORED] Changes to enable display of comments annotations in pptx fi...

[vinaya mandke (via Code Review)]

vinaya mandke has restored this change.

Change subject: Changes to enable display of comments annotations in pptx files
..


Patch Set 2: Restored

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

Gerrit-MessageType: restore
Gerrit-Change-Id: I965798cd3a539ab8deffcdf4a8e2c52c9e8e8fc1
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: vinaya mandke 
Gerrit-Reviewer: Joren De Cuyper 
Gerrit-Reviewer: Michael Meeks 
Gerrit-Reviewer: Thorsten Behrens 
Gerrit-Reviewer: Tor Lillqvist 

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

[ABANDONED] Changes to enable display of comments annotations in pptx fi...

[vinaya mandke (via Code Review)]

vinaya mandke has abandoned this change.

Change subject: Changes to enable display of comments annotations in pptx files
..


Patch Set 1: Abandoned

https://gerrit.libreoffice.org/2048/

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I752f977f85cf7481f738d8a94df056adcb4a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: vinaya mandke 

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

[RESTORED] Changes to enable display of comments annotations in pptx fi...

[vinaya mandke (via Code Review)]

vinaya mandke has restored this change.

Change subject: Changes to enable display of comments annotations in pptx files
..


Patch Set 1: Restored

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

Gerrit-MessageType: restore
Gerrit-Change-Id: I752f977f85cf7481f738d8a94df056adcb4a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: vinaya mandke 

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

[ABANDONED] Changes to enable display of comments annotations in pptx fi...

[vinaya mandke (via Code Review)]

vinaya mandke has abandoned this change.

Change subject: Changes to enable display of comments annotations in pptx files
..


Patch Set 2: Abandoned

Removing trailing white spaces. Uploading again...

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I965798cd3a539ab8deffcdf4a8e2c52c9e8e8fc1
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: vinaya mandke 
Gerrit-Reviewer: Joren De Cuyper 
Gerrit-Reviewer: Michael Meeks 
Gerrit-Reviewer: Thorsten Behrens 
Gerrit-Reviewer: Tor Lillqvist 

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

[ABANDONED] Changes to enable display of comments annotations in pptx fi...

[vinaya mandke (via Code Review)]

vinaya mandke has abandoned this change.

Change subject: Changes to enable display of comments annotations in pptx files
..


Patch Set 1: Abandoned

Upload was by mistake Uploaded patch set 2. 
https://gerrit.libreoffice.org/2048/

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I752f977f85cf7481f738d8a94df056adcb4a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: vinaya mandke 

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

Re: compilation failure on centos 6

[David Tardon]

Hi,

On Wed, Mar 06, 2013 at 12:02:01PM -0500, Neeraj Rai wrote:
> VERBOSE=TRUE seems to help with verbosity.
> 
> #4  --enable-verbose is aborted with "unknown option"

Matúš was not clear on this, but --enable-verbose is configure argument,
i.e., it should be passed to ./autogen.sh .

> 
> #5I noticed "-j n" option is ignored by build. It took 149min on centos 6
> as opposed to 240min on RHEL 6 last time I tried (few weeks back), so  I am
> not complaining at all.
> Just an observation that the subprocess below shows -j 1 even though parent
> had -j 5

The default parallelism value is detected by configure. It can be
overriden either by passing --with-parallelism=5 to ./autogen.sh or by
using 

make PARALLELISM=5

. Note that you _should not_ use parallelism if you have make 3.81,
because it is prone to crashes.

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

Impress Remote Android Version

[Samuel Mehrbrodt]

Hi,

Is there a reason why Impress Remote requires Android 2.3 at least?

I have an Android 2.2 Phone and I'm not the only one:
http://developer.android.com/about/dashboards/index.html

What would be the effort to make it work with 2.2?


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

[PATCH] Changes to enable display of comments annotations in pptx fi...

[vinaya mandke (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2577

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/77/2577/1

Changes to enable display of comments annotations in pptx files

Change-Id: I752f977f85cf7481f738d8a94df056adcb4a
---
M oox/inc/oox/core/fragmenthandler2.hxx
A oox/inc/oox/ppt/comments.hxx
M oox/inc/oox/ppt/slidepersist.hxx
M oox/source/core/fragmenthandler2.cxx
M oox/source/ppt/presentationfragmenthandler.cxx
M oox/source/ppt/slidefragmenthandler.cxx
6 files changed, 295 insertions(+), 3 deletions(-)



diff --git a/oox/inc/oox/core/fragmenthandler2.hxx 
b/oox/inc/oox/core/fragmenthandler2.hxx
index 5be5b62..86f7ea8 100644
--- a/oox/inc/oox/core/fragmenthandler2.hxx
+++ b/oox/inc/oox/core/fragmenthandler2.hxx
@@ -50,6 +50,11 @@
 const ::rtl::OUString& rFragmentPath,
 bool bEnableTrimSpace = true );
 virtual ~FragmentHandler2();
+private:
+::std::vector< rtl::OUString> charVector; // handle char in OnCharacters
+
+public:
+::std::vector< rtl::OUString> getCharVector(void) { return charVector; }
 
 // resolve ambiguity from base classes
 virtual void SAL_CALL acquire() throw() { FragmentHandler::acquire(); }
diff --git a/oox/inc/oox/ppt/comments.hxx b/oox/inc/oox/ppt/comments.hxx
new file mode 100644
index 000..ffd6a41
--- /dev/null
+++ b/oox/inc/oox/ppt/comments.hxx
@@ -0,0 +1,193 @@
+/* -*- 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 OOX_PPT_COMMENTS_HXX
+#define OOX_PPT_COMMENTS_HXX
+
+#define ELEMENT_NOT_FOUND 0
+
+using rtl::OUString;
+#include 
+#include  //split function to tokenize for date 
time
+
+#include 
+
+
+struct commentAuthor
+{
+::rtl::OUString clrIdx;
+::rtl::OUString id;
+::rtl::OUString initials;
+::rtl::OUString lastIdx;
+::rtl::OUString name;
+};
+  
+class commentAuthorList
+{
+public:
+std::vector cmAuthorLst;
+void setValues( commentAuthorList list)
+{
+std::vector::iterator it;
+for(it=list.cmAuthorLst.begin();it!=list.cmAuthorLst.end();it++)
+{
+commentAuthor temp;
+cmAuthorLst.push_back(temp);
+cmAuthorLst.back().clrIdx = it->clrIdx;
+cmAuthorLst.back().id = it->id;
+cmAuthorLst.back().initials = it->initials;
+cmAuthorLst.back().lastIdx = it->lastIdx;
+cmAuthorLst.back().name = it->name;
+}
+}
+};
+
+class comment
+{
+private:
+::rtl::OUString authorId;
+::rtl::OUString dt;
+::rtl::OUString idx;
+::rtl::OUString x;
+::rtl::OUString y;
+::rtl::OUString text;
+::com::sun::star::util::DateTime aDateTime;
+
+public:
+void setAuthorId(::rtl::OUString _aId)
+{
+authorId = _aId;
+}
+void setdt(::rtl::OUString _dt)
+{
+dt=_dt;
+setDateTime(_dt);
+}
+void setidx(::rtl::OUString _idx)
+{
+idx=_idx;
+}
+void set_X(::rtl::OUString _x)
+{
+x=_x;
+}
+void set_Y(::rtl::OUString _y)
+{
+y=_y;
+}
+void set_text(std::string _text)
+{
+text = rtl::OUString::createFromAscii (  _text.c_str() );
+}
+void set_text(rtl::OUString _text)
+{
+text = _text;
+}
+
+private:
+//DateTime is saved as : 2013-01-10T15:53:26.000
+
+void setDateTime (::rtl::OUString datetime)
+{
+std::string _datetime = rtl::OUStringToOString(datetime, 
RTL_TEXTENCODING_UTF8).getStr();
+std::vector _dt;
+boost::split( _dt, _datetime, boost::is_any_of( "-:T" ) );
+aDateTime.Year = atoi(_dt.at(0).c_str());
+aDateTime.Month = atoi(_dt.at(1).c_str());
+aDateTime.Day = atoi(_dt.at(2).c_str());
+aDateTime.Hours = atoi(_dt.at(3).c_str());
+   

[LibreOffice-QA] Conference Call - March 8th, 2013 - 1400 UTC

[Joel Madero]

Hi All,

Our next conference call details are below, currently the agenda is 
empty, I'll be working on it over the next couple days, feel free to add 
new items.


Date: Friday, March 8th, 2013
Time: 1400 UTC
Duration: ~1 hour

I will be working on the agenda this afternoon.
Current agenda & Call In Instructions: 
http://wiki.documentfoundation.org/QA_Call_Current_Agenda


Open to everyone, feel free to call in and just listen or to share your 
thoughts on QA procedure.



Best Regards,
Joel


--
*Joel Madero*
LibreOffice QA Volunteer
jmadero@gmail.com 


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

Hello

[Adriam Delgado Rivero]

Using one API for Java and Writer load a template that contains a table  

I try to copy the table on the next page ( copy also need property ) to create 
a new  and I think 
This is the code I have the table and properties 
Another alternative would be to copy the entire page , as it contains only the 
table . thanks 



// first query the XTextTablesSupplier interface from our document 
XTextTablesSupplier xTablesSupplier = ( XTextTablesSupplier ) UnoRuntime . 
queryInterface ( 
XTextTablesSupplier . class , xWriterComponent ); 
// get the tables collection 
XNameAccess xNamedTables = xTablesSupplier . getTextTables (); 

// now query the XIndexAccess from the tables collection 
XIndexAccess xIndexedTables = ( XIndexAccess ) UnoRuntime . queryInterface ( 
XIndexAccess . class , xNamedTables ); 
// we need properties 
xTableProps = null ; 

// get the tables 
for ( int i = 0; i < xIndexedTables . getCount (); i++) { 
table = xIndexedTables . getByIndex (i); 
// the properties , please ! 


xTableProps = ( XPropertySet ) UnoRuntime . queryInterface ( 
XPropertySet . class , table ); 
this . xTable = ( XTextTable ) UnoRuntime . queryInterface ( 
XTextTable . class , table ); 
} 


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

[PATCH libreoffice-4-0] resolved rhbz#918168 ICU: CVE-2013-0900 race condition allow...

[Eike Rathke (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2576

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/76/2576/1

resolved rhbz#918168 ICU: CVE-2013-0900 race condition allows DoS

Upstream changes
https://ssl.icu-project.org/trac/changeset/32865
https://ssl.icu-project.org/trac/changeset/32908

See also
https://bugzilla.redhat.com/show_bug.cgi?id=918167

Plus changed UMutex to UMTX to make these compile in icu49.

Change-Id: Ida28f7c955959565a2133242b826bb5038758407
---
A icu/icu4c-CVE-2013-0900_umutex.patch
A icu/icu4c.9737.CVE-2013-0900_changesets_32865_32908.patch
M icu/makefile.mk
3 files changed, 305 insertions(+), 0 deletions(-)



diff --git a/icu/icu4c-CVE-2013-0900_umutex.patch 
b/icu/icu4c-CVE-2013-0900_umutex.patch
new file mode 100644
index 000..a705df2
--- /dev/null
+++ b/icu/icu4c-CVE-2013-0900_umutex.patch
@@ -0,0 +1,12 @@
+diff -ruN icu.orig/source/common/locid.cpp icu/source/common/locid.cpp
+--- misc/build/icu.orig/source/common/locid.cpp2013-03-06 
21:27:35.170696967 +0100
 misc/build/icu/source/common/locid.cpp 2013-03-06 21:29:47.711378977 
+0100
+@@ -53,7 +53,7 @@
+ static Locale *gLocaleCache = NULL;
+ 
+ // gDefaultLocaleMutex protects all access to gDefaultLocalesHashT and 
gDefaultLocale.
+-static UMutex gDefaultLocaleMutex = U_MUTEX_INITIALIZER;
++static UMTX gDefaultLocaleMutex = NULL;
+ static UHashtable *gDefaultLocalesHashT = NULL;
+ static Locale *gDefaultLocale = NULL;
+ 
diff --git a/icu/icu4c.9737.CVE-2013-0900_changesets_32865_32908.patch 
b/icu/icu4c.9737.CVE-2013-0900_changesets_32865_32908.patch
new file mode 100644
index 000..515e2aa
--- /dev/null
+++ b/icu/icu4c.9737.CVE-2013-0900_changesets_32865_32908.patch
@@ -0,0 +1,291 @@
+Squashed into one:
+https://ssl.icu-project.org/trac/changeset/32865
+https://ssl.icu-project.org/trac/changeset/32908
+
+diff -ruN icu.orig/source/common/locid.cpp icu/source/common/locid.cpp
+--- misc/build/icu.orig/source/common/locid.cpp2012-04-05 
22:46:14.0 +0200
 misc/build/icu/source/common/locid.cpp 2013-03-05 21:54:11.974608225 
+0100
+@@ -1,6 +1,6 @@
+ /*
+  **
+- *   Copyright (C) 1997-2011, International Business Machines
++ *   Copyright (C) 1997-2012, International Business Machines
+  *   Corporation and others.  All Rights Reserved.
+  **
+ *
+@@ -33,6 +33,7 @@
+ #include "unicode/locid.h"
+ #include "unicode/uloc.h"
+ #include "putilimp.h"
++#include "mutex.h"
+ #include "umutex.h"
+ #include "uassert.h"
+ #include "cmemory.h"
+@@ -43,6 +44,21 @@
+ 
+ #define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
+ 
++U_CDECL_BEGIN
++static UBool U_CALLCONV locale_cleanup(void);
++U_CDECL_END
++
++U_NAMESPACE_BEGIN
++
++static Locale *gLocaleCache = NULL;
++
++// gDefaultLocaleMutex protects all access to gDefaultLocalesHashT and 
gDefaultLocale.
++static UMutex gDefaultLocaleMutex = U_MUTEX_INITIALIZER;
++static UHashtable *gDefaultLocalesHashT = NULL;
++static Locale *gDefaultLocale = NULL;
++
++U_NAMESPACE_END
++
+ typedef enum ELocalePos {
+ eENGLISH,
+ eFRENCH,
+@@ -77,10 +93,6 @@
+ UBool valuesToo,
+ UErrorCode *status);
+ 
+-static icu::Locale *gLocaleCache = NULL;
+-static icu::Locale *gDefaultLocale = NULL;
+-static UHashtable *gDefaultLocalesHashT = NULL;
+-
+ U_CDECL_BEGIN
+ //
+ // Deleter function for Locales owned by the default Locale hash table/
+@@ -102,24 +114,19 @@
+ if (gDefaultLocalesHashT) {
+ uhash_close(gDefaultLocalesHashT);   // Automatically deletes all 
elements, using deleter func.
+ gDefaultLocalesHashT = NULL;
++gDefaultLocale = NULL;
+ }
+-else if (gDefaultLocale) {
+-// The cache wasn't created, and only one default locale was created.
+-delete gDefaultLocale;
+-}
+-gDefaultLocale = NULL;
+ 
+ return TRUE;
+ }
+ U_CDECL_END
+ 
+ U_NAMESPACE_BEGIN
+-//
+-//  locale_set_default_internal.
+-//
+-void locale_set_default_internal(const char *id)
+-{
+-UErrorCode   status = U_ZERO_ERROR;
++
++Locale *locale_set_default_internal(const char *id, UErrorCode& status) {
++// Synchronize this entire function.
++Mutex lock(&gDefaultLocaleMutex);
++
+ UBool canonicalize = FALSE;
+ 
+ // If given a NULL string for the locale id, grab the default
+@@ -127,17 +134,10 @@
+ //   (Different from most other locale APIs, where a null name means use
+ //the current ICU default locale.)
+ if (id == NULL) {
+-umtx_lock(NULL);
+-id = uprv_getDefaultLocaleID();
+-umtx_unlock(NULL);
++id = uprv_getDefaultLocaleID();   // This function not thread safe? 
TODO: verify.
+ canonicalize = TRUE; // always canonicalize host ID
+ }
+ 
+-// put the locale id into a canonical form,
+-//   

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sdext/source

[Ariel Constenla-Haile]

 sdext/source/minimizer/fileopendialog.cxx|   21 ++
 sdext/source/minimizer/informationdialog.cxx |   53 +++
 sdext/source/minimizer/informationdialog.hxx |1 
 3 files changed, 34 insertions(+), 41 deletions(-)

New commits:
commit 8fd66eeb883676c095c8360ef609e56b9bc055a3
Author: Ariel Constenla-Haile 
Date:   Wed Mar 6 12:45:15 2013 +

i82852 - Presentation Minimizer: missing icon in information dialog

diff --git a/sdext/source/minimizer/informationdialog.cxx 
b/sdext/source/minimizer/informationdialog.cxx
index 7535e1a..7074adf 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -92,8 +92,15 @@ rtl::OUString InsertFixedText( InformationDialog& 
rInformationDialog, const rtl:
 return rControlName;
 }
 
-rtl::OUString InsertImage( InformationDialog& rInformationDialog, const 
OUString& rControlName, const OUString& rURL,
-sal_Int32 nPosX, sal_Int32 nPosY, sal_Int32 nWidth, 
sal_Int32 nHeight )
+rtl::OUString InsertImage(
+InformationDialog& rInformationDialog,
+const OUString& rControlName,
+const OUString& rURL,
+sal_Int32 nPosX,
+sal_Int32 nPosY,
+sal_Int32 nWidth,
+sal_Int32 nHeight,
+sal_Bool bScale )
 {
 OUString pNames[] = {
 TKGet( TK_Border ),
@@ -110,7 +117,7 @@ rtl::OUString InsertImage( InformationDialog& 
rInformationDialog, const OUString
 Any( rURL ),
 Any( nPosX ),
 Any( nPosY ),
-Any( sal_True ),
+Any( bScale ),
 Any( nWidth ) };
 sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
 
@@ -204,41 +211,6 @@ static OUString ImpValueOfInMB( const sal_Int64& rVal )
 return aVal.makeStringAndClear();
 }
 
-OUString InformationDialog::ImpGetStandardImage( const OUString& sPrivateURL )
-{
-rtl::OUString sURL;
-try
-{
-mxTempFile = Reference< XStream >( 
mxMSF->getServiceManager()->createInstanceWithContext( 
OUString::createFromAscii( "com.sun.star.io.TempFile" ), mxMSF ), 
UNO_QUERY_THROW );
-Reference< XPropertySet > xPropSet( mxTempFile, UNO_QUERY );
-Reference< XOutputStream > xOutputStream( 
mxTempFile->getOutputStream() );
-if ( xOutputStream.is() && xPropSet.is() )
-{
-Reference< graphic::XGraphicProvider > xGraphicProvider( 
mxMSF->getServiceManager()->createInstanceWithContext(
-OUString::createFromAscii( 
"com.sun.star.graphic.GraphicProvider" ), mxMSF ), UNO_QUERY_THROW );
-Sequence< PropertyValue > aArgs( 1 );
-aArgs[ 0 ].Name = OUString::createFromAscii( "URL" );
-aArgs[ 0 ].Value <<= sPrivateURL;
-Reference< graphic::XGraphic > xGraphic( 
xGraphicProvider->queryGraphic( aArgs ) );
-if ( xGraphic.is() )
-{
-OUString aDestMimeType( RTL_CONSTASCII_USTRINGPARAM( 
"image/png" ) );
-Sequence< PropertyValue > aArgs2( 2 );
-aArgs2[ 0 ].Name = TKGet( TK_MimeType );// the 
GraphicProvider is using "MimeType", the GraphicExporter "MediaType"...
-aArgs2[ 0 ].Value <<= aDestMimeType;
-aArgs2[ 1 ].Name = TKGet( TK_OutputStream );
-aArgs2[ 1 ].Value <<= xOutputStream;
-xGraphicProvider->storeGraphic( xGraphic, aArgs2 );
-}
-xPropSet->getPropertyValue( OUString::createFromAscii( "Uri" ) ) 
>>= sURL;
-}
-}
-catch( Exception& )
-{
-}
-return sURL;
-}
-
 void InformationDialog::InitDialog()
 {
 sal_Int32 nDialogHeight = DIALOG_HEIGHT;
@@ -331,7 +303,10 @@ void InformationDialog::InitDialog()
 aInfoString = aInfoString.replaceAt( k, aTitlePlaceholder.getLength(), 
aTitle );
 
 com::sun::star::uno::Reference< com::sun::star::awt::XItemListener > 
xItemListener;
-InsertImage( *this, rtl::OUString( rtl::OUString::createFromAscii( 
"aboutimage" ) ), ImpGetStandardImage( rtl::OUString::createFromAscii( 
"private:standardimage/query" ) ), 5, 5, 25, 25 );
+InsertImage( *this,
+ rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "aboutimage" ) ),
+ rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
"private:standardimage/query" ) ),
+ 5, 5, 25, 25, sal_False );
 InsertFixedText( *this, rtl::OUString( rtl::OUString::createFromAscii( 
"fixedtext" ) ), aInfoString, PAGE_POS_X, 6, PAGE_WIDTH, 24, sal_True, 0 );
 if ( maSaveAsURL.getLength() )
 InsertCheckBox(  *this, TKGet( TK_OpenNewDocument ), xItemListener, 
getString( STR_AUTOMATICALLY_OPEN ), PAGE_POS_X, 42, PAGE_WIDTH, 8, 1 );
diff --git a/sdext/source/minimizer/informationdialog.hxx 
b/sdext/source/minimizer/informationdialog.hxx
index 033baeb6..0edafc1 100644
--- a/sdext/source/minimizer/informationdialog.hxx
+++ b/sdext/source/minimizer/informationdialog.hxx
@@ -65,7 +65,6 @@ private :
 
 com::sun::star::uno:

[Libreoffice-commits] core.git: 4 commits - android/experimental desktop/source sal/osl vcl/android vcl/inc vcl/source

[Tor Lillqvist]

 android/experimental/desktop/native-code.cxx   
|9 -
 
android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
 |   51 --
 desktop/source/app/sofficemain.cxx 
|   26 +
 sal/osl/unx/thread.c   
|   15 +-
 vcl/android/androidinst.cxx
|   30 -
 vcl/inc/android/androidinst.hxx
|   18 ++-
 vcl/inc/salwtype.hxx   
|1 
 vcl/inc/vcl/window.hxx 
|1 
 vcl/source/window/window.cxx   
|6 +
 9 files changed, 102 insertions(+), 55 deletions(-)

New commits:
commit 334e3dfd84b589b29a742a0c28814fa97b29313a
Author: Tor Lillqvist 
Date:   Thu Mar 7 02:32:50 2013 +0200

Revert "Window::PostPaint() was unused and empty"

Nah, seems that it was used after all on Windows, somehow.

This reverts commit 5754264f93001978a3c5f5f1cdabd7113de010b8.

diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index fd638bc..fda621f 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -590,6 +590,7 @@ public:
 virtual voidPrePaint();
 virtual voidPaint( const Rectangle& rRect );
 
+virtual voidPostPaint();
 virtual voidDraw( OutputDevice* pDev, const Point& rPos, const 
Size& rSize, sal_uLong nFlags );
 virtual voidMove();
 virtual voidResize();
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index ff69d88..38960af 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -4788,6 +4788,12 @@ void Window::Paint( const Rectangle& rRect )
 
 // ---
 
+void Window::PostPaint()
+{
+}
+
+// ---
+
 void Window::Draw( OutputDevice*, const Point&, const Size&, sal_uLong )
 {
 DBG_CHKTHIS( Window, ImplDbgCheckWindow );
commit 0ce2d740a2ed93a029a290fe88748ac92baff9a0
Author: Tor Lillqvist 
Date:   Thu Mar 7 02:17:49 2013 +0200

Handle damage tracking and redrawing properly in the "desktop" Android app

In the damaged() method do a callback up to Java code in Desktop that
invalidates the view. For now store the view in a static field, but need to 
do
that in a cleaner way eventually. There might in some circumstancest be
several instances of the Desktop activity present. Obviously should also run
just one LO thread.

Get rid of the temporary self-invalidattion in onDraw() silliness.

Start the LO thread that runs soffice_main() from Java, not from native
code. Apparently only threads created from Java have proper class loaders in
Android.

No need for an own DoReleaseYield() in AndroidSalInstance, the one in the
SvpSalInstance base class does what needs to be done.

Change-Id: I4cb85b352fca1f1375f726620ec8c93d2047f113

diff --git a/android/experimental/desktop/native-code.cxx 
b/android/experimental/desktop/native-code.cxx
index f93c8ad..117a2ba 100644
--- a/android/experimental/desktop/native-code.cxx
+++ b/android/experimental/desktop/native-code.cxx
@@ -112,10 +112,11 @@ lo_get_libmap(void)
 { NULL, NULL }
 };
 
-// We need to pull these in, too, as they aren't in any of the libs we
-// link with -Wl,--whole-archive.
-extern void Java_org_libreoffice_experimental_desktop_Desktop_spawnMain();
-volatile void *p = (void *) 
Java_org_libreoffice_experimental_desktop_Desktop_spawnMain;
+// Guard against possible function-level link-time pruning of
+// "unused" code. We need to pull these in, too, as they aren't in
+// any of the libs we link with -Wl,--whole-archive. Is this necessary?
+extern void Java_org_libreoffice_experimental_desktop_Desktop_runMain();
+volatile void *p = (void *) 
Java_org_libreoffice_experimental_desktop_Desktop_runMain;
 
 extern void Java_org_libreoffice_experimental_desktop_Desktop_renderVCL();
 p = (void *) Java_org_libreoffice_experimental_desktop_Desktop_renderVCL;
diff --git 
a/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
 
b/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
index 6d66926..c10df22 100644
--- 
a/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
+++ 
b/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
@@ -41,10 +41,10 @@ public class Desktop
 {
 private static final String TAG = "LODesktop";
 
-/* implementend by desktop */
-private static native void spawnMain();
+  

[Libreoffice-commits] core.git: Branch 'feature/gccwrapper' - solenv/gcc-wrappers

[Peter Foley]

 solenv/gcc-wrappers/wrapper.cxx |  105 ++--
 1 file changed, 79 insertions(+), 26 deletions(-)

New commits:
commit 863aeceb42a955fcbe37963fe2db592a7bb5b79f
Author: Peter Foley 
Date:   Wed Mar 6 18:35:32 2013 -0500

use CreateProcess to get exit code

Change-Id: I76bf9501243d173b20e8194748ca6c29e097efb4

diff --git a/solenv/gcc-wrappers/wrapper.cxx b/solenv/gcc-wrappers/wrapper.cxx
index 5ad0486..43c3d66 100644
--- a/solenv/gcc-wrappers/wrapper.cxx
+++ b/solenv/gcc-wrappers/wrapper.cxx
@@ -11,9 +11,13 @@
 #include 
 #include 
 
+#include 
+
 using namespace std;
 
-void setupenv() {
+vector setupenv() {
+vector enviroment;
+
 // Set-up library path
 string libpath="LIB=";
 char* libbuf;
@@ -21,7 +25,8 @@ void setupenv() {
 _dupenv_s(&libbuf,&liblen,"ILIB");
 libpath.append(libbuf);
 free(libbuf);
-_putenv(libpath.c_str());
+enviroment.insert(enviroment.end(),libpath.begin(),libpath.end());
+enviroment.push_back('\0');
 
 // Set-up include path
 string includepath="INCLUDE=.;";
@@ -31,8 +36,8 @@ void setupenv() {
 string incvar(incbuf);
 free(incbuf);
 
+// 3 = strlen(" -I")
 for(size_t pos=0; pos != string::npos;) {
-// 3 = strlen(" -I")
 size_t endpos=incvar.find(" -I",pos+3);
 size_t len=endpos-pos-3;
 if(endpos==string::npos)
@@ -41,50 +46,98 @@ void setupenv() {
 includepath.append(incvar,pos+3,len);
 includepath.append(";");
 }
- pos=incvar.find(" -I",pos+len);
+pos=incvar.find(" -I",pos+len);
 }
+enviroment.insert(enviroment.end(),includepath.begin(),includepath.end());
+enviroment.push_back('\0');
+
+// CreateProcess requires the enviroment block to be null terminated
+enviroment.push_back('\0');
 
-_putenv(includepath.c_str());
+return enviroment;
 }
 
-void processargs(string& command,vector args) {
-for(vector::iterator i = args.begin(); i != args.end(); i++) {
-command.append(" ");
+string processargs(vector rawargs) {
+string args;
+for(vector::iterator i = rawargs.begin(); i != rawargs.end(); i++) 
{
+args.append(" ");
 if(*i == "-o") {
-// TODO: handle more than just exe output
-command.append("-Fe");
+// TODO: handle more than just exe output
+args.append("-Fe");
 i++;
-command.append(*i);
-}
-else {
-command.append(*i);
+args.append(*i);
 }
+else if(*i == "-g")
+args.append("-Zi");
+else
+args.append(*i);
 }
+return args;
 }
 
-extern int main(int argc, char *argv[]) {
+int startprocess(string command, string args, vector enviroment) {
+STARTUPINFO si;
+PROCESS_INFORMATION pi;
+DWORD ret;
+
+HANDLE stdout_handle=GetStdHandle(STD_OUTPUT_HANDLE);
+HANDLE stderr_handle=GetStdHandle(STD_ERROR_HANDLE);
+
+memset(&si,0,sizeof(si));
+si.cb=sizeof(si);
+si.dwFlags |= STARTF_USESTDHANDLES;
+si.hStdError=stderr_handle;
+si.hStdOutput=stdout_handle;
+
+memset(&pi,0,sizeof(pi));
+
+void* env;
+env=&enviroment.front();
+
+if(!CreateProcess(command.c_str(), // Process Name
+(char*)args.c_str(), // Command Line
+NULL, // Process Handle not Inheritable
+NULL, // Thread Handle not Inheritable
+FALSE, // Handles are not Inherited
+0, // No creation flags
+env, // Enviroment for process
+NULL, // Use same starting directory
+&si, // Startup Info
+&pi) // Process Information
+) {
+cerr << "Error: could not create process" << endl;
+exit(1);
+}
+
+WaitForSingleObject(&pi.hProcess, INFINITE);
+GetExitCodeProcess(pi.hProcess, &ret);
+CloseHandle(pi.hThread);
+CloseHandle(pi.hProcess);
+return int(ret);
+}
+
+int main(int argc, char *argv[]) {
+vector rawargs(argv + 1, argv + argc);
+
 char* ccbuf;
 size_t cclen;
 _dupenv_s(&ccbuf,&cclen,REAL_EXE);
 if(!ccbuf) {
-cout << "Error" << REAL_EXE << "not defined. Did you forget to source 
the enviroment?" << endl;
+cout << "Error " << REAL_EXE << " not defined. Did you forget to 
source the enviroment?" << endl;
 exit(1);
 }
 string command(ccbuf);
 free(ccbuf);
 
-vector args(argv + 1, argv + argc);
-processargs(command,args);
-setupenv();
+string args=processargs(rawargs);
 
-cout << "CC=" << command << endl;
+vector enviroment=setupenv();
+
+cerr << "CC=" << command << "ARGS=" << args << endl;
+
+int ret=startprocess(command,args,enviroment);
+return ret;
 
-FILE* output=_popen(command.c_str(),"r");
-char outbuf[256];
-while(fgets(outbuf, 256, output)) {
-cout << outbuf;
-}
-cout << endl;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_

Re: hola

[Jean-Noël Rouvignac]

Hi Adriam,

I think you are on the correct mailing list to get your answer.

However, this is an English-writing mailing list.
Writing in any other language than English will more than likely bring no
answer.

Jean-Noël

PS: I do not have the answer to your question.



2013/3/7 Adriam Delgado Rivero 

>
>
> Utilizando UNO API para java y cargo una plantilla que contiene una tabla
> 
>
> Intento copiar dicha tabla  en la  siguiente hoja (propiedades también)
> para crear una nueva y no encuentro como, este es el código donde
> obtengo la tabla y sus propiedades.
>
> PD. He escrito muchas veces a  us...@global.libreoffice.org pero nadie
> responde...
>  Saludos
>
>// first query the XTextTablesSupplier interface from our document
> XTextTablesSupplier xTablesSupplier = (XTextTablesSupplier)
> UnoRuntime.queryInterface(
> XTextTablesSupplier.class, xWriterComponent);
> // get the tables collection
> XNameAccess xNamedTables = xTablesSupplier.getTextTables();
>
> // now query the XIndexAccess from the tables collection
> XIndexAccess xIndexedTables = (XIndexAccess)
> UnoRuntime.queryInterface(
> XIndexAccess.class, xNamedTables);
>  // we need properties
> xTableProps = null;
>
> // get the tables
> for (int i = 0; i < xIndexedTables.getCount(); i++) {
> table = xIndexedTables.getByIndex(i);
> // the properties, please!
>
>
> xTableProps = (XPropertySet) UnoRuntime.queryInterface(
> XPropertySet.class, table);
> this.xTable = (XTextTable) UnoRuntime.queryInterface(
> XTextTable.class, table);
>   }
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: icu/icu4c.9737.CVE-2013-0900_changesets_32865_32908.patch icu/icu4c-CVE-2013-0900_umutex.patch icu/UnpackedTarball_icu.mk

[Eike Rathke]

 icu/UnpackedTarball_icu.mk|2 
 icu/icu4c-CVE-2013-0900_umutex.patch  |   12 
 icu/icu4c.9737.CVE-2013-0900_changesets_32865_32908.patch |  291 ++
 3 files changed, 305 insertions(+)

New commits:
commit 94147f6ea2de2ace33fc3212f16ee441385cb373
Author: Eike Rathke 
Date:   Thu Mar 7 00:42:48 2013 +0100

resolved rhbz#918168 ICU: CVE-2013-0900 race condition allows DoS

Upstream changes
https://ssl.icu-project.org/trac/changeset/32865
https://ssl.icu-project.org/trac/changeset/32908

See also
https://bugzilla.redhat.com/show_bug.cgi?id=918167

Plus changed UMutex to UMTX to make these compile in icu49.

Change-Id: Ib5dba7085e6b2dd3925c0c220b5d264e4c7bb4c8

diff --git a/icu/UnpackedTarball_icu.mk b/icu/UnpackedTarball_icu.mk
index e1ace9c..14da6d5 100644
--- a/icu/UnpackedTarball_icu.mk
+++ b/icu/UnpackedTarball_icu.mk
@@ -25,6 +25,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
icu/icu4c-solarisgcc.patch \
icu/icu4c-mkdir.patch \
icu/icu4c-buffer-overflow.patch \
+   icu/icu4c.9737.CVE-2013-0900_changesets_32865_32908.patch \
+   icu/icu4c-CVE-2013-0900_umutex.patch \
icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch \
 ))
 
diff --git a/icu/icu4c-CVE-2013-0900_umutex.patch 
b/icu/icu4c-CVE-2013-0900_umutex.patch
new file mode 100644
index 000..e195c5c
--- /dev/null
+++ b/icu/icu4c-CVE-2013-0900_umutex.patch
@@ -0,0 +1,12 @@
+diff -ruN icu.orig/source/common/locid.cpp icu/source/common/locid.cpp
+--- build/icu.orig/source/common/locid.cpp 2013-03-06 21:27:35.170696967 
+0100
 build/icu/source/common/locid.cpp  2013-03-06 21:29:47.711378977 +0100
+@@ -53,7 +53,7 @@
+ static Locale *gLocaleCache = NULL;
+ 
+ // gDefaultLocaleMutex protects all access to gDefaultLocalesHashT and 
gDefaultLocale.
+-static UMutex gDefaultLocaleMutex = U_MUTEX_INITIALIZER;
++static UMTX gDefaultLocaleMutex = NULL;
+ static UHashtable *gDefaultLocalesHashT = NULL;
+ static Locale *gDefaultLocale = NULL;
+ 
diff --git a/icu/icu4c.9737.CVE-2013-0900_changesets_32865_32908.patch 
b/icu/icu4c.9737.CVE-2013-0900_changesets_32865_32908.patch
new file mode 100644
index 000..8010f092
--- /dev/null
+++ b/icu/icu4c.9737.CVE-2013-0900_changesets_32865_32908.patch
@@ -0,0 +1,291 @@
+Squashed into one:
+https://ssl.icu-project.org/trac/changeset/32865
+https://ssl.icu-project.org/trac/changeset/32908
+
+diff -ruN icu.orig/source/common/locid.cpp icu/source/common/locid.cpp
+--- build/icu.orig/source/common/locid.cpp 2012-04-05 22:46:14.0 
+0200
 build/icu/source/common/locid.cpp  2013-03-05 21:54:11.974608225 +0100
+@@ -1,6 +1,6 @@
+ /*
+  **
+- *   Copyright (C) 1997-2011, International Business Machines
++ *   Copyright (C) 1997-2012, International Business Machines
+  *   Corporation and others.  All Rights Reserved.
+  **
+ *
+@@ -33,6 +33,7 @@
+ #include "unicode/locid.h"
+ #include "unicode/uloc.h"
+ #include "putilimp.h"
++#include "mutex.h"
+ #include "umutex.h"
+ #include "uassert.h"
+ #include "cmemory.h"
+@@ -43,6 +44,21 @@
+ 
+ #define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
+ 
++U_CDECL_BEGIN
++static UBool U_CALLCONV locale_cleanup(void);
++U_CDECL_END
++
++U_NAMESPACE_BEGIN
++
++static Locale *gLocaleCache = NULL;
++
++// gDefaultLocaleMutex protects all access to gDefaultLocalesHashT and 
gDefaultLocale.
++static UMutex gDefaultLocaleMutex = U_MUTEX_INITIALIZER;
++static UHashtable *gDefaultLocalesHashT = NULL;
++static Locale *gDefaultLocale = NULL;
++
++U_NAMESPACE_END
++
+ typedef enum ELocalePos {
+ eENGLISH,
+ eFRENCH,
+@@ -77,10 +93,6 @@
+ UBool valuesToo,
+ UErrorCode *status);
+ 
+-static icu::Locale *gLocaleCache = NULL;
+-static icu::Locale *gDefaultLocale = NULL;
+-static UHashtable *gDefaultLocalesHashT = NULL;
+-
+ U_CDECL_BEGIN
+ //
+ // Deleter function for Locales owned by the default Locale hash table/
+@@ -102,24 +114,19 @@
+ if (gDefaultLocalesHashT) {
+ uhash_close(gDefaultLocalesHashT);   // Automatically deletes all 
elements, using deleter func.
+ gDefaultLocalesHashT = NULL;
++gDefaultLocale = NULL;
+ }
+-else if (gDefaultLocale) {
+-// The cache wasn't created, and only one default locale was created.
+-delete gDefaultLocale;
+-}
+-gDefaultLocale = NULL;
+ 
+ return TRUE;
+ }
+ U_CDECL_END
+ 
+ U_NAMESPACE_BEGIN
+-//
+-//  locale_set_default_internal.
+-//
+-void locale_set_default_internal(const char *id)
+-{
+-UErrorCode   status = U_ZERO_ERROR;
++
++Locale *locale_set_default_internal(const char *id, UErrorCode& status) {
++// Synchronize this entire function.
++Mutex lock(&gDefaultLocaleMutex);
++
+ UBool canonicalize = FALSE;
+ 

Re: hola

[Adriam Delgado Rivero]

Utilizando UNO API para java y cargo una plantilla que contiene una tabla 

Intento copiar dicha tabla en la siguiente hoja (propiedades también ) para 
crear una nueva y no encuentro como, este es el código donde obtengo la 
tabla y sus propiedades.

PD. He escrito muchas veces a us...@global.libreoffice.org pero nadie 
responde...
Saludos






// first query the XTextTablesSupplier interface from our document
XTextTablesSupplier xTablesSupplier = (XTextTablesSupplier) 
UnoRuntime.queryInterface(
XTextTablesSupplier.class, xWriterComponent);
// get the tables collection
XNameAccess xNamedTables = xTablesSupplier.getTextTables();

// now query the XIndexAccess from the tables collection
XIndexAccess xIndexedTables = (XIndexAccess) UnoRuntime.queryInterface(
XIndexAccess.class, xNamedTables);
// we need properties
xTableProps = null;

// get the tables
for (int i = 0; i < xIndexedTables.getCount(); i++) {
table = xIndexedTables.getByIndex(i);
// the properties, please!


xTableProps = (XPropertySet) UnoRuntime.queryInterface(
XPropertySet.class, table);
this.xTable = (XTextTable) UnoRuntime.queryInterface(
XTextTable.class, table);
}
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: LibreOffice text justification

[Kohei Yoshida]

On Wed, Mar 6, 2013 at 11:07 AM, Kohei Yoshida  wrote:
> Hi all,
>
> With Chris' permission, I'm forwarding his question to the developer's list.
>
> He would like some code pointers to Writer core where it handle
> line-to-line inter-word spacing.  Anyway, I've included the full text
> of his question below.

I forgot to say that I had already pointed it out to him that the blog
article he references is about Calc's distributed text feature whose
code is not used in Writer. Calc uses EditEngine for it whereas Writer
has its own layout engine.  That is why I forwarded his question to
the list to bring it to the attention of Writer hackers.

Regards,

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

Re: [HELP] Java expert needed on fdo#61726

[Lionel Elie Mamane]

On Wed, Mar 06, 2013 at 02:55:58PM +0100, Stephan Bergmann wrote:
> On 03/05/2013 06:26 PM, Lionel Elie Mamane wrote:
>> On Tue, Mar 05, 2013 at 04:20:32PM +0200, Noel Grandin wrote:
>>> On 2013-03-05 16:01, Lionel Elie Mamane wrote:

 If someone with a better clue at Java could take a look at
 https://bugs.freedesktop.org/show_bug.cgi?id=61726 I'd be
 grateful.

> I assume this has meanwhile been fixed with
> 
> "fdo#61726 java class collision with new idl," right?

Yes; it seems DavidO's mail client breaks threading, so the story of
how he fixed it is in another thread (with same subject).

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

[PATCH] Translate german comments in wrtw8sty.cxx

[Joren De Cuyper (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2575

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/75/2575/1

Translate german comments in wrtw8sty.cxx

Please, only apply this patch if you are native speaking German.
I'm not a native speaker, so a double check is really necessary
and appreciated.

Thanks in advance.

Change-Id: Iee7603c3fb8d78b951b967bd5942df4b1e9634f6
---
M sw/source/filter/ww8/wrtw8sty.cxx
1 file changed, 75 insertions(+), 77 deletions(-)



diff --git a/sw/source/filter/ww8/wrtw8sty.cxx 
b/sw/source/filter/ww8/wrtw8sty.cxx
index 4c9e80f..a5a8efd 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -94,12 +94,12 @@
 //  cbSED is 12 (decimal)), C (hex).
 };
 
-// class WW8_WrPlc0 ist erstmal nur fuer Header / Footer-Positionen, d.h. es
-// gibt keine inhaltstragende Struktur.
+// class WW8_WrPlc0 is only used for header and footer positioning
+// ie there is no content support structure
 class WW8_WrPlc0
 {
 private:
-std::vector aPos;  // PTRARR von CPs / FCs
+std::vector aPos;  // PTRARR of CPs / FCs
 sal_uLong nOfs;
 
 //No copying
@@ -118,16 +118,16 @@
 
 #define WW8_RESERVED_SLOTS 15
 
-// GetId( SwCharFmt ) zur Benutzung im Text -> nil verboten,
-// "Default Char Style" stattdessen
+// GetId( SwCharFmt ) for use in text -> zero is not allowed,
+// use "Default Char Style" instead
 sal_uInt16 MSWordExportBase::GetId( const SwCharFmt& rFmt ) const
 {
 sal_uInt16 nRet = pStyles->GetSlot( rFmt );
 return ( nRet != 0x0fff ) ? nRet : 10;  // Default Char Style
 }
 
-// GetId( SwTxtFmtColl ) zur Benutzung an TextNodes -> nil verboten,
-// "Standard" stattdessen
+// GetId( SwTxtFmtColl ) for use in TextNodes -> zero is not allowed,
+// "Standard" instead
 sal_uInt16 MSWordExportBase::GetId( const SwTxtFmtColl& rColl ) const
 {
 sal_uInt16 nRet = pStyles->GetSlot( rColl );
@@ -152,7 +152,7 @@
 sal_uInt16 nAlloc = WW8_RESERVED_SLOTS + 
m_rExport.pDoc->GetCharFmts()->size() - 1 +
  
m_rExport.pDoc->GetTxtFmtColls()->size() - 1;
 
-// etwas grosszuegig ( bis zu 15 frei )
+// somewhat generous ( free for up to 15 )
 pFmtA = new SwFmt*[ nAlloc ];
 memset( pFmtA, 0, nAlloc * sizeof( SwFmt* ) );
 
@@ -164,14 +164,14 @@
 delete[] pFmtA;
 }
 
-// Sty_SetWWSlot() fuer Abhaengigkeiten der Styles -> nil ist erlaubt
+// Sty_SetWWSlot() dependencies for the styles -> zero is allowed
 sal_uInt16 MSWordStyles::GetSlot( const SwFmt& rFmt ) const
 {
 sal_uInt16 n;
 for ( n = 0; n < nUsedSlots; n++ )
 if ( pFmtA[n] == &rFmt )
 return n;
-return 0xfff;   // 0xfff: WW: nil
+return 0xfff;   // 0xfff: WW: zero
 }
 
 sal_uInt16 MSWordStyles::BuildGetSlot( const SwFmt& rFmt )
@@ -275,7 +275,7 @@
 {
 nUsedSlots = WW8_RESERVED_SLOTS;// soviele sind reserviert fuer
 // Standard und HeadingX u.a.
-const SwCharFmts& rArr = *m_rExport.pDoc->GetCharFmts();   // erst 
CharFmt
+const SwCharFmts& rArr = *m_rExport.pDoc->GetCharFmts();   // first 
CharFmt
 // das Default-ZeichenStyle ( 0 ) wird nicht mit ausgegeben !
 for( sal_uInt16 n = 1; n < rArr.size(); n++ )
 {
@@ -283,7 +283,7 @@
 pFmtA[ BuildGetSlot( *pFmt ) ] = pFmt;
 }
 
-const SwTxtFmtColls& rArr2 = *m_rExport.pDoc->GetTxtFmtColls();   // dann 
TxtFmtColls
+const SwTxtFmtColls& rArr2 = *m_rExport.pDoc->GetTxtFmtColls();   // then 
TxtFmtColls
 // das Default-TextStyle ( 0 ) wird nicht mit ausgegeben !
 for( sal_uInt16 n = 1; n < rArr2.size(); n++ )
 {
@@ -296,20 +296,20 @@
 static void impl_SkipOdd( ww::bytes* pO, sal_Size nTableStrmTell )
 {
 if ( ( nTableStrmTell + pO->size() ) & 1 ) // Start auf gerader
-pO->push_back( (sal_uInt8)0 ); // Adresse
+pO->push_back( (sal_uInt8)0 ); // Adress
 }
 
 void WW8AttributeOutput::EndStyle()
 {
 impl_SkipOdd( m_rWW8Export.pO, m_rWW8Export.pTableStrm->Tell() );
 
-short nLen = m_rWW8Export.pO->size() - 2;// Laenge des Styles
+short nLen = m_rWW8Export.pO->size() - 2;// lenght of the 
styles
 sal_uInt8* p = &m_rWW8Export.pO->front() + nPOPosStdLen1;
 ShortToSVBT16( nLen, p );   // nachtragen
 p = &m_rWW8Export.pO->front() + nPOPosStdLen2;
 ShortToSVBT16( nLen, p );   // dito
 
-m_rWW8Export.pTableStrm->Write( m_rWW8Export.pO->data(), 
m_rWW8Export.pO->size() );  // ins File damit
+m_rWW8Export.pTableStrm->Write( m_rWW8Export.pO->data(), 
m_rWW8Export.pO->size() );  // write it into the file
 m_rWW8Export.pO->clear();
 }
 
@@ -346,7 +346,7 @@
 
 
 sal_uInt16 nLen = static_cast< sal_uInt16 >( ( pData - aWW8_STD ) + 1 +
-((m_rWW8Export.bWrtWW8 ? 2 : 1 ) * (rName.Len() +

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

[Tor Lillqvist]

 vcl/inc/vcl/window.hxx   |1 -
 vcl/source/window/window.cxx |6 --
 2 files changed, 7 deletions(-)

New commits:
commit 303ff2493ba479d4b52874b8e5afa4491d9cec11
Author: Tor Lillqvist 
Date:   Wed Mar 6 23:07:29 2013 +0200

Window::PostPaint() was unused and empty

Change-Id: I0e35b55888df16067660862fd54d240f5dfcef8f

diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index fda621f..fd638bc 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -590,7 +590,6 @@ public:
 virtual voidPrePaint();
 virtual voidPaint( const Rectangle& rRect );
 
-virtual voidPostPaint();
 virtual voidDraw( OutputDevice* pDev, const Point& rPos, const 
Size& rSize, sal_uLong nFlags );
 virtual voidMove();
 virtual voidResize();
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 38960af..ff69d88 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -4788,12 +4788,6 @@ void Window::Paint( const Rectangle& rRect )
 
 // ---
 
-void Window::PostPaint()
-{
-}
-
-// ---
-
 void Window::Draw( OutputDevice*, const Point&, const Size&, sal_uLong )
 {
 DBG_CHKTHIS( Window, ImplDbgCheckWindow );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

fdo#33899 Autocorrection replacing dates with fractions

[V Stuart Foote]

The autocorrect handling of fractional text 1/4, 1/2 & 3/4 disrupts data
entry in calc where "slash" is used for entry of dates. 

fdo#33899    and several
multiple later bugs (37353, 44952, 46969, 53098, 53858 and 61903) all
suggest that unexpected autocorrect conversion to a fractional character
needs improvement in parsing its conditional input.

fdo#33899 has been marked an enhancement request, could someone please scope
out how substantive the work would be to change the autocorrect behavior.

Thanks.




--
View this message in context: 
http://nabble.documentfoundation.org/fdo-33899-Autocorrection-replacing-dates-with-fractions-tp4042102.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] core.git: sd/source sw/source

[Julien Nabet]

 sd/source/ui/remotecontrol/BluetoothServer.cxx |2 +-
 sw/source/ui/dbui/mailmergechildwindow.cxx |3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 0e2ad090d4b3147a58ea2f331d7a7d8a92b74bcf
Author: Julien Nabet 
Date:   Wed Mar 6 23:06:50 2013 +0100

Some cppcheck cleaning

Change-Id: I53ddb92d1fef3513536fa9a54bcedad35581f4aa

diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx 
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index fa919ab..a874a6a 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -663,7 +663,7 @@ void BluetoothServer::doRestoreDiscoverable()
 void BluetoothServer::cleanupCommunicators()
 {
 for (std::vector::iterator it = mpCommunicators->begin();
- it != mpCommunicators->end(); it++)
+ it != mpCommunicators->end(); ++it)
 (*it)->forceClose();
 // the hope is that all the threads then terminate cleanly and
 // clean themselves up.
diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx 
b/sw/source/ui/dbui/mailmergechildwindow.cxx
index de02632..95b494a 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.cxx
+++ b/sw/source/ui/dbui/mailmergechildwindow.cxx
@@ -515,14 +515,13 @@ void  SwSendMailDialog::SendMails()
 OSL_FAIL("config item not set");
 return;
 }
-bool bIsLoggedIn = false;
 EnterWait();
 //get a mail server connection
 uno::Reference< mail::XSmtpService > xSmtpServer =
 SwMailMergeHelper::ConnectToSmtpServer( *m_pConfigItem,
 m_pImpl->xConnectedInMailService,
 aEmptyStr, aEmptyStr, this );
-bIsLoggedIn = xSmtpServer.is() && xSmtpServer->isConnected();
+bool bIsLoggedIn = xSmtpServer.is() && xSmtpServer->isConnected();
 LeaveWait();
 if(!bIsLoggedIn)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Joel Madero  changed:

   What|Removed |Added

 Depends on|33899   |

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

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

V Stuart Foote  changed:

   What|Removed |Added

 Depends on||33899

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

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Bug 6 depends on bug 61903, which changed state.

Bug 61903 Summary: FORMATTING: entering 3/4/13 into a date formatted cell is 
changed to fraction 3/4 and /13
https://bugs.freedesktop.org/show_bug.cgi?id=61903

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |DUPLICATE

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

[PATCH] add copy() to OUStringBuffer

[via Code Review]

Hello LibreOffice gerrit bot, Norbert Thiebaud,

I'd like you to reexamine a change.  Please visit

https://gerrit.libreoffice.org/2125

to look at the new patch set (#6).

Change subject: add copy() to OUStringBuffer
..

add copy() to OUStringBuffer

Change-Id: Ibac7f624f1a1dcce653dff4bec573be457d70075
---
M sal/inc/rtl/ustrbuf.hxx
1 file changed, 40 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/25/2125/6
-- 
To view, visit https://gerrit.libreoffice.org/2125
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ibac7f624f1a1dcce653dff4bec573be457d70075
Gerrit-PatchSet: 6
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christina Roßmanith 
Gerrit-Reviewer: LibreOffice gerrit bot 
Gerrit-Reviewer: Muthu Subramanian K 
Gerrit-Reviewer: Norbert Thiebaud 
Gerrit-Reviewer: Stephan Bergmann 

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

[PATCH] Replaced XubString with OUString in vcl(combobox)

[via Code Review]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2574

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/74/2574/1

Replaced XubString with OUString in vcl(combobox)

Change-Id: Ibe80e9837f1c8275d625e942eb75ecc8de897bf5
---
M vcl/inc/vcl/combobox.hxx
M vcl/source/control/combobox.cxx
2 files changed, 47 insertions(+), 46 deletions(-)



diff --git a/vcl/inc/vcl/combobox.hxx b/vcl/inc/vcl/combobox.hxx
index 9758281..22ee570 100644
--- a/vcl/inc/vcl/combobox.hxx
+++ b/vcl/inc/vcl/combobox.hxx
@@ -120,28 +120,28 @@
 sal_uInt16  GetDropDownLineCount() const;
 
 voidEnableAutoSize( sal_Bool bAuto );
-sal_BoolIsAutoSizeEnabled() const   { return 
mbDDAutoSize; }
+sal_BoolIsAutoSizeEnabled() const   { return 
mbDDAutoSize; }
 
 voidEnableDDAutoWidth( sal_Bool b );
 
 virtual voidSetText( const OUString& rStr );
 virtual voidSetText( const OUString& rStr, const Selection& 
rNewSelection );
 
-sal_uInt16  InsertEntry( const XubString& rStr, sal_uInt16 nPos = 
COMBOBOX_APPEND );
-sal_uInt16  InsertEntry( const XubString& rStr, const Image& 
rImage, sal_uInt16 nPos = COMBOBOX_APPEND );
+sal_uInt16  InsertEntry( const OUString& rStr, sal_uInt16 nPos = 
COMBOBOX_APPEND );
+sal_uInt16  InsertEntry( const OUString& rStr, const Image& rImage, 
sal_uInt16 nPos = COMBOBOX_APPEND );
 
-voidRemoveEntry( const XubString& rStr );
+voidRemoveEntry( const OUString& rStr );
 voidRemoveEntry( sal_uInt16 nPos );
 
 voidClear();
 
-sal_uInt16  GetEntryPos( const XubString& rStr ) const;
+sal_uInt16  GetEntryPos( const OUString& rStr ) const;
 Image   GetEntryImage( sal_uInt16 nPos ) const;
-XubString   GetEntry( sal_uInt16 nPos ) const;
-sal_uInt16  GetEntryCount() const;
+OUStringGetEntry( sal_uInt16 nPos ) const;
+sal_uInt16  GetEntryCount() const;
 
-sal_BoolIsTravelSelect() const;
-sal_BoolIsInDropDown() const;
+sal_BoolIsTravelSelect() const;
+sal_BoolIsInDropDown() const;
 voidToggleDropDown();
 
 longCalcWindowSizePixel( sal_uInt16 nLines ) const;
@@ -155,10 +155,10 @@
 voidSetSeparatorPos( sal_uInt16 n = LISTBOX_ENTRY_NOTFOUND );
 
 voidEnableAutocomplete( sal_Bool bEnable, sal_Bool bMatchCase 
= sal_False );
-sal_BoolIsAutocompleteEnabled() const;
+sal_BoolIsAutocompleteEnabled() const;
 
 voidEnableMultiSelection( sal_Bool bMulti );
-sal_BoolIsMultiSelectionEnabled() const;
+sal_BoolIsMultiSelectionEnabled() const;
 voidSetMultiSelectionSeparator( sal_Unicode cSep ) { 
mcMultiSep = cSep; }
 sal_Unicode GetMultiSelectionSeparator() const { return mcMultiSep; }
 
@@ -174,8 +174,8 @@
 SizeCalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const;
 voidGetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& 
rnLines ) const;
 
-voidSetMRUEntries( const XubString& rEntries, sal_Unicode cSep 
= ';' );
-XubString   GetMRUEntries( sal_Unicode cSep = ';' ) const;
+voidSetMRUEntries( const OUString& rEntries, sal_Unicode cSep 
= ';' );
+OUStringGetMRUEntries( sal_Unicode cSep = ';' ) const;
 voidSetMaxMRUCount( sal_uInt16 n );
 sal_uInt16  GetMaxMRUCount() const;
 
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 8356a52..d021af6 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -34,11 +34,11 @@
 
 // ===
 
-static void lcl_GetSelectedEntries( ::std::set< sal_uInt16 >& rSelectedPos, 
const XubString& rText, sal_Unicode cTokenSep, const ImplEntryList* pEntryList )
+static void lcl_GetSelectedEntries( ::std::set< sal_uInt16 >& rSelectedPos, 
const OUString& rText, sal_Unicode cTokenSep, const ImplEntryList* pEntryList )
 {
-for (xub_StrLen n = comphelper::string::getTokenCount(rText, cTokenSep); 
n;)
+for (sal_Int32 n = comphelper::string::getTokenCount(rText, cTokenSep); n;)
 {
-XubString aToken = rText.GetToken( --n, cTokenSep );
+OUString aToken = rText.getToken( --n, cTokenSep );
 aToken = comphelper::string::strip(aToken, ' ');
 sal_uInt16 nPos = pEntryList->FindEntry( aToken );
 if ( nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -324,8 +324,8 @@
 if ( aSel.Len() ||
  ((eAction != AUTOCOMPLETE_TABFORWARD) && (eAction != 
AUTOCOMPLETE_TABBACKWARD)) )
 {
-XubString   aFullText = pEdit->GetText();
-XubString   aStartText = aFullText.Copy( 0, (xub_StrLen)

[PATCH] Replace XubString with OUString in morebtn.{c,h}xx

[via Code Review]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2573

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/73/2573/1

Replace XubString with OUString in morebtn.{c,h}xx

Change-Id: I492f93a9ef5244681a28aed16e81c7558e38a875
---
M vcl/inc/vcl/morebtn.hxx
M vcl/source/control/morebtn.cxx
2 files changed, 10 insertions(+), 10 deletions(-)



diff --git a/vcl/inc/vcl/morebtn.hxx b/vcl/inc/vcl/morebtn.hxx
index 7172265..a715f37 100644
--- a/vcl/inc/vcl/morebtn.hxx
+++ b/vcl/inc/vcl/morebtn.hxx
@@ -71,10 +71,10 @@
 voidSetText( const OUString& rNewText );
 OUStringGetText() const;
 
-voidSetMoreText( const XubString& rNewText );
-voidSetLessText( const XubString& rNewText );
-XubString   GetMoreText() const;
-XubString   GetLessText() const;
+voidSetMoreText( const OUString& rNewText );
+voidSetLessText( const OUString& rNewText );
+OUStringGetMoreText() const;
+OUStringGetLessText() const;
 };
 
 inline void MoreButton::SetState( sal_Bool bNewState )
diff --git a/vcl/source/control/morebtn.cxx b/vcl/source/control/morebtn.cxx
index 337bdc6..2d3b974 100644
--- a/vcl/source/control/morebtn.cxx
+++ b/vcl/source/control/morebtn.cxx
@@ -29,8 +29,8 @@
 struct ImplMoreButtonData
 {
 ImplMoreWindowList *mpItemList;
-XubString   maMoreText;
-XubString   maLessText;
+OUStringmaMoreText;
+OUStringmaLessText;
 };
 
 // ===
@@ -219,7 +219,7 @@
 }
 
 // ---
-void MoreButton::SetMoreText( const XubString& rText )
+void MoreButton::SetMoreText( const OUString& rText )
 {
 if ( mpMBData )
 mpMBData->maMoreText = rText;
@@ -229,7 +229,7 @@
 }
 
 // ---
-XubString MoreButton::GetMoreText() const
+OUString MoreButton::GetMoreText() const
 {
 if ( mpMBData )
 return mpMBData->maMoreText;
@@ -238,7 +238,7 @@
 }
 
 // ---
-void MoreButton::SetLessText( const XubString& rText )
+void MoreButton::SetLessText( const OUString& rText )
 {
 if ( mpMBData )
 mpMBData->maLessText = rText;
@@ -248,7 +248,7 @@
 }
 
 // ---
-XubString MoreButton::GetLessText() const
+OUString MoreButton::GetLessText() const
 {
 if ( mpMBData )
 return mpMBData->maLessText;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I492f93a9ef5244681a28aed16e81c7558e38a875
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christina Roßmanith 

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

scalc UNO api compilation question about header files

[Neeraj Rai]

Hi Guys,

I am trying to build a scalc extension using UNO api on centos 6 . This
previous built successfully on RHEL 6.
It seems the header files are all over the place and I trying to figure out
how to modify the Makefile to accommodate it.
In the first pass, I was too busy making it work, but this time I would
like to understand the process.

1. how is the header XDesktop.hpp generated and should it be in the path
pointed by any of the standard vars
 (OO_SDK_HOME, (OO_SDK_URE_HOME, OO_SDK_OUT)
I see it in following path on my installation :
libreoffice-4.0.0.3/workdir/
unxlngx6.pro/UnoApiHeadersTarget/offapi/comprehensive/com/sun/star/frame/XDesktop.hpp
libreoffice-4.0.0.3/workdir/
unxlngx6.pro/UnoApiHeadersTarget/offapi/normal/com/sun/star/frame/XDesktop.hpp
libreoffice-4.0.0.3/solver/
unxlngx6.pro/inc/offapi/com/sun/star/frame/XDesktop.hpp
2. how is the header XEnumerationAccess.hpp generated and should it be in
the path pointed by any of the standard vars
 (OO_SDK_HOME, (OO_SDK_URE_HOME, OO_SDK_OUT)
I see it in following path on my installation (different from XDesktop.hpp):
 libreoffice-4.0.0.3/workdir/
unxlngx6.pro/UnoApiHeadersTarget/udkapi/bootstrap/com/sun/star/container/XEnumerationAccess.hpp
 libreoffice-4.0.0.3/workdir/
unxlngx6.pro/UnoApiHeadersTarget/udkapi/comprehensive/com/sun/star/container/XEnumerationAccess.hpp
 libreoffice-4.0.0.3/workdir/
unxlngx6.pro/UnoApiHeadersTarget/udkapi/normal/com/sun/star/container/XEnumerationAccess.hpp
 libreoffice-4.0.0.3/solver/
unxlngx6.pro/inc/udkapi/com/sun/star/container/XEnumerationAccess.hpp

Neeraj
-- 
=
Intuition - is the inability to figure out the facts on which we based the
decision.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: reportbuilder/Jar_reportbuilder.mk reportbuilder/java

[David Ostrovsky]

 reportbuilder/Jar_reportbuilder.mk  |1 
 reportbuilder/java/com/sun/star/report/ReportEngine2.java   |   46 
--
 reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java |3 
 3 files changed, 1 insertion(+), 49 deletions(-)

New commits:
commit 3c14d6545bb513dc825088d8d09263d9b16c21c8
Author: David Ostrovsky 
Date:   Wed Mar 6 21:19:42 2013 +0100

remove ReportEngine2 interface

Typical anti pattern in java is the overuse of interfaces.
You only need an interface in java, if you have multiple
different implementations. Otherwise you don't.

Change-Id: If8b62adc56385f9b839dab36e8cbbf9f715e6017

diff --git a/reportbuilder/Jar_reportbuilder.mk 
b/reportbuilder/Jar_reportbuilder.mk
index d99c127..4ac4987 100644
--- a/reportbuilder/Jar_reportbuilder.mk
+++ b/reportbuilder/Jar_reportbuilder.mk
@@ -68,7 +68,6 @@ $(eval $(call gb_Jar_add_sourcefiles,sun-report-builder,\
 reportbuilder/java/com/sun/star/report/OutputRepository \
 reportbuilder/java/com/sun/star/report/ParameterMap \
 reportbuilder/java/com/sun/star/report/ReportAddIn \
-reportbuilder/java/com/sun/star/report/ReportEngine2 \
 reportbuilder/java/com/sun/star/report/ReportEngineMetaData \
 reportbuilder/java/com/sun/star/report/ReportEngineParameterNames \
 reportbuilder/java/com/sun/star/report/ReportExecutionException \
diff --git a/reportbuilder/java/com/sun/star/report/ReportEngine2.java 
b/reportbuilder/java/com/sun/star/report/ReportEngine2.java
deleted file mode 100644
index 07a2fa0..000
--- a/reportbuilder/java/com/sun/star/report/ReportEngine2.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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 .
- */
-package com.sun.star.report;
-
-/**
- * The job factory collects all required properties to build a reportJob
- * object. Implementors should define a suitable set of properties to allow
- * the configuration of the created report jobs.
- *
- * How these properties are collected is beyond the scope of this interface.
- * For each type of Job, there should be separate job-factory (remote jobs
- * vs. local jobs etc).
- *
- */
-public interface ReportEngine2
-{
-
-public ReportJobDefinition createJobDefinition();
-
-public ReportEngineMetaData getMetaData();
-
-/**
- * Open points: How to define scheduling?
- *
- * @param definition
- * @return the report job definition for the job description.
- * @throws JobDefinitionException
- */
-public ReportJob createJob(ReportJobDefinition definition)
-throws JobDefinitionException;
-}
diff --git 
a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java 
b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java
index 01f54807..a4ddc77 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java
@@ -18,14 +18,13 @@
 package com.sun.star.report.pentaho;
 
 import com.sun.star.report.JobDefinitionException;
-import com.sun.star.report.ReportEngine2;
 import com.sun.star.report.ReportEngineMetaData;
 import com.sun.star.report.ReportJob;
 import com.sun.star.report.ReportJobDefinition;
 import com.sun.star.report.util.DefaultReportJobDefinition;
 import org.jfree.report.JFreeReportBoot;
 
-public class PentahoReportEngine implements ReportEngine2
+public class PentahoReportEngine
 {
 
 private final ReportEngineMetaData metaData;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Peter Foley]

New branch 'feature/gccwrapper' available with the following commits:
commit 76ef861697c0f7e26062f757f6bddbe68e96dc56
Author: Peter Foley 
Date:   Wed Mar 6 14:11:57 2013 -0500

gcc-wrapper can create an exe

Change-Id: Ibec6819e0cc9b726f9d5fb8af318805b7a62a398

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

[Libreoffice-commits] core.git: Branch 'feature/liblibo' - desktop/source

[Michael Meeks]

 desktop/source/lib/init.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit e4a160d1a72e8652e204bb45a488ba6ace8f8039
Author: Michael Meeks 
Date:   Wed Mar 6 19:02:14 2013 +

liblibo: get fundamentalrc setup right - bootstrapping a little further.

Change-Id: I42d5ff32c2a3b721689676f5295e148c3364518d

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index de5788d..fc25403 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -87,8 +87,10 @@ aBasicErrorFunc( const OUString &rErr, const OUString 
&rAction )
 }
 
 static void
-initialize_uno( const rtl::OUString &aUserProfileURL )
+initialize_uno( const rtl::OUString &aAppURL )
 {
+rtl::Bootstrap::setIniFilename( aAppURL + "/fundamentalrc" );
+
 xContext = cppu::defaultBootstrap_InitialComponentContext();
 fprintf( stderr, "Uno initialized %d\n", xContext.is() );
 xFactory = xContext->getServiceManager();
@@ -97,7 +99,8 @@ initialize_uno( const rtl::OUString &aUserProfileURL )
 
 // set UserInstallation to user profile dir in test/user-template
 rtl::Bootstrap aDefaultVars;
-aDefaultVars.set(rtl::OUString("UserInstallation"), aUserProfileURL );
+aDefaultVars.set(rtl::OUString("UserInstallation"), aAppURL + 
"../registry" );
+// configmgr setup ?
 }
 
 bool
@@ -117,7 +120,7 @@ LibLibreOffice_Impl::initialize( const char *app_path )
 return false;
 
 try {
-initialize_uno( aAppURL + "../registry" );
+initialize_uno( aAppURL );
 force_c_locale();
 InitVCL();
 if (Application::IsHeadlessModeRequested())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

[Peter Foley]

 configure.ac |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit e9c6338f1b50c0deaf714c87750319ea3482916c
Author: Peter Foley 
Date:   Wed Mar 6 13:07:05 2013 -0500

Do not add empty path to SOLARINC on windows

Change-Id: I6c53e999b9921dff4338815a48b8c97b4fe25059

diff --git a/configure.ac b/configure.ac
index 26ec6cf..d43892c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8876,9 +8876,11 @@ if test -n "$ENABLE_DIRECTX" -a "$_os" = "WINNT"; then
 else
 AC_MSG_RESULT([no, hoping the necessary headers and libraries will be 
found anyway])
 fi
-PathFormat "$DIRECTXSDK_HOME"
-DIRECTXSDK_HOME="$formatted_path"
-SOLARINC="$SOLARINC -I$DIRECTXSDK_HOME/include"
+if test -n "$DIRECTXSDK_HOME"; then
+PathFormat "$DIRECTXSDK_HOME"
+DIRECTXSDK_HOME="$formatted_path"
+SOLARINC="$SOLARINC -I$DIRECTXSDK_HOME/include"
+fi
 fi
 AC_SUBST(DIRECTXSDK_HOME)
 AC_SUBST(DIRECTXSDK_LIB)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] fdo#61166 text format: correctly chain the formatter->getOut...

[Norbert Thiebaud (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/2570

Approvals:
  Norbert Thiebaud: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a5391cd9d77d181026abffa3ea2f036c7009ade
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Lionel Elie Mamane 
Gerrit-Reviewer: Norbert Thiebaud 

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

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Lionel Elie Mamane  changed:

   What|Removed |Added

 Depends on||61903

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

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

--- Comment #209 from V Stuart Foote  ---
(In reply to comment #208)
> Bug 61903 - FORMATTING: entering 3/4/13 into a date formatted cell is
> changed to fraction 3/4 and /13
> 
> This bug prevents typing in a date as 3/4/13 changes to ¾/13 (three-quarters
> sign then /13 - happens as soon as the second forward slash is entered).

RESOLVED NOTABUG. Autocorrect feature defaults have 1/4, 1/2 and 3/4
replacements with corresponding fraction character from fontset. Autocorrect is
immediately reverted with -Z

Alternative entry using correct date format of 03/04/13 avoids autocorrect. Or,
autocorrect replacement can be eliminated by deletion of 1/4, 1/2, 3/4 entries
in the Replace tab. 

Possible UX enhancement to change Autocorrect function for date formatted
fields, but not a MAB.

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

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

[Lionel Elie Mamane]

 svtools/source/control/fmtfield.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8a203e4996979fd9be3eba835fb84dd005ac3f69
Author: Lionel Elie Mamane 
Date:   Wed Mar 6 17:52:28 2013 +0100

fdo#61166 text format: correctly chain the formatter->getOutputString calls

cf commit 271b11a3d56ba0c5f542a142ab859a0819530dba, copy/paste error

Change-Id: I9a5391cd9d77d181026abffa3ea2f036c7009ade
Reviewed-on: https://gerrit.libreoffice.org/2570
Reviewed-by: Norbert Thiebaud 
Tested-by: Norbert Thiebaud 

diff --git a/svtools/source/control/fmtfield.cxx 
b/svtools/source/control/fmtfield.cxx
index 181bc71..6c0258b 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -954,7 +954,7 @@ void FormattedField::ImplSetValue(double dVal, sal_Bool 
bForce)
 ImplGetFormatter()->GetOutputString(dVal, 0, sTemp, 
&m_pLastOutputColor);
 // dann den String entsprechend dem Text-Format
 {
-OUString sTempIn(m_sCurrentTextValue);
+OUString sTempIn(sTemp);
 OUString sTempOut;
 ImplGetFormatter()->GetOutputString(sTempIn, m_nFormatKey, sTempOut, 
&m_pLastOutputColor);
 sNewText = sTempOut;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Bug 6 depends on bug 61903, which changed state.

Bug 61903 Summary: FORMATTING: entering 3/4/13 into a date formatted cell is 
changed to fraction 3/4 and /13
https://bugs.freedesktop.org/show_bug.cgi?id=61903

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|NOTABUG |---

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

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

V Stuart Foote  changed:

   What|Removed |Added

 Depends on|61903   |

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

[PATCH] Bug 34800 Comments added to footer are placed at the right t...

[Joren De Cuyper (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2572

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/72/2572/1

Bug 34800 Comments added to footer are placed at the right top of the page.

The problem is that the nodes in the footnote are stored before
nodes of the document body in the internal structure.
Therefore I wrote this patch to check if the compared
comments are in the footnote (one, both or both not).

Special thanks to Cédric Bosdonnat

Change-Id: Ibcd0373110fde848dccf93ffe9100459c7cc64a5
---
M sw/source/ui/docvw/PostItMgr.cxx
1 file changed, 19 insertions(+), 1 deletion(-)



diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx
index cd94ba0..5465ecf 100644
--- a/sw/source/ui/docvw/PostItMgr.cxx
+++ b/sw/source/ui/docvw/PostItMgr.cxx
@@ -90,7 +90,25 @@
 bool comp_pos(const SwSidebarItem* a, const SwSidebarItem* b)
 {
 // sort by anchor position
-return a->GetAnchorPosition() < b->GetAnchorPosition();
+SwPosition aPosAnchorA = a->GetAnchorPosition();
+SwPosition aPosAnchorB = b->GetAnchorPosition();
+
+bool aAnchorAInFooter = 
aPosAnchorA.nNode.GetNode().FindFootnoteStartNode() != NULL;
+bool aAnchorBInFooter = 
aPosAnchorB.nNode.GetNode().FindFootnoteStartNode() != NULL;
+
+// fdo#34800
+// if AnchorA is in footnote, and AnchorB isn't
+// we do not want to change over the position
+if( aAnchorAInFooter && !aAnchorBInFooter )
+return NULL;
+// if AnchorA is not placed in a footnote, and AnchorB is
+// force a change over
+else if( !aAnchorAInFooter && aAnchorBInFooter )
+return 1;
+// if none of both, or both are in the footer
+// arrange them depending on the position
+else
+return aPosAnchorA < aPosAnchorB;
 }
 
 SwPostItMgr::SwPostItMgr(SwView* pView)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibcd0373110fde848dccf93ffe9100459c7cc64a5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper 

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

[Libreoffice-commits] core.git: Branch 'feature/liblibo' - desktop/Library_libreoffice.mk smoketest/Executable_libtest.mk

[Michael Meeks]

 desktop/Library_libreoffice.mk  |1 +
 smoketest/Executable_libtest.mk |4 
 2 files changed, 5 insertions(+)

New commits:
commit f6a5bca2ade6149f79f5a7003f1808fcb139a40c
Author: Michael Meeks 
Date:   Wed Mar 6 17:25:30 2013 +

liblibo: enable debugging with threads.

Change-Id: Ied6e99c4b37eb2437552b9b7a56a2ec526052548

diff --git a/desktop/Library_libreoffice.mk b/desktop/Library_libreoffice.mk
index 96b18a1..dbe3e81 100644
--- a/desktop/Library_libreoffice.mk
+++ b/desktop/Library_libreoffice.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_Library_set_include,libreoffice,\
 $(eval $(call gb_Library_add_libs,libreoffice,\
$(if $(filter $(OS),LINUX), \
-ldl \
+-lpthread \
) \
 ))
 
diff --git a/smoketest/Executable_libtest.mk b/smoketest/Executable_libtest.mk
index 5dd6a5b..8d73ccd 100644
--- a/smoketest/Executable_libtest.mk
+++ b/smoketest/Executable_libtest.mk
@@ -19,6 +19,10 @@ $(eval $(call gb_Executable_use_libraries,libtest,\
$(gb_UWINAPI) \
 ))
 
+$(eval $(call gb_Executable_add_libs,libtest,\
+   -pthread \
+))
+
 $(eval $(call gb_Executable_add_exception_objects,libtest,\
smoketest/libtest \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] delete previous uncommented comments in positionhelper.cxx

[Tor Lillqvist (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/2571

Approvals:
  Tor Lillqvist: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0f177a078b915c1220423ea583e749de4d02e384
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper 
Gerrit-Reviewer: Tor Lillqvist 

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

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

[Joren De Cuyper]

 sw/source/core/fields/postithelper.cxx |   15 +--
 1 file changed, 5 insertions(+), 10 deletions(-)

New commits:
commit e8e068770e35dc4f7a5e793732be6ddef96d7ba7
Author: Joren De Cuyper 
Date:   Wed Mar 6 18:13:22 2013 +0100

delete previous uncommented comments in positionhelper.cxx

Change-Id: I0f177a078b915c1220423ea583e749de4d02e384
Reviewed-on: https://gerrit.libreoffice.org/2571
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/sw/source/core/fields/postithelper.cxx 
b/sw/source/core/fields/postithelper.cxx
index b68fe12..1937cee 100644
--- a/sw/source/core/fields/postithelper.cxx
+++ b/sw/source/core/fields/postithelper.cxx
@@ -165,16 +165,11 @@ unsigned long SwPostItHelper::getPageInfo( SwRect& 
rPageFrm, const SwRootFrm* pR
 SwPosition SwAnnotationItem::GetAnchorPosition() const
 {
 SwTxtFld* pFld = pFmtFld->GetTxtFld();
-if( pFld )
-{
-SwTxtNode* pTNd = pFld->GetpTxtNode();
-if( pTNd )
-{
-SwPosition aPos( *pTNd );
-aPos.nContent.Assign( pTNd, *pFld->GetStart() );
-return aPos;
-}
-}
+SwTxtNode* pTNd = pFld->GetpTxtNode();
+
+SwPosition aPos( *pTNd );
+aPos.nContent.Assign( pTNd, *pFld->GetStart() );
+return aPos;
 }
 
 bool SwAnnotationItem::UseElement()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] delete previous uncommented comments in positionhelper.cxx

[Joren De Cuyper (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2571

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/71/2571/1

delete previous uncommented comments in positionhelper.cxx

Change-Id: I0f177a078b915c1220423ea583e749de4d02e384
---
M sw/source/core/fields/postithelper.cxx
1 file changed, 5 insertions(+), 10 deletions(-)



diff --git a/sw/source/core/fields/postithelper.cxx 
b/sw/source/core/fields/postithelper.cxx
index b68fe12..1937cee 100644
--- a/sw/source/core/fields/postithelper.cxx
+++ b/sw/source/core/fields/postithelper.cxx
@@ -165,16 +165,11 @@
 SwPosition SwAnnotationItem::GetAnchorPosition() const
 {
 SwTxtFld* pFld = pFmtFld->GetTxtFld();
-if( pFld )
-{
-SwTxtNode* pTNd = pFld->GetpTxtNode();
-if( pTNd )
-{
-SwPosition aPos( *pTNd );
-aPos.nContent.Assign( pTNd, *pFld->GetStart() );
-return aPos;
-}
-}
+SwTxtNode* pTNd = pFld->GetpTxtNode();
+
+SwPosition aPos( *pTNd );
+aPos.nContent.Assign( pTNd, *pFld->GetStart() );
+return aPos;
 }
 
 bool SwAnnotationItem::UseElement()

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f177a078b915c1220423ea583e749de4d02e384
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper 

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

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

crazyske...@gmail.com changed:

   What|Removed |Added

 Depends on||61903

--- Comment #208 from crazyske...@gmail.com ---
Bug 61903 - FORMATTING: entering 3/4/13 into a date formatted cell is changed
to fraction 3/4 and /13

This bug prevents typing in a date as 3/4/13 changes to ¾/13 (three-quarters
sign then /13 - happens as soon as the second forward slash is entered).

-- 
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: compilation failure on centos 6

[Neeraj Rai]

VERBOSE=TRUE seems to help with verbosity.

#4  --enable-verbose is aborted with "unknown option"

#5I noticed "-j n" option is ignored by build. It took 149min on centos 6
as opposed to 240min on RHEL 6 last time I tried (few weeks back), so  I am
not complaining at all.
Just an observation that the subprocess below shows -j 1 even though parent
had -j 5

ps -ef |grep make
sid0 11107  2088  0 11:53 pts/100:00:00 make -j 5 VERBOSE=TRUE
sid0 11108 11107  0 11:53 pts/100:00:00 make -r -f
/data2/work/sid0/dev/builddir/libreoffice-4.0.0.3/Makefile.top all
sid0 6 11108  0 11:53 pts/100:00:00 bash -c cd packimages &&
unset MAKEFLAGS &&
\??/data2/work/sid0/dev/builddir/libreoffice-4.0.0.3/solenv/bin/build.pl-P1
--all -- -P1 && \??make -j 1 -r
sid0 11263 11262 96 11:53 pts/100:00:25 make -f Makefile -j1 -r all
slowcheck gb_PARTIALBUILD=T


On Wed, Mar 6, 2013 at 11:09 AM, Matúš Kukan  wrote:

> On 6 March 2013 17:01, Neeraj Rai  wrote:
> > One more question on build : when I see a line like following, how do I
> know
> > the corresponding linux cmd issued (gcc -I file ... etc).
> > [build DEP] LNK:Executable/oosplash
> >
> > If the answer is obvious, please point me to right tool/docs.
> > I tried "make -d " and that doesn't help.
>
> --enable-verbose should do it.
> Or - one time only: make VERBOSE=TRUE
>
> HTH,
> Matus
>



-- 
=
Intuition - is the inability to figure out the facts on which we based the
decision.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Lionel Elie Mamane]

 svtools/source/control/fmtfield.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 6cdce7fdce4905804554856f30aaf3cf68ebeaac
Author: Lionel Elie Mamane 
Date:   Wed Mar 6 18:00:09 2013 +0100

janitorial: indentation

Change-Id: Ia1d4f938cbc3c142a415850208482e6e36122562

diff --git a/svtools/source/control/fmtfield.cxx 
b/svtools/source/control/fmtfield.cxx
index a37ab98..0b2c3e4 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -954,10 +954,10 @@ void FormattedField::ImplSetValue(double dVal, sal_Bool 
bForce)
 ImplGetFormatter()->GetOutputString(dVal, 0, sTemp, 
&m_pLastOutputColor);
 // dann den String entsprechend dem Text-Format
 {
-OUString sTempIn(sTemp);
-OUString sTempOut;
-ImplGetFormatter()->GetOutputString(sTempIn, m_nFormatKey, sTempOut, 
&m_pLastOutputColor);
-sNewText = sTempOut;
+OUString sTempIn(sTemp);
+OUString sTempOut;
+ImplGetFormatter()->GetOutputString(sTempIn, m_nFormatKey, 
sTempOut, &m_pLastOutputColor);
+sNewText = sTempOut;
 }
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH libreoffice-4-0] fdo#61166 text format: correctly chain the formatter->getOut...

[Lionel Elie Mamane (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2570

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/70/2570/1

fdo#61166 text format: correctly chain the formatter->getOutputString calls

cf commit 271b11a3d56ba0c5f542a142ab859a0819530dba, copy/paste error

Change-Id: I9a5391cd9d77d181026abffa3ea2f036c7009ade
---
M svtools/source/control/fmtfield.cxx
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/svtools/source/control/fmtfield.cxx 
b/svtools/source/control/fmtfield.cxx
index 181bc71..6c0258b 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -954,7 +954,7 @@
 ImplGetFormatter()->GetOutputString(dVal, 0, sTemp, 
&m_pLastOutputColor);
 // dann den String entsprechend dem Text-Format
 {
-OUString sTempIn(m_sCurrentTextValue);
+OUString sTempIn(sTemp);
 OUString sTempOut;
 ImplGetFormatter()->GetOutputString(sTempIn, m_nFormatKey, sTempOut, 
&m_pLastOutputColor);
 sNewText = sTempOut;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a5391cd9d77d181026abffa3ea2f036c7009ade
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Lionel Elie Mamane 

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

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

[Lionel Elie Mamane]

 svtools/source/control/fmtfield.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 966ab5cd805d403f1dec73bb1a452b9ed38348d5
Author: Lionel Elie Mamane 
Date:   Wed Mar 6 17:52:28 2013 +0100

fdo#61166 text format: correctly chain the formatter->getOutputString calls

cf commit 271b11a3d56ba0c5f542a142ab859a0819530dba, copy/paste error

Change-Id: I9a5391cd9d77d181026abffa3ea2f036c7009ade

diff --git a/svtools/source/control/fmtfield.cxx 
b/svtools/source/control/fmtfield.cxx
index b580109..a37ab98 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -954,7 +954,7 @@ void FormattedField::ImplSetValue(double dVal, sal_Bool 
bForce)
 ImplGetFormatter()->GetOutputString(dVal, 0, sTemp, 
&m_pLastOutputColor);
 // dann den String entsprechend dem Text-Format
 {
-OUString sTempIn(m_sCurrentTextValue);
+OUString sTempIn(sTemp);
 OUString sTempOut;
 ImplGetFormatter()->GetOutputString(sTempIn, m_nFormatKey, sTempOut, 
&m_pLastOutputColor);
 sNewText = sTempOut;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Mirroring gtk buttons

[Caolán McNamara]

On Wed, 2013-03-06 at 17:52 +0200, Khaled Hosny wrote:
> The default direction of GTK widgets is locale dependant; it is set by a
> string in GTK's gettext catalogue, so if we can somehow trick GTK to use
> the same locale as LibreOffice UI, that would be a solution.

See SalGtkPicker::setGtkLanguage vcl/unx/gtk/fpicker/SalGtkPicker.cxx
Using LANGUAGE should get gettext to do the right thing without busting
any of the "normal" locale settings for us.

First thing to try would be to move that code out of there and get it
called before any gtk widgetery gets going. Try moving it into
GtkData::Init before that "gtk_set_locale" call and see it that
works/helps/does anything.

C.

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

[PATCH libreoffice-4-0] fdo#60722 RTF filter: shape import fixes

[Miklos Vajna (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2569

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/69/2569/1

fdo#60722 RTF filter: shape import fixes

- fix line color default
- fix line width default
- fix z-order of shapes

(cherry picked from commits 9c7dbd9e1d2a131402a80e377630fe1ab5381a47,
cf2a1277acd4a29492f056a626b13e903d391027,
1eaab77c718ffa254068ae6032862dfb5a03db67 and
ea66024d4da38a619f44c941b65e6a28b74214b9)

Change-Id: Ib6097c844b2bc929c6ece31bcec62f27bfbf386c
---
A sw/qa/extras/rtfimport/data/fdo60722.rtf
M sw/qa/extras/rtfimport/rtfimport.cxx
M writerfilter/source/dmapper/GraphicHelpers.cxx
M writerfilter/source/rtftok/rtfdocumentimpl.cxx
M writerfilter/source/rtftok/rtfdocumentimpl.hxx
M writerfilter/source/rtftok/rtfsdrimport.cxx
6 files changed, 57 insertions(+), 12 deletions(-)



diff --git a/sw/qa/extras/rtfimport/data/fdo60722.rtf 
b/sw/qa/extras/rtfimport/data/fdo60722.rtf
new file mode 100644
index 000..498df01
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo60722.rtf
@@ -0,0 +1,13 @@
+{\rtf1\ansi\deff0
+{\fonttbl
+{\f0\fnil\fcharset204\fprq0\cpg1251 Arial;}
+{\f1\fnil\fcharset204\fprq0\cpg1251 Times New Roman;}
+{\f2\fnil\fcharset204\fprq0\cpg1251 Courier New;}
+}
+{\*\viewkind1}{\*\viewscale100}\margl0\margr0\margt0\margb0
+\paperw11905\paperh16837
+{\shp{\*\shpinst\shpleft10480\shptop840\shpright11320\shpbottom840\shpfhdr0\shpbxpage\shpbypage\shpwr3\shpwrk0\shpfblwtxt1\shpz0{\sp{\sn
 shapeType}{\sv 20
+{\shp{\*\shpinst\shpleft8900\shptop11940\shpright10360\shpbottom12320\shpfhdr0\shpbxpage\shpbypage\shpwr3\shpwrk0\shpfblwtxt1\shpz0{\sp{\sn
 shapeType}{\sv 1}}{\sp{\sn fFilled}{\sv 0}}{\sp{\sn wzDescription}{\sv 
smaller
+{\shp{\*\shpinst\shpleft7920\shptop11040\shpright11320\shpbottom13440\shpfhdr0\shpbxpage\shpbypage\shpwr3\shpwrk0\shpfblwtxt1\shpz0{\sp{\sn
 shapeType}{\sv 1}}{\sp{\sn fFilled}{\sv 0}}{\sp{\sn wzDescription}{\sv 
larger
+{\par\plain\par
+}}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index b55aad9..3d3cbe6 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -140,6 +140,7 @@
 void testFdo58646line();
 void testFdo59953();
 void testFdo59638();
+void testFdo60722();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -230,6 +231,7 @@
 {"fdo58646line.rtf", &Test::testFdo58646line},
 {"fdo59953.rtf", &Test::testFdo59953},
 {"fdo59638.rtf", &Test::testFdo59638},
+{"fdo60722.rtf", &Test::testFdo60722},
 };
 for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
 {
@@ -1110,6 +1112,25 @@
 CPPUNIT_FAIL("no BulletChar property");
 }
 
+void Test::testFdo60722()
+{
+// The problem was that the larger shape was over the smaller one, and not 
the other way around.
+uno::Reference xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
+uno::Reference xShape(xDraws->getByIndex(0), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(xShape, 
"ZOrder"));
+CPPUNIT_ASSERT_EQUAL(OUString("larger"), getProperty(xShape, 
"Description"));
+
+xShape.set(xDraws->getByIndex(1), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), getProperty(xShape, 
"ZOrder"));
+CPPUNIT_ASSERT_EQUAL(OUString("smaller"), getProperty(xShape, 
"Description"));
+
+// Color of the line was blue, and it had zero width.
+xShape.set(xDraws->getByIndex(2), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_uInt32(26), getProperty(xShape, 
"LineWidth"));
+CPPUNIT_ASSERT_EQUAL(sal_uInt32(0), getProperty(xShape, 
"LineColor"));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx 
b/writerfilter/source/dmapper/GraphicHelpers.cxx
index 4d190e5..4564f3a 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -251,7 +251,8 @@
 while( it != items.end())
 {
 // std::map is iterated sorted by key
-if( it->first > relativeHeight )
+// if there is an item that has the same z-order, we belong under it
+if( it->first >= relativeHeight )
 break; // this is the first one higher, we belong right before it
 else
 ++it;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index c35b0d9..401ebb7 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3186,6 +3186,9 @@
 case RTF_SHPBOTTOM:
 m_aStates.top().aShape.nBottom = TWIP_TO_MM100(nParam);
 break;
+case RTF_SHPZ:
+m_aStates.top().aShape.oZ.reset(nParam);
+break;
 case RTF_FFTYPE:
 

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - sc/CppunitTest_sc_macros_test.mk sc/qa

[Noel Power]

 sc/CppunitTest_sc_macros_test.mk|3 +
 sc/qa/extras/macros-test.cxx|   74 +++-
 sc/qa/unit/data/xls/AutoFilter.xls  |binary
 sc/qa/unit/data/xls/CalcFont.xls|binary
 sc/qa/unit/data/xls/MiscRangeTests.xls  |binary
 sc/qa/unit/data/xls/PageBreaks.xls  |binary
 sc/qa/unit/data/xls/Ranges-2.xls|binary
 sc/qa/unit/data/xls/Ranges-3.xls|binary
 sc/qa/unit/data/xls/Ranges.xls  |binary
 sc/qa/unit/data/xls/Shapes.xls  |binary
 sc/qa/unit/data/xls/TestCalc_Rangetest.xls  |binary
 sc/qa/unit/data/xls/TestCalc_Rangetest2.xls |binary
 sc/qa/unit/data/xls/TestIntersection.xls|binary
 sc/qa/unit/data/xls/TestUnion.xls   |binary
 sc/qa/unit/data/xls/Window.xls  |binary
 sc/qa/unit/data/xls/bytearraystring.xls |binary
 sc/qa/unit/data/xls/pagesetup.xls   |binary
 sc/qa/unit/data/xls/range-4.xls |binary
 sc/qa/unit/data/xls/window2.xls |binary
 19 files changed, 76 insertions(+), 1 deletion(-)

New commits:
commit 6aea437d06ce9cbde6a6ce4cca70af434e564735
Author: Noel Power 
Date:   Wed Mar 6 16:19:54 2013 +

enable bag load of excel specific VBA api tests

Note: some of the test documents have some tests disabled in order to run
without errors, these are identified by the following lines

Rem [#FIXME disabled 3.6 ] in the macro source.

note: some of these errors are expected and were always happening, some
errors e.g. those pastespecial specific ones in
qa/unit/data/xls/TestCalc_Rangetest2.xls
seem to be to do with problems with the test harness.

note: there are some others ( e.g. in Window.xls & windows2.xls ) that seem
to be related to hard sizes and screen resolution ( these should be adjusted
sensibly )

Change-Id: I0e798fc763ee988f8f032829a912239594a35583

diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index 7d1a8fb..ba794ca 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -107,6 +107,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_macros_test,\
 sot/util/sot \
 svl/source/fsstor/fsstorage \
 svtools/util/svt \
+svx/util/svx \
 toolkit/util/tk \
 ucb/source/core/ucb1 \
 ucb/source/ucp/file/ucpfile1 \
@@ -114,6 +115,8 @@ $(eval $(call gb_CppunitTest_use_components,sc_macros_test,\
 unotools/util/utl \
 unoxml/source/rdf/unordf \
 unoxml/source/service/unoxml \
+eventattacher/source/evtatt \
+i18npool/source/search/i18nsearch \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_macros_test))
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index c5aa5a2..61f6918 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -132,7 +132,77 @@ void ScMacrosTest::testVba()
 {
 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vba.")),
 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.Modul1.Modul1?language=Basic&location=document")),
-}
+},
+{
+rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MiscRangeTests.")),
+
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+},
+{
+rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bytearraystring.")),
+
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacro.test?language=Basic&location=document"))
+},
+{
+rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoFilter.")),
+
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+},
+{
+rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CalcFont.")),
+
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+},
+{
+rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestIntersection.")),
+
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+},
+{
+rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TestUnion.")),
+
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+},
+{
+rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("range-4.")),
+
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"))
+},
+{
+rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Ranges-3.")),
+
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.Star.script:VBAPro

[Libreoffice-commits] core.git: libmariadb/mariadb-thread.patch libmariadb/StaticLibrary_mariadb.mk libmariadb/UnpackedTarball_mariadb.mk

[Fridrich Štrba]

 libmariadb/StaticLibrary_mariadb.mk   |4 
 libmariadb/UnpackedTarball_mariadb.mk |6 ++
 libmariadb/mariadb-thread.patch   |   12 
 3 files changed, 18 insertions(+), 4 deletions(-)

New commits:
commit 0bacc397742c094c8f74ea7354cae4143afb2bb6
Author: Fridrich Å trba 
Date:   Wed Mar 6 17:20:37 2013 +0100

Without threads for the while

Change-Id: I15ad587b510ab006a6b92270f51ce8c352312694

diff --git a/libmariadb/StaticLibrary_mariadb.mk 
b/libmariadb/StaticLibrary_mariadb.mk
index 3a22433..2f70dcb 100644
--- a/libmariadb/StaticLibrary_mariadb.mk
+++ b/libmariadb/StaticLibrary_mariadb.mk
@@ -22,10 +22,6 @@ $(eval $(call gb_StaticLibrary_set_include,mariadblib,\
-I$(call gb_UnpackedTarball_get_dir,mariadb)/include \
 ))
 
-$(eval $(call gb_StaticLibrary_add_defs,mariadblib,\
-   -DTHREAD \
-))
-
 $(eval $(call gb_StaticLibrary_add_generated_cobjects,mariadblib,\
 UnpackedTarball/mariadb/libmysql/array \
 UnpackedTarball/mariadb/libmysql/bchange \
diff --git a/libmariadb/UnpackedTarball_mariadb.mk 
b/libmariadb/UnpackedTarball_mariadb.mk
index 2f5c8cb..499ce70 100644
--- a/libmariadb/UnpackedTarball_mariadb.mk
+++ b/libmariadb/UnpackedTarball_mariadb.mk
@@ -17,4 +17,10 @@ $(eval $(call 
gb_UnpackedTarball_add_file,mariadb,include/my_config.h,libmariadb
 
 $(eval $(call 
gb_UnpackedTarball_add_file,mariadb,include/mysql_version.h,libmariadb/mysql_version.h))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,mariadb,1))
+
+$(eval $(call gb_UnpackedTarball_add_patches,mariadb,\
+libmariadb/mariadb-thread.patch \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/libmariadb/mariadb-thread.patch b/libmariadb/mariadb-thread.patch
new file mode 100644
index 000..997929f
--- /dev/null
+++ b/libmariadb/mariadb-thread.patch
@@ -0,0 +1,12 @@
+--- mariadb/libmysql/client_plugin.c   2013-03-06 17:06:42.548905989 +0100
 mariadb/libmysql/client_plugin.c   2013-03-06 17:14:29.721588964 +0100
+@@ -175,7 +175,9 @@
+ goto err2;
+   }
+ 
++#ifdef THREAD
+   safe_mutex_assert_owner(&LOCK_load_client_plugin);
++#endif
+ 
+   p->next= plugin_list[plugin->type];
+   plugin_list[plugin->type]= p;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ABANDONED] WaE: return a value if the checks does not succeed in GetAnc...

[Joren De Cuyper (via Code Review)]

Joren De Cuyper has abandoned this change.

Change subject: WaE: return a value if the checks does not succeed in 
GetAnchorPosition
..


Patch Set 1: Abandoned

to risky to return a NULL because of a NULL < NULL check. Will fix it in 
another way soon

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: Id9a9f5ba2299f103804b8f66c7dc5d1e5429187b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper 

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

Re: Re: fdo#61135 New feature in Calc: Stepped Lines graphs - first part of code submitted

[Markus Mohrhard]

>> > Anyway, I will now create a mock for the UI and discuss this on the UI
>
>> > list. Once this is done, what would be the best way to add the new UI
>
>> > functionality ? A friendly push in the right direction would save me
>> > quite
>
>> > some time ;-)
>
>>
>
>> You should design the dialogs nowadays with Glade. We are switching
>
>> from our old dialog descriptions to new glade xml files. Caolan wrote
>
>> a nice wiki page about widgetllayout
>
>> (https://wiki.documentfoundation.org/Development/WidgetLayout). While
>
>> it focuses mostly on transfering old dialogs to the new format it
>
>> should give you a basic idea how to create a new one. If you need one
>
>> of the custom widgets that we have somewhere in the code or other
>
>> customization of an existing widget we can help you implement that.
>
>
>
> I'm with you on new Dialogs. I could convert the existing dialog
> (ChartTypeDialog?) to glade, but it seems a bit ambitious at the moment for
> my knowledge in LO. Maybe later after getting more experience with simpler
> dialogs. I saw Caolan's talk on FOSDEM and it seemed not too difficult for
> the simpler dialogs.
>

Well i think it belongs maybe in the Smooth lines dialog with a new
title for the dialog which seems reasonable easy to convert. I think
Caolan's tutorial will give you all the information you need for it.
If you sill have questions about it you can just ask and we will help
you with the task. An inital step would be to design the dialog in
glade and send it to the ML. Caolan or I can take care of the source
code part if necessary.

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

Re: compilation failure on centos 6

[Matúš Kukan]

On 6 March 2013 17:01, Neeraj Rai  wrote:
> One more question on build : when I see a line like following, how do I know
> the corresponding linux cmd issued (gcc -I file ... etc).
> [build DEP] LNK:Executable/oosplash
>
> If the answer is obvious, please point me to right tool/docs.
> I tried "make -d " and that doesn't help.

--enable-verbose should do it.
Or - one time only: make VERBOSE=TRUE

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

Fwd: LibreOffice text justification

[Kohei Yoshida]

Hi all,

With Chris' permission, I'm forwarding his question to the developer's list.

He would like some code pointers to Writer core where it handle
line-to-line inter-word spacing.  Anyway, I've included the full text
of his question below.

Thanks, guys.

Kohei

-- Forwarded message --
From: Chris Tapp 
Date: Tue, Mar 5, 2013 at 6:17 PM
Subject: LibreOffice text justification
To: kohei.yosh...@gmail.com


Dear Kohei-san,

I manage a wiki which is being used to produce the text for a book
that is due to be published shortly. We can currently produce an ODT
document that is about 95% print-ready, but there are a few
typesetting features missing from LibreOffice which mean we will have
to use something like InDesign to complete our work flow.

One of these features relates to the justification of text. Word
processors like Writer tend to produce lines with uneven line-to-line
inter-word spacing as they do not generally consider reducing the
spaces and/or micro-spacing the characters themselves. I thought it
would be worth looking at the code-base of LibreOffice to see if it
would be possible to add this functionality. This search lead me to
your blog page at
http://kohei.us/2010/01/21/distributed-text-justification/.

It seems as if the code you modified when adding the 'Distributed
Justification' mode would be very similar to what I think is needed.
Could you please point me to the files / classes that were involved?

Any pointers would be much appreciated! Thank you for your time.

Chris Tapp

opensou...@keylevel.com
www.keylevel.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] WaE: return a value if the checks does not succeed in GetAnc...

[Joren De Cuyper (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2568

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/68/2568/1

WaE: return a value if the checks does not succeed in GetAnchorPosition

Change-Id: Id9a9f5ba2299f103804b8f66c7dc5d1e5429187b
---
M sw/source/core/fields/postithelper.cxx
1 file changed, 1 insertion(+), 0 deletions(-)



diff --git a/sw/source/core/fields/postithelper.cxx 
b/sw/source/core/fields/postithelper.cxx
index b68fe12..0e80c28 100644
--- a/sw/source/core/fields/postithelper.cxx
+++ b/sw/source/core/fields/postithelper.cxx
@@ -175,6 +175,7 @@
 return aPos;
 }
 }
+return NULL;
 }
 
 bool SwAnnotationItem::UseElement()

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9a9f5ba2299f103804b8f66c7dc5d1e5429187b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper 

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

[Libreoffice-commits] core.git: libmariadb/Makefile

[Fridrich Štrba]

 libmariadb/Makefile |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit c532e236710f582b4b51427e850be4ad66ebe2da
Author: Fridrich Å trba 
Date:   Wed Mar 6 17:03:58 2013 +0100

oops, forgot Makefile

Change-Id: I9a798186ecd213868fc44a1b49ae7bc5c93cc7ed

diff --git a/libmariadb/Makefile b/libmariadb/Makefile
new file mode 100644
index 000..ccb1c85
--- /dev/null
+++ b/libmariadb/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: libmariadb/UnpackedTarball_mariadb.mk

[Fridrich Štrba]

 libmariadb/UnpackedTarball_mariadb.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit bb4d0e1135bd026b7a39433000664c3626c96cc0
Author: Fridrich Å trba 
Date:   Wed Mar 6 17:01:27 2013 +0100

Add a comment to prevent misperceptions

Change-Id: I0c7f2a53bf7a024f1190396accd164201e3a90cb

diff --git a/libmariadb/UnpackedTarball_mariadb.mk 
b/libmariadb/UnpackedTarball_mariadb.mk
index 75ed7c6..2f5c8cb 100644
--- a/libmariadb/UnpackedTarball_mariadb.mk
+++ b/libmariadb/UnpackedTarball_mariadb.mk
@@ -11,7 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,mariadb))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,mariadb,$(MARIADB_TARBALL)))
 
+# This was generated on a 64-bit linux, will have to conditionalize it if it 
is broken
+# for another configuration.
 $(eval $(call 
gb_UnpackedTarball_add_file,mariadb,include/my_config.h,libmariadb/my_config.h))
+
 $(eval $(call 
gb_UnpackedTarball_add_file,mariadb,include/mysql_version.h,libmariadb/mysql_version.h))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: compilation failure on centos 6

[Neeraj Rai]

Hi David,

thanks - gstreamer-plugins-base-devel -  fixed it

Riccardo,  I just tried  headless option as a work around.
I'm not waiting for it but glad to know it'll be fixed in later versions.

One more question on build : when I see a line like following, how do I
know the corresponding linux cmd issued (gcc -I file ... etc).
[build DEP] LNK:Executable/oosplash

If the answer is obvious, please point me to right tool/docs.
I tried "make -d " and that doesn't help.

thanks
Neeraj
On Wed, Mar 6, 2013 at 1:23 AM, David Tardon  wrote:

> Hi,
>
> On Tue, Mar 05, 2013 at 12:52:41PM -0500, Neeraj Rai wrote:
> > Hi Caolan,
> >
> > I get following error :
> >  checking for GSTREAMER_0_10... configure: error: Package
> requirements
> > (gstreamer-0.10 gstreamer-plugins-base-0.10 ) were not met:
> >  No package 'gstreamer-plugins-base-0.10' found
> >
> > I have gstreamer-plugins-base installed :
> > > rpm -qa |grep gstreamer-plugins-base
> > gstreamer-plugins-base-0.10.29-1.el6.x86_64
>
> You need gstreamer-plugins-base-devel.
>
> D.
>



-- 
=
Intuition - is the inability to figure out the facts on which we based the
decision.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: fdo#61135 New feature in Calc: Stepped Lines graphs - first part of code submitted

[Markus Mohrhard]

Hey Eric,

>
>>
>> I have added my first real code for submission to LO :-) It's in gerrit:
>> https://gerrit.libreoffice.org/2476.
>
> I'm going to review it in the next days.
>

so here is the inital review for your change. Your patch looks already
quite good but there are some small changes necessary before we can
merge it.

First we need to move the new values in CurveStyle.idl to the end and
remove all the GNM_* values. Moving the values to the end ensures that
the old values stay unchanged which causes as little trouble for
extension developers using the API as possible.

The import for files written by gnumeric should map the values to the
corresponding ODF values and during export we only want to export them
as ODF and never into the gnumeric namespace. This also means to
remove all the references to the GNM_* values in the other source
files. For that to correctly work we need to register the gnumeric
namespace and map the elements in the chart namespace and the elements
in the gnumeric namesapce to the same UNO attributes.
Your current export code is producing invalid xml files because you
were exporting the gnumeric values without registering the namespace.
However this problem should be gone once we no longer export elements
into the gnumeric namespace. Additionally we need to take care of the
ODF version during export and make sure we only export it into ODF1.2
extended. I think Thorsten was fine with exporting the elements into
the chart namespace but only for ODF 1.2 extended.

The code in AreaChart.cxx looks mostly good and I will have a final
look at it when all the other problems are fixed.

Additionally it would be nice if you would provide at least one of
your test documents from gnumeric and one of your test documents for
normal ODF as MPL/LGPL licensed test documents that we can add to our
test file repository. If you are interested it would also be nice if
you could add a test case for it to our new chart2 import test at
chart2/qa/extras/chart2import.cxx.

Please let me know if I should help you with any of the above tasks. I
can take care of them if neccesary.

Thanks a lot for your great work. It is highly appreciated and feel
free to ask for any help you need. For the UI part of the task it
might make sense to first convert the relevant dialog to the new UI
format and then add the new elements into it.

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

Re: [tdf-discuss] macro compatibility between LO and AOO?

[Stephan Bergmann]

On 03/06/2013 04:47 PM, Andre Fischer wrote:

On 06.03.2013 15:25, Stephan Bergmann wrote:

On 03/06/2013 09:00 AM, Andre Fischer wrote:

On 05.03.2013 18:29, Michael Meeks wrote:

On Tue, 2013-03-05 at 09:19 -0800, Fred Ollinger wrote:

I was wondering if libreoffice and aooo can't agree to
some basic level api for 3rd party developers?

It's an interesting discussion; but in the absence of any concrete
code, patches etc. it doesn't belong on the libreoffice developer list;


Talking about a concrete change is a good idea so please let me ask a
question similar to one I asked at FOSDEM but to which I got no clear
answer.  Probably because of my bad English that is even worse when I
speak it.

Stephan Bergman talked about "Well-typed UNO", something that would
involve incompatible changes to the UNO API.  I would like to know if
LibreOffice and Apache OpenOffice could work together on this. I am
just talking about changes on API level not the underlying
implementation.  That would be something that both projects would do
independently.


First off, depends on what you mean with "UNO API."  One customary
meaning is the set of UNOIDL entities (mainly) declared in udkapi/ and
offapi/ .idl files.  (LibreOffice tries to meticulously track any
incompatible changes it does there, see e.g., the "API Changes"
section at
.)

Another customary meaning is the broader concept of stable interface
the URE offers, including C ABI, file formats, wire protocols, etc. My
hope is that my work on changing the type representation does not
affect the former, only the latter (file formats etc.).  And,
obviously, it will need to take care of a backward-compatibility plan.


By "UNO API" I mean everything that affects a packaged extension, that
is basically your option B.  So if I understand you correctly that an
extension developer just has to recompile (for a C++ extension) the
source code, repackage the extension and is done (with respect to your
changes).  That sounds good.


It should basically boil down to:  If you include a types.rdb in your 
extension, you can translate it to the new format (or not, in which case 
your extension will work as long as we keep the backwards-compatibility 
code alive).  If you don't include something like that (and that's 
likely most extensions anyway, except for Calc Add-Ons), you don't need 
to do anything at all.



That said, I can only repeat now what I already said at FOSDEM, that
I'm going to well document all the changes to any
specifications---just like I did for any other changes to UNO I did
over the last ten years or so.  And, as always, any input is highly
welcome.


Great. Thanks.
Do you have a pointer to the relevant documentation?


Not yet.  As always, things progress more slowly than I'd hoped.  Stay 
tuned, though.  ;)


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

Re: Mirroring gtk buttons

[Khaled Hosny]

On Wed, Mar 06, 2013 at 12:05:23PM +, Michael Meeks wrote:
> 
> On Wed, 2013-03-06 at 11:38 +, Issa Alkurtass wrote:
> > Something like that yes, but this function is only concerned with text
> > direction and ordering of items, not "graphical orientation." We need
> > something that flips or mirrors the widgets.
> 
>   Well - I'd have a read around inside the gtk+ widget implementations
> themselves to see what they are using themselves to orient
> themselves :-) then we'll need to clobber that. widget_direction as you
> point out only sounds plausible ;-)

The default direction of GTK widgets is locale dependant; it is set by a
string in GTK's gettext catalogue, so if we can somehow trick GTK to use
the same locale as LibreOffice UI, that would be a solution.

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

[Libreoffice-commits] core.git: Branch 'feature/liblibo' - smoketest/Executable_libtest.mk smoketest/Module_smoketest.mk

[Michael Meeks]

 smoketest/Executable_libtest.mk |9 -
 smoketest/Module_smoketest.mk   |2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit d60f358b0c1047c569559568bd6d2fdd0f301c98
Author: Michael Meeks 
Date:   Wed Mar 6 15:50:15 2013 +

liblibo: install test library by itself and install it.

Change-Id: Iaaa60a6e3afcc16c5b97f14c1d36d16ce4788739

diff --git a/smoketest/Executable_libtest.mk b/smoketest/Executable_libtest.mk
index 75c534c..5dd6a5b 100644
--- a/smoketest/Executable_libtest.mk
+++ b/smoketest/Executable_libtest.mk
@@ -28,8 +28,15 @@ liblibreoffice_SOFFICE_INST := 
$(DEVINSTALLDIR)/opt/LibreOffice.app/Contents/Mac
 else
 liblibreoffice_SOFFICE_INST := $(DEVINSTALLDIR)/opt/program
 endif
+liblibreoffice_OWN_LD_PATH_DIR := $(liblibreoffice_SOFFICE_INST)/libolib
+liblibreoffice_OWN_LD_SO := $(liblibreoffice_OWN_LD_PATH_DIR)/$(call 
gb_Library_get_linktargetname,libreoffice)
 
-run_libtest:
+$(liblibreoffice_OWN_LD_SO) : $(call gb_Library_get_target,libreoffice)
+   mkdir -p $(liblibreoffice_OWN_LD_PATH_DIR)/Library
+   cp -a $(call gb_Library_get_target,libreoffice) 
$(liblibreoffice_OWN_LD_SO)
+
+run_libtest: $(liblibreoffice_OWN_LD_SO)
+   
$(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}":$(liblibreoffice_OWN_LD_PATH_DIR)/Library)"
 \
$(call gb_LinkTarget_get_target,Executable/libtest) \
$(liblibreoffice_SOFFICE_INST) $(OUTDIR)/bin/smoketestdoc.sxw \
 
diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk
index b82a037..31efcce 100644
--- a/smoketest/Module_smoketest.mk
+++ b/smoketest/Module_smoketest.mk
@@ -42,9 +42,11 @@ $(eval $(call gb_Module_add_targets,smoketest,\
 ))
 endif
 
+ifeq ($(OS),LINUX)
 $(eval $(call gb_Module_add_check_targets,smoketest,\
Executable_libtest \
 ))
+endif
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,smoketest,\
CppunitTest_smoketest \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [tdf-discuss] macro compatibility between LO and AOO?

[Andre Fischer]

On 06.03.2013 15:25, Stephan Bergmann wrote:

On 03/06/2013 09:00 AM, Andre Fischer wrote:

On 05.03.2013 18:29, Michael Meeks wrote:

On Tue, 2013-03-05 at 09:19 -0800, Fred Ollinger wrote:

I was wondering if libreoffice and aooo can't agree to
some basic level api for 3rd party developers?

It's an interesting discussion; but in the absence of any concrete
code, patches etc. it doesn't belong on the libreoffice developer list;


Talking about a concrete change is a good idea so please let me ask a
question similar to one I asked at FOSDEM but to which I got no clear
answer.  Probably because of my bad English that is even worse when I
speak it.

Stephan Bergman talked about "Well-typed UNO", something that would
involve incompatible changes to the UNO API.  I would like to know if
LibreOffice and Apache OpenOffice could work together on this. I am
just talking about changes on API level not the underlying
implementation.  That would be something that both projects would do
independently.


First off, depends on what you mean with "UNO API."  One customary 
meaning is the set of UNOIDL entities (mainly) declared in udkapi/ and 
offapi/ .idl files.  (LibreOffice tries to meticulously track any 
incompatible changes it does there, see e.g., the "API Changes" 
section at 
.)


Another customary meaning is the broader concept of stable interface 
the URE offers, including C ABI, file formats, wire protocols, etc.  
My hope is that my work on changing the type representation does not 
affect the former, only the latter (file formats etc.).  And, 
obviously, it will need to take care of a backward-compatibility plan.


By "UNO API" I mean everything that affects a packaged extension, that 
is basically your option B.  So if I understand you correctly that an 
extension developer just has to recompile (for a C++ extension) the 
source code, repackage the extension and is done (with respect to your 
changes).  That sounds good.




That said, I can only repeat now what I already said at FOSDEM, that 
I'm going to well document all the changes to any 
specifications---just like I did for any other changes to UNO I did 
over the last ten years or so.  And, as always, any input is highly 
welcome.


Great. Thanks.
Do you have a pointer to the relevant documentation?

-Andre



Stephan


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

Re: [PUSHED] It is safer to uncomment these checks in the postithelper

[Stephan Bergmann]

On 03/06/2013 04:23 PM, Bosdonnat Cedric (via Code Review) wrote:

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

If you are interested in details, please visit

 https://gerrit.libreoffice.org/2567

Approvals:
   Bosdonnat Cedric: Verified; Looks good to me, approved


But that leaves SwPosition SwAnnotationItem::GetAnchorPosition() with 
code paths that do not return a value (and it's not obvious to me how to 
fix that).


Joren, Cedric, can you please fix or revert?

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

Re: Mirroring gtk buttons

[Khaled Hosny]

On Wed, Mar 06, 2013 at 11:38:14AM +, Issa Alkurtass wrote:
> Michael Meeks wrote on March 06, 2013 2:13 PM:
> >Urk - so - then I guess it is a matter of persuading each of our
> >captive gtk2 widgets to have the right RTL setting via:
> >
> >   void gtk_widget_set_direction (GtkWidget*widget,
> >  GtkTextDirection  dir);
> >
> >or perhaps I'm missing something ?
> 
> Something like that yes, but this function is only concerned with text
> direction and ordering of items, not "graphical orientation." We need
> something that flips or mirrors the widgets.

AFAIK, gtk_widget_set_direction () controls the layout of UI elements as
well.

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

[Libreoffice-commits] core.git: config_host.mk.in configure.ac download.lst libmariadb/ExternalPackage_libmariadb.mk libmariadb/Module_libmariadb.mk libmariadb/my_config.h libmariadb/mysql_version.h l

[Fridrich Štrba]

 Makefile.fetch   |1 
 RepositoryExternal.mk|   38 +++-
 RepositoryModule_host.mk |1 
 config_host.mk.in|7 
 configure.ac |   62 +-
 download.lst |1 
 libmariadb/ExternalPackage_libmariadb.mk |   51 +
 libmariadb/Module_libmariadb.mk  |   22 ++
 libmariadb/StaticLibrary_mariadb.mk  |  117 +
 libmariadb/UnpackedTarball_mariadb.mk|   17 +
 libmariadb/my_config.h   |  277 +++
 libmariadb/mysql_version.h   |   24 ++
 libmariadb/prj/build.lst |2 
 mysqlc/Library_mysqlc.mk |2 
 mysqlcppconn/Library_mysqlcppconn.mk |6 
 15 files changed, 574 insertions(+), 54 deletions(-)

New commits:
commit cad422afb7a4dcd7592c502641b41a832703e536
Author: Fridrich Å trba 
Date:   Wed Mar 6 16:33:07 2013 +0100

Adding libmariadb module for internal mariadb (work in progress)

Change-Id: If2cf9ff21120e29a149903e8eab849d97fa0c2c9

diff --git a/Makefile.fetch b/Makefile.fetch
index e7d406d..edcad4a 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -94,6 +94,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,CURL,$(CURL_TARBALL)) \
$(call fetch_Optional,EPM,$(EPM_TARBALL)) \
$(call fetch_Optional,EXPAT,$(EXPAT_TARBALL)) \
+   $(call fetch_Optional,MARIADB,$(MARIADB_TARBALL)) \
$(call fetch_Optional,MORE_FONTS,$(FONT_DEJAVU_TARBALL)) \
$(call fetch_Optional,MORE_FONTS,$(FONT_GENTIUM_TARBALL)) \
$(call 
fetch_Optional,MORE_FONTS,$(FONT_LIBERATION_NARROW_TARBALL)) \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 869e179..2e36e94 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -38,6 +38,39 @@
 
 # External headers
 
+ifeq ($(SYSTEM_MARIADB),YES)
+
+define gb_LinkTarget__use_mariadb
+$(call gb_LinkTarget_set_include,$(1),\
+   $$(INCLUDE) \
+$(MARIADB_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(MARIADB_LIBS))
+
+endef
+gb_ExternalProject__use_mariadb :=
+
+else # !SYSTEM_MARIADB
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+   mariadblib \
+))
+
+define gb_LinkTarget__use_mariadb
+$(call gb_LinkTarget_use_static_libraries,$(1),\
+   mariadblib \
+)
+
+endef
+define gb_ExternalProject__use_mariadb
+$(call gb_ExternalProject_use_package,$(1),libmariadb_inc)
+$(call gb_ExternalProject_use_static_libraries,$(1),mariadblib)
+
+endef
+
+endif # SYSTEM_MARIADB
+
+
 ifeq ($(SYSTEM_MESA_HEADERS),YES)
 
 gb_LinkTarget__use_mesa_headers :=
@@ -192,11 +225,11 @@ $(call gb_LinkTarget_add_defs,$(1),\
 )
 
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(MARIADB_LIB) \
+   $(MARIADB_LIBS) \
 )
 
 $(call gb_LinkTarget_set_include,$(1),\
-   $(MARIADB_INC) \
+   $(MARIADB_CFLAGS) \
$$(INCLUDE) \
 )
 endef
@@ -206,7 +239,6 @@ else
 define gb_LinkTarget__use_mysql
 
 $(call gb_LinkTarget_set_include,$(1),\
-   -I$(LIBMARIADB_PATH)/mariadbclient/include \
$$(INCLUDE) \
 )
 
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 8050e46..40773ba 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -127,6 +127,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
lotuswordpro \
$(call gb_Helper_optional,LPSOLVE,lpsolve) \
$(call gb_Helper_optional,DESKTOP,l10ntools) \
+   $(call gb_Helper_optional,MARIADB,libmariadb) \
MathMLDTD \
$(call gb_Helper_optional,MDDS,mdds) \
Mesa \
diff --git a/config_host.mk.in b/config_host.mk.in
index cd0fc37..cf54479 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -296,8 +296,6 @@ export LIBLANGTAG_CFLAGS=$(gb_SPACE)@LIBLANGTAG_CFLAGS@
 export LIBLANGTAG_LIBS=$(gb_SPACE)@LIBLANGTAG_LIBS@
 export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@
 export LIBLOADER_JAR=@LIBLOADER_JAR@
-export LIBMARIADB=@LIBMARIADB@
-export LIBMARIADB_PATH=@LIBMARIADB_PATH@
 export LIBMGR_X64_BINARY=@LIBMGR_X64_BINARY@
 export LIBO_THIS_YEAR=@LIBO_THIS_YEAR@
 export LIBO_VERSION_MAJOR=@LIBO_VERSION_MAJOR@
@@ -328,9 +326,8 @@ export MANDIR=@MANDIR@
 export MARIADBC_MAJOR=@MARIADBC_MAJOR@
 export MARIADBC_MICRO=@MARIADBC_MICRO@
 export MARIADBC_MINOR=@MARIADBC_MINOR@
-export MARIADB_DEFINES=@MARIADB_DEFINES@
-export MARIADB_INC=@MARIADB_INC@
-export MARIADB_LIB=@MARIADB_LIB@
+export MARIADB_CFLAGS=$(gb_SPACE)@MARIADB_CFLAGS@
+export MARIADB_LIBS=$(gb_SPACE)@MARIADB_LIBS@
 export MD5SUM=@MD5SUM@
 export MDDS_CPPFLAGS=$(gb_SPACE)@MDDS_CPPFLAGS@
 export MERGELIBS=@MERGELIBS@
diff --git a/configure.ac b/configure.ac
index 9533c3d..26ec6cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1300,21 +1300,11 @@ AC_ARG_WITH(system-apache-commons,
 
 AC_ARG_WITH(system-mariadb,
 AS_HELP_STRING([--with

[Libreoffice-commits] core.git: 4 commits - sw/qa writerfilter/source

[Miklos Vajna]

 sw/qa/extras/rtfimport/data/fdo60722.rtf   |   13 
 sw/qa/extras/rtfimport/rtfimport.cxx   |   21 +++
 writerfilter/source/dmapper/GraphicHelpers.cxx |3 +-
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |3 ++
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |2 +
 writerfilter/source/rtftok/rtfsdrimport.cxx|   27 ++---
 6 files changed, 57 insertions(+), 12 deletions(-)

New commits:
commit ea66024d4da38a619f44c941b65e6a28b74214b9
Author: Miklos Vajna 
Date:   Wed Mar 6 16:23:22 2013 +0100

fdo#60722 testcase

Change-Id: Ib6097c844b2bc929c6ece31bcec62f27bfbf386c

diff --git a/sw/qa/extras/rtfimport/data/fdo60722.rtf 
b/sw/qa/extras/rtfimport/data/fdo60722.rtf
new file mode 100644
index 000..498df01
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo60722.rtf
@@ -0,0 +1,13 @@
+{\rtf1\ansi\deff0
+{\fonttbl
+{\f0\fnil\fcharset204\fprq0\cpg1251 Arial;}
+{\f1\fnil\fcharset204\fprq0\cpg1251 Times New Roman;}
+{\f2\fnil\fcharset204\fprq0\cpg1251 Courier New;}
+}
+{\*\viewkind1}{\*\viewscale100}\margl0\margr0\margt0\margb0
+\paperw11905\paperh16837
+{\shp{\*\shpinst\shpleft10480\shptop840\shpright11320\shpbottom840\shpfhdr0\shpbxpage\shpbypage\shpwr3\shpwrk0\shpfblwtxt1\shpz0{\sp{\sn
 shapeType}{\sv 20
+{\shp{\*\shpinst\shpleft8900\shptop11940\shpright10360\shpbottom12320\shpfhdr0\shpbxpage\shpbypage\shpwr3\shpwrk0\shpfblwtxt1\shpz0{\sp{\sn
 shapeType}{\sv 1}}{\sp{\sn fFilled}{\sv 0}}{\sp{\sn wzDescription}{\sv 
smaller
+{\shp{\*\shpinst\shpleft7920\shptop11040\shpright11320\shpbottom13440\shpfhdr0\shpbxpage\shpbypage\shpwr3\shpwrk0\shpfblwtxt1\shpz0{\sp{\sn
 shapeType}{\sv 1}}{\sp{\sn fFilled}{\sv 0}}{\sp{\sn wzDescription}{\sv 
larger
+{\par\plain\par
+}}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index e577f42..819625f 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -144,6 +144,7 @@ public:
 void testFdo58076_2();
 void testFdo59953();
 void testFdo59638();
+void testFdo60722();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -260,6 +261,7 @@ void Test::run()
 {"fdo58076-2.rtf", &Test::testFdo58076_2},
 {"fdo59953.rtf", &Test::testFdo59953},
 {"fdo59638.rtf", &Test::testFdo59638},
+{"fdo60722.rtf", &Test::testFdo60722},
 };
 header();
 for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1145,6 +1147,25 @@ void Test::testFdo59638()
 CPPUNIT_FAIL("no BulletChar property");
 }
 
+void Test::testFdo60722()
+{
+// The problem was that the larger shape was over the smaller one, and not 
the other way around.
+uno::Reference xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
+uno::Reference xShape(xDraws->getByIndex(0), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(xShape, 
"ZOrder"));
+CPPUNIT_ASSERT_EQUAL(OUString("larger"), getProperty(xShape, 
"Description"));
+
+xShape.set(xDraws->getByIndex(1), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), getProperty(xShape, 
"ZOrder"));
+CPPUNIT_ASSERT_EQUAL(OUString("smaller"), getProperty(xShape, 
"Description"));
+
+// Color of the line was blue, and it had zero width.
+xShape.set(xDraws->getByIndex(2), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_uInt32(26), getProperty(xShape, 
"LineWidth"));
+CPPUNIT_ASSERT_EQUAL(sal_uInt32(0), getProperty(xShape, 
"LineColor"));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
commit 1eaab77c718ffa254068ae6032862dfb5a03db67
Author: Miklos Vajna 
Date:   Wed Mar 6 15:57:22 2013 +0100

fdo#60722 import RTF_SHPZ

Change-Id: I6c572d44d93f812d50376ec05ae94bdabadb3f1e

diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx 
b/writerfilter/source/dmapper/GraphicHelpers.cxx
index 4d190e5..4564f3a 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -251,7 +251,8 @@ sal_Int32 GraphicZOrderHelper::findZOrder( sal_Int32 
relativeHeight )
 while( it != items.end())
 {
 // std::map is iterated sorted by key
-if( it->first > relativeHeight )
+// if there is an item that has the same z-order, we belong under it
+if( it->first >= relativeHeight )
 break; // this is the first one higher, we belong right before it
 else
 ++it;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 0e05b75..eda06d3 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3187,6 +3187,9 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 case RTF_SHPBOTTOM:
 m_aStates.top().aShape.nBottom = TWIP

[PUSHED] It is safer to uncomment these checks in the postithelper

[Bosdonnat Cedric (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/2567

Approvals:
  Bosdonnat Cedric: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I84d96224dbe51ff25fcb6d96e0be9a8dff89b0a1
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper 
Gerrit-Reviewer: Bosdonnat Cedric 

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

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

[Joren De Cuyper]

 sw/source/core/fields/postithelper.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit e4f492ac0134895ac60e92c54a80b8c7f49615a1
Author: Joren De Cuyper 
Date:   Wed Mar 6 14:49:21 2013 +0100

It is safer to uncomment these checks in the postithelper

Change-Id: I84d96224dbe51ff25fcb6d96e0be9a8dff89b0a1
Reviewed-on: https://gerrit.libreoffice.org/2567
Reviewed-by: Bosdonnat Cedric 
Tested-by: Bosdonnat Cedric 

diff --git a/sw/source/core/fields/postithelper.cxx 
b/sw/source/core/fields/postithelper.cxx
index 5706319..b68fe12 100644
--- a/sw/source/core/fields/postithelper.cxx
+++ b/sw/source/core/fields/postithelper.cxx
@@ -165,16 +165,16 @@ unsigned long SwPostItHelper::getPageInfo( SwRect& 
rPageFrm, const SwRootFrm* pR
 SwPosition SwAnnotationItem::GetAnchorPosition() const
 {
 SwTxtFld* pFld = pFmtFld->GetTxtFld();
-//if( pFld )
-//{
+if( pFld )
+{
 SwTxtNode* pTNd = pFld->GetpTxtNode();
-//  if( pTNd )
-//  {
+if( pTNd )
+{
 SwPosition aPos( *pTNd );
 aPos.nContent.Assign( pTNd, *pFld->GetStart() );
 return aPos;
-//  }
-//}
+}
+}
 }
 
 bool SwAnnotationItem::UseElement()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 solenv/gbuild/ExtensionTarget.mk |8 
 1 file changed, 8 deletions(-)

New commits:
commit 050463ca89c93f033e7e3125e06f71514ab5e5cb
Author: Stephan Bergmann 
Date:   Wed Mar 6 16:22:21 2013 +0100

Dead code

Change-Id: I74f40a03dbfb7f40da1132bdac080f3359110cc0

diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index c003217..e839f47 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -158,14 +158,6 @@ $(call gb_ExtensionTarget_get_target,$(1)) : 
$(gb_ExtensionTarget_LICENSEFILE_DE
 
 endef
 
-define gb_ExtensionTarget_add_license
-$(call gb_ExtensionTarget_get_target,$(1)) : FILES += registration
-$(call gb_ExtensionTarget_get_target,$(1)) : LICENSE := $(2)
-$(call gb_ExtensionTarget_get_target,$(1)) : $(2)
-$(2) :| $(call gb_ExtensionTarget__get_preparation_target,$(1))
-
-endef
-
 # Use the default description file
 define gb_ExtensionTarget_use_default_description
 $(call 
gb_ExtensionTarget_add_file,$(1),description-en-US.txt,$(SRCDIR)/$(2)/description-en-US.txt)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 solenv/gbuild/Extension.mk |4 
 1 file changed, 4 deletions(-)

New commits:
commit 6a2e8693b239b6d69523a34103b270613794ef8c
Author: Stephan Bergmann 
Date:   Wed Mar 6 16:17:55 2013 +0100

Dead code

Change-Id: Ie54e11da130d563e52a87b924b556966d055b73f

diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 888d8c8..8d0e377 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -42,10 +42,6 @@ $(call gb_Helper_make_userfriendly_targets,$(1),Extension)
 
 endef
 
-define gb_Extension_set_license
-$(call gb_ExtensionTarget_set_license,$(1),$(2))
-endef
-
 define gb_Extension_add_file
 $(call gb_ExtensionTarget_add_file,$(1),$(2),$(3))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Converted Insert -> Names -> insert widget.

[via Code Review]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/2131


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I903d329cffd77daa9987cfc6079d9cfd10d98fc5
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Abdulelah Alarifi 
Gerrit-Reviewer: Caolán McNamara 

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - bin/lo-commit-stat

[Petr Mladek]

 bin/lo-commit-stat |  165 +
 1 file changed, 91 insertions(+), 74 deletions(-)

New commits:
commit d9eadf9c6ee92ee1e43fb453a3a1bffc0364d76f
Author: Petr Mladek 
Date:   Wed Mar 6 15:15:01 2013 +0100

lo-commit-stat: new --bugs-changelog option

Add --bugs-changelog option to print the list of bugs in the style
of SUSE changelog

Optimized the code to check bugzilla only once when you generate
more logs.

Change-Id: I56eeda92628422f1b649c0fd71ae9146aeaa85c9

diff --git a/bin/lo-commit-stat b/bin/lo-commit-stat
index 17ad9ff..a965815 100755
--- a/bin/lo-commit-stat
+++ b/bin/lo-commit-stat
@@ -253,6 +253,32 @@ sub get_branch_name($)
 return $branch;
 }
 
+sub get_bug_list($$$)
+{
+my ($pdata, $pbugs, $check_bugzilla) = @_;
+
+# associate bugs with their summaries and fixers
+foreach my $module ( keys %{$pdata}) {
+foreach my $id ( keys %{$pdata->{$module}}) {
+foreach my $bug (keys %{$pdata->{$module}{$id}{'bugs'}}) {
+%{$pbugs->{$bug}} = () if (! defined %{$pbugs->{$bug}});
+my $author = $pdata->{$module}{$id}{'author'}{'name'};
+my $summary = $pdata->{$module}{$id}{'summary'};
+$pbugs->{$bug}{'summary'} = $summary;
+$pbugs->{$bug}{'author'}{$author} = 1;
+}
+}
+}
+
+# try to replace summaries with bug names from bugzilla
+if ($check_bugzilla) {
+print "Getting bug titles:\n";
+foreach my $bug ( sort { $a cmp $b } keys %{$pbugs}) {
+$pbugs->{$bug}{'summary'} = get_bug_name($bug, 
$pbugs->{$bug}{'summary'});
+}
+}
+}
+
 sub open_log_file($$)
 {
 my ($log_dir, $log_prefix, $log_suffix, $top_dir, $branch_name, $wiki) = 
@_;
@@ -373,36 +399,16 @@ sub get_bug_name($$)
 return $summary;
 }
 
-sub print_bugs($$$)
+sub print_bugs()
 {
-my ($pdata, $log, $wiki) = @_;
-
-# associate bugs with their summaries and fixers
-my %bugs = ();
-foreach my $module ( keys %{$pdata}) {
-foreach my $id ( keys %{$pdata->{$module}}) {
-foreach my $bug (keys %{$pdata->{$module}{$id}{'bugs'}}) {
-my $author = $pdata->{$module}{$id}{'author'}{'name'};
-my $summary = $pdata->{$module}{$id}{'summary'};
-$bugs{$bug}{'summary'} = $summary;
-$bugs{$bug}{'author'}{$author} = 1;
-}
-}
-}
+my ($pbugs, $log, $wiki) = @_;
 
-# try to replace summaries with bug names from bugzilla
-print "Getting bug titles:\n";
-foreach my $bug ( sort { $a cmp $b } keys %bugs) {
-$bugs{$bug}{'summary'} = get_bug_name($bug, $bugs{$bug}{'summary'});
-}
-
-# print
-foreach my $bug ( sort { $a cmp $b } keys %bugs) {
-my $summary = $bugs{$bug}{'summary'};
+foreach my $bug ( sort { $a cmp $b } keys %{$pbugs}) {
+my $summary = $pbugs->{$bug}{'summary'};
 
 my $authors = "";
-if ( %{$bugs{$bug}{'author'}} ) {
-$authors = " [" . join (", ", keys %{$bugs{$bug}{'author'}}) . "]";
+if ( %{$pbugs->{$bug}{'author'}} ) {
+$authors = " [" . join (", ", keys %{$pbugs->{$bug}{'author'}}) . 
"]";
 }
 
 $bug =~ s/(.*)\#(.*)/* {{$1|$2}}/ if ($wiki);
@@ -410,29 +416,35 @@ sub print_bugs($$$)
 }
 }
 
-sub print_bugnumbers($$$)
+sub print_bugs_changelog()
 {
-my ($pdata, $log, $wiki) = @_;
+my ($pbugs, $log, $wiki) = @_;
 
-# just collect bugs
-my %bugs = ();
-foreach my $module ( keys %{$pdata}) {
-foreach my $id ( keys %{$pdata->{$module}}) {
-foreach my $bug (keys %{$pdata->{$module}{$id}{'bugs'}}) {
-$bugs{$bug} = 1;
-}
+foreach my $bug ( sort { $a cmp $b } keys %{$pbugs}) {
+my $summary = $pbugs->{$bug}{'summary'};
+
+my $authors = "";
+if ( %{$pbugs->{$bug}{'author'}} ) {
+$authors = " [" . join (", ", keys %{$pbugs->{$bug}{'author'}}) . 
"]";
 }
+
+print $log "+ $summary ($bug)$authors\n";
 }
+}
+
+sub print_bugnumbers()
+{
+my ($pbugs, $log, $wiki) = @_;
 
-print $log join ("\n", sort { $a cmp $b } keys %bugs), "\n";
+print $log join ("\n", sort { $a cmp $b } keys %{$pbugs}), "\n";
 }
 
 sub generate_log()
 {
-my ($pdata, $print_func, $log_dir, $log_prefix, $log_suffix, $top_dir, 
$branch_name, $wiki) = @_;
+my ($pused_data, $print_func, $log_dir, $log_prefix, $log_suffix, 
$top_dir, $branch_name, $wiki) = @_;
 
 my $log = open_log_file($log_dir, $log_prefix, $log_suffix, $top_dir, 
$branch_name, $wiki);
-& {$print_func} ($pdata, $log, $wiki);
+& {$print_func} ($pused_data, $log, $wiki);
 close $log;
 }
 
@@ -446,30 +458,31 @@ sub usage()
   "Usage: lo-commit-stat [--help] [--no-submodules] 
[--module=] --log-dir= --log-suffix= topdir 
[git_arg...]\n\n" .
 

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

[Caolán McNamara]

 sc/source/ui/namedlg/namedefdlg.cxx |1 
 sc/uiconfig/scalc/ui/insertname.ui  |  184 
 2 files changed, 185 insertions(+)

New commits:
commit ba0ad768769b0d37172d9ca18cf0b6614eb2e9e6
Author: Caolán McNamara 
Date:   Wed Mar 6 15:05:21 2013 +

need sc.hrc

Change-Id: I1c5fa09da04e8c21cfe418b814c61b63a90a4db3

diff --git a/sc/source/ui/namedlg/namedefdlg.cxx 
b/sc/source/ui/namedlg/namedefdlg.cxx
index 749bf24..bb61ecc 100644
--- a/sc/source/ui/namedlg/namedefdlg.cxx
+++ b/sc/source/ui/namedlg/namedefdlg.cxx
@@ -39,6 +39,7 @@
 #include "undorangename.hxx"
 #include "tabvwsh.hxx"
 #include "tokenarray.hxx"
+#include "sc.hrc"
 
 // defines ---
 
commit 6691b0c9d46a26e70f0acdd2a59263bfdc138171
Author: Abdulelah Alarifi 
Date:   Wed Feb 13 09:57:51 2013 +0300

Converted Insert -> Names -> insert widget.

Change-Id: I903d329cffd77daa9987cfc6079d9cfd10d98fc5

diff --git a/sc/uiconfig/scalc/ui/insertname.ui 
b/sc/uiconfig/scalc/ui/insertname.ui
new file mode 100644
index 000..5986ec7
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/insertname.ui
@@ -0,0 +1,184 @@
+
+
+  
+  
+  
+False
+
+  
+True
+False
+vertical
+6
+
+  
+True
+False
+vertical
+
+  
+True
+False
+100
+
+  
+True
+False
+0
+Name
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+False
+0
+Range
+  
+  
+False
+True
+1
+  
+
+
+  
+True
+False
+Scope
+  
+  
+False
+True
+2
+  
+
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+True
+in
+
+  
+
+  
+  
+False
+True
+1
+  
+
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+False
+
+  
+_Paste All
+True
+True
+True
+True
+  
+  
+False
+True
+0
+  
+
+
+  
+gtk-paste
+True
+True
+True
+True
+  
+  
+False
+True
+end
+1
+  
+
+  
+  
+False
+True
+1
+  
+
+
+  
+True
+False
+  
+  
+False
+True
+2
+  
+
+
+  
+True
+False
+
+  
+gtk-help
+True
+True
+True
+True
+  
+  
+False
+True
+0
+  
+
+
+  
+gtk-close
+True
+True
+True
+True
+  
+  
+False
+True
+end
+1
+  
+
+  
+  
+False
+True
+3
+  
+
+  
+
+  
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/lo-commit-stat

[Petr Mladek]

 bin/lo-commit-stat |  165 +
 1 file changed, 91 insertions(+), 74 deletions(-)

New commits:
commit 7cc7e402788b5df140976ae6c0ce7e92971a3d9d
Author: Petr Mladek 
Date:   Wed Mar 6 15:15:01 2013 +0100

lo-commit-stat: new --bugs-changelog option

Add --bugs-changelog option to print the list of bugs in the style
of SUSE changelog

Optimized the code to check bugzilla only once when you generate
more logs.

Change-Id: I56eeda92628422f1b649c0fd71ae9146aeaa85c9

diff --git a/bin/lo-commit-stat b/bin/lo-commit-stat
index 17ad9ff..a965815 100755
--- a/bin/lo-commit-stat
+++ b/bin/lo-commit-stat
@@ -253,6 +253,32 @@ sub get_branch_name($)
 return $branch;
 }
 
+sub get_bug_list($$$)
+{
+my ($pdata, $pbugs, $check_bugzilla) = @_;
+
+# associate bugs with their summaries and fixers
+foreach my $module ( keys %{$pdata}) {
+foreach my $id ( keys %{$pdata->{$module}}) {
+foreach my $bug (keys %{$pdata->{$module}{$id}{'bugs'}}) {
+%{$pbugs->{$bug}} = () if (! defined %{$pbugs->{$bug}});
+my $author = $pdata->{$module}{$id}{'author'}{'name'};
+my $summary = $pdata->{$module}{$id}{'summary'};
+$pbugs->{$bug}{'summary'} = $summary;
+$pbugs->{$bug}{'author'}{$author} = 1;
+}
+}
+}
+
+# try to replace summaries with bug names from bugzilla
+if ($check_bugzilla) {
+print "Getting bug titles:\n";
+foreach my $bug ( sort { $a cmp $b } keys %{$pbugs}) {
+$pbugs->{$bug}{'summary'} = get_bug_name($bug, 
$pbugs->{$bug}{'summary'});
+}
+}
+}
+
 sub open_log_file($$)
 {
 my ($log_dir, $log_prefix, $log_suffix, $top_dir, $branch_name, $wiki) = 
@_;
@@ -373,36 +399,16 @@ sub get_bug_name($$)
 return $summary;
 }
 
-sub print_bugs($$$)
+sub print_bugs()
 {
-my ($pdata, $log, $wiki) = @_;
-
-# associate bugs with their summaries and fixers
-my %bugs = ();
-foreach my $module ( keys %{$pdata}) {
-foreach my $id ( keys %{$pdata->{$module}}) {
-foreach my $bug (keys %{$pdata->{$module}{$id}{'bugs'}}) {
-my $author = $pdata->{$module}{$id}{'author'}{'name'};
-my $summary = $pdata->{$module}{$id}{'summary'};
-$bugs{$bug}{'summary'} = $summary;
-$bugs{$bug}{'author'}{$author} = 1;
-}
-}
-}
+my ($pbugs, $log, $wiki) = @_;
 
-# try to replace summaries with bug names from bugzilla
-print "Getting bug titles:\n";
-foreach my $bug ( sort { $a cmp $b } keys %bugs) {
-$bugs{$bug}{'summary'} = get_bug_name($bug, $bugs{$bug}{'summary'});
-}
-
-# print
-foreach my $bug ( sort { $a cmp $b } keys %bugs) {
-my $summary = $bugs{$bug}{'summary'};
+foreach my $bug ( sort { $a cmp $b } keys %{$pbugs}) {
+my $summary = $pbugs->{$bug}{'summary'};
 
 my $authors = "";
-if ( %{$bugs{$bug}{'author'}} ) {
-$authors = " [" . join (", ", keys %{$bugs{$bug}{'author'}}) . "]";
+if ( %{$pbugs->{$bug}{'author'}} ) {
+$authors = " [" . join (", ", keys %{$pbugs->{$bug}{'author'}}) . 
"]";
 }
 
 $bug =~ s/(.*)\#(.*)/* {{$1|$2}}/ if ($wiki);
@@ -410,29 +416,35 @@ sub print_bugs($$$)
 }
 }
 
-sub print_bugnumbers($$$)
+sub print_bugs_changelog()
 {
-my ($pdata, $log, $wiki) = @_;
+my ($pbugs, $log, $wiki) = @_;
 
-# just collect bugs
-my %bugs = ();
-foreach my $module ( keys %{$pdata}) {
-foreach my $id ( keys %{$pdata->{$module}}) {
-foreach my $bug (keys %{$pdata->{$module}{$id}{'bugs'}}) {
-$bugs{$bug} = 1;
-}
+foreach my $bug ( sort { $a cmp $b } keys %{$pbugs}) {
+my $summary = $pbugs->{$bug}{'summary'};
+
+my $authors = "";
+if ( %{$pbugs->{$bug}{'author'}} ) {
+$authors = " [" . join (", ", keys %{$pbugs->{$bug}{'author'}}) . 
"]";
 }
+
+print $log "+ $summary ($bug)$authors\n";
 }
+}
+
+sub print_bugnumbers()
+{
+my ($pbugs, $log, $wiki) = @_;
 
-print $log join ("\n", sort { $a cmp $b } keys %bugs), "\n";
+print $log join ("\n", sort { $a cmp $b } keys %{$pbugs}), "\n";
 }
 
 sub generate_log()
 {
-my ($pdata, $print_func, $log_dir, $log_prefix, $log_suffix, $top_dir, 
$branch_name, $wiki) = @_;
+my ($pused_data, $print_func, $log_dir, $log_prefix, $log_suffix, 
$top_dir, $branch_name, $wiki) = @_;
 
 my $log = open_log_file($log_dir, $log_prefix, $log_suffix, $top_dir, 
$branch_name, $wiki);
-& {$print_func} ($pdata, $log, $wiki);
+& {$print_func} ($pused_data, $log, $wiki);
 close $log;
 }
 
@@ -446,30 +458,31 @@ sub usage()
   "Usage: lo-commit-stat [--help] [--no-submodules] 
[--module=] --log-dir= --log-suffix= topdir 
[git_arg...]\n\n" .
 

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

[Caolán McNamara]

 helpers/help_hid.lst   |7 ---
 source/text/scalc/01/04070100.xhp  |   30 +++---
 source/text/shared/00/0208.xhp |8 
 3 files changed, 19 insertions(+), 26 deletions(-)

New commits:
commit 44a39c4833aef3499030d046f153bb1d27e84027
Author: Caolán McNamara 
Date:   Wed Mar 6 14:46:35 2013 +

update help ids for define name widget .ui conversion

Change-Id: I42a378b7e8ea6074939967efd634c3c9af9cbbc4

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 5311cf2..debf715 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -6510,10 +6510,6 @@ sc_CheckBox_RID_SCDLG_INSCONT_BTN_SKIP_EMPTY,1493435425,
 sc_CheckBox_RID_SCDLG_INSCONT_BTN_TRANSPOSE,1493435426,
 sc_CheckBox_RID_SCDLG_LINKAREA_BTN_RELOAD,1495368714,
 sc_CheckBox_RID_SCDLG_MOVETAB_BTN_COPY,1493451781,
-sc_CheckBox_RID_SCDLG_NAMES_BTN_COLHEADER,2567308321,
-sc_CheckBox_RID_SCDLG_NAMES_BTN_CRITERIA,2567308319,
-sc_CheckBox_RID_SCDLG_NAMES_BTN_PRINTAREA,2567308320,
-sc_CheckBox_RID_SCDLG_NAMES_BTN_ROWHEADER,2567308322,
 sc_CheckBox_RID_SCDLG_NAMES_CREATE_BTN_BOTTOM,1494402053,
 sc_CheckBox_RID_SCDLG_NAMES_CREATE_BTN_LEFT,1494402050,
 sc_CheckBox_RID_SCDLG_NAMES_CREATE_BTN_RIGHT,1494402051,
@@ -6603,7 +6599,6 @@ sc_ComboBox_RID_SCDLG_FILTER_ED_VAL4,2567082024,
 sc_ComboBox_RID_SCDLG_IMPORTOPT_ED_FIELDSEP,1494175749,
 sc_ComboBox_RID_SCDLG_IMPORTOPT_ED_TEXTSEP,1494175751,
 sc_ComboBox_RID_SCDLG_LINKAREA_CB_URL,1495371781,
-sc_ComboBox_RID_SCDLG_NAMES_ED_NAME,2567311372,
 sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL1,1493749792,
 sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL2,1493749793,
 sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL3,1493749794,
@@ -6636,7 +6631,6 @@ sc_Edit_RID_SCDLG_FILLSERIES_ED_INCREMENT,1493518375,
 sc_Edit_RID_SCDLG_FILLSERIES_ED_START_VALUES,1493518388,
 sc_Edit_RID_SCDLG_FILTER_ED_COPY_AREA,2567079943,
 sc_Edit_RID_SCDLG_HIGHLIGHT_CHANGES_ED_ASSIGN,2568964111,
-sc_Edit_RID_SCDLG_NAMES_ED_ASSIGN,2567309327,
 sc_Edit_RID_SCDLG_NEWSCENARIO_ED_NAME,1493846027,
 sc_Edit_RID_SCDLG_OPTSOLVER_ED_LEFT1,2569209860,
 sc_Edit_RID_SCDLG_OPTSOLVER_ED_LEFT2,2569209861,
@@ -6825,7 +6819,6 @@ sc_MoreButton_RID_SCDLG_CONSOLIDATE_BTN_MORE,2567533060,
 sc_MoreButton_RID_SCDLG_DBNAMES_BTN_MORE,2567336481,
 sc_MoreButton_RID_SCDLG_DPDATAFIELD_BTN_MORE,1495396868,
 sc_MoreButton_RID_SCDLG_FILTER_BTN_MORE,2567090689,
-sc_MoreButton_RID_SCDLG_NAMES_BTN_MORE,2567320070,
 sc_MoreButton_RID_SCDLG_PIVOTFILTER_BTN_MORE,1493758465,
 sc_MoreButton_RID_SCDLG_PIVOT_LAYOUT_BTN_MORE,2567516676,
 sc_MoreButton_RID_SCDLG_SPEC_FILTER_BTN_MORE,2567107073,
diff --git a/source/text/scalc/01/04070100.xhp 
b/source/text/scalc/01/04070100.xhp
index 2221143..0054da0 100644
--- a/source/text/scalc/01/04070100.xhp
+++ b/source/text/scalc/01/04070100.xhp
@@ -28,7 +28,7 @@
 
 
 
-
+
 Define Names
 Opens 
a dialog where you can specify a name for a selected area.
 
@@ -37,31 +37,31 @@
 
 
 The Sheet Area box on the Formula bar contains a list 
of defined names for the ranges. Click a name from this box to highlight the 
corresponding reference on the spreadsheet. Names given formulas or parts of a 
formula are not listed here.
-
+
 Name
-Enter the name of 
the area for which you want to define a reference. All area names already 
defined in the spreadsheet are listed in the text field below. If you 
click a name on the list, the corresponding reference in the document will be 
shown with a blue frame. If multiple cell ranges belong to the same area name, 
they are displayed with different colored frames.
-
+Enter the name of the 
area for which you want to define a reference. All area names already defined 
in the spreadsheet are listed in the text field below. If you click a 
name on the list, the corresponding reference in the document will be shown 
with a blue frame. If multiple cell ranges belong to the same area name, they 
are displayed with different colored frames.
+
 Assigned to
-The reference of the 
selected area name is shown here as an absolute value.
+The reference of the 
selected area name is shown here as an absolute value.
 To insert a new area reference, place the cursor in this field and 
use your mouse to select the desired area in any sheet of your spreadsheet 
document.
 
-
+
 More
-Allows you to 
specify the Area type (optional) for the 
reference.
+Allows you to specify 
the Area type (optional) for the reference.
 Area type
 Defines additional options related to the type of reference 
area.
-
+
 Print range
-Defines the 
area as a print range.
-
+Defines the area 
as a print range.
+
 Filter
-Defines the 
selected area to be used in an advanced filter.
-
+Defines the 
selected area to be used in an advanced filter.
+
 Repeat column
-Defines the 
area as a repeating column.
-
+Defines the area 
as a repeating column.
+
 Repeat row
-Defines the 
area as a repeating row.
+Defines the area 
as a repeating row.
 
 Add/Modify
 Click the 
Add button to add the defined name to the li

[Libreoffice-commits] core.git: 2 commits - helpcontent2 sc/AllLangResTarget_sc.mk sc/inc sc/source

[Caolán McNamara]

 helpcontent2|2 
 sc/AllLangResTarget_sc.mk   |1 
 sc/inc/sc.hrc   |1 
 sc/source/ui/inc/namedefdlg.hrc |   49 
 sc/source/ui/inc/namedefdlg.hxx |1 
 sc/source/ui/src/namedefdlg.src |  154 
 6 files changed, 1 insertion(+), 207 deletions(-)

New commits:
commit 96857802bd70aaa8111cf84367ca016cb8d1f06b
Author: Caolán McNamara 
Date:   Wed Mar 6 14:36:07 2013 +

remove .src remnants

Change-Id: Icd3df6c154e1eac0d7ba47c449c3fdc6ae388879

diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 59191dc..b58eba4 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -71,7 +71,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
 sc/source/ui/src/simpref.src \
 sc/source/ui/src/solveroptions.src \
 sc/source/ui/src/namedlg.src \
-sc/source/ui/src/namedefdlg.src \
 sc/source/ui/src/miscdlgs.src \
 sc/source/ui/src/tabopdlg.src \
 sc/source/ui/src/scstring.src \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 0b19621..180e6da 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1000,7 +1000,6 @@
 #define RID_SCDLG_COLORROW  (SC_DIALOGS_START + 71)
 #define RID_SCDLG_NAMES_PASTE   (SC_DIALOGS_START + 72)
 #define RID_SCDLG_NAMES_CREATE  (SC_DIALOGS_START + 73)
-#define RID_SCDLG_NAMES_DEFINE  (SC_DIALOGS_START + 75)
 
 #define RID_SCDLG_CHAR  (SC_DIALOGS_START + 76)
 #define RID_SCDLG_PARAGRAPH (SC_DIALOGS_START + 77)
diff --git a/sc/source/ui/inc/namedefdlg.hrc b/sc/source/ui/inc/namedefdlg.hrc
deleted file mode 100644
index ec3e772..000
--- a/sc/source/ui/inc/namedefdlg.hrc
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- *  Copyright (C) 2011 Markus Mohrhard  
(initial developer)
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-
-#include "sc.hrc"
-
-#define BTN_ADD 1
-#define BTN_CANCEL 2
-#define FT_NAME 3
-#define FT_RANGE 4
-#define FT_SCOPE 5
-#define FT_INFO 6
-#define ED_NAME 7
-#define ED_RANGE 8
-#define LB_SCOPE 9
-#define BTN_PRINTAREA 10
-#define BTN_CRITERIA 11
-#define BTN_ROWHEADER 12
-#define BTN_COLHEADER 13
-#define FL_DIV 15
-#define STR_DEFAULT_INFO 19
-#define RB_RANGE 20
-#define BTN_MORE 21
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx
index 8aaa937..52d3494 100644
--- a/sc/source/ui/inc/namedefdlg.hxx
+++ b/sc/source/ui/inc/namedefdlg.hxx
@@ -27,7 +27,6 @@
  */
 
 #include "anyrefdg.hxx"
-#include "namedefdlg.hrc"
 #include 
 #include 
 #include 
diff --git a/sc/source/ui/src/namedefdlg.src b/sc/source/ui/src/namedefdlg.src
deleted file mode 100644
index 6d2e0d3..000
--- a/sc/source/ui/src/namedefdlg.src
+++ /dev/null
@@ -1,154 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- *  Copyright (C) 2011 Markus Mohrhard  
(initial developer)
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provis

[Libreoffice-qa] FDO & BSA Administration Info - New version 4.0.1.2 release

[Joel Madero]

New version 4.0.1.2 rc has been updated to 4.0.1.2 release on both 
FreeDesktop.Org (FDO) & Bug Submission Assistant (BSA).


Any question can come my way.


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

[PUSHED] some refinements on label configurations in writer

[via Code Review]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/2473

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I94ad02972b0fae1327f72a41373f34962452b8ef
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Winfried Donkers 
Gerrit-Reviewer: Caolán McNamara 
Gerrit-Reviewer: Michael Meeks 
Gerrit-Reviewer: Winfried Donkers 

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

[Libreoffice-commits] core.git: extras/source sw/source

[Winfried Donkers]

 extras/source/labels/labels.xml  |6 
 sw/source/ui/envelp/labelcfg.cxx |  283 +--
 sw/source/ui/envelp/labfmt.cxx   |8 +
 sw/source/ui/envelp/labfmt.hrc   |5 
 sw/source/ui/envelp/labfmt.src   |6 
 sw/source/ui/inc/labelcfg.hxx|   11 +
 6 files changed, 155 insertions(+), 164 deletions(-)

New commits:
commit 2d66aad26750c47659e3445e18d9a385658e3328
Author: Winfried Donkers 
Date:   Thu Feb 28 18:05:52 2013 +0100

some refinements on label configurations in writer

Change-Id: I94ad02972b0fae1327f72a41373f34962452b8ef
Reviewed-on: https://gerrit.libreoffice.org/2473
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/extras/source/labels/labels.xml b/extras/source/labels/labels.xml
index a9f81ba..8ed02b9 100644
--- a/extras/source/labels/labels.xml
+++ b/extras/source/labels/labels.xml
@@ -651,7 +651,7 @@ Letter 215.9 x 279.4 mm
 S;4064;2117;3810;2117;467;1090;5;13;21000;29700
 
 
-J8654 Miini Address
+J8654 Mini Address
 S;4826;2540;4572;2540;975;2143;4;10;21000;29700
 
 
@@ -1199,7 +1199,7 @@ Letter 215.9 x 279.4 mm
 S;4064;2117;3810;2117;467;1090;5;13;21000;29700
 
 
-L7652 Miini Address
+L7652 Mini Address
 S;4826;1693;4572;1693;975;1299;4;16;21000;29700
 
 
@@ -1207,7 +1207,7 @@ Letter 215.9 x 279.4 mm
 S;4572;1693;2200;1270;2542;4902;4;12;21000;29700
 
 
-L7654 Miini Address
+L7654 Mini Address
 S;4826;2540;4572;2540;975;2143;4;10;21000;29700
 
 
diff --git a/sw/source/ui/envelp/labelcfg.cxx b/sw/source/ui/envelp/labelcfg.cxx
index 28d4074..785eff6 100644
--- a/sw/source/ui/envelp/labelcfg.cxx
+++ b/sw/source/ui/envelp/labelcfg.cxx
@@ -59,6 +59,18 @@ static inline OUString lcl_getValue(xmlreader::XmlReader& 
reader,
 return sTmp;
 }
 
+static Sequence lcl_CreatePropertyNames(const OUString& rPrefix)
+{
+Sequence aProperties(2);
+OUString* pProperties = aProperties.getArray();
+for(sal_Int32 nProp = 0; nProp < 2; nProp++)
+pProperties[nProp] = rPrefix;
+
+pProperties[ 0] += "Name";
+pProperties[ 1] += "Measure";
+return aProperties;
+}
+
 SwLabelConfig::SwLabelConfig() :
 ConfigItem("Office.Labels/Manufacturer")
 {
@@ -72,6 +84,7 @@ SwLabelConfig::SwLabelConfig() :
 OUString sName;
 OUString sMeasure;
 
+// fill m_aLabels and m_aManufacturers with the predefined labels
 res = reader.nextItem(
 xmlreader::XmlReader::TEXT_NONE, &name, &nsId);
 assert(res == xmlreader::XmlReader::RESULT_BEGIN &&
@@ -105,7 +118,10 @@ SwLabelConfig::SwLabelConfig() :
 xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("measure")));
 // Ending label mark
 lcl_assertEndingItem(reader);
-m_aLabels[sManufacturer][sName] = sMeasure;
+if ( m_aLabels.find( sManufacturer ) == m_aLabels.end() )
+m_aManufacturers.push_back( sManufacturer );
+m_aLabels[sManufacturer][sName].m_aMeasure = sMeasure;
+m_aLabels[sManufacturer][sName].m_bPredefined = true;
 }
 // Get next manufacturer or end
 res = reader.nextItem(
@@ -115,7 +131,35 @@ SwLabelConfig::SwLabelConfig() :
 xmlreader::XmlReader::TEXT_NONE, &name, &nsId);
 assert(res == xmlreader::XmlReader::RESULT_DONE);
 
-FillManufacturers();
+// add to m_aLabels and m_aManufacturers the custom labels
+const Sequence& rMan = GetNodeNames( OUString() );
+const rtl::OUString* pMan = rMan.getConstArray();
+for ( sal_Int32 nMan = 0; nMan < rMan.getLength(); nMan++ )
+{
+sManufacturer = pMan[nMan];
+const Sequence aLabels = GetNodeNames( sManufacturer );
+const OUString* pLabels = aLabels.getConstArray();
+for( sal_Int32 nLabel = 0; nLabel < aLabels.getLength(); nLabel++ )
+{
+OUString sPrefix( sManufacturer );
+sPrefix += "/";
+sPrefix += pLabels[nLabel];
+sPrefix += "/";
+Sequence aPropNames = lcl_CreatePropertyNames( sPrefix );
+Sequence   aValues = GetProperties( aPropNames );
+const Any* pValues = aValues.getConstArray();
+if (aValues.getLength() >= 1)
+if(pValues[0].hasValue())
+pValues[0] >>= sName;
+if (aValues.getLength() >= 2)
+if(pValues[1].hasValue())
+pValues[1] >>= sMeasure;
+if ( m_aLabels.find( sManufacturer ) == m_aLabels.end() )
+m_aManufacturers.push_back( sManufacturer );
+m_aLabels[sManufacturer][sName].m_aMeasure = sMeasure;
+m_aLabels[sManufacturer][sName].m_bPredefined = false;
+}
+}
 }
 
 SwLabelConfig::~SwLabelConfig()
@@ -127,32 +171,6 @@ void SwLabelConfig::Commit() {}
 
 void SwLabelConfig::Notify( const ::com::sun::s

[PUSHED] XINC and XLIB are never used

[via Code Review]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/2545

Approvals:
  Tomáš Chvátal: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I242153584dd8e50e8163c4534acf8d8a66423b02
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan 
Gerrit-Reviewer: Matúš Kukan 
Gerrit-Reviewer: Tomáš Chvátal 

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

[Libreoffice-commits] core.git: configure.ac

[Matúš Kukan]

 configure.ac |   38 ++
 1 file changed, 2 insertions(+), 36 deletions(-)

New commits:
commit a8ba50d2c0f54aa40977c6da0898814573d6a5e0
Author: Matúš Kukan 
Date:   Mon Mar 4 19:26:11 2013 +0100

XINC and XLIB are never used

Change-Id: I242153584dd8e50e8163c4534acf8d8a66423b02
Reviewed-on: https://gerrit.libreoffice.org/2545
Reviewed-by: Tomáš Chvátal 
Tested-by: Tomáš Chvátal 

diff --git a/configure.ac b/configure.ac
index 7b04705..9533c3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8372,18 +8372,11 @@ if test "$WANT_X11" = "yes"; then
 AC_PATH_XTRA
 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
 
-if test "x$x_includes" = "x"; then
+if test -z "$x_includes"; then
 x_includes="default_x_includes"
 fi
-if test "x$x_libraries" = "x"; then
-x_libraries="default_x_libraries"
-fi
-dnl The variables $x_libraries and $x_includes are set.
 if test -z "$x_libraries"; then
-AC_MSG_ERROR([No X libraries found]) # Exit
-fi
-if test -z "$x_includes"; then
-AC_MSG_ERROR([No X includes found]) # Exit
+x_libraries="default_x_libraries"
 fi
 CFLAGS="$CFLAGS $X_CFLAGS"
 LDFLAGS="$LDFLAGS $X_LDFLAGS $X_LIBS"
@@ -8392,33 +8385,6 @@ else
 x_includes="no_x_includes"
 x_libraries="no_x_libraries"
 fi
-if test -z "$x_includes"; then
-x_includes="no_x_includes"
-fi
-if test -z "$x_libraries"; then
-x_libraries="no_x_libraries"
-fi
-if test "$x_includes" = "default_x_includes"; then
-XINC="/usr/include"
-else
-XINC="$x_includes"
-fi
-AC_SUBST(XINC)
-if test "$x_libraries" = "default_x_libraries"; then
-XLIB=`$PKG_CONFIG --variable=libdir x11`
-if test "x$XLIB" = x; then
-XLIB="/usr/lib"
-fi
-else
-XLIB="$x_libraries"
-fi
-if test "$XLIB" != "no_x_libraries" -a "$XLIB" != "/usr/lib" -a "$XLIB" != 
"/usr/lib64"; then
-SOLARLIB="$SOLARLIB -L$XLIB"
-fi
-if test "$XINC" != "no_x_includes" -a "$XINC" != "/usr/include"; then
-SOLARINC="$SOLARINC -I$XINC"
-fi
-AC_SUBST(XLIB)
 
 if test "$WANT_X11" = "yes"; then
 dnl ===
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [tdf-discuss] macro compatibility between LO and AOO?

[Stephan Bergmann]

On 03/06/2013 09:00 AM, Andre Fischer wrote:

On 05.03.2013 18:29, Michael Meeks wrote:

On Tue, 2013-03-05 at 09:19 -0800, Fred Ollinger wrote:

I was wondering if libreoffice and aooo can't agree to
some basic level api for 3rd party developers?

It's an interesting discussion; but in the absence of any concrete
code, patches etc. it doesn't belong on the libreoffice developer list;


Talking about a concrete change is a good idea so please let me ask a
question similar to one I asked at FOSDEM but to which I got no clear
answer.  Probably because of my bad English that is even worse when I
speak it.

Stephan Bergman talked about "Well-typed UNO", something that would
involve incompatible changes to the UNO API.  I would like to know if
LibreOffice and Apache OpenOffice could work together on this.  I am
just talking about changes on API level not the underlying
implementation.  That would be something that both projects would do
independently.


First off, depends on what you mean with "UNO API."  One customary 
meaning is the set of UNOIDL entities (mainly) declared in udkapi/ and 
offapi/ .idl files.  (LibreOffice tries to meticulously track any 
incompatible changes it does there, see e.g., the "API Changes" section 
at .)


Another customary meaning is the broader concept of stable interface the 
URE offers, including C ABI, file formats, wire protocols, etc.  My hope 
is that my work on changing the type representation does not affect the 
former, only the latter (file formats etc.).  And, obviously, it will 
need to take care of a backward-compatibility plan.


That said, I can only repeat now what I already said at FOSDEM, that I'm 
going to well document all the changes to any specifications---just like 
I did for any other changes to UNO I did over the last ten years or so. 
 And, as always, any input is highly welcome.


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

Re: Missing service SvgWriter - forgotten when rebasing with AOO

[Michael Meeks]

On Tue, 2013-03-05 at 19:54 +0100, Tomaž Vajngerl wrote:
>  I am looking why exporting SVG doesn't work when exporting charts
> (fdo#60137). In [1] we need "com.sun.star.svg.SVGWriter" but it is not
> present in LO. Looks to me like we missed to include changes in [2]
> from AOO when rebasing. What should we do about this? 

Will fix it, thanks ! :-)

Michael.

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

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

[PUSHED] coverity#983009: Resource leak

[via Code Review]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/2550


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9c5c4c35b90d8f06933521c77c966a426a801cec
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 
Gerrit-Reviewer: Caolán McNamara 
Gerrit-Reviewer: Eike Rathke 

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

[Libreoffice-commits] core.git: 2 commits - dbaccess/uiconfig hwpfilter/source sw/uiconfig

[Caolán McNamara]

 dbaccess/uiconfig/ui/querypropertiesdialog.ui |   17 ++
 hwpfilter/source/hwpread.cxx  |8 +++---
 sw/uiconfig/swriter/ui/captionoptions.ui  |   31 +++---
 3 files changed, 21 insertions(+), 35 deletions(-)

New commits:
commit 5575d7f3f3b2fcfdc2f9bbae7c8fb0805cb0f267
Author: Caolán McNamara 
Date:   Wed Mar 6 14:18:05 2013 +

various efforts to consistently apply HIG rules

Change-Id: I1a3ef21959d2bf50c57ffeaf5be3e49f75cd8cca

diff --git a/dbaccess/uiconfig/ui/querypropertiesdialog.ui 
b/dbaccess/uiconfig/ui/querypropertiesdialog.ui
index 5119ff0..d745c16 100644
--- a/dbaccess/uiconfig/ui/querypropertiesdialog.ui
+++ b/dbaccess/uiconfig/ui/querypropertiesdialog.ui
@@ -12,22 +12,19 @@
   
 False
 vertical
-2
+12
 
   
 False
 end
-24
 
   
 gtk-ok
-False
 True
 True
 True
 True
 True
-False
 True
   
   
@@ -39,12 +36,10 @@
 
   
 gtk-cancel
-False
 True
 True
 True
 True
-False
 True
   
   
@@ -56,11 +51,9 @@
 
   
 gtk-help
-False
 True
 True
 True
-False
 True
   
   
@@ -126,13 +119,12 @@
 
   
 Yes
-False
 True
 True
 False
-False
 0
 True
+nondistinct
   
   
 False
@@ -143,11 +135,9 @@
 
   
 No
-False
 True
 True
 False
-False
 0
 True
 distinct
@@ -178,7 +168,7 @@
   
 True
 False
-24
+12
 
   
 True
@@ -198,7 +188,6 @@
   
 True
 False
-True
   
   
 1
diff --git a/sw/uiconfig/swriter/ui/captionoptions.ui 
b/sw/uiconfig/swriter/ui/captionoptions.ui
index 4cea9a2..194148e 100644
--- a/sw/uiconfig/swriter/ui/captionoptions.ui
+++ b/sw/uiconfig/swriter/ui/captionoptions.ui
@@ -17,13 +17,13 @@
   
   
 False
-5
+6
 Caption options
 dialog
 
   
 False
-2
+12
 
   
 True
@@ -31,6 +31,7 @@
 True
 True
 vertical
+12
 
   
 True
@@ -43,7 +44,6 @@
 True
 False
 6
-6
 12
 
   
@@ -51,8 +51,7 @@
 False
 True
 6
-6
-True
+12
 
   
 True
@@ -84,7 +83,6 @@
   
 True
 False
-start
 0
 _Level
 True
@@ -101,7 +99,6 @@
   
 True
 False
-start
 0
 _Separator
 True
@@ -147,7 +144,6 @@
 True
 False
 6
-6
 12
 
   
@@ -155,14 +151,11 @@
 False
 True
 6
-6
-True
+

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - bin/lo-commit-stat

[Petr Mladek]

 bin/lo-commit-stat |  167 +
 1 file changed, 92 insertions(+), 75 deletions(-)

New commits:
commit 38ed89d2877558d96f2a3bd7f5c28a7c110a91b1
Author: Petr Mladek 
Date:   Wed Mar 6 15:15:01 2013 +0100

lo-commit-stat: new --bugs-changelog option

Add --bugs-changelog option to print the list of bugs in the style
of SUSE changelog

Optimized the code to check bugzilla only once when you generate
more logs.

Change-Id: I56eeda92628422f1b649c0fd71ae9146aeaa85c9

diff --git a/bin/lo-commit-stat b/bin/lo-commit-stat
index 7dd2211..3cc3840 100755
--- a/bin/lo-commit-stat
+++ b/bin/lo-commit-stat
@@ -258,6 +258,32 @@ sub get_branch_name($)
 return $branch;
 }
 
+sub get_bug_list($$$)
+{
+my ($pdata, $pbugs, $check_bugzilla) = @_;
+
+# associate bugs with their summaries and fixers
+foreach my $piece ( keys %{$pdata}) {
+foreach my $id ( keys %{$pdata->{$piece}}) {
+foreach my $bug (keys %{$pdata->{$piece}{$id}{'bugs'}}) {
+%{$pbugs->{$bug}} = () if (! defined %{$pbugs->{$bug}});
+my $author = $pdata->{$piece}{$id}{'author'}{'name'};
+my $summary = $pdata->{$piece}{$id}{'summary'};
+$pbugs->{$bug}{'summary'} = $summary;
+$pbugs->{$bug}{'author'}{$author} = 1;
+}
+}
+}
+
+# try to replace summaries with bug names from bugzilla
+if ($check_bugzilla) {
+print "Getting bug titles:\n";
+foreach my $bug ( sort { $a cmp $b } keys %{$pbugs}) {
+$pbugs->{$bug}{'summary'} = get_bug_name($bug, 
$pbugs->{$bug}{'summary'});
+}
+}
+}
+
 sub open_log_file($$)
 {
 my ($log_dir, $log_prefix, $log_suffix, $top_dir, $branch_name, $wiki) = 
@_;
@@ -378,36 +404,16 @@ sub get_bug_name($$)
 return $summary;
 }
 
-sub print_bugs($$$)
+sub print_bugs()
 {
-my ($pdata, $log, $wiki) = @_;
-
-# associate bugs with their summaries and fixers
-my %bugs = ();
-foreach my $piece ( keys %{$pdata}) {
-foreach my $id ( keys %{$pdata->{$piece}}) {
-foreach my $bug (keys %{$pdata->{$piece}{$id}{'bugs'}}) {
-my $author = $pdata->{$piece}{$id}{'author'}{'name'};
-my $summary = $pdata->{$piece}{$id}{'summary'};
-$bugs{$bug}{'summary'} = $summary;
-$bugs{$bug}{'author'}{$author} = 1;
-}
-}
-}
+my ($pbugs, $log, $wiki) = @_;
 
-# try to replace summaries with bug names from bugzilla
-print "Getting bug titles:\n";
-foreach my $bug ( sort { $a cmp $b } keys %bugs) {
-$bugs{$bug}{'summary'} = get_bug_name($bug, $bugs{$bug}{'summary'});
-}
-
-# print
-foreach my $bug ( sort { $a cmp $b } keys %bugs) {
-my $summary = $bugs{$bug}{'summary'};
+foreach my $bug ( sort { $a cmp $b } keys %{$pbugs}) {
+my $summary = $pbugs->{$bug}{'summary'};
 
 my $authors = "";
-if ( %{$bugs{$bug}{'author'}} ) {
-$authors = " [" . join (", ", keys %{$bugs{$bug}{'author'}}) . "]";
+if ( %{$pbugs->{$bug}{'author'}} ) {
+$authors = " [" . join (", ", keys %{$pbugs->{$bug}{'author'}}) . 
"]";
 }
 
 $bug =~ s/(.*)\#(.*)/* {{$1|$2}}/ if ($wiki);
@@ -415,29 +421,35 @@ sub print_bugs($$$)
 }
 }
 
-sub print_bugnumbers($$$)
+sub print_bugs_changelog()
 {
-my ($pdata, $log, $wiki) = @_;
+my ($pbugs, $log, $wiki) = @_;
 
-# just collect bugs
-my %bugs = ();
-foreach my $piece ( keys %{$pdata}) {
-foreach my $id ( keys %{$pdata->{$piece}}) {
-foreach my $bug (keys %{$pdata->{$piece}{$id}{'bugs'}}) {
-$bugs{$bug} = 1;
-}
+foreach my $bug ( sort { $a cmp $b } keys %{$pbugs}) {
+my $summary = $pbugs->{$bug}{'summary'};
+
+my $authors = "";
+if ( %{$pbugs->{$bug}{'author'}} ) {
+$authors = " [" . join (", ", keys %{$pbugs->{$bug}{'author'}}) . 
"]";
 }
+
+print $log "+ $summary ($bug)$authors\n";
 }
+}
+
+sub print_bugnumbers()
+{
+my ($pbugs, $log, $wiki) = @_;
 
-print $log join ("\n", sort { $a cmp $b } keys %bugs), "\n";
+print $log join ("\n", sort { $a cmp $b } keys %{$pbugs}), "\n";
 }
 
 sub generate_log()
 {
-my ($pdata, $print_func, $log_dir, $log_prefix, $log_suffix, $top_dir, 
$branch_name, $wiki) = @_;
+my ($pused_data, $print_func, $log_dir, $log_prefix, $log_suffix, 
$top_dir, $branch_name, $wiki) = @_;
 
 my $log = open_log_file($log_dir, $log_prefix, $log_suffix, $top_dir, 
$branch_name, $wiki);
-& {$print_func} ($pdata, $log, $wiki);
+& {$print_func} ($pused_data, $log, $wiki);
 close $log;
 }
 
@@ -451,30 +463,31 @@ sub usage()
   "Usage: lo-commit-stat [--help] [--no-pieces] [--piece=] 
--log-dir= --log-suffix= topdir [git_arg...]\n\n" .
 
   "Option

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

[Radek Doulik]

 cppcanvas/source/mtfrenderer/emfplus.cxx |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 1d6b17d6130f0bb24c19207dffebe17f983d3415
Author: Radek Doulik 
Date:   Wed Mar 6 15:12:27 2013 +0100

do not crop the bitmap, it is already cropped. more debug output

Change-Id: Iac6cd20833e0de9d8135fc4a3a0c4e5884a0e9fa

diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx 
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index b5369cf..6712031 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1481,6 +1481,9 @@ namespace cppcanvas
 ReadPoint (rMF, x2, y2, flags);
 ReadPoint (rMF, x3, y3, flags);
 
+EMFP_DEBUG (printf ("EMF+ destination 
points: %f,%f %f,%f %f,%f\n", x1, y1, x2, y2, x3, y3));
+EMFP_DEBUG (printf ("EMF+ destination 
rectangle: %f,%f %fx%f\n", x1, y1, x2 - x1, y3 - y1));
+
 aDstPoint = Map (x1, y1);
 aDstSize = MapSize(x2 - x1, y3 - y1);
 
@@ -1491,6 +1494,8 @@ namespace cppcanvas
 
 ReadRectangle (rMF, dx, dy, dw, dh, flags 
& 0x4000);
 
+EMFP_DEBUG (printf ("EMF+ destination 
rectangle: %f,%f %fx%f\n", dx, dy, dw, dh));
+
 aDstPoint = Map (dx, dy);
 aDstSize = MapSize(dw, dh);
 
@@ -1499,12 +1504,9 @@ namespace cppcanvas
 
 if (bValid) {
 BitmapEx aBmp( image.graphic.GetBitmapEx 
() );
-const Rectangle aCropRect 
(::vcl::unotools::pointFromB2DPoint (basegfx::B2DPoint (sx, sy)),
-   
::vcl::unotools::sizeFromB2DSize (basegfx::B2DSize(sw, sh)));
-aBmp.Crop( aCropRect );
-
 
 Size aSize( aBmp.GetSizePixel() );
+EMFP_DEBUG (printf ("EMF+ bitmap size: 
%ldx%ld\n", aSize.Width(), aSize.Height()));
 if( aSize.Width() > 0 && aSize.Height() > 
0 ) {
 ActionSharedPtr pBmpAction (
 
internal::BitmapActionFactory::createBitmapAction (
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [HELP] Java expert needed on fdo#61726

[Stephan Bergmann]

On 03/06/2013 07:40 AM, Tor Lillqvist wrote:

to rectify that i renamed our class to be ReportEngine2.java


Wouldn't it have been appropriate to rename the package, too? If the
report-builder is an extension, not part of offapi, why are its
classes in com.sun.star?


Yes, that should be cleaned up.  With the typical UNO language binding 
injecting the UNOIDL module names top-level into the languages' name 
space concepts, code writers must be very careful not to trespass into 
that territory.


Stephan

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

Re: [HELP] Java expert needed on fdo#61726

[Stephan Bergmann]

On 03/05/2013 06:26 PM, Lionel Elie Mamane wrote:

On Tue, Mar 05, 2013 at 04:20:32PM +0200, Noel Grandin wrote:

On 2013-03-05 16:01, Lionel Elie Mamane wrote:



If someone with a better clue at Java could take a look at
https://bugs.freedesktop.org/show_bug.cgi?id=61726
I'd be grateful.



It completely breaks ReportBuilder, blocks other work on quite
annoying / important bugs in ReportBuilder, ...



 From what Google tells me, I don't understand how a
IncompatibleClassChangeError can survive a "make clean && make", but
there it is.



Normally when that happens it indicates that you have multiple
copies of the same code in your CLASSPATH, and the two copies are
from different versions of the code.


Concretely, how do I find out which this is?


I assume this has meanwhile been fixed with 
 
"fdo#61726 java class collision with new idl," right?


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