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

[Takeshi Abe]

 sc/source/ui/view/gridwin.cxx  |7 +++
 sc/source/ui/view/gridwin2.cxx |6 +++---
 sc/source/ui/view/gridwin4.cxx |   12 +---
 sc/source/ui/view/output.cxx   |   12 ++--
 sc/source/ui/view/output2.cxx  |   14 ++
 5 files changed, 23 insertions(+), 28 deletions(-)

New commits:
commit decfecc3d2414a6467bae6d5e9069fb63885e3fe
Author: Takeshi Abe 
Date:   Wed May 14 14:52:56 2014 +0900

Avoid possible memory leaks in case of exceptions

Change-Id: Ib74c40bb4ac11edf97b6843e983a911308fa4b98

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index d1194bf..2226ab1 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1262,15 +1262,15 @@ void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, 
SCROW nRow, bool bDataSelec
 const ScValidationData* pData = pDoc->GetValidationEntry( nIndex );
 if (pData)
 {
-ScTypedStrData* pNew = NULL;
+boost::scoped_ptr pNew;
 OUString aDocStr = pDoc->GetString(nCol, nRow, nTab);
 if ( pDoc->HasValueData( nCol, nRow, nTab ) )
 {
 double fVal = pDoc->GetValue(ScAddress(nCol, nRow, nTab));
-pNew = new ScTypedStrData(aDocStr, fVal, 
ScTypedStrData::Value);
+pNew.reset(new ScTypedStrData(aDocStr, fVal, 
ScTypedStrData::Value));
 }
 else
-pNew = new ScTypedStrData(aDocStr, 0.0, 
ScTypedStrData::Standard);
+pNew.reset(new ScTypedStrData(aDocStr, 0.0, 
ScTypedStrData::Standard));
 
 bool bSortList = ( pData->GetListType() == 
ValidListType::SORTEDASCENDING);
 if ( bSortList )
@@ -1293,7 +1293,6 @@ void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, 
SCROW nRow, bool bDataSelec
 nSelPos = std::distance(itBeg, it);
 }
 }
-delete pNew;
 }
 }
 }
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index 6ea8c89..357b419 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -47,6 +47,7 @@
 #include 
 
 #include 
+#include 
 #include 
 
 using namespace com::sun::star;
@@ -210,8 +211,8 @@ void ScGridWindow::DoPushPivotButton( SCCOL nCol, SCROW 
nRow, const MouseEvent&
 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
 OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
 
-AbstractScPivotFilterDlg* pDlg = pFact->CreateScPivotFilterDlg(
-pViewData->GetViewShell()->GetDialogParent(), aArgSet, 
nSrcTab);
+boost::scoped_ptr 
pDlg(pFact->CreateScPivotFilterDlg(
+pViewData->GetViewShell()->GetDialogParent(), aArgSet, 
nSrcTab));
 OSL_ENSURE(pDlg, "Dialog create fail!");
 if ( pDlg->Execute() == RET_OK )
 {
@@ -228,7 +229,6 @@ void ScGridWindow::DoPushPivotButton( SCCOL nCol, SCROW 
nRow, const MouseEvent&
 aFunc.DataPilotUpdate( pDPObj, &aNewObj, true, false );
 pViewData->GetView()->CursorPosChanged();   // shells may 
be switched
 }
-delete pDlg;
 }
 }
 else
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 5405b89..2625a96 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -917,7 +917,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, 
SCCOL nX2, SCROW nY2,
 }
 
 Font aFont;
-ScEditEngineDefaulter* pEditEng = NULL;
+boost::scoped_ptr pEditEng;
 const ScPatternAttr& rDefPattern = ((const 
ScPatternAttr&)pDoc->GetPool()->GetDefaultItem(ATTR_PATTERN));
 if ( nPageScript == SCRIPTTYPE_LATIN )
 {
@@ -929,7 +929,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, 
SCCOL nX2, SCROW nY2,
 else
 {
 //  use EditEngine to draw mixed-script string
-pEditEng = new ScEditEngineDefaulter( EditEngine::CreatePool(), 
true );
+pEditEng.reset(new ScEditEngineDefaulter( 
EditEngine::CreatePool(), true ));
 pEditEng->SetRefMapMode( pContentDev->GetMapMode() );
 SfxItemSet* pEditDefaults = new SfxItemSet( 
pEditEng->GetEmptyItemSet() );
 rDefPattern.FillEditItemSet( pEditDefaults );
@@ -1093,8 +1093,6 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, 
SCCOL nX2, SCROW nY2,
 }
 }
 }
-
-delete pEditEng;
 }
 }
 
@@ -,7 +1109,7 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCCOL nX2, 
ScTableInfo& rTabInfo, Out
 SCSIZE nQuery;
 SCTAB   nTab = pViewData->GetTabNo();
 ScDBData*   pDBData = NULL;
-ScQueryParam*   pQueryParam = NULL;
+boost::scoped_ptr pQueryParam;
 

Re: Access2Base - New release

[Jean-Pierre Ledure]

On 13/05/2014 10:13, Lionel Elie Mamane wrote:
I presume it is compliant with the LO release policy to push the same 
patch also to the LO 4.2 branch ? 


I don't think so; no new features, only bugfixes.

Can't an "installation as extension" override the bundled one, or
something like that?
I don't see how: installing the extension on LO 4.2 makes that 2 Basic 
libraries with the same name are present either in "My macros" or in 
"LibreOffice macros".
To be used a library must first be loaded by giving its (presumably 
unique) name ??

The result is LO being unstable or corrupt.

JP.

---
This email is free from viruses and malware because avast! Antivirus protection 
is active.
http://www.avast.com

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

LibreOffice Gerrit News for core on 2014-05-14

[gerrit]

Moin!

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

 First time contributors doing great things! 
+ fdo#78599: Fixed for file corruption which contains fields and hyperlink
  in https://gerrit.libreoffice.org/9330 from Priyanka Gaikwad
  about module sw
 End of freshness 

+ fdo#70474: Random number generation weak with Rnd in BASIC
  in https://gerrit.libreoffice.org/9349 from Thomas Arnhold
  about module basic
+ move boost rng wrapper from sc to comphelper
  in https://gerrit.libreoffice.org/9348 from Thomas Arnhold
  about module comphelper, include, sc
+ upgrade to python-3.3.5
  in https://gerrit.libreoffice.org/9311 from Thomas Arnhold
  about module build, external
+ libgltf: Update to the new version.
  in https://gerrit.libreoffice.org/9333 from Jan Holesovsky
  about module avmedia, build, external
+ Introduce Collada2gltf external library
  in https://gerrit.libreoffice.org/9291 from Matúš Kukan
  about module build, external
+ Introduce OpenCollada external library
  in https://gerrit.libreoffice.org/9290 from Matúš Kukan
  about module build, external
+ fdo#67544 Slide transistion sound(other sound) is not included in present
  in https://gerrit.libreoffice.org/8700 from Vishv Brahmbhatt
  about module include, sd, sfx2
+ fdo#78384: Fix for corruption if file contains symbols.
  in https://gerrit.libreoffice.org/9281 from Rohit Deshmukh
  about module sw, writerfilter
+ -fsanitize=address does not like -z defs
  in https://gerrit.libreoffice.org/9334 from Markus Mohrhard
  about module external


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

+ coverity#735464 Logically dead code
  in https://gerrit.libreoffice.org/9301 from Thomas Arnhold
+ fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO
  in https://gerrit.libreoffice.org/9343 from Noel Grandin
+ upgrade to libpng-1.5.18
  in https://gerrit.libreoffice.org/9344 from Thomas Arnhold
+ Use collada2gltf to open .dae files and convert them to .json.
  in https://gerrit.libreoffice.org/9332 from Matúš Kukan
+ Access2Base new release - V1.1.0
  in https://gerrit.libreoffice.org/9303 from Jean-Pierre Ledure
+ remove unused code -SvtLanguageTable::AddLanguageTag
  in https://gerrit.libreoffice.org/9342 from Noel Grandin
+ fdo#78420  File is getting corrupted after exported from LO.
  in https://gerrit.libreoffice.org/9286 from Ravindra Vidhate
+ coverity#1212488 Copy-paste error
  in https://gerrit.libreoffice.org/9302 from Thomas Arnhold
+ vcl-quartz: fix for fdo#77993 (specific to OS X <10.6)
  in https://gerrit.libreoffice.org/9180 from Douglas Mencken


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

+ fdo#72661: Check ‘Hyphenation active’ automatically
  in https://gerrit.libreoffice.org/7291 from Jiwoong Youn
+ remove dead code
  in https://gerrit.libreoffice.org/9339 from Noel Grandin
+ remove dead code in SW
  in https://gerrit.libreoffice.org/9341 from Noel Grandin
+ remove dead code SwAccessibleField
  in https://gerrit.libreoffice.org/9340 from Noel Grandin


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

+ cppunittest_filter_xslt: fix fdo#77893
  in https://gerrit.libreoffice.org/9177 from Douglas Mencken
+ DrawWaveLine/ImplDrawWaveLine fixes:   - try to avoid huge looping due to
  in https://gerrit.libreoffice.org/9174 from Douglas Mencken
+ FDO#74886: Data labels are not preserved for Column Chart in RT file
  in https://gerrit.libreoffice.org/8098 from Umesh Kadam
+ new method INetURLObject::getData() for data urls
  in https://gerrit.libreoffice.org/8737 from Christina Roßmanith
+ fdo#75757 Remove inheritance to std::map from PropertyMap
  in https://gerrit.libreoffice.org/8656 from Krisztian Pinter
+ Remove visual noise from ios
  in https://gerrit.libreoffice.org/8274 from Alexander Wilms
+ FDO#75205 : Charts - Up Down bars are getting added to Line Chart.
  in https://gerrit.libreoffice.org/8360 from Umesh Kadam
+ WIP: Converting ExtensionUpdate dialog for new format
  in https://gerrit.libreoffice.org/8506 from Rodolfo Ribeiro Gomes
+ fdo#71984 fix first line indentation in footnotes for MS Word documents
  in https://gerrit.libreoffice.org/8160 from Andras Timar
+ fdo#51525 Fix duplicate "Paste Special" entries in Calc.
  in https://gerrit.libreoffice.org/7784 from Andrzej Hunt
+ WIP fdo#72987 Use firebird backup format for .odb
  in https://gerrit.libreoffice.org/7299 from Andrzej Hunt
+ WIP: fdo#33980 Preserve selection across all slide sorters.
  in https://gerrit.libreoffice.org/6633 from Andrzej Hunt


Best,

Your friendly LibreOffice Gerrit Digest Mailer

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

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

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

tommy27  changed:

   What|Removed |Added

 Depends on|67534   |

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

[bugzilla-daemon]

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

tommy27  changed:

   What|Removed |Added

 Depends on||67534

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

[Kohei Yoshida]

 sc/qa/unit/ucalc.cxx |  106 +++
 sc/qa/unit/ucalc.hxx |2 
 sc/source/core/data/conditio.cxx |   37 +
 3 files changed, 145 insertions(+)

New commits:
commit 146f6e7e68ea56f79b72047b97bd9fba66db499d
Author: Kohei Yoshida 
Date:   Tue May 13 22:46:17 2014 -0400

fdo#76710: Adjust sheet position of conditional format entries.

When inserting or deleting sheets.

Change-Id: Ibf898350e22f092ec38b75ad98957832a5580e6a

diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 49f2fea..80a2b53 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -2002,12 +2002,49 @@ void ScConditionalFormat::InsertCol(SCTAB nTab, SCROW 
nRowStart, SCROW nRowEnd,
 
 void ScConditionalFormat::UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt 
)
 {
+for (size_t i = 0, n = maRanges.size(); i < n; ++i)
+{
+// We assume that the start and end sheet indices are equal.
+ScRange* pRange = maRanges[i];
+SCTAB nTab = pRange->aStart.Tab();
+
+if (nTab < rCxt.mnInsertPos)
+// Unaffected.
+continue;
+
+pRange->aStart.IncTab(rCxt.mnSheets);
+pRange->aEnd.IncTab(rCxt.mnSheets);
+}
+
 for (CondFormatContainer::iterator it = maEntries.begin(); it != 
maEntries.end(); ++it)
 it->UpdateInsertTab(rCxt);
 }
 
 void ScConditionalFormat::UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt 
)
 {
+for (size_t i = 0, n = maRanges.size(); i < n; ++i)
+{
+// We assume that the start and end sheet indices are equal.
+ScRange* pRange = maRanges[i];
+SCTAB nTab = pRange->aStart.Tab();
+
+if (nTab < rCxt.mnDeletePos)
+// Left of the deleted sheet(s).  Unaffected.
+continue;
+
+if (nTab <= rCxt.mnDeletePos+rCxt.mnSheets-1)
+{
+// On the deleted sheet(s).
+pRange->aStart.SetTab(-1);
+pRange->aEnd.SetTab(-1);
+continue;
+}
+
+// Right of the deleted sheet(s).  Adjust the sheet indices.
+pRange->aStart.IncTab(-1*rCxt.mnSheets);
+pRange->aEnd.IncTab(-1*rCxt.mnSheets);
+}
+
 for (CondFormatContainer::iterator it = maEntries.begin(); it != 
maEntries.end(); ++it)
 it->UpdateDeleteTab(rCxt);
 }
commit dff4725f0dbb3bd7c32155e51ba49c05ee104d4f
Author: Kohei Yoshida 
Date:   Tue May 13 22:42:44 2014 -0400

fdo#76710: Write test for this.

Change-Id: Ia0338d2839f0f319881948c208a74bee950da4af

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 2a2f706..14a323b 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -5882,6 +5882,112 @@ void Test::testCondFormatInsertRow()
 m_pDoc->DeleteTab(0);
 }
 
+void Test::testCondFormatInsertDeleteSheets()
+{
+m_pDoc->InsertTab(0, "Test");
+
+// Add a conditional format to B2:B4.
+ScConditionalFormat* pFormat = new ScConditionalFormat(1, m_pDoc);
+pFormat->AddRange(ScRange(1,1,0,1,3,0));
+
+sal_uLong nKey = m_pDoc->AddCondFormat(pFormat, 0);
+
+// Add condition in which if the value equals 2, set the "Result" style.
+ScCondFormatEntry* pEntry = new ScCondFormatEntry(
+SC_COND_EQUAL, "=2", "" , m_pDoc, ScAddress(0,0,0), 
ScGlobal::GetRscString(STR_STYLENAME_RESULT));
+pFormat->AddEntry(pEntry);
+
+// Apply the format to the range.
+m_pDoc->AddCondFormatData(pFormat->GetRange(), 0, nKey);
+
+// Make sure this conditional format entry is really there.
+ScConditionalFormatList* pList = m_pDoc->GetCondFormList(0);
+CPPUNIT_ASSERT(pList);
+const ScConditionalFormat* pCheck = pList->GetFormat(nKey);
+CPPUNIT_ASSERT_MESSAGE("Wrong condntional format instance.", pCheck == 
pFormat);
+
+// ... and its range is B2:B4.
+ScRangeList aCheckRange = pCheck->GetRange();
+CPPUNIT_ASSERT_MESSAGE("This should be a single range.", 
aCheckRange.size() == 1);
+const ScRange* pRange = aCheckRange[0];
+CPPUNIT_ASSERT(pRange);
+CPPUNIT_ASSERT_MESSAGE("Format should be applied to B2:B4.", *pRange == 
ScRange(1,1,0,1,3,0));
+
+ScDocFunc& rFunc = getDocShell().GetDocFunc();
+
+// Insert a new sheet at the left.
+bool bInserted = rFunc.InsertTable(0, "Inserted", true, true);
+CPPUNIT_ASSERT(bInserted);
+
+pList = m_pDoc->GetCondFormList(1);
+CPPUNIT_ASSERT(pList);
+pCheck = pList->GetFormat(nKey);
+CPPUNIT_ASSERT(pCheck);
+
+// Make sure the range also got shifted.
+aCheckRange = pCheck->GetRange();
+CPPUNIT_ASSERT_MESSAGE("This should be a single range.", 
aCheckRange.size() == 1);
+pRange = aCheckRange[0];
+CPPUNIT_ASSERT(pRange);
+CPPUNIT_ASSERT_MESSAGE("Format should be applied to B2:B4 on the 2nd sheet 
after the sheet insertion.", *pRange == ScRange(1,1,1,1,3,1));
+
+// Delete the sheet to the left.
+bool bDeleted = rFunc.DeleteTable(0, true,

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

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

Bug 60270 depends on bug 63840, which changed state.

Bug 63840 Summary: No text appears in Unity menus on Ubuntu 12.04 LTS
https://bugs.freedesktop.org/show_bug.cgi?id=63840

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |FIXED

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

Harichandan Pulagam license statement

[Harichandan]

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

Git email : pharic...@gmail.com

Affiliation : Individual

Wiki Nick : pharic

Thanks,

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

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

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

Bug 60270 depends on bug 63840, which changed state.

Bug 63840 Summary: No text appears in Unity menus on Ubuntu 12.04 LTS
https://bugs.freedesktop.org/show_bug.cgi?id=63840

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |---

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

Re: Save as formats explored

[Laurent BP]

Thanks Kohei, for your fast push :)



-
LibreOffice 4.2.4.2
--
View this message in context: 
http://nabble.documentfoundation.org/Save-as-formats-explored-tp4081987p4108708.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

Re: Save as formats explored

[Kohei Yoshida]

On Tue, 2014-05-13 at 12:40 -0700, Laurent BP wrote:

> What do you think?

I think that's a reasonable thing to do.  Pushed to the 4.2 branch.

Thanks!

Kohei

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

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

[Laurent Balland-Poirier]

 filter/source/config/fragments/filters/StarOffice_XML__Math_.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d9c0280d4b785d07c220bfd029c2949227b8f398
Author: Laurent Balland-Poirier 
Date:   Sun May 11 23:07:27 2014 +0200

fdo#78159 Restore EXPORT to ODF 1.0 for Math

Partially revert commit aeeaccf59abbc485d7786486f1accc1cb4d4dbf7
It is a quick fix for 4-2 since AutoText "FN" (Formula Numbering) is broken

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

diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Math_.xcu 
b/filter/source/config/fragments/filters/StarOffice_XML__Math_.xcu
index 2f60ca6..cb094ea 100644
--- a/filter/source/config/fragments/filters/StarOffice_XML__Math_.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_XML__Math_.xcu
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 
-IMPORT TEMPLATE OWN ALIEN 
ENCRYPTION
+IMPORT EXPORT TEMPLATE OWN ALIEN 
ENCRYPTION
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Save as formats explored

[Laurent BP]

Hello,


Bryan Quigley-2 wrote
> 1.  Remove all of the "OpenOffice.org 1.0" file formats.

It has been implemented by commit aeeaccf59abbc485d7786486f1accc1cb4d4dbf7
http://cgit.freedesktop.org/libreoffice/core/commit/?id=aeeaccf59abbc485d7786486f1accc1cb4d4dbf7

However, one drawback is that in Writer, autotext "Formula Numbering" is
broken since LibO 4.2.4, see fdo#78159
https://bugs.freedesktop.org/show_bug.cgi?id=78159

A solution would be to rewrite autotext FN in all localization to use more
recent ODF format. But it takes time, and I proposed a quick solution for
LibO 4.2, is to revert EXPORT for Math ODF 1.0 only, as in commit 93139
https://gerrit.libreoffice.org/#/c/9319/

What do you think?



-
LibreOffice 4.2.4.2
--
View this message in context: 
http://nabble.documentfoundation.org/Save-as-formats-explored-tp4081987p4108706.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 - include/vcl sd/source vcl/source

[Caolán McNamara]

 include/vcl/window.hxx   |4 
 sd/source/ui/accessibility/accessibility.src |2 
 vcl/source/window/window.cxx |  297 ---
 3 files changed, 182 insertions(+), 121 deletions(-)

New commits:
commit e1f0d790832098a7f8b323ab04809b6b55ade3d9
Author: Caolán McNamara 
Date:   Tue May 13 14:03:51 2014 +0100

Sub Title -> Subtitle

Change-Id: I1a0bcf7548699845752ac3cf49232655c2fb4fc0

diff --git a/sd/source/ui/accessibility/accessibility.src 
b/sd/source/ui/accessibility/accessibility.src
index 0d22039..6d2572f 100644
--- a/sd/source/ui/accessibility/accessibility.src
+++ b/sd/source/ui/accessibility/accessibility.src
@@ -210,7 +210,7 @@ String  SID_SD_A11Y_P_OUTLINER_N_STYLE
 
 String  SID_SD_A11Y_P_SUBTITLE_N_STYLE
 {
-Text [ en-US ] = "Sub Title";
+Text [ en-US ] = "Subtitle";
 };
 
 String  SID_SD_A11Y_P_PAGE_N_STYLE
commit c1c152f0e47407b2b327839e8b31601ea7423ddf
Author: Caolán McNamara 
Date:   Mon May 12 21:41:35 2014 +0100

coverity#1213522 Uncaught exception

and a gadzillion more

refactor to avoid slicing catch and rethrow

Change-Id: I5c05d1c151b81ff481eff8cd7544db9838143c71

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 2fd43a1..b24e933 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -316,6 +316,7 @@ const char* ImplDbgCheckWindow( const void* pObj );
 
 class Dialog;
 class WindowImpl;
+class PaintHelper;
 class VclBuilder;
 class VclSizeGroup;
 
@@ -343,6 +344,7 @@ class VCL_DLLPUBLIC Window : public OutputDevice, public 
Resource
 friend class SystemChildWindow;
 friend class ImplBorderWindow;
 friend class VclBuilder;
+friend class PaintHelper;
 
 // TODO: improve missing functionality
 // only required because of SetFloatingMode()
@@ -480,6 +482,8 @@ protected:
 SAL_DLLPRIVATE WindowResHeader  ImplLoadResHeader( const ResId& rResId 
);
 SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
 
+SAL_DLLPRIVATE void PushPaintHelper(PaintHelper *pHelper);
+SAL_DLLPRIVATE void PopPaintHelper(PaintHelper *pHelper);
 private:
 
 SAL_DLLPRIVATE void ImplInitWindowData( WindowType nType );
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index d958287..2291b7f 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1914,162 +1914,219 @@ void Window::ImplCalcOverlapRegion( const Rectangle& 
rSourceRect, Region& rRegio
 }
 }
 
-void Window::ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags )
+class PaintHelper
 {
-Exception aException;
-bool bExceptionCaught(false);
-
-// call PrePaint. PrePaint may add to the invalidate region as well as
-// other parameters used below.
-PrePaint();
-
-mpWindowImpl->mbPaintFrame = false;
+private:
+Window* m_pWindow;
+Region* m_pChildRegion;
+Rectangle m_aSelectionRect;
+Rectangle m_aPaintRect;
+Region m_aPaintRegion;
+sal_uInt16 m_nPaintFlags;
+bool m_bPop;
+bool m_bRestoreCursor;
+public:
+PaintHelper(Window *pWindow, sal_uInt16 nPaintFlags);
+void SetPop()
+{
+m_bPop = true;
+}
+void SetPaintRect(const Rectangle& rRect)
+{
+m_aPaintRect = rRect;
+}
+void SetSelectionRect(const Rectangle& rRect)
+{
+m_aSelectionRect = rRect;
+}
+void SetRestoreCursor(bool bRestoreCursor)
+{
+m_bRestoreCursor = bRestoreCursor;
+}
+bool GetRestoreCursor() const
+{
+return m_bRestoreCursor;
+}
+sal_uInt16 GetPaintFlags() const
+{
+return m_nPaintFlags;
+}
+Region& GetPaintRegion()
+{
+return m_aPaintRegion;
+}
+void DoPaint(const Region* pRegion);
+~PaintHelper();
+};
 
