LibreOffice Gerrit News for submodules on 2014-10-29
Moin! ~~ Project dictionaries ~~ Nothing moved in the project for the last 25 hours ~~ Project translations ~~ Nothing moved in the project for the last 25 hours ~~ Project help ~~ * Open changes on master for project help changed in the last 25 hours: + related fdo#70998 rename Picture to Image in https://gerrit.libreoffice.org/12128 from Stanislav Horáček + rename terms Movie/Sound to Audio/Video in https://gerrit.libreoffice.org/12127 from Stanislav Horáček + rename Format Paintbrush to Clone Formatting in https://gerrit.libreoffice.org/12126 from Stanislav Horáček * Merged changes on master for project help changed in the last 25 hours: None * Abandoned changes on master for project help changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: None Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for core on 2014-10-29
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + OXYGEN: Refreshing icons from main source and added a few new ones in https://gerrit.libreoffice.org/12129 from Yousuf Philips about module icon-themes + fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT in https://gerrit.libreoffice.org/12103 from Naruhiko Ogasawara about module pyuno + vcl/source: get rid of redundant svsys.h includes in https://gerrit.libreoffice.org/11814 from Douglas Mencken about module vcl + gbuild: introduce add_objcxxflags_exception_object/objects in https://gerrit.libreoffice.org/11815 from Douglas Mencken about module sal, solenv + Apache Commons Logging 1.2 - pass ENABLE_DEBUG in https://gerrit.libreoffice.org/12123 from Robert Antoni Buj i Gelonch about module external + HttpClient - pass ENABLE_DEBUG in https://gerrit.libreoffice.org/12124 from Robert Antoni Buj i Gelonch about module external + Document that gtk3 support is experimental in https://gerrit.libreoffice.org/12121 from Matthew Francis about module build + fdo#80403: Basesclasses implement Fastinterfaces in https://gerrit.libreoffice.org/12082 from Daniel Sikeler about module include, xmloff + fdo#80403: AutoCorrect uses XFastParser in https://gerrit.libreoffice.org/12083 from Daniel Sikeler about module editeng End of freshness + vcl: Allow SalGraphics to draw gradients natively in https://gerrit.libreoffice.org/12119 from Chris Sherlock about module include, vcl + android: Show document browser back in the menu in https://gerrit.libreoffice.org/12108 from Jacobo Aragunde Pérez about module android + [PATCH] RFC: ref-counting vcl::Window subclasses in https://gerrit.libreoffice.org/11972 from Noel Grandin about module extensions, filter, include, reportdesign, sfx2, svtools, vcl, winaccessibility + coverity#1242459 Identical code for different branches in https://gerrit.libreoffice.org/11772 from Caolán McNamara about module sw * Merged changes on master for project core changed in the last 25 hours: + fdo#81356: use boost::rational internally in Fraction in https://gerrit.libreoffice.org/12085 from Juan Picca + Fix python wrapper script on OS X in https://gerrit.libreoffice.org/12101 from Matthew Francis + ICONS: Exchanged icons between tango and human and small change to zoom m in https://gerrit.libreoffice.org/12125 from Yousuf Philips + fdo#85046 - MENU: Edit Changes should be renamed for better clarity in https://gerrit.libreoffice.org/12098 from Yousuf Philips + sal_Int16 as the underlying type of WindowBorderStyle in https://gerrit.libreoffice.org/12110 from Takeshi Abe + fdo#82272 - New 'Chart' toolbar icon in https://gerrit.libreoffice.org/12112 from Yousuf Philips + fdo#84938: replace TIMEF_ constants with enum in https://gerrit.libreoffice.org/12114 from Noel Grandin + TANGO: add new icons for page break, line spacing, comment, and footnote in https://gerrit.libreoffice.org/12118 from Yousuf Philips * Abandoned changes on master for project core changed in the last 25 hours: + vcl: introduce SalGraphics::DrawGradient() in https://gerrit.libreoffice.org/12120 from Chris Sherlock + fix trying to encode non-integer type as a bitfield in https://gerrit.libreoffice.org/12094 from Douglas Mencken * Open changes needing tweaks, but being untouched for more than a week: + HIG-ification of GSoC Color Picker dialog in https://gerrit.libreoffice.org/11494 from Olivier Hallot + WIP: fdo#43090: Add an option to disable autoclose brackets in https://gerrit.libreoffice.org/12024 from Marcos Paulo de Souza + convert ScHint ID's to an enum in https://gerrit.libreoffice.org/11986 from Noel Grandin + fdo#39625 Make existing CppUnittests work in https://gerrit.libreoffice.org/11605 from Tobias Madl + fdo#58194 - export DOCX Automatic indent as firstLine indent in https://gerrit.libreoffice.org/10425 from Joren De Cuyper + WIP (do not merge): remove custom impl of bidirectional list in https://gerrit.libreoffice.org/11001 from Chris Laplante + fdo#83003 Startcenter: No method for returnin Recent Docs in https://gerrit.libreoffice.org/11525 from Efe Gürkan Yalaman + fdo#82335. in https://gerrit.libreoffice.org/11555 from Sudarshan Rao + Perftest for loading autocorrect dictionaries (fdo#79761) in https://gerrit.libreoffice.org/11296 from Matúš Kukan + fdo#81956 : Rendering of vml group shape was wrong. in https://gerrit.libreoffice.org/11013 from sushil_shinde + fdo#79018: LO hangs while opening file. in https://gerrit.libreoffice.org/9564 from Yogesh Bharate + fdo#81426 : Data from header and footer is getting lost. in https://gerrit.libreoffice.org/10531 from Rajashri Udhoji + fdo#79541 :Corrupt: Shape enclosed within a floating table in https://gerrit.libreoffice.org/9914 from Rajashri Udhoji + fdo#80996:Fix for DataLabel not preserved for ColumnChart after RT in
[Libreoffice-commits] core.git: Branch 'distro/collabora/lof-4.3' - 22 commits - chart2/uiconfig configure.ac download.lst drawinglayer/source filter/source icon-themes/sifr include/filter include/svx
chart2/uiconfig/ui/tp_DataSource.ui | 62 configure.ac |2 dev/null |binary download.lst |3 drawinglayer/source/processor2d/vclhelperbufferdevice.cxx |5 filter/source/graphicfilter/ios2met/ios2met.cxx | 16 filter/source/graphicfilter/ipcx/ipcx.cxx |7 filter/source/msfilter/msdffimp.cxx | 89 filter/source/msfilter/svdfppt.cxx|5 filter/source/svg/svgexport.cxx | 18 filter/source/svg/svgfilter.hxx |1 icon-themes/sifr/cmd/lc_spacepara15.png |binary icon-themes/sifr/cmd/lc_spacepara2.png|binary icon-themes/sifr/cmd/sc_spacepara15.png |binary icon-themes/sifr/cmd/sc_spacepara2.png|binary include/filter/msfilter/svdfppt.hxx |2 include/svx/svdmodel.hxx |2 officecfg/registry/data/org/openoffice/Office/Common.xcu |2 officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 10 sc/CppunitTest_sc_ucalc.mk|1 sc/Library_scqahelper.mk |2 sc/inc/document.hxx |5 sc/inc/inputopt.hxx |3 sc/inc/sc.hrc |1 sc/inc/sortparam.hxx |1 sc/inc/table.hxx |8 sc/qa/unit/filters-test.cxx |9 sc/qa/unit/helper/sorthelper.hxx | 55 sc/qa/unit/ucalc.cxx | 491 sc/qa/unit/ucalc.hxx | 21 sc/qa/unit/ucalc_sort.cxx | 1478 ++ sc/source/core/data/documen3.cxx |5 sc/source/core/data/table2.cxx|7 sc/source/core/data/table3.cxx| 122 - sc/source/core/tool/inputopt.cxx | 34 sc/source/core/tool/token.cxx | 47 sc/source/ui/app/scmod.cxx|9 sc/source/ui/docshell/dbdocfun.cxx|5 sc/source/ui/undo/undosort.cxx|5 sd/source/ui/animations/SlideTransitionPane.cxx |5 sd/source/ui/inc/ViewShell.hxx|1 sd/source/ui/view/viewshe2.cxx| 27 sd/source/ui/view/viewshel.cxx|1 sfx2/inc/templatedlg.hxx |4 sfx2/source/doc/templatedlg.cxx |2 sfx2/uiconfig/ui/templatedlg.ui |3 svx/source/inc/svdoutlinercache.hxx |7 svx/source/svdraw/svdmodel.cxx| 11 svx/source/svdraw/svdoutlinercache.cxx|2 sw/CppunitTest_sw_htmlexport.mk |1 sw/qa/extras/htmlexport/data/checkbox-radiobutton.doc |binary sw/qa/extras/htmlexport/htmlexport.cxx| 24 sw/qa/extras/rtfimport/data/fdo83464.rtf | 24 sw/qa/extras/rtfimport/data/fdo85179.rtf | 33 sw/qa/extras/rtfimport/rtfimport.cxx | 16 sw/source/filter/html/htmlforw.cxx|5 sw/source/filter/ww8/ww8par.cxx | 13 vcl/source/filter/wmf/winwmf.cxx | 159 + vcl/source/fontsubset/sft.cxx | 31 writerfilter/source/dmapper/GraphicImport.cxx | 32 writerfilter/source/dmapper/GraphicImport.hxx |2 writerfilter/source/rtftok/rtfdocumentimpl.cxx|2 62 files changed, 2220 insertions(+), 718 deletions(-) New commits: commit 0eed8d987295d71170121e872d4c1564bd240cb8 Author: Tor Lillqvist t...@collabora.com Date: Wed Oct 29 08:30:47 2014 +0200 Bump version to 4.3.4.1 for next submission attempt Change-Id: I7b2a64b7788090beda529cb01d1fcf2aa80a6058 diff --git a/configure.ac b/configure.ac index 0d80786..63911b5 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.3.4.0],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.3.4.1],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59])
[Libreoffice-commits] core.git: icon-themes/oxygen
icon-themes/oxygen/cmd/lc_backcolor.png|binary icon-themes/oxygen/cmd/lc_designerdialog.png |binary icon-themes/oxygen/cmd/lc_drawchart.png|binary icon-themes/oxygen/cmd/lc_drawselect.png |binary icon-themes/oxygen/cmd/lc_fontcolor.png|binary icon-themes/oxygen/cmd/lc_freeline_unfilled.png|binary icon-themes/oxygen/cmd/lc_insertfieldctrl.png |binary icon-themes/oxygen/cmd/lc_insertfootnote.png |binary icon-themes/oxygen/cmd/lc_insertgraphic.png|binary icon-themes/oxygen/cmd/lc_insertobjectchart.png|binary icon-themes/oxygen/cmd/lc_insertsymbol.png |binary icon-themes/oxygen/cmd/lc_selectmode.png |binary icon-themes/oxygen/cmd/lc_selectobject.png |binary icon-themes/oxygen/cmd/lc_sendmail.png |binary icon-themes/oxygen/cmd/lc_spelldialog.png |binary icon-themes/oxygen/cmd/lc_spelling.png |binary icon-themes/oxygen/cmd/lc_spellingandgrammardialog.png |binary icon-themes/oxygen/cmd/lc_starchartdialog.png |binary icon-themes/oxygen/cmd/lc_symbolcatalogue.png |binary icon-themes/oxygen/cmd/lc_zoom.png |binary icon-themes/oxygen/cmd/lc_zoom100percent.png |binary icon-themes/oxygen/cmd/lc_zoomin.png |binary icon-themes/oxygen/cmd/lc_zoomminus.png|binary icon-themes/oxygen/cmd/sc_drawchart.png|binary icon-themes/oxygen/cmd/sc_insertgraphic.png|binary icon-themes/oxygen/cmd/sc_insertobjectchart.png|binary icon-themes/oxygen/cmd/sc_sendmail.png |binary icon-themes/oxygen/cmd/sc_spelldialog.png |binary icon-themes/oxygen/cmd/sc_spelling.png |binary icon-themes/oxygen/cmd/sc_spellingandgrammardialog.png |binary icon-themes/oxygen/cmd/sc_starchartdialog.png |binary 31 files changed New commits: commit cc81115c9394fab06741361f3a79b9ca0b885454 Author: Yousuf Philips philip...@hotmail.com Date: Wed Oct 29 03:02:10 2014 +0400 OXYGEN: Refreshing icons from main source and added a few new ones Change-Id: I7c5ca8cb9533a1df07a86909a6993bc36eda5253 Reviewed-on: https://gerrit.libreoffice.org/12129 Reviewed-by: Matthew Francis mjay.fran...@gmail.com Tested-by: Matthew Francis mjay.fran...@gmail.com diff --git a/icon-themes/oxygen/cmd/lc_backcolor.png b/icon-themes/oxygen/cmd/lc_backcolor.png index 12567fb..b778ff7 100644 Binary files a/icon-themes/oxygen/cmd/lc_backcolor.png and b/icon-themes/oxygen/cmd/lc_backcolor.png differ diff --git a/icon-themes/oxygen/cmd/lc_designerdialog.png b/icon-themes/oxygen/cmd/lc_designerdialog.png index f98dece..bdd4f95 100644 Binary files a/icon-themes/oxygen/cmd/lc_designerdialog.png and b/icon-themes/oxygen/cmd/lc_designerdialog.png differ diff --git a/icon-themes/oxygen/cmd/lc_drawchart.png b/icon-themes/oxygen/cmd/lc_drawchart.png index 4f3f66e..530e652 100644 Binary files a/icon-themes/oxygen/cmd/lc_drawchart.png and b/icon-themes/oxygen/cmd/lc_drawchart.png differ diff --git a/icon-themes/oxygen/cmd/lc_drawselect.png b/icon-themes/oxygen/cmd/lc_drawselect.png index 09187ee..e573f75 100644 Binary files a/icon-themes/oxygen/cmd/lc_drawselect.png and b/icon-themes/oxygen/cmd/lc_drawselect.png differ diff --git a/icon-themes/oxygen/cmd/lc_fontcolor.png b/icon-themes/oxygen/cmd/lc_fontcolor.png index 98f6173..b12a06b 100644 Binary files a/icon-themes/oxygen/cmd/lc_fontcolor.png and b/icon-themes/oxygen/cmd/lc_fontcolor.png differ diff --git a/icon-themes/oxygen/cmd/lc_freeline_unfilled.png b/icon-themes/oxygen/cmd/lc_freeline_unfilled.png index 45ddf2c..6123b2a 100644 Binary files a/icon-themes/oxygen/cmd/lc_freeline_unfilled.png and b/icon-themes/oxygen/cmd/lc_freeline_unfilled.png differ diff --git a/icon-themes/oxygen/cmd/lc_insertfieldctrl.png b/icon-themes/oxygen/cmd/lc_insertfieldctrl.png index 20a36d4..2cb59e0 100644 Binary files a/icon-themes/oxygen/cmd/lc_insertfieldctrl.png and b/icon-themes/oxygen/cmd/lc_insertfieldctrl.png differ diff --git a/icon-themes/oxygen/cmd/lc_insertfootnote.png b/icon-themes/oxygen/cmd/lc_insertfootnote.png index 2de6fd4..0d7382c 100644 Binary files a/icon-themes/oxygen/cmd/lc_insertfootnote.png and b/icon-themes/oxygen/cmd/lc_insertfootnote.png differ diff --git a/icon-themes/oxygen/cmd/lc_insertgraphic.png b/icon-themes/oxygen/cmd/lc_insertgraphic.png index 124e63a..e7788ec 100644 Binary files a/icon-themes/oxygen/cmd/lc_insertgraphic.png and b/icon-themes/oxygen/cmd/lc_insertgraphic.png differ diff --git a/icon-themes/oxygen/cmd/lc_insertobjectchart.png b/icon-themes/oxygen/cmd/lc_insertobjectchart.png index 4f3f66e..530e652 100644 Binary files a/icon-themes/oxygen/cmd/lc_insertobjectchart.png and b/icon-themes/oxygen/cmd/lc_insertobjectchart.png differ diff --git
[Libreoffice-commits] core.git: Branch 'feature/priorities' - 3 commits - include/vcl vcl/inc vcl/source
include/vcl/timer.hxx| 18 ++
vcl/inc/svdata.hxx |1
vcl/source/app/timer.cxx | 122 +++
3 files changed, 121 insertions(+), 20 deletions(-)
New commits:
commit aede500f3d565299c70670694494570b36f36d6c
Author: Tobias Madl tobias.madl@gmail.com
Date: Wed Oct 29 07:20:41 2014 +
Added starvation protection and Prio scheduling
Change-Id: I23f09ac5ce56179af3ac9dcd79ec4104b09297ba
diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx
index 7a952db..1fec77d 100644
--- a/include/vcl/timer.hxx
+++ b/include/vcl/timer.hxx
@@ -28,14 +28,14 @@ struct ImplTimerData;
struct ImplSVData;
enum IdlePriority : sal_Int32 {
-VCL_IDLE_PRIORITY_HIGHEST = -40, // - 0ms
-VCL_IDLE_PRIORITY_HIGH = -30, // - 1ms
-VCL_IDLE_PRIORITY_REPAINT = -20, //- 30ms
-VCL_IDLE_PRIORITY_RESIZE = -10, //- 50ms
+VCL_IDLE_PRIORITY_HIGHEST = -400, // - 0ms
+VCL_IDLE_PRIORITY_HIGH = -300, // - 1ms
+VCL_IDLE_PRIORITY_REPAINT = -200, //- 30ms
+VCL_IDLE_PRIORITY_RESIZE = -100, //- 50ms
VCL_IDLE_PRIORITY_MEDIUM = 0, // - 50ms
-VCL_IDLE_PRIORITY_LOW = 10, //- 100ms
-VCL_IDLE_PRIORITY_LOWER = 20, // - 200ms
-VCL_IDLE_PRIORITY_LOWEST = 30 // - 400ms
+VCL_IDLE_PRIORITY_LOW = 100, //- 100ms
+VCL_IDLE_PRIORITY_LOWER = 200, // - 200ms
+VCL_IDLE_PRIORITY_LOWEST = 300 // - 400ms
};
/// Base-class for timers - usually a simple, one-shot timeout
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index c1d9eed..dc74595 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -308,6 +308,7 @@ struct ImplSVData
sal_uLong mnThreadCount; // is VCL MultiThread
enabled
ImplConfigData* mpFirstConfigData; // Zeiger auf ersten
Config-Block
ImplTimerData* mpFirstTimerData; // list of all running timers
+ImplTimerData* mpWaitingTimerData; // sorted (prio) list of ready
timers
SalTimer* mpSalTimer; // interface to sal event
loop/timers
SalI18NImeStatus* mpImeStatus;// interface to ime status
window
SalSystem* mpSalSystem;// SalSystem interface
diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx
index 8c635a2..c039de1 100644
--- a/vcl/source/app/timer.cxx
+++ b/vcl/source/app/timer.cxx
@@ -93,6 +93,7 @@ void Timer::ImplTimerCallbackProc()
ImplTimerData* pTimerData;
ImplTimerData* pPrioFirstTimerData;
ImplTimerData* pPrevTimerData;
+sal_Int32 nPrevPrio;
sal_uLong nMinPeriod = MAX_TIMER_PERIOD;
sal_uLong nDeltaTime;
sal_uLong nTime = tools::Time::GetSystemTicks();
@@ -105,7 +106,11 @@ void Timer::ImplTimerCallbackProc()
// find timer where the timer handler needs to be called
pTimerData = pSVData-mpFirstTimerData;
-pPrioFirstTimerData = pTimerData;
+if(!pSVData-mpWaitingTimerData)
+pPrioFirstTimerData = pTimerData;
+else
+pPrioFirstTimerData = pSVData-mpWaitingTimerData;
+
while ( pTimerData )
{
// If the timer is not new, was not deleted, and if it is not in the
timeout handler, then
@@ -143,15 +148,24 @@ void Timer::ImplTimerCallbackProc()
pCurrentTimer = pPrioFirstTimerData;
}
}
+
pTimerData-mpTimer-SetPriority(pTimerData-mpTimer-GetPriority() - 1);
pPrioFirstTimerData = pCurrentTimer;
}
}
pTimerData = pTimerData-mpNext;
}
-while(pPrioFirstTimerData pPrioFirstTimerData-mpTimer){
+if(pPrioFirstTimerData pPrioFirstTimerData-mpTimer){
+nPrevPrio = pPrioFirstTimerData-mpTimer-GetPriority();
+pSVData-mpWaitingTimerData = pPrioFirstTimerData;
+}
+else
+pSVData-mpWaitingTimerData = NULL;
+
+while(pPrioFirstTimerData pPrioFirstTimerData-mpTimer
pPrioFirstTimerData-mpTimer-GetPriority() == nPrevPrio){
// set new update time
pPrioFirstTimerData-mnUpdateTime = nTime;
+nPrevPrio = pPrioFirstTimerData-mpTimer-GetPriority();
// if no AutoTimer than stop
if ( !pPrioFirstTimerData-mpTimer-mbAuto )
@@ -167,13 +181,17 @@ void Timer::ImplTimerCallbackProc()
pPrioFirstTimerData-mbInTimeout = false;
pPrevTimerData = pPrioFirstTimerData;
pPrioFirstTimerData = pPrioFirstTimerData-mpPrioNext;
+pPrevTimerData-mpNext = pPrevTimerData-mpPrioNext;
pPrevTimerData-mpPrioNext = NULL;
}
+if(pPrevTimerData !pPrevTimerData-mpPrioNext)
+pPrevTimerData-mpNext = NULL;
+
// determine new time
sal_uLong nNewTime = tools::Time::GetSystemTicks();
pPrevTimerData = NULL;
-pTimerData = pSVData-mpFirstTimerData;
+pTimerData =
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/compiler.cxx |6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit 4586a3f564600f1a0ce15a5cb98868b43bb9351e
Author: Noel Grandin n...@peralex.com
Date: Wed Oct 29 08:12:33 2014 +0200
cid#1242749 Unused value
Change-Id: I3227a05a4cafdcca23c32a62fdb72245cdf493d6
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index d49aaf6..f76b17a 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -463,7 +463,6 @@ static bool lcl_parseExternalName(
const sal_Unicode* const pStart = rSymbol.getStr();
const sal_Unicode* p = pStart;
sal_Int32 nLen = rSymbol.getLength();
-sal_Unicode cPrev = 0;
OUString aTmpFile, aTmpName;
sal_Int32 i = 0;
bool bInName = false;
@@ -479,7 +478,6 @@ static bool lcl_parseExternalName(
if (!p || p == pStart)
return false;
i = sal_Int32(p - pStart);
-cPrev = *(p-1);
}
for ( ; i nLen; ++i, ++p)
{
@@ -493,7 +491,7 @@ static bool lcl_parseExternalName(
{
// Move to the next char and loop until the second single
// quote.
-cPrev = c;
+sal_Unicode cPrev = c;
++i; ++p;
for (sal_Int32 j = i; j nLen; ++j, ++p)
{
@@ -547,7 +545,6 @@ static bool lcl_parseExternalName(
return false;
}
-cPrev = c;
continue;
}
}
@@ -599,7 +596,6 @@ static bool lcl_parseExternalName(
aTmpFile += OUString(c);
}
}
-cPrev = c;
}
if (!bInName)
___
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/filter/ww8/docxexport.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 7344923ffdf751646396b38af6a23be93b53a06a Author: Miklos Vajna vmik...@collabora.co.uk Date: Wed Oct 29 08:13:06 2014 +0100 sw: convert last usage of switchHeaderFooter() to DocxTableExportContext Change-Id: I47c5c60b0ffef3923c1d2830de992e1a67eb76ff diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 67540eb..1150463 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -716,10 +716,11 @@ void DocxExport::WriteHeaderFooter( const SwFmt rFmt, bool bHeader, const char* bool bStartedParaSdt = m_pAttrOutput-IsStartedParaSdt(); m_pAttrOutput-SetStartedParaSdt(false); -m_pAttrOutput-switchHeaderFooter(true, m_nHeadersFootersInSection++); +DocxTableExportContext aTableExportContext; +m_pAttrOutput-pushToTableExportContext(aTableExportContext); // do the work WriteHeaderFooterText( rFmt, bHeader ); -m_pAttrOutput-switchHeaderFooter(false, -1); +m_pAttrOutput-popFromTableExportContext(aTableExportContext); m_pAttrOutput-EndParaSdtBlock(); //When the stream changes the cache which is maintained for the graphics in case of alternate content is not cleared. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source filter/source include/svtools include/vcl reportdesign/source sfx2/source svtools/source vcl/source winaccessibility/source
extensions/source/bibliography/bibload.cxx |1
extensions/source/bibliography/general.cxx |1
extensions/source/bibliography/toolbar.cxx |2
filter/source/flash/swfdialog.cxx|1
filter/source/flash/swfwriter1.cxx |1
filter/source/pdf/impdialog.cxx |1
filter/source/pdf/impdialog.hxx |2
filter/source/pdf/pdfdialog.cxx |1
filter/source/pdf/pdfexport.cxx |1
filter/source/pdf/pdffilter.hxx |1
filter/source/pdf/pdfinteract.hxx|1
filter/source/svg/svgdialog.cxx |1
filter/source/xsltdialog/xmlfilterdialogcomponent.cxx|1
filter/source/xsltfilter/LibXSLTTransformer.hxx |1
filter/source/xsltfilter/OleHandler.hxx |1
include/svtools/valueset.hxx |3
include/vcl/button.hxx |2
include/vcl/layout.hxx | 26 ++--
include/vcl/scrbar.hxx |2
include/vcl/window.hxx | 20 +++
reportdesign/source/ui/dlg/GroupsSorting.cxx |2
sfx2/source/appl/shutdowniconaqua.mm |1
svtools/source/control/valueset.cxx |2
vcl/source/window/layout.cxx | 90 +++
vcl/source/window/window.cxx |2
winaccessibility/source/UAccCOM/AccTextBase.cxx |1
winaccessibility/source/service/AccEventListener.cxx |5
winaccessibility/source/service/AccTopWindowListener.cxx |1
28 files changed, 93 insertions(+), 81 deletions(-)
New commits:
commit bacee60a5920585feeff58840357aa7ac33e50a7
Author: Noel Grandin n...@peralex.com
Date: Mon Oct 27 14:02:38 2014 +0200
ref-counting vcl::Window subclasses
Points of discussion
(*) where in the Window destructor should dispose() be called?
It's a seriously large method.
(*) we're going to need similar typedefs and declarations for every
single sub-class of vcl::Window, I assume that I will need to create a
macro to make it less verbose.
TODO
Update clang plugin to verify that:
(a) dispose() methods always call their superclass dispose()
(b) dispose() methods don't forget to clear any references owned
by that class.
Change-Id: I873d5d5166f811e2f65e49327cc98862559fcf30
diff --git a/extensions/source/bibliography/bibload.cxx
b/extensions/source/bibliography/bibload.cxx
index 8a732cc..3d9f5c2 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -62,7 +62,6 @@
#include bibconfig.hxx
#include cppuhelper/implbase4.hxx
-using namespace ::rtl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
diff --git a/extensions/source/bibliography/general.cxx
b/extensions/source/bibliography/general.cxx
index 7c2ca8d..26a2512 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -51,7 +51,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::form;
using namespace ::com::sun::star::sdb;
-using namespace ::rtl;
static OUString lcl_GetColumnName( const Mapping* pMapping, sal_uInt16
nIndexPos )
{
diff --git a/extensions/source/bibliography/toolbar.cxx
b/extensions/source/bibliography/toolbar.cxx
index 2a5d07b..bf7e81de 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -281,7 +281,7 @@ void BibToolBar::InitListener()
pListener=new BibToolBarListener(this,aURL.Complete,nId);
}
-BibToolBarListenerRef* pxInsert = new
Referenceframe::XStatusListener;
+BibToolBarListenerRef* pxInsert = new
uno::Referenceframe::XStatusListener;
(*pxInsert) = pListener;
aListenerArr.push_back( pxInsert );
xDisp-addStatusListener(uno::Reference frame::XStatusListener
(pListener),aURL);
diff --git a/filter/source/flash/swfdialog.cxx
b/filter/source/flash/swfdialog.cxx
index 1b5f5fa..2af211d 100644
--- a/filter/source/flash/swfdialog.cxx
+++ b/filter/source/flash/swfdialog.cxx
@@ -29,7 +29,6 @@
#include com/sun/star/frame/XController.hpp
#include com/sun/star/view/XSelectionSupplier.hpp
-using namespace ::rtl;
using namespace ::vcl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/filter/source/flash/swfwriter1.cxx
b/filter/source/flash/swfwriter1.cxx
index 13b38c1..e2c34c1 100644
---
PARCEIRO CVC - Promoção CVC: As Melhores Ofertas com Preços Incríveis. Validade: 03/11
Seu cliente de e-mail não pode ler este e-mail. Para visualizá-lo on-line, por favor, clique aqui: http://cdb-br.com/sistemadeenvio/display.php?M=629998C=ab5108e26b37ea2cc3bbabf34f6eec16S=40L=9N=8 Para parar de receber nossos Emails:http://cdb-br.com/sistemadeenvio/unsubscribe.php?M=629998C=ab5108e26b37ea2cc3bbabf34f6eec16L=9N=40 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/lof-4.3' - sw/qa
sw/qa/extras/htmlexport/htmlexport.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e722a9a4ab5bd2dd51c40802c8daffe8e0b0c79b
Author: Tor Lillqvist t...@collabora.com
Date: Wed Oct 29 10:32:44 2014 +0200
Fixup for OS X after cd85ff0a814ce38d4704b4b808269d89cdaf0d11
We want to bypass all of this test on OS X and Windows in this branch,
still. So the test added must be inside the #if !defined(MACOSX)
!defined(WNT).
Change-Id: I39aa7459bf6a67d445b50be2ad1ca2cdc9022d85
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index faa3d4f..1f766b2 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -162,8 +162,6 @@ DECLARE_HTMLEXPORT_TEST(testSkipImageEmbeddedDocument,
skipimage-embedded-docum
assertXPathContent(pDoc, /html/body/p/span/p/span, Inner.);
}
-#endif
-
DECLARE_HTMLEXPORT_TEST(testExportCheckboxRadioButtonState,
checkbox-radiobutton.doc)
{
htmlDocPtr pDoc = parseHtml(maTempFile);
@@ -184,6 +182,8 @@ DECLARE_HTMLEXPORT_TEST(testExportCheckboxRadioButtonState,
checkbox-radiobutto
// FIXME not in 4.3 assertXPathNoAttribute(pDoc,
/html/body/form/p[4]/input, checked);
}
+#endif
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/all/utility.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ff037a8c09e05261563edd9c1a19835e3b18be67
Author: Noel Grandin n...@peralex.com
Date: Wed Oct 29 11:45:06 2014 +0200
fix spelling
Change-Id: I08a5fb662a4a5d756b72340cb9328fc1dc1fe9fe
diff --git a/sal/osl/all/utility.cxx b/sal/osl/all/utility.cxx
index 20ae1a4..98bc12f 100644
--- a/sal/osl/all/utility.cxx
+++ b/sal/osl/all/utility.cxx
@@ -22,7 +22,7 @@
/*
* mfe : maybe it would be wishful to include initialization
* of the global timer in dllmain or _init directly.
- * But noneoftheless this (should) work too.
+ * But none the less this (should) work too.
*/
namespace osl
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/table/tablelayouter.cxx | 19 ++-
1 file changed, 10 insertions(+), 9 deletions(-)
New commits:
commit 87f5486dcb36177a0b5d374d3d684885efcd9c28
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Oct 29 10:47:41 2014 +0100
Don't use output rArea when TableLayouter::getCellArea returns false
...when xCell-isMerged, as happens during CppunitTest_sd_filters_test.
aCellArea will be empty (i.e., getMinX()==SAL_MAX_INT32 etc.) and the
aCellRect.Move calculation will overflow for 32-bit long.
Change-Id: I12649234c060edd9f2cab1792cf75335ae22b730
diff --git a/svx/source/table/tablelayouter.cxx
b/svx/source/table/tablelayouter.cxx
index 0c53684..0793e77 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -860,15 +860,16 @@ void TableLayouter::updateCells( Rectangle rRectangle )
if( xCell.is() )
{
basegfx::B2IRectangle aCellArea;
-getCellArea( xCell, aPos, aCellArea );
-
-Rectangle aCellRect;
-aCellRect.Left() = aCellArea.getMinX();
-aCellRect.Right() = aCellArea.getMaxX();
-aCellRect.Top() = aCellArea.getMinY();
-aCellRect.Bottom() = aCellArea.getMaxY();
-aCellRect.Move( rRectangle.Left(), rRectangle.Top() );
-xCell-setCellRect( aCellRect );
+if( getCellArea( xCell, aPos, aCellArea ) )
+{
+Rectangle aCellRect;
+aCellRect.Left() = aCellArea.getMinX();
+aCellRect.Right() = aCellArea.getMaxX();
+aCellRect.Top() = aCellArea.getMinY();
+aCellRect.Bottom() = aCellArea.getMaxY();
+aCellRect.Move( rRectangle.Left(), rRectangle.Top() );
+xCell-setCellRect( aCellRect );
+}
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 2 commits - sc/qa sc/source sw/source
sc/qa/unit/data/xls/external-ref.xls |binary
sc/qa/unit/subsequent_export-test.cxx | 22 ++
sc/source/filter/excel/xehelper.cxx | 10 ++
sw/source/ui/docvw/edtwin.cxx |2 --
4 files changed, 32 insertions(+), 2 deletions(-)
New commits:
commit 24f95d7e82b0c7896994ed12cac5ab022fc32267
Author: Andras Timar andras.ti...@collabora.com
Date: Tue Oct 28 12:13:55 2014 +0100
fdo#37960 fix shift+click to select multiple drawings
I simply didn't get the logic behind calling GotoNextFly(). It caused
not only this bug. For example Ctrl+click on a background text frame
did not select the text frame, but an image on the previous page.
Change-Id: I85ccbbda2f324de55417d6199b4abe79e59bf295
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 714734d..4289af4 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -3673,8 +3673,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
rSh.IsObjSelectable( aDocPos ) )
!lcl_urlOverBackground( rSh, aDocPos ) )
{
SwMvContext aMvContext( rSh );
-if( !rSh.IsFrmSelected() )
-rSh.GotoNextFly();
rSh.EnterSelFrmMode();
bCallBase = false;
}
commit 0a5597d120e561dc8ad72a0416af15f7fb273a67
Author: Andras Timar andras.ti...@collabora.com
Date: Sat Oct 25 21:47:55 2014 +0200
bnc#893791 XLS export: external sheet references on Linux/OSX
The commit solves two problems.
1. Make sure we save absolute paths on Linux/OSX
2. Make sure we don't save invalid XLS (VirtualPath longer than 255 chars)
The first problem has always been there, so after a few load/save cycles
an XLS with reference to other XLS on a Unix-like file system became
invalid, and only LibreOffice could open it, Excel could not. These
broken XLS files can be repaired by saving after this patch, however,
the original reference will remain broken.
(cherry picked from commit 3f5251675ae56ea282fdeb09dbc53ce4aae6)
Conflicts:
sc/qa/unit/subsequent_export-test.cxx
Conflicts:
sc/qa/unit/subsequent_export-test.cxx
Change-Id: I8f575acb1d560d539c1da61a1afdaac3f0c13977
diff --git a/sc/qa/unit/data/xls/external-ref.xls
b/sc/qa/unit/data/xls/external-ref.xls
new file mode 100644
index 000..21f3338
Binary files /dev/null and b/sc/qa/unit/data/xls/external-ref.xls differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index ad2e2ee..1b88b27 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -74,6 +74,8 @@ public:
void testFormulaReferenceXLS();
void testSheetProtectionXLSX();
+void testSupBookVirtualPath();
+
CPPUNIT_TEST_SUITE(ScExportTest);
CPPUNIT_TEST(test);
#if !defined(MACOSX) !defined(DRAGONFLY)
@@ -93,6 +95,9 @@ public:
CPPUNIT_TEST(testFormulaReferenceXLS);
CPPUNIT_TEST(testSheetProtectionXLSX);
+#if !defined(WNT)
+CPPUNIT_TEST(testSupBookVirtualPath);
+#endif
CPPUNIT_TEST_SUITE_END();
private:
@@ -828,6 +833,23 @@ void ScExportTest::tearDown()
test::BootstrapFixture::tearDown();
}
+void ScExportTest::testSupBookVirtualPath()
+{
+ScDocShellRef xShell = loadDoc(external-ref., XLS);
+CPPUNIT_ASSERT(xShell.Is());
+
+ScDocShellRef xDocSh = saveAndReload(xShell, XLS);
+xShell-DoClose();
+CPPUNIT_ASSERT(xDocSh.Is());
+
+ScDocument* pDoc = xDocSh-GetDocument();
+
+if (!checkFormula(*pDoc, ScAddress(0,0,0),
'file:///home/timar/Documents/external.xls'#$Sheet1.A1))
+CPPUNIT_FAIL(Wrong SupBook VirtualPath URL);
+
+xDocSh-DoClose();
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(ScExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/filter/excel/xehelper.cxx
b/sc/source/filter/excel/xehelper.cxx
index 98f8b12..d590988 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -913,6 +913,11 @@ OUString lclEncodeDosUrl(
aBuf.append(EXC_URL_DOSDRIVE).append(cDrive);
aOldUrl = aOldUrl.copy(3);
}
+else
+{
+// URL probably points to a document on a Unix-like file system
+aBuf.append(EXC_URL_DRIVEROOT);
+}
// directories
sal_Int32 nPos = -1;
@@ -954,6 +959,11 @@ OUString lclEncodeDosUrl(
if (pTableName)
aBuf.append(*pTableName);
+// VirtualPath must be shorter than 255 chars ([MS-XLS].pdf 2.5.277)
+// It's better to truncate, than generate invalid file that Excel cannot
open.
+if (aBuf.getLength() 255)
+aBuf.setLength(255);
+
return aBuf.makeStringAndClear();
}
___
Libreoffice-commits mailing
[Libreoffice-commits] core.git: Branch 'feature/priorities' - vcl/inc vcl/source
vcl/inc/svdata.hxx |1
vcl/source/app/timer.cxx | 56 ---
2 files changed, 24 insertions(+), 33 deletions(-)
New commits:
commit 4e08ce00d4f1df57edf1e9fed8d05ba854156e9a
Author: Tobias Madl tobias.madl@gmail.com
Date: Wed Oct 29 10:36:21 2014 +
Working starvation protection and prio scheduling
Change-Id: I9434fd2fdfad5f54021325648c547a9634d6b291
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index dc74595..c1d9eed 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -308,7 +308,6 @@ struct ImplSVData
sal_uLong mnThreadCount; // is VCL MultiThread
enabled
ImplConfigData* mpFirstConfigData; // Zeiger auf ersten
Config-Block
ImplTimerData* mpFirstTimerData; // list of all running timers
-ImplTimerData* mpWaitingTimerData; // sorted (prio) list of ready
timers
SalTimer* mpSalTimer; // interface to sal event
loop/timers
SalI18NImeStatus* mpImeStatus;// interface to ime status
window
SalSystem* mpSalSystem;// SalSystem interface
diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx
index c039de1..894fb7a 100644
--- a/vcl/source/app/timer.cxx
+++ b/vcl/source/app/timer.cxx
@@ -97,19 +97,15 @@ void Timer::ImplTimerCallbackProc()
sal_uLong nMinPeriod = MAX_TIMER_PERIOD;
sal_uLong nDeltaTime;
sal_uLong nTime = tools::Time::GetSystemTicks();
+boolbAllTimerCalled = true;
if ( pSVData-mbNoCallTimer )
return;
pSVData-mnTimerUpdate++;
pSVData-mbNotAllTimerCalled = true;
-
-// find timer where the timer handler needs to be called
pTimerData = pSVData-mpFirstTimerData;
-if(!pSVData-mpWaitingTimerData)
-pPrioFirstTimerData = pTimerData;
-else
-pPrioFirstTimerData = pSVData-mpWaitingTimerData;
+pPrioFirstTimerData = pTimerData;
while ( pTimerData )
{
@@ -155,12 +151,8 @@ void Timer::ImplTimerCallbackProc()
pTimerData = pTimerData-mpNext;
}
-if(pPrioFirstTimerData pPrioFirstTimerData-mpTimer){
+if(pPrioFirstTimerData pPrioFirstTimerData-mpTimer)
nPrevPrio = pPrioFirstTimerData-mpTimer-GetPriority();
-pSVData-mpWaitingTimerData = pPrioFirstTimerData;
-}
-else
-pSVData-mpWaitingTimerData = NULL;
while(pPrioFirstTimerData pPrioFirstTimerData-mpTimer
pPrioFirstTimerData-mpTimer-GetPriority() == nPrevPrio){
// set new update time
@@ -181,17 +173,20 @@ void Timer::ImplTimerCallbackProc()
pPrioFirstTimerData-mbInTimeout = false;
pPrevTimerData = pPrioFirstTimerData;
pPrioFirstTimerData = pPrioFirstTimerData-mpPrioNext;
-pPrevTimerData-mpNext = pPrevTimerData-mpPrioNext;
pPrevTimerData-mpPrioNext = NULL;
}
-if(pPrevTimerData !pPrevTimerData-mpPrioNext)
-pPrevTimerData-mpNext = NULL;
+while(pPrioFirstTimerData pPrioFirstTimerData-mpTimer){
+pPrevTimerData = pPrioFirstTimerData;
+pPrioFirstTimerData = pPrioFirstTimerData-mpPrioNext;
+pPrevTimerData-mpPrioNext = NULL;
+bAllTimerCalled = false;
+}
// determine new time
sal_uLong nNewTime = tools::Time::GetSystemTicks();
pPrevTimerData = NULL;
-pTimerData = pSVData-mpWaitingTimerData;
+pTimerData = pSVData-mpFirstTimerData;
while ( pTimerData )
{
// ignore if timer is still in timeout handler
@@ -238,15 +233,10 @@ void Timer::ImplTimerCallbackProc()
pPrevTimerData = pTimerData;
pTimerData = pTimerData-mpNext;
}
-}
-
-if(pPrioFirstTimerData pPrioFirstTimerData-mpTimer)
-pSVData-mpWaitingTimerData = pPrioFirstTimerData;
-else
-pSVData-mpWaitingTimerData = NULL;
+ }
// delete clock if no more timers available
-if ( !pSVData-mpFirstTimerData !pSVData-mpWaitingTimerData )
+if ( !pSVData-mpFirstTimerData )
{
pSVData-mpSalTimer-Stop();
pSVData-mnTimerPeriod = MAX_TIMER_PERIOD;
@@ -254,16 +244,16 @@ void Timer::ImplTimerCallbackProc()
else
ImplStartTimer( pSVData, nMinPeriod );
-if(!pSVData-mpWaitingTimerData){
-pSVData-mnTimerUpdate--;
+pSVData-mnTimerUpdate--;
+if(bAllTimerCalled)
pSVData-mbNotAllTimerCalled = false;
-}
}
Timer::Timer():
mpTimerData(NULL),
mnTimeout(1),
-mnPriority(0),
+mnPriority(VCL_IDLE_PRIORITY_HIGH),
+mnDefaultPriority(VCL_IDLE_PRIORITY_HIGH),
mbActive(false),
mbAuto(false)
{
@@ -273,6 +263,7 @@ Timer::Timer( const Timer rTimer ):
mpTimerData(NULL),
mnTimeout(rTimer.mnTimeout),
mnPriority(rTimer.mnPriority),
+mnDefaultPriority(rTimer.mnDefaultPriority),
mbActive(false),
mbAuto(false),
maTimeoutHdl(rTimer.maTimeoutHdl)
@@ -301,17 +292,17 @@ void
[Libreoffice-commits] core.git: 15 commits - chart2/source filter/source framework/source include/o3tl include/svx jvmfwk/plugins sc/inc sc/source sd/source sfx2/source svtools/source svx/source sw/so
chart2/source/controller/drawinglayer/DrawViewWrapper.cxx |2
filter/source/graphicfilter/epict/epict.cxx| 13
filter/source/pdf/pdfexport.cxx|2
framework/source/accelerators/acceleratorconfiguration.cxx |2
include/o3tl/numeric.hxx | 28
include/svx/svdetc.hxx |4
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx| 29
sc/inc/numformat.hxx |8
sc/source/core/data/drwlayer.cxx |8
sc/source/core/tool/numformat.cxx | 16
sc/source/filter/excel/xlroot.cxx | 10
sc/source/filter/excel/xltoolbar.cxx |2
sc/source/filter/inc/xlroot.hxx|3
sc/source/ui/drawfunc/futext2.cxx |2
sd/source/ui/func/fuexpand.cxx |4
sd/source/ui/func/futext.cxx |2
sd/source/ui/view/sdview.cxx |6
sfx2/source/sidebar/SidebarController.cxx | 16
svtools/source/misc/imap.cxx |5
svx/source/sdr/properties/textproperties.cxx |2
svx/source/svdraw/svdedxv.cxx |2
svx/source/svdraw/svdetc.cxx | 32
svx/source/svdraw/svdmodel.cxx |4
svx/source/svdraw/svdoutlinercache.cxx |2
svx/source/svdraw/svdtext.cxx |2
svx/source/table/tablecontroller.cxx |6
svx/source/table/tablertfimporter.cxx |2
sw/source/core/doc/htmltbl.cxx | 18
sw/source/core/doc/tblrwcl.cxx |3
sw/source/core/docnode/ndtbl.cxx | 22
sw/source/core/layout/findfrm.cxx | 11
sw/source/filter/basflt/fltshell.cxx | 543 -
sw/source/filter/inc/fltshell.hxx | 117 --
sw/source/uibase/uiview/viewdraw.cxx |2
unusedcode.easy|3
writerfilter/source/dmapper/DomainMapperTableManager.cxx |3
xmloff/source/draw/sdxmlexp.cxx|3
37 files changed, 138 insertions(+), 801 deletions(-)
New commits:
commit c090ecc4aa43004ef6da8dce3ba1e00cc778be4d
Author: Caolán McNamara caol...@redhat.com
Date: Wed Oct 29 09:53:44 2014 +
coverity#735663 Division or modulo by zero
Change-Id: I69410ebe3dcded9951bfa9e83844644147f4416a
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 6079135..8840494 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -1085,6 +1085,9 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
nRowCnt = nZwi;
}
+if (nColCnt == 0 || nRowCnt == 0)
+break;
+
aPartSize.Width() = (aPartSize.Width() - ((nColCnt -
1) * nGapX)) / nColCnt;
aPartSize.Height() = (aPartSize.Height() - ((nRowCnt -
1) * nGapY)) / nRowCnt;
commit 6fa813da677e303ca61074a2cda2c0e103fe5469
Author: Caolán McNamara caol...@redhat.com
Date: Wed Oct 29 09:51:01 2014 +
coverity#1078538 Division or modulo by zero
Change-Id: I4f8f66689b46f594664c44da4e892983f38ad32e
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index ba18c27..b788405 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -1329,9 +1329,14 @@ void SwHTMLTableLayout::AutoLayoutPass2( sal_uInt16
nAbsAvail, sal_uInt16 nRelAv
// Only use the relative widths' fraction, that is used for the
// absolute width.
sal_uLong nAbsTabWidthL = nAbsTabWidth;
-nRelTabWidth =
-( nRelAvail ? (sal_uInt16)((nAbsTabWidthL * nRelAvail) / nAbsAvail)
-: nAbsTabWidth );
+if (nRelAvail)
+{
+if (nAbsAvail == 0)
+throw o3tl::divide_by_zero();
+nRelTabWidth = (sal_uInt16)((nAbsTabWidthL * nRelAvail) /
nAbsAvail);
+}
+else
+nRelTabWidth = nAbsTabWidth;
// Are there columns width a percentage setting and some without one?
sal_uLong nFixMax = nMax;
commit c4e53fadbd9d4d5444547a18269eea5c54fd7a89
Author: Caolán McNamara caol...@redhat.com
Date: Wed Oct 29 09:48:58 2014 +
coverity#1078537 Division or modulo by zero
Change-Id: I63e8168efe169e506b3be65ca150a779404f0885
diff --git a/sw/source/core/doc/htmltbl.cxx
[Libreoffice-commits] core.git: 17 commits - include/sal include/tools Repository.mk scp2/AutoInstall.mk scp2/inc scp2/InstallModule_base.mk scp2/InstallModule_calc.mk scp2/InstallModule_crashrep.mk s
Repository.mk | 93 +++- include/sal/log-areas.dox |1 include/tools/debug.hxx |6 - sc/source/filter/excel/tokstack.cxx | 10 +- sc/source/filter/excel/xiescher.cxx |2 scp2/AutoInstall.mk | 14 ++- scp2/InstallModule_base.mk |1 scp2/InstallModule_calc.mk |5 - scp2/InstallModule_crashrep.mk |4 scp2/InstallModule_draw.mk |4 scp2/InstallModule_impress.mk |1 scp2/InstallModule_math.mk |5 - scp2/InstallModule_ooo.mk |1 scp2/InstallModule_writer.mk|5 - scp2/inc/macros.inc |2 scp2/source/base/file_base.scp | 13 -- scp2/source/base/folderitem_base.scp|4 scp2/source/base/module_base.scp|3 scp2/source/calc/file_calc.scp |4 scp2/source/calc/folderitem_calc.scp|4 scp2/source/calc/module_calc.scp|3 scp2/source/crashrep/file_crashrep.scp | 18 --- scp2/source/draw/file_draw.scp |4 scp2/source/draw/folderitem_draw.scp|4 scp2/source/draw/module_draw.scp|4 scp2/source/impress/file_impress.scp|4 scp2/source/impress/folderitem_impress.scp |4 scp2/source/impress/module_impress.scp |3 scp2/source/math/file_math.scp |4 scp2/source/math/folderitem_math.scp|4 scp2/source/math/module_math.scp|3 scp2/source/ooo/common_brand.scp| 69 +- scp2/source/ooo/folderitem_ooo.scp |8 - scp2/source/ooo/module_pdfimport.scp|8 - scp2/source/python/file_python.scp | 12 -- scp2/source/writer/file_writer.scp | 13 -- scp2/source/writer/folderitem_writer.scp|4 scp2/source/writer/module_writer.scp|3 solenv/bin/modules/installer/setupscript.pm |5 - svx/source/sidebar/paragraph/ParaPropertyPanel.cxx |2 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |2 sw/source/core/bastyp/swcache.cxx |4 sw/source/core/doc/tblrwcl.cxx | 14 ++- sw/source/core/layout/ftnfrm.cxx| 20 sw/source/core/text/inftxt.cxx | 20 ++-- sw/source/core/text/inftxt.hxx | 23 ++-- sw/source/core/text/itrform2.cxx| 10 +- sw/source/core/text/itrtxt.cxx |6 - sw/source/core/text/porfly.cxx |2 sw/source/core/text/porrst.cxx |8 - sw/source/core/text/txthyph.cxx |2 sw/source/core/view/viewsh.cxx |9 - sw/source/filter/ww8/ww8par.cxx |2 sw/source/filter/ww8/ww8par.hxx |2 sw/source/filter/ww8/ww8par2.hxx|4 sw/source/filter/ww8/ww8par6.cxx| 24 ++--- sw/source/uibase/sidebar/PagePropertyPanel.cxx |2 57 files changed, 242 insertions(+), 273 deletions(-) New commits: commit 25bfdffdacadad812f3cebdbc537687c9c59541b Author: Michael Stahl mst...@redhat.com Date: Wed Oct 29 11:04:35 2014 +0100 scp2: remove EXENAME Change-Id: I045a65d4efbaf8fcb55318ffce4f8929e2fbbe15 diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index d2142bd..d8c7370 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -57,10 +57,8 @@ #endif #ifdef UNX -#define EXENAME(name) STRING(name) #define PROFILENAME(name) STRING(CONCAT2(name,rc)) #else -#define EXENAME(name) STRING(CONCAT2(name,.exe)) #define PROFILENAME(name) STRING(CONCAT2(name,.ini)) #endif commit a77ef6c0e4e6096b073552d98b405bda62a8950c Author: Michael Stahl mst...@redhat.com Date: Wed Oct 29 00:11:29 2014 +0100 scp2: move writer executables to AutoInstall Change-Id: Ibcfdd7a8c204a1ec90045ad39ef456237ba80a34 diff --git a/Repository.mk b/Repository.mk index 66efa4a..628a71a 100644 --- a/Repository.mk +++ b/Repository.mk @@ -128,6 +128,13 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,math_brand, \ ) \ )) +$(eval $(call gb_Helper_register_executables_for_install,OOO,writer_brand, \ + $(if $(filter WNT,$(OS)), \ + sweb \ + swriter \ + ) \ +)) + $(eval $(call
[Libreoffice-commits] core.git: bin/parse-perfcheck.py
bin/parse-perfcheck.py | 125 +
1 file changed, 125 insertions(+)
New commits:
commit 4f5f6d2444a24138c3d3d378771f87cb06427195
Author: Laurent Godard lgodard.li...@laposte.net
Date: Tue Oct 14 09:50:39 2014 +0200
perfcheck : parse callgrind.out results to build csv file
appends results on existing target file
Change-Id: Icd897b090e1d1ed896b88a2f5923e8f35e95e5d2
diff --git a/bin/parse-perfcheck.py b/bin/parse-perfcheck.py
new file mode 100755
index 000..afa22a4
--- /dev/null
+++ b/bin/parse-perfcheck.py
@@ -0,0 +1,125 @@
+#!/usr/bin/python
+
+# 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/.
+
+import sys
+import os
+import time
+
+parseTrigger = desc: Trigger: Client Request:
+parseTotal = totals:
+
+separator = os.path.sep
+
+lastCommitId =
+needsCsvHeader = True
+
+def processDirectory(rootDir):
+
+ if needsCsvHeader:
+intermediateResult = lastCommit\ttest name\tfiledatetime\tdump
comment\tcount\n
+ else:
+ intermediateResult =
+
+ for dirName, subdirList, fileList in os.walk(rootDir):
+
+files = [ fi for fi in fileList if fi.startswith(callgrind.out.) ]
+for fname in files:
+found = parseFile(dirName, fname)
+if found != :
+ intermediateResult += found
+
+ return intermediateResult
+
+def parseFile(dirname, filename):
+
+ path = dirname + separator + filename
+ callgrindFile = open(path,'r')
+ lines = callgrindFile.readlines()
+
+ message =
+ total =
+
+ for line in lines:
+if line.startswith(parseTrigger):
+ message = line[len(parseTrigger):]
+elif line.startswith(parseTotal):
+ total = line[len(parseTotal):]
+
+ callgrindFile.close()
+
+ if message == and total == 0\n:
+return
+
+ dirs = dirname.split(separator)
+ currentTest = dirs[-1:]
+ testName = currentTest[0].replace(.test.core,)
+
+ message = message.replace(\n,)
+
+ fileDate = time.strftime('%m/%d/%Y %H:%M:%S',
time.gmtime(os.path.getmtime(path)))
+
+ result = lastCommitId + \t + testName + \t + fileDate + \t + message +
\t + total
+
+ return result
+
+def getLastCommitId():
+
+ stream = os.popen(git log)
+ line = stream.readline()
+ return line.replace(commit ,).replace(\n,)
+
+def displayUsage():
+
+ print
+ print Parses the callgrind results of make percheck
+ print
+ print Usage: bin/parse_perfcheck.py [targetFileName = perfcheckResult.csv]
[sourceDirectory = ./workdir/CppunitTest]
+ print default assumes running from core root directory
+ print
+
+if __name__ == '__main__':
+
+ #check args
+
+ if len(sys.argv) 3:
+ if len(sys.argv) == 2:
+ if sys.argv[1] == --help:
+displayUsage()
+sys.exit(1)
+ else:
+targetFileName = sys.argv[1]
+sourceDirectory = ./workdir/CppunitTest
+ elif len(sys.argv) == 1:
+ targetFileName = perfcheckResult.csv
+ sourceDirectory = ./workdir/CppunitTest
+ else:
+ displayUsage()
+ sys.exit(1)
+ else:
+ targetFileName = sys.argv[1]
+ sourceDirectory = sys.argv[2]
+
+ # check if sourceDirectorty exists
+ if not os.path.isdir(sourceDirectory):
+print sourceDirectorty %s not found - Aborting % (sourceDirectory)
+sys.exit(1)
+
+ # last commit Id
+ lastCommitId = getLastCommitId()
+
+ # needs header in csv file ?
+ needsCsvHeader = not os.path.isfile(targetFileName)
+
+ # call walker
+ globalResult = processDirectory(sourceDirectory)
+
+ print globalResult
+
+ # write result
+ fileResult = open(targetFileName,'a')
+ fileResult.write(globalResult)
+ fileResult.close()
___
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/layact.hxx|9 +++--
sw/source/core/layout/layact.cxx | 13 -
2 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit b9f080e012d0e4f5343da940079c20d3f9c63513
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Oct 29 12:23:43 2014 +0100
Fix -fsanitize=signed-integer-overflow
...when std::clock_t is sufficiently small. Though the formula used in
SwLayAction::CheckWaitCrsr does look odd...
Change-Id: Iee32350850be4a1896c5cb41eff748f0cb5382a2
diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx
index 3d8d42c..897dc7e 100644
--- a/sw/source/core/inc/layact.hxx
+++ b/sw/source/core/inc/layact.hxx
@@ -18,6 +18,11 @@
*/
#ifndef INCLUDED_SW_SOURCE_CORE_INC_LAYACT_HXX
#define INCLUDED_SW_SOURCE_CORE_INC_LAYACT_HXX
+
+#include sal/config.h
+
+#include ctime
+
#include swtypes.hxx
#include swrect.hxx
@@ -62,7 +67,7 @@ class SwLayAction
// The InternalAction can then take the appropriate steps.
sal_uInt16 nPreInvaPage;
-sal_uLong nStartTicks; // The Action's starting time; if too much
time passes the
+std::clock_t nStartTicks; // The Action's starting time; if too much
time passes the
// WaitCrsr can be enabled via CheckWaitCrsr()
sal_uInt16 nInputType; // Which input should terminate processing
@@ -111,7 +116,7 @@ class SwLayAction
bool RemoveEmptyBrowserPages();
inline void CheckIdleEnd();
-inline sal_uLong GetStartTicks() { return nStartTicks; }
+inline std::clock_t GetStartTicks() { return nStartTicks; }
public:
SwLayAction( SwRootFrm *pRt, SwViewImp *pImp );
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index ed0a031..f664f70 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -19,7 +19,7 @@
#include config_features.h
-#include time.h
+#include ctime
#include rootfrm.hxx
#include pagefrm.hxx
#include viewimp.hxx
@@ -99,16 +99,11 @@ static void BreakPoint()
} \
}
-inline sal_uLong Ticks()
-{
-return 1000 * clock() / CLOCKS_PER_SEC;
-}
-
void SwLayAction::CheckWaitCrsr()
{
RESCHEDULE
if ( !IsWait() IsWaitAllowed() IsPaint()
- ((Ticks() - GetStartTicks()) = CLOCKS_PER_SEC/2) )
+ ((std::clock() - GetStartTicks()) * 1000 / CLOCKS_PER_SEC =
CLOCKS_PER_SEC/2) )
{
pWait = new SwWait( *pRoot-GetFmt()-GetDoc()-GetDocShell(), true );
}
@@ -288,7 +283,7 @@ SwLayAction::SwLayAction( SwRootFrm *pRt, SwViewImp *pI ) :
pOptTab( 0 ),
pWait( 0 ),
nPreInvaPage( USHRT_MAX ),
-nStartTicks( Ticks() ),
+nStartTicks( std::clock() ),
nInputType( 0 ),
nEndPage( USHRT_MAX ),
nCheckPageNum( USHRT_MAX )
@@ -313,7 +308,7 @@ SwLayAction::~SwLayAction()
void SwLayAction::Reset()
{
pOptTab = 0;
-nStartTicks = Ticks();
+nStartTicks = std::clock();
nInputType = 0;
nEndPage = nPreInvaPage = nCheckPageNum = USHRT_MAX;
bPaint = bComplete = bWaitAllowed = bCheckPages = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: pyuno/source
pyuno/source/module/pyuno.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 922f2005f34589e60969be3f2bf74e4af58e2e69
Author: Naruhiko Ogasawara naru...@gmail.com
Date: Sat Oct 25 17:54:22 2014 +0900
fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT
- Clean up OSL_ASSERT
Change-Id: I1f3a5dcfe08876da9bb4a8486311eb0ca9bab215
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index f468149..065513a 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -66,7 +66,7 @@ void PyUNO_del (PyObject* self)
OUString val2str( const void * pVal, typelib_TypeDescriptionReference *
pTypeRef , sal_Int32 mode )
{
-OSL_ASSERT( pVal );
+assert( pVal );
if (pTypeRef-eTypeClass == typelib_TypeClass_VOID)
return OUString(void);
@@ -124,7 +124,7 @@ OUString val2str( const void * pVal,
typelib_TypeDescriptionReference * pTypeRef
buf.append( { );
typelib_TypeDescription * pTypeDescr = 0;
TYPELIB_DANGER_GET( pTypeDescr, pTypeRef );
-OSL_ASSERT( pTypeDescr );
+assert( pTypeDescr );
typelib_CompoundTypeDescription * pCompType =
(typelib_CompoundTypeDescription *)pTypeDescr;
sal_Int32 nDescr = pCompType-nMembers;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 43157] Clean up OSL_ASSERT, DBG_ASSERT, etc.
https://bugs.freedesktop.org/show_bug.cgi?id=43157 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner |SkillCpp TopicCleanup |SkillCpp TopicCleanup |target:4.1.0 target:4.2.0 |target:4.1.0 target:4.2.0 |target:4.3.0|target:4.3.0 target:4.4.0 -- 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 43157] Clean up OSL_ASSERT, DBG_ASSERT, etc.
https://bugs.freedesktop.org/show_bug.cgi?id=43157 --- Comment #30 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Naruhiko Ogasawara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=922f2005f34589e60969be3f2bf74e4af58e2e69 fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT It will be available in 4.4.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/docnode/nodedump.cxx | 68
1 file changed, 46 insertions(+), 22 deletions(-)
New commits:
commit 59eac78fdc1e6579f104601734bdccc0e056d266
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Oct 29 12:28:40 2014 +0100
sw doc model xml dump: show bookmarks
Change-Id: Ib41c48b328835da533cba4b67dc34ce3ddfc1f9a
diff --git a/sw/source/core/docnode/nodedump.cxx
b/sw/source/core/docnode/nodedump.cxx
index b195aa9..1e05423 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -213,35 +213,59 @@ void MarkManager::dumpAsXml( xmlTextWriterPtr w ) const
{
WriterHelper writer(w);
writer.startElement(markManager);
-writer.startElement(fieldmarks);
-for (const_iterator_t it = m_vFieldmarks.begin(); it !=
m_vFieldmarks.end(); ++it)
+if (!m_vBookmarks.empty())
{
-pMark_t pMark = *it;
-writer.startElement(fieldmark);
-writer.writeFormatAttribute(startNode, TMP_FORMAT,
pMark-GetMarkStart().nNode.GetIndex());
-writer.writeFormatAttribute(startOffset, TMP_FORMAT_I32,
pMark-GetMarkStart().nContent.GetIndex());
-writer.writeFormatAttribute(endNode, TMP_FORMAT,
pMark-GetMarkEnd().nNode.GetIndex());
-writer.writeFormatAttribute(endOffset, TMP_FORMAT_I32,
pMark-GetMarkEnd().nContent.GetIndex());
-OString txt8 = OUStringToOString(pMark-GetName(),
RTL_TEXTENCODING_UTF8);
-writer.writeFormatAttribute(name, %s, BAD_CAST( txt8.getStr()));
+writer.startElement(bookmarks);
+for (const_iterator_t it = m_vBookmarks.begin(); it !=
m_vBookmarks.end(); ++it)
+{
+pMark_t pMark = *it;
+writer.startElement(bookmark);
+writer.writeFormatAttribute(startNode, TMP_FORMAT,
pMark-GetMarkStart().nNode.GetIndex());
+writer.writeFormatAttribute(startOffset, TMP_FORMAT_I32,
pMark-GetMarkStart().nContent.GetIndex());
+writer.writeFormatAttribute(endNode, TMP_FORMAT,
pMark-GetMarkEnd().nNode.GetIndex());
+writer.writeFormatAttribute(endOffset, TMP_FORMAT_I32,
pMark-GetMarkEnd().nContent.GetIndex());
+OString txt8 = OUStringToOString(pMark-GetName(),
RTL_TEXTENCODING_UTF8);
+writer.writeFormatAttribute(name, %s, BAD_CAST(
txt8.getStr()));
+writer.endElement();
+}
writer.endElement();
}
-writer.endElement();
-writer.startElement(annotationmarks);
-for (const_iterator_t it = m_vAnnotationMarks.begin(); it !=
m_vAnnotationMarks.end(); ++it)
+if (!m_vFieldmarks.empty())
{
-pMark_t pMark = *it;
-writer.startElement(annotationmark);
-writer.writeFormatAttribute(startNode, TMP_FORMAT,
pMark-GetMarkStart().nNode.GetIndex());
-writer.writeFormatAttribute(startOffset, TMP_FORMAT_I32,
pMark-GetMarkStart().nContent.GetIndex());
-writer.writeFormatAttribute(endNode, TMP_FORMAT,
pMark-GetMarkEnd().nNode.GetIndex());
-writer.writeFormatAttribute(endOffset, TMP_FORMAT_I32,
pMark-GetMarkEnd().nContent.GetIndex());
-OString txt8 = OUStringToOString(pMark-GetName(),
RTL_TEXTENCODING_UTF8);
-writer.writeFormatAttribute(name, %s, BAD_CAST( txt8.getStr()));
+writer.startElement(fieldmarks);
+for (const_iterator_t it = m_vFieldmarks.begin(); it !=
m_vFieldmarks.end(); ++it)
+{
+pMark_t pMark = *it;
+writer.startElement(fieldmark);
+writer.writeFormatAttribute(startNode, TMP_FORMAT,
pMark-GetMarkStart().nNode.GetIndex());
+writer.writeFormatAttribute(startOffset, TMP_FORMAT_I32,
pMark-GetMarkStart().nContent.GetIndex());
+writer.writeFormatAttribute(endNode, TMP_FORMAT,
pMark-GetMarkEnd().nNode.GetIndex());
+writer.writeFormatAttribute(endOffset, TMP_FORMAT_I32,
pMark-GetMarkEnd().nContent.GetIndex());
+OString txt8 = OUStringToOString(pMark-GetName(),
RTL_TEXTENCODING_UTF8);
+writer.writeFormatAttribute(name, %s, BAD_CAST(
txt8.getStr()));
+writer.endElement();
+}
+writer.endElement();
+}
+
+if (!m_vAnnotationMarks.empty())
+{
+writer.startElement(annotationmarks);
+for (const_iterator_t it = m_vAnnotationMarks.begin(); it !=
m_vAnnotationMarks.end(); ++it)
+{
+pMark_t pMark = *it;
+writer.startElement(annotationmark);
+writer.writeFormatAttribute(startNode, TMP_FORMAT,
pMark-GetMarkStart().nNode.GetIndex());
+writer.writeFormatAttribute(startOffset, TMP_FORMAT_I32,
pMark-GetMarkStart().nContent.GetIndex());
+writer.writeFormatAttribute(endNode, TMP_FORMAT,
pMark-GetMarkEnd().nNode.GetIndex());
+writer.writeFormatAttribute(endOffset, TMP_FORMAT_I32,
pMark-GetMarkEnd().nContent.GetIndex());
+OString txt8 = OUStringToOString(pMark-GetName(),
Re: Naruhiko Ogasawara license statement
On 10/26/2014 11:02 AM, Naruhiko Ogasawara wrote: All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. put on file at https://wiki.documentfoundation.org/index.php?title=Development/Developersoldid=103447 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/frmtool.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6906f659a2ef5f57fd71ddd79055b5563aa7ac22
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Oct 29 13:01:44 2014 +0100
Fix -fsanitize=signed-integer-overflow (when long int is 32-bit)
Change-Id: I25a96479eafa97eccace2879bf8e1af5e85f60c8
diff --git a/sw/source/core/layout/frmtool.cxx
b/sw/source/core/layout/frmtool.cxx
index e0b3c28..9c766ea 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -3301,7 +3301,7 @@ SwFrm* GetFrmOfModify( const SwRootFrm* pLayout, SwModify
const rMod, sal_uInt1
// Point not in rectangle. Compare distances:
const Point aCalcRectCenter = aCalcRect.Center();
const Point aDiff = aCalcRectCenter - *pPoint;
-const sal_uInt64 nCurrentDist = aDiff.getX() *
aDiff.getX() + aDiff.getY() * aDiff.getY(); // opt: no sqrt
+const sal_uInt64 nCurrentDist = sal_Int64(aDiff.getX()) *
sal_Int64(aDiff.getX()) + sal_Int64(aDiff.getY()) * sal_Int64(aDiff.getY()); //
opt: no sqrt
if ( !pMinFrm || nCurrentDist nMinDist )
{
pMinFrm = pTmpFrm;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/Module_desktop.mk
desktop/Module_desktop.mk |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 20860044c4a8c990a0b734c5a8eb63de4ab03260 Author: Michael Stahl mst...@redhat.com Date: Wed Oct 29 12:57:20 2014 +0100 desktop: do not builid crashrep.com if it's not packaged Change-Id: Ib2c8da0d901a81a41be16ec0c08985f991f1b7ab diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index cfaf0d9..a10f57e 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -56,10 +56,15 @@ endif ifeq ($(OS),WNT) +ifneq ($(ENABLE_CRASHDUMP),) +$(eval $(call gb_Module_add_targets,desktop,\ +Executable_crashrep_com \ +)) +endif + $(eval $(call gb_Module_add_targets,desktop,\ StaticLibrary_winextendloaderenv \ StaticLibrary_winlauncher \ -Executable_crashrep_com \ Executable_quickstart \ Executable_sbase \ Executable_scalc \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - 2 commits - vcl/source
vcl/source/opengl/OpenGLContext.cxx | 40 ++--
1 file changed, 16 insertions(+), 24 deletions(-)
New commits:
commit fb855f217f2af336090b3ebe40732eee1c3d5c99
Author: Daniel Stone dani...@collabora.com
Date: Wed Oct 29 13:20:52 2014 +0100
OpenGLContext: Consistently select the window's visual
When using an FBConfig, make sure we use a config compatible with the
visual we've already created our child window for.
Also remove FBConfigs from the non-debug path, as these are only used
when creating a 3.2 context.
Change-Id: I7350f961781bdfcd2e5ca740a38f6d1b0b5474aa
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index 787e5e5..9748270 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -369,6 +369,7 @@ int oglErrorHandler( Display* /*dpy*/, XErrorEvent*
/*evnt*/ )
return 0;
}
+#ifdef DBG_UTIL
GLXFBConfig* getFBConfig(Display* dpy, Window win, int nBestFBC)
{
if( dpy == 0 || !glXQueryExtension( dpy, NULL, NULL ) )
@@ -381,6 +382,7 @@ GLXFBConfig* getFBConfig(Display* dpy, Window win, int
nBestFBC)
int screen = XScreenNumberOfScreen( xattr.screen );
+// TODO: moggi: Select colour channel depth based on visual attributes,
not hardcoded */
static int visual_attribs[] =
{
GLX_DOUBLEBUFFER, True,
@@ -408,7 +410,7 @@ GLXFBConfig* getFBConfig(Display* dpy, Window win, int
nBestFBC)
for(int i = 0; i fbCount; ++i)
{
XVisualInfo* pVi = glXGetVisualFromFBConfig( dpy, pFBC[i] );
-if(pVi)
+if(pVi pVi-visualid == xattr.visual-visualid)
{
// pick the one with the most samples per pixel
int nSampleBuf = 0;
@@ -427,6 +429,7 @@ GLXFBConfig* getFBConfig(Display* dpy, Window win, int
nBestFBC)
return pFBC;
}
+#endif
// we need them before glew can initialize them
// glew needs an OpenGL context so we need to get the address manually
@@ -438,18 +441,14 @@ void initOpenGLFunctionPointers()
glXCreateContextAttribsARB = (GLXContext(*) (Display*, GLXFBConfig,
GLXContext, Bool, const int*)) glXGetProcAddressARB((const GLubyte *)
glXCreateContextAttribsARB);;
}
-XVisualInfo* getVisualInfo(Display* dpy, Window win)
+Visual* getVisual(Display* dpy, Window win)
{
initOpenGLFunctionPointers();
-int best_fbc = -1;
-GLXFBConfig* pFBC = getFBConfig(dpy, win, best_fbc);
-
-XVisualInfo* vi = glXGetVisualFromFBConfig( dpy, pFBC[best_fbc] );
-
-XFree(pFBC);
-
-return vi;
+XWindowAttributes xattr;
+XGetWindowAttributes( dpy, win, xattr );
+SAL_INFO(vcl.opengl, using VisualID xattr.visual);
+return xattr.visual;
}
}
@@ -495,14 +494,8 @@ bool OpenGLContext::init(Display* dpy, Window win, int
screen)
m_aGLWin.win = win;
m_aGLWin.screen = screen;
-XVisualInfo* vi = getVisualInfo(dpy, win);
-Visual* pVisual = NULL;
+Visual* pVisual = getVisual(dpy, win);
-if( vi )
-{
-SAL_INFO(vcl.opengl, using VisualID vi-visualid);
-pVisual = vi-visual;
-}
initGLWindow(pVisual);
return ImplInit();
@@ -855,6 +848,8 @@ void OpenGLContext::initGLWindow(Visual* pVisual)
}
// Check multi sample support
+/* TODO: moggi: This is not necessarily correct in the DBG_UTIL path, as
it picks
+ * an FBConfig instead ... */
int nSamples = 0;
glXGetConfig(m_aGLWin.dpy, m_aGLWin.vi, GLX_SAMPLES, nSamples);
if( nSamples 0 )
@@ -896,13 +891,7 @@ SystemWindowData
OpenGLContext::generateWinData(vcl::Window* pParent, bool)
if( dpy == 0 || !glXQueryExtension( dpy, NULL, NULL ) )
return aWinData;
-XVisualInfo* vi = getVisualInfo(dpy, win);
-
-if( vi )
-{
-SAL_INFO(vcl.opengl, using VisualID vi-visualid);
-aWinData.pVisual = (void*)(vi-visual);
-}
+aWinData.pVisual = getVisual(dpy, win);
return aWinData;
}
commit 363f27a942aaf9b291721512fce4c0b75f85e82b
Author: Daniel Stone dani...@collabora.com
Date: Wed Oct 29 13:05:07 2014 +0100
OpenGLContext: Add locking/sync around X errors
In order to manipulate the (global) X error handler without races, we
need to lock the X11 display, and also push an XSync through between
locking and changing the error handler, so we don't catch unrelated
errors.
Change-Id: Ic970224c98c05c6e13aadd781f8275cde5f37dd0
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index e5b5c6f..787e5e5 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -656,6 +656,8 @@ bool OpenGLContext::ImplInit()
if( glXSwapInterval ) {
int (*oldHandler)(Display* /*dpy*/, XErrorEvent* /*evnt*/);
+XLockDisplay(m_aGLWin.dpy);
+XSync(m_aGLWin.dpy, false);
// replace error handler temporarily
oldHandler =
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - 2 commits - vcl/source
vcl/source/opengl/OpenGLContext.cxx | 39 ++--
1 file changed, 20 insertions(+), 19 deletions(-)
New commits:
commit 4d2585e9b5595ed107d5e352757e6cecc832d6a8
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Wed Oct 29 13:46:44 2014 +0100
add more log messages
Change-Id: Idd3d876a658ac38aa6b32a624dada6b57b021002
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index 8aa97ff..c6ab13c 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -541,6 +541,7 @@ bool OpenGLContext::ImplInit()
None
};
m_aGLWin.ctx = glXCreateContextAttribsARB(m_aGLWin.dpy,
pFBC[best_fbc], 0, GL_TRUE, nContextAttribs);
+SAL_INFO_IF(m_aGLWin.ctx, vcl.opengl, created a 3.2 core context);
}
#endif
commit ec1653d8cf7b2b41a2dcea0a159ac22f1786d30d
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Wed Oct 29 13:28:43 2014 +0100
cosmetic clean-up
Change-Id: I8a156e66bc1b0f87129dcd85d3cc98fda3ba85aa
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index 9748270..8aa97ff 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -646,30 +646,31 @@ bool OpenGLContext::ImplInit()
// enable vsync
typedef GLint (*glXSwapIntervalProc)(GLint);
glXSwapIntervalProc glXSwapInterval = (glXSwapIntervalProc)
glXGetProcAddress( (const GLubyte*) glXSwapIntervalSGI );
-if( glXSwapInterval ) {
-int (*oldHandler)(Display* /*dpy*/, XErrorEvent* /*evnt*/);
+if( glXSwapInterval )
+{
+int (*oldHandler)(Display* /*dpy*/, XErrorEvent* /*evnt*/);
-XLockDisplay(m_aGLWin.dpy);
-XSync(m_aGLWin.dpy, false);
-// replace error handler temporarily
-oldHandler = XSetErrorHandler( oglErrorHandler );
+XLockDisplay(m_aGLWin.dpy);
+XSync(m_aGLWin.dpy, false);
+// replace error handler temporarily
+oldHandler = XSetErrorHandler( oglErrorHandler );
-errorTriggered = false;
+errorTriggered = false;
-glXSwapInterval( 1 );
+glXSwapInterval( 1 );
-// sync so that we possibly get an XError
-glXWaitGL();
-XSync(m_aGLWin.dpy, false);
+// sync so that we possibly get an XError
+glXWaitGL();
+XSync(m_aGLWin.dpy, false);
-if( errorTriggered )
-SAL_WARN(vcl.opengl, error when trying to set swap interval,
NVIDIA or Mesa bug?);
-else
-SAL_INFO(vcl.opengl, set swap interval to 1 (enable vsync));
+if( errorTriggered )
+SAL_WARN(vcl.opengl, error when trying to set swap
interval, NVIDIA or Mesa bug?);
+else
+SAL_INFO(vcl.opengl, set swap interval to 1 (enable
vsync));
-// restore the error handler
-XSetErrorHandler( oldHandler );
-XUnlockDisplay(m_aGLWin.dpy);
+// restore the error handler
+XSetErrorHandler( oldHandler );
+XUnlockDisplay(m_aGLWin.dpy);
}
}
@@ -730,7 +731,6 @@ void OpenGLContext::setWinSize(const Size rSize)
m_aGLWin.Height = rSize.Height();
}
-
void OpenGLContext::renderToFile()
{
int iWidth = m_aGLWin.Width;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - include/vcl vcl/inc vcl/source
include/vcl/outdev.hxx |8
vcl/inc/generic/genpspgraphics.h |2
vcl/inc/headless/svpgdi.hxx |1
vcl/inc/quartz/salgdi.h |1
vcl/inc/salgdi.hxx | 11
vcl/inc/unx/salgdi.h |2
vcl/inc/win/salgdi.h |1
vcl/source/gdi/salgdilayout.cxx |5
vcl/source/outdev/gradient.cxx | 521 ---
9 files changed, 461 insertions(+), 91 deletions(-)
New commits:
commit c5597ed5093f17bfaa05c0e009893ae9c9a13d36
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Sat Oct 25 18:51:51 2014 +1100
vcl: Allow SalGraphics to draw gradients natively
The aim of this patch is to allow for native gradient rendering in
SalGraphics (i.e. let OpenGL do this natively). It is a two step
process:
1. I need to allow gradient draw into SalGraphics, however the current
completely intertwined with the metafile code in OutputDevice. I am
seperating the gradient metafile code from the gradient drawing code.
2. After splitting the metafile stuff from the actual gradient drawing,
I am now able to call on SalGraphics::DrawGradient(). This just
calls on SalGraphics::drawGradient() which returns false if there is
no way of drawing native gradients, and true if there is. If false,
then we use OutputDevice's DrawGradient() functionality.
Conflicts:
vcl/inc/unx/salgdi.h
Change-Id: Ibaaabe13b76a8e7a037d9f751b5f662653a50566
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index d87100a..3d5dc3d 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -843,8 +843,12 @@ protected:
private:
-SAL_DLLPRIVATE void DrawLinearGradient( const Rectangle rRect,
const Gradient rGradient, bool bMtf, const tools::PolyPolygon* pClipPolyPoly );
-SAL_DLLPRIVATE void DrawComplexGradient( const Rectangle rRect,
const Gradient rGradient, bool bMtf, const tools::PolyPolygon* pClipPolyPoly );
+SAL_DLLPRIVATE void DrawLinearGradient( const Rectangle rRect,
const Gradient rGradient, const tools::PolyPolygon* pClipPolyPoly );
+SAL_DLLPRIVATE void DrawComplexGradient( const Rectangle rRect,
const Gradient rGradient, const tools::PolyPolygon* pClipPolyPoly );
+
+SAL_DLLPRIVATE void DrawGradientToMetafile( const
tools::PolyPolygon rPolyPoly, const Gradient rGradient );
+SAL_DLLPRIVATE void DrawLinearGradientToMetafile( const Rectangle
rRect, const Gradient rGradient );
+SAL_DLLPRIVATE void DrawComplexGradientToMetafile( const
Rectangle rRect, const Gradient rGradient );
SAL_DLLPRIVATE long GetGradientSteps( const Gradient rGradient,
const Rectangle rRect, bool bMtf, bool bComplex=false );
diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h
index 2a562c3..30c8fec 100644
--- a/vcl/inc/generic/genpspgraphics.h
+++ b/vcl/inc/generic/genpspgraphics.h
@@ -148,6 +148,8 @@ public:
const sal_uInt32* pPoints,
const SalPoint* const*
pPtAry,
const sal_uInt8* const*
pFlgAry ) SAL_OVERRIDE;
+virtual booldrawGradient( const tools::PolyPolygon, const
Gradient ) SAL_OVERRIDE { return false; };
+
virtual voidcopyArea( long nDestX,
long nDestY,
long nSrcX,
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index a872d4a..cbbac7a 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -211,6 +211,7 @@ public:
const sal_uInt32* pPoints,
const SalPoint* const*
pPtAry,
const sal_uInt8* const*
pFlgAry ) SAL_OVERRIDE;
+virtual booldrawGradient( const tools::PolyPolygon, const
Gradient ) SAL_OVERRIDE { return false; };
virtual voidcopyArea( long nDestX,
long nDestY,
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 23d3bb3..eb21e09 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -237,6 +237,7 @@ public:
const ::basegfx::B2DVector rLineWidths,
basegfx::B2DLineJoin,
com::sun::star::drawing::LineCap eLineCap)
SAL_OVERRIDE;
+virtual booldrawGradient( const tools::PolyPolygon, const
Gradient ) SAL_OVERRIDE { return false; };
// CopyArea -- No RasterOp, but ClipRegion
virtual voidcopyArea( long nDestX, long nDestY, long nSrcX,
long nSrcY, long nSrcWidth,
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
[Libreoffice-commits] core.git: Repository.mk RepositoryModule_host.mk sc/CppunitTest_sc_opencl_test.mk sc/inc sc/Library_sc.mk sc/Library_scopencl.mk sc/Module_sc.mk sc/source
Repository.mk|1 RepositoryModule_host.mk |1 sc/CppunitTest_sc_opencl_test.mk |1 sc/Library_sc.mk | 33 sc/Library_scopencl.mk | 67 sc/Module_sc.mk |6 - sc/inc/pch/precompiled_sc.hxx|4 + sc/inc/pch/precompiled_scopencl.cxx | 12 --- sc/inc/pch/precompiled_scopencl.hxx | 41 -- sc/source/core/opencl/clcc/clew.cxx |3 sc/source/core/opencl/formulagroupcl.cxx | 10 +- sc/source/core/opencl/opencl_device.cxx |3 sc/source/core/opencl/openclwrapper.cxx |5 - sc/source/core/tool/formulagroup.cxx | 123 +-- 14 files changed, 55 insertions(+), 255 deletions(-) New commits: commit 28561633d82df4f7909b6d8211d4bff2912f1bd6 Author: Tor Lillqvist t...@collabora.com Date: Wed Oct 29 14:45:48 2014 +0200 Don't bother with a separate dynamically loaded scopencl library Just link that code into the sc library. We use clew anyway to handle optoinal presence of OpenCL at run-time. This is a straightforward change for now. Could be cleaner; we could get rid of the fairly pointless wrappers in sc/source/core/opencl/formulagroupcl.cxx for instance. Change-Id: I23215c6516ef04698f6891e2a7fc6611dc83b37a diff --git a/Repository.mk b/Repository.mk index 628a71a..7ca98ff 100644 --- a/Repository.mk +++ b/Repository.mk @@ -226,7 +226,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \ scfilt \ scui \ wpftcalc \ - $(if $(ENABLE_OPENCL),scopencl) \ $(if $(ENABLE_COINMP)$(ENABLE_LPSOLVE),solver) \ $(call gb_Helper_optional,SCRIPTING,vbaobj) \ )) diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 6d9b51f..6190e4b 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -183,7 +183,6 @@ endef ifeq (,$(filter-out all build check unitcheck slowcheck subsequentcheck,$(MAKECMDGOALS))) $(eval $(call repositorymodule_serialize,\ scfilt \ - $(if $(ENABLE_OPENCL),scopencl) \ $(call gb_Helper_optional,SCRIPTING,vbaobj) \ sc msword \ $(call gb_Helper_optional,DESKTOP,swui) \ diff --git a/sc/CppunitTest_sc_opencl_test.mk b/sc/CppunitTest_sc_opencl_test.mk index 4fc6ecb..16ebd5e 100644 --- a/sc/CppunitTest_sc_opencl_test.mk +++ b/sc/CppunitTest_sc_opencl_test.mk @@ -36,7 +36,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_opencl_test, \ salhelper \ sax \ sc \ -$(if $(ENABLE_OPENCL),scopencl) \ scqahelper \ sfx \ sot \ diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index 5a7c03b..3648720 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -655,6 +655,39 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/ui/xmlsource/xmlsourcedlg \ )) +ifneq (,$(ENABLE_OPENCL)) + +$(eval $(call gb_Library_add_exception_objects,sc,\ +sc/source/core/opencl/formulagroupcl \ +sc/source/core/opencl/openclwrapper \ +sc/source/core/opencl/opencl_device \ +sc/source/core/opencl/opbase \ +sc/source/core/opencl/op_financial \ +sc/source/core/opencl/op_database \ +sc/source/core/opencl/op_math \ +sc/source/core/opencl/op_addin \ +sc/source/core/opencl/op_statistical \ +sc/source/core/opencl/op_array \ +sc/source/core/opencl/op_logical \ +sc/source/core/opencl/op_spreadsheet \ +sc/source/core/opencl/clcc/clew \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_libs,sc,\ +-ldl \ + -lrt \ +)) +endif + +ifeq ($(OS),MACOSX) +$(eval $(call gb_Library_add_libs,sc,\ +-framework OpenCL \ +)) +endif + +endif + $(eval $(call gb_SdiTarget_SdiTarget,sc/sdi/scslots,sc/sdi/scalc)) $(eval $(call gb_SdiTarget_set_include,sc/sdi/scslots,\ diff --git a/sc/Library_scopencl.mk b/sc/Library_scopencl.mk deleted file mode 100644 index 5f60a37..000 --- a/sc/Library_scopencl.mk +++ /dev/null @@ -1,67 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Library_Library,scopencl)) - -$(eval $(call gb_Library_set_include,scopencl,\ --I$(SRCDIR)/sc/source/core/inc \ --I$(SRCDIR)/sc/inc \ -$$(INCLUDE) \ -)) - -$(eval $(call gb_Library_set_precompiled_header,scopencl,$(SRCDIR)/sc/inc/pch/precompiled_scopencl)) - -$(eval $(call gb_Library_use_sdk_api,scopencl)) - -$(eval $(call gb_Library_use_externals,scopencl,\ -boost_headers \ -)) - -$(eval $(call gb_Library_use_libraries,scopencl,\ -comphelper \ -cppu \ -cppuhelper \ -for \ -sal \ -svl \
[Libreoffice-commits] core.git: Branch 'private/jmux/mailmerge-fixes' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/jmux/master+fixes' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/jmux/layout-fixes' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/jmux/indexed-pagedescs' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/CppunitTest_sc_opencl_test.mk sc/CppunitTest_sc_ucalc.mk sc/source
sc/CppunitTest_sc_opencl_test.mk |7
sc/CppunitTest_sc_ucalc.mk |7
sc/source/core/inc/clcc/clew.h | 1316 +++
sc/source/core/inc/formulagroupcl.hxx| 41
sc/source/core/inc/openclwrapper.hxx | 111 ++
sc/source/core/opencl/clcc/clew.cxx |2
sc/source/core/opencl/clcc/clew.h| 1316 ---
sc/source/core/opencl/formulagroupcl.cxx | 58 -
sc/source/core/opencl/openclwrapper.hxx | 111 --
sc/source/core/tool/formulagroup.cxx | 22
10 files changed, 1494 insertions(+), 1497 deletions(-)
New commits:
commit 3bdee6495ebc7f515d6d297e7f7df9a46acc3880
Author: Tor Lillqvist t...@collabora.com
Date: Wed Oct 29 17:12:13 2014 +0200
Avoid pointless thin wrapper layer
Also works around some warnings from our Clang plug-ins.
Change-Id: Ic9d2bbafefac345b6319300514735143f92dd196
diff --git a/sc/source/core/opencl/clcc/clew.h b/sc/source/core/inc/clcc/clew.h
similarity index 100%
rename from sc/source/core/opencl/clcc/clew.h
rename to sc/source/core/inc/clcc/clew.h
diff --git a/sc/source/core/inc/formulagroupcl.hxx
b/sc/source/core/inc/formulagroupcl.hxx
new file mode 100644
index 000..9325b25
--- /dev/null
+++ b/sc/source/core/inc/formulagroupcl.hxx
@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_SC_SOURCE_CORE_INC_FORMULAGROUPCL_HXX
+#define INCLUDED_SC_SOURCE_CORE_INC_FORMULAGROUPCL_HXX
+
+#include formulagroup.hxx
+
+namespace sc { namespace opencl {
+
+class FormulaGroupInterpreterOpenCL : public FormulaGroupInterpreter
+{
+public:
+FormulaGroupInterpreterOpenCL() :
+FormulaGroupInterpreter()
+{
+}
+virtual ~FormulaGroupInterpreterOpenCL()
+{
+}
+
+virtual ScMatrixRef inverseMatrix( const ScMatrix rMat ) SAL_OVERRIDE;
+virtual CompiledFormula* createCompiledFormula( ScDocument rDoc,
+const ScAddress rTopPos,
+ScFormulaCellGroup rGroup,
+ScTokenArray rCode ) SAL_OVERRIDE;
+virtual bool interpret( ScDocument rDoc, const ScAddress rTopPos,
+ScFormulaCellGroupRef xGroup, ScTokenArray rCode ) SAL_OVERRIDE;
+};
+
+}} // namespace sc::opencl
+
+#endif // INCLUDED_SC_SOURCE_CORE_INC_FORMULAGROUPCL_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/opencl/openclwrapper.hxx
b/sc/source/core/inc/openclwrapper.hxx
similarity index 100%
rename from sc/source/core/opencl/openclwrapper.hxx
rename to sc/source/core/inc/openclwrapper.hxx
diff --git a/sc/source/core/opencl/clcc/clew.cxx
b/sc/source/core/opencl/clcc/clew.cxx
index 636c8e2..dec4cc9 100644
--- a/sc/source/core/opencl/clcc/clew.cxx
+++ b/sc/source/core/opencl/clcc/clew.cxx
@@ -4,7 +4,7 @@
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file license.txt)
-#include clew.h
+#include clcc/clew.h
//! \file clew.c
//! \brief OpenCL run-time loader source
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 4286050..645d889 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -8,6 +8,7 @@
*/
#include formulagroup.hxx
+#include formulagroupcl.hxx
#include clkernelthread.hxx
#include grouptokenconverter.hxx
#include document.hxx
@@ -3510,26 +3511,6 @@ const DynamicKernelArgument* SymbolTable::DeclRefArg(
}
}
-class FormulaGroupInterpreterOpenCL : public FormulaGroupInterpreter
-{
-public:
-FormulaGroupInterpreterOpenCL() :
-FormulaGroupInterpreter()
-{
-}
-virtual ~FormulaGroupInterpreterOpenCL()
-{
-}
-
-virtual ScMatrixRef inverseMatrix( const ScMatrix rMat ) SAL_OVERRIDE;
-virtual CompiledFormula* createCompiledFormula( ScDocument rDoc,
-const ScAddress rTopPos,
-ScFormulaCellGroup rGroup,
-ScTokenArray rCode ) SAL_OVERRIDE;
-virtual bool interpret( ScDocument rDoc, const ScAddress rTopPos,
-ScFormulaCellGroupRef xGroup, ScTokenArray rCode ) SAL_OVERRIDE;
-};
-
ScMatrixRef FormulaGroupInterpreterOpenCL::inverseMatrix( const ScMatrix )
{
return NULL;
@@ -3730,41 +3711,4 @@ bool FormulaGroupInterpreterOpenCL::interpret(
ScDocument rDoc,
}} // namespace sc::opencl
-extern C {
-
-sc::FormulaGroupInterpreter*
-createFormulaGroupOpenCLInterpreter()
-{
-return new sc::opencl::FormulaGroupInterpreterOpenCL();
-}
-
-size_t getOpenCLPlatformCount()
-{
-return sc::opencl::getOpenCLPlatformCount();
-}
-
-void fillOpenCLInfo(
-sc::OpenCLPlatformInfo* pInfos, size_t nInfoSize )
-{
-const std::vectorsc::OpenCLPlatformInfo
[Libreoffice-commits] core.git: Branch 'feature/priorities' - vcl/source
vcl/source/app/timer.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 921da06de1d246652665c6dd535fd50c68647f74
Author: Tobias Madl tobias.madl@gmail.com
Date: Wed Oct 29 15:17:32 2014 +
Minor bug fixes of scheduling process
Change-Id: I47ad343496aff29016941f6c894c517136f992d5
diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx
index 894fb7a..bad6c1b 100644
--- a/vcl/source/app/timer.cxx
+++ b/vcl/source/app/timer.cxx
@@ -105,7 +105,7 @@ void Timer::ImplTimerCallbackProc()
pSVData-mnTimerUpdate++;
pSVData-mbNotAllTimerCalled = true;
pTimerData = pSVData-mpFirstTimerData;
-pPrioFirstTimerData = pTimerData;
+pPrioFirstTimerData = NULL;
while ( pTimerData )
{
@@ -115,8 +115,9 @@ void Timer::ImplTimerCallbackProc()
!pTimerData-mbDelete !pTimerData-mbInTimeout )
{
// time has expired
-if ( (pTimerData-mnUpdateTime+pTimerData-mpTimer-mnTimeout) =
nTime )
+if ( (pTimerData-mnUpdateTime+pTimerData-mpTimer-mnTimeout) =
nTime || pTimerData-mpTimer-GetPriority()
pTimerData-mpTimer-GetDefaultPriority() )
{
+
pTimerData-mpTimer-SetPriority(pTimerData-mpTimer-GetPriority() - 1);
ImplTimerData* pCurrentTimer = pPrioFirstTimerData;
pPrevTimerData = NULL;
if(pCurrentTimer != pTimerData){
@@ -144,7 +145,6 @@ void Timer::ImplTimerCallbackProc()
pCurrentTimer = pPrioFirstTimerData;
}
}
-
pTimerData-mpTimer-SetPriority(pTimerData-mpTimer-GetPriority() - 1);
pPrioFirstTimerData = pCurrentTimer;
}
}
@@ -245,8 +245,8 @@ void Timer::ImplTimerCallbackProc()
ImplStartTimer( pSVData, nMinPeriod );
pSVData-mnTimerUpdate--;
-if(bAllTimerCalled)
-pSVData-mbNotAllTimerCalled = false;
+//if(bAllTimerCalled)
+pSVData-mbNotAllTimerCalled = false;
}
Timer::Timer():
___
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/inc/openclwrapper.hxx|1 -
sc/source/core/opencl/openclwrapper.cxx | 15 ---
sc/source/core/tool/formulagroup.cxx|4
3 files changed, 20 deletions(-)
New commits:
commit 8007a9d1fc1912ec128199314f69562131eb10fb
Author: Tor Lillqvist t...@collabora.com
Date: Wed Oct 29 17:48:49 2014 +0200
sc::opencl::getOpenCLPlatformCount is unneeded
The same information can be seem from the size of the vector reference
returned by sc::opencl::fillOpenCLInfo().
Change-Id: I797aacdf85a852bc4fa65e0536fd5940aed396a1
diff --git a/sc/source/core/inc/openclwrapper.hxx
b/sc/source/core/inc/openclwrapper.hxx
index ef9842a..bc3957f 100644
--- a/sc/source/core/inc/openclwrapper.hxx
+++ b/sc/source/core/inc/openclwrapper.hxx
@@ -88,7 +88,6 @@ public:
static void setKernelEnv( KernelEnv *envInfo );
};
-size_t getOpenCLPlatformCount();
const std::vectorOpenCLPlatformInfo fillOpenCLInfo();
/**
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index 0f462c0..464d70b 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -754,21 +754,6 @@ bool createPlatformInfo(cl_platform_id nPlatformId,
OpenCLPlatformInfo rPlatfor
}
-size_t getOpenCLPlatformCount()
-{
-int status = clewInit(OPENCL_DLL_NAME);
-if (status 0)
-return 0;
-
-cl_uint nPlatforms;
-cl_int nState = clGetPlatformIDs(0, NULL, nPlatforms);
-
-if (nState != CL_SUCCESS)
-return 0;
-
-return nPlatforms;
-}
-
const std::vectorOpenCLPlatformInfo fillOpenCLInfo()
{
static std::vectorOpenCLPlatformInfo aPlatforms;
diff --git a/sc/source/core/tool/formulagroup.cxx
b/sc/source/core/tool/formulagroup.cxx
index 9d61efa..32e83c6 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -540,10 +540,6 @@ void
FormulaGroupInterpreter::fillOpenCLInfo(std::vectorOpenCLPlatformInfo rP
#if !HAVE_FEATURE_OPENCL
(void) rPlatforms;
#else
-size_t nPlatforms = sc::opencl::getOpenCLPlatformCount();
-if (!nPlatforms)
-return;
-
const std::vectorsc::OpenCLPlatformInfo rPlatformsFromWrapper =
sc::opencl::fillOpenCLInfo();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - include/sfx2 registry/source sfx2/source vcl/source
include/sfx2/dinfdlg.hxx |5 +++--
registry/source/reflcnst.hxx | 23 ++-
sfx2/source/dialog/dinfdlg.cxx | 24 +++-
vcl/source/window/window.cxx |2 ++
4 files changed, 38 insertions(+), 16 deletions(-)
New commits:
commit d8bc093dd07ceba42c9d722e7ccca4caedbd91e4
Author: Caolán McNamara caol...@redhat.com
Date: Wed Oct 29 16:00:18 2014 +
need to initialize mnRefCnt
all sorts of things crash, e.g. format-properties
Change-Id: Ida4fb97dc7adde4b98fa67b107a514eef615
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index a8617ae..606a4f5 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1187,6 +1187,8 @@ void Window::ImplInitWindowData( WindowType nType )
// it will not *be* an OutputDevice
mpOutputDevice = (OutputDevice*)this;
+mnRefCnt = 0;
+
mpWindowImpl = new WindowImpl( nType );
meOutDevType= OUTDEV_WINDOW;
commit f0ffe0c063c8fe32758d77c83f773821ac185ba0
Author: Caolán McNamara caol...@redhat.com
Date: Wed Oct 29 13:20:13 2014 +
Resolves: fdo#85111 put a border around the custom properties box
Change-Id: Ibdbfb4a88c1c75aaf5d33672d8639a9ea55afbac
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index a70b5ee..340681a 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -465,9 +465,10 @@ public:
// class CustomPropertiesControl -
-class CustomPropertiesControl : public VclVBox
+class CustomPropertiesControl : public vcl::Window
{
private:
+VclVBox*m_pVBox;
HeaderBar* m_pHeaderBar;
VclHBox*m_pBody;
CustomPropertiesWindow* m_pPropertiesWin;
@@ -490,7 +491,7 @@ public:
GetCustomProperties() const
{ return m_pPropertiesWin-GetCustomProperties(); }
voidInit(VclBuilderContainer rParent);
-virtual void setAllocation(const Size rAllocation) SAL_OVERRIDE;
+virtual void Resize() SAL_OVERRIDE;
};
// class SfxCustomPropertiesPage -
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index d6a2a6e..b69a9d6 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1985,7 +1985,8 @@ Sequence beans::PropertyValue
CustomPropertiesWindow::GetCustomProperties() c
}
CustomPropertiesControl::CustomPropertiesControl(vcl::Window* pParent)
-: VclVBox(pParent)
+: Window(pParent, WB_HIDE | WB_CLIPCHILDREN | WB_TABSTOP |
WB_DIALOGCONTROL | WB_BORDER)
+, m_pVBox(NULL)
, m_pHeaderBar(NULL)
, m_pBody(NULL)
, m_pPropertiesWin(NULL)
@@ -1996,8 +1997,9 @@
CustomPropertiesControl::CustomPropertiesControl(vcl::Window* pParent)
void CustomPropertiesControl::Init(VclBuilderContainer rBuilder)
{
-m_pHeaderBar = new HeaderBar(this, WB_BUTTONSTYLE | WB_BOTTOMBORDER);
-m_pBody = new VclHBox(this);
+m_pVBox = new VclVBox(this);
+m_pHeaderBar = new HeaderBar(m_pVBox, WB_BUTTONSTYLE | WB_BOTTOMBORDER);
+m_pBody = new VclHBox(m_pVBox);
FixedText* pName = rBuilder.getFixedText(name);
FixedText* pType = rBuilder.getFixedText(type);
FixedText* pValue = rBuilder.getFixedText(value);
@@ -2012,6 +2014,12 @@ void CustomPropertiesControl::Init(VclBuilderContainer
rBuilder)
set_expand(true);
set_fill(true);
+m_pVBox-set_hexpand(true);
+m_pVBox-set_vexpand(true);
+m_pVBox-set_expand(true);
+m_pVBox-set_fill(true);
+m_pVBox-Show();
+
m_pBody-set_hexpand(true);
m_pBody-set_vexpand(true);
m_pBody-set_expand(true);
@@ -2048,9 +2056,14 @@ void CustomPropertiesControl::Init(VclBuilderContainer
rBuilder)
m_pVertScroll-SetScrollHdl( aScrollLink );
}
-void CustomPropertiesControl::setAllocation(const Size rAllocation)
+void CustomPropertiesControl::Resize()
{
-VclVBox::setAllocation(rAllocation);
+Window::Resize();
+
+if (!m_pVBox)
+return;
+
+m_pVBox-SetSizePixel(GetSizePixel());
bool bWidgetsResized = m_pPropertiesWin-InitControls( m_pHeaderBar,
m_pVertScroll );
sal_Int32 nScrollOffset = m_pPropertiesWin-GetLineHeight();
@@ -2075,6 +2088,7 @@ CustomPropertiesControl::~CustomPropertiesControl()
delete m_pPropertiesWin;
delete m_pBody;
delete m_pHeaderBar;
+delete m_pVBox;
}
IMPL_LINK( CustomPropertiesControl, ScrollHdl, ScrollBar*, pScrollBar )
commit 6484bf5f3f33a62670a29bf9a1f08bf62b64f145
Author: Caolán McNamara caol...@redhat.com
Date: Wed Oct 29 11:04:40 2014 +
untaint registry data
by using a byte-swapping pattern that coverity doesn't detect as such
tested as a scratch coverity attempt with a smaller project which
has a far higher allocation of coverity attempts per week :-)
unsigned int readTaintedUINT32(const char* buffer)
Re: copying version from Help About
On Mon, 2014-10-27 at 10:33 -0400, Terrence Enger wrote: Hello, All, I am in the habit of copying version information for LibreOffice on Windows from the Help About dialog. Today with the build (beware: I am typing this rather than pasting it grin /): Build ID: c967872d... TinderBox: Win-x86@42, Branch:master, Time: 2014-10-13_00:02:37 Ctrl+A in the dialog does not highlight the version information and Ctrl+C does not copy it. Is this a bug? In LibreOffice rather than something on the tinderbox machine? How can I tell? Is this still broken for you under windows. FWIW its working ok for me under Linux. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/test solenv/gbuild test/Library_test.mk test/source
include/test/callgrind.hxx | 21 +++ solenv/gbuild/CppunitTest.mk| 25 -- solenv/gbuild/extensions/post_SpeedUpTargets.mk |2 + test/Library_test.mk|2 + test/source/callgrind.cxx | 33 5 files changed, 64 insertions(+), 19 deletions(-) New commits: commit e4e7f9d88e05fa610a72245c40f4e47f85db61ff Author: Matúš Kukan matus.ku...@collabora.com Date: Wed Oct 29 11:51:49 2014 +0100 Improve framework for callgrind performance unit tests Do not abort in tests which take longer then before. Since 4f5f6d2444a24138c3d3d378771f87cb06427195 we have nice tool to collect callgrind results, store them.. Also, make it not necessary to duplicate anything. Any test can be turned into a performance test by using callgrindStart/callgrindDump. You only need to duplicate the makefile name in gb_Module_add_perfcheck_targets. So, if the test is run as part of 'perfcheck', it runs under callgrind, otherwise it behaves like a regular unit test. Change-Id: I7acbb855b1823c9a32ba126abb57dccc767ca239 diff --git a/include/test/callgrind.hxx b/include/test/callgrind.hxx new file mode 100644 index 000..6a16fa8 --- /dev/null +++ b/include/test/callgrind.hxx @@ -0,0 +1,21 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef INCLUDED_TEST_CALLGRIND_HXX +#define INCLUDED_TEST_CALLGRIND_HXX + +#include sal/config.h +#include test/testdllapi.hxx + +void OOO_DLLPUBLIC_TEST callgrindStart(); +void OOO_DLLPUBLIC_TEST callgrindDump(const char* name); + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index aa259e3..4f00f81 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -34,6 +34,11 @@ GLIBCXX_FORCE_NEW := 1 endif endif +ifneq (,$(filter perfcheck,$(MAKECMDGOALS))) +$(if $(ENABLE_VALGRIND),,$(call gb_Output_error,Running performance tests with empty $$(ENABLE_VALGRIND) does not make sense)) +gb_CppunitTest_VALGRINDTOOL := valgrind --tool=callgrind --dump-instr=yes --instr-atstart=no +endif + # defined by platform # gb_CppunitTest_TARGETTYPE # gb_CppunitTest_get_filename @@ -94,10 +99,7 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTDEPS) || ($(if $(value gb_CppunitTest_postprocess), \ RET=$$?; \ $(call gb_CppunitTest_postprocess,$(gb_CppunitTest_CPPTESTCOMMAND),$@.core,$$RET) $@.log 21;) \ - cat $@.log; $(SRCDIR)/solenv/bin/unittest-failed.sh Cppunit $*))) \ - $(if $(PERFTEST), VAL=$$(grep '^==.*== Collected : ' $@.log | sed s/==.*== Collected : //) \ - $(if $(filter 0,$(PERFTEST)), expr $$VAL * 101 / 100, test $$VAL -le $(PERFTEST) || (echo Unit test is slow! $$VAL instructions detected (expected $(PERFTEST)). false))) \ - ) + cat $@.log; $(SRCDIR)/solenv/bin/unittest-failed.sh Cppunit $* define gb_CppunitTest_CppunitTest $(call gb_CppunitTest__CppunitTest_impl,$(1),$(call gb_CppunitTest_get_linktarget,$(1))) @@ -147,21 +149,6 @@ $(call gb_CppunitTest_get_target,$(1)) : ARGS += $(2) endef -# Run this unit test with callgrind tool to measure performance. If you are -# creating a new test, first set the number to 0, run the test, and it will -# print an number for you to use as a second parameter here. The test will -# fail if reported number of instructions will be bigger than this parameter. -# -# call gb_CppunitTest_set_performance_test,name,instructions_number -define gb_CppunitTest_set_performance_test -$(if $(ENABLE_VALGRIND),,$(call gb_Output_error,gb_CppunitTest_set_performance_test used with empty $$(ENABLE_VALGRIND))) - -$(call gb_CppunitTest_get_target,$(1)) : PERFTEST := $(2) -$(call gb_CppunitTest_get_target,$(1)) : gb_CppunitTest_VALGRINDTOOL := valgrind --tool=callgrind --dump-instr=yes --instr-atstart=no -$(call gb_CppunitTest_use_external,$(1),valgrind) - -endef - define gb_CppunitTest_use_ure $(call gb_CppunitTest_use_rdb,$(1),ure/services) $(call gb_CppunitTest_get_target,$(1)) : URE := $(true) diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk b/solenv/gbuild/extensions/post_SpeedUpTargets.mk index 8f3280f..a13392a 100644 --- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk +++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk @@ -22,6 +22,8 @@ endif ifeq (,$(filter perfcheck,$(MAKECMDGOALS)))
[Libreoffice-commits] core.git: include/oox oox/source
include/oox/drawingml/shape.hxx |2 +-
oox/source/drawingml/shape.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 628543c16d541a79b4933c9ffe7ce90d2b8ab746
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Oct 29 17:58:05 2014 +0100
const
Change-Id: I0d89cc99a1d8f7b3c17986b45653dce5e4b436d7
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 0814299..c0f0fd3 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -216,7 +216,7 @@ protected:
const ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShapes rxShapes,
const ::com::sun::star::awt::Rectangle
rClientRect,
ShapeIdMap* pShapeMap,
-basegfx::B2DHomMatrix aTransformation );
+const basegfx::B2DHomMatrix aTransformation );
voidkeepDiagramCompatibilityInfo(
::oox::core::XmlFilterBase rFilterBase );
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index b635ed4..1f10494 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -347,7 +347,7 @@ void Shape::addChildren(
const Reference XShapes rxShapes,
const awt::Rectangle,
ShapeIdMap* pShapeMap,
-basegfx::B2DHomMatrix aTransformation )
+const basegfx::B2DHomMatrix aTransformation )
{
basegfx::B2DHomMatrix aChildTransformation;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/oox oox/source
include/oox/drawingml/shape.hxx |2 +- oox/source/drawingml/shape.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 591d4559c5068d6f1f61fc63571a9fa6286b5661 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Oct 29 18:09:02 2014 +0100 const Change-Id: Ia76df719b2f76a993e65e0bf6d55723b1a2f5b93 diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index c0f0fd3..3c999b0 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -152,7 +152,7 @@ public: ::oox::core::XmlFilterBase rFilterBase, const Theme* pTheme, const ::com::sun::star::uno::Reference ::com::sun::star::drawing::XShapes rxShapes, -basegfx::B2DHomMatrix aTransformation, +const basegfx::B2DHomMatrix aTransformation, FillProperties rShapeOrParentShapeFillProps, const ::com::sun::star::awt::Rectangle* pShapeRect = 0, ShapeIdMap* pShapeMap = 0 ); diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 1f10494..2d48902 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -229,7 +229,7 @@ void Shape::addShape( ::oox::core::XmlFilterBase rFilterBase, const Theme* pTheme, const Reference XShapes rxShapes, -basegfx::B2DHomMatrix aTransformation, +const basegfx::B2DHomMatrix aTransformation, FillProperties rShapeOrParentShapeFillProps, const awt::Rectangle* pShapeRect, ShapeIdMap* pShapeMap ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/layout.hxx |1 +
vcl/source/window/layout.cxx | 13 -
2 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 62c125bbb4d27631af6cbcb498e765c0b215b734
Author: Caolán McNamara caol...@redhat.com
Date: Wed Oct 29 17:12:11 2014 +
Resolves: rhbz#1146169 a11y frames label dies before frame
Change-Id: Ie5650c3a5593dcf68196802169c47270a0c3b0e6
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 88f1887..edb8d6b 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -459,6 +459,7 @@ private:
private:
friend class VclBuilder;
void designate_label(vcl::Window *pWindow);
+DECL_LINK(WindowEventListener, VclSimpleEvent*);
public:
VclFrame(vcl::Window *pParent)
: VclBin(pParent)
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 5f5ad67..9d4b167 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1340,10 +1340,21 @@ void VclFrame::setAllocation(const Size rAllocation)
setLayoutAllocation(*pChild, aChildPos, aAllocation);
}
+IMPL_LINK(VclFrame, WindowEventListener, VclSimpleEvent*, pEvent)
+{
+if (pEvent pEvent-GetId() == VCLEVENT_OBJECT_DYING)
+designate_label(NULL);
+return 0;
+}
+
void VclFrame::designate_label(vcl::Window *pWindow)
{
-assert(pWindow-GetParent() == this);
+assert(!pWindow || pWindow-GetParent() == this);
+if (m_pLabel)
+m_pLabel-RemoveEventListener(LINK(this, VclFrame,
WindowEventListener));
m_pLabel = pWindow;
+if (m_pLabel)
+m_pLabel-AddEventListener(LINK(this, VclFrame, WindowEventListener));
}
const vcl::Window *VclFrame::get_label_widget() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: copying version from Help About
On Wed, 2014-10-29 at 16:13 +, Caolán McNamara wrote: On Mon, 2014-10-27 at 10:33 -0400, Terrence Enger wrote: Hello, All, I am in the habit of copying version information for LibreOffice on Windows from the Help About dialog. Today with the build (beware: I am typing this rather than pasting it grin /): Build ID: c967872d... TinderBox: Win-x86@42, Branch:master, Time: 2014-10-13_00:02:37 Ctrl+A in the dialog does not highlight the version information and Ctrl+C does not copy it. Is this a bug? In LibreOffice rather than something on the tinderbox machine? How can I tell? Is this still broken for you under windows. FWIW its working ok for me under Linux. Both the version I complained about and today's version from the same tinderbox let me select, copy, and paste the information. Obviously, I did something wrong, but I cannot guess what. (The way that a window can come to the top without capturing keystrokes is a familiar annoyance; I cannot believe that I overlooked *that* possible mistake.) Sorry for the noise, Terry. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'private/lfrb/opengl-vcl'
New branch 'private/lfrb/opengl-vcl' available with the following commits: commit cf136f3a9506acc19cf421f35b38267de31d1834 Author: Louis-Francis Ratté-Boulianne l...@collabora.com Date: Wed Oct 29 13:05:02 2014 -0400 vcl: Implement basic SalGraphics methods for OpenGL backend Change-Id: Iade3960c38f0de5594bc98e535450abcf88e9a6d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Calc on recent Windows build has horrible repaint problem.
On Wed, Oct 22, 2014 at 5:03 PM, Kohei Yoshida kohei.yosh...@collabora.com wrote: Hi there, So, I just built from the master branch on Windows, launched Calc and shocked in horror... I've attached a screenshot of what I see. Here, I opened a new Calc document, clicked a few cells, and select a range... Anybody with any clue? Lemme guess -- you're on a 32bit machine? Sounds like you've encountered this bug: https://bugs.freedesktop.org/show_bug.cgi?id=84854 Calc issues with screen drawing(all Windows and 32-bit Linux) Best, --R -- Robinson Tryon QA Engineer - The Document Foundation LibreOffice Community Outreach Herald qu...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
Hi, Le 23/10/2014 17:20, Michael Meeks a écrit : [...] * Pending Action Items: + get a clear use-case description of what doesn't work vs. master wrt. Calc sorting (JBF) First draft here: https://bugs.freedesktop.org/show_bug.cgi?id=85490 Comments welcome :-) Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
QA Meeting Minutes - 2014-10-22
Hi all, A big thanks to everyone who showed up for our QA Meeting on Wednesday. We had some great discussions, and had a great introduction to our newest QA Team member, Beluga! Full meeting minutes and agenda: https://wiki.documentfoundation.org/QA/Meetings/2014/October_22 http://pumbaa.documentfoundation.org/meetbot/libreoffice-qa/2014/libreoffice-qa.2014-10-22-17.50.html Our next meeting will be in two weeks: https://wiki.documentfoundation.org/QA/Meetings/2014/November_05 We've got an amazing 24 people signed up to join our LibreFest Bug-Triaging-Bee + Hackfest in Seattle this Sunday. If you're too far away to join us in person, please feel free to join us online. Add your name to the wiki page, and come say hi on IRC on Sunday! https://wiki.documentfoundation.org/Events/2014/Seattle_LibreFest#Remote_Participants Cheers, --R -- Robinson Tryon QA Engineer - The Document Foundation LibreOffice Community Outreach Herald qu...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
sdw
Dear members, since last update i can't open my sdw files in Libre office 4 running system is ubuntu 14.04 -- Spirituelle Wanderungen als e-book unterwegs dabei haben … spirituelle Wanderungen sind ein Weg gegen den Strom. Wir pilgern nicht nur, um Neues zu entdecken, wir pilgern, um neu zu werden. Franz Alt im Vorwort zu Ulrike und Christian Dittmars „Spirituelle Wanderungen. Ein Pilger- und Meditationsbegleiter“ jetzt bestellen e-mails werden nur zu Bürozeiten abgeholt - Montag ist freier Tag ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: sdw
Hi Christian, Christian Dittmar schrieb: Dear members, since last update i can't open my sdw files in Libre office 4 running system is ubuntu 14.04 Yes, the filters for those binary formats were removed, see https://wiki.documentfoundation.org/ReleaseNotes/4.0#Feature_removal_.2F_deprecation You should keep a version 3.6 to read the files and convert them to ODF format if needed. You can use a portable version for that task or a virtual box. Please use ask.libreoffice.org or the mailing list us...@global.libreoffice.org for such kind of questions. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: new git bugzilla script
Hi Markus, On Monday, 2014-10-27 14:00:56 +0100, Markus Mohrhard wrote: So now fdo#12345 fdo#23456 will be handled correctly and both bugs will be updated. Yay \o/ ^ Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Care about Free Software, support the FSFE https://fsfe.org/support/?erack pgpWQJ7kJWbWW.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: sdw
On 29.10.2014 10:18, Christian Dittmar wrote: since last update i can't open my sdw files in Libre office 4 running system is ubuntu 14.04 in addition to what Regina said, i'd like to point out that all OOo versions since 2.0 and LO up to 3.6 include a batch converter tool in Wizards-Document Converter... that can be used to quickly convert the old StarOffice binary files to ODF. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: sdw
Hi Christian, On Wed, Oct 29, 2014 at 10:18:26AM +0100, Christian Dittmar christian.ditt...@elkb.de wrote: since last update i can't open my sdw files in Libre office 4 running system is ubuntu 14.04 Are you interested in something like https://wiki.documentfoundation.org/Development/GSoC/Ideas#Implement_legacy_StarOffice_binary_formats_import_filter? If not, you accidently posted here to the development list instead of asking at e.g. http://ask.libreoffice.org/en/question/18402/can-libreoffice-read-staroffice-sdw-files/. Best, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes for call about new testing hardware
Hi, Le 28/10/2014 17:13, Markus Mohrhard a écrit : [...] ** real hardware *** about 800€ for a 64 core, 256GB memory machine (Florian) 800€ only, really? Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/perfwork4' - 4 commits - include/svx sd/inc svx/source
include/svx/svdobj.hxx |5 +
include/svx/svdotext.hxx|4 -
include/svx/svdpage.hxx |2
sd/inc/pch/precompiled_sd.hxx |1
svx/source/svdraw/svdoashp.cxx | 100 +++--
svx/source/svdraw/svdobj.cxx| 136 ++--
svx/source/svdraw/svdocapt.cxx | 28
svx/source/svdraw/svdocirc.cxx | 122 ++-
svx/source/svdraw/svdoedge.cxx |6 -
svx/source/svdraw/svdograf.cxx | 16 ++--
svx/source/svdraw/svdomeas.cxx |2
svx/source/svdraw/svdomedia.cxx |2
svx/source/svdraw/svdoole2.cxx | 16 ++--
svx/source/svdraw/svdopath.cxx |8 +-
svx/source/svdraw/svdorect.cxx | 86 +
svx/source/svdraw/svdotext.cxx | 65 ++-
svx/source/svdraw/svdotxat.cxx |9 +-
svx/source/svdraw/svdotxdr.cxx | 48 +++---
svx/source/svdraw/svdotxtr.cxx | 62 +-
svx/source/svdraw/svdouno.cxx |2
svx/source/table/svdotable.cxx | 88 -
svx/source/unodraw/unopage.cxx | 29
22 files changed, 464 insertions(+), 373 deletions(-)
New commits:
commit b5cd2186d965eb8984dceaf38e17156ac3ca6f47
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Oct 29 12:47:05 2014 -0400
Create a variant of MakeNewObject that takes snap rectangle.
And absorb 2 special cases from SvxDrawPage::_CreateSdrObject().
Change-Id: I8e400794b9aef4b229b6760835b80dffd56cbc8d
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index f1dc3a3..e91360d 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -1050,10 +1050,15 @@ public:
SdrObjUserData* pNewData;
private:
+
+static SVX_DLLPRIVATE SdrObject* CreateObjectFromFactory(
+sal_uInt32 nInventor, sal_uInt16 nIdentifier, SdrPage* pPage,
SdrModel* pModel );
+
SVX_DLLPRIVATE SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent,
SdrPage* pNewPage, SdrModel* pNewModel);
public:
static SdrObject* MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent,
SdrPage* pPage, SdrModel* pModel=NULL);
+static SdrObject* MakeNewObject( sal_uInt32 nInventor, sal_uInt16
nIdentifier, const Rectangle rSnapRect, SdrPage* pPage );
static void InsertMakeObjectHdl(const Link rLink);
static void RemoveMakeObjectHdl(const Link rLink);
static void InsertMakeUserDataHdl(const Link rLink);
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 5dda6de..d9cbe9a 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -3257,13 +3257,32 @@ SdrObjFactory::SdrObjFactory(sal_uInt32 nInvent,
sal_uInt16 nIdent, SdrPage* pNe
pNewData=NULL;
}
+SdrObject* SdrObjFactory::CreateObjectFromFactory( sal_uInt32 nInventor,
sal_uInt16 nIdentifier, SdrPage* pPage, SdrModel* pModel )
+{
+boost::scoped_ptrSdrObjFactory pFact(new SdrObjFactory(nInventor,
nIdentifier, pPage, pModel));
+
+SdrLinkList rLL = ImpGetUserMakeObjHdl();
+unsigned n = rLL.GetLinkCount();
+unsigned i = 0;
+SdrObject* pObj = NULL;
+while (i n !pObj)
+{
+rLL.GetLink(i).Call((void*)pFact.get());
+pObj = pFact-pNewObj;
+i++;
+}
+
+return pObj;
+}
+
SdrObject* SdrObjFactory::MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent,
SdrPage* pPage, SdrModel* pModel)
{
-if(pModel == NULL pPage != NULL)
+if (!pModel pPage)
pModel = pPage-GetModel();
+
SdrObject* pObj = NULL;
-if(nInvent == SdrInventor)
+if (nInvent == SdrInventor)
{
switch (nIdent)
{
@@ -3304,32 +3323,111 @@ SdrObject* SdrObjFactory::MakeNewObject(sal_uInt32
nInvent, sal_uInt16 nIdent, S
}
}
-if(pObj == NULL)
+if (!pObj)
+pObj = CreateObjectFromFactory(nInvent, nIdent, pPage, pModel);
+
+if (!pObj)
{
-boost::scoped_ptrSdrObjFactory pFact(new
SdrObjFactory(nInvent,nIdent,pPage,pModel));
-SdrLinkList rLL=ImpGetUserMakeObjHdl();
-unsigned nAnz=rLL.GetLinkCount();
-unsigned i=0;
-while (inAnz pObj==NULL) {
-rLL.GetLink(i).Call((void*)pFact.get());
-pObj=pFact-pNewObj;
-i++;
-}
+// Well, if no one wants it...
+return NULL;
}
-if(pObj == NULL)
+if (pPage)
+pObj-SetPage(pPage);
+else if (pModel)
+pObj-SetModel(pModel);
+
+return pObj;
+}
+
+SdrObject* SdrObjFactory::MakeNewObject(
+sal_uInt32 nInventor, sal_uInt16 nIdentifier, const Rectangle rSnapRect,
SdrPage* pPage )
+{
+SdrModel* pModel = pPage ? pPage-GetModel() : NULL;
+
+SdrObject* pObj = NULL;
+
+bool bSetSnapRect = true;
+
+if (nInventor == SdrInventor)
{
-// Well, if no one wants it...
+switch (nIdentifier)
+{
+case OBJ_MEASURE:
+{
+pObj = new
Re: minutes for call about new testing hardware
On Wed, Oct 29, 2014 at 8:30 PM, Jean-Baptiste Faure jbfa...@libreoffice.org wrote: Le 28/10/2014 17:13, Markus Mohrhard a écrit : [...] ** real hardware *** about 800€ for a 64 core, 256GB memory machine (Florian) 800€ only, really? monthly cost in case that wasn't clear :-) https://www.manitu.de/root-server/pro/root-server-pro-qs/ (set memory to 256GB and add some of the storage disks) and to add on the EC2 costs for sake of completeness: If using spot-pricing (i.e. where you set a limit how much you want to spend per hour, and if the actual price exceeds that limit the box is shut down) currently is around 0.3$/hour (without yearly fee) for the c3.8xlarge (32core, 60GB RAM) one. ec2's processors are higher-speced, but of course with the can be shutdown any time if there are load-spikes in EC2 and thus the price/hour increases not for stuff that should reliably run 24/7 - and of course you're kind of limited what you want to install onto those - creating additional VMs within is not supported, while on a dedicated server you can fire up additional VMs for whatever purpose you need... ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes for call about new testing hardware
Hi, On Wed, Oct 29, 2014 at 08:57:21PM +0100, Christian Lohmaier wrote: On Wed, Oct 29, 2014 at 8:30 PM, Jean-Baptiste Faure jbfa...@libreoffice.org wrote: Le 28/10/2014 17:13, Markus Mohrhard a écrit : [...] ** real hardware *** about 800€ for a 64 core, 256GB memory machine (Florian) 800€ only, really? monthly cost in case that wasn't clear :-) https://www.manitu.de/root-server/pro/root-server-pro-qs/ (set memory to 256GB and add some of the storage disks) Sooo, thats: 9600 EUR/pa compared to: (365*24 hours)*0.417USD/hour+5216USD = 8868.92 USD = 6719 EUR/pa max. for a c3.8xlarge Linux Heavy Utilization Reserved Instance in Oregon running full throttle all year[1]. And while the manitu server has more cores, Amazons Intel Xeon E5-2680 v2 is more that twice as fast per thread than the Opterons 6272 on the root-server[2]. Actually, amazons offer is already breaking the front-up cost even after ~6 months -- and we save costs should there be downtimes for any reason. As such, I seems to me a reserved ec2 instance is still the way to go ... Best, Bjoern [1] https://aws.amazon.com/ec2/purchasing-options/reserved-instances/ [2] I should know, I have those Opterons in Big Bertha. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'feature/lfrb-vcl-opengl'
New branch 'feature/lfrb-vcl-opengl' available with the following commits: commit 22215d374164698a3f3306b9ebbd6c79f4c09f52 Author: Louis-Francis Ratté-Boulianne l...@collabora.com Date: Wed Oct 29 13:05:02 2014 -0400 vcl: Implement basic SalGraphics methods for OpenGL backend Change-Id: Iade3960c38f0de5594bc98e535450abcf88e9a6d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes for call about new testing hardware
On Wed, Oct 29, 2014 at 3:34 PM, Bjoern Michaelsen bjoern.michael...@canonical.com wrote: Hi, On Wed, Oct 29, 2014 at 08:57:21PM +0100, Christian Lohmaier wrote: On Wed, Oct 29, 2014 at 8:30 PM, Jean-Baptiste Faure jbfa...@libreoffice.org wrote: Le 28/10/2014 17:13, Markus Mohrhard a écrit : [...] ** real hardware *** about 800€ for a 64 core, 256GB memory machine (Florian) 800€ only, really? monthly cost in case that wasn't clear :-) https://www.manitu.de/root-server/pro/root-server-pro-qs/ (set memory to 256GB and add some of the storage disks) Sooo, thats: 9600 EUR/pa compared to: (365*24 hours)*0.417USD/hour+5216USD = 8868.92 USD = 6719 EUR/pa max. 1/ this price is without VAT ( add 19% : http://aws.amazon.com/tax-help/european-union/ ) 2/ no storage ??? add 1.2$ per GB per year... to compare apple to apple the other machine has 4TB. so that would be $4800 + VAT more on aws 3/ no bandwidth ? aws price for bandwidth OUT, to the internet is $0.12 a GB above 1GB per month. the other box come with 20TB per month included. at aws2 price that is $25200 per year + VAT And you joined the call, you knew that we have considered and weighted these options, and concluded that a 'base' capacity in the form of 1 manitu instance, and a reserve for overflow and/or punctual need to get properly sized (read small) machine of aws2 as the need arise was the best way to proceed, or for process amenable to it, using spot instances. Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'ports/macosx10.5/master' - 77 commits - animations/source apple_remote/source avmedia/Module_avmedia.mk bin/parse-perfcheck.py bridges/Library_cpp_uno.mk bridge
Rebased ref, commits from common ancestor:
commit 85d10ebb2a794f30e740c9a9560e4d6ae925333b
Author: Douglas Mencken dougmenc...@gmail.com
Date: Sat Oct 25 11:03:56 2014 -0400
workarounds for `objc_msgSend' on 10.5
(vcl/osx/salframe.cxx, vcl/osx/salmenu.cxx)
plus, move conditional includes in salframe.cxx down a bit
Change-Id: I39886b4590f227ec69042fed0f5240ba0b0fd7f2
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index ce3e371..dacf9fe 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -37,11 +37,6 @@
#include osx/a11yfactory.h
#include quartz/utils.h
-#if MACOSX_SDK_VERSION 1060
-#include vcl/timer.hxx
-#include osx/saltimer.h
-#endif
-
#include salwtype.hxx
#include premac.h
@@ -54,6 +49,11 @@
#include Carbon/Carbon.h
#include postmac.h
+#if MACOSX_SDK_VERSION 1060
+#include vcl/timer.hxx
+#include osx/saltimer.h
+#endif
+
using namespace std;
AquaSalFrame* AquaSalFrame::s_pCaptureFrame = NULL;
@@ -201,16 +201,16 @@ void AquaSalFrame::initWindowAndView()
[mpNSWindow setAcceptsMouseMovedEvents: YES];
[mpNSWindow setHasShadow: YES];
-#if MACOSX_SDK_VERSION 1060
-objc_msgSend(mpNSWindow, @selector(setDelegate:), mpNSWindow);
-#else
+#if MACOSX_SDK_VERSION = 1070
+/* objc_msgSend(mpNSWindow, @selector(setDelegate:), mpNSWindow); */
[mpNSWindow setDelegate: static_castidNSWindowDelegate (mpNSWindow)];
-#endif
if( [mpNSWindow respondsToSelector: @selector(setRestorable:)])
{
objc_msgSend(mpNSWindow, @selector(setRestorable:), NO);
}
+#endif
+
const NSRect aRect = { NSZeroPoint, NSMakeSize( maGeometry.nWidth,
maGeometry.nHeight )};
mnTrackingRectTag = [mpNSView addTrackingRect: aRect owner: mpNSView
userData: nil assumeInside: NO];
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index 32ce46b..1c876ea 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -246,9 +246,8 @@ AquaSalMenu::AquaSalMenu( bool bMenuBar ) :
if( ! mbMenuBar )
{
mpMenu = [[SalNSMenu alloc] initWithMenu: this];
-#if MACOSX_SDK_VERSION 1060
-objc_msgSend(mpMenu, @selector(setDelegate:), mpMenu);
-#else
+#if MACOSX_SDK_VERSION = 1060
+/* objc_msgSend(mpMenu, @selector(setDelegate:), mpMenu); */
[mpMenu setDelegate: (idNSMenuDelegate)mpMenu];
#endif
}
commit 178c0d4cdfebc2d2f6b8c9e3c7d9669248f0ed6a
Author: Douglas Mencken dougmenc...@gmail.com
Date: Sun Oct 26 06:38:10 2014 -0400
vcl: fix some cannot convert 'objc_object*' to... issues
Change-Id: I4b0e32c412937da4b2ea4bf350be32ea31362b3c
diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm
index 4e19e1d..f821da7 100644
--- a/vcl/osx/a11ywrapper.mm
+++ b/vcl/osx/a11ywrapper.mm
@@ -160,7 +160,7 @@ static std::ostream operator(std::ostream s, NSPoint
point) {
// (getter with parameter)attributeNameHereAttributeForParameter:
// (setter) setAttributeNameHereAttributeForElement:to:
-(SEL)selectorForAttribute:(NSString *)attribute asGetter:(BOOL)asGetter
withGetterParameter:(BOOL)withGetterParameter {
-SEL selector = nil;
+SEL selector = (SEL)nil;
NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ];
@try {
// step 1: create method name from attribute name
@@ -186,7 +186,7 @@ static std::ostream operator(std::ostream s, NSPoint
point) {
// step 2: create selector
selector = NSSelectorFromString ( methodName );
} @catch ( id exception ) {
-selector = nil;
+selector = (SEL)nil;
}
[ pool release ];
return selector;
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 19dda57..4e90836 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -482,7 +482,7 @@ static AquaSalFrame* getMouseContainerFrame()
mpFrame = pFrame;
mMarkedRange = NSMakeRange(NSNotFound, 0);
mSelectedRange = NSMakeRange(NSNotFound, 0);
-mpReferenceWrapper = nil;
+mpReferenceWrapper = (ReferenceWrapper*)nil;
mpMouseEventListener = nil;
mpLastSuperEvent = nil;
}
@@ -1788,7 +1788,7 @@ private:
// some frames never become visible ..
::vcl::Window *pWindow = mpFrame - GetWindow();
if ( ! pWindow )
-return nil;
+return (::com::sun::star::accessibility::XAccessibleContext*)nil;
mpReferenceWrapper = new ReferenceWrapper;
mpReferenceWrapper - rAccessibleContext = pWindow -
/*GetAccessibleChildWindow( 0 ) -*/ GetAccessible() - getAccessibleContext();
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index ce3ab41..69f7753 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -558,7 +558,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
[NSNumber numberWithBool:NO],
@kCUIWindowFrameDrawTitleSeparatorKey,
[NSNumber
[Libreoffice-commits] core.git: vcl/osx
vcl/osx/salobj.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 354a5f1ab65a2d36cceb948331edd4578ac349c6
Author: Julien Nabet serval2...@yahoo.fr
Date: Wed Oct 29 22:09:20 2014 +0100
Resolves fdo#85524: OSX Crash Impress with videoclip
Change-Id: If222be9574af1078ffba15c07f048503dd8d7e8e
diff --git a/vcl/osx/salobj.cxx b/vcl/osx/salobj.cxx
index 7932f8a..58e2c64 100644
--- a/vcl/osx/salobj.cxx
+++ b/vcl/osx/salobj.cxx
@@ -38,7 +38,7 @@ AquaSalObject::AquaSalObject( AquaSalFrame* pFrame,
SystemWindowData* pWindowDat
{
maSysData.nSize = sizeof( maSysData );
maSysData.mpNSView = NULL;
-maSysData.mbOpenGL = pWindowData-bOpenGL;
+maSysData.mbOpenGL = false;
NSRect aInitFrame = { NSZeroPoint, { 20, 20 } };
mpClipView = [[NSClipView alloc] initWithFrame: aInitFrame ];
@@ -49,6 +49,7 @@ AquaSalObject::AquaSalObject( AquaSalFrame* pFrame,
SystemWindowData* pWindowDat
}
if (pWindowData pWindowData-bOpenGL)
{
+maSysData.mbOpenGL = true;
NSOpenGLPixelFormat* pixFormat = NULL;
if (pWindowData-bLegacy)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes for call about new testing hardware
On Wed, Oct 29, 2014 at 04:02:00PM -0500, Norbert Thiebaud wrote: 1/ this price is without VAT ( add 19% : http://aws.amazon.com/tax-help/european-union/ ) 2/ no storage ??? add 1.2$ per GB per year... to compare apple to apple the other machine has 4TB. so that would be $4800 + VAT more on aws 3/ no bandwidth ? aws price for bandwidth OUT, to the internet is $0.12 a GB above 1GB per month. the other box come with 20TB per month included. at aws2 price that is $25200 per year + VAT First of, the c3.8xlarge comes already with 640GB storage[1]. Well, do we really need 4TB of storage and huge amounts of bandwidth? And both of those? And if we would a i2.4xlarge comes already with that. Do we even know that document load/save cycling scales anywhere near 64 cores? Best, Bjoern [1] https://aws.amazon.com/ec2/instance-types/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/lfrb-vcl-opengl' - vcl/inc vcl/Module_vcl.mk vcl/opengl vcl/Package_opengl.mk
vcl/Module_vcl.mk |1
vcl/Package_opengl.mk | 23
vcl/inc/openglgdiimpl.hxx |2
vcl/opengl/gdiimpl.cxx | 155 +---
vcl/opengl/maskFragmentShader.glsl | 21 +++
vcl/opengl/maskVertexShader.glsl| 19 +++
vcl/opengl/maskedTextureFragmentShader.glsl | 22 +++
vcl/opengl/maskedTextureVertexShader.glsl | 19 +++
vcl/opengl/solidFragmentShader.glsl | 17 +++
vcl/opengl/solidVertexShader.glsl | 16 ++
vcl/opengl/textureFragmentShader.glsl | 18 +++
vcl/opengl/textureVertexShader.glsl | 19 +++
12 files changed, 182 insertions(+), 150 deletions(-)
New commits:
commit 72d049a945e4239533f370630ef8688a3cfd07cf
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Wed Oct 29 22:30:55 2014 +0100
extract shaders from source code
Conflicts:
vcl/opengl/gdiimpl.cxx
Change-Id: Ifbb55e58e0854cc491703b8ca8d8e582741a9bd9
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 693c625..f61cc7b 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_Module_Module,vcl))
$(eval $(call gb_Module_add_targets,vcl,\
CustomTarget_afm_hash \
Library_vcl \
+ Package_opengl \
$(if $(filter DESKTOP,$(BUILD_TYPE)), \
StaticLibrary_vclmain \
Executable_ui-previewer \
diff --git a/vcl/Package_opengl.mk b/vcl/Package_opengl.mk
new file mode 100644
index 000..9b8f745
--- /dev/null
+++ b/vcl/Package_opengl.mk
@@ -0,0 +1,23 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,vcl_opengl_shader,$(SRCDIR)/vcl/opengl))
+
+$(eval $(call
gb_Package_add_files,vcl_opengl_shader,$(LIBO_ETC_FOLDER)/opengl,\
+ maskFragmentShader.glsl \
+ maskVertexShader.glsl \
+ maskedTextureFragmentShader.glsl \
+ maskedTextureVertexShader.glsl \
+ solidFragmentShader.glsl \
+ solidVertexShader.glsl \
+ textureFragmentShader.glsl \
+ textureVertexShader.glsl \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index 2d91419..40d3f9d 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -50,8 +50,6 @@ private:
GLuint mnMaskUniform;
GLuint mnMaskColorUniform;
-GLuint CompileShader( GLenum nType, const char *aSrc );
-GLuint CreateProgram( const char *aVertShaderSrc, const char
*aFragShaderSrc );
bool CreateSolidProgram( void );
bool CreateTextureProgram( void );
bool CreateMaskedTextureProgram( void );
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 32187b6..02bba63 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -22,6 +22,8 @@
#include basegfx/polygon/b2dpolygontools.hxx
#include basegfx/polygon/b2dpolygontriangulator.hxx
+#include vcl/opengl/OpenGLHelper.hxx
+
#define GL_ATTRIB_POS 0
#define GL_ATTRIB_TEX 1
@@ -135,99 +137,9 @@ void OpenGLSalGraphicsImpl::SetROPFillColor( SalROPColor
/*nROPColor*/ )
{
}
-GLuint OpenGLSalGraphicsImpl::CompileShader( GLenum nType, const char *aSrc )
-{
-GLint nStatus;
-GLuint nShader;
-GLint nLogLen( 0 );
-char *aLog( NULL );
-
-nShader = glCreateShader( nType );
-glShaderSource( nShader, 1, (const GLchar **) aSrc, NULL );
-glCompileShader( nShader );
-glGetShaderiv( nShader, GL_COMPILE_STATUS, nStatus );
-if( nStatus )
-return nShader;
-
-glGetShaderiv( nShader, GL_INFO_LOG_LENGTH, nLogLen );
-if( nLogLen 1 )
-aLog = new char[nLogLen];
-if( aLog )
-glGetShaderInfoLog( nShader, nLogLen, NULL, aLog );
-
-SAL_WARN( vcl.opengl, ::CompileShader failed: aLog );
-
-delete aLog;
-glDeleteShader( nShader );
-
-return 0;
-}
-
-GLuint OpenGLSalGraphicsImpl::CreateProgram( const char *aVertShaderSrc, const
char *aFragShaderSrc )
-{
-GLuint nProgram;
-GLuint nVertShader, nFragShader;
-GLint nStatus;
-
-nVertShader = CompileShader( GL_VERTEX_SHADER, aVertShaderSrc );
-nFragShader = CompileShader( GL_FRAGMENT_SHADER, aFragShaderSrc );
-if( !nVertShader || !nFragShader )
-{
-SAL_WARN( vcl.opengl, ::CreateProgram couldn't compile the shaders
);
-return 0;
-}
-
-nProgram = glCreateProgram();
-if( nProgram == 0 )
-{
-SAL_WARN( vcl.opengl, ::CreateProgram couldn't create GL program );
-return 0;
-}
-
-glAttachShader( nProgram, nVertShader );
-glAttachShader( nProgram, nFragShader );
-glLinkProgram( nProgram );
-glGetProgramiv( nProgram,
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6e1c66182361eaea7857d61d14818fad77061d54 Author: Andras Timar andras.ti...@collabora.com Date: Wed Oct 29 22:59:38 2014 +0100 Updated core Project: translations 6464f1a0e1abc7b0db94aa161885aa08f3a06fe5 diff --git a/translations b/translations index 4e45711..6464f1a 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 4e45711904895e392a4b95433f3996e9c6625871 +Subproject commit 6464f1a0e1abc7b0db94aa161885aa08f3a06fe5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: source/sl
source/sl/avmedia/source/viewer.po | 29 source/sl/basctl/source/basicide.po | 28 source/sl/basctl/source/dlged.po| 38 source/sl/basctl/uiconfig/basicide/ui.po| 41 source/sl/basic/source/classes.po | 12 source/sl/chart2/source/controller/dialogs.po | 8 source/sl/chart2/uiconfig/ui.po | 145 source/sl/connectivity/registry/evoab2/org/openoffice/Office/DataAccess.po | 13 source/sl/connectivity/source/resource.po | 102 source/sl/cui/source/customize.po | 124 source/sl/cui/source/dialogs.po | 1346 source/sl/cui/source/options.po | 150 source/sl/cui/source/tabpages.po| 14 source/sl/cui/uiconfig/ui.po| 2157 source/sl/dbaccess/source/core/resource.po | 26 source/sl/dbaccess/source/ext/macromigration.po | 217 source/sl/dbaccess/source/sdbtools/resource.po | 13 source/sl/dbaccess/source/ui/app.po | 28 source/sl/dbaccess/source/ui/browser.po | 45 source/sl/dbaccess/source/ui/dlg.po | 1201 source/sl/dbaccess/source/ui/misc.po| 129 source/sl/dbaccess/source/ui/querydesign.po | 38 source/sl/dbaccess/source/ui/relationdesign.po | 23 source/sl/dbaccess/source/ui/tabledesign.po | 55 source/sl/dbaccess/uiconfig/ui.po | 1733 source/sl/desktop/source/app.po | 42 source/sl/desktop/source/deployment/gui.po | 271 source/sl/desktop/source/deployment/unopkg.po | 15 source/sl/desktop/uiconfig/ui.po| 166 source/sl/dictionaries/af_ZA.po | 11 source/sl/dictionaries/an_ES.po | 11 source/sl/dictionaries/ar.po| 11 source/sl/dictionaries/be_BY.po | 11 source/sl/dictionaries/bg_BG.po | 11 source/sl/dictionaries/bn_BD.po | 11 source/sl/dictionaries/br_FR.po | 11 source/sl/dictionaries/bs_BA.po | 6 source/sl/dictionaries/da_DK.po | 11 source/sl/dictionaries/de.po| 11 source/sl/dictionaries/el_GR.po | 11 source/sl/dictionaries/en.po| 11 source/sl/dictionaries/es.po| 11 source/sl/dictionaries/et_EE.po | 11 source/sl/dictionaries/fr_FR.po | 11 source/sl/dictionaries/gl.po| 11 source/sl/dictionaries/gu_IN.po | 11 source/sl/dictionaries/he_IL.po | 11 source/sl/dictionaries/hi_IN.po | 11 source/sl/dictionaries/hr_HR.po | 11 source/sl/dictionaries/hu_HU.po | 11 source/sl/dictionaries/is.po| 6 source/sl/dictionaries/it_IT.po | 11 source/sl/dictionaries/kmr_Latn.po | 11 source/sl/dictionaries/lo_LA.po | 6 source/sl/dictionaries/lt_LT.po | 11 source/sl/dictionaries/lv_LV.po | 11 source/sl/dictionaries/ne_NP.po | 11 source/sl/dictionaries/nl_NL.po | 11
Re: minutes for call about new testing hardware
On Wed, Oct 29, 2014 at 4:23 PM, Bjoern Michaelsen bjoern.michael...@canonical.com wrote: On Wed, Oct 29, 2014 at 04:02:00PM -0500, Norbert Thiebaud wrote: 1/ this price is without VAT ( add 19% : http://aws.amazon.com/tax-help/european-union/ ) 2/ no storage ??? add 1.2$ per GB per year... to compare apple to apple the other machine has 4TB. so that would be $4800 + VAT more on aws 3/ no bandwidth ? aws price for bandwidth OUT, to the internet is $0.12 a GB above 1GB per month. the other box come with 20TB per month included. at aws2 price that is $25200 per year + VAT First of, the c3.8xlarge comes already with 640GB storage[1]. Well, do we really need 4TB of storage and huge amounts of bandwidth? And both of those? you said 6719 EUR/pa ___max.___ yet you counted NO storage and NO bandwidth and no VAT. With VAT you are at 7995e, without storage or bandwidth. that leave you with 1344euro net-VAT for storage and bandwidth. even with a cap of 1GB per month of bandwidth that leave us with 1.4TB of storage and you get a tie... I do not know exactly how much we will need of each, but I know that 20TB a month is enough.. and I know we can make do with 4TB Are you volunteering to monitor the $-meter to figure out where we stand week after week to make sure we do not run out ? And if we would a i2.4xlarge comes already with that. and that is i2.4xlarge $7280 + $0.621 per Hour = $15K vat included. + badnwidth cost. Do we even know that document load/save cycling scales anywhere near 64 cores? That is the other thing you glossed over... that cloph mentionned earlier: the manitu instance can be spliced in VM as needed, aws2 cannot. Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Realtime collaboration tools in LibreOffice? when?
Hi everyone, I'd like to point out a subject that perhaps people is not having in mind for future versions of LibreOffice. I mean real time collaboration tools. It would be great I can have several people working with me in the same Writer document, or the same Base table or the same spreadsheet. I guess this need a lot of programming work, and I sincerely don't have the skills and don't know how to do this, but this scenario is real and very useful for many professionals and companies. I'd like to open my Writer and have a chat window in which I can chat with my work colleagues, and talk about ideas or stuff for my report or things I need to know for a work I have to do for the university or my company. Base need support to allow many users be working (at once) with the same database and all its forms, reports, queries and tables without getting the data corrupted. It would be great you create a Base file, you share it in Windows or Linux, and many people in their computers, access via local-network to that file, open it, and insert records in it, in real time. Of course you can configure a MySQL server to do that, and connect it with Base, but the cool thing would be Base be a real multi-user environment instead having to mess people installing stuff. Well, I think this is necessary and important topic, and I just wished to share this idea with the community. Having a chat window is necessary, because OPTIONALLY, I could log in, and create a chat window and talk with people, or even doing a direct chat or a direct conference thru my IP. Just imagine people working in the same building and talking among them, whilst they have open Base or Writer or Calc. They won't have to use phones, or take the elevator to ask other people, they would have everything in front of their screens. I'm sorry, but I think this is necessary. Very, necessary. As far as I know Microsoft, don't have this stuff in Office 2013 Cheers, Javier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes for call about new testing hardware
On Wed, Oct 29, 2014 at 5:11 PM, Norbert Thiebaud nthieb...@gmail.com wrote: On Wed, Oct 29, 2014 at 4:23 PM, Bjoern Michaelsen bjoern.michael...@canonical.com wrote: On Wed, Oct 29, 2014 at 04:02:00PM -0500, Norbert Thiebaud wrote: 1/ this price is without VAT ( add 19% : http://aws.amazon.com/tax-help/european-union/ ) 2/ no storage ??? add 1.2$ per GB per year... to compare apple to apple the other machine has 4TB. so that would be $4800 + VAT more on aws 3/ no bandwidth ? aws price for bandwidth OUT, to the internet is $0.12 a GB above 1GB per month. the other box come with 20TB per month included. at aws2 price that is $25200 per year + VAT First of, the c3.8xlarge comes already with 640GB storage[1]. Well, do we really need 4TB of storage and huge amounts of bandwidth? And both of those? oh btw I forgot: it is 4TB in Raid1 so 8TB flat. (again comparing apple to apple) won't you be glad that we have some place to put all these builds to manufacture bibisect repo ? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - 3 commits - vcl/inc vcl/opengl vcl/unx vcl/win
vcl/inc/openglgdiimpl.hxx |2 ++
vcl/inc/salgdiimpl.hxx |3 ++-
vcl/inc/unx/salgdi.h|2 +-
vcl/opengl/gdiimpl.cxx |8
vcl/unx/generic/gdi/gdiimpl.cxx |6 ++
vcl/unx/generic/gdi/gdiimpl.hxx |3 ++-
vcl/unx/generic/gdi/salgdi.cxx |5 +
vcl/win/source/gdi/gdiimpl.cxx |6 +++---
vcl/win/source/gdi/salgdi.cxx |3 ---
9 files changed, 29 insertions(+), 9 deletions(-)
New commits:
commit 813650eba8afd22eb6eca2bec9e2fd38b5b2e553
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Wed Oct 29 18:15:06 2014 +0100
move defines to the top of the file
Change-Id: Ia76fd2b1f9d7a9056425c760320f6b87965a2012
diff --git a/vcl/win/source/gdi/gdiimpl.cxx b/vcl/win/source/gdi/gdiimpl.cxx
index 8ae2e75..be5830a 100644
--- a/vcl/win/source/gdi/gdiimpl.cxx
+++ b/vcl/win/source/gdi/gdiimpl.cxx
@@ -78,6 +78,9 @@
#define DITHER_EXTRA_COLORS 1
#define DMAP( _def_nVal, _def_nThres )
((pDitherDiff[_def_nVal](_def_nThres))?pDitherHigh[_def_nVal]:pDitherLow[_def_nVal])
+#define SAL_POLY_STACKBUF 32
+#define USE_GDI_BEZIERS
+
namespace {
// #100127# draw an array of points which might also contain bezier control
points
@@ -1783,9 +1786,6 @@ void WinSalGraphicsImpl::drawPolyPolygon( sal_uInt32
nPoly, const sal_uInt32* pP
delete [] pWinPointAryAry;
}
-#define SAL_POLY_STACKBUF 32
-#define USE_GDI_BEZIERS
-
bool WinSalGraphicsImpl::drawPolyLineBezier( sal_uInt32 nPoints, const
SalPoint* pPtAry, const BYTE* pFlgAry )
{
#ifdef USE_GDI_BEZIERS
commit b7bd211e92d6ebdaef324f1c668961c1d7034006
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Wed Oct 29 18:14:10 2014 +0100
remove useless define
Change-Id: I3033748cac045cd6e9595fadc84c65b21128b39d
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index 28469eb..7768ab1 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -35,9 +35,6 @@
#include salgdiimpl.hxx
#include gdiimpl.hxx
-// comment out to prevent use of beziers on GDI functions
-#define USE_GDI_BEZIERS
-
#define DITHER_PAL_DELTA51
#define DITHER_PAL_STEPS6
#define DITHER_PAL_COUNT
(DITHER_PAL_STEPS*DITHER_PAL_STEPS*DITHER_PAL_STEPS)
commit a85b11feb2424055a08aa4fcf96c890195cb819a
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Wed Oct 29 17:25:55 2014 +0100
bring the gradient rendering down into SalGraphicsImpl unx backend
Change-Id: Ia5d5e7d996b4a8818e73f3f741907ff9224f93da
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index 1a3b6e7..9ae84ca 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -191,6 +191,8 @@ public:
long nX, long nY,
long nWidth, long nHeight,
sal_uInt8 nTransparency ) SAL_OVERRIDE;
+
+virtual bool drawGradient(const tools::PolyPolygon rPolygon, const
Gradient rGradient) SAL_OVERRIDE;
private:
};
diff --git a/vcl/inc/salgdiimpl.hxx b/vcl/inc/salgdiimpl.hxx
index 329f3bb..ed4f4ba 100644
--- a/vcl/inc/salgdiimpl.hxx
+++ b/vcl/inc/salgdiimpl.hxx
@@ -34,6 +34,7 @@
class SalGraphics;
class SalBitmap;
+class Gradient;
class VCL_PLUGIN_PUBLIC SalGraphicsImpl
{
@@ -197,7 +198,7 @@ public:
long nWidth, long nHeight,
sal_uInt8 nTransparency ) = 0;
-
+virtual bool drawGradient(const tools::PolyPolygon rPolygon, const
Gradient rGradient) = 0;
};
#endif
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index bb8073a..1e90e98 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -237,7 +237,7 @@ public:
const ::basegfx::B2DVector rLineWidth,
basegfx::B2DLineJoin,
com::sun::star::drawing::LineCap) SAL_OVERRIDE;
-virtual booldrawGradient( const tools::PolyPolygon, const
Gradient ) SAL_OVERRIDE { return false; };
+virtual booldrawGradient( const tools::PolyPolygon, const
Gradient ) SAL_OVERRIDE;
#if 1 // TODO: remove these obselete methods
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 8b5d8f1..6e39d1e 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -19,6 +19,8 @@
#include openglgdiimpl.hxx
+#include vcl/gradient.hxx
+
OpenGLSalGraphicsImpl::~OpenGLSalGraphicsImpl()
{
}
@@ -270,4 +272,10 @@ bool OpenGLSalGraphicsImpl::drawAlphaRect(
return false;
}
+bool OpenGLSalGraphicsImpl::drawGradient(const tools::PolyPolygon
/*rPolygon*/,
+const Gradient /*rGradient*/)
+{
+return false;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx
index e5e98d0..60ed793 100644
--- a/vcl/unx/generic/gdi/gdiimpl.cxx
+++ b/vcl/unx/generic/gdi/gdiimpl.cxx
@@ -24,6 +24,7 @@
#include gdiimpl.hxx
#include
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - vcl/win
vcl/win/source/gdi/gdiimpl.cxx |6 ++
vcl/win/source/gdi/gdiimpl.hxx |4 +++-
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 6656e8f3d07e208b105a69869fe005dfb8da8e20
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Oct 30 01:01:16 2014 +0100
implement gradient rendering method for windows backend
Change-Id: I894b14d97227d695f5cfc5e13958413c36295d7d
diff --git a/vcl/win/source/gdi/gdiimpl.cxx b/vcl/win/source/gdi/gdiimpl.cxx
index be5830a..7e99a8d 100644
--- a/vcl/win/source/gdi/gdiimpl.cxx
+++ b/vcl/win/source/gdi/gdiimpl.cxx
@@ -2362,4 +2362,10 @@ bool WinSalGraphicsImpl::drawTransformedBitmap(
return false;
}
+bool WinSalGraphicsImpl::drawGradient(const tools::PolyPolygon /*rPolygon*/,
+const Gradient /*rGradient*/)
+{
+return false;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/win/source/gdi/gdiimpl.hxx b/vcl/win/source/gdi/gdiimpl.hxx
index d1b5cfd..42765aa 100644
--- a/vcl/win/source/gdi/gdiimpl.hxx
+++ b/vcl/win/source/gdi/gdiimpl.hxx
@@ -20,6 +20,7 @@
#include salgdiimpl.hxx
#include win/svsys.h
+#include vcl/gradient.hxx
class WinSalGraphics;
@@ -207,7 +208,8 @@ public:
sal_uInt8 nTransparency ) SAL_OVERRIDE;
-
+virtual bool drawGradient(const tools::PolyPolygon rPolygon,
+const Gradient rGradient) SAL_OVERRIDE;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/perfwork4' - include/svx svx/source sw/source
include/svx/sdrpagewindow.hxx | 68 +++
include/svx/svdpagv.hxx|4
include/svx/svdpntv.hxx|2
include/svx/svdtypes.hxx |2
svx/source/sdr/contact/objectcontactofpageview.cxx | 43 +++
svx/source/svdraw/sdrpagewindow.cxx| 122 ++---
svx/source/svdraw/svdouno.cxx |2
svx/source/svdraw/svdpagv.cxx |7 -
svx/source/svdraw/svdpntv.cxx |6 -
sw/source/core/inc/viewimp.hxx |2
sw/source/core/view/vdraw.cxx |2
11 files changed, 163 insertions(+), 97 deletions(-)
New commits:
commit 0c5aca21044269ddea9aea15df5e003b7cfa35a7
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Oct 29 21:51:19 2014 -0400
Apply pimpl to SdrPageWindow.
Change-Id: I54554a229c03ff87096782344a728a49636c1de1
diff --git a/include/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx
index 078edaf..82c82b0 100644
--- a/include/svx/sdrpagewindow.hxx
+++ b/include/svx/sdrpagewindow.hxx
@@ -20,77 +20,51 @@
#ifndef INCLUDED_SVX_SDRPAGEWINDOW_HXX
#define INCLUDED_SVX_SDRPAGEWINDOW_HXX
-#include com/sun/star/awt/XWindowListener.hpp
-#include com/sun/star/beans/XPropertyChangeListener.hpp
-#include com/sun/star/awt/XControlContainer.hpp
-#include com/sun/star/util/XModeChangeListener.hpp
-#include cppuhelper/implbase4.hxx
#include svx/sdr/overlay/overlaymanager.hxx
#include svx/svdtypes.hxx
-#include svx/sdrpagewindow.hxx
#include svx/svxdllapi.h
+#include rtl/ref.hxx
-#include vector
-
+#include com/sun/star/awt/XControlContainer.hpp
// predeclarations
namespace vcl { class Region; }
-class SdrUnoObj;
-class SdrPageView;
-// #110094#
namespace sdr
{
namespace contact
{
class ObjectContact;
class ViewObjectContactRedirector;
-} // end of namespace contact
+}
+}
-namespace overlay
-{
-class OverlayManager;
-} // end of namespace overlay
-} // end of namespace sdr
-
-namespace basegfx
-{
-class B2DRange;
-} // end of namespace basegfx
+namespace basegfx { class B2DRange; }
class SdrPaintWindow;
-class Link;
-
-
+class SdrPageView;
class SVX_DLLPUBLIC SdrPageWindow
{
-// #110094# ObjectContact section
-sdr::contact::ObjectContact*mpObjectContact;
-
-// the SdrPageView this window belongs to
-SdrPageViewmrPageView;
-
-// the PaintWindow to paint on. Here is access to OutDev etc.
-// #i72752# change to pointer to allow patcing it in DrawLayer() if
necessary
-SdrPaintWindow* mpPaintWindow;
-SdrPaintWindow* mpOriginalPaintWindow;
+struct Impl;
-// UNO stuff for xControls
-::com::sun::star::uno::Reference ::com::sun::star::awt::XControlContainer
mxControlContainer;
+Impl* mpImpl;
sdr::contact::ObjectContact* CreateViewSpecificObjectContact();
+SdrPageWindow( const SdrPageWindow ); // disabled
+SdrPageWindow operator= ( const SdrPageWindow ); // disabled
+
public:
SdrPageWindow(SdrPageView rNewPageView, SdrPaintWindow rPaintWindow);
~SdrPageWindow();
// data read accesses
-SdrPageView GetPageView() const { return mrPageView; }
-SdrPaintWindow GetPaintWindow() const { return *mpPaintWindow; }
-const SdrPaintWindow* GetOriginalPaintWindow() const { return
mpOriginalPaintWindow; }
-::com::sun::star::uno::Reference ::com::sun::star::awt::XControlContainer
GetControlContainer( bool _bCreateIfNecessary = true ) const;
+SdrPageView GetPageView() const;
+SdrPaintWindow GetPaintWindow() const;
+const SdrPaintWindow* GetOriginalPaintWindow() const;
+css::uno::Referencecss::awt::XControlContainer GetControlContainer( bool
_bCreateIfNecessary = true ) const;
// OVERLAYMANAGER
rtl::Reference ::sdr::overlay::OverlayManager GetOverlayManager() const;
@@ -102,14 +76,15 @@ public:
// the repaint method. For migration from pPaintProc, use one more
parameter
void PrePaint();
void PrepareRedraw(const vcl::Region rReg);
-void RedrawAll(sdr::contact::ViewObjectContactRedirector* pRedirector)
const;
-void RedrawLayer(const SdrLayerID* pId,
sdr::contact::ViewObjectContactRedirector* pRedirector) const;
+void RedrawAll( sdr::contact::ViewObjectContactRedirector* pRedirector );
+void RedrawLayer( const SdrLayerID* pId,
sdr::contact::ViewObjectContactRedirector* pRedirector );
// Invalidate call, used from ObjectContact(OfPageView) in
InvalidatePartOfView(...)
void InvalidatePageWindow(const basegfx::B2DRange rRange);
// #110094# ObjectContact section
-sdr::contact::ObjectContact GetObjectContact() const;
+const sdr::contact::ObjectContact
[Libreoffice-commits] core.git: Branch 'feature/perfwork4' - 2 commits - include/svx svx/source
include/svx/sdrpagewindow.hxx |2 --
svx/source/svdraw/sdrpagewindow.cxx | 27 +--
2 files changed, 9 insertions(+), 20 deletions(-)
New commits:
commit dfb613213c0ee0e8ae18dee81f439c24a4cd921a
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Oct 29 23:24:38 2014 -0400
Remove com::sun::star.
Change-Id: Id656f1ef1cdfb695bcfcb35e393def3682e8c556
diff --git a/svx/source/svdraw/sdrpagewindow.cxx
b/svx/source/svdraw/sdrpagewindow.cxx
index 37ec51b..2fd2ddc 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -72,7 +72,7 @@ struct SdrPageWindow::Impl
};
-::com::sun::star::uno::Reference ::com::sun::star::awt::XControlContainer
SdrPageWindow::GetControlContainer( bool _bCreateIfNecessary ) const
+uno::Referenceawt::XControlContainer SdrPageWindow::GetControlContainer(
bool _bCreateIfNecessary ) const
{
if (!mpImpl-mxControlContainer.is() _bCreateIfNecessary)
{
@@ -98,8 +98,7 @@ struct SdrPageWindow::Impl
uno::Reference uno::XInterface xContext =
xControl-getContext();
if(!xContext.is())
{
-xControl-createPeer( ::com::sun::star::uno::Reference
::com::sun::star::awt::XToolkit (),
-::com::sun::star::uno::Reference
::com::sun::star::awt::XWindowPeer () );
+xControl-createPeer( uno::Referenceawt::XToolkit(),
uno::Referenceawt::XWindowPeer() );
}
}
}
commit ea5939084019960b0aa3ccbf9f43e40ecd74cfc6
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Oct 29 23:21:41 2014 -0400
Remove indirection...
Change-Id: Ia01ed40391a4d5725a9f9e22817406216020c0d2
diff --git a/include/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx
index 82c82b0..e7156eb 100644
--- a/include/svx/sdrpagewindow.hxx
+++ b/include/svx/sdrpagewindow.hxx
@@ -51,8 +51,6 @@ class SVX_DLLPUBLIC SdrPageWindow
Impl* mpImpl;
-sdr::contact::ObjectContact* CreateViewSpecificObjectContact();
-
SdrPageWindow( const SdrPageWindow ); // disabled
SdrPageWindow operator= ( const SdrPageWindow ); // disabled
diff --git a/svx/source/svdraw/sdrpagewindow.cxx
b/svx/source/svdraw/sdrpagewindow.cxx
index 869ff10..37ec51b 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -45,18 +45,18 @@ using namespace ::com::sun::star;
struct SdrPageWindow::Impl
{
// #110094# ObjectContact section
-sdr::contact::ObjectContact*mpObjectContact;
+mutable sdr::contact::ObjectContactOfPageView* mpObjectContact;
// the SdrPageView this window belongs to
-SdrPageViewmrPageView;
+SdrPageView mrPageView;
// the PaintWindow to paint on. Here is access to OutDev etc.
// #i72752# change to pointer to allow patcing it in DrawLayer() if
necessary
-SdrPaintWindow* mpPaintWindow;
-SdrPaintWindow* mpOriginalPaintWindow;
+SdrPaintWindow* mpPaintWindow;
+SdrPaintWindow* mpOriginalPaintWindow;
// UNO stuff for xControls
-::com::sun::star::uno::Reference ::com::sun::star::awt::XControlContainer
mxControlContainer;
+uno::Referenceawt::XControlContainer mxControlContainer;
Impl( SdrPageView rPageView, SdrPaintWindow rPaintWindow ) :
mpObjectContact(NULL),
@@ -156,12 +156,6 @@ SdrPageWindow::~SdrPageWindow()
delete mpImpl;
}
-// ObjectContact section
-sdr::contact::ObjectContact* SdrPageWindow::CreateViewSpecificObjectContact()
-{
-return new sdr::contact::ObjectContactOfPageView(*this);
-}
-
SdrPageView SdrPageWindow::GetPageView() const
{
return mpImpl-mrPageView;
@@ -449,9 +443,7 @@ void SdrPageWindow::InvalidatePageWindow(const
basegfx::B2DRange rRange)
const sdr::contact::ObjectContact SdrPageWindow::GetObjectContact() const
{
if (!mpImpl-mpObjectContact)
-{
-((SdrPageWindow*)this)-mpImpl-mpObjectContact =
((SdrPageWindow*)this)-CreateViewSpecificObjectContact();
-}
+mpImpl-mpObjectContact = new
sdr::contact::ObjectContactOfPageView(const_castSdrPageWindow(*this));
return *mpImpl-mpObjectContact;
}
@@ -459,7 +451,7 @@ const sdr::contact::ObjectContact
SdrPageWindow::GetObjectContact() const
sdr::contact::ObjectContact SdrPageWindow::GetObjectContact()
{
if (!mpImpl-mpObjectContact)
-mpImpl-mpObjectContact = CreateViewSpecificObjectContact();
+mpImpl-mpObjectContact = new
sdr::contact::ObjectContactOfPageView(*this);
return *mpImpl-mpObjectContact;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes for call about new testing hardware
Norbert Thiebaud wrote: With VAT you are at 7995e, without storage or bandwidth. that leave you with 1344euro net-VAT for storage and bandwidth. even with a cap of 1GB per month of bandwidth that leave us with 1.4TB of storage and you get a tie... Still, interesting to see that -- give or take a few dollars or SPECints or GBs -- AWS is competitive even to generous hosted offers. Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] new git bugzilla script
Hi Markus, On Monday, 2014-10-27 14:00:56 +0100, Markus Mohrhard wrote: So now fdo#12345 fdo#23456 will be handled correctly and both bugs will be updated. Yay \o/ ^ Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Care about Free Software, support the FSFE https://fsfe.org/support/?erack pgpH5h1wYCpwX.pgp Description: PGP signature ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 73709] URL hyperlinks damaged when clicked in rapid sequence in a table
https://bugs.freedesktop.org/show_bug.cgi?id=73709 --- Comment #43 from Joop Lanting j.f.lant...@inter.nl.net --- New fact: on my iMac (2013, 32Gb), I noticed dead start times for documents of 2-4 pages: for normal documents: 2 seconds for documents with URL's in a table: 11 seconds on average! Is that an indication of a faulty release? ;JOOP! -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 85584] Sorting: option UpdateReferenceOnSort should be set to false by default
https://bugs.freedesktop.org/show_bug.cgi?id=85584 Luke lukebe...@hotmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #1 from Luke lukebe...@hotmail.com --- Jean-Baptiste Faure, Thank you for taking point on this important issue. I'm sure it's not easy weeding though all those angry comments over a feature that should have never been introduced. We're lucky to have your help on this. We need to ensure that the backport get reverted before 4.2.7 is released. Are you on that? UpdateReferenceOnSort=false needs to be the default value for both the 4.3.x and 4.4.x line. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 85562] CRASH when inserting an input field
https://bugs.freedesktop.org/show_bug.cgi?id=85562 Julien Nabet serval2...@yahoo.fr changed: What|Removed |Added Keywords||have-backtrace CC||serval2...@yahoo.fr -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60342] FILEOPEN DOC: wrong page break
https://bugs.freedesktop.org/show_bug.cgi?id=60342 --- Comment #7 from Beluga todven...@suomi24.fi --- Created attachment 108606 -- https://bugs.freedesktop.org/attachment.cgi?id=108606action=edit Problematic .doc file Internet Archive had this saved! Problem confirmed, shows only 2 pages. Tested on Win 7 64-bit Version: 4.4.0.0.alpha1+ Build ID: 14a2cfc27f86112469f2a2252bdc154ad8d3219f TinderBox: Win-x86@42, Branch:master, Time: 2014-10-28_04:51:26 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60342] FILEOPEN DOC: wrong page break
https://bugs.freedesktop.org/show_bug.cgi?id=60342 Beluga todven...@suomi24.fi changed: What|Removed |Added Status|NEEDINFO|NEW -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60349] FORMATTING: Icon / button / toolbar customization - wrap alignment
https://bugs.freedesktop.org/show_bug.cgi?id=60349 Jay Philips philip...@hotmail.com changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |philip...@hotmail.com |desktop.org | --- Comment #6 from Jay Philips philip...@hotmail.com --- (In reply to Maxim Monastirsky from comment #5) Is this about the Wrap text checkbox from the Alignment panel? In that case the command is .uno:WrapText, and it can be found in the customization dialog under the Format category with the title Automatic Row Break. Unfortunately it has no icon. Well that was my assumption from the bug description. So do you think we should rename the title as i was searching through all the categories looking for 'Wrap' and didnt find anything that i thought resembled it. I'll start working on an icon. Any suggestions on where in the toolbar the button should be placed? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 85524] OSX - CRASH sigabrt when opening presentation in Impress containing video clips
https://bugs.freedesktop.org/show_bug.cgi?id=85524 Julien Nabet serval2...@yahoo.fr changed: What|Removed |Added Keywords||have-backtrace CC||serval2...@yahoo.fr --- Comment #12 from Julien Nabet serval2...@yahoo.fr --- Alex: quite agree with your last comment since we can see this on your bt: pWindowData=0x -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 85416] COLOR PICKER: annoying flickering when picker drop-down is opened
https://bugs.freedesktop.org/show_bug.cgi?id=85416 --- Comment #7 from Jay Philips philip...@hotmail.com --- Flicker is gone now, but the scrollbar went missing after being fixed (bug 84574). -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84572] COLOR PICKER: Popup appears and shrinks the space used by the recent colors list
https://bugs.freedesktop.org/show_bug.cgi?id=84572 --- Comment #7 from Jay Philips philip...@hotmail.com --- Created attachment 108607 -- https://bugs.freedesktop.org/attachment.cgi?id=108607action=edit screenshot Got the latest build and the area isnt being shrunk anymore but the area now is smaller than it used to be, which makes the scrollbar buttons to overlap each other and i'm not able to get to the second row of recently used colors. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 85587] New: save it again
https://bugs.freedesktop.org/show_bug.cgi?id=85587 Bug ID: 85587 Summary: save it again Product: LibreOffice Version: 4.2.6.3 release Hardware: All OS: All Status: UNCONFIRMED Severity: major Priority: medium Component: Database Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: apiuano-lob...@yahoo.gr I understand that requirung of double saving anything maybe is due to the ability of having multiple instances of the same anything. But this is a very strange and dangerous behaviour. What I mean. Open any odb file with at least one table. Select to edit the table. (Table Design) Make any change (lets say, rename a field) Save it. Close the Table Design window. Now you are back to the main window of odb. Although you have saved all changes you made, when you try to close the main window the program is asking the user if he/she wants to save the changes!!! (USER ASKS:)But I already have saved all my changes!!! Which are the new changes that program wants me to save? This may create unpredictable results in case user has already other opened windows which he may or may not want to save. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 85588] New: COLOR PICKER: More space between 'Custom Color' icon and label
https://bugs.freedesktop.org/show_bug.cgi?id=85588 Bug ID: 85588 Summary: COLOR PICKER: More space between 'Custom Color' icon and label Product: LibreOffice Version: 4.0.6.2 release Hardware: Other OS: All Status: UNCONFIRMED Severity: enhancement Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: philip...@hotmail.com Blocks: 85184 With the recent addition of an icon to the custom color picker button, it would be good to have a few more pixels between the icon and label. 2 or 3 pixels would do. How it looks - attachment 108607 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 85184] Meta: Track new color picker bugs
https://bugs.freedesktop.org/show_bug.cgi?id=85184 Jay Philips philip...@hotmail.com changed: What|Removed |Added Depends on||85588 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 85589] New: CRASH - datapilot crash when obtaining data from sheet, query, sql, or native sql
https://bugs.freedesktop.org/show_bug.cgi?id=85589 Bug ID: 85589 Summary: CRASH - datapilot crash when obtaining data from sheet, query, sql, or native sql Product: LibreOffice Version: 4.3.3.1 rc Hardware: All OS: All Status: UNCONFIRMED Severity: blocker Priority: medium Component: Spreadsheet Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: ipla...@yahoo.co.uk Created attachment 108608 -- https://bugs.freedesktop.org/attachment.cgi?id=108608action=edit bt 1) Open blank Calc document 2) menu Data Pivot Table Create 3) Choose Datasource registered 4) Choose Bibliography as database 5) Choose biblio as datasource 6) Choose any of Sheet, Query, SQL, SQL native 7) Crash Confirmed on libreoffice-fr irc yesterday on Debian and Mac OSX Full bt aatached -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 85589] CRASH - datapilot crash when obtaining data from sheet, query, sql, or native sql
https://bugs.freedesktop.org/show_bug.cgi?id=85589 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84572] COLOR PICKER: Popup appears and shrinks the space used by the recent colors list
https://bugs.freedesktop.org/show_bug.cgi?id=84572 --- Comment #8 from Maxim Monastirsky momonas...@gmail.com --- (In reply to Jay Philips from comment #7) Got the latest build and the area isnt being shrunk anymore but the area now is smaller than it used to be, which makes the scrollbar buttons to overlap each other and i'm not able to get to the second row of recently used colors. There should not be a second row. The recent color count is no more than one row by design. See Tomaž Vajngerl comment at https://gerrit.libreoffice.org/11494/. Regarding the scrollbar - it's a bug, as it shouldn't appear at all. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 85589] CRASH - datapilot crash when obtaining data from sheet, query, sql, or native sql
https://bugs.freedesktop.org/show_bug.cgi?id=85589 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Keywords||have-backtrace CC||libreoff...@kohei.us, ||markus.mohrhard@googlemail. ||com -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 85589] CRASH - datapilot crash when obtaining data from sheet, query, sql, or native sql
https://bugs.freedesktop.org/show_bug.cgi?id=85589 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Priority|medium |highest -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 85589] CRASH - datapilot crash when obtaining data from sheet, query, sql, or native sql
https://bugs.freedesktop.org/show_bug.cgi?id=85589 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Keywords||regression --- Comment #1 from Alex Thurgood ipla...@yahoo.co.uk --- Reproduced also on master Version: 4.4.0.0.alpha1+ Build ID: f66cbdb948c6c43909a18be10aa838c69338dcb0 regression over 4252 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 85589] CRASH - datapilot crash when obtaining data from sheet, query, sql, or native sql
https://bugs.freedesktop.org/show_bug.cgi?id=85589 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Version|4.3.3.1 rc |4.3.2.2 release --- Comment #2 from Alex Thurgood ipla...@yahoo.co.uk --- Also affects LO 4322 on OSX, setting version to earliest found so far -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84572] COLOR PICKER: Popup appears and shrinks the space used by the recent colors list
https://bugs.freedesktop.org/show_bug.cgi?id=84572 --- Comment #9 from Jay Philips philip...@hotmail.com --- (In reply to Maxim Monastirsky from comment #8) There should not be a second row. The recent color count is no more than one row by design. See Tomaž Vajngerl comment at https://gerrit.libreoffice.org/11494/. I thought that might be the case. :D Well then can we add maybe 2 or 3 pixels padding above and below, so i doesnt seem so cramped. Also is it possible to remove the scrollbar buttons on the right. Regarding the scrollbar - it's a bug, as it shouldn't appear at all. If the scrollbar isnt supposed to show, what visual indicator is a user supposed to know that there are additional colors outside of the ones currently being displayed. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77354] Mail Merge E-mail test: No SSL support included in this Python
https://bugs.freedesktop.org/show_bug.cgi?id=77354 --- Comment #4 from Laurent Godard lgodard.li...@laposte.net --- the problem is that these DLL are loaded previously by a third party software and then libreoffice do not use the DLL provided in /program directory (not served by the OS) one temporary solution is also to copy these 2 DLLs provided by Libreoffice from /program to program\python-core-3.3.3\lib (same directory than _ssl.pyd) not suitable for globally solving the problem to libreoffice (need to tweak .local files or any other mean to force using the dll provided by libreoffice) these seems rather critical as LibreOffice could use obsolote ssl dlls -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84572] COLOR PICKER: Popup appears and shrinks the space used by the recent colors list
https://bugs.freedesktop.org/show_bug.cgi?id=84572 --- Comment #10 from Maxim Monastirsky momonas...@gmail.com --- (In reply to Jay Philips from comment #9) If the scrollbar isnt supposed to show, what visual indicator is a user supposed to know that there are additional colors outside of the ones currently being displayed. I'm talking about the scrollbar of the recent colors. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 54045] Word document (.doc) graphics not displaying
https://bugs.freedesktop.org/show_bug.cgi?id=54045 --- Comment #8 from petershar...@pastoralsystems.co.nz --- (In reply to tommy27 from comment #7) please retest with current LibO 4.3.2.2 and give update of the bug status Hello. I currently have 4.3.3.1 installed. There's no improvement in display of the graphics in the .doc attached to the initial bug report. Regards -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 85560] Draw and Impress not working
https://bugs.freedesktop.org/show_bug.cgi?id=85560 --- Comment #2 from MartinsS m.serdie...@gmail.com --- Hi! Portable version works correctly. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 85553] Vlookup returns #N/A if save in .xls
https://bugs.freedesktop.org/show_bug.cgi?id=85553 raal r...@post.cz changed: What|Removed |Added Attachment #108570|text/plain |application/excel mime type|| -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84579] COLOR PICKER: Text label of currently selected color should appear in dialog
https://bugs.freedesktop.org/show_bug.cgi?id=84579 --- Comment #6 from Jay Philips philip...@hotmail.com --- Created attachment 108609 -- https://bugs.freedesktop.org/attachment.cgi?id=108609action=edit mockup (In reply to Owen Genat from comment #5) Small clarification. As per the driving design: https://redmine.documentfoundation.org/attachments/download/138/color-picker. png ... it seems the currently selected colour should appear as a separate (and labelled) swatch at the head of the dialog. I think you are mistaken, that part simply names the drop down. I think the current selected color label should appear below the color palette list and the recent list. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 85590] New: COLOR PICKER: 'Pick a color' doesnt show circle location when opened
https://bugs.freedesktop.org/show_bug.cgi?id=85590 Bug ID: 85590 Summary: COLOR PICKER: 'Pick a color' doesnt show circle location when opened Product: LibreOffice Version: 4.0.6.2 release Hardware: Other OS: All Status: UNCONFIRMED Severity: enhancement Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: philip...@hotmail.com CC: s.mehrbr...@gmail.com Blocks: 85184 Created attachment 108610 -- https://bugs.freedesktop.org/attachment.cgi?id=108610action=edit screenshot When you open the custom color dialog, it doesnt show the white circle of where the current color is position in the palette. In order to get it to appear, i click up the up arrow for 'Red' and then press the down arrow to return it to its initial place. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
