[Libreoffice-commits] core.git: Branch 'feature/priorities' - 82 commits - android/Bootstrap android/experimental basctl/source chart2/source configure.ac cui/source dbaccess/source desktop/source download.lst editeng/source extensions/source external/beanshell external/hunspell external/libebook filter/source forms/qa fpicker/source framework/qa framework/source include/editeng include/LibreOfficeKit include/sfx2 include/vcl libreofficekit/qa libreofficekit/source officecfg/registry qadevOOo/runner qadevOOo/tests readlicense_oo/license reportdesign/source sal/android scripting/java sc/source sd/source sfx2/source starmath/source svtools/source svx/source sw/source sw/uiconfig toolkit/source vcl/inc vcl/opengl vcl/qa vcl/source
Tobias Madl
tobias.madl.dev at gmail.com
Thu Jan 15 06:07:44 PST 2015
android/Bootstrap/Makefile.shared | 3
android/Bootstrap/src/org/libreoffice/kit/Document.java | 27
android/Bootstrap/src/org/libreoffice/kit/Office.java | 2
android/experimental/LOAndroid3/AndroidManifest.xml.in | 2
android/experimental/LOAndroid3/res/layout/about.xml | 9
android/experimental/LOAndroid3/res/values/strings.xml | 1
android/experimental/LOAndroid3/src/java/org/libreoffice/LOAbout.java | 23
android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java | 16
android/experimental/LOAndroid3/src/java/org/libreoffice/LOEventFactory.java | 9
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java | 33
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java | 61
android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java | 8
android/experimental/LOAndroid3/src/java/org/libreoffice/TileIdentifier.java | 5
android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java | 9
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java | 12
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java | 23
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java | 3
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/RectUtils.java | 8
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TileLayer.java | 5
basctl/source/basicide/baside2.cxx | 2
basctl/source/basicide/baside2b.cxx | 21
basctl/source/basicide/baside3.cxx | 2
basctl/source/basicide/layout.cxx | 2
basctl/source/basicide/linenumberwindow.cxx | 4
chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx | 2
chart2/source/controller/dialogs/tp_ErrorBars.cxx | 2
chart2/source/controller/dialogs/tp_Trendline.cxx | 2
chart2/source/controller/main/ChartWindow.cxx | 4
configure.ac | 4
cui/source/customize/cfg.cxx | 4
cui/source/dialogs/iconcdlg.cxx | 4
cui/source/options/optcolor.cxx | 8
cui/source/options/personalization.cxx | 2
cui/source/tabpages/align.cxx | 2
cui/source/tabpages/backgrnd.cxx | 4
cui/source/tabpages/border.cxx | 2
cui/source/tabpages/labdlg.cxx | 2
cui/source/tabpages/numfmt.cxx | 2
cui/source/tabpages/tphatch.cxx | 2
cui/source/tabpages/tpline.cxx | 2
cui/source/tabpages/tplnedef.cxx | 2
cui/source/tabpages/tplneend.cxx | 2
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 18
dbaccess/source/ui/app/AppDetailView.cxx | 14
dbaccess/source/ui/app/AppSwapWindow.cxx | 10
dbaccess/source/ui/app/AppTitleWindow.cxx | 10
dbaccess/source/ui/app/AppView.cxx | 20
dbaccess/source/ui/browser/dataview.cxx | 10
dbaccess/source/ui/control/VertSplitView.cxx | 4
dbaccess/source/ui/dlg/indexdialog.cxx | 6
dbaccess/source/ui/dlg/tablespage.cxx | 6
dbaccess/source/ui/misc/ToolBoxHelper.cxx | 6
dbaccess/source/ui/querydesign/JoinTableView.cxx | 2
dbaccess/source/ui/querydesign/TableWindow.cxx | 2
dbaccess/source/ui/querydesign/TableWindowTitle.cxx | 2
dbaccess/source/ui/tabledesign/TableDesignView.cxx | 4
desktop/source/lib/init.cxx | 18
desktop/source/lib/lokandroid.cxx | 85
download.lst | 2
editeng/source/items/frmitems.cxx | 10
extensions/source/bibliography/toolbar.cxx | 4
external/beanshell/ExternalPackage_beanshell.mk | 2
external/beanshell/bsh-2.0b1-src.patch | 126
external/hunspell/UnpackedTarball_hunspell.mk | 1
external/hunspell/ubsan.patch.0 | 11
external/libebook/0001-lrf-compute-color-interpolation-coeff.-correctly.patch.1 | 25
external/libebook/UnpackedTarball_libebook.mk | 7
external/libebook/ubsan.patch | 11
filter/source/msfilter/mstoolbar.cxx | 2
forms/qa/integration/forms/ListSelection.java | 26
forms/qa/integration/forms/ListSelection.props | 2
fpicker/source/office/iodlg.cxx | 2
framework/qa/complex/api_internal/CheckAPI.java | 63
framework/qa/complex/api_internal/CheckAPI.props | 4
framework/qa/complex/framework/recovery/RecoveryTest.java | 4
framework/qa/complex/framework/recovery/RecoveryTools.java | 6
framework/qa/complex/loadAllDocuments/CheckXComponentLoader.props | 2
framework/source/uielement/addonstoolbarmanager.cxx | 6
framework/source/uielement/statusbarmanager.cxx | 10
framework/source/uielement/toolbarmanager.cxx | 6
include/LibreOfficeKit/LibreOfficeKit.h | 32
include/LibreOfficeKit/LibreOfficeKit.hxx | 11
include/LibreOfficeKit/LibreOfficeKitGtk.h | 2
include/editeng/protitem.hxx | 1
include/sfx2/sfxbasemodel.hxx | 10
include/vcl/dibtools.hxx | 3
include/vcl/event.hxx | 39
include/vcl/print.hxx | 2
include/vcl/settings.hxx | 32
include/vcl/svapp.hxx | 16
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 16
libreofficekit/source/gtk/lokdocview.c | 34
officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 8
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 2
qadevOOo/runner/base/java_complex.java | 22
qadevOOo/runner/helper/CfgParser.java | 45
qadevOOo/runner/helper/ClParser.java | 41
qadevOOo/runner/helper/OfficeProvider.java | 50
qadevOOo/runner/org/openoffice/Runner.java | 20
qadevOOo/runner/org/openoffice/RunnerService.java | 20
qadevOOo/runner/util/PropertyName.java | 14
qadevOOo/runner/util/utils.java | 7
qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java | 23
qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java | 6
readlicense_oo/license/LICENSE | 35
readlicense_oo/license/LICENSE.fodt | 3389 +--
readlicense_oo/license/LICENSE.html | 9809 ----------
reportdesign/source/ui/misc/ColorListener.cxx | 4
reportdesign/source/ui/report/DesignView.cxx | 4
reportdesign/source/ui/report/ReportControllerObserver.cxx | 6
reportdesign/source/ui/report/ReportWindow.cxx | 4
reportdesign/source/ui/report/ScrollHelper.cxx | 4
reportdesign/source/ui/report/SectionWindow.cxx | 4
reportdesign/source/ui/report/ViewsWindow.cxx | 4
sal/android/lo-bootstrap.c | 2
sc/source/core/opencl/formulagroupcl.cxx | 382
sc/source/core/tool/calcconfig.cxx | 7
sc/source/ui/app/inputwin.cxx | 8
sc/source/ui/dbgui/csvgrid.cxx | 2
sc/source/ui/dbgui/csvruler.cxx | 2
sc/source/ui/dbgui/csvtablebox.cxx | 2
sc/source/ui/formdlg/privsplt.cxx | 4
sc/source/ui/navipi/navipi.cxx | 4
sc/source/ui/pagedlg/tptable.cxx | 2
sc/source/ui/view/gridwin.cxx | 22
sc/source/ui/view/gridwin4.cxx | 18
sc/source/ui/view/olinewin.cxx | 4
sc/source/ui/view/preview.cxx | 18
scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java | 20
scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java | 3
scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java | 11
scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java | 16
scripting/java/com/sun/star/script/framework/provider/ScriptContext.java | 5
sd/source/ui/dlg/animobjs.cxx | 4
sd/source/ui/dlg/docprev.cxx | 2
sd/source/ui/dlg/navigatr.cxx | 2
sd/source/ui/slideshow/slideshow.cxx | 2
sd/source/ui/view/sdwindow.cxx | 32
sfx2/source/appl/appcfg.cxx | 8
sfx2/source/appl/appinit.cxx | 2
sfx2/source/appl/newhelp.cxx | 12
sfx2/source/control/thumbnailview.cxx | 10
sfx2/source/dialog/templdlg.cxx | 4
sfx2/source/dialog/titledockwin.cxx | 9
sfx2/source/sidebar/SidebarController.cxx | 2
starmath/source/dialog.cxx | 12
starmath/source/toolbox.cxx | 2
svtools/source/brwbox/datwin.cxx | 4
svtools/source/brwbox/ebbcontrols.cxx | 2
svtools/source/brwbox/editbrowsebox.cxx | 6
svtools/source/config/colorcfg.cxx | 4
svtools/source/config/extcolorcfg.cxx | 4
svtools/source/contnr/ivctrl.cxx | 8
svtools/source/contnr/treelistbox.cxx | 2
svtools/source/control/calendar.cxx | 8
svtools/source/control/ctrlbox.cxx | 2
svtools/source/control/headbar.cxx | 8
svtools/source/control/hyperlabel.cxx | 6
svtools/source/control/roadmap.cxx | 12
svtools/source/control/ruler.cxx | 10
svtools/source/control/scrwin.cxx | 4
svtools/source/control/tabbar.cxx | 8
svtools/source/control/toolbarmenu.cxx | 8
svtools/source/control/valueset.cxx | 10
svtools/source/dialogs/prnsetup.cxx | 2
svtools/source/toolpanel/paneltabbar.cxx | 4
svtools/source/toolpanel/toolpaneldrawer.cxx | 9
svx/source/dialog/charmap.cxx | 4
svx/source/dialog/connctrl.cxx | 2
svx/source/dialog/dialcontrol.cxx | 2
svx/source/dialog/dlgctrl.cxx | 4
svx/source/dialog/fntctrl.cxx | 2
svx/source/dialog/frmsel.cxx | 2
svx/source/dialog/measctrl.cxx | 2
svx/source/dialog/rubydialog.cxx | 2
svx/source/dialog/swframeexample.cxx | 2
svx/source/fmcomp/gridctrl.cxx | 4
svx/source/gallery2/galbrws1.cxx | 2
svx/source/gallery2/galbrws2.cxx | 2
svx/source/gallery2/galctrl.cxx | 7
svx/source/tbxctrls/extrusioncontrols.cxx | 4
svx/source/tbxctrls/fillctrl.cxx | 4
svx/source/tbxctrls/itemwin.cxx | 8
svx/source/tbxctrls/tbcontrl.cxx | 16
svx/source/tbxctrls/tbunocontroller.cxx | 4
sw/source/core/doc/docredln.cxx | 6
sw/source/core/docnode/nodedump.cxx | 6
sw/source/core/inc/flyfrms.hxx | 4
sw/source/core/layout/pagechg.cxx | 2
sw/source/core/view/viewsh.cxx | 14
sw/source/filter/ww8/ww8par6.cxx | 43
sw/source/ui/app/mn.src | 3
sw/source/ui/config/optpage.cxx | 2
sw/source/ui/envelp/envlop1.cxx | 2
sw/source/ui/frmdlg/column.cxx | 4
sw/source/ui/frmdlg/wrap.cxx | 4
sw/source/uibase/docvw/edtwin3.cxx | 13
sw/source/uibase/docvw/srcedtw.cxx | 10
sw/source/uibase/ribbar/inputwin.cxx | 2
sw/source/uibase/ribbar/workctrl.cxx | 4
sw/source/uibase/uiview/pview.cxx | 13
sw/source/uibase/utlui/content.cxx | 12
sw/source/uibase/utlui/glbltree.cxx | 4
sw/source/uibase/utlui/navipi.cxx | 4
sw/uiconfig/sglobal/menubar/menubar.xml | 6
sw/uiconfig/sweb/menubar/menubar.xml | 6
sw/uiconfig/swform/menubar/menubar.xml | 6
sw/uiconfig/swreport/menubar/menubar.xml | 6
sw/uiconfig/swriter/menubar/menubar.xml | 6
sw/uiconfig/swxform/menubar/menubar.xml | 6
toolkit/source/awt/stylesettings.cxx | 4
vcl/inc/headless/svpframe.hxx | 4
vcl/inc/openglgdiimpl.hxx | 9
vcl/opengl/gdiimpl.cxx | 193
vcl/opengl/scale.cxx | 4
vcl/qa/complex/memCheck/CheckMemoryUsage.java | 63
vcl/qa/complex/memCheck/CheckMemoryUsage.props | 10
vcl/source/app/settings.cxx | 63
vcl/source/app/svapp.cxx | 15
vcl/source/app/svmain.cxx | 2
vcl/source/control/button.cxx | 24
vcl/source/control/combobox.cxx | 8
vcl/source/control/edit.cxx | 8
vcl/source/control/field.cxx | 12
vcl/source/control/field2.cxx | 10
vcl/source/control/fixed.cxx | 24
vcl/source/control/group.cxx | 8
vcl/source/control/ilstbox.cxx | 8
vcl/source/control/lstbox.cxx | 8
vcl/source/control/prgsbar.cxx | 4
vcl/source/control/scrbar.cxx | 8
vcl/source/control/slider.cxx | 4
vcl/source/control/spinfld.cxx | 4
vcl/source/control/tabctrl.cxx | 8
vcl/source/edit/vclmedit.cxx | 4
vcl/source/gdi/dibtools.cxx | 39
vcl/source/gdi/print.cxx | 3
vcl/source/gdi/regionband.cxx | 4
vcl/source/gdi/sallayout.cxx | 2
vcl/source/outdev/font.cxx | 4
vcl/source/outdev/map.cxx | 8
vcl/source/outdev/polyline.cxx | 2
vcl/source/window/brdwin.cxx | 8
vcl/source/window/dialog.cxx | 4
vcl/source/window/dockingarea.cxx | 2
vcl/source/window/dockwin.cxx | 4
vcl/source/window/floatwin.cxx | 4
vcl/source/window/menubarwindow.cxx | 10
vcl/source/window/menufloatingwindow.cxx | 8
vcl/source/window/mouse.cxx | 1
vcl/source/window/printdlg.cxx | 4
vcl/source/window/settings.cxx | 17
vcl/source/window/split.cxx | 2
vcl/source/window/splitwin.cxx | 4
vcl/source/window/status.cxx | 10
vcl/source/window/tabpage.cxx | 4
vcl/source/window/toolbox.cxx | 10
vcl/source/window/window.cxx | 4
vcl/source/window/winproc.cxx | 20
259 files changed, 3726 insertions(+), 12588 deletions(-)
New commits:
commit 277897193126b42adc31c9605c385073e0f1a1da
Author: Tobias Madl <tobias.madl.dev at gmail.com>
Date: Wed Jan 14 13:11:28 2015 +0000
Idle and Timer are now completely independent
And everything is functionating pretty well.
Change-Id: Id7f5a995362f6f7c5235f2e9facb7c7f119f3140
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index e750a87..7e6fb2b 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -91,7 +91,7 @@ public:
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
SfxEventAsyncer_Impl( const SfxEventHint& rHint );
virtual ~SfxEventAsyncer_Impl();
- DECL_LINK( TimerHdl, Timer*);
+ DECL_LINK( IdleHdl, Idle*);
};
@@ -114,7 +114,7 @@ SfxEventAsyncer_Impl::SfxEventAsyncer_Impl( const SfxEventHint& rHint )
if( rHint.GetObjShell() )
StartListening( *rHint.GetObjShell() );
pIdle = new Idle;
- pIdle->SetIdleHdl( LINK(this, SfxEventAsyncer_Impl, TimerHdl) );
+ pIdle->SetIdleHdl( LINK(this, SfxEventAsyncer_Impl, IdleHdl) );
pIdle->SetPriority( IdlePriority::VCL_IDLE_PRIORITY_HIGHEST );
pIdle->Start();
}
@@ -128,10 +128,10 @@ SfxEventAsyncer_Impl::~SfxEventAsyncer_Impl()
-IMPL_LINK(SfxEventAsyncer_Impl, TimerHdl, Timer*, pAsyncTimer)
+IMPL_LINK(SfxEventAsyncer_Impl, IdleHdl, Idle*, pAsyncIdle)
{
SfxObjectShellRef xRef( aHint.GetObjShell() );
- pAsyncTimer->Stop();
+ pAsyncIdle->Stop();
#ifdef DBG_UTIL
if (!xRef.Is())
{
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 2c64e34..cc90544 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -47,6 +47,7 @@
#include <vcl/edit.hxx>
#include <vcl/timer.hxx>
+#include <vcl/idle.hxx>
#include <sfx2/unoctitm.hxx>
#include "app.hrc"
@@ -110,6 +111,7 @@ void SAL_CALL SfxTerminateListener_Impl::notifyTermination( const EventObject& a
// Timers may access the SfxApplication and are only deleted in
// Application::Quit(), which is asynchronous (PostUserEvent) - disable!
Timer::ImplDeInitTimer();
+ Idle::ImplDeInitIdle();
SfxApplication* pApp = SfxGetpApp();
pApp->Broadcast( SfxSimpleHint( SFX_HINT_DEINITIALIZING ) );
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 8ae3592..3187f59 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -35,6 +35,7 @@
#include "vcl/svapp.hxx"
#include "vcl/wrkwin.hxx"
#include "vcl/cvtgrf.hxx"
+#include "vcl/idle.hxx"
#include "vcl/image.hxx"
#include "vcl/settings.hxx"
#include "vcl/unowrap.hxx"
@@ -389,6 +390,7 @@ void DeInitVCL()
if ( pSVData->maAppData.mpIdleMgr )
delete pSVData->maAppData.mpIdleMgr;
Timer::ImplDeInitTimer();
+ Idle::ImplDeInitIdle;
if ( pSVData->maWinData.mpMsgBoxImgList )
{
commit 894acc98e73eeef25702a521962d49bd95129a64
Author: David Tardon <dtardon at redhat.com>
Date: Tue Jan 13 10:27:23 2015 +0100
SwFlyLayFrm is already indirectly derived from noncopyable
Change-Id: Ic64b56a55d43efed8920eb1662fb9b6a5a2b5e14
diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx
index 82b1b96..489e475 100644
--- a/sw/source/core/inc/flyfrms.hxx
+++ b/sw/source/core/inc/flyfrms.hxx
@@ -21,8 +21,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
-
#include "flyfrm.hxx"
// #i28701#
@@ -123,7 +121,7 @@ public:
};
// Flys that are bound to LayoutFrms and not to Cntnt
-class SwFlyLayFrm : public SwFlyFreeFrm, private boost::noncopyable
+class SwFlyLayFrm : public SwFlyFreeFrm
{
public:
// #i28701#
commit 3ad1e5d4d19e62986d59c86675c600abc0e7fccd
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 13 10:07:34 2015 +0100
Improve ImplLogicToPixel overflow check
Change-Id: Ib0554f6d489e410527d7bf4dc77f76db1bdbf1fc
diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index 5117471..7a9cc0c 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -17,7 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <cstdlib>
#include <limits.h>
+
#include <o3tl/numeric.hxx>
#include <tools/bigint.hxx>
@@ -382,7 +386,9 @@ static long ImplLogicToPixel( long n, long nDPI, long nMapNum, long nMapDenom,
}
else
#else
- assert(n < std::numeric_limits<long>::max() / nMapNum); //detect overflows
+ assert(nMapNum > 0);
+ assert(nDPI > 0);
+ assert(std::abs(n) < std::numeric_limits<long>::max() / nMapNum / nDPI); //detect overflows
#endif
{
sal_Int64 n64 = n;
commit 724aa55c9e888fc4f22fea0bad1daa8b1fe94349
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 13 10:02:57 2015 +0100
Exclude FAR_AWAY objects from bounds computation
...otherwise, running CppunitTest_writerperfect_writer would overflow in
ImplLogicToPixel (vcl/source/outdev/map.cxx) when nMaxRight would be
ridiculously large due to including the ridiculously large right bound of an
SwFlyLayFrm that is marked FAR_AWAY.
Change-Id: Id6f8c895a953e99c5955b0f6ed655f8b79fba6f1
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 580117f..9a5ff25 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1085,12 +1085,14 @@ void SwViewShell::VisPortChgd( const SwRect &rRect)
if (pObj->IsFormatPossible())
{
const Rectangle &rBound = pObj->GetObjRect().SVRect();
- // OD 03.03.2003 #107927# - use correct datatype
- const SwTwips nL = std::max( 0L, rBound.Left() - nOfst );
- if ( nL < nMinLeft )
- nMinLeft = nL;
- if( rBound.Right() + nOfst > nMaxRight )
- nMaxRight = rBound.Right() + nOfst;
+ if (rBound.Left() != FAR_AWAY) {
+ // OD 03.03.2003 #107927# - use correct datatype
+ const SwTwips nL = std::max( 0L, rBound.Left() - nOfst );
+ if ( nL < nMinLeft )
+ nMinLeft = nL;
+ if( rBound.Right() + nOfst > nMaxRight )
+ nMaxRight = rBound.Right() + nOfst;
+ }
}
}
}
commit 44b2f3a06aac98ee1d4d0785b1a20fe898baab29
Author: Noel Grandin <noel at peralex.com>
Date: Tue Jan 13 10:42:38 2015 +0200
revert accidental change to configure.ac
that slipped in with commit 3ab2d3a2c5b802ab88171770d19871e081c3252b
"fdo#88256 fix crash when running javascript macro"
Change-Id: Idae2148181517e434d133958cf20d4fd6c4b9187
diff --git a/configure.ac b/configure.ac
index 18a1e6b..d4029a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4527,6 +4527,10 @@ dnl Check for syslog header
dnl ===================================================================
AC_CHECK_HEADER(syslog.h, AC_DEFINE(HAVE_SYSLOG_H))
+# placeholder for future crash reporter feature
+ENABLE_CRASHDUMP=""
+AC_SUBST(ENABLE_CRASHDUMP)
+
dnl Set the ENABLE_WERROR variable. (Activate --enable-werror)
dnl ===================================================================
AC_MSG_CHECKING([whether to turn warnings to errors])
commit 1791b1a48fe49110acf7d5b8f1501c7d8becc222
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Tue Jan 13 09:38:07 2015 +0100
libreofficekit: typo
Change-Id: Idab19cc812e40280367e6fbc70351e6e02685811
diff --git a/libreofficekit/source/gtk/lokdocview.c b/libreofficekit/source/gtk/lokdocview.c
index e34936b..cf3169c 100644
--- a/libreofficekit/source/gtk/lokdocview.c
+++ b/libreofficekit/source/gtk/lokdocview.c
@@ -183,7 +183,7 @@ static void lok_docview_callback_worker(int nType, const char* pPayload, void* p
#if GTK_CHECK_VERSION(2,12,0)
gdk_threads_add_idle(lok_docview_callback, pDocView);
#else
- g_add_idle(lok_docview_callback, pDocView);
+ g_idle_add(lok_docview_callback, pDocView);
#endif
break;
default:
commit 5f98ac758b80a6f3a52d9004b94506d723a056cd
Author: Noel Grandin <noel at peralex.com>
Date: Tue Jan 13 08:34:10 2015 +0200
fdo#88256 fix crash when running javascript macro
caused by my commit 8583da1e934a49791ef8d86668f3d5c3c5dae1d7
"java: remove unused fields"
Change-Id: Ibcd6462e8229a0a6cb98ebfd16ce5d2ea45ca931
diff --git a/configure.ac b/configure.ac
index d4029a5..18a1e6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4527,10 +4527,6 @@ dnl Check for syslog header
dnl ===================================================================
AC_CHECK_HEADER(syslog.h, AC_DEFINE(HAVE_SYSLOG_H))
-# placeholder for future crash reporter feature
-ENABLE_CRASHDUMP=""
-AC_SUBST(ENABLE_CRASHDUMP)
-
dnl Set the ENABLE_WERROR variable. (Activate --enable-werror)
dnl ===================================================================
AC_MSG_CHECKING([whether to turn warnings to errors])
diff --git a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
index c4ae664..71535e1 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
@@ -55,6 +55,11 @@ public class ParcelBrowseNode extends PropertySet implements
private Collection<XBrowseNode> browsenodes;
private final ParcelContainer container;
private Parcel parcel;
+ // these four are properties, they are accessed via reflection
+ public boolean deletable = true;
+ public boolean editable = false;
+ public boolean creatable = false;
+ public boolean renamable = true;
public ParcelBrowseNode(ScriptProvider provider, ParcelContainer container,
String parcelName) {
@@ -75,15 +80,28 @@ public class ParcelBrowseNode extends PropertySet implements
registerProperty("Editable", new Type(boolean.class), (short)0, "editable");
registerProperty("Creatable", new Type(boolean.class), (short)0, "creatable");
registerProperty("Renamable", new Type(boolean.class), (short)0, "renamable");
+ if (provider.hasScriptEditor())
+ {
+ this.creatable = true;
+ }
+ String parcelDirUrl = parcel.getPathToParcel();
XComponentContext xCtx = provider.getScriptingContext().getComponentContext();
XMultiComponentFactory xFac = xCtx.getServiceManager();
try {
- UnoRuntime.queryInterface(XSimpleFileAccess.class,
+ XSimpleFileAccess xSFA = UnoRuntime.queryInterface(XSimpleFileAccess.class,
xFac.createInstanceWithContext(
"com.sun.star.ucb.SimpleFileAccess",
xCtx));
+ if ( xSFA != null && ( xSFA.isReadOnly( parcelDirUrl ) ||
+ container.isUnoPkg() ) )
+ {
+ deletable = false;
+ editable = false;
+ creatable = false;
+ renamable = false;
+ }
} catch (com.sun.star.uno.Exception e) {
// TODO propagate potential errors
LogUtils.DEBUG("Caught exception creating ParcelBrowseNode " + e);
diff --git a/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
index bc52cb5..6cdfd2a 100644
--- a/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
@@ -37,6 +37,9 @@ public class PkgProviderBrowseNode extends ProviderBrowseNode {
container.getParcelContainerDir());
LogUtils.DEBUG("*** PkgProviderBrowseNode ctor, container has num parcels = " +
container.getElementNames().length);
+ deletable = false;
+ editable = false;
+ creatable = false;
}
@Override public String getName() {
diff --git a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
index 2e9ee68..868af08 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
@@ -52,6 +52,10 @@ public class ProviderBrowseNode extends PropertySet implements
private final String name;
protected ParcelContainer container;
private final XComponentContext m_xCtx;
+ // these are properties, they are accessed by reflection
+ public boolean deletable = true;
+ public boolean creatable = true;
+ public boolean editable = false;
public ProviderBrowseNode(ScriptProvider provider, ParcelContainer container,
XComponentContext xCtx) {
@@ -68,10 +72,15 @@ public class ProviderBrowseNode extends PropertySet implements
XMultiComponentFactory xFac = m_xCtx.getServiceManager();
try {
- UnoRuntime.queryInterface(XSimpleFileAccess.class,
+ XSimpleFileAccess xSFA = UnoRuntime.queryInterface(XSimpleFileAccess.class,
xFac.createInstanceWithContext(
"com.sun.star.ucb.SimpleFileAccess",
xCtx));
+ if ( container.isUnoPkg() || xSFA.isReadOnly( container.getParcelContainerDir() ) )
+ {
+ deletable = false;
+ creatable = false;
+ }
}
// TODO propage errors
catch (com.sun.star.uno.Exception e) {
diff --git a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
index 903a45f..8433203 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
@@ -58,25 +58,32 @@ public class ScriptBrowseNode extends PropertySet implements
private Parcel parent;
private String name;
- private boolean editable;
- private boolean deletable = false;
- private boolean renamable = false;
+ // these are properties, accessed by reflection
+ public String uri;
+ public String description;
+ public boolean editable;
+ public boolean deletable = false;
+ public boolean renamable = false;
public ScriptBrowseNode(ScriptProvider provider, Parcel parent, String name) {
this.provider = provider;
this.name = name;
this.parent = parent;
+ ScriptMetaData data = null;
XComponentContext xCtx = provider.getScriptingContext().getComponentContext();
XMultiComponentFactory xFac = xCtx.getServiceManager();
try {
+ data = (ScriptMetaData)parent.getByName( name );
XSimpleFileAccess xSFA = UnoRuntime.queryInterface(
XSimpleFileAccess.class,
xFac.createInstanceWithContext(
"com.sun.star.ucb.SimpleFileAccess",
xCtx));
+ uri = data.getShortFormScriptURL();
+ description = data.getDescription();
if (provider.hasScriptEditor()) {
this.editable = true;
@@ -147,7 +154,9 @@ public class ScriptBrowseNode extends PropertySet implements
LogUtils.DEBUG("** caught exception getting script data for " + name +
" ->" + e.toString());
}
+ uri = data.getShortFormScriptURL();
}
+
// implementation of XInvocation interface
public XIntrospectionAccess getIntrospection() {
return null;
@@ -250,6 +259,7 @@ public class ScriptBrowseNode extends PropertySet implements
LogUtils.DEBUG("Now remove old script");
parent.removeByName(name);
+ uri = data.getShortFormScriptURL();
name = languageName;
result = new Any(new Type(XBrowseNode.class), this);
} catch (NoSuchElementException nse) {
diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
index ab01797..94181e7 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
@@ -44,13 +44,16 @@ public class ScriptContext extends PropertySet implements XScriptContext {
private final static String DOC_URI = "SCRIPTING_DOC_URI";
- private final XModel m_xModel;
+ public final XModel m_xModel;
private final XScriptInvocationContext m_xInvocationContext;
private final XDesktop m_xDeskTop;
private final XComponentContext m_xComponentContext;
+ // property, accessed via reflection
+ public String m_sDocURI = null;
+
private ScriptContext(XComponentContext xmComponentContext, XDesktop xDesktop,
XModel xModel, XScriptInvocationContext xInvocContext) {
commit 7d55eb25f8c8d71d337ba9e705fb2d4722462d6e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 13 09:26:48 2015 +0100
SwFlyLayFrm shall apparently be noncopyable
Change-Id: I78e1f23c3c39cafb6e3c1c085db880bc1cd88196
diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx
index ef01125..82b1b96 100644
--- a/sw/source/core/inc/flyfrms.hxx
+++ b/sw/source/core/inc/flyfrms.hxx
@@ -19,6 +19,10 @@
#ifndef INCLUDED_SW_SOURCE_CORE_INC_FLYFRMS_HXX
#define INCLUDED_SW_SOURCE_CORE_INC_FLYFRMS_HXX
+#include <sal/config.h>
+
+#include <boost/noncopyable.hpp>
+
#include "flyfrm.hxx"
// #i28701#
@@ -119,14 +123,14 @@ public:
};
// Flys that are bound to LayoutFrms and not to Cntnt
-class SwFlyLayFrm : public SwFlyFreeFrm
+class SwFlyLayFrm : public SwFlyFreeFrm, private boost::noncopyable
{
public:
// #i28701#
TYPEINFO_OVERRIDE();
SwFlyLayFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor );
- SwFlyLayFrm( SwFlyLayFrm& );
+
protected:
virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
};
commit 863617e1682b3d0e0c5dc41127fc7eaaa499dee6
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Tue Jan 13 09:09:27 2015 +0100
sfx2: stop using comphelper/implbase_var.hxx
Change-Id: I3dc9e9305883c890e5e3c10ffcd8a9a5dbf09cc7
diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx
index 028236f..a074263 100644
--- a/include/sfx2/sfxbasemodel.hxx
+++ b/include/sfx2/sfxbasemodel.hxx
@@ -84,13 +84,7 @@
#include <com/sun/star/document/XViewDataSupplier.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
-
-#ifndef INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_32
-#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_32
-#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 32
-#include <comphelper/implbase_var.hxx>
-#endif
-
+#include <cppuhelper/implbase.hxx>
#include <svl/lstner.hxx>
class SfxMedium;
@@ -129,7 +123,7 @@ namespace sfx { namespace intern {
SfxListener
*/
-typedef ::comphelper::WeakImplHelper32 < css::container::XChild
+typedef ::cppu::WeakImplHelper < css::container::XChild
, css::document::XDocumentPropertiesSupplier
, css::document::XCmisDocument
, css::rdf::XDocumentMetadataAccess
commit 71a7222b1d398c69730e31d5372965e0624ab17f
Author: Noel Grandin <noel at peralex.com>
Date: Mon Dec 22 14:40:16 2014 +0200
java: inline CheckMemoryUsage test properties
Change-Id: Ia5ee0fdc7617b43c4874aa285459f9a1a52cea12
diff --git a/vcl/qa/complex/memCheck/CheckMemoryUsage.java b/vcl/qa/complex/memCheck/CheckMemoryUsage.java
index 5eefd42..be221e0 100644
--- a/vcl/qa/complex/memCheck/CheckMemoryUsage.java
+++ b/vcl/qa/complex/memCheck/CheckMemoryUsage.java
@@ -25,8 +25,6 @@ import java.io.File;
import java.io.FileWriter;
import java.io.FilenameFilter;
import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Iterator;
import java.util.StringTokenizer;
import lib.TestParameters;
@@ -39,6 +37,8 @@ import org.junit.Test;
import org.openoffice.test.OfficeConnection;
import util.DesktopTools;
+import util.OSName;
+import util.PropertyName;
import com.sun.star.beans.PropertyValue;
import com.sun.star.frame.XStorable;
@@ -57,13 +57,6 @@ import com.sun.star.util.XCloseable;
* Needed parameters:
* <ul>
* <li>"TestDocumentPath" - the path where test documents are located.</li>
- * <li>"AllowMemoryIncrease" (optional) - the allowed memory increase measured in kByte per exported document. The default is 10 kByte.</li>
- * <li>"ExportDocCount" (optional) - the amount of exports for each document that is loaded. Is defaulted to 25.
- * <li>"FileExportFilter" (optional) - a relation between loaded document type and used export filter. Is defaulted to
- * writer, calc and impress. This parameter can be set with a number to give more than one relation. Example:<br>
- * "FileExportFilter1=sxw,writer_pdf_Export"<br>
- * "FileExportFilter2=sxc,calc_pdf_Export"<br>
- * "FileExportFilter3=sxi,impress_pdf_Export"<br></li>
* All parameters are used for iteration over the test document path.
* </ul>
*/
@@ -92,12 +85,11 @@ class TempDir
public class CheckMemoryUsage
{
- private static final String sWriterDoc = "sxw,writer_pdf_Export";
- private static final String sCalcDoc = "sxc,calc_pdf_Export";
- private static final String sImpressDoc = "sxi,impress_pdf_Export";
TempDir m_aTempDir;
private String[][] sDocTypeExportFilter;
private String[][] sDocuments;
+ // the allowed memory increase measured in kByte per exported document. The default is 10 kByte.
+ // the allowed memory increase per exported document: if the memory increase is higher than this number, the test will fail
private static final int iAllowMemoryIncrease = 10;
private int iExportDocCount = 25;
@@ -112,10 +104,10 @@ public class CheckMemoryUsage
// some Tests need the qadevOOo TestParameters, it is like a Hashmap for Properties.
TestParameters param = new TestParameters();
- param.put("ServiceFactory", xMsf); // some qadevOOo functions need the ServiceFactory
+ param.put(PropertyName.SERVICE_FACTORY, xMsf); // some qadevOOo functions need the ServiceFactory
// test does definitely not run on Windows.
- if (param.get("OperatingSystem").equals("wntmsci"))
+ if (param.get(PropertyName.OPERATING_SYSTEM).equals(OSName.WNTMSCI))
{
System.out.println("Test can only reasonably be executed with a tool that "
+ "displays the memory usage of StarOffice.");
@@ -127,45 +119,22 @@ public class CheckMemoryUsage
// how many times is every document exported.
- int count = param.getInt("ExportDocCount");
- if (count != 0)
- {
- iExportDocCount = count;
- }
+ // the amount of exported documents: each loaded document will be written 'ExportDocCount' times
+ iExportDocCount = 25;
// get the temp dir for creating the command scripts.
m_aTempDir = new TempDir(util.utils.getOfficeTemp/*Dir*/(xMsf));
// get the file extension, export filter connection
- Iterator<String> keys = param.keySet().iterator();
- ArrayList<String> v = new ArrayList<String>();
- while (keys.hasNext())
- {
- String key = keys.next();
- if (key.startsWith("FileExportFilter"))
- {
- v.add((String) param.get(key));
- }
- }
- // if no param given, set defaults.
- if (v.isEmpty())
- {
- v.add(sWriterDoc);
- v.add(sCalcDoc);
- v.add(sImpressDoc);
- }
+ // the import and export filters
// store a file extension
- sDocTypeExportFilter = new String[v.size()][2];
- for (int i = 0; i < v.size(); i++)
- {
- // 2do: error routine for wrong given params
- final String sVContent = v.get(i);
- StringTokenizer t = new StringTokenizer(sVContent, ",");
- final String sExt = t.nextToken();
- final String sName = t.nextToken();
- sDocTypeExportFilter[i][0] = sExt;
- sDocTypeExportFilter[i][1] = sName;
- }
+ sDocTypeExportFilter = new String[3][2];
+ sDocTypeExportFilter[0][0] = "sxw";
+ sDocTypeExportFilter[0][1] = "writer_pdf_Export";
+ sDocTypeExportFilter[1][0] = "sxc";
+ sDocTypeExportFilter[1][1] = "calc_pdf_Export";
+ sDocTypeExportFilter[2][0] = "sxi";
+ sDocTypeExportFilter[2][1] = "impress_pdf_Export";
// get files to load and export
String sDocumentPath = TestDocument.getUrl();
diff --git a/vcl/qa/complex/memCheck/CheckMemoryUsage.props b/vcl/qa/complex/memCheck/CheckMemoryUsage.props
index 50738ff6..3ff90b5 100644
--- a/vcl/qa/complex/memCheck/CheckMemoryUsage.props
+++ b/vcl/qa/complex/memCheck/CheckMemoryUsage.props
@@ -19,14 +19,4 @@
# the path to the test documents
TestDocumentPath=../../testdocuments
-# the allowed memory increase per exported document: if the memory increase is higher than this number, the test will fail
-AllowMemoryIncrease=20
-# the amount of exported documents: each loaded document will be written 'ExportDocCount' times
-ExportDocCount=25
-
-# the import and export filters, separated by comma; further relations can be added with increasing numbers, like
-#'FileExportFilter4=sxd,draw_pdf_Export'
-FileExportFilter1=sxw,writer_pdf_Export
-FileExportFilter2=sxc,calc_pdf_Export
-FileExportFilter3=sxi,impress_pdf_Export
commit 1ad3729d1ad5b673a6a3730e4e4c1877f9fe33b7
Author: Noel Grandin <noel at peralex.com>
Date: Mon Dec 22 15:08:30 2014 +0200
java: inline some test properties
Change-Id: I8be2ee13652ed7223e41765811db577ecc1c85d6
diff --git a/forms/qa/integration/forms/ListSelection.java b/forms/qa/integration/forms/ListSelection.java
index ee7d7ca..5e9fd8a 100644
--- a/forms/qa/integration/forms/ListSelection.java
+++ b/forms/qa/integration/forms/ListSelection.java
@@ -63,28 +63,14 @@ public class ListSelection extends integration.forms.TestCase
/* ------------------------------------------------------------------ */
public void checkUserListSelection() throws com.sun.star.uno.Exception, java.lang.Exception
{
- boolean interactiveTest = param.getBool( "Interactive" );
-
- if ( interactiveTest )
+ int runs = 5;
+ for ( int i = 0; i < runs; ++i )
{
+ log.println( "Round " + ( i + 1 ) + " of " + runs );
prepareDocument();
- waitForUserInput();
- closeDocumentByUI();
- }
- else
- {
- int runs = param.getInt( "Runs" );
- if ( runs == 0 )
- runs = 10;
-
- for ( int i = 0; i < runs; ++i )
- {
- log.println( "Round " + ( i + 1 ) + " of " + runs );
- prepareDocument();
- impl_clickListBox();
- synchronized( this ) { this.wait( 1000 ); }
- closeDocument();
- }
+ impl_clickListBox();
+ synchronized( this ) { this.wait( 1000 ); }
+ closeDocument();
}
}
diff --git a/forms/qa/integration/forms/ListSelection.props b/forms/qa/integration/forms/ListSelection.props
index 4464e32..92b56be 100644
--- a/forms/qa/integration/forms/ListSelection.props
+++ b/forms/qa/integration/forms/ListSelection.props
@@ -1,3 +1 @@
ThreadTimeOut=600000
-Interactive=false
-Runs=5
diff --git a/qadevOOo/runner/helper/CfgParser.java b/qadevOOo/runner/helper/CfgParser.java
index d6cf0e6..7c7e17a 100644
--- a/qadevOOo/runner/helper/CfgParser.java
+++ b/qadevOOo/runner/helper/CfgParser.java
@@ -41,30 +41,13 @@ public class CfgParser
public CfgParser(String ini)
{
- if (ini != null)
- {
- this.iniFile = ini;
- }
+ this.iniFile = ini;
}
public void getIniParameters(TestParameters param)
{
debug = param.getBool(PropertyName.DEBUG_IS_ACTIVE);
- Properties cfg = null;
- if (iniFile.length() == 0)
- {
- //no iniFile given, search one in the users home directory
- cfg = getProperties(getDefaultFileName(true));
- //try to search the user dir if no iniFile could be found yet
- if (cfg == null)
- {
- cfg = getProperties(getDefaultFileName(false));
- }
- }
- else
- {
- cfg = getProperties(iniFile);
- }
+ Properties cfg = getProperties(iniFile);
if (cfg != null)
{
@@ -161,28 +144,4 @@ public class CfgParser
return prop;
}
- private String getDefaultFileName(boolean home)
- {
- String fileSeparator = System.getProperty("file.separator");
- String path = "";
- if (home)
- {
- //look inside the home directory
- path = System.getProperty("user.home");
- }
- else
- {
- path = System.getProperty("user.dir");
- }
- if (fileSeparator.equals("/"))
- {
- //suppose I'm on Unix-platform
- return path + fileSeparator + ".runner.props";
- }
- else
- {
- //suppose I'm on Windows
- return path + fileSeparator + "runner.props";
- }
- }
}
commit 32a278e377115ac5f3e6038d50e7d4d06480111b
Author: Noel Grandin <noel at peralex.com>
Date: Mon Dec 22 15:06:15 2014 +0200
java: remove some dead properties
Change-Id: I96adb2941c483ec08c752f35e35cf9ceb941971d
diff --git a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.props b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.props
index 84bdb5a..92b56be 100644
--- a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.props
+++ b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.props
@@ -1,3 +1 @@
-FtpAccess=ftp://apitest:apitest@margritte/%2e%2e/share/easyDocTypes
-HttpAccess=http://margritte:8080/share/easyDocTypes
ThreadTimeOut=600000
commit 3abc03134910dd8f55f11efd6800bc0485675b01
Author: Noel Grandin <noel at peralex.com>
Date: Mon Dec 22 15:04:20 2014 +0200
java: inline the CheckAPI properties
no need to make this configurable
Change-Id: I0ab149317f4660fc7ebc4c43342d20a386bdbc5f
diff --git a/framework/qa/complex/api_internal/CheckAPI.java b/framework/qa/complex/api_internal/CheckAPI.java
index 0480191..f2d8f96 100644
--- a/framework/qa/complex/api_internal/CheckAPI.java
+++ b/framework/qa/complex/api_internal/CheckAPI.java
@@ -23,7 +23,6 @@ import static org.junit.Assert.fail;
import helper.OfficeProvider;
import helper.ProcessHandler;
-import java.util.ArrayList;
import java.util.StringTokenizer;
import lib.TestParameters;
@@ -35,7 +34,6 @@ import org.openoffice.test.OfficeConnection;
import com.sun.star.beans.NamedValue;
import com.sun.star.beans.PropertyValue;
-import com.sun.star.beans.XPropertyAccess;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.task.XJob;
import com.sun.star.uno.UnoRuntime;
@@ -77,60 +75,25 @@ public class CheckAPI {
assertNotNull("Cannot create 'org.openoffice.RunnerService'", oObj);
// get the parameters for the internal test
- String paramList = (String)param.get("ParamList");
- ArrayList<Object> p = new ArrayList<Object>();
- StringTokenizer paramTokens = new StringTokenizer(paramList, " ");
- while(paramTokens.hasMoreTokens())
- {
- p.add(paramTokens.nextToken());
- }
- int length = p.size()/2+1;
- NamedValue[] internalParams = new NamedValue[length];
- for (int i=0; i<length-1; i++) {
- internalParams[i] = new NamedValue();
- internalParams[i].Name = (String)p.get(i*2);
- internalParams[i].Value = p.get(i*2+1);
- System.out.println("Name: "+internalParams[i].Name);
- System.out.println("Value: "+(String)internalParams[i].Value);
- }
+ final NamedValue[] internalParams = new NamedValue[3];
+ internalParams[0] = new NamedValue();
+ internalParams[0].Name = "-OutProducer";
+ internalParams[0].Value = "stats.SimpleFileOutProducer";
+ internalParams[1] = new NamedValue();
+ internalParams[1].Name = "-OutputPath";
+ internalParams[1].Value = "/dev/null";
// do we have test jobs?
- String testJob = (String)param.get("job");
- PropertyValue[]props;
- if (testJob==null)
- {
- if ( param.get("job1")==null )
- {
- // get all test jobs from runner service
- XPropertyAccess xPropAcc = UnoRuntime.queryInterface(XPropertyAccess.class, oObj);
- props = xPropAcc.getPropertyValues();
- }
- else {
- int index=1;
- p = new ArrayList<Object>();
- while ( param.get("job"+index) != null ) {
- p.add(param.get("job"+index));
- index++;
- }
- props = new PropertyValue[p.size()];
- for ( int i=0; i<props.length; i++ ) {
- props[i] = new PropertyValue();
- props[i].Value = p.get(i);
- }
- }
- }
- else {
- props = new PropertyValue[1];
- props[0] = new PropertyValue();
- props[0].Value = testJob;
- }
+ final PropertyValue[] props = new PropertyValue[1];
+ props[0] = new PropertyValue();
+ props[0].Value = "sw.SwXTextTable";
System.out.println("Props length: "+ props.length);
for (int i=0; i<props.length; i++) {
XJob xJob = UnoRuntime.queryInterface(XJob.class, oObj);
- internalParams[length-1] = new NamedValue();
- internalParams[length-1].Name = "-o";
- internalParams[length-1].Value = props[i].Value;
+ internalParams[2] = new NamedValue();
+ internalParams[2].Name = "-o";
+ internalParams[2].Value = props[i].Value;
System.out.println("Executing: " + (String)props[i].Value);
String erg = null;
diff --git a/framework/qa/complex/api_internal/CheckAPI.props b/framework/qa/complex/api_internal/CheckAPI.props
deleted file mode 100644
index 58bd942..0000000
--- a/framework/qa/complex/api_internal/CheckAPI.props
+++ /dev/null
@@ -1,4 +0,0 @@
-ParamList=-OutProducer stats.SimpleFileOutProducer -OutputPath /dev/null
-#AppExecutionCommand=d:\\prj_new\\install\\src680_m17\\program\\soffice --norestore --accept=socket,host=0,port=8100;urp;
-# the test job list
-job1=sw.SwXTextTable
commit 97394213985d4c8ea6c8119bba55e6f632236477
Author: Noel Grandin <noel at peralex.com>
Date: Mon Dec 22 14:54:07 2014 +0200
java: nothing is passing in a "ComplexIni" parameter
Change-Id: Iae7530a52eda020f9074a6de0ef9e4b9779593f6
diff --git a/qadevOOo/runner/base/java_complex.java b/qadevOOo/runner/base/java_complex.java
index 4dbf070..b5cafa1 100644
--- a/qadevOOo/runner/base/java_complex.java
+++ b/qadevOOo/runner/base/java_complex.java
@@ -45,14 +45,6 @@ public class java_complex implements TestBase
public boolean executeTest(TestParameters param)
{
- // is there an ini file for the complex tests defined?
- String complexIniFileName = ((String) param.get("ComplexIni"));
- if (complexIniFileName != null)
- {
- CfgParser ini = new CfgParser(complexIniFileName);
- ini.getIniParameters(param);
- }
-
// get the test job
String testJob = ((String) param.get("TestJob"));
@@ -69,25 +61,17 @@ public class java_complex implements TestBase
*/
public boolean executeTest(TestParameters param, DescEntry[] entries)
{
- // is there an ini file for the complex tests defined?
- String complexIniFileName = ((String) param.get("ComplexIni"));
- if (complexIniFileName != null)
- {
- CfgParser ini = new CfgParser(complexIniFileName);
- ini.getIniParameters(param);
- }
-
DynamicClassLoader dcl = new DynamicClassLoader();
ComplexTestCase testClass = null;
boolean returnVal = true;
// the concept of the TimeOut depends on runner logs. If the runner log,
// for example to start a test method, the timeout was reset. This is not
-// while the test itself log something like "open docuent...".
+// while the test itself log something like "open document...".
// An property of complex test could be that it have only one test method
-// which works for serveral minutes. Ih this case the TimeOut get not trigger
+// which works for several minutes. In this case the TimeOut get not trigger
// and the office was killed.
-// In complex tests just use "ThreadTimeOut" as timout.
+// In complex tests just use "ThreadTimeOut" as timeout.
for (int i = 0; i < entries.length; i++)
{
commit ba5275aa0b6059068e00cf218fc7177bc6d0cb02
Author: Noel Grandin <noel at peralex.com>
Date: Mon Dec 22 14:45:07 2014 +0200
java: nothing is passing a "-ini" parameter into the RunnerService
Change-Id: Ic8dffc4ed757c74ce383b3dcf204d1c899a0c4f5
diff --git a/qadevOOo/runner/helper/ClParser.java b/qadevOOo/runner/helper/ClParser.java
index 263ed2a..1dd70db 100644
--- a/qadevOOo/runner/helper/ClParser.java
+++ b/qadevOOo/runner/helper/ClParser.java
@@ -103,46 +103,6 @@ public class ClParser
}
}
- /*
- * This method returns the path to a Configuration file <br>
- * if defined as command line parameter, an empty String elsewhere
- */
- public String getIniPath(String[] args)
- {
- String iniFile = "";
-
- for (int i = 0; i < args.length; i++)
- {
- if (args[i].equals("-ini"))
- {
- iniFile = args[i + 1];
- break;
- }
- }
-
- return iniFile;
- }
-
- /*
- * This method returns the path to a Configuration file <br>
- * if defined as command line parameter, an empty String elsewhere
- */
- public String getRunnerIniPath(String[] args)
- {
- String iniFile = "";
-
- for (int i = 0; i < args.length; i++)
- {
- if (args[i].equals("-runnerini"))
- {
- iniFile = args[i + 1];
- break;
- }
- }
-
- return iniFile;
- }
-
/**
* Map command-line Parameters to TestParameters
*/
diff --git a/qadevOOo/runner/org/openoffice/Runner.java b/qadevOOo/runner/org/openoffice/Runner.java
index 42b7767..c7ee6dc 100644
--- a/qadevOOo/runner/org/openoffice/Runner.java
+++ b/qadevOOo/runner/org/openoffice/Runner.java
@@ -17,7 +17,6 @@
*/
package org.openoffice;
-import helper.CfgParser;
import helper.ClParser;
import java.util.Enumeration;
@@ -150,25 +149,6 @@ public class Runner
ClParser cli = new ClParser();
- //parse the commandline arguments if an ini-parameter is given
- String iniFile = cli.getIniPath(args);
-
- //initialize cfgParser with ini-path
- CfgParser ini = new CfgParser(iniFile);
-
- //parse ConfigFile
- ini.getIniParameters(param);
-
-
- //parse the commandline arguments if an runnerprops-parameter is given
- String runnerIniFile = cli.getRunnerIniPath(args);
-
- //initialize cfgParser with ini-path
- CfgParser runnerIni = new CfgParser(runnerIniFile);
-
- //parse ConfigFile
- runnerIni.getIniParameters(param);
-
//parse the commandline arguments
// TODO: no right error message, if no parameter given!
cli.getCommandLineParameter(param, args);
diff --git a/qadevOOo/runner/org/openoffice/RunnerService.java b/qadevOOo/runner/org/openoffice/RunnerService.java
index f04133f..99f3b15 100644
--- a/qadevOOo/runner/org/openoffice/RunnerService.java
+++ b/qadevOOo/runner/org/openoffice/RunnerService.java
@@ -18,7 +18,6 @@
package org.openoffice;
-import helper.CfgParser;
import helper.ClParser;
import java.util.ArrayList;
@@ -76,25 +75,6 @@ public class RunnerService implements XJob, XServiceInfo,
ClParser cli = new ClParser();
- //parse the arguments if an ini-parameter is given
- String iniFile = cli.getIniPath(arguments);
-
- //initialize cfgParser with ini-path
- CfgParser ini = new CfgParser(iniFile);
-
- //parse ConfigFile
- ini.getIniParameters(param);
-
-
- //parse the commandline arguments if an runnerprops-parameter is given
- String runnerIniFile = cli.getRunnerIniPath(arguments);
-
- //initialize cfgParser with ini-path
- CfgParser runnerIni = new CfgParser(runnerIniFile);
-
- //parse ConfigFile
- runnerIni.getIniParameters(param);
-
//parse the commandline arguments
cli.getCommandLineParameter(param,arguments);
commit a9ddedac7b1b533e3a4a17b23fe26099e4e68b54
Author: Noel Grandin <noel at peralex.com>
Date: Mon Dec 22 10:27:15 2014 +0200
java: move DEFAULT_SHORT_WAIT_MS to util.utils
so I can turn PopertyNames into an enum
Change-Id: I939a83c0962813302a3653e75976147b2300cb18
diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java b/framework/qa/complex/framework/recovery/RecoveryTest.java
index 42f61c3..6bf108c 100644
--- a/framework/qa/complex/framework/recovery/RecoveryTest.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTest.java
@@ -221,7 +221,7 @@ public class RecoveryTest extends ComplexTestCase {
log.println("wating for recovery dialog...");
int counter = 0;
- int maximum = param.getInt(PropertyName.THREAD_TIME_OUT) / PropertyName.DEFAULT_SHORT_WAIT_MS;
+ int maximum = param.getInt(PropertyName.THREAD_TIME_OUT) / utils.DEFAULT_SHORT_WAIT_MS;
XDialog oDialog = rt.getActiveDialog(xMSF);
@@ -352,7 +352,7 @@ public class RecoveryTest extends ComplexTestCase {
util.utils.shortWait();
int counter = 0;
- int maximum = param.getInt(PropertyName.THREAD_TIME_OUT) / PropertyName.DEFAULT_SHORT_WAIT_MS;
+ int maximum = param.getInt(PropertyName.THREAD_TIME_OUT) / utils.DEFAULT_SHORT_WAIT_MS;
XAccessibleContext oButton = null;
while ((oButton == null) && (counter < maximum)){
diff --git a/framework/qa/complex/framework/recovery/RecoveryTools.java b/framework/qa/complex/framework/recovery/RecoveryTools.java
index 7037451..b199bce 100644
--- a/framework/qa/complex/framework/recovery/RecoveryTools.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTools.java
@@ -93,7 +93,7 @@ public class RecoveryTools {
// This could consumes more time then the TimeOut allow.
int counter = 0;
int multi = 5;
- int pause = PropertyName.DEFAULT_SHORT_WAIT_MS * 10;
+ int pause = utils.DEFAULT_SHORT_WAIT_MS * 10;
int timeOut = param.getInt(PropertyName.THREAD_TIME_OUT)*5;
int maximum = (timeOut / pause) * multi;
@@ -184,7 +184,7 @@ public class RecoveryTools {
helper.ProcessHandler ph = (helper.ProcessHandler) param.get("AppProvider");
int timeOut = param.getInt(PropertyName.THREAD_TIME_OUT)*5;
- int pause = PropertyName.DEFAULT_SHORT_WAIT_MS * 20;
+ int pause = utils.DEFAULT_SHORT_WAIT_MS * 20;
int multi = 0;
while ((ph != null) && (ph.getExitCode()<0) && (pause*multi < timeOut)) {
log.println("waiting until the office is closed... remaining " + (timeOut - pause * multi)/1000 + " seconds");
@@ -257,7 +257,7 @@ public class RecoveryTools {
{
KlickButtonThread kbt = new KlickButtonThread(xWindow, buttonName);
kbt.start();
- util.utils.pause(PropertyName.DEFAULT_SHORT_WAIT_MS * 10);
+ util.utils.pause(utils.DEFAULT_SHORT_WAIT_MS * 10);
}
public void copyRecoveryData(boolean backup)
diff --git a/qadevOOo/runner/util/PropertyName.java b/qadevOOo/runner/util/PropertyName.java
index 27e29b1..51d52a8 100644
--- a/qadevOOo/runner/util/PropertyName.java
+++ b/qadevOOo/runner/util/PropertyName.java
@@ -63,10 +63,6 @@ public interface PropertyName {
*/
String OUT_PRODUCER = "OutProducer";
/**
- * Default short wait time for the Office
- */
- int DEFAULT_SHORT_WAIT_MS = 500;
- /**
* internal only, no parameter
* The OfficeProvider contains the full qualified
* class that provides a connection to StarOffice<br>
diff --git a/qadevOOo/runner/util/utils.java b/qadevOOo/runner/util/utils.java
index 4557cb5..4a77e41 100644
--- a/qadevOOo/runner/util/utils.java
+++ b/qadevOOo/runner/util/utils.java
@@ -648,7 +648,7 @@ public class utils {
* This is the default call, which waits for 500ms.
*/
public static void shortWait() {
- pause(PropertyName.DEFAULT_SHORT_WAIT_MS);
+ pause(utils.DEFAULT_SHORT_WAIT_MS);
}
/** Causes the thread to sleep some time.
@@ -857,4 +857,9 @@ public class utils {
dfmt.format(cal.get(Calendar.MILLISECOND));
return "[" + dateTime + "]";
}
+
+ /**
+ * Default short wait time for the Office
+ */
+ public static final int DEFAULT_SHORT_WAIT_MS = 500;
}
diff --git a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java
index 56dbf53..43bffcf 100644
--- a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java
+++ b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java
@@ -39,7 +39,7 @@ import java.awt.event.InputEvent;
import lib.MultiMethodTest;
import util.AccessibilityTools;
-import util.PropertyName;
+import util.utils;
/**
* Testing <code>com.sun.star.awt.XUserInputInterception</code>
@@ -151,7 +151,7 @@ public class _XUserInputInterception extends MultiMethodTest {
et.run();
- util.utils.pause(PropertyName.DEFAULT_SHORT_WAIT_MS * 2);
+ util.utils.pause(utils.DEFAULT_SHORT_WAIT_MS * 2);
log.println("key listener thread should be finished.");
@@ -214,7 +214,7 @@ public class _XUserInputInterception extends MultiMethodTest {
et.run();
- util.utils.pause(PropertyName.DEFAULT_SHORT_WAIT_MS * 2);
+ util.utils.pause(utils.DEFAULT_SHORT_WAIT_MS * 2);
log.println("mouse listener thread should be finished.");
boolean bOK = m_mousePressed1 & m_mouseReleased1 &
commit db31985095af91d3dbfc2a73b16dda57a03c747e
Author: Noel Grandin <noel at peralex.com>
Date: Mon Dec 22 10:26:01 2014 +0200
java: NO_CWS_ATTACH parameter is unused
Change-Id: I3e465987ef3dd502faecaf3c5ce151013a5bf314
diff --git a/qadevOOo/runner/helper/ClParser.java b/qadevOOo/runner/helper/ClParser.java
index 22c3e9c..263ed2a 100644
--- a/qadevOOo/runner/helper/ClParser.java
+++ b/qadevOOo/runner/helper/ClParser.java
@@ -161,7 +161,6 @@ public class ClParser
COMMAND_LINE_OPTION_TO_TEST_PARAMETER.put("-debug", "DebugIsActive");
COMMAND_LINE_OPTION_TO_TEST_PARAMETER.put("-log", "LoggingIsActive");
COMMAND_LINE_OPTION_TO_TEST_PARAMETER.put("-dbout", "DataBaseOut");
- COMMAND_LINE_OPTION_TO_TEST_PARAMETER.put("-nca", "NoCwsAttach");
}
private String getParameterFor(String name)
diff --git a/qadevOOo/runner/util/PropertyName.java b/qadevOOo/runner/util/PropertyName.java
index 7a37125..27e29b1 100644
--- a/qadevOOo/runner/util/PropertyName.java
+++ b/qadevOOo/runner/util/PropertyName.java
@@ -144,12 +144,6 @@ public interface PropertyName {
*/
String CYGWIN = "Cygwin";
/**
- * parameter name: "NoCwsAttach"<p>
- * If this parameter is set to "true" , a status of CWS-UnoAPI-Tests was not attached to EIS<p>
- * @see complex.unoapi.CheckModuleAPI
- */
- String NO_CWS_ATTACH = "NoCwsAttach";
- /**
* internal only, no parameter
*/
String WNTMSCI = "wntmsci";
diff --git a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
index 7465b01..40e75d4 100644
--- a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
+++ b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
@@ -530,23 +530,18 @@ public class CheckModuleAPI extends ComplexTestCase
private void setUnoApiCwsStatus(boolean status)
{
-
- if (!param.getBool(PropertyName.NO_CWS_ATTACH))
+ final String version = (String) param.get(PropertyName.VERSION);
+ if (version.startsWith("cws_"))
{
-
- final String version = (String) param.get(PropertyName.VERSION);
- if (version.startsWith("cws_"))
+ try
{
- try
- {
- final CwsDataExchangeImpl cde = new CwsDataExchangeImpl(param, log);
- cde.setUnoApiCwsStatus(status);
- }
- catch (ParameterNotFoundException ex)
- {
- log.println("ERROR: could not wirte status to EIS database: " + ex.toString());
- }
+ final CwsDataExchangeImpl cde = new CwsDataExchangeImpl(param, log);
+ cde.setUnoApiCwsStatus(status);
+ }
+ catch (ParameterNotFoundException ex)
+ {
+ log.println("ERROR: could not wirte status to EIS database: " + ex.toString());
}
}
}
commit dd49e1ba1ab5f0087d36704732f2ee4ba67a2c5f
Author: Noel Grandin <noel at peralex.com>
Date: Mon Dec 22 10:22:57 2014 +0200
java: DONT_BACKUP_USERLAYER parameter is unused
Change-Id: I2e66a6acfd50b929d43ffdb3e468042875b6b23d
diff --git a/qadevOOo/runner/helper/OfficeProvider.java b/qadevOOo/runner/helper/OfficeProvider.java
index a1d3910..8b20a3c 100644
--- a/qadevOOo/runner/helper/OfficeProvider.java
+++ b/qadevOOo/runner/helper/OfficeProvider.java
@@ -281,10 +281,7 @@ public class OfficeProvider implements AppProvider
}
else if (isExecutable)
{
- if (!param.getBool(util.PropertyName.DONT_BACKUP_USERLAYER))
- {
- backupUserLayer(param, msf);
- }
+ backupUserLayer(param, msf);
}
}
else
@@ -515,39 +512,36 @@ public class OfficeProvider implements AppProvider
param.remove("AppProvider");
param.remove("ServiceFactory");
- if (!param.getBool(util.PropertyName.DONT_BACKUP_USERLAYER))
+ //copy user_backup into user layer
+ try
{
- //copy user_backup into user layer
- try
+ final String userLayer = (String) param.get("userLayer");
+ final String copyLayer = (String) param.get("copyLayer");
+ if (userLayer != null && copyLayer != null)
{
- final String userLayer = (String) param.get("userLayer");
- final String copyLayer = (String) param.get("copyLayer");
- if (userLayer != null && copyLayer != null)
- {
- deleteFilesAndDirector(new File(userLayer));
- final File copyFile = new File(copyLayer);
- dbg("copy '" + copyFile + "' -> '" + userLayer + "'");
- FileTools.copyDirectory(copyFile, new File(userLayer), new String[]
- {
- "temp"
- });
- dbg("copy '" + copyFile + "' -> '" + userLayer + "' finished");
+ deleteFilesAndDirector(new File(userLayer));
+ final File copyFile = new File(copyLayer);
+ dbg("copy '" + copyFile + "' -> '" + userLayer + "'");
+ FileTools.copyDirectory(copyFile, new File(userLayer), new String[]
+ {
+ "temp"
+ });
+ dbg("copy '" + copyFile + "' -> '" + userLayer + "' finished");
- // remove all user_backup folder in temp dir
- // this is for the case the runner was killed and some old backup folder still stay in temp dir
+ // remove all user_backup folder in temp dir
+ // this is for the case the runner was killed and some old backup folder still stay in temp dir
- }
- else
- {
- System.out.println("Cannot copy layer: '" + copyLayer + "' back to user layer: '" + userLayer + "'");
- }
}
- catch (java.io.IOException e)
+ else
{
- dbg("Couldn't recover from backup\n" + e.getMessage());
+ System.out.println("Cannot copy layer: '" + copyLayer + "' back to user layer: '" + userLayer + "'");
}
}
+ catch (java.io.IOException e)
+ {
+ dbg("Couldn't recover from backup\n" + e.getMessage());
+ }
return result;
}
diff --git a/qadevOOo/runner/util/PropertyName.java b/qadevOOo/runner/util/PropertyName.java
index 1932a74..7a37125 100644
--- a/qadevOOo/runner/util/PropertyName.java
+++ b/qadevOOo/runner/util/PropertyName.java
@@ -170,8 +170,4 @@ public interface PropertyName {
*/
String UNXMACXI = "unxmacxi";
- /**
- * can be used to dont backup the user layer, faster office start/stop but less secure default is to backup the user layer
- */
- String DONT_BACKUP_USERLAYER = "DontBackupUserLayer";
}
commit 3736e03670d2bc5fe79e42e2be3f0bf776be0bdd
Author: David Ostrovsky <david at ostrovsky.org>
Date: Mon Jan 12 22:33:31 2015 +0100
Fix installer on x86_64 platform on windows
Change-Id: I3020b648cae31e28de51e68177c0490e77733f4e
Reviewed-on: https://gerrit.libreoffice.org/13878
Reviewed-by: David Ostrovsky <david at ostrovsky.org>
Tested-by: David Ostrovsky <david at ostrovsky.org>
diff --git a/configure.ac b/configure.ac
index 3234a2b..d4029a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12711,6 +12711,10 @@ else
if test "$GNUMAKE_WIN_NATIVE" = "TRUE" ; then
LO_PATH=`cygpath -p -m "$PATH"`
fi
+ if test "$BITNESS_OVERRIDE" = 64; then
+ # needed for msi packaging
+ pathmunge "$WINDOWS_SDK_HOME/bin/x86" "before"
+ fi
pathmunge "$DOTNET_FRAMEWORK_HOME/bin" "before"
pathmunge "$ASM_HOME" "before"
pathmunge "$WINDOWS_SDK_HOME/bin" "before"
commit 2027018d9da29556a89904caacb4a1889702cd9e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 12 20:22:17 2015 +0000
WaE: vcl/opengl/gdiimpl.cxx
Change-Id: Ibd5c8574b0454f9f3688a65d246fd2dea4d0dda8
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 0695693..6da2c26 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -497,8 +497,8 @@ void OpenGLSalGraphicsImpl::ImplDrawLineAA( double nX1, double nY1, double nX2,
// is almost unnoticeable.
const double w = edge ? 1.4 : 1.0;
- double t;
- double R;
+ double t(0.0);
+ double R(0.0);
double f = w - static_cast<int>(w);
//determine parameters t,R
if ( w>=0.0 && w<1.0 )
commit 7df8707084d9766396835276b6715faae285b11a
Author: Tsutomu Uchino <hanya at apache.org>
Date: Mon Jan 12 14:39:39 2015 +0000
Resolves: #i120772# do not ignore last three properties...
when special properties not found in watching window
(cherry picked from commit 8815f3f3fbb3632cccbbf8476f4c40c9bda8eb6e)
Conflicts:
basctl/source/basicide/baside2b.cxx
Change-Id: I6069d55b9f894846a7b4d81b981cf4523b444753
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index b145ad4..b9cca06 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -2162,9 +2162,16 @@ void WatchTreeListBox::RequestingChildren( SvTreeListEntry * pParent )
createAllObjectProperties( pObj );
SbxArray* pProps = pObj->GetProperties();
sal_uInt16 nPropCount = pProps->Count();
+ if ( nPropCount >= 3 &&
+ pProps->Get( nPropCount -1 )->GetName().equalsIgnoreAsciiCase( "Dbg_Methods" ) &&
+ pProps->Get( nPropCount -2 )->GetName().equalsIgnoreAsciiCase( "Dbg_Properties" ) &&
+ pProps->Get( nPropCount -3 )->GetName().equalsIgnoreAsciiCase( "Dbg_SupportedInterfaces" ) )
+ {
+ nPropCount -= 3;
+ }
pItem->maMemberList.reserve(nPropCount);
- for( sal_uInt16 i = 0 ; i < nPropCount - 3 ; i++ )
+ for( sal_uInt16 i = 0 ; i < nPropCount ; ++i )
{
SbxVariable* pVar = pProps->Get( i );
commit 858a50043f1b4975b4e9ee554f6313523e867f46
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Jan 12 20:02:29 2015 +0100
sw: fdo#88005: fix check in SwWW8ImplReader::StopApo()
404f16e97f1c2fcd8f9a1297bdfa46cba970467e is embarrassing crap; the real
problem there is that the paragraph that should be removed is _inside_
the frame, but in sf_68e4f217c107f6eada21adfe6e3c9c57-82055-minimized.doc
the MoveInsideFly() is not called so a non-empty body paragraph was removed.
Change-Id: I5d4443804c52a5fa30ddb51609ccbbee07abc5aa
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 2889fc0..aeb40d0 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2473,8 +2473,7 @@ void SwWW8ImplReader::StopApo()
Color aBg(0xFE, 0xFF, 0xFF, 0xFF); //Transparent by default
SwTxtNode* pNd = aPref.GetNode().GetTxtNode();
- if (pNd && &pPaM->GetPoint()->nNode.GetNode()
- != &pSFlyPara->pMainTextPos->nNode.GetNode())
+ if (pNd && pSFlyPara->pFlyFmt)
{
/*
#i582#
commit 0e5911656f070b86ff5de6d952280361086eb9ef
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Jan 12 20:02:01 2015 +0100
sw: translate some german comments
Change-Id: If189a60ae48a64cde109e52903c9a4b8b9fde85a
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index bc8de99..2889fc0 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2329,13 +2329,11 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults &rApo,
if( !pWFlyPara->bGrafApo )
{
- // Innerhalb des GrafApo muessen Textattribute ignoriert werden, da
- // sie sonst auf den folgenden Zeilen landen. Der Rahmen wird nur
- // eingefuegt, wenn er *nicht* nur zum Positionieren einer einzelnen
- // Grafik dient. Ist es ein Grafik-Rahmen, dann werden pWFlyPara und
- // pSFlyPara behalten und die
- // daraus resultierenden Attribute beim Einfuegen der Grafik auf die
- // Grafik angewendet.
+ // Within the GrafApo text attributes have to be ignored, because
+ // they would apply to the following lines. The frame is only inserted
+ // if it is not merely positioning a single image. If it is an image
+ // frame, pWFlyPara and pSFlyPara are retained and the resulting
+ // attributes applied to the image when inserting the image.
WW8FlySet aFlySet(*this, pWFlyPara, pSFlyPara, false);
@@ -2392,14 +2390,13 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults &rApo,
if (pSFlyPara->pFlyFmt)
MoveInsideFly(pSFlyPara->pFlyFmt);
- // 1) ReadText() wird nicht wie beim W4W-Reader rekursiv aufgerufen,
- // da die Laenge des Apo zu diesen Zeitpunkt noch nicht feststeht,
- // ReadText() diese Angabe aber braucht.
- // 2) Der CtrlStck wird nicht neu erzeugt.
- // die Char-Attribute laufen weiter ( AErger mit SW-Attributen )
- // Paraattribute muessten am Ende jeden Absatzes zurueckgesetzt
- // sein, d.h. es duerften am Absatzende keine Paraattribute
- // auf dem Stack liegen
+ // 1) ReadText() is not called recursively because the length of
+ // the Apo is unknown at that time, and ReadText() needs it.
+ // 2) the CtrlStck is not re-created.
+ // the Char attributes continue (trouble with Sw-attributes)
+ // Para attributes must be reset at the end of every paragraph,
+ // i.e. at the end of a paragraph there must not be para attributes
+ // on the stack
}
return true;
}
@@ -2413,7 +2410,7 @@ void wwSectionManager::JoinNode(const SwPosition &rPos, const SwNode &rNode)
bool SwWW8ImplReader::JoinNode(SwPaM &rPam, bool bStealAttr)
{
bool bRet = false;
- rPam.GetPoint()->nContent = 0; // an den Anfang der Zeile gehen
+ rPam.GetPoint()->nContent = 0; // go to start of paragraph
SwNodeIndex aPref(rPam.GetPoint()->nNode, -1);
@@ -2439,8 +2436,7 @@ void SwWW8ImplReader::StopApo()
return;
if (pWFlyPara->bGrafApo)
{
- // Grafik-Rahmen, der *nicht* eingefuegt wurde leeren Absatz incl.
- // Attributen entfernen
+ // image frame that has not been inserted: delete empty paragraph + attr
JoinNode(*pPaM, true);
}
@@ -2541,10 +2537,8 @@ void SwWW8ImplReader::StopApo()
}
delete pSFlyPara->pMainTextPos, pSFlyPara->pMainTextPos = 0;
-
-// Damit die Frames bei Einfuegen in existierendes Doc erzeugt werden,
-// wird in fltshell.cxx beim Setzen des FltAnchor-Attributes
-// pFlyFrm->MakeFrms() gerufen
+// To create the SwFrms when inserting into an existing document, fltshell.cxx
+// will call pFlyFrm->MakeFrms() when setting the FltAnchor attribute
}
@@ -2556,7 +2550,7 @@ void SwWW8ImplReader::StopApo()
DELETEZ( pWFlyPara );
}
-// TestSameApo() beantwortet die Frage, ob es dasselbe APO oder ein neues ist
+// TestSameApo() returns if it's the same Apo or a different one
bool SwWW8ImplReader::TestSameApo(const ApoTestResults &rApo,
const WW8_TablePos *pTabPos)
{
commit b4b84ef5abbd3078d25567a418f65121f22c24c2
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Jan 12 20:24:07 2015 +0200
Drop Add, Sub, Mul and Div from the default opcode subset
Those are supposed to obey the current setting for "Conversion from text to
number", and the OpenCL code does not currently take that setting into
consideration.
Change-Id: Iff6eeda6238c78f4aeb8eb27898ce7ea243b9dea
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 51b9c64..5d106dc 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1371,9 +1371,9 @@
<desc>The list of operator and function opcodes for which to use OpenCL. If a
formula contains only these operators and functions, it
might be calculated using OpenCL.</desc>
- <!-- numeric values correspond to +;-;*;/;RAND;SIN;COS;TAN;ATAN;EXP;LN;SQRT;NORMSINV;ROUND;POWER;SUMPRODUCT;MIN;MAX;SUM;PRODUCT;AVERAGE;COUNT;NORMDIST;SUMIFS -->
+ <!-- numeric values correspond to RAND;SIN;COS;TAN;ATAN;EXP;LN;SQRT;NORMSINV;ROUND;POWER;SUMPRODUCT;MIN;MAX;SUM;PRODUCT;AVERAGE;COUNT;NORMDIST;SUMIFS -->
</info>
- <value>40;41;42;43;66;82;83;84;88;102;103;104;149;204;209;213;222;223;224;225;226;227;236;403</value>
+ <value>66;82;83;84;88;102;103;104;149;204;209;213;222;223;224;225;226;227;236;403</value>
</prop>
<prop oor:name="OpenCLAutoSelect" oor:type="xs:boolean" oor:nillable="false">
<!-- UIHints: Tools - Options Spreadsheet Formula -->
diff --git a/sc/source/core/tool/calcconfig.cxx b/sc/source/core/tool/calcconfig.cxx
index 2b97929..36db540 100644
--- a/sc/source/core/tool/calcconfig.cxx
+++ b/sc/source/core/tool/calcconfig.cxx
@@ -41,10 +41,6 @@ void ScCalcConfig::setOpenCLConfigToDefault()
// Keep in order of opcode value, is that clearest? (Random order,
// at least, would make no sense at all.)
- maOpenCLSubsetOpCodes.insert(ocAdd);
- maOpenCLSubsetOpCodes.insert(ocSub);
- maOpenCLSubsetOpCodes.insert(ocMul);
- maOpenCLSubsetOpCodes.insert(ocDiv);
maOpenCLSubsetOpCodes.insert(ocRandom);
maOpenCLSubsetOpCodes.insert(ocSin);
maOpenCLSubsetOpCodes.insert(ocCos);
commit cead18d7a4aeb49cf69d1f2a5c6f7361c73e01d8
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Jan 12 18:19:39 2015 +0200
Increase the formula group size limit for OpenCL to be considered to 10000
Also changed the description to match the meaning (after
2021275f8fc33d9917d5fef58959a95da1dc7e6f).
Change-Id: Ide4b4f094495c178252c3167d52012f46f26b025
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 3ec97de..51b9c64 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1361,9 +1361,9 @@
<prop oor:name="OpenCLMinimumDataSize" oor:type="xs:int">
<!-- UIHints: Tools - Options Spreadsheet Formula -->
<info>
- <desc>An approximate lower limit on the number of data cells a spreadsheet formula should use for OpenCL to be considered.</desc>
+ <desc>Lower limit on the size of a formula group for OpenCL to be considered.</desc>
</info>
- <value>100</value>
+ <value>10000</value>
</prop>
<prop oor:name="OpenCLSubsetOpCodes" oor:type="xs:string" oor:nillable="false">
<!-- UIHints: Tools - Options Spreadsheet Formula -->
diff --git a/sc/source/core/tool/calcconfig.cxx b/sc/source/core/tool/calcconfig.cxx
index 1cbb3f5..2b97929 100644
--- a/sc/source/core/tool/calcconfig.cxx
+++ b/sc/source/core/tool/calcconfig.cxx
@@ -37,7 +37,7 @@ void ScCalcConfig::setOpenCLConfigToDefault()
// Crazy.
mbOpenCLSubsetOnly = true;
mbOpenCLAutoSelect = true;
- mnOpenCLMinimumFormulaGroupSize = 100;
+ mnOpenCLMinimumFormulaGroupSize = 10000;
// Keep in order of opcode value, is that clearest? (Random order,
// at least, would make no sense at all.)
commit ffff370d5537f49e7635c20496bbed459e4024d5
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Tue Jan 13 01:33:00 2015 +1100
vcl: possible regression introduced in fa1f37753d2826a0 as part of i99295
I believe the intent was to "retarget unresolved pLogCluster[n] to a glyph inside the cluster".
Unfortunately in the loop that detects clusters there was a typo and we are only indexing
element 0 of the array:
// retarget unresolved pLogCluster[n] to a glyph inside the cluster
// TODO: better do it while the deleted-glyph markers are still there
for( n = 0; n < nCharCount; ++n )
if( (p = pLogCluster[0]) >= 0 )
break;
That just doesn't make any sense, I believe we should be accessing pLogCluster[n].
If not, then why not just do:
p = pLogCluster[0];
n = nCharCount - 1;
Change-Id: I9d8873541b5c794071d69c0f63df88f17a352904
Reviewed-on: https://gerrit.libreoffice.org/13876
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index ad34efd..4ca12b9 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -1020,7 +1020,7 @@ void GenericSalLayout::ApplyDXArray( ImplLayoutArgs& rArgs )
// retarget unresolved pLogCluster[n] to a glyph inside the cluster
// TODO: better do it while the deleted-glyph markers are still there
for( n = 0; n < nCharCount; ++n )
- if( (p = pLogCluster[0]) >= 0 )
+ if( (p = pLogCluster[n]) >= 0 )
break;
if( n >= nCharCount )
return;
commit 0662930bd4a7bdffb8638720d3fb34cbe72e6663
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 12 16:54:45 2015 +0000
Resolves: fdo#79975 toggle checkered background back on
Change-Id: Id856d8dbf437acb7e528e60b4d1b012102ff0557
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 4b5c789..4140ca5 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -6350,7 +6350,7 @@
</desc>
<label>Shows previews with shining through checkered background to visualize transparency.</label>
</info>
- <value>false</value>
+ <value>true</value>
</prop>
</group>
<group oor:name="ExternalApps" oor:extensible="true">
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 90537ac..4665fd8 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -272,7 +272,6 @@ void drawTransparenceBackground(OutputDevice& rOut, const Point& rPos, const Siz
}
}
-
GalleryIconView::GalleryIconView( GalleryBrowser2* pParent, GalleryTheme* pTheme ) :
ValueSet( pParent, WB_TABSTOP | WB_3DLOOK | WB_BORDER | WB_ITEMBORDER | WB_DOUBLEBORDER | WB_VSCROLL | WB_FLATVALUESET ),
DropTargetHelper( this ),
commit ce550471e6aaa19bc4abf2d84f0fd5b7ffda1128
Author: David Tardon <dtardon at redhat.com>
Date: Mon Jan 12 17:45:19 2015 +0100
fix extension
Change-Id: I05923b7df753fdbc23f849c89f4f9f52a07915c7
diff --git a/external/libebook/0001-lrf-compute-color-interpolation-coeff.-correctly.patch b/external/libebook/0001-lrf-compute-color-interpolation-coeff.-correctly.patch.1
similarity index 100%
rename from external/libebook/0001-lrf-compute-color-interpolation-coeff.-correctly.patch
rename to external/libebook/0001-lrf-compute-color-interpolation-coeff.-correctly.patch.1
commit 9c65922bbe1621c60fe21d4634aae0143f205111
Author: David Tardon <dtardon at redhat.com>
Date: Mon Jan 12 17:12:31 2015 +0100
fix alpha computation, followup
Change-Id: I7701368e152ce20adbc05802c7c6518183919d1f
diff --git a/external/libebook/0001-lrf-compute-color-interpolation-coeff.-correctly.patch b/external/libebook/0001-lrf-compute-color-interpolation-coeff.-correctly.patch
new file mode 100644
index 0000000..dba57ac
--- /dev/null
+++ b/external/libebook/0001-lrf-compute-color-interpolation-coeff.-correctly.patch
@@ -0,0 +1,25 @@
+From 584c9bcfed7295e5e0a9d5caafb32a5020b74300 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Mon, 12 Jan 2015 17:10:07 +0100
+Subject: [PATCH] lrf: compute color interpolation coeff. correctly
+
+---
+ src/lib/LRFCollector.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/LRFCollector.cpp b/src/lib/LRFCollector.cpp
+index 1c02593..3fbee2e 100644
+--- a/src/lib/LRFCollector.cpp
++++ b/src/lib/LRFCollector.cpp
+@@ -50,7 +50,7 @@ const LRFColor combine(const LRFColor &fg, const LRFColor &bg)
+ {
+ assert(0 == bg.a);
+
+- const double a = fg.a / 255.0;
++ const double a = 1 - fg.a / 255.0;
+
+ const double r = (1 - a) * bg.r + a * fg.r;
+ const double g = (1 - a) * bg.g + a * fg.g;
+--
+2.1.0
+
diff --git a/external/libebook/UnpackedTarball_libebook.mk b/external/libebook/UnpackedTarball_libebook.mk
index 5c02bf4..02c17db 100644
--- a/external/libebook/UnpackedTarball_libebook.mk
+++ b/external/libebook/UnpackedTarball_libebook.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libebook,0))
$(eval $(call gb_UnpackedTarball_add_patches,libebook, \
external/libebook/ubsan.patch \
+ external/libebook/0001-lrf-compute-color-interpolation-coeff.-correctly.patch.1 \
))
# vim: set noet sw=4 ts=4:
commit 4eb0212f36b0af56f87d03d4ef20225e3642630a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 12 15:45:19 2015 +0000
radio check top/center/bottom alignment for table cells
Change-Id: I30b51510ac5fbfb3c1dd09e0f86a246a8b516f1e
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index ce30b9f..cd6c0b3 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -382,18 +382,21 @@
SEPARATOR ; \
MenuItem\
{\
+ RadioCheck = TRUE ; \
Identifier = SID_TABLE_VERT_NONE ; \
HelpId = CMD_SID_TABLE_VERT_NONE ; \
Text [ en-US ] = "~Top" ; \
};\
MenuItem\
{\
+ RadioCheck = TRUE ; \
Identifier = SID_TABLE_VERT_CENTER ; \
HelpId = CMD_SID_TABLE_VERT_CENTER ; \
Text [ en-US ] = "C~enter" ; \
};\
MenuItem\
{\
+ RadioCheck = TRUE ; \
Identifier = SID_TABLE_VERT_BOTTOM ; \
HelpId = CMD_SID_TABLE_VERT_BOTTOM ; \
Text [ en-US ] = "~Bottom" ; \
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index 3d6dcf0..d92a255 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -310,9 +310,9 @@
<menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
<menu:menuitem menu:id=".uno:CommonAlignJustified" menu:style="radio"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CommonAlignTop"/>
- <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter"/>
- <menu:menuitem menu:id=".uno:CommonAlignBottom"/>
+ <menu:menuitem menu:id=".uno:CommonAlignTop" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:CommonAlignBottom" menu:style="radio"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:ArrangeMenu">
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
index 5d488fa..f6836bb 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -253,9 +253,9 @@
<menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
<menu:menuitem menu:id=".uno:CommonAlignJustified" menu:style="radio"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CommonAlignTop"/>
- <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter"/>
- <menu:menuitem menu:id=".uno:CommonAlignBottom"/>
+ <menu:menuitem menu:id=".uno:CommonAlignTop" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:CommonAlignBottom" menu:style="radio"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:ArrangeMenu">
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index c1fd22a..6f081ac 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -309,9 +309,9 @@
<menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
<menu:menuitem menu:id=".uno:CommonAlignJustified" menu:style="radio"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CommonAlignTop"/>
- <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter"/>
- <menu:menuitem menu:id=".uno:CommonAlignBottom"/>
+ <menu:menuitem menu:id=".uno:CommonAlignTop" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:CommonAlignBottom" menu:style="radio"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:ArrangeMenu">
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index 3d817c2..4d9ba26 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -311,9 +311,9 @@
<menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
<menu:menuitem menu:id=".uno:CommonAlignJustified" menu:style="radio"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CommonAlignTop"/>
- <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter"/>
- <menu:menuitem menu:id=".uno:CommonAlignBottom"/>
+ <menu:menuitem menu:id=".uno:CommonAlignTop" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:CommonAlignBottom" menu:style="radio"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:ArrangeMenu">
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index ec6a852..34d185e 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -327,9 +327,9 @@
<menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
<menu:menuitem menu:id=".uno:CommonAlignJustified" menu:style="radio"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CommonAlignTop"/>
- <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter"/>
- <menu:menuitem menu:id=".uno:CommonAlignBottom"/>
+ <menu:menuitem menu:id=".uno:CommonAlignTop" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:CommonAlignBottom" menu:style="radio"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:ArrangeMenu">
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index 8a06431..854d89c 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -311,9 +311,9 @@
<menu:menuitem menu:id=".uno:CommonAlignRight" menu:style="radio"/>
<menu:menuitem menu:id=".uno:CommonAlignJustified" menu:style="radio"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:CommonAlignTop"/>
- <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter"/>
- <menu:menuitem menu:id=".uno:CommonAlignBottom"/>
+ <menu:menuitem menu:id=".uno:CommonAlignTop" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:CommonAlignVerticalCenter" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:CommonAlignBottom" menu:style="radio"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:ArrangeMenu">
commit a065adbafe0a53d31eb0a7ca3faae974a59a179f
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jan 12 16:44:19 2015 +0100
Work around -fsanitize=shift
Change-Id: I8d23c11decca864337ccc5288165058a7c21cd4e
diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx
index 0503ef2..56c0d66 100644
--- a/vcl/source/gdi/regionband.cxx
+++ b/vcl/source/gdi/regionband.cxx
@@ -480,7 +480,7 @@ bool RegionBand::InsertLine(const Point& rStartPt, const Point& rEndPt, long nLi
if ( nDX >= nDY )
{
- const long nDYX = ( nDY - nDX ) << 1;
+ const long nDYX = ( nDY - nDX ) * 2;
const long nDY2 = nDY << 1;
long nD = nDY2 - nDX;
@@ -496,7 +496,7 @@ bool RegionBand::InsertLine(const Point& rStartPt, const Point& rEndPt, long nLi
}
else
{
- const long nDYX = ( nDX - nDY ) << 1;
+ const long nDYX = ( nDX - nDY ) * 2;
const long nDY2 = nDX << 1;
long nD = nDY2 - nDY;
commit bb1040433bffbe8e77e3e836ced4a38470237a4e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jan 12 16:29:54 2015 +0100
Fix alpha computation (-fsanitize=undefined)
Change-Id: I3f50d3bb85bebdece692e069de73febc2ce63b47
diff --git a/external/libebook/UnpackedTarball_libebook.mk b/external/libebook/UnpackedTarball_libebook.mk
index 7dfee2c..5c02bf4 100644
--- a/external/libebook/UnpackedTarball_libebook.mk
+++ b/external/libebook/UnpackedTarball_libebook.mk
@@ -11,6 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libebook))
$(eval $(call gb_UnpackedTarball_set_tarball,libebook,$(EBOOK_TARBALL)))
-$(eval $(call gb_UnpackedTarball_set_patchlevel,libebook,1))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libebook,0))
+
+$(eval $(call gb_UnpackedTarball_add_patches,libebook, \
+ external/libebook/ubsan.patch \
+))
# vim: set noet sw=4 ts=4:
diff --git a/external/libebook/ubsan.patch b/external/libebook/ubsan.patch
new file mode 100644
index 0000000..0a3ead2
--- /dev/null
+++ b/external/libebook/ubsan.patch
@@ -0,0 +1,11 @@
+--- src/lib/LRFCollector.cpp
++++ src/lib/LRFCollector.cpp
+@@ -50,7 +50,7 @@
+ {
+ assert(0 == bg.a);
+
+- const double a = fg.a;
++ const double a = fg.a / 255.0;
+
+ const double r = (1 - a) * bg.r + a * fg.r;
+ const double g = (1 - a) * bg.g + a * fg.g;
commit e385c5e4f90b38a23fccd4116c168c16c3134bda
Author: Eike Rathke <erack at redhat.com>
Date: Mon Jan 12 16:05:34 2015 +0100
make this work also for an overlapping merge range, fdo#87382 follow-up
... if the merged range ends behind the visble range.
Change-Id: Ib5e9ae57299614f42c9200da5641922dfd90ab60
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 785beee..436bc15 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5741,17 +5741,28 @@ void ScGridWindow::UpdateCursorOverlay()
SCROW nY = pViewData->GetCurY();
ScDocument* pDoc = pViewData->GetDocument();
- const ScMergeAttr* pMerge = static_cast<const ScMergeAttr*>(pDoc->GetAttr(nX, nY, nTab, ATTR_MERGE));
+ const ScPatternAttr* pPattern = pDoc->GetPattern(nX,nY,nTab);
- // fdo#87382 Also display the cell cursor for the visible part of merged
- // cells if the cell position is part of merged cells.
- if (!(maVisibleRange.isInside(nX, nY) ||
- maVisibleRange.isInside(nX + pMerge->GetColMerge(), nY + pMerge->GetRowMerge())))
- return;
+ if (!maVisibleRange.isInside(nX, nY))
+ {
+ if (maVisibleRange.mnCol2 < nX || maVisibleRange.mnRow2 < nY)
+ return; // no further check needed, nothing visible
+
+ // fdo#87382 Also display the cell cursor for the visible part of
+ // merged cells if the view position is part of merged cells.
+ const ScMergeAttr& rMerge = static_cast<const ScMergeAttr&>(pPattern->GetItem(ATTR_MERGE));
+ if (rMerge.GetColMerge() <= 1 && rMerge.GetRowMerge() <= 1)
+ return; // not merged and invisible
+
+ SCCOL nX2 = nX + rMerge.GetColMerge() - 1;
+ SCROW nY2 = nY + rMerge.GetRowMerge() - 1;
+ // Check if the middle or tail of the merged range is visible.
+ if (!(maVisibleRange.mnCol1 <= nX2 && maVisibleRange.mnRow1 <= nY2))
+ return; // no visible part
+ }
// don't show the cursor in overlapped cells
- const ScPatternAttr* pPattern = pDoc->GetPattern(nX,nY,nTab);
const ScMergeFlagAttr& rMergeFlag = static_cast<const ScMergeFlagAttr&>( pPattern->GetItem(ATTR_MERGE_FLAG) );
bool bOverlapped = rMergeFlag.IsOverlapped();
commit 4f72a9ed115f15956a049422d1c49d3651e5577d
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Jan 12 14:57:05 2015 +0100
libreofficekit: we don't need our own gdk_threads_add_idle() version after all
Change-Id: I9d05a3971bd0dd14654d0b0e2a80a263d360505b
diff --git a/libreofficekit/source/gtk/lokdocview.c b/libreofficekit/source/gtk/lokdocview.c
index d9d8e41..e34936b 100644
--- a/libreofficekit/source/gtk/lokdocview.c
+++ b/libreofficekit/source/gtk/lokdocview.c
@@ -18,67 +18,6 @@
#define G_SOURCE_REMOVE FALSE
#endif
-/* Before glib 2.12. */
-#ifndef HAVE_GDK_THREADS_ADD_API
-typedef struct
-{
- GSourceFunc func;
- gpointer data;
- GDestroyNotify destroy;
-} GdkThreadsDispatch;
-
-static gboolean
-gdk_threads_dispatch (gpointer data)
-{
- GdkThreadsDispatch *dispatch = data;
- gboolean ret = FALSE;
-
- gdk_threads_enter ();
- ret = dispatch->func (dispatch->data);
- gdk_threads_leave ();
-
- return ret;
-}
-
-static void
-gdk_threads_dispatch_free (gpointer data)
-{
- GdkThreadsDispatch *dispatch = data;
-
- if (dispatch->destroy && dispatch->data)
- dispatch->destroy (dispatch->data);
-
- g_slice_free (GdkThreadsDispatch, data);
-}
-
-guint
-gdk_threads_add_idle_full (gint priority,
- GSourceFunc function,
- gpointer data,
- GDestroyNotify notify)
-{
- GdkThreadsDispatch *dispatch;
-
- g_return_val_if_fail (function != NULL, 0);
-
- dispatch = g_slice_new (GdkThreadsDispatch);
- dispatch->func = function;
- dispatch->data = data;
- dispatch->destroy = notify;
-
- return g_idle_add_full (priority, gdk_threads_dispatch, dispatch,
- gdk_threads_dispatch_free);
-}
-
-guint
-gdk_threads_add_idle (GSourceFunc function,
- gpointer data)
-{
- return gdk_threads_add_idle_full (G_PRIORITY_DEFAULT_IDLE,
- function, data, NULL);
-}
-#endif /* HAVE_GDK_THREADS_ADD_API */
-
static void lok_docview_class_init( LOKDocViewClass* pClass );
static void lok_docview_init( LOKDocView* pDocView );
@@ -218,7 +157,16 @@ void renderDocument( LOKDocView* pDocView )
static gboolean lok_docview_callback(gpointer pData)
{
LOKDocView* pDocView = pData;
+
+#if ! GTK_CHECK_VERSION(2,12,0)
+ GDK_THREADS_ENTER();
+#endif
+
renderDocument(pDocView);
+
+#if ! GTK_CHECK_VERSION(2,12,0)
+ GDK_THREADS_LEAVE();
+#endif
return G_SOURCE_REMOVE;
}
@@ -232,7 +180,11 @@ static void lok_docview_callback_worker(int nType, const char* pPayload, void* p
case LOK_CALLBACK_INVALIDATE_TILES:
// TODO for now just always render the document.
(void)pPayload;
+#if GTK_CHECK_VERSION(2,12,0)
gdk_threads_add_idle(lok_docview_callback, pDocView);
+#else
+ g_add_idle(lok_docview_callback, pDocView);
+#endif
break;
default:
break;
commit 33f74a8aa72489bd406bf5e584635e0581b1d51b
Author: Eike Rathke <erack at redhat.com>
Date: Mon Jan 12 14:52:47 2015 +0100
get rid of C-style cast, fdo#87382 follow-up
Change-Id: I86dd6a96f69d9bedeabeebc04f953b9f22476543
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 0907a39..785beee 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5741,7 +5741,7 @@ void ScGridWindow::UpdateCursorOverlay()
SCROW nY = pViewData->GetCurY();
ScDocument* pDoc = pViewData->GetDocument();
- const ScMergeAttr* pMerge = (const ScMergeAttr*) pDoc->GetAttr(nX, nY, nTab, ATTR_MERGE);
+ const ScMergeAttr* pMerge = static_cast<const ScMergeAttr*>(pDoc->GetAttr(nX, nY, nTab, ATTR_MERGE));
// fdo#87382 Also display the cell cursor for the visible part of merged
// cells if the cell position is part of merged cells.
commit 0a8addd530600ef79ad03e6296621814e1f8678c
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Jan 12 15:40:53 2015 +0200
Add RAND to the default subset of opcodes for which we trust our OpenCL
Change-Id: I1ca574f96ad84aa263bdcecbe549687fbf10d0d8
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 832c795..3ec97de 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1371,9 +1371,9 @@
<desc>The list of operator and function opcodes for which to use OpenCL. If a
formula contains only these operators and functions, it
might be calculated using OpenCL.</desc>
- <!-- numeric values correspond to RAND;SIN;COS;TAN;ATAN;EXP;LN;SQRT;NORMSINV;ROUND;POWER;SUBPRODUCT;PROUDCT;NORMDIST;MIN;MAX;SUM;AVERAGE;SUMIFS -->
+ <!-- numeric values correspond to +;-;*;/;RAND;SIN;COS;TAN;ATAN;EXP;LN;SQRT;NORMSINV;ROUND;POWER;SUMPRODUCT;MIN;MAX;SUM;PRODUCT;AVERAGE;COUNT;NORMDIST;SUMIFS -->
</info>
- <value>40;41;42;43;82;83;84;88;102;103;104;149;204;209;213;222;223;224;225;226;227;236;403</value>
+ <value>40;41;42;43;66;82;83;84;88;102;103;104;149;204;209;213;222;223;224;225;226;227;236;403</value>
</prop>
<prop oor:name="OpenCLAutoSelect" oor:type="xs:boolean" oor:nillable="false">
<!-- UIHints: Tools - Options Spreadsheet Formula -->
diff --git a/sc/source/core/tool/calcconfig.cxx b/sc/source/core/tool/calcconfig.cxx
index 3e00b05..1cbb3f5 100644
--- a/sc/source/core/tool/calcconfig.cxx
+++ b/sc/source/core/tool/calcconfig.cxx
@@ -45,6 +45,7 @@ void ScCalcConfig::setOpenCLConfigToDefault()
maOpenCLSubsetOpCodes.insert(ocSub);
maOpenCLSubsetOpCodes.insert(ocMul);
maOpenCLSubsetOpCodes.insert(ocDiv);
+ maOpenCLSubsetOpCodes.insert(ocRandom);
maOpenCLSubsetOpCodes.insert(ocSin);
maOpenCLSubsetOpCodes.insert(ocCos);
maOpenCLSubsetOpCodes.insert(ocTan);
commit fb2e5158fc9bc8769b1fcd063f6882a6952be33e
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Jan 12 14:55:48 2015 +0200
Add the Random123 license blurb
Change-Id: I018cebeeeee09c294ab576dd3cb5e7d6c703f5f2
diff --git a/readlicense_oo/license/LICENSE b/readlicense_oo/license/LICENSE
index 9ea8723..862d5c9 100644
--- a/readlicense_oo/license/LICENSE
+++ b/readlicense_oo/license/LICENSE
@@ -2188,6 +2188,41 @@ Python
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+Random123: a Library of Counter-Based Random Number Generators
+
+ The following software may be included in this product: Random123:
+ a Library of Counter-Based Random Number Generators. Use of any of
+ this software is governed by the terms of the license below:
+
+ Copyright 2010-2011, D. E. Shaw Research. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions, and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions, and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ * Neither the name of D. E. Shaw Research nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
Raptor RDF Parser Library
The following software may be included in this product: Raptor RDF
diff --git a/readlicense_oo/license/LICENSE.fodt b/readlicense_oo/license/LICENSE.fodt
index 691a2b0..728f7f7 100644
--- a/readlicense_oo/license/LICENSE.fodt
+++ b/readlicense_oo/license/LICENSE.fodt
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oas
is:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:officeooo="http://openoffice.org/2009/office" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:
experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text">
- <office:meta><meta:creation-date>2011-05-11T11:39:17.79</meta:creation-date><dc:date>2014-06-25T00:24:51.923545982</dc:date><meta:editing-duration>P6DT2H11M41S</meta:editing-duration><meta:editing-cycles>250</meta:editing-cycles><meta:generator>LibreOffice/4.1.6.2$Linux_x86 LibreOffice_project/40ff705089295be5be0aae9b15123f687c05b0a</meta:generator><meta:keyword>License</meta:keyword><meta:keyword>GPL</meta:keyword><meta:keyword>LGPL</meta:keyword><meta:keyword>MPL</meta:keyword><meta:keyword>Apache</meta:keyword><meta:keyword>CC</meta:keyword><dc:subject>LibreOffice Licensing and Legal information</dc:subject><dc:title>Licensing and Legal information</dc:title><meta:document-statistic meta:table-count="0" meta:image-count="0" meta:object-count="0" meta:page-count="191" meta:paragraph-count="2865" meta:word-count="65855" meta:character-count="407891" meta:non-whitespace-character-count="343548"/></office:meta>
+ <office:meta><meta:creation-date>2011-05-11T11:39:17.79</meta:creation-date><dc:date>2015-01-12T14:53:31.375949809</dc:date><meta:editing-duration>P6DT2H14M29S</meta:editing-duration><meta:editing-cycles>252</meta:editing-cycles><meta:generator>LibreOfficeDev/4.5.0.0.alpha0$Linux_X86_64 LibreOffice_project/226e367ff93542d82975d6ccd34448f68acf8035</meta:generator><meta:keyword>License</meta:keyword><meta:keyword>GPL</meta:keyword><meta:keyword>LGPL</meta:keyword><meta:keyword>MPL</meta:keyword><meta:keyword>Apache</meta:keyword><meta:keyword>CC</meta:keyword><dc:subject>LibreOffice Licensing and Legal information</dc:subject><dc:title>Licensing and Legal information</dc:title><dc:creator>Tor Lillqvist</dc:creator><meta:document-statistic meta:table-count="0" meta:image-count="0" meta:object-count="0" meta:page-count="192" meta:paragraph-count="2876" meta:word-count="66121" meta:character-count="409624" meta:non-whitespace-character-count="345029"/></office:meta>
<office:settings>
<config:config-item-set config:name="ooo:view-settings">
- <config:config-item config:name="ViewAreaTop" config:type="int">667173</config:config-item>
- <config:config-item config:name="ViewAreaLeft" config:type="int">0</config:config-item>
- <config:config-item config:name="ViewAreaWidth" config:type="int">31963</config:config-item>
- <config:config-item config:name="ViewAreaHeight" config:type="int">14104</config:config-item>
+ <config:config-item config:name="ViewAreaTop" config:type="long">1360805</config:config-item>
+ <config:config-item config:name="ViewAreaLeft" config:type="long">0</config:config-item>
+ <config:config-item config:name="ViewAreaWidth" config:type="long">42891</config:config-item>
+ <config:config-item config:name="ViewAreaHeight" config:type="long">19819</config:config-item>
<config:config-item config:name="ShowRedlineChanges" config:type="boolean">true</config:config-item>
<config:config-item config:name="InBrowseMode" config:type="boolean">false</config:config-item>
<config:config-item-map-indexed config:name="Views">
<config:config-item-map-entry>
<config:config-item config:name="ViewId" config:type="string">view2</config:config-item>
- <config:config-item config:name="ViewLeft" config:type="int">8885</config:config-item>
- <config:config-item config:name="ViewTop" config:type="int">670489</config:config-item>
- <config:config-item config:name="VisibleLeft" config:type="int">0</config:config-item>
- <config:config-item config:name="VisibleTop" config:type="int">667173</config:config-item>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list