-if ( nPaintFlags & IMPL_PAINT_PAINTALLCHILDREN )
-mpWindowImpl->mnPaintFlags |= IMPL_PAINT_PAINT | 
IMPL_PAINT_PAINTALLCHILDREN | (nPaintFlags & IMPL_PAINT_PAINTALL);
-if ( nPaintFlags & IMPL_PAINT_PAINTCHILDREN )
-mpWindowImpl->mnPaintFlags |= IMPL_PAINT_PAINTCHILDREN;
-if ( nPaintFlags & IMPL_PAINT_ERASE )
-mpWindowImpl->mnPaintFlags |= IMPL_PAINT_ERASE;
-if ( nPaintFlags & IMPL_PAINT_CHECKRTL )
-mpWindowImpl->mnPaintFlags |= IMPL_PAINT_CHECKRTL;
-if ( !mpWindowImpl->mpFirstChild )
-mpWindowImpl->mnPaintFlags &= ~IMPL_PAINT_PAINTALLCHILDREN;
+PaintHelper::PaintHelper(Window *pWindow, sal_uInt16 nPaintFlags)
+: m_pWindow(pWindow)
+, m_pChildRegion(NULL)
+, m_nPaintFlags(nPaintFlags)
+, m_bPop(false)
+, m_bRestoreCursor(false)
+{
+}
 
-if ( mpWindowImpl->mbPaintDisabled )
+void PaintHelper::DoPaint(const Region* pRegion)
+{
+WindowImpl* pWindowImpl = m_pWindow->ImplGetWindowImpl();
+Region* pWinChildClipRegion = m_pWindow->ImplGetWinChildClipRegion();
+if ( pWindowImpl->mnPaintFlags & IMPL_PAINT_P

[SOLVED] Re: About removing macros

[julien2412]

About "DECL_PROP1IMPL", "DECL_PROP0" and others, patches pushed on master
(eg:
http://cgit.freedesktop.org/libreoffice/core/commit/?id=aa214079b4e9df493b57fbf815460b7164225f2b
http://cgit.freedesktop.org/libreoffice/core/commit/?id=0fadbdbbdbd55cf60f9a202f1cf7b1d60517078c)

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/About-removing-macros-tp4106620p4108694.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: sc/source

[Thomas Arnhold]

 sc/source/filter/rtf/rtfexp.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 894bddec06d811d9cecabdca7133a3b02a184b65
Author: Thomas Arnhold 
Date:   Sat May 10 15:00:54 2014 +0200

coverity#735464 Logically dead code

Dead since initial import.

Change-Id: Ia9193aa2b90e9ea0e6960605d21a3c34468fc0f7
Reviewed-on: https://gerrit.libreoffice.org/9301
Tested-by: Thomas Arnhold 
Reviewed-by: Thomas Arnhold 

diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx
index bbbda81..356004a 100644
--- a/sc/source/filter/rtf/rtfexp.cxx
+++ b/sc/source/filter/rtf/rtfexp.cxx
@@ -199,8 +199,7 @@ void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL 
nCol )
 }
 }
 
-bool bResetPar, bResetAttr;
-bResetPar = bResetAttr = false;
+bool bResetAttr(false);
 
 const SvxHorJustifyItem&rHorJustifyItem = (const 
SvxHorJustifyItem&)pAttr->GetItem( ATTR_HOR_JUSTIFY );
 const SvxWeightItem&rWeightItem = (const SvxWeightItem&)
pAttr->GetItem( ATTR_FONT_WEIGHT );
@@ -243,8 +242,6 @@ void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL 
nCol )
 RTFOutFuncs::Out_String( rStrm, aContent );
 rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CELL );
 
-if ( bResetPar )
-rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PARD ).WriteCharPtr( 
OOO_STRING_SVTOOLS_RTF_INTBL );
 if ( bResetAttr )
 rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PLAIN );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/qa/unit/data/xls/shared-formula/biff5.xls |binary
 sc/qa/unit/subsequent_filters-test.cxx   |   18 ++
 sc/source/filter/excel/read.cxx  |2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 286760359bae7e21a772dd104ab17a1df69a57b0
Author: Kohei Yoshida 
Date:   Tue May 13 14:02:45 2014 -0400

fdo#78471: Don't forget to record the ID of the last record for BIFF5.

Shared formula import code depends on this.

Change-Id: Iecb009252c56673df33e0d681de825911154903a

diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index 05d2fca..5c6e6f2 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -90,7 +90,7 @@ FltError ImportExcel::Read( void )
 sal_Size nProgressBasePos = 0;
 sal_Size nProgressBaseSize = 0;
 
