date:20140221

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

2014-02-21 Thread Jan Holesovsky

 dtrans/source/win32/dtobj/FmtFilter.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1d512fb31c20e17426f0652234a1304ead2d8c8d
Author: Jan Holesovsky ke...@collabora.com
Date:   Fri Feb 21 09:07:57 2014 +0100

Update comment.

Change-Id: Ie2aeb65760fc06483f709a4194b9ee1d1f7a8955

diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx 
b/dtrans/source/win32/dtobj/FmtFilter.cxx
index 6f67a3b..4adbc93 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.cxx
+++ b/dtrans/source/win32/dtobj/FmtFilter.cxx
@@ -355,8 +355,8 @@ std::string GetHtmlFormatHeader(size_t startHtml, size_t 
endHtml, size_t startFr
 return htmlHeader.str();
 }
 
-// the office always writes the start and end html tag in upper cases and
-// without spaces both tags don't allow parameters
+// the case of these tags has to match what we output in our filters
+// both tags don't allow parameters
 const std::string TAG_HTML = std::string(html);
 const std::string TAG_END_HTML = std::string(/html);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - include/oox oox/source sw/qa

2014-02-21 Thread Zolnai Tamás

 include/oox/drawingml/textfont.hxx |3 
 oox/source/drawingml/shape.cxx |5 +
 oox/source/drawingml/textcharacterpropertiescontext.cxx|   12 +++
 oox/source/drawingml/textfont.cxx  |8 ++
 oox/source/export/drawingml.cxx|   16 +++-
 sw/qa/extras/ooxmlexport/data/dml-gradientfill-theme.docx  |binary
 sw/qa/extras/ooxmlexport/data/nested-text-frames.odt   |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx   |   44 +++--
 sw/qa/extras/ooxmlimport/data/dml-groupshape-runfonts.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx   |   10 ++
 10 files changed, 88 insertions(+), 10 deletions(-)

New commits:
commit b733190b0eae3177a30e09054a764eed4f616ba2
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Thu Feb 20 11:57:09 2014 +0100

DOCX export tests: increase strength of testing nested text frames

Change-Id: I370f22ee948f5a760ba01c98a8cfb5fac96f98b7

diff --git a/sw/qa/extras/ooxmlexport/data/nested-text-frames.odt 
b/sw/qa/extras/ooxmlexport/data/nested-text-frames.odt
index 4c38e1f..d2106f9 100644
Binary files a/sw/qa/extras/ooxmlexport/data/nested-text-frames.odt and 
b/sw/qa/extras/ooxmlexport/data/nested-text-frames.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index bda5ea0..c68d3df 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3280,11 +3280,21 @@ DECLARE_OOXMLEXPORT_TEST(testNestedTextFrames, 
nested-text-frames.odt)
 // First problem was LO crashed during export (crash test)
 
 // Second problem was LO made file corruption, writing out nested text 
boxes, which can't be handled by Word.
-// So test that all three exported text boxes are on the same level
-xmlDocPtr pXmlDoc = parseExport(word/document.xml);
-if (!pXmlDoc)
-return;
-
assertXPath(pXmlDoc,/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:txbx/w:txbxContent/w:p/w:r/w:t,
 3);
