date:20140218

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

2014-02-18 Thread Noel Grandin

 sc/source/ui/vba/vbarange.cxx |2 +-
 sc/source/ui/view/cellsh1.cxx |2 --
 sc/source/ui/view/viewfun3.cxx|4 ++--
 sd/source/core/drawdoc3.cxx   |2 +-
 sd/source/ui/app/sdxfer.cxx   |2 +-
 sw/source/core/fields/docufld.cxx |2 +-
 sw/source/filter/ww8/ww8graf.cxx  |2 +-
 7 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit c1c7eeb4859bd436e711a0225ca1247fc1863110
Author: Noel Grandin 
Date:   Tue Feb 18 11:43:55 2014 +0200

cid#736857 Dereference before null check

Change-Id: I805e0873a51bcfe291647550992480e8cc8a03d6

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 81d62dc..2788732 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2032,7 +2032,7 @@ SwWW8ImplReader::SetAttributesAtGrfNode(SvxMSDffImportRec 
const*const pRecord,
 pGrfNd->SetAttr( aCrop );
 }
 
-if (pRecord && pRecord->pObj)
+if (pRecord->pObj)
 {
 const SfxItemSet& rOldSet = pRecord->pObj->GetMergedItemSet();
 //contrast
commit 1f6449fdeb95d27e3e4d9efb8076cbd12ee18964
Author: Noel Grandin 
Date:   Tue Feb 18 11:41:52 2014 +0200

cid#736845 Dereference before null check

Change-Id: Ied41eb5cad029200fd868eaaa129d8f052f3c436

diff --git a/sw/source/core/fields/docufld.cxx 
b/sw/source/core/fields/docufld.cxx
index c66d143..5e6016c 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -2311,7 +2311,7 @@ void SwRefPageGetField::ChangeExpansion( const SwFrm* 
pFrm,
 const SwRefPageSetField* pSetFld =
 (SwRefPageSetField*)pRefTxtFld->GetFmtFld().GetField();
 Point aPt;
-const SwCntntFrm* pRefFrm = pRefTxtFld ? 
pRefTxtFld->GetTxtNode().getLayoutFrm( pFrm->getRootFrm(), &aPt, 0, sal_False ) 
: 0;
+const SwCntntFrm* pRefFrm = pRefTxtFld->GetTxtNode().getLayoutFrm( 
pFrm->getRootFrm(), &aPt, 0, sal_False );
 if( pSetFld->IsOn() && pRefFrm )
 {
 // determine the correct offset
commit 814f6e4f199f7e900bfd0f8b4ccb2da963a93ce4
Author: Noel Grandin 
Date:   Tue Feb 18 11:29:07 2014 +0200

cid#736800 dereference before null check

Change-Id: I51eb6331d74c1484cf12a2a1810485dd8b927a32

diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index addf661..359da9f 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -695,7 +695,7 @@ void SdTransferable::SetPageBookmarks( const 
std::vector &rPageBookmar
 maPageBookmarks = rPageBookmarks;
 }
 
-if( mpSdViewIntern && mpSdDrawDocument )
+if( mpSdViewIntern )
 {
 SdPage* pPage = mpSdDrawDocument->GetSdPage( 0, PK_STANDARD );
 
commit 14829a84ff4f77091767cf4503db0c8a6624f036
Author: Noel Grandin 
Date:   Tue Feb 18 11:17:41 2014 +0200

cid#736797 dereference before null check

Change-Id: Ib279f66fcc349c75d7b3d26ba80356eea1697295

diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 6735414..caab663 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -808,7 +808,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
 sal_uInt16 nSdPageStart = (nInsertPos - 1) / 2;
 sal_uInt16 nSdPageEnd = GetSdPageCount(PK_STANDARD) - nSdPageCount +
 nSdPageStart - 1;
-const bool bRemoveEmptyPresObj = pBookmarkDoc &&
+const bool bRemoveEmptyPresObj =
 (pBookmarkDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS) &&
 (GetDocumentType() == DOCUMENT_TYPE_DRAW);
 
commit adefb376c68692d0063b75e5946565e71c7cfcce
Author: Noel Grandin 
Date:   Tue Feb 18 11:01:18 2014 +0200

cid#736794 dereference before null check

Change-Id: Ic7838b753757fd86fc2316475d38cbd3b4529de5

diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index e77b304..5b915c7 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -1383,7 +1383,7 @@ bool ScViewFunc::PasteFromClip( sal_uInt16 nFlags, 
ScDocument* pClipDoc,
 
 if ( nFlags & IDF_OBJECTS )
 {
-ScModelObj* pModelObj = ( pDocSh ? ScModelObj::getImplementation( 
pDocSh->GetModel() ) : NULL );
+ScModelObj* pModelObj = ScModelObj::getImplementation( 
pDocSh->GetModel() );
 if ( pPage && pModelObj )
 {
 bool bSameDoc = ( rClipParam.getSourceDocID() == 
pDoc->GetDocumentID() );
commit 5a3290af0b4d0390190bbb00312824c0b9495cec
Author: Noel Grandin 
Date:   Tue Feb 18 10:59:46 2014 +0200

cid#736793 dereference before null check

Change-Id: I389b758cb2ec0ab71706e165d0d382dd08396c3b

diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index 20f12c4..e77b304 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -1384,7 +1384,7 @@ bool ScViewFunc::PasteFromClip( sal_uInt16

Re: Some information about LibO on actual hardware

2014-02-18 Thread Thomas Krumbein

Hey Keith,

well, I have loaded the version 4.2.1 ;)

But nevertheless - yes, I will test and give you all the feedback I can
give :)

I will update the version during the first march week - so before CeBIT.

Best regards
Thomas

Am 18.02.2014 22:58, schrieb Keith Curtis:
> I have the same hardware, but running Linux. There are a number of fixes in
> the master branch, and hope to get them into 4.2.1. It should just work on
> 8.1, but I am very curious to find out find out what happens as no one yet
> has tried. You are the first person with a Windows HiDPI machine around, so
> I hope you can try out another pre-release of 4.2.1 and give feedback? I
> checked and Cebit is March 10th so that gives time to have something better
> to show.
> 
> As for the hang, I saw it on Linux when trying to widen the sidebar past its
> maximum width when the window had already been set wider than it should by
> another part of the code which didn't respect the max value. I increased the
> maximum width allowed for the Sidebar which should make the problem usually
> go away ;-) You might be seeing another problem of course, your testing
> would be helpful.
> 
> -Keith
> 
>  
> 
> 
> 
> --
> View this message in context: 
> http://nabble.documentfoundation.org/Some-information-about-LibO-on-actual-hardware-tp4097784p4097819.html
> Sent from the Dev mailing list archive at Nabble.com.
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
> 


-- 
## Unterstützung der freien Office Suite
## http://de.libreOffice.org  - www.LibreOffice.org
## Vorstand Freies Office Deutschland e.V.
## Mitglieder willkommen: www.FroDeV.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-02-18 Thread Julien Nabet

 odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java | 
   2 +-
 svx/source/stbctrls/pszctrl.cxx  | 
   2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 78f17f316d53f40412aedf9e2ccbedd7761ee88d
Author: Julien Nabet 
Date:   Wed Feb 19 07:37:15 2014 +0100

Typo: Internaly -> Internally, Externaly -> Externally

Change-Id: I22a81d18f8bb333b3a89c96dccbf91dc864302f1

diff --git 
a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java 
b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java
index dcccb06..ea8645d9 100644
--- 
a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java
+++ 
b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java
@@ -246,7 +246,7 @@ public class CustomizeView extendsJPanel
 
 /**
  * callback for disposing events
- * Internaly we save a reference to an office frame.
+ * Internally we save a reference to an office frame.
  * Of course he can die and inform us then. We should react
  * and forget his reference.
  *
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 589f30d..82a0cf4 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -131,7 +131,7 @@ struct SvxPosSizeStatusBarControl_Impl
 
 This implementation-structure of the class SvxPosSizeStatusBarControl
 is done for the un-linking of the changes of the exported interface such as
-the toning down of symbols that are visible externaly.
+the toning down of symbols that are visible externally.
 
 One instance exists for each SvxPosSizeStatusBarControl-instance
 during it's life time
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 60270] LibreOffice 4.1 most annoying bugs

2014-02-18 Thread bugzilla-daemon

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

tommy27  changed:

   What|Removed |Added

 Depends on||71961

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

[Bug 65675] LibreOffice 4.2 most annoying bugs

2014-02-18 Thread bugzilla-daemon

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

tommy27  changed:

   What|Removed |Added

 Depends on|71961   |

-- 
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 core on 2014-02-19

2014-02-18 Thread gerrit

Moin!

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

 First time contributors doing great things! 
+ fdo#63154 Remove unused solar.h reference in tools
  in https://gerrit.libreoffice.org/8120 from Alexandre Vicenzi
  about module include, tools
+ fdo#63154 Remove unused solar.h reference in editeng
  in https://gerrit.libreoffice.org/8119 from Alexandre Vicenzi
  about module include
+ fdo#63154 Remove unused solar.h and replace sal_uLong
  in https://gerrit.libreoffice.org/8118 from Alexandre Vicenzi
  about module dbaccess, editeng, filter, framework, include, lotuswordpro, 
reportdesign, rsc, uui
+ fdo#73596 Added support to import and export Run-in type Index from docx.
  in https://gerrit.libreoffice.org/8099 from Nikhil Walvekar
  about module sw, writerfilter
+ Replace handwritten reference counting with stl shared_ptr
  in https://gerrit.libreoffice.org/7934 from Tobias Lippert
  about module include, vcl
+ FDO#74886: Data labels are not preserved for Column Chart in RT file
  in https://gerrit.libreoffice.org/8098 from Umesh Kadam
  about module chart2, oox
+ fdo#74111 3D Rotation is wrong after Round trip for pie chart
  in https://gerrit.libreoffice.org/7718 from Priyanka Gaikwad
  about module chart2, oox
 End of freshness 

+ fdo#73596 [DOCX] Auto Columns in Index
  in https://gerrit.libreoffice.org/8104 from Vinaya Mandke
  about module sw
+ fdo#73596 [DOCX] Multiple Columns in Index
  in https://gerrit.libreoffice.org/8047 from Vinaya Mandke
  about module sw, writerfilter


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

+ Translated German comments - find-german-comments clean
  in https://gerrit.libreoffice.org/8113 from Luc Castermans
+ Remove from option-dialog the CurrentPage-option (fdo#71601)
  in https://gerrit.libreoffice.org/7842 from Rob Snelders
+ Removes bogus UNO command AcceptChange and RejectChange
  in https://gerrit.libreoffice.org/8000 from Rodolfo Ribeiro Gomes
+ fdo#37246 PDF Import: Color to string conversion fix
  in https://gerrit.libreoffice.org/8106 from Vort
+ corrected translation, thanks to Philipp Weissenbacher
  in https://gerrit.libreoffice.org/8112 from Luc Castermans
+ tests belong to check target
  in https://gerrit.libreoffice.org/8111 from Björn Michaelsen
+ Any: consistently use explicit specialization instead of overloading
  in https://gerrit.libreoffice.org/8110 from Stephan Bergmann
+ Translated German comments - find-german-comments
  in https://gerrit.libreoffice.org/8023 from Luc Castermans
+ Remove  in

[Bug 65675] LibreOffice 4.2 most annoying bugs

2014-02-18 Thread bugzilla-daemon

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

Jean-Baptiste Faure  changed:

   What|Removed |Added

 Depends on||71961

--- Comment #96 from Jean-Baptiste Faure  ---
Adding bug 71961, interoperability problem with many duplicates

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

[Bug 54157] LibreOffice 4.0 most annoying bugs

2014-02-18 Thread bugzilla-daemon

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

Jean-Baptiste Faure  changed:

   What|Removed |Added

 Depends on|71961   |

--- Comment #191 from Jean-Baptiste Faure  ---
(In reply to comment #190)
> Added Bug 71961 FILESAVE: text doesn't fit into text boxes when exporting to
> .PPTX
> 
> This bug is a major interoperability issue with MSO, reported by many users.

Please read comment #189

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

[Bug 65675] LibreOffice 4.2 most annoying bugs

2014-02-18 Thread bugzilla-daemon

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

Kohei Yoshida  changed:

   What|Removed |Added

 Depends on|75130   |

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

[Bug 54157] LibreOffice 4.0 most annoying bugs

2014-02-18 Thread bugzilla-daemon

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

Luke  changed:

   What|Removed |Added

 Depends on||71961

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

[Bug 54157] LibreOffice 4.0 most annoying bugs

2014-02-18 Thread bugzilla-daemon

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

--- Comment #190 from Luke  ---
Added Bug 71961 FILESAVE: text doesn't fit into text boxes when exporting to
.PPTX

This bug is a major interoperability issue with MSO, reported by many users.

-- 
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: 2 commits - sc/qa sc/source

2014-02-18 Thread Kohei Yoshida

 sc/qa/unit/ucalc.cxx|   87 ++--
 sc/qa/unit/ucalc.hxx|9 
 sc/source/core/data/column3.cxx |   25 +--
 3 files changed, 95 insertions(+), 26 deletions(-)

New commits:
commit ca50752c34de4477c696471b707e1b8136e27661
Author: Kohei Yoshida 
Date:   Tue Feb 18 22:57:39 2014 -0500

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

Even when the text begins with '='.

Change-Id: I6e0a995f3042240b9f78068b5d0b9b758eb253ed

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 1445848..5776ac9 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -1485,6 +1485,19 @@ void ScColumn::StartListeningInArea( 
sc::StartListeningContext& rCxt, SCROW nRow
 sc::ProcessFormula(maCells.begin(), maCells, nRow1, nRow2, aFunc);
 }
 
+namespace {
+
+void applyTextNumFormat( ScColumn& rCol, SCROW nRow, SvNumberFormatter* 
pFormatter )
+{
+sal_uInt32 nFormat = pFormatter->GetStandardFormat(NUMBERFORMAT_TEXT);
+ScPatternAttr aNewAttrs(rCol.GetDoc().GetPool());
+SfxItemSet& rSet = aNewAttrs.GetItemSet();
+rSet.Put(SfxUInt32Item(ATTR_VALUE_FORMAT, nFormat));
+rCol.ApplyPattern(nRow, aNewAttrs);
+}
+
+}
+
 bool ScColumn::ParseString(
 ScCellValue& rCell, SCROW nRow, SCTAB nTabP, const OUString& rString,
 formula::FormulaGrammar::AddressConvention eConv,
@@ -1521,6 +1534,12 @@ bool ScColumn::ParseString(
 {
 rCell.set(rPool.intern(rString));
 }
+else if (aParam.meSetTextNumFormat == ScSetStringParam::Always)
+{
+// Set the cell format type to Text.
+applyTextNumFormat(*this, nRow, aParam.mpNumFormatter);
+rCell.set(rPool.intern(rString));
+}
 else // = Formula
 rCell.set(
 new ScFormulaCell(
@@ -1625,11 +1644,7 @@ bool ScColumn::ParseString(
 if (aParam.meSetTextNumFormat != ScSetStringParam::Never && 
aParam.mpNumFormatter->IsNumberFormat(rString, nIndex, nVal))
 {
 // Set the cell format type to Text.
-sal_uInt32 nFormat = 
aParam.mpNumFormatter->GetStandardFormat(NUMBERFORMAT_TEXT);
-ScPatternAttr aNewAttrs(pDocument->GetPool());
-SfxItemSet& rSet = aNewAttrs.GetItemSet();
-rSet.Put( SfxUInt32Item(ATTR_VALUE_FORMAT, nFormat) );
-ApplyPattern(nRow, aNewAttrs);
+applyTextNumFormat(*this, nRow, aParam.mpNumFormatter);
 }
 
 rCell.set(rPool.intern(rString));
commit 891817922121765cef65ae73ebf7fdc524083d20
Author: Kohei Yoshida 
Date:   Tue Feb 18 22:11:10 2014 -0500

fdo#72491: Add test for this.

Change-Id: Ic37402cb950783b080e5f185b98b19aea62efa7e

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index c7c9ba5..ed84bf2 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -1729,9 +1729,7 @@ void Test::testFuncParam()
 
 void Test::testNamedRange()
 {
-struct {
-const char* pName; const char* pExpr; sal_uInt16 nIndex;
-} aNames[] = {
+RangeNameDef aNames[] = {
 { "Divisor",  "$Sheet1.$A$1:$A$1048576", 1 },
 { "MyRange1", "$Sheet1.$A$1:$A$100", 2 },
 { "MyRange2", "$Sheet1.$B$1:$B$100", 3 },
@@ -1742,31 +1740,22 @@ void Test::testNamedRange()
 
 m_pDoc->SetValue (0, 0, 0, 101);
 
-ScAddress aA1(0, 0, 0);
-ScRangeName* pNewRanges = new ScRangeName();
-for (size_t i = 0; i < SAL_N_ELEMENTS(aNames); ++i)
-{
-ScRangeData* pNew = new ScRangeData(
-m_pDoc,
-OUString::createFromAscii(aNames[i].pName),
-OUString::createFromAscii(aNames[i].pExpr),
-aA1, 0, formula::FormulaGrammar::GRAM_ENGLISH);
-pNew->SetIndex(aNames[i].nIndex);
-bool bSuccess = pNewRanges->insert(pNew);
-CPPUNIT_ASSERT_MESSAGE ("insertion failed", bSuccess);
-}
+bool bSuccess = insertRangeNames(m_pDoc, aNames, aNames + 
SAL_N_ELEMENTS(aNames));
+CPPUNIT_ASSERT_MESSAGE("Failed to insert range names.", bSuccess);
+
+ScRangeName* pNewRanges = m_pDoc->GetRangeName();
+CPPUNIT_ASSERT(pNewRanges);
 
 // Make sure the index lookup does the right thing.
 for (size_t i = 0; i < SAL_N_ELEMENTS(aNames); ++i)
 {
-const ScRangeData* p = pNewRanges->findByIndex(aNames[i].nIndex);
+const ScRangeData* p = pNewRanges->findByIndex(aNames[i].mnIndex);
 CPPUNIT_ASSERT_MESSAGE("lookup of range name by index failed.", p);
 OUString aName = p->GetName();
-CPPUNIT_ASSERT_MESSAGE("wrong range name is retrieved.", 
aName.equalsAscii(aNames[i].pName));
+CPPUNIT_ASSERT_MESSAGE("wrong range name is retrieved.", 
aName.equalsAscii(aNames[i].mpName));
 }
 
 // Test usage in formula expression.
-m_pDoc->SetRangeName(pNewRanges);
 m_pDoc->SetString (1, 0, 0, OUS

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

2014-02-18 Thread Markus Mohrhard

 sc/source/filter/xml/XMLExportDatabaseRanges.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit b9bd3229e0e03f853a8607b0ab613c6dfbd5e9ac
Author: Markus Mohrhard 
Date:   Wed Feb 19 00:39:53 2014 +0100

don't generate broken XML files, related #i116460#

Change-Id: I5d7f487b787295af6189425601c5d7e829a3db52

diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx 
b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
index f9ea2c6..ea2b31c 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
@@ -431,10 +431,6 @@ private:
 
 void writeCondition(const ScQueryEntry& rEntry, SCCOLROW nFieldStart, bool 
bCaseSens, bool bRegExp)
 {
-mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, 
OUString::number(rEntry.nField - nFieldStart));
-if (bCaseSens)
-mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, 
XML_TRUE);
-
 const ScQueryEntry::QueryItemsType& rItems = rEntry.GetQueryItems();
 if (rItems.empty())
 {
@@ -442,7 +438,11 @@ private:
 return;
 }
 
-else if (rItems.size() == 1)
+mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, 
OUString::number(rEntry.nField - nFieldStart));
+if (bCaseSens)
+mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, 
XML_TRUE);
+
+if (rItems.size() == 1)
 {
 // Single item condition.
 const ScQueryEntry::Item& rItem = rItems.front();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-18 Thread bugzilla-daemon

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

--- Comment #53 from Alexandre Vicenzi  ---
Hi,

Any idea of where to put SVLIBRARY, or it can't be touched yet?

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

2014-02-18 Thread Kohei Yoshida

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

New commits:
commit 637353bb46d3c7d9537e47e4e003aef78a0c0ab3
Author: Kohei Yoshida 
Date:   Tue Feb 18 20:40:27 2014 -0500

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

Otherwise it would over-shoot.

Change-Id: I1f9741345dfe353e0b035ff3bead736ab3fccbef

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

[Libreoffice-commits] core.git: 9 commits - lotuswordpro/source

2014-02-18 Thread Norbert Thiebaud

 lotuswordpro/source/filter/lwplaypiece.cxx   |4 
 lotuswordpro/source/filter/lwpmarker.cxx |   17 ++---
 lotuswordpro/source/filter/lwpnotes.cxx  |2 +-
 lotuswordpro/source/filter/lwpnumericfmt.cxx |5 +++--
 lotuswordpro/source/filter/lwpoleobject.cxx  |4 +++-
 5 files changed, 25 insertions(+), 7 deletions(-)

New commits:
commit a7901132237f8bbd3ce42f0deda3fb7922230722
Author: Norbert Thiebaud 
Date:   Tue Feb 18 17:12:51 2014 -0600

coverity#738736 Uninitialized scalar field

Change-Id: I389ae4a01dc9ee2005488b0127f2ebfc76f564f9

diff --git a/lotuswordpro/source/filter/lwpoleobject.cxx 
b/lotuswordpro/source/filter/lwpoleobject.cxx
index 842e199..5251a4a 100644
--- a/lotuswordpro/source/filter/lwpoleobject.cxx
+++ b/lotuswordpro/source/filter/lwpoleobject.cxx
@@ -198,7 +198,9 @@ void LwpGraphicOleObject::GetGrafScaledSize(double & 
fWidth, double & fHeight)
  * @date:2/22/2005
  */
 LwpOleObject::LwpOleObject(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
-: LwpGraphicOleObject(objHdr, pStrm),m_SizeRect(0,0,5,5)
+: LwpGraphicOleObject(objHdr, pStrm)
+, cPersistentFlags(0)
+, m_SizeRect(0,0,5,5)
 {
 }
 /**
commit 7fe5a66e4dca57c152ab500ef2dc46fe4d6d619b
Author: Norbert Thiebaud 
Date:   Tue Feb 18 17:06:42 2014 -0600

coverity#738735 Uninitialized scalar field

Change-Id: I639c30b26302784a5130e063bd0f691d3cb9e0b6

diff --git a/lotuswordpro/source/filter/lwpnumericfmt.cxx 
b/lotuswordpro/source/filter/lwpnumericfmt.cxx
index 3c3992d..2a956de 100644
--- a/lotuswordpro/source/filter/lwpnumericfmt.cxx
+++ b/lotuswordpro/source/filter/lwpnumericfmt.cxx
@@ -177,11 +177,12 @@ LwpNumericFormatSubset::~LwpNumericFormatSubset()
 
 
///
 LwpNumericFormat::LwpNumericFormat(LwpObjectStream * pStrm)
-: cFormat(FMT_DEFAULT)
+: m_pObjStrm(pStrm)
+, cFlags(0)
+, cFormat(FMT_DEFAULT)
 , cDecimalPlaces(0)
 {
 assert(pStrm);
-m_pObjStrm = pStrm;
 }
 /**
 *   Read number format from wordpro file
commit 549dfab272e766076124ef912ff36e43fd5941c4
Author: Norbert Thiebaud 
Date:   Tue Feb 18 16:59:13 2014 -0600

coverity#738734 Uninitialized scalar field

Change-Id: I78c489596fc8a51fa8d9b6c5bad545558830f474

diff --git a/lotuswordpro/source/filter/lwpnotes.cxx 
b/lotuswordpro/source/filter/lwpnotes.cxx
index dc5c661..c6028cf 100644
--- a/lotuswordpro/source/filter/lwpnotes.cxx
+++ b/lotuswordpro/source/filter/lwpnotes.cxx
@@ -132,8 +132,8 @@ void LwpFribNote::XFConvert(XFContentContainer* pCont)
 
 LwpNoteLayout::LwpNoteLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
 : LwpFrameLayout(objHdr, pStrm)
+, m_nTime(0)
 {
-
 }
 
 LwpNoteLayout::~LwpNoteLayout()
commit f32015ccf6cca20f994c460223d4fa64768094e7
Author: Norbert Thiebaud 
Date:   Tue Feb 18 16:55:37 2014 -0600

coverity#738733 Uninitialized scalar field

Change-Id: I45b38f9568a20d4717474b98392bdd07fedf8f4a

diff --git a/lotuswordpro/source/filter/lwpmarker.cxx 
b/lotuswordpro/source/filter/lwpmarker.cxx
index 3f1fa17..fd01102 100644
--- a/lotuswordpro/source/filter/lwpmarker.cxx
+++ b/lotuswordpro/source/filter/lwpmarker.cxx
@@ -70,7 +70,11 @@
 #include "xfilter/xfplaceholder.hxx"
 #include "xfilter/xfinputlist.hxx"
 
-LwpMarker::LwpMarker(LwpObjectHeader &objHdr, LwpSvStream 
*pStrm):LwpDLNFPVList(objHdr,pStrm)
+LwpMarker::LwpMarker(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
+: LwpDLNFPVList(objHdr,pStrm)
+, m_nFlag(0)
+, m_nPageNumber(0)
+, m_nNeedUpdate(0)
 {
 }
 
commit 6c5632257b589407a73c8ddcedf0ed8ba890e873
Author: Norbert Thiebaud 
Date:   Tue Feb 18 16:53:58 2014 -0600

coverity#738732 Uninitialized scalar field

Change-Id: I3920d694fc667b2d0fc5c07d53d606a42002ce16

diff --git a/lotuswordpro/source/filter/lwpmarker.cxx 
b/lotuswordpro/source/filter/lwpmarker.cxx
index 8382cd5..3f1fa17 100644
--- a/lotuswordpro/source/filter/lwpmarker.cxx
+++ b/lotuswordpro/source/filter/lwpmarker.cxx
@@ -96,7 +96,9 @@ OUString LwpMarker::GetNamedProperty(OUString name)
 return OUString(A2OUSTR(""));
 }
 
-LwpStoryMarker::LwpStoryMarker(LwpObjectHeader &objHdr, LwpSvStream 
*pStrm):LwpMarker(objHdr,pStrm)
+LwpStoryMarker::LwpStoryMarker(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
+: LwpMarker(objHdr,pStrm)
+, m_nFlag(0)
 {
 }
 
commit 66f51851754295b2bb858ce0059844a27337f328
Author: Norbert Thiebaud 
Date:   Tue Feb 18 16:52:40 2014 -0600

coverity#738731 Uninitialized scalar field

Change-Id: I7d93953403b89236a713e7df786252cc7a42e931

diff --git a/lotuswordpro/source/filter/lwpmarker.cxx 
b/lotuswordpro/source/filter/lwpmarker.cxx
index 378206c..8382cd5 100644
--- a/lotuswordpro/source/filter/lwpmarker.cxx
+++ b/lotuswordpro/source/filter/lwpmarker.cxx
@@ -114,7 +114,11 @@ void LwpFribRange::Read(LwpObjectStream* pObjStrm)
 m_EndPara.ReadIndexed(pObjStrm);
 }
 
-LwpCHBlkMarker::LwpCHBlkMarker(LwpOb

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

2014-02-18 Thread Markus Mohrhard

 chart2/source/view/main/OpenGLRender.cxx |   14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 54e66cba3b7691ce4acf7fac947241058faf0fc3
Author: Markus Mohrhard 
Date:   Tue Feb 18 23:33:38 2014 +0100

avoid calling glew repeatedly

This saves us about 10% of the rendering time.

Change-Id: I3ea7f1849500b025830b44c5175d79ad04aff362

diff --git a/chart2/source/view/main/OpenGLRender.cxx 
b/chart2/source/view/main/OpenGLRender.cxx
index 83d68bd..9b4cd8d 100755
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -84,6 +84,7 @@ int static checkGLError(const char *file, int line)
 return retCode;
 }
 
+static bool bGlewInit = false;
 
 #define CHECK_GL_ERROR() checkGLError(__FILE__, __LINE__)
 
@@ -235,11 +236,16 @@ GLfloat texCoords[] = {
 int OpenGLRender::InitOpenGL(GLWindow aWindow)
 {
 glWin = aWindow;
-glewExperimental = GL_TRUE;
-if (glewInit() != GLEW_OK)
+if(!bGlewInit)
 {
-SAL_WARN("chart2.opengl", "Failed to initialize GLEW");
-return -1;
+glewExperimental = GL_TRUE;
+if (glewInit() != GLEW_OK)
+{
+SAL_WARN("chart2.opengl", "Failed to initialize GLEW");
+return -1;
+}
+else
+bGlewInit = true;
 }
 
 // These guys don't just check support but setup the vtables.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-18 Thread Caolán McNamara

 vcl/source/window/printdlg.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 07f0566026db8f5ec048297785f82a43e73a14f6
Author: CaolÃ¡n McNamara 
Date:   Wed Dec 4 16:48:08 2013 +

fdo#41760 rhbz#1038189 refresh printer list when print dialog launched

which is the the same thing the printer settings dialog does

(cherry picked from commit 02efbed152a3a9e364cdb73628af0aed0f5d6f7a)
Signed-off-by: Michael Stahl 

Change-Id: I36fb9f057b66faa8c9fce5a9934ed2fb70786363

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index b8cb188..21941ca 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -602,6 +602,8 @@ PrintDialog::PrintDialog( Window* i_pParent, const 
boost::shared_ptrCheck( maPController->getReversePrint() );
 
+Printer::updatePrinters();
+
 // fill printer listbox
 const std::vector< OUString >& rQueues( Printer::GetPrinterQueues() );
 for( std::vector< OUString >::const_iterator it = rQueues.begin();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 7 commits - include/vcl padmin/source padmin/uiconfig sfx2/source solenv/gbuild vcl/generic vcl/unx

2014-02-18 Thread Michael Stahl

 include/vcl/jobdata.hxx   |2 
 padmin/source/prtsetup.cxx|4 -
 padmin/uiconfig/ui/printerpropertiesdialog.ui |   14 ---
 sfx2/source/view/viewprn.cxx  |1 
 solenv/gbuild/gbuild.help.txt |2 
 solenv/gbuild/gbuild.mk   |2 
 solenv/gbuild/platform/macosx.mk  |2 
 solenv/gbuild/platform/solaris.mk |2 
 solenv/gbuild/platform/unxgcc.mk  |2 
 vcl/generic/print/genprnpsp.cxx   |   21 ++---
 vcl/unx/generic/printer/cupsmgr.cxx   |  101 --
 vcl/unx/generic/printer/jobdata.cxx   |   18 
 12 files changed, 71 insertions(+), 100 deletions(-)

New commits:
commit cdb405f4e4b168d1e2f6dea9ac985df319a76015
Author: Michael Stahl 
Date:   Tue Feb 18 22:40:20 2014 +0100

vcl: CUPS printing: notify user if spooling failed

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

Change-Id: I1bc9120c9c9f438e350c964ed7ef29924a72ce78

diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index c7bb3fc..ea0eae4 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -339,6 +339,7 @@ void SfxPrinterController::jobFinished( 
com::sun::star::view::PrintableState nSt
 mpObjectShell->Broadcast( SfxPrintingHint( nState ) );
 switch ( nState )
 {
+case view::PrintableState_JOB_SPOOLING_FAILED :
 case view::PrintableState_JOB_FAILED :
 {
 // "real" problem (not simply printing cancelled by user)
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index fca730d..1b8d0bd 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -1218,6 +1218,8 @@ sal_Bool PspSalPrinter::StartJob( const OUString* 
i_pFileName, const OUString& i
 }
 }
 
+bool bSuccess(true);
+
 // spool files
 if( ! i_pFileName && ! bAborted )
 {
@@ -1260,6 +1262,7 @@ sal_Bool PspSalPrinter::StartJob( const OUString* 
i_pFileName, const OUString& i
 aBuf.append( ' ' );
 aBuf.append( sal_Int32( i + nCurJob * 
aPDFFiles.size() ) );
 }
+bSuccess &=
 PrinterInfoManager::get().endSpool( 
pPrinter->GetName(), aBuf.makeStringAndClear(), fp, m_aJobData, bFirstJob );
 bFirstJob = false;
 }
@@ -1270,7 +1273,10 @@ sal_Bool PspSalPrinter::StartJob( const OUString* 
i_pFileName, const OUString& i
 }
 
 // job has been spooled
-i_rController.setJobState( bAborted ? view::PrintableState_JOB_ABORTED : 
view::PrintableState_JOB_SPOOLED );
+i_rController.setJobState( (bAborted)
+? view::PrintableState_JOB_ABORTED
+: ((bSuccess) ? view::PrintableState_JOB_SPOOLED
+  : view::PrintableState_JOB_SPOOLING_FAILED));
 
 // clean up the temporary PDF files
 if( ! i_pFileName || bAborted )
commit 677855e67c0ebd4f695950dfadb2ef36718efe45
Author: Michael Stahl 
Date:   Tue Feb 18 21:51:52 2014 +0100

padmin: make Printer Properties Device tab usable again

The code of the "Font Replacement" tab was removed in
6230cdd2d8971147dcb629c8bd61daa1fefcb7c7 but the tab was not removed
from printerpropertiesdialog.ui; for some reason this orphan tab causes
it to actually be visible in the UI and also enormous delays when painting
the preceding Device tab's content.

Change-Id: I95e1b29403307b86aea48518bbadea62aaba3b56

diff --git a/padmin/uiconfig/ui/printerpropertiesdialog.ui 
b/padmin/uiconfig/ui/printerpropertiesdialog.ui
index 345485d..b84184a 100644
--- a/padmin/uiconfig/ui/printerpropertiesdialog.ui
+++ b/padmin/uiconfig/ui/printerpropertiesdialog.ui
@@ -104,20 +104,6 @@
   
 
 
-  
-True
-False
-Font 
Replacement
-  
-  
-3
-False
-  
-
-
-  
-
-
   
 True
 False
commit c76cd71fe9bdefaef3f33f8ca193c32e3ab112ed
Author: Michael Stahl 
Date:   Tue Feb 18 18:07:37 2014 +0100

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

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

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

Re: Some information about LibO on actual hardware

2014-02-18 Thread Keith Curtis

I have the same hardware, but running Linux. There are a number of fixes in
the master branch, and hope to get them into 4.2.1. It should just work on
8.1, but I am very curious to find out find out what happens as no one yet
has tried. You are the first person with a Windows HiDPI machine around, so
I hope you can try out another pre-release of 4.2.1 and give feedback? I
checked and Cebit is March 10th so that gives time to have something better
to show.

As for the hang, I saw it on Linux when trying to widen the sidebar past its
maximum width when the window had already been set wider than it should by
another part of the code which didn't respect the max value. I increased the
maximum width allowed for the Sidebar which should make the problem usually
go away ;-) You might be seeing another problem of course, your testing
would be helpful.

-Keith

 



--
View this message in context: 
http://nabble.documentfoundation.org/Some-information-about-LibO-on-actual-hardware-tp4097784p4097819.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-02-18 Thread Kohei Yoshida

 sc/inc/clipcontext.hxx  |   31 +++
 sc/inc/column.hxx   |4 +
 sc/inc/document.hxx |2 
 sc/inc/table.hxx|2 
 sc/qa/unit/ucalc.hxx|2 
 sc/source/core/data/clipcontext.cxx |   58 -
 sc/source/core/data/column3.cxx |   52 +--
 sc/source/core/data/column4.cxx |   98 
 sc/source/core/data/document.cxx|   14 +++--
 sc/source/core/data/document10.cxx  |   24 
 sc/source/core/data/table7.cxx  |   32 +++
 11 files changed, 285 insertions(+), 34 deletions(-)

New commits:
commit b3043662f41b605242784d56802a44e3856187b7
Author: Kohei Yoshida 
Date:   Tue Feb 18 16:49:43 2014 -0500

This test now passes. Re-enable it.

Change-Id: I04a499666d1704277c24524f9e7cb827600a47db

diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 242d2c1..01cb908 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -411,7 +411,7 @@ public:
 CPPUNIT_TEST(testCopyPaste);
 CPPUNIT_TEST(testCopyPasteAsLink);
 CPPUNIT_TEST(testCopyPasteTranspose);
-//  CPPUNIT_TEST(testCopyPasteSkipEmpty); TODO : fix this later
+CPPUNIT_TEST(testCopyPasteSkipEmpty);
 //CPPUNIT_TEST(testCopyPasteSkipEmptyConditionalFormatting);
 CPPUNIT_TEST(testUndoCut);
 CPPUNIT_TEST(testMoveBlock);
commit cdc8ebf9646e773351c91039a62f2414c7b02105
Author: Kohei Yoshida 
Date:   Tue Feb 18 16:45:02 2014 -0500

fdo#74573: Delete ranges that are non-empty before pasting from clipboard.

The conditional formatting part is still not working. But other bits
appear to be working now.

Change-Id: Ia8a2cbe57cd2fa9ca9ad46635a91a1d8b99b0e7d

diff --git a/sc/inc/clipcontext.hxx b/sc/inc/clipcontext.hxx
index 77abcf8..d016410 100644
--- a/sc/inc/clipcontext.hxx
+++ b/sc/inc/clipcontext.hxx
@@ -22,6 +22,7 @@ class ScDocument;
 class ScColumn;
 class ScPatternAttr;
 class ScPostIt;
+class ScConditionalFormatList;
 
 namespace sc {
 
@@ -43,21 +44,37 @@ public:
 
 class CopyFromClipContext : public ClipContextBase
 {
+SCCOL mnDestCol1;
+SCCOL mnDestCol2;
+SCROW mnDestRow1;
+SCROW mnDestRow2;
 SCTAB mnTabStart;
 SCTAB mnTabEnd;
 ScDocument* mpRefUndoDoc;
 ScDocument* mpClipDoc;
-sal_uInt16  mnInsertFlag;
+sal_uInt16 mnInsertFlag;
+sal_uInt16 mnDeleteFlag;
 ScCellValue maSingleCell;
+ScConditionalFormatList* mpCondFormatList;
 const ScPatternAttr* mpSinglePattern;
 const ScPostIt* mpSingleNote;
 bool mbAsLink:1;
 bool mbSkipAttrForEmptyCells:1;
 bool mbCloneNotes:1;
+bool mbTableProtected:1;
 
 CopyFromClipContext(); // disabled
 
 public:
+
+struct Range
+{
+SCCOL mnCol1;
+SCCOL mnCol2;
+SCROW mnRow1;
+SCROW mnRow2;
+};
+
 CopyFromClipContext(ScDocument& rDoc,
 ScDocument* pRefUndoDoc, ScDocument* pClipDoc, sal_uInt16 nInsertFlag,
 bool bAsLink, bool bSkipAttrForEmptyCells);
@@ -69,18 +86,30 @@ public:
 SCTAB getTabStart() const;
 SCTAB getTabEnd() const;
 
+void setDestRange( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 );
+Range getDestRange() const;
+
 ScDocument* getUndoDoc();
 ScDocument* getClipDoc();
 sal_uInt16 getInsertFlag() const;
 
+void setDeleteFlag( sal_uInt16 nFlag );
+sal_uInt16 getDeleteFlag() const;
+
 ScCellValue& getSingleCell();
 
+void setCondFormatList( ScConditionalFormatList* pCondFormatList );
+ScConditionalFormatList* getCondFormatList();
+
 const ScPatternAttr* getSingleCellPattern() const;
 void setSingleCellPattern( const ScPatternAttr* pAttr );
 
 const ScPostIt* getSingleCellNote() const;
 void setSingleCellNote( const ScPostIt* pNote );
 
+void setTableProtected( bool b );
+bool isTableProtected() const;
+
 bool isAsLink() const;
 bool isSkipAttrForEmptyCells() const;
 bool isCloneNotes() const;
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 9b36270..7f0c365 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -232,6 +232,7 @@ public:
 bool InitBlockPosition( sc::ColumnBlockPosition& rBlockPos );
 bool InitBlockPosition( sc::ColumnBlockConstPosition& rBlockPos ) const;
 
+void DeleteBeforeCopyFromClip( sc::CopyFromClipContext& rCxt, const 
ScColumn& rClipCol );
 void CopyOneCellFromClip( sc::CopyFromClipContext& rCxt, SCROW nRow1, 
SCROW nRow2 );
 
 void CopyFromClip(
@@ -592,6 +593,9 @@ private:
 // cell notes
 void SwapCellNotes( SCROW nRow1, SCROW nRow2 );
 
+void DeleteCells(
+sc::ColumnBlockPosition& rBlockPos, SCROW nRow1, SCROW nRow2, 
sal_uInt16 nDelFlag,
+std::vector& rDeleted );
 };
 
 #endif
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 1294503..12b2bee 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1207,6 +1207,8 @@ public:
 
 bool InitC

Tobias Lippert license statement

2014-02-18 Thread Tobias Lippert

Dear developers of LibreOffice,

I hereby state that all of my past and future contributions to
LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license.

Kind regards,
Tobias Lippert

-- 
  Tobias Lippert
  d...@fastmail.fm
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-02-18 Thread Matúš Kukan

 solenv/gbuild/platform/android.mk  |1 -
 solenv/gbuild/platform/com_GCC_defs.mk |4 
 solenv/gbuild/platform/macosx.mk   |1 -
 solenv/gbuild/platform/solaris.mk  |5 -
 solenv/gbuild/platform/unxgcc.mk   |8 +---
 5 files changed, 5 insertions(+), 14 deletions(-)

New commits:
commit 3c7b65c171eeade3272cc766b813b99a35a6ef7d
Author: MatÃºÅ¡ Kukan 
Date:   Tue Feb 18 22:25:06 2014 +0100

Remove hopefully now unneeded workaround for --enable-lto build.

Change-Id: Iaffcc0825415e6aee62029fbc380954449b8bcbf

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index ee93a164..c743dcb 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -162,7 +162,7 @@ define gb_LinkTarget__command_dynamiclink
 $(call gb_Helper_abbreviate_dirs,\
$(if 
$(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) \
$(if $(filter Library 
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
-   $(if $(filter-out $(foreach lib,frm scfilt wpftdraw,$(call 
gb_Library__get_workdir_linktargetname,$(lib))),$(2)),$(gb_LTOFLAGS)) \
+   $(gb_LTOFLAGS) \
$(if $(SOVERSIONSCRIPT),-Wl$(COMMA)--soname=$(notdir $(1)) \
-Wl$(COMMA)--version-script=$(SOVERSIONSCRIPT)) \
$(subst \d,$$,$(RPATH)) \
commit 0d26fc8fd0d3f52366403cec46efa0e7ccb2755d
Author: MatÃºÅ¡ Kukan 
Date:   Tue Feb 18 22:23:48 2014 +0100

Tweak lto flags for gcc.

Change-Id: I490029f0727e060fdfdfc6e9adccd058b24e6b86

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 41c2d44..761765f 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -103,7 +103,11 @@ gb_CXXFLAGS_COMMON += -DLIBO_MERGELIBS
 endif
 
 ifeq ($(ENABLE_LTO),TRUE)
+ifeq ($(COM_GCC_IS_CLANG),TRUE)
 gb_LTOFLAGS := -flto
+else
+gb_LTOFLAGS := -flto -fuse-linker-plugin -O2
+endif
 endif
 
 gb_LinkTarget_EXCEPTIONFLAGS := \
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 151cc86..ee93a164 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -96,12 +96,6 @@ gb_CXXFLAGS += -Wno-deprecated-declarations
 endif
 endif
 
-ifeq ($(ENABLE_LTO),TRUE)
-ifneq ($(COM_GCC_IS_CLANG),TRUE)
-gb_LTOFLAGS += -fuse-linker-plugin $(gb_COMPILERDEFAULTOPTFLAGS)
-endif
-endif
-
 ifneq ($(strip $(SYSBASE)),)
 gb_CXXFLAGS += --sysroot=$(SYSBASE)
 gb_CFLAGS += --sysroot=$(SYSBASE)
commit cc493da6fe395b5948f2578b13d65fa04d8dc15d
Author: MatÃºÅ¡ Kukan 
Date:   Tue Feb 18 21:48:44 2014 +0100

There is no gb_Library_LTOFLAGS.

Change-Id: I3b6b18e45aaf88d1cc6038226f6984090163bdee

diff --git a/solenv/gbuild/platform/android.mk 
b/solenv/gbuild/platform/android.mk
index b3ed340..4dbb29f 100644
--- a/solenv/gbuild/platform/android.mk
+++ b/solenv/gbuild/platform/android.mk
@@ -38,7 +38,6 @@ $(call gb_Helper_abbreviate_dirs,\
$(if 
$(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) \
-shared \
$(if $(filter Library 
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
-   $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
$(subst \d,$$,$(RPATH)) \
$(T_LDFLAGS) \
$(foreach object,$(COBJECTS),$(call 
gb_CObject_get_target,$(object))) \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 96f56c2..211be4c 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -131,7 +131,6 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter 
Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
$(if $(filter 
Bundle,$(TARGETTYPE)),$(gb_Bundle_TARGETTYPEFLAGS)) \
$(if $(filter Library 
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
-   $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
$(subst \d,$$,$(RPATH)) \
$(T_LDFLAGS) \
$(patsubst lib%.dylib,-l%,$(patsubst 
%.$(gb_Library_UDK_MAJORVER),%,$(foreach lib,$(LINKED_LIBS),$(call 
gb_Library_get_filename,$(lib) \
commit df4a2c7425412df7757afcfd48f0f8f9aa8d5535
Author: MatÃºÅ¡ Kukan 
Date:   Tue Feb 18 21:47:19 2014 +0100

Remove lto bits from solaris makefile.

Change-Id: I5ff79fddce0140791e367fb44afffe3250574efa

diff --git a/solenv/gbuild/platform/solaris.mk 
b/solenv/gbuild/platform/solaris.mk
index 2311ab6..c8254f6 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -100,10 +100,6 @@ gb_CXXFLAGS += -Wno-deprecated-declarations
 endif
 endif
 
-ifeq ($(ENABLE_LTO),TRUE)
-gb_LinkTarget_LDFLAGS += -fuse-linker-plugin $(gb_COMPILERDEFAULTOPTFLAGS)
-endif
-
 ifneq ($(strip $(SYSBASE)),)
 gb_CXXFLAGS += --sysroot=

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

2014-02-18 Thread Miklos Vajna

 writerfilter/source/dmapper/DomainMapper.cxx   |4 -
 writerfilter/source/doctok/resources.xmi   |   62 -
 writerfilter/source/ooxml/model.xml|4 -
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 
 4 files changed, 5 insertions(+), 67 deletions(-)

New commits:
commit 1fa144261ad7a224277bc41c11e6b55088f0a069
Author: Miklos Vajna 
Date:   Tue Feb 18 22:17:49 2014 +0100

writerfilter: sprm:P{Shd,FNoAutoHyph} -> CT_PrBase_{shd,suppressAutoHyphens}

Change-Id: I3ca8805428469cebf67737fd9fce9a74641e88ce

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 05c6978..5f692a0 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1184,12 +1184,12 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, 
PropertyMapPtr rContext, SprmType
 break;
 case NS_ooxml::LN_CT_PBdr_bar:
 break;
-case NS_sprm::LN_PFNoAutoHyph:   // sprmPFNoAutoHyph
+case NS_ooxml::LN_CT_PPrBase_suppressAutoHyphens:
 rContext->Insert(PROP_PARA_IS_HYPHENATION, uno::makeAny( nIntValue ? 
false : true ));
 break;
 case NS_ooxml::LN_CT_FramePr_h:
 break;
-case NS_sprm::LN_PShd: // sprmPShd
+case NS_ooxml::LN_CT_PrBase_shd:
 {
 //contains fore color, back color and shadow percentage, results in a 
brush
 writerfilter::Reference::Pointer_t pProperties = 
rSprm.getProps();
diff --git a/writerfilter/source/doctok/resources.xmi 
b/writerfilter/source/doctok/resources.xmi
index 1b90437..f1a59ca 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -255,68 +255,6 @@
   
 
 
-
-
-  
-
-  
-  
-
-  0x242A
-  
-
-  
-
-  
-  
-
-  
rtf:sprmPFNoAutoHyph
-  
-
-  
-
-  
-  
-
-  paragraph
-  
-
-  
-
-  
-
-
-
-
-  
-
-  
-  
-
-  0x442D
-  
-
-  
-
-  
-  
-
-  
rtf:sprmPShd
-  
-
-  
-
-  
-  
-
-  paragraph
-  
-
-  
-
-  
-
-
 
 
   
diff --git a/writerfilter/source/ooxml/model.xml 
b/writerfilter/source/ooxml/model.xml
index 38f7419..59fadd4 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -22346,9 +22346,9 @@
   
   
   
-  
+  
   
-  
+  
   
   
   
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 4d49e89..a4a29e9 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3086,7 +3086,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 if (nParam)
 {
 RTFValue::Pointer_t pValue(new 
RTFValue(getColorTable(nParam)));
-lcl_putNestedAttribute(m_aStates.top().aParagraphSprms, 
NS_sprm::LN_PShd, NS_ooxml::LN_CT_Shd_fill, pValue);
+lcl_putNestedAttribute(m_aStates.top().aParagraphSprms, 
NS_ooxml::LN_CT_PrBase_shd, NS_ooxml::LN_CT_Shd_fill, pValue);
 }
 break;
 case RTF_ULC:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-18 Thread Luc Castermans

 vcl/source/window/brdwin.cxx   |   48 +++--
 vcl/source/window/cursor.cxx   |   11 -
 vcl/source/window/decoview.cxx |6 +
 vcl/source/window/dialog.cxx   |   34 +++--
 4 files changed, 44 insertions(+), 55 deletions(-)

New commits:
commit e52754170270e6b799af207f43369e530d9e176e
Author: Luc Castermans 
Date:   Tue Feb 18 21:31:42 2014 +0100

Translated German comments - find-german-comments clean

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

diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index a70bd1e..1a5da7b 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -44,7 +44,7 @@ using namespace ::com::sun::star::uno;
 
 static void ImplGetPinImage( sal_uInt16 nStyle, sal_Bool bPinIn, Image& rImage 
)
 {
-// ImageListe laden, wenn noch nicht vorhanden
+// load ImageList if not available yet
 ImplSVData* pSVData = ImplGetSVData();
 if ( !pSVData->maCtrlData.mpPinImgList )
 {
@@ -59,7 +59,7 @@ static void ImplGetPinImage( sal_uInt16 nStyle, sal_Bool 
bPinIn, Image& rImage )
 }
 }
 
-// Image ermitteln und zurueckgeben
+// get and return Image
 sal_uInt16 nId;
 if ( nStyle & BUTTON_DRAW_PRESSED )
 {
@@ -82,14 +82,14 @@ static void ImplGetPinImage( sal_uInt16 nStyle, sal_Bool 
bPinIn, Image& rImage )
 
 void Window::ImplCalcSymbolRect( Rectangle& rRect )
 {
-// Den Rand den der Button in der nicht Default-Darstellung freilaesst,
-// dazuaddieren, da wir diesen bei kleinen Buttons mit ausnutzen wollen
+// Add border, not shown in the non-default representation,
+// as we want to use it for small buttons
 rRect.Left()--;
 rRect.Top()--;
 rRect.Right()++;
 rRect.Bottom()++;
 
-// Zwischen dem Symbol und dem Button-Rand lassen wir 5% Platz
+// we leave 5% room between the symbol and the button border
 long nExtraWidth = ((rRect.GetWidth()*50)+500)/1000;
 long nExtraHeight = ((rRect.GetHeight()*50)+500)/1000;
 rRect.Left()+= nExtraWidth;
@@ -103,7 +103,7 @@ void Window::ImplCalcSymbolRect( Rectangle& rRect )
 static void ImplDrawBrdWinSymbol( OutputDevice* pDev,
   const Rectangle& rRect, SymbolType eSymbol )
 {
-// Zwischen dem Symbol und dem Button lassen wir 5% Platz
+// we leave 5% room between the symbol and the button border
 DecorationView  aDecoView( pDev );
 Rectangle   aTempRect = rRect;
 Window::ImplCalcSymbolRect( aTempRect );
@@ -488,7 +488,7 @@ sal_Bool ImplBorderWindowView::ImplTracking( 
ImplBorderFrameData* pData, const T
 pData->mnCloseState &= ~BUTTON_DRAW_PRESSED;
 DrawWindow( BORDERWINDOW_DRAW_CLOSE );
 
-// Bei Abbruch kein Click-Handler rufen
+// do not call a Click-Handler when aborting
 if ( !rTEvt.IsTrackingCanceled() )
 {
 // dispatch to correct window type (why is Close() not 
virtual ??? )
@@ -510,7 +510,7 @@ sal_Bool ImplBorderWindowView::ImplTracking( 
ImplBorderFrameData* pData, const T
 pData->mnRollState &= ~BUTTON_DRAW_PRESSED;
 DrawWindow( BORDERWINDOW_DRAW_ROLL );
 
-// Bei Abbruch kein Click-Handler rufen
+// do not call a Click-Handler when aborting
 if ( !rTEvt.IsTrackingCanceled() )
 {
 if ( 
pBorderWindow->ImplGetClientWindow()->IsSystemWindow() )
@@ -532,7 +532,7 @@ sal_Bool ImplBorderWindowView::ImplTracking( 
ImplBorderFrameData* pData, const T
 pData->mnDockState &= ~BUTTON_DRAW_PRESSED;
 DrawWindow( BORDERWINDOW_DRAW_DOCK );
 
-// Bei Abbruch kein Click-Handler rufen
+// do not call a Click-Handler when aborting
 if ( !rTEvt.IsTrackingCanceled() )
 {
 if ( 
pBorderWindow->ImplGetClientWindow()->IsSystemWindow() )
@@ -560,7 +560,7 @@ sal_Bool ImplBorderWindowView::ImplTracking( 
ImplBorderFrameData* pData, const T
 pData->mnHideState &= ~BUTTON_DRAW_PRESSED;
 DrawWindow( BORDERWINDOW_DRAW_HIDE );
 
-// Bei Abbruch kein Click-Handler rufen
+// do not call a Click-Handler when aborting
 if ( !rTEvt.IsTrackingCanceled() )
 {
 if ( 
pBorderWindow->ImplGetClientWindow()->IsSystemWindow() )
@@ -578,7 +578,7 @@ sal_Bool ImplBorderWindowView::ImplTracking( 
ImplBorderFrameData* pData, const T
 pData->mnHelpState &= ~BUTTON_DRAW_PRESSED;
 DrawWindow( BORDERWINDOW_DRAW_HELP );
 
-// Bei Abbruch kein Click-Handler rufen
+// do not call a

[Libreoffice-commits] core.git: officecfg/registry sd/source sd/uiconfig

2014-02-18 Thread Rob Snelders

 officecfg/registry/schema/org/openoffice/Office/Impress.xcs |   10 --
 sd/source/ui/app/optsitem.cxx   |   54 +---
 sd/source/ui/dlg/tpoption.cxx   |5 -
 sd/source/ui/func/fusldlg.cxx   |2 
 sd/source/ui/inc/optsitem.hxx   |1 
 sd/source/ui/inc/tpoption.hxx   |1 
 sd/source/ui/slideshow/slideshowimpl.cxx|4 
 sd/uiconfig/simpress/ui/optimpressgeneralpage.ui|   33 +--
 8 files changed, 30 insertions(+), 80 deletions(-)

New commits:
commit 12b78edde94af7550b14382d9bfd1c77854e5fb0
Author: Rob Snelders 
Date:   Tue Feb 4 12:37:01 2014 +0100

Remove from option-dialog the CurrentPage-option (fdo#71601)

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

diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index f5f9a42..5fe21cdf 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -614,16 +614,6 @@
 
   Specifies configuration items governing behavior when starting 
a presentation.
 
-
-  
-  
-  
-  
-Indicates whether to start the presentation with the current 
(true) or the first (false) page.
-Always with current page
-  
-  true
-
 
   
 Indicates whether to enable the Impress remote 
controller.
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 9435add..ee478f3 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -487,7 +487,6 @@ SdOptionsMisc::SdOptionsMisc( sal_uInt16 nConfigId, 
sal_Bool bUseConfig ) :
 bPickThrough( sal_True ),
 bDoubleClickTextEdit( sal_True ),
 bClickChangeRotation( sal_False ),
-bStartWithActualPage( sal_False ),
 bEnableSdremote( sal_False ),
 bEnablePresenterScreen( sal_True),
 bSolidDragging( sal_True ),
@@ -523,7 +522,6 @@ sal_Bool SdOptionsMisc::operator==( const SdOptionsMisc& 
rOpt ) const
 IsPickThrough() == rOpt.IsPickThrough() &&
 IsDoubleClickTextEdit() == rOpt.IsDoubleClickTextEdit() &&
 IsClickChangeRotation() == rOpt.IsClickChangeRotation() &&
-IsStartWithActualPage() == rOpt.IsStartWithActualPage() &&
 IsEnableSdremote() == rOpt.IsEnableSdremote() &&
 IsEnablePresenterScreen() == rOpt.IsEnablePresenterScreen()&&
 IsSummationOfParagraphs() == rOpt.IsSummationOfParagraphs() &&
@@ -569,7 +567,6 @@ void SdOptionsMisc::GetPropNameArray( const char**& 
ppNames, sal_uLong& rCount )
 
 // just for impress
 "NewDoc/AutoPilot",
-"Start/CurrentPage",
 "Compatibility/AddBetween",
 "ShowUndoDeleteWarning",
 "SlideshowRespectZOrder",
@@ -616,38 +613,36 @@ sal_Bool SdOptionsMisc::ReadData( const Any* pValues )
 if( pValues[14].hasValue() )
 SetStartWithTemplate( *(sal_Bool*) pValues[ 14 ].getValue() );
 if( pValues[15].hasValue() )
-SetStartWithActualPage( *(sal_Bool*) pValues[ 15 ].getValue() );
+SetSummationOfParagraphs( *(sal_Bool*) pValues[ 15 ].getValue() );
 if( pValues[16].hasValue() )
-SetSummationOfParagraphs( *(sal_Bool*) pValues[ 16 ].getValue() );
+SetShowUndoDeleteWarning( *(sal_Bool*) pValues[ 16 ].getValue() );
+
 if( pValues[17].hasValue() )
-SetShowUndoDeleteWarning( *(sal_Bool*) pValues[ 17 ].getValue() );
+SetSlideshowRespectZOrder(*(sal_Bool*) pValues[ 17 ].getValue());
 
 if( pValues[18].hasValue() )
-SetSlideshowRespectZOrder(*(sal_Bool*) pValues[ 18 ].getValue());
+SetPreviewNewEffects(*(sal_Bool*) pValues[ 18 ].getValue());
 
 if( pValues[19].hasValue() )
-SetPreviewNewEffects(*(sal_Bool*) pValues[ 19 ].getValue());
+SetPreviewChangedEffects(*(sal_Bool*) pValues[ 19 ].getValue());
 
 if( pValues[20].hasValue() )
-SetPreviewChangedEffects(*(sal_Bool*) pValues[ 20 ].getValue());
+SetPreviewTransitions(*(sal_Bool*) pValues[ 20 ].getValue());
 
 if( pValues[21].hasValue() )
-SetPreviewTransitions(*(sal_Bool*) pValues[ 21 ].getValue());
+SetDisplay(*(sal_Int32*) pValues[ 21 ].getValue());
 
 if( pValues[22].hasValue() )
-SetDisplay(*(sal_Int32*) pValues[ 22 ].getValue());
+SetPresentationPenColor( getSafeValue< sal_Int32 >( pValues[ 22 ] 
) );
 
 if( pValues[23].hasValue() )
-SetPresentationPenColor( getSafeValue< sa

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 0a/0bcaaec8c80bce3bd83c2e3d3aa1b0001bd91f

2014-02-18 Thread Caolán McNamara

 0a/0bcaaec8c80bce3bd83c2e3d3aa1b0001bd91f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit de2973e881b38e0cca931037e6641cbb4e24bbda
Author: CaolÃ¡n McNamara 
Date:   Tue Feb 18 20:29:33 2014 +

Notes added by 'git notes add'

diff --git a/0a/0bcaaec8c80bce3bd83c2e3d3aa1b0001bd91f 
b/0a/0bcaaec8c80bce3bd83c2e3d3aa1b0001bd91f
new file mode 100644
index 000..3c23a7f
--- /dev/null
+++ b/0a/0bcaaec8c80bce3bd83c2e3d3aa1b0001bd91f
@@ -0,0 +1 @@
+prefer: 57d9c96d96d818f19d34d4930cc8ffc8c24e43e2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

2014-02-18 Thread Rodolfo Ribeiro Gomes

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |   10 
--
 1 file changed, 10 deletions(-)

New commits:
commit 2c9c54285b952b59b5262500089c9c1a7902deb2
Author: Rodolfo Ribeiro Gomes 
Date:   Tue Feb 11 21:49:08 2014 -0200

Removes bogus UNO command AcceptChange and RejectChange

These are not real commands. The real ones are:
- AcceptTracedChange
- RejectTracedChange

Change-Id: I352cea4a5ffec73947932264783b61ae044f25cf
Signed-off-by: Rodolfo Ribeiro Gomes 
Reviewed-on: https://gerrit.libreoffice.org/8000
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 3cb9be4..0e871e4 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -272,16 +272,6 @@
   Copy Hyperlink Location
 
   
-  
-
-  Accept Change
-
-  
-  
-
-  Reject Change
-
-  
   
 
   Bookmar~k...
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-18 Thread Vort

 sdext/source/pdfimport/misc/pdfihelper.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 988b695bcc0013d482855b81330e10fdb3448b8b
Author: Vort 
Date:   Tue Feb 18 16:09:47 2014 +0200

fdo#37246 PDF Import: Color to string conversion fix

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

diff --git a/sdext/source/pdfimport/misc/pdfihelper.cxx 
b/sdext/source/pdfimport/misc/pdfihelper.cxx
index 7a42014..8204ad3 100644
--- a/sdext/source/pdfimport/misc/pdfihelper.cxx
+++ b/sdext/source/pdfimport/misc/pdfihelper.cxx
@@ -33,13 +33,13 @@ OUString pdfi::getColorString( const rendering::ARGBColor& 
rCol )
 const sal_uInt8 nGreen( sal::static_int_cast( basegfx::fround( 
rCol.Green * 255.0 ) ) );
 const sal_uInt8 nBlue ( sal::static_int_cast( basegfx::fround( 
rCol.Blue * 255.0 ) ) );
 aBuf.append( '#' );
-if( nRed < 10 )
+if( nRed < 16 )
 aBuf.append( '0' );
 aBuf.append( sal_Int32(nRed), 16 );
-if( nGreen < 10 )
+if( nGreen < 16 )
 aBuf.append( '0' );
 aBuf.append( sal_Int32(nGreen), 16 );
-if( nBlue < 10 )
+if( nBlue < 16 )
 aBuf.append( '0' );
 aBuf.append( sal_Int32(nBlue), 16 );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-18 Thread Luc Castermans

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

New commits:
commit 1bbc5537a8acf2de2112a7ee6eb2dd76bb841dab
Author: Luc Castermans 
Date:   Tue Feb 18 20:12:15 2014 +0100

corrected translation, thanks to Philipp Weissenbacher

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

diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx
index fb8052e..3fca6de 100644
--- a/vcl/source/gdi/outdev4.cxx
+++ b/vcl/source/gdi/outdev4.cxx
@@ -406,7 +406,7 @@ void OutputDevice::ImplDrawComplexGradient( const 
Rectangle& rRect,
 nStepCount = nMinRect / nInc;
 }
 
-// at least three steps and maximum number if colour differences
+// at least three steps and at most the number of colour differences
 long nSteps = std::max( nStepCount, 2L );
 long nCalcSteps  = std::abs( nRedSteps );
 long nTempSteps = std::abs( nGreenSteps );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-18 Thread Olivier R

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

New commits:
commit f4a0f0146b6434db9f65da8d720c33111f7435f1
Author: Olivier R 
Date:   Thu Feb 13 14:19:02 2014 +0100

Updated core
Project: dictionaries  8bd2572450ee5583976a774038f64373ed319cde

Update French spelling dictionary (v5.0.2)

Change-Id: I2d1472b701f8a599539c565fc287758a9bee7664
Signed-off-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/8108
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/dictionaries b/dictionaries
index 0b71c2f..8bd2572 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 0b71c2f91f4ab429ee9184184efb4c9e117bf5df
+Subproject commit 8bd2572450ee5583976a774038f64373ed319cde
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: unoidl/Module_unoidl.mk

2014-02-18 Thread Bjoern Michaelsen

 unoidl/Module_unoidl.mk |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 77e95ea6679fd947c910536357cb53f684ffb539
Author: Bjoern Michaelsen 
Date:   Tue Feb 18 19:45:00 2014 +0100

tests belong to check target

- the CustomTarget seems to be a test, not a build target
- worse, it is .PHONY
- ... and eats 30% of the top-level build-nocheck time alone
- so hopefully, we can we at least make it a check target

Change-Id: I113777cbd849aab9e8d0a77184e31194bc07232e
Reviewed-on: https://gerrit.libreoffice.org/8111
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/unoidl/Module_unoidl.mk b/unoidl/Module_unoidl.mk
index 0136485..e158e12 100644
--- a/unoidl/Module_unoidl.mk
+++ b/unoidl/Module_unoidl.mk
@@ -16,9 +16,11 @@ $(eval $(call gb_Module_add_targets,unoidl, \
 ))
 
 $(eval $(call gb_Module_add_targets_for_build,unoidl, \
-CustomTarget_unoidl-write_test \
 Executable_unoidl-check \
 Executable_unoidl-write \
 ))
 
+$(eval $(call gb_Module_add_check_targets,unoidl, \
+CustomTarget_unoidl-write_test \
+))
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-18 Thread Julien Nabet

 sd/source/ui/inc/OutlinerIteratorImpl.hxx |2 +-
 sw/source/core/access/acccell.hxx |2 +-
 sw/source/core/access/accframebase.hxx|2 +-
 sw/source/core/access/accpage.hxx |2 +-
 sw/source/core/crsr/crsrsh.cxx|2 +-
 sw/source/ui/wrtsh/wrtsh1.cxx |2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 3d66adaa7771c68f97990d81451c775ed06c4837
Author: Julien Nabet 
Date:   Tue Feb 18 21:08:05 2014 +0100

Typo (a/A)dditionaly -> (a/A)dditionally

Change-Id: Ic4451b45b86f14bb2fab507503a6fa1e8f515b66

diff --git a/sd/source/ui/inc/OutlinerIteratorImpl.hxx 
b/sd/source/ui/inc/OutlinerIteratorImpl.hxx
index cbacdc9..1f72b48 100644
--- a/sd/source/ui/inc/OutlinerIteratorImpl.hxx
+++ b/sd/source/ui/inc/OutlinerIteratorImpl.hxx
@@ -94,7 +94,7 @@ public:
 When both iterators ar equal  is returned,  
otherwise.
 */
 virtual bool operator== (const IteratorImplBase& rIterator) const;
-/** This method is used by the equality operator.  Additionaly to the
+/** This method is used by the equality operator.  Additionally to the
 iterator it takes a type information which is taken into account on
 comparison.  It is part of a "multimethod" pattern.
 @param rIterator
diff --git a/sw/source/core/access/acccell.hxx 
b/sw/source/core/access/acccell.hxx
index 663bd21..3b1d8a6 100644
--- a/sw/source/core/access/acccell.hxx
+++ b/sw/source/core/access/acccell.hxx
@@ -46,7 +46,7 @@ class SwAccessibleCell : public SwAccessibleContext,
 
 protected:
 // Set states for getAccessibleStateSet.
-// This drived class additionaly sets SELECTABLE(1) and SELECTED(+)
+// This drived class additionally sets SELECTABLE(1) and SELECTED(+)
 virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet );
 
 virtual void _InvalidateCursorPos();
diff --git a/sw/source/core/access/accframebase.hxx 
b/sw/source/core/access/accframebase.hxx
index 4f0cd4e..d73b3de0 100644
--- a/sw/source/core/access/accframebase.hxx
+++ b/sw/source/core/access/accframebase.hxx
@@ -34,7 +34,7 @@ class SwAccessibleFrameBase : public SwAccessibleContext,
 
 protected:
 // Set states for getAccessibleStateSet.
-// This drived class additionaly sets SELECTABLE(1), SELECTED(+),
+// This drived class additionally sets SELECTABLE(1), SELECTED(+),
 // FOCUSABLE(1) and FOCUSED(+)
 virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet );
 SwFlyFrm* getFlyFrm() const;
diff --git a/sw/source/core/access/accpage.hxx 
b/sw/source/core/access/accpage.hxx
index b4b27f8..b1bcecb 100644
--- a/sw/source/core/access/accpage.hxx
+++ b/sw/source/core/access/accpage.hxx
@@ -42,7 +42,7 @@ protected:
 SwRect GetBounds( /* const SwFrm *pFrm =0 */ );
 
 // Set states for getAccessibleStateSet.
-// This drived class additionaly sets
+// This drived class additionally sets
 // FOCUSABLE(1) and FOCUSED(+)
 virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet );
 
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index fc071f4..1f007f5 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -3180,7 +3180,7 @@ bool sw_PosOk(const SwPosition & aPos)
 
 /**
Checks if a PaM is valid. For a PaM to be valid its point must be
-   valid. Additionaly if the PaM has a mark this has to be valid, too.
+   valid. Additionally if the PaM has a mark this has to be valid, too.
 
@param aPam the PaM to check
 */
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index f1ccf38..ad6648d 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -298,7 +298,7 @@ void SwWrtShell::Insert( const OUString &rPath, const 
OUString &rFilter,
 GetGrfSize( aGrfSize );
 
 // Add the margin attributes to GrfSize,
-// because these counts at the margin additionaly
+// because these counts at the margin additionally
 aGrfSize.Width() += pFrmMgr->CalcWidthBorder();
 aGrfSize.Height()+= pFrmMgr->CalcHeightBorder();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 5 commits - drawinglayer/source framework/source svx/source sw/inc sw/source vcl/aqua

2014-02-18 Thread Armin Le Grand

 drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx |   16 +
 framework/source/layoutmanager/layoutmanager.cxx |1 
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx  |   23 ++
 svx/source/sidebar/possize/PosSizePropertyPanel.hxx  |   12 +
 sw/inc/IDocumentContentOperations.hxx|2 
 sw/inc/doc.hxx   |5 
 sw/source/core/doc/doclay.cxx|  101 +--
 sw/source/core/frmedt/fecopy.cxx |7 
 sw/source/core/frmedt/fefly1.cxx |2 
 sw/source/core/unocore/unodraw.cxx   |2 
 sw/source/filter/html/htmldraw.cxx   |2 
 sw/source/filter/rtf/swparrtf.cxx|4 
 sw/source/filter/ww8/ww8graf.cxx |4 
 sw/source/filter/ww8/ww8graf2.cxx|2 
 sw/source/filter/ww8/ww8par4.cxx |2 
 vcl/aqua/source/gdi/ctlayout.cxx |   62 ++
 16 files changed, 147 insertions(+), 100 deletions(-)

New commits:
commit 0a0bcaaec8c80bce3bd83c2e3d3aa1b0001bd91f
Author: Armin Le Grand 
Date:   Tue Feb 18 16:37:20 2014 +

i124073 choose a more compiler-independent way of construction

diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx 
b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
index 7bbe180..5803670 100755
--- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
@@ -759,9 +759,23 @@ namespace drawinglayer
 basegfx::B2DPolygon 
aMaskPolygon(basegfx::tools::createUnitPolygon());
 aMaskPolygon.transform(rTransform);
 
-aRetval[0] = new MaskPrimitive2D(
+// #124073# the clde below was compiler-dependent. 
Normally,
+// a compiler will
+// - alloc mem
+// - ececute the constructor
+// - do the assignment
+// but the mac compiler does 
alloc-assign-constructor, thus
+// modifying aRetval[0] befure aRetval gets used 
in the
+// constructor. This creates an endless loop in 
the primitive
+// stack. Thus do it the safe way.
+//
+// aRetval[0] = new MaskPrimitive2D(
+// basegfx::B2DPolyPolygon(aMaskPolygon),
+// aRetval);
+MaskPrimitive2D* pMaskPrimitive2D = new 
MaskPrimitive2D(
 basegfx::B2DPolyPolygon(aMaskPolygon),
 aRetval);
+aRetval[0] = pMaskPrimitive2D;
 }
 #ifdef USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE
 }
commit be899f92bafeac8dbb02732de5249c7fa7a1f08d
Author: Herbert DÃ¼rr 
Date:   Tue Feb 18 15:32:46 2014 +

#i124233# fix CoreText justification of text with trailing spaces

the fix works also for EditEngine by ignoring Writer's halfspace magic.
TODO: replace that halfspace magic with a generic solution.

diff --git a/vcl/aqua/source/gdi/ctlayout.cxx b/vcl/aqua/source/gdi/ctlayout.cxx
index 11df073..3ec11c9 100644
--- a/vcl/aqua/source/gdi/ctlayout.cxx
+++ b/vcl/aqua/source/gdi/ctlayout.cxx
@@ -72,7 +72,6 @@ private:
 // cached details about the resulting layout
 // mutable members since these details are all lazy initialized
 mutable double  mfCachedWidth;  // cached value of resulting 
typographical width
-mutable double  mfTrailingSpaceWidth;   // in Pixels
 
 // x-offset relative to layout origin
 // currently only used in RTL-layouts
@@ -89,7 +88,6 @@ CTLayout::CTLayout( const CTTextStyle* pTextStyle )
 ,   mnTrailingSpaces( 0 )
 ,   mfFontScale( pTextStyle->mfFontScale )
 ,   mfCachedWidth( -1 )
-,   mfTrailingSpaceWidth( 0 )
 ,   mnBaseAdv( 0 )
 {
 CFRetain( mpTextStyle->GetStyleDict() );
@@ -146,60 +144,49 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
 return;
 
 const DynCoreTextSyms& rCT = DynCoreTextSyms::get();
-// CoreText fills trailing space during justification so we have to
-// take that into account when requesting CT to justify something
-mfTrailingSpaceWidth = rCT.LineGetTrailingWhitespaceWidth( mpCTLine );
-const int nTrailingSpaceWidth = rint( mfFontScale * mfTrailingSpaceWidth );
 
-int nOrigWidth = GetTextWidth();
 int nPixelWidth = rArgs.mnLayoutWidth;
-if( nPixelWidth )
-{
-nPixelWidth -= nTrailingSpaceWidth;
-if( nPixelWidth <= 0)
-r

top level make in under 8 seconds ...

2014-02-18 Thread Bjoern Michaelsen

Hi,

On Tue, Feb 18, 2014 at 05:13:44PM +0100, Bjoern Michaelsen wrote:
> On Tue, Feb 18, 2014 at 04:57:39PM +0100, Bjoern Michaelsen wrote:
> > 4.0, no maintainer mode, second run, using cache, power supply plugged, 
> > build on tmpfs:
> > real0m11.155s

While at it I looked at the most costly things and found:

 https://gerrit.libreoffice.org/#/c/8111/

when that is on master the noop build is < 8 seconds.

With that fixed, the most expensive modules are:
> for mod in `find . -maxdepth 1 -type d|sed -e 's/^..//'`; do /usr/bin/time 
> --format=%E:%C make $mod.build 2>&1 ;done|grep :make|sort -n|tail -n 12
> 0:00.37:make sfx2.build
> 0:00.37:make xmloff.build
> 0:00.38:make vcl.build
> 0:00.40:make connectivity.build
> 0:00.45:make chart2.build
> 0:00.48:make filter.build
> 0:00.49:make dbaccess.build
> 0:00.71:make svx.build
> 0:00.82:make sd.build
> 0:01.22:make offapi.build
> 0:01.33:make sc.build
> 0:01.45:make sw.build

and building only these 12 with:
> make sw.build sc.build offapi.build sd.build svx.build dbaccess.build 
> filter.build chart2.build connectivity.build vcl.build xmloff.build sfx2.build
> real0m7.894s

is already slower than:
> make build-nocheck
> real0m7.776s

although the latter does check all > 200 modules.

So if we dont sneak in too many PHONYs, building top-level by default isnt
really that much of a burden -- after all usually, when you type 'make' you
actually rebuild something. ;)

And with that Im closing this years build system janitorial report and go back
to bumping distro releases.

Best,

Bjoern

(all measurements on notebook with SSD, no tmpfs and depcache make)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-02-18 Thread Miklos Vajna

 writerfilter/source/dmapper/DomainMapper.cxx   |6 +-
 writerfilter/source/doctok/resources.xmi   |   62 -
 writerfilter/source/ooxml/model.xml|4 -
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |4 -
 4 files changed, 7 insertions(+), 69 deletions(-)

New commits:
commit 9d40af0c791251ae21d5886e6e8b6e3344ee5470
Author: Miklos Vajna 
Date:   Tue Feb 18 20:32:14 2014 +0100

writerfilter: convert sprm:PF{PageBreakBefore,NoLineNumb}

Change-Id: I1dd89236e81a7f62bb7abef5503f7520387772a0

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 34601fa..05c6978 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1000,9 +1000,9 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, 
PropertyMapPtr rContext, SprmType
 case NS_ooxml::LN_CT_PPrBase_keepNext:
 rContext->Insert(PROP_PARA_KEEP_TOGETHER, uno::makeAny( nIntValue ? 
true : false) );
 break;
-case NS_sprm::LN_PFPageBreakBefore:
+case NS_ooxml::LN_CT_PPrBase_pageBreakBefore:
 rContext->Insert(PROP_BREAK_TYPE, uno::makeAny( 
com::sun::star::style::BreakType_PAGE_BEFORE ) );
-break;  // sprmPFPageBreakBefore
+break;
 case NS_ooxml::LN_CT_NumPr_ilvl:
 if (nIntValue < 0 || 10 <= nIntValue) // Writer can't do everything
 {
@@ -1058,7 +1058,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, 
PropertyMapPtr rContext, SprmType
 }
 }
 break;
-case NS_sprm::LN_PFNoLineNumb:   // sprmPFNoLineNumb
+case NS_ooxml::LN_CT_PPrBase_suppressLineNumbers:
 rContext->Insert(PROP_PARA_LINE_NUMBER_COUNT, uno::makeAny( nIntValue 
? false : true) );
 break;
 case 0x845d://right margin Asian - undocumented
diff --git a/writerfilter/source/doctok/resources.xmi 
b/writerfilter/source/doctok/resources.xmi
index c3ae23b..1b90437 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -100,68 +100,6 @@
   
 
 
-
-
-  
-
-  
-  
-
-  0x2407
-  
-
-  
-
-  
-  
-
-  
rtf:sprmPFPageBreakBefore
-  
-
-  
-
-  
-  
-
-  paragraph
-  
-
-  
-
-  
-
-
-
-
-  
-
-  
-  
-
-  0x240C
-  
-
-  
-
-  
-  
-
-  
rtf:sprmPFNoLineNumb
-  
-
-  
-
-  
-  
-
-  paragraph
-  
-
-  
-
-  
-
-
 
 
   
diff --git a/writerfilter/source/ooxml/model.xml 
b/writerfilter/source/ooxml/model.xml
index e833fc9..38f7419 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -22340,11 +22340,11 @@
   
   
   
-  
+  
   
   
   
-  
+  
   
   
   
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index f6651e8..4d49e89 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -442,7 +442,7 @@ void RTFDocumentImpl::checkNeedPap()
 
 // Writer will ignore a page break before a text frame, so guard 
it with empty paragraphs
 bool hasBreakBeforeFrame = m_aStates.top().aFrame.hasProperties() 
&&
-
m_aStates.top().aParagraphSprms.find(NS_sprm::LN_PFPageBreakBefore).get();
+
m_aStates.top().aParagraphSprms.find(NS_ooxml::LN_CT_PPrBase_pageBreakBefore).get();
 if (hasBreakBeforeFrame)
 {
 dispatchSymbol(RTF_PAR);
@@ -2296,7 +2296,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
 }
 break;
 case RTF_PAGEBB:
-nParam = NS_sprm::LN_PFPageBreakBefore;
+nParam = NS_ooxml::LN_CT_PPrBase_pageBreakBefore;
 break;
 default:
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-18 Thread Miklos Vajna

 sw/CppunitTest_sw_ooxmlimport.mk  |1 
 sw/qa/extras/ooxmlimport/data/ole-anchor.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |6 +
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   26 ++
 4 files changed, 15 insertions(+), 18 deletions(-)

New commits:
commit 2a35f5c7945d00b6f6e21fc7cf5b05b184eba88f
Author: Miklos Vajna 
Date:   Tue Feb 18 19:54:32 2014 +0100

DOCX OLE import: inherit anchor type from replacement graphic

Change-Id: Ic8b6f423acae5cc7e3799cf20e672b56a9cc8c0c

diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk
index d72f93e..1171001 100644
--- a/sw/CppunitTest_sw_ooxmlimport.mk
+++ b/sw/CppunitTest_sw_ooxmlimport.mk
@@ -51,6 +51,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlimport,\
basic/util/sb \
 chart2/source/controller/chartcontroller \
 chart2/source/chartcore \
+   canvas/source/factory/canvasfactory \
 comphelper/util/comphelp \
 configmgr/source/configmgr \
 drawinglayer/drawinglayer \
diff --git a/sw/qa/extras/ooxmlimport/data/ole-anchor.docx 
b/sw/qa/extras/ooxmlimport/data/ole-anchor.docx
new file mode 100755
index 000..11df239
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/ole-anchor.docx 
differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index f264f0c..3c7c473 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1783,6 +1783,12 @@ DECLARE_OOXMLIMPORT_TEST(testGroupshapeRelsize, 
"groupshape-relsize.docx")
 CPPUNIT_ASSERT_EQUAL(sal_Int32(EMU_TO_MM100(9142730)), 
getShape(1)->getSize().Height);
 }
 
+DECLARE_OOXMLIMPORT_TEST(testOleAnchor, "ole-anchor.docx")
+{
+// This was AS_CHARACTER, even if the VML style explicitly contains 
"position:absolute".
+CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER, 
getProperty(getShape(1), "AnchorType"));
+}
+
 DECLARE_OOXMLIMPORT_TEST(testDMLGroupShapeCapitalization, 
"dml-groupshape-capitalization.docx")
 {
 // Capitalization inside a group shape was not imported
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index b60c2a8..9e290e6 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1231,9 +1231,13 @@ void DomainMapper_Impl::appendOLE( const OUString& 
rStreamName, OLEHandlerPtr pO
 uno::Reference< graphic::XGraphic > xGraphic = 
pOLEHandler->getReplacement();
 
xOLEProperties->setPropertyValue(PropertyNameSupplier::GetPropertyNameSupplier().GetName(
 PROP_GRAPHIC ),
 uno::makeAny(xGraphic));
-// mimic the treatment of graphics here.. it seems anchoring as 
character
-// gives a better ( visually ) result
-
xOLEProperties->setPropertyValue(PropertyNameSupplier::GetPropertyNameSupplier().GetName(
 PROP_ANCHOR_TYPE ),  uno::makeAny( text::TextContentAnchorType_AS_CHARACTER ) 
);
+uno::Reference 
xReplacementProperties(pOLEHandler->getShape(), uno::UNO_QUERY);
+if (xReplacementProperties.is())
+xOLEProperties->setPropertyValue("AnchorType", 
xReplacementProperties->getPropertyValue("AnchorType"));
+else
+// mimic the treatment of graphics here.. it seems anchoring as 
character
+// gives a better ( visually ) result
+
xOLEProperties->setPropertyValue(PropertyNameSupplier::GetPropertyNameSupplier().GetName(
 PROP_ANCHOR_TYPE ),  uno::makeAny( text::TextContentAnchorType_AS_CHARACTER ) 
);
 // remove ( if valid ) associated shape ( used for graphic replacement 
)
 m_aAnchoredStack.top( ).bToRemove = true;
 RemoveLastParagraph();
commit ff02109b65052a1d17d18f1f66a43480c8792691
Author: Miklos Vajna 
Date:   Tue Feb 18 18:34:01 2014 +0100

Clean up DomainMapper_Impl::PushShapeContext()

It doesn't make sense to set anchor type here: either the VML import
already set it, or it should be set when the anchor/inline token
arrives.

Additionally, this basically ensured that non-inline pictures are either
inline or at-page anchored, and both of those values are incorrect.

Change-Id: Ic71aeca9da333665a2749bb0aabbb9b63cee0c00

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 2cbc737..b60c2a8 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1732,18 +1732,8 @@ void DomainMapper_Impl::PushShapeContext( const 
uno::Reference< drawing::XShape
 #ifdef DEBUG_DOMAINMAPPER
 dmapper_logger->unoPropertySet(xProps);
 #endif
-bool bIsGraphic = xSInfo->supportsService( 
"com.sun.star.drawing.GraphicObjectShape" );
-
-// If there are position properti

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

2014-02-18 Thread Jan Hubicka

 include/tools/zcodec.hxx   |5 -
 tools/source/zcodec/zcodec.cxx |5 -
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 3db6d2cb99f9559ba29759990675e469613a8bb0
Author: Jan Hubicka 
Date:   Tue Feb 18 19:17:46 2014 +0100

GCC 4.9, LTO: libvcl uses GZCodec but it is not linked with the 
implementation

This is not valid C++ and GCC now resolves the virtual calls and inlines
destructor that leads to undefined symbols.

Change-Id: I841d25bc6f994f0e73665b174994f9471597131e

diff --git a/include/tools/zcodec.hxx b/include/tools/zcodec.hxx
index 14e2d5b..e5d9592 100644
--- a/include/tools/zcodec.hxx
+++ b/include/tools/zcodec.hxx
@@ -102,7 +102,10 @@ class GZCodec : public ZCodec
 public:
 GZCodec(){};
 ~GZCodec(){};
-virtual voidBeginCompression( sal_uIntPtr nCompressMethod = 
ZCODEC_DEFAULT );
+virtual voidBeginCompression( sal_uIntPtr nCompressMethod = 
ZCODEC_DEFAULT )
+{
+ZCodec::BeginCompression( nCompressMethod | ZCODEC_GZ_LIB );
+};
 };
 
 #endif
diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx
index fe2e573..dd993f1 100644
--- a/tools/source/zcodec/zcodec.cxx
+++ b/tools/source/zcodec/zcodec.cxx
@@ -413,9 +413,4 @@ sal_uIntPtr ZCodec::UpdateCRC ( sal_uIntPtr nLatestCRC, 
sal_uInt8* pSource, long
 return rtl_crc32( nLatestCRC, pSource, nDatSize );
 }
 
-void GZCodec::BeginCompression( sal_uIntPtr nCompressMethod )
-{
-ZCodec::BeginCompression( nCompressMethod | ZCODEC_GZ_LIB );
-};
-
 /* 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: 2 commits - lotuswordpro/source vcl/quartz

2014-02-18 Thread Norbert Thiebaud

 lotuswordpro/source/filter/lwptable.cxx |9 -
 vcl/quartz/ctfonts.cxx  |7 +--
 2 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 7fd180c9d0014ac275422501e70e5122026eb364
Author: Norbert Thiebaud 
Date:   Tue Feb 18 12:01:51 2014 -0600

fix SIGBUS on mac due to Font Attribute not always available

Change-Id: I95c574e6386cacc473cad232100a224ff6a08dbb

diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index e5c3f5931..6008aef 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -310,9 +310,12 @@ ImplDevFontAttributes DevFontFromCTFontDescriptor( 
CTFontDescriptorRef pFD, bool
 CFStringRef pUILang = CFStringCreateWithCharacters( kCFAllocatorDefault, 
aUILang.getStr(), aUILang.getLength() );
 CFStringRef pLang = NULL;
 CFStringRef pFamilyName = 
(CFStringRef)CTFontDescriptorCopyLocalizedAttribute( pFD, 
kCTFontFamilyNameAttribute, &pLang );
-if ( CFStringCompare( pUILang, pLang, 0 ) != kCFCompareEqualTo )
+if ( !pLang || ( CFStringCompare( pUILang, pLang, 0 ) != kCFCompareEqualTo 
))
 {
-CFRelease( pFamilyName );
+if(pFamilyName)
+{
+CFRelease( pFamilyName );
+}
 pFamilyName = (CFStringRef)CTFontDescriptorCopyAttribute( pFD, 
kCTFontFamilyNameAttribute );
 }
 #else
commit 263882acdcb7b54aacf834ae52de4ad56a1921bf
Author: Norbert Thiebaud 
Date:   Tue Feb 18 04:37:26 2014 -0600

coverity#738749 Uninitialized scalar field

Change-Id: I3a75f31e9a7775e3685f168f418a333f40312d78

diff --git a/lotuswordpro/source/filter/lwptable.cxx 
b/lotuswordpro/source/filter/lwptable.cxx
index 1a3022f..26eada5 100644
--- a/lotuswordpro/source/filter/lwptable.cxx
+++ b/lotuswordpro/source/filter/lwptable.cxx
@@ -88,7 +88,14 @@ void LwpSuperTable::XFConvert(XFContentContainer* /*pCont*/)
 
 //End of Add
 /*/
- LwpTable::LwpTable(LwpObjectHeader &objHdr, LwpSvStream* 
pStrm):LwpContent(objHdr, pStrm)
+ LwpTable::LwpTable(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+ : LwpContent(objHdr, pStrm)
+ , m_nRow(0)
+ , m_nColumn(0)
+ , m_nHeight(0)
+ , m_nWidth(0)
+ , m_nDefaultAutoGrowRowHeight(0)
+ , m_nAttributes(0)
 {}
 
 LwpTable::~LwpTable()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-18 Thread Stephan Bergmann

 include/com/sun/star/uno/Any.h   |   18 ++
 include/com/sun/star/uno/Any.hxx |   18 ++
 2 files changed, 36 insertions(+)

New commits:
commit 2224ef39728f0ee654d82c51a900aa1837e6663d
Author: Stephan Bergmann 
Date:   Tue Feb 18 17:07:45 2014 +0100

Any: consistently use explicit specialization instead of overloading

Should be transparent to client code.

Change-Id: I5632fba87242ff9cb9a6b3481a179fa3e92c618b

diff --git a/include/com/sun/star/uno/Any.h b/include/com/sun/star/uno/Any.h
index d9afd93..ca22957 100644
--- a/include/com/sun/star/uno/Any.h
+++ b/include/com/sun/star/uno/Any.h
@@ -270,6 +270,7 @@ template< class C >
 inline void SAL_CALL operator <<= ( Any & rAny, const C & value ) 
SAL_THROW(());
 
 // additionally for C++ bool:
+template<>
 inline void SAL_CALL operator <<= ( Any & rAny, bool const & value )
 SAL_THROW(());
 
@@ -312,7 +313,9 @@ inline bool SAL_CALL operator != ( const Any & rAny, const 
C & value ) SAL_THROW
 
 // additional specialized >>= and == operators
 // bool
+template<>
 inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Bool & value ) 
SAL_THROW(());
+template<>
 inline bool SAL_CALL operator == ( const Any & rAny, const sal_Bool & value ) 
SAL_THROW(());
 template<>
 inline bool SAL_CALL operator >>= ( Any const & rAny, bool & value )
@@ -321,29 +324,44 @@ template<>
 inline bool SAL_CALL operator == ( Any const & rAny, bool const & value )
 SAL_THROW(());
 // byte
+template<>
 inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int8 & value ) 
SAL_THROW(());
 // short
+template<>
 inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int16 & value ) 
SAL_THROW(());
+template<>
 inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt16 & value ) 
SAL_THROW(());
 // long
+template<>
 inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int32 & value ) 
SAL_THROW(());
+template<>
 inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt32 & value ) 
SAL_THROW(());
 // hyper
+template<>
 inline bool SAL_CALL operator >>= ( const Any & rAny, sal_Int64 & value ) 
SAL_THROW(());
+template<>
 inline bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt64 & value ) 
SAL_THROW(());
 // float
+template<>
 inline bool SAL_CALL operator >>= ( const Any & rAny, float & value ) 
SAL_THROW(());
 // double
+template<>
 inline bool SAL_CALL operator >>= ( const Any & rAny, double & value ) 
SAL_THROW(());
 // string
+template<>
 inline bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & value 
) SAL_THROW(());
+template<>
 inline bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString & 
value ) SAL_THROW(());
 // type
+template<>
 inline bool SAL_CALL operator >>= ( const Any & rAny, Type & value ) 
SAL_THROW(());
+template<>
 inline bool SAL_CALL operator == ( const Any & rAny, const Type & value ) 
SAL_THROW(());
 // any
+template<>
 inline bool SAL_CALL operator >>= ( const Any & rAny, Any & value ) 
SAL_THROW(());
 // interface
+template<>
 inline bool SAL_CALL operator == ( const Any & rAny, const BaseReference & 
value ) SAL_THROW(());
 
 }
diff --git a/include/com/sun/star/uno/Any.hxx b/include/com/sun/star/uno/Any.hxx
index d04527a..8046c0d 100644
--- a/include/com/sun/star/uno/Any.hxx
+++ b/include/com/sun/star/uno/Any.hxx
@@ -214,6 +214,7 @@ inline void SAL_CALL operator <<= ( Any & rAny, const C & 
value ) SAL_THROW(())
 
 // additionally for C++ bool:
 
//__
+template<>
 inline void SAL_CALL operator <<= ( Any & rAny, bool const & value )
 SAL_THROW(())
 {
@@ -250,6 +251,7 @@ inline bool SAL_CALL operator >>= ( const Any & rAny, C & 
value ) SAL_THROW(())
 
 // bool
 
//__
+template<>
 inline bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, 
sal_Bool & value ) SAL_THROW(())
 {
 if (typelib_TypeClass_BOOLEAN == rAny.pType->eTypeClass)
@@ -260,6 +262,7 @@ inline bool SAL_CALL operator >>= ( const 
::com::sun::star::uno::Any & rAny, sal
 return false;
 }
 
//__
+template<>
 inline bool SAL_CALL operator == ( const Any & rAny, const sal_Bool & value ) 
SAL_THROW(())
 {
 return (typelib_TypeClass_BOOLEAN == rAny.pType->eTypeClass &&
@@ -293,6 +296,7 @@ inline bool SAL_CALL operator == ( Any const & rAny, bool 
const & value )
 
 // byte
 
//__
+template<>
 inline bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, 
sal_Int8 & value ) SAL_THROW(())
 {
 if (typelib_TypeClass_BYTE == rAny.pType->eTypeClass)
@@ -304,6 +308,7 @@ inline bool SAL_CALL operator >>= ( const 
::com::sun::star::uno::Any & rAny, sal
 }
 // short
 
//___

LibreOffice on HiDPI (was: Some information about LibO on actual hardware)

2014-02-18 Thread Bjoern Michaelsen

Hi Thomas,

On Tue, Feb 18, 2014 at 06:28:27PM +0100, Thomas Krumbein wrote:
> Display: 3200*1800px

for the progress on LibreOffice on HiDPI, please see:

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

and the referenced links.

Best,

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

Some information about LibO on actual hardware

2014-02-18 Thread Thomas Krumbein

Hey all,

in actual business cases more and more people are using tablets and
small and light computers (convertibals, ultrabooks). And because we
will be on CeBIT and CeBIT is a business exhibition, I want to be sure,
that LibO will work with actual hardware.

So I bought a Lenovo Yoga2 13" Ideapad and give LibO a chance ;)
Actual Hardware, Intel I5, Windows 8.1, SSD, 8 GB RAM,
Display: 3200*1800px

Here are my first impressions:

First of all the good news: LibO (I used version 4.2.1) can be installed
without any problems :)

The first start works ok and the new Startcenter looks good and fits to
the display resolution. Icons and fonts are big enough and easy to read.

Then I start a first applicatin (Text-Document). It opens, but was
nearly unusable - really small fonts, Icons looks like a "fly-dirt" and
you need a strong magnifying-glass to know, what it is...

So I change the options, select 120% Font, big Icons - and try again.

Now it is a little bit better, Fonts, Menus etc are readable, size is
small, but ok. Only all the Icons are still very, very small and do not
fit to fonts and text. So the surface does not look homogeneous.

But I could work with libreOffice.

Then I turn on the side-bar. Fonts are here stronger then expected and
looks a little bit to "fat". Icons are still to small.
Because some information were hide on the right side of the sidebar, I
tried to expand the sidebar a little bit to the left - this was the dead
of LibO.
Just saw a "flattern" of the left border of the sidebar stepping
forward/backwards in milliseconds - nothing reacts any more and only the
taskmanager could kill the process.
OK, I am not sure, if ths is a special problem of the version 4.2.1 or
if it is problem of the high resulution desktop - but it is a failure!

I tried all moduls and (without using the sidebar) I did not find
differences to typical desktops, so I guess, it will work on those hardware.

I have done some screenshots - but using normal displays they all looks
very big and ok - so you cannot get a feeling in real ;)

We will have this maschine on CeBIT and all who visit us can have an own
look - that might be more helpful.

That´s what I want to share with you

best regards
Thomas


-- 
## Unterstützung der freien Office Suite
## http://de.libreOffice.org  - www.LibreOffice.org
## Vorstand Freies Office Deutschland e.V.
## Mitglieder willkommen: www.FroDeV.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Fwd: Re: [Libreoffice-commits] core.git: Move string hash function into String class.

2014-02-18 Thread Muthu Subramanian


On 02/18/2014 05:53 PM, Stephan Bergmann wrote:


While a well-designed interface between a base class and its 
derivations (of which virtual functions are a part) is desirable, a 
virtual function carries a relatively high maintenance cost.  So 
please never declare functions as virtual until they actually need to be.

ah...makes sense.


Just pushed 
 
"Stick to a single O[U]String hash function" based on what we 
discussed here.  Hope it still matches the requirements of 
SfxItemSet::getHash and SdPage::getHash (where I must confess that I 
don't understand what those requirements are) as well as the 
requirements of the svl::SharedStringPool clients (see the commit 
message for details).

Thank you!
It seems fine from what I checked - I will do check it in detail 
sometime this week - I don't see any problems though.


Thank you so much!
Muthu Subramanian



Stephan


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

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

2014-02-18 Thread Zolnai Tamás

 dev/null|binary
 l10ntools/inc/lngmerge.hxx  |4 -
 l10ntools/source/lngex.cxx  |2 
 l10ntools/source/lngmerge.cxx   |6 --
 oox/source/drawingml/shape.cxx  |   13 +++-
 oox/source/drawingml/shapegroupcontext.cxx  |2 
 oox/source/shape/WpgContext.cxx |4 -
 sw/qa/extras/ooxmlexport/data/dml-groupshape-childposition.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx|   30 
--
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx|   23 ---
 10 files changed, 42 insertions(+), 42 deletions(-)

New commits:
commit 8e285728e634b8a2dafcfe87cd1fa7810791df5e
Author: Zolnai TamÃ¡s 
Date:   Tue Feb 18 14:33:55 2014 +0100

ooxml unit tests: merge two tests

Change-Id: Ie37ec829ddeeaeb8882c1a566cc80419edcfa170

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index a588ce0..fd304c0 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -110,8 +110,7 @@ protected:
 "math-mso2k7.docx",
 "ImageCrop.docx",
 "test_GIF_ImageCrop.docx",
-"test_PNG_ImageCrop.docx",
-"dml-shape-fillbitmapcrop.docx"
+"test_PNG_ImageCrop.docx"
 };
 std::vector vBlacklist(aBlacklist, aBlacklist + 
SAL_N_ELEMENTS(aBlacklist));
 
@@ -2991,10 +2990,10 @@ DECLARE_OOXMLEXPORT_TEST(testDMLShapeFillBitmapCrop, 
"dml-shape-fillbitmapcrop.d
 
 // 1st shape has some cropping
 text::GraphicCrop aGraphicCropStruct = 
getProperty(getShape(1), "GraphicCrop");
-CPPUNIT_ASSERT_EQUAL( sal_Int32( 454 ), aGraphicCropStruct.Left );
-CPPUNIT_ASSERT_EQUAL( sal_Int32( 367 ), aGraphicCropStruct.Right );
-CPPUNIT_ASSERT_EQUAL( sal_Int32( -454 ), aGraphicCropStruct.Top );
-CPPUNIT_ASSERT_EQUAL( sal_Int32( -367 ), aGraphicCropStruct.Bottom );
+CPPUNIT_ASSERT_EQUAL( sal_Int32(m_bExported ? 454 : 455 ), 
aGraphicCropStruct.Left );
+CPPUNIT_ASSERT_EQUAL( sal_Int32(m_bExported ? 367 : 368 ), 
aGraphicCropStruct.Right );
+CPPUNIT_ASSERT_EQUAL( sal_Int32(m_bExported ? -454 : -455 ), 
aGraphicCropStruct.Top );
+CPPUNIT_ASSERT_EQUAL( sal_Int32(m_bExported ? -367 : -368 ), 
aGraphicCropStruct.Bottom );
 
 // 2nd shape has no cropping
 aGraphicCropStruct = getProperty(getShape(2), 
"GraphicCrop");
diff --git a/sw/qa/extras/ooxmlimport/data/dml-shape-fillbitmapcrop.docx 
b/sw/qa/extras/ooxmlimport/data/dml-shape-fillbitmapcrop.docx
deleted file mode 100644
index 6c401ba..000
Binary files a/sw/qa/extras/ooxmlimport/data/dml-shape-fillbitmapcrop.docx and 
/dev/null differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 7d9e4f5..f264f0c 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1817,29 +1817,6 @@ DECLARE_OOXMLIMPORT_TEST(testDMLGroupShapeParaAdjust, 
"dml-groupshape-paraadjust
 CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_LEFT), 
getProperty(getRun(getParagraphOfText(7, xText), 1), "ParaAdjust"));
 }
 
-DECLARE_OOXMLIMPORT_TEST(testDMLShapeFillBitmapCrop, 
"dml-shape-fillbitmapcrop.docx")
-{
-// The same test can be found in ooxmlexport, but some rouding made on 
crop values so we can't test import and
-// export with the same values.
-
-// 1st shape has some cropping
-text::GraphicCrop aGraphicCropStruct = 
getProperty(getShape(1), "GraphicCrop");
-
-CPPUNIT_ASSERT_EQUAL( sal_Int32( 455 ), aGraphicCropStruct.Left );
-CPPUNIT_ASSERT_EQUAL( sal_Int32( 368 ), aGraphicCropStruct.Right );
-CPPUNIT_ASSERT_EQUAL( sal_Int32( -455 ), aGraphicCropStruct.Top );
-CPPUNIT_ASSERT_EQUAL( sal_Int32( -368 ), aGraphicCropStruct.Bottom );
-
-// 2nd shape has no cropping
-aGraphicCropStruct = getProperty(getShape(2), 
"GraphicCrop");
-
-CPPUNIT_ASSERT_EQUAL( sal_Int32( 0 ), aGraphicCropStruct.Left );
-CPPUNIT_ASSERT_EQUAL( sal_Int32( 0 ), aGraphicCropStruct.Right );
-CPPUNIT_ASSERT_EQUAL( sal_Int32( 0 ), aGraphicCropStruct.Top );
-CPPUNIT_ASSERT_EQUAL( sal_Int32( 0 ), aGraphicCropStruct.Bottom );
-
-}
-
 DECLARE_OOXMLIMPORT_TEST(testPictureWithSchemeColor, 
"picture-with-schemecolor.docx")
 {
 // At the start of the document, a picture which has a color specified 
with a color scheme, lost
commit c9b1fd63452325ee5cb6d003e9fc8315d1ca104e
Author: Zolnai TamÃ¡s 
Date:   Tue Feb 18 17:28:05 2014 +0100

drawingML import: fix position of cildren in shape groups

Translate component of parent shapes' transformation
have to be applied to children when there is no explicit
child transformation.

Note. Export also use this concept.

Chang

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

2014-02-18 Thread Caolán McNamara

 50/b10da7434d774ac463c148bbaeb051d2b3a22d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d07b4579a955caf07c25d617cb374f0b48799723
Author: CaolÃ¡n McNamara 
Date:   Tue Feb 18 16:26:53 2014 +

Notes added by 'git notes add'

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

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

2014-02-18 Thread Oliver-Rainer Wittmann

 framework/source/layoutmanager/layoutmanager.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6ba4d125f61f1cfe737190628e84f7fc75263382
Author: Oliver-Rainer Wittmann 
Date:   Mon Feb 17 16:20:12 2014 +

Related: #i124096# correct LayoutManager::m_xDockingAreaAcceptor clear...

on disposing

(cherry picked from commit 50b10da7434d774ac463c148bbaeb051d2b3a22d)

Conflicts:
framework/source/layoutmanager/layoutmanager.cxx

Change-Id: I51fe74698f00fadba9afaeb0f8e9f66b85f208cb

diff --git a/framework/source/layoutmanager/layoutmanager.cxx 
b/framework/source/layoutmanager/layoutmanager.cxx
index ca60d0a..d1267dbe 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -2835,6 +2835,8 @@ throw( RuntimeException )
 // Our frame gets disposed, release all our references that depends on 
a working frame reference.
 Application::RemoveEventListener( LINK( this, LayoutManager, 
SettingsChanged ) );
 
+setDockingAreaAcceptor( Reference< ui::XDockingAreaAcceptor >() );
+
 // destroy all elements, it's possible that dettaching is NOT called!
 implts_destroyElements();
 impl_clearUpMenuBar();
@@ -2883,7 +2885,6 @@ throw( RuntimeException )
 m_xFrame.clear();
 delete m_pGlobalSettings;
 m_pGlobalSettings = 0;
-m_xDockingAreaAcceptor = Reference< ui::XDockingAreaAcceptor >();
 
 bDisposeAndClear = sal_True;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-18 Thread Caolán McNamara

 cui/uiconfig/ui/acorreplacepage.ui |  178 +++--
 1 file changed, 95 insertions(+), 83 deletions(-)

New commits:
commit a05e22067a167b0aa41ffdad0d061371811a177d
Author: CaolÃ¡n McNamara 
Date:   Wed Jan 29 10:51:21 2014 +

Resolves: fdo#74070 make replace and with fields the same width

Change-Id: I2fbd7d6ed4e657660334a572768f12cbba1d75e2
(cherry picked from commit 8d464a7423ac8f3eb30eb80a0e5041989a4cc2da)
Reviewed-on: https://gerrit.libreoffice.org/8109
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/cui/uiconfig/ui/acorreplacepage.ui 
b/cui/uiconfig/ui/acorreplacepage.ui
index 199269f..2f7c6f8 100644
--- a/cui/uiconfig/ui/acorreplacepage.ui
+++ b/cui/uiconfig/ui/acorreplacepage.ui
@@ -1,7 +1,8 @@
 
+
 
-  
   
+  
   
 True
 False
@@ -11,86 +12,6 @@
 6
 12
 
-  
-True
-False
-0
-Repla_ce
-True
-origtext
-  
-  
-0
-0
-1
-1
-  
-
-
-  
-True
-False
-0
-_With:
-True
-newtext
-  
-  
-1
-0
-1
-1
-  
-
-
-  
-_Text only
-True
-True
-False
-end
-True
-0
-True
-  
-  
-2
-0
-1
-1
-  
-
-
-  
-True
-True
-True
-â
-20
-  
-  
-0
-1
-1
-1
-  
-
-
-  
-True
-True
-True
-â
-30
-  
-  
-1
-1
-2
-1
-  
-
-
   
 True
 False
@@ -143,7 +64,7 @@
 
   
   
-3
+2
 1
 1
 2
@@ -160,7 +81,98 @@
   
 0
 2
-3
+2
+1
+  
+
+
+  
+True
+True
+True
+25
+  
+  
+1
+1
+1
+1
+  
+
+
+  
+True
+True
+True
+25
+  
+  
+0
+1
+1
+1
+  
+
+
+  
+True
+False
+0
+Repla_ce
+True
+origtext
+  
+  
+0
+0
+1
+1
+  
+
+
+  
+True
+False
+
+  
+True
+False
+0
+_With:
+True
+newtext
+  
+  
+0
+0
+1
+1
+  
+
+
+  
+_Text only
+True
+True
+False
+end
+True
+True
+0
+True
+  
+  
+1
+0
+1
+1
+  
+
+  
+  
+1
+0
+1
 1
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: GNU make with depcache/some general build speed up tips/three LibreOffice GNU make forks considered harmful

2014-02-18 Thread Bjoern Michaelsen

On Tue, Feb 18, 2014 at 04:57:39PM +0100, Bjoern Michaelsen wrote:
> 4.0, no maintainer mode, second run, using cache, power supply plugged, build 
> on tmpfs:
> real0m11.155s

Just for completeness sake, same with gb_FULLDEPS=:
real0m10.213s

so with depcache, reading and stating all the files for >8000 objects is below
1 second and essentially linenoise to the 10 seconds that is gbuild reading
"real" makefiles. Still curious if it does make a change on Windows, though ;)

Best,

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

GNU make with depcache/some general build speed up tips/three LibreOffice GNU make forks considered harmful

2014-02-18 Thread Bjoern Michaelsen

Hi,

as promised at FOSDEM here is the proof-of-concept for the dependency caching
stuff for GNU make. To get it do:

 git clone https://github.com/bjoernmichaelsen/gnu-make-depcache.git gnu-make
 git checkout feature/depcache
 git clean -dfx
 autoreconf -i && ./configure && make update && make && make check

and then point the "export GNUMAKE=" line in your config_host.mk to the
generated binary. Here is what is there:
- cache generation
- cache usage
- basic test harnish
- backwards compatible implementation (triggering on .FEATURES variable)

Here is what is missing:
- handling missing dependency files (gotta look into that one)
- documentation
- the depcache isnt platform-independant

Below are the numbers -- note that the 32 seconds are on the same machine as
the numbers I presented at FOSDEM, but instead of doing measurements on the
bus, I did so in a calm place at home.

Conclusions so far:
- measuring IO performance on a notebook is tricky, doing so on the bus to
  FOSDEM is insane
- unplugging your power supply can ~half your IO speed on a SSD/notebook even
  on Linux
- Maintainer Mode is slow, it does a lot of extra sanity checks at runtime
  if you use a self compiled GNU make you really want:
  
https://github.com/bjoernmichaelsen/gnu-make-depcache/commit/00bc33b760cc54a270418212af2d4750808b91f9
- tmpfs has no additional advantage when you do depcaching
- we are below 11 seconds for build-nocheck on a 3 year old dev notebook, no
  need to push this further

I would really love to hear, if the depcache does have any impact at all on:
- slow HDDs (not ssds)
- other platforms (esp. slow Windows)

To test this, do a full build, get the depcache branch and build it as
described above, and then edit the "export GNUMAKE" line in your config_host.mk
to point to the modified make executable.

For the Linux build, its not worth fixing the remaining issues -- but if
Windows gains from this, I would have a look.

Best,

Bjoern

P.S.: We current have two gnu make forks in dev-tools, one in the gnu-make-lo
  repository on gerrit, were one cant push to. Such a mess. When nobody
  protests, I will delete the copies in dev-tools and make the gnu-make-lo
  repository writable. Whatever forking had been done there and is still of
  value needs to be pushed on proper branches there then.

build times:

distro provided GNU make 3.81, power supply unplugged, build on SSD:
real0m32.942s

distro provided GNU make 3.81, power supply plugged, build on SSD:
real0m17.071s

GNU make 4.0 -- maintainer mode, power supply plugged, build on SSD:
real0m18.469s

GNU make 4.0 -- no maintainer mode, power supply plugged, build on SSD:
real0m16.607s

4.0, no maintainer mode, irst run, caching dependencies, power supply plugged, 
build on SSD:
real0m22.530s

4.0, no maintainer mode, econd run, using cache, power supply plugged, build on 
SSD:
real0m11.070s

4.0, no maintainer mode, second run, using cache, power supply plugged, build 
on tmpfs:
real0m11.155s
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-02-18 Thread Caolán McNamara

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

New commits:
commit a9a2b6d63231b514754f16c029ca35bb7383e139
Author: CaolÃ¡n McNamara 
Date:   Mon Feb 17 16:57:44 2014 +

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

(cherry picked from commit 685ec1899435037205d98a102a32ca8b6a4836d0)

Change-Id: Ic8c743c2646c8610b3d90425024413b40dfdab13
Reviewed-on: https://gerrit.libreoffice.org/8103
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

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

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

2014-02-18 Thread Caolán McNamara

 sfx2/source/dialog/alienwarn.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit b612871fff5747d4752e8f32910e8616add44e75
Author: CaolÃ¡n McNamara 
Date:   Tue Feb 18 15:47:15 2014 +

Resolves: fdo#75121 align checkbox with message text

Change-Id: Ib8379cbdb6cf16f8799c1e34b9bd7ff2e62e27f4

diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx
index ad5290e..c041d58 100644
--- a/sfx2/source/dialog/alienwarn.cxx
+++ b/sfx2/source/dialog/alienwarn.cxx
@@ -22,12 +22,17 @@
 #include 
 #include 
 #include 
+#include 
 #include "alienwarn.hxx"
 
 SfxAlienWarningDialog::SfxAlienWarningDialog(Window* pParent, const OUString& 
_rFormatName)
 : MessageDialog(pParent, "AlienWarnDialog", "sfx/ui/alienwarndialog.ui")
 {
 get(m_pWarningOnBox, "ask");
+//fdo#75121, a bit tricky because the widgets we want to align with
+//don't actually exist in the ui description, they're implied
+
m_pWarningOnBox->set_margin_left(QueryBox::GetStandardImage().GetSizePixel().Width()
 + 12);
+
 get(m_pKeepCurrentBtn, "save");
 
 // replace formatname (text)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - jvmfwk/plugins odk/examples

2014-02-18 Thread Stephan Bergmann

 jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx|  
  4 +++-
 jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx|  
  1 +
 odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx  |  
  3 ++-
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx |  
  2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 0274246d088469752c9a91120c0b90c2f08c9282
Author: Stephan Bergmann 
Date:   Tue Feb 18 16:39:20 2014 +0100

Support OpenJDK "-internal" version suffix

...as e.g. produced by java-1.8.0-openjdk.fc20

(Sorting Rel_INTERNAL < Rel_EA is somewhat arbitrary.)

Change-Id: I25449ec4da63243fc1044aae366f8fa6c5ef1eb5

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
index 9e31143..90feb46 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
@@ -206,7 +206,9 @@ SunVersion::PreRelease SunVersion::getPreRelease(const char 
*szRelease)
 {
 if (szRelease == NULL)
 return Rel_NONE;
-if( ! strcmp(szRelease,"ea"))
+if( ! strcmp(szRelease,"internal"))
+return  Rel_INTERNAL;
+else if( ! strcmp(szRelease,"ea"))
 return  Rel_EA;
 else if( ! strcmp(szRelease,"ea1"))
 return Rel_EA1;
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx 
b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
index b60959c..f2bb726 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
@@ -56,6 +56,7 @@ protected:
 enum PreRelease
 {
 Rel_NONE,
+Rel_INTERNAL,
 Rel_EA,
 Rel_EA1,
 Rel_EA2,
commit a3ba2c4784d388bcaf20ef6f5b8b357024969a59
Author: Stephan Bergmann 
Date:   Tue Feb 18 16:36:45 2014 +0100

deprecated OUString::valueOf -> OUString::number

Change-Id: I363289075b457bafcf821af5d08c234977f8d765

diff --git 
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx 
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx
index 4df406e..727abb9 100644
--- 
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx
+++ 
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx
@@ -80,7 +80,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( 
sal_Int32 column ) throw(
 
 ::rtl::OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) 
throw(SQLException, RuntimeException)
 {
-return ::rtl::OUString("Column") + ::rtl::OUString::valueOf(column);
+return ::rtl::OUString("Column") + ::rtl::OUString::number(column);
 }
 // -
 ::rtl::OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) 
throw(SQLException, RuntimeException)
commit 15cd82cb0978821141e8f0e8ee50741c3165d377
Author: Stephan Bergmann 
Date:   Tue Feb 18 16:36:22 2014 +0100

typo

Change-Id: I6f324dc684f868736ac9351911f8c7eda9b830f1

diff --git 
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx 
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx
index 52d02ef..c979408 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx
@@ -233,7 +233,8 @@ namespace connectivity
 sal_Bool SAL_CALL classname::supportsService( const ::rtl::OUString& 
_rServiceName ) throw(::com::sun::star::uno::RuntimeException) \
 {  
 \
 return cppu::supportsService(this, _rServiceName); 
 \
-}  
 \
+}
+
 }
 }
 #endif // _CONNECTIVITY_OSUBCOMPONENT_HXX_
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2 translations

2014-02-18 Thread Miklos Vajna

 helpcontent2 |2 +-
 translations |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ab1ad6b4145f76736350a17d7c8f0bd860ce1d0c
Author: Miklos Vajna 
Date:   Tue Feb 18 16:30:17 2014 +0100

Revert "experimentally enable using depcache for full build speedup"

This reverts commit 46fa7ac866ee392ed72cfc670f062a8c318d2d92, just the
submodule part.

diff --git a/helpcontent2 b/helpcontent2
index 1fbc939..f9e2d68 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 1fbc93982ca787e8be5b38b6a6729850009c7866
+Subproject commit f9e2d688f6755c85b099cb659dd865dae775b607
diff --git a/translations b/translations
index c8c4037..f3f0426 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit c8c40371caa4507a490f8c5ab0961a35848d01c5
+Subproject commit f3f04265562dcd40990cccdd83170c8afffef4ab
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-18 Thread Bjoern Michaelsen

 helpcontent2|2 +-
 solenv/gbuild/LinkTarget.mk |4 
 translations|2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 46fa7ac866ee392ed72cfc670f062a8c318d2d92
Author: Bjoern Michaelsen 
Date:   Tue Feb 18 16:19:25 2014 +0100

experimentally enable using depcache for full build speedup

Change-Id: I6c186ba7ca27166a272327bcfe6a94c391c3514f

diff --git a/helpcontent2 b/helpcontent2
index f9e2d68..1fbc939 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f9e2d688f6755c85b099cb659dd865dae775b607
+Subproject commit 1fbc93982ca787e8be5b38b6a6729850009c7866
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 4e34a15..b7cd9c8 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -597,7 +597,11 @@ $(call gb_LinkTarget_get_target,$(1)) : 
WARNINGS_NOT_ERRORS :=
 $(call gb_LinkTarget_get_target,$(1)) : SOVERSIONSCRIPT :=
 
 ifeq ($(gb_FULLDEPS),$(true))
+ifeq (depcache:,$(filter depcache,$(.FEATURES)):$(gb_PARTIAL_BUILD))
+-includedepcache $(call gb_LinkTarget_get_dep_target,$(1))
+else
 -include $(call gb_LinkTarget_get_dep_target,$(1))
+endif
 $(call gb_LinkTarget_get_dep_target,$(1)) : COBJECTS :=
 $(call gb_LinkTarget_get_dep_target,$(1)) : CXXOBJECTS :=
 $(call gb_LinkTarget_get_dep_target,$(1)) : OBJCOBJECTS :=
diff --git a/translations b/translations
index f3f0426..c8c4037 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit f3f04265562dcd40990cccdd83170c8afffef4ab
+Subproject commit c8c40371caa4507a490f8c5ab0961a35848d01c5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 62/3cd778689bd0851652b2db00b24c308dfb657a

2014-02-18 Thread Caolán McNamara

 62/3cd778689bd0851652b2db00b24c308dfb657a |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ec8da5ab2a3a920cc285fed3a5ffeb6ab6c07ee0
Author: CaolÃ¡n McNamara 
Date:   Tue Feb 18 15:18:50 2014 +

Notes added by 'git notes add'

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

[Libreoffice-commits] core.git: 17 commits - connectivity/source desktop/source editeng/source extensions/source filter/source include/vcl sd/source svx/source test/source toolkit/source vcl/source vc

2014-02-18 Thread Caolán McNamara

 connectivity/source/drivers/postgresql/pq_allocator.hxx |2 
 connectivity/source/drivers/postgresql/pq_array.cxx |2 
 connectivity/source/drivers/postgresql/pq_array.hxx |2 
 connectivity/source/drivers/postgresql/pq_baseresultset.cxx |   19 

 connectivity/source/drivers/postgresql/pq_baseresultset.hxx |2 
 connectivity/source/drivers/postgresql/pq_connection.cxx|2 
 connectivity/source/drivers/postgresql/pq_connection.hxx|2 
 connectivity/source/drivers/postgresql/pq_databasemetadata.cxx  |2 
 connectivity/source/drivers/postgresql/pq_databasemetadata.hxx  |2 
 connectivity/source/drivers/postgresql/pq_driver.cxx|2 
 connectivity/source/drivers/postgresql/pq_driver.hxx|2 
 connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx  |2 
 connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx  |2 
 connectivity/source/drivers/postgresql/pq_preparedstatement.cxx |   18 
---
 connectivity/source/drivers/postgresql/pq_preparedstatement.hxx |2 
 connectivity/source/drivers/postgresql/pq_resultset.cxx |2 
 connectivity/source/drivers/postgresql/pq_resultset.hxx |2 
 connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx |2 
 connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx |2 
 connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx |2 
 connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx |2 
 connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx |2 
 connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx |2 
 connectivity/source/drivers/postgresql/pq_statement.cxx |   16 
--
 connectivity/source/drivers/postgresql/pq_statement.hxx |2 
 connectivity/source/drivers/postgresql/pq_statics.cxx   |2 
 connectivity/source/drivers/postgresql/pq_statics.hxx   |2 
 connectivity/source/drivers/postgresql/pq_tools.cxx |2 
 connectivity/source/drivers/postgresql/pq_tools.hxx |2 
 connectivity/source/drivers/postgresql/pq_updateableresultset.cxx   |2 
 connectivity/source/drivers/postgresql/pq_updateableresultset.hxx   |2 
 connectivity/source/drivers/postgresql/pq_xbase.cxx |2 
 connectivity/source/drivers/postgresql/pq_xbase.hxx |2 
 connectivity/source/drivers/postgresql/pq_xcolumn.cxx   |2 
 connectivity/source/drivers/postgresql/pq_xcolumn.hxx   |2 
 connectivity/source/drivers/postgresql/pq_xcolumns.cxx  |2 
 connectivity/source/drivers/postgresql/pq_xcolumns.hxx  |2 
 connectivity/source/drivers/postgresql/pq_xcontainer.cxx|2 
 connectivity/source/drivers/postgresql/pq_xcontainer.hxx|2 
 connectivity/source/drivers/postgresql/pq_xindex.cxx|2 
 connectivity/source/drivers/postgresql/pq_xindex.hxx|2 
 connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx  |2 
 connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx  |2 
 connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx |2 
 connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx |2 
 connectivity/source/drivers/postgresql/pq_xindexes.cxx  |2 
 connectivity/source/drivers/postgresql/pq_xindexes.hxx  |2 
 connectivity/source/drivers/postgresql/pq_xkey.cxx  |2 
 connectivity/source/drivers/postgresql/pq_xkey.hxx  |2 
 connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx|2 
 connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx|2 
 connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx   |2 
 connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx   |2 
 connectivity/source/drivers/postgresql/pq_xkeys.cxx |2 
 connectivity/source/drivers/postgresql/pq_xkeys.hxx |2 
 connectivity/source/drivers/postgresql/pq_xtable.cxx|2 
 connectivity/source/drivers/postgresql/pq_xtable.hxx|2 
 connectivity/source/drivers/postgresql/pq_xtables.cxx   |2 
 connectivity/source/drivers/postgresql/pq_xtables.hxx   |2 
 connectivity/source/drivers/postgresql/pq_xuser.cxx |2 
 connectivity/source/drivers/postgresql/pq_xuser.hxx |2 
 connectivity/source/drivers/postg

Re: [PATCH] Update French spelling dictionary

2014-02-18 Thread Andras Timar

On Fri, Feb 14, 2014 at 12:22 PM, Olivier R.  wrote:
> Thanks. Unfortunately there is a issue in version 5.0.1.
>
> Here is another patch for the dictionary.
> 0001-Update-French-spelling-dictionary-v5.0.2.patch
> 
>
> For master, 4.2 and 4.1.

Pushed, thanks.

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

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

2014-02-18 Thread Olivier R

 extras/source/autotext/lang/fr/acor/DocumentList.xml |  276 +++
 1 file changed, 173 insertions(+), 103 deletions(-)

New commits:
commit db850d677afe6f083c2d4f1789c9e219bc09e0eb
Author: Olivier R 
Date:   Sat Feb 15 01:33:44 2014 +0100

Update autocorrections for locale /fr/

diff --git a/extras/source/autotext/lang/fr/acor/DocumentList.xml 
b/extras/source/autotext/lang/fr/acor/DocumentList.xml
index 1229acf..84a68d2 100644
--- a/extras/source/autotext/lang/fr/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/fr/acor/DocumentList.xml
@@ -4,13 +4,115 @@
   
   
   
-  
+  
+  
+  
   
   
+  
   
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
   
   
   
@@ -31,16 +133,62 @@
   
   
   
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
   
-  
   
-  
-  
-  
   
   
-  
   
   
   
@@ -48,43 +196,22 @@
   
   
   
-  
-  
   
-  
   
   
-  
   
-  
-  
   
   
-  
   
   
   
   
-  
   
   
   
   
-  
-  
-  
   
   
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
   
   
   
@@ -97,7 +224,6 @@
   
   
   
-  
   
   
   
@@ -105,35 +231,30 @@
   
   
   
-  
   
   
+  
   
   
   
   
   
   
-  
-  
   
   
   
-  
-  
+  
+  
   
   
   
   
-  
   
   
   
-  
   
   
   
-  
   
   
   
@@ -144,7 +265,6 @@
   
   
   
-  
   
   
   
@@ -164,20 +284,11 @@
   
   
   
-  
-  
-  
   
-  
-  
   
-  
   
   
   
-  
-  
-  
   
   
   
@@ -197,7 +308,6 @@
   
   
   
-  
   
   
   
@@ -207,17 +317,12 @@
   
   
   
-  
-  
   
   
-  
   
   
   
   
-  
-  
   
   
   
@@ -232,16 +337,18 @@
   
   
   
-  
+  
+  
+  
+  
+  
+  
+  
+  
   
   
-  
   
-  
   
-  
-  
-  
   
   
   
@@ -251,8 +358,6 @@
   
   
   
-  
-  
   
   
   
@@ -268,24 +373,19 @@
   
   
   
-  
+  
   
   
-  
-  
-  
-  
   
   
   
-  
   
   
   
   
   
   
-  
+  
   
   
   
@@ -302,28 +402,16 @@
   
   
   
-  
-  
-  
   
   
-  
-  
-  
   
-  
-  
   
   
   
   
   
-  
-  
   
   
-  
-  
   
   
   
@@ -331,11 +419,7 @@
   
   
   
-  
   
-  
-  
-  
   
   
   
@@ -349,22 +433,13 @@
   
   
   
-  
-  
+  
+  
   
-  
-  
-  
-  
-  
   
-  
-  
   
   
   
-  
-  
   
   
   
@@ -374,9 +449,4 @@
   
   
   
-  
-  
-  
-  
-  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-18 Thread Miklos Vajna

 oox/source/drawingml/textparagraphpropertiescontext.cxx   |   15 ++
 sw/qa/extras/ooxmlexport/data/dml-groupshape-paraspacing.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |   12 
 sw/source/filter/ww8/docxattributeoutput.cxx  |6 ++--
 4 files changed, 31 insertions(+), 2 deletions(-)

New commits:
commit 9e6960c74dee374e2c9d1af25cb2b678366b19b4
Author: Miklos Vajna 
Date:   Tue Feb 18 14:29:11 2014 +0100

DOCX drawingML export: fix paragraph margins

Without the EndParagraphProperties() call, w:spacing wasn't ever
written as a paragraph property.

Change-Id: Iff4ca2a9e0725ac38d7b528c220c8ea58fc89cab

diff --git a/sw/qa/extras/ooxmlexport/data/dml-groupshape-paraspacing.docx 
b/sw/qa/extras/ooxmlexport/data/dml-groupshape-paraspacing.docx
new file mode 100755
index 000..1cb48d3
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/dml-groupshape-paraspacing.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index a7ea175..60e0f4f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2317,6 +2317,18 @@ DECLARE_OOXMLEXPORT_TEST(testDmlGroupshapeRelsize, 
"dml-groupshape-relsize.docx"
 assertXPath(pXmlDoc, 
"/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/wp14:sizeRelH",
 "relativeFrom", "page");
 }
 
+DECLARE_OOXMLEXPORT_TEST(testDmlGroupshapeParaspacing, 
"dml-groupshape-paraspacing.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+// Paragraph spacing of shape text in groupshapes was left, the w:spacing 
element was missing in pPr.
+assertXPath(pXmlDoc,
+
"/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wpg:wgp/wps:wsp[1]/wps:txbx/w:txbxContent/w:p/w:pPr/w:spacing",
+"before",
+"240");
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTrackChangesDeletedParagraphMark, 
"testTrackChangesDeletedParagraphMark.docx")
 {
 xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index f376d52..d30840f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3466,11 +3466,13 @@ void DocxAttributeOutput::WriteOutliner(const 
OutlinerParaObject& rParaObj)
 sal_Int32 nAktPos = 0;
 sal_Int32 nEnd = aStr.getLength();
 
-m_pSerializer->startElementNS( XML_w, XML_p, FSEND );
+StartParagraph(ww8::WW8TableNodeInfo::Pointer_t());
 
 // Write paragraph properties.
 m_pSerializer->startElementNS(XML_w, XML_pPr, FSEND);
+StartParagraphProperties();
 aAttrIter.OutParaAttr(false);
+EndParagraphProperties(0, 0, 0, 0);
 m_pSerializer->endElementNS(XML_w, XML_pPr);
 
 do {
@@ -3497,7 +3499,7 @@ void DocxAttributeOutput::WriteOutliner(const 
OutlinerParaObject& rParaObj)
 aAttrIter.NextPos();
 }
 while( nAktPos < nEnd );
-m_pSerializer->endElementNS( XML_w, XML_p );
+EndParagraph(ww8::WW8TableNodeInfoInner::Pointer_t());
 }
 m_pSerializer->endElementNS( XML_w, XML_txbxContent );
 }
commit 3c058338fbd28fba3664651b9ecc7cfefa046ec3
Author: Miklos Vajna 
Date:   Tue Feb 18 13:41:42 2014 +0100

DOCX drawingML import: handle paragraph top margin

Change-Id: I4a69647af5b068c35bea0a5f9665a5e68eb76293

diff --git a/oox/source/drawingml/textparagraphpropertiescontext.cxx 
b/oox/source/drawingml/textparagraphpropertiescontext.cxx
index aca1d78..36860f0 100644
--- a/oox/source/drawingml/textparagraphpropertiescontext.cxx
+++ b/oox/source/drawingml/textparagraphpropertiescontext.cxx
@@ -23,6 +23,8 @@
 #include 
 #include 
 
+#include 
+
 #include "oox/drawingml/colorchoicecontext.hxx"
 #include "oox/drawingml/textcharacterpropertiescontext.hxx"
 #include "oox/drawingml/fillproperties.hxx"
@@ -259,6 +261,19 @@ ContextHandlerRef 
TextParagraphPropertiesContext::onCreateContext( sal_Int32 aEl
 }
 }
 break;
+case OOX_TOKEN( doc, spacing ):
+{
+OptValue oBefore = rAttribs.getString(OOX_TOKEN(doc, 
before));
+if (oBefore.has())
+{
+TextSpacing& rSpacing = 
mrTextParagraphProperties.getParaTopMargin();
+rSpacing.nValue = TWIPS_TO_MM(oBefore.get().toInt32());
+rSpacing.bHasValue = true;
+}
+}
+break;
+default:
+SAL_WARN("oox", "TextParagraphPropertiesContext::onCreateContext: 
unhandled element: " << getBaseToken(aElementToken));
 }
 return this;
 }
___
Libreoffice-commits maili

Re: [PATCH] Update autocorrections (fr)

2014-02-18 Thread Andras Timar

On Sat, Feb 15, 2014 at 1:37 AM, Olivier R.  wrote:
> Olivier R. wrote
>> Here is a patch to update the autocorrections file for locale /fr/.
>> 0001-Update-autocorrections-fr.patch
>> 
>
> Forget this patch.
>
> Here is a new one.
> 0001-Update-autocorrections-for-locale-fr.patch
> 
>
> License is MPL 2 / LGPL 3. For 4.2 and master.

Pushed, thanks.

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

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

2014-02-18 Thread Olivier R

 extras/source/autotext/lang/fr/acor/DocumentList.xml |  276 +++
 1 file changed, 173 insertions(+), 103 deletions(-)

New commits:
commit 5b4020a202df8b41514b6f69094e486e7fe4a5a6
Author: Olivier R 
Date:   Sat Feb 15 01:33:44 2014 +0100

Update autocorrections for locale /fr/

diff --git a/extras/source/autotext/lang/fr/acor/DocumentList.xml 
b/extras/source/autotext/lang/fr/acor/DocumentList.xml
index 1229acf..84a68d2 100644
--- a/extras/source/autotext/lang/fr/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/fr/acor/DocumentList.xml
@@ -4,13 +4,115 @@
   
   
   
-  
+  
+  
+  
   
   
+  
   
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
   
   
   
@@ -31,16 +133,62 @@
   
   
   
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
   
-  
   
-  
-  
-  
   
   
-  
   
   
   
@@ -48,43 +196,22 @@
   
   
   
-  
-  
   
-  
   
   
-  
   
-  
-  
   
   
-  
   
   
   
   
-  
   
   
   
   
-  
-  
-  
   
   
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
   
   
   
@@ -97,7 +224,6 @@
   
   
   
-  
   
   
   
@@ -105,35 +231,30 @@
   
   
   
-  
   
   
+  
   
   
   
   
   
   
-  
-  
   
   
   
-  
-  
+  
+  
   
   
   
   
-  
   
   
   
-  
   
   
   
-  
   
   
   
@@ -144,7 +265,6 @@
   
   
   
-  
   
   
   
@@ -164,20 +284,11 @@
   
   
   
-  
-  
-  
   
-  
-  
   
-  
   
   
   
-  
-  
-  
   
   
   
@@ -197,7 +308,6 @@
   
   
   
-  
   
   
   
@@ -207,17 +317,12 @@
   
   
   
-  
-  
   
   
-  
   
   
   
   
-  
-  
   
   
   
@@ -232,16 +337,18 @@
   
   
   
-  
+  
+  
+  
+  
+  
+  
+  
+  
   
   
-  
   
-  
   
-  
-  
-  
   
   
   
@@ -251,8 +358,6 @@
   
   
   
-  
-  
   
   
   
@@ -268,24 +373,19 @@
   
   
   
-  
+  
   
   
-  
-  
-  
-  
   
   
   
-  
   
   
   
   
   
   
-  
+  
   
   
   
@@ -302,28 +402,16 @@
   
   
   
-  
-  
-  
   
   
-  
-  
-  
   
-  
-  
   
   
   
   
   
-  
-  
   
   
-  
-  
   
   
   
@@ -331,11 +419,7 @@
   
   
   
-  
   
-  
-  
-  
   
   
   
@@ -349,22 +433,13 @@
   
   
   
-  
-  
+  
+  
   
-  
-  
-  
-  
-  
   
-  
-  
   
   
   
-  
-  
   
   
   
@@ -374,9 +449,4 @@
   
   
   
-  
-  
-  
-  
-  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - dictionaries

2014-02-18 Thread Olivier R

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

New commits:
commit 0152415b818c30081ad3c4c238dbd0fde23386db
Author: Olivier R 
Date:   Thu Feb 13 14:19:02 2014 +0100

Updated core
Project: dictionaries  7fafdbb2982433e8a9d53a50c6f214fbbaa70663

diff --git a/dictionaries b/dictionaries
index 45b4fce..7fafdbb2 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 45b4fce2df346ca5f80560017485a40e9c2b977b
+Subproject commit 7fafdbb2982433e8a9d53a50c6f214fbbaa70663
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-18 Thread Olivier R

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

New commits:
commit 47e1a10cac206c81bed1f95cda1d56c57a4991d8
Author: Olivier R 
Date:   Thu Feb 13 14:19:02 2014 +0100

Updated core
Project: dictionaries  94d0d2bee95f138a902d6ddc02b0407da00e3b1a

diff --git a/dictionaries b/dictionaries
index b09710a..94d0d2b 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit b09710ac64cd756f9341abf93fe993bd4b1c4f35
+Subproject commit 94d0d2bee95f138a902d6ddc02b0407da00e3b1a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dictionaries

2014-02-18 Thread Olivier R

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

New commits:
commit 2fabcf66b77c8cab36482d02eabda24262163df1
Author: Olivier R 
Date:   Thu Feb 13 14:19:02 2014 +0100

Updated core
Project: dictionaries  b480c59b2cc6cd6d73f561db435c52568faea4bf

diff --git a/dictionaries b/dictionaries
index c8d2646..b480c59 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit c8d2646557a10c41a4b441c97fb1205421a41c1a
+Subproject commit b480c59b2cc6cd6d73f561db435c52568faea4bf
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-18 Thread Tor Lillqvist

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

New commits:
commit 0799a45f0fd496b8eae58d53e15ed8e663890089
Author: Tor Lillqvist 
Date:   Tue Feb 18 16:23:39 2014 +0200

Use correct log area

Change-Id: Idcbb480be0c6bba1215bf75310cd6fc7bfd101a3

diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index c519678..866c60e 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -628,7 +628,7 @@ sal_Bool SfxInterface::IsObjectBarVisible(sal_uInt16 nNo) 
const
 
 const SfxInterface* SfxInterface::GetRealInterfaceForSlot( const SfxSlot 
*pRealSlot ) const
 {
-SAL_WARN_IF( !pImpData->bRegistered, "sfx2.control", "Interface not 
registered" );
+SAL_WARN_IF( !pImpData->bRegistered, "sfx.control", "Interface not 
registered" );
 
 const SfxInterface* pInterface = this;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ANNOUNCE] Branch libreoffice-4-2-2 created

2014-02-18 Thread Christian Lohmaier

Hi all,

The branch libreoffice-4-2-2 has been created for the LibreOffice 4.2.2 release.

The branch is based on the libreoffice-4-2-1 branch. 4.2.1 will be
released early, and the initially planned rc2 will be released as
LibreOffice 4.2.2

Please make sure to push any pending fixes to the libreoffice-4-2-2
branch instead of libreoffice-4-2-1.

The following rules apply:

+ preferably just translation or blocker fixes
+ only cherry-picking from libreoffice-4-2 branch
+ 2 additional reviews needed; 2nd reviewer pushes
+ no regular merges back to anything

The 'libreoffice-4-2' branch is still active and will be used for the
4.2.3 bugfix release. Please read more at

   http://wiki.documentfoundation.org/ReleasePlan/4.2#4.2.2_release
   http://wiki.documentfoundation.org/Development/Branches
   http://wiki.documentfoundation.org/Release_Criteria

Now, if you want to switch your clone to the branch, please do:

./g pull -r
./g checkout -b libreoffice-4-2-2 origin/libreoffice-4-2-2

Happy hacking,
Christian
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-02-18 Thread Tor Lillqvist

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

New commits:
commit 5732b24b599b8bd8ff804643232a8df920af8b47
Author: Tor Lillqvist 
Date:   Tue Feb 18 16:07:49 2014 +0200

assert() is too harsh here I think, use SAL_WARN_IF() instead

I run into the assertion now in TiledLibreOffice, but if I drop the
assert(), it still works. So let's just print a warning (that
everybody will cheerfully ignore, ha ha) instead. I have no idea what
this code actually is doing...

(Originally the code had DBG_ASSERT(), which despite its name also
just prints a warning, which I changed to a real assert() in
8293b29304716d6bd117ab233b1238e1385ae592 for some reason.)

Change-Id: I928078aaf3648c8d04c59f271504c7d3b02e1bb5

diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index 308b2ff..c519678 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -628,7 +628,7 @@ sal_Bool SfxInterface::IsObjectBarVisible(sal_uInt16 nNo) 
const
 
 const SfxInterface* SfxInterface::GetRealInterfaceForSlot( const SfxSlot 
*pRealSlot ) const
 {
-assert( pImpData->bRegistered );
+SAL_WARN_IF( !pImpData->bRegistered, "sfx2.control", "Interface not 
registered" );
 
 const SfxInterface* pInterface = this;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-18 Thread Christian Lohmaier

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 597570b8c844050beca5a08e681b1ff5c771cc0f
Author: Christian Lohmaier 
Date:   Tue Feb 18 15:11:26 2014 +0100

bump version to 4.2.3.0.0+

libreoffice-4-2-2 has been branched off the libreoffice-4-2-1 branch

Change-Id: Id1b347597b369ba9035fe528b2a4c348ce3de91e

diff --git a/configure.ac b/configure.ac
index f7fe5cd..b8def00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.2.2.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.2.3.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'libreoffice-4-2-2'

2014-02-18 Thread Michael Stahl

New branch 'libreoffice-4-2-2' available with the following commits:
commit dd52bba408800ac48fdfdf0e9173d4511d28168a
Author: Michael Stahl 
Date:   Tue Feb 18 11:22:52 2014 +0100

rhbz#1065629: RTF import: don't drop nested cells if not enough \cellx

In this document written by "XMLmind XSL-FO Converter" there are less
\cellx than \cell and thus when reading \nestrow/\row a whole buffered
nested table \cell is lost and then subsequently the rest of the nested
table too.  Try to fix that by counting both \cell and \cellx and
replaying until the maximum of those.

Cannot count \intbl since we synthesize that in various places.

(regression in LO 3.5)

Change-Id: I3b64ad94af842e076611418589a0c83bd18841c6
(cherry picked from commit 07ef4cf096015f0e427ffd17cd26bb6837e75481)
Reviewed-on: https://gerrit.libreoffice.org/8100
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 
(cherry picked from commit 34de0b64b9184a85cd7fb65d0e811b435e90fe24)
Reviewed-on: https://gerrit.libreoffice.org/8102
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

commit 0cd7894708f3a72706040207eb5f9dabb5cae5cb
Author: Michael Stahl 
Date:   Fri Feb 14 22:18:27 2014 +0100

fdo#68927: sw: fix painting of SVG page background

There was a fix for a wrong constant resulting in too large image size in
a1a0830d1ac3ffabbe35bd8a0264b64f1f7a9d67, and it turns out that painting
of SVG backgrounds was relying on the wasteful rasterization:  the SVG
is rasterized only once (at the initial zoom level) and then cached, and
now the correct image size for 100% is simply scaled up when zooming in.

Fix that by painting SVGs with the drawing layer primitives instead,
which appears to give better results.

Change-Id: I4be16856fd080290526d4963d8c512beefa85363
(cherry picked from commit c9cdc1252374a04f866c0715cb582cc08935d92d)
Reviewed-on: https://gerrit.libreoffice.org/8060
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 
(cherry picked from commit 884aa71132efe05aed456a5ca0cfd69ca148939f)
Reviewed-on: https://gerrit.libreoffice.org/8082
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

commit 3cacb879cba399157115f6764fd5a57f5ee0a5a9
Author: Kohei Yoshida 
Date:   Fri Feb 14 12:28:03 2014 -0500

fdo#73773: Check if the *document* is closing, not the *app*.

Otherwise it would crash if the app has multiple document instances open
and only one of them is being closed.

Change-Id: Ib6e370037ab6097c9c6eff8035249663944b3a6c
(cherry picked from commit 76bdf523981d2bd983dac4e01bc5cc934118a73f)
Reviewed-on: https://gerrit.libreoffice.org/8054
Reviewed-by: Markus Mohrhard 
Reviewed-by: Michael Meeks 
Tested-by: Jacobo Aragunde PÃ©rez 
Reviewed-by: Jacobo Aragunde PÃ©rez 

commit 931ac18da7c7da6f4bdb955ed2d6ce264cf97159
Author: Kohei Yoshida 
Date:   Fri Feb 14 20:39:18 2014 -0500

fdo#72691: Allow overwriting of string value with numeric one.

This can legitimately happen when you have a matrix with a reference to
another cell inside, and the referenced cell originally contained a
string value then later overwritten by a numeric value.

Example.  Put a "Text" in A1, and in B1 put a 1x1 matrix {=A1}.  It
displays "Text" in B1.  Then put 11 in A1.  Prior to this change, B1
would become blank.  With this change, B1 will display 11.

Change-Id: I3feba3a8658e1a5ebf6f9e5ac34de2d579464ddb
(cherry picked from commit 9bf907a8278cecd816368db7b8c4ab745a914a59)
Reviewed-on: https://gerrit.libreoffice.org/8065
Reviewed-by: Markus Mohrhard 
Reviewed-by: Michael Meeks 
Reviewed-by: Jacobo Aragunde PÃ©rez 
Tested-by: Jacobo Aragunde PÃ©rez 

commit 593f753b9b449ca9ab632fb68d1621d33d48b909
Author: Kohei Yoshida 
Date:   Fri Feb 14 11:41:02 2014 -0500

fdo#72390: Let's not skip auto styles from unmodified sheets.

We do re-use sheet XML stream for unmodified sheets on re-save, which
is okay.  But skipping auto style population from unmodified sheets
is not okay because autostyles are shared across all sheets and written
outside the sheet XML streams. Skipping styles from unmodified sheets
could potentially fail to export used styles, not to mention could
cause a crash as reported in the bug.

Change-Id: I73e439f7354e341c2c07e28ecca5452193985860
(cherry picked from commit 5000e64ecc55efd47d92714cf6db375ff37aac4b)
(cherry picked from commit 47e540d8323e8ea2db5e7aae455503b32f306ca3)
Reviewed-on: https://gerrit.libreoffice.org/8050
Reviewed-by: Markus Mohrhard 
Reviewed-by: Michael Meeks 
Reviewed-by: Jacobo Aragunde PÃ©rez 
Tested-by: Jacobo Aragunde PÃ©rez 

commit 4ac7bf7f61ad616e705fd2b206b38b61c56cc24c
Author: Kohei Yoshida 
Date:   Sat Feb 15 10:12:52 2014 -0500

fdo#74512: Fix the ODS export as well.

[Libreoffice-commits] translations.git: Changes to 'libreoffice-4-2-2'

2014-02-18 Thread Christian Lohmaier

New branch 'libreoffice-4-2-2' available with the following commits:
commit a848bad50c6cd9cf5c50ca659ba63666ceded2aa
Author: Christian Lohmaier 
Date:   Tue Feb 18 14:50:59 2014 +0100

Branch libreoffice-4-2-2

This is 'libreoffice-4-2-2' - the stable branch for the 4.2.2 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.2.x release,
please use the 'libreoffice-4-2' branch.

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

Change-Id: I519ac8d8766067f461900e0760225ec94cfe95f6

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

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-4-2-2'

2014-02-18 Thread Christian Lohmaier

New branch 'libreoffice-4-2-2' available with the following commits:
commit 0b71c2f91f4ab429ee9184184efb4c9e117bf5df
Author: Christian Lohmaier 
Date:   Tue Feb 18 14:50:58 2014 +0100

Branch libreoffice-4-2-2

This is 'libreoffice-4-2-2' - the stable branch for the 4.2.2 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.2.x release,
please use the 'libreoffice-4-2' branch.

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

Change-Id: I074cbec09ef4c8fd94fb6e45b23735429569fdf2

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

[Libreoffice-commits] help.git: Changes to 'libreoffice-4-2-2'

2014-02-18 Thread Christian Lohmaier

New branch 'libreoffice-4-2-2' available with the following commits:
commit c689a548ea73251bbd2105bcd170b02461d67691
Author: Christian Lohmaier 
Date:   Tue Feb 18 14:50:58 2014 +0100

Branch libreoffice-4-2-2

This is 'libreoffice-4-2-2' - the stable branch for the 4.2.2 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.2.x release,
please use the 'libreoffice-4-2' branch.

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

Change-Id: I8458b369a4e29d150c22d24edea8506f47d8bf11

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

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

2014-02-18 Thread Markus Mohrhard

 oox/source/export/chartexport.cxx |   25 ++---
 1 file changed, 18 insertions(+), 7 deletions(-)

New commits:
commit 2c85dc645fdecb85ca88bc4a0a34b255ff30d6b2
Author: Markus Mohrhard 
Date:   Tue Feb 18 02:22:07 2014 +0100

prevent invalid OOXML files with trendlines, related #i88825#

Change-Id: I503b24233060400cf4bbb40701bec0a3e101512a
Reviewed-on: https://gerrit.libreoffice.org/8095
Reviewed-by: Kohei Yoshida 
Tested-by: Kohei Yoshida 

diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index 659252b..b13867e 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2527,6 +2527,21 @@ void ChartExport::exportTrendlines( Reference< 
chart2::XDataSeries > xSeries )
 
 Reference< XPropertySet > xProperties( xRegCurve , uno::UNO_QUERY 
);
 
+OUString aService;
+Reference< lang::XServiceName > xServiceName( xProperties, 
UNO_QUERY );
+if( !xServiceName.is() )
+continue;
+
+aService = xServiceName->getServiceName();
+
+if(aService != "com.sun.star.chart2.LinearRegressionCurve" &&
+aService != 
"com.sun.star.chart2.ExponentialRegressionCurve" &&
+aService != 
"com.sun.star.chart2.LogarithmicRegressionCurve" &&
+aService != "com.sun.star.chart2.PotentialRegressionCurve" 
&&
+aService != 
"com.sun.star.chart2.PolynomialRegressionCurve" &&
+aService != 
"com.sun.star.chart2.MovingAverageRegressionCurve")
+continue;
+
 pFS->startElement( FSNS( XML_c, XML_trendline ), FSEND );
 
 OUString aName;
@@ -2540,12 +2555,6 @@ void ChartExport::exportTrendlines( Reference< 
chart2::XDataSeries > xSeries )
 
 exportShapeProps( xProperties );
 
-OUString aService;
-Reference< lang::XServiceName > xServiceName( xProperties, 
UNO_QUERY );
-if( !xServiceName.is() )
-continue;
-aService = xServiceName->getServiceName();
-
 if( aService == "com.sun.star.chart2.LinearRegressionCurve" )
 {
 pFS->singleElement( FSNS( XML_c, XML_trendlineType ),
@@ -2597,7 +2606,9 @@ void ChartExport::exportTrendlines( Reference< 
chart2::XDataSeries > xSeries )
 }
 else
 {
-continue;
+// should never happen
+// This would produce invalid OOXML files so we check earlier 
for the type
+assert(false);
 }
 
 double aExtrapolateForward = 0.0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-18 Thread Markus Mohrhard

 sc/source/filter/excel/xepivot.cxx |   11 ++-
 sc/source/filter/inc/xepivot.hxx   |3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 42d0502dc1cfb66b9b14fc9346778bf905eae085
Author: Markus Mohrhard 
Date:   Sun Feb 16 22:07:20 2014 +0100

multiple pivot tables on same sheet OOXML fix (part1), related #i83250#

This just fixes the generation of the pivot table file and the
relationship. It crashed in a dbgutil build because we tried to
overwrite the same stream for each pivot table on one sheet.

Change-Id: If2c9541e38b483ead75fff32d5f6d9e16970e702
Reviewed-on: https://gerrit.libreoffice.org/8097
Tested-by: Kohei Yoshida 
Reviewed-by: Kohei Yoshida 

diff --git a/sc/source/filter/excel/xepivot.cxx 
b/sc/source/filter/excel/xepivot.cxx
index f29cc24..5759d0b 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -1243,13 +1243,14 @@ void XclExpPTField::WriteSxvdex( XclExpStream& rStrm ) 
const
 
 // 
 
-XclExpPivotTable::XclExpPivotTable( const XclExpRoot& rRoot, const ScDPObject& 
rDPObj, const XclExpPivotCache& rPCache ) :
+XclExpPivotTable::XclExpPivotTable( const XclExpRoot& rRoot, const ScDPObject& 
rDPObj, const XclExpPivotCache& rPCache, size_t nId ) :
 XclExpRoot( rRoot ),
 mrPCache( rPCache ),
 maDataOrientField( *this, EXC_SXIVD_DATA ),
 mnOutScTab( 0 ),
 mbValid( false ),
-mbFilterBtn( false )
+mbFilterBtn( false ),
+mnId( nId )
 {
 const ScRange& rOutScRange = rDPObj.GetOutRange();
 if( GetAddressConverter().ConvertRange( maPTInfo.maOutXclRange, 
rOutScRange, true ) )
@@ -1352,8 +1353,8 @@ void XclExpPivotTable::SaveXml( XclExpXmlStream& rStrm )
 if( !mbValid )
 return;
 sax_fastparser::FSHelperPtr aPivotTableDefinition = 
rStrm.CreateOutputStream(
-XclXmlUtils::GetStreamName( "xl/", "pivotTables/pivotTable", 
mnOutScTab+1),
-XclXmlUtils::GetStreamName( "../", "pivotTables/pivotTable", 
mnOutScTab+1),
+XclXmlUtils::GetStreamName( "xl/", "pivotTables/pivotTable", mnId 
+ 1),
+XclXmlUtils::GetStreamName( "../", "pivotTables/pivotTable", mnId 
+ 1),
 rStrm.GetCurrentStream()->getOutputStream(),
 
"application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml",
 
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotTable";);
@@ -1849,7 +1850,7 @@ void XclExpPivotTableManager::CreatePivotTables()
 for( size_t nDPObj = 0, nCount = pDPColl->GetCount(); nDPObj < nCount; 
++nDPObj )
 if( ScDPObject* pDPObj = (*pDPColl)[ nDPObj ] )
 if( const XclExpPivotCache* pPCache = CreatePivotCache( 
*pDPObj ) )
-maPTableList.AppendNewRecord( new XclExpPivotTable( 
GetRoot(), *pDPObj, *pPCache ) );
+maPTableList.AppendNewRecord( new XclExpPivotTable( 
GetRoot(), *pDPObj, *pPCache, nDPObj ) );
 }
 
 XclExpRecordRef XclExpPivotTableManager::CreatePivotCachesRecord()
diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx
index efcbbab..6f5a9a4 100644
--- a/sc/source/filter/inc/xepivot.hxx
+++ b/sc/source/filter/inc/xepivot.hxx
@@ -344,7 +344,7 @@ class XclExpPivotTable : public XclExpRecordBase, protected 
XclExpRoot
 {
 public:
 explicitXclExpPivotTable( const XclExpRoot& rRoot,
-const ScDPObject& rDPObj, const XclExpPivotCache& 
rPCache );
+const ScDPObject& rDPObj, const XclExpPivotCache& 
rPCache, size_t nId );
 
 /** Returns a pivot cache field. */
 const XclExpPCField* GetCacheField( sal_uInt16 nCacheIdx ) const;
@@ -422,6 +422,7 @@ private:
 SCTAB   mnOutScTab; /// Sheet index of the output 
range.
 boolmbValid;/// true = The pivot table is 
valid for export.
 boolmbFilterBtn;/// true = DataPilot has filter 
button.
+size_t  mnId;   /// Stream ID
 };
 
 // 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-18 Thread Jan Holesovsky

 sw/source/ui/docvw/PostItMgr.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 85163440eb11164dc87d8b1816d240e7635737e6
Author: Jan Holesovsky 
Date:   Tue Feb 18 14:42:48 2014 +0100

Revert "Protect PostIt deletion by SolarMutex."

Probably there is a more prosaic explanation; though I am unable to 
reproduce
now whatever I try - with or without the patch.

This reverts commit 2b2c528826b6b29d90fcb6a8e755c75cb0d65985.

Change-Id: Ia3c1017f27d28bc228c497f34b8777b487d54fb4

diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx
index 86d2dd2..99a8ebe 100644
--- a/sw/source/ui/docvw/PostItMgr.cxx
+++ b/sw/source/ui/docvw/PostItMgr.cxx
@@ -230,8 +230,6 @@ void SwPostItMgr::InsertItem(SfxBroadcaster* pItem, bool 
bCheckExistance, bool b
 
 void SwPostItMgr::RemoveItem( SfxBroadcaster* pBroadcast )
 {
-SolarMutexGuard aGuard;
-
 EndListening(*pBroadcast);
 for(std::list::iterator i = mvPostItFlds.begin(); i != 
mvPostItFlds.end() ; ++i)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2014-02-18 Thread Michael Stahl

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

New commits:
commit d37f0e5f238116f4b6ef9dd37e1039e93f9210a1
Author: Michael Stahl 
Date:   Tue Feb 18 14:20:56 2014 +0100

Updated core
Project: help  f9e2d688f6755c85b099cb659dd865dae775b607

diff --git a/helpcontent2 b/helpcontent2
index 45ca39c..f9e2d68 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 45ca39c87e40aee0d370737d0c6eb148777bcc65
+Subproject commit f9e2d688f6755c85b099cb659dd865dae775b607
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

2014-02-18 Thread Michael Stahl

 source/text/shared/01/0113.xhp |6 --
 1 file changed, 6 deletions(-)

New commits:
commit f9e2d688f6755c85b099cb659dd865dae775b607
Author: Michael Stahl 
Date:   Tue Feb 18 14:20:56 2014 +0100

helpcontent: remove obsolete Xprinter / STAR_SPOOL_DIR stuff

Change-Id: Iec864fe1eae4b355802f800995334c0c784aa59b

diff --git a/source/text/shared/01/0113.xhp 
b/source/text/shared/01/0113.xhp
index 8bcc725..a8baed3 100644
--- a/source/text/shared/01/0113.xhp
+++ b/source/text/shared/01/0113.xhp
@@ -283,12 +283,6 @@ Moved all DRAW and IMPRESS to default section.
 On the Options tab page you can set some additional options for the 
current print job. Here you can specify to print to a file instead of printing 
on a printer.
 
 Unix 
hints
-are these still 
needed?
-If you want, 
you can use the STAR_SPOOL_DIR environment variable to specify the directory 
where the Xprinter spoolfiles are saved. For example:
-
-setenv 
STAR_SPOOL_DIR /usr/local/tmp (in the csh/tcsh) or
-
-export 
STAR_SPOOL_DIR=/usr/local/tmp (in the sh/bash)
 
 You can also 
use the spadmin printer setup program to specify additional printer 
options.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-18 Thread Michael Stahl

 sw/qa/extras/rtfimport/data/rhbz1065629.rtf|   81 +
 sw/qa/extras/rtfimport/rtfimport.cxx   |   19 +
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   14 
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |1 
 4 files changed, 115 insertions(+)

New commits:
commit fb4131ba8f3fb2a00dccf8cf24bf78caa91b680b
Author: Michael Stahl 
Date:   Tue Feb 18 11:22:52 2014 +0100

rhbz#1065629: RTF import: don't drop nested cells if not enough \cellx

In this document written by "XMLmind XSL-FO Converter" there are less
\cellx than \cell and thus when reading \nestrow/\row a whole buffered
nested table \cell is lost and then subsequently the rest of the nested
table too.  Try to fix that by counting both \cell and \cellx and
replaying until the maximum of those.

Cannot count \intbl since we synthesize that in various places.

(regression in LO 3.5)

Change-Id: I3b64ad94af842e076611418589a0c83bd18841c6
(cherry picked from commit 07ef4cf096015f0e427ffd17cd26bb6837e75481)
Reviewed-on: https://gerrit.libreoffice.org/8100
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 
(cherry picked from commit 34de0b64b9184a85cd7fb65d0e811b435e90fe24)
Reviewed-on: https://gerrit.libreoffice.org/8102
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/qa/extras/rtfimport/data/rhbz1065629.rtf 
b/sw/qa/extras/rtfimport/data/rhbz1065629.rtf
new file mode 100644
index 000..b22ec50
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/rhbz1065629.rtf
@@ -0,0 +1,81 @@
+{\rtf1\ansi\ansicpg1252\deff0
+{\fonttbl
+\f0\froman\fcharset0 Times New Roman;
+\f1\fswiss\fcharset0 Arial;
+\f2\fmodern\fcharset0 Courier New;
+\f3\ftech\fcharset2 Symbol;
+\f4\fswiss\fcharset0 Helvetica;
+}
+{\info
+{\*\userprops
+{\propname creator}\proptype30
+{\staticval XMLmind XSL-FO Converter Professional Edition 4.6.1}
+}
+}
+\facingp\fet0\ftnbj
+\sectd
+\pghsxn16114\pgwsxn12514
+\margtsxn720\margbsxn907\marglsxn907\margrsxn1080
+\headery720
+\footery547
+\pgncont\pgndec
+
+\par
+\trowd\trleft10
+\clvertalt
+\clcbpat17
+\clbrdrt\brdrs\brdrw20\brdrcf2\clbrdrb\brdrs\brdrw20\brdrcf2\clbrdrl\brdrs\brdrw20\brdrcf2\clbrdrr\brdrs\brdrw20\brdrcf2\cellx10262
+\pard\intbl
+{\plain\f4\fs19\b\cf15\ulc2
+Informations client
+}
+\cell
+\row
+\trowd\trleft10
+\clvertalt
+\clbrdrl\brdrs\brdrw10\brdrcf2\cellx5136
+\clvertalt
+\clbrdrl\brdrs\brdrw10\brdrcf2\clbrdrr\brdrs\brdrw10\brdrcf2\cellx10262
+\pard\intbl\itap2
+{\plain\f4\fs18\cf2\ulc2
+E-mail:
+}
+\nestcell
+{\*\nesttableprops
+\trowd\trleft0
+\clvertalt
+\cellx5400
+\nestrow}
+\pard\intbl
+\cell
+\pard\intbl\itap2
+{\plain\f4\fs18\b\cf2\ulc2
+Responsable Commercial:
+}
+\nestcell
+{\*\nesttableprops
+\trowd\trleft0
+\clvertalt
+\cellx5400
+\nestrow}
+\pard\intbl\itap2
+{\plain\f4\fs18\cf2\ulc2
+\~
+}
+\par
+\pard\intbl\itap2
+{\plain\f4\fs18\cf2\ulc2
+Nom: John Doe
+}
+\nestcell
+{\*\nesttableprops
+\trowd\trleft0
+\clvertalt
+\cellx5400
+\nestrow}
+\pard\intbl
+\cell
+\row
+
+\pard\sect
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 42ee83c..b389af6 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1364,6 +1364,25 @@ DECLARE_RTFIMPORT_TEST(testCp118, "cp118.rtf")
 
 #endif
 
+DECLARE_RTFIMPORT_TEST(testNestedTable, "rhbz1065629.rtf")
+{
+// nested table in second cell was missing
+uno::Reference xTextTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
+uno::Reference xTable(xTables->getByIndex(1), 
uno::UNO_QUERY);
+uno::Reference xCell(xTable->getCellByName("A1"), 
uno::UNO_QUERY);
+uno::Reference 
xParaEnumAccess(xCell->getText(), uno::UNO_QUERY);
+uno::Reference xParaEnum = 
xParaEnumAccess->createEnumeration();
+uno::Reference xPara(xParaEnum->nextElement(), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("Responsable Commercial:"), 
xPara->getString());
+xCell.set(xTable->getCellByName("A2"), uno::UNO_QUERY);
+xParaEnumAccess.set(xCell->getText(), uno::UNO_QUERY);
+xParaEnum = xParaEnumAccess->createEnumeration();
+xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY);
+xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("Nom: John Doe"), xPara->getString());
+}
+
 DECLARE_RTFIMPORT_TEST(testCp116, "hello.rtf")
 {
 // The single-line document had a second fake empty para on Windows.
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 7f3e253..ef7117e 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1867,6 +1867,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
 RTFValue::Pointer_t pValue;
 m_aTableBuffer.push_back(make_p

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

2014-02-18 Thread Michael Stahl

 sw/source/core/doc/notxtfrm.cxx|   56 +
 sw/source/core/inc/frmtool.hxx |7 
 sw/source/core/layout/paintfrm.cxx |   11 ++-
 3 files changed, 49 insertions(+), 25 deletions(-)

New commits:
commit 478e481e36add5c34788b718ef7a4b9dc4744424
Author: Michael Stahl 
Date:   Fri Feb 14 22:18:27 2014 +0100

fdo#68927: sw: fix painting of SVG page background

There was a fix for a wrong constant resulting in too large image size in
a1a0830d1ac3ffabbe35bd8a0264b64f1f7a9d67, and it turns out that painting
of SVG backgrounds was relying on the wasteful rasterization:  the SVG
is rasterized only once (at the initial zoom level) and then cached, and
now the correct image size for 100% is simply scaled up when zooming in.

Fix that by painting SVGs with the drawing layer primitives instead,
which appears to give better results.

Change-Id: I4be16856fd080290526d4963d8c512beefa85363
(cherry picked from commit c9cdc1252374a04f866c0715cb582cc08935d92d)
Reviewed-on: https://gerrit.libreoffice.org/8060
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 
(cherry picked from commit 884aa71132efe05aed456a5ca0cfd69ca148939f)
Reviewed-on: https://gerrit.libreoffice.org/8082
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index fb4abbf..c148fbc 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -733,6 +733,36 @@ bool paintUsingPrimitivesHelper(
 return false;
 }
 
+
+void paintGraphicUsingPrimitivesHelper(OutputDevice & rOutputDevice,
+ Graphic const& rGraphic, GraphicAttr const& rGraphicAttr,
+ SwRect const& rAlignedGrfArea)
+{
+// unify using GraphicPrimitive2D
+// -> the primitive handles all crop and mirror stuff
+// -> the primitive renderer will create the needed pdf export data
+// -> if bitmap content, it will be cached system-dependent
+const basegfx::B2DRange aTargetRange(
+rAlignedGrfArea.Left(), rAlignedGrfArea.Top(),
+rAlignedGrfArea.Right(), rAlignedGrfArea.Bottom());
+const basegfx::B2DHomMatrix aTargetTransform(
+basegfx::tools::createScaleTranslateB2DHomMatrix(
+aTargetRange.getRange(),
+aTargetRange.getMinimum()));
+drawinglayer::primitive2d::Primitive2DSequence aContent(1);
+
+aContent[0] = new drawinglayer::primitive2d::GraphicPrimitive2D(
+aTargetTransform,
+rGraphic,
+rGraphicAttr);
+
+paintUsingPrimitivesHelper(
+rOutputDevice,
+aContent,
+aTargetRange,
+aTargetRange);
+}
+
 /** Paint the graphic.
 
 We require either a QuickDraw-Bitmap or a graphic here. If we do not have
@@ -855,30 +885,8 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const 
SwRect &rGrfArea ) cons
 }
 else
 {
-// unify using GraphicPrimitive2D
-// -> the primitive handles all crop and mirror stuff
-// -> the primitive renderer will create the needed pdf 
export data
-// -> if bitmap conent, it will be cached system-dependent
-const basegfx::B2DRange aTargetRange(
-aAlignedGrfArea.Left(), aAlignedGrfArea.Top(),
-aAlignedGrfArea.Right(), aAlignedGrfArea.Bottom());
-const basegfx::B2DHomMatrix aTargetTransform(
-basegfx::tools::createScaleTranslateB2DHomMatrix(
-aTargetRange.getRange(),
-aTargetRange.getMinimum()));
-drawinglayer::primitive2d::Primitive2DSequence aContent;
-
-aContent.realloc(1);
-aContent[0] = new 
drawinglayer::primitive2d::GraphicPrimitive2D(
-aTargetTransform,
-rGrfObj.GetGraphic(),
-aGrfAttr);
-
-paintUsingPrimitivesHelper(
-*pOut,
-aContent,
-aTargetRange,
-aTargetRange);
+paintGraphicUsingPrimitivesHelper(*pOut,
+rGrfObj.GetGraphic(), aGrfAttr, aAlignedGrfArea);
 }
 }
 else
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index 3304351..02569bf 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -42,6 +42,8 @@ class XFillGradientItem;
 class SdrMarkList;
 class SwNodeIndex;
 class OutputDevice;
+class Graphic;
+class GraphicAttr;
 class SwPageDesc;
 
 #define FAR_AWAY LONG_MAX - 2  // initial position of a Fly
@@ -57,6 +59,11 @@ void DrawGraphic( const SvxBrushItem *, const 
XFillStyleItem*, const XFillGradie

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

2014-02-18 Thread Luc Castermans

 vcl/source/gdi/impfont.cxx|2 
 vcl/source/gdi/outdev4.cxx|   47 ++--
 vcl/source/gdi/outdev6.cxx|2 
 vcl/source/gdi/outmap.cxx |  153 +++---
 vcl/source/gdi/regband.cxx|   19 ++---
 vcl/source/gdi/regionband.cxx |2 
 vcl/source/gdi/virdev.cxx |4 -
 vcl/source/gdi/wall.cxx   |   17 ++--
 8 files changed, 87 insertions(+), 159 deletions(-)

New commits:
commit 68e5e6407eecf5134168a8242640c3c95e14928a
Author: Luc Castermans 
Date:   Wed Feb 12 20:57:20 2014 +0100

Translated German comments - find-german-comments

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

diff --git a/vcl/source/gdi/impfont.cxx b/vcl/source/gdi/impfont.cxx
index 09bb07e..2674a1a 100644
--- a/vcl/source/gdi/impfont.cxx
+++ b/vcl/source/gdi/impfont.cxx
@@ -725,8 +725,6 @@ void UpdateAttributesFromPSName( const OUString& rPSName, 
ImplDevFontAttributes&
 rDFA.SetWeight(WEIGHT_BLACK);
 else if (aPSName.indexOf("black") != -1)
 rDFA.SetWeight(WEIGHT_BLACK);
-//else if (aPSName.indexOf("book") != -1)
-//rDFA.SetWeight(WEIGHT_SEMIBOLD);
 else if( (aPSName.indexOf("semibold") != -1)
 ||  (aPSName.indexOf("smbd") != -1))
 rDFA.SetWeight(WEIGHT_SEMIBOLD);
diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx
index a18ce19..fb8052e 100644
--- a/vcl/source/gdi/outdev4.cxx
+++ b/vcl/source/gdi/outdev4.cxx
@@ -164,7 +164,7 @@ void OutputDevice::ImplDrawLinearGradient( const Rectangle& 
rRect,
 aRect.Bottom() = aMirrorRect.Top();
 }
 
-// Intensitaeten von Start- und Endfarbe ggf. aendern
+// colour-intensities of start- and finish; change if needed
 longnFactor;
 Color   aStartCol   = rGradient.GetStartColor();
 Color   aEndCol = rGradient.GetEndColor();
@@ -355,14 +355,13 @@ void OutputDevice::ImplDrawComplexGradient( const 
Rectangle& rRect,
 const Gradient& rGradient,
 sal_Bool bMtf, const PolyPolygon* 
pClipPolyPoly )
 {
-// Feststellen ob Ausgabe ueber Polygon oder PolyPolygon
-// Bei Rasteroperationen ungleich Overpaint immer PolyPolygone,
-// da es zu falschen Ergebnissen kommt, wenn man mehrfach uebereinander
-// ausgibt
-// Bei Druckern auch immer PolyPolygone, da nicht alle Drucker
-// das Uebereinanderdrucken von Polygonen koennen
-// Virtuelle Device werden auch ausgeklammert, da einige Treiber
-// ansonsten zu langsam sind
+// Determine if we output via Polygon or PolyPolygon
+// For all rasteroperations other then Overpaint always use PolyPolygon,
+// as we will get wrong results if we output multiple times on top of each 
other.
+// Also for printers always use PolyPolygon, as not all printers
+// can print polygons on top of each other.
+// Also virtual devices are excluded, as some drivers are too slow.
+//
 PolyPolygon*pPolyPoly;
 Rectangle   aRect;
 Point   aCenter;
@@ -389,7 +388,7 @@ void OutputDevice::ImplDrawComplexGradient( const 
Rectangle& rRect,
 
 long nMinRect = std::min( aRect.GetWidth(), aRect.GetHeight() );
 
-// Anzahl der Schritte berechnen, falls nichts uebergeben wurde
+// calculate number of steps, if this was not passed
 if( !nStepCount )
 {
 long nInc;
@@ -407,7 +406,7 @@ void OutputDevice::ImplDrawComplexGradient( const 
Rectangle& rRect,
 nStepCount = nMinRect / nInc;
 }
 
-// minimal drei Schritte und maximal die Anzahl der Farbunterschiede
+// at least three steps and maximum number if colour differences
 long nSteps = std::max( nStepCount, 2L );
 long nCalcSteps  = std::abs( nRedSteps );
 long nTempSteps = std::abs( nGreenSteps );
@@ -421,7 +420,7 @@ void OutputDevice::ImplDrawComplexGradient( const 
Rectangle& rRect,
 if ( !nSteps )
 nSteps = 1;
 
-// Ausgabebegrenzungen und Schrittweite fuer jede Richtung festlegen
+// determine output limits and stepsizes for all directions
 Polygon aPoly;
 double  fScanLeft = aRect.Left();
 double  fScanTop = aRect.Top();
@@ -464,10 +463,10 @@ void OutputDevice::ImplDrawComplexGradient( const 
Rectangle& rRect,
 ImplDrawPolygon( aPoly = aExtRect, pClipPolyPoly );
 }
 
-// Schleife, um nacheinander die Polygone/PolyPolygone auszugeben
+// loop to output Polygone/PolyPolygone sequentially
 for( long i = 1; i < nSteps; i++ )
 {
-// neues Polygon berechnen
+// calculate new Polygon
 aRect.Left() = (long)( fScanLeft += fScanIncX );
 aRect.Top() = (long)( fScanTop += fScanIncY );
 aRect.Right() = (long)( fScanRight -= fScanIncX );
@@ -483,13 +482,13 @@ void OutputDevice::ImplDrawComplexGradient( const 
Rectangle& rRect,

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

2014-02-18 Thread Timothy Markle

 sc/source/filter/html/htmlexp.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit e719b2742c39f59f5c928fb10f09545e4139ce69
Author: Timothy Markle 
Date:   Sun Feb 16 15:28:18 2014 +0100

Remove  in

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

2014-02-18 Thread Miklos Vajna

 sw/qa/extras/rtfexport/data/fdo74709.rtf   |   32 +
 sw/qa/extras/rtfexport/rtfexport.cxx   |7 +
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   28 +
 3 files changed, 67 insertions(+)

New commits:
commit 7ade6edccb3f697d53a05b42b2b8dc6d026de88b
Author: Miklos Vajna 
Date:   Mon Feb 10 09:39:16 2014 +0100

fdo#74709 RTF import: implement RTF_CLPAD*

(cherry picked from commit 6b5ef795ed4a56195bf09633b03e88474f0b133c)

Conflicts:
sw/qa/extras/rtfexport/rtfexport.cxx

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

diff --git a/sw/qa/extras/rtfexport/data/fdo74709.rtf 
b/sw/qa/extras/rtfexport/data/fdo74709.rtf
new file mode 100644
index 000..c521084
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/fdo74709.rtf
@@ -0,0 +1,32 @@
+{\rtf1\ansi\deff4\adeflang1025
+\deftab720
+\viewscale100
+{\*\pgdsctbl
+{\pgdsc0\pgdscuse451\pgwsxn11906\pghsxn16838\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\pgdscnxt0
 Default Style;}
+}
+\formshade\paperh16838\paperw11906\margl1134\margr1134\margt1134\margb1134\sectd\sbknone\sectunlocked1\pgndec\pgwsxn11906\pghsxn16838\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc
+\trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0
+\clbrdrt\brdrhair\brdrw1\brdrcf1\clbrdrl\brdrhair\brdrw1\brdrcf1\clbrdrb\brdrhair\brdrw1\brdrcf1\cellx4819
+\clbrdrt\brdrhair\brdrw1\brdrcf1\clpadfl3\clpadl58
+\clbrdrl\brdrhair\brdrw1\brdrcf1\clpadft3\clpadt58
+\clbrdrb\brdrhair\brdrw1\brdrcf1\clpadfb3\clpadb58
+\clbrdrr\brdrhair\brdrw1\brdrcf1\clpadfr3\clpadr360\cellx9638
+\pgndec\pard\plain \s20\noline\intbl\qr
+{\rtlch \ltrch\loch 1.23}
+\cell
+\pard\plain \s20\noline\intbl\qr
+{\rtlch \ltrch\loch 4.56}
+\cell\row
+\pard\trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0
+\clbrdrl\brdrhair\brdrw1\brdrcf1\clbrdrb\brdrhair\brdrw1\brdrcf1\cellx4819
+\clbrdrl\brdrhair\brdrw1\brdrcf1\clbrdrb\brdrhair\brdrw1\brdrcf1\clbrdrr\brdrhair\brdrw1\brdrcf1\cellx9638
+\pard\plain \s20\noline\intbl
+{\rtlch \ltrch\loch first word}
+\cell
+\pard\plain \s20\noline\intbl
+{\rtlch \ltrch\loch second word}
+\cell\row
+\pard\pard\plain \s0\nowidctlpar
+{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}
+\cf0\kerning1\dbch\af5\langfe2052\dbch\af6\afs24\alang1081\loch\f4\fs24\lang2057\rtlch
 \ltrch\loch
+\par }
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index b6084cb..225ab3a 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -579,6 +579,13 @@ DECLARE_RTFEXPORT_TEST(testFdo66743, "fdo66743.rtf")
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0xd8d8d8), getProperty(xCell, 
"BackColor"));
 }
 
+DECLARE_RTFEXPORT_TEST(testFdo74709, "fdo74709.rtf")
+{
+uno::Reference xCell = getCell(getParagraphOrTable(1), "B1");
+// This was 0, as top/bottom/left/right padding wasn't imported.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(360)), 
getProperty(xCell, "RightBorderDistance"));
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index ef7117e..dffe15f 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3683,6 +3683,34 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 case RTF_TS:
 m_aStates.top().bHasTableStyle = true;
 break;
+case RTF_CLPADB:
+case RTF_CLPADL:
+case RTF_CLPADR:
+case RTF_CLPADT:
+{
+RTFSprms aAttributes;
+aAttributes.set(NS_ooxml::LN_CT_TblWidth_type, 
RTFValue::Pointer_t(new RTFValue(NS_ooxml::LN_Value_ST_TblWidth_dxa)));
+aAttributes.set(NS_ooxml::LN_CT_TblWidth_w, 
RTFValue::Pointer_t(new RTFValue(nParam)));
+switch (nKeyword)
+{
+case RTF_CLPADB:
+nSprm = NS_ooxml::LN_CT_TcMar_bottom;
+break;
+case RTF_CLPADL:
+nSprm = NS_ooxml::LN_CT_TcMar_left;
+break;
+case RTF_CLPADR:
+nSprm = NS_ooxml::LN_CT_TcMar_right;
+break;
+case RTF_CLPADT:
+nSprm = NS_ooxml::LN_CT_TcMar_top;
+break;
+default:
+break;
+}
+lcl_putNestedSprm(m_aStates.top().aTableCellSprms, 
NS_ooxml::LN_CT_TcPrBase_tcMar, nSprm, RTFValue::Pointer_t(new 
RTFValue(aAttributes)));
+}
+break;
 default:
 {

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

2014-02-18 Thread Kohei Yoshida

 sc/source/ui/app/inputhdl.cxx  |8 +++-
 sc/source/ui/inc/inputhdl.hxx  |3 +++
 sc/source/ui/view/tabvwsh4.cxx |3 +++
 3 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit ac6568e412821b4fc9c347cc1bb56ccd65311c27
Author: Kohei Yoshida 
Date:   Fri Feb 14 12:28:03 2014 -0500

fdo#73773: Check if the *document* is closing, not the *app*.

Otherwise it would crash if the app has multiple document instances open
and only one of them is being closed.

(cherry picked from commit 76bdf523981d2bd983dac4e01bc5cc934118a73f)

Conflicts:
sc/source/ui/app/inputhdl.cxx

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

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index b31489c..a45ac8f 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -298,6 +298,11 @@ handle_r1c1:
 }
 }
 
+void ScInputHandler::SetDocumentDisposing( bool b )
+{
+mbDocumentDisposing = b;
+}
+
 static void lcl_Replace( EditView* pView, const String& rNewStr, const 
ESelection& rOldSel )
 {
 if ( pView )
@@ -519,6 +524,7 @@ ScInputHandler::ScInputHandler()
 bProtected( false ),
 bCellHasPercentFormat( false ),
 bLastIsSymbol( false ),
+mbDocumentDisposing(false),
 nValidation( 0 ),
 eAttrAdjust( SVX_HOR_JUSTIFY_STANDARD ),
 aScaleX( 1,1 ),
@@ -542,7 +548,7 @@ ScInputHandler::~ScInputHandler()
 //  Wenn dies der Applikations-InputHandler ist, wird der dtor erst nach 
SfxApplication::Main
 //  gerufen, darf sich also auf keine Sfx-Funktionen mehr verlassen
 
-if ( !SFX_APP()->IsDowning() )  // inplace
+if (!mbDocumentDisposing)  // inplace
 EnterHandler(); // Eingabe noch abschliessen
 
 if (SC_MOD()->GetRefInputHdl()==this)
diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
index 8d0d44f..0bb4fda 100644
--- a/sc/source/ui/inc/inputhdl.hxx
+++ b/sc/source/ui/inc/inputhdl.hxx
@@ -100,6 +100,7 @@ private:
 boolbProtected:1;
 boolbCellHasPercentFormat:1;
 boolbLastIsSymbol:1;
+boolmbDocumentDisposing:1;
 sal_uLong   nValidation;
 SvxCellHorJustify   eAttrAdjust;
 
@@ -256,6 +257,8 @@ public:
 // actually private, public for SID_INPUT_SUM
 voidInitRangeFinder( const String& rFormula );
 
+void SetDocumentDisposing( bool b );
+
 static void SetAutoComplete(bool bSet)  { bAutoComplete = bSet; }
 };
 
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 377546f..cb920d4 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -1740,6 +1740,9 @@ ScTabViewShell::~ScTabViewShell()
 //  alles auf NULL, falls aus dem TabView-dtor noch darauf zugegriffen wird
 //! (soll eigentlich nicht !??!?!)
 
+if (pInputHandler)
+pInputHandler->SetDocumentDisposing(true);
+
 DELETEZ(pFontworkBarShell);
 DELETEZ(pExtrusionBarShell);
 DELETEZ(pCellShell);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-18 Thread Maxim Monastirsky

 filter/source/htmlfilterdetect/filterdetect.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7a044d08572244931b16f24f3f8cc83111b039f9
Author: Maxim Monastirsky 
Date:   Mon Feb 17 11:40:34 2014 +0200

fdo#74595 Make HTML detection to follow specs

See http://www.w3.org/TR/html-markup/documents.html#conformant-html

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

diff --git a/filter/source/htmlfilterdetect/filterdetect.cxx 
b/filter/source/htmlfilterdetect/filterdetect.cxx
index 140912d..9e5350d 100644
--- a/filter/source/htmlfilterdetect/filterdetect.cxx
+++ b/filter/source/htmlfilterdetect/filterdetect.cxx
@@ -53,7 +53,7 @@ bool isHTMLStream(const OString& aStreamHeader)
 for ( i = 0; i < nLength; ++i, ++pHeader )
 {
 char c = *pHeader;
-if ( c == ' ' || c == '\n' || c == '\t' )
+if ( c == ' ' || c == '\n' || c == '\t' || c == '\r' || c == '\f' )
 {
 if ( dp == TagOpened )
 return false; // Invalid: Should start with a tag name
@@ -76,8 +76,8 @@ bool isHTMLStream(const OString& aStreamHeader)
 }
 else if ( c == '!' )
 {
-if ( i == 1 && dp == TagOpened )
-return true; // "___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - external/xsltml

2014-02-18 Thread Julien Nabet

 external/xsltml/xsltml_2.1.2.patch |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 91995b930f7d35771154a439fb77d27236115d79
Author: Julien Nabet 
Date:   Mon Feb 17 23:18:19 2014 +0100

Resolves: fdo#50451 Mediawiki formula export + vec use

Unicode Character 'COMBINING RIGHT ARROW ABOVE' wasn't taken into account

Change-Id: I4b5fc5fcfa4efe40fc92935e21af829edadf1dea
Reviewed-on: https://gerrit.libreoffice.org/8093
Reviewed-by: FrÃ©dÃ©ric Wang 
Tested-by: CaolÃ¡n McNamara 
Reviewed-by: CaolÃ¡n McNamara 

diff --git a/external/xsltml/xsltml_2.1.2.patch 
b/external/xsltml/xsltml_2.1.2.patch
index 292338b..f02b0c5 100644
--- a/external/xsltml/xsltml_2.1.2.patch
+++ b/external/xsltml/xsltml_2.1.2.patch
@@ -1214,7 +1214,7 @@
\overbrace{

}
-@@ -192,10 +193,46 @@
+@@ -192,10 +193,51 @@
\ddot{

}
@@ -1256,6 +1256,11 @@
 +  
 +  }
 +  
++   
++  \vec{
++  
++  }
++  
 +  
 +   

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

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

2014-02-18 Thread Miklos Vajna

 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |4 
 writerfilter/source/dmapper/DomainMapper.cxx  |   12 ++--
 writerfilter/source/dmapper/SettingsTable.cxx |   11 +++
 writerfilter/source/dmapper/SettingsTable.hxx |3 +++
 writerfilter/source/ooxml/model.xml   |2 +-
 5 files changed, 29 insertions(+), 3 deletions(-)

New commits:
commit 15c05b945b238ae05cda92564b9465f04db5c919
Author: Miklos Vajna 
Date:   Mon Feb 17 10:00:32 2014 +0100

fdo#74357 DOCX import: avoid layout problem with automatic spacing

Commit 279ff2e03371542d014bf281e73282ba8080cf6b (bnc#816593 DOCX import:
fix auto para spacing without compat option, 2013-08-28) corrected the
value of "auto" paragraph spacing, but unfortunately this triggers a
layout problem:

warn:legacy.osl:12692:1:sw/source/core/layout/tabfrm.cxx:2513: debug 
assertion:  - format of table lowers suppressed by fix 
i44910

resulting in "the rest of the table is not rendered by the layout".

Given that we backported the original fix to stable branches as well,
just stay on the safe side and revert back to the original behavior in
case the document requests the web layout.

(cherry picked from commit 8b6ff51bb89db0d7050bb4d00c0ec797b4754f25)

Conflicts:
writerfilter/source/dmapper/SettingsTable.cxx

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

diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index a7d576e..dca64b7 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -744,6 +744,10 @@ DECLARE_OOXMLIMPORT_TEST(testFdo74357, "fdo74357.docx")
 uno::Reference 
xDrawPage(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
 // This was 0.
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDrawPage->getCount());
+
+// Bottom margin of the first paragraph was too large, causing a layout 
problem.
+// This was 494.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(86), 
getProperty(getParagraph(1), "ParaBottomMargin"));
 }
 
 DECLARE_OOXMLIMPORT_TEST(testFdo55187, "fdo55187.docx")
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 06ea11c..6ed6ddf 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1192,7 +1192,12 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 sal_Int32 default_spacing = 100;
 if 
(!m_pImpl->GetSettingsTable()->GetDoNotUseHTMLParagraphAutoSpacing())
 {
-default_spacing = 280;
+// 49 is just the old value that should be removed, once the
+// root cause in SwTabFrm::MakeAll() is fixed.
+if (m_pImpl->GetSettingsTable()->GetView() == 
NS_ooxml::LN_Value_wordprocessingml_ST_View_web)
+default_spacing = 49;
+else
+default_spacing = 280;
 }
 m_pImpl->GetTopContext()->Insert( PROP_PARA_TOP_MARGIN, 
uno::makeAny( ConversionHelper::convertTwipToMM100(default_spacing) ) );
 if  (nIntValue) // If auto spacing is set, then only store set 
value in InteropGrabBag
@@ -1207,7 +1212,10 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 
 if 
(!m_pImpl->GetSettingsTable()->GetDoNotUseHTMLParagraphAutoSpacing())
 {
-default_spacing = 280;
+if (m_pImpl->GetSettingsTable()->GetView() == 
NS_ooxml::LN_Value_wordprocessingml_ST_View_web)
+default_spacing = 49;
+else
+default_spacing = 280;
 }
 m_pImpl->GetTopContext()->Insert( PROP_PARA_BOTTOM_MARGIN, 
uno::makeAny( ConversionHelper::convertTwipToMM100(default_spacing) ) );
 if  (nIntValue) // If auto spacing is set, then only store set 
value in InteropGrabBag
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx 
b/writerfilter/source/dmapper/SettingsTable.cxx
index b01047a..b4c54a2 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -67,6 +67,7 @@ struct SettingsTable_Impl
 OUString m_sSalt;
 boolm_bLinkStyles;
 sal_Int16   m_nZoomFactor;
+Id  m_nView;
 boolm_bEvenAndOddHeaders;
 boolm_bUsePrinterMetrics;
 boolembedTrueTypeFonts;
@@ -91,6 +92,7 @@ struct SettingsTable_Impl
 , m_nCryptSpinCount(0)
 , m_bLinkStyles(false)
 , m_nZoomFactor(0)
+, m_nView(0)
 , m_bEvenAndOddHeaders(false)
 , m_bUsePrinterMetrics(false)
 , embedTrueTypeFonts(false)
@@ -123,6 +125,9 @@ void SettingsTable::lcl_attribute(Id nName,

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

2014-02-18 Thread Miklos Vajna

 sw/qa/extras/ooxmlimport/data/fdo74357.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |9 +
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |5 -
 3 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 28fa9a59940471bf072175a7ee98e23546485e50
Author: Miklos Vajna 
Date:   Mon Feb 17 09:37:51 2014 +0100

fdo#74357 DOCX import: fix nested tables anchored inside tables

Regression from bbef85c157169efa958ea1014d91d467cb243e6f (bnc#779620
DOCX import: try harder to convert floating tables to text frames,
2013-10-01), the conversion of nested tables is delayed by default till
we know the page size. However, in case the anchor is in a table, we
should convert it right away, because the conversion of the parent table
would invalidate our XTextRange references.

(cherry picked from commit e5fd7c2dacf3c128cdc62622e736ce8abbc578a5)

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

diff --git a/sw/qa/extras/ooxmlimport/data/fdo74357.docx 
b/sw/qa/extras/ooxmlimport/data/fdo74357.docx
new file mode 100644
index 000..9703729
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo74357.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index e9c5ad0..a7d576e 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -737,6 +737,15 @@ DECLARE_OOXMLIMPORT_TEST(testN779627, "n779627.docx")
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Not centered vertically relatively to page", 
text::RelOrientation::PAGE_FRAME, nValue);
 }
 
+DECLARE_OOXMLIMPORT_TEST(testFdo74357, "fdo74357.docx")
+{
+// Floating table wasn't converted to a textframe.
+uno::Reference xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xDrawPage(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
+// This was 0.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDrawPage->getCount());
+}
+
 DECLARE_OOXMLIMPORT_TEST(testFdo55187, "fdo55187.docx")
 {
 // 0x010d was imported as a newline.
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 3c9095a..0827cc9 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -951,9 +951,12 @@ void DomainMapperTableHandler::endTable(unsigned int 
nestedTableLevel)
 // SectionPropertyMap::CloseSectionGroup(), so we'll have no idea
 // about the text area width, nor can fix this by delaying the text
 // frame conversion: just do it here.
+// Also, we the anchor is within a table, then do it here as well,
+// as xStart/xEnd would not point to the start/end at conversion
+// time anyway.
 sal_Int32 nTableWidth = 0;
 m_aTableProperties->getValue(TablePropertyMap::TABLE_WIDTH, 
nTableWidth);
-if (m_rDMapper_Impl.GetSectionContext())
+if (m_rDMapper_Impl.GetSectionContext() && nestedTableLevel <= 1)
 
m_rDMapper_Impl.m_aPendingFloatingTables.push_back(FloatingTableInfo(xStart, 
xEnd, aFrameProperties, nTableWidth));
 else
 m_xText->convertToTextFrame(xStart, xEnd, aFrameProperties);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Fwd: Re: [Libreoffice-commits] core.git: Move string hash function into String class.

2014-02-18 Thread Stephan Bergmann


On 02/15/2014 04:51 AM, Muthu Subramanian wrote:

On 02/14/2014 09:39 PM, Stephan Bergmann wrote:

Sure, but how exactly rtl::O[U]String::hashCode should behave is
somewhat orthogonal to the point that the current design of
SdPage::getHash is needlessly resource-hungry.  And, as I wrote, "I
wouldn't mind changing the rtl string classes' hashCode behavior."


Then I guess I didn't understand your view point completely :(
I do agree that SdPage::getHash is resource hungry - currently.
It would hopefully reduce its resource hungriness as we progress. Then
again, it also depends on which resource ;)


I was alluding to dynamic memory allocation with "resource hungry."


SfxItemSet::getHash and SfxItemSet::stringify

Na...these are used


Oops, my mistake.


That's my point---none of the getHash/stringify functions in SdPage,
SdrObject, nor SfxItemSet should be virtual.

If its allowed to be inherited, its good to be virtual? Especially if we
are looking at hash folding?


While a well-designed interface between a base class and its derivations 
(of which virtual functions are a part) is desirable, a virtual function 
carries a relatively high maintenance cost.  So please never declare 
functions as virtual until they actually need to be.



I'll do what best I understood from this conversation (I hope I
understood right!) and leave the rest to you? Hope that's fine, please?


Just pushed 
 
"Stick to a single O[U]String hash function" based on what we discussed 
here.  Hope it still matches the requirements of SfxItemSet::getHash and 
SdPage::getHash (where I must confess that I don't understand what those 
requirements are) as well as the requirements of the 
svl::SharedStringPool clients (see the commit message for details).


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

[Libreoffice-commits] core.git: 2 commits - connectivity/source include/rtl include/svl sal/rtl sal/util sd/inc sd/source svl/source

2014-02-18 Thread Stephan Bergmann

 connectivity/source/drivers/ado/AColumn.cxx|2 
 connectivity/source/drivers/ado/AColumns.cxx   |2 
 connectivity/source/drivers/ado/AConnection.cxx|4 -
 connectivity/source/drivers/ado/APreparedStatement.cxx |2 
 connectivity/source/drivers/ado/AResultSet.cxx |2 
 connectivity/source/drivers/ado/Aolevariant.cxx|2 
 connectivity/source/inc/ado/Aolevariant.hxx|3 
 include/rtl/string.h   |   18 -
 include/rtl/string.hxx |   15 
 include/rtl/ustring.h  |   18 -
 include/rtl/ustring.hxx|   15 
 include/svl/itemset.hxx|2 
 sal/rtl/strtmpl.cxx|   57 -
 sal/util/sal.map   |6 -
 sd/inc/sdpage.hxx  |2 
 sd/source/core/sdpage2.cxx |4 -
 sd/source/core/stlpool.cxx |2 
 svl/source/items/itemset.cxx   |4 -
 18 files changed, 19 insertions(+), 141 deletions(-)

New commits:
commit cd361611ed43b24c2d85dc227ece4f6a5d551104
Author: Stephan Bergmann 
Date:   Tue Feb 18 13:08:41 2014 +0100

sal_Bool -> bool fixup in Windows-only ADO driver

Change-Id: I6ad4d730b4b8d715fcab20c09d654e5aa57465d5

diff --git a/connectivity/source/drivers/ado/AColumn.cxx 
b/connectivity/source/drivers/ado/AColumn.cxx
index 8207916..1e6ab61 100644
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
@@ -171,7 +171,7 @@ void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 
nHandle,const Any& r
 break;
 
 case PROPERTY_ID_ISAUTOINCREMENT:
-OTools::putValue( m_aColumn.get_Properties(), OUString( 
"Autoincrement" ), (sal_Bool)getBOOL( rValue ) );
+OTools::putValue( m_aColumn.get_Properties(), OUString( 
"Autoincrement" ), getBOOL( rValue ) );
 break;
 
 case PROPERTY_ID_IM001:
diff --git a/connectivity/source/drivers/ado/AColumns.cxx 
b/connectivity/source/drivers/ado/AColumns.cxx
index c7db779..68063f1 100644
--- a/connectivity/source/drivers/ado/AColumns.cxx
+++ b/connectivity/source/drivers/ado/AColumns.cxx
@@ -107,7 +107,7 @@ sdbcx::ObjectType OColumns::appendObject( const OUString&, 
const Reference< XPro
 WpADOColumn aAddedColumn = 
m_aCollection.GetItem(OLEVariant(aColumn.get_Name()));
 if ( aAddedColumn.IsValid() )
 {
-sal_Bool bAutoIncrement = sal_False;
+bool bAutoIncrement = false;
 
pColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT))
 >>= bAutoIncrement;
 if ( bAutoIncrement )
 OTools::putValue( aAddedColumn.get_Properties(), 
OUString("Autoincrement"), bAutoIncrement );
diff --git a/connectivity/source/drivers/ado/AConnection.cxx 
b/connectivity/source/drivers/ado/AConnection.cxx
index a32ad71..5dc8476 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -138,7 +138,7 @@ void OConnection::construct(const OUString& url,const 
Sequence< PropertyValue >&
 WpADOProperties aProps = m_pAdoConnection->get_Properties();
 if(aProps.IsValid())
 {
-OTools::putValue(aProps,OUString("Jet OLEDB:ODBC 
Parsing"),sal_True);
+OTools::putValue(aProps,OUString("Jet OLEDB:ODBC 
Parsing"),true);
 OLEVariant aVar(OTools::getValue(aProps,OUString("Jet 
OLEDB:Engine Type")));
 if(!aVar.isNull() && !aVar.isEmpty())
 m_nEngineType = aVar;
@@ -208,7 +208,7 @@ OUString SAL_CALL OConnection::nativeSQL( const OUString& 
_sql ) throw(SQLExcept
 WpADOProperties aProps = m_pAdoConnection->get_Properties();
 if(aProps.IsValid())
 {
-OTools::putValue(aProps,OUString("Jet OLEDB:ODBC Parsing"),sal_True);
+OTools::putValue(aProps,OUString("Jet OLEDB:ODBC Parsing"),true);
 WpADOCommand aCommand;
 aCommand.Create();
 aCommand.put_ActiveConnection((IDispatch*)*m_pAdoConnection);
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx 
b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 8b51779..8692726 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -294,7 +294,7 @@ Reference< XResultSet > SAL_CALL 
OPreparedStatement::executeQuery(  ) throw(SQLE
 
 void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, 
sal_Bool x ) throw(SQLException, RuntimeException)
 {
-setParameter(parameterIndex,adBoolean,sizeof(x),x);
+setParameter(parameterIndex,adBoolean,sizeof

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

2014-02-18 Thread Michael Stahl

 sw/qa/extras/rtfimport/data/rhbz1065629.rtf|   81 +
 sw/qa/extras/rtfimport/rtfimport.cxx   |   22 ++
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   14 
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |1 
 4 files changed, 118 insertions(+)

New commits:
commit c30a06600a3b002c9eebb819c1b8dcee9d11abe0
Author: Michael Stahl 
Date:   Tue Feb 18 11:22:52 2014 +0100

rhbz#1065629: RTF import: don't drop nested cells if not enough \cellx

In this document written by "XMLmind XSL-FO Converter" there are less
\cellx than \cell and thus when reading \nestrow/\row a whole buffered
nested table \cell is lost and then subsequently the rest of the nested
table too.  Try to fix that by counting both \cell and \cellx and
replaying until the maximum of those.

Cannot count \intbl since we synthesize that in various places.

(regression in LO 3.5)

(cherry picked from commit 07ef4cf096015f0e427ffd17cd26bb6837e75481)
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx

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

diff --git a/sw/qa/extras/rtfimport/data/rhbz1065629.rtf 
b/sw/qa/extras/rtfimport/data/rhbz1065629.rtf
new file mode 100644
index 000..b22ec50
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/rhbz1065629.rtf
@@ -0,0 +1,81 @@
+{\rtf1\ansi\ansicpg1252\deff0
+{\fonttbl
+\f0\froman\fcharset0 Times New Roman;
+\f1\fswiss\fcharset0 Arial;
+\f2\fmodern\fcharset0 Courier New;
+\f3\ftech\fcharset2 Symbol;
+\f4\fswiss\fcharset0 Helvetica;
+}
+{\info
+{\*\userprops
+{\propname creator}\proptype30
+{\staticval XMLmind XSL-FO Converter Professional Edition 4.6.1}
+}
+}
+\facingp\fet0\ftnbj
+\sectd
+\pghsxn16114\pgwsxn12514
+\margtsxn720\margbsxn907\marglsxn907\margrsxn1080
+\headery720
+\footery547
+\pgncont\pgndec
+
+\par
+\trowd\trleft10
+\clvertalt
+\clcbpat17
+\clbrdrt\brdrs\brdrw20\brdrcf2\clbrdrb\brdrs\brdrw20\brdrcf2\clbrdrl\brdrs\brdrw20\brdrcf2\clbrdrr\brdrs\brdrw20\brdrcf2\cellx10262
+\pard\intbl
+{\plain\f4\fs19\b\cf15\ulc2
+Informations client
+}
+\cell
+\row
+\trowd\trleft10
+\clvertalt
+\clbrdrl\brdrs\brdrw10\brdrcf2\cellx5136
+\clvertalt
+\clbrdrl\brdrs\brdrw10\brdrcf2\clbrdrr\brdrs\brdrw10\brdrcf2\cellx10262
+\pard\intbl\itap2
+{\plain\f4\fs18\cf2\ulc2
+E-mail:
+}
+\nestcell
+{\*\nesttableprops
+\trowd\trleft0
+\clvertalt
+\cellx5400
+\nestrow}
+\pard\intbl
+\cell
+\pard\intbl\itap2
+{\plain\f4\fs18\b\cf2\ulc2
+Responsable Commercial:
+}
+\nestcell
+{\*\nesttableprops
+\trowd\trleft0
+\clvertalt
+\cellx5400
+\nestrow}
+\pard\intbl\itap2
+{\plain\f4\fs18\cf2\ulc2
+\~
+}
+\par
+\pard\intbl\itap2
+{\plain\f4\fs18\cf2\ulc2
+Nom: John Doe
+}
+\nestcell
+{\*\nesttableprops
+\trowd\trleft0
+\clvertalt
+\cellx5400
+\nestrow}
+\pard\intbl
+\cell
+\row
+
+\pard\sect
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index eca16e3..dd6f198 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -162,6 +162,8 @@ public:
 void testFdo69384();
 void testFdo70221();
 void testFdo65090();
+void testNestedTable();
+
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -308,6 +310,7 @@ void Test::run()
 {"hello.rtf", &Test::testFdo69384},
 {"fdo70221.rtf", &Test::testFdo70221},
 {"fdo65090.rtf", &Test::testFdo65090},
+{"rhbz1065629.rtf", &Test::testNestedTable},
 };
 header();
 for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1500,6 +1503,25 @@ void Test::testFdo65090()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1), getProperty< 
uno::Sequence >(xTableRows->getByIndex(0), 
"TableColumnSeparators").getLength());
 }
 
+void Test::testNestedTable()
+{
+// nested table in second cell was missing
+uno::Reference xTextTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
+uno::Reference xTable(xTables->getByIndex(1), 
uno::UNO_QUERY);
+uno::Reference xCell(xTable->getCellByName("A1"), 
uno::UNO_QUERY);
+uno::Reference 
xParaEnumAccess(xCell->getText(), uno::UNO_QUERY);
+uno::Reference xParaEnum = 
xParaEnumAccess->createEnumeration();
+uno::Reference xPara(xParaEnum->nextElement(), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("Responsable Commercial:"), 
xPara->getString());
+xCell.set(xTable->getCellByName("A2"), uno::UNO_QUERY);
+xParaEnumAccess.set(xCell->getText(), uno::UNO_QUERY);
+xParaEnum = xParaEnumAccess->createEnumeration();
+xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY);
+xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("Nom: John Doe"), xPara->getString());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff

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

2014-02-18 Thread Michael Stahl

 sw/qa/extras/rtfimport/data/rhbz1065629.rtf|   81 +
 sw/qa/extras/rtfimport/rtfimport.cxx   |   19 +
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   14 
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |1 
 4 files changed, 115 insertions(+)

New commits:
commit 34de0b64b9184a85cd7fb65d0e811b435e90fe24
Author: Michael Stahl 
Date:   Tue Feb 18 11:22:52 2014 +0100

rhbz#1065629: RTF import: don't drop nested cells if not enough \cellx

In this document written by "XMLmind XSL-FO Converter" there are less
\cellx than \cell and thus when reading \nestrow/\row a whole buffered
nested table \cell is lost and then subsequently the rest of the nested
table too.  Try to fix that by counting both \cell and \cellx and
replaying until the maximum of those.

Cannot count \intbl since we synthesize that in various places.

(regression in LO 3.5)

Change-Id: I3b64ad94af842e076611418589a0c83bd18841c6
(cherry picked from commit 07ef4cf096015f0e427ffd17cd26bb6837e75481)
Reviewed-on: https://gerrit.libreoffice.org/8100
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/qa/extras/rtfimport/data/rhbz1065629.rtf 
b/sw/qa/extras/rtfimport/data/rhbz1065629.rtf
new file mode 100644
index 000..b22ec50
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/rhbz1065629.rtf
@@ -0,0 +1,81 @@
+{\rtf1\ansi\ansicpg1252\deff0
+{\fonttbl
+\f0\froman\fcharset0 Times New Roman;
+\f1\fswiss\fcharset0 Arial;
+\f2\fmodern\fcharset0 Courier New;
+\f3\ftech\fcharset2 Symbol;
+\f4\fswiss\fcharset0 Helvetica;
+}
+{\info
+{\*\userprops
+{\propname creator}\proptype30
+{\staticval XMLmind XSL-FO Converter Professional Edition 4.6.1}
+}
+}
+\facingp\fet0\ftnbj
+\sectd
+\pghsxn16114\pgwsxn12514
+\margtsxn720\margbsxn907\marglsxn907\margrsxn1080
+\headery720
+\footery547
+\pgncont\pgndec
+
+\par
+\trowd\trleft10
+\clvertalt
+\clcbpat17
+\clbrdrt\brdrs\brdrw20\brdrcf2\clbrdrb\brdrs\brdrw20\brdrcf2\clbrdrl\brdrs\brdrw20\brdrcf2\clbrdrr\brdrs\brdrw20\brdrcf2\cellx10262
+\pard\intbl
+{\plain\f4\fs19\b\cf15\ulc2
+Informations client
+}
+\cell
+\row
+\trowd\trleft10
+\clvertalt
+\clbrdrl\brdrs\brdrw10\brdrcf2\cellx5136
+\clvertalt
+\clbrdrl\brdrs\brdrw10\brdrcf2\clbrdrr\brdrs\brdrw10\brdrcf2\cellx10262
+\pard\intbl\itap2
+{\plain\f4\fs18\cf2\ulc2
+E-mail:
+}
+\nestcell
+{\*\nesttableprops
+\trowd\trleft0
+\clvertalt
+\cellx5400
+\nestrow}
+\pard\intbl
+\cell
+\pard\intbl\itap2
+{\plain\f4\fs18\b\cf2\ulc2
+Responsable Commercial:
+}
+\nestcell
+{\*\nesttableprops
+\trowd\trleft0
+\clvertalt
+\cellx5400
+\nestrow}
+\pard\intbl\itap2
+{\plain\f4\fs18\cf2\ulc2
+\~
+}
+\par
+\pard\intbl\itap2
+{\plain\f4\fs18\cf2\ulc2
+Nom: John Doe
+}
+\nestcell
+{\*\nesttableprops
+\trowd\trleft0
+\clvertalt
+\cellx5400
+\nestrow}
+\pard\intbl
+\cell
+\row
+
+\pard\sect
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 42ee83c..b389af6 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1364,6 +1364,25 @@ DECLARE_RTFIMPORT_TEST(testCp118, "cp118.rtf")
 
 #endif
 
+DECLARE_RTFIMPORT_TEST(testNestedTable, "rhbz1065629.rtf")
+{
+// nested table in second cell was missing
+uno::Reference xTextTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
+uno::Reference xTable(xTables->getByIndex(1), 
uno::UNO_QUERY);
+uno::Reference xCell(xTable->getCellByName("A1"), 
uno::UNO_QUERY);
+uno::Reference 
xParaEnumAccess(xCell->getText(), uno::UNO_QUERY);
+uno::Reference xParaEnum = 
xParaEnumAccess->createEnumeration();
+uno::Reference xPara(xParaEnum->nextElement(), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("Responsable Commercial:"), 
xPara->getString());
+xCell.set(xTable->getCellByName("A2"), uno::UNO_QUERY);
+xParaEnumAccess.set(xCell->getText(), uno::UNO_QUERY);
+xParaEnum = xParaEnumAccess->createEnumeration();
+xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY);
+xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("Nom: John Doe"), xPara->getString());
+}
+
 DECLARE_RTFIMPORT_TEST(testCp116, "hello.rtf")
 {
 // The single-line document had a second fake empty para on Windows.
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 7f3e253..ef7117e 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1867,6 +1867,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
 RTFValue::Pointer_t pValue;
 m_aTableBuffer.push_back(make_pair(BUFFER_CELLEND, pValue));
 m_bNeedPap = true;
+m_aStates.top().nCellEnds++;
 }
 break;
 case RTF_ROW:
@@ -1899,6 +1900,17 @@ i

[Libreoffice-commits] core.git: jvmfwk/plugins jvmfwk/source

2014-02-18 Thread Stephan Bergmann

 jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx |8 
 jvmfwk/source/elements.cxx   |2 +-
 jvmfwk/source/elements.hxx   |2 +-
 jvmfwk/source/framework.cxx  |2 +-
 jvmfwk/source/fwkbase.cxx|   12 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit f2529fc7441ced32daef09c0ca767080998d1792
Author: Stephan Bergmann 
Date:   Tue Feb 18 12:01:43 2014 +0100

jvmfwk: sal_Bool -> bool

Change-Id: I35f302006cb9ef6e98a041dea811818b98c0e876

diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx 
b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index fb99974..09e0435 100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -29,7 +29,7 @@
 #include "jvmfwk/framework.h"
 
 
-static sal_Bool hasOption(char const * szOption, int argc, char** argv);
+static bool hasOption(char const * szOption, int argc, char** argv);
 static OString getLD_LIBRARY_PATH(const rtl::ByteSequence & vendorData);
 static bool findAndSelect(JavaInfo**);
 
@@ -132,14 +132,14 @@ OString getLD_LIBRARY_PATH(const rtl::ByteSequence & 
vendorData)
 return paths;
 }
 
-static sal_Bool hasOption(char const * szOption, int argc, char** argv)
+static bool hasOption(char const * szOption, int argc, char** argv)
 {
-sal_Bool retVal= sal_False;
+bool retVal= false;
 for(sal_Int16 i= 1; i < argc; i++)
 {
 if( ! strcmp(argv[i], szOption))
 {
-retVal= sal_True;
+retVal= true;
 break;
 }
 }
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index 9fdab7a..ec30fc2 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -586,7 +586,7 @@ void NodeJava::write() const
 throw FrameworkException(JFW_E_ERROR, sExcMsg);
 }
 
-void NodeJava::setEnabled(sal_Bool bEnabled)
+void NodeJava::setEnabled(bool bEnabled)
 {
 m_enabled =  boost::optional(bEnabled);
 }
diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx
index 36fbd3e..f716fe4 100644
--- a/jvmfwk/source/elements.hxx
+++ b/jvmfwk/source/elements.hxx
@@ -186,7 +186,7 @@ public:
 /** sets m_enabled.
 /java/enabled@xsi:nil will be set to false when write is called.
  */
-void setEnabled(sal_Bool bEnabled);
+void setEnabled(bool bEnabled);
 
 /** sets m_sUserClassPath. See setEnabled.
  */
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index f0b9d69..dcaac1b 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -40,7 +40,7 @@ static bool g_bEnabledSwitchedOn = false;
 
 static JavaVM * g_pJavaVM = NULL;
 
-sal_Bool areEqualJavaInfo(
+bool areEqualJavaInfo(
 JavaInfo const * pInfoA,JavaInfo const * pInfoB)
 {
 return jfw_areEqualJavaInfo(pInfoA, pInfoB);
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index 29949c6..3b4fba3 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -424,12 +424,12 @@ OUString BootParams::getJREHome()
 {
 OUString sJRE;
 OUString sEnvJRE;
-sal_Bool bJRE = Bootstrap::get()->getFrom(
+bool bJRE = Bootstrap::get()->getFrom(
 OUString(UNO_JAVA_JFW_JREHOME) ,sJRE);
-sal_Bool bEnvJRE = Bootstrap::get()->getFrom(
+bool bEnvJRE = Bootstrap::get()->getFrom(
 OUString(UNO_JAVA_JFW_ENV_JREHOME) ,sEnvJRE);
 
-if (bJRE == sal_True && bEnvJRE == sal_True)
+if (bJRE && bEnvJRE)
 {
 throw FrameworkException(
 JFW_E_CONFIGURATION,
@@ -439,7 +439,7 @@ OUString BootParams::getJREHome()
  "Check bootstrap parameters: environment 
variables, command line "
  "arguments, rc/ini files for executable and java 
framework library."));
 }
-else if (bEnvJRE == sal_True)
+else if (bEnvJRE)
 {
 const char * pJRE = getenv("JAVA_HOME");
 if (pJRE == NULL)
@@ -463,8 +463,8 @@ OUString BootParams::getJREHome()
 #endif
 }
 else if (getMode() == JFW_MODE_DIRECT
-&& bEnvJRE == sal_False
-&& bJRE == sal_False)
+&& !bEnvJRE
+&& !bJRE)
 {
 throw FrameworkException(
 JFW_E_CONFIGURATION,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Vort license statement

2014-02-18 Thread Vort

Hello.

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

-- Vort

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

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

2014-02-18 Thread Michael Stahl

 include/sal/log-areas.dox|2 
 sw/qa/extras/rtfimport/data/rhbz1065629.rtf  |   81 +++
 sw/qa/extras/rtfimport/rtfimport.cxx |   19 +++
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   14 --
 writerfilter/source/rtftok/rtfdocumentimpl.cxx   |   16 ++
 writerfilter/source/rtftok/rtfdocumentimpl.hxx   |1 
 6 files changed, 122 insertions(+), 11 deletions(-)

New commits:
commit 07ef4cf096015f0e427ffd17cd26bb6837e75481
Author: Michael Stahl 
Date:   Tue Feb 18 11:22:52 2014 +0100

rhbz#1065629: RTF import: don't drop nested cells if not enough \cellx

In this document written by "XMLmind XSL-FO Converter" there are less
\cellx than \cell and thus when reading \nestrow/\row a whole buffered
nested table \cell is lost and then subsequently the rest of the nested
table too.  Try to fix that by counting both \cell and \cellx and
replaying until the maximum of those.

Cannot count \intbl since we synthesize that in various places.

(regression in LO 3.5)

Change-Id: I3b64ad94af842e076611418589a0c83bd18841c6

diff --git a/sw/qa/extras/rtfimport/data/rhbz1065629.rtf 
b/sw/qa/extras/rtfimport/data/rhbz1065629.rtf
new file mode 100644
index 000..b22ec50
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/rhbz1065629.rtf
@@ -0,0 +1,81 @@
+{\rtf1\ansi\ansicpg1252\deff0
+{\fonttbl
+\f0\froman\fcharset0 Times New Roman;
+\f1\fswiss\fcharset0 Arial;
+\f2\fmodern\fcharset0 Courier New;
+\f3\ftech\fcharset2 Symbol;
+\f4\fswiss\fcharset0 Helvetica;
+}
+{\info
+{\*\userprops
+{\propname creator}\proptype30
+{\staticval XMLmind XSL-FO Converter Professional Edition 4.6.1}
+}
+}
+\facingp\fet0\ftnbj
+\sectd
+\pghsxn16114\pgwsxn12514
+\margtsxn720\margbsxn907\marglsxn907\margrsxn1080
+\headery720
+\footery547
+\pgncont\pgndec
+
+\par
+\trowd\trleft10
+\clvertalt
+\clcbpat17
+\clbrdrt\brdrs\brdrw20\brdrcf2\clbrdrb\brdrs\brdrw20\brdrcf2\clbrdrl\brdrs\brdrw20\brdrcf2\clbrdrr\brdrs\brdrw20\brdrcf2\cellx10262
+\pard\intbl
+{\plain\f4\fs19\b\cf15\ulc2
+Informations client
+}
+\cell
+\row
+\trowd\trleft10
+\clvertalt
+\clbrdrl\brdrs\brdrw10\brdrcf2\cellx5136
+\clvertalt
+\clbrdrl\brdrs\brdrw10\brdrcf2\clbrdrr\brdrs\brdrw10\brdrcf2\cellx10262
+\pard\intbl\itap2
+{\plain\f4\fs18\cf2\ulc2
+E-mail:
+}
+\nestcell
+{\*\nesttableprops
+\trowd\trleft0
+\clvertalt
+\cellx5400
+\nestrow}
+\pard\intbl
+\cell
+\pard\intbl\itap2
+{\plain\f4\fs18\b\cf2\ulc2
+Responsable Commercial:
+}
+\nestcell
+{\*\nesttableprops
+\trowd\trleft0
+\clvertalt
+\cellx5400
+\nestrow}
+\pard\intbl\itap2
+{\plain\f4\fs18\cf2\ulc2
+\~
+}
+\par
+\pard\intbl\itap2
+{\plain\f4\fs18\cf2\ulc2
+Nom: John Doe
+}
+\nestcell
+{\*\nesttableprops
+\trowd\trleft0
+\clvertalt
+\cellx5400
+\nestrow}
+\pard\intbl
+\cell
+\row
+
+\pard\sect
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 0289ea2..87dee32 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1365,6 +1365,25 @@ DECLARE_RTFIMPORT_TEST(testCp118, "cp118.rtf")
 
 #endif
 
+DECLARE_RTFIMPORT_TEST(testNestedTable, "rhbz1065629.rtf")
+{
+// nested table in second cell was missing
+uno::Reference xTextTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
+uno::Reference xTable(xTables->getByIndex(1), 
uno::UNO_QUERY);
+uno::Reference xCell(xTable->getCellByName("A1"), 
uno::UNO_QUERY);
+uno::Reference 
xParaEnumAccess(xCell->getText(), uno::UNO_QUERY);
+uno::Reference xParaEnum = 
xParaEnumAccess->createEnumeration();
+uno::Reference xPara(xParaEnum->nextElement(), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("Responsable Commercial:"), 
xPara->getString());
+xCell.set(xTable->getCellByName("A2"), uno::UNO_QUERY);
+xParaEnumAccess.set(xCell->getText(), uno::UNO_QUERY);
+xParaEnum = xParaEnumAccess->createEnumeration();
+xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY);
+xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("Nom: John Doe"), xPara->getString());
+}
+
 DECLARE_RTFIMPORT_TEST(testCp116, "hello.rtf")
 {
 // The single-line document had a second fake empty para on Windows.
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 95da80b..f6651e8 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1890,6 +1890,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
 RTFValue::Pointer_t pValue;
 m_aTableBuffer.push_back(make_pair(BUFFER_CELLEND, pValue));
 m_bNeedPap = true;
+m_aStates.top().nCellEnds++;
 }
 break;
 case RTF_ROW:
@@ -1922,6 +1923,17 @@ int RTFDoc

Re: [comment] Remove vcl/settings.hxx from vcl/svapp.hxx and vcl/outdev.hx...

2014-02-18 Thread Caolán McNamara

On Mon, 2014-02-17 at 18:12 +, Tobias Lippert (via Code Review)
wrote:
> Hello Caolan, I have sent an email to the dev list a week ago. I got an
> reply which says the email is currently being reviewed by the
> moderators. How long does it usually take to review the mails?

This is a real nuisance. Typically the list does not require
subscription, so the spam filter must be basically over enthusiastic in
catching things and holding them for moderation :-( Can you try again,
and add me on CC so that I'll definitely get at least one of the copies.

C.

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

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

2014-02-18 Thread Caolán McNamara

 svl/source/items/cintitem.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 830ea7ba994f84cfaa0e73cd8589c7c96de67324
Author: CaolÃ¡n McNamara 
Date:   Tue Feb 18 10:25:39 2014 +

coverity#984145 Uninitialized scalar field

Change-Id: I08d4de5fc4cbc56feda0f57f95ae76cd25b124e3

diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx
index ec155e0..de4559b 100644
--- a/svl/source/items/cintitem.cxx
+++ b/svl/source/items/cintitem.cxx
@@ -255,8 +255,9 @@ DBG_NAME(CntInt32Item);
 
 TYPEINIT1_AUTOFACTORY(CntInt32Item, SfxPoolItem);
 
-CntInt32Item::CntInt32Item(sal_uInt16 which, SvStream & rStream) :
-SfxPoolItem(which)
+CntInt32Item::CntInt32Item(sal_uInt16 which, SvStream & rStream)
+: SfxPoolItem(which)
+, m_nValue(0)
 {
 DBG_CTOR(CntInt32Item, 0);
 //fdo#39428 SvStream no longer supports operator>>(long&)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-18 Thread Caolán McNamara

 bc/34afebf4562ad3a8c48484f3fb9841ab4809b0 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6a5648ed2c8e541a23c4e4da22dff1ec36697d2c
Author: CaolÃ¡n McNamara 
Date:   Tue Feb 18 10:23:58 2014 +

Notes added by 'git notes add'

diff --git a/bc/34afebf4562ad3a8c48484f3fb9841ab4809b0 
b/bc/34afebf4562ad3a8c48484f3fb9841ab4809b0
new file mode 100644
index 000..6457ebe
--- /dev/null
+++ b/bc/34afebf4562ad3a8c48484f3fb9841ab4809b0
@@ -0,0 +1 @@
+merged as: d280756b12cf30112901633f827d6509ce00c7f2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-02-18 Thread Yuri Dario

 ucb/source/ucp/webdav/SerfCallbacks.hxx|2 +-
 ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx  |2 +-
 ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx|2 +-
 ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx |2 +-
 ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx  |2 +-
 ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx  |2 +-
 ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx   |2 +-
 ucb/source/ucp/webdav/SerfRequestProcessor.hxx |2 +-
 ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx |2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit d280756b12cf30112901633f827d6509ce00c7f2
Author: Yuri Dario 
Date:   Mon Feb 17 16:32:25 2014 +

Resolves: #i123744# use only one way to include serf headers

(cherry picked from commit bc34afebf4562ad3a8c48484f3fb9841ab4809b0)

Change-Id: I0ef0d1a8b35ed6eb30db3d116bb102a911006ca0

diff --git a/ucb/source/ucp/webdav/SerfCallbacks.hxx 
b/ucb/source/ucp/webdav/SerfCallbacks.hxx
index af3be03..78b0d06 100644
--- a/ucb/source/ucp/webdav/SerfCallbacks.hxx
+++ b/ucb/source/ucp/webdav/SerfCallbacks.hxx
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_CALLBACKS_HXX
 #define INCLUDED_CALLBACKS_HXX
 
-#include 
+#include 
 
 extern "C" apr_status_t Serf_ConnectSetup( apr_socket_t *skt,
serf_bucket_t **read_bkt,
diff --git a/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx 
b/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
index 1bc2098..f098b80 100644
--- a/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx
@@ -19,7 +19,7 @@
 
 #include "SerfCopyReqProcImpl.hxx"
 
-#include 
+#include 
 
 namespace http_dav_ucp
 {
diff --git a/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx 
b/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
index 9287408..893c407 100644
--- a/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx
@@ -19,7 +19,7 @@
 
 #include "SerfDeleteReqProcImpl.hxx"
 
-#include 
+#include 
 
 namespace http_dav_ucp
 {
diff --git a/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx 
b/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
index 07c6725..b7b2105 100644
--- a/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx
@@ -19,7 +19,7 @@
 
 #include "SerfMkColReqProcImpl.hxx"
 
-#include 
+#include 
 
 namespace http_dav_ucp
 {
diff --git a/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx 
b/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
index b0cb2cc..4518fcd 100644
--- a/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx
@@ -19,7 +19,7 @@
 
 #include "SerfMoveReqProcImpl.hxx"
 
-#include 
+#include 
 
 namespace http_dav_ucp
 {
diff --git a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx 
b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
index 86e2f36..5bf1ce9 100644
--- a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
@@ -19,7 +19,7 @@
 
 #include "SerfPostReqProcImpl.hxx"
 
-#include 
+#include 
 
 using namespace com::sun::star;
 
diff --git a/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx 
b/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
index 78b454a..e3617f9 100644
--- a/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx
@@ -21,7 +21,7 @@
 
 #include "SerfPutReqProcImpl.hxx"
 
-#include 
+#include 
 
 namespace http_dav_ucp
 {
diff --git a/ucb/source/ucp/webdav/SerfRequestProcessor.hxx 
b/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
index 9addb34..d1bfe97 100644
--- a/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
+++ b/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
@@ -24,7 +24,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include "DAVTypes.hxx"
 #include "DAVResource.hxx"
diff --git a/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx 
b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx
index cea80bd..1c15621 100644
--- a/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx
+++ b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SERFREQUESTPROCESSORIMPL_HXX
 #define INCLUDED_SERFREQUESTPROCESSORIMPL_HXX
 
-#include 
+#include 
 
 #include 
 #include "DAVRequestEnvironment.hxx"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 7c/b6c17be30228228b0db7a6497aecca57ad9401

2014-02-18 Thread Caolán McNamara

 7c/b6c17be30228228b0db7a6497aecca57ad9401 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b4df54805993d664c7d8e8beb51c53829c5039b3
Author: CaolÃ¡n McNamara 
Date:   Tue Feb 18 10:12:31 2014 +

Notes added by 'git notes add'

diff --git a/7c/b6c17be30228228b0db7a6497aecca57ad9401 
b/7c/b6c17be30228228b0db7a6497aecca57ad9401
new file mode 100644
index 000..644c2d0
--- /dev/null
+++ b/7c/b6c17be30228228b0db7a6497aecca57ad9401
@@ -0,0 +1 @@
+prefer: 828dfdd4fb9fc133f4e3241e9722f23f3778db08
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 5 commits - include/sfx2 include/svtools sd/inc sd/source sfx2/source svtools/source svx/uiconfig sw/source unotools/source unusedcode.easy xmlscript/source

2014-02-18 Thread Caolán McNamara

 include/sfx2/thumbnailview.hxx |2 
 include/svtools/headbar.hxx|5 
 include/svtools/valueset.hxx   |1 
 sd/inc/stlpool.hxx |2 
 sd/source/core/stlpool.cxx |   10 
 sfx2/source/control/thumbnailview.cxx  |7 
 sfx2/source/dialog/backingwindow.cxx   |   25 -
 sfx2/source/dialog/backingwindow.hxx   |1 
 sfx2/source/sidebar/TabBar.cxx |   15 
 sfx2/source/sidebar/TabBar.hxx |1 
 svtools/source/contnr/svimpbox.cxx |   22 -
 svtools/source/control/headbar.cxx |8 
 svtools/source/control/valueset.cxx|   17 
 svx/uiconfig/ui/sidebarparagraph.ui|  446 ++---
 sw/source/core/access/accfrmobj.cxx|   17 
 sw/source/core/access/accfrmobj.hxx|2 
 sw/source/core/access/accnotextframe.cxx   |   10 
 sw/source/core/access/accnotextframe.hxx   |4 
 sw/source/core/access/acctable.cxx |6 
 sw/source/core/access/acctable.hxx |1 
 sw/source/core/doc/docfld.cxx  |6 
 sw/source/core/inc/docfld.hxx  |1 
 unotools/source/config/extendedsecurityoptions.cxx |9 
 unusedcode.easy|   11 
 xmlscript/source/xmldlg_imexp/imp_share.hxx|2 
 25 files changed, 244 insertions(+), 387 deletions(-)

New commits:
commit 31bacc9bed54759dbd90e6cddfd430cf35c71556
Author: CaolÃ¡n McNamara 
Date:   Tue Feb 18 10:09:05 2014 +

coverity#984146 Uninitialized scalar field

Change-Id: Ibaeaa95c346547f17b82c687944a8b37c05b9b49

diff --git a/svtools/source/contnr/svimpbox.cxx 
b/svtools/source/contnr/svimpbox.cxx
index 6ac1b35..71b26be 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -44,17 +44,17 @@ Image*  SvImpLBox::s_pDefCollapsed  = NULL;
 Image*  SvImpLBox::s_pDefExpanded   = NULL;
 sal_Int32 SvImpLBox::s_nImageRefCount   = 0;
 
-SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvTreeList* pLBTree, WinBits 
nWinStyle) :
-
-aVerSBar( pLBView, WB_DRAG | WB_VSCROLL ),
-aHorSBar( pLBView, WB_DRAG | WB_HSCROLL ),
-aScrBarBox( pLBView ),
-aOutputSize( 0, 0 ),
-aSelEng( pLBView, (FunctionSet*)0 ),
-aFctSet( this, &aSelEng, pLBView ),
-nExtendedWinBits( 0 ),
-bAreChildrenTransient( true ),
-m_pStringSorter(NULL)
+SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvTreeList* pLBTree, WinBits 
nWinStyle)
+: aVerSBar(pLBView, WB_DRAG | WB_VSCROLL)
+, aHorSBar(pLBView, WB_DRAG | WB_HSCROLL)
+, aScrBarBox(pLBView)
+, aOutputSize(0, 0)
+, aSelEng(pLBView, (FunctionSet*)0)
+, aFctSet(this, &aSelEng, pLBView)
+, nNextVerVisSize(0)
+, nExtendedWinBits(0)
+, bAreChildrenTransient(true)
+, m_pStringSorter(NULL)
 {
 osl_atomic_increment(&s_nImageRefCount);
 pView = pLBView;
commit cdb19b8b00eba8d4e591aa2912a6d3180d71c8c7
Author: CaolÃ¡n McNamara 
Date:   Tue Feb 18 10:05:58 2014 +

coverity#984167 Uninitialized scalar field

Change-Id: I2f6b40def145ea478403fb566c4b0d57c87c0627

diff --git a/unotools/source/config/extendedsecurityoptions.cxx 
b/unotools/source/config/extendedsecurityoptions.cxx
index 9e09757..b6d02d3 100644
--- a/unotools/source/config/extendedsecurityoptions.cxx
+++ b/unotools/source/config/extendedsecurityoptions.cxx
@@ -141,10 +141,11 @@ class SvtExtendedSecurityOptions_Impl : public ConfigItem
 
//*
 SvtExtendedSecurityOptions_Impl::SvtExtendedSecurityOptions_Impl()
 // Init baseclasses first
-:   ConfigItem  ( ROOTNODE_SECURITY ),
-m_aSecureExtensionsSetName( SECURE_EXTENSIONS_SET ),
-m_aExtensionPropName( EXTENSION_PROPNAME ),
-m_bROOpenHyperlinkMode(sal_False)
+:   ConfigItem  ( ROOTNODE_SECURITY )
+, m_aSecureExtensionsSetName( SECURE_EXTENSIONS_SET )
+, m_aExtensionPropName( EXTENSION_PROPNAME )
+, m_eOpenHyperlinkMode(SvtExtendedSecurityOptions::OPEN_NEVER)
+, m_bROOpenHyperlinkMode(sal_False)
 // Init member then.
 {
 // Fill the extension hash map with all secure extension strings
commit 6c594bcf6a00b26ca70b9b6152dda9b1d3f896e3
Author: CaolÃ¡n McNamara 
Date:   Tue Feb 18 10:02:27 2014 +

coverity#984352 Uninitialized scalar field

Change-Id: I871fcd02f461c798520a033217e14b3caa78876e

diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx 
b/xmlscript/source/xmldlg_imexp/imp_share.hxx
index b5d0055..b417f63 100644
--- a/xmlscript/source/xmldlg_imexp/imp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx
@@ -156,6 +156,8 @@ public:
 , _pStyles( pStyles )
 , _xDialog

1 2 >

1 - 100 of 112 matches

Mail list logo