summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xaccessibility/inc/accessibility/extended/AccessibleGridControl.hxx8
-rwxr-xr-xaccessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx6
-rwxr-xr-xaccessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx7
-rwxr-xr-xaccessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx8
-rwxr-xr-xaccessibility/source/extended/AccessibleGridControl.cxx9
-rwxr-xr-xaccessibility/source/extended/AccessibleGridControlHeader.cxx9
-rwxr-xr-xaccessibility/source/extended/AccessibleGridControlTable.cxx12
-rwxr-xr-xaccessibility/source/extended/AccessibleGridControlTableBase.cxx10
-rw-r--r--accessibility/source/helper/acc_factory.cxx13
-rw-r--r--apple_remote/AppleRemote.m29
-rw-r--r--basegfx/test/basegfx2d.cxx7
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_s390/except.cxx6
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx10
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx6
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx10
-rw-r--r--cairo/prj/build.lst2
-rwxr-xr-xcanvas/source/directx/dx_winstuff.hxx12
-rw-r--r--chart2/source/tools/ChartTypeHelper.cxx2
-rw-r--r--chart2/source/view/charttypes/VSeriesPlotter.cxx5
-rw-r--r--comphelper/inc/comphelper/weakeventlistener.hxx2
-rw-r--r--configure.in23
-rw-r--r--connectivity/source/commontools/FValue.cxx2
-rw-r--r--connectivity/source/commontools/dbtools.cxx53
-rw-r--r--connectivity/source/drivers/jdbc/tools.cxx2
-rw-r--r--connectivity/source/parse/PColumn.cxx3
-rw-r--r--connectivity/source/parse/sqlnode.cxx2
-rw-r--r--cppcanvas/inc/cppcanvas/color.hxx10
-rw-r--r--cppuhelper/inc/cppuhelper/weakref.hxx29
-rwxr-xr-xcppuhelper/source/cc5_solaris_sparc.map2
-rw-r--r--cppuhelper/source/gcc3.map2
-rw-r--r--cppuhelper/source/msvc_win32_intel.map1
-rw-r--r--cppuhelper/source/weak.cxx45
-rw-r--r--dbaccess/qa/complex/dbaccess/dbaccess.sce2
-rw-r--r--dbaccess/source/core/api/KeySet.cxx31
-rw-r--r--dbaccess/source/core/api/KeySet.hxx2
-rw-r--r--dbaccess/source/core/api/RowSet.cxx97
-rw-r--r--dbaccess/source/core/api/RowSetBase.cxx48
-rw-r--r--dbaccess/source/core/api/RowSetCache.cxx6
-rw-r--r--dbaccess/source/core/api/SingleSelectQueryComposer.cxx27
-rw-r--r--dbaccess/source/core/dataaccess/connection.cxx13
-rw-r--r--dbaccess/source/core/dataaccess/connection.hxx4
-rw-r--r--dbaccess/source/core/dataaccess/databasecontext.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/databasedocument.cxx3
-rw-r--r--dbaccess/source/core/dataaccess/datasource.cxx8
-rw-r--r--dbaccess/source/core/dataaccess/documentcontainer.cxx29
-rw-r--r--dbaccess/source/core/dataaccess/documentdefinition.cxx3
-rw-r--r--dbaccess/source/core/inc/core_resource.hrc24
-rw-r--r--dbaccess/source/core/misc/dsntypes.cxx1
-rw-r--r--dbaccess/source/core/resource/strings.src77
-rw-r--r--dbaccess/source/ext/macromigration/dbmm_global.hrc3
-rw-r--r--dbaccess/source/ext/macromigration/macromigration.src13
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationwizard.cxx10
-rw-r--r--dbaccess/source/filter/xml/xmlColumn.cxx3
-rw-r--r--dbaccess/source/ui/app/AppController.cxx176
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.cxx43
-rw-r--r--dbaccess/source/ui/app/app.src8
-rw-r--r--dbaccess/source/ui/app/dbu_app.hrc5
-rw-r--r--dbaccess/source/ui/browser/dsEntriesNoExp.cxx2
-rw-r--r--dbaccess/source/ui/inc/QueryDesignView.hxx4
-rw-r--r--dbaccess/source/ui/inc/TableFieldDescription.hxx1
-rw-r--r--dbaccess/source/ui/inc/WCopyTable.hxx40
-rw-r--r--dbaccess/source/ui/inc/dbu_misc.hrc4
-rw-r--r--dbaccess/source/ui/inc/dbu_resource.hrc4
-rw-r--r--dbaccess/source/ui/inc/dbu_uno.hrc5
-rw-r--r--dbaccess/source/ui/misc/DExport.cxx5
-rw-r--r--dbaccess/source/ui/misc/WCPage.cxx17
-rw-r--r--dbaccess/source/ui/misc/WColumnSelect.cxx1
-rw-r--r--dbaccess/source/ui/misc/WCopyTable.cxx104
-rw-r--r--dbaccess/source/ui/misc/WTypeSelect.cxx2
-rw-r--r--dbaccess/source/ui/misc/WizardPages.src10
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignView.cxx75
-rw-r--r--dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx125
-rw-r--r--dbaccess/source/ui/querydesign/TableFieldDescription.cxx44
-rw-r--r--dbaccess/source/ui/uno/copytablewizard.cxx15
-rw-r--r--dbaccess/source/ui/uno/copytablewizard.src12
-rw-r--r--default_images/sc/res/popup_select_current.pngbin0 -> 454 bytes
-rw-r--r--default_images/sc/res/popup_unselect_current.pngbin0 -> 348 bytes
-rw-r--r--desktop/source/deployment/misc/dp_ucb.cxx75
-rw-r--r--desktop/source/deployment/registry/help/dp_help.cxx2
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java29
-rw-r--r--drawinglayer/source/processor2d/vclpixelprocessor2d.cxx3
-rw-r--r--extensions/source/update/feed/makefile.mk16
-rw-r--r--extensions/source/update/feed/updatefeed.cxx362
-rw-r--r--fileaccess/source/FileAccess.cxx90
-rw-r--r--filter/source/msfilter/msdffimp.cxx4
-rw-r--r--filter/source/pdf/impdialog.cxx64
-rw-r--r--filter/source/pdf/impdialog.hrc1
-rw-r--r--filter/source/pdf/impdialog.hxx4
-rw-r--r--filter/source/pdf/impdialog.src13
-rw-r--r--filter/source/pdf/pdffilter.cxx3
-rw-r--r--forms/source/component/FormattedField.cxx2
-rw-r--r--fpicker/source/office/fpsmartcontent.cxx31
-rw-r--r--goodies/source/filter.vcl/ipbm/ipbm.cxx11
-rw-r--r--graphite/makefile.mk6
-rw-r--r--l10ntools/inc/cfgmerge.hxx (renamed from transex3/inc/cfgmerge.hxx)0
-rw-r--r--l10ntools/inc/export.hxx (renamed from transex3/inc/export.hxx)6
-rw-r--r--l10ntools/inc/gsicheck.hxx (renamed from transex3/inc/gsicheck.hxx)0
-rw-r--r--l10ntools/inc/helpmerge.hxx (renamed from transex3/inc/helpmerge.hxx)0
-rw-r--r--l10ntools/inc/inireader.hxx (renamed from transex3/inc/inireader.hxx)0
-rw-r--r--l10ntools/inc/l10ntools/directory.hxx (renamed from transex3/inc/transex3/directory.hxx)6
-rw-r--r--l10ntools/inc/l10ntools/file.hxx (renamed from transex3/inc/transex3/file.hxx)0
-rw-r--r--l10ntools/inc/l10ntools/vosapp.hxx (renamed from transex3/inc/transex3/vosapp.hxx)0
-rw-r--r--l10ntools/inc/lngmerge.hxx (renamed from transex3/inc/lngmerge.hxx)0
-rw-r--r--l10ntools/inc/makefile.mk (renamed from transex3/inc/makefile.mk)2
-rw-r--r--l10ntools/inc/pch/precompiled_l10ntools.cxx (renamed from transex3/inc/pch/precompiled_transex3.cxx)2
-rw-r--r--l10ntools/inc/pch/precompiled_l10ntools.hxx (renamed from transex3/inc/pch/precompiled_transex3.hxx)0
-rw-r--r--l10ntools/inc/srciter.hxx (renamed from transex3/inc/srciter.hxx)6
-rw-r--r--l10ntools/inc/tagtest.hxx (renamed from transex3/inc/tagtest.hxx)0
-rw-r--r--l10ntools/inc/tokens.h (renamed from transex3/inc/tokens.h)0
-rw-r--r--l10ntools/inc/treeconfig.hxx (renamed from transex3/inc/treeconfig.hxx)0
-rw-r--r--l10ntools/inc/utf8conv.hxx (renamed from transex3/inc/utf8conv.hxx)0
-rw-r--r--l10ntools/inc/wrdtrans.hxx (renamed from transex3/inc/wrdtrans.hxx)0
-rw-r--r--l10ntools/inc/wtranode.hxx (renamed from transex3/inc/wtranode.hxx)0
-rw-r--r--l10ntools/inc/wtratree.hxx (renamed from transex3/inc/wtratree.hxx)0
-rw-r--r--l10ntools/inc/xmlparse.hxx (renamed from transex3/inc/xmlparse.hxx)0
-rw-r--r--l10ntools/inc/xmlutil.hxx (renamed from transex3/inc/xmlutil.hxx)0
-rw-r--r--l10ntools/inc/xrmmerge.hxx (renamed from transex3/inc/xrmmerge.hxx)0
-rwxr-xr-xl10ntools/java/l10nconv/build.xml (renamed from transex3/java/l10nconv/build.xml)0
-rwxr-xr-xl10ntools/java/l10nconv/converter.MF (renamed from transex3/java/l10nconv/converter.MF)0
-rwxr-xr-xl10ntools/java/l10nconv/documentation/readmeConverter.sxw (renamed from transex3/java/l10nconv/documentation/readmeConverter.sxw)bin9824 -> 9824 bytes
-rwxr-xr-xl10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapCheck.java (renamed from transex3/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapCheck.java)0
-rwxr-xr-xl10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapper.java (renamed from transex3/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapper.java)0
-rwxr-xr-xl10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/Tag.java (renamed from transex3/java/l10nconv/java/com/sun/star/tooling/DirtyTags/Tag.java)0
-rwxr-xr-xl10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/TagPair.java (renamed from transex3/java/l10nconv/java/com/sun/star/tooling/DirtyTags/TagPair.java)0
-rwxr-xr-xl10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Convert.java (renamed from transex3/java/l10nconv/java/com/sun/star/tooling/converter/Convert.java)0
-rwxr-xr-xl10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Converter.java (renamed from transex3/java/l10nconv/java/com/sun/star/tooling/converter/Converter.java)0
-rwxr-xr-xl10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ConverterException.java (renamed from transex3/java/l10nconv/java/com/sun/star/tooling/converter/ConverterException.java)0
-rwxr-xr-xl10ntools/java/l10nconv/java/com/sun/star/tooling/converter/DataHandler.java (renamed from transex3/java/l10nconv/java/com/sun/star/tooling/converter/DataHandler.java)0
-rwxr-xr-xl10ntools/java/l10nconv/java/com/sun/star/tooling/converter/DataReader.java (renamed from transex3/java/l10nconv/java/com/sun/star/tooling/converter/DataReader.java)0
-rwxr-xr-xl10ntools/java/l10nconv/java/com/sun/star/tooling/converter/DataWriter.java (renamed from transex3/java/l10nconv/java/com/sun/star/tooling/converter/DataWriter.java)0
-rwxr-xr-xl10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ExtMap.java (renamed from transex3/java/l10nconv/java/com/sun/star/tooling/converter/ExtMap.java)0
-rwxr-xr-xl10ntools/java/l10nconv/java/com/sun/star/tooling/converter/FileMaker.java (renamed from transex3/java/l10nconv/java/com/sun/star/tooling/converter/FileMaker.java)0
-rwxr-xr-xl10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIReader.java (renamed from transex3/java/l10nconv/java/com/sun/star/tooling/converter/GSIReader.java)0
-rwxr-xr-xl10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIWriter.java (renamed from transex3/java/l10nconv/java/com/sun/star/tooling/converter/GSIWriter.java)0
-rwxr-xr-xl10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIandSDFMerger.java (renamed from transex3/java/l10nconv/java/com/sun/star/tooling/converter/GSIandSDFMerger.java)0
-rwxr-xr-xl10ntools/java/l10nconv/java/com/sun/star/tooling/converter/LineErrorException.java (renamed from transex3/java/l10nconv/java/com/sun/star/tooling/converter/LineErrorException.java)0
-rwxr-xr-xl10ntools/java/l10nconv/java/com/sun/star/tooling/converter/OutputHandler.java (renamed from transex3/java/l10nconv/java/com/sun/star/tooling/converter/OutputHandler.java)0
-rwxr-xr-xl10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ResTypeResolver.java (renamed from transex3/java/l10nconv/java/com/sun/star/tooling/converter/ResTypeResolver.java)0
-rwxr-xr-xl10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Resolver.java (renamed from transex3/java/l10nconv/java/com/sun/star/tooling/converter/Resolver.java)0
-rwxr-xr-xl10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFReader.java (renamed from transex3/java/l10nconv/java/com/sun/star/tooling/converter/SDFReader.java)0
-rwxr-xr-xl10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFWriter.java (renamed from transex3/java/l10nconv/java/com/sun/star/tooling/converter/SDFWriter.java)0
-rwxr-xr-xl10ntools/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFReader.java (renamed from transex3/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFReader.java)0
-rwxr-xr-xl10ntools/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFWriter.java (renamed from transex3/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFWriter.java)0
-rwxr-xr-xl10ntools/java/l10nconv/java/com/sun/star/tooling/converter/dtd/xliff.dtd (renamed from transex3/java/l10nconv/java/com/sun/star/tooling/converter/dtd/xliff.dtd)0
-rwxr-xr-xl10ntools/java/l10nconv/java/com/sun/star/tooling/languageResolver/LanguageResolver.java (renamed from transex3/java/l10nconv/java/com/sun/star/tooling/languageResolver/LanguageResolver.java)0
-rwxr-xr-xl10ntools/java/l10nconv/java/com/sun/star/tooling/languageResolver/lang.map (renamed from transex3/java/l10nconv/java/com/sun/star/tooling/languageResolver/lang.map)0
-rwxr-xr-xl10ntools/java/l10nconv/makefile.mk (renamed from transex3/java/l10nconv/makefile.mk)2
-rwxr-xr-xl10ntools/java/receditor/build.xml (renamed from transex3/java/receditor/build.xml)0
-rw-r--r--l10ntools/java/receditor/java/transex3/controller/EditorController.java (renamed from transex3/java/receditor/java/transex3/controller/EditorController.java)0
-rw-r--r--l10ntools/java/receditor/java/transex3/controller/Main.java (renamed from transex3/java/receditor/java/transex3/controller/Main.java)0
-rw-r--r--l10ntools/java/receditor/java/transex3/model/ResourceFile.java (renamed from transex3/java/receditor/java/transex3/model/ResourceFile.java)0
-rw-r--r--l10ntools/java/receditor/java/transex3/model/SdfEntity.java (renamed from transex3/java/receditor/java/transex3/model/SdfEntity.java)0
-rw-r--r--l10ntools/java/receditor/java/transex3/model/SdfString.java (renamed from transex3/java/receditor/java/transex3/model/SdfString.java)0
-rw-r--r--l10ntools/java/receditor/java/transex3/view/Editor.java (renamed from transex3/java/receditor/java/transex3/view/Editor.java)0
-rw-r--r--l10ntools/java/receditor/java/transex3/view/SdfTable.java (renamed from transex3/java/receditor/java/transex3/view/SdfTable.java)0
-rwxr-xr-xl10ntools/java/receditor/makefile.mk (renamed from transex3/java/receditor/makefile.mk)2
-rwxr-xr-xl10ntools/java/receditor/receditor.MF (renamed from transex3/java/receditor/receditor.MF)0
-rw-r--r--l10ntools/layout/README (renamed from transex3/layout/README)0
-rw-r--r--l10ntools/layout/layoutparse.cxx (renamed from transex3/layout/layoutparse.cxx)0
-rw-r--r--l10ntools/layout/layoutparse.hxx (renamed from transex3/layout/layoutparse.hxx)0
-rw-r--r--l10ntools/layout/loc.sdf (renamed from transex3/layout/loc.sdf)0
-rw-r--r--l10ntools/layout/makefile.mk (renamed from transex3/layout/makefile.mk)2
-rw-r--r--l10ntools/layout/tralay.cxx (renamed from transex3/layout/tralay.cxx)2
-rw-r--r--l10ntools/layout/zoom.xml (renamed from transex3/layout/zoom.xml)0
-rw-r--r--l10ntools/prj/build.lst10
-rw-r--r--l10ntools/prj/d.lst (renamed from transex3/prj/d.lst)16
-rw-r--r--l10ntools/scripts/fast_merge.pl (renamed from transex3/scripts/fast_merge.pl)0
-rw-r--r--l10ntools/scripts/keyidGen.pl (renamed from transex3/scripts/keyidGen.pl)0
-rwxr-xr-xl10ntools/scripts/localize.pl (renamed from transex3/scripts/localize.pl)13
-rwxr-xr-xl10ntools/scripts/localize_old.pl (renamed from transex3/scripts/localize_old.pl)0
-rw-r--r--l10ntools/source/cfg_yy_wrapper.c (renamed from transex3/source/cfg_yy_wrapper.c)0
-rw-r--r--l10ntools/source/cfglex.l (renamed from transex3/source/cfglex.l)0
-rw-r--r--l10ntools/source/cfgmerge.cxx (renamed from transex3/source/cfgmerge.cxx)2
-rw-r--r--l10ntools/source/directory.cxx (renamed from transex3/source/directory.cxx)4
-rw-r--r--l10ntools/source/export.cxx (renamed from transex3/source/export.cxx)2
-rw-r--r--l10ntools/source/export2.cxx (renamed from transex3/source/export2.cxx)9
-rw-r--r--l10ntools/source/file.cxx (renamed from transex3/source/file.cxx)4
-rw-r--r--l10ntools/source/filter/merge/FCFGMerge.cfg (renamed from transex3/source/filter/merge/FCFGMerge.cfg)0
-rw-r--r--l10ntools/source/filter/merge/FCFGMerge.java (renamed from transex3/source/filter/merge/FCFGMerge.java)0
-rw-r--r--l10ntools/source/filter/merge/Manifest.mf (renamed from transex3/source/filter/merge/Manifest.mf)0
-rw-r--r--l10ntools/source/filter/merge/Merger.java (renamed from transex3/source/filter/merge/Merger.java)0
-rw-r--r--l10ntools/source/filter/merge/makefile.mk (renamed from transex3/source/filter/merge/makefile.mk)2
-rw-r--r--l10ntools/source/filter/utils/AnalyzeStartupLog.java (renamed from transex3/source/filter/utils/AnalyzeStartupLog.java)0
-rw-r--r--l10ntools/source/filter/utils/Cache.java (renamed from transex3/source/filter/utils/Cache.java)0
-rw-r--r--l10ntools/source/filter/utils/ConfigHelper.java (renamed from transex3/source/filter/utils/ConfigHelper.java)0
-rw-r--r--l10ntools/source/filter/utils/FileHelper.java (renamed from transex3/source/filter/utils/FileHelper.java)0
-rw-r--r--l10ntools/source/filter/utils/Logger.java (renamed from transex3/source/filter/utils/Logger.java)0
-rw-r--r--l10ntools/source/filter/utils/MalformedCommandLineException.java (renamed from transex3/source/filter/utils/MalformedCommandLineException.java)0
-rw-r--r--l10ntools/source/filter/utils/XMLHelper.java (renamed from transex3/source/filter/utils/XMLHelper.java)0
-rw-r--r--l10ntools/source/filter/utils/makefile.mk (renamed from transex3/source/filter/utils/makefile.mk)2
-rw-r--r--l10ntools/source/gsicheck.cxx (renamed from transex3/source/gsicheck.cxx)2
-rw-r--r--l10ntools/source/gsiconv.cxx (renamed from transex3/source/gsiconv.cxx)2
-rw-r--r--l10ntools/source/help/HelpCompiler.cxx (renamed from transex3/source/help/HelpCompiler.cxx)0
-rw-r--r--l10ntools/source/help/HelpCompiler.hxx (renamed from transex3/source/help/HelpCompiler.hxx)0
-rw-r--r--l10ntools/source/help/HelpFileDocument.java (renamed from transex3/source/help/HelpFileDocument.java)0
-rw-r--r--l10ntools/source/help/HelpIndexerTool.java (renamed from transex3/source/help/HelpIndexerTool.java)0
-rw-r--r--l10ntools/source/help/HelpLinker.cxx (renamed from transex3/source/help/HelpLinker.cxx)0
-rw-r--r--l10ntools/source/help/compilehelp.hxx (renamed from transex3/source/help/compilehelp.hxx)0
-rw-r--r--l10ntools/source/help/helplinker.pmk (renamed from transex3/source/help/helplinker.pmk)0
-rw-r--r--l10ntools/source/help/makefile.mk (renamed from transex3/source/help/makefile.mk)2
-rw-r--r--l10ntools/source/helpex.cxx (renamed from transex3/source/helpex.cxx)2
-rw-r--r--l10ntools/source/helpmerge.cxx (renamed from transex3/source/helpmerge.cxx)2
-rw-r--r--l10ntools/source/inireader.cxx (renamed from transex3/source/inireader.cxx)2
-rw-r--r--l10ntools/source/lngex.cxx (renamed from transex3/source/lngex.cxx)2
-rw-r--r--l10ntools/source/lngmerge.cxx (renamed from transex3/source/lngmerge.cxx)2
-rw-r--r--l10ntools/source/localize.cxx (renamed from transex3/source/localize.cxx)25
-rw-r--r--l10ntools/source/makefile.mk (renamed from transex3/source/makefile.mk)2
-rw-r--r--l10ntools/source/merge.cxx (renamed from transex3/source/merge.cxx)2
-rw-r--r--l10ntools/source/src_yy_wrapper.c (renamed from transex3/source/src_yy_wrapper.c)0
-rw-r--r--l10ntools/source/srciter.cxx (renamed from transex3/source/srciter.cxx)2
-rw-r--r--l10ntools/source/srclex.l (renamed from transex3/source/srclex.l)0
-rw-r--r--l10ntools/source/tagtest.cxx (renamed from transex3/source/tagtest.cxx)2
-rw-r--r--l10ntools/source/treeconfig.cxx (renamed from transex3/source/treeconfig.cxx)0
-rw-r--r--l10ntools/source/utf8conv.cxx (renamed from transex3/source/utf8conv.cxx)2
-rw-r--r--l10ntools/source/wrdtrans.cxx (renamed from transex3/source/wrdtrans.cxx)2
-rw-r--r--l10ntools/source/wtranode.cxx (renamed from transex3/source/wtranode.cxx)2
-rw-r--r--l10ntools/source/wtratree.cxx (renamed from transex3/source/wtratree.cxx)2
-rw-r--r--l10ntools/source/xgfconv.cxx (renamed from transex3/source/xgfconv.cxx)2
-rw-r--r--l10ntools/source/xmlparse.cxx (renamed from transex3/source/xmlparse.cxx)2
-rw-r--r--l10ntools/source/xrm_yy_wrapper.c (renamed from transex3/source/xrm_yy_wrapper.c)0
-rw-r--r--l10ntools/source/xrmlex.l (renamed from transex3/source/xrmlex.l)0
-rw-r--r--l10ntools/source/xrmmerge.cxx (renamed from transex3/source/xrmmerge.cxx)2
-rw-r--r--l10ntools/workbench/gsicheck_errors.sdf (renamed from transex3/workbench/gsicheck_errors.sdf)0
-rw-r--r--l10ntools/workbench/gsicheck_errors_err-.sdf (renamed from transex3/workbench/gsicheck_errors_err-.sdf)0
-rw-r--r--l10ntools/workbench/gsicheck_errors_err-l.sdf (renamed from transex3/workbench/gsicheck_errors_err-l.sdf)0
-rw-r--r--l10ntools/workbench/gsicheck_errors_err-s.sdf (renamed from transex3/workbench/gsicheck_errors_err-s.sdf)0
-rw-r--r--l10ntools/workbench/gsicheck_errors_err-t.sdf (renamed from transex3/workbench/gsicheck_errors_err-t.sdf)0
-rw-r--r--l10ntools/workbench/gsicheck_errors_ok-.sdf (renamed from transex3/workbench/gsicheck_errors_ok-.sdf)0
-rw-r--r--l10ntools/workbench/gsicheck_errors_ok-l.sdf (renamed from transex3/workbench/gsicheck_errors_ok-l.sdf)0
-rw-r--r--l10ntools/workbench/gsicheck_errors_ok-s.sdf (renamed from transex3/workbench/gsicheck_errors_ok-s.sdf)0
-rw-r--r--l10ntools/workbench/gsicheck_errors_ok-t.sdf (renamed from transex3/workbench/gsicheck_errors_ok-t.sdf)0
-rw-r--r--l10ntools/workbench/gsicheckcheck.btm (renamed from transex3/workbench/gsicheckcheck.btm)0
-rw-r--r--lingucomponent/prj/build.lst2
-rw-r--r--neon/makefile.mk5
-rw-r--r--neon/neon.patch268
-rw-r--r--odk/examples/DevelopersGuide/UCB/ResourceCreator.java18
-rw-r--r--offapi/com/sun/star/presentation/XSlideShow.idl19
-rw-r--r--offapi/com/sun/star/sheet/MemberResultFlags.idl11
-rw-r--r--offapi/com/sun/star/task/PasswordContainerInteractionHandler.idl60
-rw-r--r--offapi/com/sun/star/task/XUrlContainer.idl4
-rw-r--r--offapi/com/sun/star/task/makefile.mk3
-rw-r--r--offapi/com/sun/star/ucb/CommandEnvironment.idl67
-rw-r--r--offapi/com/sun/star/ucb/Content.idl82
-rw-r--r--offapi/com/sun/star/ucb/InteractiveLockingException.idl61
-rw-r--r--offapi/com/sun/star/ucb/InteractiveLockingLockExpiredException.idl56
-rw-r--r--offapi/com/sun/star/ucb/InteractiveLockingLockedException.idl62
-rw-r--r--offapi/com/sun/star/ucb/InteractiveLockingNotLockedException.idl59
-rw-r--r--offapi/com/sun/star/ucb/URLAuthenticationRequest.idl2
-rw-r--r--offapi/com/sun/star/ucb/XContentCreator.idl13
-rw-r--r--offapi/com/sun/star/ucb/XInteractionSupplyAuthentication2.idl2
-rw-r--r--offapi/com/sun/star/ucb/makefile.mk11
-rw-r--r--padmin/source/prtsetup.cxx23
-rw-r--r--padmin/source/prtsetup.hxx2
-rw-r--r--qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java4
-rw-r--r--qadevOOo/tests/java/mod/_sw/SwXDocumentIndexMark.java9
-rwxr-xr-xreadlicense_oo/docs/readme/readme.xrm14
-rw-r--r--remotebridges/source/bridge/bridge_connection.cxx4
-rw-r--r--reportbuilder/java/com/sun/star/report/ImageService.java14
-rw-r--r--reportbuilder/java/com/sun/star/report/InputRepository.java6
-rw-r--r--reportbuilder/java/com/sun/star/report/JobProgressIndicator.java1
-rw-r--r--reportbuilder/java/com/sun/star/report/OfficeToken.java61
-rw-r--r--reportbuilder/java/com/sun/star/report/OutputRepository.java1
-rw-r--r--reportbuilder/java/com/sun/star/report/ReportEngine.java1
-rw-r--r--reportbuilder/java/com/sun/star/report/ReportEngineParameterNames.java39
-rw-r--r--reportbuilder/java/com/sun/star/report/ReportExecutionException.java105
-rw-r--r--reportbuilder/java/com/sun/star/report/ReportExpression.java10
-rw-r--r--reportbuilder/java/com/sun/star/report/ReportJob.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/SDBCReportData.java12
-rw-r--r--reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java56
-rw-r--r--reportbuilder/java/com/sun/star/report/SOImageService.java14
-rw-r--r--reportbuilder/java/com/sun/star/report/StorageRepository.java22
-rw-r--r--reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunction.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunctionDescription.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/function/metadata/TitleFunction.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/function/metadata/TitleFunctionDescription.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/DefaultNameGenerator.java4
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java1
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/PentahoFormulaContext.java1
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java45
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/SOFormulaOpCodeMapper.java26
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java81
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/SOFunctionManager.java17
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/SOReportJobFactory.java119
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/StarFunctionCategory.java23
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription.java24
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/StarReportDataFactory.java138
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/StarReportModule.java41
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpression.java35
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpressionMetaData.java73
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FixedTextLayoutController.java54
-rwxr-xr-xreportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java46
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementContext.java89
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java29
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ObjectOleLayoutController.java4
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java195
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController.java200
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java275
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java90
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficePageSectionLayoutController.java21
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java6
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController.java401
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableLayoutController.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java3
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java8
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesCollection.java78
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java234
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryResourceData.java70
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/loader/InputResourceKey.java45
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/DataStyle.java25
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/FixedTextElement.java23
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceDeclsSection.java49
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceElement.java25
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/FormatCondition.java48
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/FormattedTextElement.java26
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/ImageElement.java72
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/ObjectOleElement.java29
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDetailSection.java9
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDocument.java39
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroup.java77
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupInstanceSection.java7
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterPage.java42
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterStyles.java54
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeReport.java60
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyle.java166
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStylesCollection.java115
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/OfficeTableSection.java9
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/PageLayout.java44
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/RawText.java11
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/ReportElement.java108
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/TableCellElement.java8
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/model/VariablesDeclarationSection.java12
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/oasis-datastyle.css2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/oasis-draw.css2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/oasis-form.css2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/oasis-style.css4
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/oasis-table.css14
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/oasis-text.css4
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/ImageProducer.java26
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java93
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/OleProducer.java43
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/StyleUtilities.java24
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java528
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportTarget.java21
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java236
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/text/MasterPageFactory.java13
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/text/PageContext.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportProcessor.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java134
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/AttributeSpecification.java45
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java17
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeParserUtil.java1
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeStylesXmlResourceFactory.java26
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/StarStyleXmlFactoryModule.java39
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/StarXmlFactoryModule.java3
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/StyleMapper.java11
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/chart/ChartReadHandler.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/draw/ObjectOleReadHandler.java4
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentContentReadHandler.java1
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentStylesReadHandler.java96
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/office/FontFaceDeclsReadHandler.java103
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt-schema-v1.0-os.xsd720
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormattedTextReadHandler.java14
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupReadHandler.java4
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/MasterDetailReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportReadHandler.java1
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/style/FontFaceReadHandler.java21
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/style/MasterPageReadHandler.java96
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler.java94
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler.java165
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler.java92
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler.java87
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/OneOfConstantsMapper.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/draw/TextAreaVerticalAlignMapper.java19
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontStyleMapper.java19
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontWeightMapper.java19
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/TextAlignMapper.java22
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyGenericMapper.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyMapper.java5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontNameMapper.java21
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontPitchMapper.java15
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontReliefMapper.java18
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextEmphasizeMapper.java18
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineColorMapper.java27
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineStyleMapper.java28
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWordMode.java15
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/VerticalAlignMapper.java21
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/ColumnWidthMapper.java22
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/RowHeightMapper.java22
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnReadHandler.java1
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnsReadHandler.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/smil.css2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/star-office.css2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/star-report.css28
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/star-rpt.css2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/styles/LengthCalculator.java117
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapper.java76
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperKey.java4
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlFactoryModule.java3
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlResourceFactory.java25
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingReadHandler.java98
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingRule.java47
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xsd102
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/svg.css2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/xsl-fo.css2
-rw-r--r--reportbuilder/java/com/sun/star/report/util/DefaultJobProperties.java65
-rw-r--r--reportbuilder/java/com/sun/star/report/util/DefaultParameterMap.java142
-rw-r--r--reportbuilder/java/com/sun/star/report/util/DefaultReportJobDefinition.java152
-rw-r--r--reportbuilder/java/com/sun/star/report/util/ManifestWriter.java104
-rw-r--r--reportdesign/inc/RptObject.hxx1
-rw-r--r--reportdesign/inc/reportformula.hxx3
-rw-r--r--reportdesign/source/core/api/ReportControlModel.cxx8
-rw-r--r--reportdesign/source/core/api/ReportDefinition.cxx3
-rw-r--r--reportdesign/source/core/inc/ReportControlModel.hxx2
-rw-r--r--reportdesign/source/core/misc/reportformula.cxx6
-rw-r--r--reportdesign/source/core/sdr/RptObject.cxx16
-rw-r--r--reportdesign/source/filter/xml/xmlExport.cxx87
-rw-r--r--reportdesign/source/filter/xml/xmlExport.hxx2
-rw-r--r--reportdesign/source/filter/xml/xmlGroup.cxx10
-rw-r--r--reportdesign/source/ui/inc/DesignView.hxx2
-rw-r--r--reportdesign/source/ui/inc/ReportWindow.hxx1
-rw-r--r--reportdesign/source/ui/inc/ScrollHelper.hxx1
-rw-r--r--reportdesign/source/ui/inc/StartMarker.hxx4
-rw-r--r--reportdesign/source/ui/inc/ViewsWindow.hxx5
-rw-r--r--reportdesign/source/ui/report/DesignView.cxx2
-rw-r--r--reportdesign/source/ui/report/ReportWindow.cxx5
-rw-r--r--reportdesign/source/ui/report/ScrollHelper.cxx5
-rw-r--r--reportdesign/source/ui/report/StartMarker.cxx6
-rw-r--r--reportdesign/source/ui/report/ViewsWindow.cxx27
-rw-r--r--sal/osl/unx/file_misc.cxx21
-rw-r--r--sc/inc/AccessibleFilterMenu.hxx194
-rw-r--r--sc/inc/AccessibleFilterMenuItem.hxx124
-rw-r--r--sc/inc/AccessibleFilterTopWindow.hxx104
-rw-r--r--sc/inc/AccessibleGlobal.hxx72
-rw-r--r--sc/inc/attrib.hxx16
-rw-r--r--sc/inc/column.hxx2
-rw-r--r--sc/inc/document.hxx2
-rw-r--r--sc/inc/dpgroup.hxx5
-rw-r--r--sc/inc/dpobject.hxx42
-rw-r--r--sc/inc/dpoutput.hxx7
-rw-r--r--sc/inc/dpoutputgeometry.hxx80
-rw-r--r--sc/inc/dpsave.hxx73
-rw-r--r--sc/inc/dptabres.hxx5
-rw-r--r--sc/inc/dptabsrc.hxx18
-rw-r--r--sc/inc/fillinfo.hxx2
-rw-r--r--sc/inc/global.hxx2
-rw-r--r--sc/inc/miscuno.hxx17
-rw-r--r--sc/inc/pivot.hxx46
-rw-r--r--sc/inc/sc.hrc5
-rw-r--r--sc/inc/scabstdlg.hxx2
-rw-r--r--sc/inc/table.hxx1
-rw-r--r--sc/inc/unonames.hxx4
-rw-r--r--sc/source/core/data/attarray.cxx3
-rw-r--r--sc/source/core/data/column2.cxx14
-rw-r--r--sc/source/core/data/documen8.cxx10
-rw-r--r--sc/source/core/data/document.cxx26
-rw-r--r--sc/source/core/data/dpgroup.cxx4
-rw-r--r--sc/source/core/data/dpobject.cxx329
-rw-r--r--sc/source/core/data/dpoutput.cxx104
-rw-r--r--sc/source/core/data/dpoutputgeometry.cxx217
-rw-r--r--sc/source/core/data/dpsave.cxx327
-rw-r--r--sc/source/core/data/dptabres.cxx94
-rw-r--r--sc/source/core/data/dptabsrc.cxx129
-rw-r--r--sc/source/core/data/fillinfo.cxx8
-rw-r--r--sc/source/core/data/global2.cxx47
-rw-r--r--sc/source/core/data/makefile.mk2
-rw-r--r--sc/source/core/data/pivot2.cxx25
-rw-r--r--sc/source/core/data/table2.cxx8
-rw-r--r--sc/source/filter/excel/read.cxx4
-rw-r--r--sc/source/filter/excel/xepivot.cxx141
-rw-r--r--sc/source/filter/excel/xestring.cxx4
-rw-r--r--sc/source/filter/excel/xiescher.cxx129
-rw-r--r--sc/source/filter/excel/xipivot.cxx173
-rw-r--r--sc/source/filter/excel/xlpivot.cxx125
-rw-r--r--sc/source/filter/inc/xepivot.hxx5
-rw-r--r--sc/source/filter/inc/xestring.hxx1
-rw-r--r--sc/source/filter/inc/xiescher.hxx2
-rw-r--r--sc/source/filter/inc/xipivot.hxx16
-rw-r--r--sc/source/filter/inc/xlpivot.hxx30
-rw-r--r--sc/source/filter/inc/xlstring.hxx1
-rw-r--r--sc/source/filter/xml/XMLExportDataPilot.cxx58
-rw-r--r--sc/source/filter/xml/XMLExportDataPilot.hxx3
-rw-r--r--sc/source/filter/xml/xmldpimp.cxx271
-rw-r--r--sc/source/filter/xml/xmldpimp.hxx67
-rw-r--r--sc/source/filter/xml/xmlexprt.cxx22
-rw-r--r--sc/source/filter/xml/xmlimprt.cxx47
-rw-r--r--sc/source/filter/xml/xmlimprt.hxx19
-rw-r--r--sc/source/ui/Accessibility/AccessibleContextBase.cxx5
-rw-r--r--sc/source/ui/Accessibility/AccessibleFilterMenu.cxx401
-rw-r--r--sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx208
-rw-r--r--sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx137
-rw-r--r--sc/source/ui/Accessibility/AccessibleGlobal.cxx98
-rw-r--r--sc/source/ui/Accessibility/makefile.mk8
-rw-r--r--sc/source/ui/cctrl/dpcontrol.cxx1419
-rw-r--r--sc/source/ui/cctrl/dpcontrol.src82
-rw-r--r--sc/source/ui/cctrl/makefile.mk10
-rw-r--r--sc/source/ui/dbgui/makefile.mk1
-rw-r--r--sc/source/ui/dbgui/pvfundlg.cxx66
-rw-r--r--sc/source/ui/dbgui/pvlaydlg.cxx106
-rw-r--r--sc/source/ui/docshell/dbdocfun.cxx4
-rw-r--r--sc/source/ui/inc/AccessibleContextBase.hxx2
-rw-r--r--sc/source/ui/inc/dbfunc.hxx3
-rw-r--r--sc/source/ui/inc/dpcontrol.hrc (renamed from sw/source/core/inc/unoclbck.hxx)33
-rw-r--r--sc/source/ui/inc/dpcontrol.hxx366
-rw-r--r--sc/source/ui/inc/gridwin.hxx25
-rw-r--r--sc/source/ui/inc/pvfundlg.hxx11
-rw-r--r--sc/source/ui/inc/pvlaydlg.hxx2
-rw-r--r--sc/source/ui/undo/undodat.cxx4
-rw-r--r--sc/source/ui/unoobj/dapiuno.cxx13
-rw-r--r--sc/source/ui/unoobj/miscuno.cxx37
-rw-r--r--sc/source/ui/view/cellsh2.cxx15
-rw-r--r--sc/source/ui/view/dbfunc.cxx18
-rw-r--r--sc/source/ui/view/dbfunc3.cxx509
-rw-r--r--sc/source/ui/view/gridwin.cxx120
-rw-r--r--sc/source/ui/view/gridwin2.cxx320
-rw-r--r--sc/source/ui/view/gridwin4.cxx30
-rw-r--r--sc/source/ui/view/makefile.mk4
-rw-r--r--sc/source/ui/view/tabview.cxx30
-rw-r--r--sc/util/makefile.mk1
-rw-r--r--scp2/prj/build.lst2
-rw-r--r--scp2/source/ooo/common_brand.scp46
-rw-r--r--sd/source/filter/eppt/epptso.cxx114
-rw-r--r--sd/source/ui/slideshow/makefile.mk5
-rw-r--r--sd/source/ui/slideshow/slideshow.cxx2
-rw-r--r--sd/source/ui/slideshow/slideshow.hrc19
-rw-r--r--sd/source/ui/slideshow/slideshow.src125
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx461
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.hxx17
-rw-r--r--sd/source/ui/unoidl/facreg.cxx2
-rw-r--r--sd/source/ui/unoidl/unolayer.cxx4
-rw-r--r--sd/source/ui/unoidl/unomodel.cxx47
-rw-r--r--sd/source/ui/view/sdview4.cxx3
-rw-r--r--sdext/source/pdfimport/config/description.xml2
-rw-r--r--sdext/source/pdfimport/pdfparse/pdfparse.cxx30
-rw-r--r--set_soenv.in1
-rw-r--r--setup_native/prj/build.lst2
-rwxr-xr-xsetup_native/source/java/javaversion.dat26
-rw-r--r--setup_native/source/java/javaversion2.dat26
-rw-r--r--sfx2/source/doc/doctempl.cxx9
-rw-r--r--sfx2/source/doc/objstor.cxx60
-rw-r--r--slideshow/source/engine/color.cxx13
-rw-r--r--slideshow/source/engine/eventmultiplexer.cxx39
-rw-r--r--slideshow/source/engine/makefile.mk4
-rw-r--r--slideshow/source/engine/shapes/shapeimporter.cxx120
-rw-r--r--slideshow/source/engine/slide/slideimpl.cxx89
-rw-r--r--slideshow/source/engine/slide/userpaintoverlay.cxx303
-rw-r--r--slideshow/source/engine/slide/userpaintoverlay.hxx20
-rw-r--r--slideshow/source/engine/slideshowimpl.cxx343
-rw-r--r--slideshow/source/engine/tools.cxx48
-rw-r--r--slideshow/source/inc/eventmultiplexer.hxx27
-rw-r--r--slideshow/source/inc/rgbcolor.hxx3
-rw-r--r--slideshow/source/inc/shapeimporter.hxx22
-rw-r--r--slideshow/source/inc/slide.hxx47
-rw-r--r--slideshow/source/inc/tools.hxx3
-rw-r--r--slideshow/source/inc/userpainteventhandler.hxx6
-rw-r--r--soldep/bootstrp/prj.cxx131
-rw-r--r--soldep/inc/soldep/prj.hxx14
-rwxr-xr-xsolenv/bin/build.pl202
-rwxr-xr-xsolenv/bin/localize4
-rwxr-xr-xsolenv/bin/localize_sl18
-rw-r--r--solenv/bin/modules/SourceConfig.pm53
-rw-r--r--solenv/config/sdev300.ini2
-rw-r--r--solenv/inc/minor.mk6
-rw-r--r--solenv/inc/rules.mk44
-rw-r--r--solenv/inc/settings.mk2
-rw-r--r--solenv/inc/tg_dep.mk1
-rw-r--r--solenv/inc/wntmsci11.mk5
-rwxr-xr-xsoltools/mkdepend/collectdircontent.cxx4
-rw-r--r--soltools/mkdepend/collectdircontent.hxx1
-rw-r--r--soltools/mkdepend/main.c3
-rw-r--r--sot/source/sdstor/ucbstorage.cxx59
-rw-r--r--splitbuild/prj/build.lst2
-rw-r--r--svtools/source/control/ctrlbox.cxx1
-rw-r--r--svtools/source/filter.vcl/jpeg/jpeg.cxx39
-rw-r--r--svtools/source/filter.vcl/jpeg/jpeg.h2
-rw-r--r--svtools/source/filter.vcl/jpeg/jpegc.c14
-rw-r--r--svtools/source/filter.vcl/wmf/emfwr.cxx103
-rw-r--r--svtools/source/filter.vcl/wmf/emfwr.hxx1
-rw-r--r--svtools/source/filter.vcl/wmf/winmtf.cxx9
-rw-r--r--svtools/source/filter.vcl/wmf/winmtf.hxx15
-rw-r--r--svtools/source/filter.vcl/wmf/winwmf.cxx216
-rw-r--r--svtools/source/filter.vcl/wmf/wmfwr.cxx81
-rw-r--r--svtools/source/filter.vcl/wmf/wmfwr.hxx9
-rw-r--r--svtools/source/misc/ehdl.cxx26
-rw-r--r--svx/inc/svx/numitem.hxx1
-rw-r--r--svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx1
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeEngine.cxx4
-rw-r--r--svx/source/items/numitem.cxx10
-rw-r--r--svx/source/outliner/outlvw.cxx34
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx23
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx16
-rw-r--r--svx/source/svdraw/svdfmtf.cxx4
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx8
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx1
-rw-r--r--sw/inc/calbck.hxx5
-rw-r--r--sw/inc/chpfld.hxx4
-rw-r--r--sw/inc/dcontact.hxx10
-rw-r--r--sw/inc/doc.hxx3
-rw-r--r--sw/inc/fmtanchr.hxx4
-rwxr-xr-x[-rw-r--r--]sw/inc/fmtmeta.hxx22
-rw-r--r--sw/inc/frmfmt.hxx19
-rw-r--r--sw/inc/ndtxt.hxx20
-rw-r--r--sw/inc/pagedesc.hxx3
-rw-r--r--sw/inc/section.hxx20
-rw-r--r--sw/inc/swtable.hxx2
-rw-r--r--sw/inc/swtypes.hxx10
-rw-r--r--sw/inc/tox.hxx32
-rw-r--r--sw/inc/txtatr.hxx2
-rw-r--r--sw/inc/unobaseclass.hxx150
-rw-r--r--sw/inc/unobookmark.hxx244
-rw-r--r--sw/inc/unochart.hxx10
-rw-r--r--sw/inc/unocoll.hxx1
-rw-r--r--sw/inc/unocrsrhelper.hxx111
-rw-r--r--sw/inc/unofield.hxx8
-rw-r--r--sw/inc/unofootnote.hxx233
-rw-r--r--sw/inc/unoframe.hxx35
-rw-r--r--sw/inc/unoidx.hxx540
-rw-r--r--sw/inc/unoobj.hxx1493
-rw-r--r--sw/inc/unoparaframeenum.hxx131
-rw-r--r--sw/inc/unoparagraph.hxx369
-rw-r--r--sw/inc/unoredline.hxx4
-rw-r--r--sw/inc/unoredlines.hxx5
-rw-r--r--sw/inc/unorefmark.hxx178
-rw-r--r--sw/inc/unosection.hxx251
-rw-r--r--sw/inc/unotbl.hxx39
-rw-r--r--sw/inc/unotext.hxx343
-rw-r--r--sw/inc/unotextbodyhf.hxx214
-rw-r--r--sw/inc/unotextcursor.hxx351
-rw-r--r--sw/inc/unotextrange.hxx342
-rwxr-xr-xsw/qa/complex/writer/TextPortionEnumerationTest.java2
-rw-r--r--sw/source/core/access/accframe.cxx6
-rw-r--r--sw/source/core/access/accfrmobj.cxx6
-rw-r--r--sw/source/core/access/accpara.cxx13
-rw-r--r--sw/source/core/attr/calbck.cxx2
-rw-r--r--sw/source/core/crsr/bookmrk.cxx32
-rw-r--r--sw/source/core/crsr/crsrsh.cxx6
-rwxr-xr-xsw/source/core/doc/doc.cxx2
-rw-r--r--sw/source/core/doc/docbm.cxx33
-rw-r--r--sw/source/core/doc/docdraw.cxx10
-rw-r--r--sw/source/core/doc/docedt.cxx38
-rw-r--r--sw/source/core/doc/docfld.cxx7
-rw-r--r--sw/source/core/doc/docfly.cxx52
-rw-r--r--sw/source/core/doc/docglbl.cxx22
-rw-r--r--sw/source/core/doc/doclay.cxx101
-rw-r--r--sw/source/core/doc/docnew.cxx5
-rw-r--r--sw/source/core/doc/docsort.cxx19
-rw-r--r--sw/source/core/doc/poolfmt.cxx18
-rw-r--r--sw/source/core/doc/tblcpy.cxx12
-rw-r--r--sw/source/core/docnode/ndcopy.cxx47
-rw-r--r--sw/source/core/docnode/ndtbl.cxx19
-rw-r--r--sw/source/core/docnode/node.cxx6
-rw-r--r--sw/source/core/docnode/nodes.cxx15
-rw-r--r--sw/source/core/docnode/section.cxx5
-rw-r--r--sw/source/core/docnode/swbaslnk.cxx30
-rw-r--r--sw/source/core/draw/dcontact.cxx18
-rw-r--r--sw/source/core/draw/dview.cxx14
-rw-r--r--sw/source/core/edit/autofmt.cxx2
-rw-r--r--sw/source/core/edit/editsh.cxx4
-rw-r--r--sw/source/core/fields/expfld.cxx17
-rw-r--r--sw/source/core/frmedt/fecopy.cxx73
-rw-r--r--sw/source/core/frmedt/fefly1.cxx84
-rw-r--r--sw/source/core/frmedt/feshview.cxx24
-rw-r--r--sw/source/core/frmedt/fews.cxx18
-rw-r--r--sw/source/core/frmedt/tblsel.cxx9
-rw-r--r--sw/source/core/inc/bookmrk.hxx24
-rw-r--r--sw/source/core/inc/flyfrm.hxx8
-rw-r--r--sw/source/core/inc/frmtool.hxx2
-rwxr-xr-xsw/source/core/inc/unometa.hxx193
-rw-r--r--sw/source/core/layout/anchoreddrawobject.cxx16
-rw-r--r--sw/source/core/layout/anchoredobject.cxx12
-rw-r--r--sw/source/core/layout/atrfrm.cxx84
-rw-r--r--sw/source/core/layout/calcmove.cxx6
-rw-r--r--sw/source/core/layout/flowfrm.cxx2
-rw-r--r--sw/source/core/layout/fly.cxx19
-rw-r--r--sw/source/core/layout/flycnt.cxx2
-rw-r--r--sw/source/core/layout/flylay.cxx9
-rw-r--r--sw/source/core/layout/flypos.cxx8
-rw-r--r--sw/source/core/layout/frmtool.cxx31
-rw-r--r--sw/source/core/layout/laycache.cxx11
-rw-r--r--sw/source/core/layout/objectformatter.cxx2
-rw-r--r--sw/source/core/layout/objectformattertxtfrm.cxx6
-rw-r--r--sw/source/core/layout/pagechg.cxx12
-rw-r--r--sw/source/core/layout/sortedobjsimpl.cxx41
-rw-r--r--sw/source/core/layout/tabfrm.cxx8
-rw-r--r--sw/source/core/layout/wsfrm.cxx10
-rw-r--r--sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx6
-rw-r--r--sw/source/core/table/swtable.cxx29
-rw-r--r--sw/source/core/text/EnhancedPDFExportHelper.cxx12
-rw-r--r--sw/source/core/text/itratr.cxx6
-rw-r--r--sw/source/core/text/porfly.cxx5
-rw-r--r--sw/source/core/text/txtfly.cxx50
-rw-r--r--sw/source/core/text/txtfrm.cxx20
-rw-r--r--sw/source/core/tox/tox.cxx34
-rw-r--r--sw/source/core/txtnode/atrflyin.cxx10
-rw-r--r--sw/source/core/txtnode/fmtatr2.cxx66
-rw-r--r--sw/source/core/txtnode/ndtxt.cxx32
-rw-r--r--sw/source/core/txtnode/thints.cxx20
-rw-r--r--sw/source/core/txtnode/txtatr2.cxx10
-rw-r--r--sw/source/core/undo/rolbck.cxx2
-rw-r--r--sw/source/core/undo/unattr.cxx16
-rw-r--r--sw/source/core/undo/undel.cxx4
-rw-r--r--sw/source/core/undo/undobj.cxx6
-rw-r--r--sw/source/core/undo/undobj1.cxx91
-rw-r--r--sw/source/core/undo/undraw.cxx37
-rw-r--r--sw/source/core/undo/untbl.cxx10
-rw-r--r--sw/source/core/undo/untblk.cxx16
-rw-r--r--sw/source/core/unocore/SwXTextDefaults.cxx11
-rw-r--r--sw/source/core/unocore/TextCursorHelper.cxx4
-rw-r--r--sw/source/core/unocore/makefile.mk1
-rw-r--r--sw/source/core/unocore/unobkm.cxx499
-rw-r--r--sw/source/core/unocore/unochart.cxx3
-rw-r--r--sw/source/core/unocore/unoclbck.cxx119
-rw-r--r--sw/source/core/unocore/unocoll.cxx82
-rw-r--r--sw/source/core/unocore/unocrsrhelper.cxx39
-rw-r--r--sw/source/core/unocore/unodraw.cxx69
-rw-r--r--sw/source/core/unocore/unofield.cxx9
-rw-r--r--sw/source/core/unocore/unoflatpara.cxx11
-rw-r--r--sw/source/core/unocore/unoframe.cxx61
-rw-r--r--sw/source/core/unocore/unoftn.cxx762
-rw-r--r--sw/source/core/unocore/unoidx.cxx3309
-rw-r--r--sw/source/core/unocore/unoobj.cxx3266
-rw-r--r--sw/source/core/unocore/unoobj2.cxx2504
-rw-r--r--sw/source/core/unocore/unoparagraph.cxx1184
-rw-r--r--sw/source/core/unocore/unoport.cxx27
-rw-r--r--sw/source/core/unocore/unoportenum.cxx104
-rw-r--r--sw/source/core/unocore/unoredline.cxx43
-rw-r--r--sw/source/core/unocore/unoredlines.cxx7
-rw-r--r--sw/source/core/unocore/unorefmk.cxx861
-rw-r--r--sw/source/core/unocore/unosect.cxx2381
-rw-r--r--sw/source/core/unocore/unosett.cxx5
-rw-r--r--sw/source/core/unocore/unosrch.cxx7
-rw-r--r--sw/source/core/unocore/unostyle.cxx63
-rw-r--r--sw/source/core/unocore/unotbl.cxx126
-rw-r--r--sw/source/core/unocore/unotext.cxx3493
-rw-r--r--sw/source/core/view/vdraw.cxx9
-rw-r--r--sw/source/filter/basflt/shellio.cxx19
-rw-r--r--sw/source/filter/html/css1atr.cxx10
-rw-r--r--sw/source/filter/html/htmlcss1.cxx13
-rw-r--r--sw/source/filter/html/htmldraw.cxx14
-rw-r--r--sw/source/filter/html/htmlfly.cxx20
-rw-r--r--sw/source/filter/html/htmlform.cxx9
-rw-r--r--sw/source/filter/html/htmlforw.cxx11
-rw-r--r--sw/source/filter/html/htmlgrin.cxx30
-rw-r--r--sw/source/filter/html/htmlplug.cxx8
-rw-r--r--sw/source/filter/html/swhtml.cxx36
-rw-r--r--sw/source/filter/inc/fltshell.hxx4
-rw-r--r--sw/source/filter/rtf/rtfatr.cxx20
-rw-r--r--sw/source/filter/rtf/rtffly.cxx17
-rw-r--r--sw/source/filter/rtf/swparrtf.cxx28
-rw-r--r--sw/source/filter/rtf/wrtrtf.cxx7
-rw-r--r--sw/source/filter/ww1/fltshell.cxx13
-rw-r--r--sw/source/filter/ww1/w1sprm.cxx10
-rw-r--r--sw/source/filter/ww8/writerhelper.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx16
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx13
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx2
-rw-r--r--sw/source/filter/ww8/wrtww8gr.cxx6
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx12
-rw-r--r--sw/source/filter/ww8/ww8glsy.cxx13
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx20
-rw-r--r--sw/source/filter/ww8/ww8graf2.cxx8
-rw-r--r--sw/source/filter/ww8/ww8par.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx13
-rw-r--r--sw/source/filter/ww8/ww8par3.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par4.cxx8
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx8
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx24
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.cxx17
-rw-r--r--sw/source/filter/xml/swxml.cxx7
-rw-r--r--sw/source/filter/xml/xmlexp.cxx5
-rw-r--r--sw/source/filter/xml/xmlfmt.cxx10
-rw-r--r--sw/source/filter/xml/xmlfonte.cxx4
-rw-r--r--sw/source/filter/xml/xmlimp.cxx15
-rw-r--r--sw/source/filter/xml/xmlmeta.cxx1
-rw-r--r--sw/source/filter/xml/xmltble.cxx6
-rw-r--r--sw/source/filter/xml/xmltbli.cxx6
-rw-r--r--sw/source/filter/xml/xmltexte.cxx5
-rw-r--r--sw/source/filter/xml/xmltexti.cxx8
-rw-r--r--sw/source/ui/app/appenv.cxx20
-rw-r--r--sw/source/ui/app/applab.cxx18
-rw-r--r--sw/source/ui/app/docsh2.cxx35
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.cxx6
-rw-r--r--sw/source/ui/dialog/SwSpellDialogChildWindow.cxx15
-rw-r--r--sw/source/ui/dialog/regionsw.cxx23
-rw-r--r--sw/source/ui/docvw/edtwin.cxx25
-rw-r--r--sw/source/ui/envelp/labelexp.cxx2
-rw-r--r--sw/source/ui/frmdlg/column.cxx2
-rw-r--r--sw/source/ui/frmdlg/frmmgr.cxx27
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx60
-rw-r--r--sw/source/ui/frmdlg/wrap.cxx54
-rw-r--r--sw/source/ui/misc/glossary.cxx22
-rw-r--r--sw/source/ui/ribbar/conrect.cxx11
-rw-r--r--sw/source/ui/ribbar/drawbase.cxx3
-rw-r--r--sw/source/ui/shells/basesh.cxx58
-rw-r--r--sw/source/ui/shells/drwbassh.cxx12
-rw-r--r--sw/source/ui/shells/drwtxtsh.cxx6
-rw-r--r--sw/source/ui/shells/tabsh.cxx6
-rw-r--r--sw/source/ui/shells/textdrw.cxx6
-rw-r--r--sw/source/ui/shells/textidx.cxx6
-rw-r--r--sw/source/ui/shells/textsh.cxx12
-rw-r--r--sw/source/ui/table/chartins.cxx7
-rw-r--r--sw/source/ui/uiview/view2.cxx19
-rw-r--r--sw/source/ui/uiview/viewtab.cxx4
-rw-r--r--sw/source/ui/uno/SwXDocumentSettings.cxx6
-rw-r--r--sw/source/ui/uno/unoatxt.cxx57
-rw-r--r--sw/source/ui/uno/unodispatch.cxx7
-rw-r--r--sw/source/ui/uno/unomod.cxx2
-rw-r--r--sw/source/ui/uno/unotxdoc.cxx43
-rw-r--r--sw/source/ui/uno/unotxvw.cxx97
-rw-r--r--sw/source/ui/utlui/attrdesc.cxx8
-rw-r--r--sw/source/ui/utlui/swrenamexnameddlg.cxx1
-rw-r--r--sw/source/ui/utlui/unotools.cxx3
-rw-r--r--sw/source/ui/wrtsh/select.cxx6
-rw-r--r--sysui/prj/build.lst2
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/optional/includes/loadsave/ch2_xml_format.inc498
-rwxr-xr-xtestautomation/chart2/required/ch2_updt_calc.bas316
-rwxr-xr-xtestautomation/dbaccess/optional/includes/db_Mozilla.inc284
-rwxr-xr-xtestautomation/dbaccess/optional/includes/misc_Macros.inc242
-rwxr-xr-xtestautomation/extensions/optional/input/options/readme.txt390
-rwxr-xr-xtestautomation/extensions/optional/input/platform/readme.txt98
-rwxr-xr-xtestautomation/extensions/optional/input/update/readme.txt52
-rwxr-xr-xtestautomation/extensions/optional/input/web_update/readme.txt266
-rwxr-xr-xtestautomation/framework/optional/includes/configuration.inc26
-rwxr-xr-xtestautomation/framework/optional/includes/standardbar2.inc2
-rwxr-xr-xtestautomation/framework/optional/input/extras_formats/Labels_en-US.txt3072
-rwxr-xr-xtestautomation/framework/optional/input/extras_formats/Tables_calc_en-US.txt34
-rwxr-xr-xtestautomation/framework/optional/input/extras_formats/Tables_writer_en-US.txt34
-rwxr-xr-xtestautomation/framework/optional/input/filternames/OpenOffice.org_Filternames_en-US.txt266
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/input/filternames/StarOffice_Filternames_add_en-US.txt266
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/input/filternames/StarOffice_Filternames_en-US.txt252
-rwxr-xr-xtestautomation/framework/optional/input/filternames/StarSuite_Filternames_en-US.txt244
-rwxr-xr-xtestautomation/framework/optional/input/help_browser/OpenOffice.org_help_applications_en-US.txt16
-rwxr-xr-xtestautomation/framework/optional/input/help_browser/OpenOffice.org_help_content_en-US.txt1738
-rwxr-xr-xtestautomation/framework/optional/input/help_browser/OpenOffice.org_help_topic_en-US.txt44324
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/input/help_browser/OpenOffice.org_help_topics_en-US.txt43898
-rwxr-xr-xtestautomation/framework/optional/input/help_browser/OpenOffice.org_search_headings_and_whole_words_en-US.txt12
-rwxr-xr-xtestautomation/framework/optional/input/help_browser/OpenOffice.org_search_headings_only_en-US.txt14
-rwxr-xr-xtestautomation/framework/optional/input/help_browser/OpenOffice.org_search_whole_words_only_en-US.txt32
-rwxr-xr-xtestautomation/framework/optional/input/help_browser/OpenOffice.org_search_without_filter_en-US.txt44
-rwxr-xr-xtestautomation/framework/optional/input/help_browser/StarOffice_help_applications_en-US.txt16
-rwxr-xr-xtestautomation/framework/optional/input/help_browser/StarOffice_help_content_en-US.txt1736
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/input/help_browser/StarOffice_help_topics_en-US.txt43958
-rwxr-xr-xtestautomation/framework/optional/input/help_browser/StarOffice_search_headings_and_whole_words_en-US.txt12
-rwxr-xr-xtestautomation/framework/optional/input/help_browser/StarOffice_search_headings_only_en-US.txt14
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/input/help_browser/StarOffice_search_whole_words_only_en-US.txt32
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/input/help_browser/StarOffice_search_without_filter_en-US.txt44
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/input/help_browser/StarSuite_help_applications_en-US.txt16
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/input/help_browser/StarSuite_help_content_en-US.txt1738
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/input/help_browser/StarSuite_help_topics_en-US.txt43898
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/input/help_browser/StarSuite_search_headings_and_whole_words_en-US.txt12
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/input/help_browser/StarSuite_search_headings_only_en-US.txt14
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/input/help_browser/StarSuite_search_whole_words_only_en-US.txt32
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/input/help_browser/StarSuite_search_without_filter_en-US.txt44
-rwxr-xr-xtestautomation/framework/optional/input/menu/en-us_basic.txt114
-rwxr-xr-xtestautomation/framework/optional/input/menu/en-us_calc.txt354
-rwxr-xr-xtestautomation/framework/optional/input/menu/en-us_draw.txt314
-rwxr-xr-xtestautomation/framework/optional/input/menu/en-us_htmldokument.txt344
-rwxr-xr-xtestautomation/framework/optional/input/menu/en-us_impress.txt316
-rwxr-xr-xtestautomation/framework/optional/input/menu/en-us_insight.txt164
-rwxr-xr-xtestautomation/framework/optional/input/menu/en-us_masterdoc.txt388
-rwxr-xr-xtestautomation/framework/optional/input/menu/en-us_math.txt170
-rwxr-xr-xtestautomation/framework/optional/input/menu/en-us_writer.txt390
-rwxr-xr-xtestautomation/framework/required/includes/topten.inc622
-rwxr-xr-xtestautomation/framework/required/includes/wizard_fax.inc208
-rwxr-xr-xtestautomation/global/input/filters/native_suffixes.dat106
-rwxr-xr-xtestautomation/global/input/macros.txt54
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_filetools.inc2
-rwxr-xr-xtestautomation/global/tools/includes/optional/t_ole.inc42
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_xml_filter1.inc1522
-rwxr-xr-xtestautomation/graphics/required/input/gallery/gal_1.txt60
-rwxr-xr-xtestautomation/graphics/required/input/gallery/gal_31.txt60
-rwxr-xr-xtestautomation/graphics/required/input/gallery/gal_33.txt60
-rwxr-xr-xtestautomation/graphics/required/input/gallery/gal_34.txt60
-rwxr-xr-xtestautomation/graphics/required/input/gallery/gal_36.txt60
-rwxr-xr-xtestautomation/graphics/required/input/gallery/gal_39.txt60
-rwxr-xr-xtestautomation/graphics/required/input/gallery/gal_46.txt60
-rwxr-xr-xtestautomation/graphics/required/input/gallery/gal_48.txt60
-rwxr-xr-xtestautomation/graphics/required/input/gallery/gal_49.txt60
-rwxr-xr-xtestautomation/graphics/required/input/gallery/gal_55.txt60
-rwxr-xr-xtestautomation/graphics/required/input/gallery/gal_81.txt56
-rwxr-xr-xtestautomation/graphics/required/input/gallery/gal_82.txt56
-rwxr-xr-xtestautomation/graphics/required/input/gallery/gal_86.txt56
-rwxr-xr-xtestautomation/graphics/required/input/gallery/gal_88.txt56
-rwxr-xr-xtestautomation/graphics/required/input/gallery/gal_oo_1.txt12
-rwxr-xr-xtestautomation/graphics/required/input/gallery/gal_oo_49.txt12
-rwxr-xr-xtestautomation/graphics/required/input/gallery/gal_oo_50.txt12
-rwxr-xr-xtestautomation/graphics/required/input/gallery/gal_oo_84.txt12
-rwxr-xr-xtestautomation/graphics/required/input/spellb_1.txt304
-rwxr-xr-xtestautomation/graphics/required/input/spellb_31.txt376
-rwxr-xr-xtestautomation/graphics/required/input/spellb_33.txt304
-rwxr-xr-xtestautomation/graphics/required/input/spellb_34.txt400
-rwxr-xr-xtestautomation/graphics/required/input/spellb_36.txt368
-rwxr-xr-xtestautomation/graphics/required/input/spellb_39.txt442
-rwxr-xr-xtestautomation/graphics/required/input/spellb_49.txt304
-rwxr-xr-xtestautomation/graphics/required/input/spellb_50.txt404
-rwxr-xr-xtestautomation/graphics/required/input/spellb_55.txt398
-rwxr-xr-xtestautomation/graphics/required/input/spellb_7.txt112
-rwxr-xr-xtestautomation/graphics/required/input/spellb_82.txt392
-rwxr-xr-xtestautomation/graphics/required/input/spellb_86.txt428
-rwxr-xr-xtestautomation/graphics/required/input/spellb_88.txt428
-rwxr-xr-xtestautomation/spreadsheet/optional/input/loadsave/preselected_filter/txt.txt14
-rwxr-xr-xtestautomation/writer/optional/includes/stylist/w_stylist.inc2044
-rwxr-xr-xtestautomation/writer/optional/input/filter/sa_actua_36.txt164
-rwxr-xr-xtestautomation/writer/optional/input/filter/sa_sorte_36.txt164
-rwxr-xr-xtestautomation/writer/optional/input/import/swdos.txt1262
-rwxr-xr-x[-rw-r--r--]testautomation/writer/required/includes/w_001a_.inc960
-rw-r--r--tools/inc/tools/wintypes.hxx6
-rw-r--r--transex3/prj/build.lst10
-rwxr-xr-xucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java11
-rw-r--r--ucb/source/core/cmdenv.cxx194
-rw-r--r--ucb/source/core/cmdenv.hxx105
-rw-r--r--ucb/source/core/makefile.mk7
-rw-r--r--ucb/source/core/ucbcmds.cxx231
-rw-r--r--ucb/source/core/ucbserv.cxx24
-rw-r--r--ucb/source/ucp/file/bc.cxx50
-rw-r--r--ucb/source/ucp/file/filerror.hxx24
-rw-r--r--ucb/source/ucp/file/filglob.cxx27
-rw-r--r--ucb/source/ucp/file/filtask.cxx75
-rw-r--r--ucb/source/ucp/file/filtask.hxx25
-rw-r--r--ucb/source/ucp/file/shell.cxx139
-rw-r--r--ucb/source/ucp/file/shell.hxx12
-rw-r--r--ucb/source/ucp/ftp/ftpcontent.cxx229
-rw-r--r--ucb/source/ucp/ftp/ftpcontent.hxx24
-rw-r--r--ucb/source/ucp/ftp/ftpcontentcaps.cxx28
-rw-r--r--ucb/source/ucp/ftp/ftpdirp.cxx12
-rw-r--r--ucb/source/ucp/ftp/ftpdirp.hxx5
-rw-r--r--ucb/source/ucp/ftp/ftpinpstr.cxx11
-rw-r--r--ucb/source/ucp/ftp/ftpintreq.cxx14
-rw-r--r--ucb/source/ucp/ftp/ftpintreq.hxx4
-rw-r--r--ucb/source/ucp/ftp/ftpresultsetI.cxx6
-rw-r--r--ucb/source/ucp/ftp/ftpurl.cxx23
-rw-r--r--ucb/source/ucp/gio/gio_content.cxx104
-rw-r--r--ucb/source/ucp/gio/gio_content.hxx6
-rw-r--r--ucb/source/ucp/gio/gio_datasupplier.cxx2
-rw-r--r--ucb/source/ucp/gvfs/gvfs_content.cxx (renamed from ucb/source/ucp/gvfs/content.cxx)147
-rw-r--r--ucb/source/ucp/gvfs/gvfs_content.hxx (renamed from ucb/source/ucp/gvfs/content.hxx)85
-rw-r--r--ucb/source/ucp/gvfs/gvfs_directory.cxx (renamed from ucb/source/ucp/gvfs/directory.cxx)4
-rw-r--r--ucb/source/ucp/gvfs/gvfs_directory.hxx (renamed from ucb/source/ucp/gvfs/directory.hxx)8
-rw-r--r--ucb/source/ucp/gvfs/gvfs_provider.cxx (renamed from ucb/source/ucp/gvfs/provider.cxx)4
-rw-r--r--ucb/source/ucp/gvfs/gvfs_provider.hxx (renamed from ucb/source/ucp/gvfs/provider.hxx)0
-rw-r--r--ucb/source/ucp/gvfs/gvfs_stream.cxx (renamed from ucb/source/ucp/gvfs/stream.cxx)8
-rw-r--r--ucb/source/ucp/gvfs/gvfs_stream.hxx (renamed from ucb/source/ucp/gvfs/stream.hxx)0
-rw-r--r--ucb/source/ucp/gvfs/makefile.mk10
-rw-r--r--ucb/source/ucp/hierarchy/hierarchycontent.cxx187
-rw-r--r--ucb/source/ucp/hierarchy/hierarchycontent.hxx11
-rw-r--r--ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx137
-rw-r--r--ucb/source/ucp/package/pkgcontent.cxx206
-rw-r--r--ucb/source/ucp/package/pkgcontent.hxx34
-rw-r--r--ucb/source/ucp/package/pkgcontentcaps.cxx65
-rw-r--r--ucb/source/ucp/tdoc/tdoc_content.cxx223
-rw-r--r--ucb/source/ucp/tdoc/tdoc_content.hxx16
-rw-r--r--ucb/source/ucp/tdoc/tdoc_contentcaps.cxx83
-rw-r--r--ucb/source/ucp/webdav/DAVException.hxx36
-rw-r--r--ucb/source/ucp/webdav/DAVProperties.cxx26
-rw-r--r--ucb/source/ucp/webdav/DAVResourceAccess.cxx177
-rw-r--r--ucb/source/ucp/webdav/DAVResourceAccess.hxx162
-rw-r--r--ucb/source/ucp/webdav/DAVSession.hxx127
-rw-r--r--ucb/source/ucp/webdav/LinkSequence.cxx17
-rw-r--r--ucb/source/ucp/webdav/LockEntrySequence.cxx38
-rw-r--r--ucb/source/ucp/webdav/LockSequence.cxx7
-rw-r--r--ucb/source/ucp/webdav/NeonLockStore.cxx248
-rw-r--r--ucb/source/ucp/webdav/NeonLockStore.hxx105
-rw-r--r--ucb/source/ucp/webdav/NeonPropFindRequest.cxx87
-rw-r--r--ucb/source/ucp/webdav/NeonSession.cxx936
-rw-r--r--ucb/source/ucp/webdav/NeonSession.hxx462
-rw-r--r--ucb/source/ucp/webdav/NeonTypes.hxx3
-rw-r--r--ucb/source/ucp/webdav/NeonUri.cxx5
-rw-r--r--ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx13
-rw-r--r--ucb/source/ucp/webdav/makefile.mk60
-rw-r--r--ucb/source/ucp/webdav/webdavcontent.cxx827
-rw-r--r--ucb/source/ucp/webdav/webdavcontent.hxx189
-rw-r--r--ucb/source/ucp/webdav/webdavcontentcaps.cxx331
-rw-r--r--ucbhelper/inc/ucbhelper/content.hxx103
-rw-r--r--ucbhelper/source/client/content.cxx171
-rw-r--r--ucbhelper/workben/ucbexplorer/ucbexplorer.cxx188
-rw-r--r--ucbhelper/workben/ucbexplorer/ucbexplorer.src11
-rw-r--r--unotools/source/config/confignode.cxx37
-rw-r--r--unotools/source/ucbhelper/ucbhelper.cxx16
-rw-r--r--uui/source/getcontinuations.hxx121
-rw-r--r--uui/source/iahndl-authentication.cxx588
-rw-r--r--uui/source/iahndl-cookies.cxx212
-rw-r--r--uui/source/iahndl-errorhandler.cxx321
-rw-r--r--uui/source/iahndl-filter.cxx474
-rw-r--r--uui/source/iahndl-ioexceptions.cxx346
-rw-r--r--uui/source/iahndl-locking.cxx319
-rw-r--r--uui/source/iahndl-ssl.cxx360
-rw-r--r--uui/source/iahndl.cxx4200
-rw-r--r--uui/source/iahndl.hxx452
-rw-r--r--uui/source/ids.hrc4
-rw-r--r--uui/source/ids.src22
-rw-r--r--uui/source/makefile.mk30
-rw-r--r--uui/source/passwordcontainer.cxx473
-rw-r--r--uui/source/passwordcontainer.hxx200
-rw-r--r--uui/source/services.cxx74
-rw-r--r--vcl/aqua/inc/salgdi.h1
-rw-r--r--vcl/aqua/source/gdi/salnativewidgets.cxx16
-rw-r--r--vcl/inc/postgraphitestl.h9
-rw-r--r--vcl/inc/pregraphitestl.h30
-rw-r--r--vcl/inc/vcl/combobox.hxx4
-rw-r--r--vcl/inc/vcl/graphite_adaptors.hxx5
-rw-r--r--vcl/inc/vcl/graphite_cache.hxx4
-rw-r--r--vcl/inc/vcl/graphite_features.hxx3
-rw-r--r--vcl/inc/vcl/graphite_layout.hxx2
-rw-r--r--vcl/inc/vcl/ilstbox.hxx10
-rw-r--r--vcl/inc/vcl/lstbox.hxx4
-rw-r--r--vcl/inc/vcl/popupmenuwindow.hxx50
-rw-r--r--vcl/inc/vcl/ppdparser.hxx23
-rw-r--r--vcl/inc/vcl/printerinfomanager.hxx2
-rw-r--r--vcl/inc/vcl/tabctrl.hxx4
-rw-r--r--vcl/inc/vcl/tabdlg.hxx3
-rw-r--r--vcl/inc/vcl/vclevent.hxx24
-rw-r--r--vcl/inc/vcl/window.h3
-rw-r--r--vcl/inc/vcl/window.hxx9
-rw-r--r--vcl/prj/build.lst2
-rw-r--r--vcl/prj/d.lst1
-rw-r--r--vcl/source/app/vclevent.cxx23
-rw-r--r--vcl/source/control/combobox.cxx24
-rw-r--r--vcl/source/control/ilstbox.cxx27
-rw-r--r--vcl/source/control/lstbox.cxx21
-rw-r--r--vcl/source/control/tabctrl.cxx12
-rw-r--r--vcl/source/fontsubset/gsub.cxx13
-rw-r--r--vcl/source/fontsubset/sft.cxx20
-rw-r--r--vcl/source/gdi/outdev3.cxx2
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx1272
-rw-r--r--vcl/source/gdi/pdfwriter_impl.hxx55
-rw-r--r--vcl/source/glyphs/gcach_ftyp.cxx13
-rw-r--r--vcl/source/glyphs/graphite_adaptors.cxx2
-rw-r--r--vcl/source/glyphs/graphite_cache.cxx2
-rw-r--r--vcl/source/glyphs/graphite_features.cxx6
-rw-r--r--vcl/source/glyphs/graphite_layout.cxx14
-rw-r--r--vcl/source/glyphs/graphite_textsrc.cxx10
-rw-r--r--vcl/source/glyphs/graphite_textsrc.hxx4
-rw-r--r--vcl/source/window/dlgctrl.cxx15
-rw-r--r--vcl/source/window/makefile.mk1
-rw-r--r--vcl/source/window/menu.cxx16
-rw-r--r--vcl/source/window/popupmenuwindow.cxx82
-rw-r--r--vcl/source/window/status.cxx1
-rw-r--r--vcl/source/window/tabdlg.cxx18
-rw-r--r--vcl/source/window/window.cxx32
-rw-r--r--vcl/unx/gtk/a11y/atkutil.cxx11
-rw-r--r--vcl/unx/gtk/a11y/atkwindow.cxx41
-rw-r--r--vcl/unx/gtk/a11y/atkwrapper.cxx54
-rw-r--r--vcl/unx/gtk/app/gtkinst.cxx5
-rw-r--r--vcl/unx/gtk/window/gtkframe.cxx2
-rw-r--r--vcl/unx/headless/svpprn.cxx2
-rw-r--r--vcl/unx/source/app/randrwrapper.cxx3
-rw-r--r--vcl/unx/source/dtrans/X11_dndcontext.cxx12
-rw-r--r--vcl/unx/source/dtrans/X11_dndcontext.hxx20
-rw-r--r--vcl/unx/source/dtrans/X11_selection.cxx192
-rw-r--r--vcl/unx/source/dtrans/X11_selection.hxx100
-rw-r--r--vcl/unx/source/dtrans/bmp.cxx2
-rw-r--r--vcl/unx/source/dtrans/bmp.hxx2
-rw-r--r--vcl/unx/source/gdi/salgdi.cxx18
-rw-r--r--vcl/unx/source/gdi/salprnpsp.cxx2
-rw-r--r--vcl/unx/source/printer/cupsmgr.cxx4
-rw-r--r--vcl/unx/source/printer/ppdparser.cxx440
-rw-r--r--vcl/unx/source/printer/printerinfomanager.cxx1
-rw-r--r--vcl/unx/source/printergfx/printerjob.cxx3
-rw-r--r--vcl/util/makefile.mk1
-rw-r--r--vcl/util/makefile2.pmk7
-rwxr-xr-x[-rw-r--r--]vcl/win/source/window/salframe.cxx5
-rw-r--r--wizards/com/sun/star/wizards/query/Finalizer.java16
-rw-r--r--wizards/com/sun/star/wizards/query/QueryWizard.java4
-rw-r--r--wizards/com/sun/star/wizards/report/IReportDocument.java2
-rw-r--r--wizards/com/sun/star/wizards/report/ReportFinalizer.java32
-rw-r--r--wizards/com/sun/star/wizards/report/ReportTextImplementation.java2
-rw-r--r--wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java29
-rw-r--r--writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx1
-rw-r--r--xmlhelp/prj/build.lst2
-rw-r--r--xmlhelp/source/cxxhelp/provider/databases.cxx2
-rw-r--r--xmloff/inc/xmlnmspe.hxx3
-rw-r--r--xmloff/inc/xmloff/xmltoken.hxx4
-rw-r--r--xmloff/source/core/xmlexp.cxx6
-rw-r--r--xmloff/source/core/xmlimp.cxx4
-rw-r--r--xmloff/source/core/xmltoken.cxx4
-rw-r--r--xmloff/source/draw/ximpshap.cxx13
-rw-r--r--xpdf/xpdf-3.02.patch272
1080 files changed, 143290 insertions, 127610 deletions
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
index 765dc115fa11..219cf03dfe88 100755
--- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
@@ -64,14 +64,6 @@ protected:
virtual ~AccessibleGridControl();
- /** sets the XAccessible which created the context
-
- <p>To be called only once, and only if in the ctor NULL was passed.</p>
- */
- void setCreator(
- const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxCreator
- );
-
/** Cleans up members. */
using AccessibleGridControlBase::disposing;
virtual void SAL_CALL disposing();
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
index f164e7576247..1c1a3aee2804 100755
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
@@ -197,12 +197,6 @@ protected:
inline sal_Bool isRowBar() const;
/** @return <TRUE/>, if the objects is a header bar for columns. */
inline sal_Bool isColumnBar() const;
-
- /** @attention This method requires locked mutex's and a living object.
- @throws <type>IndexOutOfBoundsException</type>
- If the specified row/column index (depending on type) is invalid. */
- void ensureIsValidHeaderIndex( sal_Int32 nIndex )
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException );
};
// inlines --------------------------------------------------------------------
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
index c3465c6c32fb..c71bfd5eb65f 100755
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
@@ -211,13 +211,6 @@ protected:
//// internal helper methods ------------------------------------------------
- /** Returns the specified row or column. Uses one of the parameters,
- depending on object type.
- @attention This method requires locked mutex's and a living object.
- @return The XAccessible interface of the specified column/row. */
- ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible >
- implGetChild( sal_Int32 nRow, sal_uInt16 nColumnPos );
///** @attention This method requires a locked mutex.
// @return The XAccessibleTable interface of the specified header bar. */
::com::sun::star::uno::Reference<
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
index aa9eb061f147..79c294952acf 100755
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
@@ -198,14 +198,6 @@ protected:
@return The child index of the specified cell address. */
sal_Int32 implGetChildIndex( sal_Int32 nRow, sal_Int32 nColumn ) const;
- /** @attention This method requires locked mutex's and a living object.
- @return <TRUE/>, if the specified row is selected. */
- sal_Bool implIsRowSelected( sal_Int32 nRow ) const;
-
- /** @attention This method requires locked mutex's and a living object.
- @return The count of selected rows. */
- sal_Int32 implGetSelectedRowCount() const;
-
/** Fills a sequence with sorted indexes of completely selected rows.
@attention This method requires locked mutex's and a living object.
@param rSeq Out-parameter that takes the sorted row index list. */
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx
index fd24a3f27aa1..4671f3284110 100755
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -90,15 +90,6 @@ AccessibleGridControl::AccessibleGridControl(
m_pImpl.reset( new AccessibleGridControl_Impl() );
m_pImpl->m_aCreator = _rxCreator;
}
-// -----------------------------------------------------------------------------
-void AccessibleGridControl::setCreator( const Reference< XAccessible >& _rxCreator )
-{
-#if OSL_DEBUG_LEVEL > 0
- Reference< XAccessible > xCreator = (Reference< XAccessible >)m_pImpl->m_aCreator;
- DBG_ASSERT( !xCreator.is(), "accessibility/extended/AccessibleGridControl::setCreator: creator already set!" );
-#endif
- m_pImpl->m_aCreator = _rxCreator;
-}
// -----------------------------------------------------------------------------
AccessibleGridControl::~AccessibleGridControl()
diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx
index d8cc7a11d202..a5a2be4049dc 100755
--- a/accessibility/source/extended/AccessibleGridControlHeader.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx
@@ -304,15 +304,6 @@ Reference< XAccessible > AccessibleGridControlHeader::implGetChild(
return xChild;
}
-void AccessibleGridControlHeader::ensureIsValidHeaderIndex( sal_Int32 nIndex )
- throw ( lang::IndexOutOfBoundsException )
-{
- if( isRowBar() )
- ensureIsValidRow( nIndex );
- else
- ensureIsValidColumn( nIndex );
-}
-
// ============================================================================
} // namespace accessibility
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
index ba6c229e2dc5..3b51c986b8b1 100755
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -297,7 +297,6 @@ sal_Int32 SAL_CALL AccessibleGridControlTable::getSelectedAccessibleChildCount()
TCSolarGuard aSolarGuard;
::osl::MutexGuard aGuard( getOslMutex() );
ensureIsAlive();
- // return isRowBar() ? implGetSelectedRowCount() : implGetSelectedColumnCount();
return 0;
}
//To Do - not implemented yet
@@ -309,9 +308,6 @@ AccessibleGridControlTable::getSelectedAccessibleChild( sal_Int32 nSelectedChild
::osl::MutexGuard aGuard( getOslMutex() );
ensureIsAlive();
(void)nSelectedChildIndex;
- // method may throw lang::IndexOutOfBoundsException
- //sal_Int32 nIndex = implGetChildIndexFromSelectedIndex( nSelectedChildIndex );
- //return implGetChild( nIndex, implToVCLColumnPos( nIndex ) );
return NULL;
}
//To Do - not implemented yet
@@ -371,14 +367,6 @@ Rectangle AccessibleGridControlTable::implGetBoundingBoxOnScreen()
return m_aTable.calcTableRect();
}
// internal helper methods ----------------------------------------------------
-
-Reference< XAccessible > AccessibleGridControlTable::implGetChild(
- sal_Int32 nRow, sal_uInt16 nColumnPos )
-{
- (void)nRow;
- (void)nColumnPos;
- return NULL;
-}
//To Do - not implemented yet
//sal_Int32 AccessibleGridControlTable::implGetChildIndexFromSelectedIndex(
// sal_Int32 nSelectedChildIndex )
diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
index bc266f10f323..76584bf4b965 100755
--- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
@@ -263,16 +263,6 @@ sal_Int32 AccessibleGridControlTableBase::implGetChildIndex(
return nRow * m_aTable.GetColumnCount() + nColumn;
}
-sal_Bool AccessibleGridControlTableBase::implIsRowSelected( sal_Int32 nRow ) const
-{
- return m_aTable.IsRowSelected( nRow );
-}
-
-sal_Int32 AccessibleGridControlTableBase::implGetSelectedRowCount() const
-{
- return m_aTable.GetSelectedRowCount();
-}
-
void AccessibleGridControlTableBase::implGetSelectedRows( Sequence< sal_Int32 >& rSeq )
{
rSeq = comphelper::containerToSequence(m_aTable.GetSelectedRows());
diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx
index 60e4f416dc3c..e1e8eae2ac78 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -74,6 +74,7 @@
#include <vcl/combobox.hxx>
#include <accessibility/extended/AccessibleGridControl.hxx>
#include <svtools/accessibletable.hxx>
+#include "vcl/popupmenuwindow.hxx"
#include <floatingwindowaccessible.hxx>
@@ -385,7 +386,17 @@ inline bool hasFloatingChild(Window *pWindow)
}
else if ( nType == WINDOW_BORDERWINDOW && hasFloatingChild( pWindow ) )
{
- xContext = new FloatingWindowAccessible( _pXWindow );
+ PopupMenuFloatingWindow* pChild = dynamic_cast<PopupMenuFloatingWindow*>(
+ pWindow->GetAccessibleChildWindow(0));
+ if ( pChild && pChild->IsPopupMenu() )
+ {
+ // Get the accessible context from the child window.
+ Reference<XAccessible> xAccessible = pChild->CreateAccessible();
+ if (xAccessible.is())
+ xContext = xAccessible->getAccessibleContext();
+ }
+ else
+ xContext = new FloatingWindowAccessible( _pXWindow );
}
else if ( nType == WINDOW_HELPTEXTWINDOW )
{
diff --git a/apple_remote/AppleRemote.m b/apple_remote/AppleRemote.m
index 25a6771e7139..a65cc6440b41 100644
--- a/apple_remote/AppleRemote.m
+++ b/apple_remote/AppleRemote.m
@@ -42,6 +42,9 @@ const char* AppleRemoteDeviceName = "AppleIRController";
#ifndef NSAppKitVersionNumber10_4
#define NSAppKitVersionNumber10_4 824
#endif
+#ifndef NSAppKitVersionNumber10_5
+ #define NSAppKitVersionNumber10_5 949
+#endif
@implementation AppleRemote
@@ -53,6 +56,9 @@ const char* AppleRemoteDeviceName = "AppleIRController";
// TODO : avoid such magics
if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_4) {
+ #ifdef DEBUG
+ NSLog( @"setting 10.4 cookies" );
+ #endif
// 10.4.x Tiger
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus] forKey:@"14_12_11_6_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus] forKey:@"14_13_11_6_"];
@@ -65,7 +71,10 @@ const char* AppleRemoteDeviceName = "AppleIRController";
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold] forKey:@"14_6_14_6_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold] forKey:@"18_14_6_18_14_6_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched] forKey:@"19_"];
- } else {
+ } else if( floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_5 ) {
+ #ifdef DEBUG
+ NSLog( @"setting 10.5 cookies" );
+ #endif
// 10.5.x Leopard
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus] forKey:@"31_29_28_19_18_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus] forKey:@"31_30_28_19_18_"];
@@ -79,6 +88,24 @@ const char* AppleRemoteDeviceName = "AppleIRController";
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold] forKey:@"35_31_19_18_35_31_19_18_"];
[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched] forKey:@"19_"];
}
+ else
+ {
+ #ifdef DEBUG
+ NSLog( @"setting 10.6 cookies" );
+ #endif
+ // 10.6.x Snow Leopard
+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus] forKey:@"33_31_30_21_20_2_"];
+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus] forKey:@"33_32_30_21_20_2_"];
+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu] forKey:@"33_22_21_20_2_33_22_21_20_2_"];
+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay] forKey:@"33_23_21_20_2_33_23_21_20_2_"];
+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight] forKey:@"33_24_21_20_2_33_24_21_20_2_"];
+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft] forKey:@"33_25_21_20_2_33_25_21_20_2_"];
+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold] forKey:@"33_21_20_14_12_2_"];
+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold] forKey:@"33_21_20_13_12_2_"];
+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold] forKey:@"33_21_20_2_33_21_20_2_"];
+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold] forKey:@"37_33_21_20_2_37_33_21_20_2_"];
+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched] forKey:@"19_"];
+ }
}
- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown {
diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx
index 1bd15702e143..b592a0e84ea6 100644
--- a/basegfx/test/basegfx2d.cxx
+++ b/basegfx/test/basegfx2d.cxx
@@ -489,8 +489,11 @@ public:
// depending on float precision and the getContinuity() implemetation using
// fTools::equal, linux and mac produce more 'C' than 'S' statements, while WIN32
// uses more 'S' statements (as it should be for circles)
- CPPUNIT_ASSERT_MESSAGE("exporting to circle does not produce the expected number of coordinates",
- nCount==67 || nCount==50);
+#ifdef S390X
+ CPPUNIT_ASSERT_MESSAGE("exporting to circle does not produce the expected number of coordinates", nCount==61 );
+#else
+ CPPUNIT_ASSERT_MESSAGE("exporting to circle does not produce the expected number of coordinates", nCount==67 || nCount==50 );
+#endif
const B2DPolygon aRect(
tools::createPolygonFromRect( B2DRange(0.0,0.0,4000.0,4000.0) ));
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
index 0d49d0b95a74..eaf9566c54b9 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
@@ -137,8 +137,8 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
MutexGuard guard( m_mutex );
- t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
- if (iFind == m_rttis.end())
+ t_rtti_map::const_iterator iRttiFind( m_rttis.find( unoName ) );
+ if (iRttiFind == m_rttis.end())
{
// RTTI symbol
OStringBuffer buf( 64 );
@@ -202,7 +202,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
}
else
{
- rtti = iFind->second;
+ rtti = iRttiFind->second;
}
return rtti;
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
index e866e05f32c5..7e169993e905 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
@@ -491,7 +491,7 @@ static typelib_TypeClass cpp_mediate(
long privateSnippetExecutor(long r2, long r3, long r4, long r5, long r6, long firstonstack)
{
register long r0 asm("r0");
- sal_uInt32 nOffsetAndIndex = r0;
+ sal_uInt64 nOffsetAndIndex = r0;
long sp = (long)&firstonstack;
@@ -522,15 +522,21 @@ long privateSnippetExecutor(long r2, long r3, long r4, long r5, long r6, long fi
switch( aType )
{
- case typelib_TypeClass_VOID:
case typelib_TypeClass_BOOLEAN:
case typelib_TypeClass_BYTE:
+ nRegReturn[0] = (unsigned long)(*(unsigned char *)nRegReturn);
+ break;
case typelib_TypeClass_CHAR:
case typelib_TypeClass_UNSIGNED_SHORT:
case typelib_TypeClass_SHORT:
+ nRegReturn[0] = (unsigned long)(*(unsigned short *)nRegReturn);
+ break;
case typelib_TypeClass_ENUM:
case typelib_TypeClass_UNSIGNED_LONG:
case typelib_TypeClass_LONG:
+ nRegReturn[0] = (unsigned long)(*(unsigned int *)nRegReturn);
+ break;
+ case typelib_TypeClass_VOID:
default:
break;
case typelib_TypeClass_FLOAT:
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
index e474dce7268c..11ddfbb424e2 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
@@ -138,8 +138,8 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
MutexGuard guard( m_mutex );
- t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
- if (iFind == m_rttis.end())
+ t_rtti_map::const_iterator iRttiFind( m_rttis.find( unoName ) );
+ if (iRttiFind == m_rttis.end())
{
// RTTI symbol
OStringBuffer buf( 64 );
@@ -203,7 +203,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
}
else
{
- rtti = iFind->second;
+ rtti = iRttiFind->second;
}
return rtti;
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx
index 5940f566f9ca..2b85eb125d59 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx
@@ -60,19 +60,21 @@ void MapReturn(long r2, double f0, typelib_TypeClass eTypeClass, sal_uInt64* pRe
{
case typelib_TypeClass_HYPER:
case typelib_TypeClass_UNSIGNED_HYPER:
+ *pRegisterReturn = r2;
+ break;
case typelib_TypeClass_LONG:
case typelib_TypeClass_UNSIGNED_LONG:
case typelib_TypeClass_ENUM:
- *pRegisterReturn = r2;
+ *(unsigned int*)pRegisterReturn = (unsigned int)r2;
break;
case typelib_TypeClass_CHAR:
case typelib_TypeClass_SHORT:
case typelib_TypeClass_UNSIGNED_SHORT:
- *pRegisterReturn = (unsigned short)r2;
+ *(unsigned short*)pRegisterReturn = (unsigned short)r2;
break;
case typelib_TypeClass_BOOLEAN:
case typelib_TypeClass_BYTE:
- *pRegisterReturn = (unsigned char)r2;
+ *(unsigned char*)pRegisterReturn = (unsigned char)r2;
break;
case typelib_TypeClass_FLOAT:
*reinterpret_cast<float *>( pRegisterReturn ) = f0;
@@ -90,7 +92,6 @@ void MapReturn(long r2, double f0, typelib_TypeClass eTypeClass, sal_uInt64* pRe
#define INSERT_FLOAT( pSV, nr, pFPR, pDS ) \
{ \
- float tmp = *reinterpret_cast<float *>( pSV ); \
if ( nr < s390x::MAX_SSE_REGS ) \
{ \
pFPR[nr++] = *reinterpret_cast<float *>( pSV ); \
@@ -421,7 +422,6 @@ void unoInterfaceProxyDispatch(
// is my surrogate
bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
= static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy *> (pUnoI);
- typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
switch (pMemberDescr->eTypeClass)
{
diff --git a/cairo/prj/build.lst b/cairo/prj/build.lst
index 6f45aedc4047..c531e6c0ffb9 100644
--- a/cairo/prj/build.lst
+++ b/cairo/prj/build.lst
@@ -1,4 +1,4 @@
-lcairo cairo : zlib soltools NULL
+lcairo cairo : ZLIB:zlib soltools NULL
lcairo cairo usr1 - all lcairo_mkout NULL
lcairo cairo\pixman nmake - all lcairo_pixman NULL
lcairo cairo\cairo nmake - all lcairo_cairo lcairo_pixman NULL
diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx
index 1c64506c0f21..47658991e74b 100755
--- a/canvas/source/directx/dx_winstuff.hxx
+++ b/canvas/source/directx/dx_winstuff.hxx
@@ -89,7 +89,7 @@
#include <d3d9.h>
#include <d3dx9.h>
- #include <dxerr9.h>
+// #include <dxerr9.h> #i107614# removing include, it has been changed in the latest sdk fron August2009 from dxerr9.h into dxerr.h
typedef IDirect3DSurface9 surface_type;
@@ -97,11 +97,11 @@
#undef DrawText
-#ifdef __MINGW32__
-using ::std::max;
-using ::std::min;
-#endif
-
+#ifdef __MINGW32__
+using ::std::max;
+using ::std::min;
+#endif
+
#include <gdiplus.h>
#ifdef min
diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx
index 9e521fa76dae..243e30093ff3 100644
--- a/chart2/source/tools/ChartTypeHelper.cxx
+++ b/chart2/source/tools/ChartTypeHelper.cxx
@@ -549,7 +549,7 @@ sal_Int32 ChartTypeHelper::getNumberOfDisplayedSeries(
if( (xChartTypeProp->getPropertyValue( C2U("UseRings")) >>= bDonut)
&& !bDonut )
{
- return 1;
+ return nNumberOfSeries>0 ? 1 : 0;
}
}
}
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index c8f473d226d0..864a9f8accfa 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -537,6 +537,9 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re
createText( xTarget_, aText.makeStringAndClear()
, *pPropNames, *pPropValues, ShapeFactory::makeTransformation( aScreenPosition2D ) );
+ if( !xTextShape.is() )
+ return xTextShape;
+
const awt::Point aUnrotatedTextPos( xTextShape->getPosition() );
if( fRotationDegrees != 0.0 )
{
@@ -547,7 +550,7 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re
LabelPositionHelper::correctPositionForRotation( xTextShape, eAlignment, fRotationDegrees, true /*bRotateAroundCenter*/ );
}
- if( xSymbol.is() && xTextShape.is() )
+ if( xSymbol.is() )
{
const awt::Point aOldTextPos( xTextShape->getPosition() );
awt::Point aNewTextPos( aOldTextPos );
diff --git a/comphelper/inc/comphelper/weakeventlistener.hxx b/comphelper/inc/comphelper/weakeventlistener.hxx
index c6938e2b8423..045dfb169312 100644
--- a/comphelper/inc/comphelper/weakeventlistener.hxx
+++ b/comphelper/inc/comphelper/weakeventlistener.hxx
@@ -76,7 +76,7 @@ namespace comphelper
inline void resetListener( )
{
- m_aListener = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >();
+ m_aListener.clear();
}
diff --git a/configure.in b/configure.in
index 0ce538aeed8e..abf5176b095d 100644
--- a/configure.in
+++ b/configure.in
@@ -382,6 +382,10 @@ AC_ARG_WITH(beanshell-jar,
[ --with-beanshell-jar=JARFILE Specify path to jarfile manually ],
[ BSH_JAR="$withval"
])
+AC_ARG_ENABLE(presenter-extra-ui,
+[ --enable-presenter-extra-ui enables extra functionality during slideshow,
+ e.g. selecting pen color, erasing drawings etc.
+],,enable_presenter_extra_ui=no)
AC_ARG_ENABLE(minimizer,
[ --enable-minimizer enables the build of the Presentation Minimizer extension
],,)
@@ -3495,7 +3499,7 @@ AC_SUBST(BUILD_QADEVOOO)
dnl ===================================================================
dnl Check for prelinked libgcc_s.so.1
dnl ===================================================================
-if test -z "$with_system_stdlibs" -a -z "$with_system_libs"; then
+if test "$_os" = "Linux" -a -z "$with_system_stdlibs" -a -z "$with_system_libs"; then
if test -n "$checkforstdlibproblems"; then
if test -f /etc/rpm/macros.prelink; then
with_system_stdlibs=yes
@@ -4472,12 +4476,6 @@ if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" == "z"
AC_MSG_RESULT([external])
SYSTEM_GRAPHITE=YES
PKG_CHECK_MODULES( GRAPHITE, silgraphite )
- AC_MSG_CHECKING([STL compatibility])
- if test "$WITH_STLPORT" != "no"; then
- AC_MSG_ERROR([to use system graphite you need to use --without-stlport])
- else
- AC_MSG_RESULT([OK])
- fi
else
AC_MSG_RESULT([internal])
SYSTEM_GRAPHITE=NO
@@ -4870,6 +4868,7 @@ if test -n "$with_system_altlinuxhyph" -o -n "$with_system_libs" && \
else
AC_MSG_RESULT([internal])
SYSTEM_HYPH=NO
+ BUILD_TYPE="$BUILD_TYPE HYPHEN"
fi
AC_SUBST(SYSTEM_HYPH)
AC_SUBST(HYPHEN_LIB)
@@ -5531,6 +5530,16 @@ fi
AC_SUBST(ENABLE_OPENGL)
+AC_MSG_CHECKING([whether to build extra presenter ui])
+if test -n "$enable_presenter_extra_ui" -a "$enable_presenter_extra_ui" != "no"; then
+ AC_MSG_RESULT([yes])
+ ENABLE_PRESENTER_EXTRA_UI=YES
+else
+ AC_MSG_RESULT([no])
+ ENABLE_PRESENTER_EXTRA_UI=NO
+fi
+AC_SUBST(ENABLE_PRESENTER_EXTRA_UI)
+
AC_MSG_CHECKING([whether to build the Presentation Minimizer extension])
if test -n "$enable_minimizer" -a "$enable_minimizer" != "no"; then
AC_MSG_RESULT([yes])
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index f171af5ec530..f434d775f87c 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -1955,7 +1955,7 @@ namespace detail
virtual Reference< XInputStream > getCharacterStream() const { return m_xRow->getCharacterStream( m_nPos ); };
virtual Reference< XBlob > getBlob() const { return m_xRow->getBlob( m_nPos ); };
virtual Reference< XClob > getClob() const { return m_xRow->getClob( m_nPos ); };
- virtual Any getObject() const { return m_xRow->getObject( m_nPos, NULL ); };
+ virtual Any getObject() const { return m_xRow->getObject( m_nPos ,NULL); };
virtual sal_Bool wasNull() const { return m_xRow->wasNull( ); };
private:
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index f00cfe14a9e5..79f9f9707c26 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1388,16 +1388,18 @@ namespace
::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
Reference< XPropertySetInfo > xInfo = _xTable->getPropertySetInfo();
if ( xInfo.is()
- && xInfo->hasPropertyByName(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME))
- && xInfo->hasPropertyByName(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME))
&& xInfo->hasPropertyByName(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) )
{
::rtl::OUString aCatalog;
::rtl::OUString aSchema;
::rtl::OUString aTable;
- _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)) >>= _out_rCatalog;
- _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= _out_rSchema;
+ if ( xInfo->hasPropertyByName(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME))
+ && xInfo->hasPropertyByName(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) )
+ {
+ _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)) >>= _out_rCatalog;
+ _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= _out_rSchema;
+ }
_xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= _out_rName;
}
else
@@ -1779,15 +1781,31 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer,
Reference<XIndexAccess> xParamsAsIndicies = xParameters.is() ? xParameters->getParameters() : Reference<XIndexAccess>();
Reference<XNameAccess> xParamsAsNames(xParamsAsIndicies, UNO_QUERY);
sal_Int32 nParamCount = xParamsAsIndicies.is() ? xParamsAsIndicies->getCount() : 0;
- if ( (nParamCount && _aParametersSet.empty()) || ::std::count(_aParametersSet.begin(),_aParametersSet.end(),true) != nParamCount )
+ ::std::bit_vector aNewParameterSet( _aParametersSet );
+ if ( nParamCount || ::std::count(aNewParameterSet.begin(),aNewParameterSet.end(),true) != nParamCount )
{
+ static const ::rtl::OUString PROPERTY_NAME(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME));
+ aNewParameterSet.resize(nParamCount ,false);
+ typedef ::std::map< ::rtl::OUString, ::std::vector<sal_Int32> > TParameterPositions;
+ TParameterPositions aParameterNames;
+ for(sal_Int32 i = 0; i < nParamCount; ++i)
+ {
+ Reference<XPropertySet> xParam(xParamsAsIndicies->getByIndex(i),UNO_QUERY);
+ ::rtl::OUString sName;
+ xParam->getPropertyValue(PROPERTY_NAME) >>= sName;
+
+ TParameterPositions::iterator aFind = aParameterNames.find(sName);
+ if ( aFind != aParameterNames.end() )
+ aNewParameterSet[i] = true;
+ aParameterNames[sName].push_back(i+1);
+ }
// build an interaction request
// two continuations (Ok and Cancel)
OInteractionAbort* pAbort = new OInteractionAbort;
OParameterContinuation* pParams = new OParameterContinuation;
// the request
ParametersRequest aRequest;
- Reference<XIndexAccess> xWrappedParameters = new OParameterWrapper(_aParametersSet,xParamsAsIndicies);
+ Reference<XIndexAccess> xWrappedParameters = new OParameterWrapper(aNewParameterSet,xParamsAsIndicies);
aRequest.Parameters = xWrappedParameters;
aRequest.Connection = _xConnection;
OInteractionRequest* pRequest = new OInteractionRequest(makeAny(aRequest));
@@ -1815,11 +1833,10 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer,
Reference< XPropertySet > xParamColumn(xWrappedParameters->getByIndex(i),UNO_QUERY);
if (xParamColumn.is())
{
-#ifdef DBG_UTIL
::rtl::OUString sName;
- xParamColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= sName;
+ xParamColumn->getPropertyValue(PROPERTY_NAME) >>= sName;
OSL_ENSURE(sName.equals(pFinalValues->Name), "::dbaui::askForParameters: inconsistent parameter names!");
-#endif
+
// determine the field type and ...
sal_Int32 nParamType = 0;
xParamColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nParamType;
@@ -1827,21 +1844,17 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer,
sal_Int32 nScale = 0;
if (hasProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE), xParamColumn))
xParamColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)) >>= nScale;
- // and set the value
- ::std::bit_vector::const_iterator aIter = _aParametersSet.begin();
- ::std::bit_vector::const_iterator aEnd = _aParametersSet.end();
- sal_Int32 j = 0;
- sal_Int32 nParamPos = -1;
- for(; aIter != aEnd && j <= i; ++aIter)
+ // (the index of the parameters is one-based)
+ TParameterPositions::iterator aFind = aParameterNames.find(pFinalValues->Name);
+ ::std::vector<sal_Int32>::iterator aIterPos = aFind->second.begin();
+ ::std::vector<sal_Int32>::iterator aEndPos = aFind->second.end();
+ for(;aIterPos != aEndPos;++aIterPos)
{
- ++nParamPos;
- if ( !*aIter )
+ if ( _aParametersSet.empty() || !_aParametersSet[(*aIterPos)-1] )
{
- ++j;
+ _xParameters->setObjectWithInfo(*aIterPos, pFinalValues->Value, nParamType, nScale);
}
}
- _xParameters->setObjectWithInfo(nParamPos + 1, pFinalValues->Value, nParamType, nScale);
- // (the index of the parameters is one-based)
}
}
}
diff --git a/connectivity/source/drivers/jdbc/tools.cxx b/connectivity/source/drivers/jdbc/tools.cxx
index f77c45d66fc8..13bc83d1a56d 100644
--- a/connectivity/source/drivers/jdbc/tools.cxx
+++ b/connectivity/source/drivers/jdbc/tools.cxx
@@ -153,6 +153,8 @@ java_util_Properties* connectivity::createStringPropertyArray(const Sequence< Pr
&& pBegin->Name.compareToAscii( "SupportsTableCreation" )
&& pBegin->Name.compareToAscii( "UseJava" )
&& pBegin->Name.compareToAscii( "Authentication" )
+ && pBegin->Name.compareToAscii( "PreferDosLikeLineEnds" )
+ && pBegin->Name.compareToAscii( "PrimaryKeySupport" )
)
{
::rtl::OUString aStr;
diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx
index d8372ca69167..e8baf187eef7 100644
--- a/connectivity/source/parse/PColumn.cxx
+++ b/connectivity/source/parse/PColumn.cxx
@@ -116,7 +116,7 @@ OParseColumn* OParseColumn::createColumnForResultSet( const Reference< XResultSe
const Reference< XDatabaseMetaData >& _rxDBMetaData, sal_Int32 _nColumnPos )
{
OParseColumn* pColumn = new OParseColumn(
- _rxResMetaData->getColumnName( _nColumnPos ),
+ _rxResMetaData->getColumnLabel( _nColumnPos ),
_rxResMetaData->getColumnTypeName( _nColumnPos ),
::rtl::OUString(),
_rxResMetaData->isNullable( _nColumnPos ),
@@ -135,6 +135,7 @@ OParseColumn* OParseColumn::createColumnForResultSet( const Reference< XResultSe
eComplete
) );
pColumn->setIsSearchable( _rxResMetaData->isSearchable( _nColumnPos ) );
+ pColumn->setRealName(_rxResMetaData->getColumnName( _nColumnPos ));
return pColumn;
}
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index c76dd44e3d18..969682539074 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -911,7 +911,7 @@ OSQLParseNode* OSQLParser::convertNode(sal_Int32 nType,OSQLParseNode*& pLiteral)
}
break;
default:
- OSL_ENSURE(0,"Not handled!");
+ ;
}
}
return pReturn;
diff --git a/cppcanvas/inc/cppcanvas/color.hxx b/cppcanvas/inc/cppcanvas/color.hxx
index 7441f6f2937a..ad0430713ead 100644
--- a/cppcanvas/inc/cppcanvas/color.hxx
+++ b/cppcanvas/inc/cppcanvas/color.hxx
@@ -83,6 +83,16 @@ namespace cppcanvas
return (nRed << 24U)|(nGreen << 16U)|(nBlue << 8U)|(nAlpha);
}
+ inline sal_Int32 unMakeColor( sal_uInt8 nAlpha, sal_uInt8 nRed, sal_uInt8 nGreen, sal_uInt8 nBlue)
+ {
+ return (nAlpha << 24U)|(nRed << 16U)|(nGreen << 8U)|(nBlue);
+ }
+
+ inline sal_Int32 makeColorARGB( sal_uInt8 nAlpha, sal_uInt8 nRed, sal_uInt8 nGreen, sal_uInt8 nBlue)
+ {
+ return (nAlpha << 24U)|(nRed << 16U)|(nGreen << 8U)|(nBlue);
+ }
+
}
#endif /* _CPPCANVAS_COLOR_HXX */
diff --git a/cppuhelper/inc/cppuhelper/weakref.hxx b/cppuhelper/inc/cppuhelper/weakref.hxx
index 01a4c7c6e0df..5ed14743a520 100644
--- a/cppuhelper/inc/cppuhelper/weakref.hxx
+++ b/cppuhelper/inc/cppuhelper/weakref.hxx
@@ -79,13 +79,15 @@ public:
*/
WeakReferenceHelper & SAL_CALL operator = ( const WeakReferenceHelper & rWeakRef ) SAL_THROW( () );
- /** Releases this reference and takes over hard reference xInt. If the implementation behind
- xInt does not support XWeak or XInt is null, than this reference is null.
+ /** Releases this reference and takes over hard reference xInt.
+ If the implementation behind xInt does not support XWeak
+ or XInt is null, then this reference is null.
@param xInt another hard reference
*/
- inline WeakReferenceHelper & SAL_CALL operator = ( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & xInt ) SAL_THROW( () )
- { return operator = ( WeakReferenceHelper( xInt ) ); }
+ WeakReferenceHelper & SAL_CALL operator = (
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::uno::XInterface > & xInt ) SAL_THROW( () );
/** Returns true if both weak refs reference to the same object.
@@ -107,6 +109,12 @@ public:
inline SAL_CALL operator Reference< XInterface > () const SAL_THROW( () )
{ return get(); }
+ /** Releases this reference.
+
+ @since UDK 3.2.12
+ */
+ void SAL_CALL clear() SAL_THROW( () );
+
protected:
/** @internal */
OWeakRefListener * m_pImpl;
@@ -135,6 +143,19 @@ public:
: WeakReferenceHelper( rRef )
{}
+ /** Releases this reference and takes over hard reference xInt.
+ If the implementation behind xInt does not support XWeak
+ or XInt is null, then this reference is null.
+
+ @param xInt another hard reference
+
+ @since UDK 3.2.12
+ */
+ WeakReference & SAL_CALL operator = (
+ const ::com::sun::star::uno::Reference< interface_type > & xInt )
+ SAL_THROW( () )
+ { WeakReferenceHelper::operator=(xInt); return *this; }
+
/** Gets a hard reference to the object.
@return hard reference or null, if the weakly referenced interface has gone
diff --git a/cppuhelper/source/cc5_solaris_sparc.map b/cppuhelper/source/cc5_solaris_sparc.map
index 0961c6830d1f..941465519a08 100755
--- a/cppuhelper/source/cc5_solaris_sparc.map
+++ b/cppuhelper/source/cc5_solaris_sparc.map
@@ -383,4 +383,6 @@ UDK_3.6 { # OOo 3.0
UDK_3.7 { # OOo 3.3
global:
__1cEcppuLOWeakObjectbAdisposeWeakConnectionPoint6M_v_;
+ __1cDcomDsunEstarDunoTWeakReferenceHelper2G6Mrkn0DJReference4n0DKXInterface____r4_;
+ __1cDcomDsunEstarDunoTWeakReferenceHelperFclear6M_v_;
} UDK_3.6;
diff --git a/cppuhelper/source/gcc3.map b/cppuhelper/source/gcc3.map
index 9348e91525c0..099373b2e220 100644
--- a/cppuhelper/source/gcc3.map
+++ b/cppuhelper/source/gcc3.map
@@ -377,5 +377,7 @@ UDK_3.5 { # OOo 3.0
UDK_3.6 { # OOo 3.3
global:
_ZN4cppu11OWeakObject26disposeWeakConnectionPointEv;
+ _ZN3com3sun4star3uno19WeakReferenceHelperaSERKNS2_9ReferenceINS2_10XInterfaceEEE;
+ _ZN3com3sun4star3uno19WeakReferenceHelper5clearEv;
} UDK_3.5;
diff --git a/cppuhelper/source/msvc_win32_intel.map b/cppuhelper/source/msvc_win32_intel.map
index c999ae200ac2..6bc10cb175c2 100644
--- a/cppuhelper/source/msvc_win32_intel.map
+++ b/cppuhelper/source/msvc_win32_intel.map
@@ -275,4 +275,5 @@ UDK_3.5 { # OOo 3.0
UDK_3.6 { # OOo 3.3
global:
?disposeWeakConnectionPoint@OWeakObject@cppu@@IAEXXZ;
+ ?clear@WeakReferenceHelper@uno@star@sun@com@@QAAXXZ;
} UDK_3.5;
diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx
index b518d2526e3b..1fbfb3fa96ad 100644
--- a/cppuhelper/source/weak.cxx
+++ b/cppuhelper/source/weak.cxx
@@ -479,50 +479,55 @@ WeakReferenceHelper::WeakReferenceHelper(const WeakReferenceHelper& rWeakRef) SA
}
}
-WeakReferenceHelper& WeakReferenceHelper::operator=(const WeakReferenceHelper& rWeakRef) SAL_THROW( () )
+void WeakReferenceHelper::clear() SAL_THROW( () )
{
try
{
- if (this != &rWeakRef)
- {
- Reference< XInterface > xInt( rWeakRef.get() );
if (m_pImpl)
{
if (m_pImpl->m_XWeakConnectionPoint.is())
{
- m_pImpl->m_XWeakConnectionPoint->removeReference((XReference*)m_pImpl);
+ m_pImpl->m_XWeakConnectionPoint->removeReference(
+ (XReference*)m_pImpl);
m_pImpl->m_XWeakConnectionPoint.clear();
}
m_pImpl->release();
m_pImpl = 0;
}
+ }
+ catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no unexpected()
+}
+
+WeakReferenceHelper& WeakReferenceHelper::operator=(const WeakReferenceHelper& rWeakRef) SAL_THROW( () )
+{
+ if (this == &rWeakRef)
+ {
+ return *this;
+ }
+ Reference< XInterface > xInt( rWeakRef.get() );
+ return operator = ( xInt );
+}
+
+WeakReferenceHelper & SAL_CALL
+WeakReferenceHelper::operator= (const Reference< XInterface > & xInt)
+SAL_THROW( () )
+{
+ try
+ {
+ clear();
if (xInt.is())
{
m_pImpl = new OWeakRefListener(xInt);
m_pImpl->acquire();
}
}
- }
catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no unexpected()
return *this;
}
WeakReferenceHelper::~WeakReferenceHelper() SAL_THROW( () )
{
- try
- {
- if (m_pImpl)
- {
- if (m_pImpl->m_XWeakConnectionPoint.is())
- {
- m_pImpl->m_XWeakConnectionPoint->removeReference((XReference*)m_pImpl);
- m_pImpl->m_XWeakConnectionPoint.clear();
- }
- m_pImpl->release();
- m_pImpl = 0; // for safety
- }
- }
- catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no unexpected()
+ clear();
}
Reference< XInterface > WeakReferenceHelper::get() const SAL_THROW( () )
diff --git a/dbaccess/qa/complex/dbaccess/dbaccess.sce b/dbaccess/qa/complex/dbaccess/dbaccess.sce
index 47387e459ae9..c5fa408ff273 100644
--- a/dbaccess/qa/complex/dbaccess/dbaccess.sce
+++ b/dbaccess/qa/complex/dbaccess/dbaccess.sce
@@ -7,6 +7,6 @@
-o complex.dbaccess.DataSource
-o complex.dbaccess.Parser
-o complex.dbaccess.ApplicationController
-#-o complex.dbaccess.CopyTableWizard
+-o complex.dbaccess.CopyTableWizard
-o complex.dbaccess.UISettings
-o complex.dbaccess.Beamer
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index f028dba66ae0..c4fa68b12505 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -597,6 +597,7 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow
sal_Int32 nPos = aIter->second.nPosition;
if((_rInsertRow->get())[nPos].isModified())
{
+ impl_convertValue_throw(_rInsertRow,aIter->second);
(_rInsertRow->get())[nPos].setSigned((_rOrginalRow->get())[nPos].isSigned());
setParameter(i++,xParameter,(_rInsertRow->get())[nPos],aIter->second.nType,aIter->second.nScale);
}
@@ -621,8 +622,6 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow
}
m_bUpdated = xPrep->executeUpdate() > 0;
-
-
if(m_bUpdated)
{
m_aKeyIter = m_aKeyMap.find(::comphelper::getINT32((_rInsertRow->get())[0].getAny()));
@@ -681,6 +680,7 @@ void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivi
xParameter->setNull(i++,(_rInsertRow->get())[nPos].getTypeKind());
else
{
+ impl_convertValue_throw(_rInsertRow,aIter->second);
(_rInsertRow->get())[nPos].setSigned(m_aSignedFlags[nPos-1]);
setParameter(i++,xParameter,(_rInsertRow->get())[nPos],aIter->second.nType,aIter->second.nScale);
}
@@ -1171,8 +1171,9 @@ void SAL_CALL OKeySet::refreshRow() throw(SQLException, RuntimeException)
m_xSet = m_xStatement->executeQuery();
OSL_ENSURE(m_xSet.is(),"No resultset form statement!");
- sal_Bool bOK = m_xSet->next(); (void)bOK;
- OSL_ENSURE(bOK,"No rows!");
+ sal_Bool bOK = m_xSet->next();
+ if ( !bOK )
+ m_aKeyIter = m_aKeyMap.end();
m_xRow.set(m_xSet,UNO_QUERY);
OSL_ENSURE(m_xRow.is(),"No row form statement!");
}
@@ -1464,3 +1465,25 @@ namespace dbaccess
}
}
}
+// -----------------------------------------------------------------------------
+void OKeySet::impl_convertValue_throw(const ORowSetRow& _rInsertRow,const SelectColumnDescription& i_aMetaData)
+{
+ ORowSetValue& aValue((_rInsertRow->get())[i_aMetaData.nPosition]);
+ switch(i_aMetaData.nType)
+ {
+ case DataType::DECIMAL:
+ case DataType::NUMERIC:
+ {
+ ::rtl::OUString sValue = aValue.getString();
+ sal_Int32 nIndex = sValue.indexOf('.');
+ if ( nIndex != -1 )
+ {
+ aValue = sValue.copy(0,nIndex + (i_aMetaData.nScale > 0 ? i_aMetaData.nScale + 1 : 0));
+ }
+ }
+ break;
+ default:
+ break;
+ }
+}
+// -----------------------------------------------------------------------------
diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx
index 7a213d05b466..3a73487c2c3d 100644
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@ -134,6 +134,8 @@ namespace dbaccess
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > getKeyColumns() const;
void fillAllRows();
sal_Bool fetchRow();
+
+ void impl_convertValue_throw(const ORowSetRow& _rInsertRow,const SelectColumnDescription& i_aMetaData);
protected:
virtual ~OKeySet();
public:
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 18d8398c8233..0de2b0511946 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -977,19 +977,26 @@ void SAL_CALL ORowSet::updateRow( ) throw(SQLException, RuntimeException)
m_pCache->updateRow(m_aCurrentRow.operator ->());
m_aBookmark = m_pCache->getBookmark();
m_aCurrentRow = m_pCache->m_aMatrixIter;
- m_aOldRow->setRow(new ORowSetValueVector(m_aCurrentRow->getBody()));
+ if ( m_pCache->m_aMatrixIter != m_pCache->getEnd() )
+ {
+ m_aOldRow->setRow(new ORowSetValueVector(m_aCurrentRow->getBody()));
- // notification order
- // - column values
- ORowSetBase::firePropertyChange(aOldValues);
+ // notification order
+ // - column values
+ ORowSetBase::firePropertyChange(aOldValues);
- // - rowChanged
- notifyAllListenersRowChanged(aGuard,aEvt);
+ // - rowChanged
+ notifyAllListenersRowChanged(aGuard,aEvt);
- // - IsModified
- if(!m_bModified)
- fireProperty(PROPERTY_ID_ISMODIFIED,sal_False,sal_True);
- OSL_ENSURE( !m_bModified, "ORowSet::updateRow: just updated, but _still_ modified?" );
+ // - IsModified
+ if(!m_bModified)
+ fireProperty(PROPERTY_ID_ISMODIFIED,sal_False,sal_True);
+ OSL_ENSURE( !m_bModified, "ORowSet::updateRow: just updated, but _still_ modified?" );
+ }
+ else // the update went rong
+ {
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_UPDATE_FAILED ), SQL_INVALID_CURSOR_POSITION, *this );
+ }
}
}
// -------------------------------------------------------------------------
@@ -1001,20 +1008,15 @@ void SAL_CALL ORowSet::deleteRow( ) throw(SQLException, RuntimeException)
checkCache();
if ( m_bBeforeFirst || m_bAfterLast )
- throwSQLException( "Cannot delete the before-first or after-last row.", SQL_INVALID_CURSOR_POSITION, *this );
- // TODO: resource
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_DELETE_BEFORE_AFTER ), SQL_INVALID_CURSOR_POSITION, *this );
if ( m_bNew )
- throwSQLException( "Cannot delete the insert-row.", SQL_INVALID_CURSOR_POSITION, *this );
- // TODO: resource
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_DELETE_INSERT_ROW ), SQL_INVALID_CURSOR_POSITION, *this );
if ( m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY )
- throwSQLException( "Result set is read only.", SQL_FUNCTION_SEQUENCE_ERROR, *this );
- // TODO: resource
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_RESULT_IS_READONLY ), SQL_FUNCTION_SEQUENCE_ERROR, *this );
if ( ( m_pCache->m_nPrivileges & Privilege::DELETE ) != Privilege::DELETE )
- throwSQLException( "DELETE privilege not available.", SQL_FUNCTION_SEQUENCE_ERROR, *this );
- // TODO: resource
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_DELETE_PRIVILEGE ), SQL_FUNCTION_SEQUENCE_ERROR, *this );
if ( rowDeleted() )
- throwSQLException( "Current row already deleted.", SQL_FUNCTION_SEQUENCE_ERROR, *this );
- // TODO: resource
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_ROW_ALREADY_DELETED ), SQL_FUNCTION_SEQUENCE_ERROR, *this );
// this call position the cache indirect
Any aBookmarkToDelete( m_aBookmark );
@@ -1178,8 +1180,7 @@ void SAL_CALL ORowSet::moveToInsertRow( ) throw(SQLException, RuntimeException)
::osl::ResettableMutexGuard aGuard( *m_pMutex );
checkPositioningAllowed();
if ( ( m_pCache->m_nPrivileges & Privilege::INSERT ) != Privilege::INSERT )
- throwSQLException( "No insert privileges", SQL_GENERAL_ERROR, *this );
- // TODO: resource
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_INSERT_PRIVILEGE ), SQL_GENERAL_ERROR, *this );
if ( notifyAllListenersCursorBeforeMove( aGuard ) )
{
@@ -1245,8 +1246,7 @@ void SAL_CALL ORowSet::moveToCurrentRow( ) throw(SQLException, RuntimeException
// m_bModified should be true. Also, as soon as somebody calls moveToInsertRow,
// our current row should not be deleted anymore. So, we should not have survived the above
// check "if ( !m_pCache->m_bNew && !m_bModified )"
- throwSQLException( "The current row is deleted.", SQL_FUNCTION_SEQUENCE_ERROR, *this );
- // TODO: resource
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_ROW_ALREADY_DELETED ), SQL_FUNCTION_SEQUENCE_ERROR, *this );
if ( notifyAllListenersCursorBeforeMove( aGuard ) )
{
@@ -1610,12 +1610,7 @@ Reference< XResultSet > ORowSet::impl_prepareAndExecute_throw()
m_xStatement = m_xActiveConnection->prepareStatement( sCommandToExecute );
if ( !m_xStatement.is() )
{
- SQLException aError;
- aError.Context = *this;
- aError.SQLState = getStandardSQLState( SQL_GENERAL_ERROR );
- aError.Message = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Internal error: no statement object provided by the database driver." ) );
- // TODO: resource
- throw aError;
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_INTERNAL_ERROR ), SQL_GENERAL_ERROR, *this );
}
Reference< XPropertySet > xStatementProps( m_xStatement, UNO_QUERY_THROW );
@@ -1885,15 +1880,17 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
for(sal_Int32 i=1; i <= nCount ;++i)
{
::rtl::OUString sName = xMeta->getColumnName(i);
+ ::rtl::OUString sColumnLabel = xMeta->getColumnLabel(i);
// retrieve the column number |i|
Reference<XPropertySet> xColumn;
{
sal_Bool bReFetchName = sal_False;
- if (m_xColumns->hasByName(sName))
+ if (m_xColumns->hasByName(sColumnLabel))
+ m_xColumns->getByName(sColumnLabel) >>= xColumn;
+ if (!xColumn.is() && m_xColumns->hasByName(sName))
m_xColumns->getByName(sName) >>= xColumn;
- if (!xColumn.is() && m_xColumns->hasByName(xMeta->getColumnLabel(i)))
- m_xColumns->getByName(xMeta->getColumnLabel(i)) >>= xColumn;
+
// check if column already in the list we need another
if ( aAllColumns.find( xColumn ) != aAllColumns.end() )
{
@@ -1934,16 +1931,15 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
aDescription,
m_aCurrentRow);
aColumns->get().push_back(pColumn);
- if(!sName.getLength())
+ if(!sColumnLabel.getLength())
{
if(xColumn.is())
- xColumn->getPropertyValue(PROPERTY_NAME) >>= sName;
+ xColumn->getPropertyValue(PROPERTY_NAME) >>= sColumnLabel;
else
- sName = ::rtl::OUString::createFromAscii("Expression1");
- // TODO: resource
+ sColumnLabel = DBACORE_RESSTRING( RID_STR_EXPRESSION1 );
}
- pColumn->setName(sName);
- aNames.push_back(sName);
+ pColumn->setName(sColumnLabel);
+ aNames.push_back(sColumnLabel);
m_aDataColumns.push_back(pColumn);
if ( xColumn.is() )
@@ -2354,8 +2350,7 @@ sal_Bool ORowSet::impl_buildActiveCommand_throw()
m_aActiveCommand = sCommand;
if ( !m_aActiveCommand.getLength() )
- throwSQLException( "No SQL command was provided.", SQL_FUNCTION_SEQUENCE_ERROR, *this );
- // TODO: resource
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_SQL_COMMAND ), SQL_FUNCTION_SEQUENCE_ERROR, *this );
return bDoEscapeProcessing;
}
@@ -2657,21 +2652,17 @@ void ORowSet::checkUpdateIterator()
void ORowSet::checkUpdateConditions(sal_Int32 columnIndex)
{
checkCache();
- if ( columnIndex <= 0 )
- throwSQLException( "Invalid column index", SQL_INVALID_DESCRIPTOR_INDEX, *this );
- // TODO: resource
+ if ( m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_RESULT_IS_READONLY ), SQL_GENERAL_ERROR, *this );
+
if ( rowDeleted() )
- throwSQLException( "Current row is deleted", SQL_INVALID_CURSOR_POSITION, *this );
- // TODO: resource
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_ROW_ALREADY_DELETED ), SQL_INVALID_CURSOR_POSITION, *this );
+
if ( m_aCurrentRow.isNull() )
- throwSQLException( "Invalid cursor state", SQL_INVALID_CURSOR_STATE, *this );
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_INVALID_CURSOR_STATE ), SQL_INVALID_CURSOR_STATE, *this );
- if ( sal_Int32((*m_aCurrentRow)->get().size()) <= columnIndex )
- throwSQLException( "Invalid column index", SQL_INVALID_DESCRIPTOR_INDEX, *this );
- // TODO: resource
- if ( m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
- throwSQLException( "Result set is not writeable", SQL_GENERAL_ERROR, *this );
- // TODO: resource
+ if ( columnIndex <= 0 || sal_Int32((*m_aCurrentRow)->get().size()) <= columnIndex )
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_INVALID_INDEX ), SQL_INVALID_DESCRIPTOR_INDEX, *this );
}
// -----------------------------------------------------------------------------
void SAL_CALL ORowSet::refreshRow( ) throw(SQLException, RuntimeException)
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
index d8449094fa85..c5811705570d 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -30,57 +30,25 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_dbaccess.hxx"
-#ifndef DBACCESS_CORE_API_ROWSETBASE_HXX
+
#include "RowSetBase.hxx"
-#endif
-#ifndef DBACCESS_CORE_API_CROWSETDATACOLUMN_HXX
#include "CRowSetDataColumn.hxx"
-#endif
-#ifndef _CONNECTIVITY_SDBCX_COLLECTION_HXX_
#include <connectivity/sdbcx/VCollection.hxx>
-#endif
-#ifndef DBACCESS_CORE_API_ROWSETCACHE_HXX
#include "RowSetCache.hxx"
-#endif
-#ifndef DBACCESS_SHARED_DBASTRINGS_HRC
#include "dbastrings.hrc"
-#endif
-#ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_
+#include "core_resource.hrc"
#include <com/sun/star/lang/DisposedException.hpp>
-#endif
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_
#include <com/sun/star/beans/PropertyAttribute.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBCX_COMPAREBOOKMARK_HPP_
#include <com/sun/star/sdbcx/CompareBookmark.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_RESULTSETCONCURRENCY_HPP_
#include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_LOCALE_HPP_
#include <com/sun/star/lang/Locale.hpp>
-#endif
-#ifndef _COM_SUN_STAR_UTIL_NUMBERFORMAT_HPP_
#include <com/sun/star/util/NumberFormat.hpp>
-#endif
-#ifndef _COMPHELPER_SEQUENCE_HXX_
#include <comphelper/sequence.hxx>
-#endif
-#ifndef _COMPHELPER_EXTRACT_HXX_
#include <comphelper/extract.hxx>
-#endif
-#ifndef _COMPHELPER_SEQSTREAM_HXX
#include <comphelper/seqstream.hxx>
-#endif
-#ifndef _DBHELPER_DBEXCEPTION_HXX_
#include <connectivity/dbexception.hxx>
-#endif
-#ifndef _OSL_THREAD_H_
#include <osl/thread.h>
-#endif
-#ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
-#endif
#include <rtl/logfile.hxx>
using namespace dbaccess;
@@ -278,8 +246,7 @@ const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32 columnIndex)
if ( m_bBeforeFirst || m_bAfterLast )
{
OSL_ENSURE(0,"ORowSetBase::getValue: Illegal call here (we're before first or after last)!");
- throwSQLException( "The cursor points to before the first or after the last row.", SQL_INVALID_CURSOR_POSITION, *m_pMySelf );
- // TODO: resource
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_CURSOR_BEFORE_OR_AFTER ), SQL_INVALID_CURSOR_POSITION, *m_pMySelf );
}
if ( impl_rowDeleted() )
@@ -421,8 +388,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSetBase::getBinaryS
if ( m_bBeforeFirst || m_bAfterLast )
{
OSL_ENSURE(0,"ORowSetBase::getBinaryStream: Illegal call here (we're before first or after last)!");
- throwSQLException( "The cursor points to before the first or after the last row.", SQL_INVALID_CURSOR_POSITION, *m_pMySelf );
- // TODO: resource
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_CURSOR_BEFORE_OR_AFTER ), SQL_INVALID_CURSOR_POSITION, *m_pMySelf );
}
if ( impl_rowDeleted() )
@@ -498,12 +464,10 @@ Any SAL_CALL ORowSetBase::getBookmark( ) throw(SQLException, RuntimeException)
checkCache();
if ( m_bBeforeFirst || m_bAfterLast )
- throwSQLException( "The rows before the first and after the last row don't have a bookmark.", SQL_INVALID_CURSOR_POSITION, *m_pMySelf );
- // TODO: resource
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER ), SQL_INVALID_CURSOR_POSITION, *m_pMySelf );
if ( impl_rowDeleted() )
- throwSQLException( "The current row is deleted, and thus doesn't have a bookmark.", SQL_INVALID_CURSOR_POSITION, *m_pMySelf );
- // TODO: resource
+ ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_BOOKMARK_DELETED ), SQL_INVALID_CURSOR_POSITION, *m_pMySelf );
OSL_ENSURE( m_aBookmark.hasValue(), "ORowSetBase::getBookmark: bookmark has no value!" );
return m_aBookmark;
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index 4156c32635a2..3dd4dad67441 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -912,7 +912,7 @@ sal_Bool ORowSetCache::moveWindow()
{
*m_aMatrixIter = new ORowSetValueVector(m_xMetaData->getColumnCount());
m_pCacheSet->fillValueRow(*m_aMatrixIter,m_nPosition);
- // we have to read one row forward to enshure that we know when we are on last row
+ // we have to read one row forward to ensure that we know when we are on last row
// but only when we don't know it already
if ( !m_bRowCountFinal )
{
@@ -1283,7 +1283,9 @@ void ORowSetCache::updateRow( ORowSetMatrix::iterator& _rUpdateRow )
// *(*m_aMatrixIter) = *(*_rUpdateRow);
// refetch the whole row
(*m_aMatrixIter) = NULL;
- moveToBookmark(aBookmark);
+
+ if ( !moveToBookmark(aBookmark) )
+ m_aMatrixIter = m_pMatrix->end();
// moveToBookmark((*(*m_aInsertRow))[0].makeAny());
// if(m_pCacheSet->rowUpdated())
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 9b8bae551cf1..38c4536671e6 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -750,9 +750,10 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr
OSL_ENSURE( (size_t) nCount == aSelectColumns->get().size(), "OSingleSelectQueryComposer::getColumns: inconsistent column counts, this might result in wrong columns!" );
for(sal_Int32 i=1;i<=nCount;++i)
{
- ::rtl::OUString sName = xResultSetMeta->getColumnName(i);
+ ::rtl::OUString sColumnName = xResultSetMeta->getColumnName(i);
+ ::rtl::OUString sColumnLabel = xResultSetMeta->getColumnLabel(i);
sal_Bool bFound = sal_False;
- OSQLColumns::Vector::const_iterator aFind = ::connectivity::find(aSelectColumns->get().begin(),aSelectColumns->get().end(),sName,aCaseCompare);
+ OSQLColumns::Vector::const_iterator aFind = ::connectivity::find(aSelectColumns->get().begin(),aSelectColumns->get().end(),sColumnLabel,aCaseCompare);
size_t nFoundSelectColumnPos = aFind - aSelectColumns->get().begin();
if ( aFind != aSelectColumns->get().end() )
{
@@ -761,7 +762,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr
// so we start after the first found
do
{
- aFind = ::connectivity::findRealName(++aFind,aSelectColumns->get().end(),sName,aCaseCompare);
+ aFind = ::connectivity::findRealName(++aFind,aSelectColumns->get().end(),sColumnName,aCaseCompare);
nFoundSelectColumnPos = aFind - aSelectColumns->get().begin();
}
while ( ( aUsedSelectColumns.find( nFoundSelectColumnPos ) != aUsedSelectColumns.end() )
@@ -770,9 +771,9 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr
}
if ( aFind != aSelectColumns->get().end() )
{
- (*aFind)->getPropertyValue(PROPERTY_NAME) >>= sName;
+ (*aFind)->getPropertyValue(PROPERTY_NAME) >>= sColumnName;
aUsedSelectColumns.insert( nFoundSelectColumnPos );
- aNames.push_back(sName);
+ aNames.push_back(sColumnName);
bFound = sal_True;
}
}
@@ -781,7 +782,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr
continue;
OSQLColumns::Vector::const_iterator aRealFind = ::connectivity::findRealName(
- aSelectColumns->get().begin(), aSelectColumns->get().end(), sName, aCaseCompare );
+ aSelectColumns->get().begin(), aSelectColumns->get().end(), sColumnName, aCaseCompare );
if ( i > static_cast< sal_Int32>( aSelectColumns->get().size() ) )
{
@@ -806,19 +807,19 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr
::rtl::OUString sRealName;
xProp->getPropertyValue(PROPERTY_REALNAME) >>= sRealName;
::std::vector< ::rtl::OUString>::iterator aFindName;
- if ( !sName.getLength() )
- xProp->getPropertyValue(PROPERTY_NAME) >>= sName;
+ if ( !sColumnName.getLength() )
+ xProp->getPropertyValue(PROPERTY_NAME) >>= sColumnName;
- aFindName = ::std::find_if(aNames.begin(),aNames.end(),::std::bind2nd(aCaseCompareFunctor,sName));
+ aFindName = ::std::find_if(aNames.begin(),aNames.end(),::std::bind2nd(aCaseCompareFunctor,sColumnName));
sal_Int32 j = 0;
while ( aFindName != aNames.end() )
{
- sName += ::rtl::OUString::valueOf(++j);
- aFindName = ::std::find_if(aNames.begin(),aNames.end(),::std::bind2nd(aCaseCompareFunctor,sName));
+ sColumnName += ::rtl::OUString::valueOf(++j);
+ aFindName = ::std::find_if(aNames.begin(),aNames.end(),::std::bind2nd(aCaseCompareFunctor,sColumnName));
}
- pColumn->setName(sName);
+ pColumn->setName(sColumnName);
pColumn->setRealName(sRealName);
pColumn->setTableName(::comphelper::getString(xProp->getPropertyValue(PROPERTY_TABLENAME)));
@@ -828,7 +829,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr
continue;
aUsedSelectColumns.insert( (size_t)(i - 1) );
- aNames.push_back( sName );
+ aNames.push_back( sColumnName );
}
}
catch(const Exception&)
diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index 8fb40fc63b1f..043198388976 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -601,6 +601,17 @@ Reference< XSQLQueryComposer > OConnection::createQueryComposer(void) throw( Ru
return xComposer;
}
// -----------------------------------------------------------------------------
+void OConnection::impl_fillTableFilter()
+{
+ Reference<XPropertySet> xProp(getParent(),UNO_QUERY);
+ if ( xProp.is() )
+ {
+ xProp->getPropertyValue(PROPERTY_TABLEFILTER) >>= m_aTableFilter;
+ xProp->getPropertyValue(PROPERTY_TABLETYPEFILTER) >>= m_aTableTypeFilter;
+ }
+}
+
+// -----------------------------------------------------------------------------
void OConnection::refresh(const Reference< XNameAccess >& _rToBeRefreshed)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::refresh" );
@@ -608,6 +619,7 @@ void OConnection::refresh(const Reference< XNameAccess >& _rToBeRefreshed)
{
if (!m_pTables->isInitialized())
{
+ impl_fillTableFilter();
// check if our "master connection" can supply tables
getMasterTables();
@@ -625,6 +637,7 @@ void OConnection::refresh(const Reference< XNameAccess >& _rToBeRefreshed)
{
if (!m_pViews->isInitialized())
{
+ impl_fillTableFilter();
// check if our "master connection" can supply tables
Reference< XViewsSupplier > xMaster(getMasterTables(),UNO_QUERY);
diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx
index e8a8a2ca9135..88e59f007a25 100644
--- a/dbaccess/source/core/dataaccess/connection.hxx
+++ b/dbaccess/source/core/dataaccess/connection.hxx
@@ -276,6 +276,10 @@ private:
m_xConnectionTools is nol <NULL/>
*/
void impl_loadConnectionTools_throw();
+
+ /** reads the table filter and table type filter from the datasourfce
+ */
+ void impl_fillTableFilter();
};
//........................................................................
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 8a7ff1b1595c..141c8cdc2448 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -553,8 +553,6 @@ void ODatabaseContext::revokeObject(const rtl::OUString& _rName) throw( Exceptio
if ( m_aDatabaseObjects.find( _rName ) != m_aDatabaseObjects.end() )
{
- OSL_ENSURE( false, "ODatabaseContext::revokeObject: a database document register by name? This shouldn't happen anymore!" );
- // all the code should have been changed so that registration is by URL only
m_aDatasourceProperties[ sURL ] = m_aDatasourceProperties[ _rName ];
}
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 37a68f058e3a..fd258bb0255b 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1613,8 +1613,7 @@ void SAL_CALL ODatabaseDocument::loadFromStorage( const Reference< XStorage >& /
DocumentGuard aGuard( *this );
throw Exception(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Embedding of database documents is not supported." ) ),
- // TODO: resource
+ DBACORE_RESSTRING( RID_STR_NO_EMBEDDING ),
*this
);
}
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index e0d3f10aed8d..4fe5101863db 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -68,9 +68,9 @@
#include <comphelper/property.hxx>
#include <comphelper/seqstream.hxx>
#include <comphelper/sequence.hxx>
+#include <comphelper/string.hxx>
#include <connectivity/dbexception.hxx>
#include <cppuhelper/typeprovider.hxx>
-#include <rtl/digest.h>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <tools/urlobj.hxx>
@@ -78,6 +78,7 @@
#include <unotools/confignode.hxx>
#include <unotools/sharedunocomponent.hxx>
#include <rtl/logfile.hxx>
+#include <rtl/digest.h>
#include <algorithm>
using namespace ::com::sun::star::sdbc;
@@ -815,9 +816,8 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const ::rtl::O
::rtl::OUString sMessage = DBACORE_RESSTRING( nExceptionMessageId );
SQLContext aContext;
- aContext.Message = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "A connection for the following URL was requested: " ) );
- // TODO: resource
- aContext.Message += m_pImpl->m_sConnectURL;
+ aContext.Message = DBACORE_RESSTRING( RID_STR_CONNECTION_REQUEST );
+ ::comphelper::string::searchAndReplaceAsciiI( aContext.Message, "$name$", m_pImpl->m_sConnectURL );
throwGenericSQLException( sMessage, static_cast< XDataSource* >( this ), makeAny( aContext ) );
}
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index 7334e72a1ffc..c8fe0c49ec4a 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -380,9 +380,12 @@ Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments
::rtl::OUString sServiceName;
if ( Reference< XNameAccess >( xObjectToCopy, UNO_QUERY ).is() )
+ {
if ( m_bFormsContainer )
sServiceName = SERVICE_NAME_FORM_COLLECTION;
- else sServiceName = SERVICE_NAME_REPORT_COLLECTION;
+ else
+ sServiceName = SERVICE_NAME_REPORT_COLLECTION;
+ }
else
sServiceName = SERVICE_SDB_DOCUMENTDEFINITION;
@@ -503,7 +506,7 @@ namespace
if ( bRet )
{
_rRet = _xNameContainer->getByName(_sSimpleName = sName);
- while ( nIndex != -1 )
+ while ( nIndex != -1 && bRet )
{
sName = _sName.getToken(0,'/',nIndex);
_xNameContainer.set(_rRet,UNO_QUERY);
@@ -517,8 +520,10 @@ namespace
}
}
}
- else if ( nIndex == -1 )
- _sSimpleName = sName; // a content on the root content
+ if ( nIndex == -1 )
+ _sSimpleName = sName; // a content
+ else
+ _xNameContainer.clear(); // a sub folder doesn't exist
return bRet;
}
}
@@ -540,7 +545,6 @@ Reference< XComponent > SAL_CALL ODocumentContainer::loadComponentFromURL( const
if ( !lcl_queryContent(_sURL,xNameContainer,aContent,sName) )
{
::rtl::OUString sMessage( DBA_RES( RID_STR_NAME_NOT_FOUND ) );
- // TODO: resource
::comphelper::string::searchAndReplaceAsciiI( sMessage, "$name$", _sURL );
throw IllegalArgumentException( sMessage, *this, 1 );
}
@@ -610,15 +614,24 @@ sal_Bool SAL_CALL ODocumentContainer::hasByHierarchicalName( const ::rtl::OUStri
// XHierarchicalNameContainer
void SAL_CALL ODocumentContainer::insertByHierarchicalName( const ::rtl::OUString& _sName, const Any& _aElement ) throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException)
{
+ Reference< XContent > xContent(_aElement,UNO_QUERY);
+ if ( !xContent.is() )
+ throw IllegalArgumentException();
+
ClearableMutexGuard aGuard(m_aMutex);
Any aContent;
Reference< XNameContainer > xNameContainer(this);
::rtl::OUString sName;
if ( lcl_queryContent(_sName,xNameContainer,aContent,sName) )
throw ElementExistException(_sName,*this);
- Reference< XContent > xContent(_aElement,UNO_QUERY);
- if ( !xContent.is() )
- throw IllegalArgumentException();
+
+ if ( !xNameContainer.is() )
+ {
+ ::rtl::OUString sMessage( DBA_RES( RID_STR_NO_SUB_FOLDER ) );
+ sal_Int32 index = sName.getLength();
+ ::comphelper::string::searchAndReplaceAsciiI( sMessage, "$folder$", _sName.getToken(0,'/',index) );
+ throw IllegalArgumentException( sMessage, *this, 1 );
+ }
xNameContainer->insertByName(sName,_aElement);
}
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index e1c12034b49a..20d1ce157b45 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -1694,8 +1694,7 @@ void ODocumentDefinition::loadEmbeddedObject( const Reference< XConnection >& _x
if ( !xEnumDrivers.is() || !xEnumDrivers->hasMoreElements() )
{
com::sun::star::io::WrongFormatException aWFE;
- aWFE.Message = ::rtl::OUString::createFromAscii("Extension not present.");
- // TODO: resource
+ aWFE.Message = DBACORE_RESSTRING( RID_STR_MISSING_EXTENSION );
throw aWFE;
}
}
diff --git a/dbaccess/source/core/inc/core_resource.hrc b/dbaccess/source/core/inc/core_resource.hrc
index 20e0eb280233..8bfa73bbde48 100644
--- a/dbaccess/source/core/inc/core_resource.hrc
+++ b/dbaccess/source/core/inc/core_resource.hrc
@@ -88,7 +88,29 @@
#define RID_STR_NAME_NOT_FOUND ( RID_CORE_STRINGS_START + 45 )
#define RID_STR_QUERY_DOES_NOT_EXIST ( RID_CORE_STRINGS_START + 46 )
#define RID_STR_ERROR_WHILE_SAVING ( RID_CORE_STRINGS_START + 47 )
-#define RID_NO_SUCH_DATA_SOURCE ( RID_CORE_STRINGS_START + 48 )
+#define RID_STR_NO_SUB_FOLDER ( RID_CORE_STRINGS_START + 48 )
+
+#define RID_STR_NO_DELETE_BEFORE_AFTER ( RID_CORE_STRINGS_START + 49 )
+#define RID_STR_NO_DELETE_INSERT_ROW ( RID_CORE_STRINGS_START + 50 )
+#define RID_STR_RESULT_IS_READONLY ( RID_CORE_STRINGS_START + 51 )
+#define RID_STR_NO_DELETE_PRIVILEGE ( RID_CORE_STRINGS_START + 52 )
+#define RID_STR_ROW_ALREADY_DELETED ( RID_CORE_STRINGS_START + 53 )
+#define RID_STR_UPDATE_FAILED ( RID_CORE_STRINGS_START + 54 )
+
+#define RID_STR_INVALID_INDEX ( RID_CORE_STRINGS_START + 55 )
+#define RID_STR_NO_INSERT_PRIVILEGE ( RID_CORE_STRINGS_START + 56 )
+#define RID_STR_INTERNAL_ERROR ( RID_CORE_STRINGS_START + 57 )
+#define RID_STR_EXPRESSION1 ( RID_CORE_STRINGS_START + 58 )
+#define RID_STR_NO_SQL_COMMAND ( RID_CORE_STRINGS_START + 59 )
+#define RID_STR_INVALID_CURSOR_STATE ( RID_CORE_STRINGS_START + 60 )
+#define RID_STR_CURSOR_BEFORE_OR_AFTER ( RID_CORE_STRINGS_START + 61 )
+#define RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER ( RID_CORE_STRINGS_START + 62 )
+#define RID_STR_NO_BOOKMARK_DELETED ( RID_CORE_STRINGS_START + 63 )
+#define RID_STR_NO_EMBEDDING ( RID_CORE_STRINGS_START + 64 )
+#define RID_STR_CONNECTION_REQUEST ( RID_CORE_STRINGS_START + 65 )
+#define RID_STR_MISSING_EXTENSION ( RID_CORE_STRINGS_START + 66 )
+
+#define RID_NO_SUCH_DATA_SOURCE ( RID_CORE_STRINGS_START + 67 )
#endif // _DBA_CORE_RESOURCE_HRC_
diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx
index 90294dd59869..23eda6049d24 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -444,7 +444,6 @@ DATASOURCE_TYPE ODsnTypeCollection::determineType(const String& _rDsn) const
return aKnowPrefixes[i].eType;
}
- DBG_ERROR("ODsnTypeCollection::implDetermineType : unrecognized data source type !");
return DST_UNKNOWN;
}
// -----------------------------------------------------------------------------
diff --git a/dbaccess/source/core/resource/strings.src b/dbaccess/source/core/resource/strings.src
index 3fc3806963a5..33243e199330 100644
--- a/dbaccess/source/core/resource/strings.src
+++ b/dbaccess/source/core/resource/strings.src
@@ -250,5 +250,80 @@ String RID_NO_SUCH_DATA_SOURCE
{
Text [ en-US ] = "Error accessing data source '$name$':\n$error$";
};
-
+String RID_STR_NO_SUB_FOLDER
+{
+ Text [ en-US ] = "There exists no folder named \"$folder$\".";
+};
+String RID_STR_NO_DELETE_BEFORE_AFTER
+{
+ Text [ en-US ] = "Cannot delete the before-first or after-last row.";
+};
+String RID_STR_NO_DELETE_INSERT_ROW
+{
+ Text [ en-US ] = "Cannot delete the insert-row.";
+};
+String RID_STR_RESULT_IS_READONLY
+{
+ Text [ en-US ] = "Result set is read only.";
+};
+String RID_STR_NO_DELETE_PRIVILEGE
+{
+ Text [ en-US ] = "DELETE privilege not available.";
+};
+String RID_STR_ROW_ALREADY_DELETED
+{
+ Text [ en-US ] = "Current row is already deleted.";
+};
+String RID_STR_UPDATE_FAILED
+{
+ Text [ en-US ] = "Current row could be updated.";
+};
//-------------------------------------------------------------------------
+String RID_STR_NO_INSERT_PRIVILEGE
+{
+ Text [ en-US ] = "INSERT privilege not available.";
+};
+String RID_STR_INTERNAL_ERROR
+{
+ Text [ en-US ] = "Internal error: no statement object provided by the database driver.";
+};
+String RID_STR_EXPRESSION1
+{
+ Text [ en-US ] = "Expression1";
+};
+String RID_STR_NO_SQL_COMMAND
+{
+ Text [ en-US ] = "No SQL command was provided.";
+};
+String RID_STR_INVALID_INDEX
+{
+ Text [ en-US ] = "Invalid column index.";
+};
+String RID_STR_INVALID_CURSOR_STATE
+{
+ Text [ en-US ] = "Invalid cursor state.";
+};
+String RID_STR_CURSOR_BEFORE_OR_AFTER
+{
+ Text [ en-US ] = "The cursor points to before the first or after the last row.";
+};
+String RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER
+{
+ Text [ en-US ] = "The rows before the first and after the last row don't have a bookmark.";
+};
+String RID_STR_NO_BOOKMARK_DELETED
+{
+ Text [ en-US ] = "The current row is deleted, and thus doesn't have a bookmark.";
+};
+String RID_STR_NO_EMBEDDING
+{
+ Text [ en-US ] = "Embedding of database documents is not supported.";
+};
+String RID_STR_CONNECTION_REQUEST
+{
+ Text [ en-US ] = "A connection for the following URL was requested \"$name$\".";
+};
+String RID_STR_MISSING_EXTENSION
+{
+ Text [ en-US ] = "The extension is not installed.";
+};
diff --git a/dbaccess/source/ext/macromigration/dbmm_global.hrc b/dbaccess/source/ext/macromigration/dbmm_global.hrc
index 8afb08b919e2..853e00058d2a 100644
--- a/dbaccess/source/ext/macromigration/dbmm_global.hrc
+++ b/dbaccess/source/ext/macromigration/dbmm_global.hrc
@@ -82,5 +82,8 @@
#define STR_WARNINGS ( RID_DBMM_STRING_START + 14 )
#define STR_EXCEPTION ( RID_DBMM_STRING_START + 15 )
#define STR_LIBRARY_TYPE_AND_NAME ( RID_DBMM_STRING_START + 16 )
+#define STR_INVALID_NUMBER_ARGS ( RID_DBMM_STRING_START + 17 )
+#define STR_NO_DATABASE ( RID_DBMM_STRING_START + 18 )
+#define STR_NOT_READONLY ( RID_DBMM_STRING_START + 19 )
#endif // DBACCESS_DBMM_GLOBAL_HRC
diff --git a/dbaccess/source/ext/macromigration/macromigration.src b/dbaccess/source/ext/macromigration/macromigration.src
index bb49ac7ad287..fa973be93d00 100644
--- a/dbaccess/source/ext/macromigration/macromigration.src
+++ b/dbaccess/source/ext/macromigration/macromigration.src
@@ -441,3 +441,16 @@ ErrorBox ERR_INVALID_BACKUP_LOCATION
Buttons = WB_OK;
Message [ en-US ] = "You need to choose a backup location other than the document location itself.";
};
+
+String STR_INVALID_NUMBER_ARGS
+{
+ Text [ en-US ] = "Invalid number of initialization arguments. Expected 1.";
+};
+String STR_NO_DATABASE
+{
+ Text [ en-US ] = "No database document found in the initializatin arguments.";
+};
+String STR_NOT_READONLY
+{
+ Text [ en-US ] = "Not applicable to read-only documents.";
+};
diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
index 732fa9906119..72eef7e1583b 100644
--- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
@@ -32,6 +32,7 @@
#include "precompiled_dbaccess.hxx"
#include "dbmm_module.hxx"
+#include "dbmm_global.hrc"
#include "macromigrationdialog.hxx"
/** === begin UNO includes === **/
@@ -210,8 +211,7 @@ namespace dbmm
if ( _rArguments.getLength() != 1 )
throw IllegalArgumentException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Invalid number of initialization arguments. Expected 1." ) ),
- // TODO: resource
+ String(MacroMigrationResId(STR_INVALID_NUMBER_ARGS)),
*this,
1
);
@@ -219,8 +219,7 @@ namespace dbmm
m_xDocument.set( _rArguments[0], UNO_QUERY );
if ( !m_xDocument.is() )
throw IllegalArgumentException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No database document found in the initializatin arguments." ) ),
- // TODO: resource
+ String(MacroMigrationResId(STR_NO_DATABASE)),
*this,
1
);
@@ -228,8 +227,7 @@ namespace dbmm
Reference< XStorable > xDocStor( m_xDocument, UNO_QUERY_THROW );
if ( xDocStor->isReadonly() )
throw IllegalArgumentException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Not applicable to read-only documents." ) ),
- // TODO: resource
+ String(MacroMigrationResId(STR_NOT_READONLY)),
*this,
1
);
diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx b/dbaccess/source/filter/xml/xmlColumn.cxx
index c9670d98317a..c0113fe7a14a 100644
--- a/dbaccess/source/filter/xml/xmlColumn.cxx
+++ b/dbaccess/source/filter/xml/xmlColumn.cxx
@@ -130,7 +130,8 @@ OXMLColumn::OXMLColumn( ODBFilter& rImport
break;
case XML_TOK_COLUMN_DEFAULT_VALUE:
if ( sValue.getLength() && sType.getLength() )
- SvXMLUnitConverter::convertAny(m_aDefaultValue,sType,sValue);
+ m_aDefaultValue <<= sValue;
+ // SvXMLUnitConverter::convertAny(m_aDefaultValue,sType,sValue);
break;
case XML_TOK_COLUMN_VISIBLE:
m_bHidden = sValue.equalsAscii("false");
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 57f38d324b5c..20671471d863 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -80,159 +80,70 @@
#include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
/** === end UNO includes === **/
-#ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
-#endif
-#ifndef TOOLS_DIAGNOSE_EX_H
#include <tools/diagnose_ex.h>
-#endif
-#ifndef SVTOOLS_URIHELPER_HXX
+#include <tools/string.hxx>
+
#include <svl/urihelper.hxx>
-#endif
-#ifndef _COMPHELPER_TYPES_HXX_
+#include <svl/filenotation.hxx>
+
+#include <svtools/svtreebx.hxx>
+#include <svtools/transfer.hxx>
+#include <svtools/cliplistener.hxx>
+#include <svtools/svlbitm.hxx>
+#include <svtools/insdlg.hxx>
+
+#include <comphelper/sequence.hxx>
+#include <comphelper/uno3.hxx>
+#include <comphelper/string.hxx>
#include <comphelper/types.hxx>
-#endif
-#ifndef _COMPHELPER_INTERACTION_HXX_
#include <comphelper/interaction.hxx>
-#endif
-#ifndef COMPHELPER_COMPONENTCONTEXT_HXX
#include <comphelper/componentcontext.hxx>
-#endif
-#ifndef _SV_MSGBOX_HXX
+
#include <vcl/msgbox.hxx>
-#endif
-#ifndef _VCL_STDTEXT_HXX
#include <vcl/stdtext.hxx>
-#endif
-#ifndef _FILEDLGHELPER_HXX
+#include <vcl/svapp.hxx>
+#include <vcl/menu.hxx>
+#include <vcl/lstbox.hxx>
+
+#include <unotools/pathoptions.hxx>
+#include <unotools/tempfile.hxx>
+#include <unotools/internaloptions.hxx>
+#include <unotools/moduleoptions.hxx>
+#include <unotools/historyoptions.hxx>
+
+#include <sfx2/mailmodelapi.hxx>
#include <sfx2/filedlghelper.hxx>
-#endif
-#ifndef _CPPUHELPER_TYPEPROVIDER_HXX_
+#include <sfx2/docfilt.hxx>
+#include <sfx2/QuerySaveDocument.hxx>
+
#include <cppuhelper/typeprovider.hxx>
-#endif
-#ifndef _CPPUHELPER_EXC_HLP_HXX_
#include <cppuhelper/exc_hlp.hxx>
-#endif
-#ifndef _CONNECTIVITY_DBTOOLS_HXX_
+
#include <connectivity/dbtools.hxx>
-#endif
-#ifndef DBAUI_APPVIEW_HXX
+#include <connectivity/dbexception.hxx>
+
+#include <svx/dbaexchange.hxx>
+#include <svx/dbaobjectex.hxx>
+#include <svx/svxdlg.hxx>
+
+#include <vos/mutex.hxx>
+
#include "AppView.hxx"
-#endif
-#ifndef DBACCESS_UI_BROWSER_ID_HXX
#include "browserids.hxx"
-#endif
-#ifndef _DBAU_REGHELPER_HXX_
#include "dbu_reghelper.hxx"
-#endif
-#ifndef _DBU_APP_HRC_
#include "dbu_app.hrc"
-#endif
-#ifndef DBACCESS_SOURCE_UI_MISC_DEFAULTOBJECTNAMECHECK_HXX
#include "defaultobjectnamecheck.hxx"
-#endif
-#ifndef _SV_MENU_HXX
-#include <vcl/menu.hxx>
-#endif
-#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
-#include <unotools/pathoptions.hxx>
-#endif
-#ifndef INCLUDED_SVTOOLS_INTERNALOPTIONS_HXX
-#include <unotools/internaloptions.hxx>
-#endif
-#ifndef _COMPHELPER_UNO3_HXX_
-#include <comphelper/uno3.hxx>
-#endif
-#ifndef DBACCESS_DATABASE_OBJECT_VIEW_HXX
#include "databaseobjectview.hxx"
-#endif
-#ifndef _SV_SVAPP_HXX //autogen
-#include <vcl/svapp.hxx>
-#endif
-#ifndef _SVLBOXITM_HXX
-#include <svtools/svlbitm.hxx>
-#endif
-#ifndef _DBAUI_LISTVIEWITEMS_HXX_
#include "listviewitems.hxx"
-#endif
-
-#ifndef DBAUI_APPDETAILVIEW_HXX
#include "AppDetailView.hxx"
-#endif
-#ifndef _DBAUI_LINKEDDOCUMENTS_HXX_
#include "linkeddocuments.hxx"
-#endif
-#ifndef _SV_LSTBOX_HXX
-#include <vcl/lstbox.hxx>
-#endif
-#ifndef _DBHELPER_DBEXCEPTION_HXX_
-#include <connectivity/dbexception.hxx>
-#endif
-#ifndef _DBAUI_SQLMESSAGE_HXX_
#include "sqlmessage.hxx"
-#endif
-#ifndef _STRING_HXX
-#include <tools/string.hxx>
-#endif
-#ifndef INCLUDED_SFX_MAILMODELAPI_HXX
-#include <sfx2/mailmodelapi.hxx>
-#endif
-#ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
-#include <unotools/moduleoptions.hxx>
-#endif
-#ifndef _SVTREEBOX_HXX
-#include <svtools/svtreebx.hxx>
-#endif
-#ifndef _TRANSFER_HXX
-#include <svtools/transfer.hxx>
-#endif
-#ifndef _CLIPLISTENER_HXX
-#include <svtools/cliplistener.hxx>
-#endif
-#ifndef _SVX_DBAEXCHANGE_HXX_
-#include <svx/dbaexchange.hxx>
-#endif
-#ifndef SVX_DBAOBJECTEX_HXX
-#include <svx/dbaobjectex.hxx>
-#endif
-#ifndef DBAUI_TOOLS_HXX
#include "UITools.hxx"
-#endif
-#ifndef _DBAUI_DSNTYPES_HXX_
#include "dsntypes.hxx"
-#endif
-#include <svx/svxdlg.hxx>
-#include <svtools/insdlg.hxx>
-#ifndef _UNOTOOLS_TEMPFILE_HXX
-#include <unotools/tempfile.hxx>
-#endif
-#ifndef _DBA_DBACCESS_HELPID_HRC_
#include "dbaccess_helpid.hrc"
-#endif
-#ifndef DBAUI_DLGSAVE_HXX
#include "dlgsave.hxx"
-#endif
-#ifndef _SFX_DOCFILT_HACK_HXX
-#include <sfx2/docfilt.hxx>
-#endif
-#ifndef SFX_QUERYSAVEDOCUMENT_HXX
-#include <sfx2/QuerySaveDocument.hxx>
-#endif
-#ifndef INCLUDED_SVTOOLS_HISTORYOPTIONS_HXX
-#include <unotools/historyoptions.hxx>
-#endif
-#ifndef SVTOOLS_FILENOTATION_HXX_
-#include <svl/filenotation.hxx>
-#endif
-#ifndef _COMPHELPER_SEQUENCE_HXX_
-#include <comphelper/sequence.hxx>
-#endif
-#ifndef _VOS_MUTEX_HXX_
-#include <vos/mutex.hxx>
-#endif
-#ifndef _DBACCESS_SLOTID_HRC_
#include "dbaccess_slotid.hrc"
-#endif
#include <algorithm>
#include <functional>
@@ -2955,8 +2866,7 @@ void SAL_CALL OApplicationController::removeSelectionChangeListener( const Refer
case DatabaseObjectContainer::REPORTS:
if ( eSelectedCategory != E_NONE )
throw IllegalArgumentException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "You cannot select different categories." ) ),
- // TODO: resource
+ String(ModuleRes(RID_STR_NO_DIFF_CAT)),
*this, sal_Int16( pObject - aSelectedObjects.getConstArray() ) );
eSelectedCategory =
( pObject->Type == DatabaseObjectContainer::TABLES ) ? E_TABLE
@@ -2969,13 +2879,9 @@ void SAL_CALL OApplicationController::removeSelectionChangeListener( const Refer
default:
case DatabaseObjectContainer::DATA_SOURCE:
{
- ::rtl::OUStringBuffer aMessage;
- aMessage.appendAscii( "Unsupported object type found (" );
- aMessage.append ( sal_Int32( pObject->Type ) );
- aMessage.appendAscii( ")." );
- // TODO: resource
- throw IllegalArgumentException(
- aMessage.makeStringAndClear(), *this, sal_Int16( pObject - aSelectedObjects.getConstArray() ) );
+ ::rtl::OUString sMessage = String(ModuleRes( RID_STR_UNSUPPORTED_OBJECT_TYPE ));
+ ::comphelper::string::searchAndReplaceAsciiI( sMessage, "$type$", ::rtl::OUString::valueOf(sal_Int32( pObject->Type )) );
+ throw IllegalArgumentException(sMessage, *this, sal_Int16( pObject - aSelectedObjects.getConstArray() ));
}
}
}
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 50e357b687b8..fbc5b8d0c359 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -93,9 +93,6 @@
#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
#include <toolkit/helper/vclunohelper.hxx>
#endif
-#ifndef _COM_SUN_STAR_UCB_XCONTENTCREATOR_HPP_
-#include <com/sun/star/ucb/XContentCreator.hpp>
-#endif
#ifndef _COM_SUN_STAR_UCB_XCOMMANDENVIRONMENT_HPP_
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#endif
@@ -256,7 +253,7 @@ namespace
EnableInput(FALSE);
return 0L;
}
- // -----------------------------------------------------------------------------
+ // -----------------------------------------------------------------------------
void OTablePreviewWindow::DataChanged( const DataChangedEvent& rDCEvt )
{
Window::DataChanged( rDCEvt );
@@ -268,7 +265,7 @@ namespace
Invalidate();
}
}
- // -----------------------------------------------------------------------------
+ // -----------------------------------------------------------------------------
void OTablePreviewWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground )
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -634,13 +631,13 @@ sal_Bool OAppDetailPageHelper::isCutAllowed()
// -----------------------------------------------------------------------------
sal_Bool OAppDetailPageHelper::isCopyAllowed()
{
- // int nPos = getVisibleControlIndex();
+ //int nPos = getVisibleControlIndex();
return sal_True;
}
// -----------------------------------------------------------------------------
sal_Bool OAppDetailPageHelper::isPasteAllowed()
{
- // int nPos = getVisibleControlIndex();
+ //int nPos = getVisibleControlIndex();
return sal_True;
}
// -----------------------------------------------------------------------------
@@ -658,6 +655,8 @@ void OAppDetailPageHelper::paste()
// -----------------------------------------------------------------------------
bool OAppDetailPageHelper::isLeaf(SvLBoxEntry* _pEntry) const
{
+ if ( !_pEntry )
+ return false;
sal_Int32 nEntryType = reinterpret_cast< sal_IntPtr >( _pEntry->GetUserData() );
if ( ( nEntryType == DatabaseObjectContainer::TABLES )
|| ( nEntryType == DatabaseObjectContainer::CATALOG )
@@ -1099,8 +1098,8 @@ void OAppDetailPageHelper::Resize()
//////////////////////////////////////////////////////////////////////
// Abmessungen parent window
Size aOutputSize( GetOutputSize() );
- long nOutputWidth = aOutputSize.Width();
- long nOutputHeight = aOutputSize.Height();
+ long nOutputWidth = aOutputSize.Width();
+ long nOutputHeight = aOutputSize.Height();
Window* pWindow = getCurrentView();
if ( pWindow )
@@ -1115,12 +1114,12 @@ void OAppDetailPageHelper::Resize()
String sText = m_aTBPreview.GetItemText(SID_DB_APP_DISABLE_PREVIEW);
Size aTBSize = m_aTBPreview.CalcWindowSizePixel();
- m_aTBPreview.SetPosSizePixel( Point(nOutputWidth - aTBSize.getWidth(), 0 ),
- aTBSize );
+ m_aTBPreview.SetPosSizePixel(Point(nOutputWidth - aTBSize.getWidth(), 0 ),
+ aTBSize );
- m_aBorder.SetPosSizePixel( Point(nHalfOutputWidth + aFLSize.Width() + n6PPT, aTBSize.getHeight() + n6PPT ),
- Size(nHalfOutputWidth - aFLSize.Width() - n6PPT, nOutputHeight - 2*n6PPT - aTBSize.getHeight()) );
- m_aPreview.SetPosSizePixel( Point(0,0),m_aBorder.GetSizePixel() );
+ m_aBorder.SetPosSizePixel(Point(nHalfOutputWidth + aFLSize.Width() + n6PPT, aTBSize.getHeight() + n6PPT ),
+ Size(nHalfOutputWidth - aFLSize.Width() - n6PPT, nOutputHeight - 2*n6PPT - aTBSize.getHeight()) );
+ m_aPreview.SetPosSizePixel(Point(0,0),m_aBorder.GetSizePixel() );
m_aDocumentInfo.SetPosSizePixel(Point(0,0),m_aBorder.GetSizePixel() );
m_pTablePreview->SetPosSizePixel(Point(0,0),m_aBorder.GetSizePixel() );
}
@@ -1237,9 +1236,9 @@ void OAppDetailPageHelper::showPreview(const Reference< XContent >& _xContent)
// Why the below code? It might have side effects, as the tree view needs to know
// its current selection for other purposes than the preview, too.
-// DBTreeListBox* pTreeView = getCurrentView();
-// if ( pTreeView )
-// pTreeView->clearCurrentSelection();
+// DBTreeListBox* pTreeView = getCurrentView();
+// if ( pTreeView )
+// pTreeView->clearCurrentSelection();
}
}
catch( const Exception& )
@@ -1386,7 +1385,7 @@ void OAppDetailPageHelper::DataChanged( const DataChangedEvent& rDCEvt )
{
Window::DataChanged( rDCEvt );
- if ( (rDCEvt.GetType() == DATACHANGED_FONTS) ||
+ if ( (rDCEvt.GetType() == DATACHANGED_FONTS) ||
(rDCEvt.GetType() == DATACHANGED_DISPLAY) ||
(rDCEvt.GetType() == DATACHANGED_FONTSUBSTITUTION) ||
((rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
@@ -1445,9 +1444,9 @@ OPreviewWindow::OPreviewWindow(Window* _pParent)
// -----------------------------------------------------------------------------
BOOL OPreviewWindow::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const
{
- const Size aWinSize( GetOutputSizePixel() );
- Size aNewSize( LogicToPixel( rGraphic.GetPrefSize(), rGraphic.GetPrefMapMode() ) );
- BOOL bRet = FALSE;
+ const Size aWinSize( GetOutputSizePixel() );
+ Size aNewSize( LogicToPixel( rGraphic.GetPrefSize(), rGraphic.GetPrefMapMode() ) );
+ BOOL bRet = FALSE;
if( aNewSize.Width() && aNewSize.Height() )
{
@@ -1505,7 +1504,7 @@ void OPreviewWindow::DataChanged( const DataChangedEvent& rDCEvt )
Invalidate();
}
}
-// -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
void OPreviewWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground )
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src
index c913d16ebd2d..9aff7f73d992 100644
--- a/dbaccess/source/ui/app/app.src
+++ b/dbaccess/source/ui/app/app.src
@@ -469,3 +469,11 @@ String RID_STR_EMBEDDED_DATABASE
{
Text [ en-US ] = "Embedded database";
};
+String RID_STR_NO_DIFF_CAT
+{
+ Text [ en-US ] = "You cannot select different categories.";
+};
+String RID_STR_UNSUPPORTED_OBJECT_TYPE
+{
+ Text [ en-US ] = "Unsupported object type found ($type$).";
+};
diff --git a/dbaccess/source/ui/app/dbu_app.hrc b/dbaccess/source/ui/app/dbu_app.hrc
index 63aa923ce30f..5b4aee52304e 100644
--- a/dbaccess/source/ui/app/dbu_app.hrc
+++ b/dbaccess/source/ui/app/dbu_app.hrc
@@ -68,11 +68,12 @@
#define RID_STR_FORMS_HELP_TEXT_WIZARD RID_STR_APP_START + 29
#define RID_STR_REPORT_HELP_TEXT RID_STR_APP_START + 30
#define RID_STR_EMBEDDED_DATABASE RID_STR_APP_START + 31
-
+#define RID_STR_NO_DIFF_CAT RID_STR_APP_START + 32
+#define RID_STR_UNSUPPORTED_OBJECT_TYPE RID_STR_APP_START + 33
// please adjust checking before insert new strings
-#if RID_STR_EMBEDDED_DATABASE > RID_STR_APP_END
+#if RID_STR_UNSUPPORTED_OBJECT_TYPE > RID_STR_APP_END
#error Resource-Id Ueberlauf in #file, #line
#endif
diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
index 16859283c9b7..51121b022e88 100644
--- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
+++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
@@ -166,7 +166,7 @@ void SbaTableQueryBrowser::SelectionChanged()
InvalidateFeature(ID_BROWSER_INSERTCONTENT);
InvalidateFeature(ID_BROWSER_FORMLETTER);
} // if ( !m_bShowMenu )
- InvalidateFeature(ID_BROWSER_COPY);
+ InvalidateFeature(ID_BROWSER_COPY);
InvalidateFeature(ID_BROWSER_CUT);
}
//------------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx
index 60dfb7bdec79..6a97719e0c27 100644
--- a/dbaccess/source/ui/inc/QueryDesignView.hxx
+++ b/dbaccess/source/ui/inc/QueryDesignView.hxx
@@ -171,6 +171,10 @@ namespace dbaui
const String& _sCriteria,
::rtl::OUString& _rsErrorMessage,
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn) const;
+
+ void fillFunctionInfo( const ::connectivity::OSQLParseNode* pNode
+ ,const ::rtl::OUString& sFunctionTerm
+ ,OTableFieldDescRef& aInfo);
protected:
// return the Rectangle where I can paint myself
virtual void resizeDocumentView(Rectangle& rRect);
diff --git a/dbaccess/source/ui/inc/TableFieldDescription.hxx b/dbaccess/source/ui/inc/TableFieldDescription.hxx
index 80eeeff20dfa..9230bef621c3 100644
--- a/dbaccess/source/ui/inc/TableFieldDescription.hxx
+++ b/dbaccess/source/ui/inc/TableFieldDescription.hxx
@@ -83,6 +83,7 @@ namespace dbaui
inline sal_Bool IsEmpty() const;
+ OTableFieldDesc& operator=( const OTableFieldDesc& _aField );
sal_Bool operator==( const OTableFieldDesc& rDesc );
sal_Bool IsVisible() const { return m_bVisible;}
diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx
index 37d0d870f538..741e6f67e590 100644
--- a/dbaccess/source/ui/inc/WCopyTable.hxx
+++ b/dbaccess/source/ui/inc/WCopyTable.hxx
@@ -31,55 +31,23 @@
#ifndef DBAUI_WIZ_COPYTABLEDIALOG_HXX
#define DBAUI_WIZ_COPYTABLEDIALOG_HXX
-#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
#include <com/sun/star/container/XNameAccess.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_
#include <com/sun/star/sdbc/XConnection.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XRESULTSET_HPP_
#include <com/sun/star/sdbc/XResultSet.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATA_HPP_
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#endif
-#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
#include <com/sun/star/beans/XPropertySet.hpp>
-#endif
-#ifndef _COMPHELPER_STLTYPES_HXX_
#include <comphelper/stl_types.hxx>
-#endif
-#ifndef DBAUI_TYPEINFO_HXX
#include "TypeInfo.hxx"
-#endif
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
-#ifndef _SVT_WIZDLG_HXX
#include <svtools/wizdlg.hxx>
-#endif
-#ifndef DBAUI_DATABASEEXPORT_HXX
#include "DExport.hxx"
-#endif
-#ifndef DBAUI_WIZ_TABBPAGE_HXX
#include "WTabPage.hxx"
-#endif
-#ifndef DBAUI_FIELDDESCRIPTIONS_HXX
#include "FieldDescriptions.hxx"
-#endif
-#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBCX_XKEYSSUPPLIER_HPP_
#include <com/sun/star/sdbcx/XKeysSupplier.hpp>
-#endif
-#ifndef _SV_LSTBOX_HXX
+#include <com/sun/star/task/XInteractionHandler.hpp>
#include <vcl/lstbox.hxx>
-#endif
-
#include <functional>
namespace dbaui
@@ -299,6 +267,7 @@ namespace dbaui
::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xFactory;
+ ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler> m_xInteractionHandler;
String m_sTypeNames; // these type names are the ones out of the resource file
sal_uInt32 m_nPageCount;
@@ -343,7 +312,8 @@ namespace dbaui
const ICopyTableSourceObject& _rSourceObject,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xSourceConnection,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB
+ const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler>& _xInteractionHandler
);
// used for importing rtf/html sources
@@ -445,6 +415,8 @@ namespace dbaui
void showColumnTypeNotSupported(const ::rtl::OUString& _rColumnName);
void removeColumnNameFromNameMap(const ::rtl::OUString& _sName);
+ void showError(const ::rtl::OUString& _sErrorMesage);
+ void showError(const ::com::sun::star::uno::Any& _aError);
};
}
diff --git a/dbaccess/source/ui/inc/dbu_misc.hrc b/dbaccess/source/ui/inc/dbu_misc.hrc
index 0ee803edec10..6aeb5b1331ab 100644
--- a/dbaccess/source/ui/inc/dbu_misc.hrc
+++ b/dbaccess/source/ui/inc/dbu_misc.hrc
@@ -50,10 +50,12 @@
#define STR_FILE_DOES_NOT_EXIST RID_STR_MISC_START + 13
#define STR_WARNINGS_DURING_CONNECT RID_STR_MISC_START + 14
#define STR_NAMED_OBJECT_ALREADY_EXISTS RID_STR_MISC_START + 15
+#define STR_INVALID_TABLE_NAME RID_STR_MISC_START + 16
+#define STR_INVALID_TABLE_NAME_LENGTH RID_STR_MISC_START + 17
// please adjust checking before insert new strings
-#if STR_NAMED_OBJECT_ALREADY_EXISTS > RID_STR_MISC_END
+#if STR_INVALID_TABLE_NAME_LENGTH > RID_STR_MISC_END
#error Resource-Id Ueberlauf in #file, #line
#endif
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index e537f51df6bb..7d72e16f0f2f 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -182,13 +182,13 @@
// error boxes
#define ERR_NOREGISTEREDDATASOURCES RID_ERRORBOX_START + 0
-#define ERROR_INVALID_TABLE_NAME_LENGTH RID_ERRORBOX_START + 1
+// free
#define ERR_QRY_CRITERIA_ON_ASTERISK RID_ERRORBOX_START + 2
#define ERR_QRY_ORDERBY_ON_ASTERISK RID_ERRORBOX_START + 3
#define ERR_QRY_AMB_FIELD RID_ERRORBOX_START + 4
// FREE
#define ERR_INVALID_LISTBOX_ENTRY RID_ERRORBOX_START + 6
-#define ERROR_INVALID_TABLE_NAME RID_ERRORBOX_START + 7
+// FREE
#define ERR_NEED_INDEX_FIELDS RID_ERRORBOX_START + 8
#define ERR_QRY_NOSTATEMENT RID_ERRORBOX_START + 9
#define ERR_QRY_NOCRITERIA RID_ERRORBOX_START + 10
diff --git a/dbaccess/source/ui/inc/dbu_uno.hrc b/dbaccess/source/ui/inc/dbu_uno.hrc
index acd15c94c7ef..6aec13955ac0 100644
--- a/dbaccess/source/ui/inc/dbu_uno.hrc
+++ b/dbaccess/source/ui/inc/dbu_uno.hrc
@@ -43,9 +43,12 @@
#define STR_CTW_UNSUPPORTED_COLUMN_TYPE ( RID_STR_UNO_START + 6 )
#define STR_CTW_ILLEGAL_PARAMETER_COUNT ( RID_STR_UNO_START + 7 )
#define STR_CTW_ERROR_DURING_INITIALIZATION ( RID_STR_UNO_START + 8 )
+#define STR_CTW_ERROR_UNSUPPORTED_SETTING ( RID_STR_UNO_START + 9 )
+#define STR_CTW_ERROR_NO_QUERY ( RID_STR_UNO_START + 10 )
+#define STR_CTW_ERROR_INVALID_INTERACTIONHANDLER ( RID_STR_UNO_START + 11 )
// please adjust when inserting new strings:
-#define RID_STR_UNO_LAST_USED STR_CTW_ERROR_DURING_INITIALIZATION
+#define RID_STR_UNO_LAST_USED STR_CTW_ERROR_INVALID_INTERACTIONHANDLER
#if RID_STR_UNO_LAST_USED >= RID_STR_UNO_END
#error too many resources in uno ....
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index 6c750f40ee61..a1b29faf1afa 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -479,6 +479,7 @@ sal_Int16 ODatabaseExport::CheckString(const String& aCheckToken, sal_Int16 _nOl
case NumberFormat::DATETIME:
case NumberFormat::TEXT:
case NumberFormat::DATE:
+ nNumberFormat = _nOldNumberFormat;
break;
case NumberFormat::ALL:
nNumberFormat = NumberFormat::DATE;
@@ -494,6 +495,7 @@ sal_Int16 ODatabaseExport::CheckString(const String& aCheckToken, sal_Int16 _nOl
case NumberFormat::DATETIME:
case NumberFormat::TEXT:
case NumberFormat::TIME:
+ nNumberFormat = _nOldNumberFormat;
break;
case NumberFormat::ALL:
nNumberFormat = NumberFormat::TIME;
@@ -510,6 +512,7 @@ sal_Int16 ODatabaseExport::CheckString(const String& aCheckToken, sal_Int16 _nOl
nNumberFormat = NumberFormat::CURRENCY;
break;
case NumberFormat::CURRENCY:
+ nNumberFormat = _nOldNumberFormat;
break;
case NumberFormat::ALL:
nNumberFormat = NumberFormat::CURRENCY;
@@ -526,6 +529,7 @@ sal_Int16 ODatabaseExport::CheckString(const String& aCheckToken, sal_Int16 _nOl
switch(_nOldNumberFormat)
{
case NumberFormat::NUMBER:
+ nNumberFormat = _nOldNumberFormat;
break;
case NumberFormat::CURRENCY:
nNumberFormat = NumberFormat::CURRENCY;
@@ -549,6 +553,7 @@ sal_Int16 ODatabaseExport::CheckString(const String& aCheckToken, sal_Int16 _nOl
case NumberFormat::DATETIME:
case NumberFormat::TEXT:
case NumberFormat::TIME:
+ nNumberFormat = _nOldNumberFormat;
break;
case NumberFormat::ALL:
nNumberFormat = NumberFormat::DATETIME;
diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx
index 63a910929836..85804dec9d0c 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -227,7 +227,8 @@ sal_Bool OCopyTable::LeavePage()
if ( !aNameCheck.isNameValid( m_edTableName.GetText(), aErrorInfo ) )
{
aErrorInfo.append( SQLExceptionInfo::SQL_CONTEXT, String( ModuleRes( STR_SUGGEST_APPEND_TABLE_DATA ) ) );
- ::dbaui::showError( aErrorInfo, m_pParent, m_pParent->m_xFactory );
+ m_pParent->showError(aErrorInfo.get());
+
return sal_False;
}
@@ -245,7 +246,8 @@ sal_Bool OCopyTable::LeavePage()
sal_Int32 nMaxLength = xMeta->getMaxTableNameLength();
if ( nMaxLength && sTable.getLength() > nMaxLength )
{
- ErrorBox(this, ModuleRes(ERROR_INVALID_TABLE_NAME_LENGTH)).Execute();
+ String sError(ModuleRes(STR_INVALID_TABLE_NAME_LENGTH));
+ m_pParent->showError(sError);
return sal_False;
}
@@ -256,8 +258,7 @@ sal_Bool OCopyTable::LeavePage()
String aInfoString( ModuleRes(STR_WIZ_PKEY_ALREADY_DEFINED) );
aInfoString += String(' ');
aInfoString += String(m_pParent->m_aKeyName);
- InfoBox aNameInfoBox( this, aInfoString );
- aNameInfoBox.Execute();
+ m_pParent->showError(aInfoString);
return sal_False;
}
}
@@ -288,7 +289,8 @@ sal_Bool OCopyTable::LeavePage()
if(!m_pParent->m_sName.getLength())
{
- ErrorBox(this, ModuleRes(ERROR_INVALID_TABLE_NAME)).Execute();
+ String sError(ModuleRes(STR_INVALID_TABLE_NAME));
+ m_pParent->showError(sError);
return sal_False;
}
@@ -367,9 +369,8 @@ sal_Bool OCopyTable::checkAppendData()
if ( !xTable.is() )
{
- ErrorBox( this, ModuleRes( ERROR_INVALID_TABLE_NAME ) ).Execute();
- // TODO: shouldn't this be some kind of showError? In case of the UNO service for this wizard,
- // shouldn't this even be a usage of the service's interaction handler?
+ String sError(ModuleRes(STR_INVALID_TABLE_NAME));
+ m_pParent->showError(sError);
return sal_False;
}
return sal_True;
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx
index 69d5c3bad4fd..12173965f739 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -140,6 +140,7 @@ void OWizColumnSelect::Reset()
clearListBox(m_lbOrgColumnNames);
clearListBox(m_lbNewColumnNames);
+ m_pParent->m_mNameMapping.clear();
// insert the source columns in the left listbox
const ODatabaseExport::TColumnVector* pSrcColumns = m_pParent->getSrcVector();
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 2b664c02f7e2..b178947bf5f9 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -46,6 +46,7 @@
/** === begin UNO includes === **/
#include <com/sun/star/sdb/application/CopyTableOperation.hpp>
+#include <com/sun/star/sdb/SQLContext.hpp>
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
@@ -62,8 +63,10 @@
#include <comphelper/extract.hxx>
#include <comphelper/types.hxx>
+#include <comphelper/interaction.hxx>
#include <connectivity/dbtools.hxx>
#include <connectivity/dbmetadata.hxx>
+#include <connectivity/dbexception.hxx>
#include <rtl/logfile.hxx>
#include <rtl/ustrbuf.hxx>
@@ -80,9 +83,12 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::util;
+using namespace ::com::sun::star::sdb;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::task;
+using namespace dbtools;
namespace CopyTableOperation = ::com::sun::star::sdb::application::CopyTableOperation;
@@ -566,7 +572,8 @@ namespace
//------------------------------------------------------------------------
OCopyTableWizard::OCopyTableWizard( Window * pParent, const ::rtl::OUString& _rDefaultName, sal_Int16 _nOperation,
const ICopyTableSourceObject& _rSourceObject, const Reference< XConnection >& _xSourceConnection,
- const Reference< XConnection >& _xConnection, const Reference< XMultiServiceFactory >& _rxORB )
+ const Reference< XConnection >& _xConnection, const Reference< XMultiServiceFactory >& _rxORB,
+ const Reference< XInteractionHandler>& _xInteractionHandler)
: WizardDialog( pParent, ModuleRes(WIZ_RTFCOPYTABLE))
,m_pbHelp( this , ModuleRes(PB_HELP))
,m_pbCancel( this , ModuleRes(PB_CANCEL))
@@ -578,6 +585,7 @@ OCopyTableWizard::OCopyTableWizard( Window * pParent, const ::rtl::OUString& _rD
,m_rSourceObject( _rSourceObject )
,m_xFormatter( getNumberFormatter( _xConnection, _rxORB ) )
,m_xFactory(_rxORB)
+ ,m_xInteractionHandler(_xInteractionHandler)
,m_sTypeNames(ModuleRes(STR_TABLEDESIGN_DBFIELDTYPES))
,m_nPageCount(0)
,m_bDeleteSourceColumns(sal_True)
@@ -701,6 +709,8 @@ OCopyTableWizard::OCopyTableWizard( Window* pParent, const ::rtl::OUString& _rDe
::dbaui::fillTypeInfo( _xConnection, m_sTypeNames, m_aTypeInfo, m_aTypeInfoIndex );
::dbaui::fillTypeInfo( _xConnection, m_sTypeNames, m_aDestTypeInfo, m_aDestTypeInfoIndex );
+ m_xInteractionHandler.set( m_xFactory->createInstance( SERVICE_SDB_INTERACTION_HANDLER ), UNO_QUERY);
+
OCopyTable* pPage1( new OCopyTable( this ) );
pPage1->disallowViews();
pPage1->setCreateStyleAction();
@@ -924,6 +934,7 @@ IMPL_LINK( OCopyTableWizard, ImplOKHdl, OKButton*, EMPTYARG )
OWizTypeSelect* pPage = static_cast<OWizTypeSelect*>(GetPage(3));
if ( pPage )
{
+ m_mNameMapping.clear();
pPage->setDisplayRow(nBreakPos);
ShowPage(3);
return 0;
@@ -935,33 +946,37 @@ IMPL_LINK( OCopyTableWizard, ImplOKHdl, OKButton*, EMPTYARG )
{
ODatabaseExport::TColumns::iterator aFind = ::std::find_if(m_vDestColumns.begin(),m_vDestColumns.end()
,::std::compose1(::std::mem_fun(&OFieldDescription::IsPrimaryKey),::std::select2nd<ODatabaseExport::TColumns::value_type>()));
- if ( aFind == m_vDestColumns.end() )
+ if ( aFind == m_vDestColumns.end() && m_xInteractionHandler.is() )
{
+
String sTitle(ModuleRes(STR_TABLEDESIGN_NO_PRIM_KEY_HEAD));
String sMsg(ModuleRes(STR_TABLEDESIGN_NO_PRIM_KEY));
- OSQLMessageBox aBox(this, sTitle,sMsg, WB_YES_NO_CANCEL | WB_DEF_YES);
-
- INT16 nReturn = aBox.Execute();
-
- switch(nReturn )
+ SQLContext aError;
+ aError.Message = sMsg;
+ ::rtl::Reference< ::comphelper::OInteractionRequest > xRequest( new ::comphelper::OInteractionRequest( makeAny( aError ) ) );
+ ::rtl::Reference< ::comphelper::OInteractionApprove > xYes = new ::comphelper::OInteractionApprove;
+ xRequest->addContinuation( xYes.get() );
+ xRequest->addContinuation( new ::comphelper::OInteractionDisapprove );
+ ::rtl::Reference< ::comphelper::OInteractionAbort > xAbort = new ::comphelper::OInteractionAbort;
+ xRequest->addContinuation( xAbort.get() );
+
+ m_xInteractionHandler->handle( xRequest.get() );
+
+ if ( xYes->wasSelected() )
{
- case RET_YES:
- {
- OCopyTable* pPage = static_cast<OCopyTable*>(GetPage(0));
- m_bCreatePrimaryKeyColumn = sal_True;
- m_aKeyName = pPage->GetKeyName();
- if ( !m_aKeyName.getLength() )
- m_aKeyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ID" ) );
- m_aKeyName = createUniqueName( m_aKeyName );
- sal_Int32 nBreakPos2 = 0;
- CheckColumns(nBreakPos2);
- break;
- }
- case RET_CANCEL:
- ShowPage(3);
- return 0;
- default:
- ;
+ OCopyTable* pPage = static_cast<OCopyTable*>(GetPage(0));
+ m_bCreatePrimaryKeyColumn = sal_True;
+ m_aKeyName = pPage->GetKeyName();
+ if ( !m_aKeyName.getLength() )
+ m_aKeyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ID" ) );
+ m_aKeyName = createUniqueName( m_aKeyName );
+ sal_Int32 nBreakPos2 = 0;
+ CheckColumns(nBreakPos2);
+ }
+ else if ( xAbort->wasSelected() )
+ {
+ ShowPage(3);
+ return 0;
}
}
}
@@ -1601,6 +1616,22 @@ TOTypeInfoSP OCopyTableWizard::convertType(const TOTypeInfoSP& _pType,sal_Bool&
if ( supportsType(DataType::CLOB,nDefaultType) )
break;
break;
+ case DataType::BINARY:
+ if ( supportsType(DataType::VARBINARY,nDefaultType) )
+ break;
+ break;
+ case DataType::VARBINARY:
+ if ( supportsType(DataType::LONGVARBINARY,nDefaultType) )
+ break;
+ break;
+ case DataType::LONGVARBINARY:
+ if ( supportsType(DataType::BLOB,nDefaultType) )
+ break;
+ if ( supportsType(DataType::LONGVARCHAR,nDefaultType) )
+ break;
+ if ( supportsType(DataType::CLOB,nDefaultType) )
+ break;
+ break;
default:
nDefaultType = DataType::VARCHAR;
}
@@ -1646,7 +1677,28 @@ void OCopyTableWizard::showColumnTypeNotSupported(const ::rtl::OUString& _rColum
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::showColumnTypeNotSupported" );
String sMessage( ModuleRes( STR_UNKNOWN_TYPE_FOUND ) );
sMessage.SearchAndReplaceAscii("#1",_rColumnName);
-
- OSQLWarningBox( this, sMessage ).Execute();
+ showError(sMessage);
+}
+//-------------------------------------------------------------------------------
+void OCopyTableWizard::showError(const ::rtl::OUString& _sErrorMesage)
+{
+ SQLExceptionInfo aInfo(_sErrorMesage);
+ showError(aInfo.get());
}
//-------------------------------------------------------------------------------
+void OCopyTableWizard::showError(const Any& _aError)
+{
+ if ( _aError.hasValue() && m_xInteractionHandler.is() )
+ {
+ try
+ {
+ ::rtl::Reference< ::comphelper::OInteractionRequest > xRequest( new ::comphelper::OInteractionRequest( _aError ) );
+ m_xInteractionHandler->handle( xRequest.get() );
+ }
+ catch( const Exception& )
+ {
+ DBG_UNHANDLED_EXCEPTION();
+ }
+ }
+}
+
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index ceeb058528df..a964b0e13d38 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -178,7 +178,7 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId )
{
String strMessage = String(ModuleRes(STR_TABLEDESIGN_DUPLICATE_NAME));
strMessage.SearchAndReplaceAscii("$column$", sNewName);
- OSQLWarningBox( this, strMessage ).Execute();
+ pWiz->showError(strMessage);
pCurFieldDescr->SetName(sName);
DisplayData(pCurFieldDescr);
static_cast<OWizTypeSelect*>(GetParent())->setDuplicateName(sal_True);
diff --git a/dbaccess/source/ui/misc/WizardPages.src b/dbaccess/source/ui/misc/WizardPages.src
index 638feb92e54c..329f08b222d9 100644
--- a/dbaccess/source/ui/misc/WizardPages.src
+++ b/dbaccess/source/ui/misc/WizardPages.src
@@ -552,20 +552,18 @@ String STR_COPYTABLE_TITLE_COPY
Text [ en-US ] = "Copy table" ;
};
-ErrorBox ERROR_INVALID_TABLE_NAME
+String STR_INVALID_TABLE_NAME
{
- Buttons = WB_OK;
- Message [ en-US ] = "This table name is not valid in the current database.";
+ Text [ en-US ] = "This table name is not valid in the current database.";
};
String STR_SUGGEST_APPEND_TABLE_DATA
{
Text [ en-US ] = "Choose the option 'Append data' on the first page to append data to an existing table.";
};
-ErrorBox ERROR_INVALID_TABLE_NAME_LENGTH
+String STR_INVALID_TABLE_NAME_LENGTH
{
- Buttons = WB_OK;
- Message [ en-US ] = "Please change the table name. It is too long.";
+ Text [ en-US ] = "Please change the table name. It is too long.";
};
Image IMG_SORTUP_H
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index b8fd1f5f972f..83ed283a4836 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -186,11 +186,6 @@ namespace
sal_Bool bHaving,
bool _bAddOrOnOneLine);
- void fillFunctionInfo( OQueryDesignView* _pView
- ,const ::connectivity::OSQLParseNode* pNode
- ,const ::rtl::OUString& sFunctionTerm
- ,OTableFieldDescRef& aInfo);
-
//------------------------------------------------------------------------------
::rtl::OUString quoteTableAlias(sal_Bool _bQuote, const ::rtl::OUString& _sAliasName, const ::rtl::OUString& _sQuote)
{
@@ -2180,35 +2175,6 @@ namespace
return eErrorCode;
}
//------------------------------------------------------------------------------
- void fillFunctionInfo( OQueryDesignView* _pView
- ,const ::connectivity::OSQLParseNode* pNode
- ,const ::rtl::OUString& sFunctionTerm
- ,OTableFieldDescRef& aInfo)
- {
- // get the type out of the funtion name
- OQueryController& rController = static_cast<OQueryController&>(_pView->getController());
- sal_Int32 nDataType = DataType::DOUBLE;
- ::rtl::OUString sFieldName = sFunctionTerm;
- OSQLParseNode* pFunctionName = pNode->getChild(0);
- if ( !SQL_ISPUNCTUATION(pFunctionName,"{") )
- {
- if ( SQL_ISRULEOR2(pNode,length_exp,char_value_fct) )
- pFunctionName = pFunctionName->getChild(0);
-
- ::rtl::OUString sFunctionName = pFunctionName->getTokenValue();
- if ( !sFunctionName.getLength() )
- sFunctionName = ::rtl::OStringToOUString(OSQLParser::TokenIDToStr(pFunctionName->getTokenID()),RTL_TEXTENCODING_UTF8);
-
- nDataType = OSQLParser::getFunctionReturnType(
- sFunctionName
- ,&rController.getParser().getContext());
- }
- aInfo->SetDataType(nDataType);
- aInfo->SetFieldType(TAB_NORMAL_FIELD);
- aInfo->SetField(sFieldName);
- aInfo->SetTabWindow(NULL);
- }
- //------------------------------------------------------------------------------
SqlParseError InstallFields(OQueryDesignView* _pView,
const ::connectivity::OSQLParseNode* pNode,
OJoinTableView::OTableWindowMap* pTabList )
@@ -2216,7 +2182,7 @@ namespace
if( pNode==0 || !SQL_ISRULE(pNode,select_statement))
return eNoSelectStatement;
- ::connectivity::OSQLParseNode* pParseTree = pNode->getChild(2);
+ ::connectivity::OSQLParseNode* pParseTree = pNode->getChild(2); // selection
sal_Bool bFirstField = sal_True; // bei der Initialisierung muß auf alle Faelle das erste Feld neu aktiviert werden
SqlParseError eErrorCode = eOk;
@@ -2247,9 +2213,6 @@ namespace
if ( SQL_ISRULE(pColumnRef,derived_column) )
{
- if ( !xConnection.is() )
- break;
-
::rtl::OUString aColumnAlias(rController.getParseIterator().getColumnAlias(pColumnRef)); // kann leer sein
pColumnRef = pColumnRef->getChild(0);
OTableFieldDescRef aInfo = new OTableFieldDesc();
@@ -2330,7 +2293,7 @@ namespace
}
else
{
- fillFunctionInfo(_pView,pColumnRef,aColumns,aInfo);
+ _pView->fillFunctionInfo(pColumnRef,aColumns,aInfo);
aInfo->SetFieldAlias(aColumnAlias);
}
@@ -2451,7 +2414,7 @@ namespace
_pView->getLocale(),
static_cast<sal_Char>(_pView->getDecimalSeparator().toChar()),
&rController.getParser().getContext());
- fillFunctionInfo(_pView,pArgument,sCondition,aDragLeft);
+ _pView->fillFunctionInfo(pArgument,sCondition,aDragLeft);
aDragLeft->SetFunctionType(FKT_OTHER);
aDragLeft->SetOrderDir(eOrderDir);
aDragLeft->SetVisible(sal_False);
@@ -2483,7 +2446,7 @@ namespace
const ::connectivity::OSQLParseNode* pSelectRoot )
{
SqlParseError eErrorCode = eOk;
- if (!pSelectRoot->getChild(3)->getChild(2)->isLeaf())
+ if (!pSelectRoot->getChild(3)->getChild(2)->isLeaf()) // opt_group_by_clause
{
OQueryController& rController = static_cast<OQueryController&>(_pView->getController());
::connectivity::OSQLParseNode* pGroupBy = pSelectRoot->getChild(3)->getChild(2)->getChild(2);
@@ -2518,7 +2481,7 @@ namespace
&rController.getParser().getContext(),
sal_True,
sal_True); // quote is to true because we need quoted elements inside the function
- fillFunctionInfo(_pView,pArgument,sGroupByExpression,aDragInfo);
+ _pView->fillFunctionInfo(pArgument,sGroupByExpression,aDragInfo);
aDragInfo->SetFunctionType(FKT_OTHER);
aDragInfo->SetGroupBy(sal_True);
aDragInfo->SetVisible(sal_False);
@@ -3242,4 +3205,32 @@ bool OQueryDesignView::initByParseIterator( ::dbtools::SQLExceptionInfo* _pError
}
return eErrorCode == eOk;
}
+//------------------------------------------------------------------------------
+void OQueryDesignView::fillFunctionInfo( const ::connectivity::OSQLParseNode* pNode
+ ,const ::rtl::OUString& sFunctionTerm
+ ,OTableFieldDescRef& aInfo)
+{
+ // get the type out of the funtion name
+ OQueryController& rController = static_cast<OQueryController&>(getController());
+ sal_Int32 nDataType = DataType::DOUBLE;
+ ::rtl::OUString sFieldName = sFunctionTerm;
+ OSQLParseNode* pFunctionName = pNode->getChild(0);
+ if ( !SQL_ISPUNCTUATION(pFunctionName,"{") )
+ {
+ if ( SQL_ISRULEOR2(pNode,length_exp,char_value_fct) )
+ pFunctionName = pFunctionName->getChild(0);
+
+ ::rtl::OUString sFunctionName = pFunctionName->getTokenValue();
+ if ( !sFunctionName.getLength() )
+ sFunctionName = ::rtl::OStringToOUString(OSQLParser::TokenIDToStr(pFunctionName->getTokenID()),RTL_TEXTENCODING_UTF8);
+
+ nDataType = OSQLParser::getFunctionReturnType(
+ sFunctionName
+ ,&rController.getParser().getContext());
+ }
+ aInfo->SetDataType(nDataType);
+ aInfo->SetFieldType(TAB_NORMAL_FIELD);
+ aInfo->SetField(sFieldName);
+ aInfo->SetTabWindow(NULL);
+}
// -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 27ad175c071c..1b468b2a69c9 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -890,78 +890,56 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes
OSL_ENSURE(0,"Unsupported function inserted!");
}
- else if( SQL_ISRULEOR2(pColumnRef,position_exp,extract_exp) ||
- SQL_ISRULEOR2(pColumnRef,fold,char_substring_fct) ||
- SQL_ISRULEOR2(pColumnRef,length_exp,char_value_fct) )
- // a calculation has been found ( can be calc and function )
+ else
{
- // append the whole text as field name
// so we first clear the function field
clearEntryFunctionField(_sFieldName,aSelEntry,_bListAction,nColumnId);
- sal_Bool bQuote = sal_True;
- sal_Int32 nDataType = DataType::DOUBLE;
- OSQLParseNode* pFunctionName = pColumnRef->getChild(0);
- if ( !SQL_ISPUNCTUATION(pFunctionName,"{") )
+ ::rtl::OUString sFunction;
+ pColumnRef->parseNodeToStr( sFunction,
+ xConnection,
+ &rController.getParser().getContext(),
+ sal_True,
+ sal_True); // quote is to true because we need quoted elements inside the function
+
+ getDesignView()->fillFunctionInfo(pColumnRef,sFunction,aSelEntry);
+
+ if( SQL_ISRULEOR2(pColumnRef,position_exp,extract_exp) ||
+ SQL_ISRULEOR2(pColumnRef,fold,char_substring_fct) ||
+ SQL_ISRULEOR2(pColumnRef,length_exp,char_value_fct) )
+ // a calculation has been found ( can be calc and function )
{
- if ( SQL_ISRULEOR2(pColumnRef,length_exp,char_value_fct) )
- pFunctionName = pFunctionName->getChild(0);
+ // now parse the whole statement
+ sal_uInt32 nFunCount = pColumnRef->count();
+ ::rtl::OUString sParameters;
+ for(sal_uInt32 function = 0; function < nFunCount; ++function)
+ pColumnRef->getChild(function)->parseNodeToStr( sParameters, xConnection, &rParser.getContext(), sal_True, sal_True );
- if ( pFunctionName )
+ sOldAlias = aSelEntry->GetAlias();
+ sal_Int32 nNewFunctionType = aSelEntry->GetFunctionType() | FKT_NUMERIC | FKT_OTHER;
+ aSelEntry->SetFunctionType(nNewFunctionType);
+ aSelEntry->SetField(sParameters);
+ }
+ else
+ {
+ aSelEntry->SetFieldAlias(sColumnAlias);
+ if ( SQL_ISRULE(pColumnRef,set_fct_spec) )
+ aSelEntry->SetFunctionType(/*FKT_NUMERIC | */FKT_OTHER);
+ else
{
- ::rtl::OUString sFunctionName = pFunctionName->getTokenValue();
- if ( !sFunctionName.getLength() )
- sFunctionName = ::rtl::OStringToOUString(OSQLParser::TokenIDToStr(pFunctionName->getTokenID()),RTL_TEXTENCODING_MS_1252);
-
- nDataType = OSQLParser::getFunctionReturnType(
- sFunctionName
- ,&rController.getParser().getContext());
- aSelEntry->SetDataType(nDataType);
+ if ( SQL_ISRULEOR2(pColumnRef,num_value_exp,term) || SQL_ISRULE(pColumnRef,factor) )
+ aSelEntry->SetDataType(DataType::DOUBLE);
+ else if ( SQL_ISRULE(pColumnRef,value_exp) )
+ aSelEntry->SetDataType(DataType::TIMESTAMP);
+ else
+ aSelEntry->SetDataType(DataType::VARCHAR);
+ aSelEntry->SetFunctionType(FKT_NUMERIC | FKT_OTHER);
}
}
-
- // now parse the whole statement
- sal_uInt32 nFunCount = pColumnRef->count();
- ::rtl::OUString sParameters;
- for(sal_uInt32 function = 0; function < nFunCount; ++function)
- pColumnRef->getChild(function)->parseNodeToStr( sParameters, xConnection, &rParser.getContext(), sal_True, bQuote );
-
- ::rtl::OUString aSelectionAlias = aSelEntry->GetAlias();
aSelEntry->SetAlias(::rtl::OUString());
-
- sal_Int32 nNewFunctionType = aSelEntry->GetFunctionType() | FKT_NUMERIC | FKT_OTHER;
- aSelEntry->SetFunctionType(nNewFunctionType);
-
-
- aSelEntry->SetFieldType(TAB_NORMAL_FIELD);
-
- aSelEntry->SetTabWindow(NULL);
-
- aSelEntry->SetField(sParameters);
- notifyTableFieldChanged(aSelectionAlias,aSelEntry->GetAlias(),_bListAction, nColumnId);
- }
- else
- {
- clearEntryFunctionField(_sFieldName,aSelEntry,_bListAction,nColumnId);
-
- ::rtl::OUString aColumns;
- pColumnRef->parseNodeToStr( aColumns,
- xConnection,
- &rController.getParser().getContext(),
- sal_True,
- sal_True);
- // get the type out of the funtion name
- sal_Int32 nDataType = DataType::DOUBLE;
- aSelEntry->SetDataType(nDataType);
- aSelEntry->SetField(aColumns);
- aSelEntry->SetFieldType(TAB_NORMAL_FIELD);
- aSelEntry->SetTabWindow(NULL);
- aSelEntry->SetAlias(::rtl::OUString());
- aSelEntry->SetFieldAlias(sColumnAlias);
- aSelEntry->SetFunctionType(FKT_NUMERIC | FKT_OTHER);
-
notifyTableFieldChanged(sOldAlias,aSelEntry->GetAlias(),_bListAction, nColumnId);
}
+
}
if ( i > 0 && InsertField(aSelEntry,BROWSER_INVALIDID,sal_True,sal_False).isEmpty() ) // may we have to append more than one field
{ // the field could not be isnerted
@@ -1807,25 +1785,23 @@ void OSelectionBrowseBox::AddGroupBy( const OTableFieldDescRef& rInfo , sal_uInt
pEntry->GetFunctionType() == rInfo->GetFunctionType() &&
pEntry->GetFunction() == rInfo->GetFunction())
{
- /*sal_uInt32 nPos = aIter - rFields.begin();
- bAppend = _nCurrentPos > nPos && (rInfo->IsGroupBy() != pEntry->IsGroupBy());
- if ( bAppend )
+ if ( pEntry->isNumericOrAggreateFunction() && rInfo->IsGroupBy() )
+ {
+ pEntry->SetGroupBy(sal_False);
aIter = rFields.end();
- else*/
+ break;
+ }
+ else
{
- if ( pEntry->isNumericOrAggreateFunction() && rInfo->IsGroupBy() )
- {
- pEntry->SetGroupBy(sal_False);
- aIter = rFields.end();
- }
- else
+ if ( !pEntry->IsGroupBy() && !pEntry->HasCriteria() ) // here we have a where condition which is no having clause
{
pEntry->SetGroupBy(rInfo->IsGroupBy());
if(!m_bGroupByUnRelated && pEntry->IsGroupBy())
pEntry->SetVisible(sal_True);
+ break;
}
}
- break;
+
}
}
@@ -1887,13 +1863,14 @@ void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const S
if (bCase(aField,rInfo->GetField()) &&
bCase(aAlias,rInfo->GetAlias()) &&
pEntry->GetFunctionType() == rInfo->GetFunctionType() &&
- pEntry->GetFunction() == rInfo->GetFunction())
+ pEntry->GetFunction() == rInfo->GetFunction() &&
+ pEntry->IsGroupBy() == rInfo->IsGroupBy() )
{
if ( pEntry->isNumericOrAggreateFunction() && rInfo->IsGroupBy() )
pEntry->SetGroupBy(sal_False);
else
{
- pEntry->SetGroupBy(rInfo->IsGroupBy());
+// pEntry->SetGroupBy(rInfo->IsGroupBy());
if(!m_bGroupByUnRelated && pEntry->IsGroupBy())
pEntry->SetVisible(sal_True);
}
@@ -2890,7 +2867,7 @@ bool OSelectionBrowseBox::HasFieldByAliasName(const ::rtl::OUString& rFieldName,
{
if ( (*aIter)->GetFieldAlias() == rFieldName )
{
- rInfo = *aIter;
+ rInfo.getBody() = (*aIter).getBody();
break;
}
}
diff --git a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
index 0949c8f5dc11..a00bc3dbd54c 100644
--- a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
+++ b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
@@ -69,24 +69,10 @@ OTableFieldDesc::OTableFieldDesc()
//------------------------------------------------------------------------------
OTableFieldDesc::OTableFieldDesc(const OTableFieldDesc& rRS)
: ::vos::OReference()
- ,m_vecCriteria( rRS.m_vecCriteria)
- ,m_aTableName(rRS.GetTable())
- ,m_aAliasName(rRS.GetAlias()) // table range
- ,m_aFieldName(rRS.GetField()) // column
- ,m_aFieldAlias(rRS.GetFieldAlias()) // column alias
- ,m_aFunctionName(rRS.GetFunction()) // Funktionsname
- ,m_pTabWindow(rRS.GetTabWindow())
- ,m_eDataType(rRS.GetDataType())
- ,m_eFunctionType( rRS.GetFunctionType() )
- ,m_eFieldType(rRS.GetFieldType())
- ,m_eOrderDir(rRS.GetOrderDir())
- ,m_nIndex(rRS.GetFieldIndex())
- ,m_nColWidth(rRS.GetColWidth())
- ,m_nColumnId( rRS.m_nColumnId)
- ,m_bGroupBy(rRS.IsGroupBy())
- ,m_bVisible(rRS.IsVisible())
+
{
DBG_CTOR(OTableFieldDesc,NULL);
+ *this = rRS;
}
//------------------------------------------------------------------------------
@@ -107,7 +93,31 @@ OTableFieldDesc::~OTableFieldDesc()
{
DBG_DTOR(OTableFieldDesc,NULL);
}
-
+//------------------------------------------------------------------------------
+OTableFieldDesc& OTableFieldDesc::operator=( const OTableFieldDesc& rRS )
+{
+ if (&rRS == this)
+ return *this;
+
+ m_vecCriteria = rRS.m_vecCriteria;
+ m_aTableName = rRS.GetTable();
+ m_aAliasName = rRS.GetAlias(); // table range
+ m_aFieldName = rRS.GetField(); // column
+ m_aFieldAlias = rRS.GetFieldAlias(); // column alias
+ m_aFunctionName = rRS.GetFunction(); // Funktionsname
+ m_pTabWindow = rRS.GetTabWindow();
+ m_eDataType = rRS.GetDataType();
+ m_eFunctionType = rRS.GetFunctionType();
+ m_eFieldType = rRS.GetFieldType();
+ m_eOrderDir = rRS.GetOrderDir();
+ m_nIndex = rRS.GetFieldIndex();
+ m_nColWidth = rRS.GetColWidth();
+ m_nColumnId = rRS.m_nColumnId;
+ m_bGroupBy = rRS.IsGroupBy();
+ m_bVisible = rRS.IsVisible();
+
+ return *this;
+}
//------------------------------------------------------------------------------
sal_Bool OTableFieldDesc::operator==( const OTableFieldDesc& rDesc )
{
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index ce79281f0cac..aa2b87fca329 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -70,6 +70,7 @@
#include <comphelper/interaction.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/proparrhlp.hxx>
+#include <comphelper/string.hxx>
#include <connectivity/dbexception.hxx>
#include <connectivity/dbtools.hxx>
#include <cppuhelper/exc_hlp.hxx>
@@ -775,9 +776,8 @@ void CopyTableWizard::impl_checkForUnsupportedSettings_throw( const Reference< X
if ( sUnsupportedSetting.getLength() != 0 )
{
- ::rtl::OUString sMessage( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unsupported setting in the copy source descriptor: $name$." ) ) );
- // TODO: resource
- sMessage = sMessage.replaceAt( sMessage.indexOfAsciiL( "$name$", 6 ), 6, sUnsupportedSetting );
+ ::rtl::OUString sMessage( String(ModuleRes( STR_CTW_ERROR_UNSUPPORTED_SETTING )) );
+ ::comphelper::string::searchAndReplaceAsciiI( sMessage, "$name$", sUnsupportedSetting );
throw IllegalArgumentException(
sMessage,
*const_cast< CopyTableWizard* >( this ),
@@ -849,8 +849,7 @@ void CopyTableWizard::impl_checkForUnsupportedSettings_throw( const Reference< X
if ( _out_rCommandType == CommandType::QUERY )
// we cannot copy a query if the connection cannot provide it ...
throw IllegalArgumentException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "To copy a query, your connection must be able to provide queries." ) ),
- // TODO: resource
+ String(ModuleRes( STR_CTW_ERROR_NO_QUERY )),
*const_cast< CopyTableWizard* >( this ),
1
);
@@ -1516,8 +1515,7 @@ void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments )
{ // ->createWithInteractionHandler
if ( !( _rArguments[2] >>= m_xInteractionHandler ) )
throw IllegalArgumentException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "The given interaction handler is invalid." ) ),
- // TODO: resource
+ String(ModuleRes( STR_CTW_ERROR_INVALID_INTERACTIONHANDLER )),
*this,
3
);
@@ -1578,7 +1576,8 @@ Dialog* CopyTableWizard::createDialog( Window* _pParent )
*m_pSourceObject,
m_xSourceConnection.getTyped(),
m_xDestConnection.getTyped(),
- m_aContext.getLegacyServiceFactory()
+ m_aContext.getLegacyServiceFactory(),
+ m_xInteractionHandler
);
impl_attributesToDialog_nothrow( *pWizard );
diff --git a/dbaccess/source/ui/uno/copytablewizard.src b/dbaccess/source/ui/uno/copytablewizard.src
index 07db51196ce2..4bb6efc839cc 100644
--- a/dbaccess/source/ui/uno/copytablewizard.src
+++ b/dbaccess/source/ui/uno/copytablewizard.src
@@ -69,3 +69,15 @@ String STR_CTW_ERROR_DURING_INITIALIZATION
{
Text [ en-US ] = "An error occurred during initialization.";
};
+String STR_CTW_ERROR_UNSUPPORTED_SETTING
+{
+ Text [ en-US ] = "Unsupported setting in the copy source descriptor: $name$.";
+};
+String STR_CTW_ERROR_NO_QUERY
+{
+ Text [ en-US ] = "To copy a query, your connection must be able to provide queries.";
+};
+String STR_CTW_ERROR_INVALID_INTERACTIONHANDLER
+{
+ Text [ en-US ] = "The given interaction handler is invalid.";
+};
diff --git a/default_images/sc/res/popup_select_current.png b/default_images/sc/res/popup_select_current.png
new file mode 100644
index 000000000000..475b5b183bf4
--- /dev/null
+++ b/default_images/sc/res/popup_select_current.png
Binary files differ
diff --git a/default_images/sc/res/popup_unselect_current.png b/default_images/sc/res/popup_unselect_current.png
new file mode 100644
index 000000000000..3c764e203a02
--- /dev/null
+++ b/default_images/sc/res/popup_unselect_current.png
Binary files differ
diff --git a/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx
index 8a4f55caae1a..013ba0e2ce23 100644
--- a/desktop/source/deployment/misc/dp_ucb.cxx
+++ b/desktop/source/deployment/misc/dp_ucb.cxx
@@ -40,7 +40,6 @@
#include "xmlscript/xml_helper.hxx"
#include "com/sun/star/io/XInputStream.hpp"
#include "com/sun/star/ucb/CommandFailedException.hpp"
-#include "com/sun/star/ucb/XContentCreator.hpp"
#include "com/sun/star/ucb/ContentInfo.hpp"
#include "com/sun/star/ucb/ContentInfoAttribute.hpp"
@@ -130,50 +129,46 @@ bool create_folder(
if (! create_folder(
&parentContent, url.copy( 0, slash ), xCmdEnv, throw_exc ))
return false;
- Reference<XContentCreator> xCreator( parentContent.get(), UNO_QUERY );
- if (xCreator.is())
+ const Any title( ::rtl::Uri::decode( url.copy( slash + 1 ),
+ rtl_UriDecodeWithCharset,
+ RTL_TEXTENCODING_UTF8 ) );
+ const Sequence<ContentInfo> infos(
+ parentContent.queryCreatableContentsInfo() );
+ for ( sal_Int32 pos = 0; pos < infos.getLength(); ++pos )
{
- const Any title( ::rtl::Uri::decode( url.copy( slash + 1 ),
- rtl_UriDecodeWithCharset,
- RTL_TEXTENCODING_UTF8 ) );
- const Sequence<ContentInfo> infos(
- xCreator->queryCreatableContentsInfo() );
- for ( sal_Int32 pos = 0; pos < infos.getLength(); ++pos )
+ // look KIND_FOLDER:
+ ContentInfo const & info = infos[ pos ];
+ if ((info.Attributes & ContentInfoAttribute::KIND_FOLDER) != 0)
{
- // look KIND_FOLDER:
- ContentInfo const & info = infos[ pos ];
- if ((info.Attributes & ContentInfoAttribute::KIND_FOLDER) != 0)
- {
- // make sure the only required bootstrap property is "Title":
- Sequence<beans::Property> const & rProps = info.Properties;
- if (rProps.getLength() != 1 ||
- !rProps[ 0 ].Name.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM("Title") ))
- continue;
+ // make sure the only required bootstrap property is "Title":
+ Sequence<beans::Property> const & rProps = info.Properties;
+ if (rProps.getLength() != 1 ||
+ !rProps[ 0 ].Name.equalsAsciiL(
+ RTL_CONSTASCII_STRINGPARAM("Title") ))
+ continue;
- try {
- if (parentContent.insertNewContent(
- info.Type,
- Sequence<OUString>( &StrTitle::get(), 1 ),
- Sequence<Any>( &title, 1 ),
- ucb_content )) {
- if (ret_ucb_content != 0)
- *ret_ucb_content = ucb_content;
- return true;
- }
+ try {
+ if (parentContent.insertNewContent(
+ info.Type,
+ Sequence<OUString>( &StrTitle::get(), 1 ),
+ Sequence<Any>( &title, 1 ),
+ ucb_content )) {
+ if (ret_ucb_content != 0)
+ *ret_ucb_content = ucb_content;
+ return true;
}
- catch (RuntimeException &) {
+ }
+ catch (RuntimeException &) {
+ throw;
+ }
+ catch (CommandFailedException &) {
+ // Interaction Handler already handled the error
+ // that has occured...
+ }
+ catch (Exception &) {
+ if (throw_exc)
throw;
- }
- catch (CommandFailedException &) {
- // Interaction Handler already handled the error
- // that has occured...
- }
- catch (Exception &) {
- if (throw_exc)
- throw;
- return false;
- }
+ return false;
}
}
}
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 7daa9adb277e..4477d9ba101d 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -41,7 +41,7 @@
#include "svl/inettype.hxx"
#include "unotools/pathoptions.hxx"
-#include <transex3/compilehelp.hxx>
+#include <l10ntools/compilehelp.hxx>
#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
#include <com/sun/star/util/XMacroExpander.hpp>
#include <com/sun/star/uri/XUriReferenceFactory.hpp>
diff --git a/desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java b/desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java
index 4628034723e1..e920bc098219 100644
--- a/desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java
+++ b/desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java
@@ -95,12 +95,12 @@ public class SystemEnvironment {
this.systemManufacturer = "";
this.cpuManufacturer = "";
this.serialNumber = "";
- this.physmem = "";
- this.sockets = "";
- this.cores = "";
- this.virtcpus = "";
+ this.physmem = "0";
+ this.sockets = "0";
+ this.cores = "0";
+ this.virtcpus = "0";
this.cpuname = "";
- this.clockrate = "";
+ this.clockrate = "0";
}
@@ -173,6 +173,8 @@ public class SystemEnvironment {
* @param physmem The physmem to set.
*/
public void setPhysMem(String physmem) {
+ if (physmem.length() == 0)
+ physmem = "0";
this.physmem = physmem;
}
@@ -181,6 +183,8 @@ public class SystemEnvironment {
* @param sockets The sockets to set.
*/
public void setSockets(String sockets) {
+ if (sockets.length() == 0)
+ sockets = "0";
this.sockets = sockets;
}
@@ -189,6 +193,8 @@ public class SystemEnvironment {
* @param cores The cores to set.
*/
public void setCores(String cores) {
+ if (cores.length() == 0)
+ cores ="0";
this.cores = cores;
}
@@ -197,6 +203,8 @@ public class SystemEnvironment {
* @param virtcpus The virtcpus to set.
*/
public void setVirtCpus(String virtcpus) {
+ if (virtcpus.length() == 0)
+ virtcpus = "0";
this.virtcpus = virtcpus;
}
@@ -213,9 +221,14 @@ public class SystemEnvironment {
* @param clockrate The clockrate to set.
*/
public void setClockRate(String clockrate) {
- Float f = Float.parseFloat(clockrate);
- Integer nClockrate = f.intValue();
- this.clockrate = nClockrate.toString();
+ if (clockrate.length() == 0)
+ this.clockrate = "0";
+ else
+ {
+ Float f = Float.parseFloat(clockrate);
+ Integer nClockrate = f.intValue();
+ this.clockrate = nClockrate.toString();
+ }
}
/**
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 5a74b0471b7f..bb7635913dce 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -70,6 +70,9 @@
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <drawinglayer/primitive2d/epsprimitive2d.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
+#include <vcl/window.hxx>
+
//////////////////////////////////////////////////////////////////////////////
using namespace com::sun::star;
diff --git a/extensions/source/update/feed/makefile.mk b/extensions/source/update/feed/makefile.mk
index ecb5957df9b7..30f0fdeb00a8 100644
--- a/extensions/source/update/feed/makefile.mk
+++ b/extensions/source/update/feed/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -43,27 +43,21 @@ ENABLE_EXCEPTIONS=TRUE
# no "lib" prefix
DLLPRE =
-.IF "$(SYSTEM_ZLIB)" == "YES"
-CFLAGS+=-DSYSTEM_ZLIB
-.ENDIF
-
# --- Files ---
-
SLOFILES=\
$(SLO)$/updatefeed.obj \
-
+
SHL1NOCHECK=TRUE
-SHL1TARGET=$(TARGET).uno
+SHL1TARGET=$(TARGET).uno
SHL1OBJS=$(SLOFILES)
SHL1IMPLIB=i$(SHL1TARGET)
SHL1STDLIBS= \
$(CPPUHELPERLIB) \
$(CPPULIB) \
- $(SALLIB) \
- $(ZLIB3RDLIB)
-
+ $(SALLIB)
+
SHL1VERSIONMAP=..$/exports.map
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
DEF1NAME=$(SHL1TARGET)
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index bed6bed85bc3..8d33e63b5770 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -32,7 +32,7 @@
#include "precompiled_extensions.hxx"
#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase4.hxx>
#include <cppuhelper/implementationentry.hxx>
#include <com/sun/star/beans/Property.hpp>
#include <com/sun/star/beans/XPropertySetInfo.hpp>
@@ -44,26 +44,16 @@
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/task/XPasswordContainer.hpp>
-#include "com/sun/star/task/NoMasterException.hpp"
-#include "com/sun/star/ucb/AuthenticationRequest.hpp"
-#ifndef _COM_SUN_STAR_UCB_XCOMMMANDENVIRONMENT_HPP_
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
-#endif
-#ifndef _COM_SUN_STAR_UCB_XWEBDAVCOMMMANDENVIRONMENT_HPP_
#include <com/sun/star/ucb/XWebDAVCommandEnvironment.hpp>
-#endif
-#ifndef _COM_SUN_STAR_UCB_XCOMMMANDPROCESSOR2_HPP_
#include <com/sun/star/ucb/XCommandProcessor2.hpp>
-#endif
-#ifndef _COM_SUN_STAR_UCB_XCONTENTIDNETIFIERFACTORY_HPP_
#include <com/sun/star/ucb/XContentIdentifierFactory.hpp>
-#endif
#include <com/sun/star/ucb/XContentProvider.hpp>
#include "com/sun/star/ucb/XInteractionSupplyAuthentication.hpp"
#include <com/sun/star/ucb/OpenCommandArgument2.hpp>
#include <com/sun/star/ucb/OpenMode.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
+#include <com/sun/star/task/PasswordContainerInteractionHandler.hpp>
#include <com/sun/star/xml/dom/XDocumentBuilder.hpp>
#include <com/sun/star/xml/xpath/XXPathAPI.hpp>
@@ -74,14 +64,6 @@
#include <osl/process.h>
#include <osl/conditn.hxx>
-#ifndef _ZLIB_H
-#ifdef SYSTEM_ZLIB
-#include "zlib.h"
-#else
-#include "zlib/zlib.h"
-#endif
-#endif
-
namespace beans = com::sun::star::beans ;
namespace container = com::sun::star::container ;
namespace deployment = com::sun::star::deployment ;
@@ -161,154 +143,11 @@ public:
//------------------------------------------------------------------------------
-class InflateInputStream : public ::cppu::WeakImplHelper1< io::XInputStream >
-{
- uno::Reference< io::XInputStream > m_xStream;
-
- uno::Sequence < sal_Int8 > m_aBuffer;
- sal_Int32 m_nOffset;
- bool m_bRead;
-
- rtl::OUString m_aContentEncoding;
-
- void readIntoMemory();
-
-public:
- InflateInputStream(const uno::Reference< io::XInputStream >& rxStream,const rtl::OUString& rContentEncoding) :
- m_xStream(rxStream), m_nOffset(0), m_bRead(false), m_aContentEncoding(rContentEncoding) {};
-
- virtual sal_Int32 SAL_CALL readBytes(uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
- throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException);
- virtual sal_Int32 SAL_CALL readSomeBytes(uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
- throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException)
- { readIntoMemory(); return readBytes(aData, nMaxBytesToRead ); };
- virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
- throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException)
- {
- readIntoMemory();
- if( m_nOffset + nBytesToSkip < m_aBuffer.getLength() )
- m_nOffset += nBytesToSkip;
- else
- m_nOffset = m_aBuffer.getLength();
- };
- virtual sal_Int32 SAL_CALL available()
- throw (io::NotConnectedException, io::IOException, uno::RuntimeException)
- { readIntoMemory(); return m_aBuffer.getLength() - m_nOffset; };
- virtual void SAL_CALL closeInput( )
- throw (io::NotConnectedException, io::IOException, uno::RuntimeException)
- { m_xStream->closeInput(); };
-};
-
-
-sal_Int32 SAL_CALL
-InflateInputStream::readBytes(uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
- throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException)
-{
- readIntoMemory();
- sal_Int32 nAvailable = available();
- sal_Int32 nBytesToCopy = nAvailable < nBytesToRead ? nAvailable : nBytesToRead;
- if( nBytesToCopy > 0 )
- {
- aData.realloc(nBytesToCopy);
- rtl_copyMemory(aData.getArray(), m_aBuffer.getConstArray() + m_nOffset, nBytesToCopy);
- m_nOffset += nBytesToCopy;
- }
-
- return nBytesToCopy;
-};
-
-void InflateInputStream::readIntoMemory()
-{
- if( !m_bRead && m_xStream.is() )
- {
- const sal_Int32 nBytesRequested = 4096;
-
- uno::Sequence < sal_Int8 > aTempBuffer(nBytesRequested);
- uno::Sequence < sal_Int8 > aCompressedBuffer;
- sal_Int32 nBytesRead;
-
- m_bRead = true;
-
- do
- {
- nBytesRead = m_xStream->readBytes(aTempBuffer, nBytesRequested);
-
- if( nBytesRead > 0 )
- {
- sal_Int32 nOffset = aCompressedBuffer.getLength();
- aCompressedBuffer.realloc( nOffset + nBytesRead );
-
- rtl_copyMemory(aCompressedBuffer.getArray() + nOffset, aTempBuffer.getConstArray(), nBytesRead);
- }
- }
- while( nBytesRead == nBytesRequested );
-
- z_stream *pStream = new z_stream;
- /* memset to 0 to set zalloc/opaque etc */
- rtl_zeroMemory (pStream, sizeof(*pStream));
-
- int windowSize = 15;
- int headerOffset = 0;
-
- if( m_aContentEncoding.equalsAscii("gzip") )
- {
- sal_uInt8 magic[2];
- magic[0] = *((sal_uInt8 *) aCompressedBuffer.getConstArray());
- magic[1] = *((sal_uInt8 *) aCompressedBuffer.getConstArray() + 1);
-
- if( (magic[0] == 0x1f) && (magic[1] == 0x8b) )
- {
- windowSize = -14;
- headerOffset = 10;
- }
- }
-
- pStream->next_in = (unsigned char *) aCompressedBuffer.getConstArray();
- pStream->avail_in = aCompressedBuffer.getLength();
-
- pStream->next_in += headerOffset;
- pStream->avail_in -= headerOffset;
-
- if( Z_OK == inflateInit2(pStream, windowSize) )
- {
- int result;
-
- do
- {
- sal_Int32 nOffset = m_aBuffer.getLength();
- m_aBuffer.realloc(nOffset + 4096);
-
- pStream->next_out = reinterpret_cast < unsigned char* > ( m_aBuffer.getArray() + nOffset );
- pStream->avail_out = 4096;
-
- result = ::inflate(pStream, Z_FINISH);
-
- if( result == Z_STREAM_END )
- break;
-
- } while( result == Z_BUF_ERROR );
-
- inflateEnd(pStream);
- m_aBuffer.realloc(pStream->total_out);
-
- }
-
- if (pStream != NULL)
- {
- delete pStream;
- pStream = NULL;
- }
- }
-}
-
-//------------------------------------------------------------------------------
-
class UpdateInformationProvider :
- public ::cppu::WeakImplHelper5< deployment::XUpdateInformationProvider,
+ public ::cppu::WeakImplHelper4< deployment::XUpdateInformationProvider,
ucb::XCommandEnvironment,
ucb::XWebDAVCommandEnvironment,
- lang::XServiceInfo,
- task::XInteractionHandler >
+ lang::XServiceInfo >
{
public:
static uno::Reference< uno::XInterface > createInstance(const uno::Reference<uno::XComponentContext>& xContext);
@@ -360,10 +199,6 @@ public:
virtual uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames()
throw (uno::RuntimeException);
- // XInteractionHandler
- virtual void SAL_CALL handle( const uno::Reference< task::XInteractionRequest >& rRequest )
- throw( uno::RuntimeException );
-
protected:
virtual ~UpdateInformationProvider();
@@ -375,8 +210,6 @@ private:
void storeCommandInfo( sal_Int32 nCommandId,
uno::Reference< ucb::XCommandProcessor > const & rxCommandProcessor);
- bool initPasswordContainer( uno::Reference< task::XPasswordContainer > * pContainer );
-
UpdateInformationProvider(const uno::Reference<uno::XComponentContext>& xContext,
const uno::Reference< ucb::XContentIdentifierFactory >& xContentIdFactory,
const uno::Reference< ucb::XContentProvider >& xContentProvider,
@@ -394,6 +227,7 @@ private:
uno::Reference< ucb::XCommandProcessor > m_xCommandProcessor;
uno::Reference< task::XInteractionHandler > m_xInteractionHandler;
+ uno::Reference< task::XInteractionHandler > m_xPwContainerInteractionHandler;
osl::Mutex m_aMutex;
osl::Condition m_bCancelled;
@@ -504,7 +338,7 @@ UpdateInformationProvider::UpdateInformationProvider(
const uno::Reference< xml::xpath::XXPathAPI >& xXPathAPI
) : m_xContext(xContext), m_xContentIdFactory(xContentIdFactory),
m_xContentProvider(xContentProvider), m_xDocumentBuilder(xDocumentBuilder),
- m_xXPathAPI(xXPathAPI), m_aRequestHeaderList(2)
+ m_xXPathAPI(xXPathAPI), m_aRequestHeaderList(1)
{
uno::Reference< lang::XMultiComponentFactory > xServiceManager(xContext->getServiceManager());
if( !xServiceManager.is() )
@@ -581,14 +415,11 @@ UpdateInformationProvider::UpdateInformationProvider(
m_aRequestHeaderList[0].Name = UNISTRING("Accept-Language");
m_aRequestHeaderList[0].Value = getConfigurationItem( xConfigurationProvider, UNISTRING("org.openoffice.Setup/L10N"), UNISTRING("ooLocale") );
- m_aRequestHeaderList[1].Name = UNISTRING("Accept-Encoding");
- m_aRequestHeaderList[1].Value = uno::makeAny( UNISTRING("gzip,deflate") );
-
if( aUserAgent.getLength() > 0 )
{
- m_aRequestHeaderList.realloc(3);
- m_aRequestHeaderList[2].Name = UNISTRING("User-Agent");
- m_aRequestHeaderList[2].Value = uno::makeAny(aUserAgent);
+ m_aRequestHeaderList.realloc(2);
+ m_aRequestHeaderList[1].Name = UNISTRING("User-Agent");
+ m_aRequestHeaderList[1].Value = uno::makeAny(aUserAgent);
}
}
@@ -663,33 +494,6 @@ UpdateInformationProvider::storeCommandInfo(
//------------------------------------------------------------------------------
-bool UpdateInformationProvider::initPasswordContainer( uno::Reference< task::XPasswordContainer > * pContainer )
-{
- OSL_ENSURE( pContainer, "specification violation" );
-
- if ( !pContainer->is() )
- {
- uno::Reference<uno::XComponentContext> xContext(m_xContext);
-
- if( !xContext.is() )
- throw uno::RuntimeException( UNISTRING( "UpdateInformationProvider: empty component context" ), *this );
-
- uno::Reference< lang::XMultiComponentFactory > xServiceManager(xContext->getServiceManager());
-
- if( !xServiceManager.is() )
- throw uno::RuntimeException( UNISTRING( "UpdateInformationProvider: unable to obtain service manager from component context" ), *this );
-
- *pContainer = uno::Reference< task::XPasswordContainer >(
- xServiceManager->createInstanceWithContext( UNISTRING( "com.sun.star.task.PasswordContainer" ), xContext ),
- uno::UNO_QUERY);
- }
-
- OSL_ENSURE(pContainer->is(), "unexpected situation");
- return pContainer->is();
-}
-
-//------------------------------------------------------------------------------
-
uno::Reference< io::XInputStream >
UpdateInformationProvider::load(const rtl::OUString& rURL)
{
@@ -729,43 +533,13 @@ UpdateInformationProvider::load(const rtl::OUString& rURL)
throw;
}
-
- uno::Sequence< beans::Property > aProps( 1 );
- aProps[0].Name = UNISTRING( "Content-Encoding" );
-
- aCommand.Name = UNISTRING("getPropertyValues");
- aCommand.Argument = uno::makeAny( aProps );
-
- sal_Bool bCompressed = sal_False;
- rtl::OUString aContentEncoding;
-
- try
- {
- uno::Any aResult = xCommandProcessor->execute(aCommand, 0,
- static_cast < XCommandEnvironment *> (this));
- uno::Reference< sdbc::XRow > xPropList( aResult, uno::UNO_QUERY );
- if ( xPropList.is() ) {
- aContentEncoding = xPropList->getString(1);
- if( aContentEncoding.equalsAscii("gzip") || aContentEncoding.equalsAscii("deflate"))
- bCompressed = sal_True;
- }
- }
- catch( const uno::Exception &e )
- {
- OSL_TRACE( "Caught exception: %s\n",
- rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr() );
- }
-
storeCommandInfo(0, uno::Reference< ucb::XCommandProcessor > ());
uno::Reference< ucb::XCommandProcessor2 > xCommandProcessor2(xCommandProcessor, uno::UNO_QUERY);
if( xCommandProcessor2.is() )
xCommandProcessor2->releaseCommandIdentifier(nCommandId);
- if ( bCompressed )
- return INPUT_STREAM( new InflateInputStream( aSink->getInputStream(), aContentEncoding ) );
- else
- return INPUT_STREAM(aSink->getInputStream());
+ return INPUT_STREAM(aSink->getInputStream());
}
//------------------------------------------------------------------------------
@@ -976,7 +750,26 @@ UpdateInformationProvider::getInteractionHandler()
if ( m_xInteractionHandler.is() )
return m_xInteractionHandler;
else
- return this;
+ {
+ try
+ {
+ // Supply an interaction handler that uses the password container
+ // service to obtain credentials without displaying a password gui.
+
+ if ( !m_xPwContainerInteractionHandler.is() )
+ m_xPwContainerInteractionHandler
+ = task::PasswordContainerInteractionHandler::create(
+ m_xContext );
+ }
+ catch ( uno::RuntimeException const & )
+ {
+ throw;
+ }
+ catch ( uno::Exception const & )
+ {
+ }
+ return m_xPwContainerInteractionHandler;
+ }
}
//------------------------------------------------------------------------------
@@ -1026,101 +819,6 @@ UpdateInformationProvider::supportsService( rtl::OUString const & serviceName )
return sal_False;
}
-//------------------------------------------------------------------------------
-
-void SAL_CALL UpdateInformationProvider::handle( uno::Reference< task::XInteractionRequest > const & rRequest)
- throw (uno::RuntimeException)
-{
- uno::Any aAnyRequest( rRequest->getRequest() );
- ucb::AuthenticationRequest aAuthenticationRequest;
-
- if ( aAnyRequest >>= aAuthenticationRequest )
- {
- uno::Sequence< uno::Reference< task::XInteractionContinuation > > xContinuations = rRequest->getContinuations();
- uno::Reference< task::XInteractionHandler > xIH;
- uno::Reference< ucb::XInteractionSupplyAuthentication > xSupplyAuthentication;
- uno::Reference< task::XPasswordContainer > xContainer;
-
- for ( sal_Int32 i = 0; i < xContinuations.getLength(); ++i )
- {
- xSupplyAuthentication = uno::Reference< ucb::XInteractionSupplyAuthentication >(
- xContinuations[i], uno::UNO_QUERY );
- if ( xSupplyAuthentication.is() )
- break;
- }
-
- // xContainer works with userName passwdSequences pairs:
- if ( xSupplyAuthentication.is() &&
- aAuthenticationRequest.HasUserName &&
- aAuthenticationRequest.HasPassword &&
- initPasswordContainer( &xContainer ) )
- {
- xIH = getInteractionHandler();
- try
- {
- if ( aAuthenticationRequest.UserName.getLength() == 0 )
- {
- task::UrlRecord aRec( xContainer->find( aAuthenticationRequest.ServerName, xIH ) );
- if ( aRec.UserList.getLength() != 0 )
- {
- if ( xSupplyAuthentication->canSetUserName() )
- xSupplyAuthentication->setUserName( aRec.UserList[0].UserName.getStr() );
- if ( xSupplyAuthentication->canSetPassword() )
- {
- OSL_ENSURE( aRec.UserList[0].Passwords.getLength() != 0, "empty password list" );
- xSupplyAuthentication->setPassword( aRec.UserList[0].Passwords[0].getStr() );
- }
- if ( aRec.UserList[0].Passwords.getLength() > 1 )
- {
- if ( aAuthenticationRequest.HasRealm )
- {
- if ( xSupplyAuthentication->canSetRealm() )
- xSupplyAuthentication->setRealm( aRec.UserList[0].Passwords[1].getStr() );
- }
- else if ( xSupplyAuthentication->canSetAccount() )
- xSupplyAuthentication->setAccount( aRec.UserList[0].Passwords[1].getStr() );
- }
- xSupplyAuthentication->select();
- return;
- }
- }
- else
- {
- task::UrlRecord aRec(xContainer->findForName( aAuthenticationRequest.ServerName,
- aAuthenticationRequest.UserName,
- xIH));
- if ( aRec.UserList.getLength() != 0 )
- {
- OSL_ENSURE( aRec.UserList[0].Passwords.getLength() != 0, "empty password list" );
- if ( !aAuthenticationRequest.HasPassword ||
- ( aAuthenticationRequest.Password != aRec.UserList[0].Passwords[0] ) )
- {
- if ( xSupplyAuthentication->canSetUserName() )
- xSupplyAuthentication->setUserName( aRec.UserList[0].UserName.getStr() );
- if ( xSupplyAuthentication->canSetPassword() )
- xSupplyAuthentication->setPassword(aRec.UserList[0].Passwords[0].getStr());
- if ( aRec.UserList[0].Passwords.getLength() > 1 )
- {
- if ( aAuthenticationRequest.HasRealm )
- {
- if ( xSupplyAuthentication->canSetRealm() )
- xSupplyAuthentication->setRealm(aRec.UserList[0].Passwords[1].getStr());
- }
- else if ( xSupplyAuthentication->canSetAccount() )
- xSupplyAuthentication->setAccount(aRec.UserList[0].Passwords[1].getStr());
- }
- xSupplyAuthentication->select();
- return;
- }
- }
- }
- }
- catch (task::NoMasterException const &)
- {} // user did not enter master password
- }
- }
-}
-
} // anonymous namespace
//------------------------------------------------------------------------------
diff --git a/fileaccess/source/FileAccess.cxx b/fileaccess/source/FileAccess.cxx
index 5d568dc994cb..3f387afe4b4c 100644
--- a/fileaccess/source/FileAccess.cxx
+++ b/fileaccess/source/FileAccess.cxx
@@ -61,7 +61,6 @@
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <com/sun/star/ucb/XContent.hpp>
#include <com/sun/star/ucb/XContentAccess.hpp>
-#include <com/sun/star/ucb/XContentCreator.hpp>
#include <com/sun/star/ucb/XSimpleFileAccess3.hpp>
#include <com/sun/star/util/XMacroExpander.hpp>
@@ -480,11 +479,7 @@ void OFileAccess::createFolder( const rtl::OUString& NewFolderURL )
ucbhelper::Content aCnt( aURL.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment );
- Reference< XContentCreator > xCreator = Reference< XContentCreator >( aCnt.get(), UNO_QUERY );
- if ( !xCreator.is() )
- return;
-
- Sequence< ContentInfo > aInfo = xCreator->queryCreatableContentsInfo();
+ Sequence< ContentInfo > aInfo = aCnt.queryCreatableContentsInfo();
sal_Int32 nCount = aInfo.getLength();
if ( nCount == 0 )
return;
@@ -758,56 +753,51 @@ bool OFileAccess::createNewFile( const rtl::OUString & rParentURL,
{
ucbhelper::Content aParentCnt( rParentURL, mxEnvironment );
- Reference< XContentCreator > xCreator
- = Reference< XContentCreator >( aParentCnt.get(), UNO_QUERY );
- if ( xCreator.is() )
- {
- Sequence< ContentInfo > aInfo = xCreator->queryCreatableContentsInfo();
- sal_Int32 nCount = aInfo.getLength();
- if ( nCount == 0 )
- return false;
+ Sequence< ContentInfo > aInfo = aParentCnt.queryCreatableContentsInfo();
+ sal_Int32 nCount = aInfo.getLength();
+ if ( nCount == 0 )
+ return false;
- for ( sal_Int32 i = 0; i < nCount; ++i )
+ for ( sal_Int32 i = 0; i < nCount; ++i )
+ {
+ const ContentInfo & rCurr = aInfo[i];
+ if ( ( rCurr.Attributes
+ & ContentInfoAttribute::KIND_DOCUMENT ) &&
+ ( rCurr.Attributes
+ & ContentInfoAttribute::INSERT_WITH_INPUTSTREAM ) )
{
- const ContentInfo & rCurr = aInfo[i];
- if ( ( rCurr.Attributes
- & ContentInfoAttribute::KIND_DOCUMENT ) &&
- ( rCurr.Attributes
- & ContentInfoAttribute::INSERT_WITH_INPUTSTREAM ) )
- {
- // Make sure the only required bootstrap property is
- // "Title",
- const Sequence< Property > & rProps = rCurr.Properties;
- if ( rProps.getLength() != 1 )
- continue;
+ // Make sure the only required bootstrap property is
+ // "Title",
+ const Sequence< Property > & rProps = rCurr.Properties;
+ if ( rProps.getLength() != 1 )
+ continue;
- if ( !rProps[ 0 ].Name.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( "Title" ) ) )
- continue;
+ if ( !rProps[ 0 ].Name.equalsAsciiL(
+ RTL_CONSTASCII_STRINGPARAM( "Title" ) ) )
+ continue;
- Sequence<rtl::OUString> aNames(1);
- rtl::OUString* pNames = aNames.getArray();
- pNames[0] = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "Title" ) );
- Sequence< Any > aValues(1);
- Any* pValues = aValues.getArray();
- pValues[0] = makeAny( rtl::OUString( rTitle ) );
+ Sequence<rtl::OUString> aNames(1);
+ rtl::OUString* pNames = aNames.getArray();
+ pNames[0] = rtl::OUString(
+ RTL_CONSTASCII_USTRINGPARAM( "Title" ) );
+ Sequence< Any > aValues(1);
+ Any* pValues = aValues.getArray();
+ pValues[0] = makeAny( rtl::OUString( rTitle ) );
- try
- {
- ucbhelper::Content aNew;
- if ( aParentCnt.insertNewContent(
- rCurr.Type, aNames, aValues, data, aNew ) )
- return true; // success.
- else
- continue;
- }
- catch ( CommandFailedException const & )
- {
- // Interaction Handler already handled the
- // error that has occured...
+ try
+ {
+ ucbhelper::Content aNew;
+ if ( aParentCnt.insertNewContent(
+ rCurr.Type, aNames, aValues, data, aNew ) )
+ return true; // success.
+ else
continue;
- }
+ }
+ catch ( CommandFailedException const & )
+ {
+ // Interaction Handler already handled the
+ // error that has occured...
+ continue;
}
}
}
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 5d1f115e59d8..861370e55ded 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5175,7 +5175,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
else
{
fNumber = 0.0;
- seqAdjustmentValues[ 0 ].Value <<= fNumber;
+ seqAdjustmentValues[ 1 ].Value <<= fNumber;
seqAdjustmentValues[ 1 ].State = com::sun::star::beans::PropertyState_DIRECT_VALUE;
}
@@ -5311,7 +5311,9 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
SdrObject::Free( pRet );
pRet = new SdrEdgeObj();
+ ApplyAttributes( rSt, aSet, aObjData );
pRet->SetLogicRect( aObjData.aBoundRect );
+ pRet->SetMergedItemSet(aSet);
// Konnektoren
MSO_ConnectorStyle eConnectorStyle = (MSO_ConnectorStyle)GetPropertyValue( DFF_Prop_cxstyle, mso_cxstyleStraight );
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 8f1044cb38b3..a87b71c4c3c2 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -85,7 +85,8 @@ ImpPDFTabDialog::ImpPDFTabDialog( Window* pParent,
mbReduceImageResolution( sal_False ),
mnMaxImageResolution( 300 ),
mbUseTaggedPDF( sal_False ),
- mbExportNotesBoth( sal_True ),
+ mbExportNotes( sal_True ),
+ mbExportNotesPages( sal_False ),
mbUseTransitionEffects( sal_False ),
mbIsSkipEmptyPages( sal_True ),
mnFormsType( 0 ),
@@ -189,9 +190,8 @@ ImpPDFTabDialog::ImpPDFTabDialog( Window* pParent,
mbUseTaggedPDF = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "UseTaggedPDF" ) ), sal_False );
mnPDFTypeSelection = maConfigItem.ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "SelectPdfVersion" ) ), 0 );
if ( mbIsPresentation )
- mbExportNotesBoth = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportNotesPages" ) ), sal_False );
- else
- mbExportNotesBoth = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportNotes" ) ), sal_True );
+ mbExportNotesPages = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportNotesPages" ) ), sal_False );
+ mbExportNotes = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportNotes" ) ), sal_False );
mbExportBookmarks = maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportBookmarks" ) ), sal_True );
mnOpenBookmarkLevels = maConfigItem.ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "OpenBookmarkLevels" ) ), -1 );
@@ -309,6 +309,14 @@ Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData()
// updating the FilterData sequence and storing FilterData to configuration
if( GetTabPage( RID_PDF_TAB_GENER ) )
( ( ImpPDFTabGeneralPage* )GetTabPage( RID_PDF_TAB_GENER ) )->GetFilterConfigItem( this );
+ if( GetTabPage( RID_PDF_TAB_VPREFER ) )
+ ( ( ImpPDFTabViewerPage* )GetTabPage( RID_PDF_TAB_VPREFER ) )->GetFilterConfigItem( this );
+ if( GetTabPage( RID_PDF_TAB_OPNFTR ) )
+ ( ( ImpPDFTabOpnFtrPage* )GetTabPage( RID_PDF_TAB_OPNFTR ) )->GetFilterConfigItem( this );
+ if( GetTabPage( RID_PDF_TAB_LINKS ) )
+ ( ( ImpPDFTabLinksPage* )GetTabPage( RID_PDF_TAB_LINKS ) )->GetFilterConfigItem( this );
+ if( GetTabPage( RID_PDF_TAB_SECURITY ) )
+ ( ( ImpPDFTabSecurityPage* )GetTabPage( RID_PDF_TAB_SECURITY ) )->GetFilterConfigItem( this );
//prepare the items to be returned
maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "UseLosslessCompression" ) ), mbUseLosslessCompression );
@@ -320,9 +328,8 @@ Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData()
maConfigItem.WriteInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "SelectPdfVersion" ) ), mnPDFTypeSelection );
if ( mbIsPresentation )
- maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportNotesPages" ) ), mbExportNotesBoth );
- else
- maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportNotes" ) ), mbExportNotesBoth );
+ maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportNotesPages" ) ), mbExportNotesPages );
+ maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportNotes" ) ), mbExportNotes );
maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportBookmarks" ) ), mbExportBookmarks );
maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "UseTransitionEffects" ) ), mbUseTransitionEffects );
@@ -337,12 +344,6 @@ Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData()
maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportFormFields" ) ), mbExportFormFields );
maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "AllowDuplicateFieldNames" ) ), mbAllowDuplicateFieldNames );
- if( GetTabPage( RID_PDF_TAB_VPREFER ) )
- ( ( ImpPDFTabViewerPage* )GetTabPage( RID_PDF_TAB_VPREFER ) )->GetFilterConfigItem( this );
-
- if( GetTabPage( RID_PDF_TAB_OPNFTR ) )
- ( ( ImpPDFTabOpnFtrPage* )GetTabPage( RID_PDF_TAB_OPNFTR ) )->GetFilterConfigItem( this );
-
maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "HideViewerToolbar" ) ), mbHideViewerToolbar );
maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "HideViewerMenubar" ) ), mbHideViewerMenubar );
maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "HideViewerWindowControls" ) ), mbHideViewerWindowControls );
@@ -358,17 +359,11 @@ Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData()
maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "FirstPageOnLeft" ) ), mbFirstPageLeft );
maConfigItem.WriteInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "OpenBookmarkLevels" ) ), mnOpenBookmarkLevels );
- if( GetTabPage( RID_PDF_TAB_LINKS ) )
- ( ( ImpPDFTabLinksPage* )GetTabPage( RID_PDF_TAB_LINKS ) )->GetFilterConfigItem( this );
-
maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportLinksRelativeFsys" ) ), mbExportRelativeFsysLinks );
maConfigItem.WriteInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "PDFViewSelection" ) ), mnViewPDFMode );
maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ConvertOOoTargetToPDFTarget" ) ), mbConvertOOoTargets );
maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportBookmarksToPDFDestination" ) ), mbExportBmkToPDFDestination );
- if( GetTabPage( RID_PDF_TAB_SECURITY ) )
- ( ( ImpPDFTabSecurityPage* )GetTabPage( RID_PDF_TAB_SECURITY ) )->GetFilterConfigItem( this );
-
maConfigItem.WriteInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Printing" ) ), mnPrint );
maConfigItem.WriteInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Changes" ) ), mnChangesAllowed );
maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableCopyingOfContent" ) ), mbCanCopyOrExtract );
@@ -449,6 +444,7 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage( Window* pParent,
maCbExportBookmarks( this, PDFFilterResId( CB_EXPORTBOOKMARKS ) ),
maCbExportNotes( this, PDFFilterResId( CB_EXPORTNOTES ) ),
+ maCbExportNotesPages( this, PDFFilterResId( CB_EXPORTNOTESPAGES ) ),
maCbExportEmptyPages( this, PDFFilterResId( CB_EXPORTEMPTYPAGES ) ),
maCbAddStream( this, PDFFilterResId( CB_ADDSTREAM ) ),
mbIsPresentation( sal_False ),
@@ -497,9 +493,6 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent
maCbExportEmptyPages.Enable( mbIsWriter );
-// SJ: Dont know if there are Notes available also for writer.
-// maCbExportNotes.Enable( paParent->mbIsPresentation );
-
maRbLosslessCompression.SetToggleHdl( LINK( this, ImpPDFTabGeneralPage, ToggleCompressionHdl ) );
const sal_Bool bUseLosslessCompression = paParent->mbUseLosslessCompression;
if ( bUseLosslessCompression )
@@ -546,12 +539,27 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent
maCbAllowDuplicateFieldNames.Check( paParent->mbAllowDuplicateFieldNames );
maCbAllowDuplicateFieldNames.Enable( paParent->mbExportFormFields );
+ maCbExportBookmarks.Check( paParent->mbExportBookmarks );
+
+ maCbExportNotes.Check( paParent->mbExportNotes );
+
if ( mbIsPresentation )
- maCbExportNotes.Check( paParent->mbExportNotesBoth );
+ {
+ maCbExportNotesPages.Show( TRUE );
+ maCbExportNotesPages.Check( paParent->mbExportNotesPages );
+ }
else
- maCbExportNotes.Check( paParent->mbExportNotesBoth );
-
- maCbExportBookmarks.Check( paParent->mbExportBookmarks );
+ {
+ long nCheckBoxHeight =
+ maCbExportNotesPages.LogicToPixel( Size( 13, 13 ), MAP_APPFONT ).Height();
+
+ Point aPos = maCbExportEmptyPages.GetPosPixel();
+ maCbExportEmptyPages.SetPosPixel( Point( aPos.X(), aPos.Y() - nCheckBoxHeight ) );
+ aPos = maCbAddStream.GetPosPixel();
+ maCbAddStream.SetPosPixel( Point( aPos.X(), aPos.Y() - nCheckBoxHeight ) );
+ maCbExportNotesPages.Show( FALSE );
+ maCbExportNotesPages.Check( FALSE );
+ }
maCbExportEmptyPages.Check( !paParent->mbIsSkipEmptyPages );
@@ -584,7 +592,9 @@ void ImpPDFTabGeneralPage::GetFilterConfigItem( ImpPDFTabDialog* paParent )
paParent->mnQuality = static_cast<sal_Int32>(maNfQuality.GetValue());
paParent->mbReduceImageResolution = maCbReduceImageResolution.IsChecked();
paParent->mnMaxImageResolution = maCoReduceImageResolution.GetText().ToInt32();
- paParent->mbExportNotesBoth = maCbExportNotes.IsChecked();
+ paParent->mbExportNotes = maCbExportNotes.IsChecked();
+ if ( mbIsPresentation )
+ paParent->mbExportNotesPages = maCbExportNotesPages.IsChecked();
paParent->mbExportBookmarks = maCbExportBookmarks.IsChecked();
paParent->mbIsSkipEmptyPages = !maCbExportEmptyPages.IsChecked();
diff --git a/filter/source/pdf/impdialog.hrc b/filter/source/pdf/impdialog.hrc
index 91ff6a662ae3..ad214a752f77 100644
--- a/filter/source/pdf/impdialog.hrc
+++ b/filter/source/pdf/impdialog.hrc
@@ -88,6 +88,7 @@
#define CB_ADDSTREAM 25
#define CB_PDFA_1B_SELECT 26
+#define CB_EXPORTNOTESPAGES 27
#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 62fe73850254..7dacf4e34c76 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -101,7 +101,8 @@ protected:
sal_Int32 mnMaxImageResolution;
sal_Bool mbUseTaggedPDF;
sal_Int32 mnPDFTypeSelection;
- sal_Bool mbExportNotesBoth;
+ sal_Bool mbExportNotes;
+ sal_Bool mbExportNotesPages;
sal_Bool mbUseTransitionEffects;
sal_Bool mbIsSkipEmptyPages;
sal_Bool mbAddStream;
@@ -201,6 +202,7 @@ class ImpPDFTabGeneralPage : public SfxTabPage
CheckBox maCbExportBookmarks;
CheckBox maCbExportNotes;
+ CheckBox maCbExportNotesPages;
CheckBox maCbExportEmptyPages;
CheckBox maCbAddStream;
diff --git a/filter/source/pdf/impdialog.src b/filter/source/pdf/impdialog.src
index f47a6219c313..b20c5afb0237 100644
--- a/filter/source/pdf/impdialog.src
+++ b/filter/source/pdf/impdialog.src
@@ -30,7 +30,7 @@
#include "impdialog.hrc"
-#define TAB_PDF_SIZE Size = MAP_APPFONT ( 176, 239 )
+#define TAB_PDF_SIZE Size = MAP_APPFONT ( 176, 255 )
//string for TabDialog standard buttons
String STR_PDF_EXPORT
{
@@ -217,9 +217,16 @@ TabPage RID_PDF_TAB_GENER
TabStop = TRUE ;
Text[ en-US ] = "~Export comments";
};
- CheckBox CB_EXPORTEMPTYPAGES
+ CheckBox CB_EXPORTNOTESPAGES
{
Pos = MAP_APPFONT ( 12 , 216 ) ;
+ Size = MAP_APPFONT ( 158 , 10 ) ;
+ TabStop = TRUE ;
+ Text[ en-US ] = "Export ~notes pages";
+ };
+ CheckBox CB_EXPORTEMPTYPAGES
+ {
+ Pos = MAP_APPFONT ( 12 , 229 ) ;
Size = MAP_APPFONT ( 158 , 16 ) ;
TabStop = TRUE ;
WordBreak = TRUE ;
@@ -227,7 +234,7 @@ TabPage RID_PDF_TAB_GENER
};
CheckBox CB_ADDSTREAM
{
- Pos = MAP_APPFONT ( 12 , 235 ) ;
+ Pos = MAP_APPFONT ( 12 , 248 ) ;
Size = MAP_APPFONT ( 158 , 10 ) ;
TabStop = TRUE ;
Text[ en-US ] = "Create ~hybrid file";
diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx
index 631b90021ea5..021123ed7eff 100644
--- a/filter/source/pdf/pdffilter.cxx
+++ b/filter/source/pdf/pdffilter.cxx
@@ -85,7 +85,8 @@ sal_Bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
aCfgItem.ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "MaxImageResolution" ) ), 300 );
aCfgItem.ReadBool( String( RTL_CONSTASCII_USTRINGPARAM( "UseTaggedPDF" ) ), sal_False );
aCfgItem.ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "SelectPdfVersion" ) ), 0 );
- aCfgItem.ReadBool( String( RTL_CONSTASCII_USTRINGPARAM( "ExportNotes" ) ), sal_True );
+ aCfgItem.ReadBool( String( RTL_CONSTASCII_USTRINGPARAM( "ExportNotes" ) ), sal_False );
+ aCfgItem.ReadBool( String( RTL_CONSTASCII_USTRINGPARAM( "ExportNotesPages" ) ), sal_False );
aCfgItem.ReadBool( String( RTL_CONSTASCII_USTRINGPARAM( "UseTransitionEffects" ) ), sal_True );
aCfgItem.ReadBool( String( RTL_CONSTASCII_USTRINGPARAM( "IsSkipEmptyPages" ) ), sal_False );
aCfgItem.ReadBool( String( RTL_CONSTASCII_USTRINGPARAM( "ExportFormFields" ) ), sal_True );
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index 3add838333b9..77a108f300f9 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -583,7 +583,7 @@ void OFormattedModel::_propertyChanged( const com::sun::star::beans::PropertyCha
// as m_aSaveValue (which is used by commitControlValueToDbColumn) is format dependent we have
// to recalc it, which is done by translateDbColumnToControlValue
- if ( m_xColumn.is() && m_xAggregateFastSet.is() )
+ if ( m_xColumn.is() && m_xAggregateFastSet.is() && !m_xCursor->isBeforeFirst() && !m_xCursor->isAfterLast())
{
setControlValue( translateDbColumnToControlValue(), eOther );
}
diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx
index 34be031fdf6e..3ee5166fed9b 100644
--- a/fpicker/source/office/fpsmartcontent.cxx
+++ b/fpicker/source/office/fpsmartcontent.cxx
@@ -33,14 +33,13 @@
#include "fpsmartcontent.hxx"
/** === begin UNO includes === **/
-#include <com/sun/star/ucb/XContentCreator.hpp>
#include <com/sun/star/container/XChild.hpp>
+#include <com/sun/star/ucb/ContentInfo.hpp>
#include <com/sun/star/ucb/ContentInfoAttribute.hpp>
+#include <com/sun/star/ucb/XContent.hpp>
/** === end UNO includes === **/
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
#include <comphelper/processfactory.hxx>
-#endif
#include <ucbhelper/commandenvironment.hxx>
#include <tools/solar.h>
#include <tools/debug.hxx>
@@ -282,25 +281,21 @@ namespace svt
sal_Bool bRet = sal_False;
try
{
- Reference< XContentCreator > xCreator = Reference< XContentCreator >( m_pContent->get(), UNO_QUERY );
- if ( xCreator.is() )
+ Sequence< ContentInfo > aInfo = m_pContent->queryCreatableContentsInfo();
+ const ContentInfo* pInfo = aInfo.getConstArray();
+ sal_Int32 nCount = aInfo.getLength();
+ for ( sal_Int32 i = 0; i < nCount; ++i, ++pInfo )
{
- Sequence< ContentInfo > aInfo = xCreator->queryCreatableContentsInfo();
- const ContentInfo* pInfo = aInfo.getConstArray();
- sal_Int32 nCount = aInfo.getLength();
- for ( sal_Int32 i = 0; i < nCount; ++i, ++pInfo )
+ // Simply look for the first KIND_FOLDER...
+ if ( pInfo->Attributes & ContentInfoAttribute::KIND_FOLDER )
{
- // Simply look for the first KIND_FOLDER...
- if ( pInfo->Attributes & ContentInfoAttribute::KIND_FOLDER )
- {
- bRet = sal_True;
- break;
- }
+ bRet = sal_True;
+ break;
}
-
- // now we're definately valid
- m_eState = VALID;
}
+
+ // now we're definately valid
+ m_eState = VALID;
}
catch( Exception& )
{
diff --git a/goodies/source/filter.vcl/ipbm/ipbm.cxx b/goodies/source/filter.vcl/ipbm/ipbm.cxx
index 227490fc9d8e..3c30dd0c2ba3 100644
--- a/goodies/source/filter.vcl/ipbm/ipbm.cxx
+++ b/goodies/source/filter.vcl/ipbm/ipbm.cxx
@@ -106,7 +106,7 @@ BOOL PBMReader::ReadPBM( SvStream & rPBM, Graphic & rGraphic )
if ( ( mbStatus = ImplReadHeader() ) == FALSE )
return FALSE;
- if ( mnWidth == 0 || mnHeight == 0 )
+ if ( ( mnMaxVal == 0 ) || ( mnWidth == 0 ) || ( mnHeight == 0 ) )
return FALSE;
// 0->PBM, 1->PGM, 2->PPM
@@ -172,6 +172,7 @@ BOOL PBMReader::ImplReadHeader()
*mpPBM >> nID[ 0 ] >> nID[ 1 ];
if ( nID[ 0 ] != 'P' )
return FALSE;
+ mnMaxVal = mnWidth = mnHeight = 0;
switch ( nID[ 1 ] )
{
case '1' :
@@ -179,6 +180,7 @@ BOOL PBMReader::ImplReadHeader()
case '4' :
mnMode = 0;
nMax = 2; // number of parameters in Header
+ mnMaxVal = 1;
break;
case '2' :
mbRaw = FALSE;
@@ -195,9 +197,6 @@ BOOL PBMReader::ImplReadHeader()
default:
return FALSE;
}
-
- mnMaxVal = mnWidth = mnHeight = 0;
-
while ( bFinished == FALSE )
{
if ( mpPBM->GetError() )
@@ -466,7 +465,9 @@ BOOL PBMReader::ImplReadBody()
if ( nCount == 3 )
{
nCount = 0;
- mpAcc->SetPixel( nHeight, nWidth++, BitmapColor( (BYTE)nRGB[ 0 ], (BYTE)nRGB[ 1 ], (BYTE)nRGB[ 2 ] ) );
+ mpAcc->SetPixel( nHeight, nWidth++, BitmapColor( static_cast< BYTE >( ( nRGB[ 0 ] * 255 ) / mnMaxVal ),
+ static_cast< BYTE >( ( nRGB[ 1 ] * 255 ) / mnMaxVal ),
+ static_cast< BYTE >( ( nRGB[ 2 ] * 255 ) / mnMaxVal ) ) );
nCount = 0;
nRGB[ 0 ] = nRGB[ 1 ] = nRGB[ 2 ] = 0;
if ( nWidth == mnWidth )
diff --git a/graphite/makefile.mk b/graphite/makefile.mk
index 5faa9054f98a..5ec831b61c00 100644
--- a/graphite/makefile.mk
+++ b/graphite/makefile.mk
@@ -68,6 +68,12 @@ TARGET=so_graphite
.INCLUDE : settings.mk
+.IF "$(SYSTEM_GRAPHITE)" == "YES"
+all:
+ @echo "An already available installation of silgraphite should exist on your system."
+ @echo "Therefore the version provided here does not need to be built in addition."
+.ENDIF
+
# --- Files --------------------------------------------------------
.IF "$(ENABLE_GRAPHITE)"=="TRUE"
TARFILE_NAME=silgraphite-2.3.1
diff --git a/transex3/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index 9f1c97f05af5..9f1c97f05af5 100644
--- a/transex3/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
diff --git a/transex3/inc/export.hxx b/l10ntools/inc/export.hxx
index ec5195034e91..6d94297c25fb 100644
--- a/transex3/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -31,9 +31,9 @@
#ifndef _EXPORT_HXX
#define _EXPORT_HXX
-#ifndef TRANSEX_DIRECTORY_HXX
-#define TRANSEX_DIRECTORY_HXX
-#include <transex3/directory.hxx>
+#ifndef L10NTOOLS_DIRECTORY_HXX
+#define L10NTOOLS_DIRECTORY_HXX
+#include <l10ntools/directory.hxx>
#endif
diff --git a/transex3/inc/gsicheck.hxx b/l10ntools/inc/gsicheck.hxx
index 13debcfc7106..13debcfc7106 100644
--- a/transex3/inc/gsicheck.hxx
+++ b/l10ntools/inc/gsicheck.hxx
diff --git a/transex3/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx
index 0ebfa7ed62a9..0ebfa7ed62a9 100644
--- a/transex3/inc/helpmerge.hxx
+++ b/l10ntools/inc/helpmerge.hxx
diff --git a/transex3/inc/inireader.hxx b/l10ntools/inc/inireader.hxx
index 0861290adf9f..0861290adf9f 100644
--- a/transex3/inc/inireader.hxx
+++ b/l10ntools/inc/inireader.hxx
diff --git a/transex3/inc/transex3/directory.hxx b/l10ntools/inc/l10ntools/directory.hxx
index 6e507961d3bb..6b71f59435f7 100644
--- a/transex3/inc/transex3/directory.hxx
+++ b/l10ntools/inc/l10ntools/directory.hxx
@@ -12,9 +12,9 @@
#include <stdio.h>
-#ifndef TRANSEX_FILE_HXX
-#define TRANSEX_FILE_HXX
-#include <transex3/file.hxx>
+#ifndef L10NTOOLS_FILE_HXX
+#define L10NTOOLS_FILE_HXX
+#include <l10ntools/file.hxx>
#endif
namespace transex{
diff --git a/transex3/inc/transex3/file.hxx b/l10ntools/inc/l10ntools/file.hxx
index e3a1a46b4ee8..e3a1a46b4ee8 100644
--- a/transex3/inc/transex3/file.hxx
+++ b/l10ntools/inc/l10ntools/file.hxx
diff --git a/transex3/inc/transex3/vosapp.hxx b/l10ntools/inc/l10ntools/vosapp.hxx
index 49e10e15e3d4..49e10e15e3d4 100644
--- a/transex3/inc/transex3/vosapp.hxx
+++ b/l10ntools/inc/l10ntools/vosapp.hxx
diff --git a/transex3/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx
index 502889b27aa9..502889b27aa9 100644
--- a/transex3/inc/lngmerge.hxx
+++ b/l10ntools/inc/lngmerge.hxx
diff --git a/transex3/inc/makefile.mk b/l10ntools/inc/makefile.mk
index 00caed43733a..6a704d63e48f 100644
--- a/transex3/inc/makefile.mk
+++ b/l10ntools/inc/makefile.mk
@@ -30,7 +30,7 @@
#*************************************************************************
PRJ=..
-PRJNAME=transex3
+PRJNAME=l10ntools
TARGET=inc
# --- Settings -----------------------------------------------------
diff --git a/transex3/inc/pch/precompiled_transex3.cxx b/l10ntools/inc/pch/precompiled_l10ntools.cxx
index 5b69c9f2f204..b6cac813375f 100644
--- a/transex3/inc/pch/precompiled_transex3.cxx
+++ b/l10ntools/inc/pch/precompiled_l10ntools.cxx
@@ -28,5 +28,5 @@
*
************************************************************************/
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
diff --git a/transex3/inc/pch/precompiled_transex3.hxx b/l10ntools/inc/pch/precompiled_l10ntools.hxx
index 2ed3c72ad4ee..2ed3c72ad4ee 100644
--- a/transex3/inc/pch/precompiled_transex3.hxx
+++ b/l10ntools/inc/pch/precompiled_l10ntools.hxx
diff --git a/transex3/inc/srciter.hxx b/l10ntools/inc/srciter.hxx
index bcbdf5eb542b..7f80074cd651 100644
--- a/transex3/inc/srciter.hxx
+++ b/l10ntools/inc/srciter.hxx
@@ -28,9 +28,9 @@
*
************************************************************************/
-#ifndef TRANSEX_DIRECTORY_HXX
-#define TRANSEX_DIRECTORY_HXX
-#include <transex3/directory.hxx>
+#ifndef L10NTOOLS_DIRECTORY_HXX
+#define L10NTOOLS_DIRECTORY_HXX
+#include <l10ntools/directory.hxx>
#endif
// class SourceTreeIterator
diff --git a/transex3/inc/tagtest.hxx b/l10ntools/inc/tagtest.hxx
index 811c4bf0e164..811c4bf0e164 100644
--- a/transex3/inc/tagtest.hxx
+++ b/l10ntools/inc/tagtest.hxx
diff --git a/transex3/inc/tokens.h b/l10ntools/inc/tokens.h
index ef285f4c6361..ef285f4c6361 100644
--- a/transex3/inc/tokens.h
+++ b/l10ntools/inc/tokens.h
diff --git a/transex3/inc/treeconfig.hxx b/l10ntools/inc/treeconfig.hxx
index 96d693b0d376..96d693b0d376 100644
--- a/transex3/inc/treeconfig.hxx
+++ b/l10ntools/inc/treeconfig.hxx
diff --git a/transex3/inc/utf8conv.hxx b/l10ntools/inc/utf8conv.hxx
index 32e506edbda8..32e506edbda8 100644
--- a/transex3/inc/utf8conv.hxx
+++ b/l10ntools/inc/utf8conv.hxx
diff --git a/transex3/inc/wrdtrans.hxx b/l10ntools/inc/wrdtrans.hxx
index efcb663204a6..efcb663204a6 100644
--- a/transex3/inc/wrdtrans.hxx
+++ b/l10ntools/inc/wrdtrans.hxx
diff --git a/transex3/inc/wtranode.hxx b/l10ntools/inc/wtranode.hxx
index 4d71fc160fff..4d71fc160fff 100644
--- a/transex3/inc/wtranode.hxx
+++ b/l10ntools/inc/wtranode.hxx
diff --git a/transex3/inc/wtratree.hxx b/l10ntools/inc/wtratree.hxx
index 67d63280449f..67d63280449f 100644
--- a/transex3/inc/wtratree.hxx
+++ b/l10ntools/inc/wtratree.hxx
diff --git a/transex3/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index 18b047ef75c1..18b047ef75c1 100644
--- a/transex3/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
diff --git a/transex3/inc/xmlutil.hxx b/l10ntools/inc/xmlutil.hxx
index 812f50b85c45..812f50b85c45 100644
--- a/transex3/inc/xmlutil.hxx
+++ b/l10ntools/inc/xmlutil.hxx
diff --git a/transex3/inc/xrmmerge.hxx b/l10ntools/inc/xrmmerge.hxx
index 47be1ea7a038..47be1ea7a038 100644
--- a/transex3/inc/xrmmerge.hxx
+++ b/l10ntools/inc/xrmmerge.hxx
diff --git a/transex3/java/l10nconv/build.xml b/l10ntools/java/l10nconv/build.xml
index 6902227e5122..6902227e5122 100755
--- a/transex3/java/l10nconv/build.xml
+++ b/l10ntools/java/l10nconv/build.xml
diff --git a/transex3/java/l10nconv/converter.MF b/l10ntools/java/l10nconv/converter.MF
index 843d500b7548..843d500b7548 100755
--- a/transex3/java/l10nconv/converter.MF
+++ b/l10ntools/java/l10nconv/converter.MF
diff --git a/transex3/java/l10nconv/documentation/readmeConverter.sxw b/l10ntools/java/l10nconv/documentation/readmeConverter.sxw
index f779e10acb2c..f779e10acb2c 100755
--- a/transex3/java/l10nconv/documentation/readmeConverter.sxw
+++ b/l10ntools/java/l10nconv/documentation/readmeConverter.sxw
Binary files differ
diff --git a/transex3/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapCheck.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapCheck.java
index d304c2544bff..d304c2544bff 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapCheck.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapCheck.java
diff --git a/transex3/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapper.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapper.java
index 49fc08b69d32..49fc08b69d32 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapper.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapper.java
diff --git a/transex3/java/l10nconv/java/com/sun/star/tooling/DirtyTags/Tag.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/Tag.java
index 7495736ab68c..7495736ab68c 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/DirtyTags/Tag.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/Tag.java
diff --git a/transex3/java/l10nconv/java/com/sun/star/tooling/DirtyTags/TagPair.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/TagPair.java
index 7993fc9cf0a4..7993fc9cf0a4 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/DirtyTags/TagPair.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/TagPair.java
diff --git a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/Convert.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Convert.java
index 5b1fb6c62b61..5b1fb6c62b61 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/Convert.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Convert.java
diff --git a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/Converter.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Converter.java
index 7ec09bcb411a..7ec09bcb411a 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/Converter.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Converter.java
diff --git a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/ConverterException.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ConverterException.java
index 07a3708d4366..07a3708d4366 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/ConverterException.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ConverterException.java
diff --git a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/DataHandler.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/DataHandler.java
index e8b4136f185a..e8b4136f185a 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/DataHandler.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/DataHandler.java
diff --git a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/DataReader.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/DataReader.java
index 59de7ca7e1f4..59de7ca7e1f4 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/DataReader.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/DataReader.java
diff --git a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/DataWriter.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/DataWriter.java
index c5d6765e3840..c5d6765e3840 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/DataWriter.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/DataWriter.java
diff --git a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/ExtMap.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ExtMap.java
index b05767e93ae3..b05767e93ae3 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/ExtMap.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ExtMap.java
diff --git a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/FileMaker.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/FileMaker.java
index a21b8daa7b1d..a21b8daa7b1d 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/FileMaker.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/FileMaker.java
diff --git a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/GSIReader.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIReader.java
index adb6e358a74c..adb6e358a74c 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/GSIReader.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIReader.java
diff --git a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/GSIWriter.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIWriter.java
index 085e26475e09..085e26475e09 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/GSIWriter.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIWriter.java
diff --git a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/GSIandSDFMerger.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIandSDFMerger.java
index ff0348f97d3d..ff0348f97d3d 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/GSIandSDFMerger.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIandSDFMerger.java
diff --git a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/LineErrorException.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/LineErrorException.java
index 6a11360cc472..6a11360cc472 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/LineErrorException.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/LineErrorException.java
diff --git a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/OutputHandler.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/OutputHandler.java
index 997c05a70b4f..997c05a70b4f 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/OutputHandler.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/OutputHandler.java
diff --git a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/ResTypeResolver.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ResTypeResolver.java
index f53fe0101275..f53fe0101275 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/ResTypeResolver.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ResTypeResolver.java
diff --git a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/Resolver.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Resolver.java
index 29a9ee2e528a..29a9ee2e528a 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/Resolver.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Resolver.java
diff --git a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/SDFReader.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFReader.java
index 4c0c234778ec..4c0c234778ec 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/SDFReader.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFReader.java
diff --git a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/SDFWriter.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFWriter.java
index 98eb8c856e6a..98eb8c856e6a 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/SDFWriter.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFWriter.java
diff --git a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFReader.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFReader.java
index 522dcc18a5bd..522dcc18a5bd 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFReader.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFReader.java
diff --git a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFWriter.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFWriter.java
index 42eef42884c1..42eef42884c1 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFWriter.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFWriter.java
diff --git a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/dtd/xliff.dtd b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/dtd/xliff.dtd
index 91262ec28204..91262ec28204 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/dtd/xliff.dtd
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/dtd/xliff.dtd
diff --git a/transex3/java/l10nconv/java/com/sun/star/tooling/languageResolver/LanguageResolver.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/languageResolver/LanguageResolver.java
index 62ff008156ab..62ff008156ab 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/languageResolver/LanguageResolver.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/languageResolver/LanguageResolver.java
diff --git a/transex3/java/l10nconv/java/com/sun/star/tooling/languageResolver/lang.map b/l10ntools/java/l10nconv/java/com/sun/star/tooling/languageResolver/lang.map
index a43e8f5e0218..a43e8f5e0218 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/languageResolver/lang.map
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/languageResolver/lang.map
diff --git a/transex3/java/l10nconv/makefile.mk b/l10ntools/java/l10nconv/makefile.mk
index feb869778e80..2be2eb391ced 100755
--- a/transex3/java/l10nconv/makefile.mk
+++ b/l10ntools/java/l10nconv/makefile.mk
@@ -30,7 +30,7 @@
#*************************************************************************
PRJ=../..
-PRJNAME=transex3
+PRJNAME=l10ntools
TARGET=converter
.INCLUDE : ant.mk
diff --git a/transex3/java/receditor/build.xml b/l10ntools/java/receditor/build.xml
index 34f02128f034..34f02128f034 100755
--- a/transex3/java/receditor/build.xml
+++ b/l10ntools/java/receditor/build.xml
diff --git a/transex3/java/receditor/java/transex3/controller/EditorController.java b/l10ntools/java/receditor/java/transex3/controller/EditorController.java
index 38462d665304..38462d665304 100644
--- a/transex3/java/receditor/java/transex3/controller/EditorController.java
+++ b/l10ntools/java/receditor/java/transex3/controller/EditorController.java
diff --git a/transex3/java/receditor/java/transex3/controller/Main.java b/l10ntools/java/receditor/java/transex3/controller/Main.java
index e8dd06ce9f85..e8dd06ce9f85 100644
--- a/transex3/java/receditor/java/transex3/controller/Main.java
+++ b/l10ntools/java/receditor/java/transex3/controller/Main.java
diff --git a/transex3/java/receditor/java/transex3/model/ResourceFile.java b/l10ntools/java/receditor/java/transex3/model/ResourceFile.java
index 51fabb3a4b7a..51fabb3a4b7a 100644
--- a/transex3/java/receditor/java/transex3/model/ResourceFile.java
+++ b/l10ntools/java/receditor/java/transex3/model/ResourceFile.java
diff --git a/transex3/java/receditor/java/transex3/model/SdfEntity.java b/l10ntools/java/receditor/java/transex3/model/SdfEntity.java
index 4b293421fd28..4b293421fd28 100644
--- a/transex3/java/receditor/java/transex3/model/SdfEntity.java
+++ b/l10ntools/java/receditor/java/transex3/model/SdfEntity.java
diff --git a/transex3/java/receditor/java/transex3/model/SdfString.java b/l10ntools/java/receditor/java/transex3/model/SdfString.java
index 7419aeb5578b..7419aeb5578b 100644
--- a/transex3/java/receditor/java/transex3/model/SdfString.java
+++ b/l10ntools/java/receditor/java/transex3/model/SdfString.java
diff --git a/transex3/java/receditor/java/transex3/view/Editor.java b/l10ntools/java/receditor/java/transex3/view/Editor.java
index f46a82a11a2b..f46a82a11a2b 100644
--- a/transex3/java/receditor/java/transex3/view/Editor.java
+++ b/l10ntools/java/receditor/java/transex3/view/Editor.java
diff --git a/transex3/java/receditor/java/transex3/view/SdfTable.java b/l10ntools/java/receditor/java/transex3/view/SdfTable.java
index f0cc7bd84a34..f0cc7bd84a34 100644
--- a/transex3/java/receditor/java/transex3/view/SdfTable.java
+++ b/l10ntools/java/receditor/java/transex3/view/SdfTable.java
diff --git a/transex3/java/receditor/makefile.mk b/l10ntools/java/receditor/makefile.mk
index e5e3921eea6b..dd3f84daccce 100755
--- a/transex3/java/receditor/makefile.mk
+++ b/l10ntools/java/receditor/makefile.mk
@@ -30,7 +30,7 @@
#*************************************************************************
PRJ=../..
-PRJNAME=transex3
+PRJNAME=l10ntools
TARGET=receditor
.INCLUDE : ant.mk
diff --git a/transex3/java/receditor/receditor.MF b/l10ntools/java/receditor/receditor.MF
index dced97882df9..dced97882df9 100755
--- a/transex3/java/receditor/receditor.MF
+++ b/l10ntools/java/receditor/receditor.MF
diff --git a/transex3/layout/README b/l10ntools/layout/README
index 1838e2a94ba0..1838e2a94ba0 100644
--- a/transex3/layout/README
+++ b/l10ntools/layout/README
diff --git a/transex3/layout/layoutparse.cxx b/l10ntools/layout/layoutparse.cxx
index 0f43c9a3053f..0f43c9a3053f 100644
--- a/transex3/layout/layoutparse.cxx
+++ b/l10ntools/layout/layoutparse.cxx
diff --git a/transex3/layout/layoutparse.hxx b/l10ntools/layout/layoutparse.hxx
index b9cd8f6c18b2..b9cd8f6c18b2 100644
--- a/transex3/layout/layoutparse.hxx
+++ b/l10ntools/layout/layoutparse.hxx
diff --git a/transex3/layout/loc.sdf b/l10ntools/layout/loc.sdf
index 023357adc420..023357adc420 100644
--- a/transex3/layout/loc.sdf
+++ b/l10ntools/layout/loc.sdf
diff --git a/transex3/layout/makefile.mk b/l10ntools/layout/makefile.mk
index 9864b46242b2..63dbeae6d9e9 100644
--- a/transex3/layout/makefile.mk
+++ b/l10ntools/layout/makefile.mk
@@ -33,7 +33,7 @@ PRJ=..
INCPRE=$(MISC)
-PRJNAME=transex3
+PRJNAME=l10ntools
TARGET=tralay
#TARGETTYPE=GUI
TARGETTYPE=CUI
diff --git a/transex3/layout/tralay.cxx b/l10ntools/layout/tralay.cxx
index 740981674c50..13a7fdb0c5d9 100644
--- a/transex3/layout/tralay.cxx
+++ b/l10ntools/layout/tralay.cxx
@@ -30,7 +30,7 @@
************************************************************************/
#include <com/sun/star/xml/sax/SAXException.hpp>
-#include <transex3/vosapp.hxx>
+#include <l10ntools/vosapp.hxx>
#include <osl/file.hxx>
diff --git a/transex3/layout/zoom.xml b/l10ntools/layout/zoom.xml
index 0fb3d27343ff..0fb3d27343ff 100644
--- a/transex3/layout/zoom.xml
+++ b/l10ntools/layout/zoom.xml
diff --git a/l10ntools/prj/build.lst b/l10ntools/prj/build.lst
new file mode 100644
index 000000000000..ff961c096cbd
--- /dev/null
+++ b/l10ntools/prj/build.lst
@@ -0,0 +1,10 @@
+tr l10ntools : tools LIBXSLT:libxslt BERKELEYDB:berkeleydb LUCENE:lucene NULL
+tr l10ntools usr1 - all tr_mkout NULL
+tr l10ntools\inc nmake - all tr_inc NULL
+tr l10ntools\source nmake - all tr_src tr_inc NULL
+tr l10ntools\layout nmake - all rt_layout tr_src tr_inc NULL
+#tr l10ntools\java\l10nconv nmake - all tr_conv NULL
+#tr l10ntools\java\receditor nmake - all tr_rece NULL
+tr l10ntools\source\help nmake - all tr_bla_help NULL
+tr l10ntools\source\filter\utils nmake - all tr_bla_utils NULL
+tr l10ntools\source\filter\merge nmake - all tr_bla_merge tr_bla_utils NULL
diff --git a/transex3/prj/d.lst b/l10ntools/prj/d.lst
index a469837275ed..f75c16b43764 100644
--- a/transex3/prj/d.lst
+++ b/l10ntools/prj/d.lst
@@ -1,4 +1,4 @@
-mkdir: %_DEST%\inc%_EXT%\transex3
+mkdir: %_DEST%\inc%_EXT%\l10ntools
mkdir: %_DEST%\bin%_EXT%
mkdir: %_DEST%\bin%_EXT%\help
mkdir: %_DEST%\bin%_EXT%\help\com
@@ -46,16 +46,16 @@ mkdir: %_DEST%\bin%_EXT%\help\com\sun\star\help
..\scripts\fast_merge.pl %_DEST%\bin%_EXT%\fast_merge.pl
..\scripts\keyidGen.pl %_DEST%\bin%_EXT%\keyidGen.pl
-..\inc\export.hxx %_DEST%\inc%_EXT%\transex3\export.hxx
-..\inc\transex3\directory.hxx %_DEST%\inc%_EXT%\transex3\directory.hxx
-..\inc\transex3\file.hxx %_DEST%\inc%_EXT%\transex3\file.hxx
-..\inc\transex3\vosapp.hxx %_DEST%\inc%_EXT%\transex3\vosapp.hxx
+..\inc\export.hxx %_DEST%\inc%_EXT%\l10ntools\export.hxx
+..\inc\l10ntools\directory.hxx %_DEST%\inc%_EXT%\l10ntools\directory.hxx
+..\inc\l10ntools\file.hxx %_DEST%\inc%_EXT%\l10ntools\file.hxx
+..\inc\l10ntools\vosapp.hxx %_DEST%\inc%_EXT%\l10ntools\vosapp.hxx
-..\inc\utf8conv.hxx %_DEST%\inc%_EXT%\transex3\utf8conv.hxx
+..\inc\utf8conv.hxx %_DEST%\inc%_EXT%\l10ntools\utf8conv.hxx
..\%__SRC%\lib\transex.lib %_DEST%\lib%_EXT%\transex.lib
..\%__SRC%\lib\libtransex.a %_DEST%\lib%_EXT%\libtransex.a
-..\source\help\compilehelp.hxx %_DEST%\inc%_EXT%\transex3\compilehelp.hxx
-#..\source\help\helplinkerdllapi.h %_DEST%\inc%_EXT%\transex3\helplinkerdllapi.h
+..\source\help\compilehelp.hxx %_DEST%\inc%_EXT%\l10ntools\compilehelp.hxx
+#..\source\help\helplinkerdllapi.h %_DEST%\inc%_EXT%\l10ntools\helplinkerdllapi.h
..\%__SRC%\lib\* %_DEST%\lib%_EXT%\*
..\%__SRC%\class\com\sun\star\help\* %_DEST%\bin%_EXT%\help\com\sun\star\help\*
diff --git a/transex3/scripts/fast_merge.pl b/l10ntools/scripts/fast_merge.pl
index 7321a9a42911..7321a9a42911 100644
--- a/transex3/scripts/fast_merge.pl
+++ b/l10ntools/scripts/fast_merge.pl
diff --git a/transex3/scripts/keyidGen.pl b/l10ntools/scripts/keyidGen.pl
index acb5137e3f7c..acb5137e3f7c 100644
--- a/transex3/scripts/keyidGen.pl
+++ b/l10ntools/scripts/keyidGen.pl
diff --git a/transex3/scripts/localize.pl b/l10ntools/scripts/localize.pl
index 10e8124027b1..0f6a19effc38 100755
--- a/transex3/scripts/localize.pl
+++ b/l10ntools/scripts/localize.pl
@@ -78,6 +78,7 @@ my $WIN;
my $languages;
#my %sl_modules; # Contains all modules where en-US and de is source language
my $use_default_date = '0';
+my $force_ooo_module = '0';
my %is_ooo_module;
my %is_so_module;
my $DELIMITER;
@@ -275,7 +276,7 @@ sub check_modules_scm
sub is_openoffice_module
{
my $module = shift;
- return "TRUE", if defined $is_ooo_module{ $module };
+ return "TRUE", if ( $force_ooo_module || defined $is_ooo_module{ $module } );
return "";
}
@@ -1114,7 +1115,7 @@ sub parse_options{
my $extract;
my $success = GetOptions('f=s' => \$sdffile , 'l=s' => \$languages , 's=s' => \$srcpath , 'h' => \$help , 'v' => \$bVerbose ,
'm' => \$merge , 'e' => \$extract , 'x' => \$no_sort , 'd' => \$use_default_date , 'c' => \$create_dirs ,
- 'n' => \$no_gsicheck );
+ 'n' => \$no_gsicheck , 'o' => \$force_ooo_module );
$outputfile = $sdffile;
#print STDOUT "DBG: lang = $languages\n";
@@ -1126,7 +1127,11 @@ sub parse_options{
exit(1);
}
}
- if( $help || !$success || $#ARGV > 1 || ( !$sdffile ) ){
+ if( $help ){
+ usage();
+ exit(0);
+ }
+ if( !$success || $#ARGV > 1 || ( !$sdffile ) ){
usage();
exit(1);
}
@@ -1167,6 +1172,8 @@ sub usage{
print STDERR " -h File with localize.sdf's\n!";
print STDERR " -n No gsicheck\n";
print STDERR " -i Module to merge\n";
+ print STDERR " -o force using ooo localization from the l10n module instead of l10n_so; \n";
+ print STDERR " useful if the type can't be detected by the .svn tags; \n";
print STDERR " -v Verbose\n";
print STDERR "\nExample:\n";
print STDERR "\nlocalize -e -l en-US,pt-BR=en-US -f my.sdf\n( Extract en-US and pt-BR with en-US fallback )\n";
diff --git a/transex3/scripts/localize_old.pl b/l10ntools/scripts/localize_old.pl
index 151399d22002..151399d22002 100755
--- a/transex3/scripts/localize_old.pl
+++ b/l10ntools/scripts/localize_old.pl
diff --git a/transex3/source/cfg_yy_wrapper.c b/l10ntools/source/cfg_yy_wrapper.c
index ac678d17f399..ac678d17f399 100644
--- a/transex3/source/cfg_yy_wrapper.c
+++ b/l10ntools/source/cfg_yy_wrapper.c
diff --git a/transex3/source/cfglex.l b/l10ntools/source/cfglex.l
index dd2d9a45ab59..dd2d9a45ab59 100644
--- a/transex3/source/cfglex.l
+++ b/l10ntools/source/cfglex.l
diff --git a/transex3/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 0607c9e9bb06..5d85a4835843 100644
--- a/transex3/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -29,7 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
#include <stdio.h>
#include <tools/string.hxx>
#include <tools/fsys.hxx>
diff --git a/transex3/source/directory.cxx b/l10ntools/source/directory.cxx
index ed0fe27d22c2..21d0a5878d66 100644
--- a/transex3/source/directory.cxx
+++ b/l10ntools/source/directory.cxx
@@ -30,8 +30,8 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
-#include <transex3/directory.hxx>
+#include "precompiled_l10ntools.hxx"
+#include <l10ntools/directory.hxx>
#include "tools/string.hxx"
#include <iostream>
#include <vector>
diff --git a/transex3/source/export.cxx b/l10ntools/source/export.cxx
index 5294d902d2ee..72826d7bf1f2 100644
--- a/transex3/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -29,7 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
#include <stdio.h>
#include <stdlib.h>
#include <tools/fsys.hxx>
diff --git a/transex3/source/export2.cxx b/l10ntools/source/export2.cxx
index 7815e80e033f..6132b01db644 100644
--- a/transex3/source/export2.cxx
+++ b/l10ntools/source/export2.cxx
@@ -29,7 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
#include "export.hxx"
#include "utf8conv.hxx"
#include <tools/datetime.hxx>
@@ -354,17 +354,18 @@ bool Export::CopyFile( const ByteString& source , const ByteString& dest )
const int BUFFERSIZE = 8192;
char buf[ BUFFERSIZE ];
- FILE* IN_FILE = fopen( source.GetBuffer() , "r" );
- FILE* OUT_FILE = fopen( dest.GetBuffer() , "w" );
-
+ FILE* IN_FILE = fopen( source.GetBuffer() , "r" );
if( IN_FILE == NULL )
{
cerr << "Export::CopyFile WARNING: Could not open " << source.GetBuffer() << "\n";
return false;
}
+
+ FILE* OUT_FILE = fopen( dest.GetBuffer() , "w" );
if( OUT_FILE == NULL )
{
cerr << "Export::CopyFile WARNING: Could not open/create " << dest.GetBuffer() << " for writing\n";
+ fclose( IN_FILE );
return false;
}
diff --git a/transex3/source/file.cxx b/l10ntools/source/file.cxx
index 4ea9ca55d574..43ce4c757d54 100644
--- a/transex3/source/file.cxx
+++ b/l10ntools/source/file.cxx
@@ -30,8 +30,8 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
-#include <transex3/file.hxx>
+#include "precompiled_l10ntools.hxx"
+#include <l10ntools/file.hxx>
namespace transex
{
diff --git a/transex3/source/filter/merge/FCFGMerge.cfg b/l10ntools/source/filter/merge/FCFGMerge.cfg
index 46fcccafe7e4..46fcccafe7e4 100644
--- a/transex3/source/filter/merge/FCFGMerge.cfg
+++ b/l10ntools/source/filter/merge/FCFGMerge.cfg
diff --git a/transex3/source/filter/merge/FCFGMerge.java b/l10ntools/source/filter/merge/FCFGMerge.java
index 7fbfa8a0c986..7fbfa8a0c986 100644
--- a/transex3/source/filter/merge/FCFGMerge.java
+++ b/l10ntools/source/filter/merge/FCFGMerge.java
diff --git a/transex3/source/filter/merge/Manifest.mf b/l10ntools/source/filter/merge/Manifest.mf
index 1337eaf4d39a..1337eaf4d39a 100644
--- a/transex3/source/filter/merge/Manifest.mf
+++ b/l10ntools/source/filter/merge/Manifest.mf
diff --git a/transex3/source/filter/merge/Merger.java b/l10ntools/source/filter/merge/Merger.java
index 0bf11fc42fbf..0bf11fc42fbf 100644
--- a/transex3/source/filter/merge/Merger.java
+++ b/l10ntools/source/filter/merge/Merger.java
diff --git a/transex3/source/filter/merge/makefile.mk b/l10ntools/source/filter/merge/makefile.mk
index bf768be851d8..510ec3202bb4 100644
--- a/transex3/source/filter/merge/makefile.mk
+++ b/l10ntools/source/filter/merge/makefile.mk
@@ -31,7 +31,7 @@
PRJ = ..$/..$/..
TARGET = FCFGMerge
-PRJNAME = filter
+PRJNAME = l10ntools
PACKAGE = com$/sun$/star$/filter$/config$/tools$/merge
# --- Settings -----------------------------------------------------
diff --git a/transex3/source/filter/utils/AnalyzeStartupLog.java b/l10ntools/source/filter/utils/AnalyzeStartupLog.java
index 498528850697..498528850697 100644
--- a/transex3/source/filter/utils/AnalyzeStartupLog.java
+++ b/l10ntools/source/filter/utils/AnalyzeStartupLog.java
diff --git a/transex3/source/filter/utils/Cache.java b/l10ntools/source/filter/utils/Cache.java
index 94c26008ed13..94c26008ed13 100644
--- a/transex3/source/filter/utils/Cache.java
+++ b/l10ntools/source/filter/utils/Cache.java
diff --git a/transex3/source/filter/utils/ConfigHelper.java b/l10ntools/source/filter/utils/ConfigHelper.java
index 78cc71cf65b2..78cc71cf65b2 100644
--- a/transex3/source/filter/utils/ConfigHelper.java
+++ b/l10ntools/source/filter/utils/ConfigHelper.java
diff --git a/transex3/source/filter/utils/FileHelper.java b/l10ntools/source/filter/utils/FileHelper.java
index 71f51cf36bf6..71f51cf36bf6 100644
--- a/transex3/source/filter/utils/FileHelper.java
+++ b/l10ntools/source/filter/utils/FileHelper.java
diff --git a/transex3/source/filter/utils/Logger.java b/l10ntools/source/filter/utils/Logger.java
index 7657eba5f426..7657eba5f426 100644
--- a/transex3/source/filter/utils/Logger.java
+++ b/l10ntools/source/filter/utils/Logger.java
diff --git a/transex3/source/filter/utils/MalformedCommandLineException.java b/l10ntools/source/filter/utils/MalformedCommandLineException.java
index e073dcb9adcc..e073dcb9adcc 100644
--- a/transex3/source/filter/utils/MalformedCommandLineException.java
+++ b/l10ntools/source/filter/utils/MalformedCommandLineException.java
diff --git a/transex3/source/filter/utils/XMLHelper.java b/l10ntools/source/filter/utils/XMLHelper.java
index 0f912cac8e25..0f912cac8e25 100644
--- a/transex3/source/filter/utils/XMLHelper.java
+++ b/l10ntools/source/filter/utils/XMLHelper.java
diff --git a/transex3/source/filter/utils/makefile.mk b/l10ntools/source/filter/utils/makefile.mk
index d41d8ba9a825..4025c54b2c38 100644
--- a/transex3/source/filter/utils/makefile.mk
+++ b/l10ntools/source/filter/utils/makefile.mk
@@ -31,7 +31,7 @@
PRJ = ..$/..$/..
TARGET = FCFGUtils
-PRJNAME = filter
+PRJNAME = l10ntools
PACKAGE = com$/sun$/star$/filter$/config$/tools$/utils
# --- Settings -----------------------------------------------------
diff --git a/transex3/source/gsicheck.cxx b/l10ntools/source/gsicheck.cxx
index 99183602f951..aa3b8157952d 100644
--- a/transex3/source/gsicheck.cxx
+++ b/l10ntools/source/gsicheck.cxx
@@ -29,7 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
#include <stdio.h>
#include <tools/fsys.hxx>
#include <tools/stream.hxx>
diff --git a/transex3/source/gsiconv.cxx b/l10ntools/source/gsiconv.cxx
index f6dea76ebb51..e127e55482da 100644
--- a/transex3/source/gsiconv.cxx
+++ b/l10ntools/source/gsiconv.cxx
@@ -29,7 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
#include <stdio.h>
#include <tools/fsys.hxx>
#include <tools/stream.hxx>
diff --git a/transex3/source/help/HelpCompiler.cxx b/l10ntools/source/help/HelpCompiler.cxx
index 5001d0907972..5001d0907972 100644
--- a/transex3/source/help/HelpCompiler.cxx
+++ b/l10ntools/source/help/HelpCompiler.cxx
diff --git a/transex3/source/help/HelpCompiler.hxx b/l10ntools/source/help/HelpCompiler.hxx
index 7ffb096bd635..7ffb096bd635 100644
--- a/transex3/source/help/HelpCompiler.hxx
+++ b/l10ntools/source/help/HelpCompiler.hxx
diff --git a/transex3/source/help/HelpFileDocument.java b/l10ntools/source/help/HelpFileDocument.java
index 2212db27f251..2212db27f251 100644
--- a/transex3/source/help/HelpFileDocument.java
+++ b/l10ntools/source/help/HelpFileDocument.java
diff --git a/transex3/source/help/HelpIndexerTool.java b/l10ntools/source/help/HelpIndexerTool.java
index 6bf22d1ac344..6bf22d1ac344 100644
--- a/transex3/source/help/HelpIndexerTool.java
+++ b/l10ntools/source/help/HelpIndexerTool.java
diff --git a/transex3/source/help/HelpLinker.cxx b/l10ntools/source/help/HelpLinker.cxx
index 7dfe4ee4a2a2..7dfe4ee4a2a2 100644
--- a/transex3/source/help/HelpLinker.cxx
+++ b/l10ntools/source/help/HelpLinker.cxx
diff --git a/transex3/source/help/compilehelp.hxx b/l10ntools/source/help/compilehelp.hxx
index d123d628be27..d123d628be27 100644
--- a/transex3/source/help/compilehelp.hxx
+++ b/l10ntools/source/help/compilehelp.hxx
diff --git a/transex3/source/help/helplinker.pmk b/l10ntools/source/help/helplinker.pmk
index 569c5f4dbdee..569c5f4dbdee 100644
--- a/transex3/source/help/helplinker.pmk
+++ b/l10ntools/source/help/helplinker.pmk
diff --git a/transex3/source/help/makefile.mk b/l10ntools/source/help/makefile.mk
index 6fc823a1b59a..57164004af8b 100644
--- a/transex3/source/help/makefile.mk
+++ b/l10ntools/source/help/makefile.mk
@@ -30,7 +30,7 @@
#*************************************************************************
PRJ = ..$/..
-PRJNAME = xmlhelp
+PRJNAME = l10ntools
TARGET = HelpLinker
LIBBASENAME = helplinker
PACKAGE = com$/sun$/star$/help
diff --git a/transex3/source/helpex.cxx b/l10ntools/source/helpex.cxx
index f4a1589b530e..8f0b6c1d218f 100644
--- a/transex3/source/helpex.cxx
+++ b/l10ntools/source/helpex.cxx
@@ -29,7 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
#include <stdio.h>
#include <stdlib.h>
diff --git a/transex3/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 8aafc692f14c..84d73e94f312 100644
--- a/transex3/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -29,7 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
#include <tools/fsys.hxx>
#include <osl/file.hxx>
// local includes
diff --git a/transex3/source/inireader.cxx b/l10ntools/source/inireader.cxx
index 1ff34fad8e95..63f902a5a1da 100644
--- a/transex3/source/inireader.cxx
+++ b/l10ntools/source/inireader.cxx
@@ -120,7 +120,7 @@ void INIreader::toStlString( const UnicodeString& str , string& stl_str)
char* buffer = new char[ str.length()*3 ];
str.extract( 0 , str.length() , buffer );
stl_str = string( buffer );
- delete[] buffer;
+ delete [] buffer;
}
void INIreader::trim( string& str )
diff --git a/transex3/source/lngex.cxx b/l10ntools/source/lngex.cxx
index 53c97de6e045..67ee34cbdaab 100644
--- a/transex3/source/lngex.cxx
+++ b/l10ntools/source/lngex.cxx
@@ -29,7 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
#include <stdio.h>
// local includes
diff --git a/transex3/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index e55fdc83ce37..fcad498128c2 100644
--- a/transex3/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -29,7 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
#include <tools/fsys.hxx>
// local includes
diff --git a/transex3/source/localize.cxx b/l10ntools/source/localize.cxx
index c82d152cac7e..b617fdb4cf1e 100644
--- a/transex3/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -29,7 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
#include "srciter.hxx"
#include "export.hxx"
@@ -41,9 +41,9 @@
#include "tools/errcode.hxx"
#include "tools/fsys.hxx"
-#ifndef TRANSEX_FILE_HXX
-#define TRANSEX_FILE_HXX
-#include <transex3/file.hxx>
+#ifndef L10NTOOLS_FILE_HXX
+#define L10NTOOLS_FILE_HXX
+#include <l10ntools/file.hxx>
#endif
namespace transex3
@@ -938,10 +938,25 @@ int _cdecl main( int argc, char *argv[] )
bool hasPwd = treeconfig.getActiveRepositories( repos );
if( hasPwd ) cout << "Found special path!\n";
+ string minor_ext;
+ bool has_minor_ext;
+
+ if( Export::GetEnv("UPDMINOREXT") != NULL )
+ {
+ minor_ext = string( Export::GetEnv("UPDMINOREXT") );
+ has_minor_ext = minor_ext.size();
+ }
+ else
+ has_minor_ext = false;
+
// localize through all repositories
for( vector<string>::iterator iter = repos.begin(); iter != repos.end() ; ++iter )
{
- string curRepository = string( Export::GetEnv("SOURCE_ROOT_DIR") ) + "/" + *iter;
+ string curRepository;
+ if( has_minor_ext )
+ curRepository = string( Export::GetEnv("SOURCE_ROOT_DIR") ) + "/" + *iter + minor_ext;
+ else
+ curRepository = string( Export::GetEnv("SOURCE_ROOT_DIR") ) + "/" + *iter;
cout << "Localizing repository " << curRepository << "\n";
SourceTreeLocalizer aIter( ByteString( curRepository.c_str() ) , sVersion , (sOutput.Len() > 0) , bQuiet2 , bSkipLinks );
aIter.SetLanguageRestriction( sLanguages );
diff --git a/transex3/source/makefile.mk b/l10ntools/source/makefile.mk
index a557b210aad0..fe4ecc919179 100644
--- a/transex3/source/makefile.mk
+++ b/l10ntools/source/makefile.mk
@@ -33,7 +33,7 @@ PRJ=..
INCPRE=$(MISC)
-PRJNAME=transex3
+PRJNAME=l10ntools
TARGET=transex
TARGETTYPE=CUI
LIBTARGET=no
diff --git a/transex3/source/merge.cxx b/l10ntools/source/merge.cxx
index ee0f6f459655..42f539065651 100644
--- a/transex3/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -29,7 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
#include <stdio.h>
#include <tools/fsys.hxx>
#include "export.hxx"
diff --git a/transex3/source/src_yy_wrapper.c b/l10ntools/source/src_yy_wrapper.c
index d326b9a94e86..d326b9a94e86 100644
--- a/transex3/source/src_yy_wrapper.c
+++ b/l10ntools/source/src_yy_wrapper.c
diff --git a/transex3/source/srciter.cxx b/l10ntools/source/srciter.cxx
index d2cbb2352570..cf04de4bf3fa 100644
--- a/transex3/source/srciter.cxx
+++ b/l10ntools/source/srciter.cxx
@@ -29,7 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
#include "srciter.hxx"
#include <stdio.h>
diff --git a/transex3/source/srclex.l b/l10ntools/source/srclex.l
index fef251e47224..fef251e47224 100644
--- a/transex3/source/srclex.l
+++ b/l10ntools/source/srclex.l
diff --git a/transex3/source/tagtest.cxx b/l10ntools/source/tagtest.cxx
index 89c1ecf15488..7896915ede0c 100644
--- a/transex3/source/tagtest.cxx
+++ b/l10ntools/source/tagtest.cxx
@@ -29,7 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
#include <tools/string.hxx>
#include "tagtest.hxx"
diff --git a/transex3/source/treeconfig.cxx b/l10ntools/source/treeconfig.cxx
index 137492c39a50..137492c39a50 100644
--- a/transex3/source/treeconfig.cxx
+++ b/l10ntools/source/treeconfig.cxx
diff --git a/transex3/source/utf8conv.cxx b/l10ntools/source/utf8conv.cxx
index 8fc61f9bb5cc..ee35eb56befd 100644
--- a/transex3/source/utf8conv.cxx
+++ b/l10ntools/source/utf8conv.cxx
@@ -29,7 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
#include "utf8conv.hxx"
//
diff --git a/transex3/source/wrdtrans.cxx b/l10ntools/source/wrdtrans.cxx
index 71866cd0e618..c4a9d6ea5570 100644
--- a/transex3/source/wrdtrans.cxx
+++ b/l10ntools/source/wrdtrans.cxx
@@ -29,7 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
/*
#include "wrdtrans.hxx"
diff --git a/transex3/source/wtranode.cxx b/l10ntools/source/wtranode.cxx
index 0383ffa7feac..401c0b20fe1a 100644
--- a/transex3/source/wtranode.cxx
+++ b/l10ntools/source/wtranode.cxx
@@ -29,7 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
#include "wtranode.hxx"
diff --git a/transex3/source/wtratree.cxx b/l10ntools/source/wtratree.cxx
index fea67215ba51..dbf02a6f22be 100644
--- a/transex3/source/wtratree.cxx
+++ b/l10ntools/source/wtratree.cxx
@@ -29,7 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
#include "wtratree.hxx"
diff --git a/transex3/source/xgfconv.cxx b/l10ntools/source/xgfconv.cxx
index 76ea1a2906a8..54b92fb3c1c2 100644
--- a/transex3/source/xgfconv.cxx
+++ b/l10ntools/source/xgfconv.cxx
@@ -6,7 +6,7 @@
/*****************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
#if defined(UNX) || defined(OS2)
int main( int argc, char *argv[] )
#else
diff --git a/transex3/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index 921f1d329f67..f75a0afe9792 100644
--- a/transex3/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -29,7 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
#include <iterator> /* std::iterator*/
#include <stdio.h>
diff --git a/transex3/source/xrm_yy_wrapper.c b/l10ntools/source/xrm_yy_wrapper.c
index 6a304d0d09dc..6a304d0d09dc 100644
--- a/transex3/source/xrm_yy_wrapper.c
+++ b/l10ntools/source/xrm_yy_wrapper.c
diff --git a/transex3/source/xrmlex.l b/l10ntools/source/xrmlex.l
index efc8bf1f7d91..efc8bf1f7d91 100644
--- a/transex3/source/xrmlex.l
+++ b/l10ntools/source/xrmlex.l
diff --git a/transex3/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index f1b3d4d6cb5a..3eadd202ef5c 100644
--- a/transex3/source/xrmmerge.cxx
+++ b/l10ntools/source/xrmmerge.cxx
@@ -29,7 +29,7 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
#include <stdio.h>
#include <tools/string.hxx>
#include <tools/fsys.hxx>
diff --git a/transex3/workbench/gsicheck_errors.sdf b/l10ntools/workbench/gsicheck_errors.sdf
index 04dde12e13ca..04dde12e13ca 100644
--- a/transex3/workbench/gsicheck_errors.sdf
+++ b/l10ntools/workbench/gsicheck_errors.sdf
diff --git a/transex3/workbench/gsicheck_errors_err-.sdf b/l10ntools/workbench/gsicheck_errors_err-.sdf
index f6b267b1c55b..f6b267b1c55b 100644
--- a/transex3/workbench/gsicheck_errors_err-.sdf
+++ b/l10ntools/workbench/gsicheck_errors_err-.sdf
diff --git a/transex3/workbench/gsicheck_errors_err-l.sdf b/l10ntools/workbench/gsicheck_errors_err-l.sdf
index 6ca7f7065cd2..6ca7f7065cd2 100644
--- a/transex3/workbench/gsicheck_errors_err-l.sdf
+++ b/l10ntools/workbench/gsicheck_errors_err-l.sdf
diff --git a/transex3/workbench/gsicheck_errors_err-s.sdf b/l10ntools/workbench/gsicheck_errors_err-s.sdf
index 523017fcfb35..523017fcfb35 100644
--- a/transex3/workbench/gsicheck_errors_err-s.sdf
+++ b/l10ntools/workbench/gsicheck_errors_err-s.sdf
diff --git a/transex3/workbench/gsicheck_errors_err-t.sdf b/l10ntools/workbench/gsicheck_errors_err-t.sdf
index e9594642113c..e9594642113c 100644
--- a/transex3/workbench/gsicheck_errors_err-t.sdf
+++ b/l10ntools/workbench/gsicheck_errors_err-t.sdf
diff --git a/transex3/workbench/gsicheck_errors_ok-.sdf b/l10ntools/workbench/gsicheck_errors_ok-.sdf
index 4bb4b7bece16..4bb4b7bece16 100644
--- a/transex3/workbench/gsicheck_errors_ok-.sdf
+++ b/l10ntools/workbench/gsicheck_errors_ok-.sdf
diff --git a/transex3/workbench/gsicheck_errors_ok-l.sdf b/l10ntools/workbench/gsicheck_errors_ok-l.sdf
index 9a55e7c95dd3..9a55e7c95dd3 100644
--- a/transex3/workbench/gsicheck_errors_ok-l.sdf
+++ b/l10ntools/workbench/gsicheck_errors_ok-l.sdf
diff --git a/transex3/workbench/gsicheck_errors_ok-s.sdf b/l10ntools/workbench/gsicheck_errors_ok-s.sdf
index 97dd4da6a54b..97dd4da6a54b 100644
--- a/transex3/workbench/gsicheck_errors_ok-s.sdf
+++ b/l10ntools/workbench/gsicheck_errors_ok-s.sdf
diff --git a/transex3/workbench/gsicheck_errors_ok-t.sdf b/l10ntools/workbench/gsicheck_errors_ok-t.sdf
index a6c097e6bd2f..a6c097e6bd2f 100644
--- a/transex3/workbench/gsicheck_errors_ok-t.sdf
+++ b/l10ntools/workbench/gsicheck_errors_ok-t.sdf
diff --git a/transex3/workbench/gsicheckcheck.btm b/l10ntools/workbench/gsicheckcheck.btm
index de71b17da332..de71b17da332 100644
--- a/transex3/workbench/gsicheckcheck.btm
+++ b/l10ntools/workbench/gsicheckcheck.btm
diff --git a/lingucomponent/prj/build.lst b/lingucomponent/prj/build.lst
index 65e8459bea3f..138e5858f70e 100644
--- a/lingucomponent/prj/build.lst
+++ b/lingucomponent/prj/build.lst
@@ -1,4 +1,4 @@
-lc lingucomponent : linguistic libtextcat svl hyphen HUNSPELL:hunspell NULL
+lc lingucomponent : linguistic libtextcat svl HYPHEN:hyphen HUNSPELL:hunspell NULL
lc lingucomponent usr1 - all lc_mkout NULL
lc lingucomponent\inc nmake - all lc_inc NULL
lc lingucomponent\source\lingutil nmake - all lc_util lc_inc NULL
diff --git a/neon/makefile.mk b/neon/makefile.mk
index dd0022822752..367e5ffc0a46 100644
--- a/neon/makefile.mk
+++ b/neon/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -62,8 +62,8 @@ PATCH_FILES=neon.patch
.ENDIF
ADDITIONAL_FILES=src$/makefile.mk src$/config.h src$/ne_ntlm.h src$/ne_ntlm.c
-
BUILD_DIR=src
+
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
OUT2INC= \
@@ -71,6 +71,7 @@ OUT2INC= \
$(BUILD_DIR)$/ne_alloc.h \
$(BUILD_DIR)$/ne_auth.h \
$(BUILD_DIR)$/ne_basic.h \
+ $(BUILD_DIR)$/ne_compress.h \
$(BUILD_DIR)$/ne_defs.h \
$(BUILD_DIR)$/ne_locks.h \
$(BUILD_DIR)$/ne_props.h \
diff --git a/neon/neon.patch b/neon/neon.patch
index 23a6bba02ebe..09233266b292 100644
--- a/neon/neon.patch
+++ b/neon/neon.patch
@@ -1,6 +1,6 @@
---- misc/neon-0.28.2/src/config.h 2009-09-29 10:28:26.750000000 +0200
-+++ misc/build/neon-0.28.2/src/config.h 2009-09-29 10:22:51.890625000 +0200
-@@ -1 +1,484 @@
+--- misc/neon-0.28.2/src/config.h 2010-01-08 11:51:21.000000000 +0100
++++ misc/build/neon-0.28.2/src/config.h 2010-01-08 11:53:42.000000000 +0100
+@@ -1 +1,488 @@
-dummy
+
+/* Define to specific EGD socket path */
@@ -22,7 +22,7 @@
+
+/* Define to 1 if you have the declaration of `h_errno', and to 0 if you
+ don't. */
-+#ifdef WIN32
++#ifdef WIN32
+#define HAVE_DECL_H_ERRNO 1
+#endif
+
@@ -132,14 +132,14 @@
+#endif
+
+/* Define if OpenSSL support is enabled */
-+/* #undef HAVE_OPENSSL */
-+#define HAVE_OPENSSL
++#define HAVE_OPENSSL 1
++
+/* Define to 1 if you have the <openssl/opensslv.h> header file. */
-+/* #undef HAVE_OPENSSL_OPENSSLV_H */
+#define HAVE_OPENSSL_OPENSSLV_H 1
++
+/* Define to 1 if you have the <openssl/ssl.h> header file. */
-+/* #undef HAVE_OPENSSL_SSL_H */
+#define HAVE_OPENSSL_SSL_H 1
++
+/* Define to 1 if you have the `pipe' function. */
+#define HAVE_PIPE 1
+
@@ -340,13 +340,13 @@
+/* #undef NE_HAVE_SOCKS */
+
+/* Defined if SSL is supported */
-+/* #undef NE_HAVE_SSL */
+#define NE_HAVE_SSL
++
+/* Defined if TS_SSL is supported */
+/* #undef NE_HAVE_TS_SSL */
+
+/* Defined if ZLIB is supported */
-+/* #undef NE_HAVE_ZLIB */
++#define NE_HAVE_ZLIB 1
+
+/* Define to be filename of an SSL CA root bundle */
+/* #undef NE_SSL_CA_BUNDLE */
@@ -455,6 +455,10 @@
+/* Define to `unsigned' if <sys/types.h> does not define. */
+/* #undef size_t */
+
++/* MS IIS does not send Lock-Token response header after creation of a */
++/* new lock. This violates RFC, but... if we want to talk with this */
++/* beast we need a workaround */
++#define IIS_LOCK_BUG_WORKAROUND 1
+
+/* Enable leak-tracking versions of ne_*alloc when NEON_MEMLEAK is enabled */
+#ifdef NEON_MEMLEAK
@@ -471,13 +475,13 @@
+
+#define HAVE_MEMCPY 1
+
-+#define strncasecmp strnicmp
++#define strncasecmp strnicmp
+#define inline __inline
+#define WIN32_LEAN_AND_MEAN
+#define NOUSER
+#define NOGDI
+#define NONLS
-+#define NOCRYPT
++#define NOCRYPT
+
+#endif
+
@@ -486,9 +490,9 @@
+#else
+#define HAVE_NTLM 1
+#endif
---- misc/neon-0.28.2/src/makefile.mk 2009-09-29 10:28:26.687500000 +0200
-+++ misc/build/neon-0.28.2/src/makefile.mk 2009-09-17 13:04:18.031250000 +0200
-@@ -1 +1,92 @@
+--- misc/neon-0.28.2/src/makefile.mk 2010-01-08 11:51:21.000000000 +0100
++++ misc/build/neon-0.28.2/src/makefile.mk 2010-01-08 11:53:27.000000000 +0100
+@@ -1 +1,100 @@
-dummy
+PRJ=..$/..$/..$/..$/..
+
@@ -497,7 +501,7 @@
+LIBTARGET=NO
+USE_DEFFILE=TRUE
+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+ UWINAPILIB=
++UWINAPILIB=
+
+# --- Settings -----------------------------------------------------
+
@@ -508,7 +512,7 @@
+CDEFS+=-DHAVE_CONFIG_H
+
+.IF "$(SYSTEM_LIBXML)" == "YES"
-+CFLAGS+= -DSYSTEM_LIBXML $(LIBXML_CFLAGS)
++CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
+.ELSE
+LIBXMLINCDIR=external$/libxml
+CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXMLINCDIR)
@@ -518,6 +522,13 @@
+CFLAGS+= $(OPENSSL_CFLAGS)
+.ENDIF
+
++.IF "$(SYSTEM_ZLIB)" == "YES"
++CFLAGS+=-DSYSTEM_ZLIB
++.ELSE
++ZLIBINCDIR=external$/zlib
++CFLAGS+=-I$(SOLARINCDIR)$/$(ZLIBINCDIR)
++.ENDIF
++
+SLOFILES= \
+ $(SLO)$/ne_207.obj \
+ $(SLO)$/ne_acl.obj \
@@ -548,14 +559,15 @@
+.ENDIF
+
+# $(SLO)$/ne_gnutls.obj \
-+# $(SLO)$/ne_stubssl.obj
++# $(SLO)$/ne_stubssl.obj
+
+SHL1OBJS=$(SLOFILES)
+SHL1TARGET=$(TARGET)
+SHL1VERSIONMAP=exports.map
+SHL1IMPLIB=i$(TARGET)
+
-+SHL1STDLIBS+= $(LIBXML2LIB)
++SHL1STDLIBS+= $(LIBXML2LIB) \
++ $(ZLIB3RDLIB)
+
+.IF "$(GUI)"=="WNT"
+ SHL1STDLIBS+= $(WSOCK32LIB)
@@ -580,10 +592,10 @@
+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+
+# --- Targets ------------------------------------------------------
-+DEF1NAME=$(SHL1TARGET)
++DEF1NAME=$(SHL1TARGET)
+.INCLUDE : target.mk
--- misc/neon-0.28.2/src/ne_auth.c 2008-02-29 17:30:12.000000000 +0100
-+++ misc/build/neon-0.28.2/src/ne_auth.c 2009-09-29 10:22:51.906250000 +0200
++++ misc/build/neon-0.28.2/src/ne_auth.c 2010-01-08 11:30:06.000000000 +0100
@@ -77,6 +77,10 @@
#include "ne_sspi.h"
#endif
@@ -627,25 +639,22 @@
chall->handler->attempt++, sess->username, pwbuf) == 0) {
return 0;
} else {
-@@ -598,9 +611,10 @@
+@@ -598,7 +611,8 @@
int ntlm = ne_strcasecmp(parms->protocol->name, "NTLM") == 0;
int status;
char *response = NULL;
-
-+ char password[NE_ABUFSIZ];
-+
++ char password[NE_ABUFSIZ];
++
NE_DEBUG(NE_DBG_HTTPAUTH, "auth: SSPI challenge.\n");
--
-+
+
if (!sess->sspi_context) {
- ne_uri uri = {0};
-
@@ -614,8 +628,17 @@
return status;
}
}
+
-+ /* Authentification needs more than one http request.
++ /* Authentification needs more than one http request.
+ * As long as authentification in progress use the existing credentials.
+ * Otherwise get new credentials.*/
+ if (!parms->opaque)
@@ -665,7 +674,7 @@
+#ifdef HAVE_NTLM
+
-+static char *request_ntlm(auth_session *sess, struct auth_request *request)
++static char *request_ntlm(auth_session *sess, struct auth_request *request)
+{
+ char *token = ne_ntlm_getRequestToken(sess->ntlm_context);
+ if (token) {
@@ -679,13 +688,13 @@
+
+static int ntlm_challenge(auth_session *sess, int attempt,
+ struct auth_challenge *parms,
-+ ne_buffer **errmsg)
++ ne_buffer **errmsg)
+{
+ int status;
-+
++
+ NE_DEBUG(NE_DBG_HTTPAUTH, "auth: NTLM challenge.\n");
-+
-+ if (!parms->opaque) {
++
++ if (!parms->opaque && (!sess->ntlm_context || (attempt > 1))) {
+ char password[NE_ABUFSIZ];
+
+ if (get_credentials(sess, errmsg, attempt, parms, password)) {
@@ -702,7 +711,7 @@
+ }
+
+ status = ne_ntlm_create_context(&sess->ntlm_context,
-+ sess->username,
++ sess->username,
+ password);
+ if (status) {
+ return status;
@@ -717,7 +726,7 @@
+ return 0;
+}
+#endif /* HAVE_NTLM */
-+
++
+
/* Examine a digest challenge: return 0 if it is a valid Digest challenge,
* else non-zero. */
@@ -747,7 +756,7 @@
return ret;
}
--- misc/neon-0.28.2/src/ne_auth.h 2007-12-05 17:39:58.000000000 +0100
-+++ misc/build/neon-0.28.2/src/ne_auth.h 2009-09-29 10:22:51.921875000 +0200
++++ misc/build/neon-0.28.2/src/ne_auth.h 2010-01-08 11:30:07.000000000 +0100
@@ -47,8 +47,8 @@
* Hint: if you just wish to attempt authentication just once (even if
* the user gets the username/password wrong), have the callback
@@ -760,7 +769,7 @@
/* Set callbacks to provide credentials for server and proxy
* authentication, using the default set of authentication protocols.
--- misc/neon-0.28.2/src/ne_defs.h 2006-10-24 21:40:09.000000000 +0200
-+++ misc/build/neon-0.28.2/src/ne_defs.h 2009-09-29 10:22:51.921875000 +0200
++++ misc/build/neon-0.28.2/src/ne_defs.h 2010-01-08 11:30:07.000000000 +0100
@@ -41,7 +41,7 @@
#endif
@@ -770,8 +779,76 @@
#define ssize_t int
#endif
+--- misc/neon-0.28.2/src/ne_locks.c 2007-02-05 11:09:27.000000000 +0100
++++ misc/build/neon-0.28.2/src/ne_locks.c 2010-01-08 11:30:06.000000000 +0100
+@@ -579,6 +579,23 @@
+ const char *token = ne_get_response_header(ctx->req, "Lock-Token");
+ /* at the root element; retrieve the Lock-Token header,
+ * and bail if it wasn't given. */
++#ifdef IIS_LOCK_BUG_WORKAROUND
++ /* MS IIS violates RFC 2518/4918. It does not send a Lock-Token response
++ header upon successful creation of a new lock. As a workaround, we
++ will try to pick the lock token from the response body (although
++ this is not 100% safe in case of multiple activelocks). */
++ if (token == NULL)
++ NE_DEBUG(NE_DBG_LOCKS,
++ "Ignoring missing LOCK response Lock-Token header\n");
++
++ if (token != NULL) {
++ if (token[0] == '<') token++;
++ ctx->token = ne_strdup(token);
++ ne_shave(ctx->token, ">");
++ NE_DEBUG(NE_DBG_LOCKS, "lk_startelm: Finding token %s\n",
++ ctx->token);
++ }
++#else
+ if (token == NULL) {
+ ne_xml_set_error(ctx->parser,
+ _("LOCK response missing Lock-Token header"));
+@@ -590,12 +607,28 @@
+ ne_shave(ctx->token, ">");
+ NE_DEBUG(NE_DBG_LOCKS, "lk_startelm: Finding token %s\n",
+ ctx->token);
++#endif
+ }
+
+ /* TODO: only accept 'prop' as root for LOCK response */
+ if (!can_accept(parent, id))
+ return NE_XML_DECLINE;
+
++#ifdef IIS_LOCK_BUG_WORKAROUND
++ if (id == ELM_activelock && ctx->found) {
++ /* Found another activelock... */
++ const char *token = ne_get_response_header(ctx->req, "Lock-Token");
++ if (token == NULL) {
++ /* Response contains more than one activelock and no Lock-Token
++ * response header. We are doomed. No safe workaround for IIS
++ * lock bug possible. */
++ ne_xml_set_error(ctx->parser,
++ _("LOCK response missing Lock-Token header and more than one activelock"));
++ return NE_XML_ABORT;
++ }
++ }
++#endif
++
+ if (id == ELM_activelock && !ctx->found) {
+ /* a new activelock */
+ ne_lock_free(&ctx->active);
+@@ -621,7 +654,12 @@
+ return -1;
+
+ if (state == ELM_activelock) {
++#ifdef IIS_LOCK_BUG_WORKAROUND
++ if (ctx->active.token) {
++ ctx->token = ne_strdup(ctx->active.token);
++#else
+ if (ctx->active.token && strcmp(ctx->active.token, ctx->token) == 0) {
++#endif
+ ctx->found = 1;
+ }
+ }
--- misc/neon-0.28.2/src/ne_locks.h 2006-01-02 12:43:19.000000000 +0100
-+++ misc/build/neon-0.28.2/src/ne_locks.h 2009-09-29 10:22:51.921875000 +0200
++++ misc/build/neon-0.28.2/src/ne_locks.h 2010-01-08 11:30:07.000000000 +0100
@@ -22,6 +22,10 @@
#ifndef NE_LOCKS_H
#define NE_LOCKS_H
@@ -783,11 +860,11 @@
#include "ne_request.h" /* for ne_session + ne_request */
#include "ne_uri.h" /* for ne_uri */
---- misc/neon-0.28.2/src/ne_ntlm.c 2009-09-29 10:28:26.875000000 +0200
-+++ misc/build/neon-0.28.2/src/ne_ntlm.c 2009-09-29 10:22:51.937500000 +0200
-@@ -1 +1,700 @@
+--- misc/neon-0.28.2/src/ne_ntlm.c 2010-01-08 11:51:21.000000000 +0100
++++ misc/build/neon-0.28.2/src/ne_ntlm.c 2010-01-08 11:53:52.000000000 +0100
+@@ -1 +1,703 @@
-dummy
-+/*
++/*
+ Handling of NTLM Authentication
+ Copyright (C) 2003, Daniel Stenberg <daniel@haxx.se>
+ Copyright (C) 2009, Kai Sommerfeld <kso@openoffice.org>
@@ -796,7 +873,7 @@
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
-+
++
+ This library 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
@@ -810,7 +887,7 @@
+*/
+
+/* NTLM details:
-+
++
+ http://davenport.sourceforge.net/ntlm.html
+ http://www.innovation.ch/java/ntlm.html
+
@@ -1018,8 +1095,8 @@
+ memcpy(ctx->nonce, &buffer[24], 8);
+
+ /* at index decimal 20, there's a 32bit NTLM flag field */
-+
-+ if (buffer) ne_free(buffer);
++
++ if (buffer) ne_free(buffer);
+ }
+ else {
+ if(ctx->state >= NTLMSTATE_TYPE1)
@@ -1105,7 +1182,7 @@
+
+ if (len > 14)
+ len = 14;
-+
++
+ for (i=0; i<len; i++)
+ pw[i] = toupper(password[i]);
+
@@ -1119,7 +1196,7 @@
+ setup_des_key(pw, DESKEY(ks));
+ DES_ecb_encrypt((DES_cblock *)magic, (DES_cblock *)lmbuffer,
+ DESKEY(ks), DES_ENCRYPT);
-+
++
+ setup_des_key(pw+7, DESKEY(ks));
+ DES_ecb_encrypt((DES_cblock *)magic, (DES_cblock *)(lmbuffer+8),
+ DESKEY(ks), DES_ENCRYPT);
@@ -1173,13 +1250,13 @@
+ if(!ctx->user || !ctx->passwd)
+ /* no user, no auth */
+ return 0; /* OK */
-+
++
+ switch(ctx->state) {
+ case NTLMSTATE_TYPE1:
+ default: /* for the weird cases we (re)start here */
+ hostoff = 32;
+ domoff = hostoff + hostlen;
-+
++
+ /* Create and send a type-1 message:
+
+ Index Description Content
@@ -1232,7 +1309,7 @@
+ ctx->requestToken = ne_base64(ntlmbuf, size);
+
+ break;
-+
++
+ case NTLMSTATE_TYPE2:
+ /* We received the type-2 already, create a type-3 message:
+
@@ -1250,7 +1327,7 @@
+ 52 (64) start of data block
+
+ */
-+
++
+ {
+ int lmrespoff;
+ int ntrespoff;
@@ -1300,25 +1377,25 @@
+ "%c%c" /* NT-response allocated space */
+ "%c%c" /* NT-response offset */
+ "%c%c" /* 2 zeroes */
-+
++
+ "%c%c" /* domain length */
+ "%c%c" /* domain allocated space */
+ "%c%c" /* domain name offset */
+ "%c%c" /* 2 zeroes */
-+
++
+ "%c%c" /* user length */
+ "%c%c" /* user allocated space */
+ "%c%c" /* user offset */
+ "%c%c" /* 2 zeroes */
-+
++
+ "%c%c" /* host length */
+ "%c%c" /* host allocated space */
+ "%c%c" /* host offset */
+ "%c%c%c%c%c%c" /* 6 zeroes */
-+
++
+ "\xff\xff" /* message length */
+ "%c%c" /* 2 zeroes */
-+
++
+ "\x01\x82" /* flags */
+ "%c%c" /* 2 zeroes */
+
@@ -1335,7 +1412,7 @@
+ SHORTPAIR(0x18),
+ SHORTPAIR(lmrespoff),
+ 0x0, 0x0,
-+
++
+#ifdef USE_NTRESPONSES
+ SHORTPAIR(0x18), /* NT-response length, twice */
+ SHORTPAIR(0x18),
@@ -1355,12 +1432,12 @@
+ SHORTPAIR(userlen),
+ SHORTPAIR(useroff),
+ 0x0, 0x0,
-+
++
+ SHORTPAIR(hostlen),
+ SHORTPAIR(hostlen),
+ SHORTPAIR(hostoff),
+ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-+
++
+ 0x0, 0x0,
+
+ 0x0, 0x0);
@@ -1388,7 +1465,7 @@
+ }
+
+#ifdef USE_NTRESPONSES
-+ if(size < ((int)sizeof(ntlmbuf) - 0x18)) {
++ if(size < ((int)sizeof(ntlmbuf) - 0x18)) {
+ memcpy(&ntlmbuf[size], ntresp, 0x18);
+ size += 0x18;
+ }
@@ -1458,10 +1535,13 @@
+ if (context == NULL) {
+ return -1;
+ } else {
++ if (!responseToken && (context->state == NTLMSTATE_TYPE3))
++ context->state = NTLMSTATE_NONE;
++
+ if (context->state <= NTLMSTATE_TYPE3) {
+ ntlm ntlmstatus = ne_input_ntlm(context, responseToken);
+
-+ if (ntlmstatus != NTLM_FINE) {
++ if (ntlmstatus != NTLM_FINE) {
+ return -1;
+ }
+ }
@@ -1487,11 +1567,11 @@
+
+#endif /* HAVE_OPENSSL */
+#endif /* HAVE_NTLM */
---- misc/neon-0.28.2/src/ne_ntlm.h 2009-09-29 10:28:26.812500000 +0200
-+++ misc/build/neon-0.28.2/src/ne_ntlm.h 2009-09-29 10:22:51.937500000 +0200
+--- misc/neon-0.28.2/src/ne_ntlm.h 2010-01-08 11:51:21.000000000 +0100
++++ misc/build/neon-0.28.2/src/ne_ntlm.h 2010-01-08 11:53:52.000000000 +0100
@@ -1 +1,44 @@
-dummy
-+/*
++/*
+ Handling of NTLM Authentication
+ Copyright (C) 2009, Kai Sommerfeld <kso@openoffice.org>
+
@@ -1499,7 +1579,7 @@
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
-+
++
+ This library 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
@@ -1536,7 +1616,7 @@
+
+#endif /* NE_NTLM_H */
--- misc/neon-0.28.2/src/ne_socket.c 2008-02-28 14:19:19.000000000 +0100
-+++ misc/build/neon-0.28.2/src/ne_socket.c 2009-09-29 10:22:51.953125000 +0200
++++ misc/build/neon-0.28.2/src/ne_socket.c 2010-01-08 11:30:06.000000000 +0100
@@ -60,6 +60,7 @@
#include <stddef.h>
#ifdef USE_GETADDRINFO
@@ -1546,17 +1626,13 @@
#endif
--- misc/neon-0.28.2/src/ne_sspi.c 2007-08-10 17:26:08.000000000 +0200
-+++ misc/build/neon-0.28.2/src/ne_sspi.c 2009-09-29 10:22:51.953125000 +0200
-@@ -202,9 +202,48 @@
- return -1;
- }
++++ misc/build/neon-0.28.2/src/ne_sspi.c 2010-01-08 11:30:07.000000000 +0100
+@@ -206,6 +206,45 @@
+ }
-+ return 0;
-+}
-+
-+/*
+ /*
+ * Simplification wrapper arround AcquireCredentialsHandle as most of
-+ * the parameters do not change.
++ * the parameters do not change.
+ */
+static int acquireCredentialsHandleForUsername(CredHandle * credentials, char *package, const char *username, const char *password)
+{
@@ -1589,13 +1665,14 @@
+ return -1;
+ }
+
- return 0;
- }
-
++ return 0;
++}
+
- /*
++
++/*
* Wrapper arround initializeSecurityContext. Supplies several
* default parameters as well as logging in case of errors.
+ */
@@ -483,7 +522,7 @@
* Processes received authentication tokens as well as supplies the
* response token.
@@ -1605,11 +1682,17 @@
{
SecBufferDesc outBufferDesc;
SecBuffer outBuffer;
-@@ -560,14 +599,23 @@
-
+@@ -561,13 +600,22 @@
/* Reset any existing context since we are starting over */
resetContext(sspiContext);
-+
+
+- if (acquireCredentialsHandle
+- (&sspiContext->credentials, sspiContext->mechanism) != SEC_E_OK) {
+- freeBuffer(&outBufferDesc);
+- NE_DEBUG(NE_DBG_HTTPAUTH,
+- "sspi: acquireCredentialsHandle failed.\n");
+- return -1;
+- }
+ if (strlen(username) != 0) {
+ if (acquireCredentialsHandleForUsername
+ (&sspiContext->credentials, sspiContext->mechanism, username, password) != SEC_E_OK) {
@@ -1625,19 +1708,12 @@
+ return -1;
+ }
+ }
-
-- if (acquireCredentialsHandle
-- (&sspiContext->credentials, sspiContext->mechanism) != SEC_E_OK) {
-- freeBuffer(&outBufferDesc);
-- NE_DEBUG(NE_DBG_HTTPAUTH,
-- "sspi: acquireCredentialsHandle failed.\n");
-- return -1;
-- }
++
securityStatus =
initializeSecurityContext(&sspiContext->credentials, NULL,
--- misc/neon-0.28.2/src/ne_sspi.h 2006-02-12 13:05:14.000000000 +0100
-+++ misc/build/neon-0.28.2/src/ne_sspi.h 2009-09-29 10:22:51.968750000 +0200
++++ misc/build/neon-0.28.2/src/ne_sspi.h 2010-01-08 11:30:06.000000000 +0100
@@ -41,7 +41,7 @@
int ne_sspi_clear_context(void *context);
@@ -1648,7 +1724,7 @@
#endif /* HAVE_SSPI */
--- misc/neon-0.28.2/src/ne_uri.c 2007-12-05 12:04:47.000000000 +0100
-+++ misc/build/neon-0.28.2/src/ne_uri.c 2009-09-29 10:22:51.968750000 +0200
++++ misc/build/neon-0.28.2/src/ne_uri.c 2010-01-08 11:30:06.000000000 +0100
@@ -42,7 +42,7 @@
#include "ne_alloc.h"
#include "ne_uri.h"
@@ -1695,7 +1771,7 @@
/* 4x */ AT, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL,
/* 5x */ AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, GD, OT, GD, OT, US,
--- misc/neon-0.28.2/src/ne_utils.c 2006-03-07 10:36:43.000000000 +0100
-+++ misc/build/neon-0.28.2/src/ne_utils.c 2009-09-29 10:22:51.984375000 +0200
++++ misc/build/neon-0.28.2/src/ne_utils.c 2010-01-08 11:30:06.000000000 +0100
@@ -118,6 +118,9 @@
#ifdef HAVE_GNUTLS
", GNU TLS " LIBGNUTLS_VERSION
@@ -1726,7 +1802,7 @@
#endif /* NE_HAVE_* */
default:
--- misc/neon-0.28.2/src/ne_utils.h 2007-07-16 08:54:57.000000000 +0200
-+++ misc/build/neon-0.28.2/src/ne_utils.h 2009-09-29 10:22:51.984375000 +0200
++++ misc/build/neon-0.28.2/src/ne_utils.h 2010-01-08 11:30:07.000000000 +0100
@@ -54,6 +54,7 @@
#define NE_FEATURE_SOCKS (5) /* SOCKSv5 support */
#define NE_FEATURE_TS_SSL (6) /* Thread-safe SSL/TLS support */
diff --git a/odk/examples/DevelopersGuide/UCB/ResourceCreator.java b/odk/examples/DevelopersGuide/UCB/ResourceCreator.java
index 202941e1772a..c28bc47ea866 100644
--- a/odk/examples/DevelopersGuide/UCB/ResourceCreator.java
+++ b/odk/examples/DevelopersGuide/UCB/ResourceCreator.java
@@ -43,7 +43,6 @@ import com.sun.star.uno.UnoRuntime;
import com.sun.star.ucb.ContentInfo;
import com.sun.star.ucb.InsertCommandArgument;
import com.sun.star.ucb.XContent;
-import com.sun.star.ucb.XContentCreator;
import com.sun.star.io.XInputStream;
@@ -154,18 +153,17 @@ public class ResourceCreator {
boolean result = false;
if ( stream != null && name != null && !name.equals( "" )) {
- // Obtain content creator interface.
- XContentCreator creator = ( XContentCreator )UnoRuntime.queryInterface(
- XContentCreator.class, m_content );
-
- // Note: The data for info may have been obtained using
- // XContentCreator::queryCreatableContentsInfo().
+ // Note: The data for info may have been obtained from
+ // property CreatableContentsInfo.
ContentInfo info = new ContentInfo();
info.Type = "application/vnd.sun.staroffice.fsys-file";
info.Attributes = 0;
- // Create new, empty content.
- XContent newContent = creator.createNewContent( info );
+ // Create new, empty content (execute command "createNewContent").
+ XContent newContent = ( XContent )UnoRuntime.queryInterface(
+ XContent.class,
+ m_helper.executeCommand( m_content, "createNewContent", info ) );
+
if ( newContent != null ) {
/////////////////////////////////////////////////////////////////////