+// Test that all three exported text boxes are anchored to the same 
paragraph and not each other.
+uno::Referencetext::XTextContent xTextContent(getShape(1), 
uno::UNO_QUERY);
+uno::Referencetext::XTextRange xRange(xTextContent-getAnchor(), 
uno::UNO_QUERY);
+uno::Referencetext::XText xText(xRange-getText(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString(Anchor point), xText-getString());
+
+xTextContent.set(getShape(2), uno::UNO_QUERY);
+xRange.set(xTextContent-getAnchor(), uno::UNO_QUERY);
+xText.set(xRange-getText(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString(Anchor point), xText-getString());
+
+xTextContent.set(getShape(3), uno::UNO_QUERY);
+xRange.set(xTextContent-getAnchor(), uno::UNO_QUERY);
+xText.set(xRange-getText(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString(Anchor point), xText-getString());
 }
 
 DECLARE_OOXMLEXPORT_TEST(testFloatingTablePosition, 
floating-table-position.docx)
commit 756d0b1dff3cb5c3cab10c1f14e4dae6ac3ba135
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Thu Feb 20 13:22:33 2014 +0100

drawingML import: run fonts inside group shape

Change-Id: Ib54fe868c11c0c22b85d8821fa7274c80918362c

diff --git a/include/oox/drawingml/textfont.hxx 
b/include/oox/drawingml/textfont.hxx
index a069057..d3361fc 100644
--- a/include/oox/drawingml/textfont.hxx
+++ b/include/oox/drawingml/textfont.hxx
@@ -39,6 +39,9 @@ public:
 /** Sets attributes from the passed attribute list. */
 voidsetAttributes( const AttributeList rAttribs );
 
+/** Sets font name and init other attributes. */
+voidsetAttributes( const OUString rFontName );
+
 /** Overwrites this text font with the passed text font, if it is used. */
 voidassignIfUsed( const TextFont rTextFont );
 
diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx 
b/oox/source/drawingml/textcharacterpropertiescontext.cxx
index 36bd255..8b6156e 100644
--- a/oox/source/drawingml/textcharacterpropertiescontext.cxx
+++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx
@@ -132,6 +132,18 @@ ContextHandlerRef 
TextCharacterPropertiesContext::onCreateContext( sal_Int32 aEl
 case A_TOKEN( hlinkMouseOver ): // CT_Hyperlink
 return new HyperLinkContext( *this, rAttribs,  
mrTextCharacterProperties.maHyperlinkPropertyMap );
 case OOX_TOKEN( doc, rFonts ):
+if( rAttribs.hasAttribute(OOX_TOKEN(doc, ascii)) )
+{
+
mrTextCharacterProperties.maLatinFont.setAttributes(rAttribs.getString(OOX_TOKEN(doc,
 ascii), OUString()));
+}
+if( rAttribs.hasAttribute(OOX_TOKEN(doc, cs)) )
+{
+

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

2014-02-21 Thread Caolán McNamara

 vcl/source/window/layout.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 5754e66f54fbf0a3e2eb96fa7afdf963a230d670
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Feb 17 16:57:44 2014 +

Resolves: fdo#74284 use AccessibleRole::PANEL for VclBoxes under windows

(cherry picked from commit 685ec1899435037205d98a102a32ca8b6a4836d0)

Change-Id: Ic8c743c2646c8610b3d90425024413b40dfdab13
Reviewed-on: https://gerrit.libreoffice.org/8105
Reviewed-by: Michael Meeks michael.me...@collabora.com
Reviewed-by: Michael Stahl mst...@redhat.com
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
(cherry picked from commit 47ff82608b065c3c0d98557583bb822b20fb4081)

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 35e76a4..8d8ab0d 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -322,7 +322,13 @@ bool VclBox::set_property(const OString rKey, const 
OString rValue)
 
 sal_uInt16 VclBox::getDefaultAccessibleRole() const
 {
+#if defined(WNT)
+//fdo#74284 call Boxes Panels, keep then as Filler under
+//at least Linux seeing as that's what Gtk does for GtkBoxes
+return com::sun::star::accessibility::AccessibleRole::PANEL;
+#else
 return com::sun::star::accessibility::AccessibleRole::FILLER;
+#endif
 }
 
 #define DEFAULT_CHILD_MIN_WIDTH 85
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-21 Thread Kohei Yoshida

 dtrans/source/win32/dtobj/FmtFilter.cxx |   10 +-
 vcl/aqua/source/dtrans/HtmlFmtFlt.cxx   |8 
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 3ba02e9ec03df980803f35c4b16ce8b8ce90cb66
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu Feb 20 20:19:07 2014 -0500

fdo#74584: These tags should be lowercase for correct clipboard handling.

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

diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx 
b/dtrans/source/win32/dtobj/FmtFilter.cxx
index 199d301..5615715 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.cxx
+++ b/dtrans/source/win32/dtobj/FmtFilter.cxx
@@ -357,13 +357,13 @@ std::string GetHtmlFormatHeader(size_t startHtml, size_t 
endHtml, size_t startFr
 
 // the office always writes the start and end html tag in upper cases and
 // without spaces both tags don't allow parameters
-const std::string TAG_HTML = std::string(HTML);
-const std::string TAG_END_HTML = std::string(/HTML);
+const std::string TAG_HTML = std::string(html);
+const std::string TAG_END_HTML = std::string(/html);
 
 // The body tag may have parameters so we need to search for the
-// closing '' manually e.g. BODY param #92840#
-const std::string TAG_BODY = std::string(BODY);
-const std::string TAG_END_BODY = std::string(/BODY);
+// closing '' manually e.g. body param #92840#
+const std::string TAG_BODY = std::string(body);
+const std::string TAG_END_BODY = std::string(/body);
 
 Sequencesal_Int8 SAL_CALL TextHtmlToHTMLFormat(Sequencesal_Int8 aTextHtml)
 {
diff --git a/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx 
b/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
index e629f11..f5e0b22 100644
--- a/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
+++ b/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
@@ -73,13 +73,13 @@ std::string GetHtmlFormatHeader(size_t startHtml, size_t 
endHtml, size_t startFr
 
 // the office always writes the start and end html tag in upper cases and
 // without spaces both tags don't allow parameters
-const std::string TAG_HTML = std::string(HTML);
-const std::string TAG_END_HTML = std::string(/HTML);
+const std::string TAG_HTML = std::string(html);
+const std::string TAG_END_HTML = std::string(/html);
 
 // The body tag may have parameters so we need to search for the
 // closing '' manually e.g. BODY param #92840#
-const std::string TAG_BODY = std::string(BODY);
-const std::string TAG_END_BODY = std::string(/BODY);
+const std::string TAG_BODY = std::string(body);
+const std::string TAG_END_BODY = std::string(/body);
 
 Sequencesal_Int8 SAL_CALL TextHtmlToHTMLFormat(Sequencesal_Int8 aTextHtml)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-2' - swext/mediawiki

2014-02-21 Thread Julien Nabet

 swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4c3d28b3ce57b17efd5ac49385b249a27feebb46
Author: Julien Nabet serval2...@yahoo.fr
Date:   Wed Feb 19 22:23:58 2014 +0100

Resolves: fdo#69925 Wiki Publisher Extension is not working

Regression from 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=b80d8c695e6b6ded231e67ed9a80bcd1f1250c03
compareTo has been replaced by ==, so we compared the equality ot the 
pointers on the objects instead of the content of the strings
To make it simple and since we compare String objects, let's simply use 
equals method

Change-Id: I65bc1a87751297411fdbe722d3f49bce5e291638
Reviewed-on: https://gerrit.libreoffice.org/8133
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 6dd74978f4a41f8bb79b87784d50a85880e7e9e0)
Reviewed-on: https://gerrit.libreoffice.org/8137
Reviewed-by: Julien Nabet serval2...@yahoo.fr
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java 
b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
index ff9f85a..4cad2f6 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
@@ -134,7 +134,7 @@ public final class WikiEditorImpl extends WeakBase
 {
 final com.sun.star.util.URL myURL = aURL;
 //logger.log( Level.INFO, received dispatch request for: 
+aURL.Complete );
-if ( aURL.Protocol == protocolName )
+if ( aURL.Protocol.equals(protocolName) )
 {
 /*
 synchronized( this )
@@ -146,7 +146,7 @@ public final class WikiEditorImpl extends WeakBase
 
 try
 {
-if ( myURL.Path == send )
+if ( myURL.Path.equals(send) )
 {
 sendArticle();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-2' - postprocess/signing

2014-02-21 Thread Andras Timar

 postprocess/signing/signing.pl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 703566b1dd752f7099d589da8617382a255b1d5e
Author: Andras Timar andras.ti...@collabora.com
Date:   Wed Feb 19 14:40:45 2014 +0100

fdo#75206: use 'ne' for string comparison

Change-Id: I0d059933786119c3c26202c7b48d793404e5a0eb
Reviewed-on: https://gerrit.libreoffice.org/8129
Reviewed-by: Michael Stahl mst...@redhat.com
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/postprocess/signing/signing.pl b/postprocess/signing/signing.pl
index fc17092..875076a 100644
--- a/postprocess/signing/signing.pl
+++ b/postprocess/signing/signing.pl
@@ -47,7 +47,7 @@ if ( $#ARGV  2 ) {
 exit(1);
 }
 @args = parse_options();
-get_exclude_files() if ($opt_exclude != );
+get_exclude_files() if ($opt_exclude ne );
 @files_to_sign = get_files(\@args);
 if ( $opt_log ) {   # logging
 open(LOG,$opt_log) || die Can't open log file $opt_log\n;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source dbaccess/source sd/inc sd/source svx/source unusedcode.easy

2014-02-21 Thread Caolán McNamara

 chart2/source/controller/dialogs/DataBrowser.cxx  |   10 --
 chart2/source/controller/dialogs/DataBrowser.hxx  |2 -
 dbaccess/source/ui/control/FieldControls.cxx  |   21 --
 dbaccess/source/ui/inc/FieldControls.hxx  |3 --
 sd/inc/stlpool.hxx|1 
 sd/source/core/stlpool.cxx|6 
 svx/source/accessibility/svxpixelctlaccessiblecontext.cxx |7 +---
 svx/source/inc/svxpixelctlaccessiblecontext.hxx   |2 -
 unusedcode.easy   |3 --
 9 files changed, 3 insertions(+), 52 deletions(-)

New commits:
commit 5c3a6d383e9aa89252f796a6b17adf81f2bb40a1
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Feb 21 08:55:23 2014 +

callcatcher: update unused code

Change-Id: Ie4df15ab292df51274d983d31ce8e21e0549de81

diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx 
b/chart2/source/controller/dialogs/DataBrowser.cxx
index 01ea4c2..95091b6 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -17,9 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-// header for class SvNumberformat
 #include svl/zformat.hxx
-// header for SvNumberFormatter
 #include svl/zforlist.hxx
 
 #include DataBrowser.hxx
@@ -1376,14 +1374,6 @@ IMPL_LINK( DataBrowser, SeriesHeaderChanged, 
impl::SeriesHeaderEdit*, pEdit )
 return 0;
 }
 
-sal_Int32 DataBrowser::GetTotalWidth() const
-{
-sal_uLong nWidth = 0;
-for ( sal_uInt16 nCol = 0; nCol  ColCount(); ++nCol )
-nWidth += GetColumnWidth( nCol );
-return static_cast sal_Int32 ( nWidth );
-}
-
 } // namespace chart
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx 
b/chart2/source/controller/dialogs/DataBrowser.hxx
index 66a5302..db16008 100644
--- a/chart2/source/controller/dialogs/DataBrowser.hxx
+++ b/chart2/source/controller/dialogs/DataBrowser.hxx
@@ -136,8 +136,6 @@ public:
 // calls the protected inline-function 
BrowseBox::GetFirstVisibleColNumber()
 sal_Int16 GetFirstVisibleColumNumber() const;
 
-sal_Int32 GetTotalWidth() const;
-
 bool CellContainsNumbers( sal_Int32 nRow, sal_uInt16 nCol ) const;
 
 sal_uInt32 GetNumberFormatKey( sal_Int32 nRow, sal_uInt16 nCol ) const;
diff --git a/dbaccess/source/ui/control/FieldControls.cxx 
b/dbaccess/source/ui/control/FieldControls.cxx
index 9d9ea9e..e0ef828 100644
--- a/dbaccess/source/ui/control/FieldControls.cxx
+++ b/dbaccess/source/ui/control/FieldControls.cxx
@@ -63,13 +63,6 @@ OPropEditCtrl::OPropEditCtrl(Window* pParent, sal_uInt16 
nHelpId, short nPositio
 m_strHelpText = ModuleRes(nHelpId);
 }
 
-OPropEditCtrl::OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId 
_rRes,short nPosition)
-:Edit(pParent, _rRes)
-,m_nPos(nPosition)
-{
-m_strHelpText = ModuleRes(nHelpId);
-}
-
 void
 OPropEditCtrl::SetSpecialReadOnly(sal_Bool _bReadOnly)
 {
@@ -92,26 +85,12 @@ OPropNumericEditCtrl::OPropNumericEditCtrl(Window* pParent, 
sal_uInt16 nHelpId,
 m_strHelpText = ModuleRes(nHelpId);
 }
 
-OPropNumericEditCtrl::OPropNumericEditCtrl(Window* pParent, sal_uInt16 
nHelpId, const ResId _rRes,short nPosition)
-:NumericField(pParent, _rRes)
-,m_nPos(nPosition)
-{
-m_strHelpText = ModuleRes(nHelpId);
-}
-
 OPropListBoxCtrl::OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, short 
nPosition, WinBits nWinStyle)
 :ListBox(pParent, nWinStyle)
 ,m_nPos(nPosition)
 {
 m_strHelpText = ModuleRes(nHelpId);
 }
-OPropListBoxCtrl::OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, const 
ResId _rRes,short nPosition)
-:ListBox(pParent, _rRes)
-,m_nPos(nPosition)
-{
-m_strHelpText = ModuleRes(nHelpId);
-}
-
 
 void
 OPropListBoxCtrl::SetSpecialReadOnly(sal_Bool _bReadOnly)
diff --git a/dbaccess/source/ui/inc/FieldControls.hxx 
b/dbaccess/source/ui/inc/FieldControls.hxx
index 2503fa7..9b34dd0 100644
--- a/dbaccess/source/ui/inc/FieldControls.hxx
+++ b/dbaccess/source/ui/inc/FieldControls.hxx
@@ -53,7 +53,6 @@ namespace dbaui
 
 public:
 OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = 
-1, WinBits nWinStyle = 0);
-OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId 
_rRes,short nPosition = -1);
 
 virtual bool IsModified() const SAL_OVERRIDE { return GetText() != 
GetSavedValue(); }
 
@@ -70,7 +69,6 @@ namespace dbaui
 
 public:
 OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, short 
nPosition = -1, WinBits nWinStyle = 0);
-OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId 
_rRes,short nPosition = -1);
 
 virtual bool IsModified() const SAL_OVERRIDE { return GetText() != 
GetSavedValue(); }
 
@@ -88,7 +86,6 @@ namespace dbaui
 
 public:

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

2014-02-21 Thread Michael Stahl

 sfx2/source/view/viewprn.cxx|1 +
 vcl/generic/print/genprnpsp.cxx |8 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 9da8283de5c1327a30f9c8f5719a8454d1a0eab9
Author: Michael Stahl mst...@redhat.com
Date:   Tue Feb 18 22:40:20 2014 +0100

vcl: CUPS printing: notify user if spooling failed

CUPS does not accept jobs for a printer that has been stopped; pop up
an error message in this case instead of silently ignoring failure.

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

diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 12e5633..0c003ed 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -339,6 +339,7 @@ void SfxPrinterController::jobFinished( 
com::sun::star::view::PrintableState nSt
 mpObjectShell-Broadcast( SfxPrintingHint( nState ) );
 switch ( nState )
 {
+case view::PrintableState_JOB_SPOOLING_FAILED :
 case view::PrintableState_JOB_FAILED :
 {
 // real problem (not simply printing cancelled by user)
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index 1f080a2..6b8c8ce 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -1231,6 +1231,8 @@ sal_Bool PspSalPrinter::StartJob( const OUString* 
i_pFileName, const OUString i
 }
 }
 
+bool bSuccess(true);
+
 // spool files
 if( ! i_pFileName  ! bAborted )
 {
@@ -1273,6 +1275,7 @@ sal_Bool PspSalPrinter::StartJob( const OUString* 
i_pFileName, const OUString i
 aBuf.append( ' ' );
 aBuf.append( sal_Int32( i + nCurJob * 
aPDFFiles.size() ) );
 }
+bSuccess =
 PrinterInfoManager::get().endSpool( 
pPrinter-GetName(), aBuf.makeStringAndClear(), fp, m_aJobData, bFirstJob );
 bFirstJob = false;
 }
@@ -1283,7 +1286,10 @@ sal_Bool PspSalPrinter::StartJob( const OUString* 
i_pFileName, const OUString i
 }
 
 // job has been spooled
-i_rController.setJobState( bAborted ? view::PrintableState_JOB_ABORTED : 
view::PrintableState_JOB_SPOOLED );
+i_rController.setJobState( (bAborted)
+? view::PrintableState_JOB_ABORTED
+: ((bSuccess) ? view::PrintableState_JOB_SPOOLED
+  : view::PrintableState_JOB_SPOOLING_FAILED));
 
 // clean up the temporary PDF files
 if( ! i_pFileName || bAborted )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - c3/f761a8e6f6d3f959b756401e84c9a1efe35419 c6/d291416fecd48f56782d2c92f58d10b9ba2c27

2014-02-21 Thread Caolán McNamara

 c3/f761a8e6f6d3f959b756401e84c9a1efe35419 |1 +
 c6/d291416fecd48f56782d2c92f58d10b9ba2c27 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit fc61b4d7b7e9d673b3beacd88465630796755eed
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Feb 21 09:06:42 2014 +

Notes added by 'git notes add'

diff --git a/c3/f761a8e6f6d3f959b756401e84c9a1efe35419 
b/c3/f761a8e6f6d3f959b756401e84c9a1efe35419
new file mode 100644
index 000..403addb
--- /dev/null
+++ b/c3/f761a8e6f6d3f959b756401e84c9a1efe35419
@@ -0,0 +1 @@
+ignore: OS/2
commit 1e3b3679729cbf756a77c1e49aa3a25b8121b928
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Feb 21 09:06:29 2014 +

Notes added by 'git notes add'

diff --git a/c6/d291416fecd48f56782d2c92f58d10b9ba2c27 
b/c6/d291416fecd48f56782d2c92f58d10b9ba2c27
new file mode 100644
index 000..403addb
--- /dev/null
+++ b/c6/d291416fecd48f56782d2c92f58d10b9ba2c27
@@ -0,0 +1 @@
+ignore: OS/2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 38/50c1ea205b1b948077c1a7e73d37b92ae06f6f

2014-02-21 Thread Caolán McNamara

 38/50c1ea205b1b948077c1a7e73d37b92ae06f6f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f6eb3585eff2bf9a4c6071004aab371b7fd09651
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Feb 21 09:07:47 2014 +

Notes added by 'git notes add'

diff --git a/38/50c1ea205b1b948077c1a7e73d37b92ae06f6f 
b/38/50c1ea205b1b948077c1a7e73d37b92ae06f6f
new file mode 100644
index 000..403addb
--- /dev/null
+++ b/38/50c1ea205b1b948077c1a7e73d37b92ae06f6f
@@ -0,0 +1 @@
+ignore: OS/2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 9e/f080c6f3d59fd3f27559b780d456106396cb84

2014-02-21 Thread Caolán McNamara

 9e/f080c6f3d59fd3f27559b780d456106396cb84 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6b3512dac4d7e747f48895b88e185800d17295b2
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Feb 21 09:07:16 2014 +

Notes added by 'git notes add'

diff --git a/9e/f080c6f3d59fd3f27559b780d456106396cb84 
b/9e/f080c6f3d59fd3f27559b780d456106396cb84
new file mode 100644
index 000..403addb
--- /dev/null
+++ b/9e/f080c6f3d59fd3f27559b780d456106396cb84
@@ -0,0 +1 @@
+ignore: OS/2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f7/3b742763b7adc3d35b4fba73d415357045ac6e

2014-02-21 Thread Caolán McNamara

 f7/3b742763b7adc3d35b4fba73d415357045ac6e |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 28dd955d399f2266504e8c9a38321bd7bc0a6921
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Feb 21 09:08:07 2014 +

Notes added by 'git notes add'

diff --git a/f7/3b742763b7adc3d35b4fba73d415357045ac6e 
b/f7/3b742763b7adc3d35b4fba73d415357045ac6e
new file mode 100644
index 000..403addb
--- /dev/null
+++ b/f7/3b742763b7adc3d35b4fba73d415357045ac6e
@@ -0,0 +1 @@
+ignore: OS/2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 34/dd827c58caf08ff4538971dc5186aa5447e9cf

2014-02-21 Thread Caolán McNamara

 34/dd827c58caf08ff4538971dc5186aa5447e9cf |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 53c52466e1c6d6f50db7a6b8c010b60ffbbb06c8
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Feb 21 09:08:32 2014 +

Notes added by 'git notes add'

diff --git a/34/dd827c58caf08ff4538971dc5186aa5447e9cf 
b/34/dd827c58caf08ff4538971dc5186aa5447e9cf
new file mode 100644
index 000..403addb
--- /dev/null
+++ b/34/dd827c58caf08ff4538971dc5186aa5447e9cf
@@ -0,0 +1 @@
+ignore: OS/2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

fdo75264 incorrect function name tips, suggestions wanted

2014-02-21 Thread Winfried Donkers

Hi Kohei, all,

While typing a function name in a Calc cell (e.g. =GC), a tip (sometimes) 
appears above the cell with the first fitting function name.
However, when the function name contains a '_' or a '.' (e.g. GCD_ADD or 
PERCENTRANK.EXC), 
the tip doesn't show (cell content =GCD_) or shows the wrong function name 
(cell content =GCD_A produces tip AVERAGE()).
This is because in sc/source/input/app/inputhdl.cxx, function 
ScInputHandler::UseFormulaData() the call in line
  OUString aText = pEngine-GetWord( 0, asel.nEndpos-1 );
breaks the function name as '_' and '.' are seen as word separators.

Also, there are 2 tips: one above the cell (showing just function name, with 
the behaviour as above) and one below the cell (showing function name plus 
arguments, for which I submitted a patch 
(https://gerrit.libreoffice.org/#/c/8143/).
The list (ScFormulaHandler::pFormulaData) used for the tip above seems to 
contain only function names for which 'extended' names also exists, e.g. GCD 
and GCD_ADD, GCD is in the list), whereas the list used for the tip below 
(ScFormulaHandler::pFormulaDataPara) seems to contain all functions.
When the function name has no 'extended' versions (e.g. AND), no tip shows.

Why is this?
I don't want to break things when trying to fix bug fdo75264 and I am a bit 
confused about the current ScInputHandler::UseFormulaData() code.


Winfried


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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - da/f363af20ddd83bbcc7e8e9de16147c760f9085

2014-02-21 Thread Caolán McNamara

 da/f363af20ddd83bbcc7e8e9de16147c760f9085 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ec8a79d9eb811e01c84d9f32df704a921f86149d
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Feb 21 09:11:50 2014 +

Notes added by 'git notes add'

diff --git a/da/f363af20ddd83bbcc7e8e9de16147c760f9085 
b/da/f363af20ddd83bbcc7e8e9de16147c760f9085
new file mode 100644
index 000..2fb6b07
--- /dev/null
+++ b/da/f363af20ddd83bbcc7e8e9de16147c760f9085
@@ -0,0 +1 @@
+prefer: b1cb15496e7cfc8cc1c54cada5306931fa95adc6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - include/vcl vcl/generic vcl/unx

2014-02-21 Thread Michael Stahl

 include/vcl/jobdata.hxx |2 ++
 vcl/generic/print/genprnpsp.cxx |   13 +++--
 vcl/unx/generic/printer/cupsmgr.cxx |2 ++
 vcl/unx/generic/printer/jobdata.cxx |   18 ++
 4 files changed, 25 insertions(+), 10 deletions(-)

New commits:
commit 138f41fd408b120d52e3d6c185940ace065512af
Author: Michael Stahl mst...@redhat.com
Date:   Tue Feb 18 18:07:37 2014 +0100

fdo#41524: CUPS printing: use collate option when PDF is available

Assume that the CUPS printer is able to handle collating by itself,
don't send multiple print jobs (except if user clicks on Create single
print jobs for collated output of course...).

To enable collating with PDF based printers, add the collate option;
legacy PS based printers still get the weird stuff read from the PPD
(not sure what the risks of changing that are).

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

diff --git a/include/vcl/jobdata.hxx b/include/vcl/jobdata.hxx
index 974c049..af78db5 100644
--- a/include/vcl/jobdata.hxx
+++ b/include/vcl/jobdata.hxx
@@ -34,6 +34,7 @@ enum type {
 struct VCL_DLLPUBLIC JobData
 {
 int m_nCopies;
+boolm_bCollate;
 int m_nLeftMarginAdjust;
 int m_nRightMarginAdjust;
 int m_nTopMarginAdjust;
@@ -50,6 +51,7 @@ struct VCL_DLLPUBLIC JobData
 
 JobData() :
 m_nCopies( 1 ),
+m_bCollate(false),
 m_nLeftMarginAdjust( 0 ),
 m_nRightMarginAdjust( 0 ),
 m_nTopMarginAdjust( 0 ),
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index 6b8c8ce..9d28e7f 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -808,16 +808,9 @@ sal_uLong PspSalInfoPrinter::GetCapabilities( const 
ImplJobSetup* pJobSetup, sal
 return 0x;
 case PRINTER_CAPABILITIES_COLLATECOPIES:
 {
-// see if the PPD contains a value to set Collate to True
-JobData aData;
-JobData::constructFromStreamBuffer( pJobSetup-mpDriverData, 
pJobSetup-mnDriverDataLen, aData );
-
-const PPDKey* pKey = aData.m_pParser ? aData.m_pParser-getKey( 
OUString(Collate) ) : NULL;
-const PPDValue* pVal = pKey ? pKey-getValue(OUString(True)) : 
NULL;
-
 // PPDs don't mention the number of possible collated copies.
 // so let's guess as many as we want ?
-return pVal ? 0x : 0;
+return 0x;
 }
 case PRINTER_CAPABILITIES_SETORIENTATION:
 return 1;
@@ -836,7 +829,7 @@ sal_uLong PspSalInfoPrinter::GetCapabilities( const 
ImplJobSetup* pJobSetup, sal
 return 1;
 else
 {
-// see if the PPD contains a value to set Collate to True
+// see if the PPD contains a value to set PDF device
 JobData aData = PrinterInfoManager::get().getPrinterInfo( 
pJobSetup-maPrinterName );
 if( pJobSetup-mpDriverData )
 JobData::constructFromStreamBuffer( 
pJobSetup-mpDriverData, pJobSetup-mnDriverDataLen, aData );
@@ -846,7 +839,7 @@ sal_uLong PspSalInfoPrinter::GetCapabilities( const 
ImplJobSetup* pJobSetup, sal
 return PrinterInfoManager::get().checkFeatureToken( 
pJobSetup-maPrinterName, external_dialog ) ? 1 : 0;
 case PRINTER_CAPABILITIES_USEPULLMODEL:
 {
-// see if the PPD contains a value to set Collate to True
+// see if the PPD contains a value to set PDF device
 JobData aData = PrinterInfoManager::get().getPrinterInfo( 
pJobSetup-maPrinterName );
 if( pJobSetup-mpDriverData )
 JobData::constructFromStreamBuffer( pJobSetup-mpDriverData, 
pJobSetup-mnDriverDataLen, aData );
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx 
b/vcl/unx/generic/printer/cupsmgr.cxx
index 52b6bfb..069df7d 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -631,6 +631,8 @@ void CUPSManager::getOptionsFromDocumentSetup( const 
JobData rJob, bool bBanner
 {
 OString aVal( OString::number( rJob.m_nCopies ) );
 rNumOptions = cupsAddOption( copies, aVal.getStr(), rNumOptions, 
(cups_option_t**)rOptions );
+aVal = OString::boolean(rJob.m_bCollate);
+rNumOptions = cupsAddOption( collate, aVal.getStr(), rNumOptions, 
(cups_option_t**)rOptions );
 }
 if( ! bBanner )
 {
diff --git a/vcl/unx/generic/printer/jobdata.cxx 
b/vcl/unx/generic/printer/jobdata.cxx
index adf9d41..117f677 100644
--- a/vcl/unx/generic/printer/jobdata.cxx

[Libreoffice-commits] core.git: bin/gbuild-to-ide

2014-02-21 Thread Honza Havlíček

 bin/gbuild-to-ide |   63 --
 1 file changed, 47 insertions(+), 16 deletions(-)

New commits:
commit c6fd524295c0083c9a1e3f52a6abe6405cdc25a9
Author: Honza HavlÃÄek havlicek.ho...@gmail.com
Date:   Thu Feb 20 22:43:04 2014 +0100

fdo#70414: Add dependencies for solution and create solution for all 
projects

Add new Visual Studio solution for all generated projects with name
LibreOffice.sln and add dependencies between projects that are in same 
solution.
That allows building by Build Solution from menu of Visual Studio for most
projects (12 projects out of 319 fail).

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

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 0f08d71..e737dc6 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -69,7 +69,7 @@ class GbuildParser:
 srcdirpattern = re.compile('^SRCDIR = (.*)')
 builddirpattern = re.compile('^BUILDDIR = (.*)')
 instdirpattern = re.compile('^INSTDIR = (.*)')
-binpathpattern = re.compile('LS = (.*)ls(.exe)?')
+binpathpattern = re.compile('^LS = (.*)ls(.exe)?')
 libpattern = re.compile('#  [a-z]+ to execute \(from 
[\'`](.*)/Library_(.*)\.mk\', line [0-9]*\):')
 exepattern = re.compile('#  [a-z]+ to execute \(from 
[\'`](.*)/Executable_(.*)\.mk\', line [0-9]*\):')
 includepattern = re.compile('# INCLUDE := (.*)')
@@ -556,27 +556,59 @@ class 
VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
 def module_make_command(self, targets):
 return '%(sh)s -c PATH=\\/bin:$PATH\\; cd %(location)s  
%(makecmd)s -rs ' + targets + '';
 
+class Project:
+def __init__(self, guid, target, project_path):
+self.guid = guid
+self.target = target
+self.path = project_path
+
 def emit(self):
+all_projects = []
 for location in self.target_by_location:
-projects = dict()
+projects = []
 module = location.split('/')[-1]
-project_directory = os.path.join(self.solution_directory, module)
+module_directory = os.path.join(self.solution_directory, module)
 for target in self.target_by_location[location]:
-project_guid = self.write_project(project_directory, target)
-projects[project_guid] = target
-self.write_solution(os.path.join(project_directory, '%s.sln' % 
module), module, projects)
+project_path = os.path.join(module_directory, '%s.vcxproj' % 
target.name)
+project_guid = self.write_project(project_path, target)
+p = VisualStudioIntegrationGenerator.Project(project_guid, 
target, project_path)
+projects.append(p)
+self.write_solution(os.path.join(module_directory, '%s.sln' % 
module), projects)
+all_projects += projects
+
+self.write_solution(os.path.join(self.solution_directory, 
'LibreOffice.sln'), all_projects)
 
 nmake_project_guid = '8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942'
 
-def write_solution(self, solution_path, name, projects):
-print('Solution %s:' % name, end='')
+def get_project_directory(self, target):
+return os.path.join(self.solution_directory, 
target.location.split('/')[-1])
+
+def get_dependency_libs(self, linked_libs, projects):
+dependency_libs = {}
+for linked_lib in linked_libs:
+for project in projects:
+if project.target.name == linked_lib:
+dependency_libs[project.guid] = project
+return dependency_libs
+
+def write_solution(self, solution_path, projects):
+print('Solution %s:' % 
os.path.splitext(os.path.basename(solution_path))[0], end='')
 with open(solution_path, 'w') as f:
 f.write('Microsoft Visual Studio Solution File, Format Version 
12.00\n')
-for guid, target in projects.items():
+for project in projects:
+target = project.target
 print(' %s' % target.name, end='')
-f.write('Project({%s}) = %s, %s.vcxproj, {%s}\n' %
+module = target.location.split('/')[-1]
+proj_path = os.path.relpath(project.path, 
os.path.abspath(os.path.dirname(solution_path)))
+f.write('Project({%s}) = %s, %s, {%s}\n' %
 (VisualStudioIntegrationGenerator.nmake_project_guid,
-target.short_name(), target.name, guid))
+target.short_name(), proj_path, project.guid))
+libs_in_solution = 
self.get_dependency_libs(target.linked_libs, projects)
+if libs_in_solution:
+f.write('\tProjectSection(ProjectDependencies) =

[Bug 70414] create VSProject files for code editing in MSVS from gbuild

2014-02-21 Thread bugzilla-daemon

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

--- Comment #14 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Honza HavliÄek committed a patch related to this issue.
It has been pushed to master:

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

fdo#70414: Add dependencies for solution and create solution for all projects



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
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: include/editeng

2014-02-21 Thread Alexandre Vicenzi

 include/editeng/editdata.hxx  |3 ---
 include/editeng/edtdlg.hxx|1 -
 include/editeng/outlobj.hxx   |7 ---
 include/editeng/paragraphdata.hxx |7 +--
 include/editeng/txtrange.hxx  |9 -
 include/editeng/unoedsrc.hxx  |1 -
 6 files changed, 1 insertion(+), 27 deletions(-)

New commits:
commit 682ace7031b8bd0a8ee8d1ba10e95823755895ed
Author: Alexandre Vicenzi vicenzi.alexan...@gmail.com
Date:   Tue Feb 18 23:36:47 2014 -0300

fdo#63154 Remove unused solar.h reference in editeng

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

diff --git a/include/editeng/editdata.hxx b/include/editeng/editdata.hxx
index 5f59e5d..cf39557 100644
--- a/include/editeng/editdata.hxx
+++ b/include/editeng/editdata.hxx
@@ -22,7 +22,6 @@
 #define INCLUDED_EDITENG_EDITDATA_HXX
 
 #include rtl/ustring.hxx
-#include tools/solar.h
 #include editeng/editengdllapi.h
 
 class SfxItemSet;
@@ -210,8 +209,6 @@ struct EDITENG_DLLPUBLIC EFieldInfo
 EFieldInfo operator= ( const EFieldInfo );
 };
 
-// ---
-
 enum ImportState {
 RTFIMP_START, RTFIMP_END,   // only pParser, 
nPara, nIndex
 RTFIMP_NEXTTOKEN, RTFIMP_UNKNOWNATTR,   // 
nToken+nTokenValue
diff --git a/include/editeng/edtdlg.hxx b/include/editeng/edtdlg.hxx
index 6476bfe..6a25679 100644
--- a/include/editeng/edtdlg.hxx
+++ b/include/editeng/edtdlg.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_EDITENG_EDTDLG_HXX
 
 #include rtl/ustring.hxx
-#include tools/solar.h
 #include editeng/editengdllapi.h
 #include i18nlangtag/lang.h
 #include com/sun/star/uno/Reference.hxx
diff --git a/include/editeng/outlobj.hxx b/include/editeng/outlobj.hxx
index 23f9a6a..193241c 100644
--- a/include/editeng/outlobj.hxx
+++ b/include/editeng/outlobj.hxx
@@ -20,19 +20,14 @@
 #ifndef INCLUDED_EDITENG_OUTLOBJ_HXX
 #define INCLUDED_EDITENG_OUTLOBJ_HXX
 
-//
-
 #include editeng/paragraphdata.hxx
 #include editeng/editengdllapi.h
 #include rtl/ustring.hxx
 #include rsc/rscsfx.hxx
-#include tools/solar.h
 
 class EditTextObject;
 class ImplOutlinerParaObject;
 
-//
-
 class EDITENG_DLLPUBLIC OutlinerParaObject
 {
 private:
@@ -84,8 +79,6 @@ public:
 const SfxStyleFamily rNewFamily);
 };
 
-//
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/paragraphdata.hxx 
b/include/editeng/paragraphdata.hxx
index 3806e5e..b6dcfea 100644
--- a/include/editeng/paragraphdata.hxx
+++ b/include/editeng/paragraphdata.hxx
@@ -20,10 +20,9 @@
 #ifndef INCLUDED_EDITENG_PARAGRAPHDATA_HXX
 #define INCLUDED_EDITENG_PARAGRAPHDATA_HXX
 
-#include tools/solar.h
 #include vector
+#include sal/types.h
 
-//
 // Only for internal use, oder some kind like hPara for the few
 // functions where you need it outside ( eg. moving paragraphs... )
 //
@@ -53,12 +52,8 @@ public:
 sal_Int16 getDepth() const { return nDepth; }
 };
 
-//
-
 typedef ::std::vector ParagraphData  ParagraphDataVector;
 
-//
-
 #endif // INCLUDED_EDITENG_PARAGRAPHDATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/txtrange.hxx b/include/editeng/txtrange.hxx
index dd9af49..c072e09 100644
--- a/include/editeng/txtrange.hxx
+++ b/include/editeng/txtrange.hxx
@@ -21,9 +21,7 @@
 #define INCLUDED_EDITENG_TXTRANGE_HXX
 
 #include editeng/editengdllapi.h
-#include tools/solar.h
 #include tools/gen.hxx
-
 #include deque
 
 class PolyPolygon;
@@ -35,11 +33,6 @@ namespace basegfx {
 
 typedef std::dequelong* LongDqPtr;
 
-/*
-|*
-|*class TextRanger
-|*
-*/
 class EDITENG_DLLPUBLIC TextRanger
 {
 //! The RangeCache class is used to cache the result of a single range 
calculation.
@@ -91,8 +84,6 @@ public:
 void SetVertical( sal_Bool bNew );
 };
 
-
-
 #endif  // _TXTRANGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx
index fb34126..671f86b 100644
--- a/include/editeng/unoedsrc.hxx
+++ b/include/editeng/unoedsrc.hxx
@@ -25,7 +25,6 @@
 #include i18nlangtag/lang.h
 #include rtl/ustring.hxx
 #include tools/gen.hxx
-#include tools/solar.h
 #include

[Bug 63154] replace tools/solar.h macros with osl versions

2014-02-21 Thread bugzilla-daemon

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

--- Comment #61 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Alexandre Vicenzi committed a patch related to this issue.
It has been pushed to master:

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

fdo#63154 Remove unused solar.h reference in editeng



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
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: external/liborcus

2014-02-21 Thread Matúš Kukan

 external/liborcus/ExternalProject_liborcus.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a11dff0342cd826c6e680a83a011e606595acfb7
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Fri Feb 21 18:28:19 2014 +0100

Build liborcus with lto flags. To unbreak linking phase.

Change-Id: Ie24054a9c0538187e1b234101dd41f30306ec2ae

diff --git a/external/liborcus/ExternalProject_liborcus.mk 
b/external/liborcus/ExternalProject_liborcus.mk
index a62855d4e..4247e51 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -68,8 +68,8 @@ liborcus_CPPFLAGS+=-D_GLIBCXX_DEBUG
 endif
 endif
 
-liborcus_CXXFLAGS=$(CXXFLAGS)
-liborcus_LDFLAGS=$(LDFLAGS)
+liborcus_CXXFLAGS=$(CXXFLAGS) $(gb_LTOFLAGS)
+liborcus_LDFLAGS=$(LDFLAGS) $(gb_LTOFLAGS)
 ifeq ($(COM),MSC)
 liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS)
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 17 commits - cppu/source dbaccess/source filter/source formula/source hwpfilter/source include/filter l10ntools/inc l10ntools/source sc/source

2014-02-21 Thread Noel Grandin

 cppu/source/AffineBridge/AffineBridge.cxx|5 
 dbaccess/source/core/api/TableDeco.cxx   |1 
 dbaccess/source/core/dataaccess/ContentHelper.cxx|1 
 dbaccess/source/core/inc/TableDeco.hxx   |1 
 dbaccess/source/ui/misc/TokenWriter.cxx  |1 
 filter/source/graphicfilter/egif/giflzwc.cxx |3 
 filter/source/graphicfilter/egif/giflzwc.hxx |   10 -
 filter/source/graphicfilter/eps/eps.cxx  |   50 ++
 filter/source/graphicfilter/ios2met/ios2met.cxx  |   83 ++-
 formula/source/core/api/FormulaCompiler.cxx  |8 -
 hwpfilter/source/hbox.h  |9 -
 include/filter/msfilter/svdfppt.hxx  |   14 +
 l10ntools/inc/export.hxx |1 
 l10ntools/source/export.cxx  |6 
 sc/source/core/data/dptabdat.cxx |3 
 sc/source/core/tool/adiasync.cxx |2 
 sc/source/filter/excel/exctools.cxx  |1 
 sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx |2 
 sc/source/ui/miscdlgs/anyrefdg.cxx   |2 
 19 files changed, 147 insertions(+), 56 deletions(-)

New commits:
commit b32658e7c492b33c15c738f6dd365b921f29dbc4
Author: Noel Grandin n...@peralex.com
Date:   Thu Feb 20 16:00:53 2014 +0200

cid#708091 Uninitialized pointer field

Change-Id: Ibc068d4a077d3715f4f8c28d20f53167686cbbee

diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx 
b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 0ed8c67..2dcb9cf 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -48,9 +48,11 @@
 ScFormulaReferenceHelper::ScFormulaReferenceHelper(IAnyRefDialog* 
_pDlg,SfxBindings* _pBindings)
  : m_pDlg(_pDlg)
  , pRefEdit (NULL)
+ , pRefBtn (NULL)
  , m_pWindow(NULL)
  , m_pBindings(_pBindings)
  , pAccel( NULL )
+ , m_nOldBorderWidth (0)
  , nRefTab(0)
  , mnOldEditWidthReq( -1 )
  , mpOldEditParent( NULL )
commit 628dbbc99e0841c84a046eda572c35b337c5c1bd
Author: Noel Grandin n...@peralex.com
Date:   Thu Feb 20 15:58:28 2014 +0200

cid#708083 Uninitialized pointer field

Change-Id: Ic0b5b9f70c09127c4b73a4faf38383cb4cfa1d67

diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx 
b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index daa8605..e911c89 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -527,7 +527,7 @@ private:
 };
 
 ScIAccessibleViewForwarder::ScIAccessibleViewForwarder()
-: mbValid(false)
+: mpViewShell(NULL), mpAccDoc(NULL), mbValid(false)
 {
 }
 
commit be5d879b540ca7b897e844927a6ce2cc4e4b6f40
Author: Noel Grandin n...@peralex.com
Date:   Thu Feb 20 15:55:30 2014 +0200

cid#708029 Uninitialized pointer field

Change-Id: Ifb61a1db7a0527f4d722a753c0918ef035436997

diff --git a/sc/source/filter/excel/exctools.cxx 
b/sc/source/filter/excel/exctools.cxx
index 8e26dc5..780b943 100644
--- a/sc/source/filter/excel/exctools.cxx
+++ b/sc/source/filter/excel/exctools.cxx
@@ -63,6 +63,7 @@ RootData::RootData( void )
 
 pIR = NULL;
 pER = NULL;
+pColRowBuff = NULL;
 }
 
 RootData::~RootData()
commit 09fed2bcd3653f53f68a51b9162ba1f27b86fb2c
Author: Noel Grandin n...@peralex.com
Date:   Thu Feb 20 15:39:20 2014 +0200

cid#708014 Uninitialized pointer field

Change-Id: Icfffb7ce6e34f31ae1bcc2964460e59f5486399d

diff --git a/sc/source/core/tool/adiasync.cxx b/sc/source/core/tool/adiasync.cxx
index bd5b0b9..ad41cfd 100644
--- a/sc/source/core/tool/adiasync.cxx
+++ b/sc/source/core/tool/adiasync.cxx
@@ -38,6 +38,8 @@ void CALLTYPE ScAddInAsyncCallBack( double nHandle, void* 
pData )
 
 ScAddInAsync::ScAddInAsync() :
 SvtBroadcaster(),
+pDocs( NULL ),
+mpFuncData( NULL ),
 nHandle( 0 )
 {   // nur fuer aSeekObj !
 }
commit b6c8a233f272a36ad2595b7589a2b0afd987ec0a
Author: Noel Grandin n...@peralex.com
Date:   Thu Feb 20 15:36:16 2014 +0200

cid#707998 Uninitialized pointer field

Change-Id: I7e72f2e3f2d62c0f293f9cdab212fabd74452b4d

diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx
index 954cdee..494c492 100644
--- a/sc/source/core/data/dptabdat.cxx
+++ b/sc/source/core/data/dptabdat.cxx
@@ -41,6 +41,9 @@ using ::std::vector;
 // ---
 
 ScDPTableData::CalcInfo::CalcInfo() :
+pInitState( NULL ),
+pColRoot( NULL ),
+pRowRoot( NULL ),
 bRepeatIfEmpty(false)
 {
 }
commit f5d4d2bf566cd55394d1d1f30ebcb5a180089fdd
Author: Noel Grandin n...@peralex.com
Date:   Thu Feb 20 15:29:41 2014 +0200

cid#707946 Uninitialized pointer field

this

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

2014-02-21 Thread Oliver-Rainer Wittmann

 writerfilter/source/dmapper/DomainMapperTableManager.cxx |   86 +++
 writerfilter/source/dmapper/DomainMapperTableManager.hxx |   11 +
 2 files changed, 75 insertions(+), 22 deletions(-)

New commits:
commit 321d104cf2c13582a08a2313ff733fa02bc6610f
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Fri Feb 21 09:53:15 2014 +

123345: assure availability of member data for table style import

diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx 
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index bc23e69..cc09b65 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -81,6 +81,7 @@ bool DomainMapperTableManager::sprm(Sprm  rSprm)
 dmapper_logger-endElement(tablemanager.sprm);
 #endif
 bool bRet = DomainMapperTableManager_Base_t::sprm(rSprm);
+
 if( !bRet )
 {
 bRet = m_pTablePropsHandler-sprm( rSprm );
@@ -89,17 +90,20 @@ bool DomainMapperTableManager::sprm(Sprm  rSprm)
 if ( !bRet )
 {
 bRet = true;
-sal_uInt32 nSprmId = rSprm.getId();
-Value::Pointer_t pValue = rSprm.getValue();
-sal_Int32 nIntValue = ((pValue.get() != NULL) ? pValue-getInt() : 0);
+const sal_uInt32 nSprmId = rSprm.getId();
+const Value::Pointer_t pValue = rSprm.getValue();
+const sal_Int32 nIntValue = ((pValue.get() != NULL) ? pValue-getInt() 
: 0);
 switch ( nSprmId )
 {
 case 0xf661: //sprmTTRLeft left table indent
 /* WRITERFILTERSTATUS: done: 100, planned: 2, spent: 0 */
+
 case 0xf614: // sprmTTPreferredWidth - preferred table width
 /* WRITERFILTERSTATUS: done: 100, planned: 2, spent: 0 */
+
 case NS_ooxml::LN_CT_TblPrBase_tblW:  //90722;
 /* WRITERFILTERSTATUS: done: 100, planned: 2, spent: 0 */
+
 case NS_ooxml::LN_CT_TblPrBase_tblInd: //90725
 /* WRITERFILTERSTATUS: done: 100, planned: 2, spent: 0 */
 {
@@ -127,8 +131,9 @@ bool DomainMapperTableManager::sprm(Sprm  rSprm)
 }
 }
 break;
+
 case 0x3404:// sprmTTableHeader
-case NS_ooxml::LN_CT_TrPrBase_tblHeader: //90704
+case NS_ooxml::LN_CT_TrPrBase_tblHeader:
 /* WRITERFILTERSTATUS: done: 100, planned: 2, spent: 0 */
 // if nIntValue == 1 then the row is a repeated header line
 // to prevent later rows from increasing the repeating 
m_nHeaderRepeat is set to NULL when repeating stops
@@ -142,6 +147,7 @@ bool DomainMapperTableManager::sprm(Sprm  rSprm)
 else
 m_nCurrentHeaderRepeatCount.top() = -1;
 break;
+
 case 0xd608: // TDefTable
 /* WRITERFILTERSTATUS: done: 100, planned: 2, spent: 0 */
 {
@@ -173,6 +179,7 @@ bool DomainMapperTableManager::sprm(Sprm  rSprm)
 }
 }
 break;
+
 case 0xD605: // sprmTTableBorders
 /* WRITERFILTERSTATUS: done: 100, planned: 2, spent: 0 */
 {
@@ -188,12 +195,15 @@ bool DomainMapperTableManager::sprm(Sprm  rSprm)
 }
 }
 break;
+
 case 0xd632 : //sprmTNewSpacing
 /* WRITERFILTERSTATUS: done: 0, planned: 2, spent: 0 */
+
 case 0xd634 : //sprmTNewSpacing
 /* WRITERFILTERSTATUS: done: 0, planned: 2, spent: 0 */
 //TODO: sprms contain default (TNew) and actual border spacing 
of cells - not resolvable yet
 break;
+
 case 0xd613: //sprmTGridLineProps
 /* WRITERFILTERSTATUS: done: 0, planned: 2, spent: 0 */
 // TODO: needs a handler
@@ -211,10 +221,12 @@ bool DomainMapperTableManager::sprm(Sprm  rSprm)
 
 */
 break;
+
 case 0x740a : //sprmTTlp
 /* WRITERFILTERSTATUS: done: 0, planned: 2, spent: 0 */
 //TODO: Table look specifier
 break;
+
 case 0x6816 : //unknown
 case 0x3466 : //unknown
 case 0x3615 : //unknown
@@ -225,6 +237,7 @@ bool DomainMapperTableManager::sprm(Sprm  rSprm)
 /* WRITERFILTERSTATUS: done: 100, planned: 2, spent: 0 */
 bRet = false;
 break;
+
 case NS_ooxml::LN_CT_TblPrBase_tblStyle: //table style name
 /* WRITERFILTERSTATUS: done: 100, planned: 2, spent: 0 */
 {
@@ -233,12 +246,14 @@ bool DomainMapperTableManager::sprm(Sprm  rSprm)
 insertTableProps(pPropMap);
 }
 break;
+
 case NS_ooxml::LN_CT_TblGridBase_gridCol:
 /* WRITERFILTERSTATUS: done: 100, planned: 2, spent: 0 */
 {
 getCurrentGrid()-push_back(

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

2014-02-21 Thread Caolán McNamara

 svtools/source/svhtml/htmlkywd.cxx |5 ++---
 svtools/source/svhtml/parhtml.cxx  |   12 +---
 2 files changed, 7 insertions(+), 10 deletions(-)

New commits:
commit 456b92609cdd0795e165ca4487419d1f329bb158
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Feb 21 09:32:17 2014 +

fdo#74584: complete revert various previous changes to upcase HTML tags

f1f8b3bfdc3406ea79b662a2fda3d0c1cb87bb10 says it reverts

commit 3c84fa61570113d1dfb2523ab88f268eeeb46c3c.
commit 96a1f60aeb2a7954533da9b4aa4947efb7a65e70.
commit 1f74a3ce201bad68f160584900285e2c087ab2c0.
commit 3d481254a07fe82d11953f9825a2f8fc6eeabc0b.

but only reverted 3d481254a07fe82d11953f9825a2f8fc6eeabc0b

Change-Id: I0530bd0b176b1f1e9bbf8eee78376991c664a850

diff --git a/svtools/source/svhtml/htmlkywd.cxx 
b/svtools/source/svhtml/htmlkywd.cxx
index affbc86..c0b7915 100644
--- a/svtools/source/svhtml/htmlkywd.cxx
+++ b/svtools/source/svhtml/htmlkywd.cxx
@@ -189,7 +189,6 @@ static int SAL_CALL HTMLKeyCompare( const void *pFirst, 
const void *pSecond)
 
 int GetHTMLToken( const OUString rName )
 {
-OUString aNameUpper = rName.toAsciiUpperCase();
 if( !bSortKeyWords )
 {
 qsort( (void*) aHTMLTokenTab,
@@ -201,12 +200,12 @@ int GetHTMLToken( const OUString rName )
 
 int nRet = 0;
 
-if (!aNameUpper.compareTo(OOO_STRING_SVTOOLS_HTML_comment, 3))
+if( !rName.compareTo( OOO_STRING_SVTOOLS_HTML_comment, 3  ) )
 return HTML_COMMENT;
 
 void* pFound;
 HTML_TokenEntry aSrch;
-aSrch.pUToken = aNameUpper;
+aSrch.pUToken = rName;
 aSrch.nToken = -1;
 
 pFound = bsearch( (sal_Char *) aSrch,
diff --git a/svtools/source/svhtml/parhtml.cxx 
b/svtools/source/svhtml/parhtml.cxx
index a941a06..6517e5c 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -881,7 +881,7 @@ int HTMLParser::_GetNextRawToken()
 }
 
 OUString aTok( sTmpBuffer.toString() );
-aTok = aTok.toAsciiUpperCase();
+aTok = aTok.toAsciiLowerCase();
 bool bDone = false;
 if( bReadScript || !aEndToken.isEmpty() )
 {
@@ -1126,7 +1126,7 @@ int HTMLParser::_GetNextToken()
 
 // Search token in table:
 sSaveToken = aToken;
-aToken = aToken.toAsciiUpperCase();
+aToken = aToken.toAsciiLowerCase();
 if( 0 == (nRet = GetHTMLToken( aToken )) )
 // Unknown control
 nRet = HTML_UNKNOWNCONTROL_ON;
@@ -1462,10 +1462,8 @@ const HTMLOptions HTMLParser::GetOptions( sal_uInt16 
*pNoConvertToken )
 
 OUString sName( aToken.copy( nStt, nPos-nStt ) );
 
-// PlugIns require original token name. Convert to upper case only 
for searching.
-OUString sNameUpperCase( sName.toAsciiUpperCase() );
-
-nToken = GetHTMLOption( sNameUpperCase ); // Name is ready
+// PlugIns require original token name. Convert to lower case only 
for searching.
+nToken = GetHTMLOption( sName.toAsciiLowerCase() ); // Name is 
ready
 DBG_ASSERTWARNING( nToken!=HTML_O_UNKNOWN,
 GetOption: unknown HTML option );
 bool bStripCRLF = (nToken  HTML_OPTION_SCRIPT_START ||
@@ -1913,7 +1911,7 @@ bool HTMLParser::IsHTMLFormat( const sal_Char* pHeader,
 sCmp = pHeader;
 }
 
-sCmp = sCmp.toAsciiUpperCase();
+sCmp = sCmp.toAsciiLowerCase();
 
 // A HTML document must have a '' in the first line
 sal_Int32 nStart = sCmp.indexOf('');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/python3

2014-02-21 Thread Matúš Kukan

 external/python3/ExternalProject_python3.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c84a79f095aeef527cbea7eaf09777047cee6c1c
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Fri Feb 21 19:30:45 2014 +0100

Use gb_LTOFLAGS for python3 too.

Change-Id: Ida2dee3b66dd7fbc7942d47a13ce38dda82db866

diff --git a/external/python3/ExternalProject_python3.mk 
b/external/python3/ExternalProject_python3.mk
index 6254cda..8cce5cb 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -51,7 +51,7 @@ else
 # create a symlink LO_lib because the .so are in a directory with platform
 # specific name like build/lib.linux-x86_64-3.3
 
-python3_cflags = $(ZLIB_CFLAGS)
+python3_cflags = $(ZLIB_CFLAGS) $(gb_LTOFLAGS)
 ifneq (,$(ENABLE_VALGRIND))
 python3_cflags += $(VALGRIND_CFLAGS)
 endif
@@ -85,6 +85,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
$(if $(SYSBASE), -L$(SYSBASE)/usr/lib) \
$(if $(filter WNT-GCC,$(OS)-$(COM)), -shared-libgcc \
$(if $(filter 
YES,$(MINGW_SHARED_GCCLIB)),-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 
-Wl$(COMMA)--export-all-symbols)) \
+   $(gb_LTOFLAGS) \
) \
 MAKEFLAGS= $(MAKE) \
$(if $(filter 
MACOSX,$(OS)),DESTDIR=$(EXTERNAL_WORKDIR)/python-inst install) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Patch for bug 71984

2014-02-21 Thread Pavel Laštovička


Hi all,

I have finally posted a fix for
https://bugs.freedesktop.org/show_bug.cgi?id=71984
The patch is against 4.1.3, hopefully it applies on master.

Sorry it took so long.

--
Pavel Laštovička
blue.point Solutions spol. s  r. o.

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

Re: Patch for bug 71984

2014-02-21 Thread Andras Timar

Hi Pavel,

On Fri, Feb 21, 2014 at 11:41 AM, Pavel Laštovička
pavel.lastovi...@blue-point.cz wrote:
 Hi all,

 I have finally posted a fix for
 https://bugs.freedesktop.org/show_bug.cgi?id=71984
 The patch is against 4.1.3, hopefully it applies on master.

Thanks for the patch. As far as I can tell you're not already listed
as a dev, could you add
yourself to https://wiki.documentfoundation.org/Development/Developers
and follow the
https://wiki.documentfoundation.org/Development/Developers#Example_Statement
example for license statements?


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

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

2014-02-21 Thread Jan Holesovsky

 svtools/source/svhtml/htmlkywd.cxx |  284 ++---
 svtools/source/svhtml/parhtml.cxx  |9 -
 2 files changed, 147 insertions(+), 146 deletions(-)

New commits:
commit 8a467da032954f4591ed30c0ca3a9bc05b343e06
Author: Jan Holesovsky ke...@collabora.com
Date:   Fri Feb 21 11:16:59 2014 +0100

html: Make GetColor() working in lower case.

To be consistent with the rest that works in lower case now.

Change-Id: I6fe40e71393230bbde8e283b1f98479bf644c610

diff --git a/svtools/source/svhtml/parhtml.cxx 
b/svtools/source/svhtml/parhtml.cxx
index 6517e5c..5d49ab5 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -229,8 +229,7 @@ void HTMLOption::GetColor( Color rColor ) const
 DBG_ASSERT( (nToken=HTML_OPTION_COLOR_START  
nTokenHTML_OPTION_COLOR_END) || nToken==HTML_O_SIZE,
 GetColor: Option is not a color. );
 
-OUString aTmp( aValue );
-aTmp = aTmp.toAsciiUpperCase();
+OUString aTmp(aValue.toAsciiLowerCase());
 sal_uInt32 nColor = SAL_MAX_UINT32;
 if( '#' != aTmp[0] )
 nColor = GetHTMLColor( aTmp );
@@ -252,9 +251,9 @@ void HTMLOption::GetColor( Color rColor ) const
 }
 nColor *= 16;
 if( c = '0'  c = '9' )
-nColor += (c - 48);
-else if( c = 'A'  c = 'F' )
-nColor += (c - 55);
+nColor += (c - '0');
+else if( c = 'a'  c = 'f' )
+nColor += (c + 0xa - 'a');
 }
 }
 
commit 0f1b3df7a35251e077404c4534bc14a35fd0501a
Author: Jan Holesovsky ke...@collabora.com
Date:   Fri Feb 21 10:54:16 2014 +0100

html: Lowercase the html colors, and make the comparison more robust.

Change-Id: I5fb3b1c8ea3692864707489ff9a82b78c5647d4a

diff --git a/svtools/source/svhtml/htmlkywd.cxx 
b/svtools/source/svhtml/htmlkywd.cxx
index c0b7915..4c0fde7 100644
--- a/svtools/source/svhtml/htmlkywd.cxx
+++ b/svtools/source/svhtml/htmlkywd.cxx
@@ -753,146 +753,146 @@ static bool bSortColorKeyWords = false;
 // http://www.uio.no/~mnbjerke/colors_w.html;)
 // http://www.infi.net/wwwimages/colorindex.html; seem to be buggy.
 static HTML_ColorEntry aHTMLColorNameTab[] = {
-{ { ALICEBLUE }, 0x00f0f8ffUL },
-{ { ANTIQUEWHITE }, 0x00faebd7UL },
-{ { AQUA }, 0xUL },
-{ { AQUAMARINE }, 0x007fffd4UL },
-{ { AZURE }, 0x00f0UL },
-{ { BEIGE }, 0x00f5f5dcUL },
-{ { BISQUE }, 0x00ffe4c4UL },
-{ { BLACK }, 0xUL },
-{ { BLANCHEDALMOND }, 0x00ffebcdUL },
-{ { BLUE }, 0x00ffUL },
-{ { BLUEVIOLET }, 0x008a2be2UL },
-{ { BROWN }, 0x00a52a2aUL },
-{ { BURLYWOOD }, 0x00deb887UL },
-{ { CADETBLUE }, 0x005f9ea0UL },
-{ { CHARTREUSE }, 0x007fff00UL },
-{ { CHOCOLATE }, 0x00d2691eUL },
-{ { CORAL }, 0x00ff7f50UL },
-{ { CORNFLOWERBLUE }, 0x006495edUL },
-{ { CORNSILK }, 0x00fff8dcUL },
-{ { CRIMSON }, 0x00dc143cUL },
-{ { CYAN }, 0xUL },
-{ { DARKBLUE }, 0x008bUL },
-{ { DARKCYAN }, 0x8b8bUL },
-{ { DARKGOLDENROD }, 0x00b8860bUL },
-{ { DARKGRAY }, 0x00a9a9a9UL },
-{ { DARKGREEN }, 0x6400UL },
-{ { DARKKHAKI }, 0x00bdb76bUL },
-{ { DARKMAGENTA }, 0x008b008bUL },
-{ { DARKOLIVEGREEN }, 0x00556b2fUL },
-{ { DARKORANGE }, 0x00ff8c00UL },
-{ { DARKORCHID }, 0x009932ccUL },
-{ { DARKRED }, 0x008bUL },
-{ { DARKSALMON }, 0x00e9967aUL },
-{ { DARKSEAGREEN }, 0x008fbc8fUL },
-{ { DARKSLATEBLUE }, 0x00483d8bUL },
-{ { DARKSLATEGRAY }, 0x002f4f4fUL },
-{ { DARKTURQUOISE }, 0xced1UL },
-{ { DARKVIOLET }, 0x009400d3UL },
-{ { DEEPPINK }, 0x00ff1493UL },
-{ { DEEPSKYBLUE }, 0xbfffUL },
-{ { DIMGRAY }, 0x00696969UL },
-{ { DODGERBLUE }, 0x001e90ffUL },
-{ { FIREBRICK }, 0x00b2UL },
-{ { FLORALWHITE }, 0x00fffaf0UL },
-{ { FORESTGREEN }, 0x00228b22UL },
-{ { FUCHSIA }, 0x00ff00ffUL },
-{ { GAINSBORO }, 0x00dcdcdcUL },
-{ { GHOSTWHITE }, 0x00f8f8ffUL },
-{ { GOLD }, 0x00ffd700UL },
-{ { GOLDENROD }, 0x00daa520UL },
-{ { GRAY }, 0x00808080UL },
-{ { GREEN }, 0x8000UL },
-{ { GREENYELLOW }, 0x00adff2fUL },
-{ { HONEYDEW }, 0x00f0fff0UL },
-{ { HOTPINK }, 0x00ff69b4UL },
-{ { INDIANRED }, 0x00cd5c5cUL },
-{ { INDIGO }, 0x004b0082UL },
-{ { IVORY }, 0x00f0UL },
-{ { KHAKI }, 0x00f0e68cUL },
-{ { LAVENDER }, 0x00e6e6faUL },
-{ { LAVENDERBLUSH }, 0x00fff0f5UL },
-{ { LAWNGREEN }, 0x007cfc00UL },
-{ { LEMONCHIFFON }, 0x00fffacdUL },
-{ { LIGHTBLUE }, 0x00add8e6UL },
-{ { LIGHTCORAL }, 0x00f08080UL },
-{ { LIGHTCYAN }, 0x00e0UL },
-{ { LIGHTGOLDENRODYELLOW }, 0x00fafad2UL },
-{ { LIGHTGREEN }, 0x0090ee90UL },
-{ { LIGHTGREY }, 0x00d3d3d3UL },
-{ { LIGHTPINK }, 0x00ffb6c1UL },
-{ { LIGHTSALMON }, 0x00ffa07aUL },
-{ { LIGHTSEAGREEN }, 0x0020b2aaUL },
-{ {

[Bug 75280] [Easyhack] Convert inappropriate use of sal_uIntPtr to better integer types

2014-02-21 Thread bugzilla-daemon

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

Alexandre Vicenzi vicenzi.alexan...@gmail.com changed:

   What|Removed |Added

 Status|NEW |ASSIGNED
   Assignee|libreoffice-b...@lists.free |vicenzi.alexan...@gmail.com
   |desktop.org |

--- Comment #1 from Alexandre Vicenzi vicenzi.alexan...@gmail.com ---
As I'm working in 63154, I will take a look in this bug.

-- 
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

Pavel Lastovicka's License Statement

2014-02-21 Thread Pavel Laštovička


Hello,

here is my license statement:

All of my past  future contributions to LibreOffice may be
licensed under the MPLv2/LGPLv3+ dual license.

All the best,

--

Pavel Laštovička
blue.point Solutions spol. s  r. o.

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

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

2014-02-21 Thread Stephan Bergmann

 solenv/gbuild/platform/com_GCC_class.mk |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 1c8402465cfd4df862409dc310f5f099d044c4d8
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Feb 20 13:10:10 2014 +0100

Don't unnecessarily(?) drop compiler flags when rewriting

Change-Id: I674d1eeecee593e0d6ed83c34e2afa0ccad633b0

diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index 88542e1..2308af8 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -72,11 +72,14 @@ $(call gb_Helper_abbreviate_dirs,\
 ICECC=no CCACHE_DISABLE=1 \
$(gb_CC) \
$(DEFS) \
+   $(gb_LTOFLAGS) \
+   $(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
+   $(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \
+   $(gb_COMPILER_PLUGINS) \
$(T_CFLAGS) $(T_CFLAGS_APPEND) \
-c $(2) \
-I$(dir $(2)) \
$(INCLUDE) \
-   $(gb_COMPILER_PLUGINS) \
)
 endef
 
@@ -113,11 +116,14 @@ $(call gb_Helper_abbreviate_dirs,\
 ICECC=no CCACHE_DISABLE=1 \
$(gb_CXX) \
$(DEFS) \
+   $(gb_LTOFLAGS) \
+   $(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \
+   $(if $(WARNINGS_NOT_ERRORS),,$(gb_CXXFLAGS_WERROR)) \
+   $(gb_COMPILER_PLUGINS) \
$(T_CXXFLAGS) $(T_CXXFLAGS_APPEND) \
-c $(2) \
-I$(dir $(2)) \
$(INCLUDE) \
-   $(gb_COMPILER_PLUGINS) \
)
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-21 Thread Miklos Vajna

 sw/qa/extras/ooxmlexport/data/dml-picture-in-textframe.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx|   11 +
 sw/source/filter/ww8/docxattributeoutput.cxx|   14 +---
 sw/source/filter/ww8/docxattributeoutput.hxx|3 ++
 sw/source/filter/ww8/docxexport.cxx |3 ++
 5 files changed, 28 insertions(+), 3 deletions(-)

New commits:
commit 32ada80a9f47b095d7b0c4d16e3422f6ef7f2ac2
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Feb 21 12:57:57 2014 +0100

DOCX export: make sure a graphic is only written once

Even if it's referenced multiple times, because of mc:AlternateContent.

Change-Id: Ie4cb0ec088d12be5421bac43113c8ae4636028e0

diff --git a/sw/qa/extras/ooxmlexport/data/dml-picture-in-textframe.docx 
b/sw/qa/extras/ooxmlexport/data/dml-picture-in-textframe.docx
new file mode 100755
index 000..7d58761
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/dml-picture-in-textframe.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index c68d3df..025b27e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2307,6 +2307,17 @@ DECLARE_OOXMLEXPORT_TEST(testDmlShapeRelsize, 
dml-shape-relsize.docx)
 assertXPath(pXmlDoc, 
/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/wp14:sizeRelH,
 relativeFrom, margin);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testDmlPictureInTextframe, 
dml-picture-in-textframe.docx)
+{
+if (!m_bExported)
+return;
+
+uno::Referencepackages::zip::XZipFileAccess2 xNameAccess = 
packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory),
 m_aTempFile.GetURL());
+CPPUNIT_ASSERT_EQUAL(true, 
bool(xNameAccess-hasByName(word/media/image1.gif)));
+// This was also true, image was written twice.
+CPPUNIT_ASSERT_EQUAL(false, 
bool(xNameAccess-hasByName(word/media/image2.gif)));
+}
+
 DECLARE_OOXMLEXPORT_TEST(testDmlGroupshapeRelsize, 
dml-groupshape-relsize.docx)
 {
 xmlDocPtr pXmlDoc = parseExport(word/document.xml);
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index afeb057..ab71fd9 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3020,10 +3020,18 @@ void DocxAttributeOutput::FlyFrameGraphic( const 
SwGrfNode* pGrfNode, const Size
 else
 pGraphic = pOLENode-GetGraphic();
 
-m_rDrawingML.SetFS( m_pSerializer ); // to be sure that we write to 
the right stream
-OUString aImageId = m_rDrawingML.WriteImage( *pGraphic );
+if (m_aRelIdCache.find(pGraphic) != m_aRelIdCache.end())
+// We already have a RelId for this Graphic.
+aRelId = m_aRelIdCache[pGraphic];
+else
+{
+// Not in cache, then need to write it.
+m_rDrawingML.SetFS( m_pSerializer ); // to be sure that we write 
to the right stream
+OUString aImageId = m_rDrawingML.WriteImage( *pGraphic );
 
-aRelId = OUStringToOString( aImageId, RTL_TEXTENCODING_UTF8 );
+aRelId = OUStringToOString( aImageId, RTL_TEXTENCODING_UTF8 );
+m_aRelIdCache[pGraphic] = aRelId;
+}
 
 nImageType = XML_embed;
 }
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index e25606d..47ce782 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -824,6 +824,9 @@ private:
 
 bool m_setFootnote;
 
+/// RelId - Graphic* cache, so that in case of alternate content, the 
same graphic only gets written once.
+std::mapconst Graphic*, OString m_aRelIdCache;
+
 public:
 DocxAttributeOutput( DocxExport rExport, ::sax_fastparser::FSHelperPtr 
pSerializer, oox::drawingml::DrawingML* pDrawingML );
 
commit 3f6df3835fec71ea61894f9a3bbfe5e4a06a5495
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Feb 21 12:56:59 2014 +0100

DOCX export: fix image counters for multiple documents

The next commit will have a testcase for this, too.

Change-Id: Ia4ed1bb5095cc1ade78a404ec3328b7d1349dc3d

diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index e004cc5..2f416e5 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -379,6 +379,9 @@ void DocxExport::ExportDocument_Impl()
 // init sections
 m_pSections = new MSWordSections( *this );
 
+// Make sure images are counted from one, even when exporting multiple 
documents.
+oox::drawingml::DrawingML::ResetCounters();
+
 WriteMainText();
 
 WriteFootnotesEndnotes();
___
Libreoffice-commits mailing list

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - graphite/graphite-2.3.1.patch sd/source

2014-02-21 Thread Andre Fischer

 graphite/graphite-2.3.1.patch  |   25 ++
 sd/source/ui/slidesorter/controller/SlideSorterController.cxx  |   12 +--
 sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx |5 +
 sd/source/ui/slidesorter/controller/SlsPageSelector.cxx|   40 
++
 sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx|2 
 sd/source/ui/slidesorter/model/SlideSorterModel.cxx|   31 ++-
 sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx  |4 -
 7 files changed, 89 insertions(+), 30 deletions(-)

New commits:
commit 163d414311b0c8bcb1b0ad7c7cbf364e0ad4e4c4
Author: Andre Fischer a...@apache.org
Date:   Fri Feb 21 11:55:33 2014 +

123197: Fixed selection problems when switching between normal and master 
mode.

diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx 
b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index 83650d7..5b59595 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -946,6 +946,8 @@ void SlideSorterController::FinishEditModeChange (void)
 {
 if (mrModel.GetEditMode() == EM_MASTERPAGE)
 {
+mpPageSelector-DeselectAllPages();
+
 // Search for the master page that was determined in
 // PrepareEditModeChange() and make it the current page.
 PageEnumeration aAllPages 
(PageEnumerationProvider::CreateAllPagesEnumeration(mrModel));
@@ -955,16 +957,20 @@ void SlideSorterController::FinishEditModeChange (void)
 if (pDescriptor-GetPage() == mpEditModeChangeMasterPage)
 {
 GetCurrentSlideManager()-SwitchCurrentSlide(pDescriptor);
+mpPageSelector-SelectPage(pDescriptor);
 break;
 }
 }
 }
 else
 {
+PageSelector::BroadcastLock aBroadcastLock (*mpPageSelector);
+
 SharedPageDescriptor pDescriptor 
(mrModel.GetPageDescriptor(mnCurrentPageBeforeSwitch));
 GetCurrentSlideManager()-SwitchCurrentSlide(pDescriptor);
 
 // Restore the selection.
+mpPageSelector-DeselectAllPages();
 ::std::vectorSdPage*::iterator iPage;
 for (iPage=maSelectionBeforeSwitch.begin();
  iPage!=maSelectionBeforeSwitch.end();
@@ -1049,12 +1055,6 @@ void SlideSorterController::SetDocumentSlides (const 
Referencecontainer::XIndex
 PreModelChange();
 
 mrModel.SetDocumentSlides(rxSlides);
-mrView.Layout();
-
-// Select just the current slide.
-PageSelector::BroadcastLock aBroadcastLock (*mpPageSelector);
-mpPageSelector-DeselectAllPages();
-mpPageSelector-SelectPage(mpCurrentSlideManager-GetCurrentSlide());
 }
 }
 
diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx 
b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
index 0aa9f08..9676c5e 100644
--- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
@@ -86,11 +86,14 @@ void CurrentSlideManager::NotifyCurrentSlideChange (const 
sal_Int32 nSlideIndex)
 {
 if (mnCurrentSlideIndex != nSlideIndex)
 {
+PageSelector::BroadcastLock aBroadcastLock 
(mrSlideSorter.GetController().GetPageSelector());
+
+mrSlideSorter.GetController().GetPageSelector().DeselectAllPages();
+
 ReleaseCurrentSlide();
 AcquireCurrentSlide(nSlideIndex);
 
 // Update the selection.
-mrSlideSorter.GetController().GetPageSelector().DeselectAllPages();
 if (mpCurrentSlide)
 {
 
mrSlideSorter.GetController().GetPageSelector().SelectPage(mpCurrentSlide);
diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx 
b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
index e03e202..8a17124 100644
--- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
@@ -65,7 +65,7 @@ PageSelector::PageSelector (SlideSorter rSlideSorter)
   mpSelectionAnchor(),
   mpCurrentPage(),
   mnUpdateLockCount(0),
-  mbIsUpdateCurrentPagePending(false)
+  mbIsUpdateCurrentPagePending(true)
 {
 CountSelectedPages ();
 }
@@ -393,27 +393,39 @@ void PageSelector::UpdateCurrentPage (const bool 
bUpdateOnlyWhenPending)
 mbIsUpdateCurrentPagePending = false;
 
 // Make the first selected page the current page.
+SharedPageDescriptor pCurrentPageDescriptor;
 const sal_Int32 nPageCount (GetPageCount());
 for (sal_Int32 nIndex=0; nIndexnPageCount; ++nIndex)
 {
 SharedPageDescriptor pDescriptor (mrModel.GetPageDescriptor(nIndex));
-if (pDescriptor  pDescriptor-HasState(PageDescriptor::ST_Selected))
+if ( ! pDescriptor)
+continue;
+if (pDescriptor-HasState(PageDescriptor::ST_Selected))
 {
-

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

2014-02-21 Thread Stephan Bergmann

 vcl/inc/osx/salframe.h   |6 +++---
 vcl/inc/osx/salmenu.h|2 +-
 vcl/inc/osx/salprn.h |   16 
 vcl/inc/quartz/salgdi.h  |   18 +-
 vcl/inc/quartz/salvd.h   |2 +-
 vcl/osx/salframe.cxx |6 +++---
 vcl/osx/salmenu.cxx  |2 +-
 vcl/osx/salnativewidgets.cxx |8 
 vcl/osx/salprn.cxx   |   16 
 vcl/quartz/salgdicommon.cxx  |   10 +-
 vcl/quartz/salvd.cxx |2 +-
 11 files changed, 44 insertions(+), 44 deletions(-)

New commits:
commit d6dfeb95885a03e6f255c0be75b2dfa9258c61cc
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Feb 21 13:08:35 2014 +0100

Mac OS X vcl: sal_Bool - bool fixup

Change-Id: I77a2e7957351ca6da44948e5a28d08116e1cd14d

diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index 464a54a..ed9f61c 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -110,7 +110,7 @@ public:
 
 virtual SalGraphics*GetGraphics();
 virtual voidReleaseGraphics( SalGraphics* pGraphics );
-virtual sal_BoolPostEvent( void* pData );
+virtual boolPostEvent( void* pData );
 virtual voidSetTitle( const OUString rTitle );
 virtual voidSetIcon( sal_uInt16 nIcon );
 virtual voidSetRepresentedURL( const OUString );
@@ -125,7 +125,7 @@ public:
 virtual voidGetWorkArea( Rectangle rRect );
 virtual SalFrame*   GetParent() const;
 virtual voidSetWindowState( const SalFrameState* pState );
-virtual sal_BoolGetWindowState( SalFrameState* pState );
+virtual boolGetWindowState( SalFrameState* pState );
 virtual voidShowFullScreen( sal_Bool bFullScreen, 
sal_Int32 nDisplay );
 virtual voidStartPresentation( sal_Bool bStart );
 virtual voidSetAlwaysOnTop( sal_Bool bOnTop );
@@ -139,7 +139,7 @@ public:
 virtual voidSetInputContext( SalInputContext* pContext );
 virtual voidEndExtTextInput( sal_uInt16 nFlags );
 virtual OUString  GetKeyName( sal_uInt16 nKeyCode );
-virtual sal_BoolMapUnicodeToKeyCode( sal_Unicode aUnicode, 
LanguageType aLangType, KeyCode rKeyCode );
+virtual boolMapUnicodeToKeyCode( sal_Unicode aUnicode, 
LanguageType aLangType, KeyCode rKeyCode );
 virtual LanguageTypeGetInputLanguage();
 virtual voidUpdateSettings( AllSettings rSettings );
 virtual voidBeep();
diff --git a/vcl/inc/osx/salmenu.h b/vcl/inc/osx/salmenu.h
index 925a339..6bd9b72 100644
--- a/vcl/inc/osx/salmenu.h
+++ b/vcl/inc/osx/salmenu.h
@@ -56,7 +56,7 @@ public:
 AquaSalMenu( bool bMenuBar );
 virtual ~AquaSalMenu();
 
-virtual sal_Bool VisibleMenuBar();  // must return TRUE to actually 
DISPLAY native menu bars
+virtual bool VisibleMenuBar();  // must return TRUE to actually DISPLAY 
native menu bars
 // otherwise only menu messages are 
processed (eg, OLE on Windows)
 
 virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos );
diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h
index 906a61d..d2ac588 100644
--- a/vcl/inc/osx/salprn.h
+++ b/vcl/inc/osx/salprn.h
@@ -73,9 +73,9 @@ class AquaSalInfoPrinter : public SalInfoPrinter
 
 virtual SalGraphics*GetGraphics();
 virtual voidReleaseGraphics( SalGraphics* i_pGraphics );
-virtual sal_BoolSetup( SalFrame* i_pFrame, ImplJobSetup* 
i_pSetupData );
-virtual sal_BoolSetPrinterData( ImplJobSetup* pSetupData );
-virtual sal_BoolSetData( sal_uLong i_nFlags, ImplJobSetup* 
i_pSetupData );
+virtual boolSetup( SalFrame* i_pFrame, ImplJobSetup* 
i_pSetupData );
+virtual boolSetPrinterData( ImplJobSetup* pSetupData );
+virtual boolSetData( sal_uLong i_nFlags, ImplJobSetup* 
i_pSetupData );
 virtual voidGetPageInfo( const ImplJobSetup* i_pSetupData,
  long o_rOutWidth, long 
o_rOutHeight,
  long o_rPageOffX, long 
o_rPageOffY,
@@ -127,7 +127,7 @@ class AquaSalPrinter : public SalPrinter
 AquaSalPrinter( AquaSalInfoPrinter* i_pInfoPrinter );
 virtual ~AquaSalPrinter();
 
-virtual sal_BoolStartJob( const OUString* i_pFileName,
+virtual boolStartJob( const OUString* i_pFileName,
   const OUString i_rJobName,
   const OUString i_rAppName,
   sal_uLong i_nCopies,
@@ -135,16 +135,16 @@ class

Minutes of ESC call

2014-02-21 Thread Jan Holesovsky

* Present: Christian, Bjoern, David, Kendy, Miklos, Moggi, Adam, Miklos, 
Michael S., Lionel, Norbert, Stephan,
  Cedric, Andras, Robinson

* Completed Action Items
+ File an MAB for install issues (Kendy)
+ https://bugs.freedesktop.org/show_bug.cgi?id=74934
 
* Pending Action Items:
+ GSOC mentors - prune / remove already done ideas from each side (All)
+ need design for copying styles between templates (Cor Nouws/other UX?)
cf. 
http://www.mail-archive.com/libreoffice-ux-advise@lists.freedesktop.org/msg01658.html

http://www.mail-archive.com/libreoffice-ux-advise@lists.freedesktop.org/msg01663.html
[ Astron made mockup, discussed with Cor, but not published yet ]
+ will try filing a lot of small string changes as easy hacks (Astron)
+ review HiDPI branch for 4.2 (Kendy, Michael, Caolan)
 
* Release Engineering update (Christian)
+ 4.1.5 RC3 status
+ released now, closed
+ 4.2.1 RC1 / final status
+ announced today, went public
+ 4.2.2 will be what was 4.2.1.2 rc2
+ did not change
+ deadline for the 4.2.2 did not change
+ future schedule - should we ~always do that ?
+ MAB:
+ 2 are more serious: https://bugs.freedesktop.org/50855
+ will try to bi-bisect it [Christian]
+ suggested change to the release plan: 4 weeks between .0 and .1, 5 weeks 
between .1 and .2
+ sounds good [Bjoern]
+ didn't we have even shorter .0 and .1? - ie. sounds good to me too 
:-) [Kendy]
+ 4.3 just before the conference, might be tricky [Bjoern]
AI  + agreed, Christian will update the wiki [Christian]
+ some patches in 4-2-1 branch
AI  + should be cherry-picked to 4-2-2 [Christian]
 
* UX update (Astron)
+ discussion about how to use sidebars in the future
+ new sifr theme: lots of people love that [Bjoern]
+ but some people would like to have it a bit lighter for dark themes
+ could we have some sifr-light for dark themes? [Bjoern]
+ based on gnome, possible to re-color on the fly [Astron]
+ some of them available only as png's [Astron]
  http://www.omgubuntu.co.uk/2014/01/libreoffice-4-2-new-icon-theme 
(see comments)
+ hi-dpi sifr version? [Astron]
+ would it make sense to exchange hicontrast with sifr-light? [Kendy]
+ concerns about accessibility [Bjoern]
+ not clear to me if the colors in the hicontrast are needed, or if 
the white as
  the base color is what is most needed there [Kendy]
+ no objection to sifr-light in general
 
* GSoC update (Cedric)
+ Google review starting / underway
+ please consider what you are able to mentor:
+ https://wiki.documentfoundation.org/Development/GSoC/Ideas
+ cleanup still needed - everyone should review the page
+ we will have answer from Google on Monday
+ after that, students can reach us, by Monday evening it has to be perfect
AI  + Cedric to poke people who haven't done any action there
 
* Crashtest update (Markus)
+ new crash-test / data (?)
+ 
http://dev-builds.libreoffice.org/crashtest/f3d93434829d0e7c004679d000c30a934083b188/
+ will produce new one over the weekend
+ 15 fixes: real impact! - you can fix hundreds of documents
+ most of that can be fixed by pointer check
+ so easy stuff, go for that! :-)

* Problems in image scaling code (Markus)
+ can we use openmp there?  anybody against?
+ nobody familiar here probably :-) [Miklos]
+ gcc and visual studio both support that [Markus]
+ easy to use [Markus]
+ go for that - I guess you know most of that anyway [Kendy]
 
* ODF TC / how we handle ODF proposals (Miklos)
+ typically developers add new features, and create an ODF extension
+ ideally leads to proposal that should be sent to the ODF TC
+ includes extending RelaxNG + description
+ follow-up was handled by Thorsten previously
+ has to be done in Jira, where only some people have access
+ some follow-up questions answering
+ ie. cannot be done by every developer
+ Thorsten cannot do that any more
+ do we have people who have access these days?
+ 2 people active now: Regina [TDF], Michael S. [RedHat]
+ Michael S. will talk to Thorsten
+ Michael S. could act as a proxy at least, hopefully
 
* GNU make, upstreaming stuff (Bjoern)
+ cleaned up branches, now at:  
https://gerrit.libreoffice.org/gitweb?p=gnu-make-lo.git
+ dependency caching: parsing of deps down to 0.6 seconds from 6 seconds on 
Linux (branch feature/depcache)
+ need testing on Windows - incremental builds
AI  + Kendy to try it on his tinderbox
+ sugggested to upstream:
  http://lists.gnu.org/archive/html/bug-make/2014-02/msg00055.html
 
* Certification update (Kendy/Bjoern/Stephan)
+ we should start a new round
 
* QA (Robinson/Bjoern)
+

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

2014-02-21 Thread Stephan Bergmann

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

New commits:
commit dd30c02aad0f5b65ab42ca288d17f5040bc9efa0
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Feb 21 13:30:57 2014 +0100

Silence false control reaches end of non-void function warning

Change-Id: I4614f445b23aa5c498b7b64a181cb5ca74f18081

diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 85f76e6..a5b7dd9 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -718,7 +718,7 @@ bool StyleSettings::GetUseImagesInMenus() const
 return false;
 case AUTO_STATE_ON:
 return true;
-case AUTO_STATE_AUTO:
+default: // AUTO_STATE_AUTO:
 return GetPreferredUseImagesInMenus();
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 3b/d259ce52b15e968302ecca39f72d06af66e301

2014-02-21 Thread Caolán McNamara

 3b/d259ce52b15e968302ecca39f72d06af66e301 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0993d52318aff70ad4e68aea9a410aee363968e4
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Feb 21 12:41:12 2014 +

Notes added by 'git notes add'

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

[Bug 75025] LibreOffice 4.3 most annoying bugs

2014-02-21 Thread bugzilla-daemon

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

tommy27 ba...@quipo.it changed:

   What|Removed |Added

 Depends on||74401

-- 
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 'refs/notes/commits' - c2/c3bd1ceed76e34a690bf458a8ad94cd6211fb0

2014-02-21 Thread Caolán McNamara

 c2/c3bd1ceed76e34a690bf458a8ad94cd6211fb0 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ffada410a23d3ca16d534214a88fd71cfc842652
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Feb 21 12:42:36 2014 +

Notes added by 'git notes add'

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

[Bug 75025] LibreOffice 4.3 most annoying bugs

2014-02-21 Thread bugzilla-daemon

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

--- Comment #1 from tommy27 ba...@quipo.it ---
added Bug 74401 - FILEOPEN: DOCX: Figures with text which are on canvas become
rectangles (regression from 4.2.x see attachment 94155)

-- 
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 'refs/notes/commits' - 32/1d104cf2c13582a08a2313ff733fa02bc6610f

2014-02-21 Thread Caolán McNamara

 32/1d104cf2c13582a08a2313ff733fa02bc6610f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d22a7a8f91d884c5b1f8e10c07516e702b03f866
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Feb 21 12:44:22 2014 +

Notes added by 'git notes add'

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

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

2014-02-21 Thread Winfried Donkers

 sc/source/ui/app/inputhdl.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 00856ac90d4a230d6f219937f836ca0e9f3fe1e3
Author: Winfried Donkers winfrieddonk...@libreoffice.org
Date:   Thu Feb 20 07:28:40 2014 +0100

fdo#71077 wrong tips for some calc functions

Calc functions with name X where also calc functions with
name XY exist show the tip for the first XY function
instead of the X function as soon as the '(' is typed in the cell.
This fixes that.

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

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index b0c7d7e..c5be05b 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -994,7 +994,6 @@ void ScInputHandler::ShowTip( const OUString rText )
 {
 //  aManualTip muss hinterher von aussen gesetzt werden
 HideTip();
-
 EditView* pActiveView = pTopView ? pTopView : pTableView;
 if (pActiveView)
 {
@@ -1103,10 +1102,10 @@ void ScInputHandler::UseFormulaData()
 {
 nArgPos = aHelper.GetArgStart( aFormula, nNextFStart, 
0 );
 nArgs = 
static_castsal_uInt16(ppFDesc-getParameterCount());
-
+OUString aFuncName = ppFDesc-getFunctionName() + (;
 OUString aNew;
 ScTypedCaseStrSet::const_iterator it =
-findText(*pFormulaDataPara, 
pFormulaDataPara-end(), ppFDesc-getFunctionName(), aNew, false);
+findText(*pFormulaDataPara, 
pFormulaDataPara-end(), aFuncName, aNew, false);
 if (it != pFormulaDataPara-end())
 {
 bool bFlag = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-21 Thread Kohei Yoshida

 dtrans/source/win32/dtobj/FmtFilter.cxx |   10 +-
 vcl/aqua/source/dtrans/HtmlFmtFlt.cxx   |8 
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 9ffb9d0baa22f85cc7c22a198760f90a4a857458
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu Feb 20 20:19:07 2014 -0500

fdo#74584: These tags should be lowercase for correct clipboard handling.

Change-Id: I323b96cecbf7158919fad534a202f158965ca99f
(cherry picked from commit 88c6cbda921f1e3627910f9028ff2e29f26160e7)
Reviewed-on: https://gerrit.libreoffice.org/8154
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com
(cherry picked from commit 3ba02e9ec03df980803f35c4b16ce8b8ce90cb66)
Reviewed-on: https://gerrit.libreoffice.org/8157
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx 
b/dtrans/source/win32/dtobj/FmtFilter.cxx
index 199d301..5615715 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.cxx
+++ b/dtrans/source/win32/dtobj/FmtFilter.cxx
@@ -357,13 +357,13 @@ std::string GetHtmlFormatHeader(size_t startHtml, size_t 
endHtml, size_t startFr
 
 // the office always writes the start and end html tag in upper cases and
 // without spaces both tags don't allow parameters
-const std::string TAG_HTML = std::string(HTML);
-const std::string TAG_END_HTML = std::string(/HTML);
+const std::string TAG_HTML = std::string(html);
+const std::string TAG_END_HTML = std::string(/html);
 
 // The body tag may have parameters so we need to search for the
-// closing '' manually e.g. BODY param #92840#
-const std::string TAG_BODY = std::string(BODY);
-const std::string TAG_END_BODY = std::string(/BODY);
+// closing '' manually e.g. body param #92840#
+const std::string TAG_BODY = std::string(body);
+const std::string TAG_END_BODY = std::string(/body);
 
 Sequencesal_Int8 SAL_CALL TextHtmlToHTMLFormat(Sequencesal_Int8 aTextHtml)
 {
diff --git a/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx 
b/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
index e629f11..f5e0b22 100644
--- a/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
+++ b/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
@@ -73,13 +73,13 @@ std::string GetHtmlFormatHeader(size_t startHtml, size_t 
endHtml, size_t startFr
 
 // the office always writes the start and end html tag in upper cases and
 // without spaces both tags don't allow parameters
-const std::string TAG_HTML = std::string(HTML);
-const std::string TAG_END_HTML = std::string(/HTML);
+const std::string TAG_HTML = std::string(html);
+const std::string TAG_END_HTML = std::string(/html);
 
 // The body tag may have parameters so we need to search for the
 // closing '' manually e.g. BODY param #92840#
-const std::string TAG_BODY = std::string(BODY);
-const std::string TAG_END_BODY = std::string(/BODY);
+const std::string TAG_BODY = std::string(body);
+const std::string TAG_END_BODY = std::string(/body);
 
 Sequencesal_Int8 SAL_CALL TextHtmlToHTMLFormat(Sequencesal_Int8 aTextHtml)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-21 Thread Kohei Yoshida

 sc/source/core/tool/interpr6.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 165ab67a284efc75d3ed07c4dd2b03a430959481
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu Feb 20 00:28:06 2014 -0500

fdo#75228: We still need to get the value only to pop value from the stack.

Change-Id: Iad231aa97ed35f91b96cddf8157ebcd9af0f8ec9
(cherry picked from commit 9e183fbfdbfbe364d17f9d36a0b33d2fae89862d)
Reviewed-on: https://gerrit.libreoffice.org/8142
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx
index f404561..a32b3c1 100644
--- a/sc/source/core/tool/interpr6.cxx
+++ b/sc/source/core/tool/interpr6.cxx
@@ -891,6 +891,7 @@ void ScInterpreter::ScCount()
 }
 break;
 case svDouble:
+GetDouble();
 nCount++;
 nFuncFmtType = NUMBERFORMAT_NUMBER;
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-21 Thread Kohei Yoshida

 sc/source/ui/cctrl/checklistmenu.cxx |  106 +--
 1 file changed, 64 insertions(+), 42 deletions(-)

New commits:
commit 8e2e2b0d2d585839e2ecf339f26336c8f653b0e6
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Feb 19 23:45:38 2014 -0500

fdo#73565: Populate date members in a locale-safe way.

Change-Id: Id90b2829465fada690b0446d6d823e76e792c77b
(cherry picked from commit 2be2786879883badd6d0075e63965bacd312ed23)
Reviewed-on: https://gerrit.libreoffice.org/8139
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-on: https://gerrit.libreoffice.org/8140
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx 
b/sc/source/ui/cctrl/checklistmenu.cxx
index 2cde8eb..848d84c 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -32,6 +32,7 @@
 #include svtools/fmtfield.hxx
 #include document.hxx
 
+using namespace com::sun::star;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::accessibility::XAccessible;
 using ::com::sun::star::accessibility::XAccessibleContext;
@@ -1279,50 +1280,71 @@ void ScCheckListMenuWindow::setMemberSize(size_t n)
 void ScCheckListMenuWindow::addDateMember(const OUString rsName, double nVal, 
bool bVisible)
 {
 ScDocument* pDoc = getDoc();
-if ( pDoc )
+SvNumberFormatter* pFormatter = pDoc-GetFormatTable();
+
+// Convert the numeric date value to a date object.
+Date aDate = *(pFormatter-GetNullDate());
+aDate += static_castlong(rtl::math::approxFloor(nVal));
+
+sal_uInt16 nYear = aDate.GetYear();
+sal_uInt16 nMonth = aDate.GetMonth();
+sal_uInt16 nDay = aDate.GetDay();
+
+// Get the localized month name list.
+CalendarWrapper* pCalendar = ScGlobal::GetCalendar();
+uno::Sequencei18n::CalendarItem2 aMonths = pCalendar-getMonths();
+if (aMonths.getLength()  nMonth)
+return;
+
+OUString aYearName = OUString::number(nYear);
+OUString aMonthName = aMonths[nMonth-1].FullName;
+OUString aDayName = OUString::number(nDay);
+
+maChecks.SetUpdateMode(false);
+
+SvTreeListEntry* pYearEntry = maChecks.FindEntry(NULL, aYearName);
+if (!pYearEntry)
 {
-SvNumberFormatter* pFormatter = pDoc-GetFormatTable();
-OUString rsDate;
-if ( pFormatter )
-{
-OUString sFormat(//DD);
-Color* pColor = NULL;
-pFormatter-GetPreviewString(sFormat,
-nVal,
-rsDate,
-pColor,
-ScGlobal::eLnge );
-}
-maChecks.SetUpdateMode(false);
-sal_Int32 nIndex = 0;
-OUString sParent;
-SvTreeListEntry* pParent = NULL;
-int count = 0;
-do
-{
-OUString sPart = rsDate.getToken( 0, '/', nIndex );
-bool bLeaf = ( ++count == 3 );
-SvTreeListEntry* pChild = maChecks.FindEntry( pParent, sPart );
-if ( !pChild )
-{
-if ( bLeaf )
-pChild = maChecks.SvTreeListBox::InsertEntry( sPart, 
pParent, sal_False, LISTBOX_APPEND, NULL, SvLBoxButtonKind_enabledCheckbox );
-else
-pChild = maChecks.SvTreeListBox::InsertEntry( sPart, 
pParent, sal_True, LISTBOX_APPEND, NULL, SvLBoxButtonKind_enabledCheckbox );
-Member aMember;
-aMember.maName = sPart;
-aMember.maRealName = rsName;
-aMember.mbDate = true;
-aMember.mbLeaf = bLeaf;
-aMember.mbVisible = bVisible;
-aMember.mpParent = pParent;
-maMembers.push_back(aMember);
-}
-sParent = sPart;
-pParent = pChild;
-} while ( nIndex = 0 );
-maChecks.SetUpdateMode(true);
+pYearEntry = maChecks.InsertEntry(aYearName, NULL, true);
+Member aMemYear;
+aMemYear.maName = aYearName;
+aMemYear.maRealName = rsName;
+aMemYear.mbDate = true;
+aMemYear.mbLeaf = false;
+aMemYear.mbVisible = bVisible;
+aMemYear.mpParent = NULL;
+maMembers.push_back(aMemYear);
+}
+
+SvTreeListEntry* pMonthEntry = maChecks.FindEntry(pYearEntry, aMonthName);
+if (!pMonthEntry)
+{
+pMonthEntry = maChecks.InsertEntry(aMonthName, pYearEntry, true);
+Member aMemMonth;
+aMemMonth.maName = aMonthName;
+aMemMonth.maRealName = rsName;
+aMemMonth.mbDate = true;
+aMemMonth.mbLeaf = false;
+aMemMonth.mbVisible = bVisible;
+aMemMonth.mpParent = pYearEntry;
+maMembers.push_back(aMemMonth);
 }
+
+SvTreeListEntry* pDayEntry = maChecks.FindEntry(pMonthEntry, aDayName);
+if (!pDayEntry)
+{
+

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

2014-02-21 Thread Kohei Yoshida

 sc/source/ui/view/tabview2.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit de7ea676a51832d502b449b39809ce26299aa09a
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Tue Feb 18 20:40:27 2014 -0500

fdo#74857: Update the incrementer when skipping over hidden regions.

Otherwise it would over-shoot.

Change-Id: I1f9741345dfe353e0b035ff3bead736ab3fccbef
(cherry picked from commit 637353bb46d3c7d9537e47e4e003aef78a0c0ab3)
Reviewed-on: https://gerrit.libreoffice.org/8117
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
(cherry picked from commit 793c2b2b3ac8c8e74ccdfc6876ce47e5039fb65a)
Reviewed-on: https://gerrit.libreoffice.org/8131
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index bcce76e..8762520 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -86,6 +86,7 @@ void moveCursorByProtRule(
 if(nNewUnhiddenCol = MAXCOL)
 return;
 
+i += nEndCol - nNewUnhiddenCol + 1;
 nNewUnhiddenCol = nEndCol +1;
 }
 
@@ -105,6 +106,7 @@ void moveCursorByProtRule(
 if(nNewUnhiddenCol = 0)
 return;
 
+i -= nNewUnhiddenCol - nStartCol + 1;
 nNewUnhiddenCol = nStartCol - 1;
 }
 
@@ -125,6 +127,7 @@ void moveCursorByProtRule(
 if(nNewUnhiddenRow = MAXROW)
 return;
 
+i += nEndRow - nNewUnhiddenRow + 1;
 nNewUnhiddenRow = nEndRow + 1;
 }
 
@@ -144,6 +147,7 @@ void moveCursorByProtRule(
 if(nNewUnhiddenRow = 0)
 return;
 
+i -= nNewUnhiddenRow - nStartRow + 1;
 nNewUnhiddenRow = nStartRow - 1;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-21 Thread Kohei Yoshida

 sc/inc/column.hxx   |2 
 sc/inc/mtvcellfunc.hxx  |   11 +++
 sc/source/core/data/column2.cxx |  111 +---
 3 files changed, 50 insertions(+), 74 deletions(-)

New commits:
commit e285e059b6a03b426a0f64ff3686966802d040c3
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Feb 17 12:20:57 2014 -0500

fdo#75032: Handle note copying correctly.

(cherry picked from commit 575e88da278f536ebfb6562dfd98f341240afec4)

Conflicts:
sc/source/core/data/column2.cxx

Change-Id: Iae37ac86889d7a25f25e6dd0b69f724107c6798a
Reviewed-on: https://gerrit.libreoffice.org/8089
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-on: https://gerrit.libreoffice.org/8138
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index c6db640..529f84f 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -167,6 +167,8 @@ public:
 const sc::CellStoreType GetCellStore() const { return maCells; }
 sc::CellTextAttrStoreType GetCellAttrStore() { return maCellTextAttrs; }
 const sc::CellTextAttrStoreType GetCellAttrStore() const { return 
maCellTextAttrs; }
+sc::CellNoteStoreType GetCellNoteStore() { return maCellNotes; }
+const sc::CellNoteStoreType GetCellNoteStore() const { return 
maCellNotes; }
 
 ScRefCellValue GetCellValue( SCROW nRow ) const;
 ScRefCellValue GetCellValue( const sc::CellStoreType::const_iterator 
itPos, size_t nOffset ) const;
diff --git a/sc/inc/mtvcellfunc.hxx b/sc/inc/mtvcellfunc.hxx
index fc6d2dc..d5e7921 100644
--- a/sc/inc/mtvcellfunc.hxx
+++ b/sc/inc/mtvcellfunc.hxx
@@ -166,6 +166,17 @@ void ProcessNote(CellNoteStoreType rStore, _Func rFunc)
 ProcessElements1CellNoteStoreType, cellnote_block, _Func, 
FuncElseNoOpsize_t (rStore, rFunc, aElse);
 }
 
+templatetypename _Func
+typename CellNoteStoreType::const_iterator
+ParseNote(
+const CellNoteStoreType::const_iterator itPos, const CellNoteStoreType 
rStore,
+SCROW nStart, SCROW nEnd, _Func rFunc)
+{
+FuncElseNoOpsize_t aElse;
+return ParseElements1CellNoteStoreType, cellnote_block, _Func, 
FuncElseNoOpsize_t (
+itPos, rStore, nStart, nEnd, rFunc, aElse);
+}
+
 templatetypename _FuncElem
 typename CellNoteStoreType::iterator
 ProcessNote(
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 1d28780..ae1a722 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1798,85 +1798,48 @@ void ScColumn::CopyCellTextAttrsToDocument(SCROW nRow1, 
SCROW nRow2, ScColumn r
 }
 }
 
-void ScColumn::CopyCellNotesToDocument(SCROW nRow1, SCROW nRow2, ScColumn 
rDestCol, bool bCloneCaption, SCROW nRowOffsetDest) const
-{
-SCCOL nDestCol = rDestCol.GetCol();
-SCTAB nDestTab = rDestCol.GetTab();
-
-rDestCol.maCellNotes.set_empty(nRow1 + nRowOffsetDest, nRow2 + 
nRowOffsetDest); // Empty the destination range first.
+namespace {
 
-sc::CellNoteStoreType::const_iterator itBlk = maCellNotes.begin(), 
itBlkEnd = maCellNotes.end();
+class CopyCellNotesHandler
+{
+ScColumn mrDestCol;
+sc::CellNoteStoreType mrDestNotes;
+sc::CellNoteStoreType::iterator miPos;
+SCTAB mnSrcTab;
+SCCOL mnSrcCol;
+SCTAB mnDestTab;
+SCCOL mnDestCol;
+SCROW mnDestOffset; /// Add this to the source row position to get the 
destination row.
+bool mbCloneCaption;
 
-// Locate the top row position.
-size_t nOffsetInBlock = 0;
-size_t nBlockStart = 0, nBlockEnd = 0, nRowPos = 
static_castsize_t(nRow1);
-for (; itBlk != itBlkEnd; ++itBlk, nBlockStart = nBlockEnd)
-{
-nBlockEnd = nBlockStart + itBlk-size;
-if (nBlockStart = nRowPos  nRowPos  nBlockEnd)
-{
-// Found.
-nOffsetInBlock = nRowPos - nBlockStart;
-break;
-}
+public:
+CopyCellNotesHandler( const ScColumn rSrcCol, ScColumn rDestCol, SCROW 
nDestOffset, bool bCloneCaption ) :
+mrDestCol(rDestCol),
+mrDestNotes(rDestCol.GetCellNoteStore()),
+miPos(mrDestNotes.begin()),
+mnSrcTab(rSrcCol.GetTab()),
+mnSrcCol(rSrcCol.GetCol()),
+mnDestTab(rDestCol.GetTab()),
+mnDestCol(rDestCol.GetCol()),
+mnDestOffset(nDestOffset),
+mbCloneCaption(bCloneCaption) {}
+
+void operator() ( size_t nRow, const ScPostIt* p )
+{
+SCROW nDestRow = nRow + mnDestOffset;
+ScAddress aSrcPos(mnSrcCol, nRow, mnSrcTab);
+ScAddress aDestPos(mnDestCol, nDestRow, mnDestTab);
+miPos = mrDestNotes.set(miPos, nDestRow, p-Clone(aSrcPos, 
mrDestCol.GetDoc(), aDestPos, mbCloneCaption));
 }
+};
 
-if (itBlk == itBlkEnd)
-// Specified range not found. Bail out.
-return;
-
-nRowPos = static_castsize_t(nRow2); // End

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

2014-02-21 Thread Kohei Yoshida

 sc/source/core/data/column3.cxx |   25 -
 1 file changed, 20 insertions(+), 5 deletions(-)

New commits:
commit 50b46373b06545b81c68efc9f183cc5670c8517a
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Tue Feb 18 22:57:39 2014 -0500

fdo#72491: Always set input as text when that's requested.

Even when the text begins with '='.

Change-Id: I6e0a995f3042240b9f78068b5d0b9b758eb253ed
(cherry picked from commit ca50752c34de4477c696471b707e1b8136e27661)
Reviewed-on: https://gerrit.libreoffice.org/8122
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
(cherry picked from commit 563516fc10f1590a5987606de5444643b1b83747)
Reviewed-on: https://gerrit.libreoffice.org/8130
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 13ee606..50c52ce 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -1492,6 +1492,19 @@ void ScColumn::StartListeningInArea( 
sc::StartListeningContext rCxt, SCROW nRow
 sc::ProcessFormula(maCells.begin(), maCells, nRow1, nRow2, aFunc);
 }
 
+namespace {
+
+void applyTextNumFormat( ScColumn rCol, SCROW nRow, SvNumberFormatter* 
pFormatter )
+{
+sal_uInt32 nFormat = pFormatter-GetStandardFormat(NUMBERFORMAT_TEXT);
+ScPatternAttr aNewAttrs(rCol.GetDoc().GetPool());
+SfxItemSet rSet = aNewAttrs.GetItemSet();
+rSet.Put(SfxUInt32Item(ATTR_VALUE_FORMAT, nFormat));
+rCol.ApplyPattern(nRow, aNewAttrs);
+}
+
+}
+
 bool ScColumn::ParseString(
 ScCellValue rCell, SCROW nRow, SCTAB nTabP, const OUString rString,
 formula::FormulaGrammar::AddressConvention eConv,
@@ -1528,6 +1541,12 @@ bool ScColumn::ParseString(
 {
 rCell.set(rPool.intern(rString));
 }
+else if (aParam.meSetTextNumFormat == ScSetStringParam::Always)
+{
+// Set the cell format type to Text.
+applyTextNumFormat(*this, nRow, aParam.mpNumFormatter);
+rCell.set(rPool.intern(rString));
+}
 else // = Formula
 rCell.set(
 new ScFormulaCell(
@@ -1632,11 +1651,7 @@ bool ScColumn::ParseString(
 if (aParam.meSetTextNumFormat != ScSetStringParam::Never  
aParam.mpNumFormatter-IsNumberFormat(rString, nIndex, nVal))
 {
 // Set the cell format type to Text.
-sal_uInt32 nFormat = 
aParam.mpNumFormatter-GetStandardFormat(NUMBERFORMAT_TEXT);
-ScPatternAttr aNewAttrs(pDocument-GetPool());
-SfxItemSet rSet = aNewAttrs.GetItemSet();
-rSet.Put( SfxUInt32Item(ATTR_VALUE_FORMAT, nFormat) );
-ApplyPattern(nRow, aNewAttrs);
+applyTextNumFormat(*this, nRow, aParam.mpNumFormatter);
 }
 
 rCell.set(rPool.intern(rString));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-21 Thread Caolán McNamara

 svx/source/dialog/_contdlg.cxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 8b2e014a99978434b2d973993c93b583ee8a62c7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Feb 21 13:13:48 2014 +

-Werror=parentheses

Change-Id: Ibf897ccd5c89d8ba86b6d7838d43b9e23aac79ca

diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index c5c2353..5565606 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -535,11 +535,13 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, 
pTbx )
 aStbStatus.Invalidate();
 else if ( bGraphicLinked )
 {
-MessageDialog aQBox( 
this,QueryUnlinkGraphicsDialog,svx/ui/queryunlinkgraphicsdialog.ui);
+MessageDialog aQBox(this, QueryUnlinkGraphicsDialog,
+svx/ui/queryunlinkgraphicsdialog.ui);
 
-if ( aQBox.Execute() != RET_YES )
+if (aQBox.Execute() != RET_YES)
 {
-aTbx1.CheckItem( TBI_PIPETTE, bPipette = sal_False );
+bPipette = false;
+aTbx1.CheckItem(TBI_PIPETTE, bPipette);
 aStbStatus.Invalidate();
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Would like some help building Android APK that includes the native (jni) library...

2014-02-21 Thread Michael Meeks

Hi Keith,

On Thu, 2014-02-20 at 12:45 -0500, Keith Creasy wrote:
 I thought I wrote and asked about this already but now I'm not sure if it
 worked.

It did; sorry for not getting back to you quickly.

 We are interested in creating an accessible Android office suite (accessible
 to blind users).

Great ! I -suspect- that the current state of LibreOffice on Android
may be more susceptible to an Accessible interface for blind users than
it is for a sighted user's 60fps smooth / tiled-rendering with
animations experience =)

So - I think this is quite an achievable goal. The main development
would be around building a bridge between our UNO accessibility APIs and
the native Android a11y stack. Experience suggests that the size of one
of these bridges should be:

atk:2012 ';' LOC (git grep ';' | wc -l )
IAcc2:  5000 ';' LOC

So - really achievable =)

  I've been able to build LibreOffice on Linux and also the
 Android libraries and experimental apps.

Great.

  The problem is that my APK doesn't include the native libraries.
 The jni directories are empty. If I try to run
 ndk-build I get the error:
 /home/kcreasy/ndk/build/core/build-shared-library.mk:23: *** Android NDK:
 Missing LOCAL_MODULE before including BUILD_SHARED_LIBRARY in jni/Android.mk
 .  Stop.

That is indeed annoying; perhaps the best person to talk to there would
be Tor; I'll set a build of master going on my local machine too though
for good measure.

 I'm thinking that there is a shared library I just need to add t my project
 but just don't know which library or where to find it in the overall
 project.

Hopefully you are running 'make' inside android/ to build that stuff ?
we have to pre-process  generate some compatible ant files - to turn
off compression for various assets in the .zip - if that is hosed (new
Android SDKs tend to bust that gratuitously) then we may need to fix
that. What SDK / NDK versions do you have ?

 If someone can give me some pointers on how to get this building a runnable
 APK it would be very helpful. We are interested in contributing and sharing
 our work toward an Android word processor and perhaps other apps with the
 community.

It sounds awesome, welcome to the community; sorry for the initially
slow response; Tor if you could spare 30mins or so getting Keith going
over the next while that'd be lovely ! =)

All the best,

Michael.
-- 
 michael.me...@collabora.com  , Pseudo Engineer, itinerant idiot

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

Re: Would like some help building Android APK that includes the native (jni) library...

2014-02-21 Thread Tor Lillqvist

All I know is that when I build for Android, I do get .apk files in
android/experimental/LibreOffice4Android/bin/LibreOffice4Android-debug.apk
and android/experimental/desktop/bin/LibreOfficeExperimentalDesktop-debug.apk
.

This is from just running make at the top level; after all the other
stuff has been compiled, the Android experimental apps are built.

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

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

2014-02-21 Thread Jan Holesovsky

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   88 ++
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |3 
 2 files changed, 28 insertions(+), 63 deletions(-)

New commits:
commit 07338e20663f9a52f819d0d0c93e8599406d1ff2
Author: Jan Holesovsky ke...@collabora.com
Date:   Fri Feb 21 13:56:18 2014 +0100

Kill copy'n'paste.

Change-Id: I3d457efc89873ca92a4458b1ac0a125848c942a8

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index a5f839c..b66b7f3 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1337,14 +1337,18 @@ uno::Reference beans::XPropertySet  
DomainMapper_Impl::appendTextSectionAfter(
 return xRet;
 }
 
-
-void DomainMapper_Impl::PushPageHeader(SectionPropertyMap::PageType eType)
+void DomainMapper_Impl::PushPageHeaderFooter(bool bHeader, 
SectionPropertyMap::PageType eType)
 {
+const PropertyIds ePropIsOn = bHeader? PROP_HEADER_IS_ON: 
PROP_FOOTER_IS_ON;
+const PropertyIds ePropShared = bHeader? PROP_HEADER_IS_SHARED: 
PROP_FOOTER_IS_SHARED;
+const PropertyIds ePropTextLeft = bHeader? PROP_HEADER_TEXT_LEFT: 
PROP_FOOTER_TEXT_LEFT;
+const PropertyIds ePropText = bHeader? PROP_HEADER_TEXT: PROP_FOOTER_TEXT;
+
 m_bInHeaderFooterImport = true;
 
 //get the section context
 PropertyMapPtr pContext = 
DomainMapper_Impl::GetTopContextOfType(CONTEXT_SECTION);
-//ask for the header name of the given type
+//ask for the header/footer name of the given type
 SectionPropertyMap* pSectionContext = dynamic_cast SectionPropertyMap* ( 
pContext.get() );
 if(pSectionContext)
 {
@@ -1362,21 +1366,22 @@ void 
DomainMapper_Impl::PushPageHeader(SectionPropertyMap::PageType eType)
 {
 PropertyNameSupplier rPropNameSupplier = 
PropertyNameSupplier::GetPropertyNameSupplier();
 
-//switch on header use
+//switch on header/footer use
 xPageStyle-setPropertyValue(
-rPropNameSupplier.GetName(PROP_HEADER_IS_ON),
-uno::makeAny(sal_True) );
+rPropNameSupplier.GetName(ePropIsOn),
+uno::makeAny(sal_True));
 
 // If the 'Different Even  Odd Pages' flag is turned on - do 
not ignore it
-// Even if the 'Even' header is blank - the flag should be 
imported (so it would look in LO like in Word)
+// Even if the 'Even' header/footer is blank - the flag should 
be imported (so it would look in LO like in Word)
 if (GetSettingsTable()-GetEvenAndOddHeaders())
-
xPageStyle-setPropertyValue(rPropNameSupplier.GetName(PROP_HEADER_IS_SHARED), 
uno::makeAny( false ));
+
xPageStyle-setPropertyValue(rPropNameSupplier.GetName(ePropShared), 
uno::makeAny(false));
 
 //set the interface
-uno::Reference text::XText  xHeaderText;
-xPageStyle-getPropertyValue(rPropNameSupplier.GetName( bLeft 
? PROP_HEADER_TEXT_LEFT : PROP_HEADER_TEXT) ) = xHeaderText;
-m_aTextAppendStack.push( TextAppendContext(uno::Reference 
text::XTextAppend ( xHeaderText, uno::UNO_QUERY_THROW),
-m_bIsNewDoc ? uno::Referencetext::XTextCursor() 
: m_xBodyText-createTextCursorByRange(xHeaderText-getStart(;
+uno::Reference text::XText  xText;
+xPageStyle-getPropertyValue(rPropNameSupplier.GetName(bLeft? 
ePropTextLeft: ePropText)) = xText;
+
+m_aTextAppendStack.push(TextAppendContext(uno::Reference 
text::XTextAppend (xText, uno::UNO_QUERY_THROW),
+m_bIsNewDoc? uno::Referencetext::XTextCursor(): 
m_xBodyText-createTextCursorByRange(xText-getStart(;
 }
 else
 {
@@ -1389,59 +1394,16 @@ void 
DomainMapper_Impl::PushPageHeader(SectionPropertyMap::PageType eType)
 }
 }
 
+void DomainMapper_Impl::PushPageHeader(SectionPropertyMap::PageType eType)
+{
+PushPageHeaderFooter(/* bHeader = */ true, eType);
+}
 
 void DomainMapper_Impl::PushPageFooter(SectionPropertyMap::PageType eType)
 {
-m_bInHeaderFooterImport = true;
-
-//get the section context
-PropertyMapPtr pContext = 
DomainMapper_Impl::GetTopContextOfType(CONTEXT_SECTION);
-//ask for the footer name of the given type
-SectionPropertyMap* pSectionContext = dynamic_cast SectionPropertyMap* ( 
pContext.get() );
-if(pSectionContext)
-{
-uno::Reference beans::XPropertySet  xPageStyle =
-pSectionContext-GetPageStyle(
-GetPageStyles(),
-m_xTextFactory,
-eType == SectionPropertyMap::PAGE_FIRST );
-if (!xPageStyle.is())
-return;
-try
-{
-bool bLeft = eType ==

Re: Would like some help building Android APK that includes the native (jni) library...

2014-02-21 Thread Michael Meeks


On Fri, 2014-02-21 at 15:32 +0200, Tor Lillqvist wrote:
 All I know is that when I build for Android, I do get .apk files in
 android/experimental/LibreOffice4Android/bin/LibreOffice4Android-debug.apk
 and android/experimental/desktop/bin/LibreOfficeExperimentalDesktop-debug.apk

I guess the tinderboxen also have a big .so in their packages:

http://dev-builds.libreoffice.org/daily/master/Android-ARM@24-Bytemark-Hosting/current/

Otherwise they wouldn't be 50Mb small etc. ;-)

Keith - some more compile-errors / log output would be most helpful.

ATB,

Michael.

-- 
 michael.me...@collabora.com  , Pseudo Engineer, itinerant idiot

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

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

2014-02-21 Thread Caolán McNamara

 cui/source/options/optgdlg.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 16e7112f3e34302db168bfbb8f3b3882d6358715
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Feb 21 13:40:03 2014 +

-Werror=parentheses

Change-Id: I8e64440635d9d94d62c67fd542b39a2436390de2

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index d8b456d..f93dc04 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1142,13 +1142,15 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* 
pParent, const SfxItemSet rSe
 m_pAsianSupportCB-SetClickHdl( aLink );
 m_pCTLSupportCB-SetClickHdl( aLink );
 
-m_pAsianSupportCB-Check( m_bOldAsian = 
pLangConfig-aLanguageOptions.IsAnyEnabled() );
+m_bOldAsian = pLangConfig-aLanguageOptions.IsAnyEnabled();
+m_pAsianSupportCB-Check(m_bOldAsian);
 m_pAsianSupportCB-SaveValue();
 sal_Bool bReadonly = 
pLangConfig-aLanguageOptions.IsReadOnly(SvtLanguageOptions::E_ALLCJK);
 m_pAsianSupportCB-Enable(!bReadonly);
 SupportHdl( m_pAsianSupportCB );
 
-m_pCTLSupportCB-Check( m_bOldCtl = 
pLangConfig-aLanguageOptions.IsCTLFontEnabled() );
+m_bOldCtl = pLangConfig-aLanguageOptions.IsCTLFontEnabled();
+m_pCTLSupportCB-Check(m_bOldCtl);
 m_pCTLSupportCB-SaveValue();
 bReadonly = 
pLangConfig-aLanguageOptions.IsReadOnly(SvtLanguageOptions::E_CTLFONT);
 m_pCTLSupportCB-Enable(!bReadonly);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: fdo75264 incorrect function name tips, suggestions wanted

2014-02-21 Thread Kohei Yoshida

On Fri, 2014-02-21 at 10:11 +0100, Winfried Donkers wrote:
 Why is this?

No clue. ;-)

 I don't want to break things when trying to fix bug fdo75264 and I am
 a bit confused about the current ScInputHandler::UseFormulaData()
 code.

Yeah me too.  I'll try to investigate and see if I can make any sense of
it.  Stay tuned.

Great to see you tackling bug fixes, BTW.  Thank you.

Kohei


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

RE: Would like some help building Android APK that includes the native (jni) library...

2014-02-21 Thread Keith Creasy

OK. At least this tells me something that is supposed to work and how. Let me 
start over a bit and see that I either do or don't get the same results. That 
lone is very helpful.

I'll let you know how far I can get.

Thanks.

Keith

-Original Message-
From: tlillqv...@gmail.com [mailto:tlillqv...@gmail.com] On Behalf Of Tor 
Lillqvist
Sent: Friday, February 21, 2014 8:32 AM
To: Michael Meeks
Cc: Keith Creasy; Tor Lillqvist; libreoffice-dev
Subject: Re: Would like some help building Android APK that includes the native 
(jni) library...

All I know is that when I build for Android, I do get .apk files in 
android/experimental/LibreOffice4Android/bin/LibreOffice4Android-debug.apk
and android/experimental/desktop/bin/LibreOfficeExperimentalDesktop-debug.apk
.

This is from just running make at the top level; after all the other stuff 
has been compiled, the Android experimental apps are built.

--tml

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

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

2014-02-21 Thread Oliver-Rainer Wittmann

 filter/source/xsltfilter/XSLTFilter.cxx |  235 ++--
 1 file changed, 135 insertions(+), 100 deletions(-)

New commits:
commit 933d1ff4354a39545d5a391e2c68302d9c2d7498
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Fri Feb 21 14:01:22 2014 +

124092: export code for UOF v2 only for corresponding export style sheets

diff --git a/filter/source/xsltfilter/XSLTFilter.cxx 
b/filter/source/xsltfilter/XSLTFilter.cxx
index 3d90139..0cf4269 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -20,7 +20,6 @@
  **/
 
  // MARKER(update_precomp.py): autogen include statement, do not remove
-//This file is about the conversion of the UOF v2.0 and ODF document format
 #include precompiled_filter.hxx
 
 #include stdio.h
@@ -66,16 +65,9 @@
 #include com/sun/star/beans/NamedValue.hpp
 
 
-#include unotools/streamwrap.hxx
-#include comphelper/processfactory.hxx
-#include tools/stream.hxx
 #include uof2splitter.hxx
-
-#include xmloff/attrlist.hxx
 #include uof2storage.hxx
 #include uof2merge.hxx
-#include tools/stream.hxx
-#include string
 
 using namespace ::rtl;
 using namespace ::cppu;
@@ -94,32 +86,6 @@ namespace XSLT {
 
 class XSLTFilter : public WeakImplHelper4 XImportFilter, XExportFilter, 
XDocumentHandler, XStreamListener
 {
-private:
-// the UNO ServiceFactory
-Reference XMultiServiceFactory  m_rServiceFactory;
-
-// DocumentHandler interface of the css::xml::sax::Writer service
-Reference  XExtendedDocumentHandler  m_rDocumentHandler;
-Reference  XOutputStream  m_rOutputStream;
-
-// controls pretty-printing
-sal_Bool m_bPrettyPrint;
-
-Reference XActiveDataControl  m_tcontrol;
-oslCondition  m_cTransformed;
-
-//UOF v2.0 export
-Reference XActiveDataControl  m_splitControl;
-
-sal_Bool m_bTerminated;
-sal_Bool m_bError;
-
-OUString m_aExportBaseUrl;
-OUString m_aOldBaseUrl;
-
-OUString rel2abs(const OUString);
-OUString expandUrl(const OUString);
-
 public:
 
 // ctor...
@@ -163,18 +129,51 @@ public:
 throw (com::sun::star::xml::sax::SAXException,RuntimeException);
 virtual void SAL_CALL setDocumentLocator(const ReferenceXLocator 
doclocator)
 throw (SAXException,RuntimeException);
-// UOF v2.0 export
+
 private:
+// the UNO ServiceFactory
+Reference XMultiServiceFactory  m_rServiceFactory;
+
+// DocumentHandler interface of the css::xml::sax::Writer service
+Reference  XExtendedDocumentHandler  m_rDocumentHandler;
+Reference  XOutputStream  m_rOutputStream;
+
+// controls pretty-printing
+sal_Bool m_bPrettyPrint;
+
+Reference XActiveDataControl  m_tcontrol;
+oslCondition m_cTransformed;
+
+sal_Bool m_bTerminated;
+sal_Bool m_bError;
+
+OUString m_aExportBaseUrl;
+OUString m_aOldBaseUrl;
+
+OUString rel2abs(const OUString);
+OUString expandUrl(const OUString);
+
+// for support of UOF v2.0
+Reference XActiveDataControl  m_splitControl;
 Reference XStream  m_rStream;
-UOF2Splitter * pSplitter;
+
+bool isUOF2ExportStyleSheet( const OUString rExportStyleSheet );
 
 };
 
 XSLTFilter::XSLTFilter( const Reference XMultiServiceFactory  r )
-: m_rServiceFactory(r)
-, m_bPrettyPrint(sal_True)
-, m_bTerminated(sal_False)
-, m_bError(sal_False)
+: m_rServiceFactory( r )
+, m_rDocumentHandler()
+, m_rOutputStream()
+, m_bPrettyPrint( sal_True )
+, m_tcontrol()
+, m_cTransformed()
+, m_bTerminated( sal_False )
+, m_bError( sal_False )
+, m_aExportBaseUrl()
+, m_aOldBaseUrl()
+, m_splitControl()
+, m_rStream()
 {
 m_cTransformed = osl_createCondition();
 }
@@ -252,35 +251,37 @@ sal_Bool XSLTFilter::importer(
 if ( msUserData.getLength()  5 )
 return sal_False;
 
-OUString udImport = msUserData[2];
-OUString udStyleSheet = rel2abs(msUserData[4]);
+const OUString udStyleSheet = rel2abs( msUserData[4] );
 
 // get information from media descriptor
 // the imput stream that represents the imported file
 // is most important here since we need to supply it to
 // the sax parser that drives the supplied document handler
-sal_Int32 nLength = aSourceData.getLength();
-OUString aName, aFileName, aURL;
+const sal_Int32 nLength = aSourceData.getLength();
+OUString aFileName;
+OUString aURL;
 Reference XInputStream  xInputStream;
 for ( sal_Int32 i = 0 ; i  nLength; i++)
 {
-aName = aSourceData[i].Name;
-if (aName.equalsAscii(InputStream))
+const OUString aName = aSourceData[i].Name;
+if ( aName.equalsAscii( InputStream ) )
 aSourceData[i].Value = xInputStream;
-else if ( aName.equalsAscii(FileName))
+else if ( aName.equalsAscii( FileName ) )
 aSourceData[i].Value = aFileName;
-else if (

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

2014-02-21 Thread Stephan Bergmann

 vcl/inc/win/salframe.h   |6 +++---
 vcl/inc/win/salgdi.h |   18 +-
 vcl/inc/win/salmenu.h|2 +-
 vcl/inc/win/salprn.h |   14 +++---
 vcl/inc/win/salvd.h  |2 +-
 vcl/win/source/gdi/salgdi.cxx|8 
 vcl/win/source/gdi/salgdi3.cxx   |2 +-
 vcl/win/source/gdi/salnativewidgets-luna.cxx |8 
 vcl/win/source/gdi/salprn.cxx|   14 +++---
 vcl/win/source/gdi/salvd.cxx |2 +-
 vcl/win/source/window/salframe.cxx   |6 +++---
 vcl/win/source/window/salmenu.cxx|2 +-
 12 files changed, 42 insertions(+), 42 deletions(-)

New commits:
commit 0f82480261a177cbb4f83548c8ce578056bb625a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Feb 21 15:19:55 2014 +0100

Windows vcl: sal_Bool - bool fixup

Change-Id: I60cba53ec0a5aaedf20b6c0c295a91be226b4354

diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h
index 0a54ac2..2aa3eed 100644
--- a/vcl/inc/win/salframe.h
+++ b/vcl/inc/win/salframe.h
@@ -90,7 +90,7 @@ public:
 
 virtual SalGraphics*GetGraphics();
 virtual voidReleaseGraphics( SalGraphics* pGraphics );
-virtual sal_BoolPostEvent( void* pData );
+virtual boolPostEvent( void* pData );
 virtual voidSetTitle( const OUString rTitle );
 virtual voidSetIcon( sal_uInt16 nIcon );
 virtual voidSetMenu( SalMenu* pSalMenu );
@@ -105,7 +105,7 @@ public:
 virtual voidGetWorkArea( Rectangle rRect );
 virtual SalFrame*   GetParent() const;
 virtual voidSetWindowState( const SalFrameState* pState );
-virtual sal_BoolGetWindowState( SalFrameState* pState );
+virtual boolGetWindowState( SalFrameState* pState );
 virtual voidShowFullScreen( sal_Bool bFullScreen, 
sal_Int32 nDisplay );
 virtual voidStartPresentation( sal_Bool bStart );
 virtual voidSetAlwaysOnTop( sal_Bool bOnTop );
@@ -119,7 +119,7 @@ public:
 virtual voidSetInputContext( SalInputContext* pContext );
 virtual voidEndExtTextInput( sal_uInt16 nFlags );
 virtual OUString  GetKeyName( sal_uInt16 nKeyCode );
-virtual sal_BoolMapUnicodeToKeyCode( sal_Unicode aUnicode, 
LanguageType aLangType, KeyCode rKeyCode );
+virtual boolMapUnicodeToKeyCode( sal_Unicode aUnicode, 
LanguageType aLangType, KeyCode rKeyCode );
 virtual LanguageTypeGetInputLanguage();
 virtual voidUpdateSettings( AllSettings rSettings );
 virtual voidBeep();
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index bea5b64..d417833 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -214,9 +214,9 @@ protected:
 const ::basegfx::B2DVector rLineWidth,
 basegfx::B2DLineJoin,
 com::sun::star::drawing::LineCap);
-virtual sal_BooldrawPolyLineBezier( sal_uInt32 nPoints, const 
SalPoint* pPtAry, const sal_uInt8* pFlgAry );
-virtual sal_BooldrawPolygonBezier( sal_uInt32 nPoints, const SalPoint* 
pPtAry, const sal_uInt8* pFlgAry );
-virtual sal_BooldrawPolyPolygonBezier( sal_uInt32 nPoly, const 
sal_uInt32* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry 
);
+virtual booldrawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* 
pPtAry, const sal_uInt8* pFlgAry );
+virtual booldrawPolygonBezier( sal_uInt32 nPoints, const SalPoint* 
pPtAry, const sal_uInt8* pFlgAry );
+virtual booldrawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* 
pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry );
 
 // CopyArea -- No RasterOp, but ClipRegion
 virtual voidcopyArea( long nDestX, long nDestY, long nSrcX, long 
nSrcY, long nSrcWidth,
@@ -243,15 +243,15 @@ protected:
 virtual voidinvert( long nX, long nY, long nWidth, long nHeight, 
SalInvert nFlags);
 virtual voidinvert( sal_uInt32 nPoints, const SalPoint* pPtAry, 
SalInvert nFlags );
 
-virtual sal_BooldrawEPS( long nX, long nY, long nWidth, long 
nHeight, void* pPtr, sal_uIntPtr nSize );
+virtual booldrawEPS( long nX, long nY, long nWidth, long nHeight, 
void* pPtr, sal_uIntPtr nSize );
 
 // native widget rendering methods that require mirroring
-virtual sal_BoolhitTestNativeControl( ControlType nType, 
ControlPart nPart, const Rectangle rControlRegion,
+virtual boolhitTestNativeControl( ControlType nType, ControlPart 
nPart, const Rectangle rControlRegion,
   const Point aPos, bool

Re: Minutes of ESC call

2014-02-21 Thread Thorsten Behrens

Jan Holesovsky wrote:
 * Problems in image scaling code (Markus)
 + can we use openmp there?  anybody against?
 + gcc and visual studio both support that [Markus]
 + easy to use [Markus]

Another piece to look at are intel's TBB, which in my mind are _much_
more idiomatic for c++ code. I'm always reminded of fortran when I see
openmp code. ;)

For vcl/source/gdi/* - that is clearly rife of inefficiencies  funny
algorithms. A plan back in the day was to replace code there with
calls to basebmp stuff one by one, though somehow I never got to
it. But it would be nice to have _one_ place for filtering  image
scaling, instead of three in vcl, one in each application, and one in
basebmp.

Cheers,

-- Thorsten


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 15 commits - cui/source framework/inc framework/source include/svx offapi/com offapi/type_reference sax/source sax/test sc/inc sc/source sd/source svx/source sw/source

2014-02-21 Thread Caolán McNamara

 cui/source/options/optinet2.cxx|   24 -
 framework/inc/services/mediatypedetectionhelper.hxx|3 
 framework/source/services/mediatypedetectionhelper.cxx |5 
 include/svx/ChildrenManager.hxx|4 
 offapi/com/sun/star/xml/sax/XExtendedDocumentHandler.idl   |3 
 offapi/type_reference/offapi.idl   |2 
 sax/source/expatwrap/saxwriter.cxx |4 
 sax/test/saxdemo.cxx   |2 
 sc/inc/cellsuno.hxx|9 
 sc/source/ui/sidebar/ScPanelFactory.cxx|  136 
+-
 sc/source/ui/unoobj/cellsuno.cxx   |7 
 sc/source/ui/unoobj/scdetect.cxx   |1 
 sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx  |2 
 sd/source/ui/inc/AccessibleDrawDocumentView.hxx|3 
 sd/source/ui/slidesorter/controller/SlideSorterController.cxx  |   12 
 sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx |5 
 sd/source/ui/slidesorter/controller/SlsPageSelector.cxx|   40 +-
 sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx|2 
 sd/source/ui/slidesorter/model/SlideSorterModel.cxx|   31 +-
 sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx  |4 
 svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx|3 
 svx/source/accessibility/ChildrenManager.cxx   |3 
 svx/source/accessibility/ChildrenManagerImpl.cxx   |3 
 svx/source/accessibility/ChildrenManagerImpl.hxx   |3 
 svx/source/accessibility/svxpixelctlaccessiblecontext.cxx  |8 
 svx/source/inc/svxpixelctlaccessiblecontext.hxx|4 
 sw/source/core/doc/docedt.cxx  |3 
 sw/source/ui/uno/swdetect.cxx  |1 
 sw/source/ui/uno/unotxdoc.cxx  |2 
 toolkit/source/helper/unowrapper.cxx   |   23 -
 vcl/qa/cppunit/canvasbitmaptest.cxx|   14 -
 31 files changed, 214 insertions(+), 152 deletions(-)

New commits:
commit f6fef3a970eff5b81c2bc7390ddd6ac96931a92a
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Feb 21 15:02:34 2014 +

coverity#1130457 Uncaught exception

Change-Id: Ie65cdb00ec8823db329d2330ed142f4d841b095a

diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx 
b/vcl/qa/cppunit/canvasbitmaptest.cxx
index 5b8e6cd..a1bfecb 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -613,8 +613,11 @@ private:
 return aRes;
 }
 
-virtual uno::Sequence ::sal_Int8  SAL_CALL convertIntegerFromRGB( const 
uno::Sequence rendering::RGBColor  ) throw (lang::IllegalArgumentException,
-   
  uno::RuntimeException)
+virtual uno::Sequence ::sal_Int8  SAL_CALL convertIntegerFromRGB(
+const uno::Sequence rendering::RGBColor )
+throw (lang::IllegalArgumentException,
+   uno::RuntimeException,
+   std::exception)
 {
 CPPUNIT_ASSERT_MESSAGE(convertIntegerFromRGB: method not 
implemented, false);
 return uno::Sequence sal_Int8 ();
commit ea89446d5d7040f008c7b6c56afca03f738f7ec0
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Feb 21 15:01:30 2014 +

coverity#1130458 Uncaught exception

Change-Id: I2fd30daef6df18d0ef25132f9c0e445f613da10f

diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx 
b/vcl/qa/cppunit/canvasbitmaptest.cxx
index 690a822..5b8e6cd 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -572,8 +572,11 @@ private:
 return aRes;
 }
 
-virtual uno::Sequence rendering::ARGBColor  SAL_CALL 
convertIntegerToPARGB( const uno::Sequence ::sal_Int8  deviceColor ) throw 
(lang::IllegalArgumentException,
-   
  uno::RuntimeException)
+virtual uno::Sequence rendering::ARGBColor  SAL_CALL 
convertIntegerToPARGB(
+const uno::Sequence ::sal_Int8  deviceColor)
+throw (lang::IllegalArgumentException,
+   uno::RuntimeException,
+   std::exception)
 {
 const sal_Size  nLen( deviceColor.getLength() );
 const sal_Int32 nBytesPerPixel(mnBitsPerPixel == 8 ? 1 : 4);
commit c7a6e0645acc5bf6d92fda8986410866272bbbd6
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Feb 21 14:55:05 2014 +

coverity#1132721 fix exception specs

Change-Id: I1c499f8b994d29e265a66f4219d4c3fddb237a89

diff --git

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 16/3d414311b0c8bcb1b0ad7c7cbf364e0ad4e4c4

2014-02-21 Thread Caolán McNamara

 16/3d414311b0c8bcb1b0ad7c7cbf364e0ad4e4c4 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit bddfb4695be3433b1a99286f6d3da8131560e721
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Feb 21 15:30:57 2014 +

Notes added by 'git notes add'

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

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

2014-02-21 Thread Timothy Markle

 sw/source/filter/html/css1atr.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit 441ef2e9c6e72ea8ae47c707cc29d1cd068a47a1
Author: Timothy Markle tmark...@gmail.com
Date:   Wed Feb 19 22:53:42 2014 +0100

Remove !-- -- in style in writer export to HTML

Comment was used to hide style contents from old browsers.
No longer necessary for browsers now.

Change-Id: I1ffe77f9cc05b0c1579be379360a43a227420308

diff --git a/sw/source/filter/html/css1atr.cxx 
b/sw/source/filter/html/css1atr.cxx
index 94e2783..0a80199 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -218,8 +218,6 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
 sOut.append( + OString(OOO_STRING_SVTOOLS_HTML_style) +   +
 OString(OOO_STRING_SVTOOLS_HTML_O_type) + 
=\text/css\);
 Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
-OutNewLine();
-Strm().WriteChar( '' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_comment 
);
 
 IncIndentLevel();
 }
@@ -632,8 +630,6 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc 
rPageDesc, sal_Bool bUsed )
 if( !bFirstCSS1Rule )
 {
 DecIndentLevel();
-OutNewLine();
-Strm().WriteCharPtr( -- );
 
 OutNewLine();
 HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_style, 
sal_False );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Minutes of ESC call

2014-02-21 Thread Tomaž Vajngerl

Hi,

On Fri, Feb 21, 2014 at 3:21 PM, Thorsten Behrens
t...@documentfoundation.org wrote:
 Another piece to look at are intel's TBB, which in my mind are _much_
 more idiomatic for c++ code. I'm always reminded of fortran when I see
 openmp code. ;)

 For vcl/source/gdi/* - that is clearly rife of inefficiencies  funny
 algorithms. A plan back in the day was to replace code there with
 calls to basebmp stuff one by one, though somehow I never got to
 it. But it would be nice to have _one_ place for filtering  image
 scaling, instead of three in vcl, one in each application, and one in
 basebmp.

 Cheers,

 -- Thorsten

Actually, I think we need SIMD implementations of image scalers if we
really want speed. We already have pixman (needed by cairo) which has
SIMD optimized image scalers available (and with latest versions also
high quality SIMD image scalers) - somebody just needs to integrate
it.

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

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

2014-02-21 Thread Michael Stahl

 sw/source/core/layout/paintfrm.cxx |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 7d8e24dc4c3dd63977970fd0b4856ab81aee6305
Author: Michael Stahl mst...@redhat.com
Date:   Wed Feb 19 21:46:11 2014 +0100

fdo#75118: sw: do not paint zero-width lines

Since commit 6a3fb868b2b8af21f7b6140424b6f8377599a786 zero-width
BorderLinePrimitive2D will actually be painted as hairlines by
VclPixelProcessor2D::tryDrawBorderLinePrimitive2DDirect(), so don't
create such pointless primitives.

(cherry picked from commit 128d3d51c208ec5c37a105ea5c751530bd017d4b)

fdo#75118: actually these are floats, compare with approxEqual

(cherry picked from commit 9fb9fc301502c2762ad4a8059d8d1c818d2843db)

Change-Id: I4c2404b73f106156b83a6d72efa3c8991e5d659e
Reviewed-on: https://gerrit.libreoffice.org/8144
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com
(cherry picked from commit 1639e174ebb3945f4fda08c30f535f98d3e54d7e)
Reviewed-on: https://gerrit.libreoffice.org/8148
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index ba57797..54de397 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2474,8 +2474,8 @@ void SwTabFrmPainter::PaintLines( OutputDevice rDev, 
const SwRect rRect ) cons
 break;
 
 const SwLineEntrySet rEntrySet = (*aIter).second;
-SwLineEntrySetConstIter aSetIter = rEntrySet.begin();
-while ( aSetIter != rEntrySet.end() )
+for (SwLineEntrySetConstIter aSetIter = rEntrySet.begin();
+ aSetIter != rEntrySet.end(); ++aSetIter)
 {
 const SwLineEntry rEntry = *aSetIter;
 const svx::frame::Style rEntryStyle( (*aSetIter).maAttribute );
@@ -2608,6 +2608,12 @@ void SwTabFrmPainter::PaintLines( OutputDevice rDev, 
const SwRect rRect ) cons
 aPaintStart.Y() -= nTwipYCorr;
 aPaintEnd.Y()   -= nTwipYCorr;
 
+if (::rtl::math::approxEqual(aStyles[0].Prim(), 0.0) 
+::rtl::math::approxEqual(aStyles[0].Secn(), 0.0))
+{
+continue; // fdo#75118 do not paint zero-width lines
+}
+
 // Here comes the painting stuff: Thank you, DR, great job!!!
 if ( bHori )
 {
@@ -2642,8 +2648,6 @@ void SwTabFrmPainter::PaintLines( OutputDevice rDev, 
const SwRect rRect ) cons
 );
 }
 }
-
-++aSetIter;
 }
 
 ++aIter;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-21 Thread Tobias Lippert

 include/vcl/settings.hxx|   47 +--
 vcl/source/app/settings.cxx |  178 
 2 files changed, 55 insertions(+), 170 deletions(-)

New commits:
commit a9cfb745c5ade8b05b97a33c4cb5cc66941b803d
Author: Tobias Lippert d...@fastmail.fm
Date:   Sat Jan 11 21:03:11 2014 +0100

Replace handwritten reference counting with shared_ptr

This will help to avoid race conditions because the shared pointers
are thread safe and use atomic increments.

Conflicts:
include/vcl/settings.hxx
vcl/source/app/settings.cxx

Change-Id: Ie3d27d6412167855a0cea1442676b81b733c15e8

diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 0173b31..828c7a1 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -30,6 +30,8 @@
 #include i18nlangtag/languagetag.hxx
 #include unotools/syslocale.hxx
 
+#include boost/shared_ptr.hpp
+
 class CollatorWrapper;
 class LocaleDataWrapper;
 
@@ -44,12 +46,11 @@ namespace vcl {
 class ImplMouseData
 {
 friend class MouseSettings;
-
+public:
 ImplMouseData();
 ImplMouseData( const ImplMouseData rData 
);
 
 private:
-sal_uLong   mnRefCount;
 sal_uLong   mnOptions;
 sal_uLong   mnDoubleClkTime;
 longmnDoubleClkWidth;
@@ -97,7 +98,7 @@ class VCL_DLLPUBLIC MouseSettings
 voidCopyData();
 
 private:
-ImplMouseData*  mpData;
+boost::shared_ptrImplMouseData  mpData;
 
 public:
 MouseSettings();
@@ -241,13 +242,12 @@ class ImplStyleData
 {
 friend class StyleSettings;
 
+public:
 ImplStyleData();
 ImplStyleData( const ImplStyleData rData 
);
-voidSetStandardStyles();
 
 private:
-sal_uLong   mnRefCount;
-
+voidSetStandardStyles();
 Color   maActiveBorderColor;
 Color   maActiveColor;
 Color   maActiveColor2;
@@ -434,7 +434,7 @@ class VCL_DLLPUBLIC StyleSettings
 voidCopyData();
 
 private:
-ImplStyleData*  mpData;
+boost::shared_ptrImplStyleData  mpData;
 
 public:
 StyleSettings();
@@ -833,8 +833,8 @@ public:
 
 voidSetOptions( sal_uLong nOptions )
 { CopyData(); mpData-mnOptions = 
nOptions; }
-sal_uLong   GetOptions() const
-{ return mpData-mnOptions; }
+sal_uLong   GetOptions() const;
+
 voidSetAutoMnemonic( bool bAutoMnemonic )
 { CopyData(); mpData-mnAutoMnemonic = 
(sal_uInt16)bAutoMnemonic; }
 boolGetAutoMnemonic() const
@@ -958,15 +958,15 @@ protected:
 class ImplMiscData
 {
 friend class MiscSettings;
+public:
 
 ImplMiscData();
 ImplMiscData( const ImplMiscData rData );
 
 private:
-sal_uLong   mnRefCount;
-AutoState  mnEnableATT;
+AutoState   mnEnableATT;
 boolmbEnableLocalizedDecimalSep;
-AutoState  mnDisablePrinting;
+AutoState   mnDisablePrinting;
 };
 
 // 
@@ -978,7 +978,7 @@ class VCL_DLLPUBLIC MiscSettings
 voidCopyData();
 
 private:
-ImplMiscData*   mpData;
+boost::shared_ptrImplMiscData   mpData;
 
 public:
 MiscSettings();
@@ -1006,12 +1006,11 @@ public:
 class ImplHelpData
 {
 friend class HelpSettings;
-
+public:
 ImplHelpData();
 ImplHelpData( const ImplHelpData rData );
 
 private:
-sal_uLong   mnRefCount;
 sal_uLong   mnOptions;
 sal_uLong   mnTipDelay;
 sal_uLong   mnTipTimeout;
@@ -1027,7 +1026,7 @@ class VCL_DLLPUBLIC HelpSettings
 voidCopyData();
 
 private:
-ImplHelpData*   mpData;
+boost::shared_ptrImplHelpData   mpData;
 
 public:
 HelpSettings();
@@ -1063,14 +1062,13 @@ public:
 // ---
 class ImplAllSettingsData
 {
-friend classAllSettings;
-
-

[Bug 60270] LibreOffice 4.1 most annoying bugs

2014-02-21 Thread bugzilla-daemon

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

Thomas Thym unget...@mevin.net changed:

   What|Removed |Added

 Depends on||61840

--- Comment #142 from Thomas Thym unget...@mevin.net ---
Bug 61840 - FORMATTING: Formating numbers in Data Pilot table does not work
anymore (regression)

Nominating this bug, because it is a regression (to 4.0.0.x and still here in
4.2.0.4) and because it is really annoying to do the formating for each and
every data pilot table / pivot table once and once again after the data is
refreshed.

-- 
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: sw/CppunitTest_sw_ooxmlexport.mk sw/qa sw/source

2014-02-21 Thread Miklos Vajna

 sw/CppunitTest_sw_ooxmlexport.mk|1 
 sw/qa/extras/ooxmlexport/data/form-control.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx|8 +
 sw/source/filter/ww8/docxattributeoutput.cxx|   36 ++--
 sw/source/filter/ww8/docxattributeoutput.hxx|2 +
 5 files changed, 45 insertions(+), 2 deletions(-)

New commits:
commit 1ec263e25d8606c70ac2089d5ceea22750d25daf
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Feb 21 17:19:23 2014 +0100

DOCX export: initial support for the DateField form control

Before we started to import the date SDT as a form control, we exported
what is now the HelpText property on the control. So as an initial step,
export that back as plain text, without any formatting.

Change-Id: I569e6690b0c580d8073611b48d610f87974145b3

diff --git a/sw/CppunitTest_sw_ooxmlexport.mk b/sw/CppunitTest_sw_ooxmlexport.mk
index 6d09ca2..30643b2 100644
--- a/sw/CppunitTest_sw_ooxmlexport.mk
+++ b/sw/CppunitTest_sw_ooxmlexport.mk
@@ -58,6 +58,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlexport,\
drawinglayer/drawinglayer \
 embeddedobj/util/embobj \
 filter/source/config/cache/filterconfig1 \
+   forms/util/frm \
 framework/util/fwk \
 i18npool/util/i18npool \
 linguistic/source/lng \
diff --git a/sw/qa/extras/ooxmlexport/data/form-control.docx 
b/sw/qa/extras/ooxmlexport/data/form-control.docx
new file mode 100755
index 000..4f6305a
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/form-control.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 025b27e..ceea5c2 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2280,6 +2280,14 @@ DECLARE_OOXMLEXPORT_TEST(testDmlShapeTitle, 
dml-shape-title.docx)
 CPPUNIT_ASSERT_EQUAL(OUString(Description), 
getPropertyOUString(getShape(1), Description));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testFormControl, form-control.docx)
+{
+if (!m_bExported)
+return;
+// [Date] was missing.
+getParagraph(1, Foo [Date] bar.);
+}
+
 DECLARE_OOXMLEXPORT_TEST(testBehinddoc, behinddoc.docx)
 {
 xmlDocPtr pXmlDoc = parseExport(word/document.xml);
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index ab71fd9..8087ca7 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -80,6 +80,8 @@
 #include editeng/editobj.hxx
 #include svx/xfillit0.hxx
 #include svx/xflgrit.hxx
+#include svx/fmglob.hxx
+#include svx/svdouno.hxx
 #include svl/grabbagitem.hxx
 #include sfx2/sfxbasemodel.hxx
 #include tools/datetimeutils.hxx
@@ -696,6 +698,11 @@ void DocxAttributeOutput::EndRun()
 m_pSerializer-endElementNS( XML_w, XML_r );
 
 WritePostponedMath();
+
+for (std::vectorconst SdrObject*::iterator it = 
m_aPostponedFormControls.begin(); it != m_aPostponedFormControls.end(); ++it)
+WritePostponedFormControl(*it);
+m_aPostponedFormControls.clear();
+
 WritePendingPlaceholder();
 
 // if there is some redlining in the document, output it
@@ -3311,6 +3318,26 @@ void DocxAttributeOutput::WritePostponedMath()
 m_postponedMath = NULL;
 }
 
+void DocxAttributeOutput::WritePostponedFormControl(const SdrObject* pObject)
+{
+if (pObject  pObject-GetObjInventor() == FmFormInventor)
+{
+if (SdrUnoObj *pFormObj = PTR_CAST(SdrUnoObj,pObject))
+{
+uno::Referenceawt::XControlModel xControlModel = 
pFormObj-GetUnoControlModel();
+uno::Referencelang::XServiceInfo xInfo(xControlModel, 
uno::UNO_QUERY);
+if 
(xInfo-supportsService(com.sun.star.form.component.DateField))
+{
+uno::Referencebeans::XPropertySet 
xPropertySet(xControlModel, uno::UNO_QUERY);
+OUString aHelpText = 
xPropertySet-getPropertyValue(HelpText).getOUString();
+m_pSerializer-startElementNS(XML_w, XML_r, FSEND);
+RunText(aHelpText);
+m_pSerializer-endElementNS(XML_w, XML_r);
+}
+}
+}
+}
+
 /*
  * Write w:pict hierarchy  end element of w:rPr tag.
  */
@@ -3417,11 +3444,16 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const 
sw::Frame rFrame, const Po
 }
 }
 break;
+case sw::Frame::eFormControl:
+{
+const SdrObject* pObject = 
rFrame.GetFrmFmt().FindRealSdrObject();
+m_aPostponedFormControls.push_back(pObject);
+}
+break;
 default:
 OSL_TRACE( TODO DocxAttributeOutput::OutputFlyFrame_Impl( const 
sw::Frame rFrame, const Point rNdTopLeft ) - frame type '%s'\n,
 rFrame.GetWriterType() == sw::Frame::eTxtBox? eTxtBox:
-( rFrame.GetWriterType() == sw::Frame::eOle? eOle:
-

[Bug 60270] LibreOffice 4.1 most annoying bugs

2014-02-21 Thread bugzilla-daemon

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

--- Comment #143 from Kohei Yoshida libreoff...@kohei.us ---
(In reply to comment #142)
 Bug 61840 - FORMATTING: Formating numbers in Data Pilot table does not work
 anymore (regression)
 
 Nominating this bug, because it is a regression (to 4.0.0.x and still here
 in 4.2.0.4) and because it is really annoying to do the formating for each
 and every data pilot table / pivot table once and once again after the data
 is refreshed.

FWIW, this never worked, so not a regression. If it ever appeared to have
worked before, it was a fluke.

-- 
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 60270] LibreOffice 4.1 most annoying bugs

2014-02-21 Thread bugzilla-daemon

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

Kohei Yoshida libreoff...@kohei.us changed:

   What|Removed |Added

 Depends on|61840   |

-- 
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: cui/source

2014-02-21 Thread Caolán McNamara

 cui/source/options/optgdlg.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c8ed5991709725d7cade48a99a09cc26243f4b95
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Feb 21 17:01:46 2014 +

restore translatable Auto text

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

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 92fe1df..6b256d8 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -594,6 +594,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const 
SfxItemSet rSet)
 }
 
 // Set known icon themes
+OUString sAutoStr( m_pIconStyleLB-GetEntry( 0 ) );
 m_pIconStyleLB-Clear();
 StyleSettings aStyleSettings = 
Application::GetSettings().GetStyleSettings();
 mInstalledIconThemes = aStyleSettings.GetInstalledIconThemes();
@@ -602,7 +603,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const 
SfxItemSet rSet)
 OUString autoThemeId = aStyleSettings.GetAutomaticallyChosenIconTheme();
 const vcl::IconThemeInfo autoIconTheme = 
vcl::IconThemeInfo::FindIconThemeById(mInstalledIconThemes, autoThemeId);
 
-OUString entryForAuto = OUString(Auto () +
+OUString entryForAuto = sAutoStr + OUString( () +
 autoIconTheme.GetDisplayName() +
 OUString());
 m_pIconStyleLB-InsertEntry(entryForAuto);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-21 Thread Caolán McNamara

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

New commits:
commit 79b6edcb6854989253021295e8d35ecfcf0a3874
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Feb 21 17:34:52 2014 +

I missed a nullptr c++11ish

Change-Id: I048efbb816fc4f4e91eb3a80a16f3f82b52599e0

diff --git a/vcl/source/app/IconThemeInfo.cxx b/vcl/source/app/IconThemeInfo.cxx
index 69f0302..89a1b4e 100644
--- a/vcl/source/app/IconThemeInfo.cxx
+++ b/vcl/source/app/IconThemeInfo.cxx
@@ -83,7 +83,7 @@ IconThemeInfo::UrlCanBeParsed(const OUString url)
 return false;
 }
 
-if (!fname.endsWithIgnoreAsciiCase(EXTENSION_FOR_ICON_PACKAGES, nullptr)) {
+if (!fname.endsWithIgnoreAsciiCase(EXTENSION_FOR_ICON_PACKAGES)) {
 return false;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Rachit Gupta license statement

2014-02-21 Thread Rachit Gupta

All of my past  future contributions to LibreOffice may be licensed
under the MPLv2/LGPLv3+ dual license.

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

[Libreoffice-commits] dev-tools.git: scripts/esc-bug-stats.pl

2014-02-21 Thread Michael Meeks

 scripts/esc-bug-stats.pl |   30 +++---
 1 file changed, 23 insertions(+), 7 deletions(-)

New commits:
commit 530dd9b821c61381946cf6236afe93c75f83b124
Author: Michael Meeks michael.me...@collabora.com
Date:   Fri Feb 21 18:06:51 2014 +

Adapt for 4.3 MAB tracker.

diff --git a/scripts/esc-bug-stats.pl b/scripts/esc-bug-stats.pl
index 3c7c29e..ac099a7 100755
--- a/scripts/esc-bug-stats.pl
+++ b/scripts/esc-bug-stats.pl
@@ -36,6 +36,9 @@ my %sadly_non_libreoffice = (
 'Kenneth Graunke' = 1,
 'Seif Lotfy' = 1,
 'Alex Deucher' = 1,
+'Ian Romanick' = 1,
+'Tollef Fog Heen' = 1,
+'Patrick Ohly' = 1,
 );
 
 # use me for testing XML pretty printing etc.
@@ -52,7 +55,7 @@ sub get_url($)
 my $url = shift;
 my @lines;
 my $handle;
-open ($handle, curl -s '$url' 21 |) || die can't exec curl: $!;
+open ($handle, curl -k -s '$url' 21 |) || die can't exec curl: $!;
 while ($handle) {
push @lines, $_;
 }
@@ -132,7 +135,7 @@ sub crunch_bugstat_lines(@)
 my %closed_stats;
 
 while ((my $line = shift @lines)  $region ne 'end') {
-#  print $region - $line;
+#  print STDERR $region - $line\n;
if ($region eq 'header'  $line =~ /h2Top .* modules\/h2/) {
$region = 'top-modules';
 
@@ -189,6 +192,7 @@ sub build_overall_bugstats()
 }
 
 my %bug_to_ver = (
+'4.3' = '75025',
 '4.2' = '65675',
 '4.1' = '60270',
 '4.0' = '54157',
@@ -348,6 +352,12 @@ print  EOF
   text:pClosed 4.2/text:p
  /table:table-cell
  table:table-cell table:style-name=boldheader 
office:value-type=string calcext:value-type=string
+  text:pOpen 4.3/text:p
+ /table:table-cell
+ table:table-cell table:style-name=boldheader 
office:value-type=string calcext:value-type=string
+  text:pClosed 4.3/text:p
+ /table:table-cell
+ table:table-cell table:style-name=boldheader 
office:value-type=string calcext:value-type=string
   text:pTotal 3.5/text:p
  /table:table-cell
  table:table-cell table:style-name=boldheader 
office:value-type=string calcext:value-type=string
@@ -363,6 +373,9 @@ print  EOF
   text:pTotal 4.2/text:p
  /table:table-cell
  table:table-cell table:style-name=boldheader 
office:value-type=string calcext:value-type=string
+  text:pTotal 4.3/text:p
+ /table:table-cell
+ table:table-cell table:style-name=boldheader 
office:value-type=string calcext:value-type=string
   text:pTotal Open/text:p
  /table:table-cell
  table:table-cell table:style-name=boldheader 
office:value-type=string calcext:value-type=string
@@ -379,18 +392,21 @@ print  EOF
  table:table-cell/
  table:table-cell/
  table:table-cell office:value-type=float 
office:value=$ver_open{'4.0'} calcext:value-type=float/
- table:table-cell table:formula=of:=[.N2]-[.F2] 
office:value-type=float calcext:value-type=float/
+ table:table-cell table:formula=of:=[.P2]-[.F2] 
office:value-type=float calcext:value-type=float/
  table:table-cell office:value-type=float 
office:value=$ver_open{'4.1'} calcext:value-type=float/
- table:table-cell table:formula=of:=[.O2]-[.H2] 
office:value-type=float calcext:value-type=float/
+ table:table-cell table:formula=of:=[.Q2]-[.H2] 
office:value-type=float calcext:value-type=float/
  table:table-cell office:value-type=float 
office:value=$ver_open{'4.2'} calcext:value-type=float/
- table:table-cell table:formula=of:=[.P2]-[.J2] 
office:value-type=float  calcext:value-type=float/
+ table:table-cell table:formula=of:=[.R2]-[.J2] 
office:value-type=float  calcext:value-type=float/
+ table:table-cell office:value-type=float 
office:value=$ver_open{'4.3'} calcext:value-type=float/
+ table:table-cell table:formula=of:=[.S2]-[.L2] 
office:value-type=float  calcext:value-type=float/
  table:table-cell office:value-type=float office:value=221 
calcext:value-type=float/
  table:table-cell office:value-type=float 
office:value=$ver_total{'3.6'} calcext:value-type=float/
  table:table-cell office:value-type=float 
office:value=$ver_total{'4.0'} calcext:value-type=float/
  table:table-cell office:value-type=float 
office:value=$ver_total{'4.1'} calcext:value-type=float/
  table:table-cell office:value-type=float 
office:value=$ver_total{'4.2'} calcext:value-type=float/
- table:table-cell table:formula=of:=[.B2]+[.D2]+[.F2]+[.H2] 
office:value-type=float/
- table:table-cell table:formula=of:=SUM([.L2:.P2])-[.Q2] 
office:value-type=float/
+ table:table-cell office:value-type=float 
office:value=$ver_total{'4.3'} calcext:value-type=float/
+ table:table-cell table:formula=of:=[.B2]+[.D2]+[.F2]+[.H2]+[.L2] 
office:value-type=float/
+ table:table-cell table:formula=of:=SUM([.N2:.S2])-[.T2] 
office:value-type=float/
 /table:table-row
 
 table:table-row/
___
Libreoffice-commits mailing list

[Libreoffice-commits] core.git: sal/osl

2014-02-21 Thread Stephan Bergmann

 sal/osl/unx/file_volume.cxx |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit b2a13845559c1be7cade887bc3a337e87bc57a51
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Feb 21 19:20:31 2014 +0100

loplugin:literaltoboolconversion

Change-Id: I5796e8b4c156b13c5cab42bc0012d241efb1c4d9

diff --git a/sal/osl/unx/file_volume.cxx b/sal/osl/unx/file_volume.cxx
index 576ead4..0473b9f 100644
--- a/sal/osl/unx/file_volume.cxx
+++ b/sal/osl/unx/file_volume.cxx
@@ -149,8 +149,8 @@ oslFileError osl_getVolumeInformation( rtl_uString* 
ustrDirectoryURL, oslVolumeI
 /* always return true if queried for the properties of
the file system. If you think this is wrong under any
of the target platforms fix it */
-#   define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)  (1)
-#   define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
+#   define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)  (true)
+#   define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (true)
 #endif /* FREEBSD || MACOSX || OPENBSD */
 
 #if defined(NETBSD)
@@ -204,8 +204,8 @@ oslFileError osl_getVolumeInformation( rtl_uString* 
ustrDirectoryURL, oslVolumeI
 /* always return true if queried for the properties of
the file system. If you think this is wrong under any
of the target platforms fix it */
-#   define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)  (1)
-#   define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
+#   define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)  (true)
+#   define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (true)
 #endif /* SOLARIS */
 
 #   define __OSL_STATFS_INIT(a) (memset((a), 0, 
sizeof(__OSL_STATFS_STRUCT)))
@@ -215,9 +215,9 @@ oslFileError osl_getVolumeInformation( rtl_uString* 
ustrDirectoryURL, oslVolumeI
 #   define __OSL_STATFS_STRUCT   struct dummy {int i;}
 #   define __OSL_STATFS_INIT(a)  ((void)a)
 #   define __OSL_STATFS(dir, sfs)(1)
-#   define __OSL_STATFS_ISREMOTE(sfs)(0)
-#   define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)  (1)
-#   define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
+#   define __OSL_STATFS_ISREMOTE(sfs)(false)
+#   define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)  (true)
+#   define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (true)
 #endif /* HAVE_STATFS_H */
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Would like some help building Android APK that includes the native (jni) library...

2014-02-21 Thread Tor Lillqvist

 2. switch to the project directory and do ./autogen.sh.

OK, so you didn't give any options on the ./autogen.sh command line at
all (and had no autogen.input file that would have contained
corresponding options)? Then you have built LibreOffice for your build
platform, apparently Linux, and not for Android. Please read
README.Android.

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

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

2014-02-21 Thread Tor Lillqvist

 configure.ac |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 691f87b2f1197fedfafa24aa7ae95f268243653e
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Feb 21 17:42:45 2014 +0200

Surely no need to check for malloc, realloc, calloc and free

Change-Id: Ie2176e830d6c759657936b48c8ac6860aacf3d9d

diff --git a/configure.ac b/configure.ac
index c858df5..092d4e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6612,7 +6612,6 @@ AC_MSG_CHECKING([which memory allocator to use])
 if test $with_alloc = system; then
 AC_MSG_RESULT([system])
 ALLOC=SYS_ALLOC
-AC_CHECK_FUNCS([malloc realloc calloc free])
 fi
 if test $with_alloc = tcmalloc; then
 AC_MSG_RESULT(tcmalloc)
@@ -6635,7 +6634,6 @@ if test $with_alloc = jemalloc; then
 else
 AC_MSG_RESULT([system])
 ALLOC=SYS_ALLOC
-AC_CHECK_FUNCS([malloc realloc calloc free])
 fi
 fi
 if test $with_alloc = internal -o -z $with_alloc; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-21 Thread Tor Lillqvist

 include/vcl/IconThemeSelector.hxx |2 +-
 vcl/CppunitTest_vcl_app_test.mk   |4 
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit c42719bf5d320f449b55721d3a0e7feda61dc531
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Feb 21 22:09:49 2014 +0200

This uses boost_headers

Change-Id: I3e587cf07674374c18fa49e0528c0d7f8605f0df

diff --git a/vcl/CppunitTest_vcl_app_test.mk b/vcl/CppunitTest_vcl_app_test.mk
index 0aa3202..0449e04 100644
--- a/vcl/CppunitTest_vcl_app_test.mk
+++ b/vcl/CppunitTest_vcl_app_test.mk
@@ -22,6 +22,10 @@ vcl \
 $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_use_externals,vcl_app_test, \
+   boost_headers \
+))
+
 $(eval $(call gb_CppunitTest_set_include,vcl_app_test, \
 $$(INCLUDE) \
 -I$(OUTDIR)/inc \
commit 630ce26a254becab7b96abe87ac3094cf9c08f87
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Feb 21 22:07:07 2014 +0200

WaE: struct/class inconsistency

Change-Id: Iedb9873bc36fa5854de56738351d3683e245024d

diff --git a/include/vcl/IconThemeSelector.hxx 
b/include/vcl/IconThemeSelector.hxx
index 35bde9e..39fdf6a 100644
--- a/include/vcl/IconThemeSelector.hxx
+++ b/include/vcl/IconThemeSelector.hxx
@@ -20,7 +20,7 @@
 class IconThemeSelectorTest;
 
 namespace vcl {
-struct IconThemeInfo;
+class IconThemeInfo;
 
 /** This class helps to choose an icon theme from a list of installed themes.
  *
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-21 Thread Tor Lillqvist

 vcl/source/app/settings.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 01f1dae0aaa8f98db593e54f46cf35bd7b109796
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Feb 21 22:13:42 2014 +0200

WaE: implicit conversion of literal of type 'sal_Bool' to 'bool'

Change-Id: Icc60d9dbbc8be68bd1ac54c93bd2506af6c01c0c

diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index c6c93dd..37adb5f 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -681,11 +681,11 @@ bool StyleSettings::operator ==( const StyleSettings 
rSet ) const
 return true;
 
 if (mpData-mIconTheme != rSet.mpData-mIconTheme) {
-return sal_False;
+return false;
 }
 
 if (*mpData-mIconThemeSelector != *rSet.mpData-mIconThemeSelector) {
-return sal_False;
+return false;
 }
 
 if ( (mpData-mnOptions == rSet.mpData-mnOptions) 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] mso-dumper.git: msodumper/formula.py msodumper/xlsrecord.py

2014-02-21 Thread Kohei Yoshida

 msodumper/formula.py   |   21 ++---
 msodumper/xlsrecord.py |2 +-
 2 files changed, 15 insertions(+), 8 deletions(-)

New commits:
commit ea31f6bfff283b30ea5dcf7bb2b5f5a691fec43e
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Fri Feb 21 15:20:40 2014 -0500

Map formula opcode 0x5A to PtgRef3d, and introduce parsed formula type.

Parsed formula type determines how the same token can be parsed. For now
it's not used yet.

diff --git a/msodumper/formula.py b/msodumper/formula.py
index abb17b7..3c9dd6c 100644
--- a/msodumper/formula.py
+++ b/msodumper/formula.py
@@ -112,6 +112,12 @@ class TokenType:
 Area3d = 0
 Unknown = 
 
+class ParsedFormulaType:
+Cell = 0
+Name = 1
+Shared = 2
+Unknown = 
+
 def getPtgDataType (opcode):
 return (opcode  0x60) / (2**5)
 
@@ -129,11 +135,11 @@ class PtgDataType(object):
 return 'unknown'
 
 class PtgBase(object):
-def __init__ (self, strm, opcode1, opcode2=None):
-self.opcode1 = opcode1
-self.opcode2 = opcode2
+def __init__ (self, strm, opcode, parseType):
+self.opcode = opcode
 self.strm = strm
 self.tokenType = TokenType.Unknown
+self.parseType = parseType
 
 def parse (self):
 self.parseBytes()
@@ -163,7 +169,7 @@ class PtgMissArg(PtgBase):
 
 class PtgMemFunc(PtgBase):
 def parseBytes(self):
-self.dataType = getPtgDataType(self.opcode1)
+self.dataType = getPtgDataType(self.opcode)
 self.length = self.strm.readUnsignedInt(2)
 
 def getText (self):
@@ -634,7 +640,7 @@ class PtgFuncVar(PtgBase):
 }
 
 def parseBytes (self):
-self.dataType = (self.opcode1  0x60)/32  # 0x1 = reference, 0x2 = 
value, 0x3 = array
+self.dataType = (self.opcode  0x60)/32  # 0x1 = reference, 0x2 = 
value, 0x3 = array
 self.argCount = self.strm.readUnsignedInt(1)
 tab = self.strm.readUnsignedInt(2)
 self.funcType = (tab  0x7FFF)
@@ -667,6 +673,7 @@ _tokenMap = {
 0x43: PtgName,
 0x44: PtgRef,
 0x59: PtgNameX,
+0x5A: PtgRef3d,
 0x5B: _Area3d,
 0x7B: _Area3d,
 
@@ -693,14 +700,14 @@ associated token classes will be without the leading 
underscore (_).
 globals.error(FormulaParser: init called with None source\n)
 self.strm = globals.ByteStream()
 
-def parse (self):
+def parse (self, parseType=ParsedFormulaType.Cell):
 while not self.strm.isEndOfRecord():
 b = self.strm.readUnsignedInt(1)
 if not _tokenMap.has_key(b):
 # Unknown token.  Stop parsing.
 raise FormulaParserError(unknown token 0x%2.2X%b)
 
-token = _tokenMap[b](self.strm, b)
+token = _tokenMap[b](self.strm, b, parseType)
 token.parse()
 self.tokens.append(token)
 
diff --git a/msodumper/xlsrecord.py b/msodumper/xlsrecord.py
index ac070f4..9a51fc7 100644
--- a/msodumper/xlsrecord.py
+++ b/msodumper/xlsrecord.py
@@ -2704,7 +2704,7 @@ class ShrFmla(BaseRecordHandler):
 ftext = None
 try:
 parser = formula.FormulaParser(self.header, self.tokens)
-parser.parse()
+parser.parse(formula.ParsedFormulaType.Shared)
 ftext = parser.getText()
 except formula.FormulaParserError as e:
 ftext = (Error: %s)%e.args[0]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Minutes of ESC call

2014-02-21 Thread Thorsten Behrens

Noel Grandin wrote:
 Wasn't there a plan at one point to make use of Cairo and/or Pixman
 for such things?
 

Tomaž Vajngerl wrote:
 Actually, I think we need SIMD implementations of image scalers if we
 really want speed. We already have pixman (needed by cairo) which has
 SIMD optimized image scalers available (and with latest versions also
 high quality SIMD image scalers) - somebody just needs to integrate
 it.
 
Yeah. Though legacy vcl has some weird formats to support still. But
at least a number of critical paths could be re-routed to pixman (I
would do that in basebmp though - simply because the semantics are
much clearer defined in that code).

Something else to keep an eye on:

 https://github.com/MetaScale/nt2/tree/master/modules/boost/simd

Cheers,

-- Thorsten


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-02-21 Thread Caolán McNamara

 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |2 +-
 vcl/unx/kde4/KDESalFrame.cxx  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 47cedf845b376bf3d13f169c7d94f7f5e37578c3
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Feb 21 20:20:23 2014 +

other vclplugs need adapting

Change-Id: I83c54b27dc58dfeac72462d8c5eb92a08b5e8e2e

diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 6ba0ec3..300385e 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1417,7 +1417,7 @@ void GtkSalGraphics::updateSettings( AllSettings 
rSettings )
 // preferred icon style
 gchar* pIconThemeName = NULL;
 g_object_get( pSettings, gtk-icon-theme-name, pIconThemeName, (char 
*)NULL );
-aStyleSet.SetPreferredSymbolsStyleName( OUString::createFromAscii( 
pIconThemeName ) );
+aStyleSet.SetPreferredIconTheme( OUString::createFromAscii( pIconThemeName 
) );
 g_free( pIconThemeName );
 
 aStyleSet.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_LARGE );
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index a322912..52a0315 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -198,7 +198,7 @@ void KDESalFrame::UpdateSettings( AllSettings rSettings )
 
 pKey = Theme;
 if ( aGroup.hasKey( pKey ) )
-style.SetPreferredSymbolsStyleName( readEntryUntranslated( 
aGroup, pKey ) );
+style.SetPreferredIconTheme( readEntryUntranslated( aGroup, pKey 
) );
 
 //toolbar
 pKey = toolbarFont;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - vcl/qa

2014-02-21 Thread Tor Lillqvist

 vcl/qa/cppunit/app/test_IconThemeInfo.cxx |6 --
 vcl/qa/cppunit/app/test_IconThemeScanner.cxx  |2 ++
 vcl/qa/cppunit/app/test_IconThemeSelector.cxx |2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 6bc639523fc350fa45a9d546e0bfecdf7e0f059d
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Feb 21 22:23:35 2014 +0200

WaE: implicit conversion of literal of type 'const char *' to 'bool'

Change-Id: Ia0c05b93bbb5a399257d0e1ab8670aa95be01fd7

diff --git a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx 
b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
index 34961e7..c1eb785 100644
--- a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
+++ b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
@@ -184,7 +184,7 @@ IconThemeSelectorTest::DifferentPreferredThemesAreInequal()
 vcl::IconThemeSelector s1;
 vcl::IconThemeSelector s2;
 s1.SetPreferredIconTheme(oxygen);
-s2.SetUseHighContrastTheme(katze);
+s2.SetUseHighContrastTheme(true);
 bool equal = (s1 == s2);
 CPPUNIT_ASSERT_EQUAL_MESSAGE(Different preferred themes are detected as 
inequal, false, equal);
 }
commit ae993046a9e51222eaac54e6d39325d928136719
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Feb 21 22:21:27 2014 +0200

WaE: unused variables

Change-Id: Ia5bdfd7db7ed2769b34e8dbd7e0ed7dbe5499d34

diff --git a/vcl/qa/cppunit/app/test_IconThemeInfo.cxx 
b/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
index 9e3a8ef..77bb246 100644
--- a/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
+++ b/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
@@ -109,7 +109,7 @@ 
IconThemeInfoTest::ExceptionIsThrownWhenIdCannotBeDetermined1()
 bool thrown = false;
 OUString fname(images_oxygen);
 try {
-OUString sname = vcl::IconThemeInfo::FileNameToThemeId(fname);
+vcl::IconThemeInfo::FileNameToThemeId(fname);
 }
 catch (std::runtime_error) {
 thrown = true;
@@ -123,7 +123,7 @@ 
IconThemeInfoTest::ExceptionIsThrownWhenIdCannotBeDetermined2()
 bool thrown = false;
 OUString fname(image_oxygen.zip);
 try {
-OUString sname = vcl::IconThemeInfo::FileNameToThemeId(fname);
+vcl::IconThemeInfo::FileNameToThemeId(fname);
 }
 catch (std::runtime_error) {
 thrown = true;
commit 87dc2bfecfc4e33ab9a174e2de4b575af99eb434
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Feb 21 22:17:28 2014 +0200

Include stdexcept for std::runtime_error

Change-Id: I6ef2036f075c2992b692d9a227db257edc4a6955

diff --git a/vcl/qa/cppunit/app/test_IconThemeInfo.cxx 
b/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
index e401046..9e3a8ef 100644
--- a/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
+++ b/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include stdexcept
+
 #include sal/types.h
 
 #include rtl/ustring.hxx
diff --git a/vcl/qa/cppunit/app/test_IconThemeScanner.cxx 
b/vcl/qa/cppunit/app/test_IconThemeScanner.cxx
index af2e957..63c5987 100644
--- a/vcl/qa/cppunit/app/test_IconThemeScanner.cxx
+++ b/vcl/qa/cppunit/app/test_IconThemeScanner.cxx
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include stdexcept
+
 #include sal/types.h
 
 #include rtl/ustring.hxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Minutes of ESC call

2014-02-21 Thread Tor Lillqvist

 We already have pixman (needed by cairo)

Except that cairo is used only on one of our supported platforms.

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

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

2014-02-21 Thread Caolán McNamara

 vcl/source/app/IconThemeScanner.cxx |   23 ---
 1 file changed, 12 insertions(+), 11 deletions(-)

New commits:
commit e9a049cf1ab6e8e616ffc0b42860d763c202ce1e
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Feb 21 20:28:26 2014 +

fix mac build, c++11isms

Change-Id: I91dba6c054511554e90006aa66134b17cca206fe

diff --git a/vcl/source/app/IconThemeScanner.cxx 
b/vcl/source/app/IconThemeScanner.cxx
index e6a6a13..5d62a29 100644
--- a/vcl/source/app/IconThemeScanner.cxx
+++ b/vcl/source/app/IconThemeScanner.cxx
@@ -24,12 +24,12 @@ search_path_is_valid(const OUString dir)
 {
 osl::DirectoryItem dirItem;
 osl::FileBase::RC retvalGet = osl::DirectoryItem::get(dir, dirItem);
-if (retvalGet != osl::FileBase::RC::E_None) {
+if (retvalGet != osl::FileBase::E_None) {
 return false;
 }
 osl::FileStatus fileStatus(osl_FileStatus_Mask_Type);
 osl::FileBase::RC retvalStatus = dirItem.getFileStatus(fileStatus);
-if (retvalStatus != osl::FileBase::RC::E_None) {
+if (retvalStatus != osl::FileBase::E_None) {
 return false;
 }
 
@@ -56,8 +56,9 @@ IconThemeScanner::ScanDirectoryForIconThemes(const OUString 
path)
 return false;
 }
 mFoundIconThemes.clear();
-for (const OUString pathToTheme : iconThemePaths) {
-AddIconThemeByPath(pathToTheme);
+for (std::vectorOUString::iterator aI = iconThemePaths.begin(); aI != 
iconThemePaths.end(); ++aI)
+{
+AddIconThemeByPath(*aI);
 }
 return true;
 }
@@ -68,7 +69,7 @@ IconThemeScanner::AddIconThemeByPath(const OUString url)
 if (!IconThemeInfo::UrlCanBeParsed(url)) {
 return false;
 }
-IconThemeInfo newTheme{url};
+IconThemeInfo newTheme(url);
 mFoundIconThemes.push_back(newTheme);
 return true;
 }
@@ -80,15 +81,15 @@ IconThemeScanner::ReadIconThemesFromPath(const OUString 
dir)
 
 osl::Directory dirToScan(dir);
 osl::FileBase::RC retvalOpen = dirToScan.open();
-if (retvalOpen != osl::FileBase::RC::E_None) {
+if (retvalOpen != osl::FileBase::E_None) {
 return found;
 }
 
 osl::DirectoryItem directoryItem;
-while (dirToScan.getNextItem(directoryItem) == osl::FileBase::RC::E_None) {
+while (dirToScan.getNextItem(directoryItem) == osl::FileBase::E_None) {
 osl::FileStatus status(osl_FileStatus_Mask_Type | 
osl_FileStatus_Mask_FileURL | osl_FileStatus_Mask_FileName);
 osl::FileBase::RC retvalStatus = directoryItem.getFileStatus(status);
-if (retvalStatus != osl::FileBase::RC::E_None) {
+if (retvalStatus != osl::FileBase::E_None) {
 continue;
 }
 if (!status.isRegular()) {
@@ -115,12 +116,12 @@ IconThemeScanner::FileIsValidIconTheme(const OUString 
filename)
 // check whether the file is a regular file
 osl::DirectoryItem dirItem;
 osl::FileBase::RC retvalGet = osl::DirectoryItem::get(filename, dirItem);
-if (retvalGet != osl::FileBase::RC::E_None) {
+if (retvalGet != osl::FileBase::E_None) {
 return false;
 }
 osl::FileStatus fileStatus(osl_FileStatus_Mask_Type);
 osl::FileBase::RC retvalStatus = dirItem.getFileStatus(fileStatus);
-if (retvalStatus != osl::FileBase::RC::E_None) {
+if (retvalStatus != osl::FileBase::E_None) {
 return false;
 }
 if (!fileStatus.isRegular()) {
@@ -138,7 +139,7 @@ IconThemeScanner::IconThemeIsInstalled(const OUString 
themeId) const
 /*static*/ boost::shared_ptrIconThemeScanner
 IconThemeScanner::Create(const OUString path)
 {
-boost::shared_ptrIconThemeScanner retval(new IconThemeScanner{});
+boost::shared_ptrIconThemeScanner retval(new IconThemeScanner);
 retval-ScanDirectoryForIconThemes(path);
 return retval;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 93/3d1ff4354a39545d5a391e2c68302d9c2d7498

2014-02-21 Thread Caolán McNamara

 93/3d1ff4354a39545d5a391e2c68302d9c2d7498 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit af8b6fc7d82d777dd367dbb52d43cb2957fb95b6
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Feb 21 20:38:07 2014 +

Notes added by 'git notes add'

diff --git a/93/3d1ff4354a39545d5a391e2c68302d9c2d7498 
b/93/3d1ff4354a39545d5a391e2c68302d9c2d7498
new file mode 100644
index 000..9297782
--- /dev/null
+++ b/93/3d1ff4354a39545d5a391e2c68302d9c2d7498
@@ -0,0 +1 @@
+ignore: UOF, worthy but needs excessive merge rework
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: README.Android README.cross

2014-02-21 Thread Tor Lillqvist

 README.Android |4 +++-
 README.cross   |8 +++-
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 2462aa668f7109fc40de9fbf5e13e1f3fdf904cd
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Feb 21 22:37:47 2014 +0200

Minor updates

Change-Id: I8f3580f10e8beee4103780be71a08929e9000bf0

diff --git a/README.Android b/README.Android
index 3a78e76..68bec24 100644
--- a/README.Android
+++ b/README.Android
@@ -1,7 +1,9 @@
 Android-specific notes
 
 Note that this document has not necessarily been updated to match
-reality... 
+reality...
+
+For instructions on how to build for Android, see README.cross.
 
 * Getting something running on an emulated device
 
diff --git a/README.cross b/README.cross
index 49fe05e..74917fa 100644
--- a/README.cross
+++ b/README.cross
@@ -345,12 +345,12 @@ from Linux:
 --enable-dbgutil
 --enable-debug
 --enable-werror
---with-android-ndk=/home/tml/android-ndk-r8d
---with-android-ndk-toolchain-version=4.6
+--with-android-ndk=/home/tml/android-ndk-r9c
+--with-android-ndk-toolchain-version=4.8
 --with-android-sdk=/home/tml/adt-bundle-linux/sdk
 --with-distro=LibreOfficeAndroid
 
-And here is an autogen.input for Android on X86:
+And here is an (quite old) autogen.input for Android on X86:
 
 --with-android-ndk=/opt/libreoffice/android-ndk-r8b
 --with-android-ndk-toolchain-version=4.6
@@ -358,8 +358,6 @@ And here is an autogen.input for Android on X86:
 --build=i586-suse-linux
 --enable-ccache
 --with-distro=LibreOfficeAndroidX86
---with-num-cpus=6
---with-max-jobs=6
 
 There are a couple of (more or less) interactive apps that you can run
 on the emulator or on a device that use LibreOffice code. Look in
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Would like some help building Android APK that includes the native (jni) library...

2014-02-21 Thread Michael Meeks


On Fri, 2014-02-21 at 21:40 +0200, Tor Lillqvist wrote:
  2. switch to the project directory and do ./autogen.sh.
 
 OK, so you didn't give any options on the ./autogen.sh command line at
 all (and had no autogen.input file that would have contained
 corresponding options)? Then you have built LibreOffice for your build
 platform, apparently Linux, and not for Android. Please read
 README.Android.

Or you might want to adapt and use my autogen.input for the x86 /
Android version. X86 runs rather fast in the emulator - which is good
for native development ]. Drop the file in the core/ checkout - and then
just run autogen.sh - and these will be used as the configure parameters
=) Failing that, tweak it for ARM as per the README.Android, or is it
README.cross - one or the other.

HTH,

Michael.

-- 
 michael.me...@collabora.com  , Pseudo Engineer, itinerant idiot
--build=x86_64-unknown-linux-gnu
--with-android-ndk=/opt/libreoffice/android-ndk-r9b
--with-android-ndk-toolchain-version=4.8
--with-android-sdk=/opt/libreoffice/android-sdk-linux
--enable-ccache
--with-distro=LibreOfficeAndroidX86
--disable-python
--without-helppack-integration
--without-myspell-dicts
--enable-mpl-subset
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-02-21 Thread Stephan Bergmann

 bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a14f55e0785664d04ec74aa060e6a1bcd661f183
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Feb 21 21:56:02 2014 +0100

loplugin:implicitboolconversion, loplugin:literaltoboolconversion

Change-Id: I69bf7b3cace97dc7e1e5c362321b43d38dd36536

diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx 
b/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx
index 06e33de..facdcdd 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx
@@ -245,7 +245,7 @@ classify_argument( typelib_TypeDescriptionReference 
*pTypeRef, enum x86_64_reg_c
 #if OSL_DEBUG_LEVEL  1
 OSL_TRACE( Unhandled case: pType-eTypeClass == %d, 
pTypeRef-eTypeClass );
 #endif
-OSL_ASSERT(0);
+OSL_ASSERT(false);
 }
 return 0; /* Never reached.  */
 }
@@ -288,7 +288,7 @@ bool x86_64::examine_argument( 
typelib_TypeDescriptionReference *pTypeRef, bool
 #if OSL_DEBUG_LEVEL  1
 OSL_TRACE( Unhandled case: classes[n] == %d, classes[n] );
 #endif
-OSL_ASSERT(0);
+OSL_ASSERT(false);
 }
 return true;
 }
@@ -297,7 +297,7 @@ bool x86_64::return_in_hidden_param( 
typelib_TypeDescriptionReference *pTypeRef
 {
 int g, s;
 
-return examine_argument( pTypeRef, true, g, s ) == 0;
+return !examine_argument( pTypeRef, true, g, s );
 }
 
 void x86_64::fill_struct( typelib_TypeDescriptionReference *pTypeRef, const 
sal_uInt64 *pGPR, const double *pSSE, void *pStruct ) throw ()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - include/editeng oox/source sw/qa sw/source

2014-02-21 Thread Zolnai Tamás

 include/editeng/unotext.hxx   |2 
 oox/source/drawingml/textparagraph.cxx|2 
 oox/source/drawingml/textparagraphproperties.cxx  |4 
 oox/source/drawingml/textparagraphpropertiescontext.cxx   |   68 -
 sw/qa/extras/ooxmlexport/data/dml-groupshape-paraspacing.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |   72 -
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |2 
 sw/source/filter/ww8/docxattributeoutput.cxx  |2 
 sw/source/filter/ww8/ww8atr.cxx   |   75 --
 9 files changed, 163 insertions(+), 64 deletions(-)

New commits:
commit 27a03eb3ba2064cdcf14fc61bfd83facd1ef4282
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Fri Feb 21 22:19:10 2014 +0100

WW export: make line spacing export clearer

see also: SvxLineSpacingItem::PutValue

Move para spacing test from import to export and
remove a test case which tests a part of the same thing.

Change-Id: I96da9f6ac7851bd74e34ab4a6d2a2f3499549a87

diff --git a/sw/qa/extras/ooxmlexport/data/dml-groupshape-paraspacing.docx 
b/sw/qa/extras/ooxmlexport/data/dml-groupshape-paraspacing.docx
old mode 100755
new mode 100644
index 1cb48d3..a8fc82b
Binary files a/sw/qa/extras/ooxmlexport/data/dml-groupshape-paraspacing.docx 
and b/sw/qa/extras/ooxmlexport/data/dml-groupshape-paraspacing.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index ceea5c2..4793249 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2335,18 +2335,6 @@ DECLARE_OOXMLEXPORT_TEST(testDmlGroupshapeRelsize, 
dml-groupshape-relsize.docx
 assertXPath(pXmlDoc, 
/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/wp14:sizeRelH,
 relativeFrom, margin);
 }
 
-DECLARE_OOXMLEXPORT_TEST(testDmlGroupshapeParaspacing, 
dml-groupshape-paraspacing.docx)
-{
-xmlDocPtr pXmlDoc = parseExport(word/document.xml);
-if (!pXmlDoc)
-return;
-// Paragraph spacing of shape text in groupshapes was left, the w:spacing 
element was missing in pPr.
-assertXPath(pXmlDoc,
-
/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wpg:wgp/wps:wsp[1]/wps:txbx/w:txbxContent/w:p/w:pPr/w:spacing,
-before,
-240);
-}
-
 DECLARE_OOXMLEXPORT_TEST(testTrackChangesDeletedParagraphMark, 
testTrackChangesDeletedParagraphMark.docx)
 {
 xmlDocPtr pXmlDoc = parseExport(word/document.xml);
@@ -3371,6 +3359,66 @@ DECLARE_OOXMLEXPORT_TEST(testDMLGradientFillTheme, 
dml-gradientfill-theme.docx
 
/w:document/w:body/w:p[2]/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:style/a:fillRef/a:schemeClr,
 val, accent1);
 }
+
+DECLARE_OOXMLEXPORT_TEST(testDMLGroupShapeParaSpacing, 
dml-groupshape-paraspacing.docx)
+{
+// Paragraph spacing (top/bottom margin and line spacing) inside a group 
shape was not imported
+uno::Referencecontainer::XIndexAccess xGroup(getShape(1), 
uno::UNO_QUERY);
+uno::Referencetext::XText xText = 
uno::Referencetext::XTextRange(xGroup-getByIndex(1), 
uno::UNO_QUERY)-getText();
+
+// 1st paragraph has 1.5x line spacing but it has no spacing before/after.
+uno::Referencetext::XTextRange xRun = getRun(getParagraphOfText(1, 
xText),1);
+::com::sun::star::style::LineSpacing aLineSpacing = 
getProperty::com::sun::star::style::LineSpacing(xRun, ParaLineSpacing);
+
CPPUNIT_ASSERT_EQUAL(sal_Int16(::com::sun::star::style::LineSpacingMode::PROP), 
aLineSpacing.Mode);
+CPPUNIT_ASSERT_EQUAL(sal_Int16(150), aLineSpacing.Height);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getPropertysal_Int32(xRun, 
ParaTopMargin));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getPropertysal_Int32(xRun, 
ParaBottomMargin));
+
+// 2nd paragraph has double line spacing but it has no spacing 
before/after.
+xRun.set(getRun(getParagraphOfText(2, xText),1));
+aLineSpacing = getProperty::com::sun::star::style::LineSpacing(xRun, 
ParaLineSpacing);
+
CPPUNIT_ASSERT_EQUAL(sal_Int16(::com::sun::star::style::LineSpacingMode::PROP), 
aLineSpacing.Mode);
+CPPUNIT_ASSERT_EQUAL(sal_Int16(200), aLineSpacing.Height);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getPropertysal_Int32(xRun, 
ParaTopMargin));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getPropertysal_Int32(xRun, 
ParaBottomMargin));
+
+// 3rd paragraph has 24 pt line spacing but it has no spacing before/after.
+xRun.set(getRun(getParagraphOfText(3, xText),1));
+aLineSpacing = getProperty::com::sun::star::style::LineSpacing(xRun, 
ParaLineSpacing);
+
CPPUNIT_ASSERT_EQUAL(sal_Int16(::com::sun::star::style::LineSpacingMode::MINIMUM),
 aLineSpacing.Mode);
+CPPUNIT_ASSERT_EQUAL(sal_Int16(847),

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

2014-02-21 Thread Miklos Vajna

 writerfilter/source/dmapper/DomainMapper.cxx   |8 +-
 writerfilter/source/doctok/resources.xmi   |   93 -
 writerfilter/source/ooxml/model.xml|6 -
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 
 4 files changed, 8 insertions(+), 101 deletions(-)

New commits:
commit 4b544037c4fdbcb8958723bb9ea3d9a33f43e6ee
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Feb 21 22:18:12 2014 +0100

writerfilter: convert sprm:P{WAlignFont,TightWrap,OutLvl}

Change-Id: Id2090637953d98e899481a2e802815cdc6244e50

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index acd7f8b..e9f57fa 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1234,7 +1234,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm, 
PropertyMapPtr rContext, SprmType
 break;
 case NS_ooxml::LN_CT_PPrBase_autoSpaceDN:
 break;
-case NS_sprm::LN_PWAlignFont:
+case NS_ooxml::LN_CT_PPrBase_textAlignment:
 {
 sal_Int16 nAlignment = 0;
 switch (nIntValue)
@@ -1257,10 +1257,10 @@ void DomainMapper::sprmWithProps( Sprm rSprm, 
PropertyMapPtr rContext, SprmType
 }
 rContext-Insert( PROP_PARA_VERT_ALIGNMENT, uno::makeAny( 
nAlignment) );
 }
-break;  // sprmPWAlignFont
+break;
 case NS_ooxml::LN_CT_PPrBase_textDirection:
 break;
-case NS_sprm::LN_POutLvl:
+case NS_ooxml::LN_CT_PPrBase_outlineLvl:
 {
 sal_Int16 nLvl = static_cast sal_Int16 ( nIntValue );
 if( m_pImpl-IsStyleSheetImport() )
@@ -1275,7 +1275,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm, 
PropertyMapPtr rContext, SprmType
 rContext-Insert(PROP_OUTLINE_LEVEL, uno::makeAny ( nLvl ));
 }
 }
-break;  // sprmPOutLvl
+break;
 case NS_ooxml::LN_CT_PPrBase_bidi:
 {
 if (nIntValue != 0)
diff --git a/writerfilter/source/doctok/resources.xmi 
b/writerfilter/source/doctok/resources.xmi
index 18d9e64..0b8c40c 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -224,68 +224,6 @@
   /UML:ModelElement.taggedValue
 /UML:Class
 !--SPRM sprmPFWidowControl--
-!--SPRM sprmPWAlignFont--
-UML:Class xmi.id=sprmPWAlignFont name=sprmPWAlignFont
-  UML:ModelElement.stereotype
-UML:Stereotype xmi.idref=ww8sprm/
-  /UML:ModelElement.stereotype
-  UML:ModelElement.taggedValue
-UML:TaggedValue
-  UML:TaggedValue.dataValue0x4439/UML:TaggedValue.dataValue
-  UML:TaggedValue.type
-UML:TagDefinition xmi.idref=sprmcode/
-  /UML:TaggedValue.type
-/UML:TaggedValue
-  /UML:ModelElement.taggedValue
-  UML:ModelElement.taggedValue
-UML:TaggedValue
-  
UML:TaggedValue.dataValuertf:sprmPWAlignFont/UML:TaggedValue.dataValue
-  UML:TaggedValue.type
-UML:TagDefinition xmi.idref=sprmid/
-  /UML:TaggedValue.type
-/UML:TaggedValue
-  /UML:ModelElement.taggedValue
-  UML:ModelElement.taggedValue
-UML:TaggedValue
-  UML:TaggedValue.dataValueparagraph/UML:TaggedValue.dataValue
-  UML:TaggedValue.type
-UML:TagDefinition xmi.idref=kind/
-  /UML:TaggedValue.type
-/UML:TaggedValue
-  /UML:ModelElement.taggedValue
-/UML:Class
-!--SPRM sprmPWAlignFont--
-!--SPRM sprmPOutLvl--
-UML:Class xmi.id=sprmPOutLvl name=sprmPOutLvl
-  UML:ModelElement.stereotype
-UML:Stereotype xmi.idref=ww8sprm/
-  /UML:ModelElement.stereotype
-  UML:ModelElement.taggedValue
-UML:TaggedValue
-  UML:TaggedValue.dataValue0x2640/UML:TaggedValue.dataValue
-  UML:TaggedValue.type
-UML:TagDefinition xmi.idref=sprmcode/
-  /UML:TaggedValue.type
-/UML:TaggedValue
-  /UML:ModelElement.taggedValue
-  UML:ModelElement.taggedValue
-UML:TaggedValue
-  
UML:TaggedValue.dataValuertf:sprmPOutLvl/UML:TaggedValue.dataValue
-  UML:TaggedValue.type
-UML:TagDefinition xmi.idref=sprmid/
-  /UML:TaggedValue.type
-/UML:TaggedValue
-  /UML:ModelElement.taggedValue
-  UML:ModelElement.taggedValue
-UML:TaggedValue
-  UML:TaggedValue.dataValueparagraph/UML:TaggedValue.dataValue
-  UML:TaggedValue.type
-UML:TagDefinition xmi.idref=kind/
-  /UML:TaggedValue.type
-/UML:TaggedValue
-  /UML:ModelElement.taggedValue
-/UML:Class
-!--SPRM sprmPOutLvl--

Re: Minutes of ESC call

2014-02-21 Thread Michael Stahl

On 21/02/14 21:27, Tor Lillqvist wrote:
 We already have pixman (needed by cairo)
 
 Except that cairo is used only on one of our supported platforms.

... which actually makes this more problematic: on Mac and Windows we
can just build internal pixman but on Linux either we have to restrict
usage to RHEL5-era pixman or statically link an internal one to prevent
conflicts with system cairo due to ELF's stupid global namespace.



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

[Libreoffice-commits] translations.git: Branch 'libreoffice-4-2' - source/nb source/tr

2014-02-21 Thread Andras Timar

 source/nb/helpcontent2/source/text/swriter/guide.po |2 +-
 source/tr/helpcontent2/source/text/sdraw/guide.po   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit afbdfd5eb5dc98f74c1b5a7307d1bab852b79951
Author: Andras Timar andras.ti...@collabora.com
Date:   Fri Feb 21 23:35:35 2014 +0100

typo fixes in xml tags (also fixed in Pootle)

Change-Id: I9222907044cb14f5ae132419b65e8ed68d32370f

diff --git a/source/nb/helpcontent2/source/text/swriter/guide.po 
b/source/nb/helpcontent2/source/text/swriter/guide.po
index 87e3ce5..df5bba3 100644
--- a/source/nb/helpcontent2/source/text/swriter/guide.po
+++ b/source/nb/helpcontent2/source/text/swriter/guide.po
@@ -3068,7 +3068,7 @@ msgctxt 
 31\n
 help.text
 msgid Type a name for the page in the item type=\menuitem\Style 
name/item   box, and then click item 
type=\menuitem\OK/item.
-msgstr Skriv inn et navn pÃ¥ siden i boksen item type=\menu 
item\Stilnavn/item, og trykk deretter pÃ¥ item 
type=\menuitem\OK/item.
+msgstr Skriv inn et navn pÃ¥ siden i boksen item 
type=\menuitem\Stilnavn/item, og trykk deretter pÃ¥ item 
type=\menuitem\OK/item.
 
 #: change_header.xhp
 msgctxt 
diff --git a/source/tr/helpcontent2/source/text/sdraw/guide.po 
b/source/tr/helpcontent2/source/text/sdraw/guide.po
index 59df588..3226f2e 100644
--- a/source/tr/helpcontent2/source/text/sdraw/guide.po
+++ b/source/tr/helpcontent2/source/text/sdraw/guide.po
@@ -1907,7 +1907,7 @@ msgctxt 
 par_idN106CD\n
 help.text
 msgid If there is an arrow next to the icon, the drawing tool opens a sub 
toolbar. Press the item type=\keycode\Up/item or item 
type=\keycode\Down/item arrow key to open the sub toolbar, then press the 
item type=\keycode\Right/item or item type=\keycode\Left/item key 
to select an icon.
-msgstr EÄer bir simgenin yanÄ±nda bir ok varsa, Ã§izim aracÄ± bir alt menÃ¼ 
aÃ§ar. item type=\key code\YukarÄ±/item veya item type=\key 
code\AÅaÄÄ±/item yÃ¶n tuÅlarÄ±ile alt menÃ¼leri aÃ§Ä±n ve item 
type=\keycode\SaÄ/item veya item type=\keycode\Sol/item tuÅuyla 
bir simge seÃ§in.
+msgstr EÄer bir simgenin yanÄ±nda bir ok varsa, Ã§izim aracÄ± bir alt menÃ¼ 
aÃ§ar. item type=\keycode\YukarÄ±/item veya item 
type=\keycode\AÅaÄÄ±/item yÃ¶n tuÅlarÄ±ile alt menÃ¼leri aÃ§Ä±n ve 
item type=\keycode\SaÄ/item veya item type=\keycode\Sol/item 
tuÅuyla bir simge seÃ§in.
 
 #: keyboard.xhp
 msgctxt 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - translations

2014-02-21 Thread Andras Timar

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

New commits:
commit 5fd90cdd1fdb20ab7f6a2b67c384f0994f09a86b
Author: Andras Timar andras.ti...@collabora.com
Date:   Fri Feb 21 23:35:35 2014 +0100

Updated core
Project: translations  afbdfd5eb5dc98f74c1b5a7307d1bab852b79951

diff --git a/translations b/translations
index 44e8f81..afbdfd5 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 44e8f81735ce29b81fc6593d29c0e0f5e21f4f02
+Subproject commit afbdfd5eb5dc98f74c1b5a7307d1bab852b79951
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-21 Thread Tomaž Vajngerl

 sw/qa/extras/ooxmlexport/data/TextEffects.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx   |   12 ++
 sw/source/filter/ww8/docxattributeoutput.cxx   |  103 -
 sw/source/filter/ww8/docxattributeoutput.hxx   |3 
 sw/source/filter/ww8/docxexport.cxx|1 
 writerfilter/source/dmapper/TextEffectsHandler.cxx |   62 +++-
 writerfilter/source/dmapper/TextEffectsHandler.hxx |3 
 writerfilter/source/ooxml/model.xml|   25 +++--
 8 files changed, 193 insertions(+), 16 deletions(-)

New commits:
commit 0d2c1e6423b32dc933b08a821a98c0f175987222
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Fri Feb 21 20:10:46 2014 +0100

OOXML roundtrip test for w14:glow

Change-Id: I80dd71bad02be980229899845c1451df6f34dca5

diff --git a/sw/qa/extras/ooxmlexport/data/TextEffects.docx 
b/sw/qa/extras/ooxmlexport/data/TextEffects.docx
new file mode 100644
index 000..d164cd9
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/TextEffects.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 4793249..288c397 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -156,6 +156,7 @@ xmlNodeSetPtr Test::getXPathNode(xmlDocPtr pXmlDoc, const 
OString rXPath)
 xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(a), 
BAD_CAST(http://schemas.openxmlformats.org/drawingml/2006/main;));
 xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(pic), 
BAD_CAST(http://schemas.openxmlformats.org/drawingml/2006/picture;));
 xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(rels), 
BAD_CAST(http://schemas.openxmlformats.org/package/2006/relationships;));
+xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(w14), 
BAD_CAST(http://schemas.microsoft.com/office/word/2010/wordml;));
 xmlXPathObjectPtr pXmlXpathObj = 
xmlXPathEvalExpression(BAD_CAST(rXPath.getStr()), pXmlXpathCtx);
 return pXmlXpathObj-nodesetval;
 }
@@ -3419,6 +3420,17 @@ DECLARE_OOXMLEXPORT_TEST(testDMLGroupShapeParaSpacing, 
dml-groupshape-paraspaci
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getPropertysal_Int32(xRun, 
ParaTopMargin));
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getPropertysal_Int32(xRun, 
ParaBottomMargin));
 }
+
+DECLARE_OOXMLEXPORT_TEST(testW14TextEffects, TextEffects.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+
+CPPUNIT_ASSERT(getXPath(pXmlDoc, 
/w:document/w:body/w:p/w:r[1]/w:rPr/w14:glow, rad).match(63500));
+CPPUNIT_ASSERT(getXPath(pXmlDoc, 
/w:document/w:body/w:p/w:r[2]/w:rPr/w14:glow, rad).match(228600));
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
commit 3554f377eac7446c3d91b70c740c22bb060b9313
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Fri Feb 21 20:07:56 2014 +0100

ooxml: export w14:glow with subelements from a CharGrabGab

Change-Id: I3e60f0532a18eba12f7a63c3e745668f54b8806e

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index b1e4a01..b81fcc6 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1121,7 +1121,8 @@ void DocxAttributeOutput::InitCollectedRunProperties()
 FSNS( XML_w, XML_eastAsianLayout ),
 FSNS( XML_w, XML_specVanish ),
 FSNS( XML_w, XML_oMath ),
-FSNS( XML_w, XML_rPrChange )
+FSNS( XML_w, XML_rPrChange ),
+FSNS( XML_w14, XML_glow ),
 };
 
 // postpone the output so that we can later [in EndParagraphProperties()]
@@ -1135,6 +1136,94 @@ void DocxAttributeOutput::InitCollectedRunProperties()
 
 }
 
+namespace
+{
+
+struct NameToId
+{
+const OUString  maName;
+const sal_Int32 maId;
+};
+
+const NameToId aNameToIdMapping[] =
+{
+{ OUString(val),   FSNS( XML_w14, XML_val ) },
+{ OUString(rad),   FSNS( XML_w14, XML_rad ) },
+{ OUString(schemeClr), FSNS( XML_w14, XML_schemeClr ) },
+{ OUString(srgbClr),   FSNS( XML_w14, XML_srgbClr ) },
+{ OUString(tint),  FSNS( XML_w14, XML_tint ) },
+{ OUString(shade), FSNS( XML_w14, XML_shade ) },
+{ OUString(alpha), FSNS( XML_w14, XML_alpha ) },
+{ OUString(hueMod),FSNS( XML_w14, XML_hueMod ) },
+{ OUString(sat),   FSNS( XML_w14, XML_sat ) },
+{ OUString(satOff),FSNS( XML_w14, XML_satOff ) },
+{ OUString(satMod),FSNS( XML_w14, XML_satMod ) },
+{ OUString(lum),   FSNS( XML_w14, XML_lum ) },
+{ OUString(lumOff),FSNS( XML_w14, XML_lumOff ) },
+{ OUString(lumMod),FSNS( XML_w14, XML_lumMod ) },
+};
+
+void lclProcessRecursiveGrabBag(sal_Int32 aElementId, 
css::uno::Sequencecss::beans::PropertyValue aElements, 
sax_fastparser::FSHelperPtr pSerializer)
+{
+css::uno::Sequencecss::beans::PropertyValue aAttributes;
+FastAttributeList* pAttributes = pSerializer-createAttrList();
+
+for (sal_Int32 j=0; j

[Libreoffice-commits] core.git: 7 commits - compilerplugins/clang compilerplugins/Makefile-clang.mk extensions/source include/sal vcl/generic vcl/headless vcl/inc vcl/ios vcl/osx vcl/quartz vcl/source

2014-02-21 Thread Stephan Bergmann

 compilerplugins/Makefile-clang.mk |6 +-
 compilerplugins/clang/implicitboolconversion.cxx  |9 ++---
 compilerplugins/clang/literaltoboolconversion.cxx |   20 +---
 compilerplugins/clang/plugin.cxx  |   15 +++
 compilerplugins/clang/plugin.hxx  |4 +++-
 extensions/source/update/check/updatecheck.cxx|2 ++
 include/sal/log-areas.dox |1 +
 vcl/generic/fontmanager/fontmanager.cxx   |8 
 vcl/headless/svpframe.cxx |2 +-
 vcl/inc/headless/svpframe.hxx |2 +-
 vcl/inc/osx/salframe.h|2 +-
 vcl/inc/salframe.hxx  |2 +-
 vcl/inc/sft.hxx   |   10 +-
 vcl/inc/unx/gtk/gtkframe.hxx  |2 +-
 vcl/inc/unx/salframe.h|2 +-
 vcl/inc/win/salframe.h|2 +-
 vcl/ios/iosinst.cxx   |2 +-
 vcl/osx/DataFlavorMapping.cxx |3 ++-
 vcl/osx/DragSource.cxx|5 +++--
 vcl/osx/HtmlFmtFlt.cxx|7 +++
 vcl/osx/PictToBmpFlt.cxx  |4 ++--
 vcl/osx/salframe.cxx  |   10 +-
 vcl/osx/salinst.cxx   |2 +-
 vcl/osx/salmenu.cxx   |4 ++--
 vcl/osx/salnativewidgets.cxx  |   12 ++--
 vcl/osx/salprn.cxx|   10 +-
 vcl/quartz/salgdi.cxx |2 +-
 vcl/quartz/salgdicommon.cxx   |   14 +++---
 vcl/source/fontsubset/gsub.cxx|2 +-
 vcl/source/fontsubset/gsub.h  |2 +-
 vcl/source/fontsubset/sft.cxx |   18 +-
 vcl/unx/generic/window/salframe.cxx   |4 ++--
 vcl/unx/gtk/window/gtksalframe.cxx|2 +-
 vcl/win/source/gdi/salgdi3.cxx|6 +++---
 vcl/win/source/window/salframe.cxx|2 +-
 35 files changed, 117 insertions(+), 83 deletions(-)

New commits:
commit 9377e44cf85a3871cf8b38f9cc1fb96da3490477
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Feb 21 23:46:59 2014 +0100

-Werror,-Wunused-function

Change-Id: Ic792930c291bae1cf18ffd65548908e910c69c45

diff --git a/extensions/source/update/check/updatecheck.cxx 
b/extensions/source/update/check/updatecheck.cxx
index 2e0ab73..33ffd7e 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -106,12 +106,14 @@ static inline OUString getBuildId()
 }
 
 
//--
+#if defined LINUX || defined SOLARIS
 static inline OUString getBaseInstallation()
 {
 OUString aPathVal($BRAND_BASE_DIR);
 rtl::Bootstrap::expandMacros(aPathVal);
 return aPathVal;
 }
+#endif
 
 
//--
 
commit fe7a4bccfdc6ff7e10789e5512ac469a4dc44f55
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Feb 21 23:46:33 2014 +0100

Adapt vcl to various loplugin warnings on Mac OS X

Change-Id: I4553ce218fbcf2ac681b284c71e7d558a451511c

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 6f4b496..11b7613 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -363,6 +363,7 @@ certain functionality.
 @li @c vcl.kde4 - KDE4
 @li @c vcl.layout - Widget layout
 @li @c vcl.plugadapt - the Unix/X11 backend plugin mechanism
+@li @c vcl.osx
 @li @c vcl.osx.print
 @li @c vcl.scrollbar - Scroll Bars
 @li @c vcl.sm - Session Manager
diff --git a/vcl/generic/fontmanager/fontmanager.cxx 
b/vcl/generic/fontmanager/fontmanager.cxx
index afd6ed5..4102df7 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -234,7 +234,7 @@ bool PrintFontManager::TrueTypeFontFile::queryMetricPage( 
int nPage, MultiAtomPr
 
 int nCharacters = nPage  255 ? 256 : 254;
 MapString( pTTFont, table, nCharacters, NULL, false );
-TTSimpleGlyphMetrics* pMetrics = GetTTSimpleCharMetrics( pTTFont, 
nPage*256, nCharacters, 0 );
+TTSimpleGlyphMetrics* pMetrics = GetTTSimpleCharMetrics( pTTFont, 
nPage*256, nCharacters, false );
 if( pMetrics )
 {
 for( i = 0; i  nCharacters; i++ )
@@ -253,7 +253,7 @@ bool PrintFontManager::TrueTypeFontFile::queryMetricPage( 
int nPage, MultiAtomPr
 for( i = 0; i  256; i++ )
 table_vert[ i ] = 256*nPage + i;
 MapString( pTTFont, table_vert, nCharacters, NULL, true );
-pMetrics = GetTTSimpleCharMetrics( pTTFont, nPage*256, nCharacters, 1 
);
+

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

2014-02-21 Thread Kohei Yoshida

 sc/inc/document.hxx |2 
 sc/qa/unit/data/ods/shared-formula/3d-reference.ods |binary
 sc/qa/unit/subsequent_export-test.cxx   |   95 
 sc/source/filter/excel/xeformula.cxx|   27 +++--
 sc/source/filter/excel/xetable.cxx  |   53 ++-
 sc/source/filter/inc/xeformula.hxx  |3 
 sc/source/filter/inc/xetable.hxx|   16 ++-
 7 files changed, 183 insertions(+), 13 deletions(-)

New commits:
commit 180f593fbfea238df97d006f6847bba3d9b0e317
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Feb 21 17:43:28 2014 -0500

fdo#74345: Some shared formulas cannot be exported as shared formulas.

Excel's shared formula has some restrictions that Calc's doesn't have.
So we need to check each shared formula token to see if we can export
it as shared when saving to Excel.  Refer to the SharedParsedFormula
section of the [MS-XLS] spec.

Change-Id: I0ffce26700d2773bbd2893743edc6c03682c2ed7

diff --git a/sc/source/filter/excel/xeformula.cxx 
b/sc/source/filter/excel/xeformula.cxx
index bdf7180..835a49d 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -322,6 +322,9 @@ public:
 /** Returns true, if the passed formula type allows 3D references only. */
 boolIs3DRefOnly( XclFormulaType eType ) const;
 
+bool IsRef2D( const ScSingleRefData rRefData, bool bCheck3DFlag ) const;
+bool IsRef2D( const ScComplexRefData rRefData, bool bCheck3DFlag ) const;
+
 // 
 private:
 const XclExpCompConfig* GetConfigForType( XclFormulaType eType ) const;
@@ -390,8 +393,6 @@ private:
 // reference handling -
 
 SCTAB   GetScTab( const ScSingleRefData rRefData ) const;
-boolIsRef2D( const ScSingleRefData rRefData ) const;
-boolIsRef2D( const ScComplexRefData rRefData ) const;
 
 voidConvertRefData( ScSingleRefData rRefData, XclAddress 
rXclPos,
 bool bNatLangRef, bool bTruncMaxCol, bool 
bTruncMaxRow ) const;
@@ -1814,13 +1815,13 @@ SCTAB XclExpFmlaCompImpl::GetScTab( const 
ScSingleRefData rRefData ) const
 return rRefData.toAbs(*mxData-mpScBasePos).Tab();
 }
 
-bool XclExpFmlaCompImpl::IsRef2D( const ScSingleRefData rRefData ) const
+bool XclExpFmlaCompImpl::IsRef2D( const ScSingleRefData rRefData, bool 
bCheck3DFlag ) const
 {
 /*  rRefData.IsFlag3D() determines if sheet name is always visible, even on
 the own sheet. If 3D references are allowed, the passed reference does
 not count as 2D reference. */
 
-if (mxData-mpLinkMgr  rRefData.IsFlag3D())
+if (bCheck3DFlag  rRefData.IsFlag3D())
 return false;
 
 if (rRefData.IsTabDeleted())
@@ -1832,9 +1833,9 @@ bool XclExpFmlaCompImpl::IsRef2D( const ScSingleRefData 
rRefData ) const
 return rRefData.Tab() == GetCurrScTab();
 }
 
-bool XclExpFmlaCompImpl::IsRef2D( const ScComplexRefData rRefData ) const
+bool XclExpFmlaCompImpl::IsRef2D( const ScComplexRefData rRefData, bool 
bCheck3DFlag ) const
 {
-return IsRef2D( rRefData.Ref1 )  IsRef2D( rRefData.Ref2 );
+return IsRef2D(rRefData.Ref1, bCheck3DFlag)  IsRef2D(rRefData.Ref2, 
bCheck3DFlag);
 }
 
 void XclExpFmlaCompImpl::ConvertRefData(
@@ -1937,7 +1938,7 @@ void XclExpFmlaCompImpl::ProcessCellRef( const 
XclExpScToken rTokData )
 mxData-mpLinkMgr-StoreCell(aRefData, *mxData-mpScBasePos);
 
 // create the tRef, tRefErr, tRefN, tRef3d, or tRefErr3d token
-if( !mxData-mrCfg.mb3DRefOnly  IsRef2D( aRefData ) )
+if (!mxData-mrCfg.mb3DRefOnly  IsRef2D(aRefData, mxData-mpLinkMgr))
 {
 // 2D reference (not in defined names, but allowed in range lists)
 sal_uInt8 nBaseId = (!mxData-mpScBasePos  lclIsRefRel2D( 
aRefData )) ? EXC_TOKID_REFN :
@@ -1982,7 +1983,7 @@ void XclExpFmlaCompImpl::ProcessRangeRef( const 
XclExpScToken rTokData )
 mxData-mpLinkMgr-StoreCellRange(aRefData, *mxData-mpScBasePos);
 
 // create the tArea, tAreaErr, tAreaN, tArea3d, or tAreaErr3d token
-if( !mxData-mrCfg.mb3DRefOnly  IsRef2D( aRefData ) )
+if (!mxData-mrCfg.mb3DRefOnly  IsRef2D(aRefData, mxData-mpLinkMgr))
 {
 // 2D reference (not in name formulas, but allowed in range lists)
 sal_uInt8 nBaseId = (!mxData-mpScBasePos  lclIsRefRel2D( aRefData 
)) ? EXC_TOKID_AREAN :
@@ -2662,6 +2663,14 @@ XclTokenArrayRef 
XclExpFormulaCompiler::CreateNameXFormula(
 return mxImpl-CreateNameXFormula( nExtSheet, nExtName );
 }
 
-// 
+bool XclExpFormulaCompiler::IsRef2D( const ScSingleRefData rRefData ) const
+{
+return mxImpl-IsRef2D(rRefData, true);
+}

[Libreoffice-commits] core.git: compilerplugins/clang

2014-02-21 Thread Stephan Bergmann

 compilerplugins/clang/compat.hxx  |9 +
 compilerplugins/clang/literaltoboolconversion.cxx |3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit d36e60f6854c3226d4297fc3425ba010ed8f1038
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Feb 21 23:59:04 2014 +0100

Adapt to Clang = 3.4

Change-Id: If9c9d63d85ce29629e6453f2d69355bd64ac2fc5

diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx
index 4c8c333..4bc9a6b 100644
--- a/compilerplugins/clang/compat.hxx
+++ b/compilerplugins/clang/compat.hxx
@@ -11,6 +11,7 @@
 #define INCLUDED_COMPILERPLUGINS_CLANG_COMPAT_HXX
 
 #include clang/AST/Decl.h
+#include clang/AST/Expr.h
 #include clang/AST/Type.h
 #include clang/Basic/Diagnostic.h
 #include clang/Basic/DiagnosticIDs.h
@@ -45,6 +46,14 @@ inline clang::QualType getParamType(
 #endif
 }
 
+inline unsigned getBuiltinCallee(clang::CallExpr const  expr) {
+#if (__clang_major__ == 3  __clang_minor__ = 5) || __clang_major__  3
+return expr.getBuiltinCallee();
+#else
+return expr.isBuiltinCall();
+#endif
+}
+
 inline unsigned getCustomDiagID(
 clang::DiagnosticsEngine  engine, clang::DiagnosticsEngine::Level L,
 llvm::StringRef FormatString)
diff --git a/compilerplugins/clang/literaltoboolconversion.cxx 
b/compilerplugins/clang/literaltoboolconversion.cxx
index 1bbdc05..bbb0cbf 100644
--- a/compilerplugins/clang/literaltoboolconversion.cxx
+++ b/compilerplugins/clang/literaltoboolconversion.cxx
@@ -10,6 +10,7 @@
 
 #include clang/Lex/Lexer.h
 
+#include compat.hxx
 #include plugin.hxx
 
 namespace {
@@ -138,7 +139,7 @@ bool LiteralToBoolConversion::VisitImplicitCastExpr(
 } else if (sub-isIntegerConstantExpr(compiler.getASTContext())) {
 CallExpr const * ce = dyn_castCallExpr(sub);
 if (ce == nullptr
-|| ce-getBuiltinCallee() != Builtin::BI__builtin_expect)
+|| compat::getBuiltinCallee(*ce) != Builtin::BI__builtin_expect)
 {
 report(
 DiagnosticsEngine::Warning,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-21 Thread Caolán McNamara

 cui/source/options/optgdlg.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6e0823e3880e5ea26db868dbe0455e8c984744ab
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Feb 21 23:09:13 2014 +

c++11ism

Change-Id: I54a32d1e07173e2cd5522e1b2e7ceff3b4f3378c

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 6b256d8..3e4cdf5 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -608,8 +608,8 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const 
SfxItemSet rSet)
 OUString());
 m_pIconStyleLB-InsertEntry(entryForAuto);
 
-for (const vcl::IconThemeInfo i : mInstalledIconThemes) {
-m_pIconStyleLB-InsertEntry(i.GetDisplayName());
+for (std::vectorvcl::IconThemeInfo::const_iterator aI = 
mInstalledIconThemes.begin(); aI != mInstalledIconThemes.end(); ++aI) {
+m_pIconStyleLB-InsertEntry(aI-GetDisplayName());
 }
 
 // separate auto and other icon themes
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-21 Thread Caolán McNamara

 vcl/qa/cppunit/app/test_IconThemeSelector.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f392ef868cd111f0d4a12842d1f1a68ea062bde4
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Feb 21 23:10:26 2014 +

c++11ism

Change-Id: I0838eafa47aaed222aca30d234300f2c05697175

diff --git a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx 
b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
index c1eb785..6c85bcd 100644
--- a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
+++ b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
@@ -76,7 +76,7 @@ class IconThemeSelectorTest : public CppUnit::TestFixture
 IconThemeSelectorTest::GetFakeInstalledThemes()
 {
 std::vectorvcl::IconThemeInfo r;
-vcl::IconThemeInfo a{};
+vcl::IconThemeInfo a;
 a.mThemeId = tango;
 r.push_back(a);
 a.mThemeId = oxygen;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-21 Thread Stephan Bergmann

 writerfilter/source/dmapper/TextEffectsHandler.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b5b22e5c041ef5a4f9419cb8f97a091883dedbf8
Author: Stephan Bergmann sberg...@redhat.com
Date:   Sat Feb 22 00:19:53 2014 +0100

Fix 32-bit builds

Change-Id: I904bd077a0a519f296155ba0d83c083e8bca67d2

diff --git a/writerfilter/source/dmapper/TextEffectsHandler.cxx 
b/writerfilter/source/dmapper/TextEffectsHandler.cxx
index 6e00b20..38d3d82 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.cxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.cxx
@@ -138,13 +138,13 @@ void TextEffectsHandler::lcl_attribute(Id aName, Value 
aValue)
 switch(aName)
 {
 case NS_ooxml::LN_CT_Percentage_val:
-mpGrabBagStack-appendElement(val, makeAny(aValue.getInt()));
+mpGrabBagStack-appendElement(val, 
makeAny(sal_Int32(aValue.getInt(;
 break;
 case NS_ooxml::LN_CT_PositiveFixedPercentage_val:
-mpGrabBagStack-appendElement(val, makeAny(aValue.getInt()));
+mpGrabBagStack-appendElement(val, 
makeAny(sal_Int32(aValue.getInt(;
 break;
 case NS_ooxml::LN_CT_PositivePercentage_val:
-mpGrabBagStack-appendElement(val, makeAny(aValue.getInt()));
+mpGrabBagStack-appendElement(val, 
makeAny(sal_Int32(aValue.getInt(;
 break;
 case NS_ooxml::LN_CT_SchemeColor_val:
 mpGrabBagStack-appendElement(val, 
makeAny(getSchemeColorTypeString(aValue.getInt(;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

1 2 3 4 >

1 - 100 of 347 matches

Mail list logo