[Libreoffice-commits] .: l10ntools/source
l10ntools/source/ulfconv/msi-encodinglist.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4b939e617819e13fa754d4997f1dacdbbe3f1cf9 Author: Andras Timar Date: Sat Dec 15 08:47:02 2012 +0100 set LCID of qtz Change-Id: I7cf9f4297d6f55a07f449c4ff25976d669ef819e diff --git a/l10ntools/source/ulfconv/msi-encodinglist.txt b/l10ntools/source/ulfconv/msi-encodinglist.txt index 7d88f08..9d5b333 100644 --- a/l10ntools/source/ulfconv/msi-encodinglist.txt +++ b/l10ntools/source/ulfconv/msi-encodinglist.txt @@ -122,7 +122,7 @@ ps 0 2171 pt 0 2070 pt-BR0 1046 pt-PT0 2070 -qtz 0 1033 # key id pseudo language +qtz 0 1638 # key id pseudo language rm 0 1047 # Raeto-Romance ro 0 1048 # Romanian ru 0 1049 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - l10ntools/source
l10ntools/source/ulfconv/msi-encodinglist.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cf453b85b0461189cc1d63d5d0a43fb855d6bdaa Author: Andras Timar Date: Sat Dec 15 08:47:02 2012 +0100 set LCID of qtz Change-Id: I7cf9f4297d6f55a07f449c4ff25976d669ef819e diff --git a/l10ntools/source/ulfconv/msi-encodinglist.txt b/l10ntools/source/ulfconv/msi-encodinglist.txt index 7d88f08..9d5b333 100644 --- a/l10ntools/source/ulfconv/msi-encodinglist.txt +++ b/l10ntools/source/ulfconv/msi-encodinglist.txt @@ -122,7 +122,7 @@ ps 0 2171 pt 0 2070 pt-BR0 1046 pt-PT0 2070 -qtz 0 1033 # key id pseudo language +qtz 0 1638 # key id pseudo language rm 0 1047 # Raeto-Romance ro 0 1048 # Romanian ru 0 1049 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Converted Formats->columns.ui
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1346 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/46/1346/1 Converted Formats->columns.ui Change-Id: I7be50faa10d0106452256f02ec2f4b9cacd3c6d2 --- A sw/uiconfig/swriter/ui/columns.ui 1 file changed, 750 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1346 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7be50faa10d0106452256f02ec2f4b9cacd3c6d2 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: gokul s ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - sc/inc sc/source
sc/inc/globstr.hrc | 11 ++-
sc/source/filter/xml/xmlstyli.cxx |1
sc/source/ui/condformat/condformatdlg.cxx |8 ++
sc/source/ui/condformat/condformatdlgentry.cxx | 17 ++---
sc/source/ui/src/globstr.src |4 +
sc/source/ui/view/cellsh1.cxx | 71 ++---
6 files changed, 87 insertions(+), 25 deletions(-)
New commits:
commit 89872cc04d8c7053c35eee21509706fd4ee53c5a
Author: Markus Mohrhard
Date: Fri Dec 14 16:50:09 2012 +0100
no need for this using statement
Change-Id: Ie956d5368560d6851f3bcb5174d712e35f09c368
diff --git a/sc/source/filter/xml/xmlstyli.cxx
b/sc/source/filter/xml/xmlstyli.cxx
index dae4aa9..a479283 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -70,7 +70,6 @@ using namespace ::com::sun::star::container;
using namespace xmloff::token;
using namespace ::formula;
-using rtl::OUString;
using com::sun::star::uno::Reference;
using com::sun::star::uno::UNO_QUERY;
commit 4578832a84b1818943da907c4e292af64c49beee
Author: Markus Mohrhard
Date: Fri Dec 14 10:29:48 2012 +0100
use correct cond format dlg setUp for colorscales, fdo#58232
Change-Id: Ib119b09b110d6563bc0abd304f60031a8592d7f1
diff --git a/sc/source/ui/condformat/condformatdlg.cxx
b/sc/source/ui/condformat/condformatdlg.cxx
index 6236432..c9667ce 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -84,7 +84,13 @@ ScCondFormatList::ScCondFormatList(Window* pParent, const
ResId& rResId, ScDocum
}
break;
case condformat::COLORSCALE:
-maEntries.push_back(new ScColorScale3FrmtEntry( this,
mpDoc, maPos, static_cast( pEntry ) ) );
+{
+const ScColorScaleFormat* pColorScale =
static_cast( pEntry );
+if( pColorScale->size() == 2 )
+maEntries.push_back(new ScColorScale2FrmtEntry(
this, mpDoc, maPos, pColorScale ) );
+else
+maEntries.push_back(new ScColorScale3FrmtEntry(
this, mpDoc, maPos, pColorScale ) );
+}
break;
case condformat::DATABAR:
maEntries.push_back(new ScDataBarFrmtEntry( this, mpDoc,
maPos, static_cast( pEntry ) ) );
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx
b/sc/source/ui/condformat/condformatdlgentry.cxx
index 96c9bda..3c27da6 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -582,7 +582,10 @@ namespace {
void SetColorScaleEntryTypes( const ScColorScaleEntry& rEntry, ListBox&
rLbType, Edit& rEdit, ColorListBox& rLbCol )
{
-rLbType.SelectEntryPos(rEntry.GetType());
+// entry Automatic is not available for color scales
+sal_Int32 nIndex = static_cast(rEntry.GetType());
+assert(nIndex > 0);
+rLbType.SelectEntryPos(nIndex - 1);
switch(rEntry.GetType())
{
case COLORSCALE_MIN:
@@ -818,17 +821,11 @@ ScColorScale3FrmtEntry::ScColorScale3FrmtEntry( Window*
pParent, ScDocument* pDo
maLbType.SelectEntryPos(0);
if(pFormat)
{
-if(pFormat->size() == 2)
-maLbColorFormat.SelectEntryPos(0);
-else
-maLbColorFormat.SelectEntryPos(1);
ScColorScaleFormat::const_iterator itr = pFormat->begin();
SetColorScaleEntryTypes(*itr, maLbEntryTypeMin, maEdMin, maLbColMin);
-if(pFormat->size() == 3)
-{
-++itr;
-SetColorScaleEntryTypes(*itr, maLbEntryTypeMiddle, maEdMiddle,
maLbColMiddle);
-}
+assert(pFormat->size() == 3);
+++itr;
+SetColorScaleEntryTypes(*itr, maLbEntryTypeMiddle, maEdMiddle,
maLbColMiddle);
++itr;
SetColorScaleEntryTypes(*itr, maLbEntryTypeMax, maEdMax, maLbColMax);
}
commit 7073310431becb1a69af0c7187b9844ce7901cd5
Author: Markus Mohrhard
Date: Fri Dec 14 10:03:05 2012 +0100
make editing conditional formats more obvious, related fdo#57895
Change-Id: I2ea95a204fbbd0d36a8fb1374e41aa5aae3cf410
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index c1873b5..e860a6b 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -615,12 +615,13 @@
#define STR_COND_DATE 490
#define STR_ERR_CONDFORMAT_PROTECTED 491
+#define STR_EDIT_EXISTING_COND_FORMATS 492
-#define STR_QUERY_FORMULA_RECALC_ONLOAD_ODS 492
-#define STR_QUERY_FORMULA_RECALC_ONLOAD_XLS 493
-#define STR_ALWAYS 494
-#define STR_NEVER 495
+#define STR_QUERY_FORMULA_RECALC_ONLOAD_ODS 493
+#define STR_QUERY_FORMULA_RECALC_ONLOAD_XLS 494
+#define STR_ALWAYS 495
+#define STR_NEVER 496
-#define STR_COUNT 496
+#define STR_
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/inc sc/source
sc/inc/dpcache.hxx |1
sc/source/core/data/dpcache.cxx| 45 -
sc/source/core/data/dpitemdata.cxx |3 +-
3 files changed, 43 insertions(+), 6 deletions(-)
New commits:
commit a81040bed300b1110fdef051ffaa21588d62c94f
Author: Kohei Yoshida
Date: Sat Dec 15 00:46:12 2012 -0500
fdo#35943: Better performance with pivot table refresh.
When the source data range contains trailing rows, simply skip them, and
don't even bother iterating them. Apparently sometimes users specify a
data range with a huge amount of trailing empty rows, which would slow
down the pivot table refresh for no good reason.
But we do still need to keep the original end row position, in case the
pivot table needs to include empty cells in the output.
Change-Id: I2c73c368837b8e322e12b25ddf31429488961f06
diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx
index 0185f9d..69d11ec 100644
--- a/sc/inc/dpcache.hxx
+++ b/sc/inc/dpcache.hxx
@@ -121,6 +121,7 @@ private:
LabelsType maLabelNames;// Stores dimension names.
mdds::flat_segment_tree maEmptyRows;
SCROW mnDataSize;
+SCROW mnRowCount;
bool mbDisposing;
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index cf03b0d..724c842 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -56,6 +56,7 @@ ScDPCache::ScDPCache(ScDocument* pDoc) :
mnColumnCount ( 0 ),
maEmptyRows(0, MAXROW, true),
mnDataSize(-1),
+mnRowCount(0),
mbDisposing(false)
{
}
@@ -311,6 +312,16 @@ bool ScDPCache::InitFromDoc(ScDocument* pDoc, const
ScRange& rRange)
mnColumnCount = nEndCol - nStartCol + 1;
+// this row count must include the trailing empty rows.
+mnRowCount = nEndRow - nStartRow; // skip the topmost label row.
+
+// Skip trailing empty rows if exists.
+SCCOL nCol1 = nStartCol, nCol2 = nEndCol;
+SCROW nRow1 = nStartRow, nRow2 = nEndRow;
+pDoc->ShrinkToDataArea(nDocTab, nCol1, nRow1, nCol2, nRow2);
+bool bTailEmptyRows = nEndRow > nRow2; // Trailing empty rows exist.
+nEndRow = nRow2;
+
maFields.reserve(mnColumnCount);
for (size_t i = 0; i < static_cast(mnColumnCount); ++i)
maFields.push_back(new Field);
@@ -342,6 +353,17 @@ bool ScDPCache::InitFromDoc(ScDocument* pDoc, const
ScRange& rRange)
}
processBuckets(aBuckets, rField);
+
+if (bTailEmptyRows)
+{
+// If the last item is not empty, append one. Note that the items
+// are sorted, and empty item should come last when sorted.
+if (rField.maItems.empty() || !rField.maItems.back().IsEmpty())
+{
+aData.SetEmpty();
+rField.maItems.push_back(aData);
+}
+}
}
PostInit();
@@ -404,6 +426,9 @@ bool ScDPCache::InitFromDataBase(DBConnector& rDB)
rDB.finish();
+if (!maFields.empty())
+mnRowCount = maFields[0].maData.size();
+
PostInit();
return true;
}
@@ -684,6 +709,8 @@ void ScDPCache::PostInit()
void ScDPCache::Clear()
{
+mnColumnCount = 0;
+mnRowCount = 0;
maFields.clear();
maLabelNames.clear();
maGroupFields.clear();
@@ -723,7 +750,18 @@ SCROW ScDPCache::GetItemDataId(sal_uInt16 nDim, SCROW
nRow, bool bRepeatIfEmpty)
OSL_ENSURE(nDim < mnColumnCount, "ScDPTableDataCache::GetItemDataId ");
const Field& rField = maFields[nDim];
-if (bRepeatIfEmpty)
+if (static_cast(nRow) >= rField.maData.size())
+{
+// nRow is in the trailing empty rows area.
+if (bRepeatIfEmpty)
+nRow = rField.maData.size()-1; // Move to the last non-empty row.
+else
+// Return the last item, which should always be empty if the
+// initialization has skipped trailing empty rows.
+return rField.maItems.size()-1;
+
+}
+else if (bRepeatIfEmpty)
{
while (nRow > 0 && rField.maItems[rField.maData[nRow]].IsEmpty())
--nRow;
@@ -772,10 +810,7 @@ const ScDPItemData* ScDPCache::GetItemDataById(long nDim,
SCROW nId) const
SCROW ScDPCache::GetRowCount() const
{
-if (maFields.empty() || maFields[0].maData.empty())
-return 0;
-
-return maFields[0].maData.size();
+return mnRowCount;
}
SCROW ScDPCache::GetDataSize() const
diff --git a/sc/source/core/data/dpitemdata.cxx
b/sc/source/core/data/dpitemdata.cxx
index 5408714..85a6917 100644
--- a/sc/source/core/data/dpitemdata.cxx
+++ b/sc/source/core/data/dpitemdata.cxx
@@ -33,7 +33,8 @@ sal_Int32 ScDPItemData::Compare(const ScDPItemData& rA, const
ScDPItemData& rB)
{
if (rA.meType != rB.meType)
{
-// group value, value and string in this order.
+// group value, value and string in this order. Ensure that the empty
+// type comes last.
return rA.meType < rB.
[Libreoffice-commits] .: sc/inc sc/source
sc/inc/dpcache.hxx |1
sc/source/core/data/dpcache.cxx| 45 -
sc/source/core/data/dpitemdata.cxx |3 +-
3 files changed, 43 insertions(+), 6 deletions(-)
New commits:
commit 696644dbfb25dea3030da92b2ab40cd70da90f05
Author: Kohei Yoshida
Date: Sat Dec 15 00:46:12 2012 -0500
fdo#35943: Better performance with pivot table refresh.
When the source data range contains trailing rows, simply skip them, and
don't even bother iterating them. Apparently sometimes users specify a
data range with a huge amount of trailing empty rows, which would slow
down the pivot table refresh for no good reason.
But we do still need to keep the original end row position, in case the
pivot table needs to include empty cells in the output.
Change-Id: I2c73c368837b8e322e12b25ddf31429488961f06
diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx
index 0185f9d..69d11ec 100644
--- a/sc/inc/dpcache.hxx
+++ b/sc/inc/dpcache.hxx
@@ -121,6 +121,7 @@ private:
LabelsType maLabelNames;// Stores dimension names.
mdds::flat_segment_tree maEmptyRows;
SCROW mnDataSize;
+SCROW mnRowCount;
bool mbDisposing;
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index cf03b0d..724c842 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -56,6 +56,7 @@ ScDPCache::ScDPCache(ScDocument* pDoc) :
mnColumnCount ( 0 ),
maEmptyRows(0, MAXROW, true),
mnDataSize(-1),
+mnRowCount(0),
mbDisposing(false)
{
}
@@ -311,6 +312,16 @@ bool ScDPCache::InitFromDoc(ScDocument* pDoc, const
ScRange& rRange)
mnColumnCount = nEndCol - nStartCol + 1;
+// this row count must include the trailing empty rows.
+mnRowCount = nEndRow - nStartRow; // skip the topmost label row.
+
+// Skip trailing empty rows if exists.
+SCCOL nCol1 = nStartCol, nCol2 = nEndCol;
+SCROW nRow1 = nStartRow, nRow2 = nEndRow;
+pDoc->ShrinkToDataArea(nDocTab, nCol1, nRow1, nCol2, nRow2);
+bool bTailEmptyRows = nEndRow > nRow2; // Trailing empty rows exist.
+nEndRow = nRow2;
+
maFields.reserve(mnColumnCount);
for (size_t i = 0; i < static_cast(mnColumnCount); ++i)
maFields.push_back(new Field);
@@ -342,6 +353,17 @@ bool ScDPCache::InitFromDoc(ScDocument* pDoc, const
ScRange& rRange)
}
processBuckets(aBuckets, rField);
+
+if (bTailEmptyRows)
+{
+// If the last item is not empty, append one. Note that the items
+// are sorted, and empty item should come last when sorted.
+if (rField.maItems.empty() || !rField.maItems.back().IsEmpty())
+{
+aData.SetEmpty();
+rField.maItems.push_back(aData);
+}
+}
}
PostInit();
@@ -404,6 +426,9 @@ bool ScDPCache::InitFromDataBase(DBConnector& rDB)
rDB.finish();
+if (!maFields.empty())
+mnRowCount = maFields[0].maData.size();
+
PostInit();
return true;
}
@@ -684,6 +709,8 @@ void ScDPCache::PostInit()
void ScDPCache::Clear()
{
+mnColumnCount = 0;
+mnRowCount = 0;
maFields.clear();
maLabelNames.clear();
maGroupFields.clear();
@@ -723,7 +750,18 @@ SCROW ScDPCache::GetItemDataId(sal_uInt16 nDim, SCROW
nRow, bool bRepeatIfEmpty)
OSL_ENSURE(nDim < mnColumnCount, "ScDPTableDataCache::GetItemDataId ");
const Field& rField = maFields[nDim];
-if (bRepeatIfEmpty)
+if (static_cast(nRow) >= rField.maData.size())
+{
+// nRow is in the trailing empty rows area.
+if (bRepeatIfEmpty)
+nRow = rField.maData.size()-1; // Move to the last non-empty row.
+else
+// Return the last item, which should always be empty if the
+// initialization has skipped trailing empty rows.
+return rField.maItems.size()-1;
+
+}
+else if (bRepeatIfEmpty)
{
while (nRow > 0 && rField.maItems[rField.maData[nRow]].IsEmpty())
--nRow;
@@ -772,10 +810,7 @@ const ScDPItemData* ScDPCache::GetItemDataById(long nDim,
SCROW nId) const
SCROW ScDPCache::GetRowCount() const
{
-if (maFields.empty() || maFields[0].maData.empty())
-return 0;
-
-return maFields[0].maData.size();
+return mnRowCount;
}
SCROW ScDPCache::GetDataSize() const
diff --git a/sc/source/core/data/dpitemdata.cxx
b/sc/source/core/data/dpitemdata.cxx
index 5408714..85a6917 100644
--- a/sc/source/core/data/dpitemdata.cxx
+++ b/sc/source/core/data/dpitemdata.cxx
@@ -33,7 +33,8 @@ sal_Int32 ScDPItemData::Compare(const ScDPItemData& rA, const
ScDPItemData& rB)
{
if (rA.meType != rB.meType)
{
-// group value, value and string in this order.
+// group value, value and string in this order. Ensure that the empty
+// type comes last.
return rA.meType < rB.
[PATCH] Change in core[libreoffice-3-6]: Do extra check on source range to make sure no funny things ...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1345 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/45/1345/1 Do extra check on source range to make sure no funny things happen. Like a crash in the pivot layout dialog... :-/ Change-Id: I9a330ee3f39ebacb7299d24868bb13ee2a9c3ec5 --- M sc/source/core/data/dpcache.cxx M sc/source/core/data/dpshttab.cxx 2 files changed, 13 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1345 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9a330ee3f39ebacb7299d24868bb13ee2a9c3ec5 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Kohei Yoshida ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - sc/source
sc/source/core/data/dpcache.cxx |5 + sc/source/core/data/dpshttab.cxx |8 2 files changed, 13 insertions(+) New commits: commit 4b1e24fd35b8dd3a58199f3c7d3051142048be21 Author: Kohei Yoshida Date: Fri Dec 14 22:34:38 2012 -0500 Do extra check on source range to make sure no funny things happen. Like a crash in the pivot layout dialog... :-/ Change-Id: I9a330ee3f39ebacb7299d24868bb13ee2a9c3ec5 diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx index 1fbddfc..7f64355 100644 --- a/sc/source/core/data/dpcache.cxx +++ b/sc/source/core/data/dpcache.cxx @@ -382,6 +382,11 @@ bool ScDPCache::InitFromDoc(ScDocument* pDoc, const ScRange& rRange) SCROW nStartRow = rRange.aStart.Row(); // start of data SCROW nEndRow = rRange.aEnd.Row(); + +// Sanity check +if (!ValidRow(nStartRow) || !ValidRow(nEndRow) || nEndRow-nStartRow <= 0) +return false; + sal_uInt16 nStartCol = rRange.aStart.Col(); sal_uInt16 nEndCol = rRange.aEnd.Col(); sal_uInt16 nDocTab = rRange.aStart.Tab(); diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx index 8ee3d4e..d2d8faf 100644 --- a/sc/source/core/data/dpshttab.cxx +++ b/sc/source/core/data/dpshttab.cxx @@ -335,6 +335,14 @@ sal_uLong ScSheetSourceDesc::CheckSourceRange() const if (!mpDoc) return STR_ERR_DATAPILOTSOURCE; +// Make sure the range is valid and sane. +const ScRange& rSrcRange = GetSourceRange(); +if (!rSrcRange.IsValid()) +return STR_ERR_DATAPILOTSOURCE; + +if (rSrcRange.aStart.Col() > rSrcRange.aEnd.Col() || rSrcRange.aStart.Row() > rSrcRange.aEnd.Row()) +return STR_ERR_DATAPILOTSOURCE; + return 0; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/source
sc/source/core/data/dpcache.cxx |5 + sc/source/core/data/dpshttab.cxx |8 2 files changed, 13 insertions(+) New commits: commit 3cd99bc974c25b4066cf68c40d94c821dd413950 Author: Kohei Yoshida Date: Fri Dec 14 22:34:38 2012 -0500 Do extra check on source range to make sure no funny things happen. Like a crash in the pivot layout dialog... :-/ Change-Id: I9a330ee3f39ebacb7299d24868bb13ee2a9c3ec5 diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx index afa4b1b..cf03b0d 100644 --- a/sc/source/core/data/dpcache.cxx +++ b/sc/source/core/data/dpcache.cxx @@ -300,6 +300,11 @@ bool ScDPCache::InitFromDoc(ScDocument* pDoc, const ScRange& rRange) SCROW nStartRow = rRange.aStart.Row(); // start of data SCROW nEndRow = rRange.aEnd.Row(); + +// Sanity check +if (!ValidRow(nStartRow) || !ValidRow(nEndRow) || nEndRow-nStartRow <= 0) +return false; + sal_uInt16 nStartCol = rRange.aStart.Col(); sal_uInt16 nEndCol = rRange.aEnd.Col(); sal_uInt16 nDocTab = rRange.aStart.Tab(); diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx index b9de61f..ccf4659 100644 --- a/sc/source/core/data/dpshttab.cxx +++ b/sc/source/core/data/dpshttab.cxx @@ -312,6 +312,14 @@ sal_uLong ScSheetSourceDesc::CheckSourceRange() const if (!mpDoc) return STR_ERR_DATAPILOTSOURCE; +// Make sure the range is valid and sane. +const ScRange& rSrcRange = GetSourceRange(); +if (!rSrcRange.IsValid()) +return STR_ERR_DATAPILOTSOURCE; + +if (rSrcRange.aStart.Col() > rSrcRange.aEnd.Col() || rSrcRange.aStart.Row() > rSrcRange.aEnd.Row()) +return STR_ERR_DATAPILOTSOURCE; + return 0; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/core/data/dpcache.cxx |5 + sc/source/core/data/dpshttab.cxx |8 2 files changed, 13 insertions(+) New commits: commit 33c5cd785762f272d2a88230af48261342800c3f Author: Kohei Yoshida Date: Fri Dec 14 22:34:38 2012 -0500 Do extra check on source range to make sure no funny things happen. Like a crash in the pivot layout dialog... :-/ Change-Id: I9a330ee3f39ebacb7299d24868bb13ee2a9c3ec5 diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx index afa4b1b..cf03b0d 100644 --- a/sc/source/core/data/dpcache.cxx +++ b/sc/source/core/data/dpcache.cxx @@ -300,6 +300,11 @@ bool ScDPCache::InitFromDoc(ScDocument* pDoc, const ScRange& rRange) SCROW nStartRow = rRange.aStart.Row(); // start of data SCROW nEndRow = rRange.aEnd.Row(); + +// Sanity check +if (!ValidRow(nStartRow) || !ValidRow(nEndRow) || nEndRow-nStartRow <= 0) +return false; + sal_uInt16 nStartCol = rRange.aStart.Col(); sal_uInt16 nEndCol = rRange.aEnd.Col(); sal_uInt16 nDocTab = rRange.aStart.Tab(); diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx index b9de61f..ccf4659 100644 --- a/sc/source/core/data/dpshttab.cxx +++ b/sc/source/core/data/dpshttab.cxx @@ -312,6 +312,14 @@ sal_uLong ScSheetSourceDesc::CheckSourceRange() const if (!mpDoc) return STR_ERR_DATAPILOTSOURCE; +// Make sure the range is valid and sane. +const ScRange& rSrcRange = GetSourceRange(); +if (!rSrcRange.IsValid()) +return STR_ERR_DATAPILOTSOURCE; + +if (rSrcRange.aStart.Col() > rSrcRange.aEnd.Col() || rSrcRange.aStart.Row() > rSrcRange.aEnd.Row()) +return STR_ERR_DATAPILOTSOURCE; + return 0; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/inc sc/source
sc/inc/viewopti.hxx |4 ++--
sc/source/core/tool/viewopti.cxx | 36 ++--
2 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit 0dc856a870a300d6743f58b558ca9a0fc23fd1c8
Author: Kohei Yoshida
Date: Fri Dec 14 22:05:11 2012 -0500
Fixed accidentally modified default view options.
It was unintentionally caused by
6ea8ea456cf5df267284278ecda42aa9b089a682.
Also made the default values easier to see.
Let's not do
foo1 =
foo2 =
foo3 = true;
type of assignment which may give the reader the wrong impression.
Let's do
foo1 = true;
foo2 = true;
foo3 = true;
instead.
Change-Id: I181b80d2aae96d65b662b187bc884913fec836db
diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index 4bea442..07e8c04 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -86,7 +86,7 @@ public:
voidSetDefaults();
voidSetOption( ScViewOption eOpt, sal_Bool bNew =
sal_True ){ aOptArr[eOpt] = bNew; }
-sal_BoolGetOption( ScViewOption eOpt ) const
{ return aOptArr[eOpt]; }
+boolGetOption( ScViewOption eOpt ) const
{ return aOptArr[eOpt]; }
voidSetObjMode( ScVObjType eObj, ScVObjMode eMode ) {
aModeArr[eObj] = eMode; }
ScVObjMode GetObjMode( ScVObjType eObj ) const {
return aModeArr[eObj]; }
@@ -103,7 +103,7 @@ public:
int operator!= ( const ScViewOptions& rOpt ) const {
return !(operator==(rOpt)); }
private:
-sal_BoolaOptArr [MAX_OPT];
+boolaOptArr [MAX_OPT];
ScVObjMode aModeArr[MAX_TYPE];
Color aGridCol;
String aGridColName;
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index d1078a5..64a4fec 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -134,24 +134,24 @@ ScViewOptions::~ScViewOptions()
void ScViewOptions::SetDefaults()
{
-aOptArr[ VOPT_FORMULAS] =
-aOptArr[ VOPT_SYNTAX ] =
-aOptArr[ VOPT_HELPLINES ] =
-aOptArr[ VOPT_GRID_ONTOP ] =
-aOptArr[ VOPT_NOTES ] =
-aOptArr[ VOPT_NULLVALS] =
-aOptArr[ VOPT_VSCROLL ] =
-aOptArr[ VOPT_HSCROLL ] =
-aOptArr[ VOPT_TABCONTROLS ] =
-aOptArr[ VOPT_OUTLINER] =
-aOptArr[ VOPT_HEADER ] =
-aOptArr[ VOPT_GRID] =
-aOptArr[ VOPT_ANCHOR ] =
-aOptArr[ VOPT_PAGEBREAKS ] =
-aOptArr[ VOPT_CLIPMARKS ] = sal_True;
-
-aModeArr[VOBJ_TYPE_OLE ] =
-aModeArr[VOBJ_TYPE_CHART] =
+aOptArr[ VOPT_FORMULAS] = false;
+aOptArr[ VOPT_SYNTAX ] = false;
+aOptArr[ VOPT_HELPLINES ] = false;
+aOptArr[ VOPT_GRID_ONTOP ] = false;
+aOptArr[ VOPT_NOTES ] = true;
+aOptArr[ VOPT_NULLVALS] = true;
+aOptArr[ VOPT_VSCROLL ] = true;
+aOptArr[ VOPT_HSCROLL ] = true;
+aOptArr[ VOPT_TABCONTROLS ] = true;
+aOptArr[ VOPT_OUTLINER] = true;
+aOptArr[ VOPT_HEADER ] = true;
+aOptArr[ VOPT_GRID] = true;
+aOptArr[ VOPT_ANCHOR ] = true;
+aOptArr[ VOPT_PAGEBREAKS ] = true;
+aOptArr[ VOPT_CLIPMARKS ] = true;
+
+aModeArr[VOBJ_TYPE_OLE ] = VOBJ_MODE_SHOW;
+aModeArr[VOBJ_TYPE_CHART] = VOBJ_MODE_SHOW;
aModeArr[VOBJ_TYPE_DRAW ] = VOBJ_MODE_SHOW;
aGridCol = Color( SC_STD_GRIDCOLOR );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/inc sc/source
sc/inc/viewopti.hxx |4 ++--
sc/source/core/tool/viewopti.cxx | 36 ++--
2 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit 2d754521853b9ae89f4d9621150857f6592603b9
Author: Kohei Yoshida
Date: Fri Dec 14 22:05:11 2012 -0500
Fixed accidentally modified default view options.
It was unintentionally caused by
6ea8ea456cf5df267284278ecda42aa9b089a682.
Also made the default values easier to see.
Let's not do
foo1 =
foo2 =
foo3 = true;
type of assignment which may give the reader the wrong impression.
Let's do
foo1 = true;
foo2 = true;
foo3 = true;
instead.
Change-Id: I181b80d2aae96d65b662b187bc884913fec836db
diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index 4bea442..07e8c04 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -86,7 +86,7 @@ public:
voidSetDefaults();
voidSetOption( ScViewOption eOpt, sal_Bool bNew =
sal_True ){ aOptArr[eOpt] = bNew; }
-sal_BoolGetOption( ScViewOption eOpt ) const
{ return aOptArr[eOpt]; }
+boolGetOption( ScViewOption eOpt ) const
{ return aOptArr[eOpt]; }
voidSetObjMode( ScVObjType eObj, ScVObjMode eMode ) {
aModeArr[eObj] = eMode; }
ScVObjMode GetObjMode( ScVObjType eObj ) const {
return aModeArr[eObj]; }
@@ -103,7 +103,7 @@ public:
int operator!= ( const ScViewOptions& rOpt ) const {
return !(operator==(rOpt)); }
private:
-sal_BoolaOptArr [MAX_OPT];
+boolaOptArr [MAX_OPT];
ScVObjMode aModeArr[MAX_TYPE];
Color aGridCol;
String aGridColName;
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index d1078a5..64a4fec 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -134,24 +134,24 @@ ScViewOptions::~ScViewOptions()
void ScViewOptions::SetDefaults()
{
-aOptArr[ VOPT_FORMULAS] =
-aOptArr[ VOPT_SYNTAX ] =
-aOptArr[ VOPT_HELPLINES ] =
-aOptArr[ VOPT_GRID_ONTOP ] =
-aOptArr[ VOPT_NOTES ] =
-aOptArr[ VOPT_NULLVALS] =
-aOptArr[ VOPT_VSCROLL ] =
-aOptArr[ VOPT_HSCROLL ] =
-aOptArr[ VOPT_TABCONTROLS ] =
-aOptArr[ VOPT_OUTLINER] =
-aOptArr[ VOPT_HEADER ] =
-aOptArr[ VOPT_GRID] =
-aOptArr[ VOPT_ANCHOR ] =
-aOptArr[ VOPT_PAGEBREAKS ] =
-aOptArr[ VOPT_CLIPMARKS ] = sal_True;
-
-aModeArr[VOBJ_TYPE_OLE ] =
-aModeArr[VOBJ_TYPE_CHART] =
+aOptArr[ VOPT_FORMULAS] = false;
+aOptArr[ VOPT_SYNTAX ] = false;
+aOptArr[ VOPT_HELPLINES ] = false;
+aOptArr[ VOPT_GRID_ONTOP ] = false;
+aOptArr[ VOPT_NOTES ] = true;
+aOptArr[ VOPT_NULLVALS] = true;
+aOptArr[ VOPT_VSCROLL ] = true;
+aOptArr[ VOPT_HSCROLL ] = true;
+aOptArr[ VOPT_TABCONTROLS ] = true;
+aOptArr[ VOPT_OUTLINER] = true;
+aOptArr[ VOPT_HEADER ] = true;
+aOptArr[ VOPT_GRID] = true;
+aOptArr[ VOPT_ANCHOR ] = true;
+aOptArr[ VOPT_PAGEBREAKS ] = true;
+aOptArr[ VOPT_CLIPMARKS ] = true;
+
+aModeArr[VOBJ_TYPE_OLE ] = VOBJ_MODE_SHOW;
+aModeArr[VOBJ_TYPE_CHART] = VOBJ_MODE_SHOW;
aModeArr[VOBJ_TYPE_DRAW ] = VOBJ_MODE_SHOW;
aGridCol = Color( SC_STD_GRIDCOLOR );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: src/xlsrecord.py src/xlsstream.py
src/xlsrecord.py | 87 +++
src/xlsstream.py |5 +--
2 files changed, 90 insertions(+), 2 deletions(-)
New commits:
commit e1b72c670823b0eb998427bace6570fada423ff2
Author: Kohei Yoshida
Date: Fri Dec 14 21:38:13 2012 -0500
Handler for SxRule record.
This record is a part of PivotTable records.
diff --git a/src/xlsrecord.py b/src/xlsrecord.py
index b81af59..90cb699 100644
--- a/src/xlsrecord.py
+++ b/src/xlsrecord.py
@@ -3301,6 +3301,93 @@ class SXStreamID(BaseRecordHandler):
self.strmData.appendPivotCacheId(strmId)
self.appendLine("pivot cache stream ID in SX DB storage: %4.4X"%strmId)
+class SxRule(BaseRecordHandler):
+
+viewAreaTypes = [
+"does not refer to any area.",
+"refers to one or more pivot fields specified by SxFilt records that
follow this record.",
+"refers to cells displaying values of data items specified by SxFilt
records that follow this record.",
+"refers to the entire PivotTable view.",
+"refers to the cells at the top-left of the PivotTable view, or at the
top-right for a right-to-left sheet. For more information about this area, see
Location and Body.",
+"refers to a cell displaying a pivot field caption. The pivot field is
specified by isxvd.",
+"refers to the cells at the top-right of the PivotTable view, or at
the top-left for a right-to-left sheet. For more information about this area,
see Location and Body."
+]
+
+def __parseBytes (self):
+self.iDim = self.readUnsignedInt(1)
+self.isvxd = self.readUnsignedInt(1)
+
+flag = self.readUnsignedInt(2)
+self.sxaxisRw = (flag & 0x0001) != 0
+self.sxaxisCol = (flag & 0x0002) != 0
+self.sxaxisPage = (flag & 0x0004) != 0
+self.sxaxisData = (flag & 0x0008) != 0
+self.sxrType= (flag & 0x00F0) / (2**4)
+
+flag /= 2**8 # shift 8 bits
+
+self.fPart= (flag & 0x01) != 0
+self.fDataOnly= (flag & 0x02) != 0
+self.fLabelOnly = (flag & 0x04) != 0
+self.fGrandRw = (flag & 0x08) != 0
+self.fGrandCol= (flag & 0x10) != 0
+self.fGrandRwSav = (flag & 0x20) != 0
+self.fCacheBased = (flag & 0x40) != 0
+self.fGrandColSav = (flag & 0x80) != 0
+
+self.readBytes(2) # 2 bytes reserved
+
+self.csxFilt = self.readUnsignedInt(2)
+
+if not self.fPart:
+return
+
+# following should exist only when fPart is true
+self.irwFirst = self.readUnsignedInt(1)
+self.irwLast = self.readUnsignedInt(1)
+self.icolFirst = self.readUnsignedInt(1)
+self.icolLast = self.readUnsignedInt(1)
+
+def parseBytes (self):
+self.__parseBytes()
+self.appendLineInt("pivot field position", self.iDim)
+if self.isvxd <= 0xFD:
+if self.fCacheBased:
+self.appendLineInt("cache field index", self.isvxd)
+else:
+self.appendLineInt("pivot field index", self.isvxd)
+elif self.isvxd == 0xFE:
+self.appendLine("this record refers to data field")
+elif self.isvxd == 0xFF:
+if self.fCacheBased:
+self.appendLine("cache fields specified by SxFilt records.")
+else:
+self.appendLine("pivot fields specified by SxFilt records.")
+
+self.appendLineBoolean("references row axis", self.sxaxisRw)
+self.appendLineBoolean("references column axis", self.sxaxisCol)
+self.appendLineBoolean("references page axis", self.sxaxisPage)
+self.appendLineBoolean("references value axis", self.sxaxisData)
+self.appendMultiLine("view area type: " +
globals.getValueOrUnknown(SxRule.viewAreaTypes, self.sxrType))
+self.appendLineBoolean("this rule includes data cells only",
self.fDataOnly)
+self.appendLineBoolean("this rule includes labels only",
self.fDataOnly)
+self.appendLineBoolean("this rule includes grand total row",
self.fGrandRw)
+self.appendLineBoolean("this rule includes grand total column",
self.fGrandCol)
+self.appendLineBoolean("this rule previosly included grand total row",
self.fGrandRwSav)
+self.appendLineBoolean("this rule previosly included grand total
column", self.fGrandColSav)
+
+self.appendLineInt("number of SxFilt records", self.csxFilt)
+
+if not self.fPart:
+return
+
+# following should exist only when fPart is true
+self.appendLineInt("offset to first row", self.irwFirst)
+self.appendLineInt("offset to last row", self.irwLast)
+self.appendLineInt("offset to first column", self.icolFirst)
+self.appendLineInt("offset to last column", self.icolLast)
+
+
class SXView(BaseRecordHandler):
diff --git a/src/xlsstream.py b/src/xlsstream.py
index 322582d..d47e121 100644
--- a/src/xlsstr
Re: Addin exceptions in SvStream
Sounds to me like a big learning curve is involved - which is going to be very distracting from research activities. If someone can give me link to a good tutorial that gives me a good feeling about it I may bite. (But I can still change code in the filters manually - the thing is that mindless work is no fun) Marc-André LAVERDIÈRE "Perseverance must finish its work so that you may be mature and complete, not lacking anything." -James 1:4 http://asimplediscipleslife.blogspot.com/ mlaverd.theunixplace.com On Fri, Dec 14, 2012 at 5:28 AM, Michael Meeks wrote: > > On Thu, 2012-12-13 at 14:00 +0100, Lubos Lunak wrote: >> I think it shouldn't be that difficult to write a Clang plugin that finds >> all >> uses of SvStream::operator<> , checks whether the variable read to is >> initalized [*] , and possibly it shouldn't be even that big deal to have it >> rewrite them to a series of SvStream::readInt32() etc. calls (i.e. EasyHack >> fdo#56110). I have not written yet any howto on plugins besides the examples >> under compilerplugins/, but if there would be interest, I could do something. > > Oooh ! that would be really lovely :-) > >> [*] Or, since I assume all those variables have been needlessly initialized >> just in attempt to silence the broken warning with the wretched gcc thing on >> Apple, the check will need to be more complicated and find if the initializer >> is not the default value for the type. > > Yep - I guess so ! > > Would rather improve the robustness of our filters I suspect. > > Marc - now that's a real fun / hacking task - are you interested ? :-) > > ATB, > > Michael. > > -- > michael.me...@suse.com <><, Pseudo Engineer, itinerant idiot > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: src/xlsrecord.py src/xlsstream.py
src/xlsrecord.py | 230 ++- src/xlsstream.py |2 2 files changed, 130 insertions(+), 102 deletions(-) New commits: commit ca2e8bee5d40ec5bb0107bb4cfa489add35e0890 Author: Kohei Yoshida Date: Fri Dec 14 18:47:23 2012 -0500 Handler for SxDXF record. Not complete yet. Re-used the DXFN parser code from CF. diff --git a/src/xlsrecord.py b/src/xlsrecord.py index 40d808d..b81af59 100644 --- a/src/xlsrecord.py +++ b/src/xlsrecord.py @@ -148,6 +148,125 @@ records.""" self.hasMoreThan255 = False self.values = [] + +class DXFN(object): + +def __init__ (self, strm): +bits = strm.readUnsignedInt(4) +self.alchNinch = (bits & 0x0001) != 0 # whether the value of dxfalc.alc MUST be ignored. +self.alcvNinch = (bits & 0x0002) != 0 # whether the value of dxfalc.alcv MUST be ignored. +self.wrapNinch = (bits & 0x0004) != 0 # whether the value of dxfalc.fWrap MUST be ignored. +self.trotNinch = (bits & 0x0008) != 0 # whether the value of dxfalc.trot MUST be ignored. +self.kintoNinch = (bits & 0x0010) != 0 # whether the value of dxfalc.fJustLast MUST be ignored. +self.cIndentNinch = (bits & 0x0020) != 0 # whether the values of dxfalc.cIndent and dxfalc.iIndent MUST be ignored. +self.fShrinkNinch = (bits & 0x0040) != 0 # whether the value of dxfalc.fShrinkToFit MUST be ignored. +self.fMergeCellNinch= (bits & 0x0080) != 0 # whether the value of dxfalc.fMergeCell MUST be ignored. +self.lockedNinch= (bits & 0x0100) != 0 # whether the value of dxfprot.fLocked MUST be ignored. +self.hiddenNinch= (bits & 0x0200) != 0 # whether the value of dxfprot.fHidden MUST be ignored. +self.glLeftNinch= (bits & 0x0400) != 0 # whether the values of dxfbdr.dgLeft and dxfbdr.icvLeft MUST be ignored . +self.glRightNinch = (bits & 0x0800) != 0 # whether the values of dxfbdr.dgRight and dxfbdr.icvRight MUST be ignored. +self.glTopNinch = (bits & 0x1000) != 0 # whether the values of dxfbdr.dgTop and dxfbdr.icvTop MUST be ignored. +self.glBottomNinch = (bits & 0x2000) != 0 # whether the values of dxfbdr.dgBottom and dxfbdr.icvBottom MUST be ignored. +self.glDiagDownNinch= (bits & 0x4000) != 0 # whether the value of dxfbdr.bitDiagDown MUST be ignored. +self.glDiagUpNinch = (bits & 0x8000) != 0 # whether the value of dxfbdr.bitDiagUp MUST be ignored. +self.flsNinch = (bits & 0x0001) != 0 # whether the value of dxfpat.fls MUST be ignored. +self.icvFNinch = (bits & 0x0002) != 0 # whether the value of dxfpat.icvForeground MUST be ignored. +self.icvBNinch = (bits & 0x0004) != 0 # whether the value of dxfpat.icvBackground MUST be ignored. +self.ifmtNinch = (bits & 0x0008) != 0 # whether the value of dxfnum.ifmt MUST be ignored. +self.fIfntNinch = (bits & 0x0010) != 0 # whether the value of dxffntd.ifnt MUST be ignored. +self.V = (bits & 0x0020) != 0 # (unused) +self.W = (bits & 0x01C0) != 0 # (reserved; 3-bits) +self.ibitAtrNum = (bits & 0x0200) != 0 # whether number formatting information is part of this structure. +self.ibitAtrFnt = (bits & 0x0400) != 0 # whether font information is part of this structure. +self.ibitAtrAlc = (bits & 0x0800) != 0 # whether alignment information is part of this structure. +self.ibitAtrBdr = (bits & 0x1000) != 0 # whether border formatting information is part of this structure. +self.ibitAtrPat = (bits & 0x2000) != 0 # whether pattern information is part of this structure. +self.ibitAtrProt= (bits & 0x4000) != 0 # whether rotation information is part of this structure. +self.iReadingOrderNinch = (bits & 0x8000) != 0 # whether the value of dxfalc.iReadingOrder MUST be ignored. +bits = strm.readUnsignedInt(2) +self.fIfmtUser = (bits & 0x0001) != 0 # When set to 1, dxfnum contains a format string. +self.f = (bits & 0x0002) != 0 # (unused) +self.fNewBorder = (bits & 0x0004) != 0 # 0=border formats to all cells; 1=border formats to the range outline only +self.fZeroInited= (bits & 0x8000) != 0 # whether the value of dxfalc.iReadingOrder MUST be taken into account. + +if self.ibitAtrNum: +# DXFNum (number format) +if self.fIfmtUser: +# DXFNumUser (string) +sizeDXFNumUser = strm.readUnsignedInt(2) +strBytes = strm.readBy
[Libreoffice-commits] .: sfx2/inc sfx2/source unusedcode.easy
sfx2/inc/sfx2/thumbnailview.hxx |2 --
sfx2/source/control/thumbnailview.cxx | 11 ---
unusedcode.easy |1 -
3 files changed, 14 deletions(-)
New commits:
commit edf999c3f42cc97a0340cf253a80885a24cedf24
Author: Julien Nabet
Date: Sat Dec 15 00:23:23 2012 +0100
Remove unused ThumbnailView::GetScrollWidth()
Change-Id: I8d3337e6ff30276c9de6c5de4836ea75ed6c8d99
diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx
index 9548bd1..bc5aae9 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/sfx2/inc/sfx2/thumbnailview.hxx
@@ -227,8 +227,6 @@ public:
bool IsColor() const { return maColor.GetTransparency() == 0; }
-longGetScrollWidth() const;
-
void filterItems (const boost::function
&func);
void sortItems (const boost::functionImplInitScrollBar();
-return mpScrBar->GetSizePixel().Width()+mnScrBarOffset;
-}
-else
-return 0;
-}
-
void ThumbnailView::filterItems (const boost::function &func)
{
mnFirstLine = 0;// start at the top of the list instead of the
current position
diff --git a/unusedcode.easy b/unusedcode.easy
index 7ef0ae2..cce5489 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -10,7 +10,6 @@ ScVbaFormat::getAddIndent()
ScVbaFormat::setAddIndent(com::sun::star::uno::Any
const&)
SfxDocumentTemplateDlg::SfxDocumentTemplateDlg(Window*, SfxDocumentTemplates*)
TextEngine::GetLeftMargin() const
-ThumbnailView::GetScrollWidth() const
ThumbnailViewItemAcc::FireAccessibleEvent(short, com::sun::star::uno::Any
const&, com::sun::star::uno::Any const&)
TransitionScene::clear()
UnoControl::UnoControl()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1a0134feb001416015a27184efd51265ea2e0d0c Author: Andras Timar Date: Fri Dec 14 23:56:58 2012 +0100 typo in configure.ac Change-Id: Ic20c758034309a7b67966d73066770c4b870f146 diff --git a/configure.ac b/configure.ac index 63e1479..29462cd 100644 --- a/configure.ac +++ b/configure.ac @@ -11859,7 +11859,7 @@ done WITH_LANG_LIST=`echo $WITH_LANG | sed "s/ALL/$ALL_LANGS/"` test -z "$WITH_LANG_LIST" && WITH_LANG_LIST="en-US" test "$WITH_LANG" = "en-US" && WITH_LANG= -if test "$enable_release_build" = "" -o "$enable_releasbie_build" = "no"; then +if test "$enable_release_build" = "" -o "$enable_release_build" = "no"; then test "$WITH_LANG_LIST" = "en-US" || WITH_LANG_LIST=`echo $WITH_LANG_LIST qtz` fi AC_SUBST(ALL_LANGS) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 546faa79bf3b1e4b222f182d43a9839106a398db Author: Andras Timar Date: Fri Dec 14 23:56:58 2012 +0100 typo in configure.ac Change-Id: Ic20c758034309a7b67966d73066770c4b870f146 diff --git a/configure.ac b/configure.ac index b241dea..6df8f4e 100644 --- a/configure.ac +++ b/configure.ac @@ -11595,7 +11595,7 @@ done WITH_LANG_LIST=`echo $WITH_LANG | sed "s/ALL/$ALL_LANGS/"` test -z "$WITH_LANG_LIST" && WITH_LANG_LIST="en-US" test "$WITH_LANG" = "en-US" && WITH_LANG= -if test "$enable_release_build" = "" -o "$enable_releasbie_build" = "no"; then +if test "$enable_release_build" = "" -o "$enable_release_build" = "no"; then test "$WITH_LANG_LIST" = "en-US" || WITH_LANG_LIST=`echo $WITH_LANG_LIST qtz` fi AC_SUBST(ALL_LANGS) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] fdo#38837: Timers must end eventually [Writer idle timer]
2012/12/12 Caolán McNamara :
> Could you submit a new patch with the fixups ?
>
> C.
Sure! Thank you for the review.
pkoroau
--
diff --git a/sw/inc/IDocumentTimerAccess.hxx b/sw/inc/IDocumentTimerAccess.hxx
index 84e3cd4..458ad79 100644
--- a/sw/inc/IDocumentTimerAccess.hxx
+++ b/sw/inc/IDocumentTimerAccess.hxx
@@ -20,31 +20,41 @@
#ifndef IDOCUMENTTIMERACCESS_HXX_INCLUDED
#define IDOCUMENTTIMERACCESS_HXX_INCLUDED
- /** Get information about the current document state
+ /** Manipulate background jobs of the document. It starts with a mode of
+ 'started' and a block count of 0.
*/
class IDocumentTimerAccess
{
public:
/**
-Set modus to start, i.e. start timer if block count == 0
+Set modus to 'start'.
*/
virtual void StartIdling() = 0;
/**
-Set modus to stopped, i.e. stop timer if running
+Set mode to 'stopped'.
*/
virtual void StopIdling() = 0;
/**
-Increment block count, stop timer if running
+Increment block count.
*/
virtual void BlockIdling() = 0;
/**
-Decrement block count, start timer if block count == 0 AND modus == start
+Decrement block count.
*/
virtual void UnblockIdling() = 0;
+/**
+Do these jobs asynchronously: do grammar checking,
+do layout, and update fields.
+They will be delayed until mode is start AND block count == 0.
+The implementation might delay them further, for example
+it might wait until the application is idle.
+*/
+virtual void StartBackgroundJobs() = 0;
+
protected:
virtual ~IDocumentTimerAccess() {};
};
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index ae910d8..51d669c 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -972,6 +972,7 @@ public:
virtual void StopIdling();
virtual void BlockIdling();
virtual void UnblockIdling();
+virtual void StartBackgroundJobs();
/** IDocumentChartDataProviderAccess
*/
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 18953ad..7f6e6ac 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -2564,8 +2564,8 @@ void SwDocUpdtFld::RemoveFldType( const SwFieldType&
rType )
}
}
-SwDocUpdtFld::SwDocUpdtFld()
-: pFldSortLst(0), nFldLstGetMode(0)
+SwDocUpdtFld::SwDocUpdtFld(SwDoc* pDoc)
+: pFldSortLst(0), nFldLstGetMode(0), pDocument(pDoc)
{
bInUpdateFlds = bFldsDirty = sal_False;
memset( aFldTypeTable, 0, sizeof( aFldTypeTable ) );
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 06b10d5..c4079c5 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -1826,6 +1826,11 @@ void SwDoc::UnblockIdling()
aIdleTimer.Start();
}
+void SwDoc::StartBackgroundJobs() {
+// Trigger DoIdleJobs(), asynchronously.
+aIdleTimer.Start();
+}
+
/*
|*
|* SwDoc::DoIdleJobs()
@@ -1846,11 +1851,10 @@ IMPL_LINK( SwDoc, DoIdleJobs, Timer *, pTimer )
ViewShell *pSh, *pStartSh;
pSh = pStartSh = GetCurrentViewShell();
do {
if( pSh->ActionPend() )
{
-if( pTimer )
-pTimer->Start();
+pTimer->Start();
return 0;
}
pSh = (ViewShell*)pSh->GetNext();
} while( pSh != pStartSh );
@@ -1865,28 +1869,35 @@ IMPL_LINK( SwDoc, DoIdleJobs, Timer *, pTimer )
if (bIsOnlineSpell && bIsAutoGrammar)
StartGrammarChecking( *this );
}
-SwFldUpdateFlags nFldUpdFlag;
std::set aAllLayouts = GetAllLayouts();//swmod 080320
std::set::iterator pLayIter = aAllLayouts.begin();
for ( ;pLayIter != aAllLayouts.end();++pLayIter )
{
if ((*pLayIter)->IsIdleFormat())
{
(*pLayIter)->GetCurrShell()->LayoutIdle();
-break;
+
+// Defer the remaining work.
+pTimer->Start();
+return 0;
}
}
-bool bAllValid = pLayIter == aAllLayouts.end() ? 1 : 0;
-if( bAllValid && ( AUTOUPD_FIELD_ONLY ==
- ( nFldUpdFlag = getFieldUpdateFlags(true) )
+
+SwFldUpdateFlags nFldUpdFlag = getFieldUpdateFlags(true);
+if( ( AUTOUPD_FIELD_ONLY == nFldUpdFlag
|| AUTOUPD_FIELD_AND_CHARTS == nFldUpdFlag ) &&
-GetUpdtFlds().IsFieldsDirty() &&
-!GetUpdtFlds().IsInUpdateFlds() &&
-!IsExpFldsLocked()
+GetUpdtFlds().IsFieldsDirty()
// If we switch the field name the Fields are not updated.
// So the "backgorund update" should always be carried out
/* && !pStartSh->GetViewOptions()->IsFldName()*/ )
{
+if ( GetUpdtFlds().IsInUpdateFlds() ||
+ IsExpFldsLocked() )
+
Re: additional calc functions produce warnings
> Now I can see them with that obvious tip. Resource
> RID_PRICING_DEFFUNCTION_NAME is empty in
> scaddins/source/pricing/pricing.src
Ah yes, thanks for that. I left that empty because I assumed this was
optional and I didn't understand the point of it. It seemed something
to do with translating function names (the other add-ins only
contain a German translation and again the English version).
In any case, the attached diff will get rid of the warnings. Don't
know if it's ok to leave ItemList empty, but at least no warnings are
printed, except for
core/sfx2/source/control/dispatch.cxx:1477: Childwindow slot missing!
which I guess is unrelated.
-
./core/scaddins/source/pricing/pricing.src
--
Resource RID_PRICING_DEFFUNCTION_NAMES
{
StringArray PRICING_DEFFUNCNAME_OptBarrier
{
ItemList =
{
};
};
StringArray PRICING_DEFFUNCNAME_OptTouch
{
ItemList =
{
};
};
StringArray PRICING_DEFFUNCNAME_OptProbHit
{
ItemList =
{
};
};
StringArray PRICING_DEFFUNCNAME_OptProbInMoney
{
ItemList =
{
};
};
};
diff --git a/scaddins/source/pricing/pricing.src
b/scaddins/source/pricing/pricing.src
index 6aa1675..67ae69f 100644
--- a/scaddins/source/pricing/pricing.src
+++ b/scaddins/source/pricing/pricing.src
@@ -432,5 +432,32 @@ Resource RID_PRICING_FUNCTION_NAMES
// for translating function names
Resource RID_PRICING_DEFFUNCTION_NAMES
{
+StringArray PRICING_DEFFUNCNAME_OptBarrier
+{
+ItemList =
+{
+};
+};
+
+
+StringArray PRICING_DEFFUNCNAME_OptTouch
+{
+ItemList =
+{
+};
+};
+StringArray PRICING_DEFFUNCNAME_OptProbHit
+{
+ItemList =
+{
+};
+};
+
+StringArray PRICING_DEFFUNCNAME_OptProbInMoney
+{
+ItemList =
+{
+};
+};
};
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Personas in LibreOffice
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi Astron, all Em 14-12-2012 14:53, Stefan Knorr (Astron) escreveu: > Sorry to rain on the parade here .. but is there some good reason why > we need this feature? That was, very likely, the same question people at Mozilla asked when they saw it beeing cooked for FFox... but then, a few month after release, they got tens of thousands of Personas. Many users like to put fancy ringtones in their mobiles, and we all know people put ringtones not for themselves but for *you/we/us/they* to "listen how fancy is my ringtone, dude!". Admitedly, this Personas stuff won't add a bit in performance or solve any MAB, but if correctly worked by our MarCom at release time, it will make a hit in terms of branding, not to make sure we look prettier than others (includes Microsoft) not to say that we may hear some rumbling drums around the teepees. And at the same time I am +1 to replace the tedious, tasteless application background (grey shade) by a user-choice bitmap... Full personalization is a trend I believe people want for their personal stuff. They want to convey a message to their social environment. Kind regards - -- Olivier Hallot Founder, Board of Directors Member - The Document Foundation The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Fundação responsável civilmente, de acordo com o direito civil Detalhes Legais: http://www.documentfoundation.org/imprint LibreOffice translation leader for Brazilian Portuguese +55-21-8822-8812 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with undefined - http://www.enigmail.net/ iQEcBAEBAgAGBQJQy6OAAAoJEJp3R7nH3vLxWjkH/jrLNF2SinYSsFfOAY/51yHF XIToSniiDWnPgMn6GG/3dkMnT5COXWL9EPptC8z8xayImzZ0IxxyaEoH6nRaWbfp YMS7FDXSh2aOqDtJn8Tc8Q9l6664LX8hVvxbk08aROqOJcOGCBTgMTGRx3APAyyN TmZfLEVZVcZWXdpEPFnZJxPuecx3ogrVWeaEAelk2ifoXasjiYmCvqcXGa+QJ5cT dZzwkSfDbCYkU0MGsOdrbzfdPOEd1+v1Ie9tZXalXmk8oiyT07uam84UAy8ZVF4Y xIbyjbihCcXrzmhPnb5xk0QCwEdVvuaPkKG9DXx9xa4M5inVwLw2HeZpAEOzPzk= =8rAi -END PGP SIGNATURE- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: src/xlsrecord.py src/xlsstream.py
src/xlsrecord.py | 13 +
src/xlsstream.py |3 ++-
2 files changed, 15 insertions(+), 1 deletion(-)
New commits:
commit 0218de6091fa1baa6b007a745d113335766c6230
Author: Kohei Yoshida
Date: Fri Dec 14 16:58:45 2012 -0500
Handler for SxFormat record.
diff --git a/src/xlsrecord.py b/src/xlsrecord.py
index 5261d36..40d808d 100644
--- a/src/xlsrecord.py
+++ b/src/xlsrecord.py
@@ -3170,6 +3170,19 @@ class SXFDB(BaseRecordHandler):
self.appendLineString("field name", self.stFieldName)
+class SxFormat(BaseRecordHandler):
+
+def __parseBytes (self):
+flag = self.readUnsignedInt(2)
+self.rlType = (flag & 0x000F) != 0
+self.cbData = self.readUnsignedInt(2)
+
+def parseBytes (self):
+self.__parseBytes()
+self.appendLineBoolean("formatting applied", self.rlType)
+self.appendLineInt("number of byts in next SxDXF", self.cbData)
+
+
class SXLI(BaseRecordHandler):
itemTypes = {
diff --git a/src/xlsstream.py b/src/xlsstream.py
index 0f1a013..bb9d2c0 100644
--- a/src/xlsstream.py
+++ b/src/xlsstream.py
@@ -171,11 +171,12 @@ recData = {
0x00F0: ["SXRULE", "PivotTable Rule Data"],
0x00F1: ["SXEX", "PivotTable View Extended Information", xlsrecord.SXEx],
0x00F2: ["SXFILT", "PivotTable Rule Filter"],
+0x00F4: ["SxDXF", "PivotTable Differential Formatting"],
0x00F6: ["SXNAME", "PivotTable Name"],
0x00F7: ["SXSELECT", "PivotTable Selection Information"],
0x00F8: ["SXPAIR", "PivotTable Name Pair"],
0x00F9: ["SXFMLA", "PivotTable Parsed Expression"],
-0x00FB: ["SXFORMAT", "PivotTable Format Record"],
+0x00FB: ["SXFORMAT", "PivotTable Format Record", xlsrecord.SxFormat],
0x00FC: ["SST", "Shared String Table", xlsrecord.SST],
0x00FD: ["LABELSST", "Cell Value", xlsrecord.LabelSST],
0x00FF: ["EXTSST", "Extended Shared String Table"],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: default CUPS printing format Re: [PATCH] fdo#44664: printer truncates Landscape orientation pages to ...
Hi Caolan, Thanks so much for nailing that :-) On Fri, 2012-12-14 at 15:18 +, Caolán McNamara wrote: > We've worked around this with a "toggle this option if it doesn't work > for you for some reason" (where for some reason is apparently likely to > be: drivers were developed against version X of poppler or ghostscript > which had bug Y which when fixed made those drivers not work correctly) > > In conversion with twaugh I wondered if there was any way that in > LibreOffice I could detect that a given user's print system is going to > be deficient. He suggested the possibility of a hack, which I'm not > implementing personally, but I thought I should pass on for > completeness.. We already get and parse the PPD files from CUPS as plain-text files; so this should be reasonably trivial to do - but yes, what hideous ugliness to have to maintain a list / heuristic for broken CUPS printers in LibreOffice ;-) even if it is easy - presumably better to fix CUPS. ATB, Michael. -- michael.me...@suse.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svx/inc svx/source unusedcode.easy
svx/inc/svx/compressgraphicdialog.hxx |2 -
svx/source/dialog/compressgraphicdialog.cxx | 29
unusedcode.easy |2 -
3 files changed, 33 deletions(-)
New commits:
commit 0d14248a51a3995171d9295d55a465072775e305
Author: Julien Nabet
Date: Fri Dec 14 22:35:37 2012 +0100
Remove 2 unused methods from CompressGraphicsDialog
Change-Id: I51ce4a231a43dc32a36303d293c718ee44b371a1
diff --git a/svx/inc/svx/compressgraphicdialog.hxx
b/svx/inc/svx/compressgraphicdialog.hxx
index 9c24ee5..20d15ab 100644
--- a/svx/inc/svx/compressgraphicdialog.hxx
+++ b/svx/inc/svx/compressgraphicdialog.hxx
@@ -80,11 +80,9 @@ private:
public:
CompressGraphicsDialog( Window* pParent, SdrGrafObj* pGraphicObj,
SfxBindings& rBindings );
-CompressGraphicsDialog( Window* pParent, const Graphic& rGraphic, Size&
rViewSize100mm, Rectangle& rCropRectangle, SfxBindings& rBindings );
virtual ~CompressGraphicsDialog();
SdrGrafObj* GetCompressedSdrGrafObj();
-Graphic GetCompressedGraphic();
};
#endif
diff --git a/svx/source/dialog/compressgraphicdialog.cxx
b/svx/source/dialog/compressgraphicdialog.cxx
index 7543907..7232936 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -48,19 +48,6 @@ CompressGraphicsDialog::CompressGraphicsDialog( Window*
pParent, SdrGrafObj* pGr
Initialize();
}
-CompressGraphicsDialog::CompressGraphicsDialog( Window* pParent, const
Graphic& rGraphic, Size& rViewSize100mm, Rectangle& rCropRectangle,
SfxBindings& rBindings ) :
-ModalDialog ( pParent, "CompressGraphicDialog",
"svx/ui/compressgraphicdialog.ui" ),
-m_pGraphicObj ( NULL ),
-m_aGraphic( rGraphic ),
-m_aViewSize100mm ( rViewSize100mm ),
-m_aCropRectangle ( rCropRectangle ),
-m_rBindings ( rBindings ),
-m_dResolution ( 96.0 )
-{
-Initialize();
-}
-
-
void CompressGraphicsDialog::Initialize()
{
get(m_pFixedText2, "label-original-size");
@@ -346,20 +333,4 @@ SdrGrafObj*
CompressGraphicsDialog::GetCompressedSdrGrafObj()
return NULL;
}
-Graphic CompressGraphicsDialog::GetCompressedGraphic()
-{
-if ( m_dResolution > 0 )
-{
-SvMemoryStream aMemStream;
-aMemStream.SetVersion( SOFFICE_FILEFORMAT_CURRENT );
-Compress( aMemStream );
-aMemStream.Seek( STREAM_SEEK_TO_BEGIN );
-Graphic aResultGraphic;
-GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
-rFilter.ImportGraphic( aResultGraphic, String("import"), aMemStream );
-return aResultGraphic;
-}
-return m_aGraphic;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unusedcode.easy b/unusedcode.easy
index c6815be..7ef0ae2 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,6 +1,4 @@
Application::GetDisplayScreenName(unsigned int)
-CompressGraphicsDialog::CompressGraphicsDialog(Window*, Graphic const&, Size&,
Rectangle&, SfxBindings&)
-CompressGraphicsDialog::GetCompressedGraphic()
FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&,
float, int, bool)
Line::Intersection(Rectangle const&, Line&) const
PoHeader::PoHeader()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: src/xlsrecord.py
src/xlsrecord.py | 28 +---
1 file changed, 21 insertions(+), 7 deletions(-)
New commits:
commit 44b5210a12c09b38db9ab915d880750370b3f356
Author: Kohei Yoshida
Date: Fri Dec 14 16:36:25 2012 -0500
Forgot to display flags in SXEX.
diff --git a/src/xlsrecord.py b/src/xlsrecord.py
index 6f953a3..5261d36 100644
--- a/src/xlsrecord.py
+++ b/src/xlsrecord.py
@@ -2988,13 +2988,13 @@ class SXEx(BaseRecordHandler):
flag = self.readUnsignedInt(2)
self.fEnableWizard= (flag & 0x0001) != 0 # D
-self.fEnableDrilldown = (flag & 0x0001) != 0 # E
-self.fEnableFieldDialog = (flag & 0x0001) != 0 # F
-self.fPreserveFormatting = (flag & 0x0001) != 0 # G
-self.fMergeLabels = (flag & 0x0001) != 0 # H
-self.fDisplayErrorString = (flag & 0x0001) != 0 # I
-self.fDisplayNullString = (flag & 0x0001) != 0 # J
-self.fSubtotalHiddenPageItems = (flag & 0x0001) != 0 # K
+self.fEnableDrilldown = (flag & 0x0002) != 0 # E
+self.fEnableFieldDialog = (flag & 0x0004) != 0 # F
+self.fPreserveFormatting = (flag & 0x0008) != 0 # G
+self.fMergeLabels = (flag & 0x0010) != 0 # H
+self.fDisplayErrorString = (flag & 0x0020) != 0 # I
+self.fDisplayNullString = (flag & 0x0040) != 0 # J
+self.fSubtotalHiddenPageItems = (flag & 0x0080) != 0 # K
self.cchPageFieldStyle = self.readUnsignedInt(2)
self.cchTableStyle = self.readUnsignedInt(2)
@@ -3033,6 +3033,20 @@ class SXEx(BaseRecordHandler):
self.appendLineString("style used in page area", self.stPageFieldStyle)
self.appendLineString("style used in table body", self.stTableStyle)
self.appendLineString("style used in empty cells", self.stVacateStyle)
+if self.fAcrossPageLay:
+self.appendLine("page area layout: left to right, then top to
bottom")
+else:
+self.appendLine("page area layout: top to bottom, then left to
right")
+self.appendLineInt("rows in each page column", self.cWrapPage)
+
+self.appendLineBoolean("enable wizard", self.fEnableWizard)
+self.appendLineBoolean("enable drilldown", self.fEnableDrilldown)
+self.appendLineBoolean("enable field properties dialog",
self.fEnableFieldDialog)
+self.appendLineBoolean("preserve formatting", self.fPreserveFormatting)
+self.appendLineBoolean("merge labels", self.fMergeLabels)
+self.appendLineBoolean("display custom error string",
self.fDisplayErrorString)
+self.appendLineBoolean("display custom empty string",
self.fDisplayNullString)
+self.appendLineBoolean("subtotal hidden page items",
self.fSubtotalHiddenPageItems)
class SXDtr(BaseRecordHandler):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svtools/inc svtools/source unusedcode.easy
svtools/inc/svtools/treelist.hxx|4
svtools/inc/svtools/viewdataentry.hxx |1 -
svtools/source/contnr/treelist.cxx | 29 -
svtools/source/contnr/viewdataentry.cxx |5 -
unusedcode.easy |3 ---
5 files changed, 42 deletions(-)
New commits:
commit 00438a182db9d0edcc2339c8a35a79280c60d1a5
Author: Julien Nabet
Date: Fri Dec 14 22:26:58 2012 +0100
Remove some newly tagged unused methods
Change-Id: I95d2c24ffefe6835c9505d149dc94847f1140b9c
diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx
index c931f0e..220b2f4 100644
--- a/svtools/inc/svtools/treelist.hxx
+++ b/svtools/inc/svtools/treelist.hxx
@@ -193,9 +193,6 @@ public:
const SvTreeListEntries& GetChildList( SvTreeListEntry* pParent ) const;
SvTreeListEntries& GetChildList( SvTreeListEntry* pParent );
-std::pair
-GetChildIterators(const SvTreeListEntry* pParent) const;
-
std::pair
GetChildIterators(SvTreeListEntry* pParent);
@@ -341,7 +338,6 @@ public:
sal_BoolIsExpanded( SvTreeListEntry* pEntry ) const;
sal_BoolIsSelected( SvTreeListEntry* pEntry ) const;
-sal_BoolHasEntryFocus( SvTreeListEntry* pEntry ) const;
voidSetEntryFocus( SvTreeListEntry* pEntry, sal_Bool
bFocus );
const SvViewDataEntry* GetViewData( const SvTreeListEntry* pEntry
) const;
SvViewDataEntry* GetViewData( SvTreeListEntry* pEntry );
diff --git a/svtools/inc/svtools/viewdataentry.hxx
b/svtools/inc/svtools/viewdataentry.hxx
index 9fc0408..3800b29 100644
--- a/svtools/inc/svtools/viewdataentry.hxx
+++ b/svtools/inc/svtools/viewdataentry.hxx
@@ -65,7 +65,6 @@ public:
bool IsCursored() const;
bool IsSelectable() const;
void SetFocus( bool bFocus );
-void SetCursored( bool bCursored );
void SetSelected( bool bSelected );
void SetHighlighted( bool bHighlighted );
void SetExpanded( bool bExpanded );
diff --git a/svtools/source/contnr/treelist.cxx
b/svtools/source/contnr/treelist.cxx
index d0125f4..90a03d2 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -1118,27 +1118,6 @@ SvTreeListEntry* SvTreeList::GetRootLevelParent(
SvTreeListEntry* pEntry ) const
return pCurParent;
}
-std::pair
-SvTreeList::GetChildIterators(const SvTreeListEntry* pParent) const
-{
-typedef std::pair IteratorPair;
-
-static const SvTreeListEntries dummy; // prevent singular iterator asserts
-IteratorPair aRet(dummy.begin(), dummy.end());
-
-if (!pParent)
-pParent = pRootItem;
-
-if (pParent->maChildren.empty())
-// This entry has no children.
-return aRet;
-
-aRet.first = pParent->maChildren.begin();
-aRet.second = pParent->maChildren.end();
-
-return aRet;
-}
-
std::pair
SvTreeList::GetChildIterators(SvTreeListEntry* pParent)
{
@@ -1494,14 +1473,6 @@ sal_Bool SvListView::IsSelected( SvTreeListEntry* pEntry
) const
return itr->second->IsSelected();
}
-sal_Bool SvListView::HasEntryFocus( SvTreeListEntry* pEntry ) const
-{
-DBG_ASSERT(pEntry,"IsExpanded:No Entry");
-SvDataTable::const_iterator itr = maDataTable.find(pEntry );
-DBG_ASSERT(itr != maDataTable.end(),"Entry not in Table");
-return itr->second->HasFocus();
-}
-
void SvListView::SetEntryFocus( SvTreeListEntry* pEntry, sal_Bool bFocus )
{
DBG_ASSERT(pEntry,"SetEntryFocus:No Entry");
diff --git a/svtools/source/contnr/viewdataentry.cxx
b/svtools/source/contnr/viewdataentry.cxx
index c9c75f3..adf7b31 100644
--- a/svtools/source/contnr/viewdataentry.cxx
+++ b/svtools/source/contnr/viewdataentry.cxx
@@ -97,11 +97,6 @@ void SvViewDataEntry::SetFocus( bool bFocus )
mbFocused = bFocus;
}
-void SvViewDataEntry::SetCursored( bool bCursored )
-{
-mbCursored = bCursored;
-}
-
void SvViewDataEntry::SetSelected( bool bSelected )
{
mbSelected = bSelected;
diff --git a/unusedcode.easy b/unusedcode.easy
index 6b829c4..c6815be 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -11,9 +11,6 @@ ScMenuFloatingWindow::getDoc()
ScVbaFormat::getAddIndent()
ScVbaFormat::setAddIndent(com::sun::star::uno::Any
const&)
SfxDocumentTemplateDlg::SfxDocumentTemplateDlg(Window*, SfxDocumentTemplates*)
-SvListView::HasEntryFocus(SvTreeListEntry*) const
-SvTreeList::GetChildIterators(SvTreeListEntry const*) const
-SvViewDataEntry::SetCursored(bool)
TextEngine::GetLeftMargin() const
ThumbnailView::GetScrollWidth() const
ThumbnailViewItemAcc::FireAccessibleEvent(short, com::sun::star::uno::Any
const&, com::sun::star::uno::Any const&)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fdo#55430 switches off text mode when clicking an other obje...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1344 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/44/1344/1 fdo#55430 switches off text mode when clicking an other object. This patch complements Iee4abf4eddf79ef7ed331221b0a0b23d3370ae2b (and I69aecacc264c9a9b766ccfa48c0deb1f153e88da, which didn't correctly before) This also fixes issues when clicking on another object to stop text editing. Switches off text mode, and instantaneously selects the other object. (Rotation doesn't belong into the text routine AT ALL, which also caused bug 37482, which is resolved differently from now on) Known issues: text mode stays on when you youse drag'n drop. Won't work in calc. The oldest patch for fdo#55430 doesn't work in writer. So writer will respond unexpectedly. Change-Id: I3c8cdedbfae58165ebeda5887c1b6573832eb495 Signed-off-by: Lennard --- M sd/source/ui/func/fusel.cxx M sd/source/ui/func/futext.cxx 2 files changed, 14 insertions(+), 10 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1344 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3c8cdedbfae58165ebeda5887c1b6573832eb495 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Lennard Wasserthal ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: src/xlsrecord.py src/xlsstream.py
src/xlsrecord.py | 68 +++
src/xlsstream.py |2 -
2 files changed, 69 insertions(+), 1 deletion(-)
New commits:
commit 8969e07368b5401b34e30cc4c59c40f0efed4f4a
Author: Kohei Yoshida
Date: Fri Dec 14 16:08:43 2012 -0500
Record handler for SXEx - pivot table extended view properties.
diff --git a/src/xlsrecord.py b/src/xlsrecord.py
index 88a92cc..6f953a3 100644
--- a/src/xlsrecord.py
+++ b/src/xlsrecord.py
@@ -2966,6 +2966,74 @@ class SXDbEx(BaseRecordHandler):
self.appendLine("last changed: %g"%lastChanged)
self.appendLine("count of SXFORMULA records for this cache:
%d"%sxFmlaRecs)
+class SXEx(BaseRecordHandler):
+
+def __parseBytes (self):
+self.csxformat = self.readUnsignedInt(2)
+self.cchErrorString = self.readUnsignedInt(2)
+self.cchNullString = self.readUnsignedInt(2)
+self.cchTag = self.readUnsignedInt(2)
+self.csxselect = self.readUnsignedInt(2)
+self.crwPage = self.readUnsignedInt(2)
+self.ccolPage = self.readUnsignedInt(2)
+flag = self.readUnsignedInt(2)
+
+# Page field layout
+# 0 = top to bottom then left to right
+# 1 = left to right then top to bottom
+self.fAcrossPageLay = (flag & 0x0001)
+
+# Rows in each page field column
+self.cWrapPage = (flag & 0x01FE) / 2
+
+flag = self.readUnsignedInt(2)
+self.fEnableWizard= (flag & 0x0001) != 0 # D
+self.fEnableDrilldown = (flag & 0x0001) != 0 # E
+self.fEnableFieldDialog = (flag & 0x0001) != 0 # F
+self.fPreserveFormatting = (flag & 0x0001) != 0 # G
+self.fMergeLabels = (flag & 0x0001) != 0 # H
+self.fDisplayErrorString = (flag & 0x0001) != 0 # I
+self.fDisplayNullString = (flag & 0x0001) != 0 # J
+self.fSubtotalHiddenPageItems = (flag & 0x0001) != 0 # K
+
+self.cchPageFieldStyle = self.readUnsignedInt(2)
+self.cchTableStyle = self.readUnsignedInt(2)
+self.cchVacateStyle = self.readUnsignedInt(2)
+
+self.stError = ""
+if self.cchErrorString != 0x:
+self.stError = self.readXLUnicodeStringNoCch(self.cchErrorString)
+
+self.stDisplayNull = ""
+if self.cchNullString != 0x:
+self.stDisplayNull =
self.readXLUnicodeStringNoCch(self.cchNullString)
+
+self.stTag = ""
+if self.cchTag != 0x:
+self.stTag = self.readXLUnicodeStringNoCch(self.cchTag)
+
+self.stPageFieldStyle = ""
+if self.cchPageFieldStyle != 0x and self.cchPageFieldStyle > 0:
+self.stPageFieldStyle =
self.readXLUnicodeStringNoCch(self.cchPageFieldStyle)
+
+self.stTableStyle = ""
+if self.cchTableStyle != 0x and self.cchTableStyle > 0:
+self.stTableStyle =
self.readXLUnicodeStringNoCch(self.cchTableStyle)
+
+self.stVacateStyle = ""
+if self.cchVacateStyle != 0x and self.cchVacateStyle > 0:
+self.stVacateStyle =
self.readXLUnicodeStringNoCch(self.cchVacateStyle)
+
+def parseBytes (self):
+self.__parseBytes()
+self.appendLineInt("number of SxFormat records", self.csxformat)
+self.appendLineString("error string", self.stError)
+self.appendLineString("null string", self.stDisplayNull)
+self.appendLineString("custom string", self.stTag)
+self.appendLineString("style used in page area", self.stPageFieldStyle)
+self.appendLineString("style used in table body", self.stTableStyle)
+self.appendLineString("style used in empty cells", self.stVacateStyle)
+
class SXDtr(BaseRecordHandler):
diff --git a/src/xlsstream.py b/src/xlsstream.py
index 6234779..0f1a013 100644
--- a/src/xlsstream.py
+++ b/src/xlsstream.py
@@ -169,7 +169,7 @@ recData = {
0x00ED: ["MSODRAWINGSELECTION", "Microsoft Office Drawing Selection",
xlsrecord.MSODrawingSelection],
0x00EF: ["PHONETIC", "Asian Phonetic Settings", xlsrecord.PhoneticInfo],
0x00F0: ["SXRULE", "PivotTable Rule Data"],
-0x00F1: ["SXEX", "PivotTable View Extended Information"],
+0x00F1: ["SXEX", "PivotTable View Extended Information", xlsrecord.SXEx],
0x00F2: ["SXFILT", "PivotTable Rule Filter"],
0x00F6: ["SXNAME", "PivotTable Name"],
0x00F7: ["SXSELECT", "PivotTable Selection Information"],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - sw/source xmloff/inc
sw/source/filter/basflt/fltini.cxx |1 -
sw/source/filter/inc/fltini.hxx|1 -
sw/source/filter/xml/xmlimp.cxx| 11 +++
sw/source/filter/xml/xmltexti.cxx | 10 --
sw/source/ui/uno/unotxdoc.cxx | 10 --
xmloff/inc/xmloff/xmlimp.hxx |1 +
6 files changed, 20 insertions(+), 14 deletions(-)
New commits:
commit 3a9e1e71d9a28b2c6bc96757e629b231d2276d9d
Author: Stephan Bergmann
Date: Fri Dec 14 21:46:49 2012 +0100
Do not defer ~XMLRedlineImportHelper activity to ~SwXMLImport
At least with one Clang build, executing sw_unoapi test aborts at shutdown
of
soffice.bin with
20 __cxxabiv1::__cxa_call_unexpected
21 XMLRedlineImportHelper::~XMLRedlineImportHelper
22 XMLRedlineImportHelper::~XMLRedlineImportHelper
23 SwXMLTextImportHelper::~SwXMLTextImportHelper
24 SwXMLTextImportHelper::~SwXMLTextImportHelper
25 UniRefBase::release
26 UniReference::~UniReference
27 UniReference::~UniReference
28 SvXMLImport::~SvXMLImport
29 SwXMLImport::~SwXMLImport
30 SwXMLImport::~SwXMLImport
31 cppu::OWeakObject::release
[...]
79 binaryurp::Bridge::dispose
[...]
98 desktop::Desktop::DeregisterServices
99 desktop::Desktop::doShutdown
100 desktop::Desktop::Main
due to ~XMLRedlineImportHelper calling setPropertyValue on an
SwXTextDocument
that is !IsValid() and thus throws a RuntimeException.
SwXMLImport::endOocument
already contains ClearShapeImport with a comment that indicates it is
necessary
for a similar reason, so add a ClearTextImport that ensures any
~XMLRedlineImportHelper activity is done before the SwXTextDocument becomes
invalid, and not only at shutdown of the remote bridge that still holds a
(Java)
reference to SwXMLImport.
Change-Id: I9891879c91bfea79fa9e22691be1826f61fdd70a
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 8e79e98..240439e 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -936,6 +936,7 @@ void SwXMLImport::endDocument( void )
// delegate to parent: takes care of error handling
SvXMLImport::endDocument();
+ClearTextImport();
}
diff --git a/xmloff/inc/xmloff/xmlimp.hxx b/xmloff/inc/xmloff/xmlimp.hxx
index 125728f..4fac737 100644
--- a/xmloff/inc/xmloff/xmlimp.hxx
+++ b/xmloff/inc/xmloff/xmlimp.hxx
@@ -155,6 +155,7 @@ protected:
const
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >&
xAttrList );
virtual XMLTextImportHelper* CreateTextImport();
+inline void ClearTextImport() { mxTextImport = 0; }
virtual XMLShapeImportHelper* CreateShapeImport();
inline sal_Bool HasShapeImport() const { return mxShapeImport.is(); }
inline void ClearShapeImport() { mxShapeImport = 0; }
commit da07b237caa815540405e9e4980beb16403ecd30
Author: Stephan Bergmann
Date: Fri Dec 14 18:41:12 2012 +0100
Add exception messages
Change-Id: I17dc1673d5126e00328baa1e7a8ed9b59572f08d
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index 2c26127..be2a5d6 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -1830,7 +1830,10 @@ void SwXTextDocument::setPropertyValue(const OUString&
rPropertyName,
{
SolarMutexGuard aGuard;
if(!IsValid())
-throw RuntimeException();
+throw RuntimeException(
+"invalid SwXTextDocument",
+static_cast< cppu::OWeakObject * >(
+static_cast< SwXTextDocumentBaseClass * >(this)));
const SfxItemPropertySimpleEntry* pEntry =
pPropSet->getPropertyMap().getByName( rPropertyName);
if(!pEntry)
@@ -1842,7 +1845,10 @@ void SwXTextDocument::setPropertyValue(const OUString&
rPropertyName,
case WID_DOC_CHAR_COUNT :
case WID_DOC_PARA_COUNT :
case WID_DOC_WORD_COUNT :
-throw RuntimeException();
+throw RuntimeException(
+"bad WID",
+static_cast< cppu::OWeakObject * >(
+static_cast< SwXTextDocumentBaseClass * >(this)));
case WID_DOC_WORD_SEPARATOR :
{
OUString sDelim;
commit b25f4796a3c2d81d5af16183b162eb98e9f9d549
Author: Stephan Bergmann
Date: Fri Dec 14 18:19:04 2012 +0100
SwXMLImport::CreateTextImport -> xmlimp.cxx
Change-Id: Iea502cbe8becaf460f50e1ec954cf2cb6c18e252
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 637ef88..8e79e98 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -43,6 +43,7 @@
#include
#include
#include "xmlimp.hxx"
+#include "xmltexti.hxx"
#include
#include
#include
@@ -990,6 +991,15 @@ SvTextShapeImportHelper::~SvTextShapeImportHelper()
}
+XMLTextImportHelper* SwXMLImport::CreateTextImport()
+{
+return ne
Re: additional calc functions produce warnings
On Fri, 2012-12-14 at 18:31 +0100, Eike Rathke wrote: > They are triggered as soon as the first formula cell is > entered. Now I can see them with that obvious tip. Resource RID_PRICING_DEFFUNCTION_NAME is empty in scaddins/source/pricing/pricing.src presumably you need four strings in there for barrier, touch, probable hir and probable in money or some such C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] calc/data-pilot
calc/data-pilot/field-cell-format.xls |binary 1 file changed New commits: commit a88c69d76cebbc5d2b0b97504c4c0fc6e42aab09 Author: Kohei Yoshida Date: Fri Dec 14 15:08:54 2012 -0500 Add custom formats to field members as well. diff --git a/calc/data-pilot/field-cell-format.xls b/calc/data-pilot/field-cell-format.xls index d7285a2..fedfafb 100644 Binary files a/calc/data-pilot/field-cell-format.xls and b/calc/data-pilot/field-cell-format.xls differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] calc/data-pilot
calc/data-pilot/field-cell-format.xls |binary 1 file changed New commits: commit 53e0c9c6e879b342d37fcde88a77c4a0bc95599b Author: Kohei Yoshida Date: Fri Dec 14 14:58:21 2012 -0500 New test file for custom cell formats in pivot table area. diff --git a/calc/data-pilot/field-cell-format.xls b/calc/data-pilot/field-cell-format.xls new file mode 100644 index 000..d7285a2 Binary files /dev/null and b/calc/data-pilot/field-cell-format.xls differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Roman Eisele changed: What|Removed |Added Depends on||50284 -- 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 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Roman Eisele changed: What|Removed |Added Depends on|50284 | -- 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: fdo57180 add function NUMBERVALUE() to calc as defined in ODFF1.2
Hi Winfried, On Thursday, 2012-12-13 09:59:38 +0100, Winfried Donkers wrote: > The coding of this function seems to be going nicely, but for the string to > double conversion I would like some pointers/interpretations. > 1. ODFF1.2 refers to 'xsd:float' and conversion 'according to the definition > provided in XML Schema, Part 2, Section 3.2.4'. I don't think I found that > particular type and section. Could you give links to these? http://www.w3.org/TR/xmlschema-2/#float Note however that our data type is double, not float, so http://www.w3.org/TR/xmlschema-2/#double Personally I think that xsd:float and section 3.2.4 are awkward and it should be xsd:double and section 3.2.5 instead, but float may be there to have a common least denominator, I don't remember. This NUMBERVALUE() definition is the only place mentioning float, earlier versions of the draft referenced IEEE 754 double at several other places but those got removed as well. Short essence: use rtl::math::stringToDouble() to convert, include rtl/math.hxx First check if DecimalSeparator appears in GroupSeparator and bail out if so. Slightly different processing as given in steps 1-4 of ODFF because stringToDouble() handles one group separator and this doesn't need extra processing if there are <=1 characters in GroupSeparator: If GroupSeparator is not present or empty, call rtl::math::stringToDouble( X, DecimalSeparator[0], 0, ...) If GroupSeparator contains one character (length==1), call rtl::math::stringToDouble( X, DecimalSeparator[0], GroupSeparator[0], ...) If GroupSeparator contains more than one character, remove all characters before the first DecimalSeparator in the number string that match one of GroupSeparator, and call rtl::math::stringToDouble( X, DecimalSeparator[0], 0, ...) NOTE: the GroupSeparator OUString/String may contain UTF-16 encoded Unicode surrogate pairs, so OUString::iterateCodePoints() should be used on the numberstring if that is the case. Theoretically DecimalSeparator might as well, but stringToDouble() doesn't handle that. If that really was a problem we'd have to craft some additional method that takes the full Unicode range.. which I'd avoid for now. Of course do the trailing percent sign processing for all cases before calling stringToDouble(). > 2. ODFF1.2 mentions under VALUE() that dates should be recognised, as well as > fractional numbers, e.g. '2 3/8'. I'm not sure if NUMBERVALUE() should > recognise that too. For dates it is as good as impossible (no separator, > language and order is known); but fractional numbers could be recognised. > What is your judgement on this? Don't. NUMBERVALUE() is not defined for other cases. Btw, "2 3/8" could be 23.8 with DecimalSeparator='/' and GroupSeparator=' ' ;-) > 3. Currently I am putting the code for the string to double conversion in de > function ScNumberValue() itself as i can't find accessable stringtodouble > functions that do not ask for language settings. Now would be a very good > time to tell that I have overlooked the accessible stringtodouble function :). See above ;-) and sal/inc/rtl/math.hxx Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpcZp1rQ9bdO.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] WIP fdo#56124 add IFERROR and IFNA to calc
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1343 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/43/1343/1 WIP fdo#56124 add IFERROR and IFNA to calc Change-Id: If0145363ed7495a6633d80dabbbfac30af9a0301 --- M formula/inc/formula/compiler.hrc M formula/inc/formula/opcode.hxx M formula/source/core/api/FormulaCompiler.cxx M formula/source/core/resource/core_resource.src M sc/inc/helpids.h M sc/qa/unit/ucalc.cxx M sc/source/core/inc/interpre.hxx M sc/source/core/tool/interpr1.cxx M sc/source/core/tool/interpr4.cxx M sc/source/core/tool/parclass.cxx M sc/source/core/tool/token.cxx M sc/source/ui/src/scfuncs.src M sc/util/hidother.src 13 files changed, 132 insertions(+), 14 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1343 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If0145363ed7495a6633d80dabbbfac30af9a0301 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Winfried Donkers ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Personas in LibreOffice
On 12/14/2012 05:21 PM, Jan Holesovsky wrote: Hi all, Is there some reason why this then appears in the Linux version of my master build and does absolutely nothing ? From that I mean, that if I select a background image, e.g. jpg, then nothing happens and the dialog just cycles (repeated select/enter/no effect/display dialog, until I cancel it ? Is there some limit to the size of the image one can use, or is it not supposed to work on Linux at all ? And if the latter, why do we have access to it on Linux ? Or have I totally misunderstood what this is about ? Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Change in core[master]: fdo#56124 add calc functions IFERROR and IFNA as in ODFF1.2
Hi Winfried,
On Sunday, 2012-12-09 15:07:46 +0100, Winfried Donkers wrote:
> >Could it be that you didn't implement the special handling in the
> compiler and tokens? ...
>
> I did an opengrok search for ocIf and changed all files, including sxfunc.src
> (to give iferror 3 parameters).
> The only differences that I know of between IF() and IFERROR() are the
> function names and the group to which the functions belong.
>
> When in the switch statement in ScIfError()/ScIfJump() (in
> /core/sc/source/core/tool/interpr1.cxx)
> default:
> {
> if ( GetBool() ) <<-- here
> { // TRUE
> if( nJumpCount >= 2 )
>
> I replace GetBool() with getDouble() and look at its value, it is 3 in case
> of IFERROR() and 0 in case of IF().
> (in calc I entered IFERROR(0;2;3), result 2 and IF(0;2;3), result 3).
I did not quite get what you are actually doing there.. if the
functions are otherwise treated identically then IFERROR should return
3 as well. Could you please upload the patch to gerrit, mark it as work
in progress by preceding the commit summary with WIP:
Thanks
Eike
--
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD
Support the FSFE, care about Free Software! https://fsfe.org/support/?erack
pgp0iXXXa5vLu.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Personas in LibreOffice
Sorry, really have no business in this thread, but I just couldnt resist... Why not 'best of both worlds' ? Allow user persona's, and improve the default look ? you could even do a contest, where the best user persona wins to be the new default look ? just my 2 $ Well, shutting up now again... - John Smith. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build Problem
Hi, Thanks but that problem got solved already :) Cheers, Akshay On Fri, Dec 14, 2012 at 2:31 PM, Bjoern Michaelsen < bjoern.michael...@canonical.com> wrote: > Hi Akshay, > > On Thu, Dec 13, 2012 at 10:19:22PM +0530, Akshay Ratan wrote: > > *On running ./autogen.sh on my ubuntu 11.10 oneiric terminal,following > > error is reported, > > . > > . > > . > > > > BEGIN failed--compilation aborted at -e line 1. > > configure: error: Failed to find some modules > > Error running configure at ./autogen.sh line 201. > > What version of LibreOffice are you trying to build? Which instructions > are you > following? > > Best, > > Bjoern > -- Akshay ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: additional calc functions produce warnings
Hi tino, On Friday, 2012-12-14 11:26:46 +, tino wrote: > > AFAIR you recently added the pricing functions. When running calc to test > > my code changes, I get lots of: > > warn:legacy.osl:11918:1:/home/w.donkers/git/libo/tools/source/rc/resmgr.cxx:773: > > > > file:///home/w.donkers/git/libo/solver/unxlngi6/installation/opt/program/../program/resource/pricingen-US.res > > Class: 256, Id: 0. Cannot free resource! > > Thanks for the info, but I'm not sure how to debug this. See Caolan's mail in this thread about setting a breakpoint in gdb. Note that you need a build configured with --enable-dbgutil to see these warnings. They are triggered as soon as the first formula cell is entered. > Maybe someone > else can comment what "Class: 256, Id: 0" is and what a possible cause > of the warning may be? I could only guess it's something to do with > UNO as there's no dynamic allocations in the core calculations. It's from our internal resource manager that for example loads strings defined in .srs files, I assume it's the function names. Each Class: 256, Id: 0. Cannot free resource! is preceded by a warn:legacy.osl:20465:1:/build/libo/core/tools/source/rc/resmgr.cxx:773: file:///build/libo/core/solver/unxlngx6/installation/opt/program/../program/resource/pricingen-US.res Class: 377, Id: 3001. Cannot load resource! with IDs in the range 3001..3004 which would match 4 function names. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpoysbyPckxz.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re:
Hi Rushi, On 14 December 2012 12:29, Rushi Shukla wrote: > Sorry I'm not clear about how to find the checkout of the libreoffice > version I am trying to build . Since you cloned into a folder called "libo", you should try looking for that, I guess. Does that help? Astron. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Personas in LibreOffice
Hi Astron, Stefan Knorr (Astron) píše v Pá 14. 12. 2012 v 17:53 +0100: > > So far this is still not finished, and I am fighting to have some time > > to finish that for Beta 2, and for late feature approval ;-) - so it > > still may happen that I'll need to just disable that code in 4.0, even > > though I'd love to finish that - I am close. > > > > The reason why it is Windows-only so far is that we do much more theming > > of the menu and toolbars ourselves on Windows, so we can better control > > there what is going on; so want to go the safe way, and do it > > Windows-only first, then extend to Linux too. > > Sorry to rain on the parade here .. but is there some good reason why > we need this feature? In the first place - sorry for my poor communication of this :-( I should have poked UX-advise in advance that I am poking this. There are actually 3 reasons: people love using their personalized pictures for backgrounds - I can see it everywhere. Photos of kids on the screens of mobile phones, desktop backgrounds etc. The other reason is that this has even enterprise use - I have a real customer who is unhappy with the look of the background behind the menu + toolbar. It is much easier to provide them with a way to tweak that than trying to find out a balance between their needs and needs of other customers - you will never do everyone happy. And the last thing - should you decide to change the background under the menu + toolbars, it will be as easy as drawing a new bitmap, instead of having to programaticaly change the look, which is not that fun with GDI functions :-) > If people are unhappy with how LibreOffice looks, we should probably > tweak the platform specific look until it is better. And from looking > at screenshots from Mac OS (and to a much lesser extent, working with > Windows), I do understand why people would say that. Unfortunately, eg. on Windows there is no real standard that would look good :-( > The thing is, those problems won't be solved at all when we allow > people to put pictures of their cats in the application background. In > fact, that will make matters for the most part. (I haven't yet seen > the feature working so far... But even Firefox's implementation of it > which tries to make sure everything stays usable does not guarantee > readable results.) Yes - people will be able to set something that it will do the app unusable; but hard to blame us for that, I think. Again - sorry for not communicating this in advance. All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: additional calc functions produce warnings
On Fri, 2012-12-14 at 13:17 +0100, Winfried Donkers wrote: > Hi Tino, > > > Also, what did you change, and did you get the same warnings before? > I didn't have these warnings before you submitted the pricing functions, > naturally :) > My changes have to do with adding new calc functions lwhich are defined in > ODFF1.2, but not yet present in calc. > These include IFERROR, IFNA, NUMBERVALUE, (ISO)WEEKNUM, but I don't think > they have anything to do with your code. I don't do anything with .res files > anyway. > It's because I run calc with debug traces switched on, that I get these > messages. . ./ooenv gdb ./soffice.bin break tools/source/rc/resmgr.cxx:773 run --calc and get the backtrace of that warning. That'll help indicate what's going on. These are indeed the .res file parser and so its fairly "mundane" code. e.g. missing resources of double freeresource of some such C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Personas in LibreOffice
Hi Kendy, On 14 December 2012 17:21, Jan Holesovsky wrote: > So far this is still not finished, and I am fighting to have some time > to finish that for Beta 2, and for late feature approval ;-) - so it > still may happen that I'll need to just disable that code in 4.0, even > though I'd love to finish that - I am close. > > The reason why it is Windows-only so far is that we do much more theming > of the menu and toolbars ourselves on Windows, so we can better control > there what is going on; so want to go the safe way, and do it > Windows-only first, then extend to Linux too. Sorry to rain on the parade here .. but is there some good reason why we need this feature? If people are unhappy with how LibreOffice looks, we should probably tweak the platform specific look until it is better. And from looking at screenshots from Mac OS (and to a much lesser extent, working with Windows), I do understand why people would say that. The thing is, those problems won't be solved at all when we allow people to put pictures of their cats in the application background. In fact, that will make matters for the most part. (I haven't yet seen the feature working so far... But even Firefox's implementation of it which tries to make sure everything stays usable does not guarantee readable results.) Astron. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Personas in LibreOffice
Hi Marcos, Marcos Souza píše v Čt 06. 12. 2012 v 09:57 -0200: > After take a look in some commits in LO about the FFox Personas, I saw > that this is only for Windows until now... > > There is a reason for that? > > There is something that we can do for extend this for Linux users? So far this is still not finished, and I am fighting to have some time to finish that for Beta 2, and for late feature approval ;-) - so it still may happen that I'll need to just disable that code in 4.0, even though I'd love to finish that - I am close. The reason why it is Windows-only so far is that we do much more theming of the menu and toolbars ourselves on Windows, so we can better control there what is going on; so want to go the safe way, and do it Windows-only first, then extend to Linux too. All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - basic/source
basic/source/runtime/step0.cxx | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 8309553c5e9fb1b70c2c0827c9407f78c9ebf3ec
Author: Noel Power
Date: Fri Dec 14 15:50:55 2012 +
bnc#792048 - squash error accessing object ( for ole property )
strange scenario where lhs property which is assigned to an object,
in this case ( the property ) ADODB.Recordset.Source can assigned a
String or ASODB.Command, however the Property will only return a string.
This confuses the basic runtime. But... this happens in checkUnoStruct so
really in this case the scenario is harmless, but.. we need to either
squash the error ( or retain any previous error ) as appropriate
Change-Id: I091877315a0c956b46fab8ff59feeb7e0572a169
diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx
index 69c748b..607d5cb 100644
--- a/basic/source/runtime/step0.cxx
+++ b/basic/source/runtime/step0.cxx
@@ -345,8 +345,17 @@ inline void checkUnoStructCopy( SbxVariableRef& refVal,
SbxVariableRef& refVar )
// #115826: Exclude ProcedureProperties to avoid call to Property Get
procedure
if( refVar->ISA(SbProcedureProperty) )
return;
-
+SbxError eOldErr = refVar->GetError();
+// There are some circumstances when calling GetObject
+// will trigger an error, we need to squash those here.
+// Alternatively it is possible that the same scenario
+// could overwrite and existing error. Lets prevent that
SbxObjectRef xVarObj = (SbxObject*)refVar->GetObject();
+if ( eOldErr != SbxERR_OK )
+refVar->SetError( eOldErr );
+else
+refVar->ResetError();
+
SbxDataType eValType = refVal->GetType();
if( eValType == SbxOBJECT && xVarObj == xValObj )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - padmin/Module_padmin.mk padmin/source padmin/uiconfig padmin/UI_spa.mk solenv/bin vcl/inc vcl/source
padmin/Module_padmin.mk |1
padmin/UI_spa.mk| 16 +
padmin/source/prtsetup.cxx | 113 +++-
padmin/source/prtsetup.hxx | 27 ---
padmin/source/rtsetup.hrc | 12 -
padmin/source/rtsetup.src | 101 ---
padmin/uiconfig/ui/printerdevicepage.ui | 208 +++
padmin/uiconfig/ui/printerproperties.ui | 286
solenv/bin/uilangfilter.xslt| 15 +
vcl/inc/vcl/builder.hxx |7
vcl/source/control/tabctrl.cxx |3
vcl/source/window/builder.cxx | 89 +
12 files changed, 473 insertions(+), 405 deletions(-)
New commits:
commit 00427faebbe66dde8bd2253e67b19e96f982fe27
Author: Caolán McNamara
Date: Fri Dec 14 14:54:24 2012 +
split out printer device page and adapt code to .ui
Change-Id: I7eacd837aacba452ab55ce707c3c032b2efadfb3
diff --git a/padmin/Module_padmin.mk b/padmin/Module_padmin.mk
index 53c54b4..c8d024d 100644
--- a/padmin/Module_padmin.mk
+++ b/padmin/Module_padmin.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_Module_add_targets,padmin,\
Library_spa \
AllLangResTarget_spa \
Package_inc \
+UI_spa \
))
endif
diff --git a/padmin/UI_spa.mk b/padmin/UI_spa.mk
new file mode 100644
index 000..70008c2
--- /dev/null
+++ b/padmin/UI_spa.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UI_UI,spa))
+
+$(eval $(call gb_UI_add_uifiles,spa,\
+ padmin/uiconfig/ui/printerdevicepage \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx
index 3862cde..6b398f1 100644
--- a/padmin/source/prtsetup.cxx
+++ b/padmin/source/prtsetup.cxx
@@ -94,8 +94,7 @@ RTSDialog::RTSDialog( const PrinterInfo& rJobData, const
String& rPrinter, bool
m_pOtherPage( NULL ),
m_pFontSubstPage( NULL ),
m_pCommandPage( NULL ),
-m_aInvalidString( PaResId( RID_RTS_RTSDIALOG_INVALID_TXT ) ),
-m_aFromDriverString( PaResId( RID_RTS_RTSDIALOG_FROMDRIVER_TXT ) )
+m_aInvalidString( PaResId( RID_RTS_RTSDIALOG_INVALID_TXT ) )
{
FreeResource();
@@ -350,37 +349,28 @@ IMPL_LINK( RTSPaperPage, SelectHdl, ListBox*, pBox )
* RTSDevicePage
*/
-RTSDevicePage::RTSDevicePage( RTSDialog* pParent ) :
-TabPage( & pParent->m_aTabControl, PaResId( RID_RTS_DEVICEPAGE ) ),
+RTSDevicePage::RTSDevicePage( RTSDialog* pParent )
+: TabPage(&pParent->m_aTabControl, "PrinterDevicePage",
"spa/ui/printerdevicepage.ui" )
+, m_pParent( pParent )
+{
+get(m_pPPDKeyBox, "options");
+get(m_pPPDValueBox, "values");
-m_pParent( pParent ),
+m_pPPDKeyBox->SetDropDownLineCount(12);
+m_pPPDValueBox->SetDropDownLineCount(12);
-m_aSpaceColor( PaResId( RID_RTS_DEVICE_COLOR_TXT ) ),
-m_aSpaceGray( PaResId( RID_RTS_DEVICE_GRAY_TXT ) ),
-m_aPPDKeyText( this, PaResId( RID_RTS_DEVICE_PPDKEY_TXT ) ),
-m_aPPDKeyBox( this, PaResId( RID_RTS_DEVICE_PPDKEY_BOX ) ),
-m_aPPDValueText( this, PaResId( RID_RTS_DEVICE_PPDVALUE_TXT ) ),
-m_aPPDValueBox( this, PaResId( RID_RTS_DEVICE_PPDVALUE_BOX ) ),
-m_aLevelText( this, PaResId( RID_RTS_DEVICE_PRINTLANG_TXT ) ),
-m_aLevelBox( this, PaResId( RID_RTS_DEVICE_PRINTLANG_BOX ) ),
-m_aSpaceText( this, PaResId( RID_RTS_DEVICE_SPACE_TXT ) ),
-m_aSpaceBox( this, PaResId( RID_RTS_DEVICE_SPACE_BOX ) ),
-m_aDepthText( this, PaResId( RID_RTS_DEVICE_DEPTH_TXT ) ),
-m_aDepthBox( this, PaResId( RID_RTS_DEVICE_DEPTH_BOX ) )
-{
-FreeResource();
+get(m_pLevelBox, "level");
+get(m_pSpaceBox, "colorspace");
+get(m_pDepthBox, "colordepth");
-m_aPPDKeyBox.SetSelectHdl( LINK( this, RTSDevicePage, SelectHdl ) );
-m_aPPDValueBox.SetSelectHdl( LINK( this, RTSDevicePage, SelectHdl ) );
+m_pPPDKeyBox->SetSelectHdl( LINK( this, RTSDevicePage, SelectHdl ) );
+m_pPPDValueBox->SetSelectHdl( LINK( this, RTSDevicePage, SelectHdl ) );
-m_aSpaceBox.InsertEntry( m_pParent->m_aFromDriverString );
-m_aSpaceBox.InsertEntry( m_aSpaceColor );
-m_aSpaceBox.InsertEntry( m_aSpaceGray );
switch( m_pParent->m_aJobData.m_nColorDevice )
{
-case -1: m_aSpaceBox.SelectEntry( m_aSpaceGray );break;
-case 0: m_aSpaceBox.SelectEntry( m_pParent->m_aFromDriverString
);break;
-case 1: m_aSpaceBox.SelectEntry( m_aSpaceColor );break;
+case 0: m_pSpaceBox->SelectEntryPos(0);break;
+case 1: m_pSpaceBox->SelectEntryPos(1);break;
+case -1: m_pSpaceBox->SelectEntryPos(2);break;
}
Re: --headless broken with --enable-headless
Hi Michael, Il 12/12/2012 22:36, Michael Meeks ha scritto: With 6a10f561d9e9cde17534bad7bf0497c9f74ece9e , master still crashes for me when running unoconv test suite: http://paste.ubuntu.com/1428111/ Odd indeed - I guess you'd need to valgrind it to work out what FMR/W is happening there and why (?) the LazyDeletor (urk) should be rather safe you would hope. Unfortunately am not able to reproduce it under valgrind _but_ latest master works fine. All's well that ends well :) riccardo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: default CUPS printing format Re: [PATCH] fdo#44664: printer truncates Landscape orientation pages to ...
On Thu, 2012-11-08 at 12:23 +0100, Michael Stahl wrote: > replying on list because there are some wider issues with this... > > this patch appears to change the default format for printing via CUPS > from PDF to PostScript. this was changed from PostScript to PDF in OOo 3.3. > > apparently there are some printers or CUPS setups that don't work well > with PDF as a default, the bug appears to have a long CC: list: We've worked around this with a "toggle this option if it doesn't work for you for some reason" (where for some reason is apparently likely to be: drivers were developed against version X of poppler or ghostscript which had bug Y which when fixed made those drivers not work correctly) In conversion with twaugh I wondered if there was any way that in LibreOffice I could detect that a given user's print system is going to be deficient. He suggested the possibility of a hack, which I'm not implementing personally, but I thought I should pass on for completeness.. C. On Fri, 2012-11-30 at 16:45 +, Tim Waugh wrote: Well, there *is*, but you probably don't want to do that. ... here is how it could be done. First, fetch the PPD for the queue. .. Next, look through it for a *cupsFilter or *cupsFilter2 attribute. http://www.cups.org/documentation.php/doc-1.5/spec-ppd.html#cupsFilter If any of those attributes says the driver can handle "application/vnd.cups-pdf" or "application/vnd.cups-postscript" by running a program to do it (i.e. any filter other than "-"), this driver will likely *not* handle landscape correctly. Of course, it might handle it fine, there's just no way to be sure without testing it. e.g. cupsFilter: "application/vnd.cups-pdf 0 foomatic-rip" -> FAIL? but cupsFilter: "application/vnd.cups-raster 0 hpcups" -> PASS and no cupsFilter line at all -> PASS I don't really advise this. :-) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6]: ps level 2 and level 3 both assigned the id for level 2
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1341 Approvals: Luboš Luňák: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1341 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia35c9fbcc023d29a5a0ecff04fa688aa00ce30e8 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Caolán McNamara Gerrit-Reviewer: Luboš Luňák ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-4'
Tag 'suse-3.6-4' created by Petr Mladek at 2012-12-14 15:07 -0800 Tag suse-3.6-4 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iEYEABECAAYFAlDLQJYACgkQKZC06p8y5oPUqQCfVWWhwUlueoKF3LSlZM1FfPLv df4AniS146t3NB5OTCPdkr7MXZmbG/zJ =CWTD -END PGP SIGNATURE- Changes since suse-3.6-3-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-4'
Tag 'suse-3.6-4' created by Petr Mladek at 2012-12-14 15:07 -0800 Tag suse-3.6-4 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iEYEABECAAYFAlDLQJYACgkQKZC06p8y5oPQEQCdGGdexHkPWi4UuKJHTLLEPjdZ fzMAn2sqAHnk6Wi5WIdt+BF61LOQt4yh =h2o0 -END PGP SIGNATURE- Changes since suse-3.6-3-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-4'
Tag 'suse-3.6-4' created by Petr Mladek at 2012-12-14 15:07 -0800 Tag suse-3.6-4 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iEYEABECAAYFAlDLQJYACgkQKZC06p8y5oNkMgCdEzeV7H0QqMnxnF8LONefDfIk oV4AmwXkR4UEBqPLNsTGVMqCjo853l/W =K/Ac -END PGP SIGNATURE- Changes since suse-3.6-3-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-4'
Tag 'suse-3.6-4' created by Petr Mladek at 2012-12-14 15:07 -0800 Tag suse-3.6-4 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iEYEABECAAYFAlDLQJYACgkQKZC06p8y5oNZDQCggCFDaq0NNb0q3fzltAmoYe6O 9nUAn1wpOBqwu2z23X7zHgHjAuksBuY2 =UD0B -END PGP SIGNATURE- Changes since suse-3.6-3-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-4'
Tag 'suse-3.6-4' created by Petr Mladek at 2012-12-14 15:06 -0800 Tag suse-3.6-4 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iEYEABECAAYFAlDLQJYACgkQKZC06p8y5oMFXACdHaFai7YhmPksFvTz12ZV/Y8Y rnQAoIFSpqYWO9JOSR1ro71gIdWneLm4 =+1W1 -END PGP SIGNATURE- Changes since suse-3.6-3-38: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - padmin/source
padmin/source/rtsetup.src |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 60da9c5fee9f5ff9d6789478ea7dd709846c305c Author: Caolán McNamara Date: Fri Dec 14 12:47:41 2012 + ps level 2 and level 3 both assigned the id for level 2 Change-Id: Ia35c9fbcc023d29a5a0ecff04fa688aa00ce30e8 (cherry picked from commit f350e8ebe9a0aea0c13db3f6d8b5a35f20145e09) Reviewed-on: https://gerrit.libreoffice.org/1341 Reviewed-by: LuboÅ¡ LuÅák Tested-by: LuboÅ¡ LuÅák diff --git a/padmin/source/rtsetup.src b/padmin/source/rtsetup.src index d73b615..d121e38 100644 --- a/padmin/source/rtsetup.src +++ b/padmin/source/rtsetup.src @@ -198,7 +198,7 @@ TabPage RID_RTS_DEVICEPAGE < "PostScript (Level from driver)" ; 1; > ; < "PostScript Level 1" ; 2; > ; < "PostScript Level 2"; 3; > ; -< "PostScript Level 3"; 3; > ; +< "PostScript Level 3"; 4; > ; < "PDF"; 10; > ; }; }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] docx export: graphics relativeFrom attributes now matches im...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1342 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/1342/1 docx export: graphics relativeFrom attributes now matches import code Change-Id: I9f543c08f5e19c11c7e1b8020b8c5f62ae040f6e --- M sw/source/filter/ww8/docxattributeoutput.cxx 1 file changed, 32 insertions(+), 2 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1342 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9f543c08f5e19c11c7e1b8020b8c5f62ae040f6e Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: ps level 2 and level 3 both assigned the id for level 2
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1341 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/41/1341/1 ps level 2 and level 3 both assigned the id for level 2 Change-Id: Ia35c9fbcc023d29a5a0ecff04fa688aa00ce30e8 (cherry picked from commit f350e8ebe9a0aea0c13db3f6d8b5a35f20145e09) --- M padmin/source/rtsetup.src 1 file changed, 1 insertion(+), 1 deletion(-) -- To view, visit https://gerrit.libreoffice.org/1341 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia35c9fbcc023d29a5a0ecff04fa688aa00ce30e8 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Caolán McNamara ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/androidapp' - android/qa
android/qa/desktop/Makefile| 10
++
android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java |2
++
2 files changed, 4 insertions(+), 8 deletions(-)
New commits:
commit 37445f423fae2fd5903a76fa704696d52ae732e0
Author: Michael Meeks
Date: Fri Dec 14 14:54:40 2012 +
android: more cleanup / misc. fixes.
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index c34cdab..3a3562b 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -1,6 +1,3 @@
-# lo-main-library - parameter denoting which shlib to load and execute
-# 'lo_main' from
-
include ../../../config_host.mk
# The default target just builds.
@@ -153,8 +150,5 @@ build-ant: android_version_setup copy-stuff link-so
properties setup-jars
unset JAVA_HOME && $(ANT) debug
run:
- echo "-env:INIFILENAME=file:///assets/program/sofficerc" > cmdline
-# echo "file:///assets/demo/writer.odt" > cmdline
- $(ANDROID_SDK_HOME)/platform-tools/adb push cmdline
$(APP_DATA_PATH)/cmdline
- $(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n
org.libreoffice.android.exampless/LODesktop -e lo-main-delay 20 -e
lo-main-indirect-cmdline "$(APP_DATA_PATH)/cmdline"
-# add -e lo-strace yes # if you want that
+ $(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n
org.libreoffice.android.examples/.LODesktop -e input /asset/test1.odt
+# -e lo-main-delay 20 -e lo-strace yes
\ No newline at end of file
diff --git
a/android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java
b/android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java
index c8e7990..5891cea 100644
--- a/android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java
+++ b/android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java
@@ -257,6 +257,8 @@ public class LODesktop
{
super.onCreate(savedInstanceState);
+Log.i(TAG, "onCreate - added here\n");
+
try {
String input = getIntent().getStringExtra("input");
if (input == null)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/androidapp' - 2 commits - android/Bootstrap android/experimental android/qa
android/Bootstrap/Makefile.shared |6 android/experimental/DocumentLoader/Makefile |7 android/qa/desktop/AndroidManifest.xml | 23 android/qa/desktop/Makefile| 285 -- android/qa/desktop/fonts.conf | 14 android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java | 285 ++ 6 files changed, 427 insertions(+), 193 deletions(-) New commits: commit 58fafe1fb910194bf48195abbfd7a18058be87b3 Author: Michael Meeks Date: Fri Dec 14 14:06:26 2012 + android: get the desktop demo building again. diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 4411dd7..6fe10a3 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -1,15 +1,14 @@ include ../../../config_host.mk +# The default target just builds. +all: build-ant + # The package of this app APP_PACKAGE=org.libreoffice.android.examples BOOTSTRAPDIR=../../Bootstrap include $(BOOTSTRAPDIR)/Makefile.shared -# The default target just builds. - -all: build-ant - copy-stuff: # Then "assets". Let the directory structure under assets mimic # that under solver for now. diff --git a/android/qa/desktop/AndroidManifest.xml b/android/qa/desktop/AndroidManifest.xml index c76425e..c5a6cc0 100644 --- a/android/qa/desktop/AndroidManifest.xml +++ b/android/qa/desktop/AndroidManifest.xml @@ -1,23 +1,20 @@ http://schemas.android.com/apk/res/android"; - package="org.libreoffice.android.libo" + package="org.libreoffice.android.examples" android:versionCode="1" android:versionName="1.0"> - - - - - - - + + + - diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index f94b39b..c34cdab 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -3,180 +3,129 @@ include ../../../config_host.mk -BOOTSTRAPDIR=../../Bootstrap -include $(BOOTSTRAPDIR)/Makefile.shared +# The default target just builds. +all: build-ant # The package of this app -APP_PACKAGE=org.libreoffice.android.libo +APP_PACKAGE=org.libreoffice.android.examples + +BOOTSTRAPDIR=../../Bootstrap +include $(BOOTSTRAPDIR)/Makefile.shared # The name of the Bootstrap activity class BOOTSTRAP=org.libreoffice.android.Bootstrap # The default target just builds. -all: build-ant - -buildrcs: -# main sofficerc ini ... - mkdir -p assets/program/ - echo "[Bootstrap]" > assets/program/lofficerc - echo "Logo=1" >> assets/program/lofficerc - echo "NativeProgress=1" >> assets/program/lofficerc - echo "URE_BOOTSTRAP=file:///assets/program/fundamentalrc" >> assets/program/lofficerc -# echo "RTL_LOGFILE=file:///dev/log/main" >> assets/program/lofficerc - echo "HOME=$(APP_DATA_PATH)/files" >> assets/program/lofficerc - echo "OSL_SOCKET_PATH=$(APP_DATA_PATH)/files" >> assets/program/lofficerc -# - this looks useful but breaks more than it fixes ... -# echo "DISABLE_EXTENSION_SYNCHRONIZATION=1" >> assets/program/lofficerc - -# fundamentalrc ini ... - echo "[Bootstrap]" > assets/program/fundamentalrc - echo "LO_LIB_DIR=file://$(APP_DATA_PATH)/lib/" >> assets/program/fundamentalrc +copy-stuff: +# Then "assets". Let the directory structure under assets mimic +# that under solver for now. +# +# Please note that I have no idea what all of this is really necessary and for +# much of this stuff being copied, no idea whether it makes any sense at all. +# Much of this is copy-pasted from android/qa/sc/Makefile (where a couple of +# unit tests for sc are built, and those do seem to mostly work) and +# android/qa/desktop/Makefile (mmeeks's desktop demo, also works to some +# extent). +# + mkdir -p assets/gz.unpack/program/ure assets/lib assets/program assets/xml/ure assets/ComponentTarget/i18npool/util + gzip -9 <$(OUTDIR)/bin/offapi.rdb >assets/gz.unpack/program/offapi.rdb + gzip -9 <$(OUTDIR)/bin/oovbaapi.rdb >assets/gz.unpack/program/oovbaapi.rdb + gzip -9 <$(OUTDIR)/bin/types.rdb >assets/gz.unpack/program/types.rdb + gzip -9 <$(OUTDIR)/bin/ure/types.rdb >assets/gz.unpack/program/ure/types.rdb +# For some reason the vnd.sun.star.expand:$LO_LIB_DIR doesn't seem to work, it expands to empty!? +# So just hardcode the known APP_DATA_PATH for now... + for F in xml/services xml/ure/services; do \ + sed -e 's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="file://$(APP_DATA_PATH)/lib/!g' <$(OUTDIR)/$$F.rdb >assets/$$F.rdb; \ + done + cp $(SRC_ROOT)/odk/examples/java/DocumentHandling/test/test1.odt \ + $(SRC_ROOT)/sc/qa/unit/data/x
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6.3' - sc/source
sc/source/filter/oox/workbookhelper.cxx |7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) New commits: commit 7a5c52c1d13634e6a0eb1eac6ee8b78d50673b87 Author: Noel Power Date: Thu Dec 13 16:52:50 2012 + fix sometimes data corruption with xlsx import ( with scenario sheets ) formula import is buffered 'till the end of import. The processing of the formula data need to happen before the scenario import happens. This is necessary because sheet numbers stored in the formula addresses can become invalid as scenario import insertes new hidden sheets upsetting the previous table order Change-Id: I9357f028f31bec1b1504ca991f5534f80d79c9bc diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index 071b9a6..dce942c 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -591,11 +591,6 @@ void WorkbookGlobals::finalize() // #i79826# enable updating automatic row height after loading the document aPropSet.setProperty( PROP_IsAdjustHeightEnabled, true ); -getFormulaBuffer().finalizeImport(); - -// hack, setting it true the second time will delete the cache -aPropSet.setProperty( PROP_IsAdjustHeightEnabled, true ); - // Insert all pivot tables. Must be done after loading all sheets and // formulas, because data pilots expect existing source data on // creation. @@ -667,6 +662,8 @@ void WorkbookHelper::finalizeWorkbookImport() mrBookGlob.getWorkbookSettings().finalizeImport(); mrBookGlob.getViewSettings().finalizeImport(); +// need to import formulas before scenarios +mrBookGlob.getFormulaBuffer().finalizeImport(); /* Insert scenarios after all sheet processing is done, because new hidden sheets are created for scenarios which would confuse code that relies on certain sheet indexes. Must be done after pivot tables too. */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6.3' - sw/source
sw/source/core/layout/trvlfrm.cxx | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 209149e9126dd75241f6a7c969ca5a12da61b28c
Author: Michael Stahl
Date: Thu Dec 13 01:28:59 2012 +0100
fdo#58142: fix frame selection in SwPageFrm::GetCrsrOfst:
The function does not handle the case where a paragraph was hit but no
background frame was hit properly, which may or may not (depending on
the platform) cause it to return a position of a frame when that is
undesirable, such as when called from SwWrtShell::UnSelectFrm().
When UnselectFrm() leaves a frame selected pasting multiple pictures
leads to a crash.
(regression from e8fbe97900f13305b17015d9044993bde4adab36)
Change-Id: I3604825f654c523a37f47a9fc660647d8b3e7077
(cherry picked from commit 2fc4af311656e7d019ca802d23444e5161f820ee)
Reviewed-on: https://gerrit.libreoffice.org/1314
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/core/layout/trvlfrm.cxx
b/sw/source/core/layout/trvlfrm.cxx
index 2ffc033..ee907cd 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -275,8 +275,12 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point
&rPoint,
if ( ( bTestBackground && bBackRet ) || !bTextRet )
{
bRet = bBackRet;
-pPos->nNode = aBackPos.nNode;
-pPos->nContent = aBackPos.nContent;
+(*pPos) = aBackPos;
+}
+else if (bTextRet && !bBackRet)
+{
+bRet = bTextRet;
+(*pPos) = aTextPos;
}
else
{
@@ -314,14 +318,12 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point
&rPoint,
if ( bValidTextDistance && bValidBackDistance &&
basegfx::fTools::more( nTextDistance, nBackDistance ) )
{
bRet = bBackRet;
-pPos->nNode = aBackPos.nNode;
-pPos->nContent = aBackPos.nContent;
+(*pPos) = aBackPos;
}
else
{
bRet = bTextRet;
-pPos->nNode = aTextPos.nNode;
-pPos->nContent = aTextPos.nContent;
+(*pPos) = aTextPos;
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/unocrsrhelper.hxx |4 +-
sw/source/core/unocore/unocrsrhelper.cxx | 16 +-
sw/source/core/unocore/unodraw.cxx | 48 +++
sw/source/core/unocore/unofield.cxx | 16 +-
sw/source/core/unocore/unoidx.cxx| 12 +++
sw/source/core/unocore/unoobj.cxx|6 +--
sw/source/core/unocore/unoobj2.cxx |4 +-
sw/source/core/unocore/unoport.cxx |2 -
sw/source/core/unocore/unoredline.cxx|2 -
sw/source/core/unocore/unorefmk.cxx |2 -
sw/source/core/unocore/unosect.cxx | 10 +++---
sw/source/core/unocore/unosett.cxx | 36 +++
12 files changed, 79 insertions(+), 79 deletions(-)
New commits:
commit de5f128cb394baea1e4e67552b8c30709c596334
Author: Takeshi Abe
Date: Fri Dec 14 22:19:32 2012 +0900
sal_Bool to bool
Change-Id: I43a98cfaf0a508e99f7f6b413e67d4c1ebdacfba
diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx
index 016238f..a5892f6 100644
--- a/sw/inc/unocrsrhelper.hxx
+++ b/sw/inc/unocrsrhelper.hxx
@@ -77,7 +77,7 @@ namespace SwUnoCursorHelper
GetNestedTextContent(SwTxtNode & rTextNode, xub_StrLen const nIndex,
bool const bParent);
-sal_BoolgetCrsrPropertyValue(const
SfxItemPropertySimpleEntry& rEntry
+boolgetCrsrPropertyValue(const
SfxItemPropertySimpleEntry& rEntry
, SwPaM& rPam
, com::sun::star::uno::Any *pAny
,
com::sun::star::beans::PropertyState& eState
@@ -110,7 +110,7 @@ namespace SwUnoCursorHelper
SwPaM& rPam,
com::sun::star::beans::PropertyState&
eState);
-sal_BoolDocInsertStringSplitCR( SwDoc &rDoc,
+boolDocInsertStringSplitCR( SwDoc &rDoc,
const SwPaM &rNewCursor, const String &rText,
const bool bForceExpandHints );
voidmakeRedline( SwPaM& rPaM, const ::rtl::OUString& RedlineType,
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx
b/sw/source/core/unocore/unocrsrhelper.cxx
index d165d4b..584b2d7 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -120,7 +120,7 @@ GetNestedTextContent(SwTxtNode & rTextNode, xub_StrLen
const nIndex,
/* --
* Read the special properties of the cursor
* --*/
-sal_Bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
+bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
, SwPaM& rPam
, Any *pAny
, PropertyState& eState
@@ -129,7 +129,7 @@ sal_Bool getCrsrPropertyValue(const
SfxItemPropertySimpleEntry& rEntry
PropertyState eNewState = PropertyState_DIRECT_VALUE;
//PropertyState_DEFAULT_VALUE
//PropertyState_AMBIGUOUS_VALUE
-sal_Bool bDone = sal_True;
+bool bDone = true;
switch(rEntry.nWID)
{
case FN_UNO_PARA_CONT_PREV_SUBTREE:
@@ -540,7 +540,7 @@ sal_Bool getCrsrPropertyValue(const
SfxItemPropertySimpleEntry& rEntry
break;
case RES_TXTATR_CHARFMT:
// no break here!
-default: bDone = sal_False;
+default: bDone = false;
}
if( bDone )
eState = eNewState;
@@ -910,12 +910,12 @@ void InsertFile(SwUnoCrsr* pUnoCrsr,
// insert text and scan for CR characters in order to insert
// paragraph breaks at those positions by calling SplitNode
-sal_Bool DocInsertStringSplitCR(
+bool DocInsertStringSplitCR(
SwDoc &rDoc,
const SwPaM &rNewCursor, const String &rText,
const bool bForceExpandHints )
{
-sal_Bool bOK = sal_True;
+bool bOK = true;
const enum IDocumentContentOperations::InsertFlags nInsertFlags =
(bForceExpandHints)
@@ -947,12 +947,12 @@ sal_Bool DocInsertStringSplitCR(
!rDoc.InsertString( rNewCursor, aTxt, nInsertFlags ))
{
OSL_FAIL( "Doc->Insert(Str) failed." );
-bOK = sal_False;
+bOK = false;
}
if (!rDoc.SplitNode( *rNewCursor.GetPoint(), false ) )
{
OSL_FAIL( "SplitNode failed" );
-bOK = sal_False;
+bOK = false;
}
nStartIdx = nIdx + 1;
nIdx = rText.Search( '\r', nStartIdx );
@@ -962,7 +962,7 @@ sal_Bool DocInsertStringSplitCR(
!rDoc.InsertString( rNewCursor, aTxt, nInsertFlags ))
{
OSL_FAIL( "Doc->Insert(Str) failed." );
-bOK = sal_False;
+bOK = false;
}
return bOK;
diff --git a/sw/source/core/unocore/unodraw.cxx
b/sw/source/core/unocore/unodraw.cxx
index 62b6bc5..ed19
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - 2 commits - padmin/source sfx2/inc sw/inc sw/source
padmin/source/rtsetup.src |2
sfx2/inc/sfx2/sfxdlg.hxx | 20 ++-
sfx2/inc/sfx2/tabdlg.hxx |8 +
sw/inc/swabstdlg.hxx |2
sw/source/ui/app/docst.cxx| 202 ++
sw/source/ui/dialog/swdlgfact.cxx | 30 +++--
sw/source/ui/dialog/swdlgfact.hxx | 19 +++
sw/source/ui/fmtui/tmpdlg.cxx | 12 --
sw/source/ui/inc/tmpdlg.hxx |1
9 files changed, 176 insertions(+), 120 deletions(-)
New commits:
commit 012c62b9ae04404349b8595e4408e9f63ec52164
Author: Caolán McNamara
Date: Fri Dec 14 12:47:41 2012 +
ps level 2 and level 3 both assigned the id for level 2
Change-Id: Ia35c9fbcc023d29a5a0ecff04fa688aa00ce30e8
(cherry picked from commit f350e8ebe9a0aea0c13db3f6d8b5a35f20145e09)
Signed-off-by: Caolán McNamara
diff --git a/padmin/source/rtsetup.src b/padmin/source/rtsetup.src
index b75a1a3..9449cfd 100644
--- a/padmin/source/rtsetup.src
+++ b/padmin/source/rtsetup.src
@@ -190,7 +190,7 @@ TabPage RID_RTS_DEVICEPAGE
< "PostScript (Level from driver)" ; 1; > ;
< "PostScript Level 1" ; 2; > ;
< "PostScript Level 2"; 3; > ;
-< "PostScript Level 3"; 3; > ;
+< "PostScript Level 3"; 4; > ;
< "PDF"; 10; > ;
};
};
commit cafa391c032dbba6869bbf56132025240c34c123
Author: Caolán McNamara
Date: Thu Dec 13 10:12:13 2012 +
Related: fdo#38606 keep style dialog open when apply is clicked
i.e. don't close and reopen, just stay open
Change-Id: I11cdc492e3c4adfb75c9a0dfa52e5ba351914858
diff --git a/sfx2/inc/sfx2/sfxdlg.hxx b/sfx2/inc/sfx2/sfxdlg.hxx
index 3585645..0465dbb 100644
--- a/sfx2/inc/sfx2/sfxdlg.hxx
+++ b/sfx2/inc/sfx2/sfxdlg.hxx
@@ -55,7 +55,7 @@ namespace com { namespace sun { namespace star { namespace
frame {
class XModel;
} } } }
-class SfxAbstractDialog : public VclAbstractDialog
+class SfxAbstractDialog : virtual public VclAbstractDialog
{
public:
virtual const SfxItemSet* GetOutputItemSet() const = 0;
@@ -63,15 +63,21 @@ public:
virtual String GetText() const = 0;
};
-class SfxAbstractTabDialog : public SfxAbstractDialog
+class SfxAbstractTabDialog : virtual public SfxAbstractDialog
{
public:
virtual voidSetCurPageId( sal_uInt16 nId ) = 0;
-virtual const sal_uInt16* GetInputRanges( const SfxItemPool& ) = 0;
+virtual const sal_uInt16* GetInputRanges( const SfxItemPool& ) = 0;
virtual voidSetInputSet( const SfxItemSet* pInSet ) = 0;
};
-class SfxAbstractInsertObjectDialog : public VclAbstractDialog
+class SfxAbstractApplyTabDialog : virtual public SfxAbstractTabDialog
+{
+public:
+virtual voidSetApplyHdl( const Link& rLink ) = 0;
+};
+
+class SfxAbstractInsertObjectDialog : virtual public VclAbstractDialog
{
public:
virtual com::sun::star::uno::Reference <
com::sun::star::embed::XEmbeddedObject > GetObject()=0;
@@ -79,7 +85,7 @@ public:
virtual sal_Bool IsCreateNew()=0;
};
-class SfxAbstractPasteDialog : public VclAbstractDialog
+class SfxAbstractPasteDialog : virtual public VclAbstractDialog
{
public:
virtual void Insert( SotFormatStringId nFormat, const String & rFormatName
) = 0;
@@ -89,11 +95,11 @@ public:
const TransferableObjectDescriptor* pDesc=0 ) = 0;
};
-class SfxAbstractLinksDialog : public VclAbstractDialog
+class SfxAbstractLinksDialog : virtual public VclAbstractDialog
{
};
-class AbstractScriptSelectorDialog : public VclAbstractDialog
+class AbstractScriptSelectorDialog : virtual public VclAbstractDialog
{
public:
virtual String GetScriptURL() const = 0;
diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx
index c3e010a..164dae3 100644
--- a/sfx2/inc/sfx2/tabdlg.hxx
+++ b/sfx2/inc/sfx2/tabdlg.hxx
@@ -201,7 +201,13 @@ public:
voidSetApplyHandler(const Link& _rHdl);
SAL_DLLPRIVATE void Start_Impl();
-SAL_DLLPRIVATE sal_Bool OK_Impl() { return PrepareLeaveCurrentPage(); }
+bool OK_Impl()
+{
+bool bRet = PrepareLeaveCurrentPage();
+if (bRet)
+Ok();
+return bRet;
+}
};
namespace sfx { class ItemConnectionBase; }
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 5355b97..c0e1bc8 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -416,7 +416,7 @@ public:
sal_BoolbFmt =
sal_False,
sal_uInt16 nDefPage =
0,
const String* pFmtStr = 0)
= 0; //add for SwFrmDlg
-virtual SfxAbstractTabDialog* CreateTemplateDialog( int nResId,
+virtual SfxAbstractApplyTabDialog* CreateTemplateDialog(
Window*
[Libreoffice-commits] .: padmin/source
padmin/source/rtsetup.src |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f350e8ebe9a0aea0c13db3f6d8b5a35f20145e09 Author: Caolán McNamara Date: Fri Dec 14 12:47:41 2012 + ps level 2 and level 3 both assigned the id for level 2 Change-Id: Ia35c9fbcc023d29a5a0ecff04fa688aa00ce30e8 diff --git a/padmin/source/rtsetup.src b/padmin/source/rtsetup.src index b75a1a3..9449cfd 100644 --- a/padmin/source/rtsetup.src +++ b/padmin/source/rtsetup.src @@ -190,7 +190,7 @@ TabPage RID_RTS_DEVICEPAGE < "PostScript (Level from driver)" ; 1; > ; < "PostScript Level 1" ; 2; > ; < "PostScript Level 2"; 3; > ; -< "PostScript Level 3"; 3; > ; +< "PostScript Level 3"; 4; > ; < "PDF"; 10; > ; }; }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] let's have plain 'make' without '-r' even faster
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1257 Approvals: Björn Michaelsen: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1257 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8338a6be0afbad456d1c5ca5d5a1b8a26ffca8ad Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan Gerrit-Reviewer: Björn Michaelsen ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/gbuild.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit bef07dc079523e9955c10e7792cbcdb818237cf2 Author: Matúš Kukan Date: Thu Dec 6 20:45:11 2012 +0100 let's have plain 'make' without '-r' even faster Change-Id: I8338a6be0afbad456d1c5ca5d5a1b8a26ffca8ad Reviewed-on: https://gerrit.libreoffice.org/1257 Reviewed-by: Björn Michaelsen Tested-by: Björn Michaelsen diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 9e621cd..5898cde 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -54,7 +54,8 @@ GBUILDDIR:=$(SRCDIR)/solenv/gbuild # FOR TAIL_BUILD THE IMPACT IS HUGE! # (unless you are doing make -r, which we should explicitly NOT require from # users) -MAKEFLAGS+=-r +MAKEFLAGS += r +.SUFFIXES: # by default gbuild use /bin/sh # if you want to use a particular shell ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
RE: additional calc functions produce warnings
Hi Tino, > Also, what did you change, and did you get the same warnings before? I didn't have these warnings before you submitted the pricing functions, naturally :) My changes have to do with adding new calc functions lwhich are defined in ODFF1.2, but not yet present in calc. These include IFERROR, IFNA, NUMBERVALUE, (ISO)WEEKNUM, but I don't think they have anything to do with your code. I don't do anything with .res files anyway. It's because I run calc with debug traces switched on, that I get these messages. Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: fix fdo#58237 import hyperlinks for shapes in xlsx documents
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1337 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/37/1337/1 fix fdo#58237 import hyperlinks for shapes in xlsx documents Change-Id: Ib0c661dbb3ce9a2f8c8d29707a1cf0c65aadc81f --- M oox/inc/oox/core/relations.hxx M oox/source/core/relations.cxx M oox/source/drawingml/hyperlinkcontext.cxx M sc/source/filter/inc/worksheetbuffer.hxx M sc/source/filter/oox/drawingfragment.cxx M sc/source/filter/oox/worksheetbuffer.cxx 6 files changed, 56 insertions(+), 1 deletion(-) -- To view, visit https://gerrit.libreoffice.org/1337 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib0c661dbb3ce9a2f8c8d29707a1cf0c65aadc81f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Noel Power ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: fix sometimes data corruption with xlsx import ( with scenar...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1338 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/38/1338/1 fix sometimes data corruption with xlsx import ( with scenario sheets ) formula import is buffered 'till the end of import. The processing of the formula data need to happen before the scenario import happens. This is necessary because sheet numbers stored in the formula addresses can become invalid as scenario import insertes new hidden sheets upsetting the previous table order Change-Id: I9357f028f31bec1b1504ca991f5534f80d79c9bc --- M sc/source/filter/oox/workbookhelper.cxx 1 file changed, 2 insertions(+), 5 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1338 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9357f028f31bec1b1504ca991f5534f80d79c9bc Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Noel Power ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] Changes to 'feature/androidapp'
New branch 'feature/androidapp' available with the following commits: commit 0f5c06d23864222951d93d76bfaf3be1e23bc8b7 Author: Michael Meeks Date: Fri Dec 14 11:50:22 2012 + android: share more of the Makefile / build logic commit c3d630a703f8a6706550cea491c7445897b15cf2 Author: Michael Meeks Date: Thu Dec 13 19:33:42 2012 + Revert "Clean up remains of NativeActivity-based Android app support" This reverts commit cecc926070ee3d2ad6296fc5e0cfcde8642bb140. Conflicts: sal/android/lo-bootstrap.c sal/inc/osl/detail/android-bootstrap.h ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - 2 commits - oox/inc oox/source sc/source
oox/inc/oox/core/relations.hxx|2 ++
oox/source/core/relations.cxx |6 ++
oox/source/drawingml/hyperlinkcontext.cxx |5 +
sc/source/filter/inc/worksheetbuffer.hxx |4
sc/source/filter/oox/drawingfragment.cxx | 21 -
sc/source/filter/oox/workbookhelper.cxx |7 ++-
sc/source/filter/oox/worksheetbuffer.cxx | 19 +++
7 files changed, 58 insertions(+), 6 deletions(-)
New commits:
commit f851a46abac1460376d9030bf8525c509ed590ce
Author: Noel Power
Date: Thu Dec 13 16:52:50 2012 +
fix sometimes data corruption with xlsx import ( with scenario sheets )
formula import is buffered 'till the end of import. The processing of the
formula data need to happen before the scenario import happens. This is
necessary because sheet numbers stored in the formula addresses can become
invalid as scenario import insertes new hidden sheets upsetting the previous
table order
Change-Id: I9357f028f31bec1b1504ca991f5534f80d79c9bc
diff --git a/sc/source/filter/oox/workbookhelper.cxx
b/sc/source/filter/oox/workbookhelper.cxx
index 071b9a6..dce942c 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -591,11 +591,6 @@ void WorkbookGlobals::finalize()
// #i79826# enable updating automatic row height after loading the
document
aPropSet.setProperty( PROP_IsAdjustHeightEnabled, true );
-getFormulaBuffer().finalizeImport();
-
-// hack, setting it true the second time will delete the cache
-aPropSet.setProperty( PROP_IsAdjustHeightEnabled, true );
-
// Insert all pivot tables. Must be done after loading all sheets and
// formulas, because data pilots expect existing source data on
// creation.
@@ -667,6 +662,8 @@ void WorkbookHelper::finalizeWorkbookImport()
mrBookGlob.getWorkbookSettings().finalizeImport();
mrBookGlob.getViewSettings().finalizeImport();
+// need to import formulas before scenarios
+mrBookGlob.getFormulaBuffer().finalizeImport();
/* Insert scenarios after all sheet processing is done, because new hidden
sheets are created for scenarios which would confuse code that relies
on certain sheet indexes. Must be done after pivot tables too. */
commit c1638e418cfdffabef93bb358dcdd3ae239e3bcd
Author: Noel Power
Date: Thu Dec 13 16:26:58 2012 +
fix fdo#58237 import hyperlinks for shapes in xlsx documents
Change-Id: Ib0c661dbb3ce9a2f8c8d29707a1cf0c65aadc81f
diff --git a/oox/inc/oox/core/relations.hxx b/oox/inc/oox/core/relations.hxx
index e7d558b..67f298e 100644
--- a/oox/inc/oox/core/relations.hxx
+++ b/oox/inc/oox/core/relations.hxx
@@ -88,6 +88,8 @@ public:
/** Returns the external target of the relation with the passed relation
identifier. */
::rtl::OUString getExternalTargetFromRelId( const ::rtl::OUString&
rRelId ) const;
+/** Returns the internal target of the relation with the passed relation
identifier. */
+::rtl::OUString getInternalTargetFromRelId( const ::rtl::OUString&
rRelId ) const;
/** Returns the full fragment path for the target of the passed relation.
*/
::rtl::OUString getFragmentPathFromRelation( const Relation& rRelation
) const;
diff --git a/oox/source/core/relations.cxx b/oox/source/core/relations.cxx
index ef9510c..ad39489 100644
--- a/oox/source/core/relations.cxx
+++ b/oox/source/core/relations.cxx
@@ -92,6 +92,12 @@ OUString Relations::getExternalTargetFromRelId( const
OUString& rRelId ) const
return (pRelation && pRelation->mbExternal) ? pRelation->maTarget :
OUString();
}
+OUString Relations::getInternalTargetFromRelId( const OUString& rRelId ) const
+{
+const Relation* pRelation = getRelationFromRelId( rRelId );
+return (pRelation && !pRelation->mbExternal) ? pRelation->maTarget :
OUString();
+}
+
OUString Relations::getFragmentPathFromRelation( const Relation& rRelation )
const
{
// no target, no fragment path
diff --git a/oox/source/drawingml/hyperlinkcontext.cxx
b/oox/source/drawingml/hyperlinkcontext.cxx
index 06958aa..ed03ddd 100644
--- a/oox/source/drawingml/hyperlinkcontext.cxx
+++ b/oox/source/drawingml/hyperlinkcontext.cxx
@@ -59,6 +59,11 @@ HyperLinkContext::HyperLinkContext( ContextHandler& rParent,
OSL_TRACE("OOX: URI href %s", ::rtl::OUStringToOString (sHref,
RTL_TEXTENCODING_UTF8).pData->buffer);
sURL = getFilter().getAbsoluteUrl( sHref );
}
+else
+{
+// not sure if we also need to set sHref to the internal target
+sURL = getRelations().getInternalTargetFromRelId( aRelId );
+}
}
OUString sTooltip = xAttributes->getOptionalValue( R_TOKEN( tooltip ) );
if ( !sTooltip.isEmpty() )
diff --git a/sc/source/filter/inc/worksheetbuffer.hxx
b/sc/source/filter/inc/worksheetbuffer.hxx
index e527a7
[PUSHED] Change in core[libreoffice-3-6]: fdo#58142: fix frame selection in SwPageFrm::GetCrsrOfst:
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1314 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1314 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3604825f654c523a37f47a9fc660647d8b3e7077 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Michael Stahl Gerrit-Reviewer: Caolán McNamara ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source
sw/source/core/layout/trvlfrm.cxx | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 4703b45c8fd6b72c8cb797492b14e48b5e1c38f7
Author: Michael Stahl
Date: Thu Dec 13 01:28:59 2012 +0100
fdo#58142: fix frame selection in SwPageFrm::GetCrsrOfst:
The function does not handle the case where a paragraph was hit but no
background frame was hit properly, which may or may not (depending on
the platform) cause it to return a position of a frame when that is
undesirable, such as when called from SwWrtShell::UnSelectFrm().
When UnselectFrm() leaves a frame selected pasting multiple pictures
leads to a crash.
(regression from e8fbe97900f13305b17015d9044993bde4adab36)
Change-Id: I3604825f654c523a37f47a9fc660647d8b3e7077
(cherry picked from commit 2fc4af311656e7d019ca802d23444e5161f820ee)
Reviewed-on: https://gerrit.libreoffice.org/1314
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/core/layout/trvlfrm.cxx
b/sw/source/core/layout/trvlfrm.cxx
index 2ffc033..ee907cd 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -275,8 +275,12 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point
&rPoint,
if ( ( bTestBackground && bBackRet ) || !bTextRet )
{
bRet = bBackRet;
-pPos->nNode = aBackPos.nNode;
-pPos->nContent = aBackPos.nContent;
+(*pPos) = aBackPos;
+}
+else if (bTextRet && !bBackRet)
+{
+bRet = bTextRet;
+(*pPos) = aTextPos;
}
else
{
@@ -314,14 +318,12 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point
&rPoint,
if ( bValidTextDistance && bValidBackDistance &&
basegfx::fTools::more( nTextDistance, nBackDistance ) )
{
bRet = bBackRet;
-pPos->nNode = aBackPos.nNode;
-pPos->nContent = aBackPos.nContent;
+(*pPos) = aBackPos;
}
else
{
bRet = bTextRet;
-pPos->nNode = aTextPos.nNode;
-pPos->nContent = aTextPos.nContent;
+(*pPos) = aTextPos;
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Anti-aliasing via GPU
On 2012-12-14 13:32, Michael Meeks wrote: OK; interesting - if you don't think it's suitable that's fine - I had assumed that with the reasonably demanding SVG / HTML5 canvas requirements of the browser that it might be a reasonable fit (at least to investigate). It might be. I'm just saying it wasn't designed to be general purpose. Specifically, its (a) a stateless API (b) use floating point, not fixed point, numbers for it's positioning and geometry APIs. Whereas Cairo is stateful and fixed point. And Azure would require spinning out into a separate library. Indeed - will add it to the list; though it's mostly cairo hackery right ? It's entirely Cairo work. But it won't any traction at all unless a decent sized project (like us) says that we're willing to actually use it. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - connectivity/source framework/inc framework/source sc/source sw/inc sw/source tools/inc tools/source unusedcode.easy vcl/source
connectivity/source/drivers/mork/MColumnAlias.cxx |4
connectivity/source/drivers/mork/MColumnAlias.hxx |1
framework/inc/xml/menudocumenthandler.hxx |4
framework/source/fwe/xml/menuconfiguration.cxx|2
framework/source/fwe/xml/menudocumenthandler.cxx |9 -
sc/source/filter/inc/formulabase.hxx | 10 -
sc/source/filter/oox/formulabase.cxx |5
sw/inc/globals.hrc|1
sw/inc/helpid.h |1
sw/source/ui/app/app.src |7
sw/source/ui/config/optdlg.src| 184 --
sw/source/ui/frmdlg/cption.cxx| 27 +--
sw/source/ui/inc/cption.hxx |2
tools/inc/tools/string.hxx|4
tools/source/string/tustring.cxx | 54 --
unusedcode.easy |7
vcl/source/window/builder.cxx |2
17 files changed, 25 insertions(+), 299 deletions(-)
New commits:
commit 32e7b29f51c4f6bce08a23e454ec47b83849c9df
Author: Caolán McNamara
Date: Fri Dec 14 11:12:22 2012 +
drop converted TP_OPTPRINT_PAGE page
Change-Id: Ieac443b40fd5fa3b1b13b492e1b97a5df35835b5
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index d443b6d..8ad0db0 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -161,7 +161,6 @@
#define HID_COLUMN "SW_HID_COLUMN"
#define HID_DOC_STAT
"SW_HID_DOC_STAT"
#define HID_FOOTNOTE_PAGE
"SW_HID_FOOTNOTE_PAGE"
-#define HID_OPTPRINT_PAGE
"SW_HID_OPTPRINT_PAGE"
#define HID_FORMAT_TABLE
"SW_HID_FORMAT_TABLE"
#define HID_TABLE_COLUMN
"SW_HID_TABLE_COLUMN"
#define HID_LAB_LAB
"SW_HID_LAB_LAB"
diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src
index b15c1c5..16f80af 100644
--- a/sw/source/ui/config/optdlg.src
+++ b/sw/source/ui/config/optdlg.src
@@ -187,190 +187,6 @@ TabPage TP_CONTENT_OPT
};
};
-TabPage TP_OPTPRINT_PAGE
-{
-HelpID = HID_OPTPRINT_PAGE ;
-Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-Hide = TRUE ;
-FixedLine FL_1
-{
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 78 , 8 ) ;
-Text [ en-US ] = "Contents" ;
-Group = TRUE ;
-};
-CheckBox CB_PGRF /*functionally merged with CB_PDRAW*/
-{
-HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_PGRF";
-Pos = MAP_APPFONT ( 12 , 14 ) ;
-Size = MAP_APPFONT ( 70 , 10 ) ;
-Text [ en-US ] = "~Pictures and objects" ;
-TabStop = TRUE ;
-Group = TRUE ;
-};
-CheckBox CB_CTRLFLD
-{
-HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_CTRLFLD";
-Pos = MAP_APPFONT ( 12 , 27 ) ;
-Size = MAP_APPFONT ( 70 , 10 ) ;
-Text [ en-US ] = "Form control~s" ;
-};
-CheckBox CB_BACKGROUND
-{
-HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_BACKGROUND";
-Pos = MAP_APPFONT ( 12 , 40 ) ;
-Size = MAP_APPFONT ( 70 , 10 ) ;
-Text [ en-US ] = "Page ba~ckground" ;
-};
-CheckBox CB_BLACK_FONT
-{
-HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_BLACK_FONT";
-Pos = MAP_APPFONT ( 12 , 53 ) ;
-Size = MAP_APPFONT ( 70 , 10 ) ;
-Text [ en-US ] = "Print text in blac~k" ;
-};
-CheckBox CB_HIDDEN_TEXT
-{
-HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_HIDDEN_TEXT";
-Pos = MAP_APPFONT ( 12 , 66 ) ;
-Size = MAP_APPFONT ( 70 , 10 ) ;
-Text [ en-US ] = "Hidden te~xt" ;
-};
-CheckBox CB_TEXT_PLACEHOLDER
-{
-HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_TEXT_PLACEHOLDER";
-Pos = MAP_APPFONT ( 12 , 79 ) ;
-Size = MAP_APPFONT ( 70 , 10 ) ;
-Text [ en-US ] = "Text ~placeholder" ;
-};
-FixedLine FL_SEP_PRT_LEFT
-{
-Pos = MAP_APPFONT ( 85 , 14 ) ;
-Size = MAP_APPFONT ( 4 , 78 ) ;
-Vert = TRUE;
-};
-FixedLine FL_2
-{
-Pos = MAP_APPFONT ( 90 , 3 ) ;
-Size = MAP_APPFONT ( 78 , 8 ) ;
-Text [ en-US ] = "Pages" ;
-Group = TRUE ;
-};
-CheckBox CB_LEFTP
-{
-HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_LEFTP";
-Pos = MAP_APPFONT ( 96 , 14 ) ;
-Size = MAP_APPFONT ( 70 , 10 ) ;
-Text [ en-US ] = "~Left pages" ;
-TabStop = TRUE ;
-Group = TRUE ;
-};
-CheckBox CB_RIGHTP
-{
-HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_RIGHTP";
-Pos = MAP_APPFONT ( 96 , 27 ) ;
-Size = MAP_APPFONT ( 70 , 10 ) ;
-Text [ en-US ] = "~Right pages" ;
-};
-CheckBox CB_PROSPECT
-{
-HelpID =
[Libreoffice-commits] .: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ea26d97b2189d5b92bfec9c61253b2c740c38170 Author: Caolán McNamara Date: Fri Dec 14 11:07:12 2012 + Updated core Project: help 1909df07cbd54bf753514cc6dc4137b7b69af63c update help ids for number format page .ui conversion diff --git a/helpcontent2 b/helpcontent2 index 56562e9..1909df0 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 56562e9b04dcbfd63012eecddb53b76dc4cee84b +Subproject commit 1909df07cbd54bf753514cc6dc4137b7b69af63c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: filter/source
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 16
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit f15e01ab033e93f58d29791ef6ffc932599fb33f
Author: Ivan Timofeev
Date: Fri Dec 14 15:34:51 2012 +0400
there was SearchAndReplace which replaces the first occurrence
Change-Id: I2fd4356ed8dcf2567912e417aa57b12b4a23a245
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 90c788a..4df5dd0 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -798,7 +798,7 @@ void XMLFilterSettingsDialog::onDelete()
OUString aPlaceHolder( "%s" );
OUString aMessage(RESIDSTR(STR_WARN_DELETE));
-aMessage = aMessage.replaceAll( aPlaceHolder, pInfo->maFilterName );
+aMessage = aMessage.replaceFirst( aPlaceHolder, pInfo->maFilterName );
WarningBox aWarnBox(this, (WinBits)(WB_YES_NO | WB_DEF_YES),
aMessage );
if( aWarnBox.Execute() == RET_YES )
@@ -922,14 +922,14 @@ void XMLFilterSettingsDialog::onSave()
if( nFilters > 0 )
{
aMsg = RESIDSTR(STR_FILTERS_HAVE_BEEN_SAVED);
-aMsg = aMsg.replaceAll( sPlaceholder, OUString::valueOf(
static_cast(nFilters) ) );
-aMsg = aMsg.replaceAll( sPlaceholder, aURL.GetName() );
+aMsg = aMsg.replaceFirst( sPlaceholder, OUString::valueOf(
static_cast(nFilters) ) );
+aMsg = aMsg.replaceFirst( sPlaceholder, aURL.GetName() );
}
else
{
aMsg = RESIDSTR(STR_FILTER_HAS_BEEN_SAVED);
-aMsg = aMsg.replaceAll( sPlaceholder,
(*aFilters.begin())->maFilterName );
-aMsg = aMsg.replaceAll( sPlaceholder, aURL.GetName() );
+aMsg = aMsg.replaceFirst( sPlaceholder,
(*aFilters.begin())->maFilterName );
+aMsg = aMsg.replaceFirst( sPlaceholder, aURL.GetName() );
}
InfoBox aBox(this, aMsg );
@@ -986,18 +986,18 @@ void XMLFilterSettingsDialog::onOpen()
{
INetURLObject aURLObj( aURL );
aMsg = RESIDSTR(STR_NO_FILTERS_FOUND);
-aMsg = aMsg.replaceAll( sPlaceholder, aURLObj.GetName() );
+aMsg = aMsg.replaceFirst( sPlaceholder, aURLObj.GetName() );
}
else if( nFilters == 1 )
{
aMsg = RESIDSTR(STR_FILTER_INSTALLED);
-aMsg = aMsg.replaceAll( sPlaceholder, aFilterName );
+aMsg = aMsg.replaceFirst( sPlaceholder, aFilterName );
}
else
{
aMsg = RESIDSTR(STR_FILTERS_INSTALLED);
-aMsg = aMsg.replaceAll( sPlaceholder, OUString::valueOf(
static_cast(nFilters) ) );
+aMsg = aMsg.replaceFirst( sPlaceholder, OUString::valueOf(
static_cast(nFilters) ) );
}
InfoBox aBox(this, aMsg );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Anti-aliasing via GPU
On Fri, 2012-12-14 at 12:26 +0200, Noel Grandin wrote: > I think what he is saying is that he's happy if you take and check it > in, but he doesn't want to take any responsibility for maintaining such > a thing. :-) then someone should do that I think. > The Mozilla thing is Azure. It's really not intended to be a proper > general purpose drawing library. It is specifically constructed to mesh > well with the browser's internal drawing model. OK; interesting - if you don't think it's suitable that's fine - I had assumed that with the reasonably demanding SVG / HTML5 canvas requirements of the browser that it might be a reasonable fit (at least to investigate). > Getting the Direct2D backend copied from Mozilla into Cairo would, I > suspect, be the best bet. And it would allow us to rationalise our own > backends. Sounds good to me. IIRC we shipped the Cairo backend on windows already without noticing it [ at least for a while ], so presumably it might work reasonably well to consolidate on that. > But it's a major chunk of work. And open-source Win32 hackers are in > short supply. Quite - you're like gold-dust :-) > Might make a good Google Summer-of-code project?? Indeed - will add it to the list; though it's mostly cairo hackery right ? http://wiki.documentfoundation.org/Development/Gsoc/Ideas#Use_Cairo_for_rendering_cross-platform ATB, Michael. -- michael.me...@suse.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - boost/boost_1_44_0-clang-warnings.patch sc/inc
boost/boost_1_44_0-clang-warnings.patch | 39
sc/inc/dpsave.hxx |1
2 files changed, 39 insertions(+), 1 deletion(-)
New commits:
commit fef2ef3b91a42d59d1a24a3d17dfd13f2debf094
Author: Stephan Bergmann
Date: Fri Dec 14 12:31:02 2012 +0100
-Werror,-Wshadow
Change-Id: I9828e16c295d3634bd5f0c6910cf28e2f4dde3d2
diff --git a/boost/boost_1_44_0-clang-warnings.patch
b/boost/boost_1_44_0-clang-warnings.patch
index cf7603a..d577205 100644
--- a/boost/boost_1_44_0-clang-warnings.patch
+++ b/boost/boost_1_44_0-clang-warnings.patch
@@ -80,6 +80,45 @@
template
static void plus_equal(Token &t, const Value &v) {
t += v;
+--- misc/boost_1_44_0/boost/random/lagged_fibonacci.hpp
misc/build/boost_1_44_0/boost/random/lagged_fibonacci.hpp
+@@ -16,6 +16,10 @@
+ #ifndef BOOST_RANDOM_LAGGED_FIBONACCI_HPP
+ #define BOOST_RANDOM_LAGGED_FIBONACCI_HPP
+
++#if defined __GNUC__
++#pragma GCC system_header
++#endif
++
+ #include
+ #include
+ #include // std::max
+--- misc/boost_1_44_0/boost/random/shuffle_output.hpp
misc/build/boost_1_44_0/boost/random/shuffle_output.hpp
+@@ -16,6 +16,10 @@
+ #ifndef BOOST_RANDOM_SHUFFLE_OUTPUT_HPP
+ #define BOOST_RANDOM_SHUFFLE_OUTPUT_HPP
+
++#if defined __GNUC__
++#pragma GCC system_header
++#endif
++
+ #include
+ #include // std::copy
+ #include
+--- misc/boost_1_44_0/boost/random/subtract_with_carry.hpp
misc/build/boost_1_44_0/boost/random/subtract_with_carry.hpp
+@@ -16,6 +16,10 @@
+ #ifndef BOOST_RANDOM_SUBTRACT_WITH_CARRY_HPP
+ #define BOOST_RANDOM_SUBTRACT_WITH_CARRY_HPP
+
++#if defined __GNUC__
++#pragma GCC system_header
++#endif
++
+ #include
+ #include
+ #include // std::equal
--- misc/boost_1_44_0/boost/uuid/name_generator.hpp
+++ misc/build/boost_1_44_0/boost/uuid/name_generator.hpp
@@ -72,10 +72,10 @@
commit 65674e4801cd5eac58f899d34f8e34a65532633b
Author: Stephan Bergmann
Date: Fri Dec 14 12:17:40 2012 +0100
-Werror,-Wunused-private-field
Change-Id: Icd62aa1f8008c1dfcc7d2ab3eb2ffd2188905fcd
diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx
index 5bca23b..ef27b17 100644
--- a/sc/inc/dpsave.hxx
+++ b/sc/inc/dpsave.hxx
@@ -96,7 +96,6 @@ class SC_DLLPUBLIC ScDPSaveDimension
{
private:
::rtl::OUString aName;
-::rtl::OUString* pSelectedPage;
boost::scoped_ptr mpLayoutName;
boost::scoped_ptr mpSubtotalName;
bool bIsDataLayout;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re:
Hello The platform is Linux Ubuntu 11.10 , Git version is : git version 1.7.12.4 and for cloning the libreoffice repos i used : git clone git:// anongit.freedesktop.org/libreoffice/core libo . Sorry I'm not clear about how to find the checkout of the libreoffice version I am trying to build . Regards, Rushi On Fri, Dec 14, 2012 at 3:37 PM, Michael Meeks wrote: > Hi there, > > On Fri, 2012-12-14 at 04:45 +0530, Rushi Shukla wrote: > > I was trying to build LibreOffice but when i issue the './autogen.sh' > > comand the error i get is : > > Please always CC the development list. > > > BEGIN failed--compilation aborted at -e line 1. > > configure: error: Failed to find some modules > > Error running configure at ./autogen.sh line 201. > > What platform are you using ? what version of git ? what checkout > of > LibreOffice ? > > > Please help me get rid of this problem . Thanks in advance . > > More details are helpful :-) > > Thanks for getting involved ! > > ATB, > > Michael. > > -- > michael.me...@suse.com <><, Pseudo Engineer, itinerant idiot > > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/source
sc/source/core/tool/interpr3.cxx | 131 +++
1 file changed, 64 insertions(+), 67 deletions(-)
New commits:
commit b67866895a8d836ce2af1caa4fdeff283a9bb621
Author: Eike Rathke
Date: Fri Dec 14 12:27:41 2012 +0100
fix ugly and misleading indentation that crept in with rebase
Change-Id: I8990411b5004358925dcb3a18a9b6f1a64c0b065
(cherry picked from commit d8f34ebb234789da18f0c8f5461f580b4129bff1)
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 638806d..76f9a98 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -998,35 +998,35 @@ double ScInterpreter::GetBetaDist(double fXin, double
fAlpha, double fBeta)
return fResult;
}
- void ScInterpreter::ScBetaDist()
- {
- sal_uInt8 nParamCount = GetByte();
+void ScInterpreter::ScBetaDist()
+{
+sal_uInt8 nParamCount = GetByte();
if ( !MustHaveParamCount( nParamCount, 3, 6 ) ) // expanded, see #i91547#
- return;
+return;
double fLowerBound, fUpperBound;
double alpha, beta, x;
bool bIsCumulative;
if (nParamCount == 6)
bIsCumulative = GetBool();
- else
+else
bIsCumulative = true;
if (nParamCount >= 5)
fUpperBound = GetDouble();
else
fUpperBound = 1.0;
- if (nParamCount >= 4)
+if (nParamCount >= 4)
fLowerBound = GetDouble();
- else
+else
fLowerBound = 0.0;
- beta = GetDouble();
- alpha = GetDouble();
- x = GetDouble();
+beta = GetDouble();
+alpha = GetDouble();
+x = GetDouble();
double fScale = fUpperBound - fLowerBound;
if (fScale <= 0.0 || alpha <= 0.0 || beta <= 0.0)
- {
- PushIllegalArgument();
- return;
- }
+{
+PushIllegalArgument();
+return;
+}
if (bIsCumulative) // cumulative distribution function
{
// special cases
@@ -1161,35 +1161,35 @@ void ScInterpreter::ScVariationen2()
double ScInterpreter::GetBinomDistPMF(double x, double n, double p)
// used in ScB and ScBinomDist
// preconditions: 0.0 <= x <= n, 0.0 < p < 1.0; x,n integral although double
-{
+{
double q = (0.5 - p) + 0.5;
-double fFactor = pow(q, n);
+double fFactor = pow(q, n);
if (fFactor <=::std::numeric_limits::min())
-{
-fFactor = pow(p, n);
+{
+fFactor = pow(p, n);
if (fFactor <= ::std::numeric_limits::min())
return GetBetaDistPDF(p, x+1.0, n-x+1.0)/(n+1.0);
-else
-{
+else
+{
sal_uInt32 max = static_cast(n - x);
for (sal_uInt32 i = 0; i < max && fFactor > 0.0; i++)
-fFactor *= (n-i)/(i+1)*q/p;
+fFactor *= (n-i)/(i+1)*q/p;
return fFactor;
-}
-}
-else
-{
+}
+}
+else
+{
sal_uInt32 max = static_cast(x);
for (sal_uInt32 i = 0; i < max && fFactor > 0.0; i++)
-fFactor *= (n-i)/(i+1)*p/q;
+fFactor *= (n-i)/(i+1)*p/q;
return fFactor;
-}
}
+}
double lcl_GetBinomDistRange(double n, double xs,double xe,
double fFactor /* q^n */, double p, double q)
//preconditions: 0.0 <= xs < xe <= n; xs,xe,n integral although double
-{
+{
sal_uInt32 i;
double fSum;
// skip summands index 0 to xs-1, start sum with index xs
@@ -1199,12 +1199,12 @@ double lcl_GetBinomDistRange(double n, double xs,double
xe,
fSum = fFactor; // Summand xs
sal_uInt32 nXe = static_cast(xe);
for (i = nXs+1; i <= nXe && fFactor > 0.0; i++)
-{
+{
fFactor *= (n-i+1)/i * p/q;
-fSum += fFactor;
-}
+fSum += fFactor;
+}
return (fSum>1.0) ? 1.0 : fSum;
-}
+}
void ScInterpreter::ScB()
{
@@ -1219,16 +1219,14 @@ void ScInterpreter::ScB()
double n = ::rtl::math::approxFloor(GetDouble());
if (n < 0.0 || x < 0.0 || x > n || p < 0.0 || p > 1.0)
PushIllegalArgument();
+else if (p == 0.0)
+PushDouble( (x == 0.0) ? 1.0 : 0.0 );
+else if ( p == 1.0)
+PushDouble( (x == n) ? 1.0 : 0.0);
else
-if (p == 0.0)
-PushDouble( (x == 0.0) ? 1.0 : 0.0 );
-else
-if ( p == 1.0)
-PushDouble( (x == n) ? 1.0 : 0.0);
-else
-PushDouble(GetBinomDistPMF(x,n,p));
-}
-else
+PushDouble(GetBinomDistPMF(x,n,p));
+}
+else
{ // nParamCount == 4
double xe = ::rtl::math::approxFloor(GetDouble());
double xs = ::rtl::math::approxFloor(GetDouble());
@@ -1237,11 +1235,11 @@ void ScInterpreter::ScB()
double q = (0
[Libreoffice-commits] .: sc/source
sc/source/core/tool/interpr3.cxx | 131 +++
1 file changed, 64 insertions(+), 67 deletions(-)
New commits:
commit d8f34ebb234789da18f0c8f5461f580b4129bff1
Author: Eike Rathke
Date: Fri Dec 14 12:27:41 2012 +0100
fix ugly and misleading indentation that crept in with rebase
Change-Id: I8990411b5004358925dcb3a18a9b6f1a64c0b065
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 638806d..76f9a98 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -998,35 +998,35 @@ double ScInterpreter::GetBetaDist(double fXin, double
fAlpha, double fBeta)
return fResult;
}
- void ScInterpreter::ScBetaDist()
- {
- sal_uInt8 nParamCount = GetByte();
+void ScInterpreter::ScBetaDist()
+{
+sal_uInt8 nParamCount = GetByte();
if ( !MustHaveParamCount( nParamCount, 3, 6 ) ) // expanded, see #i91547#
- return;
+return;
double fLowerBound, fUpperBound;
double alpha, beta, x;
bool bIsCumulative;
if (nParamCount == 6)
bIsCumulative = GetBool();
- else
+else
bIsCumulative = true;
if (nParamCount >= 5)
fUpperBound = GetDouble();
else
fUpperBound = 1.0;
- if (nParamCount >= 4)
+if (nParamCount >= 4)
fLowerBound = GetDouble();
- else
+else
fLowerBound = 0.0;
- beta = GetDouble();
- alpha = GetDouble();
- x = GetDouble();
+beta = GetDouble();
+alpha = GetDouble();
+x = GetDouble();
double fScale = fUpperBound - fLowerBound;
if (fScale <= 0.0 || alpha <= 0.0 || beta <= 0.0)
- {
- PushIllegalArgument();
- return;
- }
+{
+PushIllegalArgument();
+return;
+}
if (bIsCumulative) // cumulative distribution function
{
// special cases
@@ -1161,35 +1161,35 @@ void ScInterpreter::ScVariationen2()
double ScInterpreter::GetBinomDistPMF(double x, double n, double p)
// used in ScB and ScBinomDist
// preconditions: 0.0 <= x <= n, 0.0 < p < 1.0; x,n integral although double
-{
+{
double q = (0.5 - p) + 0.5;
-double fFactor = pow(q, n);
+double fFactor = pow(q, n);
if (fFactor <=::std::numeric_limits::min())
-{
-fFactor = pow(p, n);
+{
+fFactor = pow(p, n);
if (fFactor <= ::std::numeric_limits::min())
return GetBetaDistPDF(p, x+1.0, n-x+1.0)/(n+1.0);
-else
-{
+else
+{
sal_uInt32 max = static_cast(n - x);
for (sal_uInt32 i = 0; i < max && fFactor > 0.0; i++)
-fFactor *= (n-i)/(i+1)*q/p;
+fFactor *= (n-i)/(i+1)*q/p;
return fFactor;
-}
-}
-else
-{
+}
+}
+else
+{
sal_uInt32 max = static_cast(x);
for (sal_uInt32 i = 0; i < max && fFactor > 0.0; i++)
-fFactor *= (n-i)/(i+1)*p/q;
+fFactor *= (n-i)/(i+1)*p/q;
return fFactor;
-}
}
+}
double lcl_GetBinomDistRange(double n, double xs,double xe,
double fFactor /* q^n */, double p, double q)
//preconditions: 0.0 <= xs < xe <= n; xs,xe,n integral although double
-{
+{
sal_uInt32 i;
double fSum;
// skip summands index 0 to xs-1, start sum with index xs
@@ -1199,12 +1199,12 @@ double lcl_GetBinomDistRange(double n, double xs,double
xe,
fSum = fFactor; // Summand xs
sal_uInt32 nXe = static_cast(xe);
for (i = nXs+1; i <= nXe && fFactor > 0.0; i++)
-{
+{
fFactor *= (n-i+1)/i * p/q;
-fSum += fFactor;
-}
+fSum += fFactor;
+}
return (fSum>1.0) ? 1.0 : fSum;
-}
+}
void ScInterpreter::ScB()
{
@@ -1219,16 +1219,14 @@ void ScInterpreter::ScB()
double n = ::rtl::math::approxFloor(GetDouble());
if (n < 0.0 || x < 0.0 || x > n || p < 0.0 || p > 1.0)
PushIllegalArgument();
+else if (p == 0.0)
+PushDouble( (x == 0.0) ? 1.0 : 0.0 );
+else if ( p == 1.0)
+PushDouble( (x == n) ? 1.0 : 0.0);
else
-if (p == 0.0)
-PushDouble( (x == 0.0) ? 1.0 : 0.0 );
-else
-if ( p == 1.0)
-PushDouble( (x == n) ? 1.0 : 0.0);
-else
-PushDouble(GetBinomDistPMF(x,n,p));
-}
-else
+PushDouble(GetBinomDistPMF(x,n,p));
+}
+else
{ // nParamCount == 4
double xe = ::rtl::math::approxFloor(GetDouble());
double xs = ::rtl::math::approxFloor(GetDouble());
@@ -1237,11 +1235,11 @@ void ScInterpreter::ScB()
double q = (0.5 - p) + 0.5;
bool bIsValidX = ( 0.0 <= xs && xs <= xe && xe <=
Re: additional calc functions produce warnings
> AFAIR you recently added the pricing functions. When running calc to test my > code changes, I get lots of: > warn:legacy.osl:11918:1:/home/w.donkers/git/libo/tools/source/rc/resmgr.cxx:773: > > file:///home/w.donkers/git/libo/solver/unxlngi6/installation/opt/program/../program/resource/pricingen-US.res > Class: 256, Id: 0. Cannot free resource! Thanks for the info, but I'm not sure how to debug this. Maybe someone else can comment what "Class: 256, Id: 0" is and what a possible cause of the warning may be? I could only guess it's something to do with UNO as there's no dynamic allocations in the core calculations. Also, what did you change, and did you get the same warnings before? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: postprocess/packregistry
postprocess/packregistry/makefile.mk |1 -
1 file changed, 1 deletion(-)
New commits:
commit 57c0daf5ba0627526fe4aba0b8f4fea47d1fc938
Author: Andras Timar
Date: Fri Dec 14 12:23:58 2012 +0100
remove echo line that I used to debug the makefile
Change-Id: Ie2898f6b6cefed8d7b3a018760882c4bb345dc10
diff --git a/postprocess/packregistry/makefile.mk
b/postprocess/packregistry/makefile.mk
index 819dbab..f576a10 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -517,7 +517,6 @@ $(MISC)/lang/Langpack-{$(alllangiso)}.xcd :
$(SOLARXMLDIR)/$(MY_MOD)/$$(@:b).xcu
$(MISC)/lang/Langpack-%.xcd .ERRREMOVE :
$(MKDIRHIER) $(@:d)
-echo ' $(alllangiso) ***'
- $(RM) $(MISC)/$(@:b).list
echo '' \
'$(MY_MOD)/$(@:b).xcu' >
$(MISC)/$(@:b).list
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] calc: fix mathematical error in CritBinom
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1301 Approvals: Eike Rathke: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1301 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9b12a1c4410ec72258ae1fb68409ad00c922b94c Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Werner Körner Gerrit-Reviewer: Eike Rathke Gerrit-Reviewer: Kohei Yoshida Gerrit-Reviewer: Markus Mohrhard ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: configure.ac instsetoo_native/util l10ntools/source postprocess/packregistry solenv/bin solenv/inc
configure.ac | 11 ---
instsetoo_native/util/makefile.mk|4 ++--
l10ntools/source/lngmerge.cxx|6 +-
postprocess/packregistry/makefile.mk |1 +
solenv/bin/ooinstall | 15 ++-
solenv/inc/postset.mk|2 +-
6 files changed, 19 insertions(+), 20 deletions(-)
New commits:
commit c7b1a2fe811f1d5a233cd790cec9067cea246845
Author: Andras Timar
Date: Wed Dec 12 10:07:35 2012 +0100
Make KeyID (qtz) work again
Conflicts:
configure.ac
Change-Id: I67b2ce4ae647150aeace72c542a5838940d2c058
diff --git a/configure.ac b/configure.ac
index 320384c..63e1479 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11829,7 +11829,11 @@ AC_MSG_CHECKING([which languages to be built])
# + removes en-US; we want to put it on the beginning
# + prints just the section starting with 'completelangiso=' and ending with
the " at the end of line
[eval $(sed -e :a -e '/\\$/N; s/\\\n//; ta' -n -e
's/=/="/;s/\([^\\]\)$/\1"/;s/en-US//;/^completelangiso/p'
$SRC_ROOT/solenv/inc/langlist.mk)]
-ALL_LANGS="en-US $completelangiso"
+if test "$enable_release_build" = "" -o "$enable_release_build" = "no"; then
+ALL_LANGS="en-US $completelangiso qtz"
+else
+ALL_LANGS="en-US $completelangiso"
+fi
# check the configured localizations
WITH_LANG="$with_lang"
if test -z "$WITH_LANG" -o "$WITH_LANG" = "en-US"; then
@@ -11853,10 +11857,11 @@ for lang in $WITH_LANG; do
done
# list with substituted ALL
WITH_LANG_LIST=`echo $WITH_LANG | sed "s/ALL/$ALL_LANGS/"`
-# this variable is used only by bin/distro-install-* helper scripts
-# they need a real list of languages
test -z "$WITH_LANG_LIST" && WITH_LANG_LIST="en-US"
test "$WITH_LANG" = "en-US" && WITH_LANG=
+if test "$enable_release_build" = "" -o "$enable_releasbie_build" = "no"; then
+test "$WITH_LANG_LIST" = "en-US" || WITH_LANG_LIST=`echo $WITH_LANG_LIST
qtz`
+fi
AC_SUBST(ALL_LANGS)
AC_SUBST(WITH_LANG)
AC_SUBST(WITH_LANG_LIST)
diff --git a/instsetoo_native/util/makefile.mk
b/instsetoo_native/util/makefile.mk
index 7d79e29..e4dd09f 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -76,9 +76,9 @@ OOOHELPPACK=ooohelppack
OOODEVHELPPACK=ooodevhelppack
.ENDIF
-help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name "helpcontent2"
2>/dev/null | sed -e "s|/helpcontent2||" -e "s|^.*/||" ) en-US
+help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name "helpcontent2"
2>/dev/null | sed -e "s|/helpcontent2||" -e "s|^.*/||" ) en-US qtz
-# do not build key is pseudolanguage for release builds
+# do not build KeyID pseudolanguage (qtz) for release builds
.IF "$(ENABLE_RELEASE_BUILD)"=="TRUE"
alllangiso:=$(alllangiso:s/qtz //)
.ENDIF
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 9da45b6..71f68ef 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -184,7 +184,7 @@ sal_Bool LngParser::Merge(
}
nError = LNG_OK;
-MergeDataFile aMergeDataFile( rSDFFile, sSource, false, false );
+MergeDataFile aMergeDataFile( rSDFFile, sSource, false, true );
rtl::OString sTmp( Export::sLanguages );
if( sTmp.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("ALL")) )
Export::SetLanguages( aMergeDataFile.GetLanguages() );
@@ -260,6 +260,8 @@ sal_Bool LngParser::Merge(
{
rtl::OString sNewText;
pEntrys->GetText( sNewText, STRING_TYP_TEXT,
sLang, sal_True );
+if( sLang == "qtz" )
+sNewText = sNewText.copy(6);
if ( !sNewText.isEmpty()) {
rtl::OString *pLine = (*pLines)[ nPos ];
@@ -296,6 +298,8 @@ sal_Bool LngParser::Merge(
rtl::OString sNewText;
pEntrys->GetText( sNewText, STRING_TYP_TEXT, sCur,
sal_True );
+if( sCur == "qtz" )
+sNewText = sNewText.copy(6);
if (( !sNewText.isEmpty()) &&
!((
sCur.equalsL(RTL_CONSTASCII_STRINGPARAM("x-comment"))) && ( sNewText == "-" )))
{
diff --git a/postprocess/packregistry/makefile.mk
b/postprocess/packregistry/makefile.mk
index f576a10..819dbab 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -517,6 +517,7 @@ $(MISC)/lang/Langpack-{$(alllangiso)}.xcd :
$(SOLARXMLDIR)/$(MY_MOD)/$$(@:b).xcu
$(MISC)/lang/Langpack-%.xcd .ERRREMOVE :
$(MKDIRHIER) $(@:d)
+echo ' $(alllangiso) ***'
- $(RM) $(MISC)/$(@:b).list
echo '' \
'$(MY_MOD)/$(@:b).xcu' >
$(MISC)/$(@:b).list
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index a4ce6ce..3b086c6 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -91,19 +91
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/source
sc/source/core/tool/interpr3.cxx | 24 +++-
1 file changed, 11 insertions(+), 13 deletions(-)
New commits:
commit a88646223b709133ce633f1d2930b7c732035172
Author: Werner Koerner
Date: Tue Dec 11 22:23:39 2012 +0100
calc: fix mathematical error in CritBinom
CRITBINOM(462,0.8,0.9), expected result 381, calculated value is 462.
Similar errors in BinomDist, B, CritBinom and NegBinomDist were
fixed by commit 5cf55f5b7800e443c4f087e72ae05abc8b7fef45.
Change-Id: I9b12a1c4410ec72258ae1fb68409ad00c922b94c
Reviewed-on: https://gerrit.libreoffice.org/1301
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
(cherry picked from commit a9a734a680dda8c177f92cf2f14061c9b785ec8d)
Signed-off-by: Eike Rathke
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index ada1cff..638806d 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -1348,26 +1348,25 @@ void ScInterpreter::ScCritBinom()
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er",
"ScInterpreter::ScCritBinom" );
if ( MustHaveParamCount( GetByte(), 3 ) )
{
-double alpha = GetDouble();// alpha
-double p = GetDouble();// p
+double alpha = GetDouble();
+double p = GetDouble();
double n = ::rtl::math::approxFloor(GetDouble());
if (n < 0.0 || alpha <= 0.0 || alpha >= 1.0 || p < 0.0 || p > 1.0)
PushIllegalArgument();
else
{
-double q = 1.0 - p;
+double q = (0.5 - p) + 0.5; // get one bit more for p
near 1.0
double fFactor = pow(q,n);
-if (fFactor == 0.0)
+if (fFactor <= ::std::numeric_limits::min())
{
fFactor = pow(p, n);
-if (fFactor == 0.0)
+if (fFactor <= ::std::numeric_limits::min())
PushNoValue();
else
{
-double fSum = 1.0 - fFactor; sal_uLong max = (sal_uLong) n;
-sal_uLong i;
-
-for ( i = 0; i < max && fSum >= alpha; i++)
+double fSum = 1.0 - fFactor;
+sal_uInt32 max = static_cast (n), i;
+for (i = 0; i < max && fSum >= alpha; i++)
{
fFactor *= (n-i)/(i+1)*q/p;
fSum -= fFactor;
@@ -1377,10 +1376,9 @@ void ScInterpreter::ScCritBinom()
}
else
{
-double fSum = fFactor; sal_uLong max = (sal_uLong) n;
-sal_uLong i;
-
-for ( i = 0; i < max && fSum < alpha; i++)
+double fSum = fFactor;
+sal_uInt32 max = static_cast (n), i;
+for (i = 0; i < max && fSum < alpha; i++)
{
fFactor *= (n-i)/(i+1)*p/q;
fSum += fFactor;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/core/tool/interpr3.cxx | 24 +++-
1 file changed, 11 insertions(+), 13 deletions(-)
New commits:
commit a9a734a680dda8c177f92cf2f14061c9b785ec8d
Author: Werner Koerner
Date: Tue Dec 11 22:23:39 2012 +0100
calc: fix mathematical error in CritBinom
CRITBINOM(462,0.8,0.9), expected result 381, calculated value is 462.
Similar errors in BinomDist, B, CritBinom and NegBinomDist were
fixed by commit 5cf55f5b7800e443c4f087e72ae05abc8b7fef45.
Change-Id: I9b12a1c4410ec72258ae1fb68409ad00c922b94c
Reviewed-on: https://gerrit.libreoffice.org/1301
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index ada1cff..638806d 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -1348,26 +1348,25 @@ void ScInterpreter::ScCritBinom()
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er",
"ScInterpreter::ScCritBinom" );
if ( MustHaveParamCount( GetByte(), 3 ) )
{
-double alpha = GetDouble();// alpha
-double p = GetDouble();// p
+double alpha = GetDouble();
+double p = GetDouble();
double n = ::rtl::math::approxFloor(GetDouble());
if (n < 0.0 || alpha <= 0.0 || alpha >= 1.0 || p < 0.0 || p > 1.0)
PushIllegalArgument();
else
{
-double q = 1.0 - p;
+double q = (0.5 - p) + 0.5; // get one bit more for p
near 1.0
double fFactor = pow(q,n);
-if (fFactor == 0.0)
+if (fFactor <= ::std::numeric_limits::min())
{
fFactor = pow(p, n);
-if (fFactor == 0.0)
+if (fFactor <= ::std::numeric_limits::min())
PushNoValue();
else
{
-double fSum = 1.0 - fFactor; sal_uLong max = (sal_uLong) n;
-sal_uLong i;
-
-for ( i = 0; i < max && fSum >= alpha; i++)
+double fSum = 1.0 - fFactor;
+sal_uInt32 max = static_cast (n), i;
+for (i = 0; i < max && fSum >= alpha; i++)
{
fFactor *= (n-i)/(i+1)*q/p;
fSum -= fFactor;
@@ -1377,10 +1376,9 @@ void ScInterpreter::ScCritBinom()
}
else
{
-double fSum = fFactor; sal_uLong max = (sal_uLong) n;
-sal_uLong i;
-
-for ( i = 0; i < max && fSum < alpha; i++)
+double fSum = fFactor;
+sal_uInt32 max = static_cast (n), i;
+for (i = 0; i < max && fSum < alpha; i++)
{
fFactor *= (n-i)/(i+1)*p/q;
fSum += fFactor;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - 2 commits - configure.ac instsetoo_native/util l10ntools/source postprocess/packregistry solenv/bin solenv/inc
configure.ac | 11 ---
instsetoo_native/util/makefile.mk|4 ++--
l10ntools/source/lngmerge.cxx|6 +-
l10ntools/source/po.cxx | 17 +
postprocess/packregistry/makefile.mk |1 +
solenv/bin/ooinstall | 15 ++-
solenv/inc/postset.mk|2 +-
7 files changed, 28 insertions(+), 28 deletions(-)
New commits:
commit 49b9318873151d25478095bd66ef1cd40c86ba67
Author: Andras Timar
Date: Wed Dec 12 10:07:35 2012 +0100
Make KeyID (qtz) work again
Change-Id: I67b2ce4ae647150aeace72c542a5838940d2c058
diff --git a/configure.ac b/configure.ac
index 5d48f02..b241dea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11565,7 +11565,11 @@ AC_MSG_CHECKING([which languages to be built])
# + removes en-US; we want to put it on the beginning
# + prints just the section starting with 'completelangiso=' and ending with
the " at the end of line
[eval $(sed -e :a -e '/\\$/N; s/\\\n//; ta' -n -e
's/=/="/;s/\([^\\]\)$/\1"/;s/en-US//;/^completelangiso/p'
solenv/inc/langlist.mk)]
-ALL_LANGS="en-US $completelangiso"
+if test "$enable_release_build" = "" -o "$enable_release_build" = "no"; then
+ALL_LANGS="en-US $completelangiso qtz"
+else
+ALL_LANGS="en-US $completelangiso"
+fi
# check the configured localizations
WITH_LANG="$with_lang"
if test -z "$WITH_LANG" -o "$WITH_LANG" = "en-US"; then
@@ -11589,10 +11593,11 @@ for lang in $WITH_LANG; do
done
# list with substituted ALL
WITH_LANG_LIST=`echo $WITH_LANG | sed "s/ALL/$ALL_LANGS/"`
-# this variable is used only by bin/distro-install-* helper scripts
-# they need a real list of languages
test -z "$WITH_LANG_LIST" && WITH_LANG_LIST="en-US"
test "$WITH_LANG" = "en-US" && WITH_LANG=
+if test "$enable_release_build" = "" -o "$enable_releasbie_build" = "no"; then
+test "$WITH_LANG_LIST" = "en-US" || WITH_LANG_LIST=`echo $WITH_LANG_LIST
qtz`
+fi
AC_SUBST(ALL_LANGS)
AC_SUBST(WITH_LANG)
AC_SUBST(WITH_LANG_LIST)
diff --git a/instsetoo_native/util/makefile.mk
b/instsetoo_native/util/makefile.mk
index 7d79e29..e4dd09f 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -76,9 +76,9 @@ OOOHELPPACK=ooohelppack
OOODEVHELPPACK=ooodevhelppack
.ENDIF
-help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name "helpcontent2"
2>/dev/null | sed -e "s|/helpcontent2||" -e "s|^.*/||" ) en-US
+help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name "helpcontent2"
2>/dev/null | sed -e "s|/helpcontent2||" -e "s|^.*/||" ) en-US qtz
-# do not build key is pseudolanguage for release builds
+# do not build KeyID pseudolanguage (qtz) for release builds
.IF "$(ENABLE_RELEASE_BUILD)"=="TRUE"
alllangiso:=$(alllangiso:s/qtz //)
.ENDIF
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 9da45b6..71f68ef 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -184,7 +184,7 @@ sal_Bool LngParser::Merge(
}
nError = LNG_OK;
-MergeDataFile aMergeDataFile( rSDFFile, sSource, false, false );
+MergeDataFile aMergeDataFile( rSDFFile, sSource, false, true );
rtl::OString sTmp( Export::sLanguages );
if( sTmp.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("ALL")) )
Export::SetLanguages( aMergeDataFile.GetLanguages() );
@@ -260,6 +260,8 @@ sal_Bool LngParser::Merge(
{
rtl::OString sNewText;
pEntrys->GetText( sNewText, STRING_TYP_TEXT,
sLang, sal_True );
+if( sLang == "qtz" )
+sNewText = sNewText.copy(6);
if ( !sNewText.isEmpty()) {
rtl::OString *pLine = (*pLines)[ nPos ];
@@ -296,6 +298,8 @@ sal_Bool LngParser::Merge(
rtl::OString sNewText;
pEntrys->GetText( sNewText, STRING_TYP_TEXT, sCur,
sal_True );
+if( sCur == "qtz" )
+sNewText = sNewText.copy(6);
if (( !sNewText.isEmpty()) &&
!((
sCur.equalsL(RTL_CONSTASCII_STRINGPARAM("x-comment"))) && ( sNewText == "-" )))
{
diff --git a/postprocess/packregistry/makefile.mk
b/postprocess/packregistry/makefile.mk
index 3150607..9d84466 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -517,6 +517,7 @@ $(MISC)/lang/Langpack-{$(alllangiso)}.xcd :
$(SOLARXMLDIR)/$(MY_MOD)/$$(@:b).xcu
$(MISC)/lang/Langpack-%.xcd .ERRREMOVE :
$(MKDIRHIER) $(@:d)
+echo ' $(alllangiso) ***'
- $(RM) $(MISC)/$(@:b).list
echo '' \
'$(MY_MOD)/$(@:b).xcu' >
$(MISC)/$(@:b).list
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index a4ce6ce..3b086c6 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@
[Libreoffice-commits] .: drawinglayer/source
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit c6f104e0c9a8d1953b74de4c4d13ba38a61e60d0
Author: Radek Doulik
Date: Fri Dec 14 12:09:36 2012 +0100
fix emf+ rendering
Change-Id: Ib49898362f7e648a8ce9c27b5e5b4f0b2ad93afd
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index b78ac5b..f9d583d 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1631,8 +1631,9 @@ namespace drawinglayer
case PRIMITIVE2D_ID_METAFILEPRIMITIVE2D :
{
static bool bUseMetaFilePrimitiveDecomposition(true);
+const primitive2d::MetafilePrimitive2D& aMetafile =
static_cast< const primitive2d::MetafilePrimitive2D& >(rCandidate);
-if(bUseMetaFilePrimitiveDecomposition)
+if(bUseMetaFilePrimitiveDecomposition &&
!aMetafile.getMetaFile().GetUseCanvas())
{
// use new Metafile decomposition
process(rCandidate.get2DDecomposition(getViewInformation2D()));
@@ -1640,7 +1641,7 @@ namespace drawinglayer
else
{
// direct draw of MetaFile, use default pocessing
-RenderMetafilePrimitive2D(static_cast< const
primitive2d::MetafilePrimitive2D& >(rCandidate));
+RenderMetafilePrimitive2D(aMetafile);
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
additional calc functions produce warnings
Hi Tino, AFAIR you recently added the pricing functions. When running calc to test my code changes, I get lots of: warn:legacy.osl:11918:1:/home/w.donkers/git/libo/tools/source/rc/resmgr.cxx:773: file:///home/w.donkers/git/libo/solver/unxlngi6/installation/opt/program/../program/resource/pricingen-US.res Class: 256, Id: 0. Cannot free resource! Possibly something in your code is not quite right? Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Michael Meeks changed: What|Removed |Added Depends on||58267 --- Comment #48 from Michael Meeks --- added bug#58267 - evil shape lifecycle issue causing import crashers for RTF, DOCX etc. -- 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] .: Branch 'libreoffice-4-0' - liblangtag/README
liblangtag/README |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ec3cc4fdb5785074bbe415b41c6f80063b7395ed Author: Eike Rathke Date: Fri Dec 14 11:32:56 2012 +0100 upstream has moved to http://tagoh.bitbucket.org/liblangtag/ Change-Id: I844ae1363ff37578fe734125bc6ee6aa8fb352c6 (cherry picked from commit 63d116cb0e7654d2b4f0cf9b6a5223f98d755001) diff --git a/liblangtag/README b/liblangtag/README index 1d510dc..78946d5 100644 --- a/liblangtag/README +++ b/liblangtag/README @@ -1,4 +1,4 @@ -From [https://github.com/tagoh/liblangtag/]. An interface for BCP47 language tags. +From [http://tagoh.bitbucket.org/liblangtag/]. An interface for BCP47 language tags. Note that (as far a I recall) liblangtag is the only "bundled" (3rd-party) library we have that we configure and build also for MSVC ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: liblangtag/README
liblangtag/README |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 63d116cb0e7654d2b4f0cf9b6a5223f98d755001 Author: Eike Rathke Date: Fri Dec 14 11:32:56 2012 +0100 upstream has moved to http://tagoh.bitbucket.org/liblangtag/ Change-Id: I844ae1363ff37578fe734125bc6ee6aa8fb352c6 diff --git a/liblangtag/README b/liblangtag/README index 1d510dc..78946d5 100644 --- a/liblangtag/README +++ b/liblangtag/README @@ -1,4 +1,4 @@ -From [https://github.com/tagoh/liblangtag/]. An interface for BCP47 language tags. +From [http://tagoh.bitbucket.org/liblangtag/]. An interface for BCP47 language tags. Note that (as far a I recall) liblangtag is the only "bundled" (3rd-party) library we have that we configure and build also for MSVC ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Addin exceptions in SvStream
On Thu, 2012-12-13 at 14:00 +0100, Lubos Lunak wrote: > I think it shouldn't be that difficult to write a Clang plugin that finds > all > uses of SvStream::operator<> , checks whether the variable read to is > initalized [*] , and possibly it shouldn't be even that big deal to have it > rewrite them to a series of SvStream::readInt32() etc. calls (i.e. EasyHack > fdo#56110). I have not written yet any howto on plugins besides the examples > under compilerplugins/, but if there would be interest, I could do something. Oooh ! that would be really lovely :-) > [*] Or, since I assume all those variables have been needlessly initialized > just in attempt to silence the broken warning with the wretched gcc thing on > Apple, the check will need to be more complicated and find if the initializer > is not the default value for the type. Yep - I guess so ! Would rather improve the robustness of our filters I suspect. Marc - now that's a real fun / hacking task - are you interested ? :-) ATB, Michael. -- michael.me...@suse.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Anti-aliasing via GPU
On 2012-12-14 11:52, Michael Meeks wrote: Why not increase it's visibility ? last I looked it was beautiful and helpful :-) I I think what he is saying is that he's happy if you take and check it in, but he doesn't want to take any responsibility for maintaining such a thing. AFAIR there are two good options - cairo or the new cross-platform rendering thing that Mozilla is producing. The Mozilla thing is Azure. It's really not intended to be a proper general purpose drawing library. It is specifically constructed to mesh well with the browser's internal drawing model. Getting the Direct2D backend copied from Mozilla into Cairo would, I suspect, be the best bet. And it would allow us to rationalise our own backends. But it's a major chunk of work. And open-source Win32 hackers are in short supply. Might make a good Google Summer-of-code project?? Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] Re: Remove save to old Microsoft office formats
On Thu, 2012-12-13 at 18:21 -0500, Bryan Quigley wrote: > > Could you update the features page with this info > > I updated this page http://wiki.documentfoundation.org/ReleaseNotes/4.0 with: > Dropped support for legacy Word and Excel (version 6.0/95) files. > These files can still be opened, but they will save in your default > format (usually .odt/.ods). I've clarified - since people really -love- to not read carefully and get twisted up about file-formats. I've clarified that we're retaining Office 97+ binary file formats and that this is export only ;-) > > Wow - that's bold :-) > Glad it got approved as is. 4.0 is a good time to do things like this :) Agreed - thanks for picking that up. > It's generally easier to pick what you want on a shorter list as well. A good improvement, Thanks ! Michael. -- michael.me...@suse.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Anti-aliasing via GPU
Hi Kohei, On Thu, 2012-12-13 at 20:21 -0500, Kohei Yoshida wrote: > Since proper profiling of a drawing framework takes at least a few days > (running various benchmarks under various scenarios, and interpreting & > writing about the results) If you experience slow performance with a real-world document; it takes only 10 minutes to load the thing in callgrind, reset the counters before doing the slow thing, call callgrind_control --dump afterwards and bingo: there is a profile if the real-world use-case we want to speed up :-) that might have general utility etc. - but ... constructing arbitrary artificial benchmarks can also be a problem in this way. > I would be happy to spend a few days to profile each drawing frameworks > if you want me to. But alas, right now I'm s loaded with Calc work > that I may have to wait a year or so to be able to do that. Getting the latest version of your document would be really helpful; is it available somewhere ? last I looked there was only an out-of-date version in some obscure git repo somewhere ;-) > I'd rather not. That document is my personal note. I put that up on my > site in the hope that someone finds it useful. But I'm not ready to > subject that to multiple people editing it, nor am I looking for > increasing its visibility. Why not increase it's visibility ? last I looked it was beautiful and helpful :-) I'd love to have the latest version at least -linked- into the code. Would you accept patches / new bits to it ? Anyhow :-) in general I agree: it is a good idea to re-use someone else's faster/better backend rendering infrastructure - I'm completely sold on that. AFAIR there are two good options - cairo or the new cross-platform rendering thing that Mozilla is producing. On the other hand - switching those technologies will almost certainly bring performance regressions rather than benefits: as a different set of performance mis-matches between caller and callee arrive :-) So we shouldn't do that switch for an unknown performance win :-) Of course, it makes complete sense for improved maintenance and if we could unify chunks of rendering code that would be lovely - what we have is broadly a big/horrible mess of half-finished duplicate functionality (AFAICS) :-) HTH, Michael. -- michael.me...@suse.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
