date:20141219

[Bug 45618] Implement 3d slideshow transition framework also for windows

2014-12-19 Thread bugzilla-daemon

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

--- Comment #12 from pieter kristensen  ---
To my disappointment the 3d slide transitions for Windows appear to be absent
too in the first release candidate.

-- 
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 Gerrit News for submodules on 2014-12-20

2014-12-19 Thread gerrit

Moin!



~~ Project dictionaries ~~

Nothing moved in the project for the last 25 hours

~~ Project translations ~~

Nothing moved in the project for the last 25 hours

~~ Project help ~~

* Open changes on master for project help changed in the last 25 hours:

+ fdo#86289 rename Page Preview to Print Preview
  in https://gerrit.libreoffice.org/13550 from Stanislav Horáček


* Merged changes on master for project help changed in the last 25 hours:

None

* Abandoned changes on master for project help changed in the last 25 hours:

None

* Open changes needing tweaks, but being untouched for more than a week:

None

Best,

Your friendly LibreOffice Gerrit Digest Mailer

Note: The bot generating this message can be found and improved here:
   
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

LibreOffice Gerrit News for core on 2014-12-20

2014-12-19 Thread gerrit

Moin!

* Open changes on master for project core changed in the last 25 hours:

 First time contributors doing great things! 
+ fdo#39468 translate German comments
  in https://gerrit.libreoffice.org/13549 from Michael Weghorn
  about module include
+ fdo#39440 sax, sc: reduce scope of local variables
  in https://gerrit.libreoffice.org/13548 from Michael Weghorn
  about module sax, sc
+ Refactor building perfect hash tabels for tokens
  in https://gerrit.libreoffice.org/13545 from Daniel Sikeler
  about module oox, solenv
+ fdo#79738: Test case for patch that fixes 79738
  in https://gerrit.libreoffice.org/13541 from Charu Tyagi
  about module sw
+ fdo#79738: test document for patch that that fixes 79738
  in https://gerrit.libreoffice.org/13542 from Charu Tyagi
  about module sw
+ fdo#79738: FILEOPEN: Number lines in footer not compatible with MSO
  in https://gerrit.libreoffice.org/13539 from Charu Tyagi
  about module writerfilter
+ Merge common code of sw format lists
  in https://gerrit.libreoffice.org/13448 from Jan-Marek Glogowski
  about module sw
 End of freshness 

+ Fixup --without-x build
  in https://gerrit.libreoffice.org/13452 from Riccardo Magliocchetti
  about module build, desktop, include, postprocess, svx, sw, vcl
+ onedrive: HIGify fallback dialog, make instructions translatable…
  in https://gerrit.libreoffice.org/13500 from Adolfo Jayme Barrientos
  about module ucb, uui
+ fdo#76486 Arrange Help button in a secondary group
  in https://gerrit.libreoffice.org/13427 from Adolfo Jayme Barrientos
  about module basctl, chart2, desktop, formula, reportdesign, sc, sd
+ manage VCL widgets using rtl::Reference
  in https://gerrit.libreoffice.org/13298 from Noel Grandin
  about module include, vcl


* Merged changes on master for project core changed in the last 25 hours:

+ Support for docx import of fixed date and time fields.
  in https://gerrit.libreoffice.org/13431 from Eilidh McAdam
+ fdo#59886 unit tests for DOCX fixed date field import/export.
  in https://gerrit.libreoffice.org/13432 from Eilidh McAdam
+ Small fix for docx date field format import.
  in https://gerrit.libreoffice.org/13430 from Eilidh McAdam
+ fdo#59886 export fixed date and time fields to docx.
  in https://gerrit.libreoffice.org/13429 from Eilidh McAdam
+ upgrade to icu 54
  in https://gerrit.libreoffice.org/13547 from Caolán McNamara
+ changes sidebar: Manage Changes (Redlining) panel instead of the dialog b
  in https://gerrit.libreoffice.org/13085 from Jan Holesovsky
+ fdo#39440 sal: reduce scope of local variables
  in https://gerrit.libreoffice.org/13544 from Michael Weghorn
+ fdo#39440 rsc: reduce scope of local variables
  in https://gerrit.libreoffice.org/13543 from Michael Weghorn
+ solenv: fix bashism in unittest-failed.sh
  in https://gerrit.libreoffice.org/13546 from Riccardo Magliocchetti
+ fdo#39440 reduce scope of local variables
  in https://gerrit.libreoffice.org/13540 from Michael Weghorn
+ Adjusted CppunitTest_sw_ooxmlexport for Mac Retina 13"
  in https://gerrit.libreoffice.org/13528 from Renato Ferreira
+ fdo#39468 translate German comments
  in https://gerrit.libreoffice.org/13534 from Michael Weghorn


* Abandoned changes on master for project core changed in the last 25 hours:

+ Resolves fdo#87301: Form-wizard doesn't show background-styles
  in https://gerrit.libreoffice.org/13535 from Julien Nabet


* Open changes needing tweaks, but being untouched for more than a week:

+ fdo#39625 Make existing CppUnittests work
  in https://gerrit.libreoffice.org/11605 from Tobias Madl
+ fdo#86606 removal of direct formatting options from the context menu
  in https://gerrit.libreoffice.org/13196 from Yousuf Philips
+ fdo#86784 make soffice commandline in juh Bootstrap.bootstrap() configura
  in https://gerrit.libreoffice.org/13290 from Christoph Lutz
+ l10ntools-transex3: core refactoring and improvements
  in https://gerrit.libreoffice.org/11317 from Douglas Mencken
+ Fix Python build in debug mode for x64 Windows
  in https://gerrit.libreoffice.org/13089 from David Ostrovsky
+ Replace image-sort.pl with image-sort.py
  in https://gerrit.libreoffice.org/13124 from Marcos Paulo de Souza
+ start detection of kf5 stuff in configure.ac
  in https://gerrit.libreoffice.org/13079 from Jonathan Riddell
+ fdo#65209 attempt to enable daylight saving time
  in https://gerrit.libreoffice.org/11441 from Lim Jing
+ Move more places to boost::signal2 in math
  in https://gerrit.libreoffice.org/13065 from Marcos Paulo de Souza
+ more breeze icons
  in https://gerrit.libreoffice.org/13058 from Jonathan Riddell
+ vcl: change Timer and Idle to use boost's Signal2
  in https://gerrit.libreoffice.org/12528 from Chris Sherlock
+ Removed useless includes in accessibility/ tree
  in https://gerrit.libreoffice.org/12948 from Andrea Gelmini
+ Perftest for loading autocorrect dictionaries, related fdo#79761
  in https://gerrit.libreoffice.org/11296 from Matúš Kukan
+ HIG-ification of GSoC Color Picker dialog

Gary Houston license statement

2014-12-19 Thread Gary Houston


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

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

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

2014-12-19 Thread Lionel Elie Mamane

 xmloff/source/draw/shapeexport.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit aeeff83595a176805d74ad4e35d946eb6a8e1b25
Author: Lionel Elie Mamane 
Date:   Sat Dec 20 00:19:09 2014 +0100

fix build

Change-Id: Ia528bd301e2f2ee1f7f3b009e3b9c3f395a4dcdb

diff --git a/xmloff/source/draw/shapeexport.cxx 
b/xmloff/source/draw/shapeexport.cxx
index f8d417c..4981626 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -248,7 +248,7 @@ void XMLShapeExport::collectShapeAutoStyles(const 
uno::Reference< drawing::XShap
 if( xPropSet.is() )
 xPropSet->getPropertyValue(msZIndex) >>= nZIndex;
 else
-nZindex = 0;
+nZIndex = 0;
 }
 
 ImplXMLShapeExportInfoVector& aShapeInfoVector = 
(*maCurrentShapesIter).second;
@@ -614,7 +614,7 @@ void XMLShapeExport::exportShape(const uno::Reference< 
drawing::XShape >& xShape
 if( xSet.is() )
 xSet->getPropertyValue(msZIndex) >>= nZIndex;
 else
-nZindex = 0;
+nZIndex = 0;
 }
 
 ImplXMLShapeExportInfoVector& aShapeInfoVector = 
(*maCurrentShapesIter).second;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-19 Thread Lionel Elie Mamane

 wizards/com/sun/star/wizards/document/TimeStampControl.java |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d2929cdc1a337769ee3b64b81f8454329c9d4cbb
Author: Lionel Elie Mamane 
Date:   Fri Dec 19 23:59:23 2014 +0100

fix build

Change-Id: I149d36a103df51ca78324df3121f51440797e226

diff --git a/wizards/com/sun/star/wizards/document/TimeStampControl.java 
b/wizards/com/sun/star/wizards/document/TimeStampControl.java
index 0706e32..524f172 100644
--- a/wizards/com/sun/star/wizards/document/TimeStampControl.java
+++ b/wizards/com/sun/star/wizards/document/TimeStampControl.java
@@ -30,6 +30,7 @@ import com.sun.star.uno.UnoRuntime;
 import com.sun.star.container.XNameContainer;
 import com.sun.star.drawing.XControlShape;
 import com.sun.star.drawing.XShape;
+import com.sun.star.drawing.XShapes;
 
 public class TimeStampControl extends DatabaseControl
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-19 Thread Lionel Elie Mamane

 wizards/com/sun/star/wizards/form/StyleApplier.java |   24 ++--
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit df5d040006dc9fdfa65049cd5cbf6841bd4a74de
Author: Lionel Elie Mamane 
Date:   Fri Dec 19 23:40:50 2014 +0100

fix indentation

Change-Id: I35a89fc3a7f388be783c729c8e3414aba1c5c726

diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java 
b/wizards/com/sun/star/wizards/form/StyleApplier.java
index 4a171e0..0e33f92 100644
--- a/wizards/com/sun/star/wizards/form/StyleApplier.java
+++ b/wizards/com/sun/star/wizards/form/StyleApplier.java
@@ -334,11 +334,11 @@ public class StyleApplier
 {
 StylesPath = FileAccess.getOfficePath(xMSF, "Config", "", "");
 StylesPath = FileAccess.combinePaths(xMSF, StylesPath, 
"/wizard/form/styles");
-   }
+}
 catch (NoValidPathException e)
-   {
-   }
-   return StylesPath;
+{
+}
+return StylesPath;
 }
 
 private int[] getStyleColors(String _filename)
@@ -401,16 +401,16 @@ public class StyleApplier
 if (aDBControl != null)
 {
 if 
(aDBControl.xServiceInfo.supportsService("com.sun.star.drawing.ShapeCollection"))
-{
-TimeStampControl oTimeStampControl = 
(TimeStampControl) aDBControl;
-for (int i = 0; i < 2; i++)
 {
-XPropertySet xPropertySet = 
oTimeStampControl.getControlofGroupShapeByIndex(i);
-setDBControlColors(xPropertySet, 
_iStyleColors);
+TimeStampControl oTimeStampControl = 
(TimeStampControl) aDBControl;
+for (int i = 0; i < 2; i++)
+{
+XPropertySet xPropertySet = 
oTimeStampControl.getControlofGroupShapeByIndex(i);
+setDBControlColors(xPropertySet, 
_iStyleColors);
+}
 }
-}
-else
-{
+else
+{
 
setDBControlColors(aDBControl.xPropertySet, _iStyleColors);
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 20 commits - include/xmloff reportdesign/source sc/source svx/source wizards/com xmloff/source

2014-12-19 Thread Lionel Elie Mamane

 include/xmloff/shapeexport.hxx  |4 
 reportdesign/source/filter/xml/xmlExport.cxx|4 
 sc/source/filter/xml/xmlexprt.cxx   |8 -
 svx/source/svdraw/svdobj.cxx|2 
 wizards/com/sun/star/wizards/document/FormHandler.java  |   13 +
 wizards/com/sun/star/wizards/document/TimeStampControl.java |   40 -
 wizards/com/sun/star/wizards/form/FormControlArranger.java  |   91 ++--
 wizards/com/sun/star/wizards/form/FormDocument.java |1 
 xmloff/source/chart/SchXMLExport.cxx|4 
 xmloff/source/draw/shapeexport.cxx  |   36 ++--
 xmloff/source/forms/elementimport.cxx   |9 +
 xmloff/source/forms/layerexport.cxx |2 
 xmloff/source/forms/propertyexport.cxx  |8 -
 xmloff/source/text/txtparae.cxx |2 
 14 files changed, 114 insertions(+), 110 deletions(-)

New commits:
commit c2cca8439d385d24c8de3601ff90d7522ff9c9a5
Author: Lionel Elie Mamane 
Date:   Fri Dec 19 23:29:26 2014 +0100

correct function name in debug message

Change-Id: I9c02fdd99504bdee6654d1072559a4afac6532a3

diff --git a/xmloff/source/forms/layerexport.cxx 
b/xmloff/source/forms/layerexport.cxx
index 6fa19a3..9057ae7 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -605,7 +605,7 @@ namespace xmloff
 {   // the column indeed has a formatting
 sal_Int32 nStyleMapIndex = 
m_xStyleExportMapper->getPropertySetMapper()->FindEntryIndex( 
CTF_FORMS_DATA_STYLE );
 // TODO: move this to the ctor
-OSL_ENSURE ( -1 != nStyleMapIndex, 
"XMLShapeExport::collectShapeAutoStyles: could not obtain the index for our 
context id!");
+OSL_ENSURE ( -1 != nStyleMapIndex, 
"OFormLayerXMLExport_Impl::collectGridColumnStylesAndIds: could not obtain the 
index for our context id!");
 
 XMLPropertyState aNumberStyleState( nStyleMapIndex, 
makeAny( sColumnNumberStyle ) );
 aPropertyStates.push_back( aNumberStyleState );
commit be2aa71a2caba12c7e2e0fc03cba30c6f6d81619
Author: Lionel Elie Mamane 
Date:   Fri Dec 19 23:29:07 2014 +0100

survive "TextBox" having no value

Change-Id: Iebed41cfcc5899387e3defb8d8a0792276349098

diff --git a/xmloff/source/draw/shapeexport.cxx 
b/xmloff/source/draw/shapeexport.cxx
index 5276afb..f8d417c 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -358,7 +358,7 @@ void XMLShapeExport::collectShapeAutoStyles(const 
uno::Reference< drawing::XShap
 }
 }
 
-if (aParentName.isEmpty() && 
xPropertySetInfo->hasPropertyByName("TextBox") && 
xPropSet->getPropertyValue("TextBox").get())
+if (aParentName.isEmpty() && 
xPropertySetInfo->hasPropertyByName("TextBox") && 
xPropSet->getPropertyValue("TextBox").hasValue() && 
xPropSet->getPropertyValue("TextBox").get())
 {
 // Shapes with a Writer TextBox always have a parent style.
 // If there would be none, then just assign the first available.
commit 0685b2e73e48adb84cd01355d45551ab478ebcd5
Author: Lionel Elie Mamane 
Date:   Fri Dec 19 23:25:21 2014 +0100

Assume that as long as the model is the same, the shape doesn't change.

Even if it is moved from not a page to a page or vice-versa.
This allows assumptions made in the Base Form wizard to hold,
namely that if one:
1) Creates controls (and their associated shapes)
2) Groups the shapes (in a GroupShape)
Then all the shapes still remember their associated control
and vice-versa.

Change-Id: I31975970e7ea2f7978aea7f753de88ecd8e55234

diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 3ff4238..0862bab 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -530,7 +530,7 @@ void SdrObject::SetPage(SdrPage* pNewPage)
 // If the page is changing to another page with the same model, we
 // assume they create compatible UNO shape objects so we shouldn't have
 // to invalidate.
-if (pOldPage != pPage && !(pOldPage && pPage && pOldModel == pModel))
+if (pOldPage != pPage && pOldModel != pModel)
 {
 SvxShape* const pShape(getSvxShape());
 if (pShape && !pShape->HasSdrObjectOwnership())
commit 8fdc6735d740dbdc09a3b14ec3d5fc6234ad2370
Author: Lionel Elie Mamane 
Date:   Fri Dec 19 23:25:00 2014 +0100

janitorial

Change-Id: I91387b354d0034410819dbcb8dc1ad8889fc8f14

diff --git a/wizards/com/sun/star/wizards/form/FormDocument.java 
b/wizards/com/sun/star/wizards/form/FormDocument.java
index 17698c2..3aed54d 100644
--- a/wizards/com/sun/star/wizards/form/FormDocument.java
+++ b/wizards/com/sun/star/wizards/form/FormDocument.java
@@

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

2014-12-19 Thread Miklos Vajna

 sw/qa/extras/inc/swmodeltestbase.hxx |3 +++
 sw/qa/extras/odfexport/data/fdo86963.odt |binary
 sw/qa/extras/odfexport/odfexport.cxx |   10 --
 sw/source/core/unocore/unodraw.cxx   |   13 +++--
 4 files changed, 22 insertions(+), 4 deletions(-)

New commits:
commit 97952280f0adbe195e6a2e0bab8a21a7e352a721
Author: Miklos Vajna 
Date:   Fri Dec 19 19:41:52 2014 +0100

fdo#86963 SwXShape: don't ask SwTextBoxHelper for ZOrder of child shapes

Regression from commit 01fc08c0b5c57fef8ad3755672f4266d85e849a5
(fdo#85554 SwXShape: fix getting ZOrder property when doc contains
TextBoxes, 2014-11-20), the problem was that we returned wrong ZOrder of
shapes inside group shapes.

In SwXShape::getPropertyValue(), pObj points to the Writer-interfacing
outermost group shape in case of shapes contained by group shapes, while
GetSvxShape() gives access to the real shape. Given that TextBoxes are
only possible at the highest level (and not inside group shapes), just
check if the two pointers are the same: when not, then no need to
convert anything.

With this, child shapes get back their original ZOrder -- before in case
the group shape had ZOrder=0, all its child shapes had ZOrder=0 as well.

Change-Id: I9c4097154130cd04f6ab2f2082abafc1d4333872

diff --git a/sw/qa/extras/odfexport/data/fdo86963.odt 
b/sw/qa/extras/odfexport/data/fdo86963.odt
new file mode 100644
index 000..72896e1
Binary files /dev/null and b/sw/qa/extras/odfexport/data/fdo86963.odt differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx 
b/sw/qa/extras/odfexport/odfexport.cxx
index 9c2200c..41c4ed9 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -402,6 +402,14 @@ DECLARE_ODFEXPORT_TEST(testTextboxRoundedCorners, 
"textbox-rounded-corners.odt")
 CPPUNIT_ASSERT_EQUAL(OUString("a"), xCell->getString());
 }
 
+DECLARE_ODFEXPORT_TEST(testFdo86963, "fdo86963.odt")
+{
+// Export of this document failed with beans::UnknownPropertyException.
+uno::Reference xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xDrawPage = 
xDrawPageSupplier->getDrawPage();
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDrawPage->getCount());
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/unocore/unodraw.cxx 
b/sw/source/core/unocore/unodraw.cxx
index ea0dd24..3cc240e 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -1763,8 +1763,17 @@ uno::Any SwXShape::getPropertyValue(const OUString& 
rPropertyName)
 const SdrObject* pObj = pFmt->FindRealSdrObject();
 if (pObj)
 {
-std::set aTextBoxes = 
SwTextBoxHelper::findTextBoxes(pFmt->GetDoc());
-aRet <<= SwTextBoxHelper::getOrdNum(pObj, aTextBoxes);
+bool bConvert = true;
+if (SvxShape* pSvxShape = GetSvxShape())
+// In case of group shapes, pSvxShape points to 
the child shape, while pObj points to the outermost group shape.
+if (pSvxShape->GetSdrObject() != pObj)
+// Textboxes are not expected inside group 
shapes, so no conversion is necessary there.
+bConvert = false;
+if (bConvert)
+{
+std::set aTextBoxes = 
SwTextBoxHelper::findTextBoxes(pFmt->GetDoc());
+aRet <<= SwTextBoxHelper::getOrdNum(pObj, 
aTextBoxes);
+}
 }
 }
 }
commit cdb8d7a53e587819044f2b5ea43c6416909686b1
Author: Miklos Vajna 
Date:   Fri Dec 19 22:31:11 2014 +0100

CppunitTest_sw_odfexport: allow running a single testcase

Change-Id: Iaaa3d8a4e8ddf419ecaf75dfa30d1b4a9bc984af

diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx 
b/sw/qa/extras/inc/swmodeltestbase.hxx
index 8e8dea8..30b642c 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -91,6 +91,7 @@ using namespace css;
 #define DECLARE_RTFIMPORT_TEST(TestName, filename) 
DECLARE_SW_IMPORT_TEST(TestName, filename, Test)
 #define DECLARE_RTFEXPORT_TEST(TestName, filename) 
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test)
 #define DECLARE_ODFIMPORT_TEST(TestName, filename) 
DECLARE_SW_IMPORT_TEST(TestName, filename, Test)
+#define DECLARE_ODFEXPORT_TEST(TestName, filename) 
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test)
 #define DECLARE_WW8EXPORT_TEST(TestName, filename) 
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test)
 
 // For testing during development of a test, you want to use
@@ -102,6 +103,7 @@ using namespace css;
 #define DECLARE_RTFIMPORT_TEST_ONLY(TestName, filename) 
DECLARE_SW_IMPORT_TEST(TestName, filename, Test)
 #define DECLARE_RTFEXPORT_TEST_ONLY(Tes

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

2014-12-19 Thread Tor Lillqvist

 sc/inc/formulacell.hxx  |4 
 sc/inc/tokenarray.hxx   |3 +++
 sc/source/core/data/formulacell.cxx |9 -
 sc/source/core/tool/token.cxx   |   27 +++
 4 files changed, 42 insertions(+), 1 deletion(-)

New commits:
commit cc4dbc0c4613b169045341d1f02bc4c47a407fa0
Author: Tor Lillqvist 
Date:   Fri Dec 19 17:51:53 2014 +0200

Check number of cells referenced by group instead of group size

It's more relevant when deciding whether to use OpenCL or not.

Note that we won't use OpenCL for a single formula cell, no matter how 
large a
calculation it invokes (like =SUM(A1:A100), for instance), as a single
cell is not a group.

Change-Id: I66b03c197431c2b4cef96f46b010d99d3e0624fc

diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 0ed021f..899d3b7 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -410,6 +410,10 @@ public:
 bool IsSharedTop() const;
 SCROW GetSharedTopRow() const;
 SCROW GetSharedLength() const;
+
+// An estimate of the number of cells referenced by the formula
+sal_Int32 GetWeight() const;
+
 ScTokenArray* GetSharedCode();
 const ScTokenArray* GetSharedCode() const;
 
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index 5d6593d..ab1e941 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -60,6 +60,9 @@ public:
 virtual ~ScTokenArray();
 ScTokenArray* Clone() const;/// True copy!
 
+// An estimate of the number of cells referenced by the token array
+sal_Int32 GetWeight() const;
+
 void GenHash();
 size_t GetHash() const { return mnHashValue;}
 
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index a7f4813..5c6511f 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3752,7 +3752,7 @@ bool ScFormulaCell::InterpretFormulaGroup()
 if (mxGroup->meCalcState == sc::GroupCalcDisabled)
 return false;
 
-if (GetSharedLength() < 
ScInterpreter::GetGlobalConfig().mnOpenCLMinimumFormulaGroupSize)
+if (GetWeight() < 
ScInterpreter::GetGlobalConfig().mnOpenCLMinimumFormulaGroupSize)
 {
 mxGroup->meCalcState = sc::GroupCalcDisabled;
 return false;
@@ -4130,6 +4130,13 @@ SCROW ScFormulaCell::GetSharedLength() const
 return mxGroup ? mxGroup->mnLength : 0;
 }
 