-while( eAkt != Z_Ende )
+for (; eAkt != Z_Ende; mnLastRecId = nOpcode)
 {
 if( eAkt == Z_Biff5E )
 {
commit 14e21865443a7318c715c2f9ff655d5b21f716ea
Author: Kohei Yoshida 
Date:   Tue May 13 14:01:53 2014 -0400

fdo#78471: Write test for import of shared formulas from BIFF5.

Change-Id: I77fee109adf1c0decc6eb96cf2292f89fde1aceb

diff --git a/sc/qa/unit/data/xls/shared-formula/biff5.xls 
b/sc/qa/unit/data/xls/shared-formula/biff5.xls
new file mode 100644
index 000..ce72eb1
Binary files /dev/null and b/sc/qa/unit/data/xls/shared-formula/biff5.xls differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index ef0428d..2e5a8f6 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -170,6 +170,7 @@ public:
 
 void testSharedFormulaHorizontalXLS();
 void testSharedFormulaWrappedRefsXLS();
+void testSharedFormulaBIFF5();
 void testExternalRefCacheXLSX();
 void testExternalRefCacheODS();
 void testHybridSharedStringODS();
@@ -247,6 +248,7 @@ public:
 CPPUNIT_TEST(testColumnStyleXLSX);
 CPPUNIT_TEST(testSharedFormulaHorizontalXLS);
 CPPUNIT_TEST(testSharedFormulaWrappedRefsXLS);
+CPPUNIT_TEST(testSharedFormulaBIFF5);
 CPPUNIT_TEST(testExternalRefCacheXLSX);
 CPPUNIT_TEST(testExternalRefCacheODS);
 CPPUNIT_TEST(testHybridSharedStringODS);
@@ -2522,6 +2524,22 @@ void ScFiltersTest::testSharedFormulaWrappedRefsXLS()
 xDocSh->DoClose();
 }
 
+void ScFiltersTest::testSharedFormulaBIFF5()
+{
+ScDocShellRef xDocSh = loadDoc("shared-formula/biff5.", XLS);
+CPPUNIT_ASSERT(xDocSh.Is());
+ScDocument* pDoc = xDocSh->GetDocument();
+pDoc->CalcAll();
+
+// E6:E376 should be all formulas, and they should belong to the same 
group.
+const ScFormulaCell* pFC = pDoc->GetFormulaCell(ScAddress(4,5,0));
+CPPUNIT_ASSERT(pFC);
+CPPUNIT_ASSERT_EQUAL(static_cast(5), pFC->GetSharedTopRow());
+CPPUNIT_ASSERT_EQUAL(static_cast(371), pFC->GetSharedLength());
+
+xDocSh->DoClose();
+}
+
 void ScFiltersTest::testExternalRefCacheXLSX()
 {
 ScDocShellRef xDocSh = loadDoc("external-refs.", XLSX);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sw/inc ucb/source vcl/unx

[Matúš Kukan]

 sw/inc/crsrsh.hxx  |2 +-
 ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx |   10 --
 vcl/unx/generic/app/saldisp.cxx|2 ++
 3 files changed, 3 insertions(+), 11 deletions(-)

New commits:
commit 054738256c37b007a371249cbbe868ee30d6726d
Author: Matúš Kukan 
Date:   Tue May 13 18:50:00 2014 +0200

loplugin:unreffun

Change-Id: Ifd544db272652e1e9c45093291ab7f8ae3dd53a0

diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx 
b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
index 20d8c8a..a4b5dd5 100644
--- a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
+++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
@@ -26,16 +26,6 @@ using namespace http_dav_ucp;
 using namespace ::com::sun::star;
 
 
-
-struct UCBDeadPropertyValueParseContext
-{
-OUString * pType;
-OUString * pValue;
-
-UCBDeadPropertyValueParseContext() : pType( 0 ), pValue( 0 ) {}
-~UCBDeadPropertyValueParseContext() { delete pType; delete pValue; }
-};
-
 // static
 const OUString UCBDeadPropertyValue::aTypeString
 = OUString( "string" );
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index a5cef39..73c7b1f 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -84,6 +84,7 @@ using namespace vcl_sal;
 #define SALCOLOR_WHITE  MAKE_SALCOLOR( 0xFF, 0xFF, 0xFF )
 #define SALCOLOR_BLACK  MAKE_SALCOLOR( 0x00, 0x00, 0x00 )
 
+#ifdef DBG_UTIL
 inline const char *Null( const char *p ) { return p ? p : ""; }
 inline const char *GetEnv( const char *p ) { return Null( getenv( p ) ); }
 inline const char *KeyStr( KeySym n ) { return Null( XKeysymToString( n ) ); }
@@ -93,6 +94,7 @@ inline const char *GetAtomName( Display *d, Atom a )
 
 inline double Hypothenuse( long w, long h )
 { return sqrt( (double)((w*w)+(h*h)) ); }
+#endif
 
 inline int ColorDiff( int r, int g, int b )
 { return (r*r)+(g*g)+(b*b); }
commit 95bb3305ca1ebfdd99a201d1d3234c820268af19
Author: Matúš Kukan 
Date:   Tue May 13 19:48:37 2014 +0200

loplugin:literaltoboolconversion

Change-Id: I7457e47866bd327cfc32a0b2d43ebd04c3c68dbc

diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index bf062bf..b94b412 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -452,7 +452,7 @@ public:
 void EndCrsrMove( const bool bIdleEnd = false );
 #else
 void SttCrsrMove() { ++m_nCrsrMove; StartAction(); }
-void EndCrsrMove( const bool bIdleEnd = sal_False )
+void EndCrsrMove( const bool bIdleEnd = false )
 { EndAction( bIdleEnd ); --m_nCrsrMove; }
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - desktop/source include/unotools sw/source unotools/source

[Stephan Bergmann]

 desktop/source/deployment/registry/dp_backend.cxx |2 
 include/unotools/tempfile.hxx |   13 -
 sw/source/ui/dbui/mmoutputpage.cxx|2 
 unotools/source/ucbhelper/tempfile.cxx|  201 +++---
 4 files changed, 73 insertions(+), 145 deletions(-)

New commits:
commit fcf455d4efde077bb2b092b607de12ebfc350275
Author: Stephan Bergmann 
Date:   Tue May 13 19:04:50 2014 +0200

Consolidate CreateTempName_Impl and lcl_createName

Change-Id: I4dbb917a6d9343f797859a2f24fa1d92b26a51eb

diff --git a/unotools/source/ucbhelper/tempfile.cxx 
b/unotools/source/ucbhelper/tempfile.cxx
index 098c422..54799fd 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -159,92 +159,23 @@ OUString ConstructTempDir_Impl( const OUString* pParent )
 return aName;
 }
 
-void CreateTempName_Impl( OUString& rName, bool bKeep, bool bDir = true )
+OUString lcl_createName(
+const OUString& rLeadingChars, unsigned long nSeed, bool bFirst,
+const OUString* pExtension, const OUString* pParent, bool bDirectory,
+bool bKeep)
 {
-// add a suitable tempname
 // 36 ** 6 == 2176782336
 unsigned const nRadix = 36;
 unsigned long const nMax = (nRadix*nRadix*nRadix*nRadix*nRadix*nRadix);
-OUString aName;
-OUString aEyeCatcher = "lu";
-#ifdef DBG_UTIL
-#ifdef UNX
-const char* eye = getenv("LO_TESTNAME");
-if(eye)
-{
-aEyeCatcher = OUString(eye, strlen(eye), RTL_TEXTENCODING_ASCII_US);
-}
-#endif
-#endif
-aName = rName + aEyeCatcher;
-rName = "";
-static unsigned long u = Time::GetSystemTicks() % nMax;
-for ( unsigned long nSeed = u; ++u != nSeed; )
-{
-u %= nMax;
-OUString aTmp( aName );
-aTmp += OUString::number(u, nRadix);
-aTmp += ".tmp";
-
-if ( bDir )
-{
-FileBase::RC err = Directory::create( aTmp );
-if ( err == FileBase::E_None )
-{
-// !bKeep: only for creating a name, not a file or directory
-if ( bKeep || Directory::remove( aTmp ) == FileBase::E_None )
-rName = aTmp;
-break;
-}
-else if ( err != FileBase::E_EXIST )
-{
-// if f.e. name contains invalid chars stop trying to create 
dirs
-break;
-}
-}
-else
-{
-DBG_ASSERT( bKeep, "Too expensive, use directory for creating 
name!" );
-File aFile( aTmp );
-#ifdef UNX /* RW permission for the user only! */
-mode_t old_mode = umask(077);
-#endif
-FileBase::RC err = aFile.open( osl_File_OpenFlag_Create | 
osl_File_OpenFlag_NoLock );
-#ifdef UNX
-umask(old_mode);
-#endif
-if (  err == FileBase::E_None )
-{
-rName = aTmp;
-aFile.close();
-break;
-}
-else if ( err != FileBase::E_EXIST )
-{
- // if f.e. name contains invalid chars stop trying to create 
files
- // but if there is a folder with such name proceed further
-
- DirectoryItem aTmpItem;
- FileStatus aTmpStatus( osl_FileStatus_Mask_Type );
- if ( DirectoryItem::get( aTmp, aTmpItem ) != FileBase::E_None
-   || aTmpItem.getFileStatus( aTmpStatus ) != FileBase::E_None
-   || aTmpStatus.getFileType() != FileStatus::Directory )
- break;
-}
-}
-}
-}
+nSeed %= nMax;
 
-OUString lcl_createName(const OUString& rLeadingChars, bool _bStartWithZero,
-const OUString* pExtension, const OUString* pParent, bool 
bDirectory)
-{
 // get correct directory
 OUString aName = ConstructTempDir_Impl( pParent );
 
-bool bUseNumber = _bStartWithZero;
+bool bUseNumber = bFirst;
 // now use special naming scheme ( name takes leading chars and an index 
counting up from zero
 aName += rLeadingChars;
-for ( sal_Int32 i=0;; i++ )
+for ( unsigned long i=nSeed;; )
 {
 OUString aTmp( aName );
 if ( bUseNumber )
@@ -259,7 +190,11 @@ OUString lcl_createName(const OUString& rLeadingChars, 
bool _bStartWithZero,
 FileBase::RC err = Directory::create( aTmp );
 if ( err == FileBase::E_None )
 {
-return aTmp;
+// !bKeep: only for creating a name, not a file or directory
+if ( bKeep || Directory::remove( aTmp ) == FileBase::E_None )
+return aTmp;
+else
+return OUString();
 }
 else if ( err != FileBase::E_EXIST )
 // if f.e. name contains invalid chars stop trying to create 
dirs
@@ -267,6 +202,7 @@ OUString lcl_createName(const OUString& rLeadingChars, bool 
_bStart

[Bug 38835] strip out non-trivial globals before main

[bugzilla-daemon]

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

--- Comment #13 from Stephan Bergmann  ---
(In reply to comment #12)
> Do I need to worry about synchronization between multiple threads when I try
> to create the singleton at the same time?

Yes, see comment 9.

> I don't think I need to do the same for arrays right?

The destinction wouldn't be so much between array vs. scalar, but whether or
not it requires initialization at runtime.

-- 
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 38835] strip out non-trivial globals before main

[bugzilla-daemon]

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

--- Comment #12 from Lynn  ---
Do I need to worry about synchronization between multiple threads when I try to
create the singleton at the same time?

I don't think I need to do the same for arrays right?

-- 
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/inc sc/qa sc/source

[Kohei Yoshida]

 sc/inc/document.hxx  |4 -
 sc/qa/unit/ucalc.cxx |7 ++
 sc/qa/unit/ucalc.hxx |4 +
 sc/qa/unit/ucalc_formula.cxx |  127 +++
 sc/source/core/data/conditio.cxx |   29 
 sc/source/core/data/document.cxx |9 ++
 sc/source/core/tool/interpr4.cxx |8 +-
 sc/source/ui/undo/undoblk.cxx|   15 
 8 files changed, 196 insertions(+), 7 deletions(-)

New commits:
commit a93bb27aa46c84410c8848a6118d5d63d47be92c
Author: Kohei Yoshida 
Date:   Tue May 13 12:35:24 2014 -0400

fdo#78402: Adjust references of validity entries as appropriate.

Change-Id: I7fd62153c7267a3d606b86d74bebecf6b8d75250

diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 43dc94e..49f2fea 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -513,13 +513,38 @@ void ScConditionEntry::UpdateReference( 
sc::RefUpdateContext& rCxt )
 
 if (pFormula1)
 {
-sc::RefUpdateResult aRes = pFormula1->AdjustReferenceInName(rCxt, 
aOldSrcPos);
+sc::RefUpdateResult aRes;
+switch (rCxt.meMode)
+{
+case URM_INSDEL:
+aRes = pFormula1->AdjustReferenceOnShift(rCxt, aOldSrcPos);
+break;
+case URM_MOVE:
+aRes = pFormula1->AdjustReferenceOnMove(rCxt, aOldSrcPos, 
aSrcPos);
+break;
+default:
+;
+}
+
 if (aRes.mbReferenceModified || bChangedPos)
 DELETEZ(pFCell1);   // is created again in IsValid
 }
+
 if (pFormula2)
 {
-sc::RefUpdateResult aRes = pFormula2->AdjustReferenceInName(rCxt, 
aOldSrcPos);
+sc::RefUpdateResult aRes;
+switch (rCxt.meMode)
+{
+case URM_INSDEL:
+aRes = pFormula2->AdjustReferenceOnShift(rCxt, aOldSrcPos);
+break;
+case URM_MOVE:
+aRes = pFormula2->AdjustReferenceOnMove(rCxt, aOldSrcPos, 
aSrcPos);
+break;
+default:
+;
+}
+
 if (aRes.mbReferenceModified || bChangedPos)
 DELETEZ(pFCell2);   // is created again in IsValid
 }
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index e414337..e4fb73f 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1867,6 +1867,8 @@ void ScInterpreter::QueryMatrixType(ScMatrixRef& xMat, 
short& rRetTypeExpr, sal_
 {
 if (xMat)
 {
+SCSIZE nCols, nRows;
+xMat->GetDimensions(nCols, nRows);
 ScMatrixValue nMatVal = xMat->Get(0, 0);
 ScMatValType nMatValType = nMatVal.nType;
 if (ScMatrix::IsNonValueType( nMatValType))
@@ -1874,14 +1876,14 @@ void ScInterpreter::QueryMatrixType(ScMatrixRef& xMat, 
short& rRetTypeExpr, sal_
 if ( xMat->IsEmptyPath( 0, 0))
 {   // result of empty FALSE jump path
 FormulaTokenRef xRes = new FormulaDoubleToken( 0.0);
-PushTempToken( new ScMatrixCellResultToken( xMat, xRes.get()));
+PushTempToken( new ScMatrixFormulaCellToken(nCols, nRows, 
xMat, xRes.get()));
 rRetTypeExpr = NUMBERFORMAT_LOGICAL;
 }
 else
 {
 svl::SharedString aStr( nMatVal.GetString());
 FormulaTokenRef xRes = new FormulaStringToken( aStr);
-PushTempToken( new ScMatrixCellResultToken( xMat, xRes.get()));
+PushTempToken( new ScMatrixFormulaCellToken(nCols, nRows, 
xMat, xRes.get()));
 rRetTypeExpr = NUMBERFORMAT_TEXT;
 }
 }
@@ -1893,7 +1895,7 @@ void ScInterpreter::QueryMatrixType(ScMatrixRef& xMat, 
short& rRetTypeExpr, sal_
 xRes = new FormulaErrorToken( nErr);
 else
 xRes = new FormulaDoubleToken( nMatVal.fVal);
-PushTempToken( new ScMatrixCellResultToken( xMat, xRes.get()));
+PushTempToken( new ScMatrixFormulaCellToken(nCols, nRows, xMat, 
xRes.get()));
 if ( rRetTypeExpr != NUMBERFORMAT_LOGICAL )
 rRetTypeExpr = NUMBERFORMAT_NUMBER;
 }
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index fefa95f..dd0577e 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -49,6 +49,8 @@
 #include "sc.hrc"
 #include 
 #include 
+#include 
+#include 
 
 #include 
 #include 
@@ -1264,6 +1266,19 @@ void ScUndoDragDrop::Undo()
 SCTAB nTabDelta = aSrcRange.aStart.Tab() - aDestRange.aStart.Tab();
 sc::RefMovedHint aHint(aDestRange, ScAddress(nColDelta, nRowDelta, 
nTabDelta));
 pDoc->BroadcastRefMoved(aHint);
+
+ScValidationDataList* pValidList = pDoc->GetValidationList();
+if (pValidList)
+{
+// Update the references of validation entries.
+

[Libreoffice-commits] core.git: download.lst external/libpng

[Thomas Arnhold]

 download.lst |3 
 external/libpng/configs/pnglibconf.h |  267 ++-
 2 files changed, 140 insertions(+), 130 deletions(-)

New commits:
commit 47104bef17521bbdd663d97e6e0b3658b3ed784d
Author: Thomas Arnhold 
Date:   Tue May 13 14:25:11 2014 +0200

upgrade to libpng-1.5.18

Change-Id: I500645d655fc7e7c850b09e47bece26e74197eb7
Reviewed-on: https://gerrit.libreoffice.org/9344
Tested-by: LibreOffice gerrit bot 
Reviewed-by: Thomas Arnhold 

diff --git a/download.lst b/download.lst
index 9e9be30..69aa304 100644
--- a/download.lst
+++ b/download.lst
@@ -106,7 +106,8 @@ export OPENLDAP_TARBALL := 
804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
 export OPENSSL_TARBALL := 
de62b43dfcd858e66a74bee1c834e959-openssl-1.0.1g.tar.gz
 export ORCUS_TARBALL := 7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
-export PNG_TARBALL := 9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz
+export PNG_MD5SUM := 5266905cef49d1224437465ad4d67fd9
+export PNG_TARBALL := libpng-1.5.18.tar.gz
 export POPPLER_TARBALL := 
1cd27460f7e3379d1eb109cfd7bcdb39-poppler-0.22.5.tar.gz
 export POSTGRESQL_TARBALL := 
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
 export PYTHON_TARBALL := f3ebe34d4d8695bf889279b54673e10c-Python-3.3.3.tar.bz2
diff --git a/external/libpng/configs/pnglibconf.h 
b/external/libpng/configs/pnglibconf.h
index 650098e..9e97d1e 100644
--- a/external/libpng/configs/pnglibconf.h
+++ b/external/libpng/configs/pnglibconf.h
@@ -1,10 +1,9 @@
-/* libpng STANDARD API DEFINITION */
-
+/* 1.5.18 STANDARD API DEFINITION */
 /* pnglibconf.h - library build configuration */
 
-/* libpng version 1.5.0 - last changed on January 6, 2011 */
+/* libpng version 1.5.18 - February 6, 2014 */
 
-/* Copyright (c) 1998-2011 Glenn Randers-Pehrson */
+/* Copyright (c) 1998-2013 Glenn Randers-Pehrson */
 
 /* This code is released under the libpng license. */
 /* For conditions of distribution and use, see the disclaimer */
@@ -15,164 +14,174 @@
 /* Derived from: scripts/pnglibconf.dfa */
 #ifndef PNGLCONF_H
 #define PNGLCONF_H
-/* settings */
-#define PNG_MAX_GAMMA_8 11
-#define PNG_CALLOC_SUPPORTED
-#define PNG_QUANTIZE_RED_BITS 5
-#define PNG_USER_WIDTH_MAX 100L
-#define PNG_QUANTIZE_GREEN_BITS 5
-#define PNG_API_RULE 0
-#define PNG_QUANTIZE_BLUE_BITS 5
-#define PNG_USER_CHUNK_CACHE_MAX 0
-#define PNG_USER_HEIGHT_MAX 100L
-#define PNG_sCAL_PRECISION 5
-#define PNG_COST_SHIFT 3
-#define PNG_WEIGHT_SHIFT 8
-#define PNG_USER_CHUNK_MALLOC_MAX 0
-#define PNG_DEFAULT_READ_MACROS 1
-#define PNG_ZBUF_SIZE 8192
-#define PNG_GAMMA_THRESHOLD_FIXED 5000
-/* end of settings */
 /* options */
-#define PNG_INFO_IMAGE_SUPPORTED
-#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-#define PNG_POINTER_INDEXING_SUPPORTED
-#define PNG_WARNINGS_SUPPORTED
-#define PNG_FLOATING_ARITHMETIC_SUPPORTED
-#define PNG_WRITE_SUPPORTED
-#define PNG_WRITE_INTERLACING_SUPPORTED
-#define PNG_WRITE_16BIT_SUPPORTED
+#define PNG_16BIT_SUPPORTED
+#define PNG_ALIGNED_MEMORY_SUPPORTED
+/*#undef PNG_ARM_NEON_API_SUPPORTED*/
+/*#undef PNG_ARM_NEON_CHECK_SUPPORTED*/
+#define PNG_BENIGN_ERRORS_SUPPORTED
+#define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
+#define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
+#define PNG_CHECK_cHRM_SUPPORTED
+#define PNG_CONSOLE_IO_SUPPORTED
+#define PNG_CONVERT_tIME_SUPPORTED
 #define PNG_EASY_ACCESS_SUPPORTED
-#define PNG_ALIGN_MEMORY_SUPPORTED
-#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_USER_LIMITS_SUPPORTED
-#define PNG_FIXED_POINT_SUPPORTED
 /*#undef PNG_ERROR_NUMBERS_SUPPORTED*/
 #define PNG_ERROR_TEXT_SUPPORTED
-#define PNG_READ_SUPPORTED
-/*#undef PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED*/
-#define PNG_BENIGN_ERRORS_SUPPORTED
-#define PNG_SETJMP_SUPPORTED
-#define PNG_WRITE_FLUSH_SUPPORTED
-#define PNG_MNG_FEATURES_SUPPORTED
+#define PNG_FIXED_POINT_SUPPORTED
+#define PNG_FLOATING_ARITHMETIC_SUPPORTED
 #define PNG_FLOATING_POINT_SUPPORTED
+#define PNG_GET_PALETTE_MAX_SUPPORTED
+#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
 #define PNG_INCH_CONVERSIONS_SUPPORTED
-#define PNG_STDIO_SUPPORTED
-#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_USER_MEM_SUPPORTED
+#define PNG_INFO_IMAGE_SUPPORTED
 #define PNG_IO_STATE_SUPPORTED
-#define PNG_SET_USER_LIMITS_SUPPORTED
+#define PNG_MNG_FEATURES_SUPPORTED
+#define PNG_POINTER_INDEXING_SUPPORTED
+#define PNG_PROGRESSIVE_READ_SUPPORTED
+#define PNG_READ_16BIT_SUPPORTED
+#define PNG_READ_ALPHA_MODE_SUPPORTED
 #define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
-#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED
-#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
-#define PNG_WRITE_FILTER_SUPPORTED
-#define PNG_SET_CHUNK_CACHE_LIMIT_SUPPORTED
-#define PNG_WRITE_iCCP_SUPPORTED
-#define PNG_READ_TRANSFORMS_SUPPORTED
+#define PNG_READ_BACKGROUND_SUPPORTED
+#define PNG_READ_BGR_SUPPORTED
+#define PNG_READ_CHECK_F

[Libreoffice-commits] core.git: Changes to 'private/jmux/indexed-pagedescs'

[Jan-Marek Glogowski]

New branch 'private/jmux/indexed-pagedescs' available with the following 
commits:
commit 565b88041d7417160d2ae97a7b3906659cf790e7
Author: Jan-Marek Glogowski 
Date:   Mon May 12 18:55:58 2014 +0200

Fixup vector stuff (catchall)

Fixup some occations of broken vector => sorted_vector stuff.

There are still plenty of failures in the unit tests especially
with ooxml import and export.

Change-Id: Ia10a5672e882799ee0cb7f14382558f836bc1128

commit 4a0900813da02a58d262e0c5ba03fb639acddfca
Author: Jan-Marek Glogowski 
Date:   Tue May 13 17:39:54 2014 +0200

Convert SwPageDescs to a o3tl::sorted_vector

Originally I planned to use a boost::container::flat_map, but there
seem to be now way to directly access the indexed vector.

All unit tests still work without this patch! I'm still
missing some codepatchs, which assume all new PageDesc indizes are
craeted at the back.

Change-Id: Iaf8f69152c8f9c8f28afed919cad89e835912968

commit 9b5b3803ed9efe0aca0c4d7779c6ff7479385691
Author: Jan-Marek Glogowski 
Date:   Mon May 12 16:30:34 2014 +0200

Change MakePageDesc return type

Almost everybody except SwDoc::ClearDoc just use the index once
to get the SwPageDesc* pointer.

This is just a cleanup patch to prepare the conversion from a
stable vector index to a sorted vector, where indices change on
insert and removal.

Change-Id: I4b2491813530fd3efb2480e389912c410c221168

commit 1f7082aa5528801dd02132d75b6d9d5b3671cd18
Author: Jan-Marek Glogowski 
Date:   Mon May 12 16:00:02 2014 +0200

Implement SwPageDescs like o3tl::sorted_vector API

This moves the SwPageDescs class to pagedesc.hxx and extends
it from a vector class to a o3tl::sorted_vector compatible API.

This also drops multiple implementations for the "find SwPageDesc
by name algorithm".

This should just be a cleanup patch and is a preparation for the
change of SwPageDescs from vector to o3tl::sorted_vector.

Change-Id: I08561c139d1af9bad6ca68be27466fac33fab384

commit 02776dedcb3dda21de919ba28aea3cdbade94742
Author: Jan-Marek Glogowski 
Date:   Mon May 12 10:20:00 2014 +0200

Sorted vector special case: default first element

A lot of code using vectors in LO relies on the fact, that the
first entry in the vector contains the default values.

Therefore this adds a boolean to the constructor, which leaves
the first entry unsorted in the vector and special cases find
and insert.

All other functions are unaffected.

Change-Id: I9603f47be4fb56d991f42066ce9f5ad0ab6ffdf8

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

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Joel Madero  changed:

   What|Removed |Added

 Depends on|51168   |

-- 
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: Library_merged.mk

[Matúš Kukan]

 Library_merged.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 12ddc6d01bfae7cede15feac8e1fd60d59843a41
Author: Matúš Kukan 
Date:   Tue May 13 17:17:38 2014 +0200

add externals for libmerged too

Change-Id: I6801745e25d31e951ed9d0dcf1e2d93aa55905e4

diff --git a/Library_merged.mk b/Library_merged.mk
index ecc72ab..4cfff2b 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Library_use_externals,merged,\
boost_headers \
boostdatetime \
$(call gb_Helper_optional,DESKTOP,clucene) \
+   $(call gb_Helper_optional,COLLADA2GLTF,collada2gltf) \
cups \
curl \
dbus \
@@ -58,6 +59,8 @@ $(eval $(call gb_Library_use_externals,merged,\
mesa_headers \
mythes \
nss3 \
+   $(call gb_Helper_optional,COLLADA2GLTF,opencollada_parser) \
+   $(call gb_Helper_optional,COLLADA2GLTF,png) \
telepathy \
zlib \
 ))
___
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

[bugzilla-daemon]

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

Joel Madero  changed:

   What|Removed |Added

 Depends on|51168   |

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

[bugzilla-daemon]

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

Joel Madero  changed:

   What|Removed |Added

 Depends on||51168

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

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

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

Bug 60270 depends on bug 40788, which changed state.

Bug 40788 Summary: FORMATTING - Calc ignores manual breaks when "fit to number 
of pages" is chosen
https://bugs.freedesktop.org/show_bug.cgi?id=40788

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |FIXED

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

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

[David Tardon]

 external/libxmlsec/UnpackedTarball_xmlsec.mk   |1 
 external/libxmlsec/xmlsec1-update-config.guess.patch.1 | 1630 +
 2 files changed, 1631 insertions(+)

New commits:
commit 106d9b392bd59f52775eeb09e2a4e8b20828894b
Author: David Tardon 
Date:   Tue May 13 16:48:40 2014 +0200

update libxmlsec config.* to support ppc64le

Change-Id: I4b31729481b7fd538483db5b6e39e1d80e03b3b6

diff --git a/external/libxmlsec/UnpackedTarball_xmlsec.mk 
b/external/libxmlsec/UnpackedTarball_xmlsec.mk
index 6d1cb43..a72deed 100644
--- a/external/libxmlsec/UnpackedTarball_xmlsec.mk
+++ b/external/libxmlsec/UnpackedTarball_xmlsec.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,xmlsec,\
external/libxmlsec/xmlsec1-android.patch \
external/libxmlsec/xmlsec1-1.2.14-ansi.patch \
external/libxmlsec/xmlsec1-customkeymanage.patch \
+   external/libxmlsec/xmlsec1-update-config.guess.patch.1 \
 ))
 
 $(eval $(call 
gb_UnpackedTarball_add_file,xmlsec,include/xmlsec/mscrypto/akmngr.h,external/libxmlsec/include/akmngr_mscrypto.h))
diff --git a/external/libxmlsec/xmlsec1-update-config.guess.patch.1 
b/external/libxmlsec/xmlsec1-update-config.guess.patch.1
new file mode 100644
index 000..1b8ea40
--- /dev/null
+++ b/external/libxmlsec/xmlsec1-update-config.guess.patch.1
@@ -0,0 +1,1630 @@
+From dd15aae9ce221198be486a6e75d5a42f75ff9de6 Mon Sep 17 00:00:00 2001
+From: David Tardon 
+Date: Tue, 13 May 2014 16:35:04 +0200
+Subject: [PATCH] update config.* to support ppc64le
+
+---
+ config.guess | 541 +--
+ config.sub   | 301 ++---
+ 2 files changed, 472 insertions(+), 370 deletions(-)
+
+diff --git a/config.guess b/config.guess
+index da83314..b79252d 100755
+--- a/config.guess
 b/config.guess
+@@ -1,14 +1,12 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+-#   Free Software Foundation, Inc.
++#   Copyright 1992-2013 Free Software Foundation, Inc.
+ 
+-timestamp='2009-04-27'
++timestamp='2013-06-10'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
++# the Free Software Foundation; either version 3 of the License, or
+ # (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful, but
+@@ -17,26 +15,22 @@ timestamp='2009-04-27'
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# along with this program; if not, see .
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+-# the same distribution terms that you use for the rest of that program.
+-
+-
+-# Originally written by Per Bothner .
+-# Please send patches to .  Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# the same distribution terms that you use for the rest of that
++# program.  This Exception is an additional permission under section 7
++# of the GNU General Public License, version 3 ("GPLv3").
++#
++# Originally written by Per Bothner.
+ #
+-# This script attempts to guess a canonical system name similar to
+-# config.sub.  If it succeeds, it prints the system name on stdout, and
+-# exits with 0.  Otherwise, it exits with 1.
++# You can get the latest version of this script from:
++# 
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+ #
+-# The plan is that this can be called by configure scripts if you
+-# don't specify an explicit build system type.
++# Please send patches with a ChangeLog entry to config-patc...@gnu.org.
++
+ 
+ me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+@@ -56,8 +50,7 @@ version="\
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright 1992-2013 Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -139,12 +132,33 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || 
UNAME_RELEASE=unknown
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+ 
++case "${UNAME_SYSTEM}" in
++Linux|GNU|GNU/*)
++  # If the s

Re: [libreoffice-projects] minutes of ESC call ...

[Michael Meeks]

On Tue, 2014-05-13 at 16:07 +0200, Bjoern Michaelsen wrote:
> Ok, this viciously Canonical/Ubuntu branded, but its 10xi5 and it fits on a
> plane in a Pelican box:

Looks cool to me =) to what degree would Canonical be willing to
sponsor / loan those ? [ it seems they have a try-before-you-buy thing
going there anyway ;-].

>  http://blog.dustinkirkland.com/2014/05/the-orange-box-cloud-for-free-man.html

And/or $10k seems a bit above the budget we'd budgeted =)

ATB,

Michael.

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

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

[Libreoffice-commits] core.git: 3 commits - avmedia/Library_avmedia.mk avmedia/source configure.ac download.lst external/collada2gltf external/Module_external.mk external/opencollada Makefile.fetch Re

[Matúš Kukan]

 Makefile.fetch   |2 
 RepositoryExternal.mk|   30 +
 avmedia/Library_avmedia.mk   |   15 
 avmedia/source/framework/modeltools.cxx  |   33 +
 configure.ac |   25 +
 download.lst |4 
 external/Module_external.mk  |2 
 external/collada2gltf/GitSHA1.cpp|2 
 external/collada2gltf/Makefile   |   14 
 external/collada2gltf/Module_collada2gltf.mk |   17 
 external/collada2gltf/README |4 
 external/collada2gltf/StaticLibrary_collada2gltf.mk  |  100 +
 external/collada2gltf/UnpackedTarball_collada2gltf.mk|   16 
 external/opencollada/Makefile|   14 
 external/opencollada/Module_opencollada.mk   |   17 
 external/opencollada/README  |5 
 external/opencollada/StaticLibrary_opencollada_parser.mk |  273 +++
 external/opencollada/UnpackedTarball_opencollada.mk  |   19 +
 external/opencollada/opencollada.clang.patch.0   |   12 
 external/opencollada/opencollada.libxml.patch.0  |   12 
 20 files changed, 613 insertions(+), 3 deletions(-)

New commits:
commit 0bd49edc1ffd3717a75952bb8512110a5503d74b
Author: Matúš Kukan 
Date:   Mon May 12 18:01:38 2014 +0200

Use collada2gltf to open .dae files and convert them to .json.

Change-Id: Idb70da1db2516eeb6d518b39eb732a7e7d0a14ab

diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index a77fb29..fcd4a07 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -46,6 +46,21 @@ $(eval $(call gb_Library_use_libraries,avmedia,\
$(gb_UWINAPI) \
 ))
 
+ifneq (,$(filter COLLADA2GLTF,$(BUILD_TYPE)))
+$(eval $(call gb_Library_set_warnings_not_errors,avmedia))
+
+$(eval $(call gb_Library_use_externals,avmedia,\
+   collada2gltf \
+   libxml2 \
+   opencollada_parser \
+   png \
+))
+
+$(eval $(call gb_Library_add_defs,avmedia,\
+   -DENABLE_COLLADA2GLTF \
+))
+endif
+
 $(eval $(call gb_Library_add_exception_objects,avmedia,\
avmedia/source/framework/mediacontrol \
avmedia/source/framework/mediaitem \
diff --git a/avmedia/source/framework/modeltools.cxx 
b/avmedia/source/framework/modeltools.cxx
index 6dff44b..0d51744 100644
--- a/avmedia/source/framework/modeltools.cxx
+++ b/avmedia/source/framework/modeltools.cxx
@@ -19,11 +19,18 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 #include 
 #include 
 
+#ifdef ENABLE_COLLADA2GLTF
+#include 
+#include 
+#endif
+
 #include 
 #include 
 
@@ -130,9 +137,29 @@ static void lcl_EmbedExternals(const OUString& rSourceURL, 
uno::Reference& xModel,
 const OUString& rSourceURL, OUString& o_rEmbeddedURL)
 {
+OUString sSource = rSourceURL;
+#ifdef ENABLE_COLLADA2GLTF
+if (rSourceURL.endsWith("dae"))
+{
+OUString sName = ::utl::TempFile::CreateTempName();
+// remove .tmp extension
+sName = sName.copy(0, sName.getLength() - 4);
+const INetURLObject aSourceURLObj(rSourceURL);
+std::string sSourcePath = OUStringToOString( 
aSourceURLObj.getFSysPath(INetURLObject::FSYS_DETECT), RTL_TEXTENCODING_UTF8 
).getStr();
+
+std::shared_ptr  asset(new GLTF::GLTFAsset());
+asset->setInputFilePath(sSourcePath);
+asset->setBundleOutputPath(OUStringToOString( sName, 
RTL_TEXTENCODING_UTF8 ).getStr());
+GLTF::COLLADA2GLTFWriter writer(asset);
+writer.write();
+// Path to the .json file created by COLLADA2GLTFWriter
+::utl::LocalFileHelper::ConvertPhysicalNameToURL(sName + "/" + 
GetFilename(sName) + ".json", sSource);
+}
+#endif
+
 try
 {
-::ucbhelper::Content aSourceContent(rSourceURL,
+::ucbhelper::Content aSourceContent(sSource,
 uno::Reference(),
 comphelper::getProcessComponentContext());
 
@@ -148,13 +175,13 @@ bool Embed3DModel( const uno::Reference& 
xModel,
 xStorage->openStorageElement(sModel, embed::ElementModes::WRITE));
 
 // Own storage of the corresponding model
-const OUString sFilename(GetFilename(rSourceURL));
+const OUString sFilename(GetFilename(sSource));
 const OUString sGLTFDir(sFilename.copy(0,sFilename.lastIndexOf('.')));
 uno::Reference const xSubStorage(
 xModelStorage->openStorageElement(sGLTFDir, 
embed::ElementModes::WRITE));
 
 // Embed external resources
-lcl_EmbedExternals(rSourceURL, xSubStorage, aSourceContent);
+lcl_EmbedExternals(sSource, xSubStorage, aSourceContent);
 
 // Save model file (.json)
 uno::Reference const xStream(
commit d575917016f65a7322817a8e13ec25c52d18a600
Author: Zolnai Tamá

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

[Miklos Vajna]

 writerfilter/source/dmapper/GraphicImport.cxx |1 
 writerfilter/source/ooxml/model.xml   |   33 --
 2 files changed, 27 insertions(+), 7 deletions(-)

New commits:
commit 701f3dcb8d647304c56e7c437cc942b908123bc3
Author: Miklos Vajna 
Date:   Tue May 13 16:00:44 2014 +0200

fdo#78657 writerfilter: tokenize a:hlinkClick

This is just the tokenizer part, though all the heavy-lifing in
model.xml should be now done.

Change-Id: I42a13637a29411d4ee8925d7f06336584d69f25a

diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index a145905..10c7029 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -933,6 +933,7 @@ void GraphicImport::lcl_sprm(Sprm& rSprm)
 case NS_ooxml::LN_wpg_wgp:
 case NS_ooxml::LN_sizeRelH_sizeRelH:
 case NS_ooxml::LN_sizeRelV_sizeRelV:
+case NS_ooxml::LN_hlinkClick_hlinkClick:
 {
 writerfilter::Reference::Pointer_t pProperties = 
rSprm.getProps();
 if( pProperties.get())
diff --git a/writerfilter/source/ooxml/model.xml 
b/writerfilter/source/ooxml/model.xml
index 3fb84af..203d20a 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -78,11 +78,12 @@
 
 
 
-http://www.w3.org/2001/XMLSchema"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
xmlns:fn="http://www.w3.org/2006/xpath-functions"; 
xmlns="http://relaxng.org/ns/structure/1.0"; 
ns="http://schemas.openxmlformats.org/drawingml/2006/main"; 
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes";>
+
+http://schemas.openxmlformats.org/officeDocument/2006/relationships"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
xmlns:fn="http://www.w3.org/2006/xpath-functions"; 
xmlns="http://relaxng.org/ns/structure/1.0"; 
ns="http://schemas.openxmlformats.org/drawingml/2006/main"; 
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes";>
   
   
   
-  
+  
   
 
   
@@ -228,6 +229,13 @@
   
 
   
+  
+
+  
+
+  
+
+  
   
 
   
@@ -243,13 +251,24 @@
   
 
   
+  
+
+  
+
+  
 
 
+http://schemas.openxmlformats.org/officeDocument/2006/relationships"; 
name="CT_Hyperlink" resource="Properties" tag="shape">
+  
+
 
   
 
 
 
+
+  
+
   
   
 http://relaxng.org/ns/structure/1.0"; 
ns="http://schemas.openxmlformats.org/drawingml/2006/main";>
@@ -4780,7 +4799,7 @@
 
   
   
-http://www.w3.org/2001/XMLSchema"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
xmlns:fn="http://www.w3.org/2006/xpath-functions"; 
xmlns="http://relaxng.org/ns/structure/1.0"; 
ns="http://schemas.openxmlformats.org/drawingml/2006/main"; 
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes";>
+http://schemas.openxmlformats.org/drawingml/2006/main"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
xmlns:fn="http://www.w3.org/2006/xpath-functions"; 
xmlns="http://relaxng.org/ns/structure/1.0"; 
ns="http://schemas.openxmlformats.org/drawingml/2006/main"; 
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes";>
   
   
   
@@ -5027,8 +5046,8 @@
   
 
   
-
-  
+
+  
 
   
   
@@ -5177,8 +5196,8 @@
   
   
 
-
-  
+http://schemas.openxmlformats.org/drawingml/2006/main"; 
name="CT_NonVisualDrawingProps" resource="Properties" tag="shape">
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - postprocess/packcomponents

[Herbert Dürr]

 postprocess/packcomponents/makefile.mk |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit c1498d1638bb563017230b324a31a59cea476cb6
Author: Herbert Dürr 
Date:   Tue May 13 12:12:12 2014 +

#i124875# pre-register the Mac AVFoundation component

diff --git a/postprocess/packcomponents/makefile.mk 
b/postprocess/packcomponents/makefile.mk
index d2de088..4ef5f14 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -315,6 +315,7 @@ my_components += \
 .IF "$(OS)" == "MACOSX"
 my_components += \
 avmediaQuickTime \
+avmediaMacAVF \
 fps_aqua \
 macab1 \
 macbe1 \
commit a4773fde20d4be3caa815a409a144aa7003cb25d
Author: Herbert Dürr 
Date:   Tue May 13 12:10:19 2014 +

#i124800# reenable pre-registration of the quicktime component

diff --git a/postprocess/packcomponents/makefile.mk 
b/postprocess/packcomponents/makefile.mk
index ebdc907..d2de088 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -314,13 +314,11 @@ my_components += \
 
 .IF "$(OS)" == "MACOSX"
 my_components += \
+avmediaQuickTime \
 fps_aqua \
 macab1 \
 macbe1 \
 MacOSXSpell
-.IF "${MACOSX_DEPLOYMENT_TARGET}" == ""
-my_components += avmediaQuickTime
-.END
 .END
 
 .IF "$(OS)" == "WNT"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libreoffice-projects] minutes of ESC call ...

[Bjoern Michaelsen]

On Thu, May 08, 2014 at 04:29:41PM +0100, Michael Meeks wrote:
> + HackFest 'pack' / box / Virtual Machines / etc. ?
> + idea of the Virtual-Boxes is rather good (Kendy)
> + don't want to discourage that.
> + Peli-cases for hack-fests would be cool
> + 1x powerful machine for icecream master & slave
> + fast switch & some ethernet cables, power blocks etc.
> + At Gran Canaria - wifi was somewhat flaky etc.
> + unable to use icecream - no wired connection.
> + Still have hardware to try out (Bjoern)
> + can bring to Paris - some quadro / quad CPU thingit
>   (TDF-owned Sun Ultra 24 with Q9650)
> + if we buy new hardware: something like tinderboxes
>   we have or ...
> + alternatives (from ebay):
> + refurbished HP DL165 with 24 cores at 1.5K EUR at 1HU/15kg
> + refurbished Lenovo W520s at ~1K EUR each (and 
> plane-suitable)
> + total cost sub Eur 5k
> AI: + add it to the next Board budget extensions (Michael)
> + bit expensive if H/W sits idle rest of the year (Bjoern)
> + happy to have it at his place as a tinderbox the rest of
>   the time (Kendy)
> + something that would be permitted to travel with a person
>   on a plane (Thorsten)
>  + problems getting people to accept that stuff at the
>target location etc. would be a shame to loose it.
> AI: + budget for Amazon VM's for hack-fests (Thorsten)

Ok, this viciously Canonical/Ubuntu branded, but its 10xi5 and it fits on a
plane in a Pelican box:

 http://blog.dustinkirkland.com/2014/05/the-orange-box-cloud-for-free-man.html

Best,

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

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

[Matúš Kukan]

 include/svtools/brwbox.hxx|4 
 svtools/source/brwbox/brwbox1.cxx |   23 ---
 svtools/source/brwbox/brwbox2.cxx |8 
 3 files changed, 35 deletions(-)

New commits:
commit 0727c09e244b52f1a10faead9123f9f502ffd56b
Author: Matúš Kukan 
Date:   Tue May 13 15:37:44 2014 +0200

BrowseBoxCheckInvariants appears to be unused [loplugin:unreffun]

Change-Id: Ie6c546ee085b20bd3eb39cdfb7b38394c0a35b67

diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 61f3657..f16c001 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -213,10 +213,6 @@ class SVT_DLLPUBLIC BrowseBox
 friend class BrowserDataWin;
 friend class ::svt::BrowseBoxImpl;
 
-#ifdef DBG_UTIL
-friend const char* BrowseBoxCheckInvariants( const void * pVoid );
-#endif
-
 public:
 static const sal_uInt16 HandleColumnId = 0;
 
diff --git a/svtools/source/brwbox/brwbox1.cxx 
b/svtools/source/brwbox/brwbox1.cxx
index d529c49..a5f68dd 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -33,8 +33,6 @@
 #include "brwimpl.hxx"
 
 
-extern const char* BrowseBoxCheckInvariants( const void* pVoid );
-
 #define SCROLL_FLAGS (SCROLL_CLIP | SCROLL_NOCHILDREN)
 #define getDataWindow() ((BrowserDataWin*)pDataWin)
 
@@ -2391,27 +2389,6 @@ void BrowseBox::SetHeaderBar( BrowserHeader* pHeaderBar )
 ( (BrowserDataWin*)pDataWin )->pHeaderBar->SetStartDragHdl( LINK( this, 
BrowseBox, StartDragHdl ) );
 }
 
-
-#ifdef DBG_UTIL
-const char* BrowseBoxCheckInvariants( const void * pVoid )
-{
-const BrowseBox * p = (const BrowseBox *)pVoid;
-
-if (p->nRowCount < 0) return "BrowseBox: nRowCount < 0";
-if (p->nTopRow < 0) return "BrowseBox: nTopRow < 0";
-if (p->nTopRow >= p->nRowCount && p->nRowCount != 0) return "BrowseBox: 
nTopRow >= nRowCount && nRowCount != 0";
-if (p->nCurRow < -1) return "BrowseBox: nCurRow < -1";
-if (p->nCurRow > p->nRowCount) return "BrowseBox: nCurRow > nRowCount";
-
-// Sadly not always the case when editing:
-//if (p->nCurRow < 0 && p->nRowCount != 0) return "nCurRow < 0 && 
nRowCount != 0";
-//if (p->nCurRow >= p->nRowCount && p->nRowCount != 0) return "nCurRow >= 
nRowCount && nRowCount != 0";
-
-return NULL;
-}
-#endif
-
-
 long BrowseBox::GetTitleHeight() const
 {
 long nHeight;
diff --git a/svtools/source/brwbox/brwbox2.cxx 
b/svtools/source/brwbox/brwbox2.cxx
index 33e4935..ef9a6d4 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -33,14 +33,6 @@ using namespace ::com::sun::star::datatransfer;
 
 
 
-
-
-
-
-extern const char* BrowseBoxCheckInvariants( const void * pVoid );
-
-
-
 void BrowseBox::StartDrag( sal_Int8 /* _nAction */, const Point& /* _rPosPixel 
*/ )
 {
 // not interested in this event
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 include/vcl/combobox.hxx|2 +-
 vcl/source/control/combobox.cxx |7 ---
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 9d48e8fdf4e1efed5fc82e2ca00f2252debc94da
Author: Eike Rathke 
Date:   Tue May 13 15:05:40 2014 +0200

sal_Int32 ComboBox::InsertEntryWithImage()

Change-Id: Iaa1ddc931b71fcdf08d571c7e3573a936d378709

diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index 51770b2..8af4458 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -130,7 +130,7 @@ public:
 virtual voidSetText( const OUString& rStr, const Selection& 
rNewSelection ) SAL_OVERRIDE;
 
 virtual sal_Int32  InsertEntry(const OUString& rStr, sal_Int32  nPos = 
COMBOBOX_APPEND);
-voidInsertEntryWithImage( const OUString& rStr, const Image& 
rImage, sal_Int32  nPos = COMBOBOX_APPEND );
+sal_Int32   InsertEntryWithImage( const OUString& rStr, const Image& 
rImage, sal_Int32  nPos = COMBOBOX_APPEND );
 
 voidRemoveEntry( const OUString& rStr );
 virtual voidRemoveEntryAt(sal_Int32  nPos);
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 521d13a..cfd2e8e 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -872,11 +872,11 @@ sal_Int32 ComboBox::InsertEntry(const OUString& rStr, 
sal_Int32 const nPos)
 return nRealPos;
 }
 
-void ComboBox::InsertEntryWithImage(
+sal_Int32 ComboBox::InsertEntryWithImage(
 const OUString& rStr, const Image& rImage, sal_Int32 const nPos)
 {
 if (nPos < 0 || COMBOBOX_MAX_ENTRIES <= 
mpImplLB->GetEntryList()->GetEntryCount())
-return;
+return COMBOBOX_ERROR;
 
 sal_Int32 nRealPos;
 if (nPos == COMBOBOX_APPEND)
@@ -885,13 +885,14 @@ void ComboBox::InsertEntryWithImage(
 {
 const sal_Int32 nMRUCount = mpImplLB->GetEntryList()->GetMRUCount();
 if (nPos > COMBOBOX_MAX_ENTRIES - nMRUCount)
-return;
+return COMBOBOX_ERROR;
 nRealPos = nPos + nMRUCount;
 }
 
 nRealPos = mpImplLB->InsertEntry( nRealPos, rStr, rImage );
 nRealPos -= mpImplLB->GetEntryList()->GetMRUCount();
 CallEventListeners( VCLEVENT_COMBOBOX_ITEMADDED, (void*) 
sal_IntPtr(nRealPos) );
+return nRealPos;
 }
 
 void ComboBox::RemoveEntry( const OUString& rStr )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Need info on sd/source/ui/accessibility.po for l10n

[Caolán McNamara]

On Mon, 2014-05-12 at 18:35 +0200, Sophie wrote:
> Hi all,
> 
> We (l10n team) need some information for localization purpose.
> In libo43_ui/sd/source/ui/accessibility.po, some strings in the form of
> PresentationOutlinerShape
> UnknownAccessiblePresentationShape
> 
> Few of our languages support this sort of notation where there is a mix
> of capitals in one attached word. How should we translate that, are we
> allowed to separate the words (add spaces or underscores) and remove the
> capitals? Where does it appears in the UI?

Looking at where they get used, they are the accessibility descriptions
for the things they describe, presentation pages and notes and so on. So
you'd need an accessibility tool to hear them read out as you select
them in the UI. Anyway, it looks completely safe to separate them with
spaces and remove the capitals etc, and just format them as natural for
your language. We should probably separate them in the English version
too.

C.

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

[Libreoffice-commits] core.git: dbaccess/inc dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk

[Caolán McNamara]

 dbaccess/UIConfig_dbaccess.mk   |1 
 dbaccess/inc/dbaccess_helpid.hrc|2 
 dbaccess/source/ui/inc/WCPage.hxx   |   46 ++---
 dbaccess/source/ui/inc/dbu_resource.hrc |2 
 dbaccess/source/ui/misc/WCPage.cxx  |  144 --
 dbaccess/source/ui/misc/WizardPages.hrc |   12 -
 dbaccess/source/ui/misc/WizardPages.src |   93 ---
 dbaccess/uiconfig/ui/copytablepage.ui   |  254 
 8 files changed, 348 insertions(+), 206 deletions(-)

New commits:
commit 99595346359145d8cf909e5795919fb239cccbd9
Author: Caolán McNamara 
Date:   Tue May 13 13:20:42 2014 +0100

convert copy table page to .ui

Change-Id: Id537486dcaf0d3c6ab850a9fb50cef3d995ad51f

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index dc78eb8..4244e55 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/applycolpage \
 dbaccess/uiconfig/ui/choosedatasourcedialog \
 dbaccess/uiconfig/ui/colwidthdialog \
+dbaccess/uiconfig/ui/copytablepage \
 dbaccess/uiconfig/ui/dbaseindexdialog \
 dbaccess/uiconfig/ui/directsqldialog  \
 dbaccess/uiconfig/ui/fielddialog \
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index 93f5d36..407c414 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -104,8 +104,6 @@
 #define HID_TAB_WIZ_TYPE_SELECT   
"DBACCESS_HID_TAB_WIZ_TYPE_SELECT"
 #define HID_TAB_NAMEMATCHING_COLS_AVAIL   
"DBACCESS_HID_TAB_NAMEMATCHING_COLS_AVAIL"
 #define HID_TAB_NAMEMATCHING_COLS_ASSIGN  
"DBACCESS_HID_TAB_NAMEMATCHING_COLS_ASSIGN"
-#define HID_TAB_WIZ_COPYTABLE 
"DBACCESS_HID_TAB_WIZ_COPYTABLE"
-#define HID_TAB_WIZ_TABLENAME_EDIT
"DBACCESS_HID_TAB_WIZ_TABLENAME_EDIT"
 #define HID_CTL_RELATIONTAB   
"DBACCESS_HID_CTL_RELATIONTAB"
 #define HID_RELATIONDIALOG_LEFTFIELDCELL  
"DBACCESS_HID_RELATIONDIALOG_LEFTFIELDCELL"
 #define HID_RELATIONDIALOG_RIGHTFIELDCELL 
"DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL"
diff --git a/dbaccess/source/ui/inc/WCPage.hxx 
b/dbaccess/source/ui/inc/WCPage.hxx
index 1b556ee..0c0e1ff 100644
--- a/dbaccess/source/ui/inc/WCPage.hxx
+++ b/dbaccess/source/ui/inc/WCPage.hxx
@@ -34,24 +34,22 @@ namespace dbaui
 class OCopyTable : public OWizardPage
 {
 protected:
-FixedText   m_ftTableName;
-Editm_edTableName;
-FixedLine   m_aFL_Options;
-RadioButton m_aRB_DefData;
-RadioButton m_aRB_Def;
-RadioButton m_aRB_View;
-RadioButton m_aRB_AppendData;
-CheckBoxm_aCB_UseHeaderLine;
-CheckBoxm_aCB_PrimaryColumn;
-FixedText   m_aFT_KeyName;
-Editm_edKeyName;
-sal_Int16   m_nOldOperation;
+Edit*  m_pEdTableName;
+RadioButton*   m_pRB_DefData;
+RadioButton*   m_pRB_Def;
+RadioButton*   m_pRB_View;
+RadioButton*   m_pRB_AppendData;
+CheckBox*  m_pCB_UseHeaderLine;
+CheckBox*  m_pCB_PrimaryColumn;
+FixedText* m_pFT_KeyName;
+Edit*  m_pEdKeyName;
+sal_Int16  m_nOldOperation;
 
-OWizColumnSelect*   m_pPage2;
-OWizNormalExtend*   m_pPage3;
+OWizColumnSelect*  m_pPage2;
+OWizNormalExtend*  m_pPage3;
 
-boolm_bPKeyAllowed;
-boolm_bUseHeaderAllowed;
+bool   m_bPKeyAllowed;
+bool   m_bUseHeaderAllowed;
 
 DECL_LINK( AppendDataClickHdl, Button* );
 DECL_LINK( RadioChangeHdl, Button* );
@@ -69,22 +67,22 @@ namespace dbaui
 OCopyTable( Window * pParent );
 virtual ~OCopyTable();
 
-inline bool IsOptionDefData()   const { return 
m_aRB_DefData.IsChecked(); }
-inline bool IsOptionDef()   const { return 
m_aRB_Def.IsChecked(); }
-inline bool IsOptionAppendData()const { return 
m_aRB_AppendData.IsChecked(); }
-inline bool IsOptionView()  const { return 
m_aRB_View.IsChecked(); }
-inline bool UseHeaderLine() const { return 
m_aCB_UseHeaderLine.IsChecked(); }
-OUStringGetKeyName()const { return 
m_edKeyName.GetText(); }
+bool IsOpt

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

[Caolán McNamara]

 helpers/help_hid.lst  |9 --
 source/text/shared/explorer/database/05030100.xhp |   31 +++---
 2 files changed, 16 insertions(+), 24 deletions(-)

New commits:
commit 43d91a4743d30b2e4c194d991c865b7c4be7616c
Author: Caolán McNamara 
Date:   Tue May 13 13:33:52 2014 +0100

update help ids for copy table page .ui conversion

Change-Id: Idc93a475b278d96753757329ab5b1c666c234630

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 03efbbf..52be570 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3166,8 +3166,6 @@ HID_TAB_PAGE_PBUSER,38949,
 HID_TAB_PAGE_PBUSERDELETE,38951,
 HID_TAB_PAGE_TBLGRANTS,38952,
 HID_TAB_PAGE_USERADMIN,38948,
-HID_TAB_WIZ_COPYTABLE,38918,
-HID_TAB_WIZ_TABLENAME_EDIT,38919,
 HID_TAB_WIZ_TYPE_SELECT,38915,
 HID_TBXCONTROL_FILENEW,33360,
 HID_TEMPLATEDLG_DIALOG,32989,
@@ -5091,8 +5089,6 @@ dbaccess_CheckBox_DLG_INDEXDESIGN_CB_UNIQUE,1388626945,
 dbaccess_CheckBox_PAGE_ADABAS_CB_SHUTDB,851526657,
 dbaccess_CheckBox_PAGE_CONNECTION_CB_PASSWORD_REQUIRED,851543041,
 dbaccess_CheckBox_PAGE_MYSQL_NATIVE_CB_PASSWORD_REQUIRED,851837953,
-dbaccess_CheckBox_TAB_WIZ_COPYTABLE_CB_PRIMARY_COLUMN,851641349,
-dbaccess_CheckBox_TAB_WIZ_COPYTABLE_CB_USEHEADERLINE,851641350,
 dbaccess_ComboBox_TP_SAVE_DBDOC_AS_ED_SAVE_AS_LOCATION,851464193,
 dbaccess_Edit_DLG_ADABASSTAT_ET_FREESIZE,1388611589,
 dbaccess_Edit_DLG_ADABASSTAT_ET_SIZE,1388611588,
@@ -5110,7 +5106,6 @@ dbaccess_Edit_PAGE_MYSQL_NATIVE_ET_USERNAME,851838977,
 dbaccess_Edit_PAGE_ORACLE_JDBC_ET_JDBCDRIVERCLASS,851888132,
 dbaccess_Edit_PAGE_USERDRIVER_ET_HOSTNAME,851757061,
 dbaccess_Edit_PAGE_USERDRIVER_ET_OPTIONS,851757059,
-dbaccess_Edit_TAB_WIZ_COPYTABLE_ET_KEYNAME,851642371,
 dbaccess_FL_SEPARATOR2_PAGE_MYSQL_NATIVE,851836928,
 dbaccess_FT_JDBCDRIVERCLASS_PAGE_MYSQL_JDBC,851771392,
 dbaccess_FT_JDBCDRIVERCLASS_PAGE_ORACLE_JDBC,851886080,
@@ -5154,10 +5149,6 @@ dbaccess_PushButton_WIZ_RTFCOPYTABLE_PB_NEXT,1388581385,
 dbaccess_PushButton_WIZ_RTFCOPYTABLE_PB_PREV,1388581386,
 dbaccess_RadioButton_PAGE_DBWIZARD_MYSQL_INTRO_RB_CONNECTVIANATIVE,852197893,
 dbaccess_RadioButton_PAGE_GENERAL_RB_OPENEXISTINGDOC,851444227,
-dbaccess_RadioButton_TAB_WIZ_COPYTABLE_RB_APPENDDATA,851640836,
-dbaccess_RadioButton_TAB_WIZ_COPYTABLE_RB_DEF,851640834,
-dbaccess_RadioButton_TAB_WIZ_COPYTABLE_RB_DEFDATA,851640833,
-dbaccess_RadioButton_TAB_WIZ_COPYTABLE_RB_VIEW,851640835,
 dbaccess_TabPage_PAGE_ADVANCED_SETTINGS_SPECIAL,851820544,
 dbaccess_TabPage_PAGE_CONNECTION,851542016,
 dbaccess_TabPage_PAGE_DBWIZARD_MYSQL_INTRO,852197376,
diff --git a/source/text/shared/explorer/database/05030100.xhp 
b/source/text/shared/explorer/database/05030100.xhp
index df18fbf..d58c2fc 100644
--- a/source/text/shared/explorer/database/05030100.xhp
+++ b/source/text/shared/explorer/database/05030100.xhp
@@ -30,30 +30,31 @@
 
 
 
+
 Copy Table
 You can copy a table by dragging and dropping the table onto the 
table area of a database file window. The Copy table dialog 
appears.
 
-Table name
-Specifies a name for the 
copy. Some databases only accept names containing eight or fewer 
characters.
+Table name
+Specifies a name for the 
copy. Some databases only accept names containing eight or fewer 
characters.
 Options
-Definition and data
-Creates a 1:1 copy of 
the database table. The table definition and the complete data are 
copied. The table definition includes the table structure and format from 
different data fields, including special field properties. The field contents 
supply the data.
-Definition
-Copies 
only the table definition and not the corresponding data.
-As table view
-If the 
database supports Views, you can select this option only when a query is copied 
in a table container. This option enables you to see and edit a query as a 
normal table view. The table will be filtered in the view with a 
"Select" SQL statement.
-Append datasee 
#i63815
-Appends the data of 
the table to be copied to an existing table.
+Definition and data
+Creates a 1:1 copy of 
the database table. The table definition and the complete data are 
copied. The table definition includes the table structure and format from 
different data fields, including special field properties. The field contents 
supply the data.
+Definition
+Copies only the table 
definition and not the corresponding data.
+As table view
+If the database 
supports Views, you can select this option only when a query is copied in a 
table container. This option enables you to see and edit a query as a normal 
table view. The table will be filtered in the view with a "Select" SQL 
statement.
+Append datasee 
#i63815
+Appends the data of the 
table to be copied to an existing table.
 The table definition must be exactly the same so that data can be 
copied. Data cannot be copied if a data field in the target table has another 
format than the data field in the source table.
 Match the data field names in the Copy Table dialog on 
the A

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

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

New commits:
commit 2fa751ba13dd1e5c610cd8705a733633cadf983f
Author: Caolán McNamara 
Date:   Tue May 13 13:33:52 2014 +0100

Updated core
Project: help  43d91a4743d30b2e4c194d991c865b7c4be7616c

diff --git a/helpcontent2 b/helpcontent2
index ec761d9..43d91a4 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ec761d90416db68a0e8e683c3df44e43f593bb17
+Subproject commit 43d91a4743d30b2e4c194d991c865b7c4be7616c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 unotools/source/ucbhelper/tempfile.cxx |6 --
 1 file changed, 6 deletions(-)

New commits:
commit 1d72a0262c4570631d0aa8f98e34e21fb9d6ae42
Author: Stephan Bergmann 
Date:   Tue May 13 14:33:16 2014 +0200

Related fdo#60338: Create missing temp file dir with user's original umask

For one, that is consistent with how ensuredir (in the same .cxx) has always
worked, and for another saves us from trouble with umask, cf.
034d4c111976f337877e5954c6cc95ed9f90a343 "Related fdo#60338: Setting umask 
for
osl::Directory::open is useless."

Change-Id: Ic3fb5bb29ca3031d257067a514cb9f5bccfbfe4f

diff --git a/unotools/source/ucbhelper/tempfile.cxx 
b/unotools/source/ucbhelper/tempfile.cxx
index 4e2cb84..6053677 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -202,13 +202,7 @@ void CreateTempName_Impl( OUString& rName, bool bKeep, 
bool bDir = true )
 
 if ( bDir )
 {
-#ifdef UNX /* RW permission for the user only! */
-mode_t old_mode = umask(077);
-#endif
 FileBase::RC err = Directory::create( aTmp );
-#ifdef UNX
-umask(old_mode);
-#endif
 if ( err == FileBase::E_None )
 {
 // !bKeep: only for creating a name, not a file or directory
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 unotools/source/ucbhelper/tempfile.cxx |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit 034d4c111976f337877e5954c6cc95ed9f90a343
Author: Stephan Bergmann 
Date:   Tue May 13 14:29:56 2014 +0200

Related fdo#60338: Setting umask for osl::Directory::open is useless

Maybe 39c58e416252571a04b8ebbb56c9fa012b117993 "INTEGRATION: CWS
olefix: #i46469# use correct umask on unix" had intended to put it around 
the
osl::Directory::create call instead, but given the trouble of calling 
umask(3)
in a MT program at all, it is probably better to keep creating any missing
directories with the user's original umask anyway.

Change-Id: Idfddfdab05373a3c395daba635fddcc054f3f215

diff --git a/unotools/source/ucbhelper/tempfile.cxx 
b/unotools/source/ucbhelper/tempfile.cxx
index 67dbd4b..4e2cb84 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -90,14 +90,7 @@ bool ensuredir( const OUString& rUnqPath )
 // HACK: create directory on a mount point with nobrowse option
 // returns ENOSYS in any case !!
 osl::Directory aDirectory( aPath );
-#ifdef UNX
-/* RW permission for the user only! */
-mode_t old_mode = umask(077);
-#endif
 osl::FileBase::RC nError = aDirectory.open();
-#ifdef UNX
-umask(old_mode);
-#endif
 aDirectory.close();
 if( nError == osl::File::E_None )
 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' - basic/source

[Thomas Arnhold]

 basic/source/sbx/sbxdec.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit d5af7aa995d5cea88649447d9828cca4b21b6596
Author: Thomas Arnhold 
Date:   Tue May 13 05:22:47 2014 +0200

i#64348 basic: fix CDec() crash if string is empty

Change-Id: I92e9472e14c00a6550081f0d58a352faa5b78b98
Reviewed-on: https://gerrit.libreoffice.org/9336
Tested-by: David Tardon 
Reviewed-by: David Tardon 

diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx
index 276b788..25d7936 100644
--- a/basic/source/sbx/sbxdec.cxx
+++ b/basic/source/sbx/sbxdec.cxx
@@ -194,6 +194,8 @@ void SbxDecimal::setUInt( unsigned int val )
 
 bool SbxDecimal::setString( OUString* pOUString )
 {
+assert(pOUString);
+
 static LCID nLANGID = MAKELANGID( LANG_ENGLISH, SUBLANG_ENGLISH_US );
 
 // Convert delimiter
@@ -472,7 +474,9 @@ start:
 case SbxLPSTR:
 case SbxSTRING:
 case SbxBYREF | SbxSTRING:
-pnDecRes->setString( p->pOUString ); break;
+if( p->pOUString )
+pnDecRes->setString( p->pOUString );
+break;
 case SbxOBJECT:
 {
 SbxValue* pVal = PTR_CAST(SbxValue,p->pObj);
___
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' - svl/source

[David Tardon]

 svl/source/numbers/zforfind.cxx |   69 +++-
 1 file changed, 48 insertions(+), 21 deletions(-)

New commits:
commit d2ee427df785a2447769b01c85f4a2952141fef8
Author: David Tardon 
Date:   Mon May 12 14:02:13 2014 +0200

fdo#78119 find the longest match for month name

(cherry picked from commit 624e5c34ce815af6f65ce6699ad6b3f2aa1bf0da)

Change-Id: Idad7b083ce5528f5c735f3a8bd091819bf043fc8
Reviewed-on: https://gerrit.libreoffice.org/#/c/9329
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 3726c33..840af0c 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -561,6 +561,7 @@ short ImpSvNumberInputScan::GetMonth( const OUString& 
rString, sal_Int32& nPos )
 static const OUString aSepShortened("SEP");
 
 short res = 0; // no month found
+int nMatchLen = 0;
 
 if (rString.getLength() > nPos) // only if needed
 {
@@ -569,52 +570,78 @@ short ImpSvNumberInputScan::GetMonth( const OUString& 
rString, sal_Int32& nPos )
 InitText();
 }
 sal_Int16 nMonths = 
pFormatter->GetCalendar()->getNumberOfMonthsInYear();
+// Find the longest match. This is needed for, e.g., Czech, as 
Červen (June)
+// is fully contained in Červenec (July), so the latter could 
never be found
+// if we stopped at the first match.
 for ( sal_Int16 i = 0; i < nMonths; i++ )
 {
 if ( bScanGenitiveMonths && StringContains( 
pUpperGenitiveMonthText[i], rString, nPos ) )
 {   // genitive full names first
-nPos = nPos + pUpperGenitiveMonthText[i].getLength();
-res = i + 1;
-break;  // for
+const int nMonthLen = pUpperGenitiveMonthText[i].getLength();
+if (nMonthLen > nMatchLen)
+{
+nMatchLen = nMonthLen;
+res = i + 1;
+}
 }
 else if ( bScanGenitiveMonths && StringContains( 
pUpperGenitiveAbbrevMonthText[i], rString, nPos ) )
 {   // genitive abbreviated
-nPos = nPos + pUpperGenitiveAbbrevMonthText[i].getLength();
-res = sal::static_int_cast< short >(-(i+1)); // negative
-break;  // for
+const int nMonthLen = 
pUpperGenitiveAbbrevMonthText[i].getLength();
+if (nMonthLen > nMatchLen)
+{
+nMatchLen = nMonthLen;
+res = sal::static_int_cast< short >(-(i+1)); // negative
+}
 }
 else if ( bScanPartitiveMonths && StringContains( 
pUpperPartitiveMonthText[i], rString, nPos ) )
 {   // partitive full names
-nPos = nPos + pUpperPartitiveMonthText[i].getLength();
-res = i+1;
-break;  // for
+const int nMonthLen = pUpperPartitiveMonthText[i].getLength();
+if (nMonthLen > nMatchLen)
+{
+nMatchLen = nMonthLen;
+res = i+1;
+}
 }
 else if ( bScanPartitiveMonths && StringContains( 
pUpperPartitiveAbbrevMonthText[i], rString, nPos ) )
 {   // partitive abbreviated
-nPos = nPos + pUpperPartitiveAbbrevMonthText[i].getLength();
-res = sal::static_int_cast< short >(-(i+1)); // negative
-break;  // for
+const int nMonthLen = 
pUpperPartitiveAbbrevMonthText[i].getLength();
+if (nMonthLen > nMatchLen)
+{
+nMatchLen = nMonthLen;
+res = sal::static_int_cast< short >(-(i+1)); // negative
+}
 }
 else if ( StringContains( pUpperMonthText[i], rString, nPos ) )
 {   // noun full names
-nPos = nPos + pUpperMonthText[i].getLength();
-res = i+1;
-break;  // for
+const int nMonthLen = pUpperMonthText[i].getLength();
+if (nMonthLen > nMatchLen)
+{
+nMatchLen = nMonthLen;
+res = i+1;
+}
 }
 else if ( StringContains( pUpperAbbrevMonthText[i], rString, nPos 
) )
 {   // noun abbreviated
-nPos = nPos + pUpperAbbrevMonthText[i].getLength();
-res = sal::static_int_cast< short >(-(i+1)); // negative
-break;  // for
+const int nMonthLen = pUpperAbbrevMonthText[i].getLength();
+if (nMonthLen > nMatchLen)
+{
+nMatchLen = nMonthLen;
+res = sal::static_int_cast< short >(-(i+1)); // negative
+}
 }
 else if ( i

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

[Stephan Bergmann]

 sal/osl/unx/file.cxx  |   21 -
 sal/osl/unx/file_impl.hxx |7 ++-
 sal/osl/unx/file_misc.cxx |2 +-
 sal/osl/unx/tempfile.cxx  |   11 ---
 4 files changed, 27 insertions(+), 14 deletions(-)

New commits:
commit 533237fec4b91fb5f871e0b5028586516dd8c0be
Author: Stephan Bergmann 
Date:   Tue May 13 14:16:10 2014 +0200

Related fdo#60338: Restrictive open mode flags for tempfile w/o calling 
umask

Change-Id: Ia83cbe4c9352eb2a2cf317dd1fc5771ddc12c993

diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 72fda5a..e781574 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -821,7 +821,8 @@ openMemoryAsFile( void *address, size_t size, oslFileHandle 
*pHandle, const char
 #endif
 
 oslFileError
-openFilePath( const char *cpFilePath, oslFileHandle* pHandle, sal_uInt32 
uFlags )
+openFilePath( const char *cpFilePath, oslFileHandle* pHandle, sal_uInt32 
uFlags,
+  mode_t mode)
 {
 oslFileError eRet;
 
@@ -852,18 +853,22 @@ openFilePath( const char *cpFilePath, oslFileHandle* 
pHandle, sal_uInt32 uFlags
 #endif
 
 /* set mode and flags */
-int mode  = S_IRUSR | S_IRGRP | S_IROTH;
+int defmode  = S_IRUSR | S_IRGRP | S_IROTH;
 int flags = O_RDONLY;
 if (uFlags & osl_File_OpenFlag_Write)
 {
-mode |= S_IWUSR | S_IWGRP | S_IWOTH;
+defmode |= S_IWUSR | S_IWGRP | S_IWOTH;
 flags = OPEN_WRITE_FLAGS;
 }
 if (uFlags & osl_File_OpenFlag_Create)
 {
-mode |= S_IWUSR | S_IWGRP | S_IWOTH;
+defmode |= S_IWUSR | S_IWGRP | S_IWOTH;
 flags = OPEN_CREATE_FLAGS;
 }
+if (mode == mode_t(-1))
+{
+mode = defmode;
+}
 
 /* Check for flags passed in from SvFileStream::Open() */
 if (uFlags & osl_File_OpenFlag_Trunc)
@@ -1000,6 +1005,12 @@ openFilePath( const char *cpFilePath, oslFileHandle* 
pHandle, sal_uInt32 uFlags
 oslFileError
 SAL_CALL osl_openFile( rtl_uString* ustrFileURL, oslFileHandle* pHandle, 
sal_uInt32 uFlags )
 {
+return openFile(ustrFileURL, pHandle, uFlags, mode_t(-1));
+}
+
+oslFileError
+SAL_CALL openFile( rtl_uString* ustrFileURL, oslFileHandle* pHandle, 
sal_uInt32 uFlags, mode_t mode )
+{
 oslFileError eRet;
 
 if ((ustrFileURL == 0) || (ustrFileURL->length == 0) || (pHandle == 0))
@@ -1016,7 +1027,7 @@ SAL_CALL osl_openFile( rtl_uString* ustrFileURL, 
oslFileHandle* pHandle, sal_uIn
 return oslTranslateFileError (OSL_FET_ERROR, errno);
 #endif /* MACOSX */
 
-return openFilePath (buffer, pHandle, uFlags);
+return openFilePath (buffer, pHandle, uFlags, mode);
 }
 
 oslFileError
diff --git a/sal/osl/unx/file_impl.hxx b/sal/osl/unx/file_impl.hxx
index db8ce4e..d1031bc 100644
--- a/sal/osl/unx/file_impl.hxx
+++ b/sal/osl/unx/file_impl.hxx
@@ -22,6 +22,7 @@
 
 #include "osl/file.h"
 #include 
+#include 
 
 struct DirectoryItem_Impl
 {
@@ -43,10 +44,14 @@ struct DirectoryItem_Impl
 oslFileType getFileType() const;
 };
 
+oslFileError openFile(
+rtl_uString * pustrFileURL, oslFileHandle * pHandle, sal_uInt32 uFlags,
+mode_t mode);
+
 oslFileError openFilePath(
 const char *cpFilePath,
 oslFileHandle* pHandle,
-sal_uInt32 uFlags );
+sal_uInt32 uFlags, mode_t mode );
 
 #endif /* INCLUDED_FILE_IMPL_HXX */
 
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index 7662d9f..787866e 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -917,7 +917,7 @@ static int oslDoCopyFile(const sal_Char* pszSourceFileName, 
const sal_Char* pszD
 
 if (openFilePath(pszSourceFileName,
  &SourceFileFH,
- 
osl_File_OpenFlag_Read|osl_File_OpenFlag_NoLock|osl_File_OpenFlag_NoExcl) != 
osl_File_E_None)
+ 
osl_File_OpenFlag_Read|osl_File_OpenFlag_NoLock|osl_File_OpenFlag_NoExcl, 
mode_t(-1)) != osl_File_E_None)
 {
 // Let's hope errno is still set relevantly after openFilePath...
 nRet=errno;
diff --git a/sal/osl/unx/tempfile.cxx b/sal/osl/unx/tempfile.cxx
index 3d643b8..bbe3c27 100644
--- a/sal/osl/unx/tempfile.cxx
+++ b/sal/osl/unx/tempfile.cxx
@@ -30,6 +30,7 @@
 #include 
 
 #include "file_url.h"
+#include "file_impl.hxx"
 
 oslFileError SAL_CALL osl_getTempDirURL( rtl_uString** pustrTempDir )
 {
@@ -233,17 +234,13 @@ static oslFileError osl_create_temp_file_impl_(
 
 if (osl_File_E_None == osl_error)
 {
-/* RW permission for the user only! */
-mode_t old_mode = umask(077);
-
-osl_error = osl_openFile(
+osl_error = openFile(
 tmp_file_url,
 file_handle,
 osl_File_OpenFlag_Read |
 osl_File_OpenFlag_Write |
-osl_File_OpenFlag_Create);
-
-umask(old_mode);
+osl_File_OpenFlag_Create,
+S_IRUSR | S_IWUSR);
 }
 
 /* in case of error osl_File_E_EXIST we simply try agai

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

[Thomas Arnhold]

 basic/source/sbx/sbxdec.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit c8ea99e9832c2098639b268377df7486309f66fb
Author: Thomas Arnhold 
Date:   Tue May 13 05:22:47 2014 +0200

i#64348 basic: fix CDec() crash if string is empty

Change-Id: I92e9472e14c00a6550081f0d58a352faa5b78b98
Reviewed-on: https://gerrit.libreoffice.org/9337
Tested-by: David Tardon 
Reviewed-by: David Tardon 

diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx
index 276b788..25d7936 100644
--- a/basic/source/sbx/sbxdec.cxx
+++ b/basic/source/sbx/sbxdec.cxx
@@ -194,6 +194,8 @@ void SbxDecimal::setUInt( unsigned int val )
 
 bool SbxDecimal::setString( OUString* pOUString )
 {
+assert(pOUString);
+
 static LCID nLANGID = MAKELANGID( LANG_ENGLISH, SUBLANG_ENGLISH_US );
 
 // Convert delimiter
@@ -472,7 +474,9 @@ start:
 case SbxLPSTR:
 case SbxSTRING:
 case SbxBYREF | SbxSTRING:
-pnDecRes->setString( p->pOUString ); break;
+if( p->pOUString )
+pnDecRes->setString( p->pOUString );
+break;
 case SbxOBJECT:
 {
 SbxValue* pVal = PTR_CAST(SbxValue,p->pObj);
___
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

[bugzilla-daemon]

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

Bug 60270 depends on bug 40788, which changed state.

Bug 40788 Summary: FORMATTING - Calc ignores manual breaks when "fit to number 
of pages" is chosen
https://bugs.freedesktop.org/show_bug.cgi?id=40788

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |---

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

[Libreoffice-commits] core.git: oox/Library_oox.mk

[Tor Lillqvist]

 oox/Library_oox.mk |   16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 70c355dc46caaf73c708c43d3eb744373e4d5ebc
Author: Tor Lillqvist 
Date:   Tue May 13 11:26:22 2014 +0300

Work around another seeminly random mis-optimization by Apple's Clang with 
-Oz

If it wasn't for the desperate need to minimize code size for LO-based
iOS apps, I definitely wouldn't use -Oz in gb_COMPILERDEFAULTOPTFLAGS
(in solenv/gbuild/platform/IOS_ARM_GCC.mk).

Change-Id: Icb231b5f30b32afe1c0f3b43e5744bf0e41e96df

diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 4df15bc..4f4a35b 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -129,7 +129,6 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
 oox/source/drawingml/clrschemecontext \
 oox/source/drawingml/clrscheme \
 oox/source/drawingml/colorchoicecontext \
-oox/source/drawingml/color \
 oox/source/drawingml/connectorshapecontext \
 oox/source/drawingml/customshapegeometry \
 oox/source/drawingml/customshapepresetdata \
@@ -292,4 +291,19 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
 oox/source/vml/vmltextbox \
 ))
 
+ifeq ($(OS),IOS)
+# Either a compiler bug in Xcode 5.1.1 or some hard-to-spot undefined
+# behaviour in the source code... Compiling this source file with
+# optimization causes some Smart Art images to end up with completely
+# wrong colour, some even totally black.
+$(eval $(call gb_Library_add_cxxobjects,oox,\
+oox/source/drawingml/color \
+, $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+else
+$(eval $(call gb_Library_add_exception_objects,oox,\
+oox/source/drawingml/color \
+))
+endif
+
 # 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: 2 commits - basic/source

[Thomas Arnhold]

 basic/source/sbx/sbxdec.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 375a6c7a909573cea64aacd64d2a14236a371ba2
Author: Thomas Arnhold 
Date:   Tue May 13 13:24:59 2014 +0200

i#64348 basic: fix CDec() crash if string is empty

This time without memory leak.

Change-Id: If4474004124b7497b8451030a13db36887ead737

diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx
index 59f5e01..ba2fc8a 100644
--- a/basic/source/sbx/sbxdec.cxx
+++ b/basic/source/sbx/sbxdec.cxx
@@ -194,6 +194,8 @@ void SbxDecimal::setUInt( unsigned int val )
 
 bool SbxDecimal::setString( OUString* pOUString )
 {
+assert(pOUString);
+
 static LCID nLANGID = MAKELANGID( LANG_ENGLISH, SUBLANG_ENGLISH_US );
 
 // Convert delimiter
@@ -471,7 +473,9 @@ start:
 case SbxLPSTR:
 case SbxSTRING:
 case SbxBYREF | SbxSTRING:
-pnDecRes->setString( p->pOUString ); break;
+if ( p->pOUString )
+pnDecRes->setString( p->pOUString );
+break;
 case SbxOBJECT:
 {
 SbxValue* pVal = PTR_CAST(SbxValue,p->pObj);
commit 3beaccc09dfedc560d171dbbf26f2592e046d903
Author: Thomas Arnhold 
Date:   Tue May 13 13:22:04 2014 +0200

Revert "i#64348 basic: fix CDec() crash if string is empty"

This reverts commit 375b01bf747bb206c3fd6bad0acbd38271a8fb86.

diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx
index f0cab34..59f5e01 100644
--- a/basic/source/sbx/sbxdec.cxx
+++ b/basic/source/sbx/sbxdec.cxx
@@ -194,8 +194,6 @@ void SbxDecimal::setUInt( unsigned int val )
 
 bool SbxDecimal::setString( OUString* pOUString )
 {
-assert(pOUString);
-
 static LCID nLANGID = MAKELANGID( LANG_ENGLISH, SUBLANG_ENGLISH_US );
 
 // Convert delimiter
@@ -473,11 +471,7 @@ start:
 case SbxLPSTR:
 case SbxSTRING:
 case SbxBYREF | SbxSTRING:
-if( !p->pOUString )
-pnDecRes->setString( new OUString );
-else
-pnDecRes->setString( p->pOUString );
-break;
+pnDecRes->setString( p->pOUString ); break;
 case SbxOBJECT:
 {
 SbxValue* pVal = PTR_CAST(SbxValue,p->pObj);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sal/Library_sal.mk   |2 
 sal/osl/unx/tempfile.c   |  330 ---
 sal/osl/unx/tempfile.cxx |  330 +++
 3 files changed, 331 insertions(+), 331 deletions(-)

New commits:
commit f492e45dd2fd1f0ef59f37cd0c3f125203831e98
Author: Stephan Bergmann 
Date:   Tue May 13 13:13:35 2014 +0200

Convert sal/osl/unx/tempfile.c to C++

...for easier future maintenance

Change-Id: I501076882daa7f36f414f9fa62f790eb85ac3259

diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 1d88f78..122b95f 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -165,6 +165,7 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
sal/osl/unx/process_impl \
sal/osl/unx/profile \
sal/osl/unx/security \
+   sal/osl/unx/tempfile \
 $(if $(filter DESKTOP,$(BUILD_TYPE)), sal/osl/unx/salinit) \
 ))
 $(eval $(call gb_Library_add_cobjects,sal,\
@@ -175,7 +176,6 @@ $(eval $(call gb_Library_add_cobjects,sal,\
sal/osl/unx/readwrite_helper \
sal/osl/unx/socket \
sal/osl/unx/system \
-   sal/osl/unx/tempfile \
sal/osl/unx/thread \
sal/osl/unx/time \
 ))
diff --git a/sal/osl/unx/tempfile.c b/sal/osl/unx/tempfile.cxx
similarity index 99%
rename from sal/osl/unx/tempfile.c
rename to sal/osl/unx/tempfile.cxx
index 9ae785b..3d643b8 100644
--- a/sal/osl/unx/tempfile.c
+++ b/sal/osl/unx/tempfile.cxx
@@ -217,7 +217,7 @@ static oslFileError osl_create_temp_file_impl_(
 offset_file_name++;
 }
 
-while(1) /* try until success */
+while(true) /* try until success */
 {
 osl_gen_random_name_impl_(&rand_name);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 extensions/source/nsplugin/source/npshell.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit d62b6d845c75e9c6074d821b425035fbee9c1559
Author: Stephan Bergmann 
Date:   Tue May 13 12:38:55 2014 +0200

Related fdo#60338: do not call umask(3) in a MT program

...and it is unclear what this call was supposed to help for; if a user
deliberately sets its umask too strong, then better live with the 
consequences
than to silently "fix" it.

Change-Id: I0d84a7d1bd6f007794a65e1f7cc4ea09ebd9d4af

diff --git a/extensions/source/nsplugin/source/npshell.cxx 
b/extensions/source/nsplugin/source/npshell.cxx
index ae0714b..242c39d 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -772,7 +772,6 @@ NPP_StreamAsFile(NPP instance, NPStream *stream, const 
char* fname)
 return;
 }
 remove(localPathNew);
-umask(0);
 if  (0 > (fdDst = open(localPathNew, O_WRONLY|O_CREAT,
 S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH))){
 close( fdSrc);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 229e85acd222a4ae9647c7a970269c87cb875b40
Author: Stephan Bergmann 
Date:   Tue May 13 12:26:42 2014 +0200

elated fdo#60338: #error on umask(3) calls in currently unused code

(as dnssd_clientstub.c is only used on Windows), should we ever want to use 
it.

Change-Id: I5d9082ae69c505e4d60bbe8e60fdeaaf963a4614

diff --git a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c 
b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c
index 1c4e084..0aa0717 100644
--- a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c
+++ b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c
@@ -621,6 +621,7 @@ static DNSServiceErrorType deliver_request(ipc_msg_hdr 
*hdr, DNSServiceOp *sdr)
 caddr.sun_len = sizeof(struct sockaddr_un);
 #endif
 strcpy(caddr.sun_path, data);
+#error "the below umask(3) calls are bad in a MT program (cf. fdo#60338):"
 mask = umask(0);
 bindresult = bind(listenfd, (struct sockaddr *)&caddr, 
sizeof(caddr));
 umask(mask);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 include/svtools/langtab.hxx |7 +++
 svtools/source/misc/langtab.cxx |6 ++
 2 files changed, 13 insertions(+)

New commits:
commit d0787149cf25377bad97ab503f81a5c0793bbad7
Author: Eike Rathke 
Date:   Tue May 13 12:03:53 2014 +0200

remove SvtLanguageTable::AddLanguageTag from this list

... I'm about to use.

Change-Id: I4f665e14d0d2161085760a6b31f642e0a8a8345b

diff --git a/unusedcode.easy b/unusedcode.easy
index ae0ce4b..646cb1e 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -68,7 +68,6 @@ StyleSettings::SetTitleHeight(long)
 StyleSettings::SetUseFlatBorders(bool)
 StyleSettings::SetUseFlatMenus(bool)
 SvpSalInstance::PostedEventsInQueue()
-SvtLanguageTable::AddLanguageTag(LanguageTag const&, rtl::OUString const&)
 SvtListener::IsListening(SvtBroadcaster&) const
 
SvxDummyShapeContainer::SvxDummyShapeContainer(com::sun::star::uno::Reference)
 SvxNumberFormatShell::IsAdded_Impl(unsigned long)
commit 213e429cfb48510650308975d4adca6ab9aee4f4
Author: Eike Rathke 
Date:   Tue May 13 12:02:42 2014 +0200

Revert "remove unused code -SvtLanguageTable::AddLanguageTag"

This reverts commit d812b784313ed85ae5085d54a3ae50aa064c053c.

I added that code in preparation of changes I'm doing.

diff --git a/include/svtools/langtab.hxx b/include/svtools/langtab.hxx
index 4503d38..0034873 100644
--- a/include/svtools/langtab.hxx
+++ b/include/svtools/langtab.hxx
@@ -43,6 +43,13 @@ public:
  */
 static OUString GetLanguageString( const LanguageType eType, bool 
bUserInterfaceSelection );
 
+/** Add a language tag to the table.
+
+@param  rString
+UI visible description string. If empty, the rLanguageTag Bcp47
+string is used instead.
+ */
+static sal_uInt32   AddLanguageTag( const LanguageTag& rLanguageTag, const 
OUString& rString );
 };
 
 // Add LRE or RLE embedding characters to the string based on the
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index f31ea28..b8eeec0 100644
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.cxx
@@ -233,4 +233,10 @@ LanguageType SvtLanguageTable::GetLanguageTypeAtIndex( 
sal_uInt32 nIndex )
 }
 
 
+sal_uInt32 SvtLanguageTable::AddLanguageTag( const LanguageTag& rLanguageTag, 
const OUString& rString )
+{
+return theLanguageTable::get().AddItem( (rString.isEmpty() ? 
rLanguageTag.getBcp47() : rString),
+rLanguageTag.getLanguageType());
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unusedcode.easy b/unusedcode.easy
index 646cb1e..ae0ce4b 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -68,6 +68,7 @@ StyleSettings::SetTitleHeight(long)
 StyleSettings::SetUseFlatBorders(bool)
 StyleSettings::SetUseFlatMenus(bool)
 SvpSalInstance::PostedEventsInQueue()
+SvtLanguageTable::AddLanguageTag(LanguageTag const&, rtl::OUString const&)
 SvtListener::IsListening(SvtBroadcaster&) const
 
SvxDummyShapeContainer::SvxDummyShapeContainer(com::sun::star::uno::Reference)
 SvxNumberFormatShell::IsAdded_Impl(unsigned long)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - editeng/source include/editeng include/sfx2 include/svl include/svtools include/svx lotuswordpro/source sc/inc sc/source sdext/source svl/source svtools/sou

[Noel Grandin]

 editeng/source/uno/unotext.cxx |6 
 include/editeng/unotext.hxx|1 
 include/sfx2/mnuitem.hxx   |6 
 include/svl/visitem.hxx|2 
 include/svtools/langtab.hxx|7 
 include/svx/svdotext.hxx   |5 
 lotuswordpro/source/filter/lwpfilter.hxx   |   29 --
 sc/inc/column.hxx  |2 
 sc/inc/compressedarray.hxx |8 
 sc/inc/document.hxx|2 
 sc/inc/table.hxx   |3 
 sc/source/core/data/column.cxx |   12 
 sc/source/core/data/column4.cxx|   25 -
 sc/source/core/data/compressedarray.cxx|   19 -
 sc/source/core/data/document.cxx   |   20 -
 sc/source/core/data/table2.cxx |8 
 sc/source/core/data/table7.cxx |8 
 sc/source/filter/excel/excimp8.cxx |   14 -
 sdext/source/minimizer/configurationaccess.cxx |   22 -
 sdext/source/minimizer/configurationaccess.hxx |1 
 svl/source/items/visitem.cxx   |6 
 svtools/source/misc/langtab.cxx|6 
 svx/source/svdraw/svdotext.cxx |   50 ---
 sw/Library_sw.mk   |1 
 sw/inc/accmap.hxx  |2 
 sw/inc/docary.hxx  |2 
 sw/inc/fillattributes.hxx  |2 
 sw/source/core/access/accfield.cxx |  315 -
 sw/source/core/access/accfield.hxx |  175 -
 sw/source/core/access/accmap.cxx   |   38 ---
 sw/source/core/doc/docredln.cxx|   26 --
 sw/source/core/layout/fillattributes.cxx   |   19 -
 sw/source/filter/ww8/docxsdrexport.cxx |5 
 sw/source/filter/ww8/docxsdrexport.hxx |1 
 unusedcode.easy|   19 -
 35 files changed, 4 insertions(+), 863 deletions(-)

New commits:
commit d812b784313ed85ae5085d54a3ae50aa064c053c
Author: Noel Grandin 
Date:   Mon May 12 14:42:57 2014 +0200

remove unused code -SvtLanguageTable::AddLanguageTag

Change-Id: Ibb0dda4b48c711e72574c3f5aec9e3d1186d1526

diff --git a/include/svtools/langtab.hxx b/include/svtools/langtab.hxx
index 0034873..4503d38 100644
--- a/include/svtools/langtab.hxx
+++ b/include/svtools/langtab.hxx
@@ -43,13 +43,6 @@ public:
  */
 static OUString GetLanguageString( const LanguageType eType, bool 
bUserInterfaceSelection );
 
-/** Add a language tag to the table.
-
-@param  rString
-UI visible description string. If empty, the rLanguageTag Bcp47
-string is used instead.
- */
-static sal_uInt32   AddLanguageTag( const LanguageTag& rLanguageTag, const 
OUString& rString );
 };
 
 // Add LRE or RLE embedding characters to the string based on the
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index b8eeec0..f31ea28 100644
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.cxx
@@ -233,10 +233,4 @@ LanguageType SvtLanguageTable::GetLanguageTypeAtIndex( 
sal_uInt32 nIndex )
 }
 
 
-sal_uInt32 SvtLanguageTable::AddLanguageTag( const LanguageTag& rLanguageTag, 
const OUString& rString )
-{
-return theLanguageTable::get().AddItem( (rString.isEmpty() ? 
rLanguageTag.getBcp47() : rString),
-rLanguageTag.getLanguageType());
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unusedcode.easy b/unusedcode.easy
index ae0ce4b..646cb1e 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -68,7 +68,6 @@ StyleSettings::SetTitleHeight(long)
 StyleSettings::SetUseFlatBorders(bool)
 StyleSettings::SetUseFlatMenus(bool)
 SvpSalInstance::PostedEventsInQueue()
-SvtLanguageTable::AddLanguageTag(LanguageTag const&, rtl::OUString const&)
 SvtListener::IsListening(SvtBroadcaster&) const
 
SvxDummyShapeContainer::SvxDummyShapeContainer(com::sun::star::uno::Reference)
 SvxNumberFormatShell::IsAdded_Impl(unsigned long)
commit 8acc97fb46dbb91fdf7e3ee64befed3a9a09a38f
Author: Noel Grandin 
Date:   Mon May 12 12:58:25 2014 +0200

remove dead code in SW

Change-Id: Ifda459ea8863d923b211ca3022355b5941a74bfe

diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index aacfcc0..6e349b4 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -207,8 +207,6 @@ public:
 
 void InvalidateCursorPosition( const SwFrm *pFrm );
 void InvalidateFocus();
-void FirePageChangeEvent(sal_uInt16 nOldPage, sal_uInt16 nNewPage);
-void FireColumnChangeEvent(sal_uInt16 nOldColumn, sal_uInt16 nNewColumn);
 void SetCursorContext(
 const ::rtl::Reference < SwAccessibleContext >& rCursorContext );
 
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index f3615a6..f628fb2 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -205,11 +205,9

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

[Matúš Kukan]

 sal/osl/w32/socket.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fd4c3670dc509f3e10132106475c3dc414f91412
Author: Matúš Kukan 
Date:   Tue May 13 11:52:42 2014 +0200

include sal/log.hxx here

Change-Id: Iefcae15eb9f456cde933d49e1c118185883cd27c

diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx
index d215ff8..86f455e 100644
--- a/sal/osl/w32/socket.cxx
+++ b/sal/osl/w32/socket.cxx
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "sockimpl.h"
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 shell/source/unix/sysshell/recently_used_file.cxx |   13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 8fd54c107a01f98cf9c731104b0d3eaa2b85bfa4
Author: Stephan Bergmann 
Date:   Tue May 13 11:39:30 2014 +0200

Related fdo#60338: Do not use umask(3) in a MT program

Change-Id: Ie515201e44ad58faf623a04981e891c0b3f4a19d

diff --git a/shell/source/unix/sysshell/recently_used_file.cxx 
b/shell/source/unix/sysshell/recently_used_file.cxx
index 2bce26c..2189d0b 100644
--- a/shell/source/unix/sysshell/recently_used_file.cxx
+++ b/shell/source/unix/sysshell/recently_used_file.cxx
@@ -63,13 +63,12 @@ recently_used_file::recently_used_file() :
 OString tmp =
 OUStringToOString(rufn, osl_getThreadTextEncoding());
 
-file_ = fopen(tmp.getStr(), "r+");
-
-/* create if not exist */
-if (NULL == file_) {
-mode_t umask_ = umask(S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH);
-file_ = fopen(tmp.getStr(), "w+");
-umask(umask_);
+int fd = open(tmp.getStr(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
+if (fd != -1) {
+file_ = fdopen(fd, "w+");
+if (file_ == 0) {
+close(fd);
+}
 }
 
 if (NULL == file_)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Matúš Kukan]

 external/lcms2/ExternalPackage_lcms2.mk |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit b3ddc791546784bab602f678d07ac3538b034b4d
Author: Matúš Kukan 
Date:   Tue May 13 11:36:37 2014 +0200

no lcms2d.dll nowadays, there is only lcms2.dll

Change-Id: I0d6537da5d605a011bd9b4491c472b0b58fcd668

diff --git a/external/lcms2/ExternalPackage_lcms2.mk 
b/external/lcms2/ExternalPackage_lcms2.mk
index 59e5f62..06339c5 100644
--- a/external/lcms2/ExternalPackage_lcms2.mk
+++ b/external/lcms2/ExternalPackage_lcms2.mk
@@ -18,9 +18,7 @@ else ifeq ($(OS),WNT)
 ifeq ($(COM),GCC)
 $(eval $(call 
gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2-2.dll,src/.libs/liblcms2-2.dll))
 else ifeq ($(COM),MSC)
-# note: the lcms2d.lib references LCMS2.DLL (without D!) but the dll is
-# actually called LCMS2D.DLL then
-$(eval $(call 
gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/lcms2.dll,bin/lcms2$(if 
$(MSVC_USE_DEBUG_RUNTIME),d).dll))
+$(eval $(call 
gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/lcms2.dll,bin/lcms2.dll))
 endif # $(COM)
 else  # $(OS) != WNT/MACOSX
 $(eval $(call 
gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2.so.2,src/.libs/liblcms2.so.2.0.6))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 bridges/source/cpp_uno/shared/vtablefactory.cxx |4 
 idlc/source/idlccompile.cxx |4 
 2 files changed, 8 deletions(-)

New commits:
commit 0c493207723516586882e53c532dc977a1deec32
Author: Stephan Bergmann 
Date:   Tue May 13 10:51:04 2014 +0200

Revert "CID#705985 ensure umask for mkstemp"

This reverts commit 5f5a981dd6df406b7bbddd88fa0b701b5a8d2246.  Coverity 
warning
about mkstemp without umask appears to be bogus (cf.
 "Why are uses of mkstemp
'without securely setting umask first' being flagged?) and calling umask is 
not
MT-safe, see fdo#60338 "FILESAVE: Saved files have incorrect permissions on
linux."

diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx
index bbd080f..c88cac7 100644
--- a/idlc/source/idlccompile.cxx
+++ b/idlc/source/idlccompile.cxx
@@ -38,8 +38,6 @@
 #else
 #include 
 #endif
-#include 
-#include 
 #endif
 
 #include 
@@ -156,9 +154,7 @@ OString makeTempName(const OString& prefix)
 strncat(tmpFilePattern, "XX", 
sizeof(tmpFilePattern)-1-strlen(tmpFilePattern));
 
 #ifdef SAL_UNX
-mode_t nOrigMode = umask(S_IRWXG | S_IRWXO);
 int nDescriptor = mkstemp(tmpFilePattern);
-umask(nOrigMode);
 if( -1 == nDescriptor )
 {
 fprintf(stderr, "idlc: mkstemp(\"%s\") failed: %s\n", tmpFilePattern, 
strerror(errno));
commit 96b129052e280e094b6a150b185f9e8285cecca4
Author: Stephan Bergmann 
Date:   Tue May 13 10:46:00 2014 +0200

Revert "CID#705982 ensure umask for mkstemp"

This reverts commit 9ab99483808bad973363f1f27bb548c8628ace1d.  Coverity 
warning
about mkstemp without umask appears to be bogus (cf.
 "Why are uses of mkstemp
'without securely setting umask first' being flagged?) and calling umask is 
not
MT-safe, see fdo#60338 "FILESAVE: Saved files have incorrect permissions on
linux."

diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx 
b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index f6e9e7c..2589f64 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -60,8 +60,6 @@
 
 #if defined USE_DOUBLE_MMAP
 #include 
-#include 
-#include 
 #endif
 
 using bridges::cpp_uno::shared::VtableFactory;
@@ -241,7 +239,6 @@ bool VtableFactory::createBlock(Block &block, sal_Int32 
slotCount) const
 if (aSecurity.getHomeDir(strURLDirectory))
 osl::File::getSystemPathFromFileURL(strURLDirectory, strDirectory);
 
-mode_t nOrigMode = umask(S_IRWXG | S_IRWXO);
 for (int i = strDirectory.isEmpty() ? 1 : 0; i < 2; ++i)
 {
 if (strDirectory.isEmpty())
@@ -293,7 +290,6 @@ bool VtableFactory::createBlock(Block &block, sal_Int32 
slotCount) const
 
 strDirectory = OUString();
 }
-umask(nOrigMode);
 if (!block.start || !block.exec || block.fd == -1)
 {
//Fall back to non-doublemmaped allocation
___
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

[bugzilla-daemon]

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

tommy27  changed:

   What|Removed |Added

 Depends on|59288   |

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

[bugzilla-daemon]

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

tommy27  changed:

   What|Removed |Added

 Depends on||59288

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

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

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

tommy27  changed:

   What|Removed |Added

 Depends on|72075   |

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

[bugzilla-daemon]

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

tommy27  changed:

   What|Removed |Added

 Depends on||72075

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

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

[Stephan Bergmann]

 include/osl/detail/file.h|   18 --
 sal/osl/unx/file.cxx |5 +++--
 sal/osl/unx/file_impl.hxx|5 +
 sal/osl/unx/file_misc.cxx|4 ++--
 sal/osl/unx/file_stat.cxx|1 -
 sal/qa/osl/file/osl_File.cxx |1 -
 6 files changed, 10 insertions(+), 24 deletions(-)

New commits:
commit 9a8411d3b13a4e3675f99f36d5b6e81c5eace9b6
Author: Stephan Bergmann 
Date:   Tue May 13 10:43:15 2014 +0200

osl_openFilePath is internal sal/osl/unx functionality

Change-Id: I14e4d08f209e3d6a444d6c09f9ffb9c178d8731d

diff --git a/include/osl/detail/file.h b/include/osl/detail/file.h
index ddcc47e..96d8807 100644
--- a/include/osl/detail/file.h
+++ b/include/osl/detail/file.h
@@ -12,36 +12,18 @@
 
 #include 
 
-#include 
-
-#include 
-#include 
-
 /** @cond INTERNAL */
 
 /* Some additions to the osl file functions for LibreOffice internal
use. Needed for details in the Android support.
  */
 
-#if defined __cplusplus
-extern "C" {
-#endif
-
 /* More flags needed for semantics that match the open() call that
used to be in SvFileStream::Open().
 */
 #define osl_File_OpenFlag_Trunc 0x0010L
 #define osl_File_OpenFlag_NoExcl0x0020L
 
-SAL_DLLPUBLIC oslFileError SAL_CALL osl_openFilePath(
-const char *cpFilePath,
-oslFileHandle* pHandle,
-sal_uInt32 uFlags );
-
-#if defined __cplusplus
-}
-#endif
-
 /** @endcond */
 
 #endif /* INCLUDED_OSL_DETAIL_FILE_H */
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 330f194..72fda5a 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -33,6 +33,7 @@
 #include "system.h"
 #include "createfilehandlefromfd.hxx"
 #include "file_error_transl.h"
+#include "file_impl.hxx"
 #include "file_url.h"
 #include "uunxapi.h"
 
@@ -820,7 +821,7 @@ openMemoryAsFile( void *address, size_t size, oslFileHandle 
*pHandle, const char
 #endif
 
 oslFileError
-SAL_CALL osl_openFilePath( const char *cpFilePath, oslFileHandle* pHandle, 
sal_uInt32 uFlags )
+openFilePath( const char *cpFilePath, oslFileHandle* pHandle, sal_uInt32 
uFlags )
 {
 oslFileError eRet;
 
@@ -1015,7 +1016,7 @@ SAL_CALL osl_openFile( rtl_uString* ustrFileURL, 
oslFileHandle* pHandle, sal_uIn
 return oslTranslateFileError (OSL_FET_ERROR, errno);
 #endif /* MACOSX */
 
-return osl_openFilePath (buffer, pHandle, uFlags);
+return openFilePath (buffer, pHandle, uFlags);
 }
 
 oslFileError
diff --git a/sal/osl/unx/file_impl.hxx b/sal/osl/unx/file_impl.hxx
index 7d90b3d..db8ce4e 100644
--- a/sal/osl/unx/file_impl.hxx
+++ b/sal/osl/unx/file_impl.hxx
@@ -43,6 +43,11 @@ struct DirectoryItem_Impl
 oslFileType getFileType() const;
 };
 
+oslFileError openFilePath(
+const char *cpFilePath,
+oslFileHandle* pHandle,
+sal_uInt32 uFlags );
+
 #endif /* INCLUDED_FILE_IMPL_HXX */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index f238f28..7662d9f 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -915,11 +915,11 @@ static int oslDoCopyFile(const sal_Char* 
pszSourceFileName, const sal_Char* pszD
 int DestFileFD=0;
 int nRet=0;
 
-if (osl_openFilePath(pszSourceFileName,
+if (openFilePath(pszSourceFileName,
  &SourceFileFH,
  
osl_File_OpenFlag_Read|osl_File_OpenFlag_NoLock|osl_File_OpenFlag_NoExcl) != 
osl_File_E_None)
 {
-// Let's hope errno is still set relevantly after osl_openFilePath...
+// Let's hope errno is still set relevantly after openFilePath...
 nRet=errno;
 return nRet;
 }
diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx
index 6c5f6a6..ce6c5d9 100644
--- a/sal/osl/unx/file_stat.cxx
+++ b/sal/osl/unx/file_stat.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "osl/file.h"
-#include "osl/detail/file.h"
 
 #include "system.h"
 #include 
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 0a387e8..ba0a3a0 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -26,7 +26,6 @@
 #include "osl/thread.h"
 
 #include 
-#include 
 #include 
 
 #include 
___
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

[bugzilla-daemon]

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

Bug 60270 depends on bug 40788, which changed state.

Bug 40788 Summary: FORMATTING - Calc ignores manual breaks when "fit to number 
of pages" is chosen
https://bugs.freedesktop.org/show_bug.cgi?id=40788

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |FIXED

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

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

[Jacobo Aragunde Pérez]

 include/oox/drawingml/shape3dproperties.hxx |9 +
 include/oox/export/drawingml.hxx|4 
 oox/source/drawingml/scene3dcontext.cxx |7 
 oox/source/drawingml/shape.cxx  |2 
 oox/source/drawingml/shape3dproperties.cxx  |   72 
+-
 oox/source/export/drawingml.cxx |   71 
+
 sw/qa/extras/ooxmlexport/data/shape-3d-effect-preservation.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx |   27 +++
 8 files changed, 181 insertions(+), 11 deletions(-)

New commits:
commit fe88fac28afac3ec0b837c1e2e38d9f8cf152080
Author: Jacobo Aragunde Pérez 
Date:   Mon May 12 19:18:05 2014 +0200

oox: Use references to prevent unnecessary object copies

Change-Id: I5113bc581a8ac98b97c6598a5355e050c7ad7860

diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 852387d..2b3eb9e 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -123,8 +123,8 @@ public:
 OUString WriteImage( const Graphic &rGraphic , bool bRelPathToMedia = 
false);
 
 void WriteColor( sal_uInt32 nColor, sal_Int32 nAlpha = MAX_PERCENT );
-void WriteColor( const OUString& sColorSchemeName, 
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > 
aTransformations );
-void WriteColorTransformations( ::com::sun::star::uno::Sequence< 
::com::sun::star::beans::PropertyValue > aTransformations );
+void WriteColor( const OUString& sColorSchemeName, const 
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& 
aTransformations );
+void WriteColorTransformations( const ::com::sun::star::uno::Sequence< 
::com::sun::star::beans::PropertyValue >& aTransformations );
 void WriteGradientStop( sal_uInt16 nStop, sal_uInt32 nColor );
 void WriteLineArrow( ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySet > rXPropSet, bool bLineStart );
 void WriteConnectorConnections( EscherConnectorListEntry& rConnectorEntry, 
sal_Int32 nStartID, sal_Int32 nEndID );
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 99deb82..eff1d2b 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -181,7 +181,7 @@ void DrawingML::WriteColor( sal_uInt32 nColor, sal_Int32 
nAlpha )
 }
 }
 
-void DrawingML::WriteColor( const OUString& sColorSchemeName, Sequence< 
PropertyValue > aTransformations )
+void DrawingML::WriteColor( const OUString& sColorSchemeName, const Sequence< 
PropertyValue >& aTransformations )
 {
 // prevent writing a tag with empty val attribute
 if( sColorSchemeName.isEmpty() )
@@ -201,7 +201,7 @@ void DrawingML::WriteColor( const OUString& 
sColorSchemeName, Sequence< Property
   FSEND );
 }
 
-void DrawingML::WriteColorTransformations( Sequence< PropertyValue > 
aTransformations )
+void DrawingML::WriteColorTransformations( const Sequence< PropertyValue >& 
aTransformations )
 {
 for( sal_Int32 i = 0; i < aTransformations.getLength(); i++ )
 {
commit 4b4f7e17ad5571482111f1574f7e4b313531cfde
Author: Jacobo Aragunde Pérez 
Date:   Mon May 12 19:13:06 2014 +0200

ooxml: Preserve shape 3d effects: extrusion and contour colors

Shapes 3D effects can specify colors for extrusion and contours like
in the following example:

  

  


  


  

  

Colors can be theme-defined or set in RGB and can contain
transformations.

This patch preserves all the color information using the shape grab
bag and modifies an existing unit test to add this check.

Change-Id: Ida168affd4ca2135d0bd8f97135dc1cd1e74165a

diff --git a/include/oox/drawingml/shape3dproperties.hxx 
b/include/oox/drawingml/shape3dproperties.hxx
index e57ac94..5c3eaa0 100644
--- a/include/oox/drawingml/shape3dproperties.hxx
+++ b/include/oox/drawingml/shape3dproperties.hxx
@@ -64,6 +64,8 @@ struct Shape3DProperties
 OptValue< sal_Int32 > mnContourW;
 OptValue< sal_Int32 > mnShapeZ;
 OptValue< sal_Int32 > mnMaterial;
+Color maExtrusionColor;
+Color maContourColor;
 
 OptValue< BevelProperties > maTopBevelProperties;
 OptValue< BevelProperties > maBottomBevelProperties;
@@ -79,8 +81,11 @@ struct Shape3DProperties
 
 css::uno::Sequence< css::beans::PropertyValue > getCameraAttributes();
 css::uno::Sequence< css::beans::PropertyValue > getLightRigAttributes();
-css::uno::Sequence< css::beans::PropertyValue > getShape3DAttributes();
+css::uno::Sequence< css::beans::PropertyValue > getShape3DAttributes(
+const GraphicHelper& rGraphicHelper, sal_Int32 rPhClr = 
API_RGB_TRANSPARENT );
 css::uno::Sequence< css::beans::PropertyValue > getBevelAttributes( 
Be

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

[Miklos Vajna]

 sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
 sw/source/filter/ww8/docxattributeoutput.hxx |2 +-
 sw/source/filter/ww8/docxexport.cxx  |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ac9f7c8d1abffe882093f93ea70dc5e31d28a7a2
Author: Miklos Vajna 
Date:   Tue May 13 10:19:25 2014 +0200

DocxAttributeOutput: ClearGraphicCache() -> ClearRelIdCache()

Because rel ids are used not only for graphics.

Change-Id: I9d0fd7196a1b8e0494d850197cb50fc8098eff82

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index c84d2e6..2d30749 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3567,7 +3567,7 @@ void DocxAttributeOutput::WriteSrcRect(const SdrObject* 
pSdrObj )
 }
 }
 
-void DocxAttributeOutput::ClearGraphicCache()
+void DocxAttributeOutput::ClearRelIdCache()
 {
 m_aRelIdCache.clear();
 }
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 81305ba..c5dac2d 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -358,7 +358,7 @@ public:
 
 void WriteBookmarks_Impl( std::vector< OUString >& rStarts, std::vector< 
OUString >& rEnds );
 void WriteAnnotationMarks_Impl( std::vector< OUString >& rStarts, 
std::vector< OUString >& rEnds );
-void ClearGraphicCache();
+void ClearRelIdCache();
 
 private:
 /// Initialize the structures where we are going to collect some of the 
paragraph properties.
diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index f8500e4..28db5ec 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -713,7 +713,7 @@ void DocxExport::WriteHeaderFooter( const SwFmt& rFmt, bool 
bHeader, const char*
 
 //When the stream changes the cache which is maintained for the graphics 
in case of alternate content is not cleared.
 //So clearing the alternate content graphic cache.
-m_pAttrOutput->ClearGraphicCache();
+m_pAttrOutput->ClearRelIdCache();
 
 // switch the serializer back
 m_pAttrOutput->SetSerializer( m_pDocumentFS );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ravindra Vidhate]

 sw/qa/extras/ooxmlexport/data/fdo78420.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   15 +++
 sw/source/filter/ww8/docxattributeoutput.cxx |5 +
 sw/source/filter/ww8/docxattributeoutput.hxx |1 +
 sw/source/filter/ww8/docxexport.cxx  |4 
 5 files changed, 25 insertions(+)

New commits:
commit c00690d2e579607bb0d8a3582580bd875225bffb
Author: Ravindra Vidhate 
Date:   Thu May 8 20:32:56 2014 +0530

fdo#78420  File is getting corrupted after exported from LO.

It is not creating .rels file for Header3.xml. While the Header3.xml 
contains the images.

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

diff --git a/sw/qa/extras/ooxmlexport/data/fdo78420.docx 
b/sw/qa/extras/ooxmlexport/data/fdo78420.docx
new file mode 100644
index 000..6b253b1
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo78420.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index e2c7e58..4919d01 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3283,6 +3283,21 @@ DECLARE_OOXMLEXPORT_TEST(testContentTypeOLE, 
"fdo77759.docx")
 "/word/embeddings/oleObject1.xlsx");
 }
 
+DECLARE_OOXMLEXPORT_TEST(testfdo78420, "fdo78420.docx")
+{
+xmlDocPtr pXmlHeader = parseExport("word/header3.xml");
+
+if (!pXmlHeader)
+   return;
+
+xmlDocPtr pXmlHeaderRels = parseExport("word/_rels/header3.xml.rels");
+if(!pXmlHeaderRels)
+   return;
+
+
assertXPath(pXmlHeaderRels,"/rels:Relationships/rels:Relationship[1]","Id","rId1");
+}
+
+
 DECLARE_OOXMLEXPORT_TEST(testPageBreakInFirstPara,"fdo77727.docx")
 {
 /* Break to next page was not exported if it is in first paragraph of the 
section.
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index e969c0c..c84d2e6 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3567,6 +3567,11 @@ void DocxAttributeOutput::WriteSrcRect(const SdrObject* 
pSdrObj )
 }
 }
 
+void DocxAttributeOutput::ClearGraphicCache()
+{
+m_aRelIdCache.clear();
+}
+
 void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const 
Size& rSize, const SwFlyFrmFmt* pOLEFrmFmt, SwOLENode* pOLENode, const 
SdrObject* pSdrObj )
 {
 OSL_TRACE( "TODO DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* 
pGrfNode, const Size& rSize, const SwFlyFrmFmt* pOLEFrmFmt, SwOLENode* 
pOLENode, const SdrObject* pSdrObj  ) - some stuff still missing" );
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index ba26fba..81305ba 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -358,6 +358,7 @@ public:
 
 void WriteBookmarks_Impl( std::vector< OUString >& rStarts, std::vector< 
OUString >& rEnds );
 void WriteAnnotationMarks_Impl( std::vector< OUString >& rStarts, 
std::vector< OUString >& rEnds );
+void ClearGraphicCache();
 
 private:
 /// Initialize the structures where we are going to collect some of the 
paragraph properties.
diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index c3a6ddf..f8500e4 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -711,6 +711,10 @@ void DocxExport::WriteHeaderFooter( const SwFmt& rFmt, 
bool bHeader, const char*
 // do the work
 WriteHeaderFooterText( rFmt, bHeader );
 
+//When the stream changes the cache which is maintained for the graphics 
in case of alternate content is not cleared.
+//So clearing the alternate content graphic cache.
+m_pAttrOutput->ClearGraphicCache();
+
 // switch the serializer back
 m_pAttrOutput->SetSerializer( m_pDocumentFS );
 m_pVMLExport->SetFS( m_pDocumentFS );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 filter/source/flash/swfwriter1.cxx |   30 ++
 1 file changed, 14 insertions(+), 16 deletions(-)

New commits:
commit f4dd7d548ea80c00aed02e10dd8f27d324dd5855
Author: Noel Grandin 
Date:   Tue May 13 10:16:00 2014 +0200

improve some spelling and grammar

Change-Id: Ieee3f787d41f9540b9c369f93da7f7ebbe371999

diff --git a/filter/source/flash/swfwriter1.cxx 
b/filter/source/flash/swfwriter1.cxx
index 1a7e62f..89e5e97 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -118,8 +118,6 @@ sal_Int32 Writer::mapRelative( sal_Int32 n100thMM ) const
 
 
 
-/**
-*/
 void Writer::Impl_addPolygon( BitStream& rBits, const Polygon& rPoly, bool 
bFilled )
 {
 Point aLastPoint( rPoly[0] );
@@ -175,7 +173,7 @@ void Writer::Impl_addPolygon( BitStream& rBits, const 
Polygon& rPoly, bool bFill
 
 
 
-/** exports a style change record with a move to (x,y) and depending on 
bFilled a line style 1 or fill style 1
+/** Exports a style change record with a move to (x,y) and depending on 
bFilled a line style 1 or fill style 1
 */
 void Writer::Impl_addShapeRecordChange( BitStream& rBits, sal_Int16 dx, 
sal_Int16 dy, bool bFilled )
 {
@@ -198,7 +196,7 @@ void Writer::Impl_addShapeRecordChange( BitStream& rBits, 
sal_Int16 dx, sal_Int1
 
 
 
-/** exports a straight edge record
+/** Exports a straight edge record
 */
 void Writer::Impl_addStraightEdgeRecord( BitStream& rBits, sal_Int16 dx, 
sal_Int16 dy )
 {
@@ -232,7 +230,7 @@ void Writer::Impl_addStraightEdgeRecord( BitStream& rBits, 
sal_Int16 dx, sal_Int
 
 
 
-/** exports a curved edge record
+/** Exports a curved edge record
 */
 void Writer::Impl_addCurvedEdgeRecord( BitStream& rBits, sal_Int16 control_dx, 
sal_Int16 control_dy, sal_Int16 anchor_dx, sal_Int16 anchor_dy )
 {
@@ -255,7 +253,7 @@ void Writer::Impl_addCurvedEdgeRecord( BitStream& rBits, 
sal_Int16 control_dx, s
 
 
 
-/** exports a end shape record
+/** Exports a end shape record
 */
 void Writer::Impl_addEndShapeRecord( BitStream& rBits )
 {
@@ -328,7 +326,7 @@ void Writer::Impl_writePolyPolygon( const PolyPolygon& 
rPolyPoly, bool bFilled,
 
 
 
-/** a gradient is a transition from one color to another, rendered inside a 
given polypolygon */
+/** A gradient is a transition from one color to another, rendered inside a 
given polypolygon */
 void Writer::Impl_writeGradientEx( const PolyPolygon& rPolyPoly, const 
Gradient& rGradient )
 {
 if( rPolyPoly.Count() )
@@ -591,7 +589,7 @@ void Writer::Impl_writeText( const Point& rPos, const 
OUString& rText, const sal
 
 // write text element
 
-#if 0 // makes the calculated bound rect visible for debuging
+#if 0 // makes the calculated bound rect visible for debugging
 {
 Polygon aTmpPoly( aPoly );
 sal_uInt16 nID = FlashGeometryExporter::writePolygonShape( 
aMovieStream, aTmpPoly, false, Color(COL_MAGENTA), Color(COL_MAGENTA), 
mpClipPolyPolygon  );
@@ -600,7 +598,7 @@ void Writer::Impl_writeText( const Point& rPos, const 
OUString& rText, const sal
 #endif
 
 // CL: This is still a hack until we figure out how to calculate a 
correct bound rect
-// for rotatet text
+// for rotated text
 Rectangle textBounds( 0, 0, static_cast(mnDocWidth*mnDocXScale), 
static_cast(mnDocHeight*mnDocYScale) );
 double scale = 1.0;
 
@@ -806,7 +804,7 @@ sal_uInt16 Writer::defineBitmap( const BitmapEx &bmpSource, 
sal_Int32 nJPEGQuali
 // AS: OK, we have a good image, so now we decide whether or not to JPEG 
it or
 //  or Lossless compress it.
 
-//Figure out lossless size
+// Figure out lossless size
 sal_uInt8 *pImageData, *pAlphaData;
 sal_uInt32 width, height;
 
@@ -843,7 +841,7 @@ sal_uInt16 Writer::defineBitmap( const BitmapEx &bmpSource, 
sal_Int32 nJPEGQuali
 #endif
 }
 
-//Figure out JPEG size
+// Figure out JPEG size
 const sal_uInt8* pJpgData = NULL;;
 sal_uInt32 nJpgDataLength = 0x;
 
@@ -914,7 +912,7 @@ void Writer::Impl_writeImage( const BitmapEx& rBmpEx, const 
Point& rPt, const Si
 
 Rectangle cropRect(destRect);
 
-// AS: The bmp origion is always 0,0 so we have to adjust before 
we crop.
+// AS: The bmp origin is always 0,0 so we have to adjust before we 
crop.
 cropRect.Move(-srcPt.X(), -srcPt.Y());
 // AS: Rectangle has no scale function (?!) so I do it manually...
 Rectangle cropPixelRect(static_cast(cropRect.Left()*XScale),
@@ -963,7 +961,7 @@ void Writer::Impl_writeImage( const BitmapEx& rBmpEx, const 
Point& rPt, const Si
 Polygon aPoly( destRect );
 
 // AS: Since images are being cropped now, no translation is 
normally necessary.
-//  However, some things like graphical bullet points are still 
get translated.
+//  However, some things like graphical bullet points still get 
translated.
 ::basegfx::B2DHomMatrix m; // #i73264#

Re: Access2Base - New release

[Lionel Elie Mamane]

On Sun, May 11, 2014 at 03:37:28PM +0200, Jean-Pierre Ledure wrote:
> A new release of the Access2Base library (V1.1.0) has been pushed to master.
> https://gerrit.libreoffice.org/9303

Let's say will be soon :)

> Its main purpose is to get rid of the previous limitations: (...)
> Additionally the OpenDatabase method allows dynamic data access
> (...)

These look like cool new features.

> Now my question.
> Soon all users of AOO and of LO 4.1 or before will benefit of the new
> version by downloading it from their respective extensions download centers.
> I presume it is compliant with the LO release policy to push the same patch
> also to the LO 4.2 branch ?

I don't think so; no new features, only bugfixes.

Can't an "installation as extension" override the bundled one, or
something like that?

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

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

[Stephan Bergmann]

 include/osl/detail/file.h |5 -
 sal/osl/unx/file.cxx  |   15 ---
 sal/osl/w32/file.cxx  |   15 ---
 sal/util/sal.map  |5 -
 4 files changed, 40 deletions(-)

New commits:
commit 416543e829922f117ee5dc15125b470099c9e148
Author: Stephan Bergmann 
Date:   Tue May 13 10:05:36 2014 +0200

All three uses of osl_getFileOSHandle have been removed again

...introduced with a64db11b6ca1c0c99937cd99129758dbbe575ac2 "Add some 
non-public
API to be used by SvFileStream" and e541105b45d5da8df29688394e3a0297a2e7
"Use osl API to access files in the SvFileStream code" but subsequently
identified as dead code with ab02fa6552fb098990e74f2787cf02b01c0e532b
"callcatcher: update list," 05a8216d03b5db559e01dd1808f2805df31c970a
"STAR_ENABLE_FILE_LOCKING was a secret," and
1d3483ed279982278b2f9fb1bab63485523e48c5 "Remove some unused code from
unusedcode.easy."

Change-Id: I9c8584890270a87e58b8d8021080ffe54bc97b93

diff --git a/include/osl/detail/file.h b/include/osl/detail/file.h
index a3cfc73..ddcc47e 100644
--- a/include/osl/detail/file.h
+++ b/include/osl/detail/file.h
@@ -38,11 +38,6 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_openFilePath(
 oslFileHandle* pHandle,
 sal_uInt32 uFlags );
 
-/*  Get the OS specific "handle" of an open file. */
-SAL_DLLPUBLIC oslFileError SAL_CALL osl_getFileOSHandle(
-oslFileHandle Handle,
-sal_IntPtr *piFileHandle );
-
 #if defined __cplusplus
 }
 #endif
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 99fee40..330f194 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -1081,21 +1081,6 @@ SAL_CALL osl_syncFile(oslFileHandle Handle)
 }
 
 oslFileError
-SAL_CALL osl_getFileOSHandle(
-oslFileHandle Handle,
-sal_IntPtr *piFileHandle )
-{
-FileHandle_Impl* pImpl = static_cast(Handle);
-
-if (0 == pImpl || pImpl->m_kind != FileHandle_Impl::KIND_FD || -1 == 
pImpl->m_fd)
-return osl_File_E_INVAL;
-
-*piFileHandle = pImpl->m_fd;
-
-return osl_File_E_None;
-}
-
-oslFileError
 SAL_CALL osl_mapFile (
 oslFileHandle Handle,
 void**ppAddr,
diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index d51c243..1d13804 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -751,21 +751,6 @@ SAL_CALL osl_syncFile(oslFileHandle Handle)
 }
 
 oslFileError
-SAL_CALL osl_getFileOSHandle(
-oslFileHandle  Handle,
-sal_IntPtr*piFileHandle )
-{
-FileHandle_Impl* pImpl = static_cast(Handle);
-
-if (0 == pImpl || !IsValidHandle(pImpl->m_hFile))
-return osl_File_E_INVAL;
-
-*piFileHandle = (sal_IntPtr) pImpl->m_hFile;
-
-return osl_File_E_None;
-}
-
-oslFileError
 SAL_CALL osl_closeFile(oslFileHandle Handle)
 {
 FileHandle_Impl * pImpl = static_cast(Handle);
diff --git a/sal/util/sal.map b/sal/util/sal.map
index 8380e7e..e601c6d 100644
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -706,11 +706,6 @@ PRIVATE_textenc.1 { # LibreOffice 3.6
 _ZN3sal6detail7textenc37handleBadInputUnicodeToTextConversion*;
 };
 
-PRIVATE_file.1 { # LibreOffice 3.6
-global:
-osl_getFileOSHandle;
-};
-
 # Unique libstdc++ symbols:
 GLIBCXX_3.4 {
 global:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 i18npool/Library_localedata_others.mk  |1 
 i18npool/source/localedata/data/mos_BF.xml |  370 +
 i18npool/source/localedata/localedata.cxx  |3 
 3 files changed, 373 insertions(+), 1 deletion(-)

New commits:
commit 6e2818a1f8304562ec393f6d84c237596657b54f
Author: Eike Rathke 
Date:   Tue May 13 10:04:37 2014 +0200

add DateAcceptancePattern M/D for [mos-BF], fdo#78647

Change-Id: I79af7fdd7bc6b4c95f4b018a373d8a4685226abd

diff --git a/i18npool/source/localedata/data/mos_BF.xml 
b/i18npool/source/localedata/data/mos_BF.xml
index 4e87f5b..f6ba0ad 100644
--- a/i18npool/source/localedata/data/mos_BF.xml
+++ b/i18npool/source/localedata/data/mos_BF.xml
@@ -43,6 +43,7 @@
 metric
   
   
+M/D
 
   General
 
commit 2e687884e7e48fab4ef319edcfc7579e55546067
Author: Eike Rathke 
Date:   Tue May 13 10:01:29 2014 +0200

add locale data for Moore in Burkina Faso [mos-BF], fdo#78647

Change-Id: If6f3134b74c0ef6ca3caf3c508bbcc163d6196fa

diff --git a/i18npool/Library_localedata_others.mk 
b/i18npool/Library_localedata_others.mk
index 03447dc..59fe317 100644
--- a/i18npool/Library_localedata_others.mk
+++ b/i18npool/Library_localedata_others.mk
@@ -79,6 +79,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,localedata_others,\
CustomTarget/i18npool/localedata/localedata_mkw_CG \
CustomTarget/i18npool/localedata/localedata_ml_IN \
CustomTarget/i18npool/localedata/localedata_mn_Cyrl_MN \
+   CustomTarget/i18npool/localedata/localedata_mos_BF \
CustomTarget/i18npool/localedata/localedata_mr_IN \
CustomTarget/i18npool/localedata/localedata_ms_MY \
CustomTarget/i18npool/localedata/localedata_my_MM \
diff --git a/i18npool/source/localedata/localedata.cxx 
b/i18npool/source/localedata/localedata.cxx
index 7e96519..3573adc 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -288,7 +288,8 @@ static const struct {
 { "ar_KW",  lcl_DATA_OTHERS },
 { "bm_ML",  lcl_DATA_OTHERS },
 { "pui_CO", lcl_DATA_OTHERS },
-{ "lgr_SB", lcl_DATA_OTHERS }
+{ "lgr_SB", lcl_DATA_OTHERS },
+{ "mos_BF", lcl_DATA_OTHERS }
 };
 
 #else
commit 33fcda6de72781dcd11fefcfff5079f4f69998ca
Author: David Delma 
Date:   Tue May 13 09:35:26 2014 +0200

locale data for Moore in Burkina Faso [mos-BF], fdo#78647

Change-Id: Ice37ec78078e078d9b2f530b0ebfe53f12c6aed8

diff --git a/i18npool/source/localedata/data/mos_BF.xml 
b/i18npool/source/localedata/data/mos_BF.xml
new file mode 100644
index 000..4e87f5b
--- /dev/null
+++ b/i18npool/source/localedata/data/mos_BF.xml
@@ -0,0 +1,369 @@
+
+
+
+
+  
+
+  mos
+  Mòoré
+
+
+  BF
+  Burkina Faso
+
+  
+  
+
+  /
+   
+  ,
+  :
+  ,
+  ;
+   
+   
+   
+  , 
+
+
+  '
+  '
+  "
+  "
+
+AM
+PM
+metric
+  
+  
+
+  General
+
+
+  0
+
+
+  0,00
+
+
+  # ##0
+
+
+  # ##0,00
+
+
+  # ###,00
+
+
+  0,00E+00
+
+
+  0,00E+000
+
+
+  0%
+
+
+  0,00%
+
+
+  # ##0 [CURRENCY];-[CURRENCY] # ##0
+
+
+  # ##0,00 [CURRENCY];-[CURRENCY] # ##0,00
+
+
+  # ##0 [CURRENCY];[RED]-[CURRENCY] # ##0
+
+
+  # ##0,00 [CURRENCY];[RED]-[CURRENCY] # ##0,00
+
+
+  # ##0,00 CCC
+
+
+  # ##0,-- [CURRENCY];[RED]-[CURRENCY] # ##0,--
+
+
+  YY/MM/DD
+
+
+  DD  
+
+
+  YY/MM/DD
+
+
+  /MM/DD
+
+
+  D MMM YY
+
+
+  D MMM 
+
+
+  D MMM 
+
+
+  D  
+
+
+  D  
+
+
+  NN DD/MMM/YY
+
+
+  NN D MMM YY
+
+
+  NN D  
+
+
+  D  
+
+
+  MM/DD
+
+
+  YY-MM-DD
+  ISO 8601
+
+
+  -MM-DD
+  ISO 8601
+
+
+  YY/MM
+
+
+  MMM/DD
+
+
+  
+
+
+  QQ, YY
+
+
+  WW
+
+
+  HH:MM
+
+
+  HH:MM:SS
+
+
+  HH:MM AM/PM
+
+
+  HH:MM:SS AM/PM
+
+
+  [HH]:MM:SS
+
+
+  MM:SS,00
+
+
+  [HH]:MM:SS,00
+
+
+  YY/MM/DD HH:MM
+
+
+  /MM/DD HH:MM:SS AM/PM
+
+  
+  
+
+
+  IGNORE_CASE
+
+  
+  
+
+  IGNORE_CASE
+
+  
+  
+A-Z
+0
+1
+2
+4
+7
+TSVN
+TSVN
+  
+  
+
+  
+
+  sun
+  hat
+  hato
+
+
+  mon
+  tẽn
+  tẽne
+
+
+  tue
+  tal
+  talaato
+
+
+  wed
+  arb
+  arba
+
+
+

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

[Thomas Arnhold]

 svx/source/unodraw/UnoGraphicExporter.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ec8ab324a51b5e440310e6a49d08387ccba8df49
Author: Thomas Arnhold 
Date:   Sat May 10 15:11:52 2014 +0200

coverity#1212488 Copy-paste error

Change-Id: Ibdead0bf8de6ea77fe6cb0cdc4851e0eb98644a6
Reviewed-on: https://gerrit.libreoffice.org/9302
Tested-by: David Tardon 
Reviewed-by: David Tardon 

diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx 
b/svx/source/unodraw/UnoGraphicExporter.cxx
index b032f7c..eeb664f 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -932,7 +932,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& 
rSettings, Graphic& aGraphic,
 aOut.EnableOutput( false );
 aOut.SetMapMode( aMap );
 if( rSettings.mbUseHighContrast )
-aOut.SetDrawMode( aVDev.GetDrawMode() | DRAWMODE_SETTINGSLINE 
| DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT );
+aOut.SetDrawMode( aOut.GetDrawMode() | DRAWMODE_SETTINGSLINE | 
DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT );
 
 GDIMetaFile aMtf;
 aMtf.Clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Douglas Mencken]

 vcl/quartz/ctlayout.cxx |   16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

New commits:
commit c345429b27da24ac4b7ecb73a5a6311cd5e93576
Author: Douglas Mencken 
Date:   Sun Apr 27 11:57:39 2014 -0400

vcl-quartz: fix for fdo#77993 (specific to OS X <10.6)

When using current method, early version of CoreText crashes internally.

Change-Id: Id451d72ac26e4777b61f5d3fec6d4b046c46a749
Reviewed-on: https://gerrit.libreoffice.org/9180
Tested-by: David Tardon 
Reviewed-by: David Tardon 

diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx
index 7969991..0b29673 100644
--- a/vcl/quartz/ctlayout.cxx
+++ b/vcl/quartz/ctlayout.cxx
@@ -172,6 +172,11 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
 // - CoreText handles spaces specially (in particular at the text end)
 if( mnTrailingSpaceCount )
 {
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+// don't recreate line layout here, because this can lead to problems
+// (looks like internal issues inside early CoreText versions)
+mfTrailingSpaceWidth = CTLineGetTrailingWhitespaceWidth( mpCTLine );
+#else
 if(rArgs.mpDXArray)
 {
 int nFullPixelWidth = nPixelWidth;
@@ -201,8 +206,9 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
aCFText,

mpTextStyle->GetStyleDict() );
 mpCTLine = CTLineCreateWithAttributedString( pAttrStr );
-CFRelease( aCFText);
 CFRelease( pAttrStr );
+CFRelease( aCFText );
+#endif
 
 // in RTL-layouts trailing spaces are leftmost
 // TODO: use BiDi-algorithm to thoroughly check this assumption
@@ -212,7 +218,11 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
 }
 }
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+CTLineRef pNewCTLine = CTLineCreateJustifiedLine( mpCTLine, 1.0, 
nPixelWidth - mfTrailingSpaceWidth );
+#else
 CTLineRef pNewCTLine = CTLineCreateJustifiedLine( mpCTLine, 1.0, 
nPixelWidth);
+#endif
 if( !pNewCTLine )
 {
 // CTLineCreateJustifiedLine can and does fail
@@ -225,7 +235,11 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
 }
 CFRelease( mpCTLine );
 mpCTLine = pNewCTLine;
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+mfCachedWidth = nPixelWidth;
+#else
 mfCachedWidth = nPixelWidth + mfTrailingSpaceWidth;
+#endif
 }
 
 // When drawing right aligned text, rounding errors in the position returned by
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits