[Libreoffice-commits] .: Branch 'feature/line-numbers-in-basicIDE' - 260 commits - animations/Makefile automation/Makefile avmedia/Makefile basctl/inc basctl/Makefile basctl/sdi basctl/source basctl/uiconfig basebmp/inc basebmp/Makefile basebmp/test basegfx/Makefile basic/inc basic/Makefile basic/source bean/Makefile berkeleydb/db-4.7.25.patch binaryurp/Makefile bin/distro-install-clean-up bin/distro-install-desktop-integration bin/distro-install-file-lists bin/distro-install-sdk bin/get-bugzilla-attachments-by-mimetype bridges/inc bridges/source bridges/test build_env.in canvas/Makefile canvas/source chart2/Makefile comphelper/inc comphelper/Makefile comphelper/source configmgr/Makefile configmgr/prj configmgr/qa configmgr/source configure.in connectivity/inc connectivity/source connectivity/target.pmk connectivity/workben cppcanvas/Makefile cppcanvas/source cppuhelper/qa cppuhelper/source cppunit/android.patch cppunit/makefile.mk cppu/qa cui/Library_cui.mk cui/Makefile cui/source dbacce ss/inc dbaccess/Makefile dbaccess/qa dbaccess/source default_images/res default_images/starmath desktop/inc desktop/Library_sofficeapp.mk desktop/Makefile desktop/Module_desktop.mk desktop/source desktop/test desktop/unx drawinglayer/Makefile dtrans/Makefile editeng/inc editeng/Makefile editeng/source eventattacher/Makefile extensions/inc extensions/Makefile extensions/source extras/source fileaccess/Makefile filter/Library_icg.mk filter/Makefile filter/source forms/inc forms/Makefile forms/source formula/Makefile framework/inc framework/Makefile framework/source git-hooks/commit-msg .gitignore GNUmakefile.mk hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk hwpfilter/Makefile hwpfilter/prj i18npool/Makefile i18npool/prj i18nutil/Makefile idl/inc idl/Makefile idl/source instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/util io/source l10ntools/inc l10ntools/source libcmis/libcmis-0.1.0.patch libcmis/Makefile libexttextcat/android.patch libexttextcat /libexttextcat-3.1.1.patch libexttextcat/libexttextcat-3.2.0-visibility.patch libexttextcat/makefile.mk libexttextcat/prj libxslt/makefile.mk lingucomponent/source linguistic/Makefile linguistic/source linguistic/workben lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk lotuswordpro/Makefile lotuswordpro/prj Makefile.in MathMLDTD/Makefile Mesa/Makefile mysqlcppconn/makefile.mk mysqlcppconn/mysql-connector-c++-1.1.0-mysql-binding-dynamic.patch mysqlcppconn/mysql-connector-c++-1.1.0-mysql-binding-static.patch mysqlcppconn/mysql-connector-c++-1.1.0.patch mysqlcppconn/mysql-connector-cpp-mysql-binding-dynamic.patch mysqlcppconn/mysql-connector-cpp-mysql-binding-static.patch mysqlcppconn/mysql-connector-cpp.patch mysqlcppconn/patches mysqlc/source o3tl/Makefile odk/examples offapi/com offapi/Makefile offapi/UnoApi_offapi.mk officecfg/Makefile officecfg/registry ooo_custom_images/crystal ooo_custom_images/hicontrast ooo_custom_images/human ooo_custom_images/industrial ooo _custom_images/oxygen ooo_custom_images/tango ooo.lst.in oovbaapi/Makefile oowintool oox/inc oox/Makefile oox/source package/Makefile padmin/Makefile padmin/source post_download.in psprint_config/Makefile pyuno/prj pyuno/source qadevOOo/Makefile qadevOOo/tests README.cross redland/raptor regexp/Makefile remotebridges/source reportbuilder/registry reportdesign/Makefile rsc/Makefile sal/inc sal/Makefile sal/osl sal/workben sane/Makefile sax/Makefile scaddins/Makefile sccomp/Makefile sc/CppunitTest_sc_ucalc.mk sc/inc sc/Makefile scp2/prj scp2/source scp2/util sc/Package_uiconfig.mk sc/qa scripting/Makefile sc/source sc/uiconfig sd/CppunitTest_sd_uimpress.mk sdext/source sd/Makefile sd/prj sd/qa sd/source set_soenv.in setup_native/scripts setup_native/source sfx2/inc sfx2/Makefile sfx2/Module_sfx2.mk sfx2/Package_inc.mk sfx2/sdi sfx2/source shell/source slideshow/Makefile smoketestoo_native/com smoketestoo_native/makefile.mk solenv/bin solenv/gbuild solenv/inc soltools/cpp sot/M akefile .src_root starmath/inc starmath/Makefile starmath/source stoc/source stoc/test stoc/util svl/inc svl/Makefile svl/qa svl/source svtools/CppunitTest_svtools_filters_test.mk svtools/inc svtools/Makefile svtools/prj svtools/qa svtools/source svx/inc svx/Makefile svx/source svx/uiconfig sw/CppunitTest_sw_filters_test.mk sw/CppunitTest_sw_macros_test.mk sw/CppunitTest_sw_swdoc_test.mk swext/Makefile sw/inc sw/Makefile sw/Module_sw.mk sw/prj sw/qa sw/source sw/uiconfig tail_build/Makefile tail_build/prj testautomation/framework testautomation/global testautomation/Makefile testautomation/math testtools/com testtools/prj testtools/source toolkit/doc toolkit/inc toolkit/Library_tk.mk toolkit/Makefile toolkit/Module_toolkit.mk toolkit/Package_inc.mk toolkit/Package_source.mk toolkit/source toolkit/uiconfig tools/bootstrp tools/inc tools/Makefile tools/Package_inc.mk tools/source twain/Makefile ucbhelper/Makefile ucb/Makefile ucb/source udkapi/Makefile unixODBC/Makefile unotoo ls/inc unotools/Library_utl.mk unotools/Makefile unotools/Package_inc.mk unotools/source unoxml/Makefile unusedcode.easy uui/Makefile uui/source vbahelper/inc vbahelper/Makefile vcl/generic vcl/inc vcl/Library_vclplug_gen.mk vcl/Makefile vcl/prj vcl/source vcl/unx wizards/Makefile writerfilter/CppunitTest_writerfilter_rtftok.mk writerfilter/inc writerfilter/Library_resourcemodel.mk writerfilter/Makefile writerfilter/prj writerfilter/source writerperfect/Makefile xmerge/Makefile xml2cmp/Makefile xmlhelp/source xmloff/inc xmloff/Makefile xmloff/source xmlreader/Makefile xmlscript/Makefile xmlsecurity/Makefile
August Sodora
augsod at kemper.freedesktop.org
Thu Nov 17 11:58:52 PST 2011
.gitignore | 6
GNUmakefile.mk | 5
Makefile.in | 17
MathMLDTD/Makefile | 8
Mesa/Makefile | 8
README.cross | 20
animations/Makefile | 8
automation/Makefile | 8
avmedia/Makefile | 8
basctl/Makefile | 8
basctl/inc/basidesh.hrc | 6
basctl/sdi/baside.sdi | 6
basctl/source/basicide/basides1.cxx | 29
basctl/source/basicide/basidesh.src | 4
basctl/source/basicide/moduldl2.cxx | 35
basctl/source/basicide/moduldlg.hxx | 12
basctl/source/basicide/moduldlg.src | 38
basctl/uiconfig/basicide/menubar/menubar.xml | 2
basebmp/Makefile | 8
basebmp/inc/basebmp/clippedlinerenderer.hxx | 55
basebmp/inc/basebmp/debug.hxx | 10
basebmp/test/linetest.cxx | 33
basebmp/test/polytest.cxx | 105 +
basegfx/Makefile | 8
basic/Makefile | 8
basic/inc/basic/sbx.hxx | 7
basic/inc/basic/sbxobj.hxx | 9
basic/inc/basic/sbxvar.hxx | 11
basic/source/sbx/sbxarray.cxx | 30
basic/source/sbx/sbxbase.cxx | 7
basic/source/sbx/sbxobj.cxx | 109 -
basic/source/sbx/sbxvalue.cxx | 57
basic/source/sbx/sbxvar.cxx | 10
bean/Makefile | 8
berkeleydb/db-4.7.25.patch | 36
bin/distro-install-clean-up | 2
bin/distro-install-desktop-integration | 8
bin/distro-install-file-lists | 130 -
bin/distro-install-sdk | 72
bin/get-bugzilla-attachments-by-mimetype | 141 +
binaryurp/Makefile | 8
bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx | 3
bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx | 14
bridges/source/cpp_uno/gcc3_ios_arm/share.hxx | 500 +++++
bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx | 5
bridges/source/cpp_uno/gcc3_linux_arm/except.cxx | 53
bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk | 2
bridges/source/cpp_uno/gcc3_linux_arm/share.hxx | 4
bridges/test/java_uno/acquire/makefile.mk | 2
bridges/test/java_uno/equals/makefile.mk | 2
bridges/test/java_uno/nativethreadpool/makefile.mk | 4
build_env.in | 11
canvas/Makefile | 8
canvas/source/factory/cf_service.cxx | 5
chart2/Makefile | 8
comphelper/Makefile | 8
comphelper/inc/comphelper/processfactory.hxx | 11
comphelper/inc/comphelper/string.hxx | 3
comphelper/source/misc/configurationhelper.cxx | 5
comphelper/source/misc/mimeconfighelper.cxx | 8
comphelper/source/misc/string.cxx | 12
comphelper/source/processfactory/processfactory.cxx | 11
configmgr/Makefile | 8
configmgr/prj/d.lst | 6
configmgr/qa/unit/test.cxx | 9
configmgr/source/makefile.mk | 2
configure.in | 103 -
connectivity/inc/pch/precompiled_connectivity.hxx | 1
connectivity/source/cpool/ZPoolCollection.cxx | 82
connectivity/source/cpool/makefile.mk | 1
connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx | 6
connectivity/source/drivers/evoab2/NDebug.cxx | 2
connectivity/source/drivers/evoab2/NDebug.hxx | 2
connectivity/source/drivers/evoab2/NStatement.cxx | 8
connectivity/source/drivers/hsqldb/HDriver.cxx | 11
connectivity/source/drivers/hsqldb/makefile.mk | 4
connectivity/source/drivers/kab/KDriver.cxx | 6
connectivity/source/drivers/kab/makefile.mk | 1
connectivity/source/drivers/mozab/MConfigAccess.cxx | 66
connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx | 2
connectivity/source/drivers/mozab/makefile.mk | 4
connectivity/source/drivers/mozab/mozabdrv.map | 8
connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx | 2
connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx | 2
connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx | 2
connectivity/source/drivers/odbcbase/OConnection.cxx | 1
connectivity/source/manager/mdrivermanager.cxx | 9
connectivity/target.pmk | 3
connectivity/workben/little/main.cxx | 1
connectivity/workben/testmoz/main.cxx | 1
connectivity/workben/testmoz/mozthread.cxx | 1
cppcanvas/Makefile | 8
cppcanvas/source/uno/makefile.mk | 2
cppu/qa/cppumaker/makefile.mk | 5
cppu/qa/cppumaker/version.map | 34
cppu/qa/makefile.mk | 9
cppu/qa/version.map | 34
cppuhelper/qa/ifcontainer/export.map | 7
cppuhelper/qa/ifcontainer/makefile.mk | 3
cppuhelper/qa/propertysetmixin/makefile.mk | 2
cppuhelper/qa/unourl/export.map | 7
cppuhelper/qa/unourl/makefile.mk | 3
cppuhelper/source/shlib.cxx | 9
cppunit/android.patch | 18
cppunit/makefile.mk | 4
cui/Library_cui.mk | 4
cui/Makefile | 8
cui/source/customize/acccfg.cxx | 4
cui/source/customize/cfg.cxx | 10
cui/source/customize/cfgutil.cxx | 2
cui/source/customize/eventdlg.cxx | 6
cui/source/dialogs/about.cxx | 9
cui/source/dialogs/insdlg.cxx | 1
cui/source/dialogs/plfilter.cxx | 4
cui/source/dialogs/zoom.cxx | 11
cui/source/inc/numfmt.hxx | 11
cui/source/inc/zoom.hxx | 5
cui/source/options/optgdlg.cxx | 45
cui/source/options/optinet2.cxx | 41
cui/source/options/optupdt.cxx | 7
cui/source/options/treeopt.cxx | 2
cui/source/tabpages/numfmt.cxx | 40
dbaccess/Makefile | 8
dbaccess/inc/pch/precompiled_dbaccess.hxx | 1
dbaccess/inc/pch/precompiled_dbaxml.cxx | 31
dbaccess/inc/pch/precompiled_dbaxml.hxx | 522 -----
dbaccess/inc/pch/precompiled_dbmm.cxx | 31
dbaccess/inc/pch/precompiled_dbmm.hxx | 522 -----
dbaccess/inc/pch/precompiled_dbui.cxx | 31
dbaccess/inc/pch/precompiled_dbui.hxx | 525 -----
dbaccess/qa/complex/dbaccess/DatabaseDocument.java | 9
dbaccess/qa/complex/dbaccess/TestCase.java | 14
dbaccess/source/core/api/CIndexColumn.hxx | 60
dbaccess/source/core/misc/userinformation.cxx | 13
dbaccess/source/ui/browser/dbtreeview.cxx | 2
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 2
dbaccess/source/ui/dlg/sqlmessage.cxx | 13
dbaccess/source/ui/inc/AccessibleBaseIFace.hxx | 55
dbaccess/source/ui/inc/datasourcemap.hxx | 266 --
dbaccess/source/ui/misc/UITools.cxx | 9
default_images/starmath/res/bi21327.png |binary
default_images/starmath/res/bi21328.png |binary
default_images/starmath/res/bi21329.png |binary
default_images/starmath/res/bi21330.png |binary
default_images/starmath/res/bi21331.png |binary
default_images/starmath/res/bi21332.png |binary
default_images/starmath/res/bi21333.png |binary
default_images/starmath/res/bi21334.png |binary
desktop/Library_sofficeapp.mk | 8
desktop/Makefile | 8
desktop/Module_desktop.mk | 23
desktop/inc/app.hxx | 2
desktop/inc/deployment.hrc | 7
desktop/source/app/app.cxx | 223 --
desktop/source/app/appfirststart.cxx | 13
desktop/source/app/check_ext_deps.cxx | 20
desktop/source/app/configinit.cxx | 116 -
desktop/source/app/configinit.hxx | 27
desktop/source/app/copyright_ascii_sun.c | 10
desktop/source/app/langselect.cxx | 48
desktop/source/app/officeipcthread.cxx | 5
desktop/source/app/userinstall.cxx | 25
desktop/source/deployment/dp_persmap.cxx | 27
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 15
desktop/source/deployment/gui/dp_gui_service.cxx | 54
desktop/source/deployment/gui/dp_gui_shared.hxx | 8
desktop/source/deployment/gui/dp_gui_theextmgr.cxx | 4
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 25
desktop/source/deployment/inc/dp_persmap.h | 5
desktop/source/deployment/manager/dp_activepackages.cxx | 3
desktop/source/deployment/manager/dp_activepackages.hxx | 2
desktop/source/deployment/manager/dp_manager.cxx | 3
desktop/source/deployment/misc/dp_dependencies.cxx | 115 -
desktop/source/deployment/misc/dp_misc.hrc | 33
desktop/source/deployment/misc/dp_misc.src | 10
desktop/source/deployment/misc/dp_resource.cxx | 17
desktop/source/deployment/misc/dp_ucb.cxx | 2
desktop/source/deployment/registry/configuration/dp_configuration.cxx | 43
desktop/source/migration/migration.cxx | 32
desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx | 15
desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 7
desktop/source/pkgchk/unopkg/unopkg_shared.h | 17
desktop/test/deployment/dependencies/loversion35.oxt |binary
desktop/test/deployment/dependencies/loversion36.oxt |binary
desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java | 21
desktop/unx/source/start.c | 5
dev/null |binary
drawinglayer/Makefile | 8
dtrans/Makefile | 8
editeng/Makefile | 8
editeng/inc/pch/precompiled_editeng.hxx | 1
editeng/source/uno/unotext.cxx | 34
eventattacher/Makefile | 8
extensions/Makefile | 8
extensions/inc/pch/precompiled_extensions.hxx | 1
extensions/source/bibliography/bibcont.cxx | 1
extensions/source/config/ldap/ldapuserprofilebe.cxx | 17
extensions/source/config/ldap/ldapuserprofilebe.hxx | 8
extensions/source/logging/loggerconfig.cxx | 9
extensions/source/oooimprovement/makefile.mk | 1
extensions/source/oooimprovement/myconfigurationhelper.cxx | 43
extensions/source/oooimprovement/myconfigurationhelper.hxx | 4
extensions/source/update/check/download.cxx | 16
extensions/source/update/check/updatecheckconfig.cxx | 16
extensions/source/update/check/updatehdl.cxx | 56
extensions/source/update/feed/updatefeed.cxx | 16
extras/source/truetype/symbol/OpenSymbol.sfd | 264 ++
extras/source/truetype/symbol/opens___.ttf |binary
fileaccess/Makefile | 8
filter/Library_icg.mk | 1
filter/Makefile | 8
filter/source/config/cache/constant.hxx | 1
filter/source/config/cache/filtercache.cxx | 12
filter/source/config/fragments/types/draw_Visio_Document.xcu | 2
filter/source/graphicfilter/eps/eps.cxx | 10
filter/source/graphicfilter/icgm/actimpr.cxx | 4
filter/source/msfilter/msoleexp.cxx | 49
filter/source/pdf/pdfexport.cxx | 105 -
forms/Makefile | 8
forms/inc/pch/precompiled_forms.hxx | 1
forms/source/xforms/submission.cxx | 4
forms/source/xforms/submission/replace.cxx | 4
forms/source/xforms/submission/serialization_app_xml.cxx | 4
forms/source/xforms/submission/serialization_urlencoded.cxx | 5
forms/source/xforms/submission/submission.hxx | 4
forms/source/xforms/submission/submission_get.cxx | 1
forms/source/xforms/submission/submission_post.cxx | 1
forms/source/xforms/submission/submission_put.cxx | 1
forms/source/xforms/unohelper.cxx | 4
formula/Makefile | 8
framework/Makefile | 8
framework/inc/pch/precompiled_framework.hxx | 1
framework/source/fwe/classes/framelistanalyzer.cxx | 6
framework/source/fwe/helper/titlehelper.cxx | 23
framework/source/helper/titlebarupdate.cxx | 6
framework/source/loadenv/loadenv.cxx | 77
framework/source/services/autorecovery.cxx | 3
framework/source/services/substitutepathvars.cxx | 5
framework/source/uielement/uicommanddescription.cxx | 9
git-hooks/commit-msg | 2
hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk | 2
hwpfilter/Makefile | 8
hwpfilter/prj/build.lst | 2
i18npool/Makefile | 8
i18npool/prj/build.lst | 2
i18nutil/Makefile | 8
idl/Makefile | 8
idl/inc/bastype.hxx | 1
idl/inc/lex.hxx | 6
idl/source/cmptools/lex.cxx | 6
idl/source/prj/command.cxx | 8
instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf | 4
instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt | 8
instsetoo_native/util/openoffice.lst | 6
io/source/TextInputStream/makefile.mk | 2
io/source/TextOutputStream/makefile.mk | 2
io/source/acceptor/makefile.mk | 2
io/source/connector/makefile.mk | 2
io/source/stm/makefile.mk | 2
l10ntools/inc/xmlparse.hxx | 4
l10ntools/source/xmlparse.cxx | 36
libcmis/Makefile | 8
libcmis/libcmis-0.1.0.patch | 3
libexttextcat/android.patch | 20
libexttextcat/libexttextcat-3.1.1.patch | 22
libexttextcat/libexttextcat-3.2.0-visibility.patch | 10
libexttextcat/makefile.mk | 11
libexttextcat/prj/d.lst | 2
libxslt/makefile.mk | 14
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 1
lingucomponent/source/languageguessing/makefile.mk | 5
lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx | 1
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 1
lingucomponent/source/thesaurus/libnth/makefile.mk | 1
lingucomponent/source/thesaurus/libnth/nthesdta.cxx | 1
lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 6
linguistic/Makefile | 8
linguistic/source/convdic.cxx | 6
linguistic/source/convdicxml.cxx | 1
linguistic/source/convdicxml.hxx | 5
linguistic/source/dicimp.cxx | 6
linguistic/source/gciterator.cxx | 6
linguistic/source/hhconvdic.cxx | 1
linguistic/source/hyphdsp.cxx | 13
linguistic/source/iprcache.cxx | 1
linguistic/source/lngopt.cxx | 1
linguistic/source/lngsvcmgr.cxx | 14
linguistic/source/misc.cxx | 11
linguistic/source/misc2.cxx | 4
linguistic/source/spelldsp.cxx | 10
linguistic/source/spelldta.cxx | 1
linguistic/source/thesdsp.cxx | 6
linguistic/workben/sspellimp.cxx | 1
lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk | 7
lotuswordpro/Makefile | 8
lotuswordpro/prj/build.lst | 2
mysqlc/source/makefile.mk | 18
mysqlc/source/mysqlc.map | 7
mysqlcppconn/makefile.mk | 6
mysqlcppconn/mysql-connector-c++-1.1.0-mysql-binding-dynamic.patch | 6
mysqlcppconn/mysql-connector-c++-1.1.0-mysql-binding-static.patch | 6
mysqlcppconn/mysql-connector-c++-1.1.0.patch | 237 ++
mysqlcppconn/mysql-connector-cpp-mysql-binding-dynamic.patch | 6
mysqlcppconn/mysql-connector-cpp-mysql-binding-static.patch | 6
mysqlcppconn/mysql-connector-cpp.patch | 379 ---
mysqlcppconn/patches/default_to_protocol_tcp.patch | 6
o3tl/Makefile | 8
odk/examples/java/Inspector/Inspector.java | 4
offapi/Makefile | 8
offapi/UnoApi_offapi.mk | 6
offapi/com/sun/star/awt/XLayoutContainer.idl | 77
offapi/com/sun/star/awt/XLayoutFlow.idl | 32
offapi/com/sun/star/awt/XLayoutFlowContainer.idl | 27
offapi/com/sun/star/awt/XLayoutRoot.idl | 27
offapi/com/sun/star/awt/XLayoutUnit.idl | 29
offapi/com/sun/star/configuration/DefaultProvider.idl | 3
offapi/com/sun/star/configuration/theDefaultProvider.idl | 54
officecfg/Makefile | 8
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 5
officecfg/registry/data/org/openoffice/Office/Common.xcu | 7
officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu | 10
officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu | 10
officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu | 10
officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu | 49
officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu | 49
officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu | 66
officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu | 77
officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu | 67
officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu | 45
officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu | 75
officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu | 58
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 2
ooo.lst.in | 4
oovbaapi/Makefile | 8
oowintool | 26
oox/Makefile | 8
oox/inc/oox/helper/helper.hxx | 2
oox/source/drawingml/textbodypropertiescontext.cxx | 2
package/Makefile | 8
padmin/Makefile | 8
padmin/source/padialog.cxx | 6
padmin/source/pamain.cxx | 11
post_download.in | 17
psprint_config/Makefile | 8
pyuno/prj/build.lst | 2
pyuno/source/loader/makefile.mk | 2
qadevOOo/Makefile | 8
qadevOOo/tests/java/mod/_configmgr/DefaultProvider.java | 5
redland/raptor/makefile.mk | 3
regexp/Makefile | 8
remotebridges/source/unourl_resolver/makefile.mk | 2
reportbuilder/registry/data/org/openoffice/Office/makefile.mk | 2
reportbuilder/registry/data/org/openoffice/TypeDetection/makefile.mk | 2
reportbuilder/registry/data/org/openoffice/makefile.mk | 2
reportbuilder/registry/schema/org/openoffice/Office/UI/makefile.mk | 2
reportbuilder/registry/schema/org/openoffice/Office/makefile.mk | 2
reportdesign/Makefile | 8
rsc/Makefile | 8
sal/Makefile | 8
sal/inc/sal/main.h | 37
sal/osl/android/AndroidManifest.xml | 9
sal/osl/android/Makefile | 73
sal/osl/android/jni/Android.mk | 2
sal/osl/android/jni/android_native_app_glue.c | 435 ++++
sal/osl/android/jni/android_native_app_glue.h | 349 +++
sal/osl/android/jni/lo-bootstrap.c | 714 +++++--
sal/osl/android/jni/lo-bootstrap.h | 50
sal/osl/android/project.properties | 2
sal/osl/android/src/org/libreoffice/android/Bootstrap.java | 163 -
sal/osl/unx/module.c | 21
sal/osl/unx/nlsupport.c | 4
sal/osl/unx/process_impl.cxx | 8
sal/osl/unx/socket.c | 181 -
sal/workben/clipboardwben/testpaste/cbptest.cxx | 1
sal/workben/clipboardwben/testviewer/cbvtest.cxx | 1
sane/Makefile | 8
sax/Makefile | 8
sc/CppunitTest_sc_ucalc.mk | 2
sc/Makefile | 8
sc/Package_uiconfig.mk | 4
sc/inc/cell.hxx | 4
sc/inc/dbdata.hxx | 25
sc/inc/dociter.hxx | 9
sc/inc/document.hxx | 2
sc/inc/dpcachetable.hxx | 3
sc/inc/dpshttab.hxx | 1
sc/inc/dptablecache.hxx | 2
sc/inc/dptabres.hxx | 38
sc/inc/lookupcache.hxx | 2
sc/inc/queryentry.hxx | 4
sc/inc/queryparam.hxx | 1
sc/inc/table.hxx | 10
sc/qa/unit/filters-test.cxx | 4
sc/qa/unit/macros-test.cxx | 66
sc/qa/unit/ucalc.cxx | 59
sc/source/core/data/cell2.cxx | 21
sc/source/core/data/dociter.cxx | 89
sc/source/core/data/documen2.cxx | 1
sc/source/core/data/documen8.cxx | 2
sc/source/core/data/document.cxx | 18
sc/source/core/data/dpcachetable.cxx | 4
sc/source/core/data/dpshttab.cxx | 10
sc/source/core/data/dptablecache.cxx | 42
sc/source/core/data/dptabres.cxx | 58
sc/source/core/data/dptabsrc.cxx | 12
sc/source/core/data/table2.cxx | 5
sc/source/core/data/table3.cxx | 777 ++++---
sc/source/core/inc/core_pch.hxx | 1
sc/source/core/inc/interpre.hxx | 1
sc/source/core/tool/addinlis.cxx | 1
sc/source/core/tool/adiasync.cxx | 1
sc/source/core/tool/dbdata.cxx | 109 -
sc/source/core/tool/doubleref.cxx | 1
sc/source/core/tool/interpr1.cxx | 3
sc/source/core/tool/interpr4.cxx | 1
sc/source/core/tool/queryentry.cxx | 18
sc/source/core/tool/queryparam.cxx | 8
sc/source/filter/excel/excrecds.cxx | 1
sc/source/filter/excel/xestring.cxx | 10
sc/source/filter/inc/filt_pch.hxx | 1
sc/source/filter/qpro/qproform.cxx | 8
sc/source/ui/Accessibility/DrawModelBroadcaster.cxx | 10
sc/source/ui/app/inputwin.cxx | 42
sc/source/ui/app/uiitems.cxx | 36
sc/source/ui/attrdlg/attrdlg.cxx | 9
sc/source/ui/attrdlg/scdlgfact.cxx | 53
sc/source/ui/attrdlg/scdlgfact.hxx | 17
sc/source/ui/dbgui/filtdlg.cxx | 321 +--
sc/source/ui/dbgui/scuiasciiopt.cxx | 5
sc/source/ui/dbgui/sfiltdlg.cxx | 2
sc/source/ui/dbgui/sortdlg.cxx | 11
sc/source/ui/dbgui/tpsort.cxx | 22
sc/source/ui/docshell/docsh.cxx | 150 -
sc/source/ui/docshell/docsh2.cxx | 4
sc/source/ui/docshell/docsh3.cxx | 5
sc/source/ui/docshell/docsh4.cxx | 35
sc/source/ui/docshell/docsh6.cxx | 2
sc/source/ui/docshell/docsh8.cxx | 16
sc/source/ui/docshell/impex.cxx | 1
sc/source/ui/inc/attrdlg.hxx | 13
sc/source/ui/inc/docsh.hxx | 58
sc/source/ui/inc/filtdlg.hxx | 33
sc/source/ui/inc/instbdlg.hxx | 5
sc/source/ui/inc/mvtabdlg.hxx | 5
sc/source/ui/inc/sortdlg.hxx | 13
sc/source/ui/inc/strindlg.hxx | 5
sc/source/ui/inc/tpsort.hxx | 17
sc/source/ui/inc/ui_pch.hxx | 1
sc/source/ui/inc/uiitems.hxx | 12
sc/source/ui/miscdlgs/instbdlg.cxx | 22
sc/source/ui/miscdlgs/mvtabdlg.cxx | 13
sc/source/ui/miscdlgs/retypepassdlg.src | 2
sc/source/ui/miscdlgs/strindlg.cxx | 9
sc/source/ui/src/optdlg.src | 8
sc/source/ui/src/scstring.src | 4
sc/source/ui/view/auditsh.cxx | 2
sc/source/ui/view/cellsh.cxx | 84
sc/source/ui/view/cellsh1.cxx | 90
sc/source/ui/view/cellsh2.cxx | 43
sc/source/ui/view/cellsh4.cxx | 16
sc/source/ui/view/colrowba.cxx | 8
sc/source/ui/view/dbfunc.cxx | 44
sc/source/ui/view/gridwin4.cxx | 3
sc/source/ui/view/tabview3.cxx | 152 -
sc/source/ui/view/tabvwshf.cxx | 7
sc/source/ui/view/viewfunc.cxx | 4
sc/uiconfig/layout/delzip | 1
sc/uiconfig/layout/insert-sheet.xml | 57
sc/uiconfig/layout/move-copy-sheet.xml | 21
sc/uiconfig/layout/sort-options.xml | 40
sc/uiconfig/layout/string-input.xml | 16
scaddins/Makefile | 8
sccomp/Makefile | 8
scp2/prj/build.lst | 3
scp2/source/accessories/module_accessories.scp | 3
scp2/source/layout/layout.scp | 62
scp2/source/layout/makefile.mk | 50
scp2/source/ooo/common_brand.scp | 17
scp2/source/ooo/installation_ooo.scp | 1
scp2/source/ooo/registryitem_ooo.scp | 4
scp2/source/ooo/scpaction_ooo.scp | 2
scp2/source/ooo/ure_standalone.scp | 1
scp2/source/ooo/vc_redist.scp | 32
scp2/source/sdkoo/sdkoo.scp | 3
scp2/util/makefile.mk | 4
scripting/Makefile | 8
sd/CppunitTest_sd_uimpress.mk | 5
sd/Makefile | 8
sd/prj/build.lst | 2
sd/qa/unit/data/ppt/fail/CVE-2010-0033-1.ppt |binary
sd/qa/unit/data/ppt/pass/CVE-2006-3655-1.ppt |binary
sd/qa/unit/data/ppt/pass/CVE-2006-3656-1.ppt |binary
sd/qa/unit/data/ppt/pass/CVE-2006-3660-1.ppt |binary
sd/qa/unit/data/ppt/pass/CVE-2006-5296-1.ppt |binary
sd/qa/unit/filters-test.cxx | 2
sd/source/ui/func/fuinsfil.cxx | 6
sd/source/ui/inc/fuinsfil.hxx | 2
sd/source/ui/inc/strings.hrc | 40
sd/source/ui/slideshow/slideshowimpl.cxx | 5
sd/source/ui/view/sdview4.cxx | 2
sdext/source/minimizer/impoptimizer.cxx | 1
sdext/source/pdfimport/makefile.mk | 5
sdext/source/pdfimport/services.cxx | 3
sdext/source/presenter/PresenterComponent.cxx | 5
sdext/source/presenter/makefile.mk | 5
set_soenv.in | 33
setup_native/scripts/langpackscript.sh | 4
setup_native/source/opensolaris/bundledextensions/installed | 2
setup_native/source/packinfo/package_names.txt | 86
setup_native/source/packinfo/packinfo_accessories.txt | 36
setup_native/source/packinfo/packinfo_brand.txt | 32
setup_native/source/packinfo/packinfo_extensions.txt | 176 -
setup_native/source/packinfo/packinfo_office.txt | 596 +++---
setup_native/source/packinfo/packinfo_office_help.txt | 16
setup_native/source/packinfo/packinfo_office_lang.txt | 228 +-
setup_native/source/packinfo/packinfo_sdkoo.txt | 14
sfx2/Makefile | 8
sfx2/Module_sfx2.mk | 1
sfx2/Package_inc.mk | 4
sfx2/inc/pch/precompiled_sfx2.hxx | 2
sfx2/inc/sfx2/docfilt.hxx | 4
sfx2/inc/sfx2/fcontnr.hxx | 2
sfx2/inc/sfx2/layout-post.hxx | 43
sfx2/inc/sfx2/layout-pre.hxx | 52
sfx2/inc/sfx2/layout-tabdlg.hxx | 48
sfx2/inc/sfx2/layout.hxx | 69
sfx2/inc/sfx2/sfxsids.hrc | 2
sfx2/inc/sfx2/shell.hxx | 1
sfx2/inc/sfx2/tabdlg.hxx | 37
sfx2/sdi/sfx.sdi | 24
sfx2/source/appl/appinit.cxx | 9
sfx2/source/appl/appmain.cxx | 19
sfx2/source/appl/appserv.cxx | 3
sfx2/source/appl/sfxhelp.cxx | 20
sfx2/source/appl/sfxpicklist.cxx | 40
sfx2/source/bastyp/fltfnc.cxx | 4
sfx2/source/dialog/filedlghelper.cxx | 14
sfx2/source/dialog/tabdlg.cxx | 98
sfx2/source/dialog/taskpane.cxx | 10
sfx2/source/doc/docfac.cxx | 4
sfx2/source/doc/doctemplates.cxx | 5
sfx2/source/doc/objstor.cxx | 2
sfx2/source/doc/objuno.cxx | 14
sfx2/source/inc/sfxpicklist.hxx | 15
sfx2/source/layout/factory.cxx | 71
sfx2/source/layout/sfxdialog.cxx | 41
sfx2/source/layout/sfxtabdialog.cxx | 75
sfx2/source/layout/sfxtabpage.cxx | 68
sfx2/source/view/viewfac.cxx | 2
sfx2/source/view/viewfrm.cxx | 10
sfx2/source/view/viewfrm2.cxx | 5
sfx2/source/view/viewsh.cxx | 4
shell/source/all/makefile.mk | 1
shell/source/unix/sysshell/makefile.mk | 3
shell/source/unix/sysshell/recently_used_file_handler.cxx | 4
shell/source/unix/sysshell/recfile.map | 6
slideshow/Makefile | 8
smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk | 2
smoketestoo_native/makefile.mk | 2
solenv/bin/lo_find_src_root | 23
solenv/bin/lo_proxy_start | 31
solenv/bin/make_installer.pl | 13
solenv/bin/modules/installer/epmfile.pm | 2
solenv/bin/modules/installer/globals.pm | 2
solenv/bin/modules/installer/helppack.pm | 8
solenv/bin/modules/installer/languagepack.pm | 8
solenv/bin/modules/installer/setupscript.pm | 7
solenv/bin/modules/installer/windows/msiglobal.pm | 170 -
solenv/bin/modules/installer/windows/property.pm | 6
solenv/bin/modules/installer/windows/registry.pm | 4
solenv/gbuild/CppunitTest.mk | 3
solenv/gbuild/Output.mk | 4
solenv/gbuild/gbuild.mk | 23
solenv/gbuild/gbuild_simple.mk | 2
solenv/gbuild/platform/ANDROID_ARM_GCC.mk | 26
solenv/gbuild/platform/com_GCC_defs.mk | 5
solenv/gbuild/platform/macosx.mk | 3
solenv/gbuild/platform/solaris.mk | 8
solenv/gbuild/platform/unxgcc.mk | 3
solenv/gbuild/source_and_rerun.mk | 11
solenv/gbuild/templates/Makefile | 8
solenv/inc/_tg_shl.mk | 180 -
solenv/inc/extension_post.mk | 4
solenv/inc/gbuildbridge.mk | 7
solenv/inc/layout.mk | 32
solenv/inc/settings.mk | 12
solenv/inc/tg_shl.mk | 18
solenv/inc/unxandr.mk | 12
solenv/inc/unxandr/android_native_app_glue.c | 435 ----
solenv/inc/unxandr/android_native_app_glue.h | 349 ---
soltools/cpp/_lex.c | 4
sot/Makefile | 8
starmath/Makefile | 8
starmath/inc/caret.hxx | 2
starmath/inc/cursor.hxx | 5
starmath/inc/helpids.h | 8
starmath/inc/node.hxx | 7
starmath/inc/parse.hxx | 3
starmath/inc/starmath.hrc | 11
starmath/inc/types.hxx | 11
starmath/source/commands.src | 61
starmath/source/cursor.cxx | 89
starmath/source/math_pch.cxx | 1
starmath/source/mathmlexport.cxx | 4
starmath/source/mathmlimport.cxx | 4
starmath/source/mathtype.cxx | 28
starmath/source/node.cxx | 15
starmath/source/parse.cxx | 8
starmath/source/toolbox.cxx | 4
starmath/source/toolbox.src | 70
starmath/source/unomodel.cxx | 2
starmath/source/view.cxx | 8
stoc/source/corereflection/makefile.mk | 2
stoc/source/inspect/makefile.mk | 2
stoc/source/invocation/makefile.mk | 2
stoc/source/invocation_adapterfactory/makefile.mk | 2
stoc/source/javaloader/makefile.mk | 2
stoc/source/javavm/makefile.mk | 2
stoc/source/namingservice/makefile.mk | 2
stoc/source/proxy_factory/makefile.mk | 2
stoc/test/registry_tdprovider/makefile.mk | 2
stoc/test/tdmanager/makefile.mk | 2
stoc/util/makefile.mk | 4
svl/Makefile | 8
svl/inc/pch/precompiled_svl.hxx | 1
svl/inc/svl/svstdarr.hxx | 1
svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx | 4
svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx | 6
svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx | 4
svl/source/config/itemholder2.cxx | 1
svtools/CppunitTest_svtools_filters_test.mk | 5
svtools/Makefile | 8
svtools/inc/pch/precompiled_svtools.hxx | 1
svtools/inc/svtools/ivctrl.hxx | 21
svtools/prj/build.lst | 2
svtools/qa/cppunit/data/wmf/fail/CVE-2005-4560-1.wmf |binary
svtools/source/config/accessibilityoptions.cxx | 4
svtools/source/config/itemholder2.cxx | 1
svtools/source/config/printoptions.cxx | 4
svtools/source/contnr/imivctl.hxx | 11
svtools/source/contnr/imivctl1.cxx | 218 --
svtools/source/contnr/ivctrl.cxx | 69
svtools/source/dialogs/insdlg.cxx | 24
svtools/source/filter/FilterConfigCache.cxx | 6
svtools/source/filter/FilterConfigItem.cxx | 10
svtools/source/misc/imagemgr.src | 3
svx/Makefile | 8
svx/inc/pch/precompiled_svx.hxx | 1
svx/inc/svx/dlgctrl.hxx | 1
svx/inc/svx/fontlb.hxx | 22
svx/inc/svx/gallery.hxx | 2
svx/inc/svx/langbox.hxx | 22
svx/inc/svx/paraprev.hxx | 2
svx/inc/svx/srchdlg.hxx | 7
svx/source/dialog/dlgctrl.cxx | 7
svx/source/dialog/fontlb.cxx | 23
svx/source/dialog/langbox.cxx | 45
svx/source/dialog/paraprev.cxx | 9
svx/source/dialog/srchdlg.cxx | 59
svx/source/gallery2/galexpl.cxx | 22
svx/source/gallery2/galmisc.cxx | 4
svx/uiconfig/layout/delzip | 1
svx/uiconfig/layout/layout.mk | 33
svx/uiconfig/layout/makefile.mk | 46
svx/uiconfig/layout/zoom.xml | 59
sw/CppunitTest_sw_filters_test.mk | 2
sw/CppunitTest_sw_macros_test.mk | 144 +
sw/CppunitTest_sw_swdoc_test.mk | 2
sw/Makefile | 8
sw/Module_sw.mk | 1
sw/inc/IDocumentSettingAccess.hxx | 1
sw/inc/doc.hxx | 1
sw/inc/mdiexp.hxx | 3
sw/inc/pch/precompiled_sw.hxx | 1
sw/prj/build.lst | 2
sw/qa/complex/writer/CheckBookmarks.java | 9
sw/qa/core/data/doc/testVba.doc |binary
sw/qa/core/macros-test.cxx | 217 ++
sw/source/core/bastyp/calc.cxx | 3
sw/source/core/crsr/bookmrk.cxx | 50
sw/source/core/crsr/crsrsh.cxx | 7
sw/source/core/crsr/viscrs.cxx | 2
sw/source/core/doc/dbgoutsw.cxx | 6
sw/source/core/doc/doc.cxx | 5
sw/source/core/doc/docedt.cxx | 12
sw/source/core/doc/docfld.cxx | 6
sw/source/core/doc/docfmt.cxx | 2
sw/source/core/doc/docnew.cxx | 16
sw/source/core/doc/docredln.cxx | 2
sw/source/core/doc/docxforms.cxx | 4
sw/source/core/docnode/ndtbl.cxx | 2
sw/source/core/docnode/node.cxx | 3
sw/source/core/frmedt/fefly1.cxx | 3
sw/source/core/layout/atrfrm.cxx | 13
sw/source/core/layout/calcmove.cxx | 6
sw/source/core/layout/fly.cxx | 3
sw/source/core/layout/ssfrm.cxx | 3
sw/source/core/text/guess.cxx | 8
sw/source/core/text/itradj.cxx | 3
sw/source/core/text/itrform2.cxx | 7
sw/source/core/text/porlay.cxx | 6
sw/source/core/text/txtdrop.cxx | 3
sw/source/core/txtnode/fmtatr2.cxx | 2
sw/source/core/txtnode/ndtxt.cxx | 3
sw/source/core/unocore/unoframe.cxx | 3
sw/source/core/unocore/unosett.cxx | 2
sw/source/core/unocore/unotbl.cxx | 3
sw/source/filter/ascii/parasc.cxx | 3
sw/source/filter/html/htmlplug.cxx | 6
sw/source/filter/ww1/fltshell.cxx | 6
sw/source/filter/ww8/docxattributeoutput.cxx | 2
sw/source/filter/ww8/docxexport.cxx | 18
sw/source/filter/ww8/rtfexport.cxx | 4
sw/source/filter/ww8/ww8par.cxx | 7
sw/source/filter/ww8/ww8par2.cxx | 5
sw/source/filter/xml/xmlexp.cxx | 134 -
sw/source/filter/xml/xmlexp.hxx | 21
sw/source/filter/xml/xmlimp.cxx | 46
sw/source/filter/xml/xmlimp.hxx | 13
sw/source/filter/xml/xmltexti.cxx | 2
sw/source/ui/app/applab.cxx | 4
sw/source/ui/chrdlg/chrdlg.src | 2
sw/source/ui/config/optcomp.cxx | 30
sw/source/ui/config/optload.cxx | 27
sw/source/ui/dbui/dbinsdlg.cxx | 3
sw/source/ui/dbui/dbtree.cxx | 2
sw/source/ui/dbui/mmoutputpage.cxx | 2
sw/source/ui/dialog/uiregionsw.cxx | 6
sw/source/ui/dialog/wordcountdialog.cxx | 10
sw/source/ui/dialog/wordcountwrapper.cxx | 1
sw/source/ui/dochdl/swdtflvr.cxx | 3
sw/source/ui/docvw/edtwin.cxx | 19
sw/source/ui/docvw/edtwin3.cxx | 2
sw/source/ui/envelp/labprt.cxx | 3
sw/source/ui/inc/view.hxx | 3
sw/source/ui/inc/wordcountdialog.hxx | 4
sw/source/ui/misc/outline.cxx | 18
sw/source/ui/ribbar/inputwin.cxx | 3
sw/source/ui/table/tautofmt.cxx | 2
sw/source/ui/uiview/formatclipboard.cxx | 23
sw/source/ui/uiview/pview.cxx | 3
sw/source/ui/uiview/viewdraw.cxx | 3
sw/source/ui/uiview/viewling.cxx | 4
sw/source/ui/uiview/viewsrch.cxx | 4
sw/source/ui/uno/SwXDocumentSettings.cxx | 16
sw/source/ui/uno/SwXFilterOptions.cxx | 3
sw/source/ui/utlui/glbltree.cxx | 3
sw/source/ui/utlui/initui.cxx | 3
sw/source/ui/utlui/numfmtlb.cxx | 3
sw/source/ui/vba/vbacolumn.cxx | 2
sw/source/ui/vba/vbarow.cxx | 4
sw/source/ui/wrtsh/navmgr.cxx | 29
sw/uiconfig/layout/delzip | 1
sw/uiconfig/layout/layout.mk | 33
sw/uiconfig/layout/wordcount.xml | 50
swext/Makefile | 8
tail_build/Makefile | 15
tail_build/prj/build.lst | 2
testautomation/Makefile | 8
testautomation/framework/optional/input/help_browser/OpenOffice.org_help_topics_en-US.txt | 10
testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_topics_en-US.txt | 10
testautomation/global/system/includes/iniinfo.inc | 2
testautomation/global/tools/includes/optional/t_ole.inc | 2
testautomation/global/win/e_mathop.win | 8
testautomation/global/win/mathop.win | 8
testautomation/math/required/includes/m_010_.inc | 17
testtools/com/sun/star/comp/bridge/makefile.mk | 5
testtools/prj/build.lst | 2
testtools/source/bridgetest/cli/makefile.mk | 2
testtools/source/bridgetest/idl/makefile.mk | 5
testtools/source/bridgetest/makefile.mk | 14
testtools/source/performance/makefile.mk | 4
toolkit/Library_tk.mk | 29
toolkit/Makefile | 8
toolkit/Module_toolkit.mk | 1
toolkit/Package_inc.mk | 3
toolkit/Package_source.mk | 50
toolkit/doc/layout/README | 24
toolkit/doc/layout/TODO | 227 --
toolkit/doc/layout/apinotes.txt | 76
toolkit/doc/layout/metricfield.txt | 57
toolkit/doc/layout/notes.txt | 117 -
toolkit/doc/layout/oldnotes.txt | 224 --
toolkit/doc/layout/vcl.txt | 20
toolkit/inc/layout/layout-post.hxx | 84
toolkit/inc/layout/layout-pre.hxx | 81
toolkit/inc/layout/layout.hxx | 506 -----
toolkit/source/awt/vclxbutton.cxx | 129 -
toolkit/source/awt/vclxbutton.hxx | 117 -
toolkit/source/awt/vclxdialog.cxx | 274 --
toolkit/source/awt/vclxdialog.hxx | 109 -
toolkit/source/awt/vclxfixedline.cxx | 127 -
toolkit/source/awt/vclxfixedline.hxx | 78
toolkit/source/awt/vclxplugin.cxx | 84
toolkit/source/awt/vclxplugin.hxx | 70
toolkit/source/awt/vclxscroller.cxx | 204 --
toolkit/source/awt/vclxscroller.hxx | 90
toolkit/source/awt/vclxsplitter.cxx | 249 --
toolkit/source/awt/vclxsplitter.hxx | 124 -
toolkit/source/awt/vclxtabcontrol.cxx | 518 -----
toolkit/source/awt/vclxtabcontrol.hxx | 148 -
toolkit/source/awt/vclxtabpage.cxx | 147 -
toolkit/source/awt/vclxtabpage.hxx | 76
toolkit/source/awt/vclxtoolkit.cxx | 1
toolkit/source/controls/unocontrolmodel.cxx | 7
toolkit/source/helper/registerservices.cxx | 4
toolkit/source/helper/unowrapper.cxx | 1
toolkit/source/layout/core/bin.cxx | 201 --
toolkit/source/layout/core/bin.hxx | 116 -
toolkit/source/layout/core/box-base.cxx | 176 -
toolkit/source/layout/core/box-base.hxx | 90
toolkit/source/layout/core/box.cxx | 284 --
toolkit/source/layout/core/box.hxx | 105 -
toolkit/source/layout/core/byteseq.cxx | 79
toolkit/source/layout/core/container.cxx | 131 -
toolkit/source/layout/core/container.hxx | 139 -
toolkit/source/layout/core/dialogbuttonhbox.cxx | 283 --
toolkit/source/layout/core/dialogbuttonhbox.hxx | 76
toolkit/source/layout/core/factory.cxx | 126 -
toolkit/source/layout/core/factory.hxx | 77
toolkit/source/layout/core/flow.cxx | 213 --
toolkit/source/layout/core/flow.hxx | 98
toolkit/source/layout/core/helper.cxx | 597 ------
toolkit/source/layout/core/helper.hxx | 152 -
toolkit/source/layout/core/import.cxx | 328 ---
toolkit/source/layout/core/import.hxx | 214 --
toolkit/source/layout/core/localized-string.cxx | 83
toolkit/source/layout/core/localized-string.hxx | 79
toolkit/source/layout/core/precompiled_xmlscript.hxx | 38
toolkit/source/layout/core/proplist.cxx | 422 ----
toolkit/source/layout/core/proplist.hxx | 94
toolkit/source/layout/core/root.cxx | 393 ----
toolkit/source/layout/core/root.hxx | 159 -
toolkit/source/layout/core/table.cxx | 314 ---
toolkit/source/layout/core/table.hxx | 105 -
toolkit/source/layout/core/timer.cxx | 151 -
toolkit/source/layout/core/timer.hxx | 52
toolkit/source/layout/core/translate.cxx | 133 -
toolkit/source/layout/core/translate.hxx | 43
toolkit/source/layout/core/vcl.cxx | 69
toolkit/source/layout/core/vcl.hxx | 51
toolkit/source/layout/vcl/wbutton.cxx | 293 --
toolkit/source/layout/vcl/wcontainer.cxx | 134 -
toolkit/source/layout/vcl/wfield.cxx | 388 ---
toolkit/source/layout/vcl/wrapper.cxx | 982 ----------
toolkit/source/layout/vcl/wrapper.hxx | 152 -
toolkit/uiconfig/layout/delzip | 1
toolkit/uiconfig/layout/message-box.xml | 41
toolkit/uiconfig/layout/tab-dialog.xml | 20
tools/Makefile | 8
tools/Package_inc.mk | 1
tools/bootstrp/cppdep.cxx | 12
tools/inc/tools/unqid.hxx | 110 -
tools/source/fsys/comdep.hxx | 2
tools/source/fsys/dirent.cxx | 2
tools/source/fsys/wntmsc.cxx | 94
tools/source/memtools/unqidx.cxx | 95
twain/Makefile | 8
ucb/Makefile | 8
ucb/source/ucp/cmis/makefile.mk | 3
ucb/source/ucp/expand/makefile.mk | 2
ucb/source/ucp/ext/makefile.mk | 2
ucb/source/ucp/tdoc/makefile.mk | 2
ucbhelper/Makefile | 8
udkapi/Makefile | 8
unixODBC/Makefile | 8
unotools/Library_utl.mk | 1
unotools/Makefile | 8
unotools/Package_inc.mk | 1
unotools/inc/unotools/bootstrap.hxx | 3
unotools/inc/unotools/configitem.hxx | 5
unotools/inc/unotools/configmgr.hxx | 152 -
unotools/inc/unotools/processfactory.hxx | 61
unotools/source/config/bootstrap.cxx | 9
unotools/source/config/configitem.cxx | 119 -
unotools/source/config/configmgr.cxx | 786 +-------
unotools/source/config/defaultoptions.cxx | 1
unotools/source/config/docinfohelper.cxx | 18
unotools/source/config/historyoptions.cxx | 6
unotools/source/config/inetoptions.cxx | 1
unotools/source/config/itemholder1.cxx | 1
unotools/source/config/moduleoptions.cxx | 6
unotools/source/config/pathoptions.cxx | 21
unotools/source/config/saveopt.cxx | 6
unotools/source/config/useroptions.cxx | 18
unotools/source/config/viewoptions.cxx | 4
unotools/source/processfactory/processfactory.cxx | 56
unoxml/Makefile | 8
unusedcode.easy | 106 -
uui/Makefile | 8
uui/source/iahndl.cxx | 41
vbahelper/Makefile | 8
vbahelper/inc/vbahelper/vbaaccesshelper.hxx | 2
vcl/Library_vclplug_gen.mk | 5
vcl/Makefile | 8
vcl/generic/glyphs/glyphcache.cxx | 17
vcl/inc/generic/glyphcache.hxx | 1
vcl/inc/outdev.h | 1
vcl/inc/svdata.hxx | 1
vcl/inc/svids.hrc | 3
vcl/inc/vcl/graphictools.hxx | 7
vcl/inc/vcl/rendergraphic.hxx | 4
vcl/inc/vcl/svapp.hxx | 3
vcl/prj/build.lst | 2
vcl/source/app/settings.cxx | 39
vcl/source/app/svapp.cxx | 11
vcl/source/app/svmain.cxx | 6
vcl/source/gdi/gdimtf.cxx | 34
vcl/source/gdi/outdev3.cxx | 17
vcl/source/gdi/pdfwriter_impl2.cxx | 1
vcl/source/gdi/print.cxx | 4
vcl/source/gdi/rendergraphic.cxx | 12
vcl/source/src/images.src | 75
vcl/source/window/decoview.cxx | 32
vcl/unx/generic/gdi/gcach_xpeer.cxx | 569 -----
vcl/unx/generic/gdi/gcach_xpeer.hxx | 46
vcl/unx/generic/gdi/salgdi2.cxx | 26
vcl/unx/generic/gdi/xrender_peer.cxx | 177 -
vcl/unx/generic/gdi/xrender_peer.hxx | 158 -
wizards/Makefile | 8
writerfilter/CppunitTest_writerfilter_rtftok.mk | 2
writerfilter/Library_resourcemodel.mk | 14
writerfilter/Makefile | 8
writerfilter/inc/resourcemodel/TagLogger.hxx | 2
writerfilter/prj/build.lst | 2
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 15
writerfilter/source/dmapper/PropertyMap.cxx | 2
writerfilter/source/filter/ImportFilter.cxx | 9
writerfilter/source/resourcemodel/TagLogger.cxx | 19
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 25
writerfilter/source/rtftok/rtftokenizer.cxx | 5
writerperfect/Makefile | 8
xmerge/Makefile | 8
xml2cmp/Makefile | 8
xmlhelp/source/cxxhelp/provider/provider.cxx | 11
xmlhelp/source/treeview/tvread.cxx | 5
xmloff/Makefile | 8
xmloff/inc/pch/precompiled_xmloff.hxx | 1
xmloff/source/core/DomBuilderContext.cxx | 4
xmloff/source/core/DomExport.cxx | 1
xmloff/source/xforms/xformsapi.cxx | 4
xmlreader/Makefile | 8
xmlscript/Makefile | 8
xmlsecurity/Makefile | 8
944 files changed, 9100 insertions(+), 25769 deletions(-)
New commits:
commit 62c55ae015d14c7b005bac569d1a0698e85cc9d1
Author: August Sodora <augsod at gmail.com>
Date: Wed Nov 16 14:50:26 2011 -0500
Preparing to add option for line numbers in the basic ide
diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml b/basctl/uiconfig/basicide/menubar/menubar.xml
index 15d4fcd..0fe411b 100644
--- a/basctl/uiconfig/basicide/menubar/menubar.xml
+++ b/basctl/uiconfig/basicide/menubar/menubar.xml
@@ -50,6 +50,7 @@
<menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
<menu:menuitem menu:id=".uno:ShowLines"/>
<menu:menuitem menu:id=".uno:GotoLine"/>
+ <menu:menuitem menu:id=".uno:ShowLines"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FullScreen"/>
</menu:menupopup>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
index d4077e6..09924c7 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
@@ -11,6 +11,11 @@
<node oor:name=".uno:GotoLine" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Goto Line Number...</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:ShowLines" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Display Source Line Numbers</value>
</prop>
</node>
</node>
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index 09a9a80..9d3fa92 100755
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -316,6 +316,7 @@
#define SID_PASSWORDINTERACTION (SID_SFX_START + 1723)
#define SID_SHOWLINES (SID_SFX_START + 1724)
#define SID_GOTOLINE (SID_SFX_START + 1724)
+#define SID_SHOWLINES (SID_SFX_START + 1724)
#define SID_SFX_free_START (SID_SFX_START + 1725)
#define SID_SFX_free_END (SID_SFX_START + 3999)
commit aa7f5af9418802121098fadc9de409775977464c
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date: Thu Nov 17 22:13:42 2011 +0400
redundant if not-null checks on delete
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index ecee9a2..78ee52c 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -1626,8 +1626,7 @@ SwHash::SwHash( const String& rStr ) :
SwHash::~SwHash()
{
- if( pNext )
- delete pNext;
+ delete pNext;
}
void DeleteHashTable( SwHash **ppHashTable, sal_uInt16 nCount )
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index f402e02..7f859ed 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -120,11 +120,8 @@ void CheckRange( SwCursor* pCurCrsr )
* Bereich gehoert !
*/
pTmp = (SwPaM*)pTmp->GetNext();
- if( pTmpDel )
- {
- delete pTmpDel; // hebe alten Bereich auf
- pTmpDel = 0;
- }
+ delete pTmpDel; // hebe alten Bereich auf
+ pTmpDel = 0;
}
}
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 3f15e8c..b4c8e07 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -691,11 +691,8 @@ _SaveRedlEndPosForRestore::_SaveRedlEndPosForRestore( const SwNodeIndex& rInsIdx
_SaveRedlEndPosForRestore::~_SaveRedlEndPosForRestore()
{
- if( pSavArr )
- {
- delete pSavArr;
- delete pSavIdx;
- }
+ delete pSavArr;
+ delete pSavIdx;
}
void _SaveRedlEndPosForRestore::_Restore()
@@ -1236,8 +1233,7 @@ bool SwDoc::MoveNodeRange( SwNodeRange& rRange, SwNodeIndex& rPos,
GetIDocumentUndoRedo().AppendUndo(pUndo);
}
- if( pSaveInsPos )
- delete pSaveInsPos;
+ delete pSaveInsPos;
if( bUpdateFtn )
{
@@ -2500,7 +2496,7 @@ SetRedlineMode( eOld );
// in die Autokorrektur
void SwDoc::SetAutoCorrExceptWord( SwAutoCorrExceptWord* pNew )
{
- if( pACEWord && pNew != pACEWord )
+ if( pNew != pACEWord )
delete pACEWord;
pACEWord = pNew;
}
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 3a81493..e5cd57e 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -673,8 +673,7 @@ void SwDoc::UpdateTblFlds( SfxPoolItem* pHt )
}
}
- if( pCalc )
- delete pCalc;
+ delete pCalc;
}
void SwDoc::UpdatePageFlds( SfxPoolItem* pMsgHnt )
@@ -2210,8 +2209,7 @@ void SwDocUpdtFld::MakeFldList( SwDoc& rDoc, int bAll, int eGetMode )
void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
{
// new version: walk all fields of the attribute pool
- if( pFldSortLst )
- delete pFldSortLst;
+ delete pFldSortLst;
pFldSortLst = new _SetGetExpFlds( 64, 16 );
/// consider and unhide sections
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 16a0780..22a9773 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -1138,7 +1138,7 @@ void SwDoc::ResetAttrAtFormat( const sal_uInt16 nWhichId,
SetModified();
}
- else if ( pUndo )
+ else
delete pUndo;
}
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index d441723..8163a4e 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -498,12 +498,8 @@ SwDoc::~SwDoc()
delete pRedlineTbl;
delete pUnoCrsrTbl;
delete pAutoFmtRedlnComment;
-
- if( pUpdtFlds )
- delete pUpdtFlds;
-
- if( pACEWord )
- delete pACEWord;
+ delete pUpdtFlds;
+ delete pACEWord;
// die BaseLinks freigeben.
{
@@ -769,8 +765,7 @@ void SwDoc::ClearDoc()
pRedlineTbl->DeleteAndDestroy( 0, pRedlineTbl->Count() );
- if( pACEWord )
- delete pACEWord;
+ delete pACEWord;
// in den BookMarks sind Indizies auf den Content. Diese muessen vorm
// loesche der Nodes geloescht werden.
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index c3fc328..967bfc1 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -2585,7 +2585,7 @@ void SwDoc::SetAutoFmtRedlineComment( const String* pTxt, sal_uInt16 nSeqNo )
else
*pAutoFmtRedlnComment = *pTxt;
}
- else if( pAutoFmtRedlnComment )
+ else
delete pAutoFmtRedlnComment, pAutoFmtRedlnComment = 0;
nAutoFmtRedlnCommentNo = nSeqNo;
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 4054919..cda90ba 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -2294,7 +2294,7 @@ sal_uInt16 SwDoc::MergeTbl( SwPaM& rPam )
GetIDocumentUndoRedo().AppendUndo( pUndo );
}
}
- else if( pUndo )
+ else
delete pUndo;
rPam.GetPoint()->nNode = *pMergeBox->GetSttNd();
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index ad3c4a3..8164bcf 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -1001,8 +1001,7 @@ SwCntntNode::~SwCntntNode()
if( GetDepends() )
DelFrms();
- if( pCondColl )
- delete pCondColl;
+ delete pCondColl;
if ( mpAttrSet.get() && mbSetModifyAtAttr )
((SwAttrSet*)mpAttrSet.get())->SetModifyAtAttr( 0 );
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 0ebb362..6662c47 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -1263,8 +1263,7 @@ void SwFEShell::SetFrmFmt( SwFrmFmt *pNewFmt, sal_Bool bKeepOrient, Point* pDocP
else
GetLayout()->SetAssertFlyPages();
}
- if( pSet )
- delete pSet;
+ delete pSet;
EndAllActionAndCall();
}
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index c89ef90..1e2d9ee 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -1507,8 +1507,7 @@ SwFmtAnchor::SwFmtAnchor( const SwFmtAnchor &rCpy )
void SwFmtAnchor::SetAnchor( const SwPosition *pPos )
{
- if ( pCntntAnchor )
- delete pCntntAnchor;
+ delete pCntntAnchor;
pCntntAnchor = pPos ? new SwPosition( *pPos ) : 0;
//AM Absatz gebundene Flys sollten nie in den Absatz hineinzeigen.
if (pCntntAnchor &&
@@ -1630,7 +1629,7 @@ bool SwFmtAnchor::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
break;
case text::TextContentAnchorType_AT_PAGE:
eAnchor = FLY_AT_PAGE;
- if( GetPageNum() > 0 && pCntntAnchor )
+ if( GetPageNum() > 0 )
{
// If the anchor type is page and a valid page number
// has been set, the content position isn't required
@@ -1659,7 +1658,7 @@ bool SwFmtAnchor::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
if((rVal >>= nVal) && nVal > 0)
{
SetPageNum( nVal );
- if ((FLY_AT_PAGE == GetAnchorId()) && pCntntAnchor)
+ if (FLY_AT_PAGE == GetAnchorId())
{
// If the anchor type is page and a valid page number
// is set, the content paoition has to be deleted to not
@@ -1705,8 +1704,7 @@ SwFmtURL::SwFmtURL( const SwFmtURL &rURL) :
SwFmtURL::~SwFmtURL()
{
- if ( pMap )
- delete pMap;
+ delete pMap;
}
int SwFmtURL::operator==( const SfxPoolItem &rAttr ) const
@@ -1740,8 +1738,7 @@ void SwFmtURL::SetURL( const XubString &rURL, sal_Bool bServerMap )
void SwFmtURL::SetMap( const ImageMap *pM )
{
- if ( pMap )
- delete pMap;
+ delete pMap;
pMap = pM ? new ImageMap( *pM ) : 0;
}
extern const SvEventDescription* lcl_GetSupportedMacroItems();
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index bb9047c..33e3823 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -932,8 +932,7 @@ void SwLayoutFrm::MakeAll()
Format( pAttrs );
}
} //while ( !bValidPos || !bValidSize || !bValidPrtArea )
- if ( pAccess )
- delete pAccess;
+ delete pAccess;
}
/*************************************************************************
@@ -1769,8 +1768,7 @@ void SwCntntFrm::MakeAll()
static_cast<SwTxtFrm&>(*this) );
- if ( pSaveFtn )
- delete pSaveFtn;
+ delete pSaveFtn;
UnlockJoin();
if ( bMovedFwd || bMovedBwd )
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index a2fc5bf..45da740 100755
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -538,8 +538,7 @@ void SwFlyFrm::FinitDrawObj()
}
GetVirtDrawObj()->SetUserCall( 0 ); //Ruft sonst Delete des ContactObj
delete GetVirtDrawObj(); //Meldet sich selbst beim Master ab.
- if ( pMyContact )
- delete pMyContact; //zerstoert den Master selbst.
+ delete pMyContact; //zerstoert den Master selbst.
}
/*************************************************************************
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index e578bfd..cfd77c9 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -402,8 +402,7 @@ SwFrm::~SwFrm()
}
}
}
- if ( pDrawObjs )
- delete pDrawObjs;
+ delete pDrawObjs;
}
#if OSL_DEBUG_LEVEL > 1
diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx
index a502460..19fb4d1 100644
--- a/sw/source/core/text/itradj.cxx
+++ b/sw/source/core/text/itradj.cxx
@@ -597,8 +597,7 @@ SwMarginPortion *SwTxtAdjuster::CalcRightMargin( SwLineLayout *pCurrent,
aCurrRect.Left( nLeftMar + nPrtWidth );
pFly = CalcFlyPortion( nRealWidth, aCurrRect );
}
- if( pFly )
- delete pFly;
+ delete pFly;
}
SwMarginPortion *pRight = new SwMarginPortion( 0 );
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 53a092c..ee83603 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -86,11 +86,8 @@ namespace {
inline void ClearFly( SwTxtFormatInfo &rInf )
{
- if( rInf.GetFly() )
- {
- delete rInf.GetFly();
- rInf.SetFly(0);
- }
+ delete rInf.GetFly();
+ rInf.SetFly(0);
}
/*************************************************************************
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index d360414..f9d6936 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -155,13 +155,11 @@ sal_Bool lcl_ConnectToPrev( xub_Unicode cCh, xub_Unicode cPrevCh )
SwLineLayout::~SwLineLayout()
{
Truncate();
- if( GetNext() )
- delete GetNext();
+ delete pNext;
if( pBlink )
pBlink->Delete( this );
delete pLLSpaceAdd;
- if ( pKanaComp )
- delete pKanaComp;
+ delete pKanaComp;
}
/*************************************************************************
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index 298a3e9..961931b 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -116,8 +116,7 @@ SwDropSave::~SwDropSave()
SwDropPortionPart::~SwDropPortionPart()
{
- if ( pFollow )
- delete pFollow;
+ delete pFollow;
delete pFnt;
}
diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx
index 0abbdf6..999742a 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -290,7 +290,7 @@ void SwFmtINetFmt::SetMacroTbl( const SvxMacroTableDtor* pNewTbl )
else
pMacroTbl = new SvxMacroTableDtor( *pNewTbl );
}
- else if( pMacroTbl )
+ else
delete pMacroTbl, pMacroTbl = 0;
}
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index a38c2d1..547891a 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2498,8 +2498,7 @@ SwTxtNode* SwTxtNode::_MakeNewTxtNode( const SwNodeIndex& rPos, sal_Bool bNext,
SwTxtNode *pNode = new SwTxtNode( rPos, pColl, pNewAttrSet );
- if( pNewAttrSet )
- delete pNewAttrSet;
+ delete pNewAttrSet;
const SwNumRule* pRule = GetNumRule();
if( pRule && pRule == pNode->GetNumRule() && rNds.IsDocNodes() ) // #115901#
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 5ba469f..e919845 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -882,8 +882,7 @@ uno::Reference< beans::XPropertySetInfo > SwXFrame::getPropertySetInfo(void) th
void SwXFrame::SetSelection(SwPaM& rCopySource)
{
- if(m_pCopySource)
- delete m_pCopySource;
+ delete m_pCopySource;
m_pCopySource = new SwPaM( *rCopySource.Start() );
m_pCopySource->SetMark();
*m_pCopySource->GetMark() = *rCopySource.End();
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 289810e..4f2b456 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1238,7 +1238,7 @@ SwXNumberingRules::~SwXNumberingRules()
SolarMutexGuard aGuard;
if(pDoc && sCreatedNumRuleName.Len())
pDoc->DelNumRule( sCreatedNumRuleName );
- if( pNumRule && bOwnNumRuleCreated )
+ if( bOwnNumRuleCreated )
delete pNumRule;
}
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index df6f302..834954e 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -1547,8 +1547,7 @@ SwXTextTableCursor::~SwXTextTableCursor()
{
SolarMutexGuard aGuard;
SwUnoCrsr* pUnoCrsr = GetCrsr();
- if(pUnoCrsr)
- delete pUnoCrsr;
+ delete pUnoCrsr;
}
OUString SwXTextTableCursor::getRangeName(void) throw( uno::RuntimeException )
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx
index fd4ab72..6f80a95 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -253,8 +253,7 @@ sal_uLong SwASCIIParser::CallParser()
delete pItemSet, pItemSet = 0;
}
- if( pInsPam )
- delete pInsPam;
+ delete pInsPam;
::EndProgress( pDoc->GetDocShell() );
return nError;
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index 8890c0b..accb529 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -505,8 +505,7 @@ void SwHTMLParser::NewObject()
sal_Bool bPrcWidth = sal_False, bPrcHeight = sal_False,
bDeclare = sal_False;
// Eine neue Command-List anlegen
- if( pAppletImpl )
- delete pAppletImpl;
+ delete pAppletImpl;
pAppletImpl = new SwApplet_Impl( pDoc->GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
@@ -675,8 +674,7 @@ void SwHTMLParser::InsertApplet()
sal_Int16 eHoriOri = text::HoriOrientation::NONE;
// Eine neue Command-List anlegen
- if( pAppletImpl )
- delete pAppletImpl;
+ delete pAppletImpl;
pAppletImpl = new SwApplet_Impl( pDoc->GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
const HTMLOptions& rHTMLOptions = GetOptions();
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index aa4c3fc..afb26ca 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -104,8 +104,7 @@ SwFltStackEntry::SwFltStackEntry(const SwPosition& rStartPos, SfxPoolItem* pHt)
SwFltStackEntry::~SwFltStackEntry()
{
// Attribut kam zwar als Pointer, wird aber hier geloescht
- if (pAttr)
- delete pAttr;
+ delete pAttr;
}
void SwFltStackEntry::SetEndPos(const SwPosition& rEndPos)
@@ -1047,8 +1046,7 @@ SwFltShell::~SwFltShell()
delete pPaM;
for (i=0; i<sizeof(pColls)/sizeof(*pColls); i++)
- if( pColls[i] )
- delete pColls[i];
+ delete pColls[i];
delete pOutDoc;
}
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 50530c1..7d9337b 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -482,15 +482,13 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
{
case 0x038F: pImpRec->nXAlign = nUDData; break;
case 0x0390:
- if (pImpRec->pXRelTo)
- delete pImpRec->pXRelTo;
+ delete pImpRec->pXRelTo;
pImpRec->pXRelTo = new sal_uInt32;
*(pImpRec->pXRelTo) = nUDData;
break;
case 0x0391: pImpRec->nYAlign = nUDData; break;
case 0x0392:
- if (pImpRec->pYRelTo)
- delete pImpRec->pYRelTo;
+ delete pImpRec->pYRelTo;
pImpRec->pYRelTo = new sal_uInt32;
*(pImpRec->pYRelTo) = nUDData;
break;
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 5ec7a2e..1744284 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -914,13 +914,12 @@ void SwWW8ImplReader::SetNumOlst(SwNumRule* pNumR, WW8_OLST* pO, sal_uInt8 nSwLe
// von Gliederungsabsaetzen zugreifbar ist.
void SwWW8ImplReader::Read_OLST( sal_uInt16, const sal_uInt8* pData, short nLen )
{
+ delete pNumOlst;
if (nLen <= 0)
{
- delete pNumOlst, pNumOlst = 0;
+ pNumOlst = 0;
return;
}
- if (pNumOlst)
- delete pNumOlst; // nur sicherheitshalber
pNumOlst = new WW8_OLST;
if( nLen < sal::static_int_cast< sal_Int32 >(sizeof( WW8_OLST )) ) // auffuellen, falls zu kurz
memset( pNumOlst, 0, sizeof( *pNumOlst ) );
diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx
index 69623dd..3bf837f 100644
--- a/sw/source/ui/app/applab.cxx
+++ b/sw/source/ui/app/applab.cxx
@@ -436,9 +436,7 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel)
rReq.SetReturnValue(SfxVoidItem(bLabel ? FN_LABEL : FN_BUSINESS_CARD));
}
delete pDlg;
-
- if( pNewDBMgr )
- delete pNewDBMgr;
+ delete pNewDBMgr;
}
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 4dc1204..f829db9 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -1831,8 +1831,7 @@ void SwInsertDBColAutoPilot::Load()
else
aLbDbParaColl.SelectEntryPos( 0 );
- if( pTAutoFmt )
- delete pTAutoFmt, pTAutoFmt = 0;
+ delete pTAutoFmt, pTAutoFmt = 0;
sTmp = pNewData->sTAutoFmtNm;
if( sTmp.Len() )
{
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 8199981..5fb92c2 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -1115,8 +1115,7 @@ IMPL_LINK( SwEditRegionDlg, FileSearchHdl, PushButton *, EMPTYARG )
m_pOldDefDlgParent = Application::GetDefDialogParent();
Application::SetDefDialogParent( this );
- if ( m_pDocInserter )
- delete m_pDocInserter;
+ delete m_pDocInserter;
m_pDocInserter = new ::sfx2::DocumentInserter( 0, String::CreateFromAscii("swriter") );
m_pDocInserter->StartExecuteModal( LINK( this, SwEditRegionDlg, DlgClosedHdl ) );
return 0;
@@ -1866,8 +1865,7 @@ IMPL_LINK( SwInsertSectionTabPage, FileSearchHdl, PushButton *, EMPTYARG )
{
m_pOldDefDlgParent = Application::GetDefDialogParent();
Application::SetDefDialogParent( this );
- if ( m_pDocInserter )
- delete m_pDocInserter;
+ delete m_pDocInserter;
m_pDocInserter = new ::sfx2::DocumentInserter( 0, String::CreateFromAscii("swriter") );
m_pDocInserter->StartExecuteModal( LINK( this, SwInsertSectionTabPage, DlgClosedHdl ) );
return 0;
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index 9071837..4222949 100755
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -1482,8 +1482,7 @@ int SwTransferable::PasteData( TransferableDataHelper& rData,
rSh.GetView().StopShellTimer();
}
- if( pAction )
- delete pAction;
+ delete pAction;
if( bCallAutoCaption )
rSh.GetView().AutoCaption( GRAPHIC_CAP );
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index f18433c..0bb9dac 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -342,11 +342,9 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier )
PointerStyle eStyle = POINTER_FILL;
if( rSh.IsOverReadOnlyPos( rLPt ))
{
- if( pUserMarker )
- {
- delete pUserMarker;
- pUserMarker = 0L;
- }
+ delete pUserMarker;
+ pUserMarker = 0L;
+
eStyle = POINTER_NOTALLOWED;
}
else
@@ -373,7 +371,7 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier )
pUserMarker = new SdrDropMarkerOverlay( *rSh.GetDrawView(), aTmp );
}
}
- else if(pUserMarker)
+ else
{
delete pUserMarker;
pUserMarker = 0L;
@@ -661,8 +659,7 @@ void SwEditWin::LeaveArea(const Point &rPos)
JustifyAreaTimer();
if( !aTimer.IsActive() )
aTimer.Start();
- if( pShadCrsr )
- delete pShadCrsr, pShadCrsr = 0;
+ delete pShadCrsr, pShadCrsr = 0;
}
inline void SwEditWin::EnterArea()
@@ -1325,8 +1322,7 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
// running on a document, no order is being taken
return;
- if( pShadCrsr )
- delete pShadCrsr, pShadCrsr = 0;
+ delete pShadCrsr, pShadCrsr = 0;
aKeyInputFlushTimer.Stop();
sal_Bool bIsDocReadOnly = rView.GetDocShell()->IsReadOnly() &&
@@ -2680,8 +2676,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
}
bWasShdwCrsr = 0 != pShadCrsr;
- if( bWasShdwCrsr )
- delete pShadCrsr, pShadCrsr = 0;
+ delete pShadCrsr, pShadCrsr = 0;
const Point aDocPos( PixelToLogic( rMEvt.GetPosPixel() ) );
diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx
index afabaf3..b4b7348 100644
--- a/sw/source/ui/envelp/labprt.cxx
+++ b/sw/source/ui/envelp/labprt.cxx
@@ -87,8 +87,7 @@ SwLabPrtPage::SwLabPrtPage(Window* pParent, const SfxItemSet& rSet) :
SwLabPrtPage::~SwLabPrtPage()
{
- if (pPrinter)
- delete pPrinter;
+ delete pPrinter;
}
IMPL_LINK( SwLabPrtPage, CountHdl, Button *, pButton )
diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx
index adda1db..f28dab0 100644
--- a/sw/source/ui/ribbar/inputwin.cxx
+++ b/sw/source/ui/ribbar/inputwin.cxx
@@ -143,8 +143,7 @@ SwInputWindow::~SwInputWindow()
pView->GetHLineal().SetActive( sal_True );
pView->GetVLineal().SetActive( sal_True );
}
- if ( pMgr )
- delete pMgr;
+ delete pMgr;
if(pWrtShell)
pWrtShell->EndSelTblCells();
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 7f197a5..6f702d7 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -303,7 +303,7 @@ void SwAutoFormatDlg::FillAutoFmtOfIndex( SwTableAutoFmt*& rToFill ) const
else
rToFill = new SwTableAutoFmt( *(*pTableTbl)[ nIndex ] );
}
- else if( rToFill )
+ else
delete rToFill, rToFill = 0;
}
diff --git a/sw/source/ui/uiview/formatclipboard.cxx b/sw/source/ui/uiview/formatclipboard.cxx
index a9bfa3f..d40ce9f 100644
--- a/sw/source/ui/uiview/formatclipboard.cxx
+++ b/sw/source/ui/uiview/formatclipboard.cxx
@@ -279,10 +279,8 @@ SwFormatClipboard::SwFormatClipboard()
}
SwFormatClipboard::~SwFormatClipboard()
{
- if(m_pItemSet)
- delete m_pItemSet;
- if(m_pTableItemSet)
- delete m_pTableItemSet;
+ delete m_pItemSet;
+ delete m_pTableItemSet;
}
bool SwFormatClipboard::HasContent() const
@@ -569,16 +567,13 @@ void SwFormatClipboard::Paste( SwWrtShell& rWrtShell, SfxStyleSheetBasePool* pPo
void SwFormatClipboard::Erase()
{
m_nSelectionType = 0;
- if(m_pItemSet)
- {
- delete m_pItemSet;
- m_pItemSet = 0;
- }
- if(m_pTableItemSet)
- {
- delete m_pTableItemSet;
- m_pTableItemSet = 0;
- }
+
+ delete m_pItemSet;
+ m_pItemSet = 0;
+
+ delete m_pTableItemSet;
+ m_pTableItemSet = 0;
+
if( m_aCharStyle.Len() )
m_aCharStyle.Erase();
if( m_aParaStyle.Len() )
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index 790cfb6..269e57c 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -210,8 +210,7 @@ SwPagePreViewWin::SwPagePreViewWin( Window *pParent, SwPagePreView& rPView )
SwPagePreViewWin::~SwPagePreViewWin()
{
- if( mpViewShell )
- delete mpViewShell;
+ delete mpViewShell;
}
void SwPagePreViewWin::Paint( const Rectangle& rRect )
diff --git a/sw/source/ui/uiview/viewdraw.cxx b/sw/source/ui/uiview/viewdraw.cxx
index 8730908..55d3b5c 100644
--- a/sw/source/ui/uiview/viewdraw.cxx
+++ b/sw/source/ui/uiview/viewdraw.cxx
@@ -640,8 +640,7 @@ sal_Bool SwView::IsFormMode() const
void SwView::SetDrawFuncPtr(SwDrawBase* pFuncPtr)
{
- if (pDrawActual)
- delete pDrawActual;
+ delete pDrawActual;
pDrawActual = pFuncPtr;
}
diff --git a/sw/source/ui/uno/SwXFilterOptions.cxx b/sw/source/ui/uno/SwXFilterOptions.cxx
index 3af6e74..a2f54e7 100644
--- a/sw/source/ui/uno/SwXFilterOptions.cxx
+++ b/sw/source/ui/uno/SwXFilterOptions.cxx
@@ -144,8 +144,7 @@ sal_Int16 SwXFilterOptions::execute() throw (uno::RuntimeException)
delete pAsciiDlg;
}
- if( pInStream )
- delete pInStream;
+ delete pInStream;
return nRet;
}
diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx
index 1855d9f..4fa1507 100644
--- a/sw/source/ui/utlui/glbltree.cxx
+++ b/sw/source/ui/utlui/glbltree.cxx
@@ -730,8 +730,7 @@ void SwGlobalTree::InsertRegion( const SwGlblDocContent* pCont, const String* pF
{
pDefParentWin = Application::GetDefDialogParent();
Application::SetDefDialogParent( this );
- if ( pDocInserter )
- delete pDocInserter;
+ delete pDocInserter;
pDocInserter = new ::sfx2::DocumentInserter( 0, String::CreateFromAscii("swriter"), true );
pDocInserter->StartExecuteModal( LINK( this, SwGlobalTree, DialogClosedHdl ) );
}
diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx
index ae6709d..1dba7a9 100644
--- a/sw/source/ui/utlui/initui.cxx
+++ b/sw/source/ui/utlui/initui.cxx
@@ -193,8 +193,7 @@ ShellResource::ShellResource()
ShellResource::~ShellResource()
{
- if( pAutoFmtNameLst )
- delete pAutoFmtNameLst, pAutoFmtNameLst = 0;
+ delete pAutoFmtNameLst;
}
String ShellResource::GetPageDescName( sal_uInt16 nNo, PageNameMode eMode )
diff --git a/sw/source/ui/utlui/numfmtlb.cxx b/sw/source/ui/utlui/numfmtlb.cxx
index bcaa7e0..e0c9abc 100644
--- a/sw/source/ui/utlui/numfmtlb.cxx
+++ b/sw/source/ui/utlui/numfmtlb.cxx
@@ -126,8 +126,7 @@ void NumFormatListBox::Init(short nFormatType, sal_Bool bUsrFmts)
NumFormatListBox::~NumFormatListBox()
{
- if (pOwnFormatter)
- delete pOwnFormatter;
+ delete pOwnFormatter;
}
SwView* NumFormatListBox::GetView()
commit 2eb486db9bdfb0b0146e64dfe990d9adb273c92f
Author: Lior Kaplan <kaplanlior at gmail.com>
Date: Thu Nov 17 19:04:13 2011 +0200
Remove double space in strings (looks bad in pootle)
diff --git a/sc/source/ui/miscdlgs/retypepassdlg.src b/sc/source/ui/miscdlgs/retypepassdlg.src
index 0c9f11e..714f1fe 100644
--- a/sc/source/ui/miscdlgs/retypepassdlg.src
+++ b/sc/source/ui/miscdlgs/retypepassdlg.src
@@ -61,7 +61,7 @@ ModalDialog RID_SCDLG_RETYPEPASS
WordBreak = TRUE ;
- Text [ en-US ] = "The document you are about to export has one or more protected items with password that cannot be exported. Please re-type your password to be able to export your document." ;
+ Text [ en-US ] = "The document you are about to export has one or more protected items with password that cannot be exported. Please re-type your password to be able to export your document." ;
};
FixedLine FL_DOCUMENT
diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src
index c70d902..c770dfe 100644
--- a/sc/source/ui/src/scstring.src
+++ b/sc/source/ui/src/scstring.src
@@ -817,10 +817,10 @@ String SCSTR_WARN_ME_IN_FUTURE_CHECK
String SCSTR_DDEDOC_NOT_LOADED
{
- Text [ en-US ] = "The following DDE source could not be updated possibly because the source document was not open. Please launch the source document and try again." ;
+ Text [ en-US ] = "The following DDE source could not be updated possibly because the source document was not open. Please launch the source document and try again." ;
};
String SCSTR_EXTDOC_NOT_LOADED
{
- Text [ en-US ] = "The following external file could not be loaded. Data linked from this file did not get updated." ;
+ Text [ en-US ] = "The following external file could not be loaded. Data linked from this file did not get updated." ;
};
diff --git a/sw/source/ui/chrdlg/chrdlg.src b/sw/source/ui/chrdlg/chrdlg.src
index b3c8ff6..7e3bac8 100644
--- a/sw/source/ui/chrdlg/chrdlg.src
+++ b/sw/source/ui/chrdlg/chrdlg.src
@@ -42,7 +42,7 @@ InfoBox MSG_ILLEGAL_PAGENUM
{
BUTTONS = WB_OK ;
DEFBUTTON = WB_DEF_OK ;
- Message [ en-US ] = "Page numbers cannot be applied to the current page. Even numbers can be used on left pages, odd numbers on right pages." ;
+ Message [ en-US ] = "Page numbers cannot be applied to the current page. Even numbers can be used on left pages, odd numbers on right pages." ;
};
commit 918899c7490d602258f77fba9e2c8a92d0601091
Author: Korrawit Pruegsanusak <detective.conan.1412 at gmail.com>
Date: Fri Nov 18 00:36:00 2011 +0700
cppcheck: unread variables
These variables are set, but unused.
diff --git a/sal/workben/clipboardwben/testpaste/cbptest.cxx b/sal/workben/clipboardwben/testpaste/cbptest.cxx
index 73507d9..eb9cb71 100644
--- a/sal/workben/clipboardwben/testpaste/cbptest.cxx
+++ b/sal/workben/clipboardwben/testpaste/cbptest.cxx
@@ -270,7 +270,6 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
case WM_COMMAND:
wmId = LOWORD(wParam);
- int wmEvent = HIWORD(wParam);
// Menüauswahlen analysieren:
switch( wmId )
{
diff --git a/sal/workben/clipboardwben/testviewer/cbvtest.cxx b/sal/workben/clipboardwben/testviewer/cbvtest.cxx
index 6cf74c5..b4ac1d5 100644
--- a/sal/workben/clipboardwben/testviewer/cbvtest.cxx
+++ b/sal/workben/clipboardwben/testviewer/cbvtest.cxx
@@ -217,7 +217,6 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
case WM_COMMAND:
wmId = LOWORD(wParam);
- int wmEvent = HIWORD(wParam);
// Menüauswahlen analysieren:
switch( wmId )
{
commit 2eeb9a193dcdb5cf9e942bfe4f219b5db2bb3603
Author: Miklos Vajna <vmiklos at frugalware.org>
Date: Thu Nov 17 17:18:54 2011 +0100
Related i#44806: Fix crash in dmapper when importing FILENAME fields
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index e6e9ad0..a7f047c 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2569,9 +2569,10 @@ void DomainMapper_Impl::CloseFieldCommand()
case FIELD_FILENAME:
{
sal_Int32 nNumberingTypeIndex = pContext->GetCommand().indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\\p")));
- xFieldProperties->setPropertyValue(
- rPropNameSupplier.GetName(PROP_FILE_FORMAT),
- uno::makeAny( nNumberingTypeIndex > 0 ? text::FilenameDisplayFormat::FULL : text::FilenameDisplayFormat::NAME ));
+ if (xFieldProperties.is())
+ xFieldProperties->setPropertyValue(
+ rPropNameSupplier.GetName(PROP_FILE_FORMAT),
+ uno::makeAny( nNumberingTypeIndex > 0 ? text::FilenameDisplayFormat::FULL : text::FilenameDisplayFormat::NAME ));
}
break;
case FIELD_FILESIZE : break;
commit b6dac3a529640cbe5520b0f5c93faf3d0a8c0a50
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Nov 17 17:57:23 2011 +0200
Do build cpputools also for non-DESKTOP OSes, needed for bridgetest
diff --git a/i18npool/prj/build.lst b/i18npool/prj/build.lst
index e95a27a..002516f 100644
--- a/i18npool/prj/build.lst
+++ b/i18npool/prj/build.lst
@@ -1,2 +1,2 @@
-inp i18npool : bridges sax stoc comphelper CPPUNIT:cppunit ICU:icu i18nutil regexp DESKTOP:cpputools LIBXSLT:libxslt udkapi ure unotest NULL
+inp i18npool : bridges sax stoc comphelper CPPUNIT:cppunit ICU:icu i18nutil regexp cpputools LIBXSLT:libxslt udkapi ure unotest NULL
inp i18npool\prj nmake - all inp_prj NULL
diff --git a/pyuno/prj/build.lst b/pyuno/prj/build.lst
index e6e0914..a7c1c5b 100644
--- a/pyuno/prj/build.lst
+++ b/pyuno/prj/build.lst
@@ -1,4 +1,4 @@
-bgpu pyuno : stoc DESKTOP:cpputools cppuhelper bridges tools PYTHON:python LIBXSLT:libxslt NULL
+bgpu pyuno : stoc cpputools cppuhelper bridges tools PYTHON:python LIBXSLT:libxslt NULL
pu pyuno usr1 - all br_mkout NULL
pu pyuno\zipcore nmake - all pu_zipcore NULL
pu pyuno\source\module nmake - all pu_module NULL
diff --git a/testtools/prj/build.lst b/testtools/prj/build.lst
index bd4bc2f..0b8f340 100644
--- a/testtools/prj/build.lst
+++ b/testtools/prj/build.lst
@@ -1,4 +1,4 @@
-tt testtools : DESKTOP:cpputools io remotebridges stoc javaunohelper PYUNO:pyuno cli_ure offapi ure LIBXSLT:libxslt NULL
+tt testtools : cpputools io remotebridges stoc javaunohelper PYUNO:pyuno cli_ure offapi ure LIBXSLT:libxslt NULL
tt testtools\inc nmake - all tt_inc NULL
tt testtools\source\bridgetest nmake - all tt_bridgetest tt_bridgetest_idl tt_inc NULL
tt testtools\source\bridgetest\cli nmake - w,vc7 tt_cli tt_bridgetest tt_bridgetest_idl tt_inc NULL
diff --git a/vcl/prj/build.lst b/vcl/prj/build.lst
index 29b3a40..4b0ece6 100644
--- a/vcl/prj/build.lst
+++ b/vcl/prj/build.lst
@@ -1,4 +1,4 @@
-vc vcl : TRANSLATIONS:translations apple_remote BOOST:boost DESKTOP:rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offapi basegfx basebmp tools DESKTOP:l10ntools icc DESKTOP:cpputools svl LIBXSLT:libxslt CAIRO:cairo NULL
+vc vcl : TRANSLATIONS:translations apple_remote BOOST:boost DESKTOP:rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offapi basegfx basebmp tools DESKTOP:l10ntools icc cpputools svl LIBXSLT:libxslt CAIRO:cairo NULL
vc vcl usr1 - all vc_mkout NULL
vc vcl\prj nmake - all vc_prj NULL
commit 8dfd54c5db6c85f283c2a86a7fcc8a0e8b8565c2
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Nov 17 17:40:49 2011 +0200
Do build stuff here also when cross-compiling (but don't run)
diff --git a/testtools/com/sun/star/comp/bridge/makefile.mk b/testtools/com/sun/star/comp/bridge/makefile.mk
index 0a6b9a8..7083f23 100644
--- a/testtools/com/sun/star/comp/bridge/makefile.mk
+++ b/testtools/com/sun/star/comp/bridge/makefile.mk
@@ -34,11 +34,6 @@ TARGET=com_sun_star_comp_bridge
.INCLUDE : settings.mk
-.IF "$(CROSS_COMPILING)"=="YES"
-all:
- @echo Nothing done when cross-compiling
-.ENDIF
-
# ------------------------------------------------------------------
.IF "$(SOLAR_JAVA)" != ""
diff --git a/testtools/source/bridgetest/idl/makefile.mk b/testtools/source/bridgetest/idl/makefile.mk
index dce276e..8b17273 100644
--- a/testtools/source/bridgetest/idl/makefile.mk
+++ b/testtools/source/bridgetest/idl/makefile.mk
@@ -31,11 +31,6 @@ TARGET := bridgetest_idl
.INCLUDE: settings.mk
-.IF "$(CROSS_COMPILING)"=="YES"
-all:
- @echo Nothing done when cross-compiling
-.ENDIF
-
.INCLUDE: target.mk
.IF "$(L10N_framework)"==""
diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk
index 6481abc..8d2f21b 100644
--- a/testtools/source/bridgetest/makefile.mk
+++ b/testtools/source/bridgetest/makefile.mk
@@ -36,11 +36,6 @@ LIBTARGET=NO
.INCLUDE: settings.mk
-.IF "$(CROSS_COMPILING)"=="YES"
-all:
- @echo Nothing done when cross-compiling
-.ENDIF
-
.IF "$(L10N_framework)"==""
DLLPRE = # no leading "lib" on .so files
@@ -141,6 +136,7 @@ ALLTAR: \
runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk \
$(SHL1TARGETN) $(SHL2TARGETN) $(SHL3TARGETN)
+.IF "$(CROSS_COMPILING)"!="YES"
.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP"
@echo "Mac OSX PPC GCC fails this test!, likely broken UNO bridge. Fix me."
.ELSE
@@ -149,6 +145,7 @@ runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk \
-s com.sun.star.test.bridge.BridgeTest -- \
com.sun.star.test.bridge.CppTestObject
.ENDIF
+.ENDIF
$(DLLDEST)/services.rdb :
$(COPY) $(SOLARXMLDIR)/ure/services.rdb $@
commit d21e40918ad5ba503ba606540b080c96050745be
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Nov 17 17:36:24 2011 +0200
Fix unintentional glitch
diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk
index a798b50..6481abc 100644
--- a/testtools/source/bridgetest/makefile.mk
+++ b/testtools/source/bridgetest/makefile.mk
@@ -79,7 +79,7 @@ LIB1TARGET=$(SLB)$/cppobj.lib
LIB1OBJFILES= \
$(SLO)$/cppobj.obj $(SLO)$/currentcontextchecker.obj $(SLO)$/multi.obj
-SHL1TARGET = $(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)cppobj.uno
+SHL1TARGET = $(ENFORCEDSHLPREFIX)cppobj.uno
SHL1STDLIBS= \
$(CPPULIB) \
$(CPPUHELPERLIB) \
@@ -98,7 +98,7 @@ LIB2OBJFILES= \
$(SLO)$/currentcontextchecker.obj \
$(SLO)$/multi.obj
-SHL2TARGET = $(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)bridgetest.uno
+SHL2TARGET = $(ENFORCEDSHLPREFIX)bridgetest.uno
SHL2STDLIBS= \
$(CPPULIB) \
$(CPPUHELPERLIB) \
@@ -109,7 +109,7 @@ SHL2DEF= $(MISC)$/$(SHL2TARGET).def
DEF2NAME= $(SHL2TARGET)
SHL2VERSIONMAP = $(SOLARENV)/src/component.map
-SHL3TARGET = $(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)constructors.uno
+SHL3TARGET = $(ENFORCEDSHLPREFIX)constructors.uno
SHL3OBJS = $(SLO)$/constructors.obj
SHL3STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
SHL3VERSIONMAP = $(SOLARENV)/src/component.map
commit 6514a49a014efd4134bfbaea732a4e8890d1ef48
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Nov 17 16:23:11 2011 +0200
Add the gcc3_uno library
diff --git a/sal/osl/android/Makefile b/sal/osl/android/Makefile
index ac28f1b..d60618a 100644
--- a/sal/osl/android/Makefile
+++ b/sal/osl/android/Makefile
@@ -31,11 +31,12 @@ all:
#
# Then libs and UNO components that the tests from other modules need.
#
- -for F in uno_cppu \
- uno_salhelpergcc3 \
- uno_cppuhelpergcc3 \
+ -for F in gcc3_uno \
reg \
store \
+ uno_cppu \
+ uno_salhelpergcc3 \
+ uno_cppuhelpergcc3 \
xmlreader \
bootstrap.uno; do \
test -f $(OUTDIR)/lib/lib$${F}.so && cp $(OUTDIR)/lib/lib$${F}.so $(SODEST); \
commit 6436e62e400f699a9e23f37731489f178a9bbf33
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Nov 17 16:21:50 2011 +0200
Let's try using the gcc3_linux_arm code for Android, too
diff --git a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
index c21fb76..21c335b 100644
--- a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
@@ -39,7 +39,8 @@
/*See: http://people.redhat.com/drepper/selinux-mem.html*/
#if defined(LINUX) || defined(OPENBSD) || defined(FREEBSD) \
- || defined(NETBSD) || defined(DRAGONFLY)
+ || defined(NETBSD) || defined(DRAGONFLY) \
+ || defined(ANDROID) /* Not sure about Android, but let's see... */
#define USE_DOUBLE_MMAP
#endif
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk
index 9048f2c..2524792 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk
@@ -39,7 +39,7 @@ NO_BSYMBOLIC=TRUE
# --- Files --------------------------------------------------------
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCLINUXRgcc3"
+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCLINUXRgcc3" || "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCANDROIDRgcc3"
CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
commit 40e5b53180475eac5996adba06264f3fe3fcf87f
Author: Andras Timar <atimar at suse.com>
Date: Thu Nov 17 15:59:17 2011 +0100
don't create download (nsis) install sets on Windows
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index b3db464..ae4b751 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -1869,6 +1869,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
{
my $create_download = 0;
if ( $$downloadname ne "" ) { $create_download = 1; }
+ if ( $installer::globals::iswindowsbuild ) { $create_download = 0; }
if (( $is_success ) && ( $create_download ) && ( $ENV{'ENABLE_DOWNLOADSETS'} ))
{
my $downloaddir = installer::download::create_download_sets($finalinstalldir, $includepatharrayref, $allvariableshashref, $$downloadname, $languagestringref, $languagesarrayref);
@@ -2349,6 +2350,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
if ( $is_success ) { installer::followme::save_followme_info($finalinstalldir, $includepatharrayref, $allvariableshashref, $$downloadname, $languagestringref, $languagesarrayref, $current_install_number, $loggingdir, $installlogdir); }
if ( $$downloadname ne "" ) { $create_download = 1; }
+ if ( $installer::globals::iswindowsbuild ) { $create_download = 0; }
if (( $is_success ) && ( $create_download ) && ( $ENV{'ENABLE_DOWNLOADSETS'} ))
{
my $downloaddir = installer::download::create_download_sets($finalinstalldir, $includepatharrayref, $allvariableshashref, $$downloadname, $languagestringref, $languagesarrayref);
commit da843d8da14b7ac072b69974b6054f1d601e0ff8
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Nov 17 15:56:41 2011 +0200
Missing semicolon
diff --git a/sal/osl/unx/module.c b/sal/osl/unx/module.c
index b79dfbc..952449d 100644
--- a/sal/osl/unx/module.c
+++ b/sal/osl/unx/module.c
@@ -99,7 +99,7 @@ static sal_Bool getModulePathFromAddress(void * address, rtl_String ** path) {
int (*lo_dladdr)(void *, Dl_info *) = dlsym(RTLD_DEFAULT, "lo_dladdr");
result = (*lo_dladdr)(address, &dl_info);
#else
- result = dladdr(address, &dl_info)
+ result = dladdr(address, &dl_info);
#endif
if (result != 0)
commit 3ee7dd2f56cc56cf9da838bac19b0b852cad6946
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Nov 17 15:16:30 2011 +0200
Look for libboostrap.uno.so and not bootstrap.uno.so on Android
Not sure if we need to be more generic here, and always add a "lib"
prefix if not present. Or do the changes to the makefilery take care
of it, so that for other UNO components than bootstrap, the name as
stored wherever it is stored does contain the "lib" prefix we are
forces to use on Android?
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 9414e34..8bce73d 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -464,7 +464,14 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory(
SAL_THROW( (loader::CannotActivateFactoryException) )
{
#ifndef IOS
- OUString aModulePath( makeComponentPath( rLibName, rPath ) );
+ OUString sLibName(rLibName);
+
+#ifdef ANDROID
+ if ( rLibName.equals( OUSTR("bootstrap.uno" SAL_DLLEXTENSION) ) )
+ sLibName = OUSTR("libbootstrap.uno" SAL_DLLEXTENSION);
+#endif
+
+ OUString aModulePath( makeComponentPath( sLibName, rPath ) );
if (! checkAccessPath( &aModulePath ))
{
throw loader::CannotActivateFactoryException(
commit f17c0633773666b9077b4fe2349c7485881b1a68
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Nov 17 15:16:10 2011 +0200
Look for lo_main() and not main() on Android
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index 003e136..b795bbc 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -130,8 +130,16 @@ oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl (
{
oslProcessError result = osl_Process_E_NotFound;
+#ifdef ANDROID
+ /* On Android we want the address of the "lo_main()" function, as
+ * that is what corresponds to "main()" in LibreOffice programs on
+ * normal desktop OSes.
+ */
+ void * addr = dlsym (RTLD_DEFAULT, "lo_main");
+#else
/* Determine address of "main()" function. */
void * addr = dlsym (RTLD_DEFAULT, "main");
+#endif
if (addr != 0)
{
/* Determine module URL. */
commit 20d1555ac752f3f7bb990e021b89b5df52bd786f
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Nov 17 15:15:14 2011 +0200
Use lo_dladdr() on Android
diff --git a/sal/osl/unx/module.c b/sal/osl/unx/module.c
index 824a629..b79dfbc 100644
--- a/sal/osl/unx/module.c
+++ b/sal/osl/unx/module.c
@@ -95,9 +95,19 @@ static sal_Bool getModulePathFromAddress(void * address, rtl_String ** path) {
#else
Dl_info dl_info;
- if ((result = dladdr(address, &dl_info)) != 0)
+#ifdef ANDROID
+ int (*lo_dladdr)(void *, Dl_info *) = dlsym(RTLD_DEFAULT, "lo_dladdr");
+ result = (*lo_dladdr)(address, &dl_info);
+#else
+ result = dladdr(address, &dl_info)
+#endif
+
+ if (result != 0)
{
rtl_string_newFromStr(path, dl_info.dli_fname);
+#ifdef ANDROID
+ free((void *) dl_info.dli_fname);
+#endif
result = sal_True;
}
else
commit 2f2c08a4bdef3d6ed175e43a57181fa012393a6a
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Nov 17 15:04:28 2011 +0200
Add more libraries
diff --git a/sal/osl/android/Makefile b/sal/osl/android/Makefile
index 510580a..ac28f1b 100644
--- a/sal/osl/android/Makefile
+++ b/sal/osl/android/Makefile
@@ -31,11 +31,14 @@ all:
#
# Then libs and UNO components that the tests from other modules need.
#
- -for F in libuno_cppu \
- libuno_salhelpergcc3 \
- libuno_cppuhelpergcc3 \
- libbootstrap.uno; do \
- test -f $(OUTDIR)/lib/$${F}.so && cp $(OUTDIR)/lib/$${F}.so $(SODEST); \
+ -for F in uno_cppu \
+ uno_salhelpergcc3 \
+ uno_cppuhelpergcc3 \
+ reg \
+ store \
+ xmlreader \
+ bootstrap.uno; do \
+ test -f $(OUTDIR)/lib/lib$${F}.so && cp $(OUTDIR)/lib/lib$${F}.so $(SODEST); \
done
#
# Then the shared GNU C++ library
commit 234d5efeb99a22836e746886a84010a48e893022
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Nov 17 14:03:59 2011 +0200
Add lo_dladdr(), a wrapper for Android's dladdr()
Android's dladdr() stores just the basename of a shared object in
Dl_info::dli_fname. LibreOffice expects either a complete absolute
pathname or a relative path from the current directory to be returned
there. So look up the full pathname of the library from
/proc/self/maps.
Also remove the fallback message loop after lo_main() returns, instead
just exit.
diff --git a/sal/osl/android/jni/lo-bootstrap.c b/sal/osl/android/jni/lo-bootstrap.c
index c5e1905..04540a9 100644
--- a/sal/osl/android/jni/lo-bootstrap.c
+++ b/sal/osl/android/jni/lo-bootstrap.c
@@ -29,6 +29,7 @@
#include <string.h>
#include <stdlib.h>
+#include <stdio.h>
#include <sys/stat.h>
#include <unistd.h>
@@ -562,6 +563,53 @@ lo_dlsym(void *handle,
}
int
+lo_dladdr(void *addr,
+ Dl_info *info)
+{
+ FILE *maps;
+ char line[200];
+ int result;
+
+ result = dladdr(addr, info);
+ if (result != 0)
+ LOGI("dladdr(%p) = { %s:%p, %s:%p ]",
+ addr,
+ info->dli_fname, info->dli_fbase,
+ info->dli_sname ? info->dli_sname : "(none)", info->dli_saddr);
+ else {
+ LOGI("dladdr(%p) = 0", addr);
+ return 0;
+ }
+
+ maps = fopen("/proc/self/maps", "r");
+ if (maps == NULL) {
+ LOGI("lo_dladdr: Could not open /proc/self/maps: %s", strerror(errno));
+ return 0;
+ }
+ while (fgets(line, sizeof(line), maps) != NULL &&
+ line[strlen(line)-1] == '\n') {
+ void *lo, *hi;
+ char file[sizeof(line)];
+ file[0] = '\0';
+ if (sscanf(line, "%x-%x %*s %*x %*x:%*x %*d %[^\n]", &lo, &hi, file) == 3) {
+ /* LOGI("got %p-%p: %s", lo, hi, file); */
+ if (addr >= lo && addr < hi) {
+ if (info->dli_fbase != lo) {
+ LOGI("lo_dladdr: Base for %s in /proc/self/maps %p doesn't match what dladdr() said", file, lo);
+ fclose(maps);
+ return 0;
+ }
+ info->dli_fname = strdup(file);
+ break;
+ }
+ }
+ }
+ fclose(maps);
+
+ return result;
+}
+
+int
lo_dlcall_argc_argv(void *function,
int argc,
const char **argv)
@@ -584,27 +632,7 @@ void android_main(struct android_app* state)
lo_main(lo_main_argc, lo_main_argv);
- while (1) {
- // Read all pending events.
- int ident;
- int events;
- struct android_poll_source* source;
-
- while ((ident=ALooper_pollAll(-1, NULL, &events,
- (void**)&source)) >= 0) {
- LOGI("got an event ident=%d", ident);
-
- // Process this event.
- if (source != NULL) {
- source->process(state, source);
- }
-
- // Check if we are exiting.
- if (state->destroyRequested != 0) {
- return;
- }
- }
- }
+ exit(0);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/android/jni/lo-bootstrap.h b/sal/osl/android/jni/lo-bootstrap.h
index a46094c..523ba99 100644
--- a/sal/osl/android/jni/lo-bootstrap.h
+++ b/sal/osl/android/jni/lo-bootstrap.h
@@ -29,6 +29,8 @@
#if defined(ANDROID)
+#include <dlfcn.h>
+
char **lo_dlneeds(const char *library);
void *lo_dlopen(const char *library);
@@ -37,6 +39,9 @@ void *lo_dlopen(const char *library);
void *lo_dlsym(void *handle,
const char *symbol);
+int lo_dladdr(void *addr,
+ Dl_info *info);
+
int lo_dlcall_argc_argv(void *function,
int argc,
const char **argv);
commit a4efa8ae148f6c132d0a6145c599282c1fef9449
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Nov 17 14:02:45 2011 +0200
Include also the boostrap UNO component
diff --git a/sal/osl/android/Makefile b/sal/osl/android/Makefile
index 1fb7aa1..510580a 100644
--- a/sal/osl/android/Makefile
+++ b/sal/osl/android/Makefile
@@ -29,9 +29,12 @@ all:
test -f $(WORKDIR)/LinkTarget/CppunitTest/libtest_$${F}.so && cp $(WORKDIR)/LinkTarget/CppunitTest/libtest_$${F}.so $(SODEST); \
done
#
-# Then libs that the tests from other modules need.
+# Then libs and UNO components that the tests from other modules need.
#
- -for F in libuno_cppu libuno_salhelpergcc3 libuno_cppuhelpergcc3; do \
+ -for F in libuno_cppu \
+ libuno_salhelpergcc3 \
+ libuno_cppuhelpergcc3 \
+ libbootstrap.uno; do \
test -f $(OUTDIR)/lib/$${F}.so && cp $(OUTDIR)/lib/$${F}.so $(SODEST); \
done
#
commit 3c1c4b7d21b0fe9d8377739f08feafe728390b3c
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Wed Nov 16 22:18:23 2011 +0200
Enforce a "lib" prefix for UNO components for Android
This commit for the old build system. (Don't bother for components not
relevant for Android.)
The Android package installer (as invoked through "adb install", from
"ant debug install") silently ignores native libraries in app packages
(.apk files) whose names don't start with "lib" and end with ".so".
The package builder (as invoked through "ant debug") in the SDK gladly
includes also thusly named native libraries in the .apk, though. Yay
for consistency.
diff --git a/bridges/test/java_uno/acquire/makefile.mk b/bridges/test/java_uno/acquire/makefile.mk
index def12dd..bdcf6d1 100644
--- a/bridges/test/java_uno/acquire/makefile.mk
+++ b/bridges/test/java_uno/acquire/makefile.mk
@@ -40,7 +40,7 @@ INCPRE += $(MISC)$/$(TARGET)$/inc
SLOFILES = $(SLO)$/testacquire.obj
-SHL1TARGET = testacquire.uno
+SHL1TARGET = $(ENFORCEDSHLPREFIX)testacquire.uno
SHL1OBJS = $(SLOFILES)
SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
SHL1VERSIONMAP = $(SOLARENV)/src/component.map
diff --git a/bridges/test/java_uno/equals/makefile.mk b/bridges/test/java_uno/equals/makefile.mk
index 9ac266f..1da99e4 100644
--- a/bridges/test/java_uno/equals/makefile.mk
+++ b/bridges/test/java_uno/equals/makefile.mk
@@ -47,7 +47,7 @@ INCPRE += $(MISC)$/$(TARGET)$/inc
SLOFILES = $(SLO)$/testequals.obj
-SHL1TARGET = testequals.uno
+SHL1TARGET = $(ENFORCEDSHLPREFIX)testequals.uno
SHL1OBJS = $(SLOFILES)
SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
SHL1VERSIONMAP = $(SOLARENV)/src/component.map
diff --git a/bridges/test/java_uno/nativethreadpool/makefile.mk b/bridges/test/java_uno/nativethreadpool/makefile.mk
index d4926e0..6e481b1 100644
--- a/bridges/test/java_uno/nativethreadpool/makefile.mk
+++ b/bridges/test/java_uno/nativethreadpool/makefile.mk
@@ -45,13 +45,13 @@ ERROR -- missing platform
DLLPRE = # no leading "lib" on .so files
INCPRE += $(MISC)$/$(TARGET)$/inc
-SHL1TARGET = $(TARGET)_client.uno
+SHL1TARGET = $(ENFORCEDSHLPREFIX)$(TARGET)_client.uno
SHL1OBJS = $(SLO)$/testnativethreadpoolclient.obj
SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
SHL1VERSIONMAP = version.map
SHL1IMPLIB = i$(TARGET)_client
-SHL2TARGET = $(TARGET)_server.uno
+SHL2TARGET = $(ENFORCEDSHLPREFIX)$(TARGET)_server.uno
SHL2OBJS = $(SLO)$/testnativethreadpoolserver.obj
SHL2STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
SHL2VERSIONMAP = version.map
diff --git a/configmgr/prj/d.lst b/configmgr/prj/d.lst
index e2eac0f..eb33e57 100644
--- a/configmgr/prj/d.lst
+++ b/configmgr/prj/d.lst
@@ -1,4 +1,4 @@
-..\%__SRC%\bin\configmgr.uno.dll %_DEST%\bin\configmgr.uno.dll
-..\%__SRC%\lib\configmgr.uno.dylib %_DEST%\lib\configmgr.uno.dylib
-..\%__SRC%\lib\configmgr.uno.so %_DEST%\lib\configmgr.uno.so
+..\%__SRC%\bin\*.uno.dll %_DEST%\bin\*.uno.dll
+..\%__SRC%\lib\*.uno.dylib %_DEST%\lib\*.uno.dylib
+..\%__SRC%\lib\*.uno.so %_DEST%\lib\*.uno.so
..\%__SRC%\misc\configmgr.component %_DEST%\xml\configmgr.component
diff --git a/configmgr/source/makefile.mk b/configmgr/source/makefile.mk
old mode 100755
new mode 100644
index 94747d9..e75af0d
--- a/configmgr/source/makefile.mk
+++ b/configmgr/source/makefile.mk
@@ -76,7 +76,7 @@ SHL1STDLIBS = \
$(SALHELPERLIB) \
$(SALLIB) \
$(XMLREADERLIB)
-SHL1TARGET = configmgr.uno
+SHL1TARGET = $(ENFORCEDSHLPREFIX)configmgr.uno
SHL1USE_EXPORTS = name
DEF1NAME = $(SHL1TARGET)
diff --git a/cppcanvas/source/uno/makefile.mk b/cppcanvas/source/uno/makefile.mk
index 5e06f4f..589728c 100644
--- a/cppcanvas/source/uno/makefile.mk
+++ b/cppcanvas/source/uno/makefile.mk
@@ -44,7 +44,7 @@ CDEFS+= -DVERBOSE
SLOFILES = $(SLO)$/uno_mtfrenderer.obj
-SHL1TARGET=$(TARGET).uno
+SHL1TARGET=$(ENFORCEDSHLPREFIX)$(TARGET).uno
SHL1STDLIBS= $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) $(CPPCANVASLIB) $(BASEGFXLIB)
diff --git a/cppuhelper/qa/propertysetmixin/makefile.mk b/cppuhelper/qa/propertysetmixin/makefile.mk
index 02bb629..7290ec4 100644
--- a/cppuhelper/qa/propertysetmixin/makefile.mk
+++ b/cppuhelper/qa/propertysetmixin/makefile.mk
@@ -60,7 +60,7 @@ SHL1IMPLIB = i$(SHL1TARGET)
SHL1RPATH = NONE
DEF1NAME = $(SHL1TARGET)
-SHL2TARGET = $(TARGET).uno
+SHL2TARGET = $(ENFORCEDSHLPREFIX)$(TARGET).uno
SHL2OBJS = $(SLO)/comp_propertysetmixin.obj
SHL2USE_EXPORTS = name
SHL2STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
diff --git a/io/source/TextInputStream/makefile.mk b/io/source/TextInputStream/makefile.mk
index ea476c5..3c7ed2b 100644
--- a/io/source/TextInputStream/makefile.mk
+++ b/io/source/TextInputStream/makefile.mk
@@ -28,7 +28,7 @@
PRJ=..$/..
PRJNAME=io
-TARGET = textinstream.uno
+TARGET = $(ENFORCEDSHLPREFIX)textinstream.uno
ENABLE_EXCEPTIONS=TRUE
# --- Settings -----------------------------------------------------
diff --git a/io/source/TextOutputStream/makefile.mk b/io/source/TextOutputStream/makefile.mk
index 2c9d4eb..37c913c 100644
--- a/io/source/TextOutputStream/makefile.mk
+++ b/io/source/TextOutputStream/makefile.mk
@@ -28,7 +28,7 @@
PRJ=..$/..
PRJNAME=io
-TARGET = textoutstream.uno
+TARGET = $(ENFORCEDSHLPREFIX)textoutstream.uno
ENABLE_EXCEPTIONS=TRUE
# --- Settings -----------------------------------------------------
diff --git a/io/source/acceptor/makefile.mk b/io/source/acceptor/makefile.mk
index bbc7ac6..cfa6f5f 100644
--- a/io/source/acceptor/makefile.mk
+++ b/io/source/acceptor/makefile.mk
@@ -28,7 +28,7 @@
PRJ=..$/..
PRJNAME=io
-TARGET = acceptor.uno
+TARGET = $(ENFORCEDSHLPREFIX)acceptor.uno
ENABLE_EXCEPTIONS=TRUE
NO_BSYMBOLIC=TRUE
COMP1TYPELIST = acceptor
diff --git a/io/source/connector/makefile.mk b/io/source/connector/makefile.mk
index e3a67ab..dbd0ff2 100644
--- a/io/source/connector/makefile.mk
+++ b/io/source/connector/makefile.mk
@@ -28,7 +28,7 @@
PRJ=..$/..
PRJNAME=io
-TARGET = connector.uno
+TARGET = $(ENFORCEDSHLPREFIX)connector.uno
ENABLE_EXCEPTIONS=TRUE
NO_BSYMBOLIC=TRUE
COMP1TYPELIST = connectr
diff --git a/io/source/stm/makefile.mk b/io/source/stm/makefile.mk
index 52dd0c4..5a6c78a 100644
--- a/io/source/stm/makefile.mk
+++ b/io/source/stm/makefile.mk
@@ -27,7 +27,7 @@
PRJ=..$/..
PRJNAME=io
-TARGET = streams.uno
+TARGET = $(ENFORCEDSHLPREFIX)streams.uno
ENABLE_EXCEPTIONS=TRUE
NO_BSYMBOLIC=TRUE
diff --git a/pyuno/source/loader/makefile.mk b/pyuno/source/loader/makefile.mk
index 4c779cc..1760a88 100644
--- a/pyuno/source/loader/makefile.mk
+++ b/pyuno/source/loader/makefile.mk
@@ -27,7 +27,7 @@
PRJ=../..
PRJNAME=pyuno
-TARGET=pythonloader.uno
+TARGET=$(ENFORCEDSHLPREFIX)pythonloader.uno
ENABLE_EXCEPTIONS=TRUE
# --- Settings -----------------------------------------------------
diff --git a/remotebridges/source/unourl_resolver/makefile.mk b/remotebridges/source/unourl_resolver/makefile.mk
index edf5aa7..8e7e8f7 100644
--- a/remotebridges/source/unourl_resolver/makefile.mk
+++ b/remotebridges/source/unourl_resolver/makefile.mk
@@ -27,7 +27,7 @@
PRJ=..$/..
PRJNAME=remotebridges
-TARGET = uuresolver.uno
+TARGET = $(ENFORCEDSHLPREFIX)uuresolver.uno
ENABLE_EXCEPTIONS=TRUE
COMP1TYPELIST = uuresolver
diff --git a/sdext/source/pdfimport/makefile.mk b/sdext/source/pdfimport/makefile.mk
index 64fc1af..9262ef6 100644
--- a/sdext/source/pdfimport/makefile.mk
+++ b/sdext/source/pdfimport/makefile.mk
@@ -58,7 +58,7 @@ SLOFILES=\
$(SLO)$/services.obj
SHL1DLLPRE=
-SHL1TARGET=$(TARGET).uno
+SHL1TARGET=$(ENFORCEDSHLPREFIX)$(TARGET).uno
SHL1LIBS=\
$(SLB)$/pdfmisc.lib \
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index a085439..e1d15a5 100644
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -99,7 +99,7 @@ SLOFILES= \
# --- Library -----------------------------------
-SHL1TARGET= $(TARGET).uno
+SHL1TARGET=$(ENFORCEDSHLPREFIX)$(TARGET).uno
SHL1STDLIBS= $(CPPUHELPERLIB) \
$(CPPULIB) \
diff --git a/solenv/inc/unxandr.mk b/solenv/inc/unxandr.mk
index 52c92da..49b481a 100644
--- a/solenv/inc/unxandr.mk
+++ b/solenv/inc/unxandr.mk
@@ -50,3 +50,7 @@ STDLIBCUIMT+=-llog -landroid -lgnustl_shared
STDSHLGUIMT+=-llog -landroid -lgnustl_shared
STDSHLCUIMT+=-llog -landroid -lgnustl_shared
+# All shared libraries we build must start with "lib" because
+# otherwise the Android package installer will not unpack them from
+# the .apk into the app's lib directory
+ENFORCEDSHLPREFIX=lib
diff --git a/stoc/source/corereflection/makefile.mk b/stoc/source/corereflection/makefile.mk
index a546a8a..1f4b4a5 100644
--- a/stoc/source/corereflection/makefile.mk
+++ b/stoc/source/corereflection/makefile.mk
@@ -27,7 +27,7 @@
PRJ=..$/..
PRJNAME= stoc
-TARGET = reflection.uno
+TARGET = $(ENFORCEDSHLPREFIX)reflection.uno
ENABLE_EXCEPTIONS=TRUE
COMP1TYPELIST = corefl
diff --git a/stoc/source/inspect/makefile.mk b/stoc/source/inspect/makefile.mk
index 60864ee..62bf365 100644
--- a/stoc/source/inspect/makefile.mk
+++ b/stoc/source/inspect/makefile.mk
@@ -27,7 +27,7 @@
PRJ=..$/..
PRJNAME= stoc
-TARGET = introspection.uno
+TARGET = $(ENFORCEDSHLPREFIX)introspection.uno
ENABLE_EXCEPTIONS=TRUE
COMP1TYPELIST = insp
diff --git a/stoc/source/invocation/makefile.mk b/stoc/source/invocation/makefile.mk
index 72eeea3..214873d 100644
--- a/stoc/source/invocation/makefile.mk
+++ b/stoc/source/invocation/makefile.mk
@@ -27,7 +27,7 @@
PRJ=..$/..
PRJNAME= stoc
-TARGET = invocation.uno
+TARGET = $(ENFORCEDSHLPREFIX)invocation.uno
ENABLE_EXCEPTIONS=TRUE
COMP1TYPELIST = inv
diff --git a/stoc/source/invocation_adapterfactory/makefile.mk b/stoc/source/invocation_adapterfactory/makefile.mk
index 4c3450a..49bbc1a 100644
--- a/stoc/source/invocation_adapterfactory/makefile.mk
+++ b/stoc/source/invocation_adapterfactory/makefile.mk
@@ -27,7 +27,7 @@
PRJ=..$/..
PRJNAME=stoc
-TARGET = invocadapt.uno
+TARGET = $(ENFORCEDSHLPREFIX)invocadapt.uno
ENABLE_EXCEPTIONS=TRUE
COMP1TYPELIST = invadp
diff --git a/stoc/source/javaloader/makefile.mk b/stoc/source/javaloader/makefile.mk
index e53b90d..1df3b6c 100644
--- a/stoc/source/javaloader/makefile.mk
+++ b/stoc/source/javaloader/makefile.mk
@@ -28,7 +28,7 @@
PRJ=..$/..
PRJNAME=stoc
-TARGET = javaloader.uno
+TARGET = $(ENFORCEDSHLPREFIX)javaloader.uno
ENABLE_EXCEPTIONS=TRUE
COMP1TYPELIST = javaloader
diff --git a/stoc/source/javavm/makefile.mk b/stoc/source/javavm/makefile.mk
index bcd36e6..6c38f60 100644
--- a/stoc/source/javavm/makefile.mk
+++ b/stoc/source/javavm/makefile.mk
@@ -27,7 +27,7 @@
PRJ=..$/..
PRJNAME=stoc
-TARGET = javavm.uno
+TARGET = $(ENFORCEDSHLPREFIX)javavm.uno
ENABLE_EXCEPTIONS=TRUE
COMP1TYPELIST = jen
diff --git a/stoc/source/namingservice/makefile.mk b/stoc/source/namingservice/makefile.mk
index cc98cdf..149874c 100644
--- a/stoc/source/namingservice/makefile.mk
+++ b/stoc/source/namingservice/makefile.mk
@@ -27,7 +27,7 @@
PRJ=..$/..
PRJNAME= stoc
-TARGET = namingservice.uno
+TARGET = $(ENFORCEDSHLPREFIX)namingservice.uno
ENABLE_EXCEPTIONS=TRUE
COMP1TYPELIST = namingservice
diff --git a/stoc/source/proxy_factory/makefile.mk b/stoc/source/proxy_factory/makefile.mk
index 23146e6..0a8a923 100644
--- a/stoc/source/proxy_factory/makefile.mk
+++ b/stoc/source/proxy_factory/makefile.mk
@@ -28,7 +28,7 @@
PRJ=..$/..
PRJNAME=stoc
-TARGET = proxyfac.uno
+TARGET = $(ENFORCEDSHLPREFIX)proxyfac.uno
ENABLE_EXCEPTIONS=TRUE
COMP1TYPELIST = proxyfac
diff --git a/stoc/test/registry_tdprovider/makefile.mk b/stoc/test/registry_tdprovider/makefile.mk
index f258963..f4d5d7b 100644
--- a/stoc/test/registry_tdprovider/makefile.mk
+++ b/stoc/test/registry_tdprovider/makefile.mk
@@ -38,7 +38,7 @@ DLLPRE = # no leading "lib" on .so files
SLOFILES = $(SLO)$/testregistrytdprovider.obj
-SHL1TARGET = testregistrytdprovider.uno
+SHL1TARGET = $(ENFORCEDSHLPREFIX)testregistrytdprovider.uno
SHL1OBJS = $(SLOFILES)
SHL1VERSIONMAP = $(SOLARENV)/src/component.map
SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
diff --git a/stoc/test/tdmanager/makefile.mk b/stoc/test/tdmanager/makefile.mk
index 8f39ac5..488378f 100644
--- a/stoc/test/tdmanager/makefile.mk
+++ b/stoc/test/tdmanager/makefile.mk
@@ -38,7 +38,7 @@ DLLPRE = # no leading "lib" on .so files
SLOFILES = $(SLO)$/testtdmanager.obj
-SHL1TARGET = testtdmanager.uno
+SHL1TARGET = $(ENFORCEDSHLPREFIX)testtdmanager.uno
SHL1OBJS = $(SLOFILES)
SHL1VERSIONMAP = $(SOLARENV)/src/component.map
SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
diff --git a/stoc/util/makefile.mk b/stoc/util/makefile.mk
index 32f229c..8f58e09 100644
--- a/stoc/util/makefile.mk
+++ b/stoc/util/makefile.mk
@@ -37,7 +37,7 @@ DLLPRE =
# ------------------------------------------------------------------
-SHL1TARGET= $(TARGET)
+SHL1TARGET= $(ENFORCEDSHLPREFIX)$(TARGET)
LIB1TARGET= $(SLB)$/$(TARGET).lib
LIB1FILES= $(SLB)$/bootstrap.lib \
@@ -68,7 +68,7 @@ SHL1RPATH= URELIB
DEF1NAME= $(SHL1TARGET)
-SHL2TARGET= stocservices.uno
+SHL2TARGET= $(ENFORCEDSHLPREFIX)stocservices.uno
LIB2TARGET= $(SLB)$/stocservices.uno.lib
LIB2FILES= \
diff --git a/testtools/source/bridgetest/cli/makefile.mk b/testtools/source/bridgetest/cli/makefile.mk
index 3e5fd43..a8c7cb3 100644
--- a/testtools/source/bridgetest/cli/makefile.mk
+++ b/testtools/source/bridgetest/cli/makefile.mk
@@ -28,7 +28,7 @@
PRJ=..$/..$/..
PRJNAME=testtools
-TARGET=cli_cpp_bridgetest.uno
+TARGET=$(ENFORCEDSHLPREFIX)cli_cpp_bridgetest.uno
USE_DEFFILE=TRUE
NO_BSYMBOLIC=TRUE
ENABLE_EXCEPTIONS=TRUE
diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk
index 31c5b7e..a798b50 100644
--- a/testtools/source/bridgetest/makefile.mk
+++ b/testtools/source/bridgetest/makefile.mk
@@ -79,7 +79,7 @@ LIB1TARGET=$(SLB)$/cppobj.lib
LIB1OBJFILES= \
$(SLO)$/cppobj.obj $(SLO)$/currentcontextchecker.obj $(SLO)$/multi.obj
-SHL1TARGET = cppobj.uno
+SHL1TARGET = $(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)cppobj.uno
SHL1STDLIBS= \
$(CPPULIB) \
$(CPPUHELPERLIB) \
@@ -98,7 +98,7 @@ LIB2OBJFILES= \
$(SLO)$/currentcontextchecker.obj \
$(SLO)$/multi.obj
-SHL2TARGET = bridgetest.uno
+SHL2TARGET = $(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)bridgetest.uno
SHL2STDLIBS= \
$(CPPULIB) \
$(CPPUHELPERLIB) \
@@ -109,7 +109,7 @@ SHL2DEF= $(MISC)$/$(SHL2TARGET).def
DEF2NAME= $(SHL2TARGET)
SHL2VERSIONMAP = $(SOLARENV)/src/component.map
-SHL3TARGET = constructors.uno
+SHL3TARGET = $(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)constructors.uno
SHL3OBJS = $(SLO)$/constructors.obj
SHL3STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
SHL3VERSIONMAP = $(SOLARENV)/src/component.map
diff --git a/testtools/source/performance/makefile.mk b/testtools/source/performance/makefile.mk
index a4b179b..a7f2d6b 100644
--- a/testtools/source/performance/makefile.mk
+++ b/testtools/source/performance/makefile.mk
@@ -43,7 +43,7 @@ LIB1TARGET=$(SLB)$/perftest.lib
LIB1OBJFILES= \
$(SLO)$/ubtest.obj
-SHL1TARGET = perftest.uno
+SHL1TARGET = $(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)perftest.uno
SHL1VERSIONMAP = $(SOLARENV)$/src$/component.map
@@ -62,7 +62,7 @@ LIB2TARGET=$(SLB)$/perfobj.lib
LIB2OBJFILES= \
$(SLO)$/ubobject.obj
-SHL2TARGET = perfobj.uno
+SHL2TARGET = $(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)perfobj.uno
SHL2VERSIONMAP = $(SOLARENV)$/src$/component.map
diff --git a/ucb/source/ucp/expand/makefile.mk b/ucb/source/ucp/expand/makefile.mk
index 70e4411..9182517 100644
--- a/ucb/source/ucp/expand/makefile.mk
+++ b/ucb/source/ucp/expand/makefile.mk
@@ -28,7 +28,7 @@
PRJ = ..$/..$/..
PRJNAME = ucb
UCPEXPAND_MAJOR = 1
-TARGET = ucpexpand$(UCPEXPAND_MAJOR).uno
+TARGET = $(ENFORCEDSHLPREFIX)ucpexpand$(UCPEXPAND_MAJOR).uno
ENABLE_EXCEPTIONS = TRUE
NO_BSYMBOLIC = TRUE
diff --git a/ucb/source/ucp/ext/makefile.mk b/ucb/source/ucp/ext/makefile.mk
index b5f2734..b9e9a11 100644
--- a/ucb/source/ucp/ext/makefile.mk
+++ b/ucb/source/ucp/ext/makefile.mk
@@ -27,7 +27,7 @@
PRJ = ..$/..$/..
PRJNAME = ucb
-TARGET = ucpext.uno
+TARGET = $(ENFORCEDSHLPREFIX)ucpext.uno
ENABLE_EXCEPTIONS = TRUE
.INCLUDE : settings.mk
diff --git a/ucb/source/ucp/tdoc/makefile.mk b/ucb/source/ucp/tdoc/makefile.mk
index 82c76b3..611a269 100644
--- a/ucb/source/ucp/tdoc/makefile.mk
+++ b/ucb/source/ucp/tdoc/makefile.mk
@@ -29,7 +29,7 @@ PRJ=..$/..$/..
PRJNAME=ucb
# Version
UCPTDOC_MAJOR=1
-TARGET=ucptdoc$(UCPTDOC_MAJOR).uno
+TARGET=$(ENFORCEDSHLPREFIX)ucptdoc$(UCPTDOC_MAJOR).uno
ENABLE_EXCEPTIONS=TRUE
USE_DEFFILE=TRUE
NO_BSYMBOLIC=TRUE
commit 1b37f384ae83939dc6e0797868a8d02ef2612606
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Wed Nov 16 17:39:23 2011 +0200
Copy more shared objects for unit testing
diff --git a/sal/osl/android/Makefile b/sal/osl/android/Makefile
index 2a606c4..1fb7aa1 100644
--- a/sal/osl/android/Makefile
+++ b/sal/osl/android/Makefile
@@ -1,21 +1,51 @@
NDK_HOME:=$(shell type -p ndk-build)
NDK_HOME:=$(shell dirname $(NDK_HOME))
+SODEST=libs/armeabi-v7a
+
all:
ndk-build V=1
+#
# Copy shared libraries we need to libs/armeabi-v7a so that ant will
-# include them in the .apk
- cp ../../unxandr.pro/bin/cppunittester libs/armeabi-v7a/libcppunittester.so
- cp ../../../solver/unxandr.pro/lib/libcppunit-1.12.so libs/armeabi-v7a
- cp ../../unxandr.pro/lib/*.so libs/armeabi-v7a
- cp $(NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so libs/armeabi-v7a
+# include them in the .apk.
+# First ones from here, sal
+ cp ../../$(INPATH)/bin/cppunittester $(SODEST)/libcppunittester.so
+#
+# Then the cppunit library
+ cp $(OUTDIR)/lib/libcppunit-1.12.so $(SODEST)
+#
+# Then cppunit "plug-ins", first ones from sal
+#
+ cp ../../$(INPATH)/lib/*.so $(SODEST)
+#
+# Then ones from other modules. Note that depending on when you try
+# this, these might not have been built yet.
+#
+ -for F in $(SRC_ROOT)/cppu/$(INPATH)/lib/qa_*.so; do \
+ test -f $${F} && cp $${F} $(SODEST); \
+ done
+#
+ -for F in i18npool_test_breakiterator; do \
+ test -f $(WORKDIR)/LinkTarget/CppunitTest/libtest_$${F}.so && cp $(WORKDIR)/LinkTarget/CppunitTest/libtest_$${F}.so $(SODEST); \
+ done
+#
+# Then libs that the tests from other modules need.
+#
+ -for F in libuno_cppu libuno_salhelpergcc3 libuno_cppuhelpergcc3; do \
+ test -f $(OUTDIR)/lib/$${F}.so && cp $(OUTDIR)/lib/$${F}.so $(SODEST); \
+ done
+#
+# Then the shared GNU C++ library
+ cp $(NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so $(SODEST)
+#
# Copy them to obj/local/armeabi-v7a, too, where gdb will look for
-# them. Not sure if this is useful or not; I have great problems with
-# ndk-gdb.
- cp ../../unxandr.pro/bin/cppunittester obj/local/armeabi-v7a/libcppunittester.so
- cp ../../../solver/unxandr.pro/lib/libcppunit-1.12.so obj/local/armeabi-v7a
- cp ../../unxandr.pro/lib/*.so obj/local/armeabi-v7a
- cp $(NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so obj/local/armeabi-v7a
+# them. Not sure if this is useful or not; I have great problems with
+# ndk-gdb. Actually, commenting out this part for now...
+#
+# cp ../../$(INPATH)/bin/cppunittester obj/local/armeabi-v7a/libcppunittester.so
+# cp $(OUTPATH)/lib/libcppunit-1.12.so obj/local/armeabi-v7a
+# cp ../../$(INPATH)/lib/*.so obj/local/armeabi-v7a
+# cp $(NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so obj/local/armeabi-v7a
unset JAVA_HOME && ant debug
@echo 'Install it on the device with ant debug install'
@echo 'Then run it with something like what "make run" does (see Makefile)'
commit b58ee242cb6282450addf337b5e3bb3cc64fcef7
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Wed Nov 16 17:38:52 2011 +0200
Improve a diagnostic log message
diff --git a/sal/osl/android/jni/lo-bootstrap.c b/sal/osl/android/jni/lo-bootstrap.c
index ad35568..c5e1905 100644
--- a/sal/osl/android/jni/lo-bootstrap.c
+++ b/sal/osl/android/jni/lo-bootstrap.c
@@ -479,7 +479,7 @@ lo_dlopen(const char *library)
char *full_name;
char **needed;
int i;
- int found = 0;
+ int found;
rover = loaded_libraries;
while (rover != NULL &&
@@ -491,6 +491,7 @@ lo_dlopen(const char *library)
/* LOGI("lo_dlopen(%s)", library); */
+ found = 0;
if (library[0] == '/') {
full_name = strdup(library);
@@ -537,7 +538,7 @@ lo_dlopen(const char *library)
LOGI("dlopen(%s) = %p", full_name, p);
free(full_name);
if (p == NULL)
- LOGI("lo_dlopen: %s", dlerror());
+ LOGI("lo_dlopen: Error from dlopen(%s): %s", library, dlerror());
new_loaded_lib = malloc(sizeof(*new_loaded_lib));
new_loaded_lib->name = strdup(library);
commit 7480388cdfb33f59de82d2259478f5d84ba94d29
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Wed Nov 16 17:18:45 2011 +0200
Use lo_dlopen() on Android
diff --git a/cppunit/android.patch b/cppunit/android.patch
index 7d88a82..7628f5f 100644
--- a/cppunit/android.patch
+++ b/cppunit/android.patch
@@ -33,3 +33,21 @@
# Parse the version information argument.
save_ifs="$IFS"; IFS=':'
set dummy $vinfo 0 0 0
+--- misc/cppunit-1.12.1/src/cppunit/UnixDynamicLibraryManager.cpp
++++ misc/build/cppunit-1.12.1/src/cppunit/UnixDynamicLibraryManager.cpp
+@@ -13,7 +13,15 @@
+ DynamicLibraryManager::LibraryHandle
+ DynamicLibraryManager::doLoadLibrary( const std::string &libraryName )
+ {
++#ifdef __ANDROID__
++ // Use our enhanced dlopen() wrapper, see sal/osl/android/jni/lo-wrapper.c
++ void *(*lo_dlopen)(const char *) = (void *(*)(const char *)) dlsym( RTLD_DEFAULT, "lo_dlopen" );
++ if (lo_dlopen == NULL)
++ return NULL;
++ return (*lo_dlopen)( libraryName.c_str() );
++#else
+ return ::dlopen( libraryName.c_str(), RTLD_NOW | RTLD_GLOBAL );
++#endif
+ }
+
+
commit 7eaf127475c1aa91e31a4a2aecec20d18ff30e17
Author: Andras Timar <atimar at suse.com>
Date: Thu Nov 17 12:07:09 2011 +0100
remove setup.exe and setup.ini from Windows installdir
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 6f3ec4a..b3db464 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -2249,23 +2249,14 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
installer::windows::msiglobal::rename_msi_database_in_installset($defaultlanguage, $installdir, $allvariableshashref);
if ( $allvariableshashref->{'ADDLANGUAGEINDATABASENAME'} ) { installer::windows::msiglobal::add_language_to_msi_database($defaultlanguage, $installdir, $allvariableshashref); }
-
- installer::logger::print_message( "... generating setup.ini ...\n" );
-
- if ( ! $allvariableshashref->{'NOLOADERREQUIRED'} ) { installer::windows::msiglobal::create_setup_ini($languagesarrayref, $defaultlanguage, $installdir, $allvariableshashref); }
}
# Analyzing the ScpActions and copying the files into the installation set
- # At least the loader.exe
installer::logger::print_message( "... copying files into installation set ...\n" );
installer::worker::put_scpactions_into_installset($installdir);
- # ... copying the setup.exe
-
- installer::windows::msiglobal::copy_windows_installer_files_into_installset($installdir, $includepatharrayref, $allvariableshashref);
-
# ... copying MergeModules into installation set
if ( ! $installer::globals::fix_number_of_cab_files ) { installer::windows::msiglobal::copy_merge_modules_into_installset($installdir); }
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index 082afb2..d6793f4 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1334,61 +1334,6 @@ sub include_windows_lineends
}
}
-##########################################################################
-# Generation the file setup.ini, that is used by the loader setup.exe.
-##########################################################################
-
-sub create_setup_ini
-{
- my ($languagesarray, $defaultlanguage, $installdir, $allvariableshashref) = @_;
-
- installer::logger::include_header_into_logfile("Creating setup.ini");
-
- my $setupinifilename = $installdir . $installer::globals::separator . "setup.ini";
-
- my @setupinifile = ();
- my $setupinifile = \@setupinifile;
-
- my $line = "\[setup\]\n";
- push(@setupinifile, $line);
-
- put_databasename_into_setupini($setupinifile, $allvariableshashref);
- put_msiversion_into_setupini($setupinifile);
- put_productname_into_setupini($setupinifile, $allvariableshashref);
- put_productcode_into_setupini($setupinifile);
- put_productversion_into_setupini($setupinifile);
- put_upgradekey_into_setupini($setupinifile);
-
- $line = "\[languages\]\n";
- push(@setupinifile, $line);
-
- put_languagecount_into_setupini($setupinifile, $languagesarray);
- put_defaultlanguage_into_setupini($setupinifile, $defaultlanguage);
-
- if ( $#{$languagesarray} > 0 ) # writing the transforms information
- {
- my $counter = 1;
-
- for ( my $i = 0; $i <= $#{$languagesarray}; $i++ )
- {
- if ( ${$languagesarray}[$i] eq $defaultlanguage ) { next; }
-
- put_transforms_into_setupini($setupinifile, ${$languagesarray}[$i], $counter);
- $counter++;
- }
- }
-
- if ( $installer::globals::iswin && $installer::globals::plat =~ /cygwin/i) # Windows line ends only for Cygwin
- {
- include_windows_lineends($setupinifile);
- }
-
- installer::files::save_file($setupinifilename, $setupinifile);
-
- $infoline = "Generated file $setupinifilename !\n";
- push( @installer::globals::logfileinfo, $infoline);
-}
-
#################################################################
# Copying the files defined as ScpActions into the
# installation set.
@@ -1421,39 +1366,6 @@ sub copy_scpactions_into_installset
}
#################################################################
-# Copying the files for the Windows installer into the
-# installation set (setup.exe).
-#################################################################
-
-sub copy_windows_installer_files_into_installset
-{
- my ($installdir, $includepatharrayref, $allvariables) = @_;
-
- installer::logger::include_header_into_logfile("Copying Windows installer files into installation set");
-
- @copyfile = ();
- push(@copyfile, "loader2.exe");
-
- if ( $allvariables->{'NOLOADERREQUIRED'} ) { @copyfile = (); }
-
- for ( my $i = 0; $i <= $#copyfile; $i++ )
- {
- my $filename = $copyfile[$i];
- my $sourcefileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 1);
-
- if ( ! -f $$sourcefileref ) { installer::exiter::exit_program("ERROR: msi file not found: $$sourcefileref !", "copy_windows_installer_files_into_installset"); }
-
- my $destfile;
- if ( $copyfile[$i] eq "loader2.exe" ) { $destfile = "setup.exe"; } # renaming the loader
- else { $destfile = $copyfile[$i]; }
-
- $destfile = $installdir . $installer::globals::separator . $destfile;
-
- installer::systemactions::copy_one_file($$sourcefileref, $destfile);
- }
-}
-
-#################################################################
# Copying MergeModules for the Windows installer into the
# installation set. The list of MergeModules is located
# in %installer::globals::copy_msm_files
commit c7c7143b62badcc1b6728c2a4220a35cf4ef1b52
Author: Tim Hardeck <thardeck at suse.com>
Date: Wed Nov 16 19:12:06 2011 +0100
Make the toolbars not popping-up randomly
Undocked, context sensitive toolbars often tend to overlay important parts of
a document.
With this patch these toolbars are docked to the bottom to prevent the document from
being moved each time the toolbar is displayed.
Furthermore the findbar setting was changed to make sure that it stays
on top of the other toolbars at the bottom.
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
index 031a01a..4debaed 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
@@ -112,8 +112,14 @@
<value xml:lang="en-US">Toolbox</value>
</prop>
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,0</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>1</value>
+ </prop>
<prop oor:name="Docked" oor:type="xs:boolean">
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="Visible" oor:type="xs:boolean">
<value>true</value>
@@ -148,7 +154,7 @@
</node>
<node oor:name="private:resource/toolbar/findbar" oor:op="replace">
<prop oor:name="DockPos" oor:type="xs:string">
- <value>1,0</value>
+ <value>0,3</value>
</prop>
<prop oor:name="DockingArea" oor:type="xs:int">
<value>1</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
index ace87a1..81736a6 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
@@ -295,7 +295,7 @@
</node>
<node oor:name="private:resource/toolbar/findbar" oor:op="replace">
<prop oor:name="DockPos" oor:type="xs:string">
- <value>1,0</value>
+ <value>0,3</value>
</prop>
<prop oor:name="Docked" oor:type="xs:boolean">
<value>true</value>
@@ -540,8 +540,14 @@
</prop>
</node>
<node oor:name="private:resource/toolbar/fontworkobjectbar" oor:op="replace">
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,0</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>1</value>
+ </prop>
<prop oor:name="Docked" oor:type="xs:boolean">
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Fontwork</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
index 0a7f591..5ac84cb 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
@@ -30,11 +30,14 @@
<node oor:name="UIElements">
<node oor:name="States">
<node oor:name="private:resource/toolbar/extrusionobjectbar" oor:op="replace">
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,0</value>
+ </prop>
<prop oor:name="DockingArea" oor:type="xs:int">
- <value>0</value>
+ <value>1</value>
</prop>
<prop oor:name="Docked" oor:type="xs:boolean">
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="Visible" oor:type="xs:boolean">
<value>true</value>
@@ -108,7 +111,7 @@
</node>
<node oor:name="private:resource/toolbar/findbar" oor:op="replace">
<prop oor:name="DockPos" oor:type="xs:string">
- <value>1,0</value>
+ <value>0,3</value>
</prop>
<prop oor:name="Docked" oor:type="xs:boolean">
<value>true</value>
@@ -200,8 +203,14 @@
</prop>
</node>
<node oor:name="private:resource/toolbar/bezierobjectbar" oor:op="replace">
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,0</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>1</value>
+ </prop>
<prop oor:name="Docked" oor:type="xs:boolean">
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Edit Points</value>
@@ -256,8 +265,14 @@
</prop>
</node>
<node oor:name="private:resource/toolbar/fontworkobjectbar" oor:op="replace">
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,0</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>1</value>
+ </prop>
<prop oor:name="Docked" oor:type="xs:boolean">
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Fontwork</value>
@@ -290,8 +305,14 @@
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Text Box Formatting</value>
</prop>
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,0</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>1</value>
+ </prop>
<prop oor:name="Docked" oor:type="xs:boolean">
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="Visible" oor:type="xs:boolean">
<value>true</value>
@@ -307,8 +328,14 @@
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Form Filter</value>
</prop>
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,0</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>1</value>
+ </prop>
<prop oor:name="Docked" oor:type="xs:boolean">
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="Visible" oor:type="xs:boolean">
<value>true</value>
@@ -495,8 +522,14 @@
</prop>
</node>
<node oor:name="private:resource/toolbar/tableobjectbar" oor:op="replace">
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,0</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>1</value>
+ </prop>
<prop oor:name="Docked" oor:type="xs:boolean">
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="Visible" oor:type="xs:boolean">
<value>true</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index ca1a265..2ad7469 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
@@ -30,11 +30,14 @@
<node oor:name="UIElements">
<node oor:name="States">
<node oor:name="private:resource/toolbar/extrusionobjectbar" oor:op="replace">
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,0</value>
+ </prop>
<prop oor:name="DockingArea" oor:type="xs:int">
- <value>0</value>
+ <value>1</value>
</prop>
<prop oor:name="Docked" oor:type="xs:boolean">
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="Visible" oor:type="xs:boolean">
<value>true</value>
@@ -194,8 +197,14 @@
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Text Box Formatting</value>
</prop>
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,0</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>1</value>
+ </prop>
<prop oor:name="Docked" oor:type="xs:boolean">
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="Visible" oor:type="xs:boolean">
<value>true</value>
@@ -211,8 +220,14 @@
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Form Filter</value>
</prop>
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,0</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>1</value>
+ </prop>
<prop oor:name="Docked" oor:type="xs:boolean">
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="Visible" oor:type="xs:boolean">
<value>true</value>
@@ -643,8 +658,14 @@
</prop>
</node>
<node oor:name="private:resource/toolbar/tableobjectbar" oor:op="replace">
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,0</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>1</value>
+ </prop>
<prop oor:name="Docked" oor:type="xs:boolean">
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="Visible" oor:type="xs:boolean">
<value>true</value>
@@ -671,8 +692,14 @@
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Gluepoints</value>
</prop>
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,0</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>1</value>
+ </prop>
<prop oor:name="Docked" oor:type="xs:boolean">
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="Visible" oor:type="xs:boolean">
<value>true</value>
@@ -682,8 +709,14 @@
</prop>
</node>
<node oor:name="private:resource/toolbar/bezierobjectbar" oor:op="replace">
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,0</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>1</value>
+ </prop>
<prop oor:name="Docked" oor:type="xs:boolean">
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Edit Points</value>
@@ -872,7 +905,7 @@
</node>
<node oor:name="private:resource/toolbar/findbar" oor:op="replace">
<prop oor:name="DockPos" oor:type="xs:string">
- <value>1,0</value>
+ <value>0,3</value>
</prop>
<prop oor:name="Docked" oor:type="xs:boolean">
<value>true</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
index 6ae9914..872fbc5 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
@@ -90,8 +90,14 @@
</prop>
</node>
<node oor:name="private:resource/toolbar/tableobjectbar" oor:op="replace">
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,0</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>1</value>
+ </prop>
<prop oor:name="Docked" oor:type="xs:boolean">
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="Visible" oor:type="xs:boolean">
<value>true</value>
@@ -105,8 +111,14 @@
</prop>
</node>
<node oor:name="private:resource/toolbar/numobjectbar" oor:op="replace">
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,0</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>1</value>
+ </prop>
<prop oor:name="Docked" oor:type="xs:boolean">
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Bullets and Numbering</value>
@@ -156,8 +168,14 @@
</prop>
</node>
<node oor:name="private:resource/toolbar/bezierobjectbar" oor:op="replace">
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,0</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>1</value>
+ </prop>
<prop oor:name="Docked" oor:type="xs:boolean">
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Edit Points</value>
@@ -174,11 +192,14 @@
</prop>
</node>
<node oor:name="private:resource/toolbar/extrusionobjectbar" oor:op="replace">
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,0</value>
+ </prop>
<prop oor:name="DockingArea" oor:type="xs:int">
- <value>0</value>
+ <value>1</value>
</prop>
<prop oor:name="Docked" oor:type="xs:boolean">
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="Visible" oor:type="xs:boolean">
<value>true</value>
@@ -199,8 +220,14 @@
<value xml:lang="en-US">Text Box Formatting</value>
<value xml:lang="de">Textfeld Formatierungs</value>
</prop>
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,0</value>
+ </prop>
+ <prop oor:name="DockingArea" oor:type="xs:int">
+ <value>1</value>
+ </prop>
<prop oor:name="Docked" oor:type="xs:boolean">
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="Visible" oor:type="xs:boolean">
<value>true</value>
@@ -217,8 +244,14 @@
<value xml:lang="en-US">Form Filter</value>
<value xml:lang="de">Formular-Filter</value>
</prop>
+ <prop oor:name="DockPos" oor:type="xs:string">
+ <value>0,0</value>
+ </prop>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list