+sal_Int32 ScFormulaCell::GetWeight() const
+{
+if (!mxGroup)
+return pCode->GetWeight();
+return GetSharedLength() * GetSharedCode()->GetWeight();
+}
+
 ScTokenArray* ScFormulaCell::GetSharedCode()
 {
 return mxGroup ? mxGroup->mpCode : NULL;
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index e52d581..a4f2473 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1413,6 +1413,33 @@ bool ScTokenArray::ImplGetReference( ScRange& rRange, 
const ScAddress& rPos, boo
 return bIs;
 }
 
+sal_Int32 ScTokenArray::GetWeight() const
+{
+sal_Int32 result(0);
+
+FormulaToken** p = pCode;
+FormulaToken** pEnd = p + static_cast(nLen);
+for (; p != pEnd; ++p)
+{
+switch ((*p)->GetType())
+{
+case svDoubleRef :
+case svExternalDoubleRef:
+{
+const ScComplexRefData& rRef = *(*p)->GetDoubleRef();
+result += ( (rRef.Ref2.Row() - rRef.Ref1.Row() + 1) * 
(rRef.Ref2.Col() - rRef.Ref1.Col() + 1) );
+}
+break;
+default:
+break;
+}
+}
+// Just print out the this pointer. It turns out to be quite complicated 
to get
+// a symbolic printout of the ScTokenArray here.
+SAL_INFO("sc.token", "GetWeight(" << this << "): " << result);
+return result;
+}
+
 namespace {
 
 // we want to compare for similar not identical formulae
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-19 Thread Kohei Yoshida

 sc/source/core/opencl/formulagroupcl.cxx |   36 ++-
 sc/source/core/opencl/opbase.hxx |5 ++--
 2 files changed, 20 insertions(+), 21 deletions(-)

New commits:
commit 10d1eb5e933a6e37411e618cd89fa8c0a72b941b
Author: Kohei Yoshida 
Date:   Fri Dec 19 16:04:15 2014 -0500

Let's just have one typedef and use it across the board.

Change-Id: Iadfbeb5b97673a8812c90411ff2e49324347ee24

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 8705224..e1abb1d 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -877,10 +877,9 @@ protected:
 class SymbolTable
 {
 public:
-typedef std::map > ArgumentMap;
+typedef std::map 
ArgumentMap;
 // This avoids instability caused by using pointer as the key type
-typedef std::list > ArgumentList;
+typedef std::list ArgumentList;
 SymbolTable() : mCurId(0) { }
 template
 const DynamicKernelArgument* DeclRefArg( FormulaTreeNodeRef, 
SlidingFunctionBase* pCodeGen, int nResultSize );
@@ -1935,9 +1934,8 @@ struct SumIfsArgs
 /// Helper functions that have multiple buffers
 class DynamicKernelSoPArguments : public DynamicKernelArgument
 {
-typedef boost::shared_ptr SubArgument;
 public:
-typedef std::vector SubArgumentsType;
+typedef std::vector SubArgumentsType;
 
 DynamicKernelSoPArguments(
 const std::string& s, const FormulaTreeNodeRef& ft,
@@ -2204,11 +2202,11 @@ private:
 cl_mem mpClmem2;
 };
 
-boost::shared_ptr SoPHelper(
+DynamicKernelArgumentRef SoPHelper(
 const std::string& ts, const FormulaTreeNodeRef& ft, SlidingFunctionBase* 
pCodeGen,
 int nResultSize )
 {
-return boost::shared_ptr(new 
DynamicKernelSoPArguments(ts, ft, pCodeGen, nResultSize));
+return DynamicKernelArgumentRef(new DynamicKernelSoPArguments(ts, ft, 
pCodeGen, nResultSize));
 }
 
 template
@@ -2297,20 +2295,20 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(
 pCodeGen->takeString())
 {
 mvSubArguments.push_back(
-SubArgument(
+DynamicKernelArgumentRef(
 new DynamicKernelMixedSlidingArgument(
 ts, ft->Children[i], mpCodeGen, 
j)));
 }
 else
 {
 mvSubArguments.push_back(
-SubArgument(VectorRefFactory(
+
DynamicKernelArgumentRef(VectorRefFactory(
 ts, ft->Children[i], mpCodeGen, 
j)));
 }
 }
 else
 mvSubArguments.push_back(
-SubArgument(VectorRefFactory
+DynamicKernelArgumentRef(VectorRefFactory
 (
 ts, ft->Children[i], mpCodeGen, j)));
 }
@@ -2325,21 +2323,21 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(
 pCodeGen->takeString())
 {
 mvSubArguments.push_back(
-SubArgument(new DynamicKernelMixedArgument(
+DynamicKernelArgumentRef(new 
DynamicKernelMixedArgument(
 ts, ft->Children[i])));
 }
 else if (pSVR->GetArray().mpNumericArray &&
 pCodeGen->takeNumeric())
 {
 mvSubArguments.push_back(
-SubArgument(new VectorRef(ts,
+DynamicKernelArgumentRef(new VectorRef(ts,
 ft->Children[i])));
 }
 else if (pSVR->GetArray().mpStringArray &&
 pCodeGen->takeString())
 {
 mvSubArguments.push_back(
-SubArgument(new DynamicKernelStringArgument(
+DynamicKernelArgumentRef(new 
DynamicKernelStringArgument(
 ts, ft->Children[i])));
 }
 else if (pSVR->GetArray().mpStringArray == NULL &&
@@ -2347,7 +2345,7 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(
 {
 // Push as an array of NANs
 mvSubArguments.push_back(
-SubArgument(new VectorRef(ts,
+DynamicKernelArgumentRef(new VectorRef(ts,
 ft->Children[i])

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

2014-12-19 Thread Kohei Yoshida

 sc/source/core/opencl/formulagroupcl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit afbbbe91854cebf84865623d1a62712285241bde
Author: Kohei Yoshida 
Date:   Fri Dec 19 15:45:19 2014 -0500

This one can be private as well.

Change-Id: I129c6a250116fdcf78dce63e3b46bb3c789d087d

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 4ffab79..8705224 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1935,8 +1935,8 @@ struct SumIfsArgs
 /// Helper functions that have multiple buffers
 class DynamicKernelSoPArguments : public DynamicKernelArgument
 {
-public:
 typedef boost::shared_ptr SubArgument;
+public:
 typedef std::vector SubArgumentsType;
 
 DynamicKernelSoPArguments(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-19 Thread Kohei Yoshida

 sc/source/core/opencl/opbase.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0de9708a277ef85737d91925f77f1d95296eb91f
Author: Kohei Yoshida 
Date:   Fri Dec 19 15:22:04 2014 -0500

Let's hide this typedef. Not used outside this class.

Change-Id: Id3713657a8a7ff54f8d06e5ee670fcb297686706

diff --git a/sc/source/core/opencl/opbase.hxx b/sc/source/core/opencl/opbase.hxx
index c1e47b8..7d6cc1d 100644
--- a/sc/source/core/opencl/opbase.hxx
+++ b/sc/source/core/opencl/opbase.hxx
@@ -189,8 +189,8 @@ public:
 
 class SlidingFunctionBase : public OpBase
 {
-public:
 typedef boost::shared_ptr SubArgument;
+public:
 typedef std::vector SubArguments;
 virtual void GenSlidingWindowFunction( std::stringstream&,
 const std::string&, SubArguments& ) = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-19 Thread Kohei Yoshida

 sc/source/core/opencl/formulagroupcl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ec7b12a5c331cd0250d7bb5bed09384985943bda
Author: Kohei Yoshida 
Date:   Fri Dec 19 15:08:53 2014 -0500

We don't need this semi-colon.

Change-Id: I3860e2e54e6a380f8050cdaa63cda52adf70220a

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 2c77ee4..4ffab79 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -3306,7 +3306,7 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(
 
 default:
 throw UnhandledToken(pChild, "unhandled opcode");
-};
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] website.git: Branch 'update' - check.php

2014-12-19 Thread Christian Lohmaier

 check.php |   27 ++-
 1 file changed, 18 insertions(+), 9 deletions(-)

New commits:
commit 5249d17efb2d35de709ec5164e364b8bbde94913
Author: Christian Lohmaier 
Date:   Fri Dec 19 21:08:55 2014 +0100

enable update to 4.3.5, add build-ids

diff --git a/check.php b/check.php
index 70538ee..84c8026 100644
--- a/check.php
+++ b/check.php
@@ -289,6 +289,9 @@ $build_hash_to_version = array(
 # 4.2.7
 'ad618ebe74a072c4ad8fae3b902f6ff1be98983d' => '4.2.7.1',
 '933c0aa564ec4f8883ed5732c866db48dca4dac5' => '4.2.7.2', # Final
+# 4.2.8 - after-EOL-release
+'4044db1653798618515c987464157abee9229c11' => '4.2.8.1',
+'48d50dbfc06349262c9d50868e5c1f630a573ebd' => '4.2.8.2', # Final
 
 ##
 # 4.3.0 versions
@@ -315,11 +318,17 @@ $build_hash_to_version = array(
 '9bb7eadab57b6755b1265afa86e04bf45fbfc644' => '4.3.3.2', # Final
 # 4.3.4
 'bc356b2f991740509f321d70e4512a6a54c5f243' => '4.3.4.1', # Final 
(unscheduled additional release)
+# 4.3.5
+'8fd0451cc08e6a5310bed8b7ad1c46b93c1c6889' => '4.3.5.1',
+'3a87456aaa6a95c63eea1c1b3201acedf0751bd5' => '4.3.5.2', # Final
 
 ##
 # 4.4.0 versions
 'e73cb2cc40530caa75d588833c4b690e4f49f630' => '4.4.0.0.a1', # alpha1 (calc 
rendering probs)
-'24f0a5815f581dd9a7f09d30213a379edee6e9ac' => '4.4.0.0.a1', # alpha2
+'24f0a5815f581dd9a7f09d30213a379edee6e9ac' => '4.4.0.0.a2', # alpha2
+'9af3d21234aa89dac653c0bd76648188cdeb683e' => '4.4.0.0.b1', # beta1
+'be92f32b8f21603a6b7a75dd645f7475bdee519d' => '4.4.0.0.b2', # beta2
+'1ba9640ddd424f1f535c75bf2b86703770b8cf6f' => '4.3.5.1',
 );
 
 # Descriptions of the target versions
@@ -332,18 +341,18 @@ $build_hash_to_version = array(
 #   where '' and '' will be substitued with the right value
 #   NOTE: '&' in the URL has to be escaped as &
 $update_map = array(
-'stable' => array('gitid'   => 
'3fd416d4c6db7d3204c17ce57a1d70f6e531ee21',
-  'id'  => 'LibreOffice 4.2.6 security update',
-  'version' => '4.2.6-secfix',
+'stable' => array('gitid'   => 
'48d50dbfc06349262c9d50868e5c1f630a573ebd',
+  'id'  => 'LibreOffice 4.2.8',
+  'version' => '4.2.8',
   'update_type' => 'text/html',
-  'update_src'  => 
'http://www.libreoffice.org/download/libreoffice-still/?type=&lang=&version=4.2.6',
+  'update_src'  => 
'http://www.libreoffice.org/download/libreoffice-still/?type=&lang=&version=4.2.8',
   'substitute'  => true ),
 
-'latest' => array('gitid'   => 
'bc356b2f991740509f321d70e4512a6a54c5f243',
-  'id'  => 'LibreOffice 4.3.4',
-  'version' => '4.3.4',
+'latest' => array('gitid'   => 
'3a87456aaa6a95c63eea1c1b3201acedf0751bd5',
+  'id'  => 'LibreOffice 4.3.5',
+  'version' => '4.3.5',
   'update_type' => 'text/html',
-  'update_src'  => 
'http://www.libreoffice.org/download/libreoffice-fresh/?type=&lang=&version=4.3.4',
+  'update_src'  => 
'http://www.libreoffice.org/download/libreoffice-fresh/?type=&lang=&version=4.3.5',
   'substitute'  => true ),
 );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-19 Thread Christian Lohmaier

 sal/rtl/string.cxx  |2 +-
 sal/rtl/ustring.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d6e7c247563cb15dcc143f6d1d583c746af0184b
Author: Christian Lohmaier 
Date:   Fri Dec 19 20:56:15 2014 +0100

constants via #define must be integer if used in #if statement

breaks windows build otherwise (fatal erro C1017)

Change-Id: Idae78c621bfb8f989eb33220f015e17a7b7fb92f

diff --git a/sal/rtl/string.cxx b/sal/rtl/string.cxx
index 259906c..07842ec 100644
--- a/sal/rtl/string.cxx
+++ b/sal/rtl/string.cxx
@@ -56,7 +56,7 @@ static rtl_String const aImplEmpty_rtl_String =
  * ustring.cxx
  */
 
-#define IMPL_RTL_IS_USTRING false
+#define IMPL_RTL_IS_USTRING 0
 
 #define IMPL_RTL_STRCODEsal_Char
 #define IMPL_RTL_USTRCODE( c )  ((unsigned char)c)
diff --git a/sal/rtl/ustring.cxx b/sal/rtl/ustring.cxx
index 0fc9e06..a9406d8 100644
--- a/sal/rtl/ustring.cxx
+++ b/sal/rtl/ustring.cxx
@@ -62,7 +62,7 @@ static rtl_uString const aImplEmpty_rtl_uString =
  * string.cxx
  */
 
-#define IMPL_RTL_IS_USTRING true
+#define IMPL_RTL_IS_USTRING 1
 
 #define IMPL_RTL_STRCODEsal_Unicode
 #define IMPL_RTL_USTRCODE( c )  (c)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 63436] Support for ODF fields as written by KWord

2014-12-19 Thread bugzilla-daemon

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

George Bateman  changed:

   What|Removed |Added

 CC||george.batema...@gmail.com

--- Comment #3 from George Bateman  ---
I cannot reproduce the bug on Ubuntu 14.04, 64-bit. Both files attached in the
AOO report open fine on a freshly built copy of LO, and on my OS-supplied copy,
"Version 4.2.7.2, Build ID 420m0(Build:2)".
Should this be closed?

-- 
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: 6 commits - include/sfx2 include/svtools include/svx include/vcl sfx2/source svtools/source svx/inc svx/source vcl/source

2014-12-19 Thread Caolán McNamara

 include/sfx2/dockwin.hxx  |2 
 include/svtools/toolbarmenu.hxx   |   18 +-
 include/svx/dialogs.hrc   |   36 -
 include/vcl/dockwin.hxx   |6 
 sfx2/source/dialog/dockwin.cxx|2 
 svtools/source/control/toolbarmenu.cxx|   15 +-
 svx/inc/helpid.hrc|3 
 svx/source/tbxctrls/extrusioncontrols.cxx |   88 --
 svx/source/tbxctrls/extrusioncontrols.hrc |   12 -
 svx/source/tbxctrls/extrusioncontrols.hxx |5 
 svx/source/tbxctrls/extrusioncontrols.src |  184 --
 svx/source/tbxctrls/fontworkgallery.cxx   |   32 ++---
 svx/source/tbxctrls/fontworkgallery.src   |   68 ---
 vcl/source/window/dockwin.cxx |   11 -
 14 files changed, 208 insertions(+), 274 deletions(-)

New commits:
commit bccfe2cbc3166f8f15c43417a958701328cfe64b
Author: CaolÃ¡n McNamara 
Date:   Fri Dec 19 17:19:48 2014 +

convert RID_SVXFLOAT_FONTWORK_CHARSPACING to simple strings

Change-Id: I54a1a714cb80f2d41a922416a0b9d94f1e329b57

diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index ae8b7aa..46170da 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -899,11 +899,9 @@
 #define RID_SVXSTR_DEPTH_4_INCH (RID_SVX_START + 1001)
 
 #define RID_SVXFLOAT_FONTWORK_ALIGNMENT (RID_SVX_START + 1002)
-#define RID_SVXFLOAT_FONTWORK_CHARSPACING   (RID_SVX_START + 1003)
 
-/*  #i35426# DR 2004-10-19: (RID_SVX_START+1002) and (RID_SVX_START+1003) are
-already used for RID_SVXFLOAT_FONTWORK_ALIGNMENT and
-RID_SVXFLOAT_FONTWORK_CHARSPACING above. But these IDs describe floating
+/*  #i35426# DR 2004-10-19: (RID_SVX_START+1002) is
+already used for RID_SVXFLOAT_FONTWORK_ALIGNMENT above. But these IDs 
describe floating
 windows, and the following IDs are for strings, so this is no conflict. */
 #define RID_SVXSTR_PAGES(RID_SVX_START + 1002)
 
@@ -1068,9 +1066,16 @@
 #define RID_SVXSTR_MATTE (RID_SVX_START + 1298)
 #define RID_SVXSTR_PLASTIC   (RID_SVX_START + 1299)
 #define RID_SVXSTR_METAL (RID_SVX_START + 1300)
+#define RID_SVXSTR_CHARS_SPACING_VERY_TIGHT (RID_SVX_START + 1301)
+#define RID_SVXSTR_CHARS_SPACING_TIGHT   (RID_SVX_START + 1302)
+#define RID_SVXSTR_CHARS_SPACING_NORMAL  (RID_SVX_START + 1303)
+#define RID_SVXSTR_CHARS_SPACING_LOOSE   (RID_SVX_START + 1304)
+#define RID_SVXSTR_CHARS_SPACING_VERY_LOOSE (RID_SVX_START + 1305)
+#define RID_SVXSTR_CHARS_SPACING_CUSTOM   (RID_SVX_START + 1306)
+#define RID_SVXSTR_CHARS_SPACING_KERN_PAIRS (RID_SVX_START + 1307)
 
 // !!! IMPORTANT: consider and update RID_SVXSTR_NEXTFREE when introducing new 
RIDs for Strings !!!
-#define RID_SVXSTR_NEXTFREE  (RID_SVX_START + 1301)
+#define RID_SVXSTR_NEXTFREE  (RID_SVX_START + 1308)
 
 // if we have _a_lot_ time, we should group the resource ids by type, instead
 // of grouping them by semantics. The reason is that resource ids have to be
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index 20802cc..c5e565d 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -86,7 +86,6 @@
 #define HID_POPUP_COLOR   
"SVX_HID_POPUP_COLOR"
 #define HID_POPUP_COLOR_CTRL  
"SVX_HID_POPUP_COLOR_CTRL"
 #define HID_POPUP_FONTWORK_ALIGN  
"SVX_HID_POPUP_FONTWORK_ALIGN"
-#define HID_POPUP_FONTWORK_CHARSPACE  
"SVX_HID_POPUP_FONTWORK_CHARSPACE"
 #define HID_POPUP_FRAME   
"SVX_HID_POPUP_FRAME"
 #define HID_POPUP_LINE
"SVX_HID_POPUP_LINE"
 #define HID_POPUP_LINEEND 
"SVX_HID_POPUP_LINEEND"
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx 
b/svx/source/tbxctrls/fontworkgallery.cxx
index 9debe62..973809b 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -514,36 +514,30 @@ private:
 
 };
 
-
-
-FontworkCharacterSpacingWindow::FontworkCharacterSpacingWindow( 
svt::ToolboxController& rController, const Reference< XFrame >& rFrame, 
vcl::Window* pParentWindow )
-: ToolbarMenu( rFrame, pParentWindow, SVX_RES( 
RID_SVXFLOAT_FONTWORK_CHARSPACING ))
-, mrController( rController )
-, msFontworkCharacterSpacing( ".uno:FontworkCharacterSpacing" )
-, msFontworkKernCharacterPairs( ".uno:FontworkKernCharacterPairs" )
+FontworkCharacterSpacingWindow::FontworkCharacterSpacingWindow(svt::ToolboxController&
 rController,
+const Reference< XFrame >& rFrame, vcl::Window* pParentWindow)
+: ToolbarMenu(rFrame, pParentWindow, 
WB_MOVEABLE|WB_CLOSEABLE|WB_HIDE|WB_3DLOOK)
+, mrController(rController)
+, msFontworkCharacterSpacing(".uno:FontworkCharacterSpacing")
+, msFontworkKernCharacterPairs(".uno:FontworkKernCharacterPairs")
 {
-SetHelpId( HID_POPUP_FONTWORK_CHARSPA

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

2014-12-19 Thread Eike Rathke

 i18npool/source/localedata/data/fr_BF.xml |   50 +++---
 1 file changed, 26 insertions(+), 24 deletions(-)

New commits:
commit bca9ecb7326be88ab59153a1803bba25654b34e5
Author: Eike Rathke 
Date:   Fri Dec 19 19:20:59 2014 +0100

fdo#87471 update locale data for French Burkina Faso [fr-BF]

Change-Id: I7f6311c541db507236f6c6ab999aee5db8683f33
(cherry picked from commit 695e2938ff954f6dcceac4b6b170e6724294be2f)

diff --git a/i18npool/source/localedata/data/fr_BF.xml 
b/i18npool/source/localedata/data/fr_BF.xml
index ab4ad55..9330801 100644
--- a/i18npool/source/localedata/data/fr_BF.xml
+++ b/i18npool/source/localedata/data/fr_BF.xml
@@ -43,7 +43,9 @@
 metric
   
   
-M/D
+D/M
+D.M.Y
+D-M-Y
 
   Standard
 
@@ -75,34 +77,34 @@
   0,00%
 
 
-  #Â ##0[CURRENCY];-#Â ##0[CURRENCY]
+  #Â ##0 [CURRENCY];-#Â ##0 [CURRENCY]
 
 
-  #Â ##0,00[CURRENCY];-#Â ##0,00[CURRENCY]
+  #Â ##0,00 [CURRENCY];-#Â ##0,00 [CURRENCY]
 
 
-  #Â ##0[CURRENCY];[RED]-#Â ##0[CURRENCY]
+  #Â ##0 [CURRENCY];[RED]-#Â ##0 [CURRENCY]
 
 
-  #Â ##0,00[CURRENCY];[RED]-#Â ##0,00[CURRENCY]
+  #Â ##0,00 [CURRENCY];[RED]-#Â ##0,00 [CURRENCY]
 
 
-  #Â ##0,00CCC
+  #Â ##0,00 CCC
 
 
-  #Â ##0,--[CURRENCY];[RED]-#Â ##0,--[CURRENCY]
+  #Â ##0,-- [CURRENCY];[RED]-#Â ##0,-- [CURRENCY]
 
 
-  YY/MM/DD
+  D/MM/YY
 
 
   DD  
 
 
-  YY/MM/DD
+  DD/MM/YY
 
 
-  /MM/DD
+  DD/MM/
 
 
   D MMM YY
@@ -117,7 +119,7 @@
   D  
 
 
-  D  
+  D  YY
 
 
   NN DD/MMM/YY
@@ -143,7 +145,7 @@
   ISO 8601
 
 
-  YY/MM
+  MM/YY
 
 
   MMM/DD
@@ -179,10 +181,10 @@
   [HH]:MM:SS,00
 
 
-  YY/MM/DD HH:MM
+  DD/MM/YY HH:MM
 
 
-  /MM/DD HH:MM:SS AM/PM
+  DD/MM/ HH:MM:SS AM/PM
 
   
   
@@ -341,16 +343,16 @@
 
   vrai
   faux
-  Premier trimestre
-  DeuxiÃ¨me trimestre
-  TroisiÃ¨me trimestre
-  QuatriÃ¨me trimestre
-  carrÃ©
-  Racine carrÃ©
-  1er trim.
-  2e trim.
-  3e trim.
-  4e trim.
+  1er trimestre
+  2e trimestre
+  3e trimestre
+  4e trimestre
+  supÃ©rieur
+  infÃ©rieur
+  T1
+  T2
+  T3
+  T4
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-19 Thread Eike Rathke

 i18npool/source/localedata/data/fr_BF.xml |   50 +++---
 1 file changed, 26 insertions(+), 24 deletions(-)

New commits:
commit 695e2938ff954f6dcceac4b6b170e6724294be2f
Author: Eike Rathke 
Date:   Fri Dec 19 19:20:59 2014 +0100

fdo#87471 update locale data for French Burkina Faso [fr-BF]

Change-Id: I7f6311c541db507236f6c6ab999aee5db8683f33

diff --git a/i18npool/source/localedata/data/fr_BF.xml 
b/i18npool/source/localedata/data/fr_BF.xml
index ab4ad55..9330801 100644
--- a/i18npool/source/localedata/data/fr_BF.xml
+++ b/i18npool/source/localedata/data/fr_BF.xml
@@ -43,7 +43,9 @@
 metric
   
   
-M/D
+D/M
+D.M.Y
+D-M-Y
 
   Standard
 
@@ -75,34 +77,34 @@
   0,00%
 
 
-  #Â ##0[CURRENCY];-#Â ##0[CURRENCY]
+  #Â ##0 [CURRENCY];-#Â ##0 [CURRENCY]
 
 
-  #Â ##0,00[CURRENCY];-#Â ##0,00[CURRENCY]
+  #Â ##0,00 [CURRENCY];-#Â ##0,00 [CURRENCY]
 
 
-  #Â ##0[CURRENCY];[RED]-#Â ##0[CURRENCY]
+  #Â ##0 [CURRENCY];[RED]-#Â ##0 [CURRENCY]
 
 
-  #Â ##0,00[CURRENCY];[RED]-#Â ##0,00[CURRENCY]
+  #Â ##0,00 [CURRENCY];[RED]-#Â ##0,00 [CURRENCY]
 
 
-  #Â ##0,00CCC
+  #Â ##0,00 CCC
 
 
-  #Â ##0,--[CURRENCY];[RED]-#Â ##0,--[CURRENCY]
+  #Â ##0,-- [CURRENCY];[RED]-#Â ##0,-- [CURRENCY]
 
 
-  YY/MM/DD
+  D/MM/YY
 
 
   DD  
 
 
-  YY/MM/DD
+  DD/MM/YY
 
 
-  /MM/DD
+  DD/MM/
 
 
   D MMM YY
@@ -117,7 +119,7 @@
   D  
 
 
-  D  
+  D  YY
 
 
   NN DD/MMM/YY
@@ -143,7 +145,7 @@
   ISO 8601
 
 
-  YY/MM
+  MM/YY
 
 
   MMM/DD
@@ -179,10 +181,10 @@
   [HH]:MM:SS,00
 
 
-  YY/MM/DD HH:MM
+  DD/MM/YY HH:MM
 
 
-  /MM/DD HH:MM:SS AM/PM
+  DD/MM/ HH:MM:SS AM/PM
 
   
   
@@ -341,16 +343,16 @@
 
   vrai
   faux
-  Premier trimestre
-  DeuxiÃ¨me trimestre
-  TroisiÃ¨me trimestre
-  QuatriÃ¨me trimestre
-  carrÃ©
-  Racine carrÃ©
-  1er trim.
-  2e trim.
-  3e trim.
-  4e trim.
+  1er trimestre
+  2e trimestre
+  3e trimestre
+  4e trimestre
+  supÃ©rieur
+  infÃ©rieur
+  T1
+  T2
+  T3
+  T4
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-19 Thread Eilidh McAdam

 sw/qa/extras/ooxmlexport/data/fixed-date-field.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx   |   22 
 2 files changed, 22 insertions(+)

New commits:
commit 8ab2b17015592a6cdc8247b8bc245ff5f88bfec9
Author: Eilidh McAdam 
Date:   Thu Dec 11 00:26:41 2014 +

fdo#59886 unit tests for DOCX fixed date field import/export.

Checks fixed date fields are exported to docx and imported from
docx with correct initial value.

Change-Id: Ia6b6180b59806e624b03dc81a903ab1ac6d33307
Reviewed-on: https://gerrit.libreoffice.org/13432
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/qa/extras/ooxmlexport/data/fixed-date-field.docx 
b/sw/qa/extras/ooxmlexport/data/fixed-date-field.docx
new file mode 100644
index 000..960e2db
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/fixed-date-field.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
index d2a4c7f..7d18e3e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
@@ -649,6 +649,28 @@ DECLARE_OOXMLEXPORT_TEST(testSdtCompanyMultipara, 
"sdt-company-multipara.docx")
 }
 }
 
+DECLARE_OOXMLEXPORT_TEST(testFixedDateFields, "fixed-date-field.docx")
+{
+uno::Reference xTextFieldsSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xFieldsAccess(xTextFieldsSupplier->getTextFields());
+uno::Reference 
xFields(xFieldsAccess->createEnumeration());
+uno::Reference xField(xFields->nextElement(), 
uno::UNO_QUERY);
+
+// Check fixed property was imported and date value was parsed correctly
+CPPUNIT_ASSERT_EQUAL(true, getProperty(xField, "IsFixed"));
+com::sun::star::util::DateTime date = 
getProperty(xField, "DateTimeValue");
+CPPUNIT_ASSERT_EQUAL((sal_uInt16)24, date.Day);
+CPPUNIT_ASSERT_EQUAL((sal_uInt16)7, date.Month);
+CPPUNIT_ASSERT_EQUAL((sal_Int16)2014, date.Year);
+
+if (xmlDocPtr pXmlDoc = parseExport("word/document.xml"))
+{
+// Previously, fixed fields were exported as static text ("Date 
(fixed)")
+// Check they are now exported correctly as fldChar with fldLock 
attribute
+assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r[1]/w:fldChar", 
"fldLock", "true");
+}
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-19 Thread Eilidh McAdam

 writerfilter/source/dmapper/DomainMapper.cxx  |4 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   76 --
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |7 +
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |9 ++
 writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |1 
 writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx|   20 
 writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx|   14 +++
 writerfilter/source/ooxml/factoryimpl_ns.py   |8 +
 writerfilter/source/ooxml/model.xml   |5 -
 9 files changed, 137 insertions(+), 7 deletions(-)

New commits:
commit 8826934016d60d0a4a1e824e3f1cff814d915515
Author: Eilidh McAdam 
Date:   Wed Dec 10 03:50:10 2014 +

Support for docx import of fixed date and time fields.

If a field is fixed, mark it as such and parse value to seed it.
This is the other half of the docx filter improvement for fdo#59886.

Reviewed on:
https://gerrit.libreoffice.org/13431

Change-Id: Id00c454921cd386589e04b9572f4040898625a6f

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index ec5afab..2f0e43d 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2826,6 +2826,10 @@ void DomainMapper::lcl_text(const sal_uInt8 * data_, 
size_t len)
 switch(*data_)
 {
 case 0x02: return; //footnote character
+case 0x08: // Lock field if in field context
+if (m_pImpl->IsOpenField())
+m_pImpl->SetFieldLocked();
+return;
 case 0x0c: //page break
 m_pImpl->deferBreak(PAGE_BREAK);
 return;
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index d080ae8..a3694bd 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -161,6 +161,7 @@ DomainMapper_Impl::DomainMapper_Impl(
 m_xComponentContext( xContext ),
 m_bSetUserFieldContent( false ),
 m_bSetCitation( false ),
+m_bSetDateValue( false ),
 m_bIsFirstSection( true ),
 m_bIsColumnBreakDeferred( false ),
 m_bIsPageBreakDeferred( false ),
@@ -2588,6 +2589,13 @@ bool DomainMapper_Impl::IsOpenField() const
 return !m_aFieldStack.empty();
 }
 
+// Mark top field context as containing a fixed field
+void DomainMapper_Impl::SetFieldLocked()
+{
+if (IsOpenField())
+m_aFieldStack.top()->SetFieldLocked();
+}
+
 HeaderFooterContext::HeaderFooterContext(bool bTextInserted)
 : m_bTextInserted(bTextInserted)
 {
@@ -2600,7 +2608,8 @@ bool HeaderFooterContext::getTextInserted()
 
 FieldContext::FieldContext(uno::Reference< text::XTextRange > const& xStart)
 : m_bFieldCommandCompleted(false)
-,m_xStartRange( xStart )
+, m_xStartRange( xStart )
+, m_bFieldLocked( false )
 {
 m_pProperties.reset(new PropertyMap());
 }
@@ -3399,6 +3408,7 @@ void DomainMapper_Impl::CloseFieldCommand()
 {
 m_bSetUserFieldContent = false;
 m_bSetCitation = false;
+m_bSetDateValue = false;
 FieldConversionMap_t aFieldConversionMap = lcl_GetFieldConversion();
 
 try
@@ -3509,10 +3519,19 @@ void DomainMapper_Impl::CloseFieldCommand()
 case FIELD_DATE:
 if (xFieldProperties.is())
 {
-//not fixed,
-xFieldProperties->setPropertyValue(
-rPropNameSupplier.GetName(PROP_IS_FIXED),
-uno::makeAny( false ));
+// Get field fixed property from the context handler
+if (pContext->IsFieldLocked())
+{
+xFieldProperties->setPropertyValue(
+rPropNameSupplier.GetName(PROP_IS_FIXED),
+uno::makeAny( true ));
+m_bSetDateValue = true;
+}
+else
+xFieldProperties->setPropertyValue(
+rPropNameSupplier.GetName(PROP_IS_FIXED),
+uno::makeAny( false ));
+
 xFieldProperties->setPropertyValue(
 rPropNameSupplier.GetName(PROP_IS_DATE),
 uno::makeAny( true ));
@@ -3902,7 +3921,16 @@ void DomainMapper_Impl::CloseFieldCommand()
 case FIELD_SYMBOL   : break;
 case FIELD_TEMPLATE: break;
 case FIELD_TIME :
+{
+if (pContext->IsFieldLocked())
+

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

2014-12-19 Thread Eilidh McAdam

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 3726737273e488ffab02f4a2dded5640521729cb
Author: Eilidh McAdam 
Date:   Tue Dec 9 19:55:18 2014 +

Small fix for docx date field format import.

The standard allows for arbitrary amounts of whitespace between
tokens. MSO outputs with a space between \@ and ", LO doesn't.
To account for this, any whitespace between these tokens is
stripped and parsing assumes a command looks like:
DATE \@"some format".

Change-Id: I2620780da3ee873af6f35e236c7c34a073aebe73
Reviewed-on: https://gerrit.libreoffice.org/13430
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 59fff49..d080ae8 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2159,8 +2159,13 @@ style::NumberingType::
 
 OUString lcl_ParseFormat( const OUString& rCommand )
 {
-//  The command looks like: " DATE \@ "dd  "
-return msfilter::util::findQuotedText(rCommand, "\\@ \"", '\"');
+//  The command looks like: " DATE \@"dd  "
+//  Remove whitespace permitted by standard between \@ and "
+sal_Int32 delimPos = rCommand.indexOf("\\@");
+sal_Int32 wsChars = rCommand.indexOf('\"') - delimPos - 2;
+OUString command = rCommand.replaceAt(delimPos+2, wsChars, "");
+
+return msfilter::util::findQuotedText(command, "\\@\"", '\"');
 }
 /*-
 extract a parameter (with or without quotes) between the command and the 
following backslash
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-19 Thread Eilidh McAdam

 sw/source/filter/ww8/docxattributeoutput.cxx |   16 +---
 sw/source/filter/ww8/ww8atr.cxx  |2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

New commits:
commit a072b3533f44730565f42b45cfd9f77f44f506a9
Author: Eilidh McAdam 
Date:   Tue Dec 9 19:53:56 2014 +

fdo#59886 export fixed date and time fields to docx.

Fixed date and time fields are supported in OOXML by adding the
attribute fldLock="true" to the fldChar element. This applies only
to the first instance of fldChar in a field (i.e. when fldCharType
is "begin").

Change-Id: Ibb84503b942ca20b53fe476e5006d64b2f3112e5
Reviewed-on: https://gerrit.libreoffice.org/13429
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 4386d5b..87c193b 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1443,9 +1443,19 @@ void DocxAttributeOutput::StartField_Impl( FieldInfos& 
rInfos, bool bWriteRun )
 else
 {
 // Write the field start
-m_pSerializer->startElementNS( XML_w, XML_fldChar,
-FSNS( XML_w, XML_fldCharType ), "begin",
-FSEND );
+if ( rInfos.pField && rInfos.pField->GetSubType() & FIXEDFLD )
+{
+m_pSerializer->startElementNS( XML_w, XML_fldChar,
+FSNS( XML_w, XML_fldCharType ), "begin",
+FSNS( XML_w, XML_fldLock ), "true",
+FSEND );
+}
+else
+{
+m_pSerializer->startElementNS( XML_w, XML_fldChar,
+FSNS( XML_w, XML_fldCharType ), "begin",
+FSEND );
+}
 
 if ( rInfos.pFieldmark )
 WriteFFData(  rInfos );
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 4b7907f..be73977 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2861,7 +2861,7 @@ void AttributeOutputBase::TextField( const SwFmtFld& 
rField )
 case RES_DATETIMEFLD:
 {
 OUString sStr;
-if (FIXEDFLD & nSubType || !GetExport().GetNumberFmt(*pFld, sStr))
+if (!GetExport().GetNumberFmt(*pFld, sStr))
 bWriteExpand = true;
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-19 Thread Eike Rathke

 i18npool/source/localedata/data/mos_BF.xml |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit c9473311b2b680acf6d4693db40ee86c696597f9
Author: Eike Rathke 
Date:   Fri Dec 19 17:36:29 2014 +0100

fdo#87466 update locale data for Moore Burkina Faso [mos-BF]

Change-Id: I66109a89a7aced1a4595825ee587a1844b6864e8
(cherry picked from commit aa27be0013efc91374f040b72350e490b3ac770f)

diff --git a/i18npool/source/localedata/data/mos_BF.xml 
b/i18npool/source/localedata/data/mos_BF.xml
index f6ba0ad..cd92389 100644
--- a/i18npool/source/localedata/data/mos_BF.xml
+++ b/i18npool/source/localedata/data/mos_BF.xml
@@ -232,12 +232,12 @@
 
   thu
   lam
-  lamussa
+  lamusa
 
 
   fri
   arz
-  arzuma
+  arzÅ©ma
 
 
   sat
@@ -344,11 +344,11 @@
   sÉ©da
   zÄ©ri
   yÊÊmdÃ£ pipi kis a tÃ£abo
-  yÊÊmda kis a tÃ£ab a yiib n soaba
-  yÊÊmda kis a tÃ£ab a tÃ£ab n soaba
-  yÊÊmda yaoolem kis a tÃ£ab soaba
-  kaare
-  rasÄ©ng kaare
+  yÊÊmdÃ£ kis a tÃ£ab a yiib n soaba
+  yÊÊmdÃ£ kis a tÃ£ab a tÃ£ab n soaba
+  yÊÊmdÃ£ yaoolem kis a tÃ£ab soaba
+  zugáº½
+  táº½ngre
   Kis a tÃ£ab 1
   Kis a tÃ£ab 2
   Kis a tÃ£ab 3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-19 Thread Tor Lillqvist

 external/icu/icu4c-android.patch |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c3e32b0fd7fecbacd05786de2cd8a3bff97ce2b6
Author: Tor Lillqvist 
Date:   Fri Dec 19 18:40:09 2014 +0200

Make icu4c-android.patch apply again

Change-Id: I98d9fecb0f44b0b4354029bab1a5d675e98edd1f

diff --git a/external/icu/icu4c-android.patch b/external/icu/icu4c-android.patch
index ce8c8b4..0b320a8 100644
--- a/external/icu/icu4c-android.patch
+++ b/external/icu/icu4c-android.patch
@@ -17,9 +17,9 @@
fi ;;
 -*-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu) 
icu_cv_host_frag=mh-linux ;;
 +*-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu|*-*-*-androideabi*) 
icu_cv_host_frag=mh-linux ;;
- *-*-cygwin|*-*-mingw32|*-*-mingw64)
+ i[34567]86-*-cygwin)
if test "$GCC" = yes; then
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+   icu_cv_host_frag=mh-cygwin
 @@ -6032,6 +6032,10 @@
  # Check to see if genccode can generate simple assembly.
  GENCCODE_ASSEMBLY=
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-19 Thread Eike Rathke

 i18npool/source/localedata/data/mos_BF.xml |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit aa27be0013efc91374f040b72350e490b3ac770f
Author: Eike Rathke 
Date:   Fri Dec 19 17:36:29 2014 +0100

fdo#87466 update locale data for Moore Burkina Faso [mos-BF]

Change-Id: I66109a89a7aced1a4595825ee587a1844b6864e8

diff --git a/i18npool/source/localedata/data/mos_BF.xml 
b/i18npool/source/localedata/data/mos_BF.xml
index f6ba0ad..cd92389 100644
--- a/i18npool/source/localedata/data/mos_BF.xml
+++ b/i18npool/source/localedata/data/mos_BF.xml
@@ -232,12 +232,12 @@
 
   thu
   lam
-  lamussa
+  lamusa
 
 
   fri
   arz
-  arzuma
+  arzÅ©ma
 
 
   sat
@@ -344,11 +344,11 @@
   sÉ©da
   zÄ©ri
   yÊÊmdÃ£ pipi kis a tÃ£abo
-  yÊÊmda kis a tÃ£ab a yiib n soaba
-  yÊÊmda kis a tÃ£ab a tÃ£ab n soaba
-  yÊÊmda yaoolem kis a tÃ£ab soaba
-  kaare
-  rasÄ©ng kaare
+  yÊÊmdÃ£ kis a tÃ£ab a yiib n soaba
+  yÊÊmdÃ£ kis a tÃ£ab a tÃ£ab n soaba
+  yÊÊmdÃ£ yaoolem kis a tÃ£ab soaba
+  zugáº½
+  táº½ngre
   Kis a tÃ£ab 1
   Kis a tÃ£ab 2
   Kis a tÃ£ab 3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-19 Thread Tor Lillqvist

 formula/source/core/api/FormulaCompiler.cxx |   11 ---
 formula/source/core/api/token.cxx   |8 +---
 include/formula/tokenarray.hxx  |3 ---
 sc/source/core/tool/compiler.cxx|3 +--
 sc/source/core/tool/token.cxx   |2 --
 5 files changed, 2 insertions(+), 25 deletions(-)

New commits:
commit 9adb00cf4df13e6f251c0ff5f71bce5ca2c7525d
Author: Tor Lillqvist 
Date:   Fri Dec 19 15:44:32 2014 +0200

The value of the nRefs field is not used anywhere

Change-Id: I9116611d04846af7f00cb366e9174fd99e741d5c

diff --git a/formula/source/core/api/FormulaCompiler.cxx 
b/formula/source/core/api/FormulaCompiler.cxx
index 9b7da1a..cda306e 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1108,14 +1108,6 @@ bool FormulaCompiler::GetToken()
 {
 return HandleDbData();
 }
-else if( mpToken->GetType() == svSingleRef )
-{
-pArr->nRefs++;
-}
-else if( mpToken->GetType() == svDoubleRef )
-{
-pArr->nRefs++;
-}
 return true;
 }
 
@@ -1636,7 +1628,6 @@ bool FormulaCompiler::MergeRangeReference( FormulaToken * 
* const pCode1, Formul
 p2->DecRef();
 *pCode1 = p.get();
 --pCode, --pc;
-pArr->nRefs--;
 
 return true;
 }
@@ -1652,7 +1643,6 @@ bool FormulaCompiler::CompileTokenArray()
 aCorrectedFormula.clear();
 aCorrectedSymbol.clear();
 }
-pArr->nRefs = 0;// count from start
 pArr->DelRPN();
 pStack = NULL;
 FormulaToken* pData[ FORMULA_MAXTOKENS ];
@@ -1708,7 +1698,6 @@ void FormulaCompiler::PopTokenArray()
 {
 FormulaArrayStack* p = pStack;
 pStack = p->pNext;
-p->pArr->nRefs = sal::static_int_cast( p->pArr->nRefs + 
pArr->nRefs );
 // obtain special RecalcMode from SharedFormula
 if ( pArr->IsRecalcModeAlways() )
 p->pArr->SetExclusiveRecalcModeAlways();
diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index fe7b113..1824c7a 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -695,7 +695,6 @@ FormulaTokenArray::FormulaTokenArray() :
 nRPN(0),
 nIndex(0),
 nError(0),
-nRefs(0),
 nMode(RECALCMODE_NORMAL),
 bHyperLink(false)
 {
@@ -717,7 +716,6 @@ void FormulaTokenArray::Assign( const FormulaTokenArray& r )
 nRPN   = r.nRPN;
 nIndex = r.nIndex;
 nError = r.nError;
-nRefs  = r.nRefs;
 nMode  = r.nMode;
 bHyperLink = r.bHyperLink;
 pCode  = NULL;
@@ -769,7 +767,6 @@ FormulaTokenArray* FormulaTokenArray::Clone() const
 FormulaTokenArray* p = new FormulaTokenArray;
 p->nLen = nLen;
 p->nRPN = nRPN;
-p->nRefs = nRefs;
 p->nMode = nMode;
 p->nError = nError;
 p->bHyperLink = bHyperLink;
@@ -828,7 +825,7 @@ void FormulaTokenArray::Clear()
 delete [] pCode;
 }
 pCode = NULL; pRPN = NULL;
-nError = nLen = nIndex = nRPN = nRefs = 0;
+nError = nLen = nIndex = nRPN = 0;
 bHyperLink = false;
 ClearRecalcMode();
 }
@@ -856,9 +853,6 @@ FormulaToken* FormulaTokenArray::Add( FormulaToken* t )
 {
 CheckToken(*t);
 pCode[ nLen++ ] = t;
-if( t->GetOpCode() == ocPush
-&& ( t->GetType() == svSingleRef || t->GetType() == svDoubleRef ) )
-nRefs++;
 t->IncRef();
 if( t->GetOpCode() == ocArrayClose )
 return MergeArray();
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx
index ceb8425..043e349 100644
--- a/include/formula/tokenarray.hxx
+++ b/include/formula/tokenarray.hxx
@@ -103,7 +103,6 @@ protected:
 sal_uInt16  nRPN;   // Length of RPN array
 sal_uInt16  nIndex; // Current step index
 sal_uInt16  nError; // Error code
-short   nRefs;  // Count of cell references
 ScRecalcModenMode;  // Flags to indicate when to 
recalc this code
 boolbHyperLink; // If HYPERLINK() occurs in the 
formula.
 
@@ -176,8 +175,6 @@ public:
 void  Reset(){ nIndex = 0; }
 sal_uInt16GetCodeError() const  { return nError; }
 void  SetCodeError( sal_uInt16 n )  { nError = n; }
-short GetRefs()  const { return nRefs;  }
-void  IncrementRefs() { ++nRefs; }
 void  SetHyperLink( bool bVal ) { bHyperLink = bVal; }
 bool  IsHyperLink() const   { return bHyperLink; }
 
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index fbf8fb9..0c273b3 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -4000,8 +4000,7 @@ bool ScCompiler::HandleExternalReference(const 
FormulaToken& _aToken)
 {
 case svExternalSingleRef:
 case svExternalDoubleRef:
-

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

2014-12-19 Thread Miklos Vajna

 sw/qa/extras/ooxmlexport/data/decimal-numbering-no-leveltext.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |7 +++
 sw/qa/extras/rtfimport/rtfimport.cxx  |5 ++
 sw/source/filter/ww8/docxattributeoutput.cxx  |7 +++
 writerfilter/source/dmapper/NumberingManager.cxx  |   19 
++
 writerfilter/source/ooxml/OOXMLParserState.hxx|4 --
 6 files changed, 36 insertions(+), 6 deletions(-)

New commits:
commit e155e05ab70f1744d296dbee8c61564a5b7d346c
Author: Miklos Vajna 
Date:   Fri Dec 19 16:26:59 2014 +0100

DOCX filter: handle decimal number format with no level text correctly

The first problem was that no level text means no list text in Word, but
Writer only does that for the "none" numbering format.

Also, when the numbering format is "none", then Writer doesn't show the
follow character (typically a tab), either, but Word does: add a zero
width space as a suffix to mimic the Word behavior on DOCX import.

Adapt CppunitTest_sw_rtfimport accordingly, that effectively tested that
LabelFollowedBy is lost on import.

Change-Id: I7d5c7e62ba3d02da4a750ba5afad07e68b0b8c38

diff --git a/sw/qa/extras/ooxmlexport/data/decimal-numbering-no-leveltext.docx 
b/sw/qa/extras/ooxmlexport/data/decimal-numbering-no-leveltext.docx
new file mode 100644
index 000..d7ec479
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/decimal-numbering-no-leveltext.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 89ead20..c65e546 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -99,6 +99,13 @@ DECLARE_OOXMLEXPORT_TEST(testfdo76589 , "fdo76589.docx")
 assertXPath ( pXmlDoc, 
"/w:numbering/w:abstractNum[1]/w:lvl[1]/w:lvlText","val","%1" );
 }
 
+DECLARE_OOXMLEXPORT_TEST(testDecimalNumberingNoLeveltext, 
"decimal-numbering-no-leveltext.docx")
+{
+// This was "%1", not empty: we turned a kind-of-none numbering into a 
decimal one.
+if (xmlDocPtr pXmlDoc = parseExport("word/numbering.xml"))
+assertXPath (pXmlDoc, 
"/w:numbering/w:abstractNum[1]/w:lvl[1]/w:lvlText","val", "");
+}
+
 DECLARE_OOXMLEXPORT_TEST(testfdo79008, "fdo79008.docx")
 {
 /* File getting crash while saving in LO.
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 0e651d0..4a07fd0 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -582,7 +582,10 @@ DECLARE_RTFIMPORT_TEST(testFdo49692, "fdo49692.rtf")
 const beans::PropertyValue& rProp = aProps[i];
 
 if (rProp.Name == "Suffix")
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0), 
rProp.Value.get().getLength());
+{
+OUString aExpected(static_cast(0x200B));
+CPPUNIT_ASSERT_EQUAL(aExpected, rProp.Value.get());
+}
 }
 }
 
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index b45371b..4386d5b 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -5955,7 +5955,12 @@ void DocxAttributeOutput::NumberingLevel( sal_uInt8 
nLevel,
 }
 else
 {
-m_pSerializer->singleElementNS( XML_w, XML_lvlText,FSNS( XML_w, 
XML_val ), OUStringToOString( aBuffer.makeStringAndClear(), 
RTL_TEXTENCODING_UTF8 ).getStr(), FSEND );
+// Writer's "zero width space" suffix is necessary, so that 
LabelFollowedBy shows up, but Word doesn't require that.
+OUString aLevelText = aBuffer.makeStringAndClear();
+static OUString aZeroWidthSpace(static_cast(0x200B));
+if (aLevelText == aZeroWidthSpace)
+aLevelText.clear();
+m_pSerializer->singleElementNS(XML_w, XML_lvlText, FSNS(XML_w, 
XML_val), aLevelText.toUtf8(), FSEND);
 }
 
 // bullet
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx 
b/writerfilter/source/dmapper/NumberingManager.cxx
index 0a1c52f..cae1b6a 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -33,6 +33,7 @@
 
 #include 
 #include 
+#include 
 
 #include "dmapperLoggers.hxx"
 
@@ -273,6 +274,10 @@ uno::Sequence< beans::PropertyValue > 
ListLevel::GetLevelProperties( )
 {
 if (!m_sGraphicURL.isEmpty() || m_sGraphicBitmap.is())
 nNumberFormat = style::NumberingType::BITMAP;
+else if (m_sBulletChar.isEmpty() && nNumberFormat != 
style::NumberingType::CHAR_SPECIAL)
+// w:lvlText is empty, that means no numbering in Word.
+// CHAR_SPECIAL is handled separately below.
+nNumberFormat = style::NumberingType::NUMBER_NONE;
 aNumberingProperties.push_back( MAKE_PROPVAL(PROP_NUMBERING_TYPE, 
nNumberFormat ));
 }
 
@@ -619,6 +62

[Libreoffice-commits] core.git: 3 commits - sal/rtl unoidl/source

2014-12-19 Thread Stephan Bergmann

 sal/rtl/string.cxx|3 +++
 sal/rtl/strtmpl.cxx   |   32 
 sal/rtl/ustring.cxx   |9 -
 unoidl/source/sourceprovider-parser.y |4 ++--
 4 files changed, 21 insertions(+), 27 deletions(-)

New commits:
commit c54c276d09dae5472363fd433fe64c8424608e90
Author: Stephan Bergmann 
Date:   Fri Dec 19 17:19:28 2014 +0100

unoidl: Use appropriate OUString functions on string constants

Change-Id: I6ff256e091770d67f98b1b6b8d447a22fd720d4e

diff --git a/unoidl/source/sourceprovider-parser.y 
b/unoidl/source/sourceprovider-parser.y
index 133f131..de3f8e9 100644
--- a/unoidl/source/sourceprovider-parser.y
+++ b/unoidl/source/sourceprovider-parser.y
@@ -135,7 +135,7 @@ void convertToCurrentName(
 
 void clearCurrentState(unoidl::detail::SourceProviderScannerData * data) {
 assert(data != 0);
-data->currentName = "";
+data->currentName.clear();
 data->publishedContext = false;
 }
 
@@ -542,7 +542,7 @@ Found findEntity(
 break;
 }
 n = "." + typeNucleus;
-typeNucleus = "",
+typeNucleus.clear();
 e = findEntity_(data, &n);
 continue;
 }
commit 2171c3dd49694b4928b0a04b76d3c42a2b18f6cc
Author: Stephan Bergmann 
Date:   Fri Dec 19 15:44:25 2014 +0100

Assert ASCII precond of rtl_uString_newFromAscii/Literal

...and there is no reason for such a precond for rtl_string_newFromLiteral

Change-Id: I27f7217c8db17cef860c37886d0f7e561dc852f8

diff --git a/sal/rtl/strtmpl.cxx b/sal/rtl/strtmpl.cxx
index 07258b6..1a1e74f 100644
--- a/sal/rtl/strtmpl.cxx
+++ b/sal/rtl/strtmpl.cxx
@@ -1374,9 +1374,9 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newFromLiteral )( 
IMPL_RTL_STRINGDATA** ppThi
 sal_Int32 nCount;
 for( nCount = nLen; nCount > 0; --nCount )
 {
-/* Check ASCII range */
-SAL_WARN_IF( ((unsigned char)*pCharStr) > 127, "rtl.string",
-"rtl_uString_newFromLiteral - Found char > 127" );
+#if IMPL_RTL_IS_USTRING
+assert(static_cast(*pCharStr) < 0x80); // ASCII range
+#endif
 SAL_WARN_IF( ((unsigned char)*pCharStr) == '\0', "rtl.string",
 "rtl_uString_newFromLiteral - Found embedded \\0 
character" );
 
diff --git a/sal/rtl/ustring.cxx b/sal/rtl/ustring.cxx
index 26aa5d9..0fc9e06 100644
--- a/sal/rtl/ustring.cxx
+++ b/sal/rtl/ustring.cxx
@@ -501,10 +501,7 @@ void SAL_CALL rtl_uString_newFromAscii( rtl_uString** 
ppThis,
 sal_Unicode* pBuffer = (*ppThis)->buffer;
 do
 {
-/* Check ASCII range */
-SAL_WARN_IF( ((unsigned char)*pCharStr) > 127, "rtl.string",
-"rtl_uString_newFromAscii - Found char > 127" );
-
+assert(static_cast(*pCharStr) < 0x80); // ASCII 
range
 *pBuffer = *pCharStr;
 pBuffer++;
 pCharStr++;
commit 80131c795f1f9e9fcfb5a85243fb8585b083f8b1
Author: Stephan Bergmann 
Date:   Fri Dec 19 15:36:50 2014 +0100

IMPL_RTL_INTERN -> IMPL_RTL_IS_USTRING

Change-Id: I9793f697f14118340bc6db89540fe50ad0b8ccbd

diff --git a/sal/rtl/string.cxx b/sal/rtl/string.cxx
index 07e3e94..259906c 100644
--- a/sal/rtl/string.cxx
+++ b/sal/rtl/string.cxx
@@ -55,6 +55,9 @@ static rtl_String const aImplEmpty_rtl_String =
  * the strtmpl.cxx just below, used to share code between here and
  * ustring.cxx
  */
+
+#define IMPL_RTL_IS_USTRING false
+
 #define IMPL_RTL_STRCODEsal_Char
 #define IMPL_RTL_USTRCODE( c )  ((unsigned char)c)
 #define IMPL_RTL_STRNAME( n )   rtl_str_ ## n
diff --git a/sal/rtl/strtmpl.cxx b/sal/rtl/strtmpl.cxx
index 71a2fb2..07258b6 100644
--- a/sal/rtl/strtmpl.cxx
+++ b/sal/rtl/strtmpl.cxx
@@ -62,8 +62,7 @@ static inline void rtl_str_ImplCopy( IMPL_RTL_STRCODE* _pDest,
 sal_Int32 SAL_CALL IMPL_RTL_STRNAME( getLength )( const IMPL_RTL_STRCODE* pStr 
)
 SAL_THROW_EXTERN_C()
 {
-// same as "if sal_Char mode"
-#ifndef IMPL_RTL_INTERN
+#if !IMPL_RTL_IS_USTRING
 // take advantage of builtin optimisations
 return strlen( pStr);
 #else
@@ -88,8 +87,7 @@ sal_Int32 SAL_CALL IMPL_RTL_STRNAME( compare )( const 
IMPL_RTL_STRCODE* pStr1,
 const IMPL_RTL_STRCODE* pStr2 )
 SAL_THROW_EXTERN_C()
 {
-// same as "if sal_Char mode"
-#ifndef IMPL_RTL_INTERN
+#if !IMPL_RTL_IS_USTRING
 // take advantage of builtin optimisations
 return strcmp( pStr1, pStr2);
 #else
@@ -122,8 +120,7 @@ sal_Int32 SAL_CALL IMPL_RTL_STRNAME( compare_WithLength )( 
const IMPL_RTL_STRCOD
sal_Int32 nStr2Len )
 SAL_THROW_EXTERN_C()
 {
-// same as "if sal_Char mode"
-#ifndef IMPL_RTL_INTERN
+#if !IMPL_RTL_IS_USTRING
 // take advantage of builtin optimisations
 sal_Int32 nMin = std::min(nStr1Len, nStr2

Re: problem with .odt file

2014-12-19 Thread Eike Rathke

Hi Terrence,

On Friday, 2014-12-19 10:22:20 -0500, Terrence Enger wrote:

> > I don't know what's wrong with this file. It is prduceed by a php-script.
> 
> The odf validator at  reports 60
> errors.  Fixing those is probably the right place to start.

At the validator you need to select 1.2 extended conforming instead of
auto-detect to make it handle the extension namespaces. If done so,
there's no error.

> > Opening with libreoffice reports an error and offers thr repair.

I can load the document without any problem in 4-4 and 4.3.5 and 4.2.8

But, if that is really produced by a php script, the 
element certainly should not contain any LibreOffice version..

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

Re: tubes/source/conference.cxx:251:79: error: 'OSL_ENSURE' was not declared in this scope

2014-12-19 Thread Eike Rathke

Hi ungifted,

On Thursday, 2014-12-18 22:56:24 +0300, ungifted wrote:

> I found I should report build issues into this maillist. Ok.
> 
> Trying to build LibreOffice-4.4. on my Gentoo and got subj.

First thing you should do is not enable tubes in your build, remove the
--enable-telepathy option from the autogen.sh call. That is an highly
experimental framework not benefitting anyone except developers who want
to work on it.

> With this patch I can at least build it now.
> 
> +#include 

Thanks anyway for the heads-up, the proper solution would be to convert
the old OSL_ENSURE() macro calls to SAL_WARN_IF() and include
sal/log.hxx for that and add a proper section to
include/sal/log-areas.dox

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

Re: Writer : Undo problem(Japanese IME)

2014-12-19 Thread Naruhiko Ogasawara

Hi Hidemune, *

Some additional information:

1. To make the bug be tracked easier, I filed the bug:
https://www.libreoffice.org/bugzilla/show_bug.cgi?id=87500

2.  in Japaese ML:
http://listarchives.libreoffice.org/ja/discuss/msg03302.html
Hidemune said that BreakIteratorImpl::nextCharacters() handle
the last control code incorrectly in Japanese Windows environment,
and there are several code to call BreakIteratorImpl::nextCharacters()
same way.

If so, I think we should be correct BreakIteratorImpl::nextCharacters()
(or its subclasses) instead of SwBreakIt::getGraphemeCount().

How do you think?

That's because the patch is in the ML, not in Gerrit.


Regards,

2014-12-18 20:26 GMT+09:00 TANAKA H&Y :
> Hello,
>
> The bug is in the Writer (Windows7 64bit).
>
> 1. After the English input, I was a Japanese input.
> 2. I have run several times Undo.
> 3. Then, Writer was hung up.
>
> I was confirmed to work correctly when applying the following patch.
>
>
> diff --git a/sw/source/core/bastyp/breakit.cxx
> b/sw/source/core/bastyp/breakit.cxx
> index bf468b9..55f3dec 100644
> --- a/sw/source/core/bastyp/breakit.cxx
> +++ b/sw/source/core/bastyp/breakit.cxx
> @@ -191,8 +191,11 @@ sal_Int32 SwBreakIt::getGraphemeCount(const
> OUString& rText,
>  else
>  {
>  sal_Int32 nCount2 = 1;
> +sal_Int32 nPosOld = nCurPos;
>  nCurPos = xBreak->nextCharacters(rText, nCurPos,
> lang::Locale(),
>  i18n::CharacterIteratorMode::SKIPCELL, nCount2, nCount2);
> +if (nPosOld == nCurPos)
> +break;
>  }
>  ++nGraphemeCount;
>  }
>
>
>
> Best regards,
>
> TANAKA Hidemune
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice



-- 
Naruhiko Ogasawara (naru...@gmail.com)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: problem with .odt file

2014-12-19 Thread Terrence Enger

On Wed, 2014-12-17 at 18:33 +0100, Dieter Naujoks wrote:
> Hello!
> 

Hello,

> I don't know what's wrong with this file. It is prduceed by a php-script.

The odf validator at  reports 60
errors.  Fixing those is probably the right place to start.

> 
> Opening with libreoffice reports an error and offers thr repair.
> 
> Would you please tell me what's wrong?

You are more likeley to get the help you need in the libreoffice forum
at .

HTH,
Terry.

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

Re: libi18nlangtag crash on SunOS 5.11

2014-12-19 Thread Richard PALO

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Le 19/12/14 16:02, Eike Rathke a écrit :
> Hi Richard,
> 
> On Friday, 2014-12-19 14:18:36 +0100, Richard PALO wrote:
> 
>>> warn:vcl:101172:1:vcl/generic/fontmanager/fontconfig.cxx:868: In glyph 
>>> fallback 
>>> throwing away the language property of en because the detected script for 
>>> '0x9f
>>> 3' is Bengali and that language doesn't make sense. Autodetecting instead.
> 
> That warning is only indirectly related because something may trigger
> initialization of liblangtag for an unknown locale value, I've seen it
> without any crash. Adapted subject..
> 
>> My locale is fr_FR.UTF-8 on SunOS 5.11 under pkgsrc.
>>
>> it's coring with:
>>  sigmask = 0xbefc,0x,0x01ff
>>  cursig = SIGSEGV
>>
>> Coredump indicates:
>>> 08045fb8 libi18nlangtag.so`LiblantagDataRef::setup+0x4c(fe5b5bdc, fe5b5bdc, 
>>> fe5b5a1c, 804605c)
>>> 08046128 libi18nlangtag.so`LanguageTagImpl::canonicalize+0x784(e34a900, 0, 
>>> fe59b58b, fe5b28bc)
> 
> That is the actual top of the backtrace?
> There isn't much in i18nlangtag/source/languagetag/languagetag.cxx
> LiblantagDataRef::setup() that could go wrong. The only thing that comes
> to mind is that LiblantagDataRef is a static instance initialized with
> 
> namespace {
> struct theDataRef : public rtl::Static< LiblantagDataRef, theDataRef > {};
> }
> 
> which for some reason may not work on SunOS / your compiler combination.
> As probably no one is using that here, you'd have to break in
> LanguageTagImpl::canonicalize() line 1204 where
> theDataRef::get().incRef() is called (or in the
> LiblantagDataRef::incRef() inline) and investigate what actually happens
> the very first time when the incRef() calls setup()
> 
> Other than that maybe the lt_db_initialize() call misbehaves, but since
> that is not in the backtrace..
> 
> However, only a step-through could provide insights.
> 
>   Eike
> 

Okay, thanks.  I'm building now an upgrade to 4.3.5.2 and will attempt to see 
more in 
the suggested areas. (I too noticed I'd be wasting my time in fontconfig, hence 
my post:)

For info, build is with gcc4.9.2 and the back trace comes from 'mdb' on the 
core file 
with c++ demangling turned on.

cheers
-BEGIN PGP SIGNATURE-
Version: GnuPG v1
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQEcBAEBAgAGBQJUlEHYAAoJECAB22fHtp27V90H+gIPADtnj4ZPmEIyT00SLjJL
xob8DpRcllcNzk3nd9blPqC0EMF5cIz86d4iz/Ryeek+HEEYkwDQrNAdnNTSizzK
o1XG3cX+wpvE5j4upvivs+Wa4cTNYT5jwAmJIjRtNGFG50oYWvYouvQzWZyO0COP
jT2ZLszVIwH+BFafztsOJD6SbZl+d/CJk1PAGZaVmNzSYaZTGCflzbMRm0QFsm8Z
55n1HAL3ImI5P6r2yzOFlTRqXaw5nPsmDJCPHLGrtuc+F3OXQZS0II/v65zw1JFr
DvQRaIdXevVloYyvFJZtPmbhjEWRhsf584ejrkgoOnvqBKp1R46LEIrrtWdC1Dw=
=se6a
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

libi18nlangtag crash on SunOS 5.11 (was: In glyph fallback throwing away the language property of en because the detected script for '0x9f3' is Bengali and that language doesn't make sense....)

2014-12-19 Thread Eike Rathke

Hi Richard,

On Friday, 2014-12-19 14:18:36 +0100, Richard PALO wrote:

> > warn:vcl:101172:1:vcl/generic/fontmanager/fontconfig.cxx:868: In glyph 
> > fallback 
> > throwing away the language property of en because the detected script for 
> > '0x9f
> > 3' is Bengali and that language doesn't make sense. Autodetecting instead.

That warning is only indirectly related because something may trigger
initialization of liblangtag for an unknown locale value, I've seen it
without any crash. Adapted subject..

> My locale is fr_FR.UTF-8 on SunOS 5.11 under pkgsrc.
> 
> it's coring with:
>   sigmask = 0xbefc,0x,0x01ff
>   cursig = SIGSEGV
> 
> Coredump indicates:
> > 08045fb8 libi18nlangtag.so`LiblantagDataRef::setup+0x4c(fe5b5bdc, fe5b5bdc, 
> > fe5b5a1c, 804605c)
> > 08046128 libi18nlangtag.so`LanguageTagImpl::canonicalize+0x784(e34a900, 0, 
> > fe59b58b, fe5b28bc)

That is the actual top of the backtrace?
There isn't much in i18nlangtag/source/languagetag/languagetag.cxx
LiblantagDataRef::setup() that could go wrong. The only thing that comes
to mind is that LiblantagDataRef is a static instance initialized with

namespace {
struct theDataRef : public rtl::Static< LiblantagDataRef, theDataRef > {};
}

which for some reason may not work on SunOS / your compiler combination.
As probably no one is using that here, you'd have to break in
LanguageTagImpl::canonicalize() line 1204 where
theDataRef::get().incRef() is called (or in the
LiblantagDataRef::incRef() inline) and investigate what actually happens
the very first time when the incRef() calls setup()

Other than that maybe the lt_db_initialize() call misbehaves, but since
that is not in the backtrace..

However, only a step-through could provide insights.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack

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

Writer : Undo problem(Japanese IME)

2014-12-19 Thread

Hello,

The bug is in the Writer (Windows7 64bit).

1. After the English input, I was a Japanese input.
2. I have run several times Undo.
3. Then, Writer was hung up.

I was confirmed to work correctly when applying the following patch.


diff --git a/sw/source/core/bastyp/breakit.cxx
b/sw/source/core/bastyp/breakit.cxx
index bf468b9..55f3dec 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -191,8 +191,11 @@ sal_Int32 SwBreakIt::getGraphemeCount(const
OUString& rText,
 else
 {
 sal_Int32 nCount2 = 1;
+sal_Int32 nPosOld = nCurPos;
 nCurPos = xBreak->nextCharacters(rText, nCurPos,
lang::Locale(),
 i18n::CharacterIteratorMode::SKIPCELL, nCount2, nCount2);
+if (nPosOld == nCurPos)
+break;
 }
 ++nGraphemeCount;
 }



Best regards,

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

problem with .odt file

2014-12-19 Thread Dieter Naujoks

Hello!

I don't know what's wrong with this file. It is prduceed by a php-script.

Opening with libreoffice reports an error and offers thr repair.

Would you please tell me what's wrong?


Thanks

Dieter

1.odt
Description: application/vnd.oasis.opendocument.text
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

undefined reference to non-virtual thunk

2014-12-19 Thread Kostas Tamateas


Hello everyone,

I'm trying to build libreoffice-4.3.41 sources.
My system is a Debian distribution 32-bit with gcc 4.9.1 and my configure is 
this:

./autogen.sh --enable-release-build --enable-mergelibs=yes --without-java 
--without-junit --without-doxygen --disable-gconf --disable-firebird-sdbc 
--disable-postgresql-sdbc --disable-collada --disable-dbus --disable-gtk 
--disable-randr --disable-gltf --disable-liblangtag --disable-gstreamer 
--disable-kdeab --disable-tdeab  --disable-systray --disable-coinmp 
--disable-lpsolve --disable-sdremote --disable-cve-tests --disable-orcus 
--disable-graphite --disable-odk --disable-cups --with-system-libs 
--without-boost-date-time --without-boost-iostreams --disable-pdfimport 
--disable-opengl --disable-opencl --disable-gstreamer-0-10 --with-webdav=neon

After long time I get this message:

/libreoffice-4.3.4.1/workdir/CxxObject/svx/source/fmcomp/fmgridif.o:
In function 
`FmXGridControl::createPeer(com::sun::star::uno::Reference 
const&, com::sun::star::uno::Reference const&)':
fmgridif.cxx:(.text+0x87dc): undefined reference to `non-virtual thunk to 
WindowListenerMultiplexer::acquire()'
fmgridif.cxx:(.text+0x8837): undefined reference to `non-virtual thunk to 
FocusListenerMultiplexer::acquire()'
fmgridif.cxx:(.text+0x8892): undefined reference to `non-virtual thunk to 
KeyListenerMultiplexer::acquire()'
fmgridif.cxx:(.text+0x88ed): undefined reference to `non-virtual thunk to 
MouseListenerMultiplexer::acquire()'
fmgridif.cxx:(.text+0x8948): undefined reference to `non-virtual thunk to 
MouseMotionListenerMultiplexer::acquire()'
fmgridif.cxx:(.text+0x89a3): undefined reference to `non-virtual thunk to 
PaintListenerMultiplexer::acquire()'
collect2: error: ld returned 1 exit status

Is a possible way to fix that problem ?

--

*Με εκτίμηση* *,*


*Κώστας Ταματέας *
iNODE Systems Engineer

Σταθερό: +30 *2310953953
*
 




*Dataways A.E. *
Κανάρη 75, 544 53 Θεσσαλονίκη



Think before using ink.

_ΓΝΩΣΤΟΠΟΙΗΣΗ - ΔΗΛΩΣΗ ΠΡΟΣ ΤΟΥΣ ΠΑΡΑΛΗΠΤΕΣ_Αυτό το μήνυμα περιέχει 
εμπιστευτικές και απόρρητες πληροφορίες. Σε περίπτωση που περιέλθει σε 
σας από λάθος χωρίς να είσθε ο σκοπούμενος παραλήπτης, παρακαλούμε να το 
διαγράψετε άμεσα από το σύστημά σας και να ειδοποιήσετε τον αποστολέα. Η 
αντιγραφή, χρήση ή κοινοποίηση σε τρίτους του μηνύματος αυτού από μη 
κατονομαζόμενο παραλήπτη, αντίκειται στο νόμο. Το Internet δεν είναι 
ασφαλές περιβάλλον και ο αποστολέας δεν θα ευθύνεται για οποιαδήποτε 
απώλεια δεδομένων ή άλλη ζημία του παραλήπτη ή τρίτων, οφειλόμενη είτε 
σε χρήση είτε σε καθυστερημένη διαβίβαση, υποκλοπή, αλλοίωση ή μόλυνση 
με ιούς του παρόντος μηνύματος. Στον παραλήπτη εναπόκειται αποκλειστικά 
η ευθύνη για προστασία του συστήματός του από ιούς και για επιβεβαίωση 
του περιεχομένου του παρόντος.


Αυτό το μήνυμα έχει ελεγχθεί από το σύστημα iNODE  ™ 
Email Content Filtering και είναι καθαρό από γνωστούς ιούς.




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

Re: UI dialogs left over

2014-12-19 Thread Olivier Hallot

Hi

On 17/12/2014 13:02, Caolán McNamara wrote:
> On Wed, 2014-12-17 at 11:55 -0200, Olivier Hallot wrote:
>> Hi ESC, Caolán, Bubli
>>
>> I found a dialog in old format in extensions/
>>
>> extensions/source/propctrlr/browserpage.cxx
>>
>> AFAIk, this page is used in Basic IDE and in form controls, as in
>>
>> https://bugs.freedesktop.org/attachment.cgi?id=110771
>>
>> Question is: Given that this dialog is dynamically constructed line by
>> line depending on the nature of the control, does it makes sense to
>> refactor many classes there to convert the dialog to widgets UI?
> 
> Hard to tell, as far as I can tell its all hard-coded logic to manage
> that one and no .src files. Personally I don't think I'll be converting
> that to .ui
> 
> C.
> 
OK Thanks Caolán... I touched this dialog because there is a hard coded
ellipsis in the buttons that could be better for the UI if changed to
the proper action beneath it. But if that implies in a big refactor, I
will let it as is.

kind regards
-- 
Olivier Hallot
Comunidade LibreOffice
http://ask.libreoffice.org/pt-br
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

tubes/source/conference.cxx:251:79: error: 'OSL_ENSURE' was not declared in this scope

2014-12-19 Thread ungifted

Hi

I found I should report build issues into this maillist. Ok.

Trying to build LibreOffice-4.4. on my Gentoo and got subj.

With this patch I can at least build it now.

--- tubes/source/conference.cxx 2014-12-17 18:06:37.473426509 +0300
+++ tubes/source2/conference.cxx2014-12-17 18:04:20.0 +0300
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */

+#include 
+
 #include 

 #include 


Please look
Thanks


/var/tmp/portage/app-office/libreoffice-4.4./work/libreoffice-4.4./tubes/source/conference.cxx:
 In member function 'void TeleConference::setChannel(TpAccount*, TpDBusTubeCh
annel*)':
/var/tmp/portage/app-office/libreoffice-4.4./work/libreoffice-4.4./tubes/source/conference.cxx:251:79:
 error: 'OSL_ENSURE' was not declared in this scope
 OSL_ENSURE( !mpChannel, "TeleConference::setChannel: already have 
channel");
   ^
/var/tmp/portage/app-office/libreoffice-4.4./work/libreoffice-4.4./tubes/source/conference.cxx:
 In member function 'bool TeleConference::offerTube()':
/var/tmp/portage/app-office/libreoffice-4.4./work/libreoffice-4.4./tubes/source/conference.cxx:300:67:
 error: 'OSL_ENSURE' was not declared in this scope
 OSL_ENSURE( mpChannel, "TeleConference::offerTube: no channel");
   ^
/var/tmp/portage/app-office/libreoffice-4.4./work/libreoffice-4.4./tubes/source/conference.cxx:
 In member function 'bool TeleConference::setTube(GDBusConnection*)':
/var/tmp/portage/app-office/libreoffice-4.4./work/libreoffice-4.4./tubes/source/conference.cxx:322:73:
 error: 'OSL_ENSURE' was not declared in this scope
 OSL_ENSURE( !pImpl->mpTube, "TeleConference::setTube: already tubed");
 ^
/var/tmp/portage/app-office/libreoffice-4.4./work/libreoffice-4.4./solenv/gbuild/LinkTarget.mk:189:
 recipe for target '/var/tmp/portage/app-office/libreoffice-4.4./work
/libreoffice-4.4./workdir/CxxObject/tubes/source/conference.o' failed
make[1]: *** 
[/var/tmp/portage/app-office/libreoffice-4.4./work/libreoffice-4.4./workdir/CxxObject/tubes/source/conference.o]
 Error 1
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: download page says "LibreOffice Fresh" when downloading 4.2.8

2014-12-19 Thread Robinson Tryon

On Fri, Dec 19, 2014 at 1:48 AM, Lionel Elie Mamane  wrote:
> We used to have a "www" component in bugzilla but it seems to have
> disappeared?

Infra moved website bugs to Redmine.

> From https://www.libreoffice.org/ click on "Download Now". This goes
> to https://www.libreoffice.org/download/libreoffice-fresh/
> There, click on "4.2.8" because you want LibreOffice Still, not
> LibreOffice Fresh. This goes to
> https://www.libreoffice.org/download/libreoffice-fresh/?type=deb-x86_64&version=4.2.8&lang=en-GB
> which still says (in big font) LibreOffice Fresh, but should say
> "LibreOffice Still". Or maybe "Custom Download" or "Archive Download"
> or something, but not "LibreOffice Fresh".

On the same page, here's the url given for 4.4.0:
https://www.libreoffice.org/download/libreoffice-fresh/?type=deb-x86_64&version=4.4.0&lang=en-US

Now if you go to the Still page
(https://www.libreoffice.org/download/libreoffice-still/), here are
the URLs provided for 4.3.5 and 4.4.0:
https://www.libreoffice.org/download/libreoffice-still/?type=deb-x86_64&version=4.3.5&lang=en-US
https://www.libreoffice.org/download/libreoffice-still/?type=deb-x86_64&version=4.4.0&lang=en-US

My guess is that both pages have the same underlying code and work
exactly the same way whenever a version # is passed-in.

Cheers,
--R

-- 
Robinson Tryon
QA Engineer - The Document Foundation
LibreOffice Community Outreach Herald
qu...@libreoffice.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

QA Meeting Minutes - 2014-12-17

2014-12-19 Thread Robinson Tryon

Hi all,

A big thanks to everyone for the great meeting yesterday!

Minutes and ACTION items are all here:
https://wiki.documentfoundation.org/QA/Meetings/2014/December_17#IRC_Minutes

Our next meeting is scheduled for December 31st, which is in the
middle of holiday season! Instead of canceling the meeting entirely,
we'll be having a totally-optional, totally-relaxed QA Holiday Party.
Feel free to bring a glass or bottle of your favorite drink and just
say hi:
https://wiki.documentfoundation.org/QA/Meetings/2014/December_31

If you need an excuse to slip away from your in-laws for a while, just
mumble something about 'mandatory meeting' to them and find a quiet
place to hop on IRC. We've got your back!

For those keeping track on their calendars, our next "legitimate"
meeting (and the first meeting of 2015) will be on January 14th.

Have a Happy Holidays everyone!

Best,
--R

P.S. I was very happy to be able to report to the ESC today that our
UNCONFIRMED count was at 497. You guys rock!

-- 
Robinson Tryon
QA Engineer - The Document Foundation
LibreOffice Community Outreach Herald
qu...@libreoffice.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-12-19 Thread Eike Rathke

 i18npool/source/localedata/data/pt_PT.xml |   24 
 1 file changed, 24 insertions(+)

New commits:
commit 9a2cb1f0d59d66063266c05ce71985db140f907c
Author: Eike Rathke 
Date:   Fri Dec 19 15:08:26 2014 +0100

add more date formats for [pt-PT]

Apparently commonly used, as suggested by SÃ©rgio Marques

Change-Id: I6cdbcd96034ec7bb04f364ec5747b069e32ec379
(cherry picked from commit 89de0181ffe2f94ea0b27bbd9da76bafa5ad1455)

diff --git a/i18npool/source/localedata/data/pt_PT.xml 
b/i18npool/source/localedata/data/pt_PT.xml
index 7503772..770c001 100644
--- a/i18npool/source/localedata/data/pt_PT.xml
+++ b/i18npool/source/localedata/data/pt_PT.xml
@@ -132,6 +132,30 @@
 
   DD-MMM-
 
+
+  -
+
+
+  MMM-
+
+
+  -AA
+
+
+  MMM-AA
+
+
+  D--
+
+
+  D--AA
+
+
+   "de" 
+
+
+  MMM "de" 
+
 
   HH:MM
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-19 Thread Eike Rathke

 i18npool/source/localedata/data/pt_PT.xml |   24 
 1 file changed, 24 insertions(+)

New commits:
commit 89de0181ffe2f94ea0b27bbd9da76bafa5ad1455
Author: Eike Rathke 
Date:   Fri Dec 19 15:08:26 2014 +0100

add more date formats for [pt-PT]

Apparently commonly used, as suggested by SÃ©rgio Marques

Change-Id: I6cdbcd96034ec7bb04f364ec5747b069e32ec379

diff --git a/i18npool/source/localedata/data/pt_PT.xml 
b/i18npool/source/localedata/data/pt_PT.xml
index 7503772..770c001 100644
--- a/i18npool/source/localedata/data/pt_PT.xml
+++ b/i18npool/source/localedata/data/pt_PT.xml
@@ -132,6 +132,30 @@
 
   DD-MMM-
 
+
+  -
+
+
+  MMM-
+
+
+  -AA
+
+
+  MMM-AA
+
+
+  D--
+
+
+  D--AA
+
+
+   "de" 
+
+
+  MMM "de" 
+
 
   HH:MM
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 39440] cppcheck cleanliness

2014-12-19 Thread bugzilla-daemon

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

--- Comment #38 from Commit Notification 
 ---
Michael Weghorn committed a patch related to this issue.
It has been pushed to "master":

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

fdo#39440 sal: reduce scope of local variables

It will be available in 4.5.0.

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: sal/osl sal/rtl sal/textenc sal/workben

2014-12-19 Thread Michael Weghorn

 sal/osl/unx/conditn.cxx |6 +---
 sal/osl/unx/nlsupport.cxx   |6 +---
 sal/osl/unx/pipe.cxx|   17 +
 sal/osl/unx/profile.cxx |   25 +++
 sal/osl/unx/signal.cxx  |   12 +
 sal/osl/unx/socket.cxx  |5 +--
 sal/osl/unx/system.cxx  |9 +++---
 sal/osl/w32/file_url.cxx|3 --
 sal/osl/w32/profile.cxx |   26 
 sal/rtl/cipher.cxx  |6 ++--
 sal/rtl/ustring.cxx |3 --
 sal/textenc/convertsimple.cxx   |3 --
 sal/textenc/tcvtbyte.cxx|6 +---
 sal/textenc/tcvtmb.cxx  |9 ++
 sal/workben/clipboardwben/testcopy/XTDataObject.cxx |3 +-
 sal/workben/testfile.cxx|   12 +++--
 16 files changed, 62 insertions(+), 89 deletions(-)

New commits:
commit 2ee336fb556ceb1d7e1ee8017c27539da7fe543b
Author: Michael Weghorn 
Date:   Fri Dec 19 11:07:02 2014 +0100

fdo#39440 sal: reduce scope of local variables

This addresses some cppcheck warnings.

Change-Id: Id5f90757571e76a2c05a4cbd37020e1f6a6b2033
Reviewed-on: https://gerrit.libreoffice.org/13544
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/sal/osl/unx/conditn.cxx b/sal/osl/unx/conditn.cxx
index 1ba0f84..91d80d7 100644
--- a/sal/osl/unx/conditn.cxx
+++ b/sal/osl/unx/conditn.cxx
@@ -87,13 +87,12 @@ oslCondition SAL_CALL osl_createCondition()
 void SAL_CALL osl_destroyCondition(oslCondition Condition)
 {
 oslConditionImpl* pCond;
-int nRet = 0;
 
 if ( Condition )
 {
 pCond = (oslConditionImpl*)Condition;
 
-nRet = pthread_cond_destroy(&pCond->m_Condition);
+int nRet = pthread_cond_destroy(&pCond->m_Condition);
 SAL_WARN_IF(
 nRet != 0, "sal.osl",
 "pthread_cond_destroy failed, errno " << nRet << ", \""
@@ -225,7 +224,6 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition 
Condition, const Time
 {
 if ( ! pCond->m_State )
 {
-int ret;
 struct timeval  tp;
 struct timespec to;
 
@@ -237,7 +235,7 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition 
Condition, const Time
 /* spurious wake up prevention */
 do
 {
-ret = pthread_cond_timedwait(&pCond->m_Condition, 
&pCond->m_Lock, &to);
+const int ret = pthread_cond_timedwait(&pCond->m_Condition, 
&pCond->m_Lock, &to);
 if ( ret != 0 )
 {
 if ( ret == ETIME || ret == ETIMEDOUT )
diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx
index 4afccaa..1fb6e02 100644
--- a/sal/osl/unx/nlsupport.cxx
+++ b/sal/osl/unx/nlsupport.cxx
@@ -65,8 +65,6 @@ _pair_search (const char *key, const _pair *base, unsigned 
int member )
 {
 unsigned int lower = 0;
 unsigned int upper = member;
-unsigned int current;
-int comparison;
 
 /* check for validity of input */
 if ( (key == NULL) || (base == NULL) || (member == 0) )
@@ -75,8 +73,8 @@ _pair_search (const char *key, const _pair *base, unsigned 
int member )
 /* binary search */
 while ( lower < upper )
 {
-current = (lower + upper) / 2;
-comparison = _pair_compare( key, base + current );
+const unsigned int current = (lower + upper) / 2;
+const int comparison = _pair_compare( key, base + current );
 if (comparison < 0)
 upper = current;
 else if (comparison > 0)
diff --git a/sal/osl/unx/pipe.cxx b/sal/osl/unx/pipe.cxx
index ecddb66..337d412 100644
--- a/sal/osl/unx/pipe.cxx
+++ b/sal/osl/unx/pipe.cxx
@@ -115,7 +115,6 @@ oslPipe SAL_CALL osl_createPipe(rtl_uString *ustrPipeName, 
oslPipeOptions Option
 {
 oslPipe pPipe=0;
 rtl_String* strPipeName=0;
-sal_Char* pszPipeName=0;
 
 if ( ustrPipeName != 0 )
 {
@@ -124,7 +123,7 @@ oslPipe SAL_CALL osl_createPipe(rtl_uString *ustrPipeName, 
oslPipeOptions Option
 rtl_uString_getLength(ustrPipeName),
 osl_getThreadTextEncoding(),
 OUSTRING_TO_OSTRING_CVTFLAGS );
-pszPipeName = rtl_string_getStr(strPipeName);
+sal_Char* pszPipeName = rtl_string_getStr(strPipeName);
 pPipe = osl_psz_createPipe(pszPipeName, Options, Security);
 
 if ( strPipeName != 0 )
@@ -364,11 +363,6 @@ void SAL_CALL osl_releasePipe( oslPipe pPipe )
 void SAL_CALL osl_closePipe( oslPipe pPipe )
 {
 int nRet;
-#if defined(LINUX)
-size_t len;
-struct sockaddr_un addr;
-int fd;
-#endif

[Bug 39440] cppcheck cleanliness

2014-12-19 Thread bugzilla-daemon

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

--- Comment #37 from Commit Notification 
 ---
Michael Weghorn committed a patch related to this issue.
It has been pushed to "master":

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

fdo#39440 rsc: reduce scope of local variables

It will be available in 4.5.0.

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

2014-12-19 Thread Michael Weghorn

 rsc/source/parser/rscdb.cxx |9 +++--
 rsc/source/prj/start.cxx|6 ++
 rsc/source/rsc/rsc.cxx  |6 ++
 rsc/source/tools/rscdef.cxx |   11 +++
 4 files changed, 10 insertions(+), 22 deletions(-)

New commits:
commit 5712983f18e7cdec16ea20a9b3d94a1586de543e
Author: Michael Weghorn 
Date:   Fri Dec 19 10:24:04 2014 +0100

fdo#39440 rsc: reduce scope of local variables

This addresses some cppcheck warnings.

Change-Id: I69454a75c8ce4aecf9e68f5887f38f8bf6fe6dca
Reviewed-on: https://gerrit.libreoffice.org/13543
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index 25d78f66..6af2194 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -329,18 +329,15 @@ void RscTypCont :: WriteInc( FILE * fOutput, sal_uLong 
lFileKey )
 }
 else
 {
-RscDepend * pDep;
-RscFile   * pFile;
-
 RscFile   * pFName = aFileTab.Get( lFileKey );
 if( pFName )
 {
 for ( size_t i = 0, n = pFName->aDepLst.size(); i < n; ++i )
 {
-pDep = pFName->aDepLst[ i ];
+RscDepend* pDep = pFName->aDepLst[ i ];
 if( pDep->GetFileKey() != lFileKey )
 {
-pFile = aFileTab.GetFile( pDep->GetFileKey() );
+RscFile* pFile = aFileTab.GetFile( pDep->GetFileKey() );
 if( pFile )
 {
 fprintf( fOutput, "#include " );
@@ -525,7 +522,6 @@ ERRTYPE RscTypCont::WriteRc( WriteRcContext& rContext )
 void RscTypCont :: WriteSrc( FILE * fOutput, sal_uLong nFileKey,
  bool bName )
 {
-RscFile *   pFName;
 RscEnumerateRef aEnumRef( this, pRoot, fOutput );
 
 unsigned char aUTF8BOM[3] = { 0xef, 0xbb, 0xbf };
@@ -534,6 +530,7 @@ void RscTypCont :: WriteSrc( FILE * fOutput, sal_uLong 
nFileKey,
 SAL_WARN_IF(!bSuccess, "rsc", "short write");
 if( bName )
 {
+RscFile* pFName;
 WriteInc( fOutput, nFileKey );
 
 if( NOFILE_INDEX == nFileKey )
diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx
index d42f0d8..fd2de94 100644
--- a/rsc/source/prj/start.cxx
+++ b/rsc/source/prj/start.cxx
@@ -157,7 +157,6 @@ static bool CallRsc2( RscStrList * pInputList,
   const OString &rSrsName, RscPtrPtr * pCmdLine )
 {
 int nRet;
-OString*  pString;
 RscVerbosity eVerbosity = RscVerbosityNormal;
 
 RscPtrPtr aNewCmdL;
@@ -196,7 +195,7 @@ static bool CallRsc2( RscStrList * pInputList,
 
 for ( size_t i = 0, n = pInputList->size(); i < n; ++i )
 {
-pString = (*pInputList)[ i ];
+OString* pString = (*pInputList)[ i ];
 aNewCmdL.Append( rsc_strdup( pString->getStr() ) );
 }
 
@@ -231,7 +230,6 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 char ** ppStr;
 RscPtrPtr   aCmdLine;   // Kommandozeile
 sal_uInt32  i;
-OString*pString;
 
 pStr = ::ResponseFile( &aCmdLine, argv, argc );
 if( pStr )
@@ -314,7 +312,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 
 for ( size_t k = 0, n = aInputList.size(); k < n; ++k )
 {
-pString = aInputList[ k ];
+OString* pString = aInputList[ k ];
 aTmpName = ::GetTmpFileName();
 if( !CallPrePro( *pString, aTmpName, &aCmdLine, bResponse ) )
 {
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 4b48405..3a2115b 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -390,7 +390,6 @@ void RscCompiler::EndCompile()
 if( !(pCL->nCommands & NOSYNTAX_FLAG) )
 {
 FILE* foutput;
-RscFile * pFN;
 
 if( NULL == (foutput = fopen( pCL->aOutputSrs.getStr(), "w" )) )
 pTC->pEH->FatalError( ERR_OPENFILE, RscId(), 
pCL->aOutputSrs.getStr() );
@@ -400,7 +399,7 @@ void RscCompiler::EndCompile()
 sal_uIntPtr aIndex = pTC->aFileTab.FirstIndex();
 while( aIndex != UNIQUEINDEX_ENTRY_NOTFOUND )
 {
-pFN = pTC->aFileTab.Get( aIndex );
+RscFile* pFN = pTC->aFileTab.Get( aIndex );
 if( !pFN->IsIncFile() )
 {
 pTC->WriteSrc( foutput, NOFILE_INDEX, false );
@@ -476,14 +475,13 @@ ERRTYPE RscCompiler :: ParseOneFile( sal_uLong lFileKey,
 aError = ERR_ERROR;
 else if( !pFName->bLoaded )
 {
-RscDepend * pDep;
 
 //Include-Dateien vorher lesen
 pFName->bLoaded = true; //Endlos Rekursion vermeiden
 
 for ( size_t i = 0; i < pFName->aDepLst.size() && aError.IsOk(); ++i )
 {
-pDep = pFName->aDepLst[ i ];
+RscDepend* pDep = pFName->aDepLst[ i ];
 aError = ParseOneFile( pDep->GetFile

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

2014-12-19 Thread Riccardo Magliocchetti

 solenv/bin/unittest-failed.sh |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1e2786ac6d51838308c27a2cb84ce8ad9acd59c9
Author: Riccardo Magliocchetti 
Date:   Fri Dec 19 11:43:19 2014 +0100

solenv: fix bashism in unittest-failed.sh

Change-Id: If030cd711cbb04fd622a4fd5723b6c66aac28a98
Reviewed-on: https://gerrit.libreoffice.org/13546
Reviewed-by: Riccardo Magliocchetti 
Tested-by: Riccardo Magliocchetti 

diff --git a/solenv/bin/unittest-failed.sh b/solenv/bin/unittest-failed.sh
index 277c908..f898db9 100755
--- a/solenv/bin/unittest-failed.sh
+++ b/solenv/bin/unittest-failed.sh
@@ -23,11 +23,11 @@ Error: a unit test failed, please do one of:
 
 export DEBUGCPPUNIT=TRUE# for exception catching
 EOF
-if [ "$3" == "WNT" ]; then
+if [ "$3" = "WNT" ]; then
 cat << EOF
 export CPPUNITTRACE="\"[full path to devenv.exe]\" /debugexe" # for 
interactive debugging in Visual Studio
 EOF
-elif [ "$3" == "MACOSX" ]; then
+elif [ "$3" = "MACOSX" ]; then
 cat << EOF
 export CPPUNITTRACE="lldb --" # for interactive debugging on OSX
 EOF
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

In glyph fallback throwing away the language property of en because the detected script for '0x9f3' is Bengali and that language doesn't make sense....

2014-12-19 Thread Richard PALO

Yeah, sort of surprised myself.

Running scalc 'LibreOfficeDev 4.3.4.1 430m0(Build:1)' I figured out that I can 
easily force a core
by right clicking on any cell and selecting 'format cell'

I get the following in the terminal window:
> richard@omnis:/home/richard$ soffice test.ods 
> warn:sfx.control:101172:1:sfx2/source/control/dispatch.cxx:1505: Childwindow 
> slot missing: 10365
 & format cell here!
> warn:vcl:101172:1:vcl/generic/fontmanager/fontconfig.cxx:868: In glyph 
> fallback 
> throwing away the language property of en because the detected script for 
> '0x9f
> 3' is Bengali and that language doesn't make sense. Autodetecting instead.

My locale is fr_FR.UTF-8 on SunOS 5.11 under pkgsrc.

it's coring with:
sigmask = 0xbefc,0x,0x01ff
cursig = SIGSEGV

Coredump indicates:
> 08045fb8 libi18nlangtag.so`LiblantagDataRef::setup+0x4c(fe5b5bdc, fe5b5bdc, 
> fe5b5a1c, 804605c)
> 08046128 libi18nlangtag.so`LanguageTagImpl::canonicalize+0x784(e34a900, 0, 
> fe59b58b, fe5b28bc)
> 08046158 
> libi18nlangtag.so`_ZN15LanguageTagImpl15synCanonicalizeEv.part.179+0xf(
> fed8d824, 0, 8046198, feca4a02, 18, e33df90)
> 08046278 libi18nlangtag.so`LanguageTag::registerImpl+0x1a50(80462a0, 8046458, 
> f8f52a40, fed1086b, fed8d830, 0)
> 080462b8 libi18nlangtag.so`LanguageTag::getImpl+0x50(80462e8, 8046458, 
> 80462e8, 
> fed8d000, fed8d824, 8046458)
> 08046308 libi18nlangtag.so`LanguageTag::getLanguage+0x24(804639c, 8046458, 
> 8046338, fee83cba, e346860, f3)
> 08046358 libi18nlangtag.so`LanguageTag::getLanguageAndScript+0x21(804639c, 
> 8046458, 80463d8, fcb1bb2e, fed8d824, 80464fc)
> 080463d8 libvcllo.so`_GLOBAL__N_1::mapToFontConfigLangTag+0x10b(f8f52a40, 
> fed1086b, fcb819f0, e2e9e18, 804651c, 8046528)
> 080465c8 libvcllo.so`psp::PrintFontManager::Substitute+0x98b(fcc71b80, 
> 80465f8, 
> 804676c, fcb0325a, 8046684, 0)
> 08046678 libvcllo.so`FcGlyphFallbackSubstititution::FindFontSubstitute+0x140(
> fcc67480, 8046788, 804676c, 80467ac)
> 080466c8 
> libvcllo.so`PhysicalFontCollection::GetGlyphFallbackFont+0xbc(ce997c8, 
> 8046788, 804676c, 0, 10, 8046770)
> 08046718 libvcllo.so`ImplFontCache::GetGlyphFallbackFont+0x37(ce91d78, 
> ce997c8, 
> 8046788, 1, 804676c, 8046774)
> 08046808 libvcllo.so`OutputDevice::ImplGlyphFallbackLayout+0x367(e31fc08, 
> e33f138, 8046840, fed8d000, fed8d824, 8046840)
> 080468b8 libvcllo.so`OutputDevice::ImplLayout+0x12d(e31fc08, e346780, 0, 20, 
> 804690c, 0)
> 080469d8 libvcllo.so`OutputDevice::GetTextArray+0x8c(e31fc08, e346780, 0, 0, 
> , 0)
> 08046a08 libvcllo.so`OutputDevice::GetTextWidth+0x25(e31fc08, e346780, 0, 
> , fed8d824, 0)
> 08046a78 libvcllo.so`ImplListBoxWindow::ImplUpdateEntryMetrics+0x285(e31fc08, 
> e346780, e346780, 0)
> 08046aa8 
> libvcllo.so`_ZN17ImplListBoxWindow11InsertEntryElP13ImplEntryType.part.119+0x64(
> e346780, 481, e31bc18, a)
> 08046ae8 libvcllo.so`ImplListBox::InsertEntry+0x6e(e31fad8, 7fff, 
> e3447f4, 
> 548, f0ef6864, d4c1700)
> 08046b18 libvcllo.so`ListBox::InsertEntry+0x33(e31bc18, e3447f4, 7fff, 
> fdfec5aa)
> 08046b68 libcuilo.so`SvxNumberFormatTabPage::FillCurrencyBox+0x74(e2f8f28, 
> 8046bc4, 26, 0, f12c5d08, 0)  
> 08046be8 libcuilo.so`SvxNumberFormatTabPage::Reset+0x342(e2f8f28, e2e6298, 
> e2f8f28, fdef2c4c, 0, fdd8e2e4)
> 08046cb8 libsfxlo.so`SfxTabDialog::ActivatePageHdl+0x4ff(e2f50e0, e2f7f00, 
> 8046cf0, 0, fed8d824, 0)
> 08046d28 libsfxlo.so`SfxTabDialog::Start_Impl+0xd5(e2f50e0, e2f50e0, 8046d68, 
> f11f589e, f450d87c, e2e42a8)
> 08046d48 libsfxlo.so`SfxTabDialog::Execute+0x34(e2f50e0, c001, f11f586b, 
> f450d87c)
> 08046d68 libscuilo.so`ScAbstractTabDialog_Impl::Execute+0x15(e2e42a8, 
> d4d7508, 
> d66e4c0, e2e6298, 0, 0)
> 08046e78 libsclo.so`ScTabViewShell::ExecuteCellFormatDlg+0x3bc(d66b430, 
> 80472c0
> , 8046efc, fed8d000, f8f52a40, fed8d824)
> 080470e8 libsclo.so`ScCellShell::Execute+0x2064(d612100, 80472c0, fe76c38b, 
> fe13e51c)
> 08047108 libsclo.so`SfxStubScCellShellExecute+0x1d(d612100, 80472c0, 
> fdda2330, 0
> )
> 08047178 libsfxlo.so`SfxDispatcher::Call_Impl+0x27a(d30a760, d612100, 
> f46eadc4, 
> 80472c0, 1, 0)
> 080471e8 libsfxlo.so`SfxBindings::Execute_Impl+0x66(d57c3a8, 80472c0, 
> f46eadc4, 
> d612100, 8068b80, 0)
> 08047368 libsfxlo.so`SfxDispatchController_Impl::dispatch+0xeef(e2f0798, 
> e2f5658
> , 80473f0, 8047394, fcbb6654, 8068a60)
> 080473b8 libsfxlo.so`SfxOfficeDispatch::dispatch+0xfc(e2f0760, e2f5658, 
> 80473f0
> , fed11d78, feee69e0, 0)
> 08047488 libsfxlo.so`SfxAsyncExec_Impl::TimerHdl+0x6b(e2f5658, e2f5688, 108, 
> 137f0c7f)
> 080474a8 libvcllo.so`Timer::Timeout+0x19(e2f5688, fcbb6654, 80474e8, 
> fca5b961, 
> e2f2c94, 3e8)
> 080474e8 libvcllo.so`Timer::ImplTimerCallbackProc+0x191(fc539418, ce5d920, 
> f8c891bb, fc538290, e1af058, e2f2c60)
> 08047508 libvclplug_gtklo.so`sal_gtk_timeout_dispatch+0x5a(e2f2c60, fc484bf0, > 0
> , 8047548, 912faf1e, 8047548)
> 08047568 libglib-2.0.so.0.4200.1`g_main_context_dispatch+0x129(ce5d920, 12c, 
>

[Libreoffice-commits] core.git: 5 commits - include/com include/rtl ios/shared mysqlc/source odk/qa sal/qa sc/qa solenv/gbuild

2014-12-19 Thread Stephan Bergmann

 include/com/sun/star/uno/Any.hxx  |4 
 include/rtl/strbuf.hxx|   61 -
 include/rtl/string.hxx|   19 -
 include/rtl/stringconcat.hxx  |2 
 include/rtl/stringutils.hxx   |6 
 include/rtl/ustrbuf.hxx   |   61 -
 include/rtl/ustring.hxx   |   40 +--
 ios/shared/ios_sharedlo/objective_c/utils/MLOCommon.h |1 
 mysqlc/source/mysqlc_connection.cxx   |   80 +++---
 mysqlc/source/mysqlc_connection.hxx   |   38 +--
 mysqlc/source/mysqlc_databasemetadata.cxx |  208 +-
 mysqlc/source/mysqlc_databasemetadata.hxx |   74 +++---
 mysqlc/source/mysqlc_driver.cxx   |   50 ++--
 mysqlc/source/mysqlc_driver.hxx   |   16 -
 mysqlc/source/mysqlc_general.cxx  |   20 -
 mysqlc/source/mysqlc_general.hxx  |6 
 mysqlc/source/mysqlc_preparedstatement.cxx|   26 +-
 mysqlc/source/mysqlc_preparedstatement.hxx|   16 -
 mysqlc/source/mysqlc_propertyids.cxx  |6 
 mysqlc/source/mysqlc_propertyids.hxx  |6 
 mysqlc/source/mysqlc_resultset.cxx|   36 +--
 mysqlc/source/mysqlc_resultset.hxx|   12 -
 mysqlc/source/mysqlc_resultsetmetadata.cxx|   32 +-
 mysqlc/source/mysqlc_resultsetmetadata.hxx|   18 -
 mysqlc/source/mysqlc_services.cxx |   12 -
 mysqlc/source/mysqlc_statement.cxx|   32 +-
 mysqlc/source/mysqlc_statement.hxx|   16 -
 odk/qa/checkapi/checkapi.cxx  |   10 
 sal/qa/rtl/strings/test_ostring_concat.cxx|   27 --
 sal/qa/rtl/strings/test_oustring_concat.cxx   |   20 -
 sal/qa/rtl/textenc/rtl_textcvt.cxx|2 
 sc/qa/extras/macros-test.cxx  |2 
 solenv/gbuild/LinkTarget.mk   |6 
 33 files changed, 404 insertions(+), 561 deletions(-)

New commits:
commit 5537bb28ec2667018c101ad25bbbc9c52daaffb0
Author: Stephan Bergmann 
Date:   Fri Dec 19 14:26:11 2014 +0100

sc: Use appropriate OUString functions on string constants

Change-Id: Iefc8dcb25dd32acbc435bbf2aaa63572915d6753

diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index 3f210db..c2948e7 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -247,7 +247,7 @@ void ScMacrosTest::testVba()
 Any aRet;
 Sequence< sal_Int16 > aOutParamIndex;
 Sequence< Any > aOutParam;
-bool bWorkbooksHandling = OUString( testInfo[i].sFileBaseName 
).equalsAscii("Workbooks.") && !sTempDir.isEmpty() ;
+bool bWorkbooksHandling = OUString( testInfo[i].sFileBaseName ) == 
"Workbooks." && !sTempDir.isEmpty() ;
 
 if ( bWorkbooksHandling )
 {
commit a5bdf3c606b562a2af3dd4e4162b734abb1cb24c
Author: Stephan Bergmann 
Date:   Fri Dec 19 14:25:53 2014 +0100

Make O[U]StringLiteral ctor explicit

Change-Id: Ide8b167d57dd6844f5249fe6831ef4d2b4eb

diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index 3571625..773e54e 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -1646,7 +1646,7 @@ This class is not part of public API and is meant to be 
used only in LibreOffice
 struct SAL_WARN_UNUSED OStringLiteral
 {
 template< int N >
-OStringLiteral( const char (&str)[ N ] ) : size( N - 1 ), data( str ) { 
assert( strlen( str ) == N - 1 ); }
+explicit OStringLiteral( const char (&str)[ N ] ) : size( N - 1 ), data( 
str ) { assert( strlen( str ) == N - 1 ); }
 int size;
 const char* data;
 };
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index 2202415..8aaab0a 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -67,7 +67,7 @@ This class is not part of public API and is meant to be used 
only in LibreOffice
 struct SAL_WARN_UNUSED OUStringLiteral
 {
 template< int N >
-OUStringLiteral( const char (&str)[ N ] ) : size( N - 1 ), data( str ) { 
assert( strlen( str ) == N - 1 ); }
+explicit OUStringLiteral( const char (&str)[ N ] ) : size( N - 1 ), data( 
str ) { assert( strlen( str ) == N - 1 ); }
 int size;
 const char* data;
 };
commit ffd00464f8ec2c796cdfead7e1e13ee715641e78
Author: Stephan Bergmann 
Date:   Fri Dec 19 12:02:25 2014 +0100

This is not java.lang.StringBuffer

Change-Id: Iea1ebb8ec79647b279fde359aa4d617d9c360e56

diff --git a/include/rtl/strbuf.hxx b/include/rtl/strbuf.hxx
index 6a21c57..9352d54 100644
--- a/include/rtl/strbuf.hxx
+++ b/include/rtl/strbuf.hxx
@@ -56,42 +56,6 @@ namespace rtl
 /// @endcond
 
 /** A string buffer implements a mutable sequence of characters.
-
-String buffers are safe

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

2014-12-19 Thread Michael Stahl

 sw/source/core/access/accmap.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 56d06e78ccdd8ae8c8e50a5b647272b4166f63cb
Author: Michael Stahl 
Date:   Thu Dec 18 21:52:51 2014 +0100

fdo#87199: sw: fix root cause of a11y crash when merging cells

Commit f9eff2a402a4cd28d7dbfb6ce27cbf96b31e576f is not quite right
because it will leave the mpNext chain unreachable; that could perhaps
be imporoved by calling RemoveFromLayout(), but...

Actually the problem is basically that one of the deleted SwCellFrms
points to a SwTableBox with getRowSpan() -1 (because it has been merged)
and thus IsInCoveredCell() returns true and that causes ~SwCellFrm() to
skip disposing the SwAccessible stuff, so the SwCellFrm is still
contained in the SwAccessibleMap.

Because it's rather hard to prevent this sort of thing in general,
better change SwAccessibleMap::Dispose() to assume that if it found its
way into the SwAccessibleMap it should be disposed and removed.

Change-Id: Ib4cec6924cb026ae30bdac6857957adf237b4d70
(cherry picked from commit 296e8b597c141b6b54cbf943871d6a6820c1779d)
Reviewed-on: https://gerrit.libreoffice.org/13533
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index f36fb14..88ee719 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -2216,7 +2216,9 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm,
 OSL_ENSURE( !aFrmOrObj.GetSwFrm() || 
aFrmOrObj.GetSwFrm()->IsAccessibleFrm(),
 "non accessible frame should be disposed" );
 
-if( aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) )
+if (aFrmOrObj.IsAccessible( GetShell()->IsPreview() )
+// fdo#87199 dispose the darn thing if it ever was accessible
+|| (pFrm && mpFrmMap && mpFrmMap->find(pFrm) != mpFrmMap->end()))
 {
 ::rtl::Reference< SwAccessibleContext > xAccImpl;
 ::rtl::Reference< SwAccessibleContext > xParentAccImpl;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-19 Thread Michael Stahl

 sw/source/core/access/accmap.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 00428a15f0e7346af5da80563197950cf6439297
Author: Michael Stahl 
Date:   Thu Dec 18 21:52:51 2014 +0100

fdo#87199: sw: fix root cause of a11y crash when merging cells

Commit f9eff2a402a4cd28d7dbfb6ce27cbf96b31e576f is not quite right
because it will leave the mpNext chain unreachable; that could perhaps
be imporoved by calling RemoveFromLayout(), but...

Actually the problem is basically that one of the deleted SwCellFrms
points to a SwTableBox with getRowSpan() -1 (because it has been merged)
and thus IsInCoveredCell() returns true and that causes ~SwCellFrm() to
skip disposing the SwAccessible stuff, so the SwCellFrm is still
contained in the SwAccessibleMap.

Because it's rather hard to prevent this sort of thing in general,
better change SwAccessibleMap::Dispose() to assume that if it found its
way into the SwAccessibleMap it should be disposed and removed.

Change-Id: Ib4cec6924cb026ae30bdac6857957adf237b4d70
(cherry picked from commit 296e8b597c141b6b54cbf943871d6a6820c1779d)
Reviewed-on: https://gerrit.libreoffice.org/13532
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 1d94b37..35250df 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -2270,7 +2270,9 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm,
 OSL_ENSURE( !aFrmOrObj.GetSwFrm() || 
aFrmOrObj.GetSwFrm()->IsAccessibleFrm(),
 "non accessible frame should be disposed" );
 
-if( aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) )
+if (aFrmOrObj.IsAccessible( GetShell()->IsPreview() )
+// fdo#87199 dispose the darn thing if it ever was accessible
+|| (pFrm && mpFrmMap && mpFrmMap->find(pFrm) != mpFrmMap->end()))
 {
 ::rtl::Reference< SwAccessibleContext > xAccImpl;
 ::rtl::Reference< SwAccessibleContext > xParentAccImpl;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/priorities' - 2 commits - editeng/source sc/inc sc/source sd/source svtools/source sw/source vcl/source

2014-12-19 Thread Tobias Madl

 editeng/source/editeng/impedit.hxx|6 -
 editeng/source/editeng/impedit2.cxx   |6 -
 editeng/source/editeng/impedit3.cxx   |2 
 editeng/source/editeng/impedit4.cxx   |4 
 sc/inc/scmod.hxx  |2 
 sc/source/ui/app/scmod.cxx|   47 --
 sd/source/ui/framework/configuration/ConfigurationUpdater.cxx |   20 ++--
 sd/source/ui/framework/configuration/ConfigurationUpdater.hxx |2 
 sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx  |   18 +--
 sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx  |2 
 svtools/source/graphic/grfcache.cxx   |6 -
 svtools/source/graphic/grfcache.hxx   |2 
 sw/source/core/doc/DocumentTimerManager.cxx   |   18 +--
 sw/source/core/inc/DocumentTimerManager.hxx   |2 
 vcl/source/app/svapp.cxx  |3 
 vcl/source/app/timer.cxx  |2 
 16 files changed, 90 insertions(+), 52 deletions(-)

New commits:
commit a3b404e21e7ffd74b1456f3e150f6ca361480c1d
Author: Tobias Madl 
Date:   Fri Dec 19 13:02:50 2014 +

Timer: first independend idle use

Change-Id: I27985e456447ef3d71cae39c2acaf59b3aa60b83

diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 7c4a76d..17c589e 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -355,8 +355,11 @@ inline void ImplYield( bool i_bWait, bool i_bAllEvents )
 
 // run timers that have timed out
 if ( !pSVData->mbNoCallTimer )
+{
 while ( pSVData->mbNotAllTimerCalled )
 Timer::ImplTimerCallbackProc();
+Timer::Timer::ProcessAllIdleHandlers();
+}
 
 pSVData->maAppData.mnDispatchLevel++;
 // do not wait for events if application was already quit; in that
diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx
index 529c8b5..0dea56d 100644
--- a/vcl/source/app/timer.cxx
+++ b/vcl/source/app/timer.cxx
@@ -151,7 +151,7 @@ void Timer::ImplTimerCallbackProc()
 // If the timer is not new, was not deleted, and if it is not in the 
timeout handler, then
 // call the handler as soon as the time is up.
 if ( (pTimerData->mnTimerUpdate < pSVData->mnTimerUpdate) &&
- !pTimerData->mbDelete && !pTimerData->mbInTimeout )
+ !pTimerData->mbDelete && !pTimerData->mbInTimeout && 
!pTimerData->mpTimer->mbIdle)
 {
 // time has expired
 if ( pTimerData->GetDeadline() <= nTime )
commit 256d5241f1a242f2e20608a0ded2554bfece9ac5
Author: Tobias Madl 
Date:   Fri Dec 19 13:01:46 2014 +

Timer: Reversed some Idles to Timer

Change-Id: I213722cc98490430378014290cb09cca9e469bbb

diff --git a/editeng/source/editeng/impedit.hxx 
b/editeng/source/editeng/impedit.hxx
index f98f943..c6e41d4 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -465,7 +465,7 @@ private:
 
 IdleFormattter  aIdleFormatter;
 
-IdleaOnlineSpellIdle;
+Timer   aOnlineSpellTimer;
 
 // If it is detected at one point that the StatusHdl has to be called, but
 // this should not happen immediately (critical section):
@@ -979,8 +979,8 @@ public:
 
 inline EditEngine*  GetEditEnginePtr() const{ return pEditEngine; }
 
-voidStartOnlineSpellTimer() { 
aOnlineSpellIdle.Start(); }
-voidStopOnlineSpellTimer()  { aOnlineSpellIdle.Stop(); 
}
+voidStartOnlineSpellTimer() { 
aOnlineSpellTimer.Start(); }
+voidStopOnlineSpellTimer()  { 
aOnlineSpellTimer.Stop(); }
 
 const OUString& GetAutoCompleteText() const { return 
aAutoCompleteText; }
 voidSetAutoCompleteText(const OUString& rStr, bool 
bUpdateTipWindow);
diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index f4b48b8..fcc9c24 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -148,8 +148,8 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* 
pItemPool ) :
 aIdleFormatter.SetPriority( VCL_IDLE_PRIORITY_REPAINT );
 aIdleFormatter.SetIdleHdl( LINK( this, ImpEditEngine, IdleFormatHdl ) );
 
-aOnlineSpellIdle.SetPriority( VCL_IDLE_PRIORITY_LOW );
-aOnlineSpellIdle.SetIdleHdl( LINK( this, ImpEditEngine, OnlineSpellHdl ) );
+aOnlineSpellTimer.SetTimeout( 100 );
+aOnlineSpellTimer.SetTimeoutHdl( LINK( this, ImpEditEngine, OnlineSpellHdl 
) );
 
 // Access data already from here on!
 SetRefDevice( NULL );
@@ -163,7 +163,7 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* 
pItemPool ) :
 ImpEditEngine::~ImpEditEngine()
 {
 aStatusTimer.Stop();

[Libreoffice-commits] core.git: configure.ac download.lst external/icu i18nutil/source include/svx svx/source

2014-12-19 Thread Caolán McNamara

 configure.ac |2 
 download.lst |2 
 external/icu/UnpackedTarball_icu.mk  |3 
 external/icu/icu-ubsan.patch.0   |   20 
 external/icu/icu4c-aix.patch |9 --
 external/icu/icu4c-buffer-overflow.patch |   30 ---
 external/icu/icu4c-build.patch   |   43 +-
 external/icu/icu4c-icu11054.patch.1  |   44 --
 external/icu/icu4c-icu11100.patch.1  |2 
 external/icu/icu4c-icu11131.patch.1  |   68 
 external/icu/icu4c-mkdir.patch   |9 --
 i18nutil/source/utility/unicode.cxx  |   20 
 include/svx/ucsubset.hrc |   32 +++
 svx/source/dialog/charmap.cxx|   99 +++
 svx/source/dialog/ucsubset.src   |  128 +++
 15 files changed, 311 insertions(+), 200 deletions(-)

New commits:
commit f9d3e0f57c173494d250aadd0022abb738634f43
Author: CaolÃ¡n McNamara 
Date:   Fri Dec 19 11:04:49 2014 +

upgrade to icu 54

Change-Id: I4d32ac386ff8b69bee4319e673769917045d9450
Reviewed-on: https://gerrit.libreoffice.org/13547
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/configure.ac b/configure.ac
index 021c7de..276fe1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8781,7 +8781,7 @@ SYSTEM_GENBRK=
 SYSTEM_GENCCODE=
 SYSTEM_GENCMN=
 
-ICU_MAJOR=53
+ICU_MAJOR=54
 ICU_MINOR=1
 ICU_RECLASSIFIED_CLOSE_PARENTHESIS="TRUE"
 ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
diff --git a/download.lst b/download.lst
index c2e5949..2bb91ca 100644
--- a/download.lst
+++ b/download.lst
@@ -65,7 +65,7 @@ export HARFBUZZ_TARBALL := harfbuzz-0.9.23.tar.bz2
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 export HUNSPELL_TARBALL := 
4967da60b23413604c9e563beacc63b4-hunspell-1.3.3.tar.gz
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
-export ICU_TARBALL := b73baa6fbdfef197608d1f69300919b9-icu4c-53_1-src.tgz
+export ICU_TARBALL := e844caed8f2ca24c088505b0d6271bc0-icu4c-54_1-src.tgz
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 export JFREEREPORT_FLUTE_TARBALL := 
d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
 export JFREEREPORT_LIBBASE_TARBALL := 
eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index af9c751..e0d18b5 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -19,12 +19,9 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-macosx.patch \
external/icu/icu4c-solarisgcc.patch \
external/icu/icu4c-mkdir.patch \
-   external/icu/icu4c-buffer-overflow.patch \
external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch \
external/icu/icu-ubsan.patch.0 \
-   external/icu/icu4c-icu11054.patch.1 \
external/icu/icu4c-icu11100.patch.1 \
-   external/icu/icu4c-icu11131.patch.1 \
external/icu/icu4c-scriptrun.patch \
external/icu/icu4c-icu11451.patch.1 \
 ))
diff --git a/external/icu/icu-ubsan.patch.0 b/external/icu/icu-ubsan.patch.0
index 479007b..c6baaed 100644
--- a/external/icu/icu-ubsan.patch.0
+++ b/external/icu/icu-ubsan.patch.0
@@ -138,23 +138,3 @@
  }
  
  /* INTERNAL: compares two entries */
 source/common/ustring.cpp
-+++ source/common/ustring.cpp
-@@ -1486,7 +1486,7 @@
- */
- 
- #define STRING_HASH(TYPE, STR, STRLEN, DEREF) \
--int32_t hash = 0; \
-+uint32_t hash = 0; \
- const TYPE *p = (const TYPE*) STR;\
- if (p != NULL) {  \
- int32_t len = (int32_t)(STRLEN);  \
-@@ -1497,7 +1497,7 @@
- p += inc; \
- } \
- } \
--return hash
-+return static_cast(hash)
- 
- /* Used by UnicodeString to compute its hashcode - Not public API. */
- U_CAPI int32_t U_EXPORT2
diff --git a/external/icu/icu4c-aix.patch b/external/icu/icu4c-aix.patch
index 580a8fc..f4a449f 100644
--- a/external/icu/icu4c-aix.patch
+++ b/external/icu/icu4c-aix.patch
@@ -114,16 +114,16 @@
  ## BIR  - bind with internal references [so app data and icu data doesn't 
collide]
 --- misc/icu/source/tools/pkgdata/pkgdata.cpp  2013-04-06 20:56:00.935656635 
+0100
 +++ misc/build/icu/source/tools/pkgdata/pkgdata.cpp2013-10-31 
20:38:10.623984554 +0700
-@@ -888,7 +888,7 @@
+@@ -902,7 +902,7 @@
  
  uprv_strcat(pkgDataFlags[SO_EXT], ".");
  uprv_strcat(pkgDataFlags[SO_EXT], pkgDataFlags[A_EXT]);
 -#elif U_PLATFORM == U_PF_OS400 || defined(_AIX)
 +#elif U_PLATFORM == U_PF_OS400
- sprintf(libFileNames[LIB_FILE_VERSION_TMP], "%s.%s",
+ sprintf(libFileNames[LIB_FILE_VERSION_TMP],

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

2014-12-19 Thread Tor Lillqvist

 sc/source/filter/excel/xiescher.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 28ff5d52c33e240f5afb2ab1547abe88f4ba7a4d
Author: Tor Lillqvist 
Date:   Fri Dec 19 13:55:10 2014 +0200

WaE: variable 'nBofType' set but not used

Change-Id: I4f0db469beb7ed3ca4b32f3d44f22f34a4d7a54b

diff --git a/sc/source/filter/excel/xiescher.cxx 
b/sc/source/filter/excel/xiescher.cxx
index 594f28c..f45a8b5 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -1624,7 +1624,7 @@ void XclImpChartObj::ReadChartSubStream( XclImpStream& 
rStrm )
 sal_uInt16 nBofType;
 rStrm.Seek( 2 );
 nBofType = rStrm.ReaduInt16();
-DBG_ASSERT( nBofType == EXC_BOF_CHART, 
"XclImpChartObj::ReadChartSubStream - no chart BOF record" );
+SAL_WARN_IF( nBofType != EXC_BOF_CHART, "sc.filter", 
"XclImpChartObj::ReadChartSubStream - no chart BOF record" );
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 8 commits - include/svx include/vcl officecfg/registry sc/source svx/source svx/uiconfig sw/source sw/uiconfig sw/UIConfig_swriter.mk vcl/source

2014-12-19 Thread Jan Holesovsky

 include/svx/ctredlin.hxx |4 
 include/vcl/builder.hxx  |4 
 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |   53 +
 sc/source/ui/miscdlgs/acredlin.cxx   |2 
 svx/source/dialog/ctredlin.cxx   |9 
 svx/source/fmcomp/fmgridif.cxx   |4 
 svx/uiconfig/ui/redlinefilterpage.ui |  520 ++-
 sw/UIConfig_swriter.mk   |1 
 sw/source/ui/misc/swmodalredlineacceptdlg.cxx|3 
 sw/source/uibase/inc/redlndlg.hxx|   18 
 sw/source/uibase/misc/redlndlg.cxx   |   31 
 sw/source/uibase/sidebar/SwPanelFactory.cxx  |   10 
 sw/uiconfig/swriter/ui/managechangessidebar.ui   |  152 +++
 vcl/source/window/builder.cxx|   53 -
 14 files changed, 603 insertions(+), 261 deletions(-)

New commits:
commit 170c7ee2f6f902d9de139b914b74e807b28da0a9
Author: Jan Holesovsky 
Date:   Fri Dec 19 12:20:09 2014 +0100

changes sidebar: Use smaller 'clock' icons.

Change-Id: I3bcfa2b942ab0a8dbbc2997dffb0b9d18d345099

diff --git a/svx/uiconfig/ui/redlinefilterpage.ui 
b/svx/uiconfig/ui/redlinefilterpage.ui
index b83d61f..a78f495 100644
--- a/svx/uiconfig/ui/redlinefilterpage.ui
+++ b/svx/uiconfig/ui/redlinefilterpage.ui
@@ -11,12 +11,12 @@
   
 True
 False
-sc/res/time.png
+cmd/sc_timefield.png
   
   
 True
 False
-sc/res/time.png
+cmd/sc_timefield.png
   
   
 True
commit 3a7a05ea34cd50f368c5287e3d291e473852c80a
Author: Jan Holesovsky 
Date:   Fri Dec 19 11:16:14 2014 +0100

changes sidebar: Better look of the buttons.

Change-Id: I68fd844b3dbc3731c45c99fc7db4c3990e3073bc

diff --git a/sw/uiconfig/swriter/ui/managechangessidebar.ui 
b/sw/uiconfig/swriter/ui/managechangessidebar.ui
index 98a3d7a..09e023e 100644
--- a/sw/uiconfig/swriter/ui/managechangessidebar.ui
+++ b/sw/uiconfig/swriter/ui/managechangessidebar.ui
@@ -17,12 +17,16 @@
   
 True
 False
+True
+True
 vertical
 6
 
   
 True
 False
+True
+True
 
   
 
@@ -45,6 +49,7 @@
 True
 True
 True
+True
 True
   
   
@@ -60,6 +65,7 @@
 True
 True
 True
+True
 True
   
   
@@ -75,6 +81,7 @@
 True
 True
 True
+True
 True
   
   
@@ -90,6 +97,7 @@
 True
 True
 True
+True
 True
   
   
@@ -100,14 +108,12 @@
   
 
 
-  
-
-
   
 gtk-undo
 True
 True
 True
+True
 True
   
   
@@ -117,6 +123,9 @@
 1
   
 
+
+  
+
   
   
 False
commit db732cee9207dc3cfc49fc9e719bc192542e2e8e
Author: Jan Holesovsky 
Date:   Fri Dec 19 10:53:31 2014 +0100

vcl: The  can come after pCurrentChild has been already created.

So consolidate their filling-in at one place, after we are sure we have the
pCurrentChild created (whatever way).

Change-Id: Ia98a927e1158041836b173e1c2f9529d70295855

diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index af10f76..ef8264b 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -335,11 +335,11 @@ private:
 vcl::Window *insertObject(vcl::Window *pParent,
 const OString &rClass, const OString &rID,
 stringmap &rProps, stringmap &rPangoAttributes,
-stringmap &rAtkProps, std::vector &rItems);
+stringmap &rAtkProps);
 
 vcl::Window *makeObject(vcl::Window *pParent,
 const OString &rClass, const OString &rID,
-stringmap &rVec, const std::vector &rItems);
+stringmap &rVec);
 
 voidconnectNumericFormatterAdjustment(const OString &id, const 
OString &rAdjustment);
 voidconnectTimeFormatterAdjustment(const OStrin

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

2014-12-19 Thread Tor Lillqvist

 sc/source/core/opencl/formulagroupcl.cxx|   24 ++-
 sc/source/core/opencl/formulagroupcl_public.hxx |   37 
 2 files changed, 23 insertions(+), 38 deletions(-)

New commits:
commit eee97f4bb3cfe1ed88f9d939e213ebb2fc052ea4
Author: Tor Lillqvist 
Date:   Fri Dec 19 13:31:59 2014 +0200

Kill pointless formulagroupcl_public.hxx, inline in only place where 
included

Change-Id: I344322736604c5cf5f471eed1abd1205a4c5d96a

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index c3ee932..2c77ee4 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -29,12 +29,34 @@
 #include "op_array.hxx"
 #include "op_spreadsheet.hxx"
 #include "op_addin.hxx"
+
 /// CONFIGURATIONS
 // Comment out this to turn off FMIN and FMAX intrinsics
 #define USE_FMIN_FMAX 1
 #define REDUCE_THRESHOLD 201  // set to 4 for correctness testing. priority 1
 #define UNROLLING_FACTOR 16  // set to 4 for correctness testing (if no reduce)
-#include "formulagroupcl_public.hxx"
+
+static const char* publicFunc =
+ "int isNan(double a) { return isnan(a); }\n"
+ "double fsum_count(double a, double b, __private int *p) {\n"
+ "bool t = isNan(a);\n"
+ "(*p) += t?0:1;\n"
+ "return t?b:a+b;\n"
+ "}\n"
+ "double fsum(double a, double b) { return isNan(a)?b:a+b; }\n"
+ "double legalize(double a, double b) { return isNan(a)?b:a;}\n"
+ "double fsub(double a, double b) { return a-b; }\n"
+ "double fdiv(double a, double b) { return a/b; }\n"
+ "double strequal(unsigned a, unsigned b) { return (a==b)?1.0:0; }\n"
+#ifdef USE_FMIN_FMAX
+ "double mcw_fmin(double a, double b) { return fmin(a, b); }\n"
+ "double mcw_fmax(double a, double b) { return fmax(a, b); }\n"
+#else
+ "double mcw_fmin(double a, double b) { return a>b?b:a; }\n"
+ "double mcw_fmax(double a, double b) { return a>b?a:b; }\n"
+#endif
+ ;
+
 #ifdef WIN32
 #ifndef NAN
 namespace {
diff --git a/sc/source/core/opencl/formulagroupcl_public.hxx 
b/sc/source/core/opencl/formulagroupcl_public.hxx
deleted file mode 100644
index 3b36770e..000
--- a/sc/source/core/opencl/formulagroupcl_public.hxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef INCLUDED_SC_SOURCE_CORE_OPENCL_FORMULAGROUPCL_PUBLIC_HXX
-#define INCLUDED_SC_SOURCE_CORE_OPENCL_FORMULAGROUPCL_PUBLIC_HXX
-
-const char* publicFunc =
- "int isNan(double a) { return isnan(a); }\n"
- "double fsum_count(double a, double b, __private int *p) {\n"
- "bool t = isNan(a);\n"
- "(*p) += t?0:1;\n"
- "return t?b:a+b;\n"
- "}\n"
- "double fsum(double a, double b) { return isNan(a)?b:a+b; }\n"
- "double legalize(double a, double b) { return isNan(a)?b:a;}\n"
- "double fsub(double a, double b) { return a-b; }\n"
- "double fdiv(double a, double b) { return a/b; }\n"
- "double strequal(unsigned a, unsigned b) { return (a==b)?1.0:0; }\n"
-#ifdef USE_FMIN_FMAX
- "double mcw_fmin(double a, double b) { return fmin(a, b); }\n"
- "double mcw_fmax(double a, double b) { return fmax(a, b); }\n"
-#else
- "double mcw_fmin(double a, double b) { return a>b?b:a; }\n"
- "double mcw_fmax(double a, double b) { return a>b?a:b; }\n"
-#endif
-
- ;
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - external/icu

2014-12-19 Thread Caolán McNamara

 external/icu/UnpackedTarball_icu.mk |1 +
 external/icu/icu4c-icu11451.patch.1 |   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit b8e57ee5b9f0e847992307899533bb3915efb054
Author: CaolÃ¡n McNamara 
Date:   Fri Dec 19 10:40:02 2014 +

icu#11451 bidi, the gift that keeps on giving

Change-Id: I3bd37f8468c95a29ab3385dbc3ae825b76d8d3df
(cherry picked from commit bfb9eb550c4facb9aa6346a8d19f015cf5182668)
(cherry picked from commit 915153b2e14dd75a6c90f5f4b1ac01b7f47bafdb)

diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index aefc159..76d9ee6 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-icu11100.patch.1 \
external/icu/icu4c-icu11131.patch.1 \
external/icu/icu4c-scriptrun.patch \
+   external/icu/icu4c-icu11451.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/icu/icu4c-icu11451.patch.1 
b/external/icu/icu4c-icu11451.patch.1
new file mode 100644
index 000..b15185a
--- /dev/null
+++ b/external/icu/icu4c-icu11451.patch.1
@@ -0,0 +1,11 @@
+--- icu/source/common/ubidi.c.orig 2014-12-19 10:23:38.103928414 +
 icu/source/common/ubidi.c  2014-12-19 10:26:58.370071527 +
+@@ -2146,7 +2146,7 @@
+ /* The isolates[] entries contain enough information to
+resume the bidi algorithm in the same state as it was
+when it was interrupted by an isolate sequence. */
+-if(dirProps[start]==PDI) {
++if(dirProps[start]==PDI && pBiDi->isolateCount >= 0) {
+ levState.startON=pBiDi->isolates[pBiDi->isolateCount].startON;
+ start1=pBiDi->isolates[pBiDi->isolateCount].start1;
+ stateImp=pBiDi->isolates[pBiDi->isolateCount].stateImp;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: lotuswordpro/source oox/source package/source registry/source reportdesign/source

2014-12-19 Thread Michael Weghorn

 lotuswordpro/source/filter/lwpdoc.cxx  |   10 +++---
 lotuswordpro/source/filter/lwpfoundry.cxx  |3 +--
 lotuswordpro/source/filter/lwplayout.cxx   |4 +---
 lotuswordpro/source/filter/lwppagelayout.cxx   |2 +-
 lotuswordpro/source/filter/lwppara.cxx |5 ++---
 lotuswordpro/source/filter/lwpstory.cxx|3 +--
 lotuswordpro/source/filter/lwptablelayout.cxx  |3 +--
 lotuswordpro/source/filter/lwptblformula.cxx   |3 +--
 lotuswordpro/source/filter/xfilter/xfliststyle.cxx |6 ++
 oox/source/export/chartexport.cxx  |2 +-
 package/source/zippackage/ZipPackage.cxx   |6 --
 registry/source/regimpl.cxx|6 ++
 registry/source/registry.cxx   |8 ++--
 reportdesign/source/core/sdr/RptObject.cxx |4 ++--
 reportdesign/source/ui/dlg/Condition.cxx   |3 +--
 reportdesign/source/ui/dlg/GroupsSorting.cxx   |2 +-
 reportdesign/source/ui/report/ReportSection.cxx|3 ++-
 17 files changed, 28 insertions(+), 45 deletions(-)

New commits:
commit d41bc0f7b328ed6c69b2c2822de00165cdc62c61
Author: Michael Weghorn 
Date:   Fri Dec 19 08:47:29 2014 +0100

fdo#39440 reduce scope of local variables

This addresses some cppcheck warnings.

Change-Id: Idcedd908c653d5a5700884f233ad134dde8be018
Reviewed-on: https://gerrit.libreoffice.org/13540
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/lotuswordpro/source/filter/lwpdoc.cxx 
b/lotuswordpro/source/filter/lwpdoc.cxx
index e2ab2a7..a2ff123 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -257,10 +257,9 @@ void LwpDocument::RegisterLayoutStyles()
 
 //set initial pagelayout in story for parsing pagelayout
 LwpDivInfo* pDivInfo = dynamic_cast (m_DivInfo.obj( 
VO_DIVISIONINFO).get());
-LwpPageLayout* pPageLayout = NULL;
 if(pDivInfo)
 {
-pPageLayout = 
dynamic_cast(pDivInfo->GetInitialLayoutID().obj(VO_PAGELAYOUT).get());
+LwpPageLayout* pPageLayout = 
dynamic_cast(pDivInfo->GetInitialLayoutID().obj(VO_PAGELAYOUT).get());
 if(pPageLayout)
 {
 //In Ole division, the content of pagelayout is VO_OLEOBJECT
@@ -540,11 +539,10 @@ LwpDocument* LwpDocument::GetPreviousDivision()
 }
 
 LwpDocument* pDivision = GetLastDivision();
-LwpDocument* pContentDivision = NULL;
 
 while(pDivision)
 {
-pContentDivision = pDivision->GetLastDivisionWithContents();
+LwpDocument* pContentDivision = 
pDivision->GetLastDivisionWithContents();
 if(pContentDivision)
 {
 return pContentDivision;
@@ -621,11 +619,9 @@ LwpDocument* LwpDocument::GetPreviousDivision()
 
 LwpDocument* pDivision = GetFirstDivision();
 
-LwpDocument*  pContentDivision = NULL;
-
 while (pDivision)
 {
-pContentDivision = 
pDivision->GetFirstDivisionWithContentsThatIsNotOLE();
+LwpDocument* pContentDivision = 
pDivision->GetFirstDivisionWithContentsThatIsNotOLE();
 if(pContentDivision)
 return pContentDivision;
 pDivision = pDivision->GetNextDivision();
diff --git a/lotuswordpro/source/filter/lwpfoundry.cxx 
b/lotuswordpro/source/filter/lwpfoundry.cxx
index 580f5fd..232afb8 100644
--- a/lotuswordpro/source/filter/lwpfoundry.cxx
+++ b/lotuswordpro/source/filter/lwpfoundry.cxx
@@ -488,7 +488,6 @@ LwpOrderedObject* 
LwpOrderedObjectManager::Enumerate(LwpOrderedObject * pLast)
 LwpListList* LwpOrderedObjectManager::GetNextActiveListList(LwpListList * 
pLast)
 {
 LwpListList* pList = NULL;
-LwpContent* pContent = NULL;
 if(pLast)
 pList = static_cast(pLast->GetNext().obj().get());
 else
@@ -502,7 +501,7 @@ LwpListList* 
LwpOrderedObjectManager::GetNextActiveListList(LwpListList * pLast)
 
 while(pList)
 {
-pContent = static_cast(pList->GetObject().obj().get());
+LwpContent* pContent = 
static_cast(pList->GetObject().obj().get());
 if(pContent && pContent->HasNonEmbeddedLayouts() &&
 !pContent->IsStyleContent())
 return pList;
diff --git a/lotuswordpro/source/filter/lwplayout.cxx 
b/lotuswordpro/source/filter/lwplayout.cxx
index 0c5c78d..594a375 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -447,8 +447,6 @@ void LwpAssociatedLayouts::Read(LwpObjectStream* pStrm)
 */
 LwpVirtualLayout* LwpAssociatedLayouts::GetLayout(LwpVirtualLayout 
*pStartLayout)
 {
-LwpVirtualLayout* pLayout = NULL;
-
 if (!pStartLayout && !m_OnlyLayout.IsNull())
 /* Looking for the first layout and there's only one layout in  the 
list.*/
 return dynamic_cast(m_OnlyLayout.obj().get());
@@ -456,7 +454,7 @@ LwpVirtualLayout* 
LwpAssociatedLayouts::GetLayout(LwpVirtualLayout *pStartLayout
 LwpObjectHolder* pObjHolder

[Bug 39440] cppcheck cleanliness

2014-12-19 Thread bugzilla-daemon

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

--- Comment #36 from Commit Notification 
 ---
Michael Weghorn committed a patch related to this issue.
It has been pushed to "master":

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

fdo#39440 reduce scope of local variables

It will be available in 4.5.0.

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: Branch 'libreoffice-4-4' - external/icu

2014-12-19 Thread Caolán McNamara

 external/icu/UnpackedTarball_icu.mk |1 +
 external/icu/icu4c-icu11451.patch.1 |   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit 915153b2e14dd75a6c90f5f4b1ac01b7f47bafdb
Author: CaolÃ¡n McNamara 
Date:   Fri Dec 19 10:40:02 2014 +

icu#11451 bidi, the gift that keeps on giving

Change-Id: I3bd37f8468c95a29ab3385dbc3ae825b76d8d3df
(cherry picked from commit bfb9eb550c4facb9aa6346a8d19f015cf5182668)

diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index d541e2e..af9c751 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-icu11100.patch.1 \
external/icu/icu4c-icu11131.patch.1 \
external/icu/icu4c-scriptrun.patch \
+   external/icu/icu4c-icu11451.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/icu/icu4c-icu11451.patch.1 
b/external/icu/icu4c-icu11451.patch.1
new file mode 100644
index 000..b15185a
--- /dev/null
+++ b/external/icu/icu4c-icu11451.patch.1
@@ -0,0 +1,11 @@
+--- icu/source/common/ubidi.c.orig 2014-12-19 10:23:38.103928414 +
 icu/source/common/ubidi.c  2014-12-19 10:26:58.370071527 +
+@@ -2146,7 +2146,7 @@
+ /* The isolates[] entries contain enough information to
+resume the bidi algorithm in the same state as it was
+when it was interrupted by an isolate sequence. */
+-if(dirProps[start]==PDI) {
++if(dirProps[start]==PDI && pBiDi->isolateCount >= 0) {
+ levState.startON=pBiDi->isolates[pBiDi->isolateCount].startON;
+ start1=pBiDi->isolates[pBiDi->isolateCount].start1;
+ stateImp=pBiDi->isolates[pBiDi->isolateCount].stateImp;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-19 Thread Caolán McNamara

 external/icu/UnpackedTarball_icu.mk |1 +
 external/icu/icu4c-icu11451.patch.1 |   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit bfb9eb550c4facb9aa6346a8d19f015cf5182668
Author: CaolÃ¡n McNamara 
Date:   Fri Dec 19 10:40:02 2014 +

icu#11451 bidi, the gift that keeps on giving

Change-Id: I3bd37f8468c95a29ab3385dbc3ae825b76d8d3df

diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index d541e2e..af9c751 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-icu11100.patch.1 \
external/icu/icu4c-icu11131.patch.1 \
external/icu/icu4c-scriptrun.patch \
+   external/icu/icu4c-icu11451.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/icu/icu4c-icu11451.patch.1 
b/external/icu/icu4c-icu11451.patch.1
new file mode 100644
index 000..b15185a
--- /dev/null
+++ b/external/icu/icu4c-icu11451.patch.1
@@ -0,0 +1,11 @@
+--- icu/source/common/ubidi.c.orig 2014-12-19 10:23:38.103928414 +
 icu/source/common/ubidi.c  2014-12-19 10:26:58.370071527 +
+@@ -2146,7 +2146,7 @@
+ /* The isolates[] entries contain enough information to
+resume the bidi algorithm in the same state as it was
+when it was interrupted by an isolate sequence. */
+-if(dirProps[start]==PDI) {
++if(dirProps[start]==PDI && pBiDi->isolateCount >= 0) {
+ levState.startON=pBiDi->isolates[pBiDi->isolateCount].startON;
+ start1=pBiDi->isolates[pBiDi->isolateCount].start1;
+ stateImp=pBiDi->isolates[pBiDi->isolateCount].stateImp;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-19 Thread Tor Lillqvist

 oox/source/ole/vbaproject.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 63b8d48b114762c69f739a2c00a94f020d62d31b
Author: Tor Lillqvist 
Date:   Fri Dec 19 12:40:00 2014 +0200

WaE: variable 'nModuleCount' set but not used

Change-Id: If7893fcfbac978710c664cfd013910ece77cda59

diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx
index d9baea0..8e5365f 100644
--- a/oox/source/ole/vbaproject.cxx
+++ b/oox/source/ole/vbaproject.cxx
@@ -331,7 +331,7 @@ void VbaProject::readVbaModules( StorageBase& rVbaPrjStrg )
 break;
 }
 }
-OSL_ENSURE( nModuleCount == maModules.size(), "VbaProject::importVba - 
invalid module count" );
+SAL_WARN_IF( nModuleCount != maModules.size(), "oox.ole", 
"VbaProject::importVba - invalid module count" );
 
 /*  The directory does not contain the real type of the modules, it
 distinguishes only between 'procedural' and 'document' (the latter
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-19 Thread Caolán McNamara

 sc/source/filter/oox/formulaparser.cxx |9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit e52bbff12c7a9f898a753229370fa0b621ba9003
Author: CaolÃ¡n McNamara 
Date:   Fri Dec 19 10:20:34 2014 +

WaE: -Werror=unused-but-set-variable

Change-Id: I885ff40b554774d47fbbda89e4ddaaa0ca2fda4d

diff --git a/sc/source/filter/oox/formulaparser.cxx 
b/sc/source/filter/oox/formulaparser.cxx
index 4b5a04e..8bba050 100644
--- a/sc/source/filter/oox/formulaparser.cxx
+++ b/sc/source/filter/oox/formulaparser.cxx
@@ -2844,12 +2844,9 @@ OUString FormulaParser::importOleTargetLink( 
SequenceInputStream& rStrm )
 sal_Int64 nFmlaEndPos = rStrm.tell() + ::std::max< sal_Int32 >( nFmlaSize, 
0 );
 if( (nFmlaSize == 7) && (rStrm.getRemaining() >= 7) )
 {
-sal_uInt8 nToken;
-sal_Int16 nRefId;
-sal_Int32 nNameId;
-nToken = rStrm.readuChar();
-nRefId = rStrm.readInt16();
-nNameId = rStrm.readInt32();
+sal_uInt8 nToken = rStrm.readuChar();
+sal_Int16 nRefId = rStrm.readInt16();
+rStrm.skip(4); //nNameId
 if( nToken == (BIFF_TOKCLASS_VAL|BIFF_TOKID_NAMEX) )
 aTargetLink = mxImpl->resolveOleTarget( nRefId, true );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-19 Thread Caolán McNamara

 sc/source/filter/excel/excform.cxx   |   12 
 sc/source/filter/excel/impop.cxx |   11 ++-
 sc/source/filter/excel/xicontent.cxx |   17 ++---
 sc/source/filter/excel/xiescher.cxx  |8 +++-
 sc/source/filter/excel/xiname.cxx|8 
 sc/source/filter/excel/xistring.cxx  |   15 ++-
 sc/source/filter/excel/xistyle.cxx   |   22 +-
 sc/source/filter/excel/xltools.cxx   |9 -
 8 files changed, 38 insertions(+), 64 deletions(-)

New commits:
commit 37639870152a666310654205c4def38867e50029
Author: CaolÃ¡n McNamara 
Date:   Fri Dec 19 10:06:50 2014 +

WaE: -Werror=unused-but-set-variable

Change-Id: I2c1dd24fa2215300255ae4e7d50b6cf990b6e843

diff --git a/sc/source/filter/excel/excform.cxx 
b/sc/source/filter/excel/excform.cxx
index 79c3373..11fd498 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -84,16 +84,12 @@ void ImportExcel::Formula3()
 void ImportExcel::Formula4()
 {
 XclAddress aXclPos;
-sal_uInt16  nXF, nFormLen;
-double  fCurVal;
-sal_uInt8   nFlag0;
 
 aIn >> aXclPos;
-nXF = aIn.ReaduInt16();
-fCurVal = aIn.ReadDouble();
-nFlag0 = aIn.ReaduInt8();
-aIn.Ignore( 1 );
-nFormLen = aIn.ReaduInt16();
+sal_uInt16 nXF = aIn.ReaduInt16();
+double fCurVal = aIn.ReadDouble();
+aIn.Ignore( 2 );
+sal_uInt16 nFormLen = aIn.ReaduInt16();
 
 Formula( aXclPos, nXF, nFormLen, fCurVal, false );
 }
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index 667c88a..b000fa0 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -835,15 +835,8 @@ void ImportExcel::Shrfmla( void )
 // The last FORMULA record should have left this data.
 return;
 
-sal_uInt16  nFirstRow, nLastRow, nLenExpr;
-sal_uInt8   nFirstCol, nLastCol;
-
-nFirstRow = aIn.ReaduInt16();
-nLastRow = aIn.ReaduInt16();
-nFirstCol = aIn.ReaduInt8();
-nLastCol = aIn.ReaduInt8();
-aIn.Ignore( 2 );
-nLenExpr = aIn.ReaduInt16();
+aIn.Ignore( 8 );
+sal_uInt16 nLenExpr = aIn.ReaduInt16();
 
 // read mark is now on the formula
 
diff --git a/sc/source/filter/excel/xicontent.cxx 
b/sc/source/filter/excel/xicontent.cxx
index 51e2f18..247e897 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -507,17 +507,12 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm )
 if( maRanges.empty() )
 return;
 
-sal_uInt8 nType(0), nOperator(0);
-sal_uInt16 nFmlaSize1(0), nFmlaSize2(0);
-sal_uInt32 nFlags(0);
-sal_uInt16 nFlagsExtended(0);
-
-nType = rStrm.ReaduInt8();
-nOperator = rStrm.ReaduInt8();
-nFmlaSize1 = rStrm.ReaduInt16();
-nFmlaSize2 = rStrm.ReaduInt16();
-nFlags = rStrm.ReaduInt32();
-nFlagsExtended = rStrm.ReaduInt16();
+sal_uInt8 nType = rStrm.ReaduInt8();
+sal_uInt8 nOperator = rStrm.ReaduInt8();
+sal_uInt16 nFmlaSize1 = rStrm.ReaduInt16();
+sal_uInt16 nFmlaSize2 = rStrm.ReaduInt16();
+sal_uInt32 nFlags = rStrm.ReaduInt32();
+rStrm.Ignore( 2 ); //nFlagsExtended
 
 // *** mode and comparison operator ***
 
diff --git a/sc/source/filter/excel/xiescher.cxx 
b/sc/source/filter/excel/xiescher.cxx
index b990a11..594f28c 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -3818,11 +3818,9 @@ XclImpDrawing::~XclImpDrawing()
 Graphic XclImpDrawing::ReadImgData( const XclImpRoot& rRoot, XclImpStream& 
rStrm )
 {
 Graphic aGraphic;
-sal_uInt16 nFormat, nEnv;
-sal_uInt32 nDataSize;
-nFormat = rStrm.ReaduInt16();
-nEnv = rStrm.ReaduInt16();
-nDataSize = rStrm.ReaduInt32();
+sal_uInt16 nFormat = rStrm.ReaduInt16();
+rStrm.Ignore( 2 );//nEnv
+sal_uInt32 nDataSize = rStrm.ReaduInt32();
 if( nDataSize <= rStrm.GetRecLeft() )
 {
 switch( nFormat )
diff --git a/sc/source/filter/excel/xiname.cxx 
b/sc/source/filter/excel/xiname.cxx
index 3a69c09..c1bee5a 100644
--- a/sc/source/filter/excel/xiname.cxx
+++ b/sc/source/filter/excel/xiname.cxx
@@ -47,7 +47,7 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 
nXclNameIdx ) :
 // 1) *** read data from stream *** ---
 
 sal_uInt16 nFlags = 0, nFmlaSize = 0, nExtSheet = EXC_NAME_GLOBAL;
-sal_uInt8 nNameLen = 0, nShortCut;
+sal_uInt8 nNameLen = 0;
 
 switch( GetBiff() )
 {
@@ -56,7 +56,7 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 
nXclNameIdx ) :
 sal_uInt8 nFlagsBiff2;
 nFlagsBiff2 = rStrm.ReaduInt8();
 rStrm.Ignore( 1 );
-nShortCut = rStrm.ReaduInt8();
+rStrm.Ignore( 1 ); //nShortCut
 nNameLen = rStrm.ReaduInt8();
 nFmlaSize = rStrm.ReaduInt8();
 ::set_flag( nFlags, EXC_NAME_FUNC, ::get_flag( nFlagsB

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

2014-12-19 Thread Caolán McNamara

 sc/source/filter/excel/xistring.cxx |6 +++---
 vcl/source/control/combobox.cxx |7 +--
 2 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 809e667b7c6c58269d7a060f80798aab1bd332b4
Author: CaolÃ¡n McNamara 
Date:   Fri Dec 19 09:52:39 2014 +

valgrind: initialize these

Change-Id: I6440832fe508689ffa8e20fa17827528331e3585
(cherry picked from commit 2645b1979365085edf4a94500f2c610bfc4e668b)

diff --git a/sc/source/filter/excel/xistring.cxx 
b/sc/source/filter/excel/xistring.cxx
index c4165dd..e04f4d5 100644
--- a/sc/source/filter/excel/xistring.cxx
+++ b/sc/source/filter/excel/xistring.cxx
@@ -118,7 +118,7 @@ void XclImpString::ReadFormats( XclImpStream& rStrm, 
XclFormatRunVec& rFormats,
 {
 for( sal_uInt16 nIdx = 0; nIdx < nRunCount; ++nIdx )
 {
-sal_uInt16 nChar, nFontIdx;
+sal_uInt16 nChar(0), nFontIdx(0);
 rStrm >> nChar >> nFontIdx;
 AppendFormat( rFormats, nChar, nFontIdx );
 }
@@ -127,7 +127,7 @@ void XclImpString::ReadFormats( XclImpStream& rStrm, 
XclFormatRunVec& rFormats,
 {
 for( sal_uInt16 nIdx = 0; nIdx < nRunCount; ++nIdx )
 {
-sal_uInt8 nChar, nFontIdx;
+sal_uInt8 nChar(0), nFontIdx(0);
 rStrm >> nChar >> nFontIdx;
 AppendFormat( rFormats, nChar, nFontIdx );
 }
@@ -142,7 +142,7 @@ void XclImpString::ReadObjFormats( XclImpStream& rStrm, 
XclFormatRunVec& rFormat
 rFormats.reserve( nRunCount );
 for( sal_uInt16 nIdx = 0; nIdx < nRunCount; ++nIdx )
 {
-sal_uInt16 nChar, nFontIdx;
+sal_uInt16 nChar(0), nFontIdx(0);
 rStrm >> nChar >> nFontIdx;
 rStrm.Ignore( 4 );
 AppendFormat( rFormats, nChar, nFontIdx );
commit c8fa0a856e1c9063e16159982b410f3d33942d9a
Author: CaolÃ¡n McNamara 
Date:   Thu Dec 18 15:24:05 2014 +

Resolves: rhbz#1175142 nStarts ends up as an invalid -1

Change-Id: Ic67c5562d0e9936cd6a524ecd4f798aaf885a6e8
(cherry picked from commit 1cd9420755dc5d5435bf564a992b727c455a3d73)
(cherry picked from commit 4e8ae0f8187a9d3fa77d737f5de248cfd9b0ed55)

diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index a5810f2..8620102 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -297,7 +297,7 @@ IMPL_LINK( ComboBox, ImplAutocompleteHdl, Edit*, pEdit )
 {
 OUStringaFullText = pEdit->GetText();
 OUStringaStartText = aFullText.copy( 0, (sal_Int32)aSel.Max() );
-sal_Int32  nStart = mpImplLB->GetCurrentPos();
+sal_Int32   nStart = mpImplLB->GetCurrentPos();
 
 if ( nStart == LISTBOX_ENTRY_NOTFOUND )
 nStart = 0;
@@ -308,7 +308,10 @@ IMPL_LINK( ComboBox, ImplAutocompleteHdl, Edit*, pEdit )
 else if ( eAction == AUTOCOMPLETE_TABBACKWARD )
 {
 bForward = false;
-nStart = nStart ? nStart - 1 : 
mpImplLB->GetEntryList()->GetEntryCount()-1;
+if (nStart)
+nStart = nStart - 1;
+else if (mpImplLB->GetEntryList()->GetEntryCount())
+nStart = mpImplLB->GetEntryList()->GetEntryCount()-1;
 }
 
 sal_Int32 nPos = LISTBOX_ENTRY_NOTFOUND;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-19 Thread Caolán McNamara

 sc/source/filter/excel/xistring.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 2645b1979365085edf4a94500f2c610bfc4e668b
Author: CaolÃ¡n McNamara 
Date:   Fri Dec 19 09:52:39 2014 +

valgrind: initialize these

Change-Id: I6440832fe508689ffa8e20fa17827528331e3585

diff --git a/sc/source/filter/excel/xistring.cxx 
b/sc/source/filter/excel/xistring.cxx
index c4165dd..e04f4d5 100644
--- a/sc/source/filter/excel/xistring.cxx
+++ b/sc/source/filter/excel/xistring.cxx
@@ -118,7 +118,7 @@ void XclImpString::ReadFormats( XclImpStream& rStrm, 
XclFormatRunVec& rFormats,
 {
 for( sal_uInt16 nIdx = 0; nIdx < nRunCount; ++nIdx )
 {
-sal_uInt16 nChar, nFontIdx;
+sal_uInt16 nChar(0), nFontIdx(0);
 rStrm >> nChar >> nFontIdx;
 AppendFormat( rFormats, nChar, nFontIdx );
 }
@@ -127,7 +127,7 @@ void XclImpString::ReadFormats( XclImpStream& rStrm, 
XclFormatRunVec& rFormats,
 {
 for( sal_uInt16 nIdx = 0; nIdx < nRunCount; ++nIdx )
 {
-sal_uInt8 nChar, nFontIdx;
+sal_uInt8 nChar(0), nFontIdx(0);
 rStrm >> nChar >> nFontIdx;
 AppendFormat( rFormats, nChar, nFontIdx );
 }
@@ -142,7 +142,7 @@ void XclImpString::ReadObjFormats( XclImpStream& rStrm, 
XclFormatRunVec& rFormat
 rFormats.reserve( nRunCount );
 for( sal_uInt16 nIdx = 0; nIdx < nRunCount; ++nIdx )
 {
-sal_uInt16 nChar, nFontIdx;
+sal_uInt16 nChar(0), nFontIdx(0);
 rStrm >> nChar >> nFontIdx;
 rStrm.Ignore( 4 );
 AppendFormat( rFormats, nChar, nFontIdx );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 79641] LibreOffice 4.4 most annoying bugs

2014-12-19 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=79641
Bug 79641 depends on bug 86552, which changed state.

Bug 86552 Summary: Segmentation fault when I press Ctrl-Z
https://bugs.freedesktop.org/show_bug.cgi?id=86552

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

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

[Libreoffice-commits] core.git: connectivity/qa javaunohelper/test qadevOOo/runner reportbuilder/java sot/qa svl/qa toolkit/test unoxml/qa wizards/com

2014-12-19 Thread Noel Grandin

 connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java 
 |4 ++--
 javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java   
 |2 +-
 qadevOOo/runner/complexlib/Assurance.java  
 |2 +-
 
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java
 |2 +-
 sot/qa/complex/olesimplestorage/OLESimpleStorageTest.java  
 |2 +-
 svl/qa/complex/passwordcontainer/PasswordContainerTest.java
 |2 +-
 toolkit/test/accessibility/SimpleOffice.java   
 |2 +-
 unoxml/qa/complex/unoxml/DOMTest.java  
 |4 ++--
 wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
 |2 +-
 wizards/com/sun/star/wizards/db/CommandMetaData.java   
 |4 ++--
 wizards/com/sun/star/wizards/document/Shape.java   
 |2 +-
 wizards/com/sun/star/wizards/document/TimeStampControl.java
 |2 +-
 wizards/com/sun/star/wizards/report/CallReportWizard.java  
 |2 +-
 wizards/com/sun/star/wizards/report/RecordTable.java   
 |6 +++---
 wizards/com/sun/star/wizards/report/ReportLayouter.java
 |6 +++---
 wizards/com/sun/star/wizards/table/FieldFormatter.java 
 |4 ++--
 wizards/com/sun/star/wizards/table/TableWizard.java
 |   10 +-
 wizards/com/sun/star/wizards/ui/FilterComponent.java   
 |6 +++---
 wizards/com/sun/star/wizards/ui/PeerConfig.java
 |6 +++---
 wizards/com/sun/star/wizards/ui/UnoDialog.java 
 |4 ++--
 wizards/com/sun/star/wizards/ui/event/DataAware.java   
 |2 +-
 21 files changed, 38 insertions(+), 38 deletions(-)

New commits:
commit 581d1e35f86077ce91a59ad3dc4760cda0b19071
Author: Noel Grandin 
Date:   Wed Dec 17 14:23:47 2014 +0200

java: reduce visibility of some methods and fields

found by UCDetector

Change-Id: I0a0a00d1fae1fed2e6aef198b7a1482d7e7e29f0

diff --git a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java 
b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
index 9658bca..ba9dcdf 100644
--- a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
+++ b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
@@ -100,8 +100,8 @@ public class TestCacheSize {
 private int deleteWhileInsertInterval = 1;
 
 // size of the tables used in test
-int bigrows   = 1;
-int smallrows = 0xfff;
+private int bigrows   = 1;
+private int smallrows = 0xfff;
 
 // if the extra table needs to be created and filled up
 private boolean multikeytable = false;
diff --git 
a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java 
b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
index 083e855..1e1359c 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
@@ -1624,7 +1624,7 @@ XPropertiesChangeListener
 int nChangeCalled;
 int nPropertiesChange;
 int nVetoCalled;
-int nDisposingCalled;
+private int nDisposingCalled;
 boolean bVeto= false;
 PropertyChangeEvent evt;
 PropertyChangeEvent[] arEvt;
diff --git a/qadevOOo/runner/complexlib/Assurance.java 
b/qadevOOo/runner/complexlib/Assurance.java
index f2169b0..9e7d269 100644
--- a/qadevOOo/runner/complexlib/Assurance.java
+++ b/qadevOOo/runner/complexlib/Assurance.java
@@ -134,7 +134,7 @@ public class Assurance
 assure(msg, false, cont);
 }
 
-public class AssureException extends RuntimeException {
+public static class AssureException extends RuntimeException {
 
 private AssureException(String msg) {
 super(msg);
diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java
 
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeRepeatingStructu

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

2014-12-19 Thread Caolán McNamara

 include/vcl/textdata.hxx |   15 +++
 vcl/source/edit/textdoc.cxx  |   80 -
 vcl/source/edit/textdoc.hxx  |   16 ++-
 vcl/source/edit/texteng.cxx  |   92 +--
 vcl/source/edit/textundo.cxx |8 +--
 vcl/source/edit/textview.cxx |   44 ++--
 6 files changed, 136 insertions(+), 119 deletions(-)

New commits:
commit d584db0f8972fe7d4593b3f1538a967798e0f0d5
Author: CaolÃ¡n McNamara 
Date:   Thu Dec 18 17:39:07 2014 +

Resolves: fdo#86552 undo want to take ownership of nodes, but can't

Revert "fdo#75757 remove inheritance from std::vector"

This reverts commit 63d8977f9fb0618d36dc8e0ee2f8068b1af92fe6.

Change-Id: Idc9902a77ee2c1cb21b9e3b477b2d960772a022e
(cherry picked from commit 68d87e98951ae3ed5f7b863954667bfdd9805985)

diff --git a/include/vcl/textdata.hxx b/include/vcl/textdata.hxx
index fe37fbd..6af42ee 100644
--- a/include/vcl/textdata.hxx
+++ b/include/vcl/textdata.hxx
@@ -150,6 +150,21 @@ struct TEIMEInfos
 void DestroyAttribs();
 };
 
+// -  Wrapper for old Tools List ---
+
+#include 
+#include 
+
+template  class ToolsList : public ::std::vector< T >
+{
+public:
+size_t Count() const { return ::std::vector< T >::size(); }
+size_t GetPos( T pObject ) const { return ( ::std::find( this->begin(), 
this->end(), pObject ) ) - this->begin(); }
+T  GetObject( size_t nIndex ) const { return (*this)[nIndex]; }
+void   Insert( T pObject, size_t nPos ) { ::std::vector< T >::insert( 
this->begin()+nPos, pObject ); }
+void   Remove( size_t nPos ) { ::std::vector< T >::erase( 
this->begin()+nPos ); }
+};
+
 #endif // INCLUDED_VCL_TEXTDATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx
index 324d81b..560284c 100644
--- a/vcl/source/edit/textdoc.cxx
+++ b/vcl/source/edit/textdoc.cxx
@@ -407,33 +407,38 @@ void TextNode::Append( const TextNode& rNode )
 }
 }
 
-bool TextNode::operator==(TextNode const& other) const
-{
-   return maText == other.maText && &maCharAttribs == &other.maCharAttribs;
-}
-
-
-
 TextDoc::TextDoc()
 {
 mnLeftMargin = 0;
 };
 
+TextDoc::~TextDoc()
+{
+DestroyTextNodes();
+}
+
 void TextDoc::Clear()
 {
+DestroyTextNodes();
+}
+
+void TextDoc::DestroyTextNodes()
+{
+for ( sal_uLong nNode = 0; nNode < maTextNodes.Count(); nNode++ )
+delete maTextNodes.GetObject( nNode );
 maTextNodes.clear();
 }
 
 OUString TextDoc::GetText( const sal_Unicode* pSep ) const
 {
-sal_uLong nNodes = maTextNodes.size();
+sal_uLong nNodes = maTextNodes.Count();
 
 OUString aASCIIText;
 sal_uLong nLastNode = nNodes-1;
 for ( sal_uLong nNode = 0; nNode < nNodes; nNode++ )
 {
-const TextNode& pNode = maTextNodes[ nNode ];
-OUString aTmp( pNode.GetText() );
+TextNode* pNode = maTextNodes.GetObject( nNode );
+OUString aTmp( pNode->GetText() );
 aASCIIText += aTmp;
 if ( pSep && ( nNode != nLastNode ) )
 aASCIIText += pSep;
@@ -446,8 +451,9 @@ OUString TextDoc::GetText( sal_uLong nPara ) const
 {
 OUString aText;
 
-if ( nPara < maTextNodes.size() )
-aText = maTextNodes[ nPara ].GetText();
+TextNode* pNode = ( nPara < maTextNodes.Count() ) ? maTextNodes.GetObject( 
nPara ) : 0;
+if ( pNode )
+aText = pNode->GetText();
 
 return aText;
 }
@@ -455,7 +461,7 @@ OUString TextDoc::GetText( sal_uLong nPara ) const
 sal_uLong TextDoc::GetTextLen( const sal_Unicode* pSep, const TextSelection* 
pSel ) const
 {
 sal_uLong nLen = 0;
-sal_uLong nNodes = maTextNodes.size();
+sal_uLong nNodes = maTextNodes.Count();
 if ( nNodes )
 {
 sal_uLong nStartNode = 0;
@@ -468,10 +474,10 @@ sal_uLong TextDoc::GetTextLen( const sal_Unicode* pSep, 
const TextSelection* pSe
 
 for ( sal_uLong nNode = nStartNode; nNode <= nEndNode; nNode++ )
 {
-const TextNode& pNode = maTextNodes[ nNode ];
+TextNode* pNode = maTextNodes.GetObject( nNode );
 
 sal_uInt16 nS = 0;
-sal_Int32 nE = pNode.GetText().getLength();
+sal_Int32 nE = pNode->GetText().getLength();
 if ( pSel && ( nNode == pSel->GetStart().GetPara() ) )
 nS = pSel->GetStart().GetIndex();
 if ( pSel && ( nNode == pSel->GetEnd().GetPara() ) )
@@ -489,11 +495,11 @@ sal_uLong TextDoc::GetTextLen( const sal_Unicode* pSep, 
const TextSelection* pSe
 
 TextPaM TextDoc::InsertText( const TextPaM& rPaM, sal_Unicode c )
 {
-DBG_ASSERT( c != 0x0A, "TextDoc::InsertText: Newline not allowed in 
paragraph!" );
-DBG_ASSERT( c != 0x0D, "TextDoc::InsertText: Newline not allowed in 
paragraph!" );
+DBG_ASSERT( c != 0x0A, "TextDoc::InsertText: Zeilentrenner in Absatz nicht 
erlaubt!" );
+DBG_ASSERT( c != 0x0D, "TextDoc::InsertText: Zei

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

2014-12-19 Thread Jan Holesovsky

 cui/source/dialogs/SpellDialog.cxx |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 40054ae87171ee4315ccc87761e198f0a2f64a34
Author: Jan Holesovsky 
Date:   Thu Dec 18 21:42:13 2014 +0100

spell dialog: Make [Close] work in protected documents with editable fields.

We have to call ToggleChildWindow directly; calling SfxDispatcher's 
Execute()
does not work here when we are in a document with protected section - in 
that
case, the cursor can move from the editable field to the protected area, and
the slots get disabled because of SW_DISABLE_ON_PROTECTED_CURSOR (see
FN_SPELL_GRAMMAR_DIALOG in .sdi).

Change-Id: I1c310c028aaaf774431d0b1e6bba10e901a8166d
Reviewed-on: https://gerrit.libreoffice.org/13531
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index 96b59dc..745fbd0 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -736,9 +736,13 @@ IMPL_LINK_NOARG(SpellDialog, IgnoreHdl)
 
 bool SpellDialog::Close()
 {
-GetBindings().GetDispatcher()->
-Execute(rParent.GetType(),
-SfxCallMode::ASYNCHRON|SfxCallMode::RECORD);
+// We have to call ToggleChildWindow directly; calling SfxDispatcher's
+// Execute() does not work here when we are in a document with protected
+// section - in that case, the cursor can move from the editable field to
+// the protected area, and the slots get disabled because of
+// SW_DISABLE_ON_PROTECTED_CURSOR (see FN_SPELL_GRAMMAR_DIALOG in .sdi).
+SfxViewFrame::Current()->ToggleChildWindow(rParent.GetType());
+
 return true;
 }
 
___
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-12-19 Thread Caolán McNamara

 include/vcl/textdata.hxx |   15 +++
 vcl/source/edit/textdoc.cxx  |   80 -
 vcl/source/edit/textdoc.hxx  |   16 ++-
 vcl/source/edit/texteng.cxx  |   92 +--
 vcl/source/edit/textundo.cxx |8 +--
 vcl/source/edit/textview.cxx |   44 ++--
 6 files changed, 136 insertions(+), 119 deletions(-)

New commits:
commit 68d87e98951ae3ed5f7b863954667bfdd9805985
Author: CaolÃ¡n McNamara 
Date:   Thu Dec 18 17:39:07 2014 +

Resolves: fdo#86552 undo want to take ownership of nodes, but can't

Revert "fdo#75757 remove inheritance from std::vector"

This reverts commit 63d8977f9fb0618d36dc8e0ee2f8068b1af92fe6.

Change-Id: Idc9902a77ee2c1cb21b9e3b477b2d960772a022e

diff --git a/include/vcl/textdata.hxx b/include/vcl/textdata.hxx
index fe37fbd..6af42ee 100644
--- a/include/vcl/textdata.hxx
+++ b/include/vcl/textdata.hxx
@@ -150,6 +150,21 @@ struct TEIMEInfos
 void DestroyAttribs();
 };
 
+// -  Wrapper for old Tools List ---
+
+#include 
+#include 
+
+template  class ToolsList : public ::std::vector< T >
+{
+public:
+size_t Count() const { return ::std::vector< T >::size(); }
+size_t GetPos( T pObject ) const { return ( ::std::find( this->begin(), 
this->end(), pObject ) ) - this->begin(); }
+T  GetObject( size_t nIndex ) const { return (*this)[nIndex]; }
+void   Insert( T pObject, size_t nPos ) { ::std::vector< T >::insert( 
this->begin()+nPos, pObject ); }
+void   Remove( size_t nPos ) { ::std::vector< T >::erase( 
this->begin()+nPos ); }
+};
+
 #endif // INCLUDED_VCL_TEXTDATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx
index 324d81b..560284c 100644
--- a/vcl/source/edit/textdoc.cxx
+++ b/vcl/source/edit/textdoc.cxx
@@ -407,33 +407,38 @@ void TextNode::Append( const TextNode& rNode )
 }
 }
 
-bool TextNode::operator==(TextNode const& other) const
-{
-   return maText == other.maText && &maCharAttribs == &other.maCharAttribs;
-}
-
-
-
 TextDoc::TextDoc()
 {
 mnLeftMargin = 0;
 };
 
+TextDoc::~TextDoc()
+{
+DestroyTextNodes();
+}
+
 void TextDoc::Clear()
 {
+DestroyTextNodes();
+}
+
+void TextDoc::DestroyTextNodes()
+{
+for ( sal_uLong nNode = 0; nNode < maTextNodes.Count(); nNode++ )
+delete maTextNodes.GetObject( nNode );
 maTextNodes.clear();
 }
 
 OUString TextDoc::GetText( const sal_Unicode* pSep ) const
 {
-sal_uLong nNodes = maTextNodes.size();
+sal_uLong nNodes = maTextNodes.Count();
 
 OUString aASCIIText;
 sal_uLong nLastNode = nNodes-1;
 for ( sal_uLong nNode = 0; nNode < nNodes; nNode++ )
 {
-const TextNode& pNode = maTextNodes[ nNode ];
-OUString aTmp( pNode.GetText() );
+TextNode* pNode = maTextNodes.GetObject( nNode );
+OUString aTmp( pNode->GetText() );
 aASCIIText += aTmp;
 if ( pSep && ( nNode != nLastNode ) )
 aASCIIText += pSep;
@@ -446,8 +451,9 @@ OUString TextDoc::GetText( sal_uLong nPara ) const
 {
 OUString aText;
 
-if ( nPara < maTextNodes.size() )
-aText = maTextNodes[ nPara ].GetText();
+TextNode* pNode = ( nPara < maTextNodes.Count() ) ? maTextNodes.GetObject( 
nPara ) : 0;
+if ( pNode )
+aText = pNode->GetText();
 
 return aText;
 }
@@ -455,7 +461,7 @@ OUString TextDoc::GetText( sal_uLong nPara ) const
 sal_uLong TextDoc::GetTextLen( const sal_Unicode* pSep, const TextSelection* 
pSel ) const
 {
 sal_uLong nLen = 0;
-sal_uLong nNodes = maTextNodes.size();
+sal_uLong nNodes = maTextNodes.Count();
 if ( nNodes )
 {
 sal_uLong nStartNode = 0;
@@ -468,10 +474,10 @@ sal_uLong TextDoc::GetTextLen( const sal_Unicode* pSep, 
const TextSelection* pSe
 
 for ( sal_uLong nNode = nStartNode; nNode <= nEndNode; nNode++ )
 {
-const TextNode& pNode = maTextNodes[ nNode ];
+TextNode* pNode = maTextNodes.GetObject( nNode );
 
 sal_uInt16 nS = 0;
-sal_Int32 nE = pNode.GetText().getLength();
+sal_Int32 nE = pNode->GetText().getLength();
 if ( pSel && ( nNode == pSel->GetStart().GetPara() ) )
 nS = pSel->GetStart().GetIndex();
 if ( pSel && ( nNode == pSel->GetEnd().GetPara() ) )
@@ -489,11 +495,11 @@ sal_uLong TextDoc::GetTextLen( const sal_Unicode* pSep, 
const TextSelection* pSe
 
 TextPaM TextDoc::InsertText( const TextPaM& rPaM, sal_Unicode c )
 {
-DBG_ASSERT( c != 0x0A, "TextDoc::InsertText: Newline not allowed in 
paragraph!" );
-DBG_ASSERT( c != 0x0D, "TextDoc::InsertText: Newline not allowed in 
paragraph!" );
+DBG_ASSERT( c != 0x0A, "TextDoc::InsertText: Zeilentrenner in Absatz nicht 
erlaubt!" );
+DBG_ASSERT( c != 0x0D, "TextDoc::InsertText: Zeilentrenner in Absatz nicht 
erlaubt!" );
 
-TextNode& pNode = maTextN

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-4.2-21'

2014-12-19 Thread Andras Timar

Tag 'cp-4.2-21' created by Andras Timar  at 
2014-12-19 09:44 -0800

cp-4.2-21

Changes since cp-4.2-20-16:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-4.2-21'

2014-12-19 Thread Christian Lohmaier

Tag 'cp-4.2-21' created by Andras Timar  at 
2014-12-19 09:44 -0800

cp-4.2-21

Changes since cp-4.2-19:
Christian Lohmaier (1):
  update translations for 4.2.8 rc1

---
 source/ar/sw/uiconfig/swriter/ui.po|   13 
 source/as/padmin/source.po |8 
 source/cs/officecfg/registry/data/org/openoffice/Office/UI.po  |8 
 source/da/cui/uiconfig/ui.po   |6 
 source/da/filter/source/config/fragments/filters.po|   12 
 source/da/helpcontent2/source/text/sbasic/shared.po|   14 
 source/da/helpcontent2/source/text/scalc/01.po |   12 
 source/da/helpcontent2/source/text/schart/01.po|   10 
 source/da/helpcontent2/source/text/shared/00.po|   10 
 source/da/helpcontent2/source/text/shared/01.po|   14 
 source/da/helpcontent2/source/text/shared/autopi.po|   10 
 source/da/helpcontent2/source/text/shared/explorer/database.po |   14 
 source/da/helpcontent2/source/text/simpress/01.po  |   14 
 source/da/helpcontent2/source/text/simpress/guide.po   |   16 
 source/da/helpcontent2/source/text/smath/01.po |   10 
 source/da/helpcontent2/source/text/smath/guide.po  |   10 
 source/da/helpcontent2/source/text/swriter/01.po   |8 
 source/da/helpcontent2/source/text/swriter/guide.po|   12 
 source/da/officecfg/registry/data/org/openoffice/Office/UI.po  |   10 
 source/da/scp2/source/writer.po|   10 
 source/da/sd/source/ui/app.po  |   10 
 source/da/sw/uiconfig/swriter/ui.po|   10 
 source/de/helpcontent2/source/text/shared/guide.po |   14 
 source/de/sw/uiconfig/swriter/ui.po|   10 
 source/gl/officecfg/registry/data/org/openoffice/Office/UI.po  |   10 
 source/gl/sc/source/ui/src.po  |   10 
 source/gl/sd/source/ui/view.po |   12 
 source/gl/sw/uiconfig/swriter/ui.po|   12 
 source/nl/cui/uiconfig/ui.po   |   12 
 source/nl/instsetoo_native/inc_openoffice/windows/msi_languages.po |   10 
 source/nl/officecfg/registry/data/org/openoffice/Office/UI.po  |   10 
 source/nl/sc/source/ui/src.po  |8 
 source/nl/svtools/uiconfig/ui.po   |   12 
 source/nl/svx/source/dialog.po |   10 
 source/nl/sw/uiconfig/swriter/ui.po|   10 
 source/nl/vcl/source/src.po|   10 
 source/ru/cui/uiconfig/ui.po   |   12 
 source/ru/helpcontent2/source/text/shared/optionen.po  |   10 
 source/sv/sc/source/ui/src.po  |6 
 source/th/basic/source/classes.po  |6 
 source/th/connectivity/source/resource.po  |   25 -
 source/th/cui/source/customize.po  |6 
 source/th/cui/uiconfig/ui.po   |   33 -
 source/th/dbaccess/source/ui/dlg.po|6 
 source/th/dbaccess/source/ui/querydesign.po|6 
 source/th/desktop/source/app.po|6 
 source/th/desktop/source/deployment/gui.po |6 
 source/th/extensions/source/scanner.po |   14 
 source/th/filter/uiconfig/ui.po|6 
 source/th/formula/source/ui/dlg.po |   14 
 source/th/instsetoo_native/inc_openoffice/windows/msi_languages.po |8 
 source/th/officecfg/registry/data/org/openoffice/Office/UI.po  |6 
 source/th/readlicense_oo/docs.po   |6 
 source/th/sc/source/ui/src.po  |  209 
--
 source/th/sc/uiconfig/scalc/ui.po  |   14 
 source/th/scp2/source/accessories.po   |   18 
 source/th/scp2/source/ooo.po   |   14 
 source/th/sd/source/ui/app.po  |7 
 source/th/sd/uiconfig/sdraw/ui.po  |8 
 source/th/sd/uiconfig/simpress/ui.po   |6 
 source/th/sfx2/uiconfig/ui.po  |7 
 source/th/svl/source/misc.po   |7 
 source/th/svx/uiconfig/ui.po   |   21 -
 source/th/sw/source/ui

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-4.2-21'

2014-12-19 Thread Olivier R

Tag 'cp-4.2-21' created by Andras Timar  at 
2014-12-19 09:44 -0800

cp-4.2-21

Changes since cp-4.2-9:
Olivier R (1):
  French dictionary update: v5.2

---
 fr_FR/README_fr.txt   |   13 
 fr_FR/description.xml |2 
 fr_FR/fr.aff  |14658 +++---
 fr_FR/fr.dic  |15695 ++
 4 files changed, 15644 insertions(+), 14724 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-4.2-21'

2014-12-19 Thread Zolnai Tamás

Tag 'cp-4.2-21' created by Andras Timar  at 
2014-12-19 09:44 -0800

cp-4.2-21

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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sc/source

2014-12-19 Thread Eike Rathke

 sc/source/filter/xml/xmlfilti.cxx |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 06d8c19dd093a6ea0b63288ae45531c4358e31fc
Author: Eike Rathke 
Date:   Fri Dec 12 14:49:09 2014 +0100

resolved fdo#86809 connect filter conditions correctly

Maybe since 0960ec3e1b7b0d872d1f84d2d56f480a4df08b21 all conditions of a
single filter stack were OR connected, regardless whether filter-and was
given in the file.

Change-Id: Ifb423ccc7deb42bb6bba0bfc810607633f2c342c
(cherry picked from commit b500e60b32b5cf8fd61beb7476c2c29e65aee3e4)
Reviewed-on: https://gerrit.libreoffice.org/13450
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sc/source/filter/xml/xmlfilti.cxx 
b/sc/source/filter/xml/xmlfilti.cxx
index 34327eb..03cfdfd 100644
--- a/sc/source/filter/xml/xmlfilti.cxx
+++ b/sc/source/filter/xml/xmlfilti.cxx
@@ -178,12 +178,19 @@ bool ScXMLFilterContext::GetConnection()
 // secondary item gets the current connection.
 return rItem.mbOr;
 
+// The next condition of this stack will get the current connection.
+++rItem.mnCondCount;
+
 if (maConnStack.size() < 2)
 // There is no last stack.  Likely the first condition in the first
-// stack whose connection is not used.
-return true;
+// stack whose connection is not used.  Default in
+// ScQueryEntry::eConnect is SC_AND, so return false (AND instead of
+// OR) here. Otherwise, when saving the document again, we'd write a
+// uselessly stacked
+// 
...
+// for two conditions connected with AND.
+return false;
 
-++rItem.mnCondCount;
 std::vector::reverse_iterator itr = maConnStack.rbegin();
 ++itr;
 return itr->mbOr; // connection of the last stack.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-19 Thread Noel Grandin

 oox/source/ole/vbaproject.cxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 5214b96a10fed8147e5801f13bdc463e8ad0f430
Author: Noel Grandin 
Date:   Fri Dec 19 11:09:56 2014 +0200

defining a macro for two lines of code introduces more noise

.. than it solve

Change-Id: Ic60021aa428289fffb26bc349425e9b8be520d0a

diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx
index cb737d7..d9baea0 100644
--- a/oox/source/ole/vbaproject.cxx
+++ b/oox/source/ole/vbaproject.cxx
@@ -293,10 +293,9 @@ void VbaProject::readVbaModules( StorageBase& rVbaPrjStrg )
 sal_Int32 nRecSize = aRecData.getLength();
 switch( nRecId )
 {
-#define OOX_ENSURE_RECORDSIZE( cond ) OSL_ENSURE( cond, "VbaProject::importVba 
- invalid record size" )
 case VBA_ID_PROJECTCODEPAGE:
 {
-OOX_ENSURE_RECORDSIZE( nRecSize == 2 );
+OSL_ENSURE( nRecSize == 2, "VbaProject::importVba - invalid 
record size" );
 OSL_ENSURE( maModules.empty(), "VbaProject::importVba - 
unexpected PROJECTCODEPAGE record" );
 rtl_TextEncoding eNewTextEnc = 
rtl_getTextEncodingFromWindowsCodePage( aRecStrm.readuInt16() );
 OSL_ENSURE( eNewTextEnc != RTL_TEXTENCODING_DONTKNOW, 
"VbaProject::importVba - unknown text encoding" );
@@ -313,7 +312,7 @@ void VbaProject::readVbaModules( StorageBase& rVbaPrjStrg )
 }
 break;
 case VBA_ID_PROJECTMODULES:
-OOX_ENSURE_RECORDSIZE( nRecSize == 2 );
+OSL_ENSURE( nRecSize == 2, "VbaProject::importVba - invalid 
record size" );
 OSL_ENSURE( maModules.empty(), "VbaProject::importVba - 
unexpected PROJECTMODULES record" );
 nModuleCount = aRecStrm.readuInt16();
 break;
@@ -330,7 +329,6 @@ void VbaProject::readVbaModules( StorageBase& rVbaPrjStrg )
 maModulesByStrm[ rxModule->getStreamName() ] = rxModule;
 }
 break;
-#undef OOX_ENSURE_RECORDSIZE
 }
 }
 OSL_ENSURE( nModuleCount == maModules.size(), "VbaProject::importVba - 
invalid module count" );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cppuhelper/qa cppu/qa salhelper/qa sal/qa

2014-12-19 Thread Stephan Bergmann

 cppu/qa/checkapi/strings.cxx   |   30 --
 cppuhelper/qa/checkapi/strings.cxx |   30 --
 sal/qa/checkapi/strings.cxx|   31 ---
 salhelper/qa/checkapi/strings.cxx  |   30 --
 4 files changed, 121 deletions(-)

New commits:
commit d269b9ab6a035423b7e4195b4eccf723912e12a5
Author: Stephan Bergmann 
Date:   Fri Dec 19 10:06:42 2014 +0100

Remove unused */qa/checkapi/

...superseded by CppunitTest_odk_checkapi

Change-Id: I5df89a1a12f496984deab153f0ba2734323c1293

diff --git a/cppu/qa/checkapi/strings.cxx b/cppu/qa/checkapi/strings.cxx
deleted file mode 100644
index 0d35912..000
--- a/cppu/qa/checkapi/strings.cxx
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-// The whole purpose of this test is to check that public cppu/ headers
-// build even without RTL_USING (which enables using e.g. rtl::OUString
-// without to refer to the rtl namespace, which is not wanted
-// in public API). If there are build errors here, check the headers
-// for uses of such types.
-
-#ifdef RTL_USING
-#error Build system problem, RTL_USING using should not be set here.
-#endif
-
-#include "cppu_allheaders.hxx"
-
-// This module contains no tests, this is for the build system.
-#include 
-CPPUNIT_PLUGIN_IMPLEMENT();
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL firstfunc( sal_Bool bRes )
-{
-   return ( bRes = sal_True );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/qa/checkapi/strings.cxx 
b/cppuhelper/qa/checkapi/strings.cxx
deleted file mode 100644
index 9a5c65a..000
--- a/cppuhelper/qa/checkapi/strings.cxx
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-// The whole purpose of this test is to check that public cppuhelper/ headers
-// build even without RTL_USING (which enables using e.g. rtl::OUString
-// without to refer to the rtl namespace, which is not wanted
-// in public API). If there are build errors here, check the headers
-// for uses of such types.
-
-#ifdef RTL_USING
-#error Build system problem, RTL_USING using should not be set here.
-#endif
-
-#include "cppuhelper_allheaders.hxx"
-
-// This module contains no tests, this is for the build system.
-#include 
-CPPUNIT_PLUGIN_IMPLEMENT();
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL firstfunc( sal_Bool bRes )
-{
-   return ( bRes = sal_True );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/checkapi/strings.cxx b/sal/qa/checkapi/strings.cxx
deleted file mode 100644
index 9e11ea2..000
--- a/sal/qa/checkapi/strings.cxx
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-// The whole purpose of this test is to check that public sal/ headers
-// build even without RTL_USING (which enables using e.g. rtl::OUString
-// without to refer to the rtl namespace, which is not wanted
-// in public API). If there are build errors here, check the headers
-// for uses of such types.
-
-#ifdef RTL_USING
-#error Build system problem, RTL_USING using should not be set here.
-#endif
-
-// This module contains no tests, this is for the build system.
-#include 
-
-#include "sal_allheaders.hxx"
-
-CPPUNIT_PLUGIN_IMPLEMENT();
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL firstfunc( sal_Bool )
-{
-   return sal_True;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/qa/checkapi/strings.cxx 
b/salhelper/qa/checkapi/strings.cxx
deleted file mode 100644
index 6b63430..000
--- a/salhelper/qa/checkapi/strings.cxx
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-// The whole purpose of this test is to check that public sa

[Libreoffice-commits] core.git: 4 commits - compilerplugins/clang desktop/source extensions/source ucb/source

2014-12-19 Thread Stephan Bergmann

 compilerplugins/clang/literalalternative.cxx |  111 --
 compilerplugins/clang/stringconstant.cxx | 1096 +++
 desktop/source/lib/init.cxx  |2 
 extensions/source/plugin/base/xplugin.cxx|6 
 ucb/source/ucp/gio/gio_content.cxx   |4 
 ucb/source/ucp/gio/gio_provider.cxx  |2 
 6 files changed, 1103 insertions(+), 118 deletions(-)

New commits:
commit 2a52591bfe10c651c9eba66cb44ed7675f5fba26
Author: Stephan Bergmann 
Date:   Fri Dec 19 10:03:39 2014 +0100

Extend loplugin:literalalternative to loplugin:stringconstant

Change-Id: Ie425af19019126b6a15ac03f52e32d186a46db35

diff --git a/compilerplugins/clang/literalalternative.cxx 
b/compilerplugins/clang/literalalternative.cxx
deleted file mode 100644
index 0d29e0d..000
--- a/compilerplugins/clang/literalalternative.cxx
+++ /dev/null
@@ -1,111 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include 
-
-#include "plugin.hxx"
-
-// Find those calls of rtl::OUString::equalsIgnoreAsciiCaseAscii and
-// rtl::OUString::equalsIgnoreAsciiCaseAsciiL that could be simplified to call
-// rtl::OUString::equalsIgnoreAsciiCase instead:
-
-namespace {
-
-class LiteralAlternative:
-public RecursiveASTVisitor, public loplugin::Plugin
-{
-public:
-explicit LiteralAlternative(InstantiationData const & data): Plugin(data) 
{}
-
-virtual void run() override { 
TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
-
-bool VisitCallExpr(const CallExpr * expr);
-};
-
-bool LiteralAlternative::VisitCallExpr(const CallExpr * expr) {
-if (ignoreLocation(expr)) {
-return true;
-}
-FunctionDecl const * fdecl = expr->getDirectCallee();
-if (fdecl == nullptr) {
-return true;
-}
-std::string qname { fdecl->getQualifiedNameAsString() };
-if (qname == "rtl::OUString::equalsIgnoreAsciiCaseAscii"
-&& fdecl->getNumParams() == 1 && expr->getNumArgs() == 1)
-{
-// equalsIgnoreAsciiCaseAscii("foo") -> equalsIngoreAsciiCase("foo"):
-StringLiteral const * lit
-= dyn_cast(expr->getArg(0)->IgnoreParenImpCasts());
-if (lit != nullptr) {
-report(
-DiagnosticsEngine::Warning,
-("rewrite call of rtl::OUString::equalsIgnoreAsciiCaseAscii"
- " with string literal argument as call of"
- " rtl::OUString::equalsIgnoreAsciiCase"),
-expr->getExprLoc());
-//TODO: a better loc (the "equalsIgnoreAsciiCaseAscii" part)?
-}
-return true;
-}
-if (qname == "rtl::OUString::equalsIgnoreAsciiCaseAsciiL"
-&& fdecl->getNumParams() == 2 && expr->getNumArgs() == 2)
-{
-// equalsIgnoreAsciiCaseAsciiL("foo", 3) -> 
equalsIngoreAsciiCase("foo")
-// especially also for
-// equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("foo")), 
where
-// RTL_CONSTASCII_STRINGPARAM expands to complicated expressions
-// involving (&(X)[0] sub-expressions (and it might or might not be
-// better to handle that at the level of non-expanded macros instead,
-// but I have not found out how to do that yet anyway):
-APSInt res;
-if (expr->getArg(1)->isIntegerConstantExpr(res, 
compiler.getASTContext())) {
-Expr const * arg0 = expr->getArg(0)->IgnoreParenImpCasts();
-StringLiteral const * lit = dyn_cast(arg0);
-bool match = false;
-if (lit != nullptr) {
-match = res == lit->getLength();
-} else {
-UnaryOperator const * op = dyn_cast(arg0);
-if (op != nullptr && op->getOpcode() == UO_AddrOf) {
-ArraySubscriptExpr const * subs
-= dyn_cast(
-op->getSubExpr()->IgnoreParenImpCasts());
-if (subs != nullptr) {
-lit = dyn_cast(
-subs->getBase()->IgnoreParenImpCasts());
-match = lit != nullptr
-&& subs->getIdx()->isIntegerConstantExpr(
-res, compiler.getASTContext())
-&& res == 0;
-}
-}
-}
-if (match) {
-report(
-DiagnosticsEngine::Warning,
-("rewrite call of"
- " rtl::OUString::equalsIgnoreAsciiCaseAsciiL with string"
- " literal and matching length arguments as call of"
- " rtl::OUString::equalsIg

[Libreoffice-commits] core.git: 2 commits - android/experimental

2014-12-19 Thread Tomaž Vajngerl

 
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
 |   14 
 
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java
|   16 +-
 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java  
  |   11 ++
 3 files changed, 7 insertions(+), 34 deletions(-)

New commits:
commit 3860bff1013f9608b934c4cdb9ddb8d2dbbc3e52
Author: TomaÅ¾ Vajngerl 
Date:   Fri Dec 19 16:25:23 2014 +0900

android: never use TextureView for now (for performance reasons)

Get align with latest Fennec code which also has this disabled.

Change-Id: Ie4c27935bacd29218207e47593f073bdce0cf7e3

diff --git 
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java 
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
index db5c110..b59bba8 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
@@ -40,7 +40,7 @@ import java.nio.IntBuffer;
  * Note that LayerView is accessed by Robocop via reflection.
  */
 public class LayerView extends FrameLayout {
-private static String LOGTAG = "GeckoLayerView";
+private static String LOGTAG = LayerView.class.getName();
 
 private GeckoLayerClient mLayerClient;
 private TouchEventHandler mTouchEventHandler;
@@ -65,7 +65,7 @@ public class LayerView extends FrameLayout {
 
 boolean shouldUseTextureView() {
 // we can only use TextureView on ICS or higher
-if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+/*if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
 Log.i(LOGTAG, "Not using TextureView: not on ICS+");
 return false;
 }
@@ -77,7 +77,8 @@ public class LayerView extends FrameLayout {
 } catch (Exception e) {
 Log.i(LOGTAG, "Not using TextureView: caught exception checking 
for hw accel: " + e.toString());
 return false;
-}
+}*/
+return false;
 }
 
 public LayerView(Context context, AttributeSet attrs) {
commit 96a498b44c0a0ca48ac9938d9414191850d47d18
Author: TomaÅ¾ Vajngerl 
Date:   Fri Dec 19 16:24:02 2014 +0900

android: remove screenshot layer

Change-Id: Ic2f0344bab4280fd3c55923707d100f87585199a

diff --git 
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
 
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
index faa7d4e..c3535e5 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
@@ -78,7 +78,6 @@ public class GeckoLayerClient implements PanZoomTarget, 
LayerView.Listener {
 
 /* The new color for the checkerboard. */
 private int mCheckerboardColor;
-private boolean mCheckerboardShouldShowChecks;
 
 private final PanZoomController mPanZoomController;
 private LayerView mView;
@@ -98,7 +97,6 @@ public class GeckoLayerClient implements PanZoomTarget, 
LayerView.Listener {
 mViewportMetrics = new ImmutableViewportMetrics(displayMetrics);
 mZoomConstraints = new ZoomConstraints(false);
 mCheckerboardColor = Color.WHITE;
-mCheckerboardShouldShowChecks = true;
 
 mPanZoomController = PanZoomController.Factory.create(this);
 }
@@ -249,10 +247,6 @@ public class GeckoLayerClient implements PanZoomTarget, 
LayerView.Listener {
 }
 }
 
-boolean checkerboardShouldShowChecks() {
-return mCheckerboardShouldShowChecks;
-}
-
 int getCheckerboardColor() {
 return mCheckerboardColor;
 }
@@ -454,14 +448,6 @@ public class GeckoLayerClient implements PanZoomTarget, 
LayerView.Listener {
 return layerPoint;
 }
 
-/**
- * Sets whether or not the checkerboard should show checkmarks.
- */
-public void setCheckerboardShowChecks(boolean showChecks) {
-mCheckerboardShouldShowChecks = showChecks;
-mView.requestRender();
-}
-
 public ImmutableViewportMetrics getGeckoViewportMetrics() {
 return mGeckoViewport;
 }
diff --git 
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java
 
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java
index 64d3a5d..7b4ead3 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java
@@ -593,20 +593,10 @@ public class LayerRenderer implements 
GLSurfaceView.Renderer {
 if (!untransformedPageRect.contains(mFrameMetrics.getViewport()))
 mShadowLayer.draw(mPageContext);
 
-/* Draw the 'checkerboard'. We use gfx.show_che

[Libreoffice-commits] core.git: bin/lo-all-static-libs

2014-12-19 Thread Tor Lillqvist

 bin/lo-all-static-libs |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 45e8d96df39f45a7fe7b56f8d0f8fc181b0f1e46
Author: Tor Lillqvist 
Date:   Fri Dec 19 10:42:35 2014 +0200

Fix fallout from a2e4be6ded508030a6c2a33919cbe8cb504382e0

Should fix build for iOS. There is no liblibotouch.a any more, and the only
library in $WORKDIR/LinkTarget/Library turns out to be the Android-only
liblo-bootstrap.a now.

Change-Id: Ia7b2f43db06536c05caee8d99130f44d5288705e

diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index bbe950c..8cef486 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -39,6 +39,8 @@ ANDROID)
 oslibs="$WORKDIR/UnpackedTarball/curl/lib/.libs/*.a"
 oslibs="$oslibs 
$WORKDIR/UnpackedTarball/fontconfig/src/.libs/libfontconfig.a"
 oslibs="$oslibs $WORKDIR/UnpackedTarball/freetype/objs/.libs/libfreetype.a"
+# Only liblo-bootstrap.a ends up here:
+oslibs="$oslibs $WORKDIR/LinkTarget/Library/lib*.a"
 ;;
 IOS)
 oslibs="$WORKDIR/UnpackedTarball/icu/source/stubdata/*.a"
@@ -64,7 +66,6 @@ esac
 echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
  $foolibs \
  $WORKDIR/LinkTarget/StaticLibrary/lib*.a \
- $WORKDIR/LinkTarget/Library/lib*.a \
  $oslibs \
  $nsslibs \
  $WORKDIR/UnpackedTarball/coinmp/Cbc/src/.libs/*.a \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 14 commits - bean/com bridges/test connectivity/qa filter/qa forms/qa framework/qa nlpsolver/src qadevOOo/runner qadevOOo/tests scripting/java toolkit/test ucb/qa unoxm

2014-12-19 Thread Noel Grandin

 bean/com/sun/star/comp/beans/OOoBean.java  
|   10 -
 bridges/test/java_uno/equals/TestEquals.java   
|1 
 connectivity/qa/complex/connectivity/DBaseDriverTest.java  
|2 
 filter/qa/complex/filter/misc/FinalizedMandatoryTest.java  
|2 
 filter/qa/complex/filter/misc/TypeDetection6FileFormat.java
|2 
 forms/qa/integration/forms/TableCellTextBinding.java   
|   13 --
 framework/qa/complex/XUserInputInterception/EventTest.java 
|3 
 framework/qa/complex/api_internal/CheckAPI.java
|2 
 framework/qa/complex/imageManager/CheckImageManager.java   
|2 
 framework/qa/complex/imageManager/_XComponent.java 
|6 -
 framework/qa/complex/imageManager/_XInitialization.java
|4 
 framework/qa/complex/imageManager/_XTypeProvider.java  
|7 -
 framework/qa/complex/path_substitution/PathSubstitutionTest.java   
|2 
 nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java  
|2 
 qadevOOo/runner/base/java_fat.java 
|8 -
 qadevOOo/runner/complexlib/ComplexTestCase.java
|4 
 qadevOOo/runner/helper/ProcessHandler.java 
|   60 --
 qadevOOo/runner/stats/InternalLogWriter.java   
|   34 +
 qadevOOo/runner/util/db/DatabaseDocument.java  
|5 
 qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java   
|3 
 qadevOOo/tests/java/ifc/document/_XEventBroadcaster.java   
|4 
 qadevOOo/tests/java/ifc/lang/_XComponent.java  
|2 
 qadevOOo/tests/java/ifc/linguistic2/_XAvailableLocales.java
|3 
 qadevOOo/tests/java/ifc/linguistic2/_XSupportedLocales.java
|2 
 qadevOOo/tests/java/ifc/table/_XCellCursor.java
|5 
 qadevOOo/tests/java/ifc/text/_NumberingLevel.java  
|   10 -
 qadevOOo/tests/java/mod/_acceptor/Acceptor.java
|2 
 qadevOOo/tests/java/mod/_remotebridge/uno/various.java 
|1 
 qadevOOo/tests/java/mod/_remotebridge/various.java 
|1 
 scripting/java/com/sun/star/script/framework/io/XStorageHelper.java
|2 
 toolkit/test/accessibility/EventQueue.java 
|3 
 toolkit/test/accessibility/NodeHandler.java
|2 
 toolkit/test/accessibility/TextLogger.java 
|5 
 ucb/qa/complex/tdoc/_XComponent.java   
|2 
 unoxml/qa/complex/unoxml/RDFRepositoryTest.java
|2 
 vcl/qa/complex/memCheck/CheckMemoryUsage.java  
|2 
 wizards/com/sun/star/wizards/common/Resource.java  
|   16 --
 wizards/com/sun/star/wizards/db/QueryMetaData.java 
|7 -
 wizards/com/sun/star/wizards/db/TypeInspector.java 
|6 -
 wizards/com/sun/star/wizards/document/Control.java 
|3 
 wizards/com/sun/star/wizards/document/FormHandler.java 
|3 
 wizards/com/sun/star/wizards/document/GridControl.java 
|9 -
 wizards/com/sun/star/wizards/document/TimeStampControl.java
|6 -
 wizards/com/sun/star/wizards/form/Finalizer.java   
|3 
 wizards/com/sun/star/wizards/form/FormConfiguration.java   
|3 
 wizards/com/sun/star/wizards/report/Dataimport.java
|8 -
 wizards/com/sun/star/wizards/report/ReportFinalizer.java   
|3 
 wizards/com/sun/star/wizards/table/CGCategory.java 
|3 
 wizards/com/sun/star/wizards/table/CGTable.java
|3 
 wizards/com/sun/star

[Libreoffice-commits] core.git: android/experimental

2014-12-19 Thread Miklos Vajna

 android/experimental/LOAndroid3/res/values/arrays.xml  
  |9 ++---
 android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java 
  |9 ++---
 
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
 |4 ++--
 3 files changed, 14 insertions(+), 8 deletions(-)

New commits:
commit 0897aae2c7759015a5b71d705240ac00ce5ddedd
Author: Miklos Vajna 
Date:   Fri Dec 19 09:38:42 2014 +0100

android doc browser: hide Calc filter, add Draw filter

Hide Calc filter, as ATM Calc documents are not supported. Draw filter
was just missing, add it.

Change-Id: I88b9e48319e584f1c86de1b970badcdd695f30ed

diff --git a/android/experimental/LOAndroid3/res/values/arrays.xml 
b/android/experimental/LOAndroid3/res/values/arrays.xml
index 0d698c7..2263b47 100644
--- a/android/experimental/LOAndroid3/res/values/arrays.xml
+++ b/android/experimental/LOAndroid3/res/values/arrays.xml
@@ -30,13 +30,16 @@
 1
 
 
-
+
 
 EVERYTHING
 DOCUMENTS
-SPREADSHEETS
+
 PRESENTATIONS
+DRAWINGS
 
+
 
 Everything
 Documents
@@ -53,4 +56,4 @@
 
 
 
-
\ No newline at end of file
+
diff --git 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java
 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java
index baff933..3c67947 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java
@@ -21,10 +21,13 @@ import android.util.Log;
 
 public class FileUtilities {
 static final int ALL = -1;
+
+// These have to be in sync with the file_view_modes resource.
 static final int DOC = 0;
-static final int CALC = 1;
-static final int IMPRESS = 2;
-static final int DRAWING = 3;
+// static final int CALC = 1;
+static final int IMPRESS = 1;
+static final int DRAWING = 2;
+
 static final int UNKNOWN = 10;
 
 static final int SORT_AZ = 0;
diff --git 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
index 22f7b9b..d0470e7 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
@@ -127,9 +127,9 @@ public class GridItemAdapter extends BaseAdapter {
 }
 imageView.setImageResource(R.drawable.writer);
 break;
-case FileUtilities.CALC:
+/*case FileUtilities.CALC:
 imageView.setImageResource(R.drawable.calc);
-break;
+break;*/
 case FileUtilities.DRAWING: // FIXME: only for now ...
 case FileUtilities.IMPRESS:
 imageView.setImageResource(R.drawable.impress);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-19 Thread Renato Ferreira

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7524621ba4ccc054e8b2988826843eeff590a007
Author: Renato Ferreira 
Date:   Thu Dec 18 12:53:15 2014 -0500

Adjusted CppunitTest_sw_ooxmlexport for Mac Retina 13"

Change-Id: I208064aef57e0ef4b149183869f0908580e189f1
Reviewed-on: https://gerrit.libreoffice.org/13528
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 3de0747..2109a7f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -485,7 +485,7 @@ DECLARE_OOXMLEXPORT_TEST(testCropPixel, "crop-pixel.docx")
 // This is 17667 in the original document, was 504666 (so the image
 // become invisible), now is around 19072.
 (void) pXmlDoc;
-CPPUNIT_ASSERT(getXPath(pXmlDoc, "//a:srcRect", "l").toInt32() <= 
21856);
+CPPUNIT_ASSERT(getXPath(pXmlDoc, "//a:srcRect", "l").toInt32() <= 
22452);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-19 Thread Miklos Vajna

 include/test/mtfxmldump.hxx |4 ++--
 sw/inc/fmtcntnt.hxx |2 ++
 sw/qa/extras/uiwriter/uiwriter.cxx  |2 +-
 sw/source/core/docnode/nodedump.cxx |   10 +++---
 sw/source/core/layout/atrfrm.cxx|8 
 test/source/mtfxmldump.cxx  |7 ---
 6 files changed, 20 insertions(+), 13 deletions(-)

New commits:
commit 9071c5070cbcf6bba00285cdd9b062e961a10287
Author: Miklos Vajna 
Date:   Fri Dec 19 09:04:41 2014 +0100

Factor out SwFmtCntnt::dumpAsXml() from nodedump

Change-Id: I6adcaa8534efefa474d489125d3fb95f150e3e89

diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx
index c4efe4f..a33b545 100644
--- a/sw/inc/fmtcntnt.hxx
+++ b/sw/inc/fmtcntnt.hxx
@@ -44,6 +44,8 @@ public:
 
 const SwNodeIndex *GetCntntIdx() const { return pStartNode; }
 void SetNewCntntIdx( const SwNodeIndex *pIdx );
+
+void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
 
 inline const SwFmtCntnt &SwAttrSet::GetCntnt(bool bInP) const
diff --git a/sw/source/core/docnode/nodedump.cxx 
b/sw/source/core/docnode/nodedump.cxx
index f6cd7f8..c0cda75 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -423,6 +423,9 @@ void lcl_dumpSfxItemSet(WriterHelper& writer, const 
SfxItemSet* pSet)
 case RES_CHRATR_FONTSIZE:
 static_cast(pItem)->dumpAsXml(writer);
 break;
+case RES_CNTNT:
+static_cast(pItem)->dumpAsXml(writer);
+break;
 default: bDone = false; break;
 }
 if (bDone)
@@ -437,13 +440,6 @@ void lcl_dumpSfxItemSet(WriterHelper& writer, const 
SfxItemSet* pSet)
 boost::optional oValue;
 switch (pItem->Which())
 {
-case RES_CNTNT:
-{
-pWhich = "content";
-const SwFmtCntnt* pCntnt = static_cast(pItem);
-oValue = "node index: " + 
OString::number(pCntnt->GetCntntIdx()->GetNode().GetIndex());
-break;
-}
 case RES_FRM_SIZE:
 {
 pWhich = "frame size";
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 43f..dbf0caa 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -555,6 +555,14 @@ SfxPoolItem*  SwFmtCntnt::Clone( SfxItemPool* ) const
 return new SwFmtCntnt( *this );
 }
 
+void SwFmtCntnt::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtCntnt"));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), 
BAD_CAST(OString::number(Which()).getStr()));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST("startNode"), 
BAD_CAST(OString::number(pStartNode->GetNode().GetIndex()).getStr()));
+xmlTextWriterEndElement(pWriter);
+}
+
 // Partially implemented inline in hxx
 SwFmtPageDesc::SwFmtPageDesc( const SwFmtPageDesc &rCpy )
 : SfxPoolItem( RES_PAGEDESC ),
commit 93bb2101197c1ff64a5cc3ab9ffa64f66c0d9641
Author: Miklos Vajna 
Date:   Fri Dec 19 09:04:31 2014 +0100

Let MetafileXmlDump::dumpAndParse() take a const GDIMetaFile

So the const_cast<> in CppunitTest_sw_uiwriter can go away.

Change-Id: Id7d4234154cd6bed43cb5270b50208061038dcf7

diff --git a/include/test/mtfxmldump.hxx b/include/test/mtfxmldump.hxx
index 997d023..5c21765 100644
--- a/include/test/mtfxmldump.hxx
+++ b/include/test/mtfxmldump.hxx
@@ -23,7 +23,7 @@ class OOO_DLLPUBLIC_TEST MetafileXmlDump
 {
 std::vector maFilter;
 
-void writeXml(GDIMetaFile& rMetaFile, XmlWriter& rWriter);
+void writeXml(const GDIMetaFile& rMetaFile, XmlWriter& rWriter);
 
 public:
 MetafileXmlDump();
@@ -39,7 +39,7 @@ public:
 pTempStreamName - this is useful when creating the test, to dump the
 file for examination.
 */
-xmlDocPtr dumpAndParse(GDIMetaFile& rMetaFile, const OUString& 
rTempStreamName = OUString());
+xmlDocPtr dumpAndParse(const GDIMetaFile& rMetaFile, const OUString& 
rTempStreamName = OUString());
 };
 
 #endif
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 8073a43..0813dec 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -789,7 +789,7 @@ void SwUiWriterTest::testFdo87448()
 ReadGraphic(aStream, aGraphic);
 const GDIMetaFile& rMetaFile = aGraphic.GetGDIMetaFile();
 MetafileXmlDump dumper;
-xmlDocPtr pXmlDoc = 
dumper.dumpAndParse(const_cast(rMetaFile));
+xmlDocPtr pXmlDoc = dumper.dumpAndParse(rMetaFile);
 
 // The first polyline in the document has a number of points to draw arcs,
 // the last one jumps back to the start, so we call "end" the last but one.
diff --git a/test/source/mtfxmldump.cxx b/test/source/mtfxmldump.cxx
index 43098d0..ee89658 100644
--- a/test/source/mtfxmldump.cxx
+++ b/test/source/mtfxmldump.cxx
@@ -231,7 +231,7 @@ void MetafileXmlDump::filterAl

88 matches

Mail list logo