LibreOffice Gerrit News for core on 2013-10-31
Moin! * Open changes on master for project core changed in the last 25 hours: + Windows: Set minimum Windows SDK to 0x0501 (Windows XP) in https://gerrit.libreoffice.org/6496 from Thomas Arnhold + sw/qa: 1 individual unit test per filter (import/export) test in https://gerrit.libreoffice.org/6289 from Pierre-Eric Pelloux-Prayer + fdo#69762 Scientific number AutoCorrect as ordinal in https://gerrit.libreoffice.org/6204 from Laurent BP + windows: check for _WIN32 not WIN32 in https://gerrit.libreoffice.org/6490 from Thomas Arnhold + remove nonsense FOLD comments in https://gerrit.libreoffice.org/6491 from Thomas Arnhold + fdo#70978 Improve Word Count display in https://gerrit.libreoffice.org/6479 from Samuel Mehrbrodt + fdo#60698: Move generic fpicker to svtools in https://gerrit.libreoffice.org/6436 from Marcos Souza + fdo#70457: Preserve rotation of embedded bitmaps from docx in https://gerrit.libreoffice.org/6484 from Jacobo Aragunde Pérez + fdo#70998 Termchange: Graphics->Image in https://gerrit.libreoffice.org/6483 from Samuel Mehrbrodt * Merged changes on master for project core changed in the last 25 hours: + update libodfgen in https://gerrit.libreoffice.org/6487 from David Tardon + bundle libetonyek in https://gerrit.libreoffice.org/6486 from David Tardon + integrate Apple Keynote import filter in https://gerrit.libreoffice.org/6488 from David Tardon + fdo#44134 fix omission in support of Excel 2010 in https://gerrit.libreoffice.org/6495 from Winfried Donkers + fdo#7 fix omission in support of Excel 2010 in https://gerrit.libreoffice.org/6494 from Winfried Donkers + fdo#61002 add Excel 2010 functions VAR.P and VAR.S in https://gerrit.libreoffice.org/6477 from Winfried Donkers + fdo#54938: Convert svx to use cppu::supportsService in https://gerrit.libreoffice.org/6455 from Marcos Souza + fdo#54938: Convert package, writerfilter and writerperfect in https://gerrit.libreoffice.org/6456 from Marcos Souza + added stub for void touch_ui_selection_none in MLOGestureEngine in https://gerrit.libreoffice.org/6492 from Ptyl + Unit tests for Chart Series Name in https://gerrit.libreoffice.org/6383 from Markus Mohrhard + Fix for Chart Series Names in https://gerrit.libreoffice.org/6350 from Vinaya Mandke * Abandoned changes on master for project core changed in the last 25 hours: + Don't destroy OString until we need its char array in https://gerrit.libreoffice.org/6475 from Arnaud Versini * Open changes needing tweaks, but being untouched for more than a week: + Make ./autogen.sh --help work again in https://gerrit.libreoffice.org/6100 from Arnaud Versini + Make libatomic_ops buildable and enable on non-X86. in https://gerrit.libreoffice.org/5812 from Andrzej J.R. Hunt + Increase number of remembered recent documents from 10 to 25 in https://gerrit.libreoffice.org/6101 from Krisztian Pinter + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Remove old outdated gallery images and sounds in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt + Remove more unusedcode in https://gerrit.libreoffice.org/5937 from Marcos Souza + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + Dynamically align toolbars in LibreOffice in https://gerrit.libreoffice.org/5655 from Prashant Pandey + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 38886] Synchronize command text and visual cursor
https://bugs.freedesktop.org/show_bug.cgi?id=38886 Elodimuor changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |ikenna...@gmail.com |desktop.org | --- Comment #3 from Elodimuor --- I'm new to contributing to LibreOffice, and I'd like to take a shot at this bug, can i get more information and some help getting started? -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sc/inc sc/source
sc/inc/documentimport.hxx |3 +
sc/inc/paramisc.hxx| 22 ---
sc/source/core/data/documen4.cxx |6 +-
sc/source/core/data/documentimport.cxx | 91 +
sc/source/core/data/global2.cxx| 14 ++---
sc/source/filter/excel/impop.cxx | 18 ++
sc/source/ui/docshell/docfunc.cxx |2
sc/source/ui/inc/undoblk.hxx |5 +
sc/source/ui/miscdlgs/tabopdlg.cxx | 16 ++---
sc/source/ui/undo/undoblk3.cxx |8 +-
sc/source/ui/unoobj/cellsuno.cxx | 11 ++-
11 files changed, 144 insertions(+), 52 deletions(-)
New commits:
commit 460b52838fdad0352188bdd877b69cbb5f17ca63
Author: Kohei Yoshida
Date: Tue Oct 22 23:08:43 2013 -0400
Use ScDocumentImport to insert data table cells.
This ensures that all cells get populated through ScDocumentImport, which
keeps track of current cell positions in each column.
Change-Id: I2ed10c91778e0b81959c8a436c4b2def5967e70f
diff --git a/sc/inc/documentimport.hxx b/sc/inc/documentimport.hxx
index 25d4a03..d034292 100644
--- a/sc/inc/documentimport.hxx
+++ b/sc/inc/documentimport.hxx
@@ -24,6 +24,7 @@ class ScAddress;
class ScTokenArray;
class ScFormulaCell;
struct ScSetStringParam;
+struct ScTabOpParam;
struct ScDocumentImportImpl;
/**
@@ -72,6 +73,8 @@ public:
void setMatrixCells(
const ScRange& rRange, const ScTokenArray& rArray,
formula::FormulaGrammar::Grammar eGrammar);
+void setTableOpCells(const ScRange& rRange, const ScTabOpParam& rParam);
+
void finalize();
private:
diff --git a/sc/source/core/data/documentimport.cxx
b/sc/source/core/data/documentimport.cxx
index 99e9b36..323ccfb 100644
--- a/sc/source/core/data/documentimport.cxx
+++ b/sc/source/core/data/documentimport.cxx
@@ -17,6 +17,8 @@
#include "mtvelements.hxx"
#include "tokenarray.hxx"
#include "stringutil.hxx"
+#include "compiler.hxx"
+#include "paramisc.hxx"
#include "svl/sharedstringpool.hxx"
@@ -302,6 +304,95 @@ void ScDocumentImport::setMatrixCells(
}
}
+void ScDocumentImport::setTableOpCells(const ScRange& rRange, const
ScTabOpParam& rParam)
+{
+SCTAB nTab = rRange.aStart.Tab();
+SCCOL nCol1 = rRange.aStart.Col();
+SCROW nRow1 = rRange.aStart.Row();
+SCCOL nCol2 = rRange.aEnd.Col();
+SCROW nRow2 = rRange.aEnd.Row();
+
+ScTable* pTab = mpImpl->mrDoc.FetchTable(nTab);
+if (!pTab)
+return;
+
+ScDocument* pDoc = &mpImpl->mrDoc;
+ScRefAddress aRef;
+OUStringBuffer aFormulaBuf('=');
+aFormulaBuf.append(ScCompiler::GetNativeSymbol(ocTableOp));
+aFormulaBuf.append(ScCompiler::GetNativeSymbol(ocOpen));
+
+OUString aSep = ScCompiler::GetNativeSymbol(ocSep);
+if (rParam.meMode == ScTabOpParam::Column) // column only
+{
+aRef.Set(rParam.aRefFormulaCell.GetAddress(), true, false, false);
+aFormulaBuf.append(aRef.GetRefString(pDoc, nTab));
+aFormulaBuf.append(aSep);
+aFormulaBuf.append(rParam.aRefColCell.GetRefString(pDoc, nTab));
+aFormulaBuf.append(aSep);
+aRef.Set(nCol1, nRow1, nTab, false, true, true);
+aFormulaBuf.append(aRef.GetRefString(pDoc, nTab));
+nCol1++;
+nCol2 = std::min( nCol2, (SCCOL)(rParam.aRefFormulaEnd.Col() -
+rParam.aRefFormulaCell.Col() + nCol1 + 1));
+}
+else if (rParam.meMode == ScTabOpParam::Row) // row only
+{
+aRef.Set(rParam.aRefFormulaCell.GetAddress(), false, true, false);
+aFormulaBuf.append(aRef.GetRefString(pDoc, nTab));
+aFormulaBuf.append(aSep);
+aFormulaBuf.append(rParam.aRefRowCell.GetRefString(pDoc, nTab));
+aFormulaBuf.append(aSep);
+aRef.Set(nCol1, nRow1, nTab, true, false, true);
+aFormulaBuf.append(aRef.GetRefString(pDoc, nTab));
+++nRow1;
+nRow2 = std::min(
+nRow2, rParam.aRefFormulaEnd.Row() - rParam.aRefFormulaCell.Row()
+ nRow1 + 1);
+}
+else // both
+{
+aFormulaBuf.append(rParam.aRefFormulaCell.GetRefString(pDoc, nTab));
+aFormulaBuf.append(aSep);
+aFormulaBuf.append(rParam.aRefColCell.GetRefString(pDoc, nTab));
+aFormulaBuf.append(aSep);
+aRef.Set(nCol1, nRow1 + 1, nTab, false, true, true);
+aFormulaBuf.append(aRef.GetRefString(pDoc, nTab));
+aFormulaBuf.append(aSep);
+aFormulaBuf.append(rParam.aRefRowCell.GetRefString(pDoc, nTab));
+aFormulaBuf.append(aSep);
+aRef.Set(nCol1 + 1, nRow1, nTab, true, false, true);
+aFormulaBuf.append(aRef.GetRefString(pDoc, nTab));
+++nCol1;
+++nRow1;
+}
+
+aFormulaBuf.append(ScCompiler::GetNativeSymbol(ocClose));
+
+ScFormulaCell aRefCell(
+pDoc, ScAddress(nCol1, nRow1, nTab), aFormulaBuf.makeStringAndClear(),
+formula::FormulaGrammar::GRAM_NATIVE, MM_NONE);
+
+for (SCCOL nCol = nCol1; nCol <= nCol2; ++nCol)
+{
+sc:
[Libreoffice-commits] core.git: 2 commits - sc/inc sc/source sfx2/source
sc/inc/refreshtimer.hxx | 11 ---
sc/source/core/tool/refreshtimer.cxx |1
sfx2/source/doc/objstor.cxx | 55 +--
3 files changed, 28 insertions(+), 39 deletions(-)
New commits:
commit ed4f0a52f0110557f86a63d9758a71c6b2e09e06
Author: Matúš Kukan
Date: Tue Oct 29 09:46:27 2013 +0100
fix indentation
Change-Id: I41c9e96e2202f1dc52ed93c03846d4d37ae6c2cb
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 67da658..1ed9433 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -1883,38 +1883,37 @@ sal_Bool SfxObjectShell::ConnectTmpStorage_Impl(
sal_Bool SfxObjectShell::DoSaveObjectAs( SfxMedium& rMedium, sal_Bool bCommit )
{
sal_Bool bOk = sal_False;
-{
-ModifyBlocker_Impl aBlock( this );
-uno::Reference < embed::XStorage > xNewStor = rMedium.GetStorage();
-if ( !xNewStor.is() )
-return sal_False;
+ModifyBlocker_Impl aBlock( this );
-uno::Reference < beans::XPropertySet > xPropSet( xNewStor,
uno::UNO_QUERY );
-if ( xPropSet.is() )
-{
-Any a = xPropSet->getPropertyValue("MediaType");
-OUString aMediaType;
-if ( !(a>>=aMediaType) || aMediaType.isEmpty() )
-{
-SAL_WARN( "sfx.doc", "The mediatype must be set already!" );
-SetupStorage( xNewStor, SOFFICE_FILEFORMAT_CURRENT, sal_False,
false );
-}
+uno::Reference < embed::XStorage > xNewStor = rMedium.GetStorage();
+if ( !xNewStor.is() )
+return sal_False;
-pImp->bIsSaving = sal_False;
-bOk = SaveAsOwnFormat( rMedium );
+uno::Reference < beans::XPropertySet > xPropSet( xNewStor, uno::UNO_QUERY
);
+if ( !xPropSet.is() )
+return sal_False;
-if ( bCommit )
-{
-try {
-uno::Reference< embed::XTransactedObject > xTransact(
xNewStor, uno::UNO_QUERY_THROW );
-xTransact->commit();
-}
-catch( uno::Exception& )
-{
-SAL_WARN( "sfx.doc", "The strotage was not commited on
DoSaveAs!" );
-}
-}
+Any a = xPropSet->getPropertyValue("MediaType");
+OUString aMediaType;
+if ( !(a>>=aMediaType) || aMediaType.isEmpty() )
+{
+SAL_WARN( "sfx.doc", "The mediatype must be set already!" );
+SetupStorage( xNewStor, SOFFICE_FILEFORMAT_CURRENT, sal_False, false );
+}
+
+pImp->bIsSaving = sal_False;
+bOk = SaveAsOwnFormat( rMedium );
+
+if ( bCommit )
+{
+try {
+uno::Reference< embed::XTransactedObject > xTransact( xNewStor,
uno::UNO_QUERY_THROW );
+xTransact->commit();
+}
+catch( uno::Exception& )
+{
+SAL_WARN( "sfx.doc", "The strotage was not commited on DoSaveAs!"
);
}
}
commit dfe56dfebe5a8c5ee0c3c576158d43fa9fa5678a
Author: Matúš Kukan
Date: Mon Oct 28 19:52:17 2013 +0100
remove empty methods
They are empty since 3a20556d0945f9de7c12fc18018257525dfc5065.
Change-Id: Ibd6c1722d3088d92677338b5b8011cddd6dd98cf
diff --git a/sc/inc/refreshtimer.hxx b/sc/inc/refreshtimer.hxx
index e60fd62..0ee9a37 100644
--- a/sc/inc/refreshtimer.hxx
+++ b/sc/inc/refreshtimer.hxx
@@ -66,10 +66,6 @@ class ScRefreshTimer : public AutoTimer
private:
ScRefreshTimerControl * const * ppControl;
-void AppendToControl() {}
-
-void RemoveFromControl() {}
-
void Start()
{
if ( GetTimeout() )
@@ -104,12 +100,7 @@ public:
void StartRefreshTimer() { Start(); }
-void SetRefreshControl( ScRefreshTimerControl * const * pp )
-{
-RemoveFromControl();
-ppControl = pp;
-AppendToControl();
-}
+void SetRefreshControl( ScRefreshTimerControl * const * pp ) { ppControl =
pp; }
void SetRefreshHandler( const Link& rLink ) { SetTimeoutHdl( rLink ); }
diff --git a/sc/source/core/tool/refreshtimer.cxx
b/sc/source/core/tool/refreshtimer.cxx
index 8359768..0ee309e 100644
--- a/sc/source/core/tool/refreshtimer.cxx
+++ b/sc/source/core/tool/refreshtimer.cxx
@@ -37,7 +37,6 @@ ScRefreshTimer::~ScRefreshTimer()
{
if ( IsActive() )
Stop();
-RemoveFromControl();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sc/inc sc/source
sc/inc/column.hxx |5 +++--
sc/source/core/data/column.cxx | 12 +++-
sc/source/core/data/column2.cxx |9 +
sc/source/core/data/column3.cxx |8 +---
sc/source/core/data/table1.cxx |3 ++-
sc/source/ui/docshell/impex.cxx |8
sc/source/ui/inc/impex.hxx |2 +-
7 files changed, 27 insertions(+), 20 deletions(-)
New commits:
commit 7504b3dd8ca4424fd7da91195741b566ce42a2c0
Author: Markus Mohrhard
Date: Wed Oct 30 22:57:45 2013 +0100
extend the position hint to GetRangeScriptType
brings a bit more performance benefits. Still not as much as I expected.
Change-Id: I1abead8694acdd965520a9353e84824a68672988
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 61af67c..3ee53d6 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -470,7 +470,8 @@ public:
* Get combined script types of the specified range. This method may
* update script types on demand if they have not been determined.
*/
-sal_uInt8 GetRangeScriptType( sc::CellTextAttrStoreType::iterator& itPos,
SCROW nRow1, SCROW nRow2 );
+sal_uInt8 GetRangeScriptType( sc::CellTextAttrStoreType::iterator& itPos,
SCROW nRow1, SCROW nRow2,
+sc::CellStoreType::iterator itr);
void SetScriptType( SCROW nRow, sal_uInt8 nType );
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 63433c5..018f9e1 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2952,10 +2952,12 @@ class FindEditCellsHandler
{
ScColumn& mrColumn;
sc::CellTextAttrStoreType::iterator miAttrPos;
+sc::CellStoreType::iterator miCellPos;
public:
-FindEditCellsHandler(ScColumn& rColumn, sc::CellTextAttrStoreType& rAttrs)
:
-mrColumn(rColumn), miAttrPos(rAttrs.begin()) {}
+FindEditCellsHandler(ScColumn& rColumn, sc::CellTextAttrStoreType& rAttrs,
+sc::CellStoreType::iterator rCellItr) :
+mrColumn(rColumn), miAttrPos(rAttrs.begin()), miCellPos(rCellItr) {}
bool operator() (size_t, const EditTextObject*)
{
@@ -2964,7 +2966,7 @@ public:
bool operator() (size_t nRow, const ScFormulaCell* p)
{
-sal_uInt8 nScriptType = mrColumn.GetRangeScriptType(miAttrPos, nRow,
nRow);
+sal_uInt8 nScriptType = mrColumn.GetRangeScriptType(miAttrPos, nRow,
nRow, miCellPos);
if (IsAmbiguousScriptNonZero(nScriptType))
return true;
@@ -2981,7 +2983,7 @@ public:
for (size_t i = 0; i < nDataSize; ++i)
{
SCROW nRow = nTopRow + i;
-sal_uInt8 nScriptType = mrColumn.GetRangeScriptType(miAttrPos,
nRow, nRow);
+sal_uInt8 nScriptType = mrColumn.GetRangeScriptType(miAttrPos,
nRow, nRow, miCellPos);
if (IsAmbiguousScriptNonZero(nScriptType))
// Return the offset from the first row.
return RetType(i, true);
@@ -3216,7 +3218,7 @@ bool ScColumn::HasEditCells(SCROW nStartRow, SCROW
nEndRow, SCROW& rFirst)
{
// used in GetOptimalHeight - ambiguous script type counts as edit cell
-FindEditCellsHandler aFunc(*this, maCellTextAttrs);
+FindEditCellsHandler aFunc(*this, maCellTextAttrs, maCells.begin());
std::pair aPos =
sc::FindFormulaEditText(maCells, nStartRow, nEndRow, aFunc);
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 207718c..5176d82 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -874,11 +874,12 @@ void ScColumn::GetOptimalHeight(
// check for cells with different script type
sc::CellTextAttrStoreType::iterator itAttr =
maCellTextAttrs.begin();
sc::SingleColumnSpanSet::SpansType::const_iterator it =
aSpans.begin(), itEnd = aSpans.end();
+sc::CellStoreType::iterator itCells = maCells.begin();
for (; it != itEnd; ++it)
{
for (SCROW nRow = it->mnRow1; nRow <= it->mnRow2;
++nRow)
{
-sal_uInt8 nScript = GetRangeScriptType(itAttr,
nRow, nRow);
+sal_uInt8 nScript = GetRangeScriptType(itAttr,
nRow, nRow, itCells);
if (nScript == nDefScript)
continue;
@@ -2038,7 +2039,7 @@ sal_uInt8 ScColumn::GetScriptType( SCROW nRow ) const
}
sal_uInt8 ScColumn::GetRangeScriptType(
-sc::CellTextAttrStoreType::iterator& itPos, SCROW nRow1, SCROW nRow2 )
+sc::CellTextAttrStoreType::iterator& itPos, SCROW nRow1, SCROW nRow2,
sc::CellStoreType::iterator itrCells )
{
if (!ValidRow(nRow1) || !ValidRow(nRow2) || nRow1 > nRow2)
return 0;
@@ -2056,14 +2057,13 @@ sal_uInt8 ScColumn::GetRangeScriptType(
sc::celltextattr_block::iterator it =
sc::celltextattr_block::begin(*itPos->data);
sc::cel
[Libreoffice-commits] core.git: vcl/inc vcl/win vcl/WinResTarget_vcl.mk
dev/null |binary vcl/WinResTarget_vcl.mk |1 - vcl/inc/win/salids.hrc |1 - vcl/win/source/src/salsrc.rc |6 -- 4 files changed, 8 deletions(-) New commits: commit adefd564d07a6e70cc1d9fad8febe5b434511e83 Author: Thomas Arnhold Date: Wed Oct 30 23:09:08 2013 +0100 Windows: Drop obsolete stuff This is pre Windows 2000. Drop it. Change-Id: I3599a0d2ff7cb967c534eaa0cd4f070817fe3240 diff --git a/vcl/WinResTarget_vcl.mk b/vcl/WinResTarget_vcl.mk index 48daadd..fc20e5b 100644 --- a/vcl/WinResTarget_vcl.mk +++ b/vcl/WinResTarget_vcl.mk @@ -60,7 +60,6 @@ $(eval $(call gb_WinResTarget_add_dependencies,vcl/salsrc,\ vcl/win/source/src/tblselse.cur \ vcl/win/source/src/asns.cur \ vcl/win/source/src/crop.cur \ -vcl/win/source/src/help.cur \ vcl/win/source/src/neswsize.cur \ vcl/win/source/src/tblselsw.cur \ vcl/win/source/src/asnswe.cur \ diff --git a/vcl/inc/win/salids.hrc b/vcl/inc/win/salids.hrc index d860be8..086702b 100644 --- a/vcl/inc/win/salids.hrc +++ b/vcl/inc/win/salids.hrc @@ -22,7 +22,6 @@ // Cursor #define SAL_RESID_POINTER_NULL 1 -#define SAL_RESID_POINTER_HELP 10001 #ifndef WNT #define SAL_RESID_POINTER_HSIZE 10002 #define SAL_RESID_POINTER_VSIZE 10003 diff --git a/vcl/win/source/src/help.cur b/vcl/win/source/src/help.cur deleted file mode 100644 index e59ee97..000 Binary files a/vcl/win/source/src/help.cur and /dev/null differ diff --git a/vcl/win/source/src/salsrc.rc b/vcl/win/source/src/salsrc.rc index 435caed..1a59b7f 100644 --- a/vcl/win/source/src/salsrc.rc +++ b/vcl/win/source/src/salsrc.rc @@ -17,15 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// for WINVER -#include - #include SAL_RESID_POINTER_NULL CURSOR nullptr.cur -#if ( WINVER < 0x0400 ) -SAL_RESID_POINTER_HELP CURSOR help.cur -#endif #ifndef WNT SAL_RESID_POINTER_HSIZE CURSOR hsize.cur SAL_RESID_POINTER_VSIZE CURSOR vsize.cur ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60698] kill pointless one-file library ...
https://bugs.freedesktop.org/show_bug.cgi?id=60698 --- Comment #10 from Marcos Souza --- I saw a lot of very small filters inside filter module: -rwxrwxr-x 1 marcos marcos 168K Oct 30 13:06 libitglo.so -rwxrwxr-x 1 marcos marcos 158K Oct 30 13:06 libipxlo.so -rwxrwxr-x 1 marcos marcos 156K Oct 30 13:06 libiralo.so -rwxrwxr-x 1 marcos marcos 155K Oct 30 13:06 libipblo.so And a lot of others inside filter module. But, it seems that this is used inside VCL: ImpFilterLibCacheEntry::GetImportFunction Do you think this can be unified into an bugger library, of all these small filters? As they're so small, and it seems they're used inside the same library. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/svx
include/svx/itextprovider.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit b60d7a27e4b0278c2bd0c3c736597849c7ed1a21 Author: Thomas Arnhold Date: Wed Oct 30 23:05:41 2013 +0100 fixincludeguards.sh: svx/itextprovider.hxx Change-Id: I32ebe61a8431e357ffdc057b019fdd3b75dd68a8 diff --git a/include/svx/itextprovider.hxx b/include/svx/itextprovider.hxx index 3202e4d..7a8ca44 100644 --- a/include/svx/itextprovider.hxx +++ b/include/svx/itextprovider.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#if !defined SVX_ITEXTPROVIDER_HXX_INCLUDED -#define SVX_ITEXTPROVIDER_HXX_INCLUDED +#ifndef INCLUDED_SVX_ITEXTPROVIDER_HXX +#define INCLUDED_SVX_ITEXTPROVIDER_HXX #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - fpicker/source vcl/win
fpicker/source/win32/filepicker/platform_xp.h |4 ++--
vcl/win/source/window/salframe.cxx| 12
2 files changed, 2 insertions(+), 14 deletions(-)
New commits:
commit a9fd489834b63e423d4745f0d71cf15396e3e3eb
Author: Thomas Arnhold
Date: Sat Oct 26 21:47:04 2013 +0200
windows: remove WINVER check
This check is no longer necessary as we require at least Windows XP,
which is 0x0501. It was implemented for ImmGetProperty().
Came in with 011bcd1ea1e8ce10f6b9946d8d44d05a59387b8c
Change-Id: If94d6e99e7f474d931546326bd6c96f2cfa4cfcd
diff --git a/vcl/win/source/window/salframe.cxx
b/vcl/win/source/window/salframe.cxx
index 273d28e..4227430 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -17,13 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-// i72022: ad-hoc to forcibly enable reconversion
-#if WINVER < 0x0500
-#undef WINVER
-#define WINVER 0x0500
-#endif
-
#include
#include
#include
@@ -5484,7 +5477,6 @@ static void ImplHandleIMENotify( HWND hWnd, WPARAM wParam
)
}
// ---
-#if WINVER >= 0x0500
static LRESULT ImplHandleIMEReconvertString( HWND hWnd, LPARAM lParam )
{
@@ -5607,8 +5599,6 @@ static LRESULT ImplHandleIMEQueryCharPosition( HWND hWnd,
LPARAM lParam ) {
return TRUE;
}
-#endif // WINVER >= 0x0500
-
// ---
void SalTestMouseLeave()
@@ -6022,7 +6012,6 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg,
WPARAM wParam, LPARAM lP
nRet = 1;
}
break;
-#if WINVER >= 0x0500
case WM_IME_REQUEST:
if ( (sal_uIntPtr)( wParam ) == IMR_RECONVERTSTRING )
{
@@ -6040,7 +6029,6 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg,
WPARAM wParam, LPARAM lP
rDef = FALSE;
}
break;
-#endif // WINVER >= 0x0500
}
// catch WheelMouse-Message
commit 4da020c5272aaddce3d9d8f1bad4c0cef8029a13
Author: Thomas Arnhold
Date: Wed Oct 30 22:58:19 2013 +0100
Windows XP is 0x0501
See http://msdn.microsoft.com/en-us/library/aa383745.aspx
And as we support only XP as minimum change this.
Change-Id: Iad51b0dd4bb960ed5a270b0b701ec3e0b28ab4e2
diff --git a/fpicker/source/win32/filepicker/platform_xp.h
b/fpicker/source/win32/filepicker/platform_xp.h
index 89c99ef..6a502f6 100644
--- a/fpicker/source/win32/filepicker/platform_xp.h
+++ b/fpicker/source/win32/filepicker/platform_xp.h
@@ -28,8 +28,8 @@
#undef _WIN32_IE
#undef _WTL_NO_CSTRING
-#define WINVER 0x0500
-#define _WIN32_WINNT0x0500
+#define WINVER 0x0501
+#define _WIN32_WINNT0x0501
#define _WIN32_IE 0x0600
#define _WTL_NO_CSTRING
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sal
include/sal/alloca.h |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d837c7b773c719202b0ae6c33825bf6d0ea7a6c5 Author: Thomas Arnhold Date: Wed Oct 30 22:42:15 2013 +0100 Remove legacy EMX check Last release from 1998 :) http://en.wikipedia.org/wiki/EMX_(programming_environment) Change-Id: I01b1dbf0d91c44d8e1da447aa24efc8878b41e1f diff --git a/include/sal/alloca.h b/include/sal/alloca.h index c42f723..dfa8089 100644 --- a/include/sal/alloca.h +++ b/include/sal/alloca.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_SAL_ALLOCA_H #define INCLUDED_SAL_ALLOCA_H -#if defined (SOLARIS) || defined (LINUX) || defined(__EMX__) || defined(AIX) || defined(ANDROID) +#if defined (SOLARIS) || defined (LINUX) || defined(AIX) || defined(ANDROID) #ifndef INCLUDED_ALLOCA_H #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/Library_writerfilter.mk writerfilter/source
writerfilter/Library_writerfilter.mk |1
writerfilter/source/doctok/WW8LFOTable.cxx | 39 -
writerfilter/source/doctok/resources.xmi |6
3 files changed, 46 deletions(-)
New commits:
commit 659ab86604bbdd7442524054f4b01541932ee3f9
Author: Miklos Vajna
Date: Wed Oct 30 22:21:02 2013 +0100
writerfilter: remove unused WW8LFOLevel
Change-Id: I8d76ca0a051e3ea10e0544636560e840ddc193fd
diff --git a/writerfilter/Library_writerfilter.mk
b/writerfilter/Library_writerfilter.mk
index f608187..3334b4e 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -127,7 +127,6 @@ $(eval $(call
gb_Library_add_exception_objects,writerfilter,\
writerfilter/source/doctok/WW8CpAndFc \
writerfilter/source/doctok/WW8FKPImpl \
writerfilter/source/doctok/WW8FontTable \
-writerfilter/source/doctok/WW8LFOTable \
writerfilter/source/doctok/WW8ListTable \
writerfilter/source/doctok/WW8Picture \
writerfilter/source/doctok/WW8PropertySetImpl \
diff --git a/writerfilter/source/doctok/WW8LFOTable.cxx
b/writerfilter/source/doctok/WW8LFOTable.cxx
deleted file mode 100644
index ec481d4..000
--- a/writerfilter/source/doctok/WW8LFOTable.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "doctok/resources.hxx"
-
-namespace writerfilter {
-namespace doctok {
-
-void WW8LFOLevel::resolveNoAuto(Properties & /*rHandler*/)
-{
-
-}
-
-sal_uInt32 WW8LFOLevel::calcSize()
-{
-sal_uInt32 nResult = WW8LFOLevel::getSize();
-
-return nResult;
-}
-
-}}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/doctok/resources.xmi
b/writerfilter/source/doctok/resources.xmi
index 9f3f8a6..a6a68c6 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -2345,12 +2345,6 @@
-
-
-
-
-
-
8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: config_host.mk.in configure.ac download.lst external/libetonyek external/Module_external.mk Makefile.fetch RepositoryExternal.mk
Makefile.fetch|1
RepositoryExternal.mk | 35 +
config_host.mk.in |3 +
configure.ac |5 ++
download.lst |2 +
external/Module_external.mk |1
external/libetonyek/0001-fix-windows-build.patch | 30 +++
external/libetonyek/ExternalProject_libetonyek.mk | 44 ++
external/libetonyek/Makefile |7 +++
external/libetonyek/Module_libetonyek.mk | 17
external/libetonyek/README|1
external/libetonyek/UnpackedTarball_libetonyek.mk | 20 ++
12 files changed, 166 insertions(+)
New commits:
commit 08ca3e40b0ac19975459589c9bee8ea77331a6c0
Author: David Tardon
Date: Thu Oct 24 16:46:49 2013 +0200
bundle libetonyek
Change-Id: I4099ea49ebce7c28152a0895086be5b86b18e28b
Reviewed-on: https://gerrit.libreoffice.org/6486
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/Makefile.fetch b/Makefile.fetch
index 60ce0ae..39332d7 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -76,6 +76,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk
$(SRCDIR)/download.lst $(SRCDIR)
$(foreach item, \
$(call fetch_Optional,LIBATOMIC_OPS,LIBATOMIC_OPS_TARBALL) \
$(call fetch_Optional,CDR,CDR_TARBALL) \
+ $(call fetch_Optional,ETONYEK,ETONYEK_TARBALL) \
$(call fetch_Optional,FIREBIRD,FIREBIRD_TARBALL) \
$(call fetch_Optional,HARFBUZZ,HARFBUZZ_TARBALL) \
$(call fetch_Optional,MSPUB,MSPUB_TARBALL) \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 33c3ffa..efc9542 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1431,6 +1431,41 @@ endef
endif # SYSTEM_CDR
+ifeq ($(SYSTEM_ETONYEK),YES)
+
+define gb_LinkTarget__use_etonyek
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+$(ETONYEK_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(ETONYEK_LIBS))
+
+endef
+
+gb_ExternalProject__use_etonyek :=
+
+else # !SYSTEM_ETONYEK
+
+define gb_LinkTarget__use_etonyek
+$(call gb_LinkTarget_set_include,$(1),\
+ $(ETONYEK_CFLAGS) \
+ $$(INCLUDE) \
+)
+$(call gb_LinkTarget_add_libs,$(1),\
+ $(call
gb_UnpackedTarball_get_dir,libetonyek)/src/lib/.libs/libetonyek-0.0$(gb_StaticLibrary_PLAINEXT)
\
+)
+$(call gb_LinkTarget_use_external_project,$(1),libetonyek)
+
+endef
+
+define gb_ExternalProject__use_etonyek
+$(call gb_ExternalProject_use_external_project,$(1),libetonyek)
+
+endef
+
+endif # SYSTEM_ETONYEK
+
+
ifeq ($(SYSTEM_ODFGEN),YES)
define gb_LinkTarget__use_odfgen
diff --git a/config_host.mk.in b/config_host.mk.in
index d03b96f..1c88ba1 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -168,6 +168,8 @@ export ENABLE_VALGRIND=@ENABLE_VALGRIND@
export ENABLE_VLC=@ENABLE_VLC@
export EPM=@EPM@
export EPM_FLAGS=@EPM_FLAGS@
+export ETONYEK_CFLAGS=$(gb_SPACE)@ETONYEK_CFLAGS@
+export ETONYEK_LIBS=$(gb_SPACE)@ETONYEK_LIBS@
export EXTERNAL_WARNINGS_NOT_ERRORS=@EXTERNAL_WARNINGS_NOT_ERRORS@
export debug=@ENABLE_DEBUG@
@x_Cygwin@ export FIND=@WIN_FIND@
@@ -511,6 +513,7 @@ export SYSTEM_JPEG=@SYSTEM_JPEG@
export SYSTEM_LCMS2=@SYSTEM_LCMS2@
export SYSTEM_CDR=@SYSTEM_CDR@
export SYSTEM_CMIS=@SYSTEM_CMIS@
+export SYSTEM_ETONYEK=@SYSTEM_ETONYEK@
export SYSTEM_LIBATOMIC_OPS=@SYSTEM_LIBATOMIC_OPS@
export SYSTEM_LIBEXTTEXTCAT=@SYSTEM_LIBEXTTEXTCAT@
export SYSTEM_LIBEXTTEXTCAT_DATA=@SYSTEM_LIBEXTTEXTCAT_DATA@
diff --git a/configure.ac b/configure.ac
index f10f71d..10a9055 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7716,6 +7716,11 @@ fi
AC_SUBST(SYSTEM_EXPAT)
dnl ===
+dnl Check for system libetonyek
+dnl ===
+libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.0],["-I${WORKDIR}/UnpackedTarball/libetonyek/inc"],["-L${WORKDIR}/UnpackedTarball/libetonyek/src/lib/.libs
-letonyek-0.0"])
+
+dnl ===
dnl Check for system libodfgen
dnl ===
libo_CHECK_SYSTEM_MODULE([libodfgen],[ODFGEN],[libodfgen-0.0])
diff --git a/download.lst b/download.lst
index c052c65..c909646 100644
--- a/download.lst
+++ b/download.lst
@@ -1,5 +1,7 @@
CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112
export CDR_TARBALL := libcdr-0.0.14.tar.bz2
+ETONYEK_MD5SUM := f1753366de8bd37c6fb033a7771fa616
+export ETONYEK_TARBALL := libetonyek-0.0.0.tar.bz2
MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e
export MSPUB_TARBALL := libmspub-0.0.6.tar.bz2
MWAW_MD5SUM := 828dd03510791fbe037081a2b4a1a8ff
diff --git a/external/Module_external.mk b/external/Module_extern
[Libreoffice-commits] core.git: download.lst external/libodfgen Makefile.fetch writerperfect/Library_wpftdraw.mk writerperfect/Library_wpftwriter.mk writerperfect/StaticLibrary_writerperfect.mk
Makefile.fetch|2 download.lst |3 - external/libodfgen/0001-use-correct-header-for-std-swap.patch | 26 ++ external/libodfgen/ExternalProject_libodfgen.mk |1 external/libodfgen/UnpackedTarball_libodfgen.mk |6 ++ writerperfect/Library_wpftdraw.mk |1 writerperfect/Library_wpftwriter.mk |1 writerperfect/StaticLibrary_writerperfect.mk |1 8 files changed, 39 insertions(+), 2 deletions(-) New commits: commit 0aa668e8538535d6ee01185b2746d91cb1d849e4 Author: David Tardon Date: Tue Oct 22 16:08:01 2013 +0200 update libodfgen Change-Id: I9466c07f18b4befaba662386d69426dd6687d2dd Reviewed-on: https://gerrit.libreoffice.org/6487 Reviewed-by: David Tardon Tested-by: David Tardon diff --git a/Makefile.fetch b/Makefile.fetch index 39332d7..be6c2e9 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -81,6 +81,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,HARFBUZZ,HARFBUZZ_TARBALL) \ $(call fetch_Optional,MSPUB,MSPUB_TARBALL) \ $(call fetch_Optional,MWAW,MWAW_TARBALL) \ + $(call fetch_Optional,ODFGEN,ODFGEN_TARBALL) \ $(call fetch_Optional,VISIO,VISIO_TARBALL) \ ,$(call fetch_Download_item_special,http://dev-www.libreoffice.org/src,$(item))) $(foreach item, \ @@ -146,7 +147,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,NEON,$(NEON_TARBALL)) \ $(call fetch_Optional,NSS,$(NSS_TARBALL)) \ $(NUMBERTEXT_EXTENSION_PACK) \ - $(call fetch_Optional,ODFGEN,$(ODFGEN_TARBALL)) \ $(call fetch_Optional,OPENLDAP,$(OPENLDAP_TARBALL)) \ $(call fetch_Optional,OPENSSL,$(OPENSSL_TARBALL)) \ $(call fetch_Optional,ORCUS,$(ORCUS_TARBALL)) \ diff --git a/download.lst b/download.lst index c909646..e8cbc2a 100644 --- a/download.lst +++ b/download.lst @@ -6,6 +6,8 @@ MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e export MSPUB_TARBALL := libmspub-0.0.6.tar.bz2 MWAW_MD5SUM := 828dd03510791fbe037081a2b4a1a8ff export MWAW_TARBALL := libmwaw-0.1.11.tar.bz2 +ODFGEN_MD5SUM := 9cafe7f50a3b2c5ebd2dc9c6c509d2b4 +ODFGEN_TARBALL := libodfgen-0.0.3.tar.bz2 VISIO_MD5SUM := 82628333418f101a20cd21f980cf9f40 export VISIO_TARBALL := libvisio-0.0.31.tar.bz2 FIREBIRD_MD5SUM := 21154d2004e025c8a325b0357bb5 @@ -78,7 +80,6 @@ export MYSQLCPPCONN_TARBALL := 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector- export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz export NSS_TARBALL := a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz -export ODFGEN_TARBALL := 8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz export OPENSSL_TARBALL := 66bf6f10f060d561929de96f9dfe5b8c-openssl-1.0.1e.tar.gz export ORCUS_TARBALL := ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 diff --git a/external/libodfgen/0001-use-correct-header-for-std-swap.patch b/external/libodfgen/0001-use-correct-header-for-std-swap.patch new file mode 100644 index 000..13502d9 --- /dev/null +++ b/external/libodfgen/0001-use-correct-header-for-std-swap.patch @@ -0,0 +1,26 @@ +From 9008d84be1eb0b3def0df39b069a309d54aa73ab Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Wed, 30 Oct 2013 19:30:30 +0100 +Subject: [PATCH] use correct header for std::swap + +--- + src/GraphicFunctions.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/GraphicFunctions.cxx b/src/GraphicFunctions.cxx +index d8809f9..606c640 100644 +--- a/src/GraphicFunctions.cxx b/src/GraphicFunctions.cxx +@@ -24,8 +24,8 @@ + * Corel Corporation or Corel Corporation Limited." + */ + ++#include + #include +-#include + + #include "GraphicFunctions.hxx" + +-- +1.8.3.1 + diff --git a/external/libodfgen/ExternalProject_libodfgen.mk b/external/libodfgen/ExternalProject_libodfgen.mk index 8514282..eea9ad1 100644 --- a/external/libodfgen/ExternalProject_libodfgen.mk +++ b/external/libodfgen/ExternalProject_libodfgen.mk @@ -17,6 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,libodfgen,\ $(eval $(call gb_ExternalProject_use_externals,libodfgen,\ boost_headers \ + etonyek \ wpd \ wpg \ )) diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk b/external/libodfgen/UnpackedTarball_libodfgen.mk index 1a7f26c..28e589c 100644 --- a/external/libodfgen/UnpackedTarball_libodfgen.mk +++ b/external/libodfgen/UnpackedTarball_libodfgen.mk @@ -11,4 +11,10
[Libreoffice-commits] core.git: filter/Configuration_filter.mk filter/source postprocess/Rdb_services.mk Repository.mk writerperfect/Library_wpftimpress.mk writerperfect/Module_writerperfect.mk writer
Repository.mk |1 filter/Configuration_filter.mk|2 filter/source/config/fragments/filters/AppleKeynote.xcu | 29 + filter/source/config/fragments/types/impress_AppleKeynote.xcu | 29 + postprocess/Rdb_services.mk |1 writerperfect/Library_wpftimpress.mk | 61 ++ writerperfect/Module_writerperfect.mk |4 writerperfect/source/impress/KeynoteImportFilter.cxx | 221 ++ writerperfect/source/impress/KeynoteImportFilter.hxx | 89 writerperfect/source/impress/wpftimpress.component| 16 writerperfect/source/impress/wpftimpress_genericfilter.cxx| 47 ++ 11 files changed, 500 insertions(+) New commits: commit 412975713b4838582f635ac9e61a8a8e720ff09c Author: David Tardon Date: Wed Oct 30 08:56:06 2013 +0100 integrate Apple Keynote import filter Change-Id: Icc36b761da9262a99af730cfe71f576bcaab3ee1 Reviewed-on: https://gerrit.libreoffice.org/6488 Tested-by: LibreOffice gerrit bot Reviewed-by: David Tardon Tested-by: David Tardon diff --git a/Repository.mk b/Repository.mk index c957433..b3e21fe 100644 --- a/Repository.mk +++ b/Repository.mk @@ -180,6 +180,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,impress, \ placeware \ PresenterScreen \ PresentationMinimizer \ + wpftimpress \ )) $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,onlineupdate, \ diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index 645768e..62f21b6 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -581,6 +581,7 @@ $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fr # fcfg_impress $(call filter_Configuration_add_types,fcfg_langpack,fcfg_impress_types.xcu,filter/source/config/fragments/types,\ draw_StarOffice_XML_Draw \ + impress_AppleKeynote \ impress_MS_PowerPoint_97 \ impress_MS_PowerPoint_97_AutoPlay \ impress_MS_PowerPoint_97_Vorlage \ @@ -600,6 +601,7 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_impress_types.xcu,filte ) $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_impress_filters.xcu,filter/source/config/fragments/filters,\ + AppleKeynote \ MS_PowerPoint_97 \ MS_PowerPoint_97_AutoPlay \ MS_PowerPoint_97_Vorlage \ diff --git a/filter/source/config/fragments/filters/AppleKeynote.xcu b/filter/source/config/fragments/filters/AppleKeynote.xcu new file mode 100644 index 000..84deba4 --- /dev/null +++ b/filter/source/config/fragments/filters/AppleKeynote.xcu @@ -0,0 +1,29 @@ + + + + +IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED + + +org.libreoffice.comp.Impress.KeynoteImportFilter + + +Apple Keynote 5 + + +0 + + +impress_AppleKeynote + + +com.sun.star.presentation.PresentationDocument + + diff --git a/filter/source/config/fragments/types/impress_AppleKeynote.xcu b/filter/source/config/fragments/types/impress_AppleKeynote.xcu new file mode 100644 index 000..797df7a --- /dev/null +++ b/filter/source/config/fragments/types/impress_AppleKeynote.xcu @@ -0,0 +1,29 @@ + + + + +org.libreoffice.comp.Impress.KeynoteImportFilter + + +key + + +application/x-iwork-keynote-sffkey + + +true + + +Apple Keynote + + +Apple Keynote + + diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 0f28e03..06d90e3 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -118,6 +118,7 @@ $(eval $(call gb_Rdb_add_components,services,\ writerfilter/util/writerfilter \ writerperfect/util/wpftwriter \ writerperfect/util/wpftdraw \ + writerperfect/source/impress/wpftimpress \ $(if $(filter MACOSX,$(OS)), \ $(if $(filter-out X86_64,$(CPUNAME)), \ avmedia/source/quicktime/avmediaQuickTime \ diff --git a/writerperfect/Library_wpftimpress.mk b/writerperfect/Library_wpftimpress.mk new file mode 100644 index 000..cb69f98 --- /dev/null +++ b/writerperfect/Library_wpftimpress.mk @@ -0,0 +1,61 @@ +# -*- 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/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file dis
[Libreoffice-commits] core.git: postprocess/CustomTarget_registry.mk
postprocess/CustomTarget_registry.mk |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2c3d648117835df405ff8414c51821d2a0ed1519
Author: Bjoern Michaelsen
Date: Wed Oct 30 02:56:28 2013 +0100
make postprocess handle commas in OOO_VENDOR correctly
Change-Id: I560d561ba10cdaa113a154ce9bed27de65d6d8eb
diff --git a/postprocess/CustomTarget_registry.mk
b/postprocess/CustomTarget_registry.mk
index 8040051..b78ff02 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -554,7 +554,7 @@ postprocess_main_SED := \
-e
's,$${ABOUTBOXPRODUCTVERSION},$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX),g'
\
-e 's,$${ABOUTBOXPRODUCTVERSIONSUFFIX},$(LIBO_VERSION_SUFFIX_SUFFIX),g'
\
-e
's,$${DICT_REPO_URL},http://extensions.libreoffice.org/dictionaries/,g' \
- -e 's,$${OOOVENDOR},$(if $(OOO_VENDOR),$(OOO_VENDOR),The Document
Foundation),g' \
+ -e 's,$${OOOVENDOR},$(if $(OOO_VENDOR),$(subst
$(COMMA),\x2c,$(OOO_VENDOR)),The Document Foundation),g' \
-e 's,$${PRODUCTNAME},$(PRODUCTNAME),g' \
-e 's,$${PRODUCTVERSION},$(PRODUCTVERSION),g' \
-e
's,$${PRODUCTEXTENSION},.$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX),g'
\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/parclass.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 6a660262e9d1d06f4c0c6c99063e5a966e64d6d6
Author: Winfried Donkers
Date: Wed Oct 30 19:53:48 2013 +0100
fdo#44134 fix omission in support of Excel 2010
functions STDEV.P and STDEV.S
Change-Id: I4374ef6c9399ec933be8c430d3602df1219636c5
Reviewed-on: https://gerrit.libreoffice.org/6495
Tested-by: Eike Rathke
Reviewed-by: Eike Rathke
diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index afb8598..550b116 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -171,6 +171,8 @@ const ScParameterClassification::RawData
ScParameterClassification::pRawData[] =
{ ocStDevA, {{ Reference
}, 1 }},
{ ocStDevP, {{ Reference
}, 1 }},
{ ocStDevPA, {{ Reference
}, 1 }},
+{ ocStDevP_MS, {{ Reference
}, 1 }},
+{ ocStDevS, {{ Reference
}, 1 }},
{ ocSTEYX, {{ ForceArray, ForceArray
}, 0 }},
{ ocSub, {{ Array, Array
}, 0 }},
{ ocSubTotal,{{ Value, Reference
}, 1 }},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/parclass.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit cea5b8eb497f7b162ea1743401c9045d286e5d8e
Author: Winfried Donkers
Date: Wed Oct 30 19:46:23 2013 +0100
fdo#7 fix omission in support of Excel 2010
functions COVARIANCE.P and COVARIANCE.S
Change-Id: Ic5416626a8e6790e4a65d7017c739106897fa1f1
Reviewed-on: https://gerrit.libreoffice.org/6494
Tested-by: Eike Rathke
Reviewed-by: Eike Rathke
diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index 7f86e63..afb8598 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -89,6 +89,8 @@ const ScParameterClassification::RawData
ScParameterClassification::pRawData[] =
{ ocCountIf, {{ Reference, Value
}, 0 }},
{ ocCountIfs,{{ Reference, Value
}, 2 }},
{ ocCovar, {{ ForceArray, ForceArray
}, 0 }},
+{ ocCovarianceP, {{ ForceArray, ForceArray
}, 0 }},
+{ ocCovarianceS, {{ ForceArray, ForceArray
}, 0 }},
{ ocDBAverage, {{ Reference, Reference, Reference
}, 0 }},
{ ocDBCount, {{ Reference, Reference, Reference
}, 0 }},
{ ocDBCount2,{{ Reference, Reference, Reference
}, 0 }},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/curl
external/curl/ExternalProject_curl.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit 5e50987119d4ac6878911ad07e19680cc30384b9 Author: Tor Lillqvist Date: Wed Oct 30 20:06:18 2013 +0200 Fix build for Android: Don't use SYSBASE that way Change-Id: Ib4027a28a2e4b19842508a6006c1c56a06d021ed diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index 142a782..4b046fc 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -23,10 +23,12 @@ ifneq ($(OS),WNT) curl_CPPFLAGS := curl_LDFLAGS := $(if $(filter LINUX FREEBSD,$(OS)),"-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) +ifneq ($(OS),ANDROID) ifneq ($(SYSBASE),) curl_CPPFLAGS += -I$(SYSBASE)/usr/include curl_LDFLAGS += -L$(SYSBASE)/usr/lib endif +endif # there are 2 include paths, the other one is passed to --with-nss below ifeq ($(SYSTEM_NSS),NO) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/openclwrapper.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6461b9c9d28f1f46b6338c768c51a4eeb366ebab
Author: Kohei Yoshida
Date: Wed Oct 30 14:02:12 2013 -0400
Return false when no OpenCL device is detected.
Change-Id: Ib4e3e432cb69c17cf1830bfd540d4f5335056879
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index b629e53..046297f 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -2766,7 +2766,7 @@ bool switchOpenclDevice(const OUString* pDevice, bool
bAutoSelect)
{
// we don't need to change anything
// still the same device
-return true;
+return pDeviceId != NULL;
}
cl_platform_id platformId;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - sc/source
sc/source/core/opencl/openclwrapper.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8b997c8cfba34aea35efbaa0237beaf9d9c3653d
Author: Kohei Yoshida
Date: Wed Oct 30 14:02:12 2013 -0400
Return false when no OpenCL device is detected.
Change-Id: Ib4e3e432cb69c17cf1830bfd540d4f5335056879
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index b629e53..046297f 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -2766,7 +2766,7 @@ bool switchOpenclDevice(const OUString* pDevice, bool
bAutoSelect)
{
// we don't need to change anything
// still the same device
-return true;
+return pDeviceId != NULL;
}
cl_platform_id platformId;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - include/touch ios/shared sw/source
include/touch/touch.h | 74
--
ios/shared/ios_sharedlo/objective_c/gestures/MLOGestureEngine.m |4
sw/source/core/view/viewsh.cxx | 26 ++-
3 files changed, 90 insertions(+), 14 deletions(-)
New commits:
commit 19879fe620e72f45f8faffee8f8d1271d803aa6e
Author: Ptyl Dragon
Date: Wed Oct 30 19:42:09 2013 +0200
ready for integration with CATiledLayer
Change-Id: I50f519a37036ed3d17f73c80b33f4a9c4c19cb52
diff --git a/include/touch/touch.h b/include/touch/touch.h
index 6ba2fab..f0cdabe 100644
--- a/include/touch/touch.h
+++ b/include/touch/touch.h
@@ -69,19 +69,75 @@ typedef CGRect MLORect;
typedef basegfx::B2IBox MLORect;
#endif
-typedef long long MLOContentSizeDimension;
-struct MLOContentSize {
-MLOContentSizeDimension width;
-MLOContentSizeDimension height;
+// MLODip - Device Independent Pixels
+
+typedef long long MLOPixel;
+static const MLOPixel LO_TWIPS_TO_MLO_PIXEL_RATIO = 10L;
+struct MLOPixelSize {
+MLOPixel width;
+MLOPixel height;
+};
+typedef struct MLOPixelSize MLOPixelSize;
+struct MLOPixelPoint {
+MLOPixel x;
+MLOPixel y;
};
-typedef struct MLOContentSize MLOContentSize;
+typedef struct MLOPixelPoint MLOPixelPoint;
+
+CG_INLINE CGFloat
+MLOPixelToCGFloat(MLOPixel mloPixel)
+{
+return (CGFloat) (mloPixel / LO_TWIPS_TO_MLO_PIXEL_RATIO);
+}
+
+CG_INLINE MLOPixel
+CGFloatToMLOPixel(CGFloat cgFloat)
+{
+return (MLOPixel) cgFloat * LO_TWIPS_TO_MLO_PIXEL_RATIO;
+}
+
+CG_INLINE MLOPixelSize
+MLOPixelSizeMake(MLOPixel width, MLOPixel height)
+{
+MLOPixelSize size; size.width = width; size.height = height; return size;
+}
+
+CG_INLINE MLOPixelPoint
+MLOPixelPointMake(MLOPixel x, MLOPixel y)
+{
+MLOPixelPoint point; point.x = x; point.y = y; return point;
+}
+
+CG_INLINE MLOPixelSize
+CGSizeToMLOPixelSize(CGSize cgSize)
+{
+MLOPixelSize mloPixelSize;
+mloPixelSize.width = MLOPixelToCGFloat(cgSize.width);
+mloPixelSize.height = MLOPixelToCGFloat(cgSize.height);
+return mloPixelSize;
+}
+
+CG_INLINE CGSize
+MLOPixelsToCGSize(MLOPixel width, MLOPixel height)
+{
+CGFloat fWidth = CGFloatToMLOPixel(width);
+CGFloat fHeight = CGFloatToMLOPixel(height);
+return CGSizeMake(fWidth, fHeight);
+}
-CG_INLINE MLOContentSize
-MLOContentSizeMake(MLOContentSizeDimension width, MLOContentSizeDimension
height)
+CG_INLINE CGSize
+MLOPixelSizeToCGSize(MLOPixelSize mloPixelSize)
{
-MLOContentSize size; size.width = width; size.height = height; return size;
+return MLOPixelsToCGSize(mloPixelSize.width, mloPixelSize.height);
}
+MLOPixelPoint CGPointToMLOPixelPoint(CGPoint cgPoint);
+
+CGPoint MLOPixelPointToCGPoint(MLOPixelPoint mloPixelPoint);
+
+
+// selection
+
void touch_ui_selection_start(MLOSelectionKind kind,
const void *documentHandle,
MLORect *rectangles,
@@ -124,7 +180,7 @@ context, contextHeight, contextWidth specify where to draw.
*/
void touch_lo_draw_tile(void *context, int contextWidth, int contextHeight,
int tilePosX, int tilePosY, int tileWidth, int tileHeight);
void touch_lo_copy_buffer(const void * source, size_t sourceWidth, size_t
sourceHeight, size_t sourceBytesPerRow, void * target, size_t targetWidth,
size_t targetHeight);
-MLOContentSize touch_lo_get_content_size();
+CGSize touch_lo_get_content_size();
void touch_lo_mouse_drag(int x, int y, MLOMouseButtonState state);
// Move the start of the selection to (x,y)
diff --git a/ios/shared/ios_sharedlo/objective_c/gestures/MLOGestureEngine.m
b/ios/shared/ios_sharedlo/objective_c/gestures/MLOGestureEngine.m
index 3523dca..f2a6f8e 100644
--- a/ios/shared/ios_sharedlo/objective_c/gestures/MLOGestureEngine.m
+++ b/ios/shared/ios_sharedlo/objective_c/gestures/MLOGestureEngine.m
@@ -470,3 +470,7 @@ void touch_ui_selection_start(MLOSelectionKind kind,
rectangles[i].origin.y);
}
}
+
+void touch_ui_selection_none(){
+// STUB
+}
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 420715a..8606126 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1818,7 +1818,7 @@ void touch_lo_draw_tile(void * context, int contextWidth,
int contextHeight, int
Application::ReleaseSolarMutex();
}
extern "C"
-MLOContentSize touch_lo_get_content_size()
+CGSize touch_lo_get_content_size()
{
SwWrtShell *pViewShell = GetActiveWrtShell();
if (pViewShell)
@@ -1826,14 +1826,30 @@ MLOContentSize touch_lo_get_content_size()
static const long WIDTH_ADDITION = 6L * DOCUMENTBORDER;
static const long HEIGHT_ADDITION = 2L * DOCUMENTBORDER;
Size documentSize =pViewShell->GetView().GetDocSz();
-return MLOContentSizeMake(documentSize.Width() + WIDTH_ADDITION,
+return MLOPixelsToCGSize(documentSize.Width() + WIDTH_ADDITION,
documentSize.Height() + HEIG
[Libreoffice-commits] core.git: formula/source include/formula sc/inc sc/qa sc/source
formula/source/core/resource/core_resource.src | 12 ++
include/formula/compiler.hrc |4 +-
include/formula/opcode.hxx |2 +
sc/inc/helpids.h |2 +
sc/qa/unit/ucalc.cxx |2 +
sc/source/core/tool/interpr4.cxx |6 ++-
sc/source/core/tool/parclass.cxx |2 +
sc/source/filter/excel/xlformula.cxx |4 +-
sc/source/filter/oox/formulabase.cxx |4 +-
sc/source/ui/src/scfuncs.src | 48 +
10 files changed, 81 insertions(+), 5 deletions(-)
New commits:
commit 781363934af5c0ff3401161c385c6c93c9352c2c
Author: Winfried Donkers
Date: Tue Oct 29 17:30:42 2013 +0100
fdo#61002 add Excel 2010 functions VAR.P and VAR.S
Change-Id: I23f286eaaef79d196a65e8079b62cf577539e9f1
Reviewed-on: https://gerrit.libreoffice.org/6477
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index c6aec3a..3ec56c0 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -184,6 +184,8 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_VAR_A { Text = "VARA" ; };
String SC_OPCODE_VAR_P { Text = "VARP" ; };
String SC_OPCODE_VAR_P_A { Text = "VARPA" ; };
+String SC_OPCODE_VAR_P_MS { Text = "COM.MICROSOFT.VAR.P" ; };
+String SC_OPCODE_VAR_S { Text = "COM.MICROSOFT.VAR.S" ; };
String SC_OPCODE_ST_DEV { Text = "STDEV" ; };
String SC_OPCODE_ST_DEV_A { Text = "STDEVA" ; };
String SC_OPCODE_ST_DEV_P { Text = "STDEVP" ; };
@@ -536,6 +538,8 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_VAR_A { Text = "VARA" ; };
String SC_OPCODE_VAR_P { Text = "VARP" ; };
String SC_OPCODE_VAR_P_A { Text = "VARPA" ; };
+String SC_OPCODE_VAR_P_MS { Text = "VAR.P" ; };
+String SC_OPCODE_VAR_S { Text = "VAR.S" ; };
String SC_OPCODE_ST_DEV { Text = "STDEV" ; };
String SC_OPCODE_ST_DEV_A { Text = "STDEVA" ; };
String SC_OPCODE_ST_DEV_P { Text = "STDEVP" ; };
@@ -1295,6 +1299,14 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = "VARPA" ;
};
+String SC_OPCODE_VAR_P_MS
+{
+Text [ en-US ] = "VAR.P" ;
+};
+String SC_OPCODE_VAR_S
+{
+Text [ en-US ] = "VAR.S" ;
+};
String SC_OPCODE_ST_DEV
{
Text [ en-US ] = "STDEV" ;
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index bb80900..b9b4f7a 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -412,8 +412,10 @@
#define SC_OPCODE_COVARIANCE_P 414
#define SC_OPCODE_ST_DEV_P_MS 415
#define SC_OPCODE_ST_DEV_S 416
+#define SC_OPCODE_VAR_P_MS 417
+#define SC_OPCODE_VAR_S 418
-#define SC_OPCODE_STOP_2_PAR417 /* last function with two or more
parameters' OpCode + 1 */
+#define SC_OPCODE_STOP_2_PAR419 /* last function with two or more
parameters' OpCode + 1 */
#define SC_OPCODE_STOP_FUNCTION SC_OPCODE_STOP_2_PAR/* last
function's OpCode + 1 */
#define SC_OPCODE_LAST_OPCODE_ID(SC_OPCODE_STOP_FUNCTION - 1) /* last
OpCode */
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 79b229c..6dd28d3 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -220,6 +220,8 @@ enum OpCodeEnum
ocISPMT = SC_OPCODE_ISPMT,
ocVar = SC_OPCODE_VAR,
ocVarP = SC_OPCODE_VAR_P,
+ocVarP_MS = SC_OPCODE_VAR_P_MS,
+ocVarS = SC_OPCODE_VAR_S,
ocStDev = SC_OPCODE_ST_DEV,
ocStDevP= SC_OPCODE_ST_DEV_P,
ocStDevP_MS = SC_OPCODE_ST_DEV_P_MS,
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 30b8899..831e2d9 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -682,5 +682,7 @@
#define HID_FUNC_COVARIANCE_S
"SC_HID_FUNC_COVARIANCE_S"
#define HID_FUNC_ST_DEV_P_MS
"SC_HID_FUNC_ST_DEV_P_MS"
#define HID_FUNC_ST_DEV_S
"SC_HID_FUNC_ST_DEV_S"
+#define HID_FUNC_VAR_P_MS
"SC_HID_FUNC_VAR_P_MS"
+#define HID_FUNC_VAR_S
"SC_HID_FUNC_VAR_S"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index db82ac4..90af819 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -2436,6 +2436,8 @@ void Test::testFunctionLists()
"TRIMMEAN",
"TTEST",
"VAR",
+"VAR.P",
+"VAR.S",
"VARA",
"VARP",
"VARPA",
diff --git a/sc/source/c
[Bug 54938] Adapt supportsService implementations to cppu::supportsService
https://bugs.freedesktop.org/show_bug.cgi?id=54938 --- Comment #18 from Commit Notification --- Marcos Paulo de Souza committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=2b01553fa5982ed50fd37f346a150d1aac8dcd6f fdo#54938: Convert svx to use cppu::supportsService The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - formula/source sot/source svx/source sw/source
formula/source/core/api/FormulaOpCodeMapperObj.cxx |
11 --
sot/source/unoolestorage/xolesimplestorage.cxx |
15 --
svx/source/accessibility/AccessibleFrameSelector.cxx |
25
svx/source/accessibility/GraphCtlAccessibleContext.cxx |
21 ---
svx/source/accessibility/svxrectctaccessiblecontext.cxx|
15 --
svx/source/customshapes/EnhancedCustomShapeEngine.cxx |
16 ---
svx/source/fmcomp/fmgridif.cxx |
11 --
svx/source/form/formcontroller.cxx |
12 --
svx/source/tbxctrls/tbunocontroller.cxx|
10 -
svx/source/tbxctrls/tbunosearchcontrollers.cxx |
53 +-
svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx |
24
svx/source/unodraw/UnoGraphicExporter.cxx |
10 -
svx/source/unodraw/UnoNameItemTable.cxx|
10 -
svx/source/unodraw/XPropertyTable.cxx |
13 --
svx/source/unodraw/recoveryui.cxx |
33 --
svx/source/unodraw/unomod.cxx |
2
svx/source/unodraw/unomtabl.cxx|
10 -
svx/source/unodraw/unopool.cxx |
11 --
svx/source/unodraw/unoshape.cxx|
13 --
svx/source/unogallery/unogalitem.cxx |
18 ---
svx/source/xml/xmlgrhlp.cxx|
8 -
sw/source/filter/ww8/docxtablestyleexport.hxx |
2
22 files changed, 59 insertions(+), 284 deletions(-)
New commits:
commit 83397d0415f248bb61829b13eb7c6364d7a71508
Author: Stephan Bergmann
Date: Wed Oct 30 18:22:29 2013 +0100
-Werror,-Wmismatched-tags
Change-Id: Iec4f78de9e52144b84baaa739d97681343ae5a27
diff --git a/sw/source/filter/ww8/docxtablestyleexport.hxx
b/sw/source/filter/ww8/docxtablestyleexport.hxx
index c66372e..77e7036 100644
--- a/sw/source/filter/ww8/docxtablestyleexport.hxx
+++ b/sw/source/filter/ww8/docxtablestyleexport.hxx
@@ -18,7 +18,7 @@ class SwDoc;
/// Handles DOCX export of table styles, based on InteropGrabBag.
class DocxTableStyleExport
{
-class Impl;
+struct Impl;
boost::shared_ptr m_pImpl;
public:
void TableStyles();
commit 2b01553fa5982ed50fd37f346a150d1aac8dcd6f
Author: Marcos Paulo de Souza
Date: Sat Oct 26 13:11:42 2013 -0200
fdo#54938: Convert svx to use cppu::supportsService
Change-Id: I3ab178924cb1c4240511f08625f244dac54e3913
Signed-off-by: Stephan Bergmann
diff --git a/formula/source/core/api/FormulaOpCodeMapperObj.cxx
b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
index d7bbaf4..4439834 100644
--- a/formula/source/core/api/FormulaOpCodeMapperObj.cxx
+++ b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
@@ -19,21 +19,17 @@
#include "formula/FormulaOpCodeMapperObj.hxx"
#include "formula/opcode.hxx"
#include
+#include
-//
=
namespace formula
{
-//
=
-
using namespace ::com::sun::star;
-//
-
-//
sal_Bool SAL_CALL FormulaOpCodeMapperObj::supportsService( const OUString&
_rServiceName ) throw(uno::RuntimeException)
{
-return ::comphelper::findValue( getSupportedServiceNames_Static(),
_rServiceName, sal_True ).getLength() != 0;
+return cppu::supportsService(this, _rServiceName);
}
-//
+
SAL_WNODEPRECATED_DECLARATIONS_PUSH
FormulaOpCodeMapperObj::FormulaOpCodeMapperObj(::std::auto_ptr
_pCompiler)
: m_pCompiler(_pCompiler)
@@ -45,7 +41,6 @@ FormulaOpCodeMapperObj::~FormulaOpCodeMapperObj()
{
}
-
::sal_Int32 SAL_CALL FormulaOpCodeMapperObj::getOpCodeExternal()
throw (::com::sun::star::uno::RuntimeException)
{
diff --git a/sot/source/unoolestorage/xolesimplestorage.cxx
b/sot/source/unoolestorage/xolesimplestorage.cxx
index d2fbf32..712f351 100644
--- a/sot/source/unoolestorage/xolesimplestorage.cxx
+++ b/sot/source/unoolestorage/xolesimplestorage.cxx
@@ -30,6 +30,7 @@
#include
#include
+#include
#include
@@ -769,31 +770,19 @@ void SAL_CALL OLESimpleStorage::setClassInfo( const
uno::Sequence< sal_Int8 >& /
throw lang::NoSupportException();
}
-//___
[Libreoffice-commits] core.git: sc/qa sc/source
sc/qa/unit/opencl-test.cxx | 42 ---
sc/source/core/opencl/formulagroupcl.cxx |1
sc/source/core/tool/formulagroup.cxx |1
3 files changed, 44 deletions(-)
New commits:
commit a6d89e17995987549db36695f3ea490a18f30ba4
Author: Kohei Yoshida
Date: Wed Oct 30 12:50:41 2013 -0400
Ugh!
Change-Id: I95979ed5a303724e944a48b69d3c1cdbc949e53e
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index f3a9576..38fb153 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -38,48 +38,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-#include
-#include
-#include
-
-namespace {
-
-class stack_printer
-{
-public:
-explicit stack_printer(const char* msg) :
-msMsg(msg)
-{
-fprintf(stdout, "%s: --begin\n", msMsg.c_str());
-mfStartTime = getTime();
-}
-
-~stack_printer()
-{
-double fEndTime = getTime();
-fprintf(stdout, "%s: --end (duration: %g sec)\n", msMsg.c_str(),
(fEndTime - mfStartTime));
-}
-
-void printTime(int line) const
-{
-double fEndTime = getTime();
-fprintf(stdout, "%s: --(%d) (duration: %g sec)\n", msMsg.c_str(),
line, (fEndTime - mfStartTime));
-}
-
-private:
-double getTime() const
-{
-timeval tv;
-gettimeofday(&tv, NULL);
-return tv.tv_sec + tv.tv_usec / 100.0;
-}
-
-::std::string msMsg;
-double mfStartTime;
-};
-
-}
-
/* Implementation of Filters test */
class ScOpenclTest
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 4a01cb0..c71d2a0 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1291,7 +1291,6 @@ bool FormulaGroupInterpreterOpenCL::interpret(
ScDocument& rDoc,
const ScAddress& rTopPos, const ScFormulaCellGroupRef& xGroup,
ScTokenArray& rCode )
{
-fprintf(stdout, "FormulaGroupInterpreterOpenCL::interpret: opencl\n");
generateRPNCode(rDoc, rTopPos, rCode);
// printf("Vector width = %d\n", xGroup->mnLength);
// Constructing "AST"
diff --git a/sc/source/core/tool/formulagroup.cxx
b/sc/source/core/tool/formulagroup.cxx
index b4a1801..2573359 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -289,7 +289,6 @@ bool FormulaGroupInterpreterSoftware::interpret(ScDocument&
rDoc, const ScAddres
const ScFormulaCellGroupRef&
xGroup,
ScTokenArray& rCode)
{
-fprintf(stdout, "FormulaGroupInterpreterSoftware::interpret:
software\n");
typedef boost::unordered_map CachedTokensType;
// Decompose the group into individual cells and calculate them
individually.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - sc/qa sc/source
sc/qa/unit/opencl-test.cxx | 42 ---
sc/source/core/opencl/formulagroupcl.cxx |1
sc/source/core/tool/formulagroup.cxx |1
3 files changed, 44 deletions(-)
New commits:
commit ffc1d9b03a7dc2f8a9ba05243ba25ad5d4eec83d
Author: Kohei Yoshida
Date: Wed Oct 30 12:50:41 2013 -0400
Ugh!
Change-Id: I95979ed5a303724e944a48b69d3c1cdbc949e53e
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index 6f768fd..687391b 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -40,48 +40,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-#include
-#include
-#include
-
-namespace {
-
-class stack_printer
-{
-public:
-explicit stack_printer(const char* msg) :
-msMsg(msg)
-{
-fprintf(stdout, "%s: --begin\n", msMsg.c_str());
-mfStartTime = getTime();
-}
-
-~stack_printer()
-{
-double fEndTime = getTime();
-fprintf(stdout, "%s: --end (duration: %g sec)\n", msMsg.c_str(),
(fEndTime - mfStartTime));
-}
-
-void printTime(int line) const
-{
-double fEndTime = getTime();
-fprintf(stdout, "%s: --(%d) (duration: %g sec)\n", msMsg.c_str(),
line, (fEndTime - mfStartTime));
-}
-
-private:
-double getTime() const
-{
-timeval tv;
-gettimeofday(&tv, NULL);
-return tv.tv_sec + tv.tv_usec / 100.0;
-}
-
-::std::string msMsg;
-double mfStartTime;
-};
-
-}
-
/* Implementation of Filters test */
class ScOpenclTest
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 2389c95..1c113f6 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1292,7 +1292,6 @@ bool FormulaGroupInterpreterOpenCL::interpret(
ScDocument& rDoc,
const ScAddress& rTopPos, const ScFormulaCellGroupRef& xGroup,
ScTokenArray& rCode )
{
-fprintf(stdout, "FormulaGroupInterpreterOpenCL::interpret: opencl\n");
generateRPNCode(rDoc, rTopPos, rCode);
// printf("Vector width = %d\n", xGroup->mnLength);
// Constructing "AST"
diff --git a/sc/source/core/tool/formulagroup.cxx
b/sc/source/core/tool/formulagroup.cxx
index b4a1801..2573359 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -289,7 +289,6 @@ bool FormulaGroupInterpreterSoftware::interpret(ScDocument&
rDoc, const ScAddres
const ScFormulaCellGroupRef&
xGroup,
ScTokenArray& rCode)
{
-fprintf(stdout, "FormulaGroupInterpreterSoftware::interpret:
software\n");
typedef boost::unordered_map CachedTokensType;
// Decompose the group into individual cells and calculate them
individually.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/qa sc/source
sc/inc/document.hxx |4
sc/qa/unit/opencl-test.cxx | 319 +--
sc/source/core/opencl/formulagroupcl.cxx |1
sc/source/core/tool/formulagroup.cxx |1
4 files changed, 226 insertions(+), 99 deletions(-)
New commits:
commit 3fbda041d29ec6436460b75944e8c15f96366da5
Author: Kohei Yoshida
Date: Wed Oct 30 12:41:16 2013 -0400
Have the OpenCL test really use OpenCL.
Disabled testCompilerString() which currently fails.
Change-Id: I4bfc9bef0a2a3e204551085f5eaa5b9d4bebbe3c
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index dd84f5d..fb3a175 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -970,8 +970,8 @@ public:
voidSetDirty( const ScRange& );
voidSetTableOpDirty( const ScRange& ); // for Interpreter
TableOp
voidInterpretDirtyCells( const ScRangeList& rRanges );
-voidCalcAll();
-SC_DLLPUBLIC void CalcAfterLoad();
+SC_DLLPUBLIC void CalcAll();
+SC_DLLPUBLIC void CalcAfterLoad();
voidCompileAll();
voidCompileXML();
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index c595101..f3a9576 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -38,6 +38,48 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
+#include
+#include
+#include
+
+namespace {
+
+class stack_printer
+{
+public:
+explicit stack_printer(const char* msg) :
+msMsg(msg)
+{
+fprintf(stdout, "%s: --begin\n", msMsg.c_str());
+mfStartTime = getTime();
+}
+
+~stack_printer()
+{
+double fEndTime = getTime();
+fprintf(stdout, "%s: --end (duration: %g sec)\n", msMsg.c_str(),
(fEndTime - mfStartTime));
+}
+
+void printTime(int line) const
+{
+double fEndTime = getTime();
+fprintf(stdout, "%s: --(%d) (duration: %g sec)\n", msMsg.c_str(),
line, (fEndTime - mfStartTime));
+}
+
+private:
+double getTime() const
+{
+timeval tv;
+gettimeofday(&tv, NULL);
+return tv.tv_sec + tv.tv_usec / 100.0;
+}
+
+::std::string msMsg;
+double mfStartTime;
+};
+
+}
+
/* Implementation of Filters test */
class ScOpenclTest
@@ -46,7 +88,19 @@ class ScOpenclTest
{
public:
ScOpenclTest();
-bool enableOpenCL();
+
+/**
+ * Try to auto-detect OpenCL device if one is available.
+ *
+ * @return true if a usable OpenCL device is found, false otherwise.
+ */
+bool detectOpenCLDevice();
+
+/**
+ * Turn on OpenCL group interpreter. Call this after the document is
+ * loaded and before performing formula calculation.
+ */
+void enableOpenCL();
virtual void setUp();
virtual void tearDown();
@@ -123,7 +177,7 @@ public:
CPPUNIT_TEST(testStatisticalFormulaHarMean);
CPPUNIT_TEST(testFinancialCoupdaybsFormula);
CPPUNIT_TEST(testFinacialDollardeFormula);
-CPPUNIT_TEST(testCompilerString);
+// CPPUNIT_TEST(testCompilerString);
CPPUNIT_TEST(testCompilerInEq);
CPPUNIT_TEST(testFinacialDollarfrFormula);
CPPUNIT_TEST(testFinacialSYDFormula);
@@ -170,21 +224,27 @@ bool ScOpenclTest::load(const OUString &rFilter, const
OUString &rURL,
return bLoaded;
}
-bool ScOpenclTest::enableOpenCL()
+bool ScOpenclTest::detectOpenCLDevice()
{
sc::FormulaGroupInterpreter::enableOpenCL(true);
return sc::FormulaGroupInterpreter::switchOpenCLDevice(OUString(),true);
}
+void ScOpenclTest::enableOpenCL()
+{
+sc::FormulaGroupInterpreter::enableOpenCL(true);
+}
+
void ScOpenclTest::testCompilerNested()
{
-if (!enableOpenCL())
+if (!detectOpenCLDevice())
return;
ScDocShellRef xDocSh = loadDoc("opencl/compiler/nested.", ODS);
ScDocument* pDoc = xDocSh->GetDocument();
CPPUNIT_ASSERT(pDoc);
-xDocSh->DoHardRecalc(true);
+enableOpenCL();
+pDoc->CalcAll();
ScDocShellRef xDocShRes = loadDoc("opencl/compiler/nested.", ODS);
ScDocument* pDocRes = xDocShRes->GetDocument();
@@ -202,14 +262,15 @@ void ScOpenclTest::testCompilerNested()
void ScOpenclTest::testCompilerString()
{
-if (!enableOpenCL())
+if (!detectOpenCLDevice())
return;
ScDocShellRef xDocSh = loadDoc("opencl/compiler/string.", ODS);
CPPUNIT_ASSERT_MESSAGE("Failed to load document.", xDocSh.Is());
ScDocument* pDoc = xDocSh->GetDocument();
CPPUNIT_ASSERT(pDoc);
-xDocSh->DoHardRecalc(true);
+enableOpenCL();
+pDoc->CalcAll();
ScDocShellRef xDocShRes = loadDoc("opencl/compiler/string.", ODS);
CPPUNIT_ASSERT_MESSAGE("Failed to load document.", xDocShRes.Is());
@@ -231,14 +292,15 @@ void ScOpenclTest::testCompilerString()
void ScOpenclTest::testCompilerInEq()
{
-if (!enableOpenCL())
+if (!detectOpenCLDevice())
return;
ScDocShellRef xDocSh =
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - sc/inc sc/qa sc/source
sc/inc/document.hxx |4
sc/qa/unit/opencl-test.cxx | 319 +--
sc/source/core/opencl/formulagroupcl.cxx |1
sc/source/core/tool/formulagroup.cxx |1
4 files changed, 226 insertions(+), 99 deletions(-)
New commits:
commit 43f6592f849a821f09db799e72120ae24c50e60f
Author: Kohei Yoshida
Date: Wed Oct 30 12:41:16 2013 -0400
Have the OpenCL test really use OpenCL.
Disabled testCompilerString() which currently fails.
Change-Id: I4bfc9bef0a2a3e204551085f5eaa5b9d4bebbe3c
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 62f4814..7b56eda 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -970,8 +970,8 @@ public:
voidSetDirty( const ScRange& );
voidSetTableOpDirty( const ScRange& ); // for Interpreter
TableOp
voidInterpretDirtyCells( const ScRangeList& rRanges );
-voidCalcAll();
-SC_DLLPUBLIC void CalcAfterLoad();
+SC_DLLPUBLIC void CalcAll();
+SC_DLLPUBLIC void CalcAfterLoad();
voidCompileAll();
voidCompileXML();
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index b51a66b..6f768fd 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -40,6 +40,48 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
+#include
+#include
+#include
+
+namespace {
+
+class stack_printer
+{
+public:
+explicit stack_printer(const char* msg) :
+msMsg(msg)
+{
+fprintf(stdout, "%s: --begin\n", msMsg.c_str());
+mfStartTime = getTime();
+}
+
+~stack_printer()
+{
+double fEndTime = getTime();
+fprintf(stdout, "%s: --end (duration: %g sec)\n", msMsg.c_str(),
(fEndTime - mfStartTime));
+}
+
+void printTime(int line) const
+{
+double fEndTime = getTime();
+fprintf(stdout, "%s: --(%d) (duration: %g sec)\n", msMsg.c_str(),
line, (fEndTime - mfStartTime));
+}
+
+private:
+double getTime() const
+{
+timeval tv;
+gettimeofday(&tv, NULL);
+return tv.tv_sec + tv.tv_usec / 100.0;
+}
+
+::std::string msMsg;
+double mfStartTime;
+};
+
+}
+
/* Implementation of Filters test */
class ScOpenclTest
@@ -48,7 +90,19 @@ class ScOpenclTest
{
public:
ScOpenclTest();
-bool enableOpenCL();
+
+/**
+ * Try to auto-detect OpenCL device if one is available.
+ *
+ * @return true if a usable OpenCL device is found, false otherwise.
+ */
+bool detectOpenCLDevice();
+
+/**
+ * Turn on OpenCL group interpreter. Call this after the document is
+ * loaded and before performing formula calculation.
+ */
+void enableOpenCL();
virtual void setUp();
virtual void tearDown();
@@ -125,7 +179,7 @@ public:
CPPUNIT_TEST(testStatisticalFormulaHarMean);
CPPUNIT_TEST(testFinancialCoupdaybsFormula);
CPPUNIT_TEST(testFinacialDollardeFormula);
-CPPUNIT_TEST(testCompilerString);
+// CPPUNIT_TEST(testCompilerString);
CPPUNIT_TEST(testCompilerInEq);
CPPUNIT_TEST(testFinacialDollarfrFormula);
CPPUNIT_TEST(testFinacialSYDFormula);
@@ -172,21 +226,27 @@ bool ScOpenclTest::load(const OUString &rFilter, const
OUString &rURL,
return bLoaded;
}
-bool ScOpenclTest::enableOpenCL()
+bool ScOpenclTest::detectOpenCLDevice()
{
sc::FormulaGroupInterpreter::enableOpenCL(true);
return sc::FormulaGroupInterpreter::switchOpenCLDevice(OUString(),true);
}
+void ScOpenclTest::enableOpenCL()
+{
+sc::FormulaGroupInterpreter::enableOpenCL(true);
+}
+
void ScOpenclTest::testCompilerNested()
{
-if (!enableOpenCL())
+if (!detectOpenCLDevice())
return;
ScDocShellRef xDocSh = loadDoc("opencl/compiler/nested.", ODS);
ScDocument* pDoc = xDocSh->GetDocument();
CPPUNIT_ASSERT(pDoc);
-xDocSh->DoHardRecalc(true);
+enableOpenCL();
+pDoc->CalcAll();
ScDocShellRef xDocShRes = loadDoc("opencl/compiler/nested.", ODS);
ScDocument* pDocRes = xDocShRes->GetDocument();
@@ -204,14 +264,15 @@ void ScOpenclTest::testCompilerNested()
void ScOpenclTest::testCompilerString()
{
-if (!enableOpenCL())
+if (!detectOpenCLDevice())
return;
ScDocShellRef xDocSh = loadDoc("opencl/compiler/string.", ODS);
CPPUNIT_ASSERT_MESSAGE("Failed to load document.", xDocSh.Is());
ScDocument* pDoc = xDocSh->GetDocument();
CPPUNIT_ASSERT(pDoc);
-xDocSh->DoHardRecalc(true);
+enableOpenCL();
+pDoc->CalcAll();
ScDocShellRef xDocShRes = loadDoc("opencl/compiler/string.", ODS);
CPPUNIT_ASSERT_MESSAGE("Failed to load document.", xDocShRes.Is());
@@ -233,14 +294,15 @@ void ScOpenclTest::testCompilerString()
void ScOpenclTest::testCompilerInEq()
{
-if (!enableOpenCL())
+if (!detectOpenCLDevice())
return;
ScDocShellRef xDocSh =
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/formulagroupcl.cxx | 224 +++
sc/source/core/opencl/op_financial.hxx |2
sc/source/core/opencl/opbase.hxx | 25 +--
3 files changed, 99 insertions(+), 152 deletions(-)
New commits:
commit 077ef157eff28b8b50725663a287ccb2a511b071
Author: Kohei Yoshida
Date: Wed Oct 30 11:51:08 2013 -0400
Un-templatize code for speedier compilation.
This changes brings the compile and link time from several minutes to
a few seconds.
Change-Id: I486b7bfd56913b17ec9ea2e9446372f3e9da38f1
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 94ab088..c71d2a0 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -25,7 +25,7 @@
#include "formulagroupcl_public.hxx"
#include "formulagroupcl_finacial.hxx"
-#include
+#include
#include
#include
#include
@@ -35,6 +35,9 @@
#include
#endif
#include
+
+#include
+
using namespace formula;
namespace sc { namespace opencl {
@@ -297,7 +300,7 @@ protected:
/// Abstract class for code generation
-class Reduction: public SlidingFunctionBase, public OpBase
+class Reduction: public SlidingFunctionBase
{
public:
virtual void GenSlidingWindowFunction(std::stringstream &ss,
@@ -427,7 +430,7 @@ public:
};
// Strictly binary operators
-class Binary: public SlidingFunctionBase, public OpBase
+class Binary: public SlidingFunctionBase
{
public:
virtual void GenSlidingWindowFunction(std::stringstream &ss,
@@ -451,7 +454,7 @@ public:
}
};
-class SumOfProduct: public SlidingFunctionBase, public OpBase
+class SumOfProduct: public SlidingFunctionBase
{
public:
virtual void GenSlidingWindowFunction(std::stringstream &ss,
@@ -656,16 +659,16 @@ public:
}
virtual std::string BinFuncName(void) const { return "fsop"; }
};
+
/// Helper functions that have multiple buffers
-template
class DynamicKernelSoPArguments: public DynamicKernelArgument
{
public:
typedef boost::shared_ptr SubArgument;
typedef std::vector SubArgumentsType;
-DynamicKernelSoPArguments(const std::string &s,
-FormulaTreeNodeRef ft);
+DynamicKernelSoPArguments(
+const std::string &s, const FormulaTreeNodeRef& ft,
SlidingFunctionBase* pCodeGen);
/// Create buffer and pass the buffer to a given kernel
virtual size_t Marshal(cl_kernel k, int argno, int nVectorWidth)
@@ -682,7 +685,7 @@ public:
virtual void GenSlidingWindowFunction(std::stringstream &ss) {
for (unsigned i = 0; i < mvSubArguments.size(); i++)
mvSubArguments[i]->GenSlidingWindowFunction(ss);
-CodeGen.GenSlidingWindowFunction(ss, mSymName, mvSubArguments);
+mpCodeGen->GenSlidingWindowFunction(ss, mSymName, mvSubArguments);
}
virtual void GenDeclRef(std::stringstream &ss) const
{
@@ -733,7 +736,7 @@ public:
std::stringstream ss;
if (!nested)
{
-ss << mSymName << "_" << CodeGen.BinFuncName() <<"(";
+ss << mSymName << "_" << mpCodeGen->BinFuncName() <<"(";
for (unsigned i = 0; i < mvSubArguments.size(); i++)
{
if (i)
@@ -747,35 +750,33 @@ public:
} else {
if (mvSubArguments.size() != 2)
throw Unhandled();
-ss << "(" <<
CodeGen.Gen2(mvSubArguments[0]->GenSlidingWindowDeclRef(true),
+ss << "(" <<
mpCodeGen->Gen2(mvSubArguments[0]->GenSlidingWindowDeclRef(true),
mvSubArguments[1]->GenSlidingWindowDeclRef(true)) <<
")";
}
return ss.str();
}
virtual std::string DumpOpName(void) const
{
-std::string t = "_" + CodeGen.BinFuncName();
+std::string t = "_" + mpCodeGen->BinFuncName();
for (unsigned i = 0; i < mvSubArguments.size(); i++)
t = t + mvSubArguments[i]->DumpOpName();
return t;
}
private:
SubArgumentsType mvSubArguments;
-Op CodeGen;
+boost::scoped_ptr mpCodeGen;
};
-template
-boost::shared_ptr SoPHelper(const std::string &ts,
-FormulaTreeNodeRef ft)
+boost::shared_ptr SoPHelper(
+const std::string &ts, const FormulaTreeNodeRef& ft, SlidingFunctionBase*
pCodeGen)
{
-return boost::shared_ptr(
-new DynamicKernelSoPArguments(ts, ft));
+return boost::shared_ptr(new
DynamicKernelSoPArguments(ts, ft, pCodeGen));
}
-template
-DynamicKernelSoPArguments::DynamicKernelSoPArguments(const std::string &s,
-FormulaTreeNodeRef ft):
-DynamicKernelArgument(s, ft) {
+DynamicKernelSoPArguments::DynamicKernelSoPArguments(
+const std::string &s, const FormulaTreeNodeRef& ft, SlidingFunctionBase*
pCodeGen) :
+DynamicKernelArgument(s, ft), mpCodeGen(pCodeGen)
+{
size_t nChildren = ft->Children.size();
for (unsigned i = 0; i < nChildren; i++)
@@ -833,270 +834,215 @@
DynamicKernelSoPArguments::DynamicKe
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - sc/source
sc/source/core/opencl/formulagroupcl.cxx | 224 +++
sc/source/core/opencl/op_financial.hxx |2
sc/source/core/opencl/opbase.hxx | 25 +--
3 files changed, 99 insertions(+), 152 deletions(-)
New commits:
commit c555f15520e2d3c2c760b64a9791d68cbc67defc
Author: Kohei Yoshida
Date: Wed Oct 30 11:51:08 2013 -0400
Un-templatize code for speedier compilation.
This changes brings the compile and link time from several minutes to
a few seconds.
Change-Id: I486b7bfd56913b17ec9ea2e9446372f3e9da38f1
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index b583e7c..1c113f6 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -25,7 +25,7 @@
#include "formulagroupcl_public.hxx"
#include "formulagroupcl_finacial.hxx"
-#include
+#include
#include
#include
#include
@@ -35,6 +35,9 @@
#include
#endif
#include
+
+#include
+
using namespace formula;
namespace sc { namespace opencl {
@@ -297,7 +300,7 @@ protected:
/// Abstract class for code generation
-class Reduction: public SlidingFunctionBase, public OpBase
+class Reduction: public SlidingFunctionBase
{
public:
virtual void GenSlidingWindowFunction(std::stringstream &ss,
@@ -427,7 +430,7 @@ public:
};
// Strictly binary operators
-class Binary: public SlidingFunctionBase, public OpBase
+class Binary: public SlidingFunctionBase
{
public:
virtual void GenSlidingWindowFunction(std::stringstream &ss,
@@ -451,7 +454,7 @@ public:
}
};
-class SumOfProduct: public SlidingFunctionBase, public OpBase
+class SumOfProduct: public SlidingFunctionBase
{
public:
virtual void GenSlidingWindowFunction(std::stringstream &ss,
@@ -656,16 +659,16 @@ public:
}
virtual std::string BinFuncName(void) const { return "fsop"; }
};
+
/// Helper functions that have multiple buffers
-template
class DynamicKernelSoPArguments: public DynamicKernelArgument
{
public:
typedef boost::shared_ptr SubArgument;
typedef std::vector SubArgumentsType;
-DynamicKernelSoPArguments(const std::string &s,
-FormulaTreeNodeRef ft);
+DynamicKernelSoPArguments(
+const std::string &s, const FormulaTreeNodeRef& ft,
SlidingFunctionBase* pCodeGen);
/// Create buffer and pass the buffer to a given kernel
virtual size_t Marshal(cl_kernel k, int argno, int nVectorWidth)
@@ -682,7 +685,7 @@ public:
virtual void GenSlidingWindowFunction(std::stringstream &ss) {
for (unsigned i = 0; i < mvSubArguments.size(); i++)
mvSubArguments[i]->GenSlidingWindowFunction(ss);
-CodeGen.GenSlidingWindowFunction(ss, mSymName, mvSubArguments);
+mpCodeGen->GenSlidingWindowFunction(ss, mSymName, mvSubArguments);
}
virtual void GenDeclRef(std::stringstream &ss) const
{
@@ -733,7 +736,7 @@ public:
std::stringstream ss;
if (!nested)
{
-ss << mSymName << "_" << CodeGen.BinFuncName() <<"(";
+ss << mSymName << "_" << mpCodeGen->BinFuncName() <<"(";
for (unsigned i = 0; i < mvSubArguments.size(); i++)
{
if (i)
@@ -747,35 +750,33 @@ public:
} else {
if (mvSubArguments.size() != 2)
throw Unhandled();
-ss << "(" <<
CodeGen.Gen2(mvSubArguments[0]->GenSlidingWindowDeclRef(true),
+ss << "(" <<
mpCodeGen->Gen2(mvSubArguments[0]->GenSlidingWindowDeclRef(true),
mvSubArguments[1]->GenSlidingWindowDeclRef(true)) <<
")";
}
return ss.str();
}
virtual std::string DumpOpName(void) const
{
-std::string t = "_" + CodeGen.BinFuncName();
+std::string t = "_" + mpCodeGen->BinFuncName();
for (unsigned i = 0; i < mvSubArguments.size(); i++)
t = t + mvSubArguments[i]->DumpOpName();
return t;
}
private:
SubArgumentsType mvSubArguments;
-Op CodeGen;
+boost::scoped_ptr mpCodeGen;
};
-template
-boost::shared_ptr SoPHelper(const std::string &ts,
-FormulaTreeNodeRef ft)
+boost::shared_ptr SoPHelper(
+const std::string &ts, const FormulaTreeNodeRef& ft, SlidingFunctionBase*
pCodeGen)
{
-return boost::shared_ptr(
-new DynamicKernelSoPArguments(ts, ft));
+return boost::shared_ptr(new
DynamicKernelSoPArguments(ts, ft, pCodeGen));
}
-template
-DynamicKernelSoPArguments::DynamicKernelSoPArguments(const std::string &s,
-FormulaTreeNodeRef ft):
-DynamicKernelArgument(s, ft) {
+DynamicKernelSoPArguments::DynamicKernelSoPArguments(
+const std::string &s, const FormulaTreeNodeRef& ft, SlidingFunctionBase*
pCodeGen) :
+DynamicKernelArgument(s, ft), mpCodeGen(pCodeGen)
+{
size_t nChildren = ft->Children.size();
for (unsigned i = 0; i < nChildren; i++)
@@ -833,270 +834,215 @@
DynamicKernelSoPArguments::DynamicKe
[Bug 54938] Adapt supportsService implementations to cppu::supportsService
https://bugs.freedesktop.org/show_bug.cgi?id=54938 --- Comment #17 from Commit Notification --- Marcos Paulo de Souza committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=0865c446c2ac3facd75f03020e934e71403429e1 fdo#54938: Convert package, writerfilter and writerperfect The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/ui/formulacalculationoptions.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cb590c067fc86f402739e9a959192d501fe6bb26 Author: Markus Mohrhard Date: Wed Oct 30 16:24:11 2013 +0100 rename software opencl option Change-Id: Icbadc235164b8d055b71f7207535fac2188a1948 diff --git a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui index 895f8ee..2e1b93b 100644 --- a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui +++ b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui @@ -467,7 +467,7 @@ False -Software +Internal, software interpreter 0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - sc/inc sc/source test/source
sc/inc/documentimport.hxx |4 +-
sc/source/core/data/column3.cxx| 12 ++-
sc/source/core/data/documentimport.cxx |5 +--
sc/source/ui/docshell/impex.cxx| 52 -
test/source/sheet/xspreadsheets2.cxx |6 +--
5 files changed, 46 insertions(+), 33 deletions(-)
New commits:
commit 4954e2a2f6d99e9c1cfb15435c66bdbbf62f1cd3
Author: Markus Mohrhard
Date: Mon Oct 28 23:20:20 2013 +0100
simplify code and fix out of bounds read
Change-Id: I5be3a28d3d1ae43974f844d143a30bfd989cbe5b
diff --git a/test/source/sheet/xspreadsheets2.cxx
b/test/source/sheet/xspreadsheets2.cxx
index d9d78b6..aa010d3 100644
--- a/test/source/sheet/xspreadsheets2.cxx
+++ b/test/source/sheet/xspreadsheets2.cxx
@@ -326,10 +326,10 @@ void XSpreadsheets2::importSheetToCopy()
bool XSpreadsheets2::isExternalReference(const OUString& aDestContent, const
OUString& aSrcContent )
{
OUString aStart("'file://");
-const sal_Char* sSrcContent = OUStringToOString( aSrcContent,
RTL_TEXTENCODING_UTF8 ).getStr();
-return (aDestContent.endsWithIgnoreAsciiCaseAsciiL(sSrcContent,
aSrcContent.getLength()) // same cell address
-&& aDestContent.indexOf(aStart)==0 // starts with 'file://
+CPPUNIT_ASSERT(aDestContent.startsWith(aStart));
+
+return (aDestContent.endsWithIgnoreAsciiCase(aSrcContent, NULL) // same
cell address
&& aDestContent.indexOf(aSrcFileName)>0); // contains source file
name
}
commit 34012133266714259e5b009851924d176199a60d
Author: Markus Mohrhard
Date: Tue Oct 29 02:34:08 2013 +0100
use sal_Int32 instead of xub_StrLen
Change-Id: Id868448b5c981d744a066c738b344752bcd0faab
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 1399da2..df74149 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -625,7 +625,7 @@ static bool lcl_appendLineData( OUString& rField, const
sal_Unicode* p1, const s
OSL_ENSURE( rField.getLength() + (p2 - p1) <= STRING_MAXLEN,
"lcl_appendLineData: data overflow");
if (rField.getLength() + (p2 - p1) <= STRING_MAXLEN)
{
-rField += OUString( p1, sal::static_int_cast( p2 - p1 ) );
+rField += OUString( p1, sal::static_int_cast( p2 - p1 ) );
return true;
}
else
@@ -763,7 +763,7 @@ static const sal_Unicode* lcl_ScanSylkString( const
sal_Unicode* p,
}
if (!pEndQuote)
pEndQuote = p; // Take all data as string.
-rString += OUString(pStartQuote + 1, sal::static_int_cast(
pEndQuote - pStartQuote - 1 ) );
+rString += OUString(pStartQuote + 1, sal::static_int_cast(
pEndQuote - pStartQuote - 1 ) );
lcl_UnescapeSylk( rString, eVersion);
return p;
}
@@ -785,7 +785,7 @@ static const sal_Unicode* lcl_ScanSylkFormula( const
sal_Unicode* p,
}
++p;
}
-rString += OUString( pStart, sal::static_int_cast( p -
pStart));
+rString += OUString( pStart, sal::static_int_cast( p -
pStart));
lcl_UnescapeSylk( rString, eVersion);
}
else
@@ -826,7 +826,7 @@ static const sal_Unicode* lcl_ScanSylkFormula( const
sal_Unicode* p,
{
while (*p && *p != ';')
++p;
-rString += OUString( pStart, sal::static_int_cast( p -
pStart));
+rString += OUString( pStart, sal::static_int_cast( p -
pStart));
}
}
return p;
@@ -1011,9 +1011,9 @@ static bool lcl_PutString(
else if ( nColFormat != SC_COL_STANDARD ) //
Datumsformate
{
const sal_uInt16 nMaxNumberParts = 7; // Y-M-D h:m:s.t
-xub_StrLen nLen = rStr.getLength();
-xub_StrLen nStart[nMaxNumberParts];
-xub_StrLen nEnd[nMaxNumberParts];
+sal_Int32 nLen = rStr.getLength();
+sal_Int32 nStart[nMaxNumberParts];
+sal_Int32 nEnd[nMaxNumberParts];
sal_uInt16 nDP, nMP, nYP;
switch ( nColFormat )
@@ -1026,7 +1026,7 @@ static bool lcl_PutString(
sal_uInt16 nFound = 0;
bool bInNum = false;
-for ( xub_StrLen nPos=0; nPos= 5 && nDateLen <= 8 &&
ScGlobal::pCharClass->isNumeric( rStr.copy( nDateStart,
nDateLen ) ) )
commit 93959db4d8846cfdfb87ab647c4d457fb09bb869
Author: Markus Mohrhard
Date: Tue Oct 29 02:31:22 2013 +0100
use DocumentImport for csv import, related fdo#69006
Change-Id: Ib904510b6e897feb787497a4c8ff4204387cf6a4
diff --git a/sc/inc/documentimport.hxx b/sc/inc/documentimport.hxx
index 0620301..25d4a03 100644
--- a/sc/inc/documentimport.hxx
+++ b/sc/inc/documentimport.hxx
@@ -23,6 +23,7 @@ class ScColumn;
class ScAddress;
class ScTokenArray;
class ScFormulaCell;
+struct ScSetStringParam;
struct ScDocumentImportImpl;
/**
@@ -59,7 +60,8 @@ public:
void setOriginDate(sal_uInt16 nYear, sal_uInt16 nMonth, sal_uInt16 nDay);
-void setAutoInput(const ScAddress& rPos,
[Libreoffice-commits] core.git: package/source writerfilter/source writerperfect/source
package/source/manifest/ManifestReader.cxx|8 +---
package/source/manifest/ManifestReader.hxx|1
package/source/manifest/ManifestWriter.cxx|7 +--
package/source/manifest/ManifestWriter.hxx|1
package/source/zippackage/ZipPackage.cxx |3 +
package/source/zippackage/ZipPackageFolder.cxx|4 +-
package/source/zippackage/ZipPackageFolderEnumeration.cxx |4 +-
package/source/zippackage/ZipPackageStream.cxx|3 +
package/source/zippackage/zipfileaccess.cxx |9 +---
writerfilter/source/filter/ImportFilter.cxx | 21 ++
writerfilter/source/filter/RtfFilter.cxx | 12 ++
writerfilter/source/filter/WriterFilterDetection.cxx | 13 +-
writerperfect/source/draw/CDRImportFilter.cxx | 17 ++--
writerperfect/source/draw/CDRImportFilter.hxx |3 -
writerperfect/source/draw/CMXImportFilter.cxx | 17 ++--
writerperfect/source/draw/CMXImportFilter.hxx |3 -
writerperfect/source/draw/MSPUBImportFilter.cxx | 17 ++--
writerperfect/source/draw/MSPUBImportFilter.hxx |3 -
writerperfect/source/draw/VisioImportFilter.cxx | 17 ++--
writerperfect/source/draw/VisioImportFilter.hxx |3 -
writerperfect/source/draw/WPGImportFilter.cxx | 17 ++--
writerperfect/source/draw/WPGImportFilter.hxx |3 -
writerperfect/source/writer/MSWorksImportFilter.cxx | 14 ++-
writerperfect/source/writer/MSWorksImportFilter.hxx |3 -
writerperfect/source/writer/MWAWImportFilter.cxx | 16 ++--
writerperfect/source/writer/MWAWImportFilter.hxx |3 -
writerperfect/source/writer/WordPerfectImportFilter.cxx | 28 +++---
27 files changed, 61 insertions(+), 189 deletions(-)
New commits:
commit 0865c446c2ac3facd75f03020e934e71403429e1
Author: Marcos Paulo de Souza
Date: Sat Oct 26 14:22:21 2013 -0200
fdo#54938: Convert package, writerfilter and writerperfect
Change-Id: I5220e172bf9722ad86eef3bc557c30779f07201c
Signed-off-by: Stephan Bergmann
diff --git a/package/source/manifest/ManifestReader.cxx
b/package/source/manifest/ManifestReader.cxx
index 2e2b6a0..ac8d75b 100644
--- a/package/source/manifest/ManifestReader.cxx
+++ b/package/source/manifest/ManifestReader.cxx
@@ -21,6 +21,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -92,11 +93,6 @@ OUString ManifestReader::static_getImplementationName()
return OUString( "com.sun.star.packages.manifest.comp.ManifestReader" );
}
-sal_Bool SAL_CALL ManifestReader::static_supportsService(OUString const &
rServiceName)
-{
-return rServiceName == getSupportedServiceNames()[0];
-}
-
Sequence < OUString > ManifestReader::static_getSupportedServiceNames()
{
Sequence < OUString > aNames(1);
@@ -113,7 +109,7 @@ OUString ManifestReader::getImplementationName()
sal_Bool SAL_CALL ManifestReader::supportsService(OUString const &
rServiceName)
throw (RuntimeException)
{
-return static_supportsService ( rServiceName );
+return cppu::supportsService(this, rServiceName );
}
Sequence < OUString > ManifestReader::getSupportedServiceNames()
diff --git a/package/source/manifest/ManifestReader.hxx
b/package/source/manifest/ManifestReader.hxx
index d050405..72fe473 100644
--- a/package/source/manifest/ManifestReader.hxx
+++ b/package/source/manifest/ManifestReader.hxx
@@ -56,7 +56,6 @@ public:
// Component constructor
static OUString static_getImplementationName();
static ::com::sun::star::uno::Sequence < OUString >
static_getSupportedServiceNames();
-sal_Bool SAL_CALL static_supportsService(OUString const & rServiceName);
static ::com::sun::star::uno::Reference <
com::sun::star::lang::XSingleServiceFactory > createServiceFactory(
com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >
const & rServiceFactory );
};
#endif
diff --git a/package/source/manifest/ManifestWriter.cxx
b/package/source/manifest/ManifestWriter.cxx
index eaf6794..7d69b37 100644
--- a/package/source/manifest/ManifestWriter.cxx
+++ b/package/source/manifest/ManifestWriter.cxx
@@ -21,6 +21,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -74,10 +75,6 @@ OUString ManifestWriter::static_getImplementationName()
return OUString ( "com.sun.star.packages.manifest.comp.ManifestWriter" );
}
-sal_Bool SAL_CALL ManifestWriter::static_supportsService(OUString const &
rServiceName)
-{
-return rServiceName == getSupportedServiceNames()[0];
-}
Sequence < OUString > ManifestWriter::static_getSupportedServiceNames()
{
Sequence < OUString > aNames(1);
@@ -94,7 +91,7 @@ OUString ManifestWriter::getImplementationName()
sal_Bool SAL_CALL ManifestWriter::suppor
[Libreoffice-commits] core.git: Branch 'feature/chart-opengl' - sc/uiconfig
sc/uiconfig/scalc/ui/formulacalculationoptions.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9c5bdfaa7c61e4c94ec0e63cbbc4d1e4494cd912 Author: Markus Mohrhard Date: Wed Oct 30 16:24:11 2013 +0100 rename software opencl option Change-Id: Icbadc235164b8d055b71f7207535fac2188a1948 diff --git a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui index 895f8ee..2e1b93b 100644 --- a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui +++ b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui @@ -467,7 +467,7 @@ False -Software +Internal, software interpreter 0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 63962] Remove LibreOffice icon themes hardcoding
https://bugs.freedesktop.org/show_bug.cgi?id=63962 akusebi changed: What|Removed |Added CC||mak...@t-online.hu --- Comment #8 from akusebi --- (In reply to comment #7) > Hello, I have some quesions for this task > - When should the directory be searched? Where can I add the call to scan > the directory? > - What is the standard directory where the icons are located? Is the value > set anywhere, and how can I access it? > Kind regards, > Tobias Hello Tobias, I am also interested in this problem. This is my first easy hack so I'm not experienced at all. So far I investigated the followings I hope it is useful for you: - the theme names are hard coded in the gui in optviewpage.ui see iconstyle combobox -> maybe they should be removed - the icon themes are in base dir + share folder + config + "images_" + theme name + ".zip" (e.g.: /opt/libreoffice4.0/share/config/images_crystal.zip) - I think the combobox should be populated when the options dialog is created (OfaViewTabPage maybe) Best regards, Tamás -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/helpids.h |4
sc/source/ui/src/scfuncs.src |8
2 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 88d87cefb61b03909b26ea3ad89e2dc7b5538a0f
Author: Eike Rathke
Date: Wed Oct 30 15:49:21 2013 +0100
added missing HIDs instead of using copy&paste IDs of other functions
Change-Id: I4d3cb89501f287fa2b278881352a766715ec7c6e
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 648ff4f..30b8899 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -678,5 +678,9 @@
#define HID_FUNC_BITRSHIFT
"SC_HID_FUNC_BITRSHIFT"
#define HID_FUNC_FILTERXML
"SC_HID_FUNC_FILTERXML"
#define HID_FUNC_WEBSERVICE
"SC_HID_FUNC_WEBSERVICE"
+#define HID_FUNC_COVARIANCE_P
"SC_HID_FUNC_COVARIANCE_P"
+#define HID_FUNC_COVARIANCE_S
"SC_HID_FUNC_COVARIANCE_S"
+#define HID_FUNC_ST_DEV_P_MS
"SC_HID_FUNC_ST_DEV_P_MS"
+#define HID_FUNC_ST_DEV_S
"SC_HID_FUNC_ST_DEV_S"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 8b8d2ca..64d14e3 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -5194,7 +5194,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
{
0;
ID_FUNCTION_GRP_STATISTIC;
-U2S( HID_FUNC_STABW );
+U2S( HID_FUNC_ST_DEV_S );
VAR_ARGS; 0;
0;
};
@@ -5266,7 +5266,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
{
0;
ID_FUNCTION_GRP_STATISTIC;
-U2S( HID_FUNC_STABWN );
+U2S( HID_FUNC_ST_DEV_P_MS );
VAR_ARGS; 0;
0;
};
@@ -7601,7 +7601,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
{
0;
ID_FUNCTION_GRP_STATISTIC;
-U2S( HID_FUNC_KOVAR );
+U2S( HID_FUNC_COVARIANCE_P );
2; 0; 0;
0;
};
@@ -7633,7 +7633,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
{
0;
ID_FUNCTION_GRP_STATISTIC;
-U2S( HID_FUNC_KOVAR );
+U2S( HID_FUNC_COVARIANCE_S );
2; 0; 0;
0;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/helpids.h |2 ++
sc/source/ui/src/scfuncs.src |6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit fe0037e045036419b6c6b5fc979328d500dd4d08
Author: Eike Rathke
Date: Wed Oct 30 15:28:56 2013 +0100
using dbgutil builds is good for you (TM)
Init of function description resources displayed
"Class: 272, Id: 412. Classpointer not at the end!"
that was due to resource SC_OPCODE_WEBSERVICE having an extraneous
parameter flag in ExtraData that wasn't read because the function has 1
and not 2 parameters.
Additionally added HID_FUNC_FILTERXML and HID_FUNC_WEBSERVICE where the
resources used a copy&paste HID_FUNC_BITLSHIFT instead.
Change-Id: Iaf5a860901d5e02581965a4b33cfc50c1a601b1f
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index f772fc7..648ff4f 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -676,5 +676,7 @@
#define HID_FUNC_BITXOR
"SC_HID_FUNC_BITXOR"
#define HID_FUNC_BITLSHIFT
"SC_HID_FUNC_BITLSHIFT"
#define HID_FUNC_BITRSHIFT
"SC_HID_FUNC_BITRSHIFT"
+#define HID_FUNC_FILTERXML
"SC_HID_FUNC_FILTERXML"
+#define HID_FUNC_WEBSERVICE
"SC_HID_FUNC_WEBSERVICE"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 11fdecb..8b8d2ca 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -9850,7 +9850,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
{
0;
ID_FUNCTION_GRP_TEXT;
-U2S( HID_FUNC_BITLSHIFT );
+U2S( HID_FUNC_FILTERXML );
2; 0; 0;
0;
};
@@ -9885,8 +9885,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
{
0;
ID_FUNCTION_GRP_TEXT;
-U2S( HID_FUNC_BITLSHIFT );
-1; 0; 0;
+U2S( HID_FUNC_WEBSERVICE );
+1; 0;
0;
};
String 2 // Name of Parameter 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/inc/frame.hxx |5 -
1 file changed, 5 deletions(-)
New commits:
commit a5f43ca3786298bc58c43f7b5dfdeba44f511d2d
Author: Tor Lillqvist
Date: Wed Oct 30 15:42:04 2013 +0200
Bin obsolete C30-only (some ancient Sun compiler) code
Change-Id: I8efa4de7c3348867274ee9d40a6e3b8ae0fb86f7
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 40e4f7f..5e91620 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -1012,13 +1012,8 @@ inline void SwFrm::InvalidateNextPos( sal_Bool bNoFtn )
{
if ( mpNext && !mpNext->IsSctFrm() )
mpNext->InvalidatePos();
-#ifndef C30 // maybe it works for C40?
else
ImplInvalidateNextPos( bNoFtn );
-#else
-if ( !mpNext )
-ImplInvalidateNextPos( bNoFtn );
-#endif
}
inline void SwFrm::Calc() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/shared
ios/shared/ios_sharedlo/objective_c/gestures/MLOGestureEngine.m |4
1 file changed, 4 insertions(+)
New commits:
commit 95f112d200db6ae61f7510ae95e3f0eaa60a8929
Author: Ptyl Dragon
Date: Wed Oct 30 15:41:21 2013 +0200
added stub for void touch_ui_selection_none in MLOGestureEngine
Change-Id: I45f957863dc26b2ef40bdfed04cb689325f5b170
Reviewed-on: https://gerrit.libreoffice.org/6492
Reviewed-by: Tor Lillqvist
Tested-by: Tor Lillqvist
diff --git a/ios/shared/ios_sharedlo/objective_c/gestures/MLOGestureEngine.m
b/ios/shared/ios_sharedlo/objective_c/gestures/MLOGestureEngine.m
index 3523dca..53d3c74 100644
--- a/ios/shared/ios_sharedlo/objective_c/gestures/MLOGestureEngine.m
+++ b/ios/shared/ios_sharedlo/objective_c/gestures/MLOGestureEngine.m
@@ -470,3 +470,7 @@ void touch_ui_selection_start(MLOSelectionKind kind,
rectangles[i].origin.y);
}
}
+
+void touch_ui_selection_none(){
+// STUB
+}
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/global.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2d326986605def918ec846458441d4a49550a141
Author: Eike Rathke
Date: Wed Oct 30 14:34:08 2013 +0100
real assert() to bail out on invalid index
... instead of displaying a message and then silently poking memory that
we don't own. Now that globstr.hrc is renumbered it makes sense to
prevent future inconsistencies.
Change-Id: I7458fbca4928b33fc7471820aeea7882a0f71e50
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index f6a376b..09b2c50 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -346,7 +346,7 @@ void ScGlobal::SetUserList( const ScUserList* pNewList )
const OUString& ScGlobal::GetRscString( sal_uInt16 nIndex )
{
-OSL_ENSURE( nIndex < SC_GLOBSTR_STR_COUNT, "ScGlobal::GetRscString -
invalid string index");
+assert( nIndex < SC_GLOBSTR_STR_COUNT);
if( !ppRscString[ nIndex ] )
{
OpCode eOp = ocNone;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/formulagroupcl.cxx | 37 +++
sc/source/core/opencl/opbase.cxx |2 -
sc/source/core/opencl/opbase.hxx | 11 ++---
3 files changed, 27 insertions(+), 23 deletions(-)
New commits:
commit 9c6d513fe77120c85858b4f3f3250c6c0a09bbf7
Author: Kohei Yoshida
Date: Wed Oct 30 09:29:24 2013 -0400
Let's use typedef for this.
Change-Id: If2523ee085285dc47d18fce425f784caa664d73e
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index c2802e8..94ab088 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -93,7 +93,7 @@ class ConstStringArgument: public DynamicKernelArgument
{
public:
ConstStringArgument(const std::string &s,
-boost::shared_ptr ft):
+FormulaTreeNodeRef ft):
DynamicKernelArgument(s, ft) {}
/// Generate declaration
virtual void GenDecl(std::stringstream &ss) const
@@ -151,7 +151,7 @@ class DynamicKernelConstantArgument: public
DynamicKernelArgument
{
public:
DynamicKernelConstantArgument(const std::string &s,
-boost::shared_ptr ft):
+FormulaTreeNodeRef ft):
DynamicKernelArgument(s, ft) {}
/// Generate declaration
virtual void GenDecl(std::stringstream &ss) const
@@ -195,7 +195,7 @@ class DynamicKernelStringArgument: public
DynamicKernelArgument
{
public:
DynamicKernelStringArgument(const std::string &s,
-boost::shared_ptr ft):
+FormulaTreeNodeRef ft):
DynamicKernelArgument(s, ft) {}
virtual void GenSlidingWindowFunction(std::stringstream &) {}
@@ -268,7 +268,7 @@ class DynamicKernelSlidingArgument: public Base
{
public:
DynamicKernelSlidingArgument(const std::string &s,
-boost::shared_ptr ft):
+FormulaTreeNodeRef ft):
Base(s, ft)
{
FormulaToken *t = ft->GetFormulaToken();
@@ -665,7 +665,7 @@ public:
typedef std::vector SubArgumentsType;
DynamicKernelSoPArguments(const std::string &s,
-boost::shared_ptr ft);
+FormulaTreeNodeRef ft);
/// Create buffer and pass the buffer to a given kernel
virtual size_t Marshal(cl_kernel k, int argno, int nVectorWidth)
@@ -766,7 +766,7 @@ private:
template
boost::shared_ptr SoPHelper(const std::string &ts,
-boost::shared_ptr ft)
+FormulaTreeNodeRef ft)
{
return boost::shared_ptr(
new DynamicKernelSoPArguments(ts, ft));
@@ -774,7 +774,7 @@ boost::shared_ptr SoPHelper(const
std::string &ts,
template
DynamicKernelSoPArguments::DynamicKernelSoPArguments(const std::string &s,
-boost::shared_ptr ft):
+FormulaTreeNodeRef ft):
DynamicKernelArgument(s, ft) {
size_t nChildren = ft->Children.size();
@@ -1113,7 +1113,7 @@ public:
typedef std::list< boost::shared_ptr > ArgumentList;
SymbolTable(void):mCurId(0) {}
template
-const DynamicKernelArgument
*DeclRefArg(boost::shared_ptr);
+const DynamicKernelArgument *DeclRefArg(FormulaTreeNodeRef);
/// Used to generate sliding window helpers
void DumpSlidingWindowFunctions(std::stringstream &ss)
{
@@ -1144,7 +1144,7 @@ void SymbolTable::Marshal(cl_kernel k, int nVectorWidth)
/// Code generation
class DynamicKernel {
public:
-DynamicKernel(boost::shared_ptr r):mpRoot(r),
+DynamicKernel(FormulaTreeNodeRef r):mpRoot(r),
mpProgram(NULL), mpKernel(NULL), mpResClmem(NULL) {}
/// Code generation in OpenCL
void CodeGen() {
@@ -1227,8 +1227,8 @@ public:
~DynamicKernel();
cl_mem GetResultBuffer(void) const { return mpResClmem; }
private:
-void TraverseAST(boost::shared_ptr);
-boost::shared_ptr mpRoot;
+void TraverseAST(FormulaTreeNodeRef);
+FormulaTreeNodeRef mpRoot;
SymbolTable mSyms;
std::string mKernelSignature, mKernelHash;
std::string mFullProgramSrc;
@@ -1289,7 +1289,7 @@ void DynamicKernel::CreateKernel(void)
// The template argument T must be a subclass of DynamicKernelArgument
template
const DynamicKernelArgument *SymbolTable::DeclRefArg(
- boost::shared_ptr t)
+ FormulaTreeNodeRef t)
{
FormulaToken *ref = t->GetFormulaToken();
ArgumentMap::iterator it = mSymbols.find(ref);
@@ -1350,15 +1350,15 @@ bool FormulaGroupInterpreterOpenCL::interpret(
ScDocument& rDoc,
// Constructing "AST"
FormulaTokenIterator aCode = rCode;
std::list list;
-std::map > m_hash_map;
+std::map m_hash_map;
FormulaToken* pCur;
while( (pCur = (FormulaToken*)(aCode.Next()) ) != NULL)
{
OpCode eOp = pCur->GetOpCode();
if ( eOp != ocPush )
{
-boost::shared_ptr m_currNode =
- boost::shared_ptr(new FormulaTreeNode(pCur));
+FormulaTreeNodeRef m_currNode =
+ FormulaTreeNodeRef(new FormulaTreeNode(pCur));
sal_uInt8 m_ParamCount = pCu
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - sc/source
sc/source/core/opencl/formulagroupcl.cxx | 37 +++
sc/source/core/opencl/opbase.cxx |2 -
sc/source/core/opencl/opbase.hxx | 11 ++---
3 files changed, 27 insertions(+), 23 deletions(-)
New commits:
commit 4a72c7e47639688875761eb633cdf2bd60825353
Author: Kohei Yoshida
Date: Wed Oct 30 09:29:24 2013 -0400
Let's use typedef for this.
Change-Id: If2523ee085285dc47d18fce425f784caa664d73e
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index a3b21a9..b583e7c 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -93,7 +93,7 @@ class ConstStringArgument: public DynamicKernelArgument
{
public:
ConstStringArgument(const std::string &s,
-boost::shared_ptr ft):
+FormulaTreeNodeRef ft):
DynamicKernelArgument(s, ft) {}
/// Generate declaration
virtual void GenDecl(std::stringstream &ss) const
@@ -151,7 +151,7 @@ class DynamicKernelConstantArgument: public
DynamicKernelArgument
{
public:
DynamicKernelConstantArgument(const std::string &s,
-boost::shared_ptr ft):
+FormulaTreeNodeRef ft):
DynamicKernelArgument(s, ft) {}
/// Generate declaration
virtual void GenDecl(std::stringstream &ss) const
@@ -195,7 +195,7 @@ class DynamicKernelStringArgument: public
DynamicKernelArgument
{
public:
DynamicKernelStringArgument(const std::string &s,
-boost::shared_ptr ft):
+FormulaTreeNodeRef ft):
DynamicKernelArgument(s, ft) {}
virtual void GenSlidingWindowFunction(std::stringstream &) {}
@@ -268,7 +268,7 @@ class DynamicKernelSlidingArgument: public Base
{
public:
DynamicKernelSlidingArgument(const std::string &s,
-boost::shared_ptr ft):
+FormulaTreeNodeRef ft):
Base(s, ft)
{
FormulaToken *t = ft->GetFormulaToken();
@@ -665,7 +665,7 @@ public:
typedef std::vector SubArgumentsType;
DynamicKernelSoPArguments(const std::string &s,
-boost::shared_ptr ft);
+FormulaTreeNodeRef ft);
/// Create buffer and pass the buffer to a given kernel
virtual size_t Marshal(cl_kernel k, int argno, int nVectorWidth)
@@ -766,7 +766,7 @@ private:
template
boost::shared_ptr SoPHelper(const std::string &ts,
-boost::shared_ptr ft)
+FormulaTreeNodeRef ft)
{
return boost::shared_ptr(
new DynamicKernelSoPArguments(ts, ft));
@@ -774,7 +774,7 @@ boost::shared_ptr SoPHelper(const
std::string &ts,
template
DynamicKernelSoPArguments::DynamicKernelSoPArguments(const std::string &s,
-boost::shared_ptr ft):
+FormulaTreeNodeRef ft):
DynamicKernelArgument(s, ft) {
size_t nChildren = ft->Children.size();
@@ -1113,7 +1113,7 @@ public:
typedef std::list< boost::shared_ptr > ArgumentList;
SymbolTable(void):mCurId(0) {}
template
-const DynamicKernelArgument
*DeclRefArg(boost::shared_ptr);
+const DynamicKernelArgument *DeclRefArg(FormulaTreeNodeRef);
/// Used to generate sliding window helpers
void DumpSlidingWindowFunctions(std::stringstream &ss)
{
@@ -1144,7 +1144,7 @@ void SymbolTable::Marshal(cl_kernel k, int nVectorWidth)
/// Code generation
class DynamicKernel {
public:
-DynamicKernel(boost::shared_ptr r):mpRoot(r),
+DynamicKernel(FormulaTreeNodeRef r):mpRoot(r),
mpProgram(NULL), mpKernel(NULL), mpResClmem(NULL) {}
/// Code generation in OpenCL
std::string CodeGen() {
@@ -1228,8 +1228,8 @@ public:
~DynamicKernel();
cl_mem GetResultBuffer(void) const { return mpResClmem; }
private:
-void TraverseAST(boost::shared_ptr);
-boost::shared_ptr mpRoot;
+void TraverseAST(FormulaTreeNodeRef);
+FormulaTreeNodeRef mpRoot;
SymbolTable mSyms;
std::string mKernelSignature, mKernelHash;
std::string mFullProgramSrc;
@@ -1290,7 +1290,7 @@ void DynamicKernel::CreateKernel(void)
// The template argument T must be a subclass of DynamicKernelArgument
template
const DynamicKernelArgument *SymbolTable::DeclRefArg(
- boost::shared_ptr t)
+ FormulaTreeNodeRef t)
{
FormulaToken *ref = t->GetFormulaToken();
ArgumentMap::iterator it = mSymbols.find(ref);
@@ -1351,15 +1351,15 @@ bool FormulaGroupInterpreterOpenCL::interpret(
ScDocument& rDoc,
// Constructing "AST"
FormulaTokenIterator aCode = rCode;
std::list list;
-std::map > m_hash_map;
+std::map m_hash_map;
FormulaToken* pCur;
while( (pCur = (FormulaToken*)(aCode.Next()) ) != NULL)
{
OpCode eOp = pCur->GetOpCode();
if ( eOp != ocPush )
{
-boost::shared_ptr m_currNode =
- boost::shared_ptr(new FormulaTreeNode(pCur));
+FormulaTreeNodeRef m_currNode =
+ FormulaTreeNodeRef(new FormulaTreeNode(pCur));
sal_uInt8 m_ParamCount
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - curl/ExternalProject_curl.mk
curl/ExternalProject_curl.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 9c677750f17798bec98a3553f73f9898d6aab8c6 Author: Michael Stahl Date: Wed Oct 30 13:06:25 2013 +0100 curl: set the right RPATH too Change-Id: I409bb44541748ad69b5087243f4ea8142e424fe0 (cherry picked from commit 07a31ccc02f3553f1be3e8bb5ff67e6e6f7ce016) Reviewed-on: https://gerrit.libreoffice.org/6489 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna diff --git a/curl/ExternalProject_curl.mk b/curl/ExternalProject_curl.mk index 23dce11..142a782 100644 --- a/curl/ExternalProject_curl.mk +++ b/curl/ExternalProject_curl.mk @@ -21,7 +21,7 @@ $(eval $(call gb_ExternalProject_register_targets,curl,\ ifneq ($(OS),WNT) curl_CPPFLAGS := -curl_LDFLAGS := +curl_LDFLAGS := $(if $(filter LINUX FREEBSD,$(OS)),"-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) ifneq ($(SYSBASE),) curl_CPPFLAGS += -I$(SYSBASE)/usr/include @@ -36,7 +36,7 @@ endif $(call gb_ExternalProject_get_state_target,curl,build): $(call gb_ExternalProject_run,build,\ CPPFLAGS="$(curl_CPPFLAGS)" \ - LDFLAGS="$(curl_LDFLAGS)" \ + LDFLAGS=$(curl_LDFLAGS) \ ./configure \ --with-nss$(if $(filter NO,$(SYSTEM_NSS)),="$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out") \ --without-ssl \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/util
sc/inc/globstr.hrc | 1144 +++ sc/util/number-defines-consecutively.awk | 49 + 2 files changed, 624 insertions(+), 569 deletions(-) New commits: commit 01c2853b581b59f35206cfbefebb325427eecd35 Author: Eike Rathke Date: Wed Oct 30 14:10:07 2013 +0100 renumbered string ID defines consecutively to close gaps ... and shrink the resident array a little. Also included the awk script that does this. Change-Id: I47ab6d9d49d229dcffeef1a684f5c6fa836f91d0 diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc index 25a5a01..f02ef51 100644 --- a/sc/inc/globstr.hrc +++ b/sc/inc/globstr.hrc @@ -28,6 +28,12 @@ * other string IDs of strings used in message boxes and elsewhere go into * sc/inc/sc.hrc if they need to be global, or if restricted to UI dialogs into * a proper sc/source/ui/xxx/yyy.hrc and corresponding .src PLEASE! + * + * When inserting or removing defines the entire file can be renumbered using + * sc/util/number-defines-consecutively.awk + * Hint: when inserting a define use some arbitrary large enough number such as + * and then renumber the file, which you HAVE TO then since otherwise the + * number would be greater than the count of resident strings. */ #define STR_UNDO_DELETECELLS1 @@ -69,626 +75,626 @@ #define STR_UNDO_IMPORTDATA 37 #define STR_UNDO_REPEATDB 38 -#define STR_MSSG_DOSUBTOTALS_0 40 -#define STR_MSSG_DOSUBTOTALS_1 41 -#define STR_MSSG_DOSUBTOTALS_2 42 -#define STR_MSSG_REPEATDB_0 43 -#define STR_MSSG_MAKEAUTOFILTER_0 44 -#define STR_MSSG_IMPORTDATA_0 45 -#define STR_MSSG_MAKEOUTLINE_0 46 -#define STR_MSSG_REMOVEOUTLINE_047 -#define STR_MSSG_PASTEFROMCLIP_048 -#define STR_MSSG_PASTEFROMCLIP_149 -#define STR_MSSG_MOVEBLOCKTO_0 50 -#define STR_MSSG_INSERTCELLS_0 52 -#define STR_MSSG_DELETECELLS_0 53 -#define STR_MSSG_MERGECELLS_0 54 -#define STR_MSSG_SEARCHANDREPLACE_0 55 -#define STR_MSSG_SOLVE_056 -#define STR_MSSG_SOLVE_157 -#define STR_MSSG_SOLVE_258 -#define STR_MSSG_SOLVE_359 -#define STR_MSSG_SOLVE_460 - -#define STR_TABLE_GESAMTERGEBNIS64 -#define STR_TABLE_ERGEBNIS 65 -#define STR_UNDO_SPELLING 66 -#define STR_TABLE_UND 67 -#define STR_TABLE_ODER 68 -#define STR_UNDO_INSERTCELLS69 -#define STR_TABLE_DEF 70 -#define STR_MOVE_TO_END 72 -#define STR_BOX_YNI 73 -#define STR_NO_REF_TABLE74 - -#define STR_PIVOTFUNC_SUM 75 // pivot.cxx -#define STR_PIVOTFUNC_COUNT 76 -#define STR_PIVOTFUNC_AVG 77 -#define STR_PIVOTFUNC_MAX 78 -#define STR_PIVOTFUNC_MIN 79 -#define STR_PIVOTFUNC_PROD 80 -#define STR_PIVOTFUNC_COUNT290 -#define STR_PIVOTFUNC_STDDEV91 -#define STR_PIVOTFUNC_STDDEV2 92 -#define STR_PIVOTFUNC_VAR 93 -#define STR_PIVOTFUNC_VAR2 94 -#define STR_PIVOT_TOTAL 95 -#define STR_PIVOT_DATA 96 - -#define STR_PIVOT_INVALID_DBAREA97 // tabvwsh3.cxx - -#define STR_TABLE 98 -#define STR_COLUMN 99 -#define STR_ROW 100 -#define STR_LOAD_DOC101 -#define STR_SAVE_DOC102 - -#define STR_ERR_INVALID_TABREF 103 -#define STR_AREA_ALREADY_INSERTED 104 -#define STR_INVALID_TABREF 105 -#define STR_INVALID_QUERYAREA 106 - -#define STR_REIMPORT_EMPTY 107 -#define STR_NOMULTISELECT 108 -#define STR_FILL_SERIES_PROGRESS109 // documen3.cxx - -#define STR_UNKNOWN_FILTER 110 - -#define STR_DATABASE_NOTFOUND 111 -#define STR_DATABASE_ABORTED112 - -#define STR_UNDO_PRINTRANGES113 - -#define STR_UNDO_DEC_INDENT 114 -#define STR_UNDO_INC_INDENT 115 -#define STR_UNDO_THESAURUS 116 - -#define STR_FILL_TAB117 -#define STR_NO_VALUE118 /* moved to compiler.src, keep define! */ -#define STR_UPDATE_SCENARIO 119 -#define STR_ERR_NEWSCENARIO 120 -#define STR_SCENARIO121 -#define STR_PIVOT_TABLE 122 -#define STR_NEWTABNAMENOTUNIQUE 123 - -#define STR_FUN_TEXT_SUM124 -#define STR_FUN_TEXT_COUNT 125 -#define STR_FUN_TEXT_AVG126 -#define STR_FUN_TEXT_MAX127 -#define STR_FUN_TEXT_MIN128 -#define STR_FUN_TEXT_PRODUCT129 -#define STR_FUN_TEXT_STDDEV 130 -#define STR_FUN_TEXT_VAR131 -#define STR_DOC_STAT132 - -#define STR_DBNAME_IMPORT 134 - -#define STR_NOCHARTATCURSOR 135 -#define STR_NOAREASELECTED 136 -#define STR_INVALIDTABNAME 137 - -#define STR_PIVOT_NOTFOUND 138 -#define STR_ERROR_STR 139 -#define STR_NV_STR
[Libreoffice-commits] core.git: 2 commits - sc/qa
dev/null|binary sc/qa/unit/data/ods/opencl/compiler/ineq.ods|binary sc/qa/unit/data/ods/opencl/compiler/nested.ods |binary sc/qa/unit/data/ods/opencl/compiler/string.ods |binary sc/qa/unit/data/ods/opencl/math/csc.ods |binary sc/qa/unit/data/ods/opencl/statistical/Correl.ods |binary sc/qa/unit/data/xls/opencl/financial/Accrintm.xls |binary sc/qa/unit/data/xls/opencl/financial/Coupdaybs.xls |binary sc/qa/unit/data/xls/opencl/financial/Coupdays.xls |binary sc/qa/unit/data/xls/opencl/financial/Coupdaysnc.xls |binary sc/qa/unit/data/xls/opencl/financial/Cumipmt.xls|binary sc/qa/unit/data/xls/opencl/financial/Cumprinc.xls |binary sc/qa/unit/data/xls/opencl/financial/DISC.xls |binary sc/qa/unit/data/xls/opencl/financial/Dollarde.xls |binary sc/qa/unit/data/xls/opencl/financial/Dollarfr.xls |binary sc/qa/unit/data/xls/opencl/financial/EFFECT_ADD.xls |binary sc/qa/unit/data/xls/opencl/financial/Fvschedule.xls |binary sc/qa/unit/data/xls/opencl/financial/INTRATE.xls|binary sc/qa/unit/data/xls/opencl/financial/IRR.xls|binary sc/qa/unit/data/xls/opencl/financial/MIRR.xls |binary sc/qa/unit/data/xls/opencl/financial/Nominal.xls|binary sc/qa/unit/data/xls/opencl/financial/PriceMat.xls |binary sc/qa/unit/data/xls/opencl/financial/RATE.xls |binary sc/qa/unit/data/xls/opencl/financial/RRI.xls|binary sc/qa/unit/data/xls/opencl/financial/Received.xls |binary sc/qa/unit/data/xls/opencl/financial/SLN.xls|binary sc/qa/unit/data/xls/opencl/financial/SYD.xls|binary sc/qa/unit/data/xls/opencl/financial/TBILLEQ.xls|binary sc/qa/unit/data/xls/opencl/financial/TBILLPRICE.xls |binary sc/qa/unit/data/xls/opencl/financial/TBILLYIELD.xls |binary sc/qa/unit/data/xls/opencl/financial/XNPV.xls |binary sc/qa/unit/data/xls/opencl/financial/YIELD.xls |binary sc/qa/unit/data/xls/opencl/financial/YIELDDISC.xls |binary sc/qa/unit/data/xls/opencl/financial/YIELDMAT.xls |binary sc/qa/unit/data/xls/opencl/financial/general.xls|binary sc/qa/unit/data/xls/opencl/math/cos.xls |binary sc/qa/unit/data/xls/opencl/statistical/Fisher.xls |binary sc/qa/unit/data/xls/opencl/statistical/FisherInv.xls|binary sc/qa/unit/data/xls/opencl/statistical/Gamma.xls|binary sc/qa/unit/data/xls/opencl/statistical/GammaLn.xls |binary sc/qa/unit/data/xls/opencl/statistical/Gauss.xls|binary sc/qa/unit/data/xls/opencl/statistical/GeoMean.xls |binary sc/qa/unit/data/xls/opencl/statistical/HarMean.xls |binary sc/qa/unit/data/xls/opencl/statistical/Negbinomdist.xls |binary sc/qa/unit/data/xls/opencl/statistical/Pearson.xls |binary sc/qa/unit/data/xls/opencl/statistical/Rsq.xls |binary sc/qa/unit/opencl-test.cxx | 188 47 files changed, 97 insertions(+), 91 deletions(-) New commits: commit 5655b8ede2a5386b9d24d266ae08172a60b04618 Author: Kohei Yoshida Date: Wed Oct 30 09:12:09 2013 -0400 Lower-case directory names, and rename to just 'opencl'. Change-Id: I412298c73586c347d88f08bad0357a8142df3f63 diff --git a/sc/qa/unit/data/ods/OpenCLTests/Compiler/ineq.ods b/sc/qa/unit/data/ods/opencl/compiler/ineq.ods similarity index 100% rename from sc/qa/unit/data/ods/OpenCLTests/Compiler/ineq.ods rename to sc/qa/unit/data/ods/opencl/compiler/ineq.ods diff --git a/sc/qa/unit/data/ods/OpenCLTests/Compiler/nested.ods b/sc/qa/unit/data/ods/opencl/compiler/nested.ods similarity index 100% rename from sc/qa/unit/data/ods/OpenCLTests/Compiler/nested.ods rename to sc/qa/unit/data/ods/opencl/compiler/nested.ods diff --git a/sc/qa/unit/data/ods/OpenCLTests/Compiler/string.ods b/sc/qa/unit/data/ods/opencl/compiler/string.ods similarity index 100% rename from sc/qa/unit/data/ods/OpenCLTests/Compiler/string.ods rename to sc/qa/unit/data/ods/opencl/compiler/string.ods diff --git a/sc/qa/unit/data/ods/OpenCLTests/math/csc.ods b/sc/qa/unit/data/ods/opencl/math/csc.ods similarity index 100% rename from sc/qa/unit/data/ods/OpenCLTests/math/csc.ods rename to sc/qa/unit/data/ods/opencl/math/csc.ods diff --git a/sc/qa/unit/data/ods/OpenCLTests/statistical/Correl.ods b/sc/qa/unit/data/ods/opencl/statistical/Correl.ods similarity index 100% rename from sc/qa/unit/data/ods/OpenCLTests/statistical/Correl.ods rename to sc/qa/unit/data/ods/opencl/statistical/Correl.ods diff --git a/sc/qa/unit/data/xls/OpenclCase/financial/Accrintm.xls b/sc/qa/unit/data/xls/opencl/financial/Accrintm.xls similarity index 100% rename from sc/qa/unit/data/xls/OpenclCase/financial/Accrintm.xls rename to sc/qa/unit/data/xls/opencl/financial/Accrintm.xls diff --git a/sc/qa/unit/data/xls/OpenclCase/financial/Coupdaybs.xls b/sc/qa/unit/data/xls/o
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - 2 commits - sc/qa
dev/null|binary sc/qa/unit/data/ods/opencl/compiler/ineq.ods|binary sc/qa/unit/data/ods/opencl/compiler/nested.ods |binary sc/qa/unit/data/ods/opencl/compiler/string.ods |binary sc/qa/unit/data/ods/opencl/math/csc.ods |binary sc/qa/unit/data/ods/opencl/statistical/Correl.ods |binary sc/qa/unit/data/xls/opencl/financial/Accrintm.xls |binary sc/qa/unit/data/xls/opencl/financial/Coupdaybs.xls |binary sc/qa/unit/data/xls/opencl/financial/Coupdays.xls |binary sc/qa/unit/data/xls/opencl/financial/Coupdaysnc.xls |binary sc/qa/unit/data/xls/opencl/financial/Cumipmt.xls|binary sc/qa/unit/data/xls/opencl/financial/Cumprinc.xls |binary sc/qa/unit/data/xls/opencl/financial/DISC.xls |binary sc/qa/unit/data/xls/opencl/financial/Dollarde.xls |binary sc/qa/unit/data/xls/opencl/financial/Dollarfr.xls |binary sc/qa/unit/data/xls/opencl/financial/EFFECT_ADD.xls |binary sc/qa/unit/data/xls/opencl/financial/Fvschedule.xls |binary sc/qa/unit/data/xls/opencl/financial/INTRATE.xls|binary sc/qa/unit/data/xls/opencl/financial/IRR.xls|binary sc/qa/unit/data/xls/opencl/financial/MIRR.xls |binary sc/qa/unit/data/xls/opencl/financial/Nominal.xls|binary sc/qa/unit/data/xls/opencl/financial/PriceMat.xls |binary sc/qa/unit/data/xls/opencl/financial/RATE.xls |binary sc/qa/unit/data/xls/opencl/financial/RRI.xls|binary sc/qa/unit/data/xls/opencl/financial/Received.xls |binary sc/qa/unit/data/xls/opencl/financial/SLN.xls|binary sc/qa/unit/data/xls/opencl/financial/SYD.xls|binary sc/qa/unit/data/xls/opencl/financial/TBILLEQ.xls|binary sc/qa/unit/data/xls/opencl/financial/TBILLPRICE.xls |binary sc/qa/unit/data/xls/opencl/financial/TBILLYIELD.xls |binary sc/qa/unit/data/xls/opencl/financial/XNPV.xls |binary sc/qa/unit/data/xls/opencl/financial/YIELD.xls |binary sc/qa/unit/data/xls/opencl/financial/YIELDDISC.xls |binary sc/qa/unit/data/xls/opencl/financial/YIELDMAT.xls |binary sc/qa/unit/data/xls/opencl/financial/general.xls|binary sc/qa/unit/data/xls/opencl/math/cos.xls |binary sc/qa/unit/data/xls/opencl/statistical/Fisher.xls |binary sc/qa/unit/data/xls/opencl/statistical/FisherInv.xls|binary sc/qa/unit/data/xls/opencl/statistical/Gamma.xls|binary sc/qa/unit/data/xls/opencl/statistical/GammaLn.xls |binary sc/qa/unit/data/xls/opencl/statistical/Gauss.xls|binary sc/qa/unit/data/xls/opencl/statistical/GeoMean.xls |binary sc/qa/unit/data/xls/opencl/statistical/HarMean.xls |binary sc/qa/unit/data/xls/opencl/statistical/Negbinomdist.xls |binary sc/qa/unit/data/xls/opencl/statistical/Pearson.xls |binary sc/qa/unit/data/xls/opencl/statistical/Rsq.xls |binary sc/qa/unit/opencl-test.cxx | 188 47 files changed, 97 insertions(+), 91 deletions(-) New commits: commit 2af21e2357eb555b3baeefee92e0d433f61c74a5 Author: Kohei Yoshida Date: Wed Oct 30 09:12:09 2013 -0400 Lower-case directory names, and rename to just 'opencl'. Change-Id: I412298c73586c347d88f08bad0357a8142df3f63 diff --git a/sc/qa/unit/data/ods/OpenCLTests/Compiler/ineq.ods b/sc/qa/unit/data/ods/opencl/compiler/ineq.ods similarity index 100% rename from sc/qa/unit/data/ods/OpenCLTests/Compiler/ineq.ods rename to sc/qa/unit/data/ods/opencl/compiler/ineq.ods diff --git a/sc/qa/unit/data/ods/OpenCLTests/Compiler/nested.ods b/sc/qa/unit/data/ods/opencl/compiler/nested.ods similarity index 100% rename from sc/qa/unit/data/ods/OpenCLTests/Compiler/nested.ods rename to sc/qa/unit/data/ods/opencl/compiler/nested.ods diff --git a/sc/qa/unit/data/ods/OpenCLTests/Compiler/string.ods b/sc/qa/unit/data/ods/opencl/compiler/string.ods similarity index 100% rename from sc/qa/unit/data/ods/OpenCLTests/Compiler/string.ods rename to sc/qa/unit/data/ods/opencl/compiler/string.ods diff --git a/sc/qa/unit/data/ods/OpenCLTests/math/csc.ods b/sc/qa/unit/data/ods/opencl/math/csc.ods similarity index 100% rename from sc/qa/unit/data/ods/OpenCLTests/math/csc.ods rename to sc/qa/unit/data/ods/opencl/math/csc.ods diff --git a/sc/qa/unit/data/ods/OpenCLTests/statistical/Correl.ods b/sc/qa/unit/data/ods/opencl/statistical/Correl.ods similarity index 100% rename from sc/qa/unit/data/ods/OpenCLTests/statistical/Correl.ods rename to sc/qa/unit/data/ods/opencl/statistical/Correl.ods diff --git a/sc/qa/unit/data/xls/OpenclCase/financial/Accrintm.xls b/sc/qa/unit/data/xls/opencl/financial/Accrintm.xls similarity index 100% rename from sc/qa/unit/data/xls/OpenclCase/financial/Accrintm.xls rename to sc/qa/unit/data/xls/opencl/financial/Accrintm.xls diff --git a/sc/qa/unit/data/xls/OpenclCase/financial/Coupdaybs.xls b/sc/qa/unit/data/xls/o
Re: Failing ucb test, due to nss changes
On 30/10/13 09:48, Miklos Vajna wrote: > A few days ago, JunitTest_ucb_complex started to fail here and it keeps > doing so, so I wanted to have a look. > > So a dlopen failed, but no idea why, not seeing dlerror output. > Re-running as > > SAL_LOG=+INFO.sal.osl make -sr JunitTest_ucb_complex > > gives quite some output, the relevant ones seems to be: > > > info:sal.osl:32142:7:sal/osl/unx/module.cxx:168: > dlopen(/home/vmiklos/git/libreoffice/master/instdir/unxlngx6/program/../program/libucpftp1.so, > 257): > /home/vmiklos/git/libreoffice/master/instdir/unxlngx6/program/libnssutil3.so: > version `NSSUTIL_3.15' not found (required by /usr/lib64/libssl3.so) > info:sal.osl:32142:7:sal/osl/unx/module.cxx:168: > dlopen(/home/vmiklos/git/libreoffice/master/instdir/unxlngx6/program/../program/libucpftp1.so, > 257): > /home/vmiklos/git/libreoffice/master/instdir/unxlngx6/program/libnssutil3.so: > version `NSSUTIL_3.15' not found (required by /usr/lib64/libssl3.so) > info:sal.osl:32142:7:sal/osl/unx/module.cxx:168: > dlopen(/home/vmiklos/git/libreoffice/master/instdir/unxlngx6/program/../program/libucpftp1.so, > 257): > /home/vmiklos/git/libreoffice/master/instdir/unxlngx6/program/libnssutil3.so: > version `NSSUTIL_3.15' not found (required by /usr/lib64/libssl3.so) > > > To me, it seems that after your nss changes > (7f614ac933524d798724895827b255b0d36dcc6b and previous 'nss:' commits), > instdir/unxlngx6/program/libnssutil3.so doesn't pick up the libssl3.so > from instdir, but from the system, and there it fails. (System has 3.15, > we bundle 3.13.) > > Do you have any idea what can cause that? problem is that libcurl.so.4 has no RPATH. before 30e1d4c0a9202d5c8057efdb0bfda11f46a25251 the libcurl.so.4 was not actually used because the wrong file was copied; now it's the right file but due to missing rpath it doesn't find its libs... fixed in 07a31ccc02f3553f1be3e8bb5ff67e6e6f7ce016 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/curl
external/curl/ExternalProject_curl.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 07a31ccc02f3553f1be3e8bb5ff67e6e6f7ce016 Author: Michael Stahl Date: Wed Oct 30 13:06:25 2013 +0100 curl: set the right RPATH too Change-Id: I409bb44541748ad69b5087243f4ea8142e424fe0 diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index 23dce11..142a782 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -21,7 +21,7 @@ $(eval $(call gb_ExternalProject_register_targets,curl,\ ifneq ($(OS),WNT) curl_CPPFLAGS := -curl_LDFLAGS := +curl_LDFLAGS := $(if $(filter LINUX FREEBSD,$(OS)),"-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) ifneq ($(SYSBASE),) curl_CPPFLAGS += -I$(SYSBASE)/usr/include @@ -36,7 +36,7 @@ endif $(call gb_ExternalProject_get_state_target,curl,build): $(call gb_ExternalProject_run,build,\ CPPFLAGS="$(curl_CPPFLAGS)" \ - LDFLAGS="$(curl_LDFLAGS)" \ + LDFLAGS=$(curl_LDFLAGS) \ ./configure \ --with-nss$(if $(filter NO,$(SYSTEM_NSS)),="$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out") \ --without-ssl \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - 2 commits - ios/shared sw/source
ios/shared/ios_sharedlo/cxx/mlo_uno.h
|4
ios/shared/ios_sharedlo/cxx/mlo_uno.mm
| 307 +-
ios/shared/ios_sharedlo/objective_c/view_controllers/scroller/MLOScrollerData.m
|2
ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
|3
sw/source/core/view/viewsh.cxx
|5
5 files changed, 169 insertions(+), 152 deletions(-)
New commits:
commit fafadd775696afd5dbed22fcfe37c7ea599fd40d
Author: Ptyl Dragon
Date: Wed Oct 30 13:33:13 2013 +0200
1st implementation of touch_lo_get_content_size
Change-Id: I8b72c4366b502a71f2ed3bf917296c9553364d83
diff --git
a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
index 82a970f..f709fc4 100644
---
a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
+++
b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
@@ -59,6 +59,9 @@
self.tester.params.tileHeight);
CGContextRestoreGState(context);
+
+MLOContentSize size = touch_lo_get_content_size();
+NSLog(@"MLOContentSize: width=%lld, height=%lld",size.width, size.height);
}
@end
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 1df00fed..420715a 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1823,6 +1823,11 @@ MLOContentSize touch_lo_get_content_size()
SwWrtShell *pViewShell = GetActiveWrtShell();
if (pViewShell)
{
+static const long WIDTH_ADDITION = 6L * DOCUMENTBORDER;
+static const long HEIGHT_ADDITION = 2L * DOCUMENTBORDER;
+Size documentSize =pViewShell->GetView().GetDocSz();
+return MLOContentSizeMake(documentSize.Width() + WIDTH_ADDITION,
+ documentSize.Height() + HEIGHT_ADDITION);
}
return MLOContentSizeMake(0,0);
}
commit ab15ab1d7776349dce9f34f1a7c17612b90c6cbf
Author: Ptyl Dragon
Date: Wed Oct 30 13:02:38 2013 +0200
refactored mlo_uno to be in lo C++ conventions
Change-Id: I908902e6b9224b90c196a7f39b573e07b4928250
diff --git a/ios/shared/ios_sharedlo/cxx/mlo_uno.h
b/ios/shared/ios_sharedlo/cxx/mlo_uno.h
index df53190..c1e499c 100644
--- a/ios/shared/ios_sharedlo/cxx/mlo_uno.h
+++ b/ios/shared/ios_sharedlo/cxx/mlo_uno.h
@@ -14,11 +14,13 @@ extern "C" {
#endif
typedef enum {MARK_ALL,MARK_FIRST,MARK_NEXT,MARK_PREVIOUS}
MLOFindSelectionType;
+typedef enum {LAST_PAGE,CURRENT_PAGE} MLOGetPageType;
BOOL mlo_is_document_open(void);
BOOL mlo_open_file(NSString * file);
void mlo_close(void);
-long mlo_get_pages(BOOL last);
+long mlo_get_page_count(void);
+long mlo_get_current_page(void);
int mlo_find(NSString * toSearch,MLOFindSelectionType type);
void mlo_get_selection(NSMutableString * mutableString);
void mlo_fetch_view_data(NSMutableString * mutableString);
diff --git a/ios/shared/ios_sharedlo/cxx/mlo_uno.mm
b/ios/shared/ios_sharedlo/cxx/mlo_uno.mm
index 49a4fac..2107324 100644
--- a/ios/shared/ios_sharedlo/cxx/mlo_uno.mm
+++ b/ios/shared/ios_sharedlo/cxx/mlo_uno.mm
@@ -92,132 +92,136 @@ rtl::OUString lastSearch;
/// functions
-Reference< XComponentContext > getXComponentContext(){
-if(!openedComponentContext.get()){
+Reference< XComponentContext > getXComponentContext()
+{
+if(!openedComponentContext.get())
+{
openedComponentContext.set(cppu::defaultBootstrap_InitialComponentContext());
-
LOG_EVAL(openedComponentContext,@"XComponentContext");
}
return openedComponentContext;
}
-Reference getXComponentFactory(){
-if(!openedXComponentFactory.get()){
+Reference getXComponentFactory()
+{
+if(!openedXComponentFactory.get())
+{
openedXComponentFactory.set(getXComponentContext()->getServiceManager());
-
LOG_EVAL(openedXComponentFactory,@"XMultiComponentContext");
}
-
return openedXComponentFactory;
}
-Reference getXDesktop(){
-if(!openedXDesktop.get()){
-
+Reference getXDesktop()
+{
+if(!openedXDesktop.get())
+{
openedXDesktop.set(getXComponentFactory()->createInstanceWithContext (
OU("com.sun.star.frame.Desktop"), getXComponentContext()));
-
LOG_EVAL(openedXDesktop, @"XDesktop");
}
-
return openedXDesktop;
}
-Reference getXComponentLoader(){
-if(!openedXComponentLoader.get()){
+Reference getXComponentLoader()
+{
+if(!openedXComponentLoader.get())
+{
openedXComponentLoader.set(Reference < XComponentLoader >(
Desktop::create(getXComponentContext(;
-
LOG_EVAL(openedXComponentLoader, @"XComponentLoader");
}
-
return ope
[Bug 71043] Use STACK lint tool to clean code ...
https://bugs.freedesktop.org/show_bug.cgi?id=71043 Michael Meeks changed: What|Removed |Added Whiteboard||EasyHack DifficultyBeginner ||SkillCpp TopicCleanup -- 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 71043] New: Use STACK lint tool to clean code ...
https://bugs.freedesktop.org/show_bug.cgi?id=71043 Priority: medium Bug ID: 71043 CC: libreoffice@lists.freedesktop.org Assignee: libreoffice-b...@lists.freedesktop.org Summary: Use STACK lint tool to clean code ... Severity: normal Classification: Unclassified OS: All Reporter: michael.me...@collabora.com Hardware: Other Status: NEW Version: 4.2.0.0.alpha0+ Master Component: Libreoffice Product: LibreOffice A paper was recently published on a new clang based lint tool to cleanup LibreOffice code; it would be ideal to compile run this tool on LibreOffice - I believe we'd need to use Clang to do that, and chew through the output: Paper: http://pdos.csail.mit.edu/~xi/papers/stack-sosp13.pdf Code: http://css.csail.mit.edu/stack/ Thanks ! -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/chart/SchXMLExport.cxx | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 9239dc026ae31d38e495c7031b1e55cab4aebe9a
Author: Vinaya Mandke
Date: Wed Oct 23 14:25:19 2013 +0530
Fix for Chart Series Names
For Docx files, the chart series names (labels)
were rendered incorrectly and hence exported incorrectly.
In place of the correct label, the series name
for next series was displayed.
Change-Id: I988571d76d9c706ac2f7693881198bb604ec3fa8
Change-Id: I52631bc62fce46a43298c284cb11c2e8916fabe3
Reviewed-on: https://gerrit.libreoffice.org/6350
Reviewed-by: Markus Mohrhard
Tested-by: Markus Mohrhard
diff --git a/xmloff/source/chart/SchXMLExport.cxx
b/xmloff/source/chart/SchXMLExport.cxx
index aa05e7b..533c873 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -2589,6 +2589,7 @@ void SchXMLExportHelper_Impl::exportSeries(
OUString aFirstXDomainRange;
OUString aFirstYDomainRange;
+bool modifyLabelRange = false;
std::vector< XMLPropertyState > aPropertyStates;
@@ -2734,11 +2735,17 @@ void SchXMLExportHelper_Impl::exportSeries(
// #i75297# allow empty series, export
empty range to have all ranges on import
mrExport.AddAttribute(
XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, OUString());
-if( xLabelSeq.is())
+if( xLabelSeq.is()) {
+OUString aRange =
xLabelSeq->getSourceRangeRepresentation();
+if ( nSeriesIdx == 0 &&
aRange.compareToAscii("label 1") == 0)
+modifyLabelRange = true;
+if (modifyLabelRange)
+aRange = OUString("label ") +
OUString::number(aRange.copy( OUString("label").getLength()).toInt32() - 1);
mrExport.AddAttribute(
XML_NAMESPACE_CHART, XML_LABEL_CELL_ADDRESS,
lcl_ConvertRange(
-
xLabelSeq->getSourceRangeRepresentation(),
+ aRange,
xNewDoc ));
+}
if( xLabelSeq.is() || xValuesSeq.is() )
aSeriesLabelValuesPair =
tLabelValuesDataPair( xLabelSeq, xValuesSeq );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/CppunitTest_chart2_import.mk chart2/qa
chart2/CppunitTest_chart2_import.mk | 13 ++
chart2/qa/extras/chart2import.cxx | 149 +-
chart2/qa/extras/charttest.hxx| 35 +++
chart2/qa/extras/data/doc/chart.doc |binary
chart2/qa/extras/data/odp/chart.odp |binary
chart2/qa/extras/data/ods/chart.ods |binary
chart2/qa/extras/data/odt/chart.odt |binary
chart2/qa/extras/data/ppt/chart.ppt |binary
chart2/qa/extras/data/pptx/chart.pptx |binary
chart2/qa/extras/data/xls/chart.xls |binary
chart2/qa/extras/data/xlsx/chart.xlsx |binary
11 files changed, 190 insertions(+), 7 deletions(-)
New commits:
commit ce85ba3e2e926f72084cef2f18343f5f09f03152
Author: Vinaya Mandke
Date: Wed Oct 30 16:36:25 2013 +0530
Unit tests for Chart Series Name
Added UTS to verify the series names (Labels) for chart series for
following-
* xls, xlsx, ods
* odt
Change-Id: I4575a2e7ada9d4cf8b3fa708bd313f9d16244f65
Change-Id: Id291b49bf7547ee7264eb7c0751e416d20ca1e54
Reviewed-on: https://gerrit.libreoffice.org/6383
Reviewed-by: Markus Mohrhard
Tested-by: Markus Mohrhard
diff --git a/chart2/CppunitTest_chart2_import.mk
b/chart2/CppunitTest_chart2_import.mk
index 4aa64c1..f702ea9 100644
--- a/chart2/CppunitTest_chart2_import.mk
+++ b/chart2/CppunitTest_chart2_import.mk
@@ -29,12 +29,15 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_import, \
forui \
i18nlangtag \
msfilter \
+vcl \
oox \
sal \
salhelper \
sax \
sb \
sc \
+sw \
+sd \
sfx \
sot \
svl \
@@ -48,7 +51,6 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_import, \
unotest \
utl \
vbahelper \
-vcl \
xo \
$(gb_UWINAPI) \
))
@@ -66,11 +68,12 @@ $(eval $(call gb_CppunitTest_use_ure,chart2_import))
$(eval $(call gb_CppunitTest_use_components,chart2_import,\
basic/util/sb \
+animations/source/animcore/animcore \
chart2/source/controller/chartcontroller \
chart2/source/chartcore \
comphelper/util/comphelp \
configmgr/source/configmgr \
-dbaccess/util/dba \
+dtrans/util/mcnttype \
embeddedobj/util/embobj \
eventattacher/source/evtatt \
filter/source/config/cache/filterconfig1 \
@@ -86,6 +89,12 @@ $(eval $(call gb_CppunitTest_use_components,chart2_import,\
sc/util/sc \
sc/util/scd \
sc/util/scfilt \
+sw/util/sw \
+sw/util/swd \
+sw/util/msword \
+sd/util/sd \
+sd/util/sdfilt \
+sd/util/sdd \
$(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
sc/util/vbaobj) \
scaddins/source/analysis/analysis \
diff --git a/chart2/qa/extras/chart2import.cxx
b/chart2/qa/extras/chart2import.cxx
index ad10a1d..f20b834 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -7,10 +7,18 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "charttest.hxx"
+#include "charttest.hxx"
+#include
+#include
#include
#include
+#include
+#include
+#include
+#include
+#include
+#include
class Chart2ImportTest : public ChartTest
{
@@ -18,11 +26,33 @@ public:
void Fdo60083();
void testSteppedLines();
void testErrorBarRange();
+void testODSChartSeries();
+void testXLSXChartSeries();
+void testXLSChartSeries();
+void testODTChartSeries();
+void testDOCChartSeries();
+void testPPTXChartSeries();
+void testPPTChartSeries();
+void testODPChartSeries();
CPPUNIT_TEST_SUITE(Chart2ImportTest);
CPPUNIT_TEST(Fdo60083);
CPPUNIT_TEST(testSteppedLines);
CPPUNIT_TEST(testErrorBarRange);
+CPPUNIT_TEST(testODSChartSeries);
+CPPUNIT_TEST(testXLSXChartSeries);
+CPPUNIT_TEST(testXLSChartSeries);
+CPPUNIT_TEST(testODTChartSeries);
+CPPUNIT_TEST(testDOCChartSeries);
+/*
+ * Disabling Impress Uts.
+ * ChartTest::tearDown() calls dispose of mxComponent
+ * this causes the UT to crash in sd.
+ * sd::DrawView::Notify tries to reset by calling
sd::DrawViewShell::ResetActualPage
+ */
+//CPPUNIT_TEST(testPPTChartSeries);
+//CPPUNIT_TEST(testPPTXChartSeries);
+//CPPUNIT_TEST(testODPChartSeries);
CPPUNIT_TEST_SUITE_END();
private:
@@ -150,6 +180,123 @@ void Chart2ImportTest::testSteppedLines()
}
}
+uno::Sequence < OUString > getChartColumnDescriptions( uno::Reference<
chart::XChartDocument > xChart1Doc)
+{
+CPPUNIT_ASSERT(xChart1Doc.is());
+uno::Reference< chart::XChartDataArray > xChartData (
xChart1Doc->getData(), UNO_QUERY_THROW);
+CPPUNIT_ASSERT(xChartData.is());
+uno::Sequence < OUString > seriesList =
xChartData->getColumnDescriptions();
+return seriesList;
+}
+
+void Chart2ImportTest::testODSChartSeries()
+{
+load("/chart2/qa/extras/data/ods/", "chart.ods");
+uno::Reference< chart::XChartDocument > xChart1Doc (
getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW);
+uno::Sequence < OUString > seriesList = g
[Libreoffice-commits] core.git: include/jvmfwk jvmfwk/plugins jvmfwk/source
include/jvmfwk/framework.h |8 +++-
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 16 +---
jvmfwk/source/fwkutil.cxx | 22 +-
3 files changed, 25 insertions(+), 21 deletions(-)
New commits:
commit 72b954df59d64fa47f6380e4322243401afb683f
Author: Michael Meeks
Date: Wed Oct 23 19:59:23 2013 +0100
Avoid using gconftool. Atk provides a11y not Java on Unix.
cf. comment in framework header. Should have no impact on real
run-time Java a11y, which would be enabled later as-needed; only
on JRE selection. For extreme corner-cases, where your auto-selected
JRE has no a11y support either select another JRE in the UI or:
$ export JFW_PLUGIN_FORCE_ACCESSIBILITY=1
to override.
Change-Id: I59a6428e5a11664b75c29580cad76eb9500db45a
diff --git a/include/jvmfwk/framework.h b/include/jvmfwk/framework.h
index c404a95..7099f50 100644
--- a/include/jvmfwk/framework.h
+++ b/include/jvmfwk/framework.h
@@ -73,7 +73,7 @@ extern "C" {
Setting the class path used by a Java VM should not be necesarry. The
locations
-of Jar files should be knows by a class loader. If a jar file depends on
another
+of Jar files should be known by a class loader. If a jar file depends on
another
jar file then it can be referenced in the manifest file of the first jar.
However,
a user may add jars to the class path by using this API. If it becomes
necessary
to add files to the class path which is to be used by all users then one
can use
@@ -168,6 +168,12 @@ extern "C" {
It may be removed in the future. By setting it to 1, the framework will
not try to
find out if the system is configured to use accessibility tools or if a
JRE has an
accessibiliy bridge installed
+JFW_PLUGIN_FORCE_ACCESSIBILITY
+This is a unofficial variable which was introduced to workaround
external issues.
+It may be removed in the future. By setting it to 1, the framework will
override a
+platform's desire not to probe each java backend to determine if it has an
accessibility
+bridge installed. If the JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY is set this
variable has
+no effect, and is Unix specific.
*/
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 75c3412..832616f 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -364,6 +364,12 @@ void AsynchReader::execute()
}
}
+static bool isEnvVarSetToOne(const OUString &aVar)
+{
+OUString aValue;
+getBootstrap()->getFrom(aVar, aValue);
+return aValue == "1";
+}
bool getJavaProps(const OUString & exePath,
#ifdef JVM_ONE_PATH_CHECK
@@ -393,8 +399,7 @@ bool getJavaProps(const OUString & exePath,
//If the bootstrap variable is "1" then we pass the argument
//"noaccessibility" to JREProperties.class. This will prevent
//that it calls java.awt.Toolkit.getDefaultToolkit();
-OUString sValue;
-getBootstrap()->getFrom("JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY", sValue);
+bool bNoAccessibility =
isEnvVarSetToOne("JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY");
//prepare the arguments
sal_Int32 cArgs = 3;
@@ -404,8 +409,13 @@ bool getJavaProps(const OUString & exePath,
OUString arg4 = "noaccessibility";
rtl_uString *args[4] = {arg1.pData, arg2.pData, arg3.pData};
+#ifdef UNX
+// Java is no longer required for a11y - we use atk directly.
+bNoAccessibility = !isEnvVarSetToOne("JFW_PLUGIN_FORCE_ACCESSIBILITY");
+#endif
+
// Only add the fourth param if the bootstrap parameter is set.
-if (sValue.equals(OUString::number( 1)))
+if (bNoAccessibility)
{
args[3] = arg4.pData;
cArgs = 4;
diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx
index 2998695..993ddb3 100644
--- a/jvmfwk/source/fwkutil.cxx
+++ b/jvmfwk/source/fwkutil.cxx
@@ -56,9 +56,8 @@ namespace jfw
bool isAccessibilitySupportDesired()
{
OUString sValue;
-if ((sal_True == ::rtl::Bootstrap::get(
-OUString("JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY"), sValue)) && sValue
== "1"
-)
+if (::rtl::Bootstrap::get( "JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY",
sValue) &&
+sValue == "1" )
return false;
bool retVal = false;
@@ -103,24 +102,13 @@ bool isAccessibilitySupportDesired()
RegCloseKey(hKey);
#elif defined UNX
-char buf[16];
-// use 2 shells to suppress the eventual "gcontool-2 not found" message
-// of the shell trying to execute the command
-FILE* fp = popen( "/bin/sh 2>/dev/null -c \"gconftool-2 -g
/desktop/gnome/interface/accessibility\"", "r" );
-if( fp )
-{
-if( fgets( buf, sizeof(buf), fp ) )
-{
-int nCompare = strncasecmp( buf, "true", 4 );
-retVal = (nCompare == 0 ? true : false);
-}
-pclose( fp );
-
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/StyleSheetTable.cxx |3 ++
writerfilter/source/dmapper/TblStylePrHandler.cxx | 30 ++
writerfilter/source/dmapper/TblStylePrHandler.hxx |2 +
3 files changed, 35 insertions(+)
New commits:
commit 1dac69edef6f2b7632dc3be002ba7d3075c70b96
Author: Miklos Vajna
Date: Wed Oct 30 12:01:59 2013 +0100
writerfilter: also store table style type
Change-Id: Iff8ce5c7c7904a91ed1dc1aea8f7053abeeb1a45
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 4506b69..b4c5d3e 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -664,7 +664,10 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
pTableEntry->AppendInteropGrabBag(pTblStylePrHandler->getInteropGrabBag("tblPr"));
}
else if (nSprmId == NS_ooxml::LN_CT_Style_tblStylePr)
+{
+pTblStylePrHandler->appendInteropGrabBag("type",
pTblStylePrHandler->getTypeString());
pTableEntry->AppendInteropGrabBag(pTblStylePrHandler->getInteropGrabBag("tblStylePr"));
+}
}
break;
}
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.cxx
b/writerfilter/source/dmapper/TblStylePrHandler.cxx
index 194aceb..10eecfb 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.cxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.cxx
@@ -42,6 +42,28 @@ TblStylePrHandler::~TblStylePrHandler( )
delete m_pTablePropsHandler, m_pTablePropsHandler = NULL;
}
+OUString TblStylePrHandler::getTypeString()
+{
+switch (m_nType)
+{
+case TBL_STYLE_WHOLETABLE: return OUString("wholeTable");
+case TBL_STYLE_FIRSTROW: return OUString("firstRow");
+case TBL_STYLE_LASTROW: return OUString("lastRow");
+case TBL_STYLE_FIRSTCOL: return OUString("firstCol");
+case TBL_STYLE_LASTCOL: return OUString("lastCol");
+case TBL_STYLE_BAND1VERT: return OUString("band1Vert");
+case TBL_STYLE_BAND2VERT: return OUString("band2Vert");
+case TBL_STYLE_BAND1HORZ: return OUString("band1Horz");
+case TBL_STYLE_BAND2HORZ: return OUString("band2Horz");
+case TBL_STYLE_NECELL: return OUString("neCell");
+case TBL_STYLE_NWCELL: return OUString("nwCell");
+case TBL_STYLE_SECELL: return OUString("seCell");
+case TBL_STYLE_SWCELL: return OUString("swCell");
+default: break;
+}
+return OUString();
+}
+
void TblStylePrHandler::lcl_attribute(Id rName, Value & rVal)
{
#ifdef DEBUG_DOMAINMAPPER
@@ -136,6 +158,14 @@ void TblStylePrHandler::resolveSprmProps(Sprm & rSprm)
pProperties->resolve(*this);
}
+void TblStylePrHandler::appendInteropGrabBag(OUString aKey, OUString aValue)
+{
+beans::PropertyValue aProperty;
+aProperty.Name = aKey;
+aProperty.Value = uno::makeAny(aValue);
+m_aInteropGrabBag.push_back(aProperty);
+}
+
beans::PropertyValue TblStylePrHandler::getInteropGrabBag(OUString aName)
{
beans::PropertyValue aRet;
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.hxx
b/writerfilter/source/dmapper/TblStylePrHandler.hxx
index 6b74a76..a7abf77 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.hxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.hxx
@@ -70,6 +70,8 @@ public:
inline PropertyMapPtr getProperties() { return m_pProperties; };
inline TblStyleType getType() { return m_nType; };
+OUString getTypeString();
+void appendInteropGrabBag(OUString aKey, OUString aValue);
beans::PropertyValue getInteropGrabBag(OUString aName);
private:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Failing ucb test, due to nss changes
Hi Eike, On Wed, Oct 30, 2013 at 11:47:50AM +0100, Eike Rathke wrote: > This doesn't sound familiar to me but related to what I experienced > a few days ago. Unit tests in ucb didn't fail for me, but first linking > connectivity complained about missing SSL_... symbols and late Monday > postgresql configure about libssl not being found. make nss.clean > helped. Sorry -- forgot to mention: this failure happens even after a full 'make clean'. Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Failing ucb test, due to nss changes
Hi Miklos, On Wednesday, 2013-10-30 09:48:44 +0100, Miklos Vajna wrote: > To me, it seems that after your nss changes > (7f614ac933524d798724895827b255b0d36dcc6b and previous 'nss:' commits), > instdir/unxlngx6/program/libnssutil3.so doesn't pick up the libssl3.so > from instdir, but from the system, and there it fails. (System has 3.15, > we bundle 3.13.) This doesn't sound familiar to me but related to what I experienced a few days ago. Unit tests in ucb didn't fail for me, but first linking connectivity complained about missing SSL_... symbols and late Monday postgresql configure about libssl not being found. make nss.clean helped. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgp6XvZJP58PP.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/formulagroupcl.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c51a6ffd3ca90ec5fcad55826fdbc1b2f7ad6109
Author: Stephan Bergmann
Date: Wed Oct 30 10:26:24 2013 +0100
error: unused variable 'kSrc' [loplugin]
Change-Id: Ic0b2fd6d16cabdbf732ecbe038f1cee8da05639a
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 68d3b5c..c2802e8 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1147,7 +1147,7 @@ public:
DynamicKernel(boost::shared_ptr r):mpRoot(r),
mpProgram(NULL), mpKernel(NULL), mpResClmem(NULL) {}
/// Code generation in OpenCL
-std::string CodeGen() {
+void CodeGen() {
// Travese the tree of expression and declare symbols used
const DynamicKernelArgument *DK= mSyms.DeclRefArg<
DynamicKernelSoPArguments >(mpRoot);
@@ -1172,7 +1172,6 @@ public:
#if 1
std::cerr<< "Program to be compiled = \n" << mFullProgramSrc << "\n";
#endif
-return decl.str();
}
/// Produce kernel hash
std::string GetMD5(void)
@@ -1393,6 +1392,7 @@ bool FormulaGroupInterpreterOpenCL::interpret(
ScDocument& rDoc,
mpKernel = new DynamicKernel(Root);
try {
+mpKernel->CodeGen();
// Obtain cl context
KernelEnv kEnv;
OclCalc::setKernelEnv(&kEnv);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 70998] Termchange: Graphic/Picture -> Image
https://bugs.freedesktop.org/show_bug.cgi?id=70998 --- Comment #4 from Sveinn í Felli --- (In reply to comment #0) > Any objections from UX-Advise? Just to mention; as a translator I have circumvented the issue, using mostly the same local expression for the two. OTOH concerning plural forms, to me "Graphics" would signify a broader range of images, symbols, clipart, etc. But I'm not native english speaker. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/formulagroupcl.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 27759f787b48e6a16ff371041349e33d1bfeaba1
Author: Tor Lillqvist
Date: Wed Oct 30 09:56:27 2013 +0200
WaE: unused variable 'kSrc' [loplugin]
Change-Id: I6ad63d30a48bb2fb2d530d18091eee0be6cff057
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index a3b21a9..68d3b5c 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1393,7 +1393,6 @@ bool FormulaGroupInterpreterOpenCL::interpret(
ScDocument& rDoc,
mpKernel = new DynamicKernel(Root);
try {
-std::string kSrc = mpKernel->CodeGen();
// Obtain cl context
KernelEnv kEnv;
OclCalc::setKernelEnv(&kEnv);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-4.1-1'
Tag 'cp-4.1-1' created by Andras Timar at 2013-10-30 10:18 -0700 cp-4.1-1 Changes since cp-4.1-branch-point-93: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-4.1-1'
Tag 'cp-4.1-1' created by Andras Timar at 2013-10-30 10:18 -0700 cp-4.1-1 Changes since cp-4.1-branch-point-2: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-4.1-1'
Tag 'cp-4.1-1' created by Andras Timar at 2013-10-30 10:18 -0700 cp-4.1-1 Changes since libreoffice-4-1-branch-point-38: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-4.1-1'
Tag 'cp-4.1-1' created by Andras Timar at 2013-10-30 10:18 -0700 cp-4.1-1 Changes since libreoffice-4-1-branch-point-16: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 70998] Termchange: Graphic/Picture -> Image
https://bugs.freedesktop.org/show_bug.cgi?id=70998 Samuel M. changed: What|Removed |Added CC||libreoffice@lists.freedeskt ||op.org -- 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
Failing ucb test, due to nss changes
Hi Michael, A few days ago, JunitTest_ucb_complex started to fail here and it keeps doing so, so I wanted to have a look. Running 'make -sr JunitTest_ucb_complex' in ucb gives: $ make -sr JunitTest_ucb_complex [build JUT] ucb_complex JUnit version 4.10 setUpConnection() .ftp://noname:nopasswd@nohost warn:cppuhelper:32247:7:cppuhelper/source/shlib.cxx:283: loading component library failed: file:///home/vmiklos/git/libreoffice/master/instdir/unxlngx6/program/../program/libucpftp1.so warn:legacy.osl:32247:7:ucb/source/core/provprox.cxx:385: UcbContentProviderProxy::getContentProvider - No provider for 'com.sun.star.ucb.FTPContentProvider. warn:cppuhelper:32247:7:cppuhelper/source/shlib.cxx:283: loading component library failed: file:///home/vmiklos/git/libreoffice/master/instdir/unxlngx6/program/../program/libucpftp1.so warn:legacy.osl:32247:7:ucb/source/core/provprox.cxx:385: UcbContentProviderProxy::getContentProvider - No provider for 'com.sun.star.ucb.FTPContentProvider. warn:cppuhelper:32247:7:cppuhelper/source/shlib.cxx:283: loading component library failed: file:///home/vmiklos/git/libreoffice/master/instdir/unxlngx6/program/../program/libucpftp1.so warn:legacy.osl:32247:7:ucb/source/core/provprox.cxx:385: UcbContentProviderProxy::getContentProvider - No provider for 'com.sun.star.ucb.FTPContentProvider. now executing open java.lang.NullPointerException at complex.ucb.UCB.executeCommand(UCB.java:75) at complex.ucb.UCB.checkWrongFtpConnection(UCB.java:192) So a dlopen failed, but no idea why, not seeing dlerror output. Re-running as SAL_LOG=+INFO.sal.osl make -sr JunitTest_ucb_complex gives quite some output, the relevant ones seems to be: info:sal.osl:32142:7:sal/osl/unx/module.cxx:168: dlopen(/home/vmiklos/git/libreoffice/master/instdir/unxlngx6/program/../program/libucpftp1.so, 257): /home/vmiklos/git/libreoffice/master/instdir/unxlngx6/program/libnssutil3.so: version `NSSUTIL_3.15' not found (required by /usr/lib64/libssl3.so) info:sal.osl:32142:7:sal/osl/unx/module.cxx:168: dlopen(/home/vmiklos/git/libreoffice/master/instdir/unxlngx6/program/../program/libucpftp1.so, 257): /home/vmiklos/git/libreoffice/master/instdir/unxlngx6/program/libnssutil3.so: version `NSSUTIL_3.15' not found (required by /usr/lib64/libssl3.so) info:sal.osl:32142:7:sal/osl/unx/module.cxx:168: dlopen(/home/vmiklos/git/libreoffice/master/instdir/unxlngx6/program/../program/libucpftp1.so, 257): /home/vmiklos/git/libreoffice/master/instdir/unxlngx6/program/libnssutil3.so: version `NSSUTIL_3.15' not found (required by /usr/lib64/libssl3.so) To me, it seems that after your nss changes (7f614ac933524d798724895827b255b0d36dcc6b and previous 'nss:' commits), instdir/unxlngx6/program/libnssutil3.so doesn't pick up the libssl3.so from instdir, but from the system, and there it fails. (System has 3.15, we bundle 3.13.) Do you have any idea what can cause that? Thanks, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: ios/CustomTarget_MobileLibreOffice_app.mk
ios/CustomTarget_MobileLibreOffice_app.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit dd5347ef29686cc02928243b571f11444ed4e6b9 Author: Tor Lillqvist Date: Wed Oct 30 10:29:05 2013 +0200 Build targets instead of a scheme which doesn't exist in a clean tree If you try to build in a tree fresh from a clone, with no manual build in Xcode done, there will be no "schemes", so the xcodebuild will fail. Instead, build the "targets". Change-Id: Ie2689880e66d1aaa97661970d2060f5935cfcf17 diff --git a/ios/CustomTarget_MobileLibreOffice_app.mk b/ios/CustomTarget_MobileLibreOffice_app.mk index e3e95c1..e2119a1 100644 --- a/ios/CustomTarget_MobileLibreOffice_app.mk +++ b/ios/CustomTarget_MobileLibreOffice_app.mk @@ -15,7 +15,8 @@ BUILDID :=$(shell cd $(SRCDIR) && git log -1 --format=%H) #- Macros - define MobileLibreOfficeXcodeBuild - CC=;xcodebuild -project MobileLibreOffice/MobileLibreOffice.xcodeproj -scheme MobileLibreOffice -arch armv7 -configuration $(if $(ENABLE_DEBUG),Debug,Release) $(1) >/dev/null + CC=;xcodebuild -project shared/ios_sharedlo.xcodeproj -target ios_sharedlo -arch armv7 -configuration $(if $(ENABLE_DEBUG),Debug,Release) $(1) >/dev/null + CC=;xcodebuild -project MobileLibreOffice/MobileLibreOffice.xcodeproj -target MobileLibreOffice -arch armv7 -configuration $(if $(ENABLE_DEBUG),Debug,Release) $(1) >/dev/null endef #- Targets ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/firebird
external/firebird/UnpackedTarball_firebird.mk |4 -
external/firebird/firebird-c++11replfn.patch.0 | 54 +
2 files changed, 55 insertions(+), 3 deletions(-)
New commits:
commit 542a3291005dc1db011c76f437d5e0b945fa726e
Author: Stephan Bergmann
Date: Wed Oct 30 09:22:49 2013 +0100
C++11: new/delete replacement functions cannot be inline
...as clarified by a new sentence added to paragraph 3 of 17.6.4.6
[replacement.functions]: "The programâs definitions shall not be
specified as
inline." Clang trunk towards 3.4 now generates errors for this.
Having these replacement functions in the fbembed dynamic library is
extremely
fishy anyway; at least on Linux those symbols are not exported, and
hopefully on
no other platforms either. (If it turns out that this change causes the
symbols
to change from non-exported to exported on some other platform, the best fix
would probably be to remove those replacement functions completely.)
Change-Id: I590d55e44814a6707030c42e1087377e75819666
diff --git a/external/firebird/UnpackedTarball_firebird.mk
b/external/firebird/UnpackedTarball_firebird.mk
index c4119a0..77e691c 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -14,10 +14,8 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,firebird,$(FIREBIRD_TARBALL)))
$(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-icu.patch.1 \
external/firebird/firebird-rpath.patch.0 \
-))
-
-$(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-c++11.patch.1 \
+ external/firebird/firebird-c++11replfn.patch.0 \
))
ifeq ($(OS)-$(COM),WNT-MSC)
diff --git a/external/firebird/firebird-c++11replfn.patch.0
b/external/firebird/firebird-c++11replfn.patch.0
new file mode 100644
index 000..d14296c
--- /dev/null
+++ b/external/firebird/firebird-c++11replfn.patch.0
@@ -0,0 +1,54 @@
+--- src/common/classes/alloc.h
src/common/classes/alloc.h
+@@ -489,23 +489,11 @@
+ inline static MemoryPool* getDefaultMemoryPool() { return
Firebird::MemoryPool::processMemoryPool; }
+
+ // Global versions of operators new and delete
+-inline void* operator new(size_t s) THROW_BAD_ALLOC
+-{
+- return Firebird::MemoryPool::globalAlloc(s);
+-}
+-inline void* operator new[](size_t s) THROW_BAD_ALLOC
+-{
+- return Firebird::MemoryPool::globalAlloc(s);
+-}
++void* operator new(size_t s) THROW_BAD_ALLOC;
++void* operator new[](size_t s) THROW_BAD_ALLOC;
+
+-inline void operator delete(void* mem) throw()
+-{
+- Firebird::MemoryPool::globalFree(mem);
+-}
+-inline void operator delete[](void* mem) throw()
+-{
+- Firebird::MemoryPool::globalFree(mem);
+-}
++void operator delete(void* mem) throw();
++void operator delete[](void* mem) throw();
+
+ #ifdef DEBUG_GDS_ALLOC
+ inline void* operator new(size_t s, Firebird::MemoryPool& pool, const char*
file, int line)
+--- src/common/classes/alloc.cpp
src/common/classes/alloc.cpp
+@@ -2080,3 +2080,21 @@
+ #endif
+
+ } // namespace Firebird
++
++void* operator new(size_t s) THROW_BAD_ALLOC
++{
++ return Firebird::MemoryPool::globalAlloc(s);
++}
++void* operator new[](size_t s) THROW_BAD_ALLOC
++{
++ return Firebird::MemoryPool::globalAlloc(s);
++}
++
++void operator delete(void* mem) throw()
++{
++ Firebird::MemoryPool::globalFree(mem);
++}
++void operator delete[](void* mem) throw()
++{
++ Firebird::MemoryPool::globalFree(mem);
++}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: tinderbox <-> gerrit-buildbot integration: passing build specific configuration options
Hi David, On Tue, Oct 29, 2013 at 11:40:28PM +0100, David Ostrovsky wrote: > So gerrit-buildbot plugin was extended. New Gerrit change screen has now > Schedule button. When activated, a popup dialog appears, where custom > build options and even optional platforms can be specified [1]. > > The build scheduled in this way exposes the passed option(s) to engaged > tinderboxes: > > davido@wizball:~>ssh gerrit buildbot get -p test_project [...] > GERRIT_TICKET=3667585db_Linux > [...] > GERRIT_OPT='--enable-extension-integration --enable-ext-wiki-publisher' > > The only missing part is on tinderbox side to pick up the options and > pass them to the build. > > [1] http://imgur.com/3CKw0H4 Cool, can't wait to see this in action on gerrit.l.o. :-) Thanks! Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - vcl/generic vcl/source
vcl/generic/glyphs/gcach_layout.cxx | 31 ++-
vcl/source/gdi/sallayout.cxx| 21 +
2 files changed, 43 insertions(+), 9 deletions(-)
New commits:
commit 71077148d442b3bbfeefd9a572942946c6a95823
Author: Khaled Hosny
Date: Wed Oct 30 09:34:38 2013 +0200
fdo#70968: Incorrect rendering of Devanagari short 'i' vowel
It seems that some Indic fonts assign 'mark' glyph class to combining
spacing marks (spacing not non spacing) so my reliance on the glyph
class to set the IS_DIACRITIC flags broke those fonts. This is a bandaid
to get around the issue, plus some long rant! (at this rate, I'll be
writing "The VCL haters handbook" pretty soon).
Change-Id: I3ff892acf746d50182573f94e7e8c3c6f9464ae0
diff --git a/vcl/generic/glyphs/gcach_layout.cxx
b/vcl/generic/glyphs/gcach_layout.cxx
index 4673931..7a8bfc9 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -456,20 +456,36 @@ bool HbLayoutEngine::layout(ServerFontLayout& rLayout,
ImplLayoutArgs& rArgs)
if (bInCluster)
nGlyphFlags |= GlyphItem::IS_IN_CLUSTER;
+// The whole IS_DIACRITIC concept is a stupid hack that was
+// introduced ages ago to work around the utter brokenness of the
+// way justification adjustments are applied (the DXArray fiasco).
+// Since it is such a stupid hack, there is no sane way to directly
+// map to concepts of the "outside" world, so we do some rather
+// ugly hacks:
+// * If the font has a GDEF table, we check for glyphs with mark
+// glyph class which is sensible, except that some fonts
+// (fdo#70968) assign mark class to spacing marks (which is wrong
+// but usually harmless), so we try to sniff what HarfBuzz thinks
+// about this glyph by checking if it gives it a zero advance
+// width.
+// * If the font has no GDEF table, we just check if the glyph has
+// zero advance width, but this is stupid and can be wrong. A
+// better way would to check the character's Unicode combining
+// class, but unfortunately glyph gives combining marks the
+// cluster value of its base character, so nCharPos will be
+// pointing to the wrong character (but HarfBuzz might change
+// this in the future).
bool bDiacritic = false;
if (hb_ot_layout_has_glyph_classes(mpHbFace))
{
// the font has GDEF table
-if (hb_ot_layout_get_glyph_class(mpHbFace, nGlyphIndex) ==
HB_OT_LAYOUT_GLYPH_CLASS_MARK)
+bool bMark = hb_ot_layout_get_glyph_class(mpHbFace,
nGlyphIndex) == HB_OT_LAYOUT_GLYPH_CLASS_MARK;
+if (bMark && pHbPositions[i].x_advance == 0)
bDiacritic = true;
}
else
{
// the font lacks GDEF table
-// HACK: if the resolved glyph advance is zero assume it is a
-// combining mark. The whole IS_DIACRITIC concept is a hack to
-// fix the other hacks we use to second-guess glyph advances in
-// ApplyDXArray and the likes and it needs to die
if (pHbPositions[i].x_advance == 0)
bDiacritic = true;
}
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index f395936..450ec232 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -1018,6 +1018,27 @@ void GenericSalLayout::AdjustLayout( ImplLayoutArgs&
rArgs )
// ---
+// This DXArray thing is one of the stupidest ideas I have ever seen (I've been
+// told that it probably a one-to-one mapping of some Windows 3.1 API, which is
+// telling). To justify a text string, Writer calls
OutputDevice::GetTextArray()
+// to get an array that maps input characters (not glyphs) to their absolute
+// position, GetTextArray() in turn calls SalLayout::FillDXArray() to get an
+// array of character widths that it converts to absolute positions.
+//
+// Writer would then apply justification adjustments to that array of absolute
+// character positions and return to OutputDevice, which eventually calls
+// ApplyDXArray(), which needs to extract the individual adjustments for each
+// character to apply it to corresponding glyphs, and since that information is
+// already lost it tries to do some heuristics to guess it again. Those
+// heuristics often fail, and have always been a source of all sorts of weird
+// text layout bugs, and instead of fixing the broken design a hack after hack
+// have been applied on top of it, making it a complete mess that nobody
+// understands.
+//
+// As you can see by now,
