[Libreoffice-commits] core.git: Branch 'feature/vcl-opengl' - 172 commits - android/experimental avmedia/source basctl/uiconfig basic/source bin/gbuild-to-ide bridges/Jar_java_uno.mk bridges/source chart2/source compilerplugins/clang config_host/config_features.h.in configure.ac connectivity/qa connectivity/source cppuhelper/source cui/uiconfig dbaccess/source dbaccess/uiconfig desktop/Package_scripts.mk desktop/scripts desktop/source desktop/uiconfig drawinglayer/source editeng/source extensions/source external/firebird external/hunspell filter/source filter/uiconfig forms/qa formula/source helpcontent2 i18npool/source idl/inc idl/source include/connectivity include/formula include/oox include/sfx2 include/sot include/svtools include/svx include/toolkit include/tools include/unotools include/vbahelper include/vcl include/xmloff ios/CustomTarget_TiledLibreOffice_app.mk ios/experimental io/source javaunohelper/com javaunohelper/JunitTest_juh.mk javaunohelper/source javaunohelper/test jurt/com jurt /Jar_jurt.mk jurt/test jvmfwk/plugins libreofficekit/qa odk/Package_odk_headers.mk officecfg/registry oox/source package/source pyuno/source reportdesign/source ridljar/test rsc/inc rsc/source sal/osl sc/inc scp2/AutoInstall.mk scp2/inc scp2/InstallModule_winexplorerext.mk scp2/source scripting/java sc/source sc/uiconfig sdext/source sd/source sd/uiconfig sfx2/source sfx2/uiconfig sot/source starmath/uiconfig stoc/source svl/source svtools/source svtools/uiconfig svx/inc svx/Library_svxcore.mk svx/source svx/uiconfig sw/inc sw/qa sw/source sw/uiconfig toolkit/source tools/qa tools/source ucb/source UnoControls/source unotest/source uui/uiconfig vbahelper/source vcl/generic vcl/inc vcl/osx vcl/source vcl/uiconfig vcl/unx vcl/win writerfilter/source xmerge/source xmloff/source
Ptyl Dragon
ptyl at cloudon.com
Tue Sep 30 03:49:12 PDT 2014
UnoControls/source/base/basecontainercontrol.cxx | 4
UnoControls/source/base/multiplexer.cxx | 2
android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java | 10
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java | 121
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java | 34
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java | 3
android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java | 11
android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java | 4
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/ZoomConstraints.java | 46
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DisplayPortCalculator.java | 48
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GLController.java | 48
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java | 110
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ImmutableViewportMetrics.java | 204
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/Layer.java | 10
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerController.java | 154
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java | 93
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java | 7
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/MultiTileLayer.java | 146
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/NinePatchTileLayer.java | 28
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/PointUtils.java | 16
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/RectUtils.java | 35
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ScreenshotLayer.java | 135
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ScrollbarLayer.java | 12
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SingleTileLayer.java | 2
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SubTile.java | 14
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TouchEventHandler.java | 84
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ViewportMetrics.java | 160
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/ui/Axis.java | 109
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/ui/PanZoomController.java | 333 -
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/ui/PanZoomTarget.java | 24
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/ui/SubdocumentScrollHelper.java | 19
avmedia/source/viewer/mediawindow.src | 6
basctl/uiconfig/basicide/ui/deletelangdialog.ui | 2
basic/source/classes/image.cxx | 24
basic/source/classes/sb.cxx | 2
basic/source/classes/sbxmod.cxx | 16
basic/source/runtime/methods1.cxx | 16
basic/source/sbx/sbxarray.cxx | 6
basic/source/sbx/sbxbase.cxx | 20
basic/source/sbx/sbxobj.cxx | 4
basic/source/sbx/sbxvalue.cxx | 11
basic/source/sbx/sbxvar.cxx | 8
bin/gbuild-to-ide | 2
bridges/Jar_java_uno.mk | 6
bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx | 12
bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx | 12
bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx | 13
bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx | 13
bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx | 12
bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx | 12
bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx | 13
bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx | 12
bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx | 12
bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx | 12
bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx | 12
bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx | 12
bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx | 13
bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx | 13
bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx | 12
bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx | 13
bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx | 12
bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx | 13
bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx | 12
bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx | 13
bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx | 14
bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx | 15
chart2/source/view/charttypes/GL3DBarChart.cxx | 3
compilerplugins/clang/store/cstylecast.cxx | 10
config_host/config_features.h.in | 5
configure.ac | 85
connectivity/qa/connectivity/tools/HsqlDatabase.java | 6
connectivity/source/commontools/TSkipDeletedSet.cxx | 8
connectivity/source/drivers/calc/CTable.cxx | 8
connectivity/source/drivers/dbase/DTable.cxx | 80
connectivity/source/drivers/dbase/dindexnode.cxx | 4
connectivity/source/drivers/file/FResultSet.cxx | 22
connectivity/source/drivers/flat/ETable.cxx | 10
connectivity/source/drivers/odbc/ODatabaseMetaData.cxx | 2
connectivity/source/drivers/odbc/OResultSet.cxx | 12
connectivity/source/inc/TResultSetHelper.hxx | 7
connectivity/source/inc/odbc/OConnection.hxx | 2
connectivity/source/inc/odbc/ODriver.hxx | 2
connectivity/source/inc/odbc/OFunctiondefs.hxx | 98
connectivity/source/inc/odbc/OFunctions.hxx | 2
connectivity/source/inc/odbc/OTools.hxx | 2
connectivity/source/parse/sqlbison.y | 2
connectivity/source/parse/sqliterator.cxx | 4
cppuhelper/source/bootstrap.cxx | 7
cui/uiconfig/ui/iconchangedialog.ui | 2
cui/uiconfig/ui/messbox.ui | 2
cui/uiconfig/ui/querychangelineenddialog.ui | 2
cui/uiconfig/ui/querydeletebitmapdialog.ui | 2
cui/uiconfig/ui/querydeletechartcolordialog.ui | 2
cui/uiconfig/ui/querydeletecolordialog.ui | 2
cui/uiconfig/ui/querydeletedictionarydialog.ui | 2
cui/uiconfig/ui/querydeletegradientdialog.ui | 2
cui/uiconfig/ui/querydeletehatchdialog.ui | 2
cui/uiconfig/ui/querydeletelineenddialog.ui | 2
cui/uiconfig/ui/querydeletelinestyledialog.ui | 2
cui/uiconfig/ui/queryduplicatedialog.ui | 2
cui/uiconfig/ui/querynoloadedfiledialog.ui | 2
cui/uiconfig/ui/querynosavefiledialog.ui | 2
cui/uiconfig/ui/querysavelistdialog.ui | 2
cui/uiconfig/ui/queryupdategalleryfilelistdialog.ui | 2
cui/uiconfig/ui/rotationtabpage.ui | 1
dbaccess/source/ui/dlg/odbcconfig.cxx | 36
dbaccess/source/ui/misc/TokenWriter.cxx | 20
dbaccess/source/ui/tabledesign/TableRow.cxx | 16
dbaccess/source/ui/tabledesign/TableRowExchange.cxx | 2
dbaccess/uiconfig/ui/deleteallrowsdialog.ui | 2
dbaccess/uiconfig/ui/designsavemodifieddialog.ui | 2
dbaccess/uiconfig/ui/saveindexdialog.ui | 2
dbaccess/uiconfig/ui/savemodifieddialog.ui | 2
dbaccess/uiconfig/ui/tabledesignsavemodifieddialog.ui | 2
desktop/Package_scripts.mk | 2
desktop/scripts/unoinfo-mac.sh | 46
desktop/source/app/app.cxx | 6
desktop/uiconfig/ui/installforalldialog.ui | 2
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 4
editeng/source/editeng/editobj.cxx | 6
editeng/source/editeng/impedit4.cxx | 48
editeng/source/items/bulitem.cxx | 4
editeng/source/items/flditem.cxx | 18
editeng/source/items/frmitems.cxx | 60
editeng/source/items/numitem.cxx | 42
editeng/source/items/optitems.cxx | 4
editeng/source/items/paraitem.cxx | 40
editeng/source/items/svdfield.cxx | 2
editeng/source/items/textitem.cxx | 42
extensions/source/plugin/aqua/macmgr.mm | 2
extensions/source/plugin/inc/plugin/impl.hxx | 2
extensions/source/plugin/unx/npnapi.cxx | 6
extensions/source/plugin/unx/unxmgr.cxx | 2
extensions/source/plugin/win/winmgr.cxx | 2
extensions/source/scanner/sane.cxx | 62
external/firebird/firebird-cygwin-msvc.patch.1 | 2
external/hunspell/UnpackedTarball_hunspell.mk | 1
external/hunspell/hunspell-morph-overflow.patch | 30
filter/source/flash/swfwriter.cxx | 6
filter/source/flash/swfwriter2.cxx | 18
filter/source/graphicfilter/egif/egif.cxx | 52
filter/source/graphicfilter/egif/giflzwc.cxx | 4
filter/source/graphicfilter/eos2met/eos2met.cxx | 296 -
filter/source/graphicfilter/epbm/epbm.cxx | 12
filter/source/graphicfilter/epgm/epgm.cxx | 24
filter/source/graphicfilter/epict/epict.cxx | 208
filter/source/graphicfilter/eppm/eppm.cxx | 24
filter/source/graphicfilter/eps/eps.cxx | 44
filter/source/graphicfilter/eras/eras.cxx | 22
filter/source/graphicfilter/etiff/etiff.cxx | 30
filter/source/graphicfilter/expm/expm.cxx | 16
filter/source/graphicfilter/ios2met/ios2met.cxx | 8
filter/source/msfilter/escherex.cxx | 134
filter/source/msfilter/msdffimp.cxx | 18
filter/source/msfilter/svdfppt.cxx | 4
filter/uiconfig/ui/warnpdfdialog.ui | 2
forms/qa/integration/forms/DateValidator.java | 13
forms/qa/integration/forms/ListBox.java | 4
formula/source/core/api/FormulaOpCodeMapperObj.cxx | 18
formula/source/ui/dlg/formula.cxx | 2
helpcontent2 | 2
i18npool/source/collator/collator_unicode.cxx | 2
i18npool/source/nativenumber/nativenumbersupplier.cxx | 144
idl/inc/slot.hxx | 2
idl/source/objects/basobj.cxx | 2
idl/source/objects/bastype.cxx | 4
idl/source/objects/module.cxx | 4
idl/source/objects/slot.cxx | 64
idl/source/objects/types.cxx | 44
idl/source/prj/database.cxx | 4
include/connectivity/IParseContext.hxx | 3
include/connectivity/dbconversion.hxx | 63
include/connectivity/odbc.hxx | 108
include/formula/FormulaOpCodeMapperObj.hxx | 8
include/formula/IFunctionDescription.hxx | 2
include/formula/formula.hxx | 8
include/formula/formulahelper.hxx | 2
include/oox/core/recordparser.hxx | 2
include/oox/core/xmlfilterbase.hxx | 2
include/oox/vml/vmldrawing.hxx | 6
include/oox/vml/vmlshape.hxx | 10
include/sfx2/DocumentMetadataAccess.hxx | 2
include/sfx2/controlwrapper.hxx | 2
include/sfx2/itemconnect.hxx | 6
include/sfx2/opengrf.hxx | 2
include/sfx2/securitypage.hxx | 2
include/sfx2/userinputinterception.hxx | 2
include/sot/stg.hxx | 7
include/svtools/brwbox.hxx | 26
include/svtools/dialogcontrolling.hxx | 4
include/svtools/editbrowsebox.hxx | 11
include/svtools/grfmgr.hxx | 8
include/svtools/toolpanel/paneltabbar.hxx | 2
include/svtools/toolpanel/tablayouter.hxx | 2
include/svtools/toolpanel/toolpaneldeck.hxx | 2
include/svx/AccessibleTextHelper.hxx | 2
include/svx/databaselocationinput.hxx | 2
include/svx/dialcontrol.hxx | 2
include/svx/fmshell.hxx | 2
include/svx/frmsel.hxx | 2
include/svx/orienthelper.hxx | 2
include/svx/shapepropertynotifier.hxx | 2
include/toolkit/awt/vclxwindow.hxx | 4
include/toolkit/helper/formpdfexport.hxx | 3
include/tools/globname.hxx | 23
include/tools/stream.hxx | 4
include/tools/urlobj.hxx | 4
include/unotools/componentresmodule.hxx | 2
include/vbahelper/vbahelper.hxx | 2
include/vbahelper/vbashape.hxx | 4
include/vcl/abstdlg.hxx | 32
include/vcl/accel.hxx | 94
include/vcl/alpha.hxx | 128
include/vcl/animate.hxx | 285 -
include/vcl/apptypes.hxx | 14
include/vcl/bitmap.hxx | 355 -
include/vcl/bitmapex.hxx | 151
include/vcl/bitmapfilter.hxx | 5
include/vcl/bitmapscalesuper.hxx | 15
include/vcl/bmpacc.hxx | 105
include/vcl/btndlg.hxx | 56
include/vcl/builder.hxx | 332 -
include/vcl/button.hxx | 4
include/vcl/dialog.hxx | 2
include/vcl/mnemonicengine.hxx | 2
include/vcl/ppdparser.hxx | 2
include/vcl/quickselectionengine.hxx | 2
include/vcl/settings.hxx | 2
include/vcl/svapp.hxx | 47
include/vcl/threadex.hxx | 4
include/xmloff/DocumentSettingsContext.hxx | 2
include/xmloff/XMLShapeStyleContext.hxx | 3
include/xmloff/txtparae.hxx | 4
include/xmloff/xmluconv.hxx | 2
io/source/stm/odata.cxx | 2
ios/CustomTarget_TiledLibreOffice_app.mk | 4
ios/experimental/TiledLibreOffice/.gitignore | 9
ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 262 -
javaunohelper/JunitTest_juh.mk | 3
javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java | 62
javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java | 22
javaunohelper/source/bootstrap.cxx | 4
javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java | 2376 +++++-----
jurt/Jar_jurt.mk | 6
jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java | 10
jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java | 12
jurt/test/com/sun/star/uno/AnyConverter_Test.java | 46
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 2
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 4
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 2
odk/Package_odk_headers.mk | 1
officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu | 2
officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu | 2
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 2
officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu | 2
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 8
officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu | 2
officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu | 2
officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu | 2
officecfg/registry/schema/org/openoffice/Office/Draw.xcs | 2
officecfg/registry/schema/org/openoffice/Office/Impress.xcs | 2
officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs | 2
officecfg/registry/schema/org/openoffice/Office/Writer.xcs | 40
officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs | 8
officecfg/registry/schema/org/openoffice/TypeDetection/GraphicFilter.xcs | 4
oox/source/docprop/ooxmldocpropimport.cxx | 2
oox/source/drawingml/shape.cxx | 15
oox/source/export/drawingml.cxx | 11
oox/source/ole/olehelper.cxx | 18
oox/source/token/properties.txt | 1
oox/source/vml/vmlshape.cxx | 27
package/source/xstor/owriteablestream.cxx | 8
package/source/xstor/xstorage.cxx | 10
pyuno/source/module/pyuno_runtime.cxx | 5
reportdesign/source/ui/dlg/Formula.cxx | 11
reportdesign/source/ui/inc/Formula.hxx | 2
ridljar/test/com/sun/star/uno/Any_Test.java | 10
ridljar/test/com/sun/star/uno/UnoRuntime_Test.java | 6
rsc/inc/rscarray.hxx | 6
rsc/inc/rscclobj.hxx | 4
rsc/inc/rsctree.hxx | 8
rsc/source/parser/rscdb.cxx | 24
rsc/source/parser/rscibas.cxx | 6
rsc/source/parser/rsckey.cxx | 2
rsc/source/parser/rsclex.cxx | 2
rsc/source/res/rscclobj.cxx | 18
rsc/source/tools/rscdef.cxx | 10
rsc/source/tools/rsctree.cxx | 26
sal/osl/unx/security.cxx | 19
sc/inc/tokenuno.hxx | 4
sc/source/core/data/documen3.cxx | 5
sc/source/core/data/patattr.cxx | 2
sc/source/core/tool/autoform.cxx | 8
sc/source/core/tool/compiler.cxx | 7
sc/source/core/tool/rechead.cxx | 6
sc/source/core/tool/zforauto.cxx | 2
sc/source/filter/excel/xecontent.cxx | 2
sc/source/filter/excel/xiescher.cxx | 10
sc/source/filter/oox/richstring.cxx | 5
sc/source/filter/xcl97/XclImpChangeTrack.cxx | 2
sc/source/filter/xml/XMLConsolidationContext.cxx | 4
sc/source/ui/docshell/impex.cxx | 20
sc/source/ui/drawfunc/fupoor.cxx | 10
sc/source/ui/formdlg/formula.cxx | 10
sc/source/ui/inc/formula.hxx | 2
sc/source/ui/unoobj/tokenuno.cxx | 6
sc/uiconfig/scalc/menubar/menubar.xml | 2
sc/uiconfig/scalc/ui/queryrunstreamscriptdialog.ui | 2
scp2/AutoInstall.mk | 2
scp2/InstallModule_winexplorerext.mk | 8
scp2/inc/macros.inc | 15
scp2/source/winexplorerext/module_winexplorerext.scp | 6
scp2/source/winexplorerext/registryitem_winexplorerext.scp | 87
scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java | 8
sd/source/filter/eppt/eppt.cxx | 236
sd/source/filter/eppt/epptso.cxx | 480 +-
sd/source/filter/eppt/escherex.cxx | 62
sd/source/filter/eppt/pptexanimations.cxx | 4
sd/source/filter/eppt/pptexsoundcollection.cxx | 14
sd/source/filter/eppt/pptx-stylesheet.cxx | 34
sd/source/filter/eppt/pptx-text.cxx | 2
sd/source/filter/html/pubdlg.cxx | 6
sd/source/ui/app/menuids_tmpl.src | 4
sd/source/ui/app/strings.src | 8
sd/source/ui/dlg/morphdlg.cxx | 2
sd/source/ui/dlg/vectdlg.cxx | 4
sd/source/ui/func/fudraw.cxx | 21
sd/source/ui/inc/fudraw.hxx | 1
sd/uiconfig/sdraw/menubar/menubar.xml | 2
sd/uiconfig/simpress/menubar/menubar.xml | 2
sd/uiconfig/simpress/ui/headerfooterdialog.ui | 4
sdext/source/presenter/PresenterSpritePane.hxx | 18
sfx2/source/control/shell.cxx | 19
sfx2/source/dialog/taskpane.cxx | 15
sfx2/source/doc/Metadatable.cxx | 4
sfx2/source/doc/objitem.cxx | 2
sfx2/source/doc/oleprops.cxx | 22
sfx2/source/doc/zoomitem.cxx | 4
sfx2/source/view/viewimp.hxx | 2
sfx2/source/view/viewsh.cxx | 1
sfx2/uiconfig/ui/alienwarndialog.ui | 6
sfx2/uiconfig/ui/errorfindemaildialog.ui | 2
sfx2/uiconfig/ui/querysavedialog.ui | 4
sfx2/uiconfig/ui/templatedlg.ui | 5
sot/source/base/filelist.cxx | 2
sot/source/sdstor/stg.cxx | 8
sot/source/sdstor/stgcache.cxx | 2
sot/source/sdstor/stgdir.cxx | 30
sot/source/sdstor/stgdir.hxx | 4
sot/source/sdstor/stgelem.cxx | 46
sot/source/sdstor/stgio.cxx | 2
sot/source/sdstor/stgole.cxx | 24
sot/source/sdstor/storinfo.cxx | 10
sot/source/sdstor/ucbstorage.cxx | 18
starmath/uiconfig/smath/ui/savedefaultsdialog.ui | 5
stoc/source/inspect/introspection.cxx | 8
stoc/source/invocation_adapterfactory/iafactory.cxx | 2
stoc/source/javavm/javavm.cxx | 2
stoc/source/servicemanager/servicemanager.cxx | 2
svl/source/items/cintitem.cxx | 6
svl/source/items/macitem.cxx | 4
svl/source/items/poolio.cxx | 12
svl/source/items/slstitm.cxx | 4
svl/source/numbers/numhead.cxx | 6
svl/source/numbers/zforlist.cxx | 10
svl/source/numbers/zformat.cxx | 2
svtools/source/brwbox/brwbox1.cxx | 35
svtools/source/brwbox/brwbox2.cxx | 10
svtools/source/brwbox/datwin.cxx | 2
svtools/source/brwbox/datwin.hxx | 2
svtools/source/brwbox/ebbcontrols.cxx | 6
svtools/source/brwbox/editbrowsebox.cxx | 8
svtools/source/contnr/imivctl1.cxx | 4
svtools/source/contnr/simptabl.cxx | 4
svtools/source/contnr/svimpbox.cxx | 16
svtools/source/contnr/svlbitm.cxx | 6
svtools/source/contnr/svtabbx.cxx | 6
svtools/source/contnr/treelist.cxx | 2
svtools/source/contnr/treelistbox.cxx | 40
svtools/source/control/ctrlbox.cxx | 6
svtools/source/control/headbar.cxx | 4
svtools/source/control/tabbar.cxx | 12
svtools/source/control/toolbarmenu.cxx | 6
svtools/source/control/toolbarmenuacc.cxx | 6
svtools/source/edit/svmedit.cxx | 2
svtools/source/graphic/graphicunofactory.cxx | 2
svtools/source/graphic/grfattr.cxx | 12
svtools/source/graphic/grfcache.cxx | 14
svtools/source/graphic/grfmgr.cxx | 7
svtools/source/graphic/grfmgr2.cxx | 18
svtools/source/graphic/provider.cxx | 2
svtools/source/inc/unoiface.hxx | 2
svtools/source/misc/ehdl.cxx | 6
svtools/source/misc/imap.cxx | 32
svtools/source/misc/imap2.cxx | 12
svtools/source/misc/imap3.cxx | 2
svtools/source/misc/templatefoldercache.cxx | 4
svtools/source/misc/transfer.cxx | 9
svtools/source/svhtml/htmlout.cxx | 8
svtools/source/svhtml/parhtml.cxx | 5
svtools/source/svrtf/rtfout.cxx | 4
svtools/source/svrtf/svparser.cxx | 6
svtools/source/toolpanel/tablayouter.cxx | 2
svtools/source/toolpanel/toolpanelcollection.hxx | 2
svtools/source/toolpanel/toolpaneldrawer.hxx | 2
svtools/source/uno/statusbarcontroller.cxx | 4
svtools/source/uno/unoiface.cxx | 74
svtools/source/uno/unoimap.cxx | 8
svtools/uiconfig/ui/addresstemplatedialog.ui | 1
svtools/uiconfig/ui/javadisableddialog.ui | 2
svtools/uiconfig/ui/querydeletedialog.ui | 2
svx/Library_svxcore.mk | 1
svx/inc/sdr/contact/viewcontactofunocontrol.hxx | 2
svx/source/accessibility/AccessibleEmptyEditSource.cxx | 8
svx/source/accessibility/AccessibleEmptyEditSource.hxx | 4
svx/source/accessibility/AccessibleTextEventQueue.cxx | 6
svx/source/accessibility/AccessibleTextEventQueue.hxx | 2
svx/source/accessibility/AccessibleTextHelper.cxx | 4
svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx | 2
svx/source/dialog/sdstring.src | 2
svx/source/fmcomp/gridcell.cxx | 19
svx/source/fmcomp/gridctrl.cxx | 22
svx/source/form/ParseContext.cxx | 2
svx/source/form/fmshell.cxx | 6
svx/source/form/fmvwimp.cxx | 8
svx/source/form/typeconversionclient.cxx | 44
svx/source/gallery2/galobj.cxx | 4
svx/source/gallery2/galtheme.cxx | 8
svx/source/inc/formcontrolfactory.hxx | 2
svx/source/inc/formcontroller.hxx | 2
svx/source/inc/gridcell.hxx | 5
svx/source/inc/typeconversionclient.hxx | 81
svx/source/items/hlnkitem.cxx | 10
svx/source/items/pageitem.cxx | 2
svx/source/svdraw/svdattr.cxx | 4
svx/source/tbxctrls/SvxColorValueSet.cxx | 4
svx/source/tbxctrls/tbcontrl.cxx | 18
svx/source/xoutdev/xattr.cxx | 18
svx/uiconfig/ui/compressgraphicdialog.ui | 698 +-
svx/uiconfig/ui/deletefooterdialog.ui | 5
svx/uiconfig/ui/deleteheaderdialog.ui | 5
svx/uiconfig/ui/formlinkwarndialog.ui | 9
svx/uiconfig/ui/linkwarndialog.ui | 5
svx/uiconfig/ui/querydeletecontourdialog.ui | 5
svx/uiconfig/ui/querydeleteobjectdialog.ui | 5
svx/uiconfig/ui/querydeletethemedialog.ui | 5
svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui | 4
svx/uiconfig/ui/querynewcontourdialog.ui | 5
svx/uiconfig/ui/querysavecontchangesdialog.ui | 5
svx/uiconfig/ui/querysaveimagemapchangesdialog.ui | 4
svx/uiconfig/ui/queryunlinkgraphicsdialog.ui | 5
svx/uiconfig/ui/redlinefilterpage.ui | 57
svx/uiconfig/ui/savemodifieddialog.ui | 4
sw/inc/format.hxx | 1
sw/inc/frmfmt.hxx | 1
sw/inc/swtblfmt.hxx | 6
sw/qa/core/data/ooxml/pass/fdo73608-1.docx |binary
sw/qa/core/data/ooxml/pass/fdo73608-2.docx |binary
sw/qa/core/data/ooxml/pass/fdo79131.docx |binary
sw/qa/extras/inc/swmodeltestbase.hxx | 27
sw/qa/extras/odfimport/data/fdo79269.odt |binary
sw/qa/extras/odfimport/data/fdo81223.odt |binary
sw/qa/extras/odfimport/odfimport.cxx | 28
sw/qa/extras/ooxmlexport/data/bnc884615-mso-position.docx |binary
sw/qa/extras/ooxmlexport/data/rot180-flipv.docx |binary
sw/qa/extras/ooxmlexport/data/rot270-flipv.docx |binary
sw/qa/extras/ooxmlexport/data/rot90-fliph.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 70
sw/qa/extras/ooxmlexport/ooxmlexport2.cxx | 15
sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx | 10
sw/qa/extras/ww8export/data/cell-bg-color.odt |binary
sw/qa/extras/ww8export/ww8export.cxx | 8
sw/source/core/attr/format.cxx | 20
sw/source/core/crsr/crsrsh.cxx | 9
sw/source/core/doc/DocumentStylePoolManager.cxx | 2
sw/source/core/doc/tblafmt.cxx | 10
sw/source/core/edit/edglss.cxx | 2
sw/source/core/inc/frame.hxx | 1
sw/source/core/layout/atrfrm.cxx | 15
sw/source/core/layout/findfrm.cxx | 12
sw/source/core/layout/frmtool.cxx | 18
sw/source/core/layout/laycache.cxx | 14
sw/source/core/layout/paintfrm.cxx | 2
sw/source/core/table/swtable.cxx | 15
sw/source/core/unocore/unoframe.cxx | 7
sw/source/core/unocore/unoobj.cxx | 2
sw/source/core/unocore/unostyle.cxx | 36
sw/source/filter/ascii/wrtasc.cxx | 6
sw/source/filter/html/htmlgrin.cxx | 7
sw/source/filter/ww8/docxattributeoutput.cxx | 183
sw/source/filter/ww8/rtfexport.cxx | 2
sw/source/filter/ww8/wrtw8esh.cxx | 54
sw/source/filter/ww8/wrtw8sty.cxx | 2
sw/source/filter/ww8/wrtww8.cxx | 8
sw/source/filter/ww8/wrtww8gr.cxx | 2
sw/source/filter/ww8/ww8atr.cxx | 4
sw/source/filter/ww8/ww8par.cxx | 2
sw/source/ui/app/app.src | 4
sw/source/ui/app/error.src | 4
sw/source/ui/app/mn.src | 2
sw/source/ui/shells/shells.src | 6
sw/source/ui/utlui/utlui.src | 4
sw/source/uibase/config/uinums.cxx | 14
sw/source/uibase/shells/txtcrsr.cxx | 8
sw/uiconfig/sglobal/menubar/menubar.xml | 2
sw/uiconfig/sweb/menubar/menubar.xml | 8
sw/uiconfig/swform/menubar/menubar.xml | 2
sw/uiconfig/swreport/menubar/menubar.xml | 2
sw/uiconfig/swriter/menubar/menubar.xml | 2
sw/uiconfig/swriter/ui/alreadyexistsdialog.ui | 30
sw/uiconfig/swriter/ui/asksearchdialog.ui | 4
sw/uiconfig/swriter/ui/attachnamedialog.ui | 24
sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui | 5
sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui | 5
sw/uiconfig/swriter/ui/infonotfounddialog.ui | 2
sw/uiconfig/swriter/ui/inforeadonlydialog.ui | 2
sw/uiconfig/swriter/ui/picturedialog.ui | 4
sw/uiconfig/swriter/ui/printeroptions.ui | 17
sw/uiconfig/swriter/ui/printmergedialog.ui | 4
sw/uiconfig/swriter/ui/querycontinuebegindialog.ui | 5
sw/uiconfig/swriter/ui/querycontinueenddialog.ui | 5
sw/uiconfig/swriter/ui/querydefaultcompatdialog.ui | 5
sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui | 6
sw/uiconfig/swriter/ui/querysavelabeldialog.ui | 5
sw/uiconfig/swriter/ui/queryshowchangesdialog.ui | 5
sw/uiconfig/swriter/ui/saveashtmldialog.ui | 5
sw/uiconfig/swriter/ui/subjectdialog.ui | 30
sw/uiconfig/swriter/ui/warndatasourcedialog.ui | 5
sw/uiconfig/swriter/ui/warnemaildialog.ui | 5
sw/uiconfig/swxform/menubar/menubar.xml | 2
toolkit/source/awt/vclxaccessiblecomponent.cxx | 18
toolkit/source/awt/vclxdevice.cxx | 8
toolkit/source/awt/vclxmenu.cxx | 14
toolkit/source/awt/vclxprinter.cxx | 2
toolkit/source/awt/vclxsystemdependentwindow.cxx | 6
toolkit/source/awt/vclxtabpagecontainer.cxx | 18
toolkit/source/awt/vclxtoolkit.cxx | 22
toolkit/source/awt/vclxtopwindow.cxx | 12
toolkit/source/awt/vclxwindow.cxx | 4
toolkit/source/awt/vclxwindow1.cxx | 2
toolkit/source/awt/vclxwindows.cxx | 416 -
toolkit/source/helper/formpdfexport.cxx | 85
tools/qa/cppunit/test_urlobj.cxx | 14
tools/source/fsys/urlobj.cxx | 12
tools/source/generic/fract.cxx | 6
tools/source/generic/gen.cxx | 14
tools/source/generic/poly.cxx | 8
tools/source/inet/inetmsg.cxx | 10
tools/source/ref/globname.cxx | 196
tools/source/ref/pstm.cxx | 20
tools/source/stream/stream.cxx | 4
ucb/source/sorter/sortresult.cxx | 46
ucb/source/ucp/webdav-neon/NeonSession.cxx | 2
unotest/source/java/org/openoffice/test/UnoApiTest.java | 2
uui/uiconfig/ui/macrowarnmedium.ui | 2
uui/uiconfig/ui/sslwarndialog.ui | 2
uui/uiconfig/ui/unknownauthdialog.ui | 2
vbahelper/source/msforms/vbacombobox.hxx | 2
vbahelper/source/msforms/vbacontrol.cxx | 4
vbahelper/source/msforms/vbacontrol.hxx | 2
vbahelper/source/msforms/vbalistbox.hxx | 4
vcl/generic/glyphs/gcach_ftyp.cxx | 2
vcl/generic/print/prtsetup.cxx | 6
vcl/inc/cupsmgr.hxx | 2
vcl/inc/generic/gendata.hxx | 2
vcl/inc/quartz/salgdi.h | 261 -
vcl/inc/textlayout.hxx | 2
vcl/inc/unx/gtk/gtkdata.hxx | 2
vcl/osx/DataFlavorMapping.hxx | 2
vcl/osx/DragSource.cxx | 2
vcl/source/app/dbggui.cxx | 26
vcl/source/app/help.cxx | 2
vcl/source/app/settings.cxx | 11
vcl/source/app/unohelp2.cxx | 2
vcl/source/control/button.cxx | 20
vcl/source/control/combobox.cxx | 10
vcl/source/control/edit.cxx | 10
vcl/source/control/ilstbox.cxx | 2
vcl/source/control/lstbox.cxx | 12
vcl/source/control/scrbar.cxx | 2
vcl/source/control/spinfld.cxx | 4
vcl/source/control/tabctrl.cxx | 10
vcl/source/edit/texteng.cxx | 4
vcl/source/edit/textundo.cxx | 2
vcl/source/edit/textview.cxx | 2
vcl/source/edit/txtattr.cxx | 10
vcl/source/edit/xtextedt.cxx | 6
vcl/source/filter/graphicfilter.cxx | 16
vcl/source/filter/igif/gifread.cxx | 4
vcl/source/filter/ixbm/xbmread.cxx | 2
vcl/source/filter/ixpm/xpmread.cxx | 2
vcl/source/filter/jpeg/jpeg.cxx | 2
vcl/source/filter/wmf/emfwr.cxx | 206
vcl/source/filter/wmf/enhwmf.cxx | 48
vcl/source/filter/wmf/winwmf.cxx | 1
vcl/source/filter/wmf/wmfwr.cxx | 176
vcl/source/gdi/animate.cxx | 10
vcl/source/gdi/bitmapex.cxx | 2
vcl/source/gdi/cvtsvm.cxx | 470 -
vcl/source/gdi/dibtools.cxx | 18
vcl/source/gdi/font.cxx | 28
vcl/source/gdi/gdimtf.cxx | 247 -
vcl/source/gdi/gfxlink.cxx | 2
vcl/source/gdi/gradient.cxx | 2
vcl/source/gdi/graph.cxx | 2
vcl/source/gdi/graphictools.cxx | 2
vcl/source/gdi/hatch.cxx | 6
vcl/source/gdi/impanmvw.cxx | 6
vcl/source/gdi/impgraph.cxx | 35
vcl/source/gdi/impvect.cxx | 4
vcl/source/gdi/lineinfo.cxx | 14
vcl/source/gdi/mapmod.cxx | 2
vcl/source/gdi/metaact.cxx | 272 -
vcl/source/gdi/pdfwriter_impl2.cxx | 100
vcl/source/gdi/pngwrite.cxx | 4
vcl/source/gdi/region.cxx | 2
vcl/source/gdi/regionband.cxx | 14
vcl/source/gdi/virdev.cxx | 2
vcl/source/gdi/wall.cxx | 2
vcl/source/outdev/font.cxx | 4
vcl/source/outdev/map.cxx | 8
vcl/source/outdev/outdev.cxx | 2
vcl/source/window/accessibility.cxx | 16
vcl/source/window/brdwin.cxx | 24
vcl/source/window/builder.cxx | 2
vcl/source/window/decoview.cxx | 4
vcl/source/window/dialog.cxx | 12
vcl/source/window/dlgctrl.cxx | 32
vcl/source/window/dockingarea.cxx | 17
vcl/source/window/dockmgr.cxx | 8
vcl/source/window/dockwin.cxx | 2
vcl/source/window/floatwin.cxx | 4
vcl/source/window/layout.cxx | 2
vcl/source/window/menu.cxx | 14
vcl/source/window/menubarwindow.cxx | 17
vcl/source/window/menufloatingwindow.cxx | 24
vcl/source/window/menuitemlist.cxx | 2
vcl/source/window/mouse.cxx | 2
vcl/source/window/resource.cxx | 2
vcl/source/window/settings.cxx | 8
vcl/source/window/split.cxx | 2
vcl/source/window/stacking.cxx | 6
vcl/source/window/status.cxx | 12
vcl/source/window/syschild.cxx | 18
vcl/source/window/syswin.cxx | 32
vcl/source/window/taskpanelist.cxx | 4
vcl/source/window/toolbox.cxx | 9
vcl/source/window/window.cxx | 22
vcl/source/window/window2.cxx | 4
vcl/source/window/window3.cxx | 4
vcl/source/window/winproc.cxx | 10
vcl/uiconfig/ui/errornocontentdialog.ui | 2
vcl/uiconfig/ui/errornoprinterdialog.ui | 2
vcl/unx/generic/gdi/salbmp.cxx | 2
vcl/unx/generic/gdi/salgdi2.cxx | 4
vcl/unx/generic/window/salframe.cxx | 6
vcl/unx/gtk/a11y/atkutil.cxx | 2
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 20
vcl/unx/gtk/window/hudawareness.cxx | 8
vcl/win/source/app/saltimer.cxx | 2
vcl/win/source/window/salframe.cxx | 8
writerfilter/source/dmapper/DomainMapper.cxx | 23
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 18
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 12
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2
writerfilter/source/dmapper/GraphicImport.cxx | 33
writerfilter/source/dmapper/TablePropertiesHandler.cxx | 14
writerfilter/source/ooxml/model.xml | 32
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 22
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java | 4
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java | 8
xmloff/source/core/xmlexp.cxx | 2
xmloff/source/core/xmlimp.cxx | 4
xmloff/source/draw/XMLShapeStyleContext.cxx | 15
xmloff/source/style/PageMasterImportPropMapper.cxx | 12
xmloff/source/text/XMLPropertyBackpatcher.cxx | 8
xmloff/source/text/XMLTextHeaderFooterContext.cxx | 12
xmloff/source/text/txtimppr.cxx | 8
xmloff/source/text/txtparae.cxx | 10
679 files changed, 8949 insertions(+), 8299 deletions(-)
New commits:
commit 1f0f900c08f25b1804ad46fb54150a2862b09f1d
Author: Ptyl Dragon <ptyl at cloudon.com>
Date: Tue Sep 30 12:41:02 2014 +0300
Added flag --enable-vgl mapped to HAVE_VCL_OPEN_GL_BACKEND
diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index 04dc7ba..9c97eb5 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -136,4 +136,9 @@
*/
#define HAVE_FEATURE_COLLADA 0
+/*
+ * Whether VCL renders using Open GL.
+ */
+#define HAVE_VCL_OPEN_GL_BACKEND 0
+
#endif
diff --git a/configure.ac b/configure.ac
index d58df76..45869a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1222,6 +1222,11 @@ AC_ARG_ENABLE(vlc,
[Enable building with the VLC avmedia backend.]),
,enable_vlc=no)
+AC_ARG_ENABLE(vgl,
+ AS_HELP_STRING([--enable-vgl],
+ [Enable building with the VCL Open GL backend.]),
+,enable_vgl=no)
+
AC_ARG_ENABLE(neon,
AS_HELP_STRING([--disable-neon],
[Disable neon and the compilation of webdav binding.]),
@@ -2442,6 +2447,10 @@ if test $_os != iOS -a $_os != Android; then
AC_DEFINE(HAVE_FEATURE_MULTIUSER_ENVIRONMENT)
fi
+if test "$enable_vgl" == yes; then
+ AC_DEFINE(HAVE_VCL_OPEN_GL_BACKEND)
+fi
+
DISABLE_EXPORT=''
if test "$enable_export" != no; then
BUILD_TYPE="$BUILD_TYPE EXPORT"
diff --git a/ios/experimental/TiledLibreOffice/.gitignore b/ios/experimental/TiledLibreOffice/.gitignore
new file mode 100644
index 0000000..a8966da9
--- /dev/null
+++ b/ios/experimental/TiledLibreOffice/.gitignore
@@ -0,0 +1,9 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+/Resources
commit b69478acff4f5b7a9d334a765a1a528d44d7b3a4
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Tue Sep 30 09:06:18 2014 +0200
Use constants for ST_VerticalJc values
Change-Id: Ib7d2ecfa2c5bcbda55859144af6b55bc8ef09c3d
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index 1e3fa21..a46387f 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -201,10 +201,10 @@ namespace dmapper {
case NS_ooxml::LN_CT_TcPrBase_vAlign://90694
{
sal_Int16 nVertOrient = text::VertOrientation::NONE;
- switch( nIntValue ) //0 - top 1 - center 3 - bottom (ST_VerticalJc)
+ switch( nIntValue )
{
- case 1: nVertOrient = text::VertOrientation::CENTER; break;
- case 3: nVertOrient = text::VertOrientation::BOTTOM; break;
+ case NS_ooxml::LN_Value_ST_VerticalJc_center: nVertOrient = text::VertOrientation::CENTER; break;
+ case NS_ooxml::LN_Value_ST_VerticalJc_bottom: nVertOrient = text::VertOrientation::BOTTOM; break;
default:;
};
TablePropertyMapPtr pCellPropMap( new TablePropertyMap() );
@@ -216,10 +216,10 @@ namespace dmapper {
OUString aVertOrient;
switch( nIntValue )
{
- case 0: aVertOrient = "top"; break;
- case 1: aVertOrient = "center"; break;
- case 2: aVertOrient = "both"; break;
- case 3: aVertOrient = "bottom"; break;
+ case NS_ooxml::LN_Value_ST_VerticalJc_top: aVertOrient = "top"; break;
+ case NS_ooxml::LN_Value_ST_VerticalJc_center: aVertOrient = "center"; break;
+ case NS_ooxml::LN_Value_ST_VerticalJc_both: aVertOrient = "both"; break;
+ case NS_ooxml::LN_Value_ST_VerticalJc_bottom: aVertOrient = "bottom"; break;
};
if (!aVertOrient.isEmpty())
{
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index b5ec46c..ddfc717 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -17714,10 +17714,10 @@
<element name="col" tokenid="ooxml:CT_Columns_col"/>
</resource>
<resource name="ST_VerticalJc" resource="List">
- <value tokenid="0">top</value>
- <value tokenid="1">center</value>
- <value tokenid="2">both</value>
- <value tokenid="3">bottom</value>
+ <value tokenid="ooxml:Value_ST_VerticalJc_top">top</value>
+ <value tokenid="ooxml:Value_ST_VerticalJc_center">center</value>
+ <value tokenid="ooxml:Value_ST_VerticalJc_both">both</value>
+ <value tokenid="ooxml:Value_ST_VerticalJc_bottom">bottom</value>
</resource>
<resource name="CT_VerticalJc" resource="Value">
<attribute name="val" tokenid="ooxml:CT_VerticalJc_val" action="setValue"/>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index d613449..33b83dd 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3074,13 +3074,13 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
switch (nKeyword)
{
case RTF_CLVERTALT:
- nParam = 0;
+ nParam = NS_ooxml::LN_Value_ST_VerticalJc_top;
break;
case RTF_CLVERTALC:
- nParam = 1;
+ nParam = NS_ooxml::LN_Value_ST_VerticalJc_center;
break;
case RTF_CLVERTALB:
- nParam = 3;
+ nParam = NS_ooxml::LN_Value_ST_VerticalJc_bottom;
break;
default:
break;
commit 68daa8a22611605299ac3174a3632191f93236d9
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Sep 30 08:13:36 2014 +0200
xmloff: std::auto_ptr -> std::unique_ptr
Change-Id: I8baa6c0573af3629bacbf1891c3196c165883d9e
diff --git a/include/xmloff/DocumentSettingsContext.hxx b/include/xmloff/DocumentSettingsContext.hxx
index da3919e..24296f3 100644
--- a/include/xmloff/DocumentSettingsContext.hxx
+++ b/include/xmloff/DocumentSettingsContext.hxx
@@ -32,7 +32,7 @@ struct XMLDocumentSettingsContext_Data;
class XMLOFF_DLLPUBLIC XMLDocumentSettingsContext : public SvXMLImportContext
{
- ::std::auto_ptr< XMLDocumentSettingsContext_Data > m_pData;
+ ::std::unique_ptr< XMLDocumentSettingsContext_Data > m_pData;
public:
XMLDocumentSettingsContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index 2323660..37ec27b 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -76,7 +76,7 @@ class XMLOFF_DLLPUBLIC XMLTextParagraphExport : public XMLStyleExport
rtl::Reference < SvXMLExportPropertyMapper > xSectionPropMapper;
rtl::Reference < SvXMLExportPropertyMapper > xRubyPropMapper;
- const ::std::auto_ptr< ::xmloff::BoundFrameSets > pBoundFrameSets;
+ const ::std::unique_ptr< ::xmloff::BoundFrameSets > pBoundFrameSets;
XMLTextFieldExport *pFieldExport;
std::vector<OUString> *pListElements;
XMLTextListAutoStylePool *pListAutoPool;
@@ -675,7 +675,7 @@ public:
void PopTextListsHelper();
private:
- XMLTextParagraphExport(XMLTextParagraphExport &); // private copy-ctor because of explicit copy-ctor of auto_ptr
+ XMLTextParagraphExport(XMLTextParagraphExport &); // private copy-ctor because of explicit copy-ctor of unique_ptr
};
inline const XMLTextListAutoStylePool&
diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx
index 25ef7fc..f41e0d3 100644
--- a/include/xmloff/xmluconv.hxx
+++ b/include/xmloff/xmluconv.hxx
@@ -84,7 +84,7 @@ class XMLOFF_DLLPUBLIC SvXMLUnitConverter
{
private:
struct Impl;
- ::std::auto_ptr<Impl> m_pImpl;
+ ::std::unique_ptr<Impl> m_pImpl;
public:
/** constructs a SvXMLUnitConverter. The core measure unit is the
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index d704318..8b35d5d 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -271,7 +271,7 @@ public:
/// counts depth (number of open elements/start tags)
long mDepth;
- ::std::auto_ptr< ::xmloff::RDFaExportHelper> mpRDFaHelper;
+ ::std::unique_ptr< ::xmloff::RDFaExportHelper> mpRDFaHelper;
bool mbExportTextNumberElement;
bool mbNullDateInitialized;
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 804e540..f9f1969 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -295,9 +295,9 @@ public:
uno::Reference< embed::XStorage > mxSourceStorage;
- std::auto_ptr< xmloff::RDFaImportHelper > mpRDFaHelper;
+ std::unique_ptr< xmloff::RDFaImportHelper > mpRDFaHelper;
- std::auto_ptr< DocumentInfo > mpDocumentInfo;
+ std::unique_ptr< DocumentInfo > mpDocumentInfo;
SvXMLImport_Impl( const uno::Reference< uno::XComponentContext >& rxContext,
OUString const & theImplementationName)
diff --git a/xmloff/source/style/PageMasterImportPropMapper.cxx b/xmloff/source/style/PageMasterImportPropMapper.cxx
index 46a5263..7073ab6 100644
--- a/xmloff/source/style/PageMasterImportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterImportPropMapper.cxx
@@ -117,19 +117,13 @@ void PageMasterImportPropertyMapper::finished(::std::vector< XMLPropertyState >&
boost::scoped_ptr<XMLPropertyState> xFooterDynamic;
XMLPropertyState* pAllMarginProperty = NULL;
XMLPropertyState* pMargins[4] = { NULL, NULL, NULL, NULL };
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<XMLPropertyState> pNewMargins[4];
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ ::std::unique_ptr<XMLPropertyState> pNewMargins[4];
XMLPropertyState* pAllHeaderMarginProperty = NULL;
XMLPropertyState* pHeaderMargins[4] = { NULL, NULL, NULL, NULL };
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<XMLPropertyState> pNewHeaderMargins[4];
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ ::std::unique_ptr<XMLPropertyState> pNewHeaderMargins[4];
XMLPropertyState* pAllFooterMarginProperty = NULL;
XMLPropertyState* pFooterMargins[4] = { NULL, NULL, NULL, NULL };
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<XMLPropertyState> pNewFooterMargins[4];
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ ::std::unique_ptr<XMLPropertyState> pNewFooterMargins[4];
::std::vector< XMLPropertyState >::iterator aEnd = rProperties.end();
for (::std::vector< XMLPropertyState >::iterator aIter = rProperties.begin(); aIter != aEnd; ++aIter)
diff --git a/xmloff/source/text/XMLPropertyBackpatcher.cxx b/xmloff/source/text/XMLPropertyBackpatcher.cxx
index 981524e..86d6297 100644
--- a/xmloff/source/text/XMLPropertyBackpatcher.cxx
+++ b/xmloff/source/text/XMLPropertyBackpatcher.cxx
@@ -152,18 +152,16 @@ template class XMLPropertyBackpatcher<OUString>;
struct XMLTextImportHelper::BackpatcherImpl
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
/// backpatcher for references to footnotes and endnotes
- ::std::auto_ptr< XMLPropertyBackpatcher<sal_Int16> >
+ ::std::unique_ptr< XMLPropertyBackpatcher<sal_Int16> >
m_pFootnoteBackpatcher;
/// backpatchers for references to sequences
- ::std::auto_ptr< XMLPropertyBackpatcher<sal_Int16> >
+ ::std::unique_ptr< XMLPropertyBackpatcher<sal_Int16> >
m_pSequenceIdBackpatcher;
- ::std::auto_ptr< XMLPropertyBackpatcher< OUString> >
+ ::std::unique_ptr< XMLPropertyBackpatcher< OUString> >
m_pSequenceNameBackpatcher;
- SAL_WNODEPRECATED_DECLARATIONS_POP
};
::boost::shared_ptr<XMLTextImportHelper::BackpatcherImpl>
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index b200763..395759a 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -394,14 +394,10 @@ void XMLTextImportPropertyMapper::finished(
XMLPropertyState* pBackTransparent = NULL; // transparency as boolean
XMLPropertyState* pAllParaMargin = 0;
XMLPropertyState* pParaMargins[4] = { 0, 0, 0, 0 };
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<XMLPropertyState> pNewParaMargins[4];
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ ::std::unique_ptr<XMLPropertyState> pNewParaMargins[4];
XMLPropertyState* pAllMargin = 0;
XMLPropertyState* pMargins[4] = { 0, 0, 0, 0 };
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<XMLPropertyState> pNewMargins[4];
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ ::std::unique_ptr<XMLPropertyState> pNewMargins[4];
for( ::std::vector< XMLPropertyState >::iterator aIter = rProperties.begin();
aIter != rProperties.end();
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 949acac..5b93211 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -240,12 +240,10 @@ namespace xmloff
const BoundFrames* GetShapes() const
{ return m_pShapes.get(); };
private:
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- auto_ptr<BoundFrames> m_pTexts;
- auto_ptr<BoundFrames> m_pGraphics;
- auto_ptr<BoundFrames> m_pEmbeddeds;
- auto_ptr<BoundFrames> m_pShapes;
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ unique_ptr<BoundFrames> m_pTexts;
+ unique_ptr<BoundFrames> m_pGraphics;
+ unique_ptr<BoundFrames> m_pEmbeddeds;
+ unique_ptr<BoundFrames> m_pShapes;
};
}
commit 38975e16ecfd900a14600f2f1383608b659d253b
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Sep 30 08:02:58 2014 +0300
WaE: implicit conversion of literal of type 'sal_Bool' to 'bool'
Change-Id: Ibcb6abe7162197dec35f4626f158448ff538542f
diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
index b396e91..40ac808 100644
--- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx
+++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
@@ -74,7 +74,7 @@ XMLTextHeaderFooterContext::XMLTextHeaderFooterContext( SvXMLImport& rImport, sa
if( bShared )
{
// Don't share headers any longer
- bShared = sal_False;
+ bShared = false;
aAny.setValue( &bShared, ::getBooleanCppuType() );
xPropSet->setPropertyValue( sShareContent, aAny );
}
@@ -88,7 +88,7 @@ XMLTextHeaderFooterContext::XMLTextHeaderFooterContext( SvXMLImport& rImport, sa
if( bSharedFirst )
{
// Don't share first/right headers any longer
- bSharedFirst = sal_False;
+ bSharedFirst = false;
aAny.setValue( &bSharedFirst, ::getBooleanCppuType() );
xPropSet->setPropertyValue( sShareContentFirst, aAny );
}
commit 6a6e8628bdbe60931ce8e7fa9f4bb66170f7737b
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Tue Sep 30 09:11:08 2014 +1000
vcl: fixup last cleanup
Change-Id: I628b50b3dd7914edcacb571ead226146455f62f1
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 3005fae..73e57c6 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -331,7 +331,7 @@ public:
virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) SAL_OVERRIDE;
// get the repertoire of the current font
virtual const ImplFontCharMap*
- GetFontCharMap() const SAL_OVERRIDE;
+ GetImplFontCharMap() const SAL_OVERRIDE;
virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const SAL_OVERRIDE;
// graphics must fill supplied font list
virtual void GetDevFontList( PhysicalFontCollection* ) SAL_OVERRIDE;
commit 19a35bcd5beff8d1fede856c6c4078dd6716c1cf
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Tue Sep 30 09:03:09 2014 +1000
vcl: cleanup vcl/inc/quartz/salgdi.h
Change-Id: Ib34aa29bfa191efda8d31486a60ae0e607787387
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 1fdacb3..3005fae 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -63,35 +63,34 @@ typedef std::vector<unsigned char> ByteVector;
class CoreTextFontData : public PhysicalFontFace
{
public:
- CoreTextFontData( const ImplDevFontAttributes&, sal_IntPtr nFontID );
+ CoreTextFontData( const ImplDevFontAttributes&, sal_IntPtr nFontID );
+ virtual ~CoreTextFontData();
- virtual ~CoreTextFontData();
+ PhysicalFontFace* Clone() const SAL_OVERRIDE;
+ ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const SAL_OVERRIDE;
+ sal_IntPtr GetFontId() const SAL_OVERRIDE;
- PhysicalFontFace* Clone() const SAL_OVERRIDE;
- ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const SAL_OVERRIDE;
- sal_IntPtr GetFontId() const SAL_OVERRIDE;
+ CoreTextStyle* CreateTextStyle( const FontSelectPattern& ) const;
+ int GetFontTable( const char pTagName[5], unsigned char* ) const;
- CoreTextStyle* CreateTextStyle( const FontSelectPattern& ) const;
- int GetFontTable( const char pTagName[5], unsigned char* ) const;
+ const ImplFontCharMap* GetImplFontCharMap() const;
+ bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const;
+ bool HasChar( sal_uInt32 cChar ) const;
- const ImplFontCharMap* GetImplFontCharMap() const;
- bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const;
- bool HasChar( sal_uInt32 cChar ) const;
-
- void ReadOs2Table() const;
- void ReadMacCmapEncoding() const;
+ void ReadOs2Table() const;
+ void ReadMacCmapEncoding() const;
protected:
- CoreTextFontData( const CoreTextFontData&);
+ CoreTextFontData( const CoreTextFontData& );
private:
- const sal_IntPtr mnFontId;
- mutable const ImplFontCharMap* mpCharMap;
- mutable vcl::FontCapabilities maFontCapabilities;
- mutable bool mbOs2Read; // true if OS2-table related info is valid
- mutable bool mbHasOs2Table;
- mutable bool mbCmapEncodingRead; // true if cmap encoding of Mac font is read
- mutable bool mbFontCapabilitiesRead;
+ const sal_IntPtr mnFontId;
+ mutable const FontCharMapPtr mpCharMap;
+ mutable vcl::FontCapabilities maFontCapabilities;
+ mutable bool mbOs2Read; // true if OS2-table related info is valid
+ mutable bool mbHasOs2Table;
+ mutable bool mbCmapEncodingRead; // true if cmap encoding of Mac font is read
+ mutable bool mbFontCapabilitiesRead;
};
class CoreTextStyle
@@ -192,117 +191,117 @@ protected:
bool mbWindow;
public:
- AquaSalGraphics();
- virtual ~AquaSalGraphics();
+ AquaSalGraphics();
+ virtual ~AquaSalGraphics();
- bool IsPenVisible() const { return maLineColor.IsVisible(); }
- bool IsBrushVisible() const { return maFillColor.IsVisible(); }
+ bool IsPenVisible() const { return maLineColor.IsVisible(); }
+ bool IsBrushVisible() const { return maFillColor.IsVisible(); }
- void SetWindowGraphics( AquaSalFrame* pFrame );
- void SetPrinterGraphics( CGContextRef, long nRealDPIX, long nRealDPIY );
- void SetVirDevGraphics( CGLayerRef, CGContextRef, int nBitDepth = 0 );
+ void SetWindowGraphics( AquaSalFrame* pFrame );
+ void SetPrinterGraphics( CGContextRef, long nRealDPIX, long nRealDPIY );
+ void SetVirDevGraphics( CGLayerRef, CGContextRef, int nBitDepth = 0 );
- void initResolution( NSWindow* );
- void copyResolution( AquaSalGraphics& );
- void updateResolution();
+ void initResolution( NSWindow* );
+ void copyResolution( AquaSalGraphics& );
+ void updateResolution();
- bool IsWindowGraphics() const { return mbWindow; }
- AquaSalFrame* getGraphicsFrame() const { return mpFrame; }
- void setGraphicsFrame( AquaSalFrame* pFrame ) { mpFrame = pFrame; }
+ bool IsWindowGraphics() const { return mbWindow; }
+ AquaSalFrame* getGraphicsFrame() const { return mpFrame; }
+ void setGraphicsFrame( AquaSalFrame* pFrame ) { mpFrame = pFrame; }
- void ImplDrawPixel( long nX, long nY, const RGBAColor& ); // helper to draw single pixels
+ void ImplDrawPixel( long nX, long nY, const RGBAColor& ); // helper to draw single pixels
- bool CheckContext();
- CGContextRef GetContext();
- void UpdateWindow( NSRect& ); // delivered in NSView coordinates
+ bool CheckContext();
+ CGContextRef GetContext();
+ void UpdateWindow( NSRect& ); // delivered in NSView coordinates
#if !defined(__LP64__) && !defined(NS_BUILD_32_LIKE_64)
- void RefreshRect( const CGRect& );
+ void RefreshRect( const CGRect& );
#endif
- void RefreshRect( const NSRect& );
- void RefreshRect(float lX, float lY, float lWidth, float lHeight);
+ void RefreshRect( const NSRect& );
+ void RefreshRect(float lX, float lY, float lWidth, float lHeight);
- void SetState();
- void UnsetState();
+ void SetState();
+ void UnsetState();
// InvalidateContext does an UnsetState and sets mrContext to 0
- void InvalidateContext();
+ void InvalidateContext();
- virtual bool setClipRegion( const Region& ) SAL_OVERRIDE;
+ virtual bool setClipRegion( const Region& ) SAL_OVERRIDE;
// draw --> LineColor and FillColor and RasterOp and ClipRegion
- virtual void drawPixel( long nX, long nY ) SAL_OVERRIDE;
- virtual void drawPixel( long nX, long nY, SalColor nSalColor ) SAL_OVERRIDE;
- virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ) SAL_OVERRIDE;
- virtual void drawRect( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
- virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) SAL_OVERRIDE;
- virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) SAL_OVERRIDE;
- virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ) SAL_OVERRIDE;
- virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ) SAL_OVERRIDE;
- virtual bool drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) SAL_OVERRIDE;
- virtual bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) SAL_OVERRIDE;
- virtual bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry ) SAL_OVERRIDE;
- virtual bool drawPolyLine(
- const ::basegfx::B2DPolygon&,
- double fTransparency,
- const ::basegfx::B2DVector& rLineWidths,
- basegfx::B2DLineJoin,
- com::sun::star::drawing::LineCap eLineCap) SAL_OVERRIDE;
+ virtual void drawPixel( long nX, long nY ) SAL_OVERRIDE;
+ virtual void drawPixel( long nX, long nY, SalColor nSalColor ) SAL_OVERRIDE;
+ virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ) SAL_OVERRIDE;
+ virtual void drawRect( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
+ virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) SAL_OVERRIDE;
+ virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) SAL_OVERRIDE;
+ virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ) SAL_OVERRIDE;
+ virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ) SAL_OVERRIDE;
+ virtual bool drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) SAL_OVERRIDE;
+ virtual bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) SAL_OVERRIDE;
+ virtual bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry ) SAL_OVERRIDE;
+ virtual bool drawPolyLine(
+ const ::basegfx::B2DPolygon&,
+ double fTransparency,
+ const ::basegfx::B2DVector& rLineWidths,
+ basegfx::B2DLineJoin,
+ com::sun::star::drawing::LineCap eLineCap) SAL_OVERRIDE;
// CopyArea --> No RasterOp, but ClipRegion
- virtual void copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth,
- long nSrcHeight, sal_uInt16 nFlags ) SAL_OVERRIDE;
+ virtual void copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth,
+ long nSrcHeight, sal_uInt16 nFlags ) SAL_OVERRIDE;
// CopyBits and DrawBitmap --> RasterOp and ClipRegion
// CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics
- virtual void copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) SAL_OVERRIDE;
- virtual void drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap ) SAL_OVERRIDE;
- virtual void drawBitmap( const SalTwoRect& rPosAry,
- const SalBitmap& rSalBitmap,
- SalColor nTransparentColor ) SAL_OVERRIDE;
- virtual void drawBitmap( const SalTwoRect& rPosAry,
- const SalBitmap& rSalBitmap,
- const SalBitmap& rTransparentBitmap ) SAL_OVERRIDE;
- virtual void drawMask( const SalTwoRect& rPosAry,
- const SalBitmap& rSalBitmap,
- SalColor nMaskColor ) SAL_OVERRIDE;
-
- virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
- virtual SalColor getPixel( long nX, long nY ) SAL_OVERRIDE;
+ virtual void copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) SAL_OVERRIDE;
+ virtual void drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap ) SAL_OVERRIDE;
+ virtual void drawBitmap( const SalTwoRect& rPosAry,
+ const SalBitmap& rSalBitmap,
+ SalColor nTransparentColor ) SAL_OVERRIDE;
+ virtual void drawBitmap( const SalTwoRect& rPosAry,
+ const SalBitmap& rSalBitmap,
+ const SalBitmap& rTransparentBitmap ) SAL_OVERRIDE;
+ virtual void drawMask( const SalTwoRect& rPosAry,
+ const SalBitmap& rSalBitmap,
+ SalColor nMaskColor ) SAL_OVERRIDE;
+
+ virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
+ virtual SalColor getPixel( long nX, long nY ) SAL_OVERRIDE;
// invert --> ClipRegion (only Windows or VirDevs)
- virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags) SAL_OVERRIDE;
- virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) SAL_OVERRIDE;
+ virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags) SAL_OVERRIDE;
+ virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) SAL_OVERRIDE;
- virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) SAL_OVERRIDE;
+ virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) SAL_OVERRIDE;
virtual bool drawAlphaBitmap( const SalTwoRect&,
const SalBitmap& rSourceBitmap,
const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE;
- bool drawTransformedBitmap(
- const basegfx::B2DPoint& rNull,
- const basegfx::B2DPoint& rX,
- const basegfx::B2DPoint& rY,
- const SalBitmap& rSourceBitmap,
- const SalBitmap* pAlphaBitmap) SAL_OVERRIDE;
+ bool drawTransformedBitmap(
+ const basegfx::B2DPoint& rNull,
+ const basegfx::B2DPoint& rX,
+ const basegfx::B2DPoint& rY,
+ const SalBitmap& rSourceBitmap,
+ const SalBitmap* pAlphaBitmap) SAL_OVERRIDE;
virtual bool drawAlphaRect( long nX, long nY, long nWidth,
long nHeight, sal_uInt8 nTransparency ) SAL_OVERRIDE;
CGPoint* makeCGptArray(sal_uInt32 nPoints, const SalPoint* pPtAry);
// native widget rendering methods that require mirroring
- virtual bool hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
- const Point& aPos, bool& rIsInside ) SAL_OVERRIDE;
- virtual bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
- ControlState nState, const ImplControlValue& aValue,
- const OUString& aCaption ) SAL_OVERRIDE;
- virtual bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
- const ImplControlValue& aValue, const OUString& aCaption,
- Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) SAL_OVERRIDE;
+ virtual bool hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
+ const Point& aPos, bool& rIsInside ) SAL_OVERRIDE;
+ virtual bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
+ ControlState nState, const ImplControlValue& aValue,
+ const OUString& aCaption ) SAL_OVERRIDE;
+ virtual bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
+ const ImplControlValue& aValue, const OUString& aCaption,
+ Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) SAL_OVERRIDE;
// get device resolution
virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) SAL_OVERRIDE;
// get the depth of the device
- virtual sal_uInt16 GetBitCount() const SAL_OVERRIDE;
+ virtual sal_uInt16 GetBitCount() const SAL_OVERRIDE;
// get the width of the device
virtual long GetGraphicsWidth() const SAL_OVERRIDE;
@@ -327,16 +326,17 @@ public:
// set the text color to a specific color
virtual void SetTextColor( SalColor nSalColor ) SAL_OVERRIDE;
// set the font
- virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ) SAL_OVERRIDE;
+ virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ) SAL_OVERRIDE;
// get the current font's metrics
virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) SAL_OVERRIDE;
// get the repertoire of the current font
- virtual const ImplFontCharMap* GetImplFontCharMap() const SAL_OVERRIDE;
- virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const SAL_OVERRIDE;
+ virtual const ImplFontCharMap*
+ GetFontCharMap() const SAL_OVERRIDE;
+ virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const SAL_OVERRIDE;
// graphics must fill supplied font list
virtual void GetDevFontList( PhysicalFontCollection* ) SAL_OVERRIDE;
// graphics must drop any cached font info
- virtual void ClearDevFontCache() SAL_OVERRIDE;
+ virtual void ClearDevFontCache() SAL_OVERRIDE;
virtual bool AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) SAL_OVERRIDE;
// CreateFontSubset: a method to get a subset of glyhps of a font
// inside a new valid font file
@@ -350,14 +350,14 @@ public:
// rInfo: additional outgoing information
// implementation note: encoding 0 with glyph id 0 should be added implicitly
// as "undefined character"
- virtual bool CreateFontSubset( const OUString& rToFile,
- const PhysicalFontFace* pFont,
- sal_GlyphId* pGlyphIds,
- sal_uInt8* pEncoding,
- sal_Int32* pWidths,
- int nGlyphs,
- FontSubsetInfo& rInfo // out parameter
- ) SAL_OVERRIDE;
+ virtual bool CreateFontSubset( const OUString& rToFile,
+ const PhysicalFontFace* pFont,
+ sal_GlyphId* pGlyphIds,
+ sal_uInt8* pEncoding,
+ sal_Int32* pWidths,
+ int nGlyphs,
+ FontSubsetInfo& rInfo // out parameter
+ ) SAL_OVERRIDE;
// GetFontEncodingVector: a method to get the encoding map Unicode
// to font encoded character; this is only used for type1 fonts and
@@ -375,11 +375,11 @@ public:
// pWidths MUST support at least 256 members;
// rInfo: additional outgoing information
// pDataLen: out parameter, contains the byte length of the returned buffer
- virtual const void* GetEmbedFontData( const PhysicalFontFace*,
- const sal_Ucs* pUnicodes,
- sal_Int32* pWidths,
- FontSubsetInfo& rInfo,
- long* pDataLen ) SAL_OVERRIDE;
+ virtual const void* GetEmbedFontData( const PhysicalFontFace*,
+ const sal_Ucs* pUnicodes,
+ sal_Int32* pWidths,
+ FontSubsetInfo& rInfo,
+ long* pDataLen ) SAL_OVERRIDE;
// frees the font data again
virtual void FreeEmbedFontData( const void* pData, long nDataLen ) SAL_OVERRIDE;
@@ -388,31 +388,32 @@ public:
Int32Vector& rWidths,
Ucs2UIntMap& rUnicodeEnc ) SAL_OVERRIDE;
- virtual bool GetGlyphBoundRect( sal_GlyphId, Rectangle& ) SAL_OVERRIDE;
- virtual bool GetGlyphOutline( sal_GlyphId, basegfx::B2DPolyPolygon& ) SAL_OVERRIDE;
+ virtual bool GetGlyphBoundRect( sal_GlyphId, Rectangle& ) SAL_OVERRIDE;
+ virtual bool GetGlyphOutline( sal_GlyphId, basegfx::B2DPolyPolygon& ) SAL_OVERRIDE;
- virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) SAL_OVERRIDE;
- virtual void DrawServerFontLayout( const ServerFontLayout& ) SAL_OVERRIDE;
- virtual bool supportsOperation( OutDevSupportType ) const SAL_OVERRIDE;
+ virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) SAL_OVERRIDE;
+ virtual void DrawServerFontLayout( const ServerFontLayout& ) SAL_OVERRIDE;
+ virtual bool supportsOperation( OutDevSupportType ) const SAL_OVERRIDE;
// Query the platform layer for control support
- virtual bool IsNativeControlSupported( ControlType nType, ControlPart nPart ) SAL_OVERRIDE;
+ virtual bool IsNativeControlSupported( ControlType nType, ControlPart nPart ) SAL_OVERRIDE;
- virtual SystemGraphicsData GetGraphicsData() const SAL_OVERRIDE;
- virtual SystemFontData GetSysFontData( int /* nFallbacklevel */ ) const SAL_OVERRIDE;
+ virtual SystemGraphicsData
+ GetGraphicsData() const SAL_OVERRIDE;
+ virtual SystemFontData GetSysFontData( int /* nFallbacklevel */ ) const SAL_OVERRIDE;
private:
// differences between VCL, Quartz and kHiThemeOrientation coordinate systems
// make some graphics seem to be vertically-mirrored from a VCL perspective
- bool IsFlipped() const { return mbWindow; }
-
- void ApplyXorContext();
- void Pattern50Fill();
- UInt32 getState( ControlState nState );
- UInt32 getTrackState( ControlState nState );
- bool GetRawFontData( const PhysicalFontFace* pFontData,
- std::vector<unsigned char>& rBuffer,
- bool* pJustCFF );
+ bool IsFlipped() const { return mbWindow; }
+
+ void ApplyXorContext();
+ void Pattern50Fill();
+ UInt32 getState( ControlState nState );
+ UInt32 getTrackState( ControlState nState );
+ bool GetRawFontData( const PhysicalFontFace* pFontData,
+ std::vector<unsigned char>& rBuffer,
+ bool* pJustCFF );
};
// --- some trivial inlines
commit 9ea9d4d7c5db4fa85be2e14d29fe631d58b9e60f
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Sep 29 23:41:22 2014 +0200
fdo#79269: sw: more cleanup of SwXStyle's FirstIsShared property
Some of the checks for it can never be true given the preceding list of
WhichIds, but there is one other case that needs the special handling.
Change-Id: Iaf396960d064d0c9f2a950c2d02db1654a669d45
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 81c14ac..3270a31 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -425,6 +425,23 @@ SwXStyleFamily::~SwXStyleFamily()
}
+static bool lcl_GetHeaderFooterItem(
+ SfxItemSet const& rSet, OUString const& rPropName, bool const bFooter,
+ SvxSetItem const*& o_rpItem)
+{
+ SfxItemState eState = rSet.GetItemState(
+ (bFooter) ? SID_ATTR_PAGE_FOOTERSET : SID_ATTR_PAGE_HEADERSET,
+ false, reinterpret_cast<const SfxPoolItem**>(&o_rpItem));
+ if (SfxItemState::SET != eState &&
+ rPropName == UNO_NAME_FIRST_IS_SHARED)
+ { // fdo#79269 header may not exist, check footer then
+ eState = rSet.GetItemState(
+ (!bFooter) ? SID_ATTR_PAGE_FOOTERSET : SID_ATTR_PAGE_HEADERSET,
+ false, reinterpret_cast<const SfxPoolItem**>(&o_rpItem));
+ }
+ return SfxItemState::SET == eState;
+}
+
static sal_Int32 lcl_GetCountOrName(const SwDoc &rDoc,
SfxStyleFamily eFamily, OUString *pString, sal_uInt16 nIndex = USHRT_MAX)
{
@@ -2867,10 +2884,7 @@ uno::Sequence< beans::PropertyState > SwXStyle::getPropertyStates(
{
const SvxSetItem* pSetItem;
- if(SfxItemState::SET == rSet.GetItemState(
- bFooter ? SID_ATTR_PAGE_FOOTERSET : SID_ATTR_PAGE_HEADERSET,
- false,
- (const SfxPoolItem**)&pSetItem))
+ if (lcl_GetHeaderFooterItem(rSet, sPropName, bFooter, pSetItem))
{
// retarget the SfxItemSet to the HeaderFooter SfxSetItem's SfxItenSet
pSourceSet = &pSetItem->GetItemSet();
@@ -3420,18 +3434,8 @@ void SAL_CALL SwXPageStyle::SetPropertyValues_Impl(
{
// it is a Header/Footer entry, access the SvxSetItem containing it's information
const SvxSetItem* pSetItem = 0;
-
- SfxItemState eState = aBaseImpl.GetItemSet().GetItemState(
- (bFooter) ? SID_ATTR_PAGE_FOOTERSET : SID_ATTR_PAGE_HEADERSET,
- false, reinterpret_cast<const SfxPoolItem**>(&pSetItem));
- if (SfxItemState::SET != eState &&
- rPropName == UNO_NAME_FIRST_IS_SHARED)
- { // fdo#79269 header may not exist, check footer then
- eState = aBaseImpl.GetItemSet().GetItemState(
- (!bFooter) ? SID_ATTR_PAGE_FOOTERSET : SID_ATTR_PAGE_HEADERSET,
- false, reinterpret_cast<const SfxPoolItem**>(&pSetItem));
- }
- if (SfxItemState::SET == eState)
+ if (lcl_GetHeaderFooterItem(aBaseImpl.GetItemSet(),
+ rPropName, bFooter, pSetItem))
{
lcl_putItemToSet(pSetItem, *pPropSet, *pEntry, pValues[nProp], aBaseImpl, GetBasePool(), GetDoc(), GetFamily());
@@ -3532,7 +3536,7 @@ void SAL_CALL SwXPageStyle::SetPropertyValues_Impl(
const bool bHeader(rPropName.startsWith("Header"));
const bool bFooter(rPropName.startsWith("Footer"));
- if(bHeader || bFooter || rPropName == UNO_NAME_FIRST_IS_SHARED)
+ if (bHeader || bFooter)
{
const SvxSetItem* pSetItem = 0;
@@ -3736,17 +3740,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXPageStyle::GetPropertyValues_Impl(
const SfxItemSet& rSet = xStyle->GetItemSet();
const SvxSetItem* pSetItem;
- SfxItemState eState = rSet.GetItemState(
- (bFooter) ? SID_ATTR_PAGE_FOOTERSET : SID_ATTR_PAGE_HEADERSET,
- false, reinterpret_cast<const SfxPoolItem**>(&pSetItem));
- if (SfxItemState::SET != eState &&
- rPropName == UNO_NAME_FIRST_IS_SHARED)
- { // fdo#79269 header may not exist, check footer then
- eState = rSet.GetItemState(
- (!bFooter) ? SID_ATTR_PAGE_FOOTERSET : SID_ATTR_PAGE_HEADERSET,
- false, reinterpret_cast<const SfxPoolItem**>(&pSetItem));
- }
- if (SfxItemState::SET == eState)
+ if (lcl_GetHeaderFooterItem(rSet, rPropName, bFooter, pSetItem))
{
// get from SfxItemSet of the corresponding SfxSetItem
const SfxItemSet& rSetSet = pSetItem->GetItemSet();
@@ -3813,7 +3807,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXPageStyle::GetPropertyValues_Impl(
const bool bHeader(rPropName.startsWith("Header"));
const bool bFooter(rPropName.startsWith("Footer"));
- if(bHeader || bFooter || rPropName == UNO_NAME_FIRST_IS_SHARED)
+ if (bHeader || bFooter)
{
rtl::Reference< SwDocStyleSheet > xStyle( new SwDocStyleSheet( *(SwDocStyleSheet*)pBase ) );
const SfxItemSet& rSet = xStyle->GetItemSet();
commit 0f21f932081471b2a5eda820fa1a194fbf3ab85c
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Sep 29 23:22:12 2014 +0200
fdo#79269: fix ODF import of style:footer-first
The implementation of SwXStyle's FirstIsShared property is busted, and
that causes xmloff to write the footer-first content into the master
footer.
Change-Id: I520a4929d9d7313da65bcdcf4094f8244382377d
diff --git a/sw/qa/extras/odfimport/data/fdo79269.odt b/sw/qa/extras/odfimport/data/fdo79269.odt
new file mode 100644
index 0000000..2e3bf1e
Binary files /dev/null and b/sw/qa/extras/odfimport/data/fdo79269.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx
index 76f00bb..94eeb83 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -272,6 +272,24 @@ DECLARE_ODFIMPORT_TEST(testFdo60842, "fdo60842.odt")
getCell(xTable, "E1", "01/04/2012");
}
+DECLARE_ODFIMPORT_TEST(testFdo79269, "fdo79269.odt")
+{
+ uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY);
+ uno::Reference<text::XTextViewCursorSupplier> xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY);
+ uno::Reference<text::XPageCursor> xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
+ xCursor->jumpToLastPage();
+ CPPUNIT_ASSERT_EQUAL(sal_Int16(2), xCursor->getPage());
+
+ // The problem was that the first-footer was shared.
+ uno::Reference<beans::XPropertySet> xPropSet(getStyles("PageStyles")->getByName(DEFAULT_STYLE), uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(false, getProperty<bool>(xPropSet, "FirstIsShared"));
+
+ uno::Reference<text::XTextRange> xFooter1 = getProperty< uno::Reference<text::XTextRange> >(xPropSet, "FooterTextFirst");
+ CPPUNIT_ASSERT_EQUAL(OUString("forst"), xFooter1->getString());
+ uno::Reference<text::XTextRange> xFooter = getProperty< uno::Reference<text::XTextRange> >(xPropSet, "FooterText");
+ CPPUNIT_ASSERT_EQUAL(OUString("second"), xFooter->getString());
+}
+
DECLARE_ODFIMPORT_TEST(testFdo56272, "fdo56272.odt")
{
uno::Reference<drawing::XShape> xShape = getShape(1);
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index e17fce9..81c14ac 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -3421,9 +3421,17 @@ void SAL_CALL SwXPageStyle::SetPropertyValues_Impl(
// it is a Header/Footer entry, access the SvxSetItem containing it's information
const SvxSetItem* pSetItem = 0;
- if (SfxItemState::SET == aBaseImpl.GetItemSet().GetItemState(
- bFooter ? SID_ATTR_PAGE_FOOTERSET : SID_ATTR_PAGE_HEADERSET,
- false, (const SfxPoolItem**)&pSetItem))
+ SfxItemState eState = aBaseImpl.GetItemSet().GetItemState(
+ (bFooter) ? SID_ATTR_PAGE_FOOTERSET : SID_ATTR_PAGE_HEADERSET,
+ false, reinterpret_cast<const SfxPoolItem**>(&pSetItem));
+ if (SfxItemState::SET != eState &&
+ rPropName == UNO_NAME_FIRST_IS_SHARED)
+ { // fdo#79269 header may not exist, check footer then
+ eState = aBaseImpl.GetItemSet().GetItemState(
+ (!bFooter) ? SID_ATTR_PAGE_FOOTERSET : SID_ATTR_PAGE_HEADERSET,
+ false, reinterpret_cast<const SfxPoolItem**>(&pSetItem));
+ }
+ if (SfxItemState::SET == eState)
{
lcl_putItemToSet(pSetItem, *pPropSet, *pEntry, pValues[nProp], aBaseImpl, GetBasePool(), GetDoc(), GetFamily());
@@ -3728,7 +3736,17 @@ uno::Sequence< uno::Any > SAL_CALL SwXPageStyle::GetPropertyValues_Impl(
const SfxItemSet& rSet = xStyle->GetItemSet();
const SvxSetItem* pSetItem;
- if(SfxItemState::SET == rSet.GetItemState(bFooter ? SID_ATTR_PAGE_FOOTERSET : SID_ATTR_PAGE_HEADERSET, false, (const SfxPoolItem**)&pSetItem))
+ SfxItemState eState = rSet.GetItemState(
+ (bFooter) ? SID_ATTR_PAGE_FOOTERSET : SID_ATTR_PAGE_HEADERSET,
+ false, reinterpret_cast<const SfxPoolItem**>(&pSetItem));
+ if (SfxItemState::SET != eState &&
+ rPropName == UNO_NAME_FIRST_IS_SHARED)
+ { // fdo#79269 header may not exist, check footer then
+ eState = rSet.GetItemState(
+ (!bFooter) ? SID_ATTR_PAGE_FOOTERSET : SID_ATTR_PAGE_HEADERSET,
+ false, reinterpret_cast<const SfxPoolItem**>(&pSetItem));
+ }
+ if (SfxItemState::SET == eState)
{
// get from SfxItemSet of the corresponding SfxSetItem
const SfxItemSet& rSetSet = pSetItem->GetItemSet();
diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
index 6ee1e73..b396e91 100644
--- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx
+++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
@@ -68,7 +68,9 @@ XMLTextHeaderFooterContext::XMLTextHeaderFooterContext( SvXMLImport& rImport, sa
if (bLeft)
{
aAny = xPropSet->getPropertyValue( sShareContent );
- sal_Bool bShared = *(sal_Bool *)aAny.getValue();
+ bool bShared;
+ if (!(aAny >>= bShared))
+ assert(false); // should return a value!
if( bShared )
{
// Don't share headers any longer
@@ -80,7 +82,9 @@ XMLTextHeaderFooterContext::XMLTextHeaderFooterContext( SvXMLImport& rImport, sa
if (bFirst)
{
aAny = xPropSet->getPropertyValue( sShareContentFirst );
- sal_Bool bSharedFirst = aAny.has<sal_Bool>() && *(sal_Bool *)aAny.getValue();
+ bool bSharedFirst;
+ if (!(aAny >>= bSharedFirst))
+ assert(false); // should return a value!
if( bSharedFirst )
{
// Don't share first/right headers any longer
commit 87331efa9b190793c1719b31a62a2eef6a66f92d
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Sep 29 21:23:20 2014 +0200
sc: fix locking in ScXMLConsolidationContext
Essentially revert commit 4fa05ecc089a027f243e87f76cc9bcd1f70447e4,
plus move the unlock to the dtor for more RAII-ness.
Change-Id: Ie5a9cc183626e3f5b005348606bffa69c4be4f7f
diff --git a/sc/source/filter/xml/XMLConsolidationContext.cxx b/sc/source/filter/xml/XMLConsolidationContext.cxx
index e211505..525aacf 100644
--- a/sc/source/filter/xml/XMLConsolidationContext.cxx
+++ b/sc/source/filter/xml/XMLConsolidationContext.cxx
@@ -38,7 +38,7 @@ ScXMLConsolidationContext::ScXMLConsolidationContext(
bLinkToSource( false ),
bTargetAddr(false)
{
- ScXMLImport::MutexGuard aGuard(GetScImport());
+ rImport.LockSolarMutex();
if( !xAttrList.is() ) return;
sal_Int16 nAttrCount = xAttrList->getLength();
@@ -78,6 +78,7 @@ ScXMLConsolidationContext::ScXMLConsolidationContext(
ScXMLConsolidationContext::~ScXMLConsolidationContext()
{
+ GetScImport().UnlockSolarMutex();
}
SvXMLImportContext *ScXMLConsolidationContext::CreateChildContext(
@@ -136,7 +137,6 @@ void ScXMLConsolidationContext::EndElement()
if( pDoc )
pDoc->SetConsolidateDlgData( &aConsParam );
}
- GetScImport().UnlockSolarMutex();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 67a9ae4dd80cefe04225d4fe5f7b5ff3ce3bcca8
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Sep 29 23:18:26 2014 +0200
Improve debug output
Change-Id: Iba0c35a5bc07ac7b67186c3eeae1a2c926a6bc69
diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx
index 33bb5fa..5bae75f 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx
@@ -334,10 +334,18 @@ static typelib_TypeClass cpp_mediate(
typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
- OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
- throw RuntimeException( "illegal vtable index!", (XInterface *)pThis );
+ SAL_WARN(
+ "bridges",
+ "illegal " << OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ << " vtable index " << nFunctionIndex << "/"
+ << pTypeDescr->nMapFunctionIndexToMemberIndex);
+ throw RuntimeException(
+ ("illegal " + OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ + " vtable index " + OUString::number(nFunctionIndex) + "/"
+ + OUString::number(pTypeDescr->nMapFunctionIndexToMemberIndex)),
+ (XInterface *)pThis);
}
// determine called method
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
index c784d01..f47f369 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
@@ -380,10 +380,18 @@ static typelib_TypeClass cpp_mediate(
typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
- OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
- throw RuntimeException( "illegal vtable index!", (XInterface *)pCppI );
+ SAL_WARN(
+ "bridges",
+ "illegal " << OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ << " vtable index " << nFunctionIndex << "/"
+ << pTypeDescr->nMapFunctionIndexToMemberIndex);
+ throw RuntimeException(
+ ("illegal " + OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ + " vtable index " + OUString::number(nFunctionIndex) + "/"
+ + OUString::number(pTypeDescr->nMapFunctionIndexToMemberIndex)),
+ (XInterface *)pCppI);
}
// determine called method
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
index b717a4f..ca300a0 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
@@ -311,11 +311,18 @@ namespace
typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
- OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex,
- "### illegal vtable index!" );
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
- throw RuntimeException( "illegal vtable index!", (XInterface *)pCppI );
+ SAL_WARN(
+ "bridges",
+ "illegal " << OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ << " vtable index " << nFunctionIndex << "/"
+ << pTypeDescr->nMapFunctionIndexToMemberIndex);
+ throw RuntimeException(
+ ("illegal " + OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ + " vtable index " + OUString::number(nFunctionIndex) + "/"
+ + OUString::number(pTypeDescr->nMapFunctionIndexToMemberIndex)),
+ (XInterface *)pCppI);
}
// determine called method
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
index b04928f..81885d4 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
@@ -417,11 +417,18 @@ namespace
typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
- OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex,
- "### illegal vtable index!" );
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
- throw RuntimeException( "illegal vtable index!", (XInterface *)pCppI );
+ SAL_WARN(
+ "bridges",
+ "illegal " << OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ << " vtable index " << nFunctionIndex << "/"
+ << pTypeDescr->nMapFunctionIndexToMemberIndex);
+ throw RuntimeException(
+ ("illegal " + OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ + " vtable index " + OUString::number(nFunctionIndex) + "/"
+ + OUString::number(pTypeDescr->nMapFunctionIndexToMemberIndex)),
+ (XInterface *)pCppI);
}
// determine called method
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
index e8ef62e..94e502b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
@@ -356,10 +356,18 @@ static typelib_TypeClass cpp_mediate(
fprintf(stderr, "indexes are %d %d\n", nFunctionIndex, pTypeDescr->nMapFunctionIndexToMemberIndex);
#endif
- OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
- throw RuntimeException( "illegal vtable index!", (XInterface *)pThis );
+ SAL_WARN(
+ "bridges",
+ "illegal " << OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ << " vtable index " << nFunctionIndex << "/"
+ << pTypeDescr->nMapFunctionIndexToMemberIndex);
+ throw RuntimeException(
+ ("illegal " + OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ + " vtable index " + OUString::number(nFunctionIndex) + "/"
+ + OUString::number(pTypeDescr->nMapFunctionIndexToMemberIndex)),
+ (XInterface *)pThis);
}
// determine called method
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
index d73d2c0..bdb3093 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
@@ -237,10 +237,18 @@ extern "C" void cpp_vtable_call(
typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
- OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
- throw RuntimeException( "illegal vtable index!", (XInterface *)pThis );
+ SAL_WARN(
+ "bridges",
+ "illegal " << OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ << " vtable index " << nFunctionIndex << "/"
+ << pTypeDescr->nMapFunctionIndexToMemberIndex);
+ throw RuntimeException(
+ ("illegal " + OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ + " vtable index " + OUString::number(nFunctionIndex) + "/"
+ + OUString::number(pTypeDescr->nMapFunctionIndexToMemberIndex)),
+ (XInterface *)pThis);
}
// determine called method
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
index 5e963eb..df7feb7 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
@@ -285,11 +285,18 @@ namespace
typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
- OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex,
- "### illegal vtable index!" );
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
- throw RuntimeException( "illegal vtable index!", (XInterface *)pCppI );
+ SAL_WARN(
+ "bridges",
+ "illegal " << OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ << " vtable index " << nFunctionIndex << "/"
+ << pTypeDescr->nMapFunctionIndexToMemberIndex);
+ throw RuntimeException(
+ ("illegal " + OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ + " vtable index " + OUString::number(nFunctionIndex) + "/"
+ + OUString::number(pTypeDescr->nMapFunctionIndexToMemberIndex)),
+ (XInterface *)pCppI);
}
// determine called method
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
index 96b7cbf..3449ee3 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
@@ -419,10 +419,18 @@ namespace
#ifdef BRDEBUG
fprintf(stderr,"cpp_mediate2\n");
#endif
- OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
- throw RuntimeException( "illegal vtable index!", (XInterface *)pThis );
+ SAL_WARN(
+ "bridges",
+ "illegal " << OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ << " vtable index " << nFunctionIndex << "/"
+ << pTypeDescr->nMapFunctionIndexToMemberIndex);
+ throw RuntimeException(
+ ("illegal " + OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ + " vtable index " + OUString::number(nFunctionIndex) + "/"
+ + OUString::number(pTypeDescr->nMapFunctionIndexToMemberIndex)),
+ (XInterface *)pThis);
}
// determine called method
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
index fed9622..1f7a39b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
@@ -379,10 +379,18 @@ static typelib_TypeClass cpp_mediate(
typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
- OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
- throw RuntimeException( "illegal vtable index!", (XInterface *)pThis );
+ SAL_WARN(
+ "bridges",
+ "illegal " << OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ << " vtable index " << nFunctionIndex << "/"
+ << pTypeDescr->nMapFunctionIndexToMemberIndex);
+ throw RuntimeException(
+ ("illegal " + OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ + " vtable index " + OUString::number(nFunctionIndex) + "/"
+ + OUString::number(pTypeDescr->nMapFunctionIndexToMemberIndex)),
+ (XInterface *)pThis);
}
// determine called method
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
index ee95c9c..5a5b05e 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
@@ -386,10 +386,18 @@ static typelib_TypeClass cpp_mediate(
fprintf(stderr, "indexes are %d %d\n", nFunctionIndex, pTypeDescr->nMapFunctionIndexToMemberIndex);
#endif
- OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
- throw RuntimeException( "illegal vtable index!", (XInterface *)pThis );
+ SAL_WARN(
+ "bridges",
+ "illegal " << OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ << " vtable index " << nFunctionIndex << "/"
+ << pTypeDescr->nMapFunctionIndexToMemberIndex);
+ throw RuntimeException(
+ ("illegal " + OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ + " vtable index " + OUString::number(nFunctionIndex) + "/"
+ + OUString::number(pTypeDescr->nMapFunctionIndexToMemberIndex)),
+ (XInterface *)pThis);
}
// determine called method
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
index 3ffe81b..05e559f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
@@ -344,10 +344,18 @@ static typelib_TypeClass cpp_mediate(
typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
- OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
- throw RuntimeException( "illegal vtable index!", (XInterface *)pCppI );
+ SAL_WARN(
+ "bridges",
+ "illegal " << OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ << " vtable index " << nFunctionIndex << "/"
+ << pTypeDescr->nMapFunctionIndexToMemberIndex);
+ throw RuntimeException(
+ ("illegal " + OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ + " vtable index " + OUString::number(nFunctionIndex) + "/"
+ + OUString::number(pTypeDescr->nMapFunctionIndexToMemberIndex)),
+ (XInterface *)pCppI);
}
// determine called method
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
index edcdd9c..323b9a8 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
@@ -365,10 +365,18 @@ static typelib_TypeClass cpp_mediate(
typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
- OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
- throw RuntimeException( "illegal vtable index!", (XInterface *)pCppI );
+ SAL_WARN(
+ "bridges",
+ "illegal " << OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ << " vtable index " << nFunctionIndex << "/"
+ << pTypeDescr->nMapFunctionIndexToMemberIndex);
+ throw RuntimeException(
+ ("illegal " + OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ + " vtable index " + OUString::number(nFunctionIndex) + "/"
+ + OUString::number(pTypeDescr->nMapFunctionIndexToMemberIndex)),
+ (XInterface *)pCppI);
}
// determine called method
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
index 52eb13f..2b7820c 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
@@ -241,11 +241,18 @@ static typelib_TypeClass cpp_mediate(
typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
- OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex,
- "### illegal vtable index!" );
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
- throw RuntimeException( "illegal vtable index!", (XInterface *)pCppI );
+ SAL_WARN(
+ "bridges",
+ "illegal " << OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ << " vtable index " << nFunctionIndex << "/"
+ << pTypeDescr->nMapFunctionIndexToMemberIndex);
+ throw RuntimeException(
+ ("illegal " + OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ + " vtable index " + OUString::number(nFunctionIndex) + "/"
+ + OUString::number(pTypeDescr->nMapFunctionIndexToMemberIndex)),
+ (XInterface *)pCppI);
}
// determine called method
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
index b8a6363..24b17c5 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
@@ -280,11 +280,18 @@ typelib_TypeClass cpp_vtable_call(
typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
- OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!\n" );
if ( nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex )
{
- throw RuntimeException("illegal vtable index!",
- reinterpret_cast<XInterface *>( pCppI ) );
+ SAL_WARN(
+ "bridges",
+ "illegal " << OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ << " vtable index " << nFunctionIndex << "/"
+ << pTypeDescr->nMapFunctionIndexToMemberIndex);
+ throw RuntimeException(
+ ("illegal " + OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ + " vtable index " + OUString::number(nFunctionIndex) + "/"
+ + OUString::number(pTypeDescr->nMapFunctionIndexToMemberIndex)),
+ reinterpret_cast<XInterface *>( pCppI ) );
}
// determine called method
diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx
index 47a21f1..47c2bbf 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx
@@ -246,10 +246,18 @@ extern "C" void cpp_vtable_call(
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "name=%s\n", OUStringToOString(pTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_UTF8).getStr() );
#endif
- OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
- throw RuntimeException( "illegal vtable index!", (XInterface *)pThis );
+ SAL_WARN(
+ "bridges",
+ "illegal " << OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ << " vtable index " << nFunctionIndex << "/"
+ << pTypeDescr->nMapFunctionIndexToMemberIndex);
+ throw RuntimeException(
+ ("illegal " + OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ + " vtable index " + OUString::number(nFunctionIndex) + "/"
+ + OUString::number(pTypeDescr->nMapFunctionIndexToMemberIndex)),
+ (XInterface *)pThis);
}
// determine called method
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
index d6d23f9..f9d8666 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
@@ -276,11 +276,18 @@ typelib_TypeClass cpp_vtable_call(
typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
- OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!\n" );
if ( nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex )
{
- throw RuntimeException("illegal vtable index!",
- reinterpret_cast<XInterface *>( pCppI ) );
+ SAL_WARN(
+ "bridges",
+ "illegal " << OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ << " vtable index " << nFunctionIndex << "/"
+ << pTypeDescr->nMapFunctionIndexToMemberIndex);
+ throw RuntimeException(
+ ("illegal " + OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ + " vtable index " + OUString::number(nFunctionIndex) + "/"
+ + OUString::number(pTypeDescr->nMapFunctionIndexToMemberIndex)),
+ reinterpret_cast<XInterface *>( pCppI ) );
}
// determine called method
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
index 5957a0d..87fa906 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
@@ -244,10 +244,18 @@ static typelib_TypeClass cpp_mediate(
typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
- OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
- throw RuntimeException( "illegal vtable index!", (XInterface *)pThis );
+ SAL_WARN(
+ "bridges",
+ "illegal " << OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ << " vtable index " << nFunctionIndex << "/"
+ << pTypeDescr->nMapFunctionIndexToMemberIndex);
+ throw RuntimeException(
+ ("illegal " + OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ + " vtable index " + OUString::number(nFunctionIndex) + "/"
+ + OUString::number(pTypeDescr->nMapFunctionIndexToMemberIndex)),
+ (XInterface *)pThis);
}
// determine called method
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
index a1c65ef..29ae1b5f 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
@@ -240,11 +240,18 @@ static typelib_TypeClass cpp_mediate(
typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
- OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex,
- "### illegal vtable index!" );
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
- throw RuntimeException("illegal vtable index!", (XInterface *)pCppI );
+ SAL_WARN(
+ "bridges",
+ "illegal " << OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ << " vtable index " << nFunctionIndex << "/"
+ << pTypeDescr->nMapFunctionIndexToMemberIndex);
+ throw RuntimeException(
+ ("illegal " + OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ + " vtable index " + OUString::number(nFunctionIndex) + "/"
+ + OUString::number(pTypeDescr->nMapFunctionIndexToMemberIndex)),
+ (XInterface *)pCppI);
}
// determine called method
diff --git a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
index 3cbff63..d7910e6 100644
--- a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
@@ -244,10 +244,18 @@ extern "C" void cpp_vtable_call(
typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
- OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" );
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
- throw RuntimeException( "illegal vtable index!", (XInterface *)pThis );
+ SAL_WARN(
+ "bridges",
+ "illegal " << OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ << " vtable index " << nFunctionIndex << "/"
+ << pTypeDescr->nMapFunctionIndexToMemberIndex);
+ throw RuntimeException(
+ ("illegal " + OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ + " vtable index " + OUString::number(nFunctionIndex) + "/"
+ + OUString::number(pTypeDescr->nMapFunctionIndexToMemberIndex)),
+ (XInterface *)pThis);
}
// determine called method
diff --git a/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx
index 39eb28b..4c50b80 100644
--- a/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx
@@ -276,11 +276,18 @@ extern "C" typelib_TypeClass cpp_vtable_call(
typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
- OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!\n" );
if ( nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex )
{
- throw RuntimeException("illegal vtable index!",
- reinterpret_cast<XInterface *>( pCppI ) );
+ SAL_WARN(
+ "bridges",
+ "illegal " << OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ << " vtable index " << nFunctionIndex << "/"
+ << pTypeDescr->nMapFunctionIndexToMemberIndex);
+ throw RuntimeException(
+ ("illegal " + OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ + " vtable index " + OUString::number(nFunctionIndex) + "/"
+ + OUString::number(pTypeDescr->nMapFunctionIndexToMemberIndex)),
+ reinterpret_cast<XInterface *>( pCppI ) );
}
// determine called method
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
index 3712547..0927cf6 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
@@ -240,12 +240,18 @@ static typelib_TypeClass __cdecl cpp_mediate(
pThis);
typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
- OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex,
- "### illegal vtable index!" );
if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
{
- throw RuntimeException("illegal vtable index!",
- (XInterface *)pThis );
+ SAL_WARN(
+ "bridges",
+ "illegal " << OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ << " vtable index " << nFunctionIndex << "/"
+ << pTypeDescr->nMapFunctionIndexToMemberIndex);
+ throw RuntimeException(
+ ("illegal " + OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ + " vtable index " + OUString::number(nFunctionIndex) + "/"
+ + OUString::number(pTypeDescr->nMapFunctionIndexToMemberIndex)),
+ (XInterface *)pThis );
}
// determine called method
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
index 555bee1..e4fe5be 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
@@ -239,10 +239,19 @@ extern "C" typelib_TypeClass cpp_vtable_call(
typelib_InterfaceTypeDescription * pTD = pCppI->getTypeDescr();
- OSL_ENSURE( nFunctionIndex < pTD->nMapFunctionIndexToMemberIndex, "### illegal vtable index!\n" );
if ( nFunctionIndex >= pTD->nMapFunctionIndexToMemberIndex )
- throw RuntimeException("Illegal vtable index!",
- reinterpret_cast<XInterface *>( pCppI ) );
+ {
+ SAL_WARN(
+ "bridges",
+ "illegal " << OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ << " vtable index " << nFunctionIndex << "/"
+ << pTypeDescr->nMapFunctionIndexToMemberIndex);
+ throw RuntimeException(
+ ("illegal " + OUString::unacquired(&pTypeDescr->aBase.pTypeName)
+ + " vtable index " + OUString::number(nFunctionIndex) + "/"
+ + OUString::number(pTypeDescr->nMapFunctionIndexToMemberIndex)),
+ reinterpret_cast<XInterface *>( pCppI ) );
+ }
// Determine called method
int nMemberPos = pTD->pMapFunctionIndexToMemberIndex[nFunctionIndex];
commit 18539f46e96c53d5c33217df5b311cd95f6a0caf
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Sep 29 22:53:08 2014 +0200
Adapt cppu::bootstrap to new Mac OS X LibreOffice.app layout
Change-Id: I60db70c38d138455230ee56a26d840aa68885b44
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index 4cfaafd..e81f414 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -119,7 +119,12 @@ Reference< XComponentContext > SAL_CALL bootstrap()
if (!Bootstrap::get("URE_BOOTSTRAP", uri)) {
Bootstrap::set(
"URE_BOOTSTRAP",
- Bootstrap::encode(path + SAL_CONFIGFILE("fundamental")));
+ Bootstrap::encode(
+ path +
+#if defined MACOSX
+ "../Resources/"
+#endif
+ SAL_CONFIGFILE("fundamental")));
}
// create default local component context
commit f6848ac7375fec8dd3e883c6efe6206dda88fe63
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Sep 29 22:52:28 2014 +0200
Adapt unoinfo to new Mac OS X LibreOffice.app layout
Change-Id: I0e7fc27f558de2af7e860ca2ab2da1952fc85678
diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk
index 4ed94ad..ed2ae3e 100644
--- a/desktop/Package_scripts.mk
+++ b/desktop/Package_scripts.mk
@@ -23,7 +23,7 @@ endif
ifneq ($(OS),WNT)
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unoinfo,unoinfo.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unoinfo,$(if $(filter MACOSX,$(OS)),unoinfo-mac.sh,unoinfo.sh)))
$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unopkg,unopkg.sh))
endif
diff --git a/desktop/scripts/unoinfo-mac.sh b/desktop/scripts/unoinfo-mac.sh
new file mode 100755
index 0000000..3c482fc
--- /dev/null
+++ b/desktop/scripts/unoinfo-mac.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to you under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.apache.org/licenses/LICENSE-2.0 .
+#
+
+set -e
+
+# resolve installation directory
+sd_res=$0
+while [ -h "$sd_res" ] ; do
+ cd "`dirname "$sd_res"`"
+ sd_basename=`basename "$sd_res"`
+ sd_res=`ls -l "$sd_basename" | sed "s/.*$sd_basename -> //g"`
+done
+cd "`dirname "$sd_res"`"
+sd_prog=`pwd`
+
+case $1 in
+c++)
+ printf '%s' "$sd_prog/../Frameworks"
+ ;;
+java)
+ printf '0%s\0%s\0%s\0%s\0%s' \
+ "$sd_prog/../Resources/java/ridl.jar" \
+ "$sd_prog/../Resources/java/jurt.jar" \
+ "$sd_prog/../Resources/java/juh.jar" \
+ "$sd_prog/../Resources/java/unoil.jar" "$sd_prog"
+ ;;
+*)
+ exit 1
+ ;;
+esac
commit a67e6ae04086f2f60bb9747fbfc09a5a3d303d84
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Sep 29 22:08:29 2014 +0200
Precise, platform-specific Class-Path path for NativeLibraryLoader use
Change-Id: I01a521f5d5104bf2e6046330e2d667155c27a604
diff --git a/jurt/Jar_jurt.mk b/jurt/Jar_jurt.mk
index da814ee..aed0d05 100644
--- a/jurt/Jar_jurt.mk
+++ b/jurt/Jar_jurt.mk
@@ -19,7 +19,11 @@ $(eval $(call gb_Jar_set_packageroot,jurt,com))
$(eval $(call gb_Jar_set_manifest,jurt,$(SRCDIR)/jurt/util/manifest))
$(eval $(call gb_Jar_add_manifest_classpath,jurt, \
- ridl.jar unoloader.jar ../../lib/ ../bin/))
+ ridl.jar \
+ unoloader.jar \
+ $(if $(filter MACOSX,$(OS)),../../Frameworks/, \
+ $(if $(filter WNT,$(OS)),../bin/,../../lib/)) \
+))
$(eval $(call gb_Jar_add_sourcefiles,jurt,\
jurt/com/sun/star/comp/bridgefactory/BridgeFactory \
commit 02f57e36bf28312c4163d2240bbfe913d1b13823
Author: Michael Meeks <michael.meeks at collabora.com>
Date: Mon Sep 29 21:00:29 2014 +0100
LOK: avoid crash when zooming using quadview
Change-Id: I89a8c9e44906326976c3dc8057e1637affaf2521
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 2e70c09..9b2572b 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -50,7 +50,7 @@ void changeZoom( GtkWidget* pButton, gpointer /* pItem */ )
}
else if ( pDocViewQuad )
{
- fCurrentZoom = lok_docview_quad_get_zoom( LOK_DOCVIEW_QUAD(pDocView) );
+ fCurrentZoom = lok_docview_quad_get_zoom( LOK_DOCVIEW_QUAD(pDocViewQuad) );
}
if ( strcmp(sName, "gtk-zoom-in") == 0)
commit 2311c8d6771e15bb7573eca6681775256bc94826
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Sep 29 21:57:41 2014 +0200
Precise, platform-specific Class-Path path for NativeLibraryLoader use
Change-Id: I4aecc887fc4654618444616ef83ff71266a2f93a
diff --git a/bridges/Jar_java_uno.mk b/bridges/Jar_java_uno.mk
index 13a50cf..0bab303 100644
--- a/bridges/Jar_java_uno.mk
+++ b/bridges/Jar_java_uno.mk
@@ -20,9 +20,9 @@ $(eval $(call gb_Jar_set_packageroot,java_uno,com))
$(eval $(call gb_Jar_add_manifest_classpath,java_uno,\
ridl.jar \
- jurt.jar \
- ../../lib/ \
- ../bin/ \
+ jurt.jar \
+ $(if $(filter MACOSX,$(OS)),../../Frameworks/, \
+ $(if $(filter WNT,$(OS)),../bin/,../../lib/)) \
))
$(eval $(call gb_Jar_add_sourcefiles,java_uno,\
commit ca537697804c22eeed1b52b2540e9d02c7cdebed
Author: Michael Meeks <michael.meeks at collabora.com>
Date: Mon Sep 29 20:49:36 2014 +0100
chart2: take the mutex to update the chart structures.
Change-Id: I8ee6ec81913c008eeb67cd70a2490b523b0d8177
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 45aa0b3..ea3c084 100755
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -128,6 +128,8 @@ void RenderThread::renderFrame()
mpChart->mpWindow->getContext().makeCurrent();
mpChart->renderFrame();
+ // FIXME: SwapBuffers can take a considerable time, it'd be
+ // nice if we didn't hold the chart mutex while doing that.
mpChart->mpWindow->getContext().swapBuffers();
mpChart->mpWindow->getContext().resetCurrent();
}
@@ -1176,6 +1178,7 @@ int GL3DBarChart::calcTimeInterval(TimeValue &startTime, TimeValue &endTime)
void GL3DBarChart::updateScreenText()
{
SharedResourceAccess(maCond1, maCond2);
+ osl::MutexGuard aGuard(maMutex);
maScreenTextShapes.clear();
mpRenderer->ReleaseScreenTextShapes();
updateRenderFPS();
commit 65277f994ae25d930c15aebba0ed19f8de0abba1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Sep 29 20:38:18 2014 +0100
Resolves: fdo#79131 crash in EnhancedCustomShapeTypeNames::Get
Change-Id: Ib21a4a1574119120f09d4ecac73b93a0f2f6739f
diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
index 6dda34e..68bdd32 100644
--- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
@@ -301,7 +301,7 @@ MSO_SPT EnhancedCustomShapeTypeNames::Get( const OUString& rShapeType )
OUString EnhancedCustomShapeTypeNames::Get( const MSO_SPT eShapeType )
{
- return eShapeType <= mso_sptTextBox
+ return (eShapeType <= mso_sptTextBox && eShapeType >= mso_sptMin)
? OUString::createFromAscii( pNameTypeTableArray[ eShapeType ].pS )
: OUString();
}
diff --git a/sw/qa/core/data/ooxml/pass/fdo79131.docx b/sw/qa/core/data/ooxml/pass/fdo79131.docx
new file mode 100644
index 0000000..5f10d9c
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/fdo79131.docx differ
commit 4c23ff3c18bc89b12ee59d1769037f01cc6ef683
Author: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Date: Sun Sep 28 04:20:22 2014 -0500
Rework the Compress Image dialog
* Switch to an horizontal layout
* Drop the expander and make file info always visible at the right side
* Resizing didn’t make sense when the expander was there, still doesn’t
* Sentence capitalization for radio buttons and check boxes, see HIG
* Add it a title!
* Make it modal
Change-Id: I08215b122bd9466c33fdc93e3c007f4aaf47b4e5
Reviewed-on: https://gerrit.libreoffice.org/11671
Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt at gmail.com>
Tested-by: Samuel Mehrbrodt <s.mehrbrodt at gmail.com>
diff --git a/svx/uiconfig/ui/compressgraphicdialog.ui b/svx/uiconfig/ui/compressgraphicdialog.ui
index bcc9fde..c2fd63e 100644
--- a/svx/uiconfig/ui/compressgraphicdialog.ui
+++ b/svx/uiconfig/ui/compressgraphicdialog.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.18.3 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="compression-adjustment">
@@ -53,6 +53,9 @@
<object class="GtkDialog" id="CompressGraphicDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
+ <property name="title" translatable="yes">Compress Image</property>
+ <property name="resizable">False</property>
+ <property name="modal">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -120,23 +123,345 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
- <object class="GtkExpander" id="expander1">
+ <object class="GtkFrame" id="frame2">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="expanded">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkRadioButton" id="radio-lossless">
+ <property name="label" translatable="yes">Lossless compression</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbox-reduce-resolution">
+ <property name="label" translatable="yes">Reduce image resolution</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Width:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">spin-new-width</property>
+ <property name="width_chars">15</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spin-new-width">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="adjustment">width-adjustment</property>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Height:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">spin-new-height</property>
+ <property name="width_chars">15</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="radio-jpeg">
+ <property name="label" translatable="yes">JPEG compression</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radio-lossless</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list