[Libreoffice-commits] .: Branch 'feature/layout' - 360 commits - accessibility/workben autogen.sh automation/source basctl/source basic/inc basic/Library_sb.mk basic/source basic/StaticLibrary_app.mk basic/StaticLibrary_sample.mk bean/com bean/qa bean/test binaryurp/source bin/lo-commit-stat bootstrap.1 bridges/prj bridges/source bridges/test canvas/Library_directx5canvas.mk canvas/Library_directx9canvas.mk canvas/Library_gdipluscanvas.mk canvas/source cli_ure/source comphelper/CppunitTest_comphelper_test.mk comphelper/inc comphelper/Module_comphelper.mk comphelper/qa comphelper/source comphelper/util configure.in connectivity/inc connectivity/prj connectivity/source cosv/inc cppcanvas/source cppuhelper/inc cppuhelper/source cui/source dbaccess/Executable_odbcconfig.mk dbaccess/source desktop/scripts desktop/source download drawinglayer/source dtrans/Library_dnd.mk dtrans/Library_sysdtrans.mk dtrans/Module_dtrans.mk dtrans/source dtrans/StaticLibrary_dtobj.mk dtrans/util editeng/source em bedserv/source embedserv/util eventattacher/source extensions/source filter/source forms/qa forms/source formula/inc formula/source fpicker/source framework/inc framework/qa framework/source framework/util git-hooks/pre-commit .gitignore i18npool/CppunitTest_i18npool_test_breakiterator.mk i18npool/Executable_gencoll_rule.mk i18npool/Executable_genconv_dict.mk i18npool/Executable_gendict.mk i18npool/Executable_genindex_data.mk i18npool/Executable_i18npool_cppunittester_all.mk i18npool/Executable_saxparser.mk i18npool/inc i18npool/Library_collator_data.mk i18npool/Library_dict_ja.mk i18npool/Library_dict_zh.mk i18npool/Library_i18nisolang1.mk i18npool/Library_i18npaper.mk i18npool/Library_i18npool.mk i18npool/Library_i18nsearch.mk i18npool/Library_index_data.mk i18npool/Library_localedata_en.mk i18npool/Library_localedata_es.mk i18npool/Library_localedata_euro.mk i18npool/Library_localedata_others.mk i18npool/Library_textconv_dict.mk i18npool/Makefile i18npool/Module_i18npool. mk i18npool/Package_generated.mk i18npool/Package_inc.mk i18npool/Package_xml.mk i18npool/prj i18npool/qa i18npool/source i18npool/util l10ntools/source libgsf/libgsf-1.14.19.patch libgsf/libgsf-1.14.19.windows.patch lotuswordpro/source Module_tail_build.mk o3tl/inc offapi/com officecfg/Configuration_officecfg.mk officecfg/Makefile officecfg/Module_officecfg.mk officecfg/Package_misc.mk officecfg/Package_tools.mk officecfg/prj officecfg/registry officecfg/util ooo.lst.in oox/inc oox/Library_oox.mk oox/Package_source.mk oox/source package/source postprocess/packcomponents postprocess/packregistry postprocess/prj postprocess/rebase pyuno/source qadevOOo/runner qadevOOo/testdocs reportdesign/inc reportdesign/source RepositoryExternal.mk RepositoryFixes.mk Repository.mk RepositoryModule_ooo.mk rsc/Executable_rsc.mk rsc/Package_yacc.mk rsc/source sal/cppunittester sal/osl sax/source sc/CppunitTest_sc_test_filters.mk sc/CppunitTest_sc_ucalc.mk sc/inc sc/Library_scfilt.mk sc/Librar y_vbaobj.mk scp2/source scripting/source sc/source sd/CppunitTest_sd_uimpress.mk sd/Library_sdfilt.mk sd/Library_sd.mk sd/prj sd/source set_soenv.in sfx2/inc sfx2/source slideshow/Library_slideshow.mk slideshow/source smoketestoo_native/losmoketest.py smoketestoo_native/losmoketest.readme solenv/bin solenv/gbuild solenv/inc soltools/inc sot/source starmath/CppunitTest_starmath_qa_cppunit.mk stoc/source svl/inc svl/source svtools/bmpmaker svtools/Executable_bmp.mk svtools/inc svtools/source svx/inc svx/source sw/CppunitTest_sw_swdoc_test.mk sw/CppunitTest_sw_test_filters.mk sw/inc sw/Library_msword.mk sw/sdi sw/source sw/uiconfig tail_build/prj testgraphical/ui test/source toolkit/inc tools/bootstrp tools/Executable_rscdep.mk tools/inc tools/Module_tools.mk tools/source tools/StaticLibrary_toolshelpers.mk ucb/source udkapi/com udkapi/UnoApi_udkapi.mk unotools/inc unotools/source unusedcode.easy uui/AllLangResTarget_uui.mk uui/Library_uui.mk uui/Makefile uui/Module_uui.mk uui/ Package_xml.mk uui/prj uui/source uui/util vcl/inc vcl/source vcl/unx vcl/win wizards/com wizards/Jar_commonwizards.mk wizards/source writerfilter/Library_ooxml.mk writerfilter/Library_resourcemodel.mk writerfilter/Library_rtftok.mk writerfilter/Package_writerfilter_generated.mk writerfilter/qa writerfilter/source xml2cmp/source xmloff/inc xmloff/Library_xo.mk xmloff/source xmlsecurity/AllLangResTarget.mk xmlsecurity/AllLangResTarget_xsec.mk xmlsecurity/Library_xsec_xmlsec.mk xmlsecurity/Module_xmlsecurity.mk xmlsecurity/source zlib/zlib-1.2.5.patch
Ricardo Cruz
rpmcruz at kemper.freedesktop.org
Fri Aug 19 18:20:01 PDT 2011
.gitignore | 7
Module_tail_build.mk | 8
Repository.mk | 28
RepositoryExternal.mk | 55
RepositoryFixes.mk | 6
RepositoryModule_ooo.mk | 1
accessibility/workben/org/openoffice/accessibility/awb/view/StateSetView.java | 8
autogen.sh | 2
automation/source/testtool/objtest.cxx | 4
automation/source/testtool/tcommuni.cxx | 4
basctl/source/basicide/baside2b.cxx | 3
basic/Library_sb.mk | 4
basic/StaticLibrary_app.mk | 4
basic/StaticLibrary_sample.mk | 4
basic/inc/basic/basicrt.hxx | 10
basic/inc/basic/sbx.hxx | 2
basic/inc/basic/sbxmeth.hxx | 9
basic/inc/basic/sbxprop.hxx | 4
basic/inc/basic/sbxvar.hxx | 4
basic/source/app/app.cxx | 5
basic/source/app/dialogs.cxx | 6
basic/source/basmgr/basmgr.cxx | 18
basic/source/inc/namecont.hxx | 17
basic/source/runtime/wnt-mingw.s | 8
basic/source/sbx/sbxarray.cxx | 5
basic/source/sbx/sbxobj.cxx | 25
basic/source/sbx/sbxvar.cxx | 10
basic/source/uno/dlgcont.cxx | 2
basic/source/uno/namecont.cxx | 10
bean/com/sun/star/beans/LocalOfficeConnection.java | 6
bean/qa/complex/bean/OOoBeanTest.java | 54
bean/test/applet/oooapplet/OOoViewer.java | 6
bin/lo-commit-stat | 7
binaryurp/source/writer.cxx | 5
bootstrap.1 | 14
bridges/prj/build.lst | 1
bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx | 543 +++
bridges/source/cpp_uno/gcc3_ios_arm/except.cxx | 331 ++
bridges/source/cpp_uno/gcc3_ios_arm/generate-snippets.pl | 107
bridges/source/cpp_uno/gcc3_ios_arm/helper.S | 353 ++
bridges/source/cpp_uno/gcc3_ios_arm/makefile.mk | 81
bridges/source/cpp_uno/gcc3_ios_arm/share.hxx | 95
bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx | 500 +++
bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx | 3
bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx | 1
bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx | 6
bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx | 12
bridges/test/java_uno/acquire/testacquire.cxx | 3
canvas/Library_directx5canvas.mk | 7
canvas/Library_directx9canvas.mk | 10
canvas/Library_gdipluscanvas.mk | 5
canvas/source/cairo/cairo_services.cxx | 10
canvas/source/cairo/cairocanvas.component | 2
canvas/source/directx/directx5canvas.component | 2
canvas/source/directx/directx9canvas.component | 2
canvas/source/directx/dx_canvas.cxx | 11
canvas/source/directx/dx_spritecanvas.cxx | 10
canvas/source/directx/gdipluscanvas.component | 2
canvas/source/factory/canvasfactory.component | 2
canvas/source/factory/cf_service.cxx | 2
canvas/source/null/null_spritecanvas.cxx | 10
canvas/source/simplecanvas/simplecanvas.component | 2
canvas/source/simplecanvas/simplecanvasimpl.cxx | 10
canvas/source/vcl/services.cxx | 10
canvas/source/vcl/vclcanvas.component | 2
cli_ure/source/climaker/makefile.mk | 19
cli_ure/source/native/makefile.mk | 33
cli_ure/source/uno_bridge/makefile.mk | 16
comphelper/CppunitTest_comphelper_test.mk | 56
comphelper/Module_comphelper.mk | 4
comphelper/inc/comphelper/property.hxx | 13
comphelper/inc/comphelper/sequenceasvector.hxx | 2
comphelper/inc/comphelper/string.hxx | 95
comphelper/inc/comphelper/uno3.hxx | 15
comphelper/qa/string/test_string.cxx | 80
comphelper/qa/string/test_string_noadditional.cxx | 33
comphelper/source/eventattachermgr/eventattachermgr.cxx | 51
comphelper/source/misc/comphelper_services.cxx | 2
comphelper/source/misc/string.cxx | 67
comphelper/source/property/propagg.cxx | 3
comphelper/source/property/property.cxx | 6
comphelper/source/property/propertycontainerhelper.cxx | 26
comphelper/util/comphelp.component | 2
configure.in | 77
connectivity/inc/connectivity/TTableHelper.hxx | 2
connectivity/prj/build.lst | 3
connectivity/source/commontools/TTableHelper.cxx | 4
connectivity/source/commontools/dbtools.cxx | 4
connectivity/source/drivers/adabas/BDriver.cxx | 4
connectivity/source/drivers/hsqldb/HDriver.cxx | 14
cosv/inc/cosv/string.hxx | 2
cppcanvas/source/mtfrenderer/emfplus.cxx | 56
cppcanvas/source/mtfrenderer/implrenderer.cxx | 2
cppcanvas/source/uno/mtfrenderer.component | 2
cppcanvas/source/uno/uno_mtfrenderer.cxx | 10
cppuhelper/inc/cppuhelper/propshlp.hxx | 11
cppuhelper/source/gcc3.map | 5
cppuhelper/source/makefile.mk | 3
cppuhelper/source/msvc_win32_intel.map | 5
cppuhelper/source/propshlp.cxx | 20
cui/source/options/optfltr.cxx | 47
cui/source/options/optinet2.cxx | 5
cui/source/tabpages/numfmt.cxx | 4
dbaccess/Executable_odbcconfig.mk | 2
dbaccess/source/ui/app/AppController.hxx | 12
dbaccess/source/ui/browser/exsrcbrw.cxx | 7
dbaccess/source/ui/dlg/UserAdmin.hxx | 14
dbaccess/source/ui/inc/IItemSetHelper.hxx | 16
dbaccess/source/ui/inc/TablesSingleDlg.hxx | 14
dbaccess/source/ui/inc/UserAdminDlg.hxx | 14
dbaccess/source/ui/inc/dbadmin.hxx | 14
dbaccess/source/ui/inc/dbwiz.hxx | 14
dbaccess/source/ui/inc/dbwizsetup.hxx | 14
dbaccess/source/ui/inc/sbagrid.hxx | 9
desktop/scripts/soffice.sh | 5
desktop/source/app/dispatchwatcher.cxx | 10
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 35
desktop/source/deployment/registry/configuration/dp_configuration.cxx | 10
download | 2
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 36
drawinglayer/source/processor2d/vclprocessor2d.cxx | 2
dtrans/Library_dnd.mk | 2
dtrans/Library_sysdtrans.mk | 8
dtrans/Module_dtrans.mk | 1
dtrans/StaticLibrary_dtobj.mk | 17
dtrans/source/cnttype/mctfentry.cxx | 2
dtrans/source/cnttype/wbench/testcnttype.cxx | 2
dtrans/source/generic/dtrans.component | 2
dtrans/source/generic/dtrans.cxx | 2
dtrans/source/win32/clipb/wcbentry.cxx | 2
dtrans/source/win32/dnd/dndentry.cxx | 11
dtrans/source/win32/ftransl/ftranslentry.cxx | 2
dtrans/util/dnd.component | 2
dtrans/util/ftransl.component | 2
dtrans/util/mcnttype.component | 2
dtrans/util/sysdtrans.component | 2
editeng/source/editeng/editdbg.cxx | 2
editeng/source/editeng/editobj.cxx | 4
editeng/source/items/bulitem.cxx | 2
embedserv/source/embed/esdll.cxx | 3
embedserv/source/inc/embeddoc.hxx | 3
embedserv/source/inc/servprov.hxx | 4
embedserv/util/makefile.mk | 12
eventattacher/source/eventattacher.cxx | 229 +
extensions/source/nsplugin/source/nsplugin.rc | 2
extensions/source/update/check/updatecheck.cxx | 2
extensions/source/update/check/updateprotocol.cxx | 7
filter/source/config/cache/filtercache.cxx | 2
filter/source/flash/swfwriter.cxx | 2
filter/source/msfilter/escherex.cxx | 4
filter/source/pdf/impdialog.cxx | 36
filter/source/pdf/impdialog.hrc | 1
filter/source/pdf/impdialog.hxx | 1
filter/source/pdf/impdialog.src | 54
forms/qa/integration/forms/FormControlTest.java | 6
forms/source/component/DatabaseForm.cxx | 4
forms/source/component/FormComponent.cxx | 20
forms/source/inc/FormComponent.hxx | 1
forms/source/inc/frm_strings.hxx | 1
forms/source/inc/property.hrc | 1
forms/source/misc/InterfaceContainer.cxx | 17
forms/source/misc/property.cxx | 1
formula/inc/formula/FormulaCompiler.hxx | 73
formula/source/core/api/FormulaCompiler.cxx | 191 -
formula/source/core/api/token.cxx | 34
fpicker/source/win32/filepicker/FilterContainer.cxx | 6
framework/inc/macros/debug/registration.hxx | 2
framework/inc/macros/registration.hxx | 6
framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java | 3
framework/source/register/register3rdcomponents.cxx | 3
framework/source/register/registerservices.cxx | 3
framework/source/register/registertemp.cxx | 3
framework/source/uielement/toolbarmanager.cxx | 48
framework/util/fwk.component | 2
framework/util/fwl.component | 2
framework/util/fwm.component | 2
git-hooks/pre-commit | 120
i18npool/CppunitTest_i18npool_test_breakiterator.mk | 75
i18npool/Executable_gencoll_rule.mk | 54
i18npool/Executable_genconv_dict.mk | 47
i18npool/Executable_gendict.mk | 47
i18npool/Executable_genindex_data.mk | 53
i18npool/Executable_i18npool_cppunittester_all.mk | 52
i18npool/Executable_saxparser.mk | 73
i18npool/Library_collator_data.mk | 37
i18npool/Library_dict_ja.mk | 37
i18npool/Library_dict_zh.mk | 37
i18npool/Library_i18nisolang1.mk | 60
i18npool/Library_i18npaper.mk | 60
i18npool/Library_i18npool.mk | 145
i18npool/Library_i18nsearch.mk | 60
i18npool/Library_index_data.mk | 37
i18npool/Library_localedata_en.mk | 50
i18npool/Library_localedata_es.mk | 58
i18npool/Library_localedata_euro.mk | 110
i18npool/Library_localedata_others.mk | 124
i18npool/Library_textconv_dict.mk | 47
i18npool/Makefile | 39
i18npool/Module_i18npool.mk | 70
i18npool/Package_generated.mk | 82
i18npool/Package_inc.mk | 38
i18npool/Package_xml.mk | 44
i18npool/inc/i18npool/i18npooldllapi.h | 15
i18npool/inc/i18npool/mslangid.hxx | 18
i18npool/inc/i18npool/paper.hxx | 2
i18npool/inc/makefile.mk | 48
i18npool/prj/build.lst | 29
i18npool/prj/d.lst | 52
i18npool/prj/makefile.mk | 40
i18npool/qa/cppunit/i18npool_cppunittester_all.cxx | 2
i18npool/qa/cppunit/test_breakiterator.cxx | 7
i18npool/qa/cppunit/version.map | 34
i18npool/source/breakiterator/Makefile | 85
i18npool/source/breakiterator/data/dict.map | 12
i18npool/source/breakiterator/data/makefile.mk | 80
i18npool/source/breakiterator/makefile.mk | 113
i18npool/source/calendar/makefile.mk | 53
i18npool/source/characterclassification/makefile.mk | 52
i18npool/source/collator/Makefile | 45
i18npool/source/collator/data/collator_data.map | 26
i18npool/source/collator/data/makefile.mk | 64
i18npool/source/collator/makefile.mk | 77
i18npool/source/defaultnumberingprovider/makefile.mk | 49
i18npool/source/indexentry/Makefile | 40
i18npool/source/indexentry/data/index_data.map | 17
i18npool/source/indexentry/data/makefile.mk | 67
i18npool/source/indexentry/makefile.mk | 69
i18npool/source/inputchecker/makefile.mk | 51
i18npool/source/isolang/makefile.mk | 73
i18npool/source/localedata/Makefile | 52
i18npool/source/localedata/data/localedata_en.map | 246 -
i18npool/source/localedata/data/localedata_es.map | 348 --
i18npool/source/localedata/data/localedata_euro.map | 1231 --------
i18npool/source/localedata/data/localedata_others.map | 1469 ----------
i18npool/source/localedata/data/makefile.mk | 355 --
i18npool/source/localedata/makefile.mk | 88
i18npool/source/nativenumber/makefile.mk | 49
i18npool/source/numberformatcode/makefile.mk | 49
i18npool/source/ordinalsuffix/makefile.mk | 50
i18npool/source/paper/makefile.mk | 75
i18npool/source/paper/paper.cxx | 1
i18npool/source/registerservices/makefile.mk | 46
i18npool/source/registerservices/registerservices.cxx | 2
i18npool/source/search/i18nsearch.component | 2
i18npool/source/search/makefile.mk | 80
i18npool/source/search/textsearch.cxx | 2
i18npool/source/textconversion/Makefile | 40
i18npool/source/textconversion/data/makefile.mk | 68
i18npool/source/textconversion/data/textconv_dict.map | 23
i18npool/source/textconversion/makefile.mk | 63
i18npool/source/transliteration/makefile.mk | 84
i18npool/util/i18npool.component | 2
i18npool/util/makefile.mk | 95
i18npool/util/makefile.pmk | 31
l10ntools/source/export.cxx | 29
l10ntools/source/filter/utils/FileHelper.java | 4
l10ntools/source/gsicheck.cxx | 8
l10ntools/source/makefile.mk | 2
libgsf/libgsf-1.14.19.patch | 52
libgsf/libgsf-1.14.19.windows.patch | 52
lotuswordpro/source/filter/bencont.cxx | 96
lotuswordpro/source/filter/bento.hxx | 9
lotuswordpro/source/filter/lwpchangemgr.cxx | 147 -
lotuswordpro/source/filter/lwpchangemgr.hxx | 1
lotuswordpro/source/filter/lwpfootnote.cxx | 10
lotuswordpro/source/filter/lwpfootnote.hxx | 1
lotuswordpro/source/filter/lwpfoundry.cxx | 24
lotuswordpro/source/filter/lwpfoundry.hxx | 1
lotuswordpro/source/filter/lwpgrfobj.cxx | 34
lotuswordpro/source/filter/lwpgrfobj.hxx | 2
lotuswordpro/source/filter/lwplayout.cxx | 96
lotuswordpro/source/filter/lwplayout.hxx | 10
lotuswordpro/source/filter/lwplaypiece.hxx | 1
lotuswordpro/source/filter/lwpmarker.cxx | 31
lotuswordpro/source/filter/lwpmarker.hxx | 2
lotuswordpro/source/filter/lwpnumberingoverride.cxx | 51
lotuswordpro/source/filter/lwpnumberingoverride.hxx | 2
lotuswordpro/source/filter/lwpobj.cxx | 6
lotuswordpro/source/filter/lwpobjfactory.cxx | 9
lotuswordpro/source/filter/lwpobjid.cxx | 36
lotuswordpro/source/filter/lwpobjid.hxx | 2
lotuswordpro/source/filter/lwpobjstrm.cxx | 11
lotuswordpro/source/filter/lwpobjstrm.hxx | 1
lotuswordpro/source/filter/lwppara.cxx | 17
lotuswordpro/source/filter/lwppara.hxx | 15
lotuswordpro/source/filter/lwppara1.cxx | 31
lotuswordpro/source/filter/lwpparastyle.cxx | 12
lotuswordpro/source/filter/lwpparastyle.hxx | 2
lotuswordpro/source/filter/lwprowlayout.cxx | 10
lotuswordpro/source/filter/lwprowlayout.hxx | 1
lotuswordpro/source/filter/lwpsortopt.cxx | 15
lotuswordpro/source/filter/lwpsortopt.hxx | 2
lotuswordpro/source/filter/lwpstory.cxx | 24
lotuswordpro/source/filter/lwpstory.hxx | 1
lotuswordpro/source/filter/lwptable.cxx | 48
lotuswordpro/source/filter/lwptable.hxx | 46
lotuswordpro/source/filter/lwptablelayout.cxx | 12
lotuswordpro/source/filter/lwptablelayout.hxx | 1
lotuswordpro/source/filter/lwptblformula.cxx | 2
lotuswordpro/source/filter/lwpuidoc.cxx | 5
lotuswordpro/source/filter/lwpuidoc.hxx | 1
lotuswordpro/source/filter/lwpverdocument.cxx | 5
lotuswordpro/source/filter/lwpverdocument.hxx | 1
o3tl/inc/o3tl/vector_pool.hxx | 2
offapi/com/sun/star/document/XCodeNameQuery.idl | 2
officecfg/Configuration_officecfg.mk | 262 +
officecfg/Makefile | 30
officecfg/Module_officecfg.mk | 28
officecfg/Package_misc.mk | 29
officecfg/Package_tools.mk | 36
officecfg/prj/build.lst | 17
officecfg/prj/d.lst | 69
officecfg/prj/makefile.mk | 32
officecfg/registry/data/org/openoffice/Office/DataAccess.xcu | 11
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 4
officecfg/registry/data/org/openoffice/Office/UI/makefile.mk | 79
officecfg/registry/data/org/openoffice/TypeDetection/makefile.mk | 51
officecfg/registry/data/org/openoffice/makefile.mk | 70
officecfg/registry/data/org/openoffice/ucb/makefile.mk | 45
officecfg/registry/makefile.mk | 44
officecfg/registry/schema/makefile.mk | 46
officecfg/registry/schema/org/openoffice/Office/DataAccess/makefile.mk | 42
officecfg/registry/schema/org/openoffice/Office/OOoImprovement/makefile.mk | 42
officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk | 80
officecfg/registry/schema/org/openoffice/Office/makefile.mk | 82
officecfg/registry/schema/org/openoffice/TypeDetection/makefile.mk | 46
officecfg/registry/schema/org/openoffice/makefile.mk | 49
officecfg/registry/schema/org/openoffice/ucb/makefile.mk | 45
officecfg/util/makefile.mk | 48
officecfg/util/makefile.pmk | 34
ooo.lst.in | 7
oox/Library_oox.mk | 11
oox/Package_source.mk | 2
oox/inc/oox/core/fastparser.hxx | 5
oox/inc/oox/core/filterbase.hxx | 5
oox/inc/oox/core/xmlfilterbase.hxx | 29
oox/inc/oox/drawingml/chart/converterbase.hxx | 2
oox/inc/oox/drawingml/customshapeproperties.hxx | 1
oox/inc/oox/drawingml/diagram/datamodelcontext.hxx | 57
oox/inc/oox/drawingml/diagram/diagram.hxx | 242 -
oox/inc/oox/drawingml/diagram/diagramfragmenthandler.hxx | 103
oox/inc/oox/drawingml/diagram/diagramlayoutatoms.hxx | 212 -
oox/inc/oox/drawingml/drawingmltypes.hxx | 3
oox/inc/oox/drawingml/graphicshapecontext.hxx | 5
oox/inc/oox/drawingml/scene3dcontext.hxx | 56
oox/inc/oox/drawingml/shape.hxx | 30
oox/inc/oox/drawingml/shape3dproperties.hxx | 135
oox/inc/oox/drawingml/textliststyle.hxx | 4
oox/inc/oox/drawingml/theme.hxx | 8
oox/inc/oox/ppt/dgmimport.hxx | 71
oox/inc/oox/ppt/dgmlayout.hxx | 72
oox/inc/oox/ppt/pptimport.hxx | 2
oox/inc/oox/ppt/slidepersist.hxx | 1
oox/inc/oox/xls/excelfilter.hxx | 2
oox/inc/oox/xls/workbookhelper.hxx | 2
oox/source/core/fastparser.cxx | 5
oox/source/core/filterbase.cxx | 9
oox/source/core/services.cxx | 4
oox/source/core/xmlfilterbase.cxx | 174 -
oox/source/drawingml/chart/chartspaceconverter.cxx | 5
oox/source/drawingml/chart/converterbase.cxx | 4
oox/source/drawingml/chart/datasourceconverter.cxx | 13
oox/source/drawingml/clrscheme.cxx | 2
oox/source/drawingml/color.cxx | 1
oox/source/drawingml/customshapegeometry.cxx | 6
oox/source/drawingml/diagram/constraintlistcontext.cxx | 101
oox/source/drawingml/diagram/constraintlistcontext.hxx | 54
oox/source/drawingml/diagram/datamodelcontext.cxx | 237 +
oox/source/drawingml/diagram/datamodelcontext.hxx | 56
oox/source/drawingml/diagram/diagram.cxx | 518 ++-
oox/source/drawingml/diagram/diagram.hxx | 319 ++
oox/source/drawingml/diagram/diagramdefinitioncontext.cxx | 13
oox/source/drawingml/diagram/diagramdefinitioncontext.hxx | 2
oox/source/drawingml/diagram/diagramfragmenthandler.cxx | 177 -
oox/source/drawingml/diagram/diagramfragmenthandler.hxx | 115
oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 689 ++++
oox/source/drawingml/diagram/diagramlayoutatoms.hxx | 318 ++
oox/source/drawingml/diagram/layoutnodecontext.cxx | 128
oox/source/drawingml/diagram/layoutnodecontext.hxx | 3
oox/source/drawingml/drawingmltypes.cxx | 4
oox/source/drawingml/fillproperties.cxx | 3
oox/source/drawingml/graphicshapecontext.cxx | 63
oox/source/drawingml/lineproperties.cxx | 5
oox/source/drawingml/scene3dcontext.cxx | 189 +
oox/source/drawingml/shape.cxx | 53
oox/source/drawingml/shape3dproperties.cxx | 66
oox/source/drawingml/shapepropertiescontext.cxx | 5
oox/source/drawingml/table/tablecell.cxx | 53
oox/source/drawingml/textliststyle.cxx | 11
oox/source/drawingml/textparagraph.cxx | 12
oox/source/drawingml/textparagraphproperties.cxx | 1
oox/source/helper/storagebase.cxx | 20
oox/source/ole/axcontrol.cxx | 23
oox/source/ole/oleobjecthelper.cxx | 6
oox/source/ole/olestorage.cxx | 20
oox/source/ole/vbacontrol.cxx | 6
oox/source/ole/vbamodule.cxx | 6
oox/source/ole/vbaproject.cxx | 20
oox/source/ppt/dgmimport.cxx | 140
oox/source/ppt/dgmlayout.cxx | 198 +
oox/source/ppt/layoutfragmenthandler.cxx | 7
oox/source/ppt/pptimport.cxx | 4
oox/source/ppt/pptshape.cxx | 6
oox/source/ppt/presentationfragmenthandler.cxx | 13
oox/source/shape/ShapeFilterBase.cxx | 4
oox/source/shape/ShapeFilterBase.hxx | 2
oox/source/token/properties.txt | 1
oox/source/xls/excelfilter.cxx | 2
oox/source/xls/workbookhelper.cxx | 4
package/source/manifest/ManifestDefines.hxx | 5
package/source/manifest/ManifestImport.cxx | 3
package/source/manifest/ManifestImport.hxx | 1
package/source/xstor/owriteablestream.cxx | 4
package/source/xstor/xstorage.cxx | 46
postprocess/packcomponents/makefile.mk | 13
postprocess/packregistry/makefile.mk | 4
postprocess/prj/build.lst | 2
postprocess/rebase/coffbase.txt | 1
pyuno/source/module/pyuno_module.cxx | 9
qadevOOo/runner/lib/MultiMethodTest.java | 6
qadevOOo/testdocs/vertical-testcase.odt |binary
reportdesign/inc/RptDef.hxx | 17
reportdesign/inc/UndoActions.hxx | 9
reportdesign/source/core/api/ReportDefinition.cxx | 26
reportdesign/source/ui/inc/RptUndo.hxx | 13
rsc/Executable_rsc.mk | 1
rsc/Package_yacc.mk | 4
rsc/source/res/rsccont.cxx | 20
rsc/source/rsc/rsc.cxx | 8
sal/cppunittester/cppunittester.cxx | 8
sal/osl/w32/diagnose.c | 18
sal/osl/w32/security.c | 4
sax/source/expatwrap/expwrap.component | 2
sax/source/expatwrap/sax_expat.cxx | 2
sax/source/expatwrap/saxwriter.cxx | 4
sax/source/fastparser/facreg.cxx | 2
sax/source/fastparser/fastsax.component | 2
sc/CppunitTest_sc_test_filters.mk | 2
sc/CppunitTest_sc_ucalc.mk | 8
sc/Library_scfilt.mk | 1
sc/Library_vbaobj.mk | 2
sc/inc/chartlis.hxx | 30
sc/inc/compiler.hxx | 86
sc/inc/rangenam.hxx | 27
sc/inc/table.hxx | 4
sc/inc/token.hxx | 7
sc/inc/tokenarray.hxx | 8
sc/source/core/data/cell.cxx | 100
sc/source/core/data/cell2.cxx | 10
sc/source/core/data/column3.cxx | 81
sc/source/core/data/conditio.cxx | 16
sc/source/core/data/document.cxx | 236 -
sc/source/core/data/table2.cxx | 20
sc/source/core/inc/interpre.hxx | 157 -
sc/source/core/tool/chartlis.cxx | 36
sc/source/core/tool/compiler.cxx | 495 +--
sc/source/core/tool/interpr1.cxx | 188 -
sc/source/core/tool/interpr2.cxx | 68
sc/source/core/tool/interpr3.cxx | 34
sc/source/core/tool/interpr4.cxx | 85
sc/source/core/tool/interpr5.cxx | 26
sc/source/core/tool/rangenam.cxx | 61
sc/source/core/tool/token.cxx | 52
sc/source/core/tool/zforauto.cxx | 2
sc/source/filter/excel/excimp8.cxx | 8
sc/source/filter/excel/expop2.cxx | 10
sc/source/filter/excel/xestream.cxx | 4
sc/source/filter/excel/xestring.cxx | 4
sc/source/filter/excel/xichart.cxx | 6
sc/source/filter/excel/xiescher.cxx | 60
sc/source/filter/excel/xiname.cxx | 2
sc/source/filter/excel/xltools.cxx | 161 -
sc/source/filter/ftools/fapihelper.cxx | 14
sc/source/filter/inc/fapihelper.hxx | 2
sc/source/filter/inc/xestream.hxx | 2
sc/source/filter/inc/xichart.hxx | 25
sc/source/filter/inc/xiescher.hxx | 19
sc/source/filter/inc/xltools.hxx | 40
sc/source/filter/xcl97/xcl97rec.cxx | 21
sc/source/filter/xml/xmlexprt.cxx | 100
sc/source/filter/xml/xmlexprt.hxx | 5
sc/source/ui/app/inputwin.cxx | 3
sc/source/ui/docshell/docsh8.cxx | 2
sc/source/ui/docshell/impex.cxx | 18
sc/source/ui/namedlg/namedlg.cxx | 4
sc/source/ui/unoobj/docuno.cxx | 3
sc/source/ui/unoobj/servuno.cxx | 83
sc/source/ui/view/tabview2.cxx | 46
sc/source/ui/view/tabvwsh3.cxx | 4
sc/source/ui/view/viewfun3.cxx | 5
sc/source/ui/view/viewfunc.cxx | 4
scp2/source/base/file_base.scp | 2
scp2/source/calc/file_calc.scp | 2
scp2/source/draw/file_draw.scp | 2
scp2/source/impress/file_impress.scp | 2
scp2/source/math/file_math.scp | 2
scp2/source/ooo/file_ooo.scp | 2
scp2/source/ooo/module_hidden_ooo.scp | 2
scp2/source/writer/file_writer.scp | 2
scripting/source/runtimemgr/ScriptNameResolverImpl.cxx | 2
sd/CppunitTest_sd_uimpress.mk | 5
sd/Library_sd.mk | 1
sd/Library_sdfilt.mk | 13
sd/prj/d.lst | 3
sd/source/core/sdpage.cxx | 9
sd/source/filter/eppt/epptooxml.hxx | 2
sd/source/filter/eppt/epptso.cxx | 4
sd/source/filter/eppt/pptx-text.cxx | 2
sd/source/filter/ppt/pptin.cxx | 30
sd/source/filter/sdpptwrp.cxx | 29
sd/source/ui/dlg/tpoption.cxx | 24
sd/source/ui/func/fumorph.cxx | 71
sd/source/ui/inc/fuediglu.hxx | 2
sd/source/ui/inc/fumorph.hxx | 42
sd/source/ui/unoidl/unomodel.cxx | 6
sd/source/ui/view/drviews3.cxx | 14
set_soenv.in | 5
sfx2/inc/orgmgr.hxx | 1
sfx2/inc/resmgr.hxx | 3
sfx2/inc/sfx2/app.hxx | 2
sfx2/inc/sfx2/dispatch.hxx | 1
sfx2/inc/sfx2/docfile.hxx | 2
sfx2/inc/sfx2/doctdlg.hxx | 2
sfx2/inc/sfx2/doctempl.hxx | 14
sfx2/inc/sfx2/htmlmode.hxx | 1
sfx2/inc/sfx2/minarray.hxx | 130
sfx2/inc/sfx2/mnuitem.hxx | 1
sfx2/inc/sfx2/mnumgr.hxx | 4
sfx2/inc/sfx2/msgpool.hxx | 5
sfx2/inc/sfx2/new.hxx | 2
sfx2/inc/sfx2/objsh.hxx | 2
sfx2/inc/sfx2/qswin32.h | 1
sfx2/inc/sfx2/sfxstatuslistener.hxx | 2
sfx2/inc/sfx2/viewfrm.hxx | 5
sfx2/inc/sfx2/viewsh.hxx | 6
sfx2/inc/sorgitm.hxx | 1
sfx2/source/appl/app.cxx | 14
sfx2/source/appl/appbaslib.cxx | 15
sfx2/source/appl/appmisc.cxx | 1
sfx2/source/bastyp/minarray.cxx | 465 ---
sfx2/source/control/dispatch.cxx | 15
sfx2/source/control/msgpool.cxx | 26
sfx2/source/control/sfxstatuslistener.cxx | 43
sfx2/source/control/sorgitm.cxx | 11
sfx2/source/dialog/alienwarn.cxx | 23
sfx2/source/dialog/alienwarn.hrc | 2
sfx2/source/dialog/alienwarn.src | 8
sfx2/source/doc/DocumentMetadataAccess.cxx | 84
sfx2/source/doc/SfxDocumentMetaData.cxx | 53
sfx2/source/doc/docfile.cxx | 14
sfx2/source/doc/doctdlg.cxx | 19
sfx2/source/doc/doctempl.cxx | 352 --
sfx2/source/doc/new.cxx | 30
sfx2/source/doc/objmisc.cxx | 35
sfx2/source/inc/virtmenu.hxx | 5
sfx2/source/menu/mnuitem.cxx | 30
sfx2/source/menu/mnumgr.cxx | 78
sfx2/source/menu/virtmenu.cxx | 80
sfx2/source/view/orgmgr.cxx | 7
sfx2/source/view/viewfrm.cxx | 52
sfx2/source/view/viewprn.cxx | 29
sfx2/source/view/viewsh.cxx | 85
slideshow/Library_slideshow.mk | 1
slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx | 2
slideshow/source/engine/shapes/drawinglayeranimation.cxx | 2
smoketestoo_native/losmoketest.py | 571 +++
smoketestoo_native/losmoketest.readme | 186 +
solenv/bin/build.pl | 632 ----
solenv/bin/build_client.pl | 436 --
solenv/bin/modules/RepositoryHelper.pm | 54
solenv/bin/modules/SourceConfig.pm | 471 ---
solenv/bin/modules/SourceConfigHelper.pm | 5
solenv/gbuild/Configuration.mk | 447 +++
solenv/gbuild/CppunitTest.mk | 2
solenv/gbuild/Executable.mk | 1
solenv/gbuild/JavaClassSet.mk | 6
solenv/gbuild/Library.mk | 3
solenv/gbuild/LinkTarget.mk | 121
solenv/gbuild/StaticLibrary.mk | 3
solenv/gbuild/TargetLocations.mk | 26
solenv/gbuild/gbuild.mk | 1
solenv/gbuild/platform/android.mk | 3
solenv/gbuild/platform/dragonfly.mk | 13
solenv/gbuild/platform/freebsd.mk | 13
solenv/gbuild/platform/ios.mk | 5
solenv/gbuild/platform/linux.mk | 13
solenv/gbuild/platform/macosx.mk | 5
solenv/gbuild/platform/netbsd.mk | 13
solenv/gbuild/platform/openbsd.mk | 14
solenv/gbuild/platform/solaris.mk | 6
solenv/gbuild/platform/unxgcc.mk | 41
solenv/gbuild/platform/windows.mk | 37
solenv/gbuild/platform/winmingw.mk | 32
solenv/inc/settings.mk | 6
solenv/inc/wntmsc.mk | 17
soltools/inc/st_list.hxx | 4
sot/source/sdstor/stgelem.cxx | 13
sot/source/sdstor/stgelem.hxx | 2
starmath/CppunitTest_starmath_qa_cppunit.mk | 2
stoc/source/invocation/invocation.cxx | 2
stoc/source/javavm/javavm.cxx | 2
stoc/source/tdmanager/tdmgr.cxx | 2
svl/inc/svl/filerec.hxx | 28
svl/inc/svl/itempool.hxx | 2
svl/inc/svl/nfsymbol.hxx | 21
svl/inc/svl/svstdarr.hxx | 5
svl/inc/svl/zforlist.hxx | 128
svl/inc/svl/zformat.hxx | 171 -
svl/source/filerec/filerec.cxx | 39
svl/source/items/poolio.cxx | 7
svl/source/items/stylepool.cxx | 2
svl/source/memtools/svarray.cxx | 1
svl/source/numbers/numfmuno.cxx | 16
svl/source/numbers/zforfind.cxx | 364 +-
svl/source/numbers/zforfind.hxx | 100
svl/source/numbers/zforlist.cxx | 404 +-
svl/source/numbers/zformat.cxx | 555 +--
svl/source/numbers/zforscan.cxx | 180 -
svl/source/numbers/zforscan.hxx | 72
svtools/Executable_bmp.mk | 1
svtools/bmpmaker/bmpcore.cxx | 3
svtools/inc/svtools/calendar.hxx | 25
svtools/inc/svtools/grfmgr.hxx | 8
svtools/inc/svtools/valueset.hxx | 42
svtools/source/config/optionsdrawinglayer.cxx | 264 -
svtools/source/control/calendar.cxx | 316 --
svtools/source/control/ctrlbox.cxx | 2
svtools/source/control/fmtfield.cxx | 8
svtools/source/control/valueacc.cxx | 26
svtools/source/control/valueimp.hxx | 10
svtools/source/control/valueset.cxx | 253 -
svtools/source/filter/FilterConfigCache.cxx | 4
svtools/source/filter/sgvtext.cxx | 46
svtools/source/graphic/grfcache.cxx | 19
svtools/source/graphic/grfcache.hxx | 1
svtools/source/graphic/grfmgr2.cxx | 42
svtools/source/inc/sgvmain.hxx | 2
svtools/source/misc/transfer.cxx | 3
svtools/source/svrtf/svparser.cxx | 3
svtools/source/table/tablecontrol_impl.cxx | 8
svtools/source/uno/unoimap.cxx | 2
svx/inc/svx/fmpage.hxx | 6
svx/inc/svx/fmsearch.hxx | 6
svx/inc/svx/fmview.hxx | 10
svx/inc/svx/framelinkarray.hxx | 58
svx/inc/svx/numfmtsh.hxx | 67
svx/inc/svx/svdedtv.hxx | 3
svx/inc/svx/svdglev.hxx | 1
svx/inc/svx/svdorect.hxx | 5
svx/source/customshapes/EnhancedCustomShape2d.cxx | 4
svx/source/dialog/docrecovery.cxx | 11
svx/source/dialog/framelink.cxx | 12
svx/source/dialog/framelinkarray.cxx | 140
svx/source/dialog/frmsel.cxx | 5
svx/source/dialog/makefile.mk | 154 -
svx/source/engine3d/helperhittest3d.cxx | 2
svx/source/form/fmvwimp.cxx | 33
svx/source/form/makefile.mk | 117
svx/source/form/navigatortreemodel.cxx | 92
svx/source/gallery2/makefile.mk | 65
svx/source/gengal/makefile.mk | 80
svx/source/inc/docrecovery.hxx | 8
svx/source/inc/fmexpl.hxx | 4
svx/source/inc/fmitems.hxx | 9
svx/source/inc/fmpgeimp.hxx | 13
svx/source/inc/fmundo.hxx | 9
svx/source/inc/fmvwimp.hxx | 16
svx/source/inc/frmselimpl.hxx | 1
svx/source/items/makefile.mk | 84
svx/source/items/numfmtsh.cxx | 192 -
svx/source/stbctrls/makefile.mk | 75
svx/source/svdraw/svdedtv2.cxx | 21
svx/source/svdraw/svdglev.cxx | 7
svx/source/svdraw/svdocirc.cxx | 2
svx/source/svdraw/svdorect.cxx | 40
svx/source/unodraw/unoprov.cxx | 2
sw/CppunitTest_sw_swdoc_test.mk | 2
sw/CppunitTest_sw_test_filters.mk | 2
sw/Library_msword.mk | 1
sw/inc/numrule.hxx | 10
sw/inc/printdata.hxx | 2
sw/inc/unotxdoc.hxx | 3
sw/sdi/swriter.sdi | 2
sw/source/core/crsr/crossrefbookmark.cxx | 6
sw/source/core/doc/docnum.cxx | 5
sw/source/core/doc/number.cxx | 56
sw/source/core/doc/tblafmt.cxx | 2
sw/source/core/docnode/ndcopy.cxx | 3
sw/source/core/inc/frame.hxx | 3
sw/source/core/layout/layact.cxx | 57
sw/source/core/layout/paintfrm.cxx | 323 +-
sw/source/core/unocore/unocoll.cxx | 7
sw/source/core/unocore/unotext.cxx | 26
sw/source/core/view/printdata.cxx | 4
sw/source/filter/html/htmltab.cxx | 2
sw/source/filter/rtf/rtffld.cxx | 50
sw/source/filter/ww8/docxattributeoutput.cxx | 10
sw/source/filter/ww8/docxexport.cxx | 52
sw/source/filter/ww8/docxexport.hxx | 2
sw/source/filter/ww8/docxexportfilter.hxx | 2
sw/source/filter/ww8/wrtw8num.cxx | 2
sw/source/filter/ww8/wrtww8.cxx | 12
sw/source/filter/ww8/ww8atr.cxx | 12
sw/source/filter/ww8/ww8par.cxx | 32
sw/source/filter/ww8/ww8par3.cxx | 12
sw/source/filter/ww8/ww8par5.cxx | 67
sw/source/filter/ww8/ww8par6.cxx | 9
sw/source/ui/app/docsh.cxx | 6
sw/source/ui/chrdlg/pardlg.cxx | 12
sw/source/ui/config/viewopt.cxx | 11
sw/source/ui/fmtui/tmpdlg.cxx | 2
sw/source/ui/inc/hyp.hxx | 1
sw/source/ui/inc/wrtsh.hxx | 1
sw/source/ui/lingu/hyp.cxx | 11
sw/source/ui/table/tautofmt.cxx | 2
sw/source/ui/uiview/view2.cxx | 11
sw/source/ui/uno/unotxdoc.cxx | 14
sw/source/ui/utlui/uitool.cxx | 3
sw/source/ui/vba/vbarows.cxx | 16
sw/source/ui/wrtsh/wrtsh1.cxx | 33
sw/source/ui/wrtsh/wrtsh2.cxx | 6
sw/uiconfig/sglobal/menubar/menubar.xml | 2
sw/uiconfig/swform/menubar/menubar.xml | 2
sw/uiconfig/swreport/menubar/menubar.xml | 2
sw/uiconfig/swriter/menubar/menubar.xml | 2
sw/uiconfig/swxform/menubar/menubar.xml | 2
tail_build/prj/build.lst | 2
test/source/java/org/openoffice/test/OfficeConnection.java | 2
testgraphical/ui/java/ConvwatchGUIProject/src/IniFile.java | 85
toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx | 10
tools/Executable_rscdep.mk | 12
tools/Module_tools.mk | 1
tools/StaticLibrary_toolshelpers.mk | 60
tools/bootstrp/cppdep.cxx | 63
tools/bootstrp/cppdep.hxx | 3
tools/inc/tools/config.hxx | 3
tools/inc/tools/simplerm.hxx | 10
tools/inc/tools/string.hxx | 23
tools/inc/tools/urlobj.hxx | 2
tools/source/fsys/urlobj.cxx | 16
tools/source/generic/config.cxx | 54
tools/source/inet/inetmime.cxx | 16
tools/source/inet/inetmsg.cxx | 70
tools/source/rc/resmgr.cxx | 83
tools/source/string/strcvt.cxx | 102
tools/source/string/tstring.cxx | 30
ucb/source/ucp/ftp/ftpinpstr.cxx | 18
udkapi/UnoApi_udkapi.mk | 5
udkapi/com/sun/star/beans/XPropertySetOption.idl | 48
udkapi/com/sun/star/script/EventListener.idl | 46
udkapi/com/sun/star/script/XEventAttacher2.idl | 58
udkapi/com/sun/star/script/makefile.mk | 2
unotools/inc/unotools/calendarwrapper.hxx | 1
unotools/inc/unotools/fltrcfg.hxx | 5
unotools/source/config/configmgr.cxx | 20
unotools/source/config/fltrcfg.cxx | 17
unotools/source/config/xmlaccelcfg.cxx | 4
unotools/source/i18n/calendarwrapper.cxx | 21
unusedcode.easy | 363 --
uui/AllLangResTarget_uui.mk | 63
uui/Library_uui.mk | 83
uui/Makefile | 39
uui/Module_uui.mk | 37
uui/Package_xml.mk | 33
uui/prj/build.lst | 4
uui/prj/d.lst | 10
uui/prj/makefile.mk | 40
uui/source/makefile.mk | 87
uui/util/makefile.mk | 72
vcl/inc/glyphcache.hxx | 27
vcl/inc/vcl/btndlg.hxx | 6
vcl/inc/vcl/button.hxx | 8
vcl/inc/vcl/combobox.hxx | 11
vcl/inc/vcl/dockwin.hxx | 18
vcl/inc/vcl/grid.hxx | 39
vcl/inc/vcl/ldialog.hxx | 39
vcl/inc/vcl/lstbox.hxx | 16
vcl/inc/vcl/xmlparser.hxx | 39
vcl/source/control/button.cxx | 95
vcl/source/control/combobox.cxx | 60
vcl/source/control/lstbox.cxx | 82
vcl/source/gdi/gdimtf.cxx | 13
vcl/source/glyphs/gcach_ftyp.hxx | 2
vcl/source/glyphs/gcach_vdev.cxx | 290 -
vcl/source/glyphs/gcach_vdev.hxx | 60
vcl/source/glyphs/glyphcache.cxx | 2
vcl/source/layout/grid.cxx | 40
vcl/source/layout/ldialog.cxx | 40
vcl/source/layout/xmlparser.cxx | 41
vcl/source/window/btndlg.cxx | 62
vcl/source/window/dockmgr.cxx | 156 -
vcl/source/window/printdlg.cxx | 17
vcl/source/window/window.cxx | 6
vcl/unx/generic/fontmanager/fontcache.cxx | 3
vcl/unx/generic/fontmanager/fontconfig.cxx | 4
vcl/unx/generic/gdi/salgdi3.cxx | 10
vcl/unx/generic/printer/jobdata.cxx | 60
vcl/unx/generic/printer/printerinfomanager.cxx | 119
vcl/win/source/gdi/salgdi3.cxx | 6
wizards/Jar_commonwizards.mk | 10
wizards/com/sun/star/wizards/db/SQLQueryComposer.java | 2
wizards/source/euro/Init.xba | 26
wizards/source/euro/euro.src | 7
writerfilter/Library_ooxml.mk | 2
writerfilter/Library_resourcemodel.mk | 2
writerfilter/Library_rtftok.mk | 1
writerfilter/Package_writerfilter_generated.mk | 4
writerfilter/qa/cppunittests/rtftok/testrtftok.cxx | 22
writerfilter/source/Makefile | 4
writerfilter/source/dmapper/DomainMapper.cxx | 60
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 212 +
writerfilter/source/dmapper/FieldTypes.hxx | 1
writerfilter/source/dmapper/ModelEventListener.cxx | 28
writerfilter/source/dmapper/PropertyIds.cxx | 2
writerfilter/source/dmapper/PropertyIds.hxx | 2
writerfilter/source/dmapper/PropertyMap.cxx | 33
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 4
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 2
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 294 +-
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 44
writerfilter/source/rtftok/rtfsdrimport.cxx | 17
writerfilter/source/rtftok/rtfsdrimport.hxx | 9
writerfilter/source/rtftok/rtfskipdestination.cxx | 66
writerfilter/source/rtftok/rtfskipdestination.hxx | 56
writerfilter/source/rtftok/rtftokenizer.cxx | 7
writerfilter/source/rtftok/rtfvalue.cxx | 30
writerfilter/source/rtftok/rtfvalue.hxx | 6
xml2cmp/source/support/list.hxx | 2
xmloff/Library_xo.mk | 4
xmloff/inc/xmloff/xmlcnimp.hxx | 87
xmloff/source/core/SvXMLAttr.cxx | 72
xmloff/source/core/SvXMLAttr.hxx | 58
xmloff/source/core/SvXMLAttrCollection.cxx | 188 +
xmloff/source/core/SvXMLAttrCollection.hxx | 90
xmloff/source/core/unoatrcn.cxx | 1
xmloff/source/core/xmlcnimp.cxx | 148 +
xmloff/source/core/xmlcnitm.cxx | 221 -
xmloff/source/core/xmlexp.cxx | 3
xmloff/source/draw/shapeexport.cxx | 2
xmloff/source/style/xmlnumfe.cxx | 2
xmlsecurity/AllLangResTarget.mk | 45
xmlsecurity/AllLangResTarget_xsec.mk | 53
xmlsecurity/Library_xsec_xmlsec.mk | 13
xmlsecurity/Module_xmlsecurity.mk | 8
xmlsecurity/source/helper/documentsignaturehelper.cxx | 2
zlib/zlib-1.2.5.patch | 15
846 files changed, 17184 insertions(+), 20409 deletions(-)
New commits:
commit 905ef1c4f6b536f6ab1cea0140586715ed7dc009
Author: Ricardo Cruz <rpmcruz at alunos.dcc.fc.up.pt>
Date: Sat Aug 20 02:16:58 2011 +0100
Meeks: license patch
diff --git a/vcl/inc/vcl/grid.hxx b/vcl/inc/vcl/grid.hxx
index 2542f20..a48fc95 100644
--- a/vcl/inc/vcl/grid.hxx
+++ b/vcl/inc/vcl/grid.hxx
@@ -1,23 +1,32 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
*
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
+ * The Initial Developer of the Original Code is
+ * Ricardo Cruz <rpmcruz at alunos.dcc.fc.up.pt>
+ * Portions created by the Initial Developer are Copyright (C) 2011 the
+ * Initial Developer. All Rights Reserved.
*
- ************************************************************************/
-
+ * Major Contributor(s):
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
#ifndef VCL_GRID_HXX
#define VCL_GRID_HXX
diff --git a/vcl/inc/vcl/ldialog.hxx b/vcl/inc/vcl/ldialog.hxx
index f83142d..ab55803 100644
--- a/vcl/inc/vcl/ldialog.hxx
+++ b/vcl/inc/vcl/ldialog.hxx
@@ -1,23 +1,32 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
*
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
+ * The Initial Developer of the Original Code is
+ * Ricardo Cruz <rpmcruz at alunos.dcc.fc.up.pt>
+ * Portions created by the Initial Developer are Copyright (C) 2011 the
+ * Initial Developer. All Rights Reserved.
*
- ************************************************************************/
-
+ * Major Contributor(s):
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
#ifndef VCL_LDIALOG_HXX
#define VCL_LDIALOG_HXX
diff --git a/vcl/inc/vcl/xmlparser.hxx b/vcl/inc/vcl/xmlparser.hxx
index dd6b408..f8130fa 100644
--- a/vcl/inc/vcl/xmlparser.hxx
+++ b/vcl/inc/vcl/xmlparser.hxx
@@ -1,23 +1,32 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
*
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
+ * The Initial Developer of the Original Code is
+ * Ricardo Cruz <rpmcruz at alunos.dcc.fc.up.pt>
+ * Portions created by the Initial Developer are Copyright (C) 2011 the
+ * Initial Developer. All Rights Reserved.
*
- ************************************************************************/
-
+ * Major Contributor(s):
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
#ifndef VCL_XML_PARSER_HXX
#define VCL_XML_PARSER_HXX
diff --git a/vcl/source/layout/grid.cxx b/vcl/source/layout/grid.cxx
index 39df0c0..7f97560 100644
--- a/vcl/source/layout/grid.cxx
+++ b/vcl/source/layout/grid.cxx
@@ -1,24 +1,32 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
*
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
+ * The Initial Developer of the Original Code is
+ * Ricardo Cruz <rpmcruz at alunos.dcc.fc.up.pt>
+ * Portions created by the Initial Developer are Copyright (C) 2011 the
+ * Initial Developer. All Rights Reserved.
*
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
+ * Major Contributor(s):
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
#include "precompiled_vcl.hxx"
#include <vcl/grid.hxx>
diff --git a/vcl/source/layout/ldialog.cxx b/vcl/source/layout/ldialog.cxx
index c635358..9a5d8bc 100644
--- a/vcl/source/layout/ldialog.cxx
+++ b/vcl/source/layout/ldialog.cxx
@@ -1,24 +1,32 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
*
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
+ * The Initial Developer of the Original Code is
+ * Ricardo Cruz <rpmcruz at alunos.dcc.fc.up.pt>
+ * Portions created by the Initial Developer are Copyright (C) 2011 the
+ * Initial Developer. All Rights Reserved.
*
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
+ * Major Contributor(s):
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
#include "precompiled_vcl.hxx"
#include <vcl/ldialog.hxx>
diff --git a/vcl/source/layout/xmlparser.cxx b/vcl/source/layout/xmlparser.cxx
index db67a01..7240d9a 100644
--- a/vcl/source/layout/xmlparser.cxx
+++ b/vcl/source/layout/xmlparser.cxx
@@ -1,26 +1,33 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
*
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
+ * The Initial Developer of the Original Code is
+ * Ricardo Cruz <rpmcruz at alunos.dcc.fc.up.pt>
+ * Portions created by the Initial Developer are Copyright (C) 2011 the
+ * Initial Developer. All Rights Reserved.
*
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
+ * Major Contributor(s):
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
#include "precompiled_vcl.hxx"
-
#include <vcl/xmlparser.hxx>
//** Factory
commit 6cf213b37389eec27a8fa314298375b4096ab3ff
Author: Tom Tromey <tromey at redhat.com>
Date: Thu Aug 18 11:00:57 2011 +0100
compile / scope fix for latest gcc
diff --git a/soltools/inc/st_list.hxx b/soltools/inc/st_list.hxx
index 5717e01..8ede2ef 100644
--- a/soltools/inc/st_list.hxx
+++ b/soltools/inc/st_list.hxx
@@ -295,7 +295,7 @@ DynamicList<XY>::operator=( const DynamicList<XY> & i_rList )
it != i_rList.end();
++it )
{
- push_back( new XY(*(*it)) );
+ this->push_back( new XY(*(*it)) );
}
return *this;
}
@@ -308,7 +308,7 @@ DynamicList<XY>::Insert(unsigned pos, XY * const & elem_)
if ( pos > this->len )
return;
- checkSize(DynamicList<XY>::len+2);
+ this->checkSize(DynamicList<XY>::len+2);
memmove( DynamicList<XY>::inhalt+pos+1, DynamicList<XY>::inhalt+pos, (DynamicList<XY>::len-pos) * sizeof(XY*) );
this->inhalt[pos] = elem_;
this->len++;
commit 9a9f7edb703fc268aa2168ed4f146edb7c259536
Author: Aaron Strontsman <heinzlesspam at gmail.com>
Date: Thu Aug 18 10:19:59 2011 +0200
Additional patch for fdo#39167
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index c205bd8..597c8ba 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -454,6 +454,7 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage( Window* pParent,
maCbExportNotesPages( this, PDFFilterResId( CB_EXPORTNOTESPAGES ) ),
maCbExportEmptyPages( this, PDFFilterResId( CB_EXPORTEMPTYPAGES ) ),
maCbAddStream( this, PDFFilterResId( CB_ADDSTREAM ) ),
+ maFtAddStreamDescription( this, PDFFilterResId( FT_ADDSTREAMDESCRIPTION ) ),
maCbEmbedStandardFonts( this, PDFFilterResId( CB_EMBEDSTANDARDFONTS ) ),
mbIsPresentation( sal_False ),
mbIsWriter( sal_False),
@@ -588,11 +589,39 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent
{
maCbAddStream.Show( sal_True );
maCbAddStream.Check( paParent->mbAddStream );
+ maFtAddStreamDescription.Show( sal_True );
}
else
{
maCbAddStream.Show( sal_False );
maCbAddStream.Check( sal_False );
+ maFtAddStreamDescription.Show( sal_False );
+ //Move all following elements up...
+ long nAddStreamHeight =
+ maCbAddStream.LogicToPixel( Size( 13, 13 ), MAP_APPFONT ).Height()
+ + maFtAddStreamDescription.LogicToPixel( Size( 11, 11 ), MAP_APPFONT ).Height();
+ Point aPos = maCbPDFA1b.GetPosPixel();
+ maCbPDFA1b.SetPosPixel( Point( aPos.X(), aPos.Y() - nAddStreamHeight ) );
+ aPos = maCbTaggedPDF.GetPosPixel();
+ maCbTaggedPDF.SetPosPixel( Point( aPos.X(), aPos.Y() - nAddStreamHeight ) );
+ aPos = maCbExportFormFields.GetPosPixel();
+ maCbExportFormFields.SetPosPixel( Point( aPos.X(), aPos.Y() - nAddStreamHeight ) );
+ aPos = maFtFormsFormat.GetPosPixel();
+ maFtFormsFormat.SetPosPixel( Point( aPos.X(), aPos.Y() - nAddStreamHeight ) );
+ aPos = maLbFormsFormat.GetPosPixel();
+ maLbFormsFormat.SetPosPixel( Point( aPos.X(), aPos.Y() - nAddStreamHeight ) );
+ aPos = maCbAllowDuplicateFieldNames.GetPosPixel();
+ maCbAllowDuplicateFieldNames.SetPosPixel( Point( aPos.X(), aPos.Y() - nAddStreamHeight ) );
+ aPos = maCbExportBookmarks.GetPosPixel();
+ maCbExportBookmarks.SetPosPixel( Point( aPos.X(), aPos.Y() - nAddStreamHeight ) );
+ aPos = maCbExportNotes.GetPosPixel();
+ maCbExportNotes.SetPosPixel( Point( aPos.X(), aPos.Y() - nAddStreamHeight ) );
+ aPos = maCbExportNotesPages.GetPosPixel();
+ maCbExportNotesPages.SetPosPixel( Point( aPos.X(), aPos.Y() - nAddStreamHeight ) );
+ aPos = maCbExportEmptyPages.GetPosPixel();
+ maCbExportEmptyPages.SetPosPixel( Point( aPos.X(), aPos.Y() - nAddStreamHeight ) );
+ aPos = maCbEmbedStandardFonts.GetPosPixel();
+ maCbEmbedStandardFonts.SetPosPixel( Point( aPos.X(), aPos.Y() - nAddStreamHeight ) );
}
maCbAddStream.SetToggleHdl( LINK( this, ImpPDFTabGeneralPage, ToggleAddStreamHdl ) );
// init addstream dependencies
diff --git a/filter/source/pdf/impdialog.hrc b/filter/source/pdf/impdialog.hrc
index eae1c8d..c8afb6d 100644
--- a/filter/source/pdf/impdialog.hrc
+++ b/filter/source/pdf/impdialog.hrc
@@ -88,6 +88,7 @@
#define CB_PDFA_1B_SELECT 26
#define CB_EXPORTNOTESPAGES 27
#define CB_EMBEDSTANDARDFONTS 28
+#define FT_ADDSTREAMDESCRIPTION 29
#define FL_OLD_PAGES 51
#define RB_OLD_ALL 52
diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx
index b3e6c23..77f88b3 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -210,6 +210,7 @@ class ImpPDFTabGeneralPage : public SfxTabPage
CheckBox maCbExportEmptyPages;
CheckBox maCbAddStream;
+ FixedText maFtAddStreamDescription;
CheckBox maCbEmbedStandardFonts;
sal_Bool mbIsPresentation;
diff --git a/filter/source/pdf/impdialog.src b/filter/source/pdf/impdialog.src
index 37c45a7..910bbac 100644
--- a/filter/source/pdf/impdialog.src
+++ b/filter/source/pdf/impdialog.src
@@ -27,7 +27,7 @@
#include "impdialog.hrc"
-#define TAB_PDF_SIZE Size = MAP_APPFONT ( 352, 155 )
+#define TAB_PDF_SIZE Size = MAP_APPFONT ( 352, 180 )
//string for TabDialog standard buttons
String STR_PDF_EXPORT
{
@@ -157,7 +157,7 @@ TabPage RID_PDF_TAB_GENER
FixedLine FL_GENERAL_VERTICAL
{
Pos = MAP_APPFONT ( 175 , 3 ) ;
- Size = MAP_APPFONT ( 4 , 150 ) ;
+ Size = MAP_APPFONT ( 4 , 171 ) ;
Vert = TRUE;
};
@@ -173,12 +173,18 @@ TabPage RID_PDF_TAB_GENER
Pos = MAP_APPFONT ( 188 , 14 ) ;
Size = MAP_APPFONT ( 158 , 10 ) ;
TabStop = TRUE ;
- Text[ en-US ] = "Create ~LibreOffice fully editable file";
+ Text[ en-US ] = "Em~bed OpenDocument file";
+ };
+ FixedText FT_ADDSTREAMDESCRIPTION
+ {
+ Pos = MAP_APPFONT( 206 , 27 ) ;
+ Size = MAP_APPFONT( 140, 8 ) ;
+ Text[ en-US ] = "Makes this PDF easily editable in %PRODUCTNAME" ;
};
CheckBox CB_PDFA_1B_SELECT
{
HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_PDFA_1B_SELECT";
- Pos = MAP_APPFONT ( 188, 27 ) ;
+ Pos = MAP_APPFONT ( 188, 40 ) ;
Size = MAP_APPFONT ( 158 , 10 ) ;
TabStop = TRUE ;
Text[ en-US ] = "P~DF/A-1a";
@@ -186,7 +192,7 @@ TabPage RID_PDF_TAB_GENER
CheckBox CB_TAGGEDPDF
{
HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_TAGGEDPDF";
- Pos = MAP_APPFONT ( 188 , 40 ) ;
+ Pos = MAP_APPFONT ( 188 , 53 ) ;
Size = MAP_APPFONT ( 158 , 10 ) ;
TabStop = TRUE ;
Text[ en-US ] = "~Tagged PDF";
@@ -194,14 +200,14 @@ TabPage RID_PDF_TAB_GENER
CheckBox CB_EXPORTFORMFIELDS
{
HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTFORMFIELDS";
- Pos = MAP_APPFONT ( 188 , 54 ) ;
+ Pos = MAP_APPFONT ( 188 , 66 ) ;
Size = MAP_APPFONT ( 158 , 10 ) ;
TabStop = TRUE ;
Text[ en-US ] = "~Create PDF form";
};
FixedText FT_FORMSFORMAT
{
- Pos = MAP_APPFONT ( 206 , 64 ) ;
+ Pos = MAP_APPFONT ( 206 , 79 ) ;
Size = MAP_APPFONT ( 93, 8 ) ;
Text[ en-US ] = "Submit ~format";
};
@@ -209,7 +215,7 @@ TabPage RID_PDF_TAB_GENER
{
HelpID = "filter:ListBox:RID_PDF_TAB_GENER:LB_FORMSFORMAT";
Border = TRUE ;
- Pos = MAP_APPFONT ( 302, 62 ) ;
+ Pos = MAP_APPFONT ( 302, 77 ) ;
Size = MAP_APPFONT ( 38, 48 ) ;
DeltaLang = < Default ; Default ; Default ; Default ; > ;
TabStop = TRUE ;
@@ -225,7 +231,7 @@ TabPage RID_PDF_TAB_GENER
CheckBox CB_ALLOWDUPLICATEFIELDNAMES
{
HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_ALLOWDUPLICATEFIELDNAMES";
- Pos = MAP_APPFONT( 206, 76 );
+ Pos = MAP_APPFONT( 206, 92 );
Size = MAP_APPFONT( 128, 10 );
TabStop = TRUE;
Text [ en-US ] = "Allow duplicate field ~names";
@@ -233,7 +239,7 @@ TabPage RID_PDF_TAB_GENER
CheckBox CB_EXPORTBOOKMARKS
{
HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTBOOKMARKS";
- Pos = MAP_APPFONT ( 188 , 89 ) ;
+ Pos = MAP_APPFONT ( 188 , 105 ) ;
Size = MAP_APPFONT ( 158 , 10 ) ;
TabStop = TRUE ;
Text[ en-US ] = "Export ~bookmarks";
@@ -241,7 +247,7 @@ TabPage RID_PDF_TAB_GENER
CheckBox CB_EXPORTNOTES
{
HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTNOTES";
- Pos = MAP_APPFONT ( 188 , 102 ) ;
+ Pos = MAP_APPFONT ( 188 , 118 ) ;
Size = MAP_APPFONT ( 158 , 10 ) ;
TabStop = TRUE ;
Text[ en-US ] = "~Export comments";
@@ -249,7 +255,7 @@ TabPage RID_PDF_TAB_GENER
CheckBox CB_EXPORTNOTESPAGES
{
HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTNOTESPAGES";
- Pos = MAP_APPFONT ( 188 , 118 ) ;
+ Pos = MAP_APPFONT ( 188 , 131 ) ;
Size = MAP_APPFONT ( 158 , 10 ) ;
TabStop = TRUE ;
Text[ en-US ] = "Export ~notes pages";
@@ -257,7 +263,7 @@ TabPage RID_PDF_TAB_GENER
CheckBox CB_EXPORTEMPTYPAGES
{
HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTEMPTYPAGES";
- Pos = MAP_APPFONT ( 188 , 125 ) ;
+ Pos = MAP_APPFONT ( 188 , 144 ) ;
Size = MAP_APPFONT ( 158 , 16 ) ;
TabStop = TRUE ;
WordBreak = TRUE ;
@@ -266,7 +272,7 @@ TabPage RID_PDF_TAB_GENER
CheckBox CB_EMBEDSTANDARDFONTS
{
HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EMBEDSTANDARDFONTS";
- Pos = MAP_APPFONT ( 188 , 147 ) ;
+ Pos = MAP_APPFONT ( 188 , 163 ) ;
Size = MAP_APPFONT ( 158 , 10 ) ;
TabStop = TRUE ;
Text[ en-US ] = "E~mbed standard fonts";
@@ -397,7 +403,7 @@ TabPage RID_PDF_TAB_OPNFTR
FixedLine FL_INITVIEW_VERTICAL
{
Pos = MAP_APPFONT ( 175 , 3 ) ;
- Size = MAP_APPFONT ( 4 , 150 ) ;
+ Size = MAP_APPFONT ( 4 , 171 ) ;
Vert = TRUE;
};
@@ -496,7 +502,7 @@ TabPage RID_PDF_TAB_VPREFER
FixedLine FL_VPREFER_VERTICAL
{
Pos = MAP_APPFONT ( 175 , 3 ) ;
- Size = MAP_APPFONT ( 4 , 150 ) ;
+ Size = MAP_APPFONT ( 4 , 171 ) ;
Vert = TRUE;
};
@@ -673,7 +679,7 @@ TabPage RID_PDF_TAB_SECURITY
FixedLine FL_SECURITY_VERTICAL
{
Pos = MAP_APPFONT ( 175 , 3 ) ;
- Size = MAP_APPFONT ( 4 , 150 ) ;
+ Size = MAP_APPFONT ( 4 , 171 ) ;
Vert = TRUE;
};
commit c2571872470e9462ac52552847dda97fae9a20a8
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Aug 18 03:29:32 2011 -0500
i18npool depend on udkapi
diff --git a/i18npool/prj/build.lst b/i18npool/prj/build.lst
index 983ff07..ea6831a 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 NULL
+inp i18npool : bridges sax stoc comphelper CPPUNIT:cppunit ICU:icu i18nutil regexp DESKTOP:cpputools LIBXSLT:libxslt udkapi NULL
inp i18npool\prj nmake - all inp_prj NULL
commit 3427158f846ef9f027881ced92a40194cf6787fc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 18 09:15:26 2011 +0100
ByteString->rtl::OString
diff --git a/tools/inc/tools/config.hxx b/tools/inc/tools/config.hxx
index fdb0052..5c73940 100644
--- a/tools/inc/tools/config.hxx
+++ b/tools/inc/tools/config.hxx
@@ -73,7 +73,7 @@ public:
ByteString ReadKey( const ByteString& rKey ) const;
UniString ReadKey( const ByteString& rKey, rtl_TextEncoding eEncoding ) const;
ByteString ReadKey( const ByteString& rKey, const ByteString& rDefault ) const;
- void WriteKey( const ByteString& rKey, const ByteString& rValue );
+ void WriteKey(const rtl::OString& rKey, const rtl::OString& rValue);
void DeleteKey( const ByteString& rKey );
ByteString GetKeyName( sal_uInt16 nKey ) const;
ByteString ReadKey( sal_uInt16 nKey ) const;
diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx
index 1cf7094..201578d 100644
--- a/tools/source/generic/config.cxx
+++ b/tools/source/generic/config.cxx
@@ -56,8 +56,8 @@
struct ImplKeyData
{
ImplKeyData* mpNext;
- ByteString maKey;
- ByteString maValue;
+ rtl::OString maKey;
+ rtl::OString maValue;
sal_Bool mbIsComment;
};
@@ -493,11 +493,11 @@ static sal_uInt8* ImplGetConfigBuffer( const ImplConfigData* pData, sal_uIntPtr&
pKey = pGroup->mpFirstKey;
while ( pKey )
{
- nValueLen = pKey->maValue.Len();
+ nValueLen = pKey->maValue.getLength();
if ( pKey->mbIsComment )
nBufLen += nValueLen + nLineEndLen;
else
- nBufLen += pKey->maKey.Len() + nValueLen + nLineEndLen + 1;
+ nBufLen += pKey->maKey.getLength() + nValueLen + nLineEndLen + 1;
pKey = pKey->mpNext;
}
@@ -552,12 +552,12 @@ static sal_uInt8* ImplGetConfigBuffer( const ImplConfigData* pData, sal_uIntPtr&
pKey = pGroup->mpFirstKey;
while ( pKey )
{
- nValueLen = pKey->maValue.Len();
+ nValueLen = pKey->maValue.getLength();
if ( pKey->mbIsComment )
{
if ( nValueLen )
{
- memcpy( pBuf, pKey->maValue.GetBuffer(), nValueLen );
+ memcpy( pBuf, pKey->maValue.getStr(), nValueLen );
pBuf += nValueLen;
}
*pBuf = aLineEndBuf[0]; pBuf++;
@@ -568,11 +568,11 @@ static sal_uInt8* ImplGetConfigBuffer( const ImplConfigData* pData, sal_uIntPtr&
}
else
{
- nKeyLen = pKey->maKey.Len();
- memcpy( pBuf, pKey->maKey.GetBuffer(), nKeyLen );
+ nKeyLen = pKey->maKey.getLength();
+ memcpy( pBuf, pKey->maKey.getStr(), nKeyLen );
pBuf += nKeyLen;
*pBuf = '='; pBuf++;
- memcpy( pBuf, pKey->maValue.GetBuffer(), nValueLen );
+ memcpy( pBuf, pKey->maValue.getStr(), nValueLen );
pBuf += nValueLen;
*pBuf = aLineEndBuf[0]; pBuf++;
if ( nLineEndLen == 2 )
@@ -998,7 +998,7 @@ ByteString Config::ReadKey( const ByteString& rKey, const ByteString& rDefault )
ImplKeyData* pKey = pGroup->mpFirstKey;
while ( pKey )
{
- if ( !pKey->mbIsComment && pKey->maKey.EqualsIgnoreCaseAscii( rKey ) )
+ if ( !pKey->mbIsComment && pKey->maKey.equalsIgnoreAsciiCase(rKey) )
return pKey->maValue;
pKey = pKey->mpNext;
@@ -1010,19 +1010,18 @@ ByteString Config::ReadKey( const ByteString& rKey, const ByteString& rDefault )
// -----------------------------------------------------------------------
-void Config::WriteKey( const ByteString& rKey, const ByteString& rStr )
+void Config::WriteKey(const rtl::OString& rKey, const rtl::OString& rStr)
{
#ifdef DBG_UTIL
- ByteString aTraceStr( "Config::WriteKey( " );
- aTraceStr += rKey;
- aTraceStr += ", ";
- aTraceStr += rStr;
- aTraceStr += " ) to ";
- aTraceStr += GetGroup();
- aTraceStr += " in ";
- aTraceStr += ByteString( maFileName, RTL_TEXTENCODING_UTF8 );
- OSL_TRACE( "%s", aTraceStr.GetBuffer() );
- DBG_ASSERTWARNING( rStr != ReadKey( rKey ), "Config::WriteKey() with the same Value" );
+ rtl::OStringBuffer aTraceStr(RTL_CONSTASCII_STRINGPARAM("Config::WriteKey( "));
+ aTraceStr.append(rKey);
+ aTraceStr.append(RTL_CONSTASCII_STRINGPARAM(", "));
+ aTraceStr.append(rStr);
+ aTraceStr.append(RTL_CONSTASCII_STRINGPARAM(" ) to "));
+ aTraceStr.append(GetGroup());
+ aTraceStr.append(RTL_CONSTASCII_STRINGPARAM(" in "));
+ aTraceStr.append(rtl::OUStringToOString(maFileName, RTL_TEXTENCODING_UTF8));
+ OSL_TRACE("%s", aTraceStr.getStr());
#endif
// Config-Daten evt. updaten
@@ -1040,7 +1039,7 @@ void Config::WriteKey( const ByteString& rKey, const ByteString& rStr )
ImplKeyData* pKey = pGroup->mpFirstKey;
while ( pKey )
{
- if ( !pKey->mbIsComment && pKey->maKey.EqualsIgnoreCaseAscii( rKey ) )
+ if ( !pKey->mbIsComment && pKey->maKey.equalsIgnoreAsciiCase(rKey) )
break;
pPrevKey = pKey;
@@ -1096,7 +1095,7 @@ void Config::DeleteKey( const ByteString& rKey )
ImplKeyData* pKey = pGroup->mpFirstKey;
while ( pKey )
{
- if ( !pKey->mbIsComment && pKey->maKey.EqualsIgnoreCaseAscii( rKey ) )
+ if ( !pKey->mbIsComment && pKey->maKey.equalsIgnoreAsciiCase(rKey) )
break;
pPrevKey = pKey;
commit f8a456e28244cd3fd0e923a6749c5e7e752a7cda
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 18 00:57:50 2011 +0100
ByteString->rtl::OString
diff --git a/svtools/source/filter/sgvtext.cxx b/svtools/source/filter/sgvtext.cxx
index 20879f0..3dbc61a 100644
--- a/svtools/source/filter/sgvtext.cxx
+++ b/svtools/source/filter/sgvtext.cxx
@@ -1161,10 +1161,10 @@ SgfFontOne::SgfFontOne()
SVWidth=40;
}
-void SgfFontOne::ReadOne( ByteString& ID, ByteString& Dsc )
+void SgfFontOne::ReadOne( const rtl::OString& rID, ByteString& Dsc )
{
sal_uInt16 i,j,n;
- ByteString s;
+ rtl::OString s;
if ( Dsc.Len() < 4 || ( Dsc.GetChar( 0 ) != '(' ) )
return;
@@ -1185,30 +1185,31 @@ void SgfFontOne::ReadOne( ByteString& ID, ByteString& Dsc )
SVFName=String(Dsc,i+1,j); // SV-Fontname rausholen
Dsc.Erase(i,j);
- IFID = (sal_uInt32)ID.ToInt32();
+ IFID = (sal_uInt32)rID.toInt32();
n=Dsc.GetTokenCount(' ');
for (i=0;i<n;i++)
{
s = Dsc.GetToken( i,' ' );
- if ( s.Len() )
+ if (!s.isEmpty())
{
- s.ToUpperAscii();
- if ( s.CompareTo( "BOLD", 4 ) == COMPARE_EQUAL ) Bold=sal_True;
- else if ( s.CompareTo( "ITAL", 4 ) == COMPARE_EQUAL ) Ital=sal_True;
- else if ( s.CompareTo( "SERF", 4 ) == COMPARE_EQUAL ) Serf=sal_True;
- else if ( s.CompareTo( "SANS", 4 ) == COMPARE_EQUAL ) Sans=sal_True;
- else if ( s.CompareTo( "FIXD", 4 ) == COMPARE_EQUAL ) Fixd=sal_True;
- else if ( s.CompareTo( "ROMAN", 5 ) == COMPARE_EQUAL ) SVFamil=FAMILY_ROMAN;
- else if ( s.CompareTo( "SWISS", 5 ) == COMPARE_EQUAL ) SVFamil=FAMILY_SWISS;
- else if ( s.CompareTo( "MODERN", 6 ) == COMPARE_EQUAL ) SVFamil=FAMILY_MODERN;
- else if ( s.CompareTo( "SCRIPT", 6 ) == COMPARE_EQUAL ) SVFamil=FAMILY_SCRIPT;
- else if ( s.CompareTo( "DECORA", 6 ) == COMPARE_EQUAL ) SVFamil=FAMILY_DECORATIVE;
- else if ( s.CompareTo( "ANSI", 4 ) == COMPARE_EQUAL ) SVChSet=RTL_TEXTENCODING_MS_1252;
- else if ( s.CompareTo( "IBMPC", 5 ) == COMPARE_EQUAL ) SVChSet=RTL_TEXTENCODING_IBM_850;
- else if ( s.CompareTo( "MAC", 3 ) == COMPARE_EQUAL ) SVChSet=RTL_TEXTENCODING_APPLE_ROMAN;
- else if ( s.CompareTo( "SYMBOL", 6 ) == COMPARE_EQUAL ) SVChSet=RTL_TEXTENCODING_SYMBOL;
- else if ( s.CompareTo( "SYSTEM", 6 ) == COMPARE_EQUAL ) SVChSet = gsl_getSystemTextEncoding();
- else if ( comphelper::string::isAsciiDecimalString(s) ) SVWidth=sal::static_int_cast< sal_uInt16 >(s.ToInt32());
+ s = s.toAsciiUpperCase();
+ using comphelper::string::matchL;
+ if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("BOLD"))) Bold=sal_True;
+ else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("ITAL"))) Ital=sal_True;
+ else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("SERF"))) Serf=sal_True;
+ else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("SANS"))) Sans=sal_True;
+ else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("FIXD"))) Fixd=sal_True;
+ else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("ROMAN"))) SVFamil=FAMILY_ROMAN;
+ else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("SWISS"))) SVFamil=FAMILY_SWISS;
+ else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("MODERN"))) SVFamil=FAMILY_MODERN;
+ else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("SCRIPT"))) SVFamil=FAMILY_SCRIPT;
+ else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("DECORA"))) SVFamil=FAMILY_DECORATIVE;
+ else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("ANSI"))) SVChSet=RTL_TEXTENCODING_MS_1252;
+ else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("IBMPC"))) SVChSet=RTL_TEXTENCODING_IBM_850;
+ else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("MAC"))) SVChSet=RTL_TEXTENCODING_APPLE_ROMAN;
+ else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("SYMBOL"))) SVChSet=RTL_TEXTENCODING_SYMBOL;
+ else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("SYSTEM"))) SVChSet = gsl_getSystemTextEncoding();
+ else if (comphelper::string::isAsciiDecimalString(s) ) SVWidth=sal::static_int_cast< sal_uInt16 >(s.toInt32());
}
}
}
diff --git a/svtools/source/inc/sgvmain.hxx b/svtools/source/inc/sgvmain.hxx
index b4c79e7..749cc42 100644
--- a/svtools/source/inc/sgvmain.hxx
+++ b/svtools/source/inc/sgvmain.hxx
@@ -330,7 +330,7 @@ public:
String SVFName; // z.B. "Times New Roman" = 15 Chars
sal_uInt16 SVWidth; // Durchschnittliche Zeichenbreite in %
SgfFontOne();
- void ReadOne( ByteString& ID, ByteString& Dsc);
+ void ReadOne(const rtl::OString& rID, ByteString& Dsc);
};
class SgfFontLst {
commit 028e5083b5afa28e8f0eec290de8da937070f24f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 18 00:56:28 2011 +0100
callcatcher: unused code
diff --git a/lotuswordpro/source/filter/bencont.cxx b/lotuswordpro/source/filter/bencont.cxx
index 6a68f2c..f19535b 100644
--- a/lotuswordpro/source/filter/bencont.cxx
+++ b/lotuswordpro/source/filter/bencont.cxx
@@ -113,12 +113,6 @@ LtcBenContainer::Open() // delete two inputs
return BenErr_OK;
}
-void
-LtcBenContainer::Release()
-{
- delete this;
-}
-
BenError
LtcBenContainer::RegisterPropertyName(const char * sPropertyName,
pCBenPropertyName * ppPropertyName)
@@ -148,34 +142,6 @@ LtcBenContainer::RegisterPropertyName(const char * sPropertyName,
}
BenError
-LtcBenContainer::RegisterTypeName(const char * sTypeName,
- pCBenTypeName * ppTypeName)
-{
- pCBenNamedObjectListElmt pPrevNamedObjectListElmt;
- pCBenNamedObject pNamedObject = FindNamedObject(&cNamedObjects, sTypeName,
- &pPrevNamedObjectListElmt);
-
- if (pNamedObject != NULL)
- {
- if (! pNamedObject->IsTypeName())
- return BenErr_NameConflict;
- else *ppTypeName = (pCBenTypeName) pNamedObject;
- }
- else
- {
- pCBenIDListElmt pPrevObject;
- if (FindID(&cObjects, cNextAvailObjectID, &pPrevObject) != NULL)
- return BenErr_DuplicateObjectID;
-
- *ppTypeName = new CBenTypeName(this, cNextAvailObjectID,
- (pCBenObject) pPrevObject, sTypeName, pPrevNamedObjectListElmt);
- ++cNextAvailObjectID;
- }
-
- return BenErr_OK;
-}
-
-BenError
LtcBenContainer::NewObject(pCBenObject * ppBenObject)
{
pCBenIDListElmt pPrev;
@@ -280,17 +246,6 @@ BenError LtcBenContainer::SeekFromEnd(long Offset)
return BenErr_OK;
}
/**
-* Get position in the bento file
-* @date 07/05/2004
-* @param pointer of current position in container file from end
-* @return BenError
-*/
-BenError LtcBenContainer::GetPosition(BenContainerPos * pPosition)
-{
- *pPosition = cpStream->Tell();
- return BenErr_OK;
-}
-/**
* Find the next value stream with property name
* @date 07/05/2004
* @param string of property name
@@ -338,30 +293,6 @@ LtcUtBenValueStream * LtcBenContainer::FindValueStreamWithPropertyName(const cha
return FindNextValueStreamWithPropertyName(sPropertyName, NULL);
}
/**
-* Find the unique value stream with property name and Object ID
-* @date 10/24/2005
-* @param object ID
-* @param string of property name
-* @return the only value stream pointer with the property names
-*/
-LtcUtBenValueStream * LtcBenContainer::FindObjectValueStreamWithObjectIDAndProperty(BenObjectID ObjectID, const char * sPropertyName)
-{
- CBenPropertyName * pPropertyName;
- RegisterPropertyName(sPropertyName, &pPropertyName); // Get property name object
- if (NULL == pPropertyName)
- return NULL; // Property not exist
- // Get current object
- CBenObject * pObj = NULL;
- pObj = FindObject(ObjectID); // Get object with object ID
- if (NULL == pObj)
- return NULL;
- CBenValue * pValue;
- LtcUtBenValueStream * pValueStream;
- pValue = pObj->UseValue(pPropertyName->GetID());
- pValueStream = new LtcUtBenValueStream(pValue);
- return pValueStream;
-}
-/**
* <description>
* @date 07/05/2004
* @param pointer to length of bento file
diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx
index c870f0d..f9715bf 100644
--- a/lotuswordpro/source/filter/bento.hxx
+++ b/lotuswordpro/source/filter/bento.hxx
@@ -261,10 +261,7 @@ class LtcBenContainer
{
public:
BenError Open();
- void Release(); // Deletes container object--last call
BenError Close();
- BenError RegisterTypeName(const char * sTypeName,
- pCBenTypeName * ppTypeName);
BenError RegisterPropertyName(const char * sPropertyName,
pCBenPropertyName * ppPropertyName);
// Pass NULL to begin iteration. Done when returns NULL.
@@ -285,8 +282,6 @@ public: // Internal methods
BenError SeekToPosition(BenContainerPos Pos);
BenError SeekFromEnd(long Offset);
- BenError GetPosition(BenContainerPos * pPosition);
-
BenObjectID GetNextAvailObjectID() { return cNextAvailObjectID; }
void SetNextAvailObjectID(BenObjectID ID) { cNextAvailObjectID = ID; }
pCUtList GetObjects() { return &cObjects; }
@@ -294,7 +289,6 @@ public: // Internal methods
LtcUtBenValueStream * FindNextValueStreamWithPropertyName(const char * sPropertyName, LtcUtBenValueStream * pCurrentValueStream);
LtcUtBenValueStream * FindValueStreamWithPropertyName(const char * sPropertyName);
- LtcUtBenValueStream * FindObjectValueStreamWithObjectIDAndProperty(BenObjectID ObjectID, const char * sPropertyName);
BenError CreateGraphicStream(SvStream * &pStream, const char *pObjectName);
BenError GetSize(sal_uLong * pLength);
diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx
index 04fba14..6998e69 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.cxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.cxx
@@ -250,40 +250,6 @@ void LwpGraphicObject::XFConvert (XFContentContainer* pCont)
{
XFConvertEquation(pCont);
}
- if (m_sServerContextFormat[1]=='l'&&m_sServerContextFormat[2]=='c'&&m_sServerContextFormat[3]=='h')
- {
- //LwpSvStream* pDocStream = m_pStrm;
- //LwpChartStreamTools::ParseChart(pDocStream, GetObjectID(),
- // GetRectIn100thMM(), GetRectInCM(), pOutputStream);
- //LwpChartStreamTools::ParseChart(pDocStream, GetObjectID(),
- // GetRectIn100thMM(), GetRectInCM(), pCont, m_strStyleName);
- }
-}
-
-/**
-* @short Get the rectangle of a chart in 100thMM
-* @descr
-* @return the rectangle of the chart
-*/
-Rectangle LwpGraphicObject::GetRectIn100thMM()
-{
-#define To100thMM(num) (long)(2540* (double(num)/(72 * 65536L)))
- sal_Int32 nLeft,nTop,nRight,nBottom;
- GetRect(nLeft,nTop,nRight,nBottom);
- return Rectangle( To100thMM(nLeft),To100thMM(nTop),To100thMM(nRight),To100thMM(nBottom) );
-}
-
-/**
-* @short Get the rectangle of a chart in CM
-* @descr
-* @return The rectangle of the chart
-*/
-XFRect LwpGraphicObject::GetRectInCM()
-{
-#define ToCM(num) (2.54*(double(num)/(72 * 65536L)))
- sal_Int32 nLeft,nTop,nRight,nBottom;
- GetRect(nLeft,nTop,nRight,nBottom);
- return XFRect( ToCM(nLeft),ToCM(nTop),ToCM(nRight-nLeft),ToCM(nBottom-nTop) );
}
/**
diff --git a/lotuswordpro/source/filter/lwpgrfobj.hxx b/lotuswordpro/source/filter/lwpgrfobj.hxx
index b5c3ef4..a0dc634 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.hxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.hxx
@@ -105,8 +105,6 @@ private:
ImageProcessingData m_aIPData;
void GetRect(sal_Int32& nLeft, sal_Int32& nTop, sal_Int32& nRight, sal_Int32& nBottom);
- XFRect GetRectInCM();
- Rectangle GetRectIn100thMM();
void XFConvertEquation(XFContentContainer* pCont);
void ParseChart(IXFStream* pOutputStream);
diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx
index 2bb90d7..4a4ebe9 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -955,15 +955,6 @@ sal_uInt16 LwpMiddleLayout::GetScaleTile(void)
return 0;
}
-void LwpMiddleLayout::SetScaleTile(sal_uInt16 nVal)
-{
- m_nOverrideFlag |= OVER_SCALING;
- if (nVal)
- GetLayoutScale()->SetPlacement(GetLayoutScale()->GetPlacement() | LwpLayoutScale::TILED);
- else
- GetLayoutScale()->SetPlacement(GetLayoutScale()->GetPlacement() & ~LwpLayoutScale::TILED);
-}
-
sal_uInt16 LwpMiddleLayout::GetScaleCenter(void)
{
if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj())
@@ -975,15 +966,6 @@ sal_uInt16 LwpMiddleLayout::GetScaleCenter(void)
return 0;
}
-void LwpMiddleLayout::SetScaleCenter(sal_uInt16 nVal)
-{
- m_nOverrideFlag |= OVER_SCALING;
- if (nVal)
- GetLayoutScale()->SetPlacement(GetLayoutScale()->GetPlacement() | LwpLayoutScale::CENTERED);
- else
- GetLayoutScale()->SetPlacement(GetLayoutScale()->GetPlacement() & ~LwpLayoutScale::CENTERED);
-}
-
sal_uInt32 LwpMiddleLayout::GetScalePercentage(void)
{
if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj())
@@ -994,12 +976,6 @@ sal_uInt32 LwpMiddleLayout::GetScalePercentage(void)
return 100;
}
-void LwpMiddleLayout::SetScalePercentage(sal_uInt32 nVal)
-{
- m_nOverrideFlag |= OVER_SCALING;
- GetLayoutScale()->SetScalePercentage(nVal*10);
-}
-
double LwpMiddleLayout::GetScaleWidth(void)
{
if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj())
@@ -1010,12 +986,6 @@ double LwpMiddleLayout::GetScaleWidth(void)
return 0;
}
-void LwpMiddleLayout::SetScaleWidth(double fVal)
-{
- m_nOverrideFlag |= OVER_SCALING;
- GetLayoutScale()->SetScaleWidth(LwpTools::ConvertToUnits(fVal));
-}
-
double LwpMiddleLayout::GetScaleHeight(void)
{
if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj())
@@ -1144,12 +1114,6 @@ LwpPoint LwpMiddleLayout::GetOrigin()
return LwpPoint();
}
-void LwpMiddleLayout::SetScaleHeight(double fVal)
-{
- m_nOverrideFlag |= OVER_SCALING;
- GetLayoutScale()->SetScaleHeight(LwpTools::ConvertToUnits(fVal));
-}
-
/**
* @descr: Whether the fill is pattern fill or not
* @return: True if yes, false if not.
diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx
index 39f82e9..2ea8195 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -306,15 +306,10 @@ public:
LwpLayoutScale* GetLayoutScale(){return dynamic_cast<LwpLayoutScale*>(m_LayScale.obj());}
sal_uInt16 GetScaleMode(void);
sal_uInt16 GetScaleTile(void);
- void SetScaleTile(sal_uInt16 nVal);
sal_uInt16 GetScaleCenter(void);
- void SetScaleCenter(sal_uInt16 nVal);
sal_uInt32 GetScalePercentage(void);
- void SetScalePercentage(sal_uInt32 nVal);
double GetScaleWidth(void);
- void SetScaleWidth(double fVal);
double GetScaleHeight(void);
- void SetScaleHeight(double fVal);
sal_Bool CanSizeRight(void);
virtual double GetWidth();
diff --git a/lotuswordpro/source/filter/lwpnumberingoverride.cxx b/lotuswordpro/source/filter/lwpnumberingoverride.cxx
index 47f3b9a..a87ee78 100644
--- a/lotuswordpro/source/filter/lwpnumberingoverride.cxx
+++ b/lotuswordpro/source/filter/lwpnumberingoverride.cxx
@@ -92,57 +92,6 @@ void LwpNumberingOverride::Read(LwpObjectStream *pStrm)
pStrm->SkipExtra();
}
-void LwpNumberingOverride::Override(LwpNumberingOverride* pOther)
-{
- if (m_nApply & NO_LEVEL)
- {
- if (IsLevelOverridden())
- {
- pOther->OverrideLevel(m_nLevel);
- }
- else
- {
- pOther->RevertLevel();
- }
- }
-
- if (m_nApply & NO_POSITION)
- {
- if (IsPositionOverridden())
- {
- pOther->OverridePosition(m_nPosition);
- }
- else
- {
- pOther->RevertPosition();
- }
- }
-
- if (m_nApply & HEADING)
- {
- if (IsHeadingOverridden())
- {
- pOther->OverrideHeading(IsHeading());
- }
- else
- {
- pOther->RevertHeading();
- }
- }
-
- if (m_nApply & SMARTLEVEL)
- {
- if (IsSmartLevelOverridden())
- {
- pOther->OverrideSmartLevel(IsSmartLevel());
- }
- else
- {
- pOther->RevertSmartLevel();
- }
- }
-}
-
void LwpNumberingOverride::OverrideLevel(sal_uInt16 nNewLv)
{
m_nLevel = nNewLv;
diff --git a/lotuswordpro/source/filter/lwpnumberingoverride.hxx b/lotuswordpro/source/filter/lwpnumberingoverride.hxx
index 68749a1..4cb443f 100644
--- a/lotuswordpro/source/filter/lwpnumberingoverride.hxx
+++ b/lotuswordpro/source/filter/lwpnumberingoverride.hxx
@@ -81,8 +81,6 @@ public:
public:
virtual void Read(LwpObjectStream *pStrm);
- void Override(LwpNumberingOverride* pOther);
-
inline sal_uInt16 GetLevel() const;
inline sal_uInt16 GetPosition() const;
diff --git a/lotuswordpro/source/filter/lwpobj.cxx b/lotuswordpro/source/filter/lwpobj.cxx
index b434f65..be52cda 100644
--- a/lotuswordpro/source/filter/lwpobj.cxx
+++ b/lotuswordpro/source/filter/lwpobj.cxx
@@ -61,12 +61,6 @@
#include "lwpobj.hxx"
/**
- * @descr private contor to ensure only object constructed from stream
- */
-LwpObject::LwpObject()
- : m_pObjStrm(NULL), m_pFoundry(NULL), m_pStrm(NULL)
-{}
-/**
* @descr construct lwpobject from stream
*/
LwpObject::LwpObject(LwpObjectHeader objHdr, LwpSvStream* pStrm)
diff --git a/sfx2/inc/orgmgr.hxx b/sfx2/inc/orgmgr.hxx
index da26a55..d2fe396 100644
--- a/sfx2/inc/orgmgr.hxx
+++ b/sfx2/inc/orgmgr.hxx
@@ -46,7 +46,6 @@ public:
~SfxObjectList();
const String& GetBaseName( sal_uInt16 nId ) const;
- const String& GetFileName( sal_uInt16 nId ) const;
};
class IntlWrapper;
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index 31890aa..104a677 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -282,7 +282,6 @@ public:
sal_Bool IsInModalMode() const;
sal_Bool IsInPrepareClose() const;
virtual sal_Bool AcceptStateUpdate() const;
- sal_Bool HasModalViews() const;
sal_Bool IsHelpDocument() const;
sal_Bool IsDocShared() const;
@@ -454,7 +453,6 @@ public:
sal_Bool IsLoading() const;
sal_Bool IsLoadingFinished() const;
void SetAutoLoad( const INetURLObject&, sal_uInt32 nTime, sal_Bool bReload = sal_True );
- void LockAutoLoad( sal_Bool bLock );
sal_Bool IsAutoLoadLocked() const;
void NotifyReloadAvailable();
sal_Bool IsSecure();
diff --git a/sfx2/inc/sfx2/sfxstatuslistener.hxx b/sfx2/inc/sfx2/sfxstatuslistener.hxx
index c8b709e..2fa370e 100644
--- a/sfx2/inc/sfx2/sfxstatuslistener.hxx
+++ b/sfx2/inc/sfx2/sfxstatuslistener.hxx
@@ -62,8 +62,6 @@ class SFX2_DLLPUBLIC SfxStatusListener :
// old methods from SfxControllerItem
sal_uInt16 GetId() const { return m_nSlotID; }
- void Bind();
- void Bind( sal_uInt16 nSlotID, const rtl::OUString& rNewCommand );
void UnBind();
void ReBind();
diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx
index aedb2ab..a162bcc 100644
--- a/sfx2/inc/sorgitm.hxx
+++ b/sfx2/inc/sorgitm.hxx
@@ -40,7 +40,6 @@ private:
public:
TYPEINFO();
SfxScriptOrganizerItem();
- SfxScriptOrganizerItem( const String &rLanguage );
SfxScriptOrganizerItem( const SfxScriptOrganizerItem& );
virtual ~SfxScriptOrganizerItem();
diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx
index c40263f..24bfb7d 100644
--- a/sfx2/source/control/sfxstatuslistener.cxx
+++ b/sfx2/source/control/sfxstatuslistener.cxx
@@ -85,49 +85,6 @@ void SfxStatusListener::StateChanged( sal_uInt16, SfxItemState, const SfxPoolIte
// must be implemented by sub class
}
-void SfxStatusListener::Bind()
-{
- if ( !m_xDispatch.is() && m_xDispatchProvider.is() )
- {
- m_xDispatch = m_xDispatchProvider->queryDispatch( m_aCommand, rtl::OUString(), 0 );
- try
- {
- Reference< XStatusListener > aStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY );
- m_xDispatch->addStatusListener( aStatusListener, m_aCommand );
- }
- catch( Exception& )
- {
- }
- }
-}
-
-void SfxStatusListener::Bind( sal_uInt16 nSlotId, const rtl::OUString& rNewCommand )
-{
- // first remove old listener, if we have a dispatch object
- Reference< XStatusListener > aStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY );
- if ( m_xDispatch.is() )
- m_xDispatch->removeStatusListener( aStatusListener, m_aCommand );
- if ( m_xDispatchProvider.is() )
- {
- // Store new command data and query for new dispatch
- m_nSlotID = nSlotId;
- m_aCommand.Complete = rNewCommand;
- Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
- xTrans->parseStrict( m_aCommand );
-
- m_xDispatch = m_xDispatchProvider->queryDispatch( m_aCommand, rtl::OUString(), 0 );
-
- try
- {
- m_xDispatch->addStatusListener( aStatusListener, m_aCommand );
- }
- catch( Exception& )
- {
- }
- }
-}
-
void SfxStatusListener::UnBind()
{
if ( m_xDispatch.is() )
diff --git a/sfx2/source/control/sorgitm.cxx b/sfx2/source/control/sorgitm.cxx
index 4bf1465..65301b9 100644
--- a/sfx2/source/control/sorgitm.cxx
+++ b/sfx2/source/control/sorgitm.cxx
@@ -46,17 +46,6 @@ SfxScriptOrganizerItem::SfxScriptOrganizerItem() :
//------------------------------------------------------------------------
-SfxScriptOrganizerItem::SfxScriptOrganizerItem( const String& rLanguage ) :
-
- SfxStringItem( SID_SCRIPTORGANIZER, rLanguage ),
-
- aLanguage( rLanguage )
-
-{
-}
-
-//------------------------------------------------------------------------
-
SfxScriptOrganizerItem::SfxScriptOrganizerItem( const SfxScriptOrganizerItem& rItem ) :
SfxStringItem( rItem ),
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 14d87ac..2f12a8b 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -483,22 +483,6 @@ sal_Bool SfxObjectShell::AcceptStateUpdate() const
//-------------------------------------------------------------------------
-sal_Bool SfxObjectShell::HasModalViews() const
-{
- SfxViewFrame* pFrame = SfxViewFrame::GetFirst( this );
- while( pFrame )
- {
- if ( pFrame->IsInModalMode() )
- return sal_True;
-
- pFrame = SfxViewFrame::GetNext( *pFrame, this );
- }
-
- return sal_False;
-}
-
-//-------------------------------------------------------------------------
-
void SfxObjectShell::SetMacroMode_Impl( sal_Bool bModal )
{
if ( !pImp->bRunningMacro != !bModal )
@@ -1137,25 +1121,6 @@ void SfxObjectShell::PrepareReload( )
{
}
-//-------------------------------------------------------------------------
-
-void SfxObjectShell::LockAutoLoad( sal_Bool bLock )
-
-/* [Description]
-
- Prevents an possible occuring autoload. Takes also FrameSet into account.
- before the autoload.
-*/
-
-{
- if ( bLock )
- ++pImp->nAutoLoadLocks;
- else
- --pImp->nAutoLoadLocks;
-}
-
-//-------------------------------------------------------------------------
-
// Can be moved to frame.cxx, when 358+36x-State have been merged
sal_Bool SfxFrame::IsAutoLoadLocked_Impl() const
diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx
index 3d3270d..3da800c 100644
--- a/sfx2/source/inc/virtmenu.hxx
+++ b/sfx2/source/inc/virtmenu.hxx
@@ -106,9 +106,6 @@ public:
SfxMenuControl& operator[]( sal_uInt16 nPos ) const;
sal_uInt16 GetItemId( sal_uInt16 nPos ) const;
- SfxVirtualMenu* GetPopupMenu( sal_uInt16 nId ) const;
- String GetItemText( sal_uInt16 nId ) const;
-
SfxVirtualMenu* GetParentMenu() const { return pParent; }
void SetParentMenu( SfxVirtualMenu* pNewParent )
@@ -121,8 +118,6 @@ public:
void InitializeHelp();
void SetResMgr(ResMgr* pMgr) {pResMgr = pMgr; }
ResMgr* GetResMgr() { return pResMgr; }
- void SetHelpIds( ResMgr* );
- void UpdateImages();
DECL_LINK( Select, Menu * );
};
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index e427b05..723f490 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -609,51 +609,6 @@ IMPL_LINK( SfxVirtualMenu, SettingsChanged, void*, EMPTYARG )
//--------------------------------------------------------------------
-void SfxVirtualMenu::UpdateImages()
-{
- sal_Bool bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
-
- if ( bIcons )
- {
- sal_uInt16 nItemCount = pSVMenu->GetItemCount();
- SfxViewFrame * pViewFrame = pBindings->GetDispatcher()->GetFrame();
- Reference<com::sun::star::frame::XFrame> xFrame( pViewFrame->GetFrame().GetFrameInterface() );
-
- for ( sal_uInt16 nSVPos=0; nSVPos < nItemCount; ++nSVPos )
- {
- sal_uInt16 nSlotId = pSVMenu->GetItemId( nSVPos );
- if ( pSVMenu->GetItemType( nSVPos ) == MENUITEM_STRINGIMAGE )
- {
- if ( framework::AddonMenuManager::IsAddonMenuId( nSlotId ))
- {
- // Special code for Add-On menu items. They can appear inside the help menu.
- rtl::OUString aCmd( pSVMenu->GetItemCommand( nSlotId ) );
- rtl::OUString aImageId;
-
- ::framework::MenuConfiguration::Attributes* pMenuAttributes =
- (::framework::MenuConfiguration::Attributes*)pSVMenu->GetUserValue( nSlotId );
-
- if ( pMenuAttributes )
- aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
-
- pSVMenu->SetItemImage( nSlotId, RetrieveAddOnImage( xFrame, aImageId, aCmd, false ));
- }
- else
- {
- rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
- aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
- pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, false ));
- }
- }
- }
-
- if ( pImageControl )
- pImageControl->Update();
- }
-}
-
-//--------------------------------------------------------------------
-
void SfxVirtualMenu::UpdateImages( Menu* pMenu )
{
if ( !pMenu )
@@ -1109,34 +1064,6 @@ sal_uInt16 SfxVirtualMenu::GetItemPos( sal_uInt16 nItemId ) const
//--------------------------------------------------------------------
-// returns the popup-menu assigned to the item or 0 if none
-
-SfxVirtualMenu* SfxVirtualMenu::GetPopupMenu( sal_uInt16 nItemId ) const
-{
- DBG_MEMTEST();
- DBG_CHKTHIS(SfxVirtualMenu, 0);
-
- sal_uInt16 nPos = GetItemPos(nItemId);
- if ( nPos != MENU_ITEM_NOTFOUND )
- return (pItems+nPos)->GetPopupMenu();
- return 0;
-}
-//--------------------------------------------------------------------
-
-// returns the text of the item as currently shown in the menu
-
-String SfxVirtualMenu::GetItemText( sal_uInt16 nSlotId ) const
-{
- DBG_MEMTEST();
- DBG_CHKTHIS(SfxVirtualMenu, 0);
-
- sal_uInt16 nPos = GetItemPos(nSlotId);
- if ( nPos != MENU_ITEM_NOTFOUND )
- return (pItems+nPos)->GetTitle();
- return String();
-}
-//--------------------------------------------------------------------
-
// set the checkmark of the specified item
void SfxVirtualMenu::CheckItem( sal_uInt16 nItemId, sal_Bool bCheck )
@@ -1241,11 +1168,4 @@ void SfxVirtualMenu::InitializeHelp()
bHelpInitialized = sal_True;
}
-typedef sal_uIntPtr (__LOADONCALLAPI *HelpIdFunc) ( const String& );
-
-void SfxVirtualMenu::SetHelpIds( ResMgr *pRes )
-{
- pResMgr = pRes;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/view/orgmgr.cxx b/sfx2/source/view/orgmgr.cxx
index b33684a..c1015d2 100644
--- a/sfx2/source/view/orgmgr.cxx
+++ b/sfx2/source/view/orgmgr.cxx
@@ -214,13 +214,6 @@ const String &SfxObjectList::GetBaseName(sal_uInt16 i) const
//-------------------------------------------------------------------------
-const String& SfxObjectList::GetFileName( sal_uInt16 i ) const
-{
- return (*this)[i]->aFileName;
-}
-
-//-------------------------------------------------------------------------
-
SfxOrganizeMgr::SfxOrganizeMgr( SfxOrganizeListBox_Impl *pLeft,
SfxOrganizeListBox_Impl *pRight,
SfxDocumentTemplates *pTempl) :
diff --git a/unusedcode.easy b/unusedcode.easy
index 125d038..863627d 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -364,15 +364,6 @@ LwpDocument::GetMaxNumberOfPages()
LwpDocument::ParseMasterDoc(IXFStream*)
LwpFootnote::FindFootnoteTable()
LwpFribTable::Parse(IXFStream*)
-LwpGraphicObject::GetRectIn100thMM()
-LwpGraphicObject::GetRectInCM()
-LwpMiddleLayout::SetScaleCenter(unsigned short)
-LwpMiddleLayout::SetScaleHeight(double)
-LwpMiddleLayout::SetScalePercentage(unsigned int)
-LwpMiddleLayout::SetScaleTile(unsigned short)
-LwpMiddleLayout::SetScaleWidth(double)
-LwpNumberingOverride::Override(LwpNumberingOverride*)
-LwpObject::LwpObject()
MSDffImportRecords::Insert(MSDffImportRecords const*, unsigned short, unsigned short)
MSDffImportRecords::Insert(SvxMSDffImportRec* const&, unsigned short&)
MSDffImportRecords::Insert(SvxMSDffImportRec* const*, unsigned short)
@@ -458,10 +449,6 @@ OpenStormBento::CUtList::GetCount()
OpenStormBento::CUtList::GetIndex(OpenStormBento::CUtListElmt*)
OpenStormBento::CUtList::GetIndex(int)
OpenStormBento::CUtList::GetPrevOrNULL(OpenStormBento::CUtListElmt*)
-OpenStormBento::LtcBenContainer::FindObjectValueStreamWithObjectIDAndProperty(unsigned long, char const*)
-OpenStormBento::LtcBenContainer::GetPosition(unsigned long*)
-OpenStormBento::LtcBenContainer::RegisterTypeName(char const*, OpenStormBento::CBenTypeName**)
-OpenStormBento::LtcBenContainer::Release()
Outliner::Draw(OutputDevice*, Rectangle const&, Point const&)
Outliner::EndSpelling()
Outliner::GetAsianCompressionMode() const
@@ -986,13 +973,10 @@ SfxModule::IsActive() const
SfxModule::RegisterChildWindowContext(unsigned short, SfxChildWinContextFactory*)
SfxModuleArr_Impl::DeleteAndDestroy(unsigned short, unsigned short)
SfxNavigatorWrapper::GetChildWindowId()
-SfxObjectList::GetFileName(unsigned short) const
SfxObjectShell::Count()
SfxObjectShell::CreateAndLoadObject(SfxItemSet const&, SfxFrame*)
SfxObjectShell::DisconnectFromShared()
-SfxObjectShell::HasModalViews() const
SfxObjectShell::IsSecure()
-SfxObjectShell::LockAutoLoad(unsigned char)
SfxObjectShell::SetFlags(unsigned int)
SfxObjectShell::SetTemplate(unsigned char)
SfxObjectVerbsControl::RegisterControl(unsigned short, SfxModule*)
@@ -1027,14 +1011,11 @@ SfxRecordingFloatWrapper_Impl::GetChildWindowId()
SfxRectangleItem::SfxRectangleItem(unsigned short, SvStream&)
SfxRequest::IsRecording() const
SfxRequest::SetTarget(String const&)
-SfxScriptOrganizerItem::SfxScriptOrganizerItem(String const&)
SfxShell::GetBroadcaster()
SfxShell::RemoveItem(unsigned short)
SfxSingleTabDialog::GetInputRanges(SfxItemPool const&)
SfxSizeItem::SfxSizeItem(unsigned short, SvStream&)
SfxSlotPool::NextInterface()
-SfxStatusListener::Bind()
-SfxStatusListener::Bind(unsigned short, rtl::OUString const&)
SfxStringListItem::Sort(unsigned char)
SfxStyleSheet::SfxStyleSheet()
SfxStyleSheetBasePool::GetStreamName()
@@ -1078,10 +1059,6 @@ SfxViewFrame::Hide()
SfxViewShell::PlugInsActive() const
SfxViewShell::SetAdditionalPrintOptions(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&)
SfxViewShell::SetScrollingMode(SfxScrollingMode)
-SfxVirtualMenu::GetItemText(unsigned short) const
-SfxVirtualMenu::GetPopupMenu(unsigned short) const
-SfxVirtualMenu::SetHelpIds(ResMgr*)
-SfxVirtualMenu::UpdateImages()
SfxWhichIter::LastWhich()
Slider::SetRangeMax(long)
Slider::SetRangeMin(long)
commit e1e4128df08c2b4fdc4e7cf44b31e63878d2f953
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 17 23:21:11 2011 +0100
Related: fdo#33160 Add Estonian Kroon to Euro converter
diff --git a/wizards/source/euro/Init.xba b/wizards/source/euro/Init.xba
index 2de1252..9cd6710 100644
--- a/wizards/source/euro/Init.xba
+++ b/wizards/source/euro/Init.xba
@@ -71,6 +71,7 @@ Public sCurrSLOVENIAN as String
Public sCurrCYPRIOT as String
Public sCurrMALTESE as String
Public sCurrSLOVAK as String
+Public sCurrESTONIAN as String
Public sCurrUNKNOWN as String
Public sCurrSYSUNKNOWN as String
@@ -79,7 +80,7 @@ Public sPrgsCONVERTING as String
Public sPrgsUNPROTECT as String
Public sInclusiveSubDir as String
-Public Const SBCOUNTRYCOUNT = 15
+Public Const SBCOUNTRYCOUNT = 17
Public CurMimeType as String
Public CurCellCount as Long
Public oSheets as Object
@@ -115,8 +116,8 @@ Public CurExtension(2) as String
Public Currfactor as Double
Public CurrSymbolList(2) as String
Public CurrLanguage as String
-Public CurrValue(15,5)
-Public LangIDValue(15,2,2) as String
+Public CurrValue(16,5)
+Public LangIDValue(16,2,2) as String
Public PreName as String
Public Separator as String
Public BitmapDir as String
@@ -195,8 +196,9 @@ Dim LocWorkPath as String
sCurrCYPRIOT = GetResText(1513)
sCurrMALTESE = GetResText(1514)
sCurrSLOVAK = GetResText(1515)
- sCurrUNKNOWN = GetResText(1516)
- sCurrSYSUNKNOWN = GetResText(1517)
+ sCurrESTONIAN = GetResText(1516)
+ sCurrUNKNOWN = GetResText(1517)
+ sCurrSYSUNKNOWN = GetResText(1518)
.cmdCancel.Label = sCANCEL
.cmdHelp.Label = sHELP
.cmdBack.Label = GetResText(1002)
@@ -357,6 +359,11 @@ Sub InitializeLanguages()
LangIDValue(15,0,1) = "SK"
LangIDValue(15,0,2) = "-41B"
+' CURRENCIES_ESTONIAN
+ LangIDValue(16,0,0) = "et"
+ LangIDValue(16,0,1) = "ET"
+ LangIDValue(16,0,2) = "-425"
+
End Sub
@@ -509,6 +516,15 @@ Dim i as Integer
CurrValue(15,4) = "Sk"
CurrValue(15,5) = "SKK"
+ CurrValue(16,0) = sCurrESTONIAN
+ ' real conversion rate
+ CurrValue(16,1) = 15.6466
+ ' rounded conversion rate
+ CurrValue(16,2) = 16
+ CurrValue(16,3) = "kr"
+ CurrValue(16,4) = "kr"
+ CurrValue(16,5) = "EEK"
+
i = -1
CurrSymbolList(0) = ""
CurrSymbolList(1) = ""
diff --git a/wizards/source/euro/euro.src b/wizards/source/euro/euro.src
index 257632f..d984177 100644
--- a/wizards/source/euro/euro.src
+++ b/wizards/source/euro/euro.src
@@ -441,11 +441,16 @@ Text [ en-US ] = "Slovak Koruna";
String CURRENCIES + 16
{
-Text [ en-US ] = "The currency set for the document is not a European currency!";
+Text [ en-US ] = "Estonian Kroon";
};
String CURRENCIES + 17
{
+Text [ en-US ] = "The currency set for the document is not a European currency!";
+};
+
+String CURRENCIES + 18
+{
Text [ en-US ] = "The language set for your operating system is not a language of the European Monetary Union.";
};
commit 4783becd38c29a08b4d79f346fef5ac96e47a89f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 17 22:03:05 2011 +0100
Revert "disable i18npool's unit test for now"
This reverts commit 8ae498242b5fb90d4f33b470616b90790ff807e0
because no justification is listed
diff --git a/i18npool/Module_i18npool.mk b/i18npool/Module_i18npool.mk
index 8ada1ff..022e85f 100644
--- a/i18npool/Module_i18npool.mk
+++ b/i18npool/Module_i18npool.mk
@@ -57,7 +57,7 @@ $(eval $(call gb_Module_add_targets,i18npool,\
))
endif
-#$(eval $(call gb_Module_add_check_targets,i18npool,\
+$(eval $(call gb_Module_add_check_targets,i18npool,\
CppunitTest_i18npool_test_breakiterator \
))
commit 3b47f19c805771c7cc2fe0c79b005ef7ee7e070a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 17 21:45:24 2011 +0100
registered but uninstalled database drivers break address book wizard
among other things undoubtedly. The idea was IIRC to drop adabas
support, so lets not register the uninstalled components, and
while we're at it not build it either.
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index 0cc4d78..9860897 100644
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -19,7 +19,6 @@ cn connectivity\source\drivers\odbcbase nmake - all cn_odbcbase
cn connectivity\source\drivers\odbc nmake - all cn_odbc cn_odbcbase cn_inc NULL
cn connectivity\source\drivers\mysql nmake - all cn_mysql cn_dbtools cn_inc NULL
cn connectivity\source\drivers\jdbc nmake - all cn_jdbc cn_dbtools cn_inc NULL
-cn connectivity\source\drivers\adabas nmake - all cn_adabas cn_dbtools cn_odbcbase cn_inc NULL
cn connectivity\source\drivers\file nmake - all cn_file cn_dbtools cn_inc NULL
cn connectivity\source\drivers\flat nmake - all cn_flat cn_dbtools cn_file cn_inc NULL
cn connectivity\source\drivers\dbase nmake - all cn_dbase cn_dbtools cn_file cn_inc NULL
@@ -29,4 +28,4 @@ cn connectivity\source\simpledbt nmake - all cn_simpledbt
cn connectivity\source\dbtools nmake - all cn_dbtools cn_simpledbt cn_cmtools cn_parse cn_res cn_sdbcx cn_inc cn_res NULL
cn connectivity\qa\connectivity\tools nmake - all cn_qa_tools cn_inc NULL
cn connectivity\qa nmake - all cn_qa cn_inc NULL
-cn connectivity\util nmake - all cn_util cn_ado cn_mozab cn_kab cn_evoab2 cn_calc cn_odbc cn_mysql cn_jdbc cn_adabas cn_flat cn_dbase cn_hsqldb cn_macab NULL
+cn connectivity\util nmake - all cn_util cn_ado cn_mozab cn_kab cn_evoab2 cn_calc cn_odbc cn_mysql cn_jdbc cn_flat cn_dbase cn_hsqldb cn_macab NULL
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 56ae823..775f974 100755
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -45,11 +45,6 @@ export SAL_ENABLE_FILE_LOCKING
# uncomment line below if you encounter problems starting soffice on your system
# SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
-# read database entries for Adabas D
-if [ -f /etc/adabasrc ]; then
- . /etc/adabasrc
-fi
-
# The following is needed on Linux PPC with IBM j2sdk142:
#@# export JITC_PROCESSOR_TYPE=6
diff --git a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
index e0c469b..9be30a2 100644
--- a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
@@ -29,17 +29,6 @@
<oor:component-data oor:name="DataAccess" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<node oor:name="ConnectionPool">
<node oor:name="DriverSettings">
- <node oor:name="com.sun.star.comp.sdbcx.adabas.ODriver" oor:op="replace">
- <prop oor:name="DriverName">
- <value>com.sun.star.comp.sdbcx.adabas.ODriver</value>
- </prop>
- <prop oor:name="Enable">
- <value>false</value>
- </prop>
- <prop oor:name="Timeout">
- <value>60</value>
- </prop>
- </node>
<node oor:name="com.sun.star.comp.sdbc.evoab.OEvoabDriver" oor:op="replace">
<prop oor:name="DriverName">
<value>com.sun.star.comp.sdbc.evoab.OEvoabDriver</value>
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 3e65a31..9fbf3d2 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -340,11 +340,6 @@ my_components += \
my_components += component/canvas/source/directx/directx5canvas
.END
-.IF "$(OS)" == "LINUX" || "$(OS)" == "NETBSD" || \
- ("$(OS)" == "SOLARIS" && "$(CPU)" == "S") || "$(OS)" == "WNT"
-my_components += adabas
-.END
-
.IF "$(OS)" != "MACOSX" && "$(SYSTEM_MOZILLA)" != "YES" && \
"$(WITH_MOZILLA)" != "NO"
my_components += mozab
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 50a5097..a2941b6 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -320,10 +320,6 @@ MY_FILES_main += \
.ELSE
ERROR : unknown-GUIBASE
.END
-.IF "$(OS)" == "WNT" || "$(OS)" == "LINUX" || \
- ("$(OS)" == "SOLARIS" && "$(CPU)" == "S") || "$(OS)" == "NETBSD"
-MY_FILES_main += $(MY_MOD)/DataAccess/adabas.xcu
-.END
.IF "$(ENABLE_EVOAB2)" == "TRUE"
MY_FILES_main += $(MY_MOD)/DataAccess/evoab2.xcu
MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
diff --git a/postprocess/rebase/coffbase.txt b/postprocess/rebase/coffbase.txt
index 69665f0..2e841e8 100644
--- a/postprocess/rebase/coffbase.txt
+++ b/postprocess/rebase/coffbase.txt
@@ -1,7 +1,6 @@
abpmi.dll 0x0000000067fd0000 0x00020000
acceptor.uno.dll 0x0000000067fb0000 0x00010000
accmi.dll 0x0000000067f00000 0x000a0000
-adabasmi.dll 0x0000000067e90000 0x00060000
adabasuimi.dll 0x0000000067e60000 0x00020000
ado2.dll 0x0000000067dd0000 0x00080000
affine_uno_uno.dll 0x0000000067db0000 0x00010000
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index f9f29be..62d49ad 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -110,7 +110,6 @@ Module gid_Module_Root_Files_2
gid_File_Shellnew_Odp_Soffice,
gid_File_Shellnew_Odt_Soffice,
gid_File_Exe_Java,
- gid_File_Exe_Adabas,
gid_File_Exe_Userinst,
gid_File_Exe_Userdeinst,
gid_File_Regcleanold,
@@ -340,7 +339,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Stringresource,
gid_File_Lib_Ldapbe2,
gid_File_Lib_Comphelper2,
- gid_File_Lib_Adabas,
gid_File_Lib_Cached1,
gid_File_Lib_Curl,
gid_Unixlink_File_Lib_Curl,
commit 46d473521231a9c06437e5ef2cbde3a58a675df3
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Aug 18 09:34:34 2011 +0200
Remove SD_DLLPUBLIC, it breaks Windows build.
If there is a method that needs to be public, better SD_DLLPUBLIC just that one.
diff --git a/sd/source/ui/inc/fuediglu.hxx b/sd/source/ui/inc/fuediglu.hxx
index 73ae5ca..af2c496 100644
--- a/sd/source/ui/inc/fuediglu.hxx
+++ b/sd/source/ui/inc/fuediglu.hxx
@@ -39,7 +39,7 @@ namespace sd {
|*
\************************************************************************/
-class SD_DLLPUBLIC FuEditGluePoints
+class FuEditGluePoints
: public FuDraw
{
public:
commit ee03eb213fa31efb6d5fea16edbeb64dd8b38a9f
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Aug 17 12:15:48 2011 +0200
Check for amd64/atls.lib, and disable ActiveX 64bit component if not present.
diff --git a/configure.in b/configure.in
index 0b8e375..0fa9fbc 100755
--- a/configure.in
+++ b/configure.in
@@ -2674,9 +2674,8 @@ if test "$_os" = "WINNT"; then
LINK_X64_BINARY=
LIBMGR_X64_BINARY=
- if test "$CL_X64" = ""; then
- AC_MSG_CHECKING([for a x64 compiler])
-
+ AC_MSG_CHECKING([for a x64 compiler and libraries for 64bit ActiveX component])
+ if test "$CL_X64" = "" -a -f "$with_cl_home/atlmfc/lib/amd64/atls.lib"; then
# Prefer native x64 compiler to cross-compiler, in case we are running
# the build on a 64-bit OS.
if "$with_cl_home/bin/amd64/cl.exe" -? </dev/null >/dev/null 2>&1; then
@@ -2692,12 +2691,12 @@ if test "$_os" = "WINNT"; then
LINK_X64_BINARY="$with_cl_home/bin/x86_amd64/link.exe"
LIBMGR_X64_BINARY="$with_cl_home/bin/x86_amd64/lib.exe"
fi
- if test "$BUILD_X64" = TRUE; then
- AC_MSG_RESULT([found])
- else
- AC_MSG_RESULT([not found])
- AC_MSG_WARN([Installation set will not contain the 64-bit Explorer extension])
- fi
+ fi
+ if test "$BUILD_X64" = TRUE; then
+ AC_MSG_RESULT([found])
+ else
+ AC_MSG_RESULT([not found])
+ AC_MSG_WARN([Installation set will not contain the 64-bit Explorer extension])
fi
AC_SUBST(BUILD_X64)
commit 7ee280af538dc7e63d4469e0939127d0512ec95f
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Aug 15 00:20:48 2011 +0200
Revert "windows compiler insist to have access to delete[], no matter what"
This reverts commit 0ae3794348be4520adff16eebaa9486c56de70e8.
diff --git a/sd/inc/helper/simplereferencecomponent.hxx b/sd/inc/helper/simplereferencecomponent.hxx
index a6d0512..45194d8 100644
--- a/sd/inc/helper/simplereferencecomponent.hxx
+++ b/sd/inc/helper/simplereferencecomponent.hxx
@@ -98,7 +98,6 @@ private:
*/
void operator =(SimpleReferenceComponent);
-#ifndef WNT
/** not implemented (see general class documentation)
@internal
*/
@@ -108,7 +107,7 @@ private:
@internal
*/
static void operator delete[](void * pPtr);
-#endif
+
bool mbDisposed;
};
commit b7162228bae7e528db7a6b2a6b4275d22b65295d
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Aug 18 00:25:58 2011 -0500
have autogen.sh return an erro if configure failed
diff --git a/autogen.sh b/autogen.sh
index 30b1ae4..7df437b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -148,7 +148,7 @@ if (defined $ENV{NOCONFIGURE}) {
}
}
print "running ./configure with '" . join ("' '", @args), "'\n";
- system ("./configure", @args);
+ system ("./configure", @args) && die "Error running configure";
}
# Local Variables:
commit f625542710bd97f1d4cce02ceb75b130d035436a
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Thu Aug 18 08:49:46 2011 +0900
catch exceptions by const references
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index c69cc1f..ef8ac40 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -202,7 +202,7 @@ bool lclExtractRangeFromName( CellRangeAddress& orRangeAddr, const Reference< XM
orRangeAddr = xAddressable->getRangeAddress();
return true;
}
- catch( Exception& )
+ catch(const Exception& )
{
}
return false;
@@ -234,7 +234,7 @@ void lclPrepareConverter( PropertySet& rConverter, const Reference< XModel >& rx
CREATE_OUSTRING( "com.sun.star.table.CellAddressConversion" );
rConverter.set( xModelFactory->createInstance( aServiceName ) );
}
- catch( Exception& )
+ catch(const Exception& )
{
}
rConverter.setProperty( PROP_XLA1Representation, rAddressString );
@@ -351,7 +351,7 @@ void ControlConverter::bindToSources( const Reference< XControlModel >& rxCtrlMo
CREATE_OUSTRING( "com.sun.star.table.CellValueBinding" ), aArgs ), UNO_QUERY_THROW );
xBindable->setValueBinding( xBinding );
}
- catch( Exception& )
+ catch(const Exception& )
{
}
@@ -383,7 +383,7 @@ void ControlConverter::bindToSources( const Reference< XControlModel >& rxCtrlMo
CREATE_OUSTRING( "com.sun.star.table.CellRangeListSource" ), aArgs ), UNO_QUERY_THROW );
xEntrySink->setListEntrySource( xEntrySource );
}
- catch( Exception& )
+ catch(const Exception& )
{
}
}
@@ -1896,7 +1896,7 @@ bool EmbeddedControl::convertProperties( const Reference< XControlModel >& rxCtr
{
aPropMap.setProperty( PROP_GenerateVbaEvents, true);
}
- catch( Exception& )
+ catch(const Exception& )
{
}
mxModel->convertProperties( aPropMap, rConv );
@@ -1936,7 +1936,7 @@ Reference< XControlModel > EmbeddedForm::convertAndInsert( const EmbeddedControl
if( rControl.convertProperties( xCtrlModel, maControlConv ) )
return xCtrlModel;
}
- catch( Exception& )
+ catch(const Exception& )
{
}
return Reference< XControlModel >();
@@ -1961,7 +1961,7 @@ Reference< XIndexContainer > EmbeddedForm::createXForm()
mxFormIC.set( xForm, UNO_QUERY_THROW );
}
}
- catch( Exception& )
+ catch(const Exception& )
{
}
// always clear the forms supplier to not try to create the form again
diff --git a/oox/source/ole/oleobjecthelper.cxx b/oox/source/ole/oleobjecthelper.cxx
index 7a5c765..30a1ce6 100644
--- a/oox/source/ole/oleobjecthelper.cxx
+++ b/oox/source/ole/oleobjecthelper.cxx
@@ -71,7 +71,7 @@ OleObjectHelper::OleObjectHelper( const Reference< XMultiServiceFactory >& rxMod
{
mxResolver.set( rxModelFactory->createInstance( CREATE_OUSTRING( "com.sun.star.document.ImportEmbeddedObjectResolver" ) ), UNO_QUERY );
}
- catch( Exception& )
+ catch(const Exception& )
{
}
}
@@ -83,7 +83,7 @@ OleObjectHelper::~OleObjectHelper()
Reference< XComponent > xResolverComp( mxResolver, UNO_QUERY_THROW );
xResolverComp->dispose();
}
- catch( Exception& )
+ catch(const Exception& )
{
}
}
@@ -122,7 +122,7 @@ bool OleObjectHelper::importOleObject( PropertyMap& rPropMap, const OleObjectInf
bRet = true;
}
}
- catch( Exception& )
+ catch(const Exception& )
{
}
}
diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx
index 6255def..511b4ee 100755
--- a/oox/source/ole/olestorage.cxx
+++ b/oox/source/ole/olestorage.cxx
@@ -109,7 +109,7 @@ OleOutputStream::OleOutputStream( const Reference< XComponentContext >& rxContex
mxOutStrm = mxTempFile->getOutputStream();
mxSeekable.set( mxOutStrm, UNO_QUERY );
}
- catch( Exception& )
+ catch(const Exception& )
{
}
}
@@ -246,7 +246,7 @@ void OleStorage::initStorage( const Reference< XInputStream >& rxInStream )
} // scope closes output stream of tempfile
xInStrm = xTempFile->getInputStream();
}
- catch( Exception& )
+ catch(const Exception& )
{
OSL_FAIL( "OleStorage::initStorage - cannot create temporary copy of input stream" );
}
@@ -261,7 +261,7 @@ void OleStorage::initStorage( const Reference< XInputStream >& rxInStream )
mxStorage.set( xFactory->createInstanceWithArguments(
CREATE_OUSTRING( "com.sun.star.embed.OLESimpleStorage" ), aArgs ), UNO_QUERY_THROW );
}
- catch( Exception& )
+ catch(const Exception& )
{
}
}
@@ -278,7 +278,7 @@ void OleStorage::initStorage( const Reference< XStream >& rxOutStream )
mxStorage.set( xFactory->createInstanceWithArguments(
CREATE_OUSTRING( "com.sun.star.embed.OLESimpleStorage" ), aArgs ), UNO_QUERY_THROW );
}
- catch( Exception& )
+ catch(const Exception& )
{
}
}
@@ -295,7 +295,7 @@ bool OleStorage::implIsStorage() const
mxStorage->hasElements();
return true;
}
- catch( Exception& )
+ catch(const Exception& )
{
}
return false;
@@ -316,7 +316,7 @@ void OleStorage::implGetElementNames( ::std::vector< OUString >& orElementNames
if( aNames.getLength() > 0 )
orElementNames.insert( orElementNames.end(), aNames.getConstArray(), aNames.getConstArray() + aNames.getLength() );
}
- catch( Exception& )
+ catch(const Exception& )
{
}
}
@@ -331,7 +331,7 @@ StorageRef OleStorage::implOpenSubStorage( const OUString& rElementName, bool bC
Reference< XNameContainer > xSubElements( mxStorage->getByName( rElementName ), UNO_QUERY_THROW );
xSubStorage.reset( new OleStorage( *this, xSubElements, rElementName, true ) );
}
- catch( Exception& )
+ catch(const Exception& )
{
}
@@ -353,7 +353,7 @@ StorageRef OleStorage::implOpenSubStorage( const OUString& rElementName, bool bC
// return the temp storage to caller
xSubStorage = xTempStorage;
}
- catch( Exception& )
+ catch(const Exception& )
{
}
}
@@ -367,7 +367,7 @@ Reference< XInputStream > OleStorage::implOpenInputStream( const OUString& rElem
{
xInStream.set( mxStorage->getByName( rElementName ), UNO_QUERY );
}
- catch( Exception& )
+ catch(const Exception& )
{
}
return xInStream;
@@ -400,7 +400,7 @@ void OleStorage::implCommit() const
// this requires another commit(), which will be performed by the parent storage
}
}
- catch( Exception& )
+ catch(const Exception& )
{
}
}
diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx
index fc750ca..048d4f8 100644
--- a/oox/source/ole/vbacontrol.cxx
+++ b/oox/source/ole/vbacontrol.cxx
@@ -395,7 +395,7 @@ void VbaFormControl::createAndConvert( sal_Int32 nCtrlIndex,
ContainerHelper::insertByName( rxParentNC, rCtrlName, Any( xCtrlModel ) );
}
}
- catch( Exception& )
+ catch(const Exception& )
{
}
}
@@ -478,7 +478,7 @@ bool VbaFormControl::convertProperties( const Reference< XControlModel >& rxCtrl
maControls.forEachMemWithIndex( &VbaFormControl::createAndConvert,
::boost::cref( xCtrlModelNC ), ::boost::cref( rConv ) );
}
- catch( Exception& )
+ catch(const Exception& )
{
OSL_FAIL( "VbaFormControl::convertProperties - cannot get control container interface" );
}
@@ -881,7 +881,7 @@ void VbaUserForm::importForm(
ContainerHelper::insertByName( rxDialogLib, aFormName, Any( xDialogSource ) );
}
}
- catch( Exception& )
+ catch(const Exception& )
{
}
}
diff --git a/oox/source/ole/vbamodule.cxx b/oox/source/ole/vbamodule.cxx
index 45a21df..cbd9744 100644
--- a/oox/source/ole/vbamodule.cxx
+++ b/oox/source/ole/vbamodule.cxx
@@ -308,7 +308,7 @@ void VbaModule::createModule( const OUString& rVBASourceCode,
{
aModuleInfo.ModuleObject.set( rxDocObjectNA->getByName( maName ), UNO_QUERY );
}
- catch( Exception& )
+ catch(const Exception& )
{
}
break;
@@ -342,7 +342,7 @@ void VbaModule::createModule( const OUString& rVBASourceCode,
Reference< XVBAModuleInfo > xVBAModuleInfo( rxBasicLib, UNO_QUERY_THROW );
xVBAModuleInfo->insertModuleInfo( maName, aModuleInfo );
}
- catch( Exception& )
+ catch(const Exception& )
{
}
@@ -351,7 +351,7 @@ void VbaModule::createModule( const OUString& rVBASourceCode,
{
rxBasicLib->insertByName( maName, Any( aSourceCode.makeStringAndClear() ) );
}
- catch( Exception& )
+ catch(const Exception& )
{
OSL_FAIL( "VbaModule::createModule - cannot insert module into library" );
}
diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx
index cf9af55..8e5d2eb 100644
--- a/oox/source/ole/vbaproject.cxx
+++ b/oox/source/ole/vbaproject.cxx
@@ -83,7 +83,7 @@ bool lclReadConfigItem( const Reference< XInterface >& rxConfigAccess, const OUS
Any aItem = ConfigurationHelper::readRelativeKey( rxConfigAccess, CREATE_OUSTRING( "Filter/Import/VBA" ), rItemName );
return aItem.has< bool >() && aItem.get< bool >();
}
- catch( Exception& )
+ catch(const Exception& )
{
}
return false;
@@ -103,7 +103,7 @@ VbaFilterConfig::VbaFilterConfig( const Reference< XComponentContext >& rxContex
Reference< XMultiServiceFactory > xFactory( rxContext->getServiceManager(), UNO_QUERY_THROW );
mxConfigAccess = ConfigurationHelper::openConfig( xFactory, aConfigPackage, ConfigurationHelper::E_READONLY );
}
- catch( Exception& )
+ catch(const Exception& )
{
}
OSL_ENSURE( mxConfigAccess.is(), "VbaFilterConfig::VbaFilterConfig - cannot open configuration" );
@@ -146,7 +146,7 @@ void VbaMacroAttacherBase::resolveAndAttachMacro( const Reference< XVBAMacroReso
{
attachMacro( rxResolver->resolveVBAMacroToScriptURL( maMacroName ) );
}
- catch( Exception& )
+ catch(const Exception& )
{
}
}
@@ -242,7 +242,7 @@ Reference< XNameContainer > VbaProject::openLibrary( sal_Int32 nPropId, bool bCr
xLibContainer->createLibrary( maPrjName );
xLibrary.set( xLibContainer->getByName( maPrjName ), UNO_QUERY_THROW );
}
- catch( Exception& )
+ catch(const Exception& )
{
}
OSL_ENSURE( !bCreateMissing || xLibrary.is(), "VbaProject::openLibrary - cannot create library" );
@@ -436,7 +436,7 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap
xVBACompat->setProjectName( maPrjName );
}
- catch( Exception& )
+ catch(const Exception& )
{
}
@@ -446,7 +446,7 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap
{
xDocObjectNA.set( xModelFactory->createInstance( CREATE_OUSTRING( "ooo.vba.VBAObjectModuleObjectProvider" ) ), UNO_QUERY );
}
- catch( Exception& )
+ catch(const Exception& )
{
// not all documents support this
}
@@ -463,7 +463,7 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap
::boost::cref( xBasicLib ), ::boost::cref( xDocObjectNA ) );
}
}
- catch( Exception& )
+ catch(const Exception& )
{
}
@@ -494,7 +494,7 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap
VbaUserForm aForm( mxContext, mxDocModel, rGraphicHelper, bDefaultColorBgr );
aForm.importForm( mxDocModel, xDialogLib, *xSubStrg, aModuleName, eTextEnc );
}
- catch( Exception& )
+ catch(const Exception& )
{
}
}
@@ -518,7 +518,7 @@ void VbaProject::attachMacros()
CREATE_OUSTRING( "com.sun.star.script.vba.VBAMacroResolver" ), aArgs, mxContext ), UNO_QUERY_THROW );
maMacroAttachers.forEachMem( &VbaMacroAttacherBase::resolveAndAttachMacro, ::boost::cref( xResolver ) );
}
- catch( Exception& )
+ catch(const Exception& )
{
}
}
@@ -538,7 +538,7 @@ void VbaProject::copyStorage( StorageBase& rVbaPrjStrg )
}
Reference< XTransactedObject >( xDocStorage, UNO_QUERY_THROW )->commit();
}
- catch( Exception& )
+ catch(const Exception& )
{
}
}
commit edb4b3c41eca1085ed59053c5bf57441c2df6c70
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date: Thu Aug 18 00:11:46 2011 -0400
Fixed build breakage.
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 053cc61..1d6e63f 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1050,7 +1050,9 @@ try
)
{
// binary search
- Property* pResult = ::std::lower_bound(pNewProps, pNewProps + nNewLen,pOldProps[i].Name, ::comphelper::PropertyStringLessFunctor());
+ Property* pResult = ::std::lower_bound(
+ pNewProps, pNewProps + nNewLen, pOldProps[i], ::comphelper::PropertyCompareByName());
+
if ( pResult
&& ( pResult != pNewProps + nNewLen && pResult->Name == pOldProps[i].Name )
&& ( (pResult->Attributes & PropertyAttribute::READONLY) == 0 )
commit 5b1463938b49ed9800787888776bb342572860e4
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date: Wed Aug 17 22:50:51 2011 -0400
When painting overlapped controls, paint the bottom one first.
Then work our way frontward and paint the top one last.
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index ebfebb6..2d99e55 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -2438,13 +2438,13 @@ void Window::ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags )
if ( nPaintFlags & (IMPL_PAINT_PAINTALLCHILDS | IMPL_PAINT_PAINTCHILDS) )
{
- // die Childfenster ausgeben
- Window* pTempWindow = mpWindowImpl->mpFirstChild;
+ // Paint from the bottom child window and frontward.
+ Window* pTempWindow = mpWindowImpl->mpLastChild;
while ( pTempWindow )
{
if ( pTempWindow->mpWindowImpl->mbVisible )
pTempWindow->ImplCallPaint( pChildRegion, nPaintFlags );
- pTempWindow = pTempWindow->mpWindowImpl->mpNext;
+ pTempWindow = pTempWindow->mpWindowImpl->mpPrev;
}
}
commit 039d0e01b92ec123cf55f1972c434677e1c5f1b8
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Wed Aug 17 20:36:45 2011 +0200
add more component prefixes
diff --git a/canvas/source/cairo/cairo_services.cxx b/canvas/source/cairo/cairo_services.cxx
index 77f053d..7a817ea 100644
--- a/canvas/source/cairo/cairo_services.cxx
+++ b/canvas/source/cairo/cairo_services.cxx
@@ -81,6 +81,14 @@ namespace cairocanvas
}
// The C shared lib entry points
-COMPHELPER_SERVICEDECL_EXPORTS2(cairocanvas::cairoCanvasDecl, cairocanvas::cairoSpriteCanvasDecl)
+extern "C"
+{
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL cairocanvas_component_getFactory( sal_Char const* pImplName,
+ ::com::sun::star::lang::XMultiServiceFactory* pServiceManager,
+ ::com::sun::star::registry::XRegistryKey* pRegistryKey )
+{
+ return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, cairocanvas::cairoCanvasDecl, cairocanvas::cairoSpriteCanvasDecl );
+}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/cairo/cairocanvas.component b/canvas/source/cairo/cairocanvas.component
index 126ad2b..b21197d 100644
--- a/canvas/source/cairo/cairocanvas.component
+++ b/canvas/source/cairo/cairocanvas.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="cairocanvas"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.rendering.Canvas.Cairo">
<service name="com.sun.star.rendering.Canvas.Cairo"/>
diff --git a/canvas/source/directx/directx5canvas.component b/canvas/source/directx/directx5canvas.component
index 80133e7..f7bcdbf 100644
--- a/canvas/source/directx/directx5canvas.component
+++ b/canvas/source/directx/directx5canvas.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="directx5canvas"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.rendering.SpriteCanvas.DX5">
<service name="com.sun.star.rendering.SpriteCanvas.DX5"/>
diff --git a/canvas/source/directx/directx9canvas.component b/canvas/source/directx/directx9canvas.component
index 0d39589..dc0349b 100644
--- a/canvas/source/directx/directx9canvas.component
+++ b/canvas/source/directx/directx9canvas.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="directx9canvas"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.rendering.SpriteCanvas.DX9">
<service name="com.sun.star.rendering.SpriteCanvas.DX9"/>
diff --git a/canvas/source/directx/dx_canvas.cxx b/canvas/source/directx/dx_canvas.cxx
index c29319b..18d8940 100644
--- a/canvas/source/directx/dx_canvas.cxx
+++ b/canvas/source/directx/dx_canvas.cxx
@@ -252,7 +252,14 @@ namespace dxcanvas
}
// The C shared lib entry points
-COMPHELPER_SERVICEDECL_EXPORTS2(dxcanvas::dxCanvasDecl,
- dxcanvas::dxBitmapCanvasDecl);
+extern "C"
+{
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL gdipluscanvas_component_getFactory( sal_Char const* pImplName,
+ ::com::sun::star::lang::XMultiServiceFactory* pServiceManager,
+ ::com::sun::star::registry::XRegistryKey* pRegistryKey )
+{
+ return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, dxcanvas::dxCanvasDecl, dxcanvas::dxBitmapCanvasDecl );
+}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/directx/dx_spritecanvas.cxx b/canvas/source/directx/dx_spritecanvas.cxx
index 430f463..6c47392 100644
--- a/canvas/source/directx/dx_spritecanvas.cxx
+++ b/canvas/source/directx/dx_spritecanvas.cxx
@@ -209,6 +209,14 @@ namespace dxcanvas
}
// The C shared lib entry points
-COMPHELPER_SERVICEDECL_EXPORTS1(dxcanvas::dxSpriteCanvasDecl);
+extern "C"
+{
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL directx9canvas_component_getFactory( sal_Char const* pImplName,
+ ::com::sun::star::lang::XMultiServiceFactory* pServiceManager,
+ ::com::sun::star::registry::XRegistryKey* pRegistryKey )
+{
+ return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, dxcanvas::dxSpriteCanvasDecl );
+}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/directx/gdipluscanvas.component b/canvas/source/directx/gdipluscanvas.component
index e39e774..8845e8c 100644
--- a/canvas/source/directx/gdipluscanvas.component
+++ b/canvas/source/directx/gdipluscanvas.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="gdipluscanvas"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.rendering.BitmapCanvas.GDI+">
<service name="com.sun.star.rendering.BitmapCanvas.GDI+"/>
diff --git a/canvas/source/factory/canvasfactory.component b/canvas/source/factory/canvasfactory.component
index 3896f41..d8bdd52 100644
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list