You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ja...@apache.org on 2013/03/15 10:24:56 UTC
svn commit: r1456826 [1/6] - in /openoffice/branches/l10n/main: ./
autodoc/source/display/html/ automation/packimages/ automation/prj/
automation/source/communi/ automation/source/miniapp/
automation/source/testtool/ automation/util/ bridges/source/cpp...
Author: jani
Date: Fri Mar 15 09:24:52 2013
New Revision: 1456826
URL: http://svn.apache.org/r1456826
Log:
merge from trunk
Removed:
openoffice/branches/l10n/main/automation/packimages/
openoffice/branches/l10n/main/automation/source/miniapp/
openoffice/branches/l10n/main/automation/source/testtool/
openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/
Modified:
openoffice/branches/l10n/main/autodoc/source/display/html/cfrstd.cxx
openoffice/branches/l10n/main/autodoc/source/display/html/outfile.cxx
openoffice/branches/l10n/main/automation/prj/build.lst
openoffice/branches/l10n/main/automation/source/communi/communi.cxx
openoffice/branches/l10n/main/automation/util/makefile.mk
openoffice/branches/l10n/main/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
openoffice/branches/l10n/main/canvas/source/directx/dx_textlayout.cxx
openoffice/branches/l10n/main/canvas/source/directx/dx_textlayout_drawhelper.cxx
openoffice/branches/l10n/main/canvas/source/directx/dx_textlayout_drawhelper.hxx
openoffice/branches/l10n/main/cli_ure/source/native/native_bootstrap.cxx
openoffice/branches/l10n/main/codemaker/source/javamaker/classfile.cxx
openoffice/branches/l10n/main/comphelper/inc/comphelper/stl_types.hxx
openoffice/branches/l10n/main/configure.in
openoffice/branches/l10n/main/connectivity/source/drivers/hsqldb/makefile.mk
openoffice/branches/l10n/main/connectivity/source/drivers/mysql/makefile.mk
openoffice/branches/l10n/main/connectivity/source/drivers/odbc/makefile.mk
openoffice/branches/l10n/main/cppu/inc/typelib/typedescription.h
openoffice/branches/l10n/main/cppuhelper/source/findsofficepath.c
openoffice/branches/l10n/main/cui/source/dialogs/about.src
openoffice/branches/l10n/main/cui/source/options/optcolor.cxx
openoffice/branches/l10n/main/default_images/framework/res/backing.png
openoffice/branches/l10n/main/default_images/framework/res/backing_hc.png
openoffice/branches/l10n/main/default_images/introabout/about.png
openoffice/branches/l10n/main/default_images/introabout/intro.png
openoffice/branches/l10n/main/desktop/source/app/app.cxx
openoffice/branches/l10n/main/desktop/source/deployment/manager/dp_extensionmanager.cxx
openoffice/branches/l10n/main/desktop/source/migration/services/jvmfwk.cxx
openoffice/branches/l10n/main/desktop/source/pkgchk/unopkg/unopkg_app.cxx
openoffice/branches/l10n/main/editeng/source/outliner/outleeng.cxx
openoffice/branches/l10n/main/extensions/source/activex/main/makefile.mk
openoffice/branches/l10n/main/external_deps.lst
openoffice/branches/l10n/main/filter/source/graphicfilter/ieps/ieps.cxx
openoffice/branches/l10n/main/filter/source/msfilter/msdffimp.cxx
openoffice/branches/l10n/main/filter/source/xsltfilter/uof2splithandler.cxx
openoffice/branches/l10n/main/formula/source/core/resource/core_resource.src
openoffice/branches/l10n/main/fpicker/source/aqua/CFStringUtilities.cxx
openoffice/branches/l10n/main/fpicker/source/aqua/ControlHelper.cxx
openoffice/branches/l10n/main/fpicker/source/aqua/ControlHelper.hxx
openoffice/branches/l10n/main/fpicker/source/aqua/NSURL_OOoAdditions.mm
openoffice/branches/l10n/main/fpicker/source/aqua/SalAquaPicker.cxx
openoffice/branches/l10n/main/framework/inc/properties.h
openoffice/branches/l10n/main/helpcontent2/source/text/shared/00/00000021.xhp
openoffice/branches/l10n/main/helpcontent2/source/text/shared/optionen/01010500.xhp
openoffice/branches/l10n/main/helpcontent2/source/text/shared/optionen/01010501.xhp
openoffice/branches/l10n/main/hwpfilter/source/drawdef.h
openoffice/branches/l10n/main/hwpfilter/source/drawing.h
openoffice/branches/l10n/main/hwpfilter/source/formula.cpp
openoffice/branches/l10n/main/hwpfilter/source/hbox.cpp
openoffice/branches/l10n/main/hwpfilter/source/hbox.h
openoffice/branches/l10n/main/hwpfilter/source/hcode.cpp
openoffice/branches/l10n/main/hwpfilter/source/hcode.h
openoffice/branches/l10n/main/hwpfilter/source/hfont.cpp
openoffice/branches/l10n/main/hwpfilter/source/hinfo.cpp
openoffice/branches/l10n/main/hwpfilter/source/hiodev.cpp
openoffice/branches/l10n/main/hwpfilter/source/hiodev.h
openoffice/branches/l10n/main/hwpfilter/source/hpara.h
openoffice/branches/l10n/main/hwpfilter/source/hwpeq.cpp
openoffice/branches/l10n/main/hwpfilter/source/hwpfile.cpp
openoffice/branches/l10n/main/hwpfilter/source/hwpfile.h
openoffice/branches/l10n/main/hwpfilter/source/hwplib.h
openoffice/branches/l10n/main/hwpfilter/source/hwpread.cpp
openoffice/branches/l10n/main/hwpfilter/source/hwpreader.cxx
openoffice/branches/l10n/main/i18npool/source/indexentry/indexentrysupplier_asian.cxx
openoffice/branches/l10n/main/i18npool/source/localedata/data/es_PE.xml
openoffice/branches/l10n/main/i18npool/source/localedata/saxparser.cxx
openoffice/branches/l10n/main/i18npool/source/textconversion/textconversion.cxx
openoffice/branches/l10n/main/i18npool/source/transliteration/textToPronounce_zh.cxx
openoffice/branches/l10n/main/icu/icu4c-4_0_1-src.patch
openoffice/branches/l10n/main/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
openoffice/branches/l10n/main/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
openoffice/branches/l10n/main/instsetoo_native/res/nologoinstall.bmp
openoffice/branches/l10n/main/instsetoo_native/util/openoffice.lst
openoffice/branches/l10n/main/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
openoffice/branches/l10n/main/l10ntools/inc/export.hxx
openoffice/branches/l10n/main/l10ntools/inc/l10ntools/directory.hxx
openoffice/branches/l10n/main/l10ntools/inc/l10ntools/file.hxx
openoffice/branches/l10n/main/l10ntools/inc/srciter.hxx
openoffice/branches/l10n/main/l10ntools/inc/tagtest.hxx
openoffice/branches/l10n/main/l10ntools/source/export2.cxx
openoffice/branches/l10n/main/l10ntools/source/gConPo.hxx
openoffice/branches/l10n/main/l10ntools/source/gConPoWrap.cxx
openoffice/branches/l10n/main/l10ntools/source/gConPolex.l
openoffice/branches/l10n/main/l10ntools/source/gL10nMem.cxx
openoffice/branches/l10n/main/l10ntools/source/gL10nMem.hxx
openoffice/branches/l10n/main/l10ntools/source/gL10nMemDB.cxx
openoffice/branches/l10n/main/more_fonts/fonts/fc_local.conf
openoffice/branches/l10n/main/odk/cfgWin.js
openoffice/branches/l10n/main/odk/configure.pl
openoffice/branches/l10n/main/odk/docs/images/sdk_head-1.png
openoffice/branches/l10n/main/odk/docs/install.html
openoffice/branches/l10n/main/odk/setsdkenv_unix.sh.in
openoffice/branches/l10n/main/odk/setsdkenv_windows.template
openoffice/branches/l10n/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java
openoffice/branches/l10n/main/odk/source/unoapploader/win/unoapploader.c
openoffice/branches/l10n/main/odk/util/makefile.pmk
openoffice/branches/l10n/main/officecfg/registry/data/org/openoffice/Setup.xcu
openoffice/branches/l10n/main/officecfg/registry/schema/org/openoffice/Setup.xcs
openoffice/branches/l10n/main/ooo_custom_images/dev/introabout/intro.png
openoffice/branches/l10n/main/ooo_custom_images/dev_nologo/introabout/intro.png
openoffice/branches/l10n/main/ooo_custom_images/nologo/introabout/intro.png
openoffice/branches/l10n/main/sal/osl/unx/file_volume.cxx
openoffice/branches/l10n/main/sal/osl/unx/interlck.c
openoffice/branches/l10n/main/sal/osl/unx/module.c
openoffice/branches/l10n/main/sc/inc/helpids.h
openoffice/branches/l10n/main/sc/source/core/inc/interpre.hxx
openoffice/branches/l10n/main/sc/source/ui/drawfunc/objdraw.src
openoffice/branches/l10n/main/sc/source/ui/optdlg/tpcalc.cxx
openoffice/branches/l10n/main/sc/source/ui/src/optdlg.src
openoffice/branches/l10n/main/sc/source/ui/src/scfuncs.src
openoffice/branches/l10n/main/sc/source/ui/vba/vbawindow.cxx
openoffice/branches/l10n/main/sc/util/hidother.src
openoffice/branches/l10n/main/scp2/inc/macros.inc
openoffice/branches/l10n/main/scp2/source/ooo/file_library_ooo.scp
openoffice/branches/l10n/main/scp2/source/ooo/file_resource_ooo.scp
openoffice/branches/l10n/main/scp2/source/ooo/registryitem_ooo.scp
openoffice/branches/l10n/main/scp2/source/ooo/ure.scp
openoffice/branches/l10n/main/scp2/source/ooo/ure_standalone.scp
openoffice/branches/l10n/main/scp2/source/quickstart/registryitem_quickstart.scp
openoffice/branches/l10n/main/scp2/source/sdkoo/sdkoo.scp
openoffice/branches/l10n/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp
openoffice/branches/l10n/main/scripting/java/build.xml
openoffice/branches/l10n/main/scripting/workben/build.xml
openoffice/branches/l10n/main/sd/source/filter/eppt/epptso.cxx
openoffice/branches/l10n/main/sd/source/filter/ppt/pptinanimations.cxx
openoffice/branches/l10n/main/sdext/source/minimizer/description.xml
openoffice/branches/l10n/main/sdext/source/minimizer/fileopendialog.cxx
openoffice/branches/l10n/main/sdext/source/minimizer/informationdialog.cxx
openoffice/branches/l10n/main/sdext/source/minimizer/informationdialog.hxx
openoffice/branches/l10n/main/sdext/source/pdfimport/config/description.xml
openoffice/branches/l10n/main/sdext/source/presenter/description.xml
openoffice/branches/l10n/main/set_soenv.in
openoffice/branches/l10n/main/setup_native/source/mac/ooo/DS_Store
openoffice/branches/l10n/main/setup_native/source/mac/ooo/DS_Store_Dev
openoffice/branches/l10n/main/setup_native/source/mac/ooo/DS_Store_Langpack
openoffice/branches/l10n/main/setup_native/source/mac/ooo/osxdndinstall.png
openoffice/branches/l10n/main/setup_native/source/mac/sdk/DS_Store_SDK
openoffice/branches/l10n/main/setup_native/source/mac/sdk/osxdndinstall_sdk.png
openoffice/branches/l10n/main/setup_native/source/opensolaris/bundledextensions/README
openoffice/branches/l10n/main/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions
openoffice/branches/l10n/main/setup_native/source/packinfo/shellscripts_brand.txt
openoffice/branches/l10n/main/setup_native/source/packinfo/shellscripts_core01.txt
openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
openoffice/branches/l10n/main/setup_native/source/win32/customactions/relnotes/relnotes.cxx
openoffice/branches/l10n/main/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
openoffice/branches/l10n/main/setup_native/source/win32/nsis/ooobitmap.bmp
openoffice/branches/l10n/main/sfx2/inc/sfx2/event.hxx
openoffice/branches/l10n/main/sfx2/source/doc/printhelper.cxx
openoffice/branches/l10n/main/sfx2/source/view/viewprn.cxx
openoffice/branches/l10n/main/shell/inc/internal/config.hxx
openoffice/branches/l10n/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
openoffice/branches/l10n/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
openoffice/branches/l10n/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest
openoffice/branches/l10n/main/shell/source/win32/sysmail/sysmailclient.cxx
openoffice/branches/l10n/main/solenv/bin/make_installer.pl
openoffice/branches/l10n/main/solenv/bin/modules/installer/download.pm
openoffice/branches/l10n/main/solenv/bin/modules/installer/epmfile.pm
openoffice/branches/l10n/main/solenv/bin/modules/installer/simplepackage.pm
openoffice/branches/l10n/main/solenv/bin/modules/installer/windows/property.pm
openoffice/branches/l10n/main/solenv/bin/modules/installer/ziplist.pm
openoffice/branches/l10n/main/solenv/inc/set_wntx64.mk
openoffice/branches/l10n/main/svl/inc/svl/svarray.hxx
openoffice/branches/l10n/main/svl/source/misc/mediatyp.src
openoffice/branches/l10n/main/svtools/source/misc/imagemgr.src
openoffice/branches/l10n/main/svx/inc/svx/EnhancedCustomShapeGeometry.hxx
openoffice/branches/l10n/main/svx/source/customshapes/EnhancedCustomShape2d.cxx
openoffice/branches/l10n/main/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
openoffice/branches/l10n/main/svx/source/dialog/hdft.cxx
openoffice/branches/l10n/main/svx/source/dialog/sendreportw32.cxx
openoffice/branches/l10n/main/svx/source/svdraw/svdmrkv.cxx
openoffice/branches/l10n/main/sw/source/core/doc/tblrwcl.cxx
openoffice/branches/l10n/main/sw/source/core/edit/edlingu.cxx
openoffice/branches/l10n/main/sw/source/core/text/portxt.hxx
openoffice/branches/l10n/main/sw/source/filter/ww8/ww8par3.cxx
openoffice/branches/l10n/main/sw/source/filter/ww8/ww8par6.cxx
openoffice/branches/l10n/main/swext/mediawiki/src/description.xml
openoffice/branches/l10n/main/sysui/desktop/debian/control
openoffice/branches/l10n/main/sysui/desktop/freedesktop/freedesktop-menus.spec
openoffice/branches/l10n/main/sysui/desktop/mandriva/mandriva-menus.spec
openoffice/branches/l10n/main/sysui/desktop/productversion.mk
openoffice/branches/l10n/main/sysui/desktop/redhat/redhat-menus.spec
openoffice/branches/l10n/main/sysui/desktop/share/brand.pl
openoffice/branches/l10n/main/sysui/desktop/share/create_mime_xml.pl
openoffice/branches/l10n/main/sysui/desktop/share/translate.pl
openoffice/branches/l10n/main/sysui/desktop/suse/suse-menus.spec
openoffice/branches/l10n/main/tools/inc/tools/diagnose_ex.h
openoffice/branches/l10n/main/unotools/inc/unotools/configmgr.hxx
openoffice/branches/l10n/main/unotools/source/config/bootstrap.cxx
openoffice/branches/l10n/main/unotools/source/config/configmgr.cxx
openoffice/branches/l10n/main/unotools/source/config/moduleoptions.cxx
openoffice/branches/l10n/main/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
openoffice/branches/l10n/main/vcl/aqua/source/gdi/salgdiutils.cxx
openoffice/branches/l10n/main/vcl/inc/vcl/bitmap.hxx
openoffice/branches/l10n/main/vcl/source/app/settings.cxx
openoffice/branches/l10n/main/vcl/source/gdi/bitmap3.cxx
openoffice/branches/l10n/main/vcl/source/gdi/pdfwriter_impl.cxx
openoffice/branches/l10n/main/vcl/source/window/toolbox.cxx
openoffice/branches/l10n/main/vigra/vigra1.6.0.patch
openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml
openoffice/branches/l10n/main/xmerge/workben/build.xml
openoffice/branches/l10n/main/xml2cmp/source/xcd/filebuff.cxx
openoffice/branches/l10n/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
Modified: openoffice/branches/l10n/main/autodoc/source/display/html/cfrstd.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/autodoc/source/display/html/cfrstd.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/autodoc/source/display/html/cfrstd.cxx (original)
+++ openoffice/branches/l10n/main/autodoc/source/display/html/cfrstd.cxx Fri Mar 15 09:24:52 2013
@@ -98,136 +98,136 @@ bool bUse_OOoFrameDiv = true;
//*************** These are used for IDL currently only! ********************
const char * const C_sStdStyle =
- "/*See bottom of file for explanations.*/"CRLF
+ "/*See bottom of file for explanations.*/" CRLF
CRLF
- "body { background-color:#ffffff; }"CRLF
+ "body { background-color:#ffffff; }" CRLF
CRLF
- "h3 { font-size:13pt; font-weight:bold;"CRLF
- " margin-top:3pt; margin-bottom:1pt; }"CRLF
- "p, dt, dd, pre { font-size:11pt;"CRLF
- " margin-top:3pt; margin-bottom:1pt; }"CRLF
- "pre { font-family:monospace; }"CRLF
- CRLF
- "table.navimain { background-color:#eeeeff; }"CRLF
- "table.subtitle { margin-top:6pt; margin-bottom:6pt; }"CRLF
- CRLF
- "td { font-size:11pt; }"CRLF
- "td.title { font-family: Arial; font-size:19pt; font-weight:bold;"CRLF
- " line-height:30pt; background-color:#ccccff; text-align:center; }"CRLF
- "td.subtitle { font-family: Arial; font-size:13pt;"CRLF
- " line-height:20pt; background-color:#ccccff; }"CRLF
- "td.crosstitle { font-size:12pt; font-weight:bold;"CRLF
- " line-height:15pt; background-color:#eeeeff; }"CRLF
- "td.imdetail { width:100%; background-color:#eeeeff; }"CRLF
- CRLF
- "td.imsum_left { width:30%; }"CRLF
- "td.imsum_right { width:70%; }"CRLF
- CRLF
- "td.navimain, a.navimain"CRLF
- " { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold; }"CRLF
- "td.navimainself { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold;"CRLF
- " color:#ffffff; background-color:#2222ad; }"CRLF
- "td.navimainnone { text-align:center; font-family: Arial; font-size:12pt; }"CRLF
- "td.navisub, a.navisub"CRLF
- " { text-align:center; font-family: Arial; font-size:9pt; font-variant:small-caps; }"CRLF
- "td.navimain, td.navisub"CRLF
- " { padding-left:7pt; padding-right:7pt; }"CRLF
- CRLF
- "a.membertitle { font-size:12pt; font-weight:bold; line-height:18pt; }"CRLF
- "a.navimain, a.navisub { color:#000000; }"CRLF
- ".dt { font-weight:bold; }"CRLF
- ".namechain { font-size:13pt; font-weight:bold;"CRLF
- " margin-top:3pt; margin-bottom:6pt; }"CRLF
- ".title2 { font-size:13pt; font-style:italic; font-weight:bold; text-align:left; }"CRLF
+ "h3 { font-size:13pt; font-weight:bold;" CRLF
+ " margin-top:3pt; margin-bottom:1pt; }" CRLF
+ "p, dt, dd, pre { font-size:11pt;" CRLF
+ " margin-top:3pt; margin-bottom:1pt; }" CRLF
+ "pre { font-family:monospace; }" CRLF
+ CRLF
+ "table.navimain { background-color:#eeeeff; }" CRLF
+ "table.subtitle { margin-top:6pt; margin-bottom:6pt; }" CRLF
+ CRLF
+ "td { font-size:11pt; }" CRLF
+ "td.title { font-family: Arial; font-size:19pt; font-weight:bold;" CRLF
+ " line-height:30pt; background-color:#ccccff; text-align:center; }" CRLF
+ "td.subtitle { font-family: Arial; font-size:13pt;" CRLF
+ " line-height:20pt; background-color:#ccccff; }" CRLF
+ "td.crosstitle { font-size:12pt; font-weight:bold;" CRLF
+ " line-height:15pt; background-color:#eeeeff; }" CRLF
+ "td.imdetail { width:100%; background-color:#eeeeff; }" CRLF
+ CRLF
+ "td.imsum_left { width:30%; }" CRLF
+ "td.imsum_right { width:70%; }" CRLF
+ CRLF
+ "td.navimain, a.navimain" CRLF
+ " { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold; }" CRLF
+ "td.navimainself { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold;" CRLF
+ " color:#ffffff; background-color:#2222ad; }" CRLF
+ "td.navimainnone { text-align:center; font-family: Arial; font-size:12pt; }" CRLF
+ "td.navisub, a.navisub" CRLF
+ " { text-align:center; font-family: Arial; font-size:9pt; font-variant:small-caps; }" CRLF
+ "td.navimain, td.navisub" CRLF
+ " { padding-left:7pt; padding-right:7pt; }" CRLF
+ CRLF
+ "a.membertitle { font-size:12pt; font-weight:bold; line-height:18pt; }" CRLF
+ "a.navimain, a.navisub { color:#000000; }" CRLF
+ ".dt { font-weight:bold; }" CRLF
+ ".namechain { font-size:13pt; font-weight:bold;" CRLF
+ " margin-top:3pt; margin-bottom:6pt; }" CRLF
+ ".title2 { font-size:13pt; font-style:italic; font-weight:bold; text-align:left; }" CRLF
;
const char * const C_sCssExplanations =
- "/* Explanation of CSS classes:"CRLF
+ "/* Explanation of CSS classes:" CRLF
CRLF
- ".navimain Text in main navigation bar."CRLF
- ".navisub Text in lower navigation bar."CRLF
- "td.navimainself Cell in main navigation bar with \"selected\" shadow: You are here."CRLF
- "td.navimainnone Cell in main navigation bar with no link."CRLF
- CRLF
- ".namechain Line with current module path."CRLF
- CRLF
- "td.crosstitle Comment box for bases (base interfaces etc.)"CRLF
- "td.imsum_left Left part of such boxes."CRLF
- "td.imsum_right Right part of such boxes."CRLF
- CRLF
- "td.title Main title of the page like \"interface XYz\""CRLF
- ".subtitle Tables, and head cells of those, which list members"CRLF
- " like \"method summary\" and \"method details\"."CRLF
- CRLF
- "td.imdetail Background table of method's detail description."CRLF
- "a.membertitle Method name (as jump label) in method's detail"CRLF
- " description."CRLF
- ".title2 smaller font prefixes to page titles"CRLF
- "*/"CRLF
+ ".navimain Text in main navigation bar." CRLF
+ ".navisub Text in lower navigation bar." CRLF
+ "td.navimainself Cell in main navigation bar with \"selected\" shadow: You are here." CRLF
+ "td.navimainnone Cell in main navigation bar with no link." CRLF
+ CRLF
+ ".namechain Line with current module path." CRLF
+ CRLF
+ "td.crosstitle Comment box for bases (base interfaces etc.)" CRLF
+ "td.imsum_left Left part of such boxes." CRLF
+ "td.imsum_right Right part of such boxes." CRLF
+ CRLF
+ "td.title Main title of the page like \"interface XYz\"" CRLF
+ ".subtitle Tables, and head cells of those, which list members" CRLF
+ " like \"method summary\" and \"method details\"." CRLF
+ CRLF
+ "td.imdetail Background table of method's detail description." CRLF
+ "a.membertitle Method name (as jump label) in method's detail" CRLF
+ " description." CRLF
+ ".title2 smaller font prefixes to page titles" CRLF
+ "*/" CRLF
;
const char * const C_sStdStyle_withDivFrame =
- "/*See bottom of file for explanations.*/"CRLF
+ "/*See bottom of file for explanations.*/" CRLF
CRLF
- "body { background-color:#ffffff; }"CRLF
+ "body { background-color:#ffffff; }" CRLF
CRLF
- "#adc-idlref h3 { font-size:13pt; font-weight:bold;"CRLF
- " margin-top:3pt; margin-bottom:1pt; }"CRLF
- "#adc-idlref p, #adc-idlref dt, #adc-idlref dd, #adc-idlref pre"CRLF
- " { font-size:11pt;"CRLF
- " margin-top:3pt; margin-bottom:1pt; }"CRLF
- "#adc-idlref pre { font-family:monospace; }"CRLF
- CRLF
- "#adc-idlref table.navimain { background-color:#eeeeff; }"CRLF
- "#adc-idlref table.subtitle { margin-top:6pt; margin-bottom:6pt; }"CRLF
- CRLF
- "#adc-idlref td { font-size:11pt; }"CRLF
- "#adc-idlref td.title { font-family: Arial; font-size:19pt; font-weight:bold;"CRLF
- " line-height:30pt; background-color:#ccccff; text-align:center; }"CRLF
- "#adc-idlref td.subtitle { font-family: Arial; font-size:13pt;"CRLF
- " line-height:20pt; background-color:#ccccff; }"CRLF
- "#adc-idlref td.crosstitle { font-size:12pt; font-weight:bold;"CRLF
- " line-height:15pt; background-color:#eeeeff; }"CRLF
- "#adc-idlref td.imdetail { width:100%; background-color:#eeeeff; }"CRLF
- CRLF
- "#adc-idlref td.imsum_left { width:30%; }"CRLF
- "#adc-idlref td.imsum_right { width:70%; }"CRLF
- CRLF
- "#adc-idlref td.navimain, #adc-idlref a.navimain"CRLF
- " { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold; }"CRLF
- "#adc-idlref td.navimainself { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold;"CRLF
- " color:#ffffff; background-color:#2222ad; }"CRLF
- "#adc-idlref td.navimainnone { text-align:center; font-family: Arial; font-size:12pt; }"CRLF
- "#adc-idlref td.navisub, #adc-idlref a.navisub"CRLF
- " { text-align:center; font-family: Arial; font-size:9pt; font-variant:small-caps; }"CRLF
- "#adc-idlref td.navimain, #adc-idlref td.navisub"CRLF
- " { padding-left:7pt; padding-right:7pt; }"CRLF
- CRLF
- "#adc-idlref a.membertitle { font-size:12pt; font-weight:bold; line-height:18pt; }"CRLF
- "#adc-idlref a.navimain, #adc-idlref a.navisub { color:#000000; }"CRLF
- "#adc-idlref .dt { font-weight:bold; }"CRLF
- "#adc-idlref .namechain { font-size:13pt; font-weight:bold;"CRLF
- " margin-top:3pt; margin-bottom:6pt; }"CRLF
- "#adc-idlref .title2 { font-size:13pt; font-style:italic; font-weight:bold; text-align:left; }"CRLF
- ""CRLF
- "#adc-idlref table { empty-cells:show; }"CRLF
- ""CRLF
- "#adc-idlref .childlist td, "CRLF
- "#adc-idlref .commentedlinks td, "CRLF
- "#adc-idlref .memberlist td, "CRLF
- "#adc-idlref .subtitle td, "CRLF
- "#adc-idlref .crosstitle td { border: .1pt solid #000000; }"CRLF
- ""CRLF
- "#adc-idlref .flag-table td { border: .1pt solid #cccccc; } "CRLF
- ""CRLF
- "#adc-idlref .title-table td, "CRLF
- "#adc-idlref .table-in-method td, "CRLF
- "#adc-idlref .table-in-data td, "CRLF
- "#adc-idlref .navimain td, "CRLF
- "#adc-idlref .navisub td, "CRLF
- "#adc-idlref .expl-table td, "CRLF
- "#adc-idlref .param-table td { border: none; }"CRLF
+ "#adc-idlref h3 { font-size:13pt; font-weight:bold;" CRLF
+ " margin-top:3pt; margin-bottom:1pt; }" CRLF
+ "#adc-idlref p, #adc-idlref dt, #adc-idlref dd, #adc-idlref pre" CRLF
+ " { font-size:11pt;" CRLF
+ " margin-top:3pt; margin-bottom:1pt; }" CRLF
+ "#adc-idlref pre { font-family:monospace; }" CRLF
+ CRLF
+ "#adc-idlref table.navimain { background-color:#eeeeff; }" CRLF
+ "#adc-idlref table.subtitle { margin-top:6pt; margin-bottom:6pt; }" CRLF
+ CRLF
+ "#adc-idlref td { font-size:11pt; }" CRLF
+ "#adc-idlref td.title { font-family: Arial; font-size:19pt; font-weight:bold;" CRLF
+ " line-height:30pt; background-color:#ccccff; text-align:center; }" CRLF
+ "#adc-idlref td.subtitle { font-family: Arial; font-size:13pt;" CRLF
+ " line-height:20pt; background-color:#ccccff; }" CRLF
+ "#adc-idlref td.crosstitle { font-size:12pt; font-weight:bold;" CRLF
+ " line-height:15pt; background-color:#eeeeff; }" CRLF
+ "#adc-idlref td.imdetail { width:100%; background-color:#eeeeff; }" CRLF
+ CRLF
+ "#adc-idlref td.imsum_left { width:30%; }" CRLF
+ "#adc-idlref td.imsum_right { width:70%; }" CRLF
+ CRLF
+ "#adc-idlref td.navimain, #adc-idlref a.navimain" CRLF
+ " { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold; }" CRLF
+ "#adc-idlref td.navimainself { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold;" CRLF
+ " color:#ffffff; background-color:#2222ad; }" CRLF
+ "#adc-idlref td.navimainnone { text-align:center; font-family: Arial; font-size:12pt; }" CRLF
+ "#adc-idlref td.navisub, #adc-idlref a.navisub" CRLF
+ " { text-align:center; font-family: Arial; font-size:9pt; font-variant:small-caps; }" CRLF
+ "#adc-idlref td.navimain, #adc-idlref td.navisub" CRLF
+ " { padding-left:7pt; padding-right:7pt; }" CRLF
+ CRLF
+ "#adc-idlref a.membertitle { font-size:12pt; font-weight:bold; line-height:18pt; }" CRLF
+ "#adc-idlref a.navimain, #adc-idlref a.navisub { color:#000000; }" CRLF
+ "#adc-idlref .dt { font-weight:bold; }" CRLF
+ "#adc-idlref .namechain { font-size:13pt; font-weight:bold;" CRLF
+ " margin-top:3pt; margin-bottom:6pt; }" CRLF
+ "#adc-idlref .title2 { font-size:13pt; font-style:italic; font-weight:bold; text-align:left; }" CRLF
+ "" CRLF
+ "#adc-idlref table { empty-cells:show; }" CRLF
+ "" CRLF
+ "#adc-idlref .childlist td, " CRLF
+ "#adc-idlref .commentedlinks td, " CRLF
+ "#adc-idlref .memberlist td, " CRLF
+ "#adc-idlref .subtitle td, " CRLF
+ "#adc-idlref .crosstitle td { border: .1pt solid #000000; }" CRLF
+ "" CRLF
+ "#adc-idlref .flag-table td { border: .1pt solid #cccccc; } " CRLF
+ "" CRLF
+ "#adc-idlref .title-table td, " CRLF
+ "#adc-idlref .table-in-method td, " CRLF
+ "#adc-idlref .table-in-data td, " CRLF
+ "#adc-idlref .navimain td, " CRLF
+ "#adc-idlref .navisub td, " CRLF
+ "#adc-idlref .expl-table td, " CRLF
+ "#adc-idlref .param-table td { border: none; }" CRLF
;
Modified: openoffice/branches/l10n/main/autodoc/source/display/html/outfile.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/autodoc/source/display/html/outfile.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/autodoc/source/display/html/outfile.cxx (original)
+++ openoffice/branches/l10n/main/autodoc/source/display/html/outfile.cxx Fri Mar 15 09:24:52 2013
@@ -45,176 +45,176 @@ using csi::xml::AnAttribute;
const char * const
C_sStdStyle =
- "body { background-color:#ffffff; }"CRLF
- "h1 { font-size:20pt; margin-top:3pt; margin-bottom:7pt; }"CRLF
- "h2 { font-family:Arial; font-size:16pt; margin-top:3pt; margin-bottom:5pt; }"CRLF
- "h3 { font-size:13pt; margin-top:2pt; margin-bottom:3pt; }"CRLF
- "h4 { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF
- "dl { margin-top:1pt; margin-bottom:1pt; }"CRLF
- "dl.member { margin-top:1pt; margin-bottom:1pt; background-color:#eeeeff; }"CRLF
- "dt { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF
- "dt.member { font-size:13pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF
- "dt.simple { font-size:10pt; font-weight:normal; margin-top:2pt; margin-bottom:1pt; }"CRLF
- "dd { font-size:10pt; margin-top:1pt; margin-bottom:1pt; }"CRLF
- "dd.member { font-size:10pt; margin-top:1pt; margin-bottom:1pt; background-color:#ffffff; }"CRLF
- "p { font-size:10pt; margin-top:3pt; margin-bottom:1pt; }"CRLF
- "pre { font-family:monospace; font-size:10pt; margin-top:1pt; margin-bottom:1pt; }"CRLF
- "tr { font-size:10pt; }"CRLF
- "td { font-size:10pt; }"CRLF
- CRLF
- "dt.attention { color:#dd0000; }"CRLF
- CRLF
- "div.title { text-align:center; line-height:26pt; background-color:#ccccff; }"CRLF
- ".subtitle { background-color:#ccccff; }"CRLF
- CRLF
- "td.flagname { background-color:#eeeeff; font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF
- "td.flagyes { font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF
- "td.flagno { font-family:Arial; font-size:8pt; }"CRLF
- "td.flagtext { font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF
- CRLF
- "td.navimain, td.navimain a"CRLF
- " { background-color:#eeeeff; color:#000000;"CRLF
- " font-family:Arial; font-size:12pt; font-weight:bold; }"CRLF
- "td.navimainself"CRLF
- " { background-color:#2222ad; color:#ffffff;"CRLF
- " font-family:Arial; font-size:12pt; font-weight:bold; }"CRLF
- "td.navimainnone"CRLF
- " { background-color:#eeeeff; color:#000000;"CRLF
- " font-family:Arial; font-size:12pt; }"CRLF
- CRLF
- "div.define { font-family:Arial; background-color:#ccccff; }"CRLF
- CRLF
- ".nqclass { color:#008800; }"CRLF
- CRLF
- "h3.help { background-color:#eeeeff; margin-top:12pt; }"CRLF
- CRLF
- ".btpubl { color:#33ff33; }"CRLF
- ".btprot { color:#cc9933; }"CRLF
- ".btpriv { color:#ff6666; }"CRLF
- ".btvpubl { color:#33ff33; font-style:italic; }"CRLF
- ".btvprot { color:#cc9933; font-style:italic; }"CRLF
- ".btvpriv { color:#ff6666; font-style:italic; }"CRLF
- ".btself { font-weight:bold; }"CRLF
+ "body { background-color:#ffffff; }" CRLF
+ "h1 { font-size:20pt; margin-top:3pt; margin-bottom:7pt; }" CRLF
+ "h2 { font-family:Arial; font-size:16pt; margin-top:3pt; margin-bottom:5pt; }" CRLF
+ "h3 { font-size:13pt; margin-top:2pt; margin-bottom:3pt; }" CRLF
+ "h4 { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }" CRLF
+ "dl { margin-top:1pt; margin-bottom:1pt; }" CRLF
+ "dl.member { margin-top:1pt; margin-bottom:1pt; background-color:#eeeeff; }" CRLF
+ "dt { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }" CRLF
+ "dt.member { font-size:13pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }" CRLF
+ "dt.simple { font-size:10pt; font-weight:normal; margin-top:2pt; margin-bottom:1pt; }" CRLF
+ "dd { font-size:10pt; margin-top:1pt; margin-bottom:1pt; }" CRLF
+ "dd.member { font-size:10pt; margin-top:1pt; margin-bottom:1pt; background-color:#ffffff; }" CRLF
+ "p { font-size:10pt; margin-top:3pt; margin-bottom:1pt; }" CRLF
+ "pre { font-family:monospace; font-size:10pt; margin-top:1pt; margin-bottom:1pt; }" CRLF
+ "tr { font-size:10pt; }" CRLF
+ "td { font-size:10pt; }" CRLF
+ CRLF
+ "dt.attention { color:#dd0000; }" CRLF
+ CRLF
+ "div.title { text-align:center; line-height:26pt; background-color:#ccccff; }" CRLF
+ ".subtitle { background-color:#ccccff; }" CRLF
+ CRLF
+ "td.flagname { background-color:#eeeeff; font-family:Arial; font-size:8pt; font-weight:bold; }" CRLF
+ "td.flagyes { font-family:Arial; font-size:8pt; font-weight:bold; }" CRLF
+ "td.flagno { font-family:Arial; font-size:8pt; }" CRLF
+ "td.flagtext { font-family:Arial; font-size:8pt; font-weight:bold; }" CRLF
+ CRLF
+ "td.navimain, td.navimain a" CRLF
+ " { background-color:#eeeeff; color:#000000;" CRLF
+ " font-family:Arial; font-size:12pt; font-weight:bold; }" CRLF
+ "td.navimainself" CRLF
+ " { background-color:#2222ad; color:#ffffff;" CRLF
+ " font-family:Arial; font-size:12pt; font-weight:bold; }" CRLF
+ "td.navimainnone" CRLF
+ " { background-color:#eeeeff; color:#000000;" CRLF
+ " font-family:Arial; font-size:12pt; }" CRLF
+ CRLF
+ "div.define { font-family:Arial; background-color:#ccccff; }" CRLF
+ CRLF
+ ".nqclass { color:#008800; }" CRLF
+ CRLF
+ "h3.help { background-color:#eeeeff; margin-top:12pt; }" CRLF
+ CRLF
+ ".btpubl { color:#33ff33; }" CRLF
+ ".btprot { color:#cc9933; }" CRLF
+ ".btpriv { color:#ff6666; }" CRLF
+ ".btvpubl { color:#33ff33; font-style:italic; }" CRLF
+ ".btvprot { color:#cc9933; font-style:italic; }" CRLF
+ ".btvpriv { color:#ff6666; font-style:italic; }" CRLF
+ ".btself { font-weight:bold; }" CRLF
;
const char * const
C_sCssExplanations =
- "/* Explanation of CSS classes:"CRLF
+ "/* Explanation of CSS classes:" CRLF
CRLF
- "dl.member provides coloured frame for function descriptions."CRLF
- "dd.member makes the content of this frame white"CRLF
+ "dl.member provides coloured frame for function descriptions." CRLF
+ "dd.member makes the content of this frame white" CRLF
CRLF
- "dt.attention special colour for @attention remarks"CRLF
+ "dt.attention special colour for @attention remarks" CRLF
CRLF
- "div.title HTML page headline"CRLF
- ".subtitle headline of lists of members and similar"CRLF
+ "div.title HTML page headline" CRLF
+ ".subtitle headline of lists of members and similar" CRLF
CRLF
- " These are for the flagtables in classes:"CRLF
- "td.flagname Flag name."CRLF
- "td.flagyes flag value \"yes\""CRLF
- "td.flagno flag value \"no\""CRLF
- "td.flagtext other flag value"CRLF
+ " These are for the flagtables in classes:" CRLF
+ "td.flagname Flag name." CRLF
+ "td.flagyes flag value \"yes\"" CRLF
+ "td.flagno flag value \"no\"" CRLF
+ "td.flagtext other flag value" CRLF
CRLF
CRLF
- " These are for the main navigationbar:"CRLF
- "td.navimain, td.navimain a"CRLF
- " Links in navibar."CRLF
- "td.navimainself Text in navibar which refers to current page."CRLF
- "td.navimainnone Text which links to nothing."CRLF
+ " These are for the main navigationbar:" CRLF
+ "td.navimain, td.navimain a" CRLF
+ " Links in navibar." CRLF
+ "td.navimainself Text in navibar which refers to current page." CRLF
+ "td.navimainnone Text which links to nothing." CRLF
CRLF
CRLF
- "div.define Subtitles on the #define/macro descriptions page"CRLF
+ "div.define Subtitles on the #define/macro descriptions page" CRLF
CRLF
- ".nqclass special color for classes in the qualification"CRLF
- " on top of type pages like in:"CRLF
- " ::nsp1::nsp2::_ClassXY_::"CRLF
+ ".nqclass special color for classes in the qualification" CRLF
+ " on top of type pages like in:" CRLF
+ " ::nsp1::nsp2::_ClassXY_::" CRLF
CRLF
- "h3.help Subtitles on the help page"CRLF
+ "h3.help Subtitles on the help page" CRLF
CRLF
- " These are for the base class tree on class pages:"CRLF
- ".btpubl public base class"CRLF
- ".btprot protected"CRLF
- ".btpriv private"CRLF
- ".btvpubl virtual public"CRLF
- ".btvprot virtual protected"CRLF
- ".btvpriv virtual private"CRLF
- ".btself placeholder for currently displayed class"CRLF
+ " These are for the base class tree on class pages:" CRLF
+ ".btpubl public base class" CRLF
+ ".btprot protected" CRLF
+ ".btpriv private" CRLF
+ ".btvpubl virtual public" CRLF
+ ".btvprot virtual protected" CRLF
+ ".btvpriv virtual private" CRLF
+ ".btself placeholder for currently displayed class" CRLF
CRLF
- "*/"CRLF
+ "*/" CRLF
;
const char * const
C_sStdStyle_withDivFrame =
- "body { background-color:#ffffff; }"CRLF
- "#adc-cppref h1 { font-size:20pt; margin-top:3pt; margin-bottom:7pt; }"CRLF
- "#adc-cppref h2 { font-family:Arial; font-size:16pt; margin-top:3pt; margin-bottom:5pt; }"CRLF
- "#adc-cppref h3 { font-size:13pt; margin-top:2pt; margin-bottom:3pt; }"CRLF
- "#adc-cppref h4 { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF
- "#adc-cppref dl { margin-top:1pt; margin-bottom:1pt; }"CRLF
- "#adc-cppref dl.member { margin-top:1pt; margin-bottom:1pt; background-color:#eeeeff; }"CRLF
- "#adc-cppref dt { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF
- "#adc-cppref dt.member { font-size:13pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF
- "#adc-cppref dt.simple { font-size:10pt; font-weight:normal; margin-top:2pt; margin-bottom:1pt; }"CRLF
- "#adc-cppref dd { font-size:10pt; margin-top:1pt; margin-bottom:1pt; }"CRLF
- "#adc-cppref dd.member { font-size:10pt; margin-top:1pt; margin-bottom:1pt; background-color:#ffffff; }"CRLF
- "#adc-cppref p { font-size:10pt; margin-top:3pt; margin-bottom:1pt; }"CRLF
- "#adc-cppref pre { font-family:monospace; font-size:10pt; margin-top:1pt; margin-bottom:1pt; }"CRLF
- "#adc-cppref tr { font-size:10pt; }"CRLF
- "#adc-cppref td { font-size:10pt; }"CRLF
- CRLF
- "#adc-cppref dt.attention { color:#dd0000; }"CRLF
- CRLF
- "#adc-cppref div.title { text-align:center; line-height:26pt; background-color:#ccccff; }"CRLF
- "#adc-cppref .subtitle { background-color:#ccccff; }"CRLF
- CRLF
- "#adc-cppref td.flagname { background-color:#eeeeff; font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF
- "#adc-cppref td.flagyes { font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF
- "#adc-cppref td.flagno { font-family:Arial; font-size:8pt; }"CRLF
- "#adc-cppref td.flagtext { font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF
- CRLF
- "#adc-cppref td.navimain, #adc-cppref td.navimain a"CRLF
- " { background-color:#eeeeff; color:#000000;"CRLF
- " font-family:Arial; font-size:12pt; font-weight:bold; }"CRLF
- "#adc-cppref td.navimainself"CRLF
- " { background-color:#2222ad; color:#ffffff;"CRLF
- " font-family:Arial; font-size:12pt; font-weight:bold; }"CRLF
- "#adc-cppref td.navimainnone"CRLF
- " { background-color:#eeeeff; color:#000000;"CRLF
- " font-family:Arial; font-size:12pt; }"CRLF
- CRLF
- "#adc-cppref div.define { font-family:Arial; background-color:#ccccff; }"CRLF
- CRLF
- "#adc-cppref .nqclass { color:#008800; }"CRLF
- CRLF
- "#adc-cppref h3.help { background-color:#eeeeff; margin-top:12pt; }"CRLF
- CRLF
- "#adc-cppref .btpubl { color:#33ff33; }"CRLF
- "#adc-cppref .btprot { color:#cc9933; }"CRLF
- "#adc-cppref .btpriv { color:#ff6666; }"CRLF
- "#adc-cppref .btvpubl { color:#33ff33; font-style:italic; }"CRLF
- "#adc-cppref .btvprot { color:#cc9933; font-style:italic; }"CRLF
- "#adc-cppref .btvpriv { color:#ff6666; font-style:italic; }"CRLF
- "#adc-cppref .btself { font-weight:bold; }"CRLF
- ""CRLF
- "#adc-cppref table { empty-cells:show; }"CRLF
- ""CRLF
- "#adc-cppref .childlist td, "CRLF
- "#adc-cppref .commentedlinks td, "CRLF
- "#adc-cppref .memberlist td, "CRLF
- "#adc-cppref .subtitle td, "CRLF
- "#adc-cppref .crosstitle td { border: .1pt solid #000000; }"CRLF
- ""CRLF
- "#adc-cppref .flag-table td { border: .1pt solid #cccccc; } "CRLF
- ""CRLF
- "#adc-cppref .title-table td, "CRLF
- "#adc-cppref .table-in-method td, "CRLF
- "#adc-cppref .table-in-data td, "CRLF
- "#adc-cppref .navimain td, "CRLF
- "#adc-cppref .navisub td, "CRLF
- "#adc-cppref .expl-table td, "CRLF
- "#adc-cppref .param-table td { border: none; }"CRLF
+ "body { background-color:#ffffff; }" CRLF
+ "#adc-cppref h1 { font-size:20pt; margin-top:3pt; margin-bottom:7pt; }" CRLF
+ "#adc-cppref h2 { font-family:Arial; font-size:16pt; margin-top:3pt; margin-bottom:5pt; }" CRLF
+ "#adc-cppref h3 { font-size:13pt; margin-top:2pt; margin-bottom:3pt; }" CRLF
+ "#adc-cppref h4 { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }" CRLF
+ "#adc-cppref dl { margin-top:1pt; margin-bottom:1pt; }" CRLF
+ "#adc-cppref dl.member { margin-top:1pt; margin-bottom:1pt; background-color:#eeeeff; }" CRLF
+ "#adc-cppref dt { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }" CRLF
+ "#adc-cppref dt.member { font-size:13pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }" CRLF
+ "#adc-cppref dt.simple { font-size:10pt; font-weight:normal; margin-top:2pt; margin-bottom:1pt; }" CRLF
+ "#adc-cppref dd { font-size:10pt; margin-top:1pt; margin-bottom:1pt; }" CRLF
+ "#adc-cppref dd.member { font-size:10pt; margin-top:1pt; margin-bottom:1pt; background-color:#ffffff; }" CRLF
+ "#adc-cppref p { font-size:10pt; margin-top:3pt; margin-bottom:1pt; }" CRLF
+ "#adc-cppref pre { font-family:monospace; font-size:10pt; margin-top:1pt; margin-bottom:1pt; }" CRLF
+ "#adc-cppref tr { font-size:10pt; }" CRLF
+ "#adc-cppref td { font-size:10pt; }" CRLF
+ CRLF
+ "#adc-cppref dt.attention { color:#dd0000; }" CRLF
+ CRLF
+ "#adc-cppref div.title { text-align:center; line-height:26pt; background-color:#ccccff; }" CRLF
+ "#adc-cppref .subtitle { background-color:#ccccff; }" CRLF
+ CRLF
+ "#adc-cppref td.flagname { background-color:#eeeeff; font-family:Arial; font-size:8pt; font-weight:bold; }" CRLF
+ "#adc-cppref td.flagyes { font-family:Arial; font-size:8pt; font-weight:bold; }" CRLF
+ "#adc-cppref td.flagno { font-family:Arial; font-size:8pt; }" CRLF
+ "#adc-cppref td.flagtext { font-family:Arial; font-size:8pt; font-weight:bold; }" CRLF
+ CRLF
+ "#adc-cppref td.navimain, #adc-cppref td.navimain a" CRLF
+ " { background-color:#eeeeff; color:#000000;" CRLF
+ " font-family:Arial; font-size:12pt; font-weight:bold; }" CRLF
+ "#adc-cppref td.navimainself" CRLF
+ " { background-color:#2222ad; color:#ffffff;" CRLF
+ " font-family:Arial; font-size:12pt; font-weight:bold; }" CRLF
+ "#adc-cppref td.navimainnone" CRLF
+ " { background-color:#eeeeff; color:#000000;" CRLF
+ " font-family:Arial; font-size:12pt; }" CRLF
+ CRLF
+ "#adc-cppref div.define { font-family:Arial; background-color:#ccccff; }" CRLF
+ CRLF
+ "#adc-cppref .nqclass { color:#008800; }" CRLF
+ CRLF
+ "#adc-cppref h3.help { background-color:#eeeeff; margin-top:12pt; }" CRLF
+ CRLF
+ "#adc-cppref .btpubl { color:#33ff33; }" CRLF
+ "#adc-cppref .btprot { color:#cc9933; }" CRLF
+ "#adc-cppref .btpriv { color:#ff6666; }" CRLF
+ "#adc-cppref .btvpubl { color:#33ff33; font-style:italic; }" CRLF
+ "#adc-cppref .btvprot { color:#cc9933; font-style:italic; }" CRLF
+ "#adc-cppref .btvpriv { color:#ff6666; font-style:italic; }" CRLF
+ "#adc-cppref .btself { font-weight:bold; }" CRLF
+ "" CRLF
+ "#adc-cppref table { empty-cells:show; }" CRLF
+ "" CRLF
+ "#adc-cppref .childlist td, " CRLF
+ "#adc-cppref .commentedlinks td, " CRLF
+ "#adc-cppref .memberlist td, " CRLF
+ "#adc-cppref .subtitle td, " CRLF
+ "#adc-cppref .crosstitle td { border: .1pt solid #000000; }" CRLF
+ "" CRLF
+ "#adc-cppref .flag-table td { border: .1pt solid #cccccc; } " CRLF
+ "" CRLF
+ "#adc-cppref .title-table td, " CRLF
+ "#adc-cppref .table-in-method td, " CRLF
+ "#adc-cppref .table-in-data td, " CRLF
+ "#adc-cppref .navimain td, " CRLF
+ "#adc-cppref .navisub td, " CRLF
+ "#adc-cppref .expl-table td, " CRLF
+ "#adc-cppref .param-table td { border: none; }" CRLF
;
Modified: openoffice/branches/l10n/main/automation/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/automation/prj/build.lst?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/automation/prj/build.lst (original)
+++ openoffice/branches/l10n/main/automation/prj/build.lst Fri Mar 15 09:24:52 2013
@@ -5,8 +5,4 @@ au automation\source\simplecm nmake -
au automation\source\communi nmake - all au_comm au_inc NULL
au automation\source\app nmake - all au_app au_inc NULL
au automation\source\server nmake - all au_server au_inc NULL
-#au automation\source\testtool nmake - all au_tt au_inc NULL
-#au automation\source\miniapp nmake - all au_mini au_inc NULL
-#au automation\packimages nmake - all au_pack NULL
au automation\util nmake - all au_util au_scom au_comm au_app au_server NULL
-#au automation\util nmake - all au_util au_scom au_comm au_app au_mini au_server au_tt NULL
Modified: openoffice/branches/l10n/main/automation/source/communi/communi.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/automation/source/communi/communi.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/automation/source/communi/communi.cxx (original)
+++ openoffice/branches/l10n/main/automation/source/communi/communi.cxx Fri Mar 15 09:24:52 2013
@@ -196,7 +196,8 @@ void CommunicationLinkViaSocket::run()
sal_Bool bWasError = sal_False;
while ( schedule() && !bWasError && GetStreamSocket() )
{
- if ( bWasError |= !DoReceiveDataStream() )
+ bWasError |= !DoReceiveDataStream();
+ if( bWasError)
continue;
TimeValue sNochEins = {0, 1000000};
Modified: openoffice/branches/l10n/main/automation/util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/automation/util/makefile.mk?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/automation/util/makefile.mk (original)
+++ openoffice/branches/l10n/main/automation/util/makefile.mk Fri Mar 15 09:24:52 2013
@@ -128,117 +128,6 @@ DEF3DEPN = \
DEFLIB3NAME =communi
DEF3DES =Communication
-# --- TESTTOOL IDE ------------------------------------------------------
-
-#APP1TARGET=testtool
-
-#.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT")
-#APP1DEPN+=$(SHL2TARGETN) $(SHL3TARGETN)
-#.ELSE
-#APP1DEPN+=$(SHL2IMPLIBN) $(SHL3IMPLIBN)
-#.ENDIF
-#APP1STDLIBS= \
- $(APP3RDLIB) \
- $(SAMPLE3RDLIB)
-
-#APP1STDLIBS+= \
- $(CPPUHELPERLIB) \
- $(TOOLSLIB) \
- $(UNOTOOLSLIB) \
- $(SVTOOLLIB) \
- $(SVLLIB) \
- $(VCLLIB) \
- $(SALLIB) \
- $(VOSLIB) \
- $(UCBHELPERLIB) \
- $(COMPHELPERLIB) \
- $(BASICLIB) \
- $(SIMPLECMLIB) \
- $(COMMUNILIB)
-
-#.IF "$(GUI)"=="UNX"
-#APP1STDLIBS+= \
- $(VOSLIB) $(SALLIB) $(BASICLIB)
-#APP1STDLIBS+=$(CPPULIB)
-#.ENDIF
-#.IF "$(GUI)"=="WNT" || "$(COM)"=="GCC"
-#APP1STDLIBS+=$(CPPULIB)
-#.ENDIF
-
-#.IF "$(GUI)"=="WNT"
-#APP1STDLIBS += \
- $(SHELL32LIB) \
- $(ADVAPI32LIB)
-#.ENDIF # "$(GUI)"=="WNT"
-
-
-
-#.IF "$(OS)" == "SOLARIS"
-#APP1STDLIBS+= -lXm
-#.ENDIF
-
-#.IF "$(GUI)" == "UNX"
-#.IF "$(OS)" == "LINUX"
-#APP1STDLIBS+= -lXext -lX11 -lSM -lICE
-#.ENDIF
-#.IF "$(OS)"=="MACOSX"
-#APP1STDLIBS+= -lapp -lsample
-#.ENDIF
-#.ENDIF
-
-
-
-#APP1LIBS=\
- $(LB)$/testtool.lib
-
-#APP1OBJS= $(OBJ)$/testbasi.obj \
- $(OBJ)$/cmdbasestream.obj \
- $(OBJ)$/svcommstream.obj
-
-# --- TESTTOOL MINIAPP ------------------------------------------------------
-# ressources are linked here
-
-#RESLIB1NAME=tma
-#RESLIB1SRSFILES= \
- $(SRS)$/miniapp.srs
-
-#APP3TARGET=miniapp
-#APP3STDLIBS= \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(UCBHELPERLIB) \
- $(COMPHELPERLIB) \
- $(AUTOMATIONLIB) \
- $(SALLIB) \
- $(TOOLSLIB) \
- $(SVTOOLLIB) \
- $(VCLLIB)
-
-#.IF "$(GUI)"=="UNX"
-#.IF "$(OS)"=="MACOSX"
-#APP3STDLIBS+= \
- $(VOSLIB) $(SALLIB) $(LIBSTLPORT)
-#.ELSE
-#APP3STDLIBS+= \
- $(VOSLIB) $(SALLIB)
-#.ENDIF
-#.ENDIF
-# $(AUTOMATIONLIB) is build in SHL1TARGET
-#.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT")
-#APP3DEPN=$(SHL1TARGETN)
-#.ELSE
-#APP3DEPN=$(SHL1IMPLIBN)
-#.ENDIF
-
-#APP3LIBS= \
- $(LB)$/miniapp.lib
-
-#.IF "$(GUI)" != "UNX"
-#.IF "$(COM)" != "GCC"
-# win16 braucht ein appobj
-#APP3OBJS= $(OBJ)$/testapp.obj
-#.ENDIF
-#.ENDIF
# --- Targets -----------------------------------------------------------
Modified: openoffice/branches/l10n/main/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/bridges/source/cpp_uno/msvc_win32_intel/except.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/bridges/source/cpp_uno/msvc_win32_intel/except.cxx (original)
+++ openoffice/branches/l10n/main/bridges/source/cpp_uno/msvc_win32_intel/except.cxx Fri Mar 15 09:24:52 2013
@@ -28,7 +28,6 @@
#include <hash_map>
#include <sal/config.h>
#include <malloc.h>
-#include <new.h>
#include <typeinfo.h>
#include <signal.h>
Modified: openoffice/branches/l10n/main/canvas/source/directx/dx_textlayout.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/canvas/source/directx/dx_textlayout.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/canvas/source/directx/dx_textlayout.cxx (original)
+++ openoffice/branches/l10n/main/canvas/source/directx/dx_textlayout.cxx Fri Mar 15 09:24:52 2013
@@ -119,7 +119,8 @@ namespace dxcanvas
maText,
maLogicalAdvancements,
mpFont.getRef(),
- mpFont->getFontMatrix()));
+ mpFont->getFontMatrix(),
+ mnTextDirection ));
return aBounds;
}
@@ -247,7 +248,8 @@ namespace dxcanvas
maLogicalAdvancements,
mpFont.getRef(),
mpFont->getFontMatrix(),
- bAlphaSurface);
+ bAlphaSurface,
+ mnTextDirection );
return true;
}
Modified: openoffice/branches/l10n/main/canvas/source/directx/dx_textlayout_drawhelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/canvas/source/directx/dx_textlayout_drawhelper.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/canvas/source/directx/dx_textlayout_drawhelper.cxx (original)
+++ openoffice/branches/l10n/main/canvas/source/directx/dx_textlayout_drawhelper.cxx Fri Mar 15 09:24:52 2013
@@ -37,6 +37,7 @@
#include <com/sun/star/rendering/FontRequest.hpp>
#include <com/sun/star/rendering/PanoseProportion.hpp>
#include <com/sun/star/rendering/XCanvasFont.hpp>
+#include <com/sun/star/rendering/TextDirection.hpp>
#include <comphelper/sequence.hxx>
#include <comphelper/scopeguard.hxx>
#include <tools/color.hxx>
@@ -71,6 +72,35 @@ namespace dxcanvas
{
}
+ void setupLayoutMode( VirtualDevice& rVirDev,
+ sal_Int8 nTextDirection )
+ {
+ // TODO(P3): avoid if already correctly set
+ ULONG nLayoutMode;
+ switch( nTextDirection )
+ {
+ default:
+ nLayoutMode = 0;
+ break;
+ case rendering::TextDirection::WEAK_LEFT_TO_RIGHT:
+ nLayoutMode = TEXT_LAYOUT_BIDI_LTR;
+ break;
+ case rendering::TextDirection::STRONG_LEFT_TO_RIGHT:
+ nLayoutMode = TEXT_LAYOUT_BIDI_LTR | TEXT_LAYOUT_BIDI_STRONG;
+ break;
+ case rendering::TextDirection::WEAK_RIGHT_TO_LEFT:
+ nLayoutMode = TEXT_LAYOUT_BIDI_RTL;
+ break;
+ case rendering::TextDirection::STRONG_RIGHT_TO_LEFT:
+ nLayoutMode = TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_BIDI_STRONG;
+ break;
+ }
+
+ // set calculated layout mode. Origin is always the left edge,
+ // as required at the API spec
+ rVirDev.SetLayoutMode( nLayoutMode | TEXT_LAYOUT_TEXTORIGIN_LEFT );
+ }
+
void TextLayoutDrawHelper::drawText(
const GraphicsSharedPtr& rGraphics,
const ::com::sun::star::rendering::ViewState& rViewState,
@@ -81,7 +111,8 @@ namespace dxcanvas
const ::com::sun::star::uno::Reference<
::com::sun::star::rendering::XCanvasFont >& rCanvasFont,
const ::com::sun::star::geometry::Matrix2D& rFontMatrix,
- bool bAlphaSurface )
+ bool bAlphaSurface,
+ sal_Int8 nTextDirection)
{
HDC hdc = rGraphics->GetHDC();
@@ -157,6 +188,8 @@ namespace dxcanvas
// set font
aVirtualDevice.SetFont(aFont);
+ setupLayoutMode( aVirtualDevice, nTextDirection );
+
// create world transformation matrix
::basegfx::B2DHomMatrix aWorldTransform;
::canvas::tools::mergeViewAndRenderTransform(aWorldTransform, rViewState, rRenderState);
@@ -240,7 +273,8 @@ namespace dxcanvas
geometry::RealRectangle2D TextLayoutDrawHelper::queryTextBounds( const rendering::StringContext& rText,
const uno::Sequence< double >& rLogicalAdvancements,
const uno::Reference< rendering::XCanvasFont >& rCanvasFont,
- const geometry::Matrix2D& rFontMatrix )
+ const geometry::Matrix2D& rFontMatrix,
+ sal_Int8 nTextDirection )
{
if(!(rText.Length))
return geometry::RealRectangle2D();
@@ -286,6 +320,8 @@ namespace dxcanvas
// set font
aVirtualDevice.SetFont(aFont);
+ setupLayoutMode( aVirtualDevice, nTextDirection );
+
// need metrics for Y offset, the XCanvas always renders
// relative to baseline
const ::FontMetric& aMetric( aVirtualDevice.GetFontMetric() );
Modified: openoffice/branches/l10n/main/canvas/source/directx/dx_textlayout_drawhelper.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/canvas/source/directx/dx_textlayout_drawhelper.hxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/canvas/source/directx/dx_textlayout_drawhelper.hxx (original)
+++ openoffice/branches/l10n/main/canvas/source/directx/dx_textlayout_drawhelper.hxx Fri Mar 15 09:24:52 2013
@@ -59,14 +59,16 @@ namespace dxcanvas
const ::com::sun::star::uno::Reference<
::com::sun::star::rendering::XCanvasFont >& rCanvasFont,
const ::com::sun::star::geometry::Matrix2D& rFontMatrix,
- bool bAlphaSurface );
+ bool bAlphaSurface,
+ sal_Int8 nTextDirection);
::com::sun::star::geometry::RealRectangle2D queryTextBounds(
const ::com::sun::star::rendering::StringContext& rText,
const ::com::sun::star::uno::Sequence< double >& rLogicalAdvancements,
const ::com::sun::star::uno::Reference<
::com::sun::star::rendering::XCanvasFont >& rCanvasFont,
- const ::com::sun::star::geometry::Matrix2D& rFontMatrix );
+ const ::com::sun::star::geometry::Matrix2D& rFontMatrix,
+ sal_Int8 nTextDirection );
#ifdef DBG_UTIL
void test();
Modified: openoffice/branches/l10n/main/cli_ure/source/native/native_bootstrap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/cli_ure/source/native/native_bootstrap.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/cli_ure/source/native/native_bootstrap.cxx (original)
+++ openoffice/branches/l10n/main/cli_ure/source/native/native_bootstrap.cxx Fri Mar 15 09:24:52 2013
@@ -54,7 +54,7 @@ namespace cli_ure {
// INSTALL_PATH value needs to correspond to the Windows registry subkey
// in main\scp2\source\ooo\registryitem_ooo.scp
-#define INSTALL_PATH L"Software\\Apache OpenOffice\\UNO\\InstallPath"
+#define INSTALL_PATH L"Software\\OpenOffice\\UNO\\InstallPath"
#define BASIS_LINK L"\\basis-link"
#define URE_LINK L"\\ure-link"
#define URE_BIN L"\\bin"
@@ -130,7 +130,7 @@ void oneDirUp(LPTSTR io_path)
for example c:/openoffice.org 3/program
This path is either obtained from the environment variable UNO_PATH
or the registry item
- "Software\\Apache OpenOffice\\UNO\\InstallPath"
+ "Software\\OpenOffice\\UNO\\InstallPath"
either in HKEY_CURRENT_USER or HKEY_LOCAL_MACHINE
The return value must be freed with delete[]
*/
@@ -332,8 +332,8 @@ namespace util
Bootstrapping requires the existence of many libraries which are contained
in an URE installation. To find and load these libraries the Windows
- registry keys HKEY_CURRENT_USER\Software\Apache OpenOffice\Layer\URE\1
- and HKEY_LOCAL_MACHINE\Software\Apache OpenOffice\Layer\URE\1 are examined.
+ registry keys HKEY_CURRENT_USER\Software\OpenOffice\Layer\URE\1
+ and HKEY_LOCAL_MACHINE\Software\OpenOffice\Layer\URE\1 are examined.
These contain a named value UREINSTALLLOCATION which holds a path to the URE
installation folder.
*/
Modified: openoffice/branches/l10n/main/codemaker/source/javamaker/classfile.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/codemaker/source/javamaker/classfile.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/codemaker/source/javamaker/classfile.cxx (original)
+++ openoffice/branches/l10n/main/codemaker/source/javamaker/classfile.cxx Fri Mar 15 09:24:52 2013
@@ -692,10 +692,12 @@ void ClassFile::addMethod(
appendSignatureAttribute(m_methods, signature);
}
+#define CLASSFILE_FMT 49.0 // a classfile format understood by JDK 5/6/7
+
void ClassFile::write(FileStream & file) const {
writeU4(file, 0xCAFEBABE);
- writeU2(file, 0);
- writeU2(file, 46);
+ writeU2(file, static_cast<sal_uInt16>((CLASSFILE_FMT-(int)CLASSFILE_FMT)*100000));
+ writeU2(file, static_cast<sal_uInt16>((int)CLASSFILE_FMT));
writeU2(file, m_constantPoolCount);
writeStream(file, m_constantPool);
writeU2(file, static_cast< sal_uInt16 >(m_accessFlags));
Modified: openoffice/branches/l10n/main/comphelper/inc/comphelper/stl_types.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/comphelper/inc/comphelper/stl_types.hxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/comphelper/inc/comphelper/stl_types.hxx (original)
+++ openoffice/branches/l10n/main/comphelper/inc/comphelper/stl_types.hxx Fri Mar 15 09:24:52 2013
@@ -52,10 +52,10 @@ namespace comphelper
//.........................................................................
//========================================================================
-// comparisation functions
+// comparison functors
//------------------------------------------------------------------------
- struct UStringLess : public ::std::binary_function< ::rtl::OUString, ::rtl::OUString, bool>
+struct UStringLess : public ::std::binary_function< ::rtl::OUString, ::rtl::OUString, bool>
{
bool operator() (const ::rtl::OUString& x, const ::rtl::OUString& y) const { return x < y ? true : false;} // construct prevents a MSVC6 warning
};
Modified: openoffice/branches/l10n/main/configure.in
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/configure.in?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/configure.in (original)
+++ openoffice/branches/l10n/main/configure.in Fri Mar 15 09:24:52 2013
@@ -268,6 +268,12 @@ AC_ARG_ENABLE(cl-standard,
options and therefore removes a lot of warnings when
using the cheaper standard compiler. )
],,)
+AC_ARG_ENABLE(win-x64-shellext,
+[ --enable-win-x64-shellext Enable the build/usage of Windows 64bit shell extensions.
+ These extension are used for the system integration on a
+ Windows 64bit systems. For example supporting the search
+ in ODF files with the standard Windows search feature.
+],,)
AC_ARG_ENABLE(gtk,
[ --disable-gtk Determines whether to use Gtk+ vclplug on platforms
where Gtk+ is available.
@@ -516,8 +522,8 @@ AC_ARG_WITH(beanshell-jar,
AC_ARG_ENABLE(minimizer,
[ --enable-minimizer enables the build of the Presentation Minimizer extension
],,)
-AC_ARG_ENABLE(presenter-console,
-[ --enable-presenter-console enables the build of the Presenter Console extension
+AC_ARG_ENABLE(presenter-screen,
+[ --enable-presenter-screen enables the build of the Presenter Screen extension
],,)
AC_ARG_ENABLE(pdfimport,
[ --enable-pdfimport enables the build of the PDF Import extension
@@ -1103,6 +1109,10 @@ else
CygwinVer="false"
fi
+# get info about the system provided release/version details
+head /etc/*-release
+uname -a
+
dnl ===================================================================
dnl The following is a list of supported systems.
dnl Sequential to keep the logic very simple
@@ -1292,6 +1302,21 @@ if test "$_os" = "WINNT"; then
AC_SUBST(VC_STANDARD)
fi
+if test "$_os" = "WINNT"; then
+ dnl ===================================================================
+ dnl Set the BUILD_X64 variable.
+ dnl ===================================================================
+ AC_MSG_CHECKING([whether to build/use the Windows 64bit shell extensions])
+ if test "$enable_win_x64_shellext" = "" -o "$enable_win_x64_shellext" = "no"; then
+ BUILD_X64=""
+ AC_MSG_RESULT([no])
+ else
+ BUILD_X64="TRUE"
+ AC_MSG_RESULT([yes])
+ fi
+ AC_SUBST(BUILD_X64)
+fi
+
dnl ===================================================================
dnl Set the ENABLE_WERROR variable. (Activate --enable-werror)
dnl ===================================================================
@@ -4576,7 +4601,8 @@ SYSTEM_SERF=NO
SERF_CFLAGS=
SERF_LIBS=
AC_MSG_CHECKING([which libserf to use])
-if test "x$with_system_serf" = "xyes" -o -n "$with_system_libs"; then
+if test -n "$with_system_serf" -o -n "$with_system_libs" && \
+ test "$with_system_serf" != "no"; then
AC_MSG_RESULT([system])
PKG_CHECK_MODULES([SERF], [serf-1 >= 1.1])
SYSTEM_SERF=YES
@@ -5766,8 +5792,10 @@ if test \( "$_os" = "WINNT" \) ; then
fi
if test -z "$with_atl_lib_dir"; then
ATL_LIB=$COMPATH/atlmfc/lib
+ ATL_LIB_X64=$COMPATH/atlmfc/lib/amd64
else
ATL_LIB=`cygpath -u "$with_atl_lib_dir"`
+ ATL_LIB_X64=$ATL_LIB/../amd64
fi
if test -z "$with_mfc_include_dir"; then
MFC_INCLUDE=$COMPATH/atlmfc/include
@@ -5782,6 +5810,7 @@ if test \( "$_os" = "WINNT" \) ; then
ATL_INCLUDE=`echo $ATL_INCLUDE | $SED 's/\/$//'`
ATL_LIB=`echo $ATL_LIB | $SED 's/\/$//'`
+ ATL_LIB_X64=`echo $ATL_LIB_X64 | $SED 's/\/$//'`
MFC_INCLUDE=`echo $MFC_INCLUDE | $SED 's/\/$//'`
MFC_LIB=`echo $MFC_LIB | $SED 's/\/$//'`
@@ -5827,6 +5856,7 @@ if test \( "$_os" = "WINNT" \) ; then
if test "$HAVE_ATL_H" = "no" -o "$HAVE_MFC_H" = "no" -o "$HAVE_ATL_LIB" = "no" -o "$HAVE_MFC_LIB" = "no"; then
ATL_INCLUDE=
ATL_LIB=
+ ATL_LIB_X64=
MFC_INCLUDE=
MFC_LIB=
HAVE_ATL_LIB=
@@ -5837,6 +5867,7 @@ if test \( "$_os" = "WINNT" \) ; then
else
ATL_INCLUDE=`cygpath -dm "$ATL_INCLUDE"`
ATL_LIB=`cygpath -dm "$ATL_LIB"`
+ ATL_LIB_X64=`cygpath -dm "$ATL_LIB_X64"`
MFC_INCLUDE=`cygpath -dm "$MFC_INCLUDE"`
MFC_LIB=`cygpath -dm "$MFC_LIB"`
AC_MSG_RESULT([ATL/MFC enabled])
@@ -5845,6 +5876,7 @@ if test \( "$_os" = "WINNT" \) ; then
fi
AC_SUBST(ATL_INCLUDE)
AC_SUBST(ATL_LIB)
+AC_SUBST(ATL_LIB_X64)
AC_SUBST(HAVE_ATLTHUNK)
AC_SUBST(MFC_INCLUDE)
AC_SUBST(MFC_LIB)
@@ -6392,7 +6424,7 @@ fi
AC_SUBST(ENABLE_MINIMIZER)
AC_MSG_CHECKING([whether to build the Presenter Screen extension])
-if test -n "$enable_presenter_console" -a "$enable_presenter_screen" != "no"; then
+if test -n "$enable_presenter_screen" -a "$enable_presenter_screen" != "no"; then
AC_MSG_RESULT([yes])
ENABLE_PRESENTER_SCREEN=YES
else
Modified: openoffice/branches/l10n/main/connectivity/source/drivers/hsqldb/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/connectivity/source/drivers/hsqldb/makefile.mk?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/connectivity/source/drivers/hsqldb/makefile.mk (original)
+++ openoffice/branches/l10n/main/connectivity/source/drivers/hsqldb/makefile.mk Fri Mar 15 09:24:52 2013
@@ -36,7 +36,7 @@ USE_DEFFILE=TRUE
.IF "$(SOLAR_JAVA)"==""
nojava:
- @echo "Not building jurt because Java is disabled"
+ @echo "Not building hsqldb because Java is disabled"
.ENDIF
.IF "$(SYSTEM_HSQLDB)" == "YES"
Modified: openoffice/branches/l10n/main/connectivity/source/drivers/mysql/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/connectivity/source/drivers/mysql/makefile.mk?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/connectivity/source/drivers/mysql/makefile.mk (original)
+++ openoffice/branches/l10n/main/connectivity/source/drivers/mysql/makefile.mk Fri Mar 15 09:24:52 2013
@@ -55,7 +55,11 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component
# --- Library -----------------------------------
+.IF "$(GUI)" == "OS2"
+REALNAME:=$(MYSQL_TARGET)
+.ELSE
REALNAME:=$(MYSQL_TARGET).uno
+.ENDIF
SHL1TARGET=$(REALNAME)$(DLLPOSTFIX)
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
Modified: openoffice/branches/l10n/main/connectivity/source/drivers/odbc/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/connectivity/source/drivers/odbc/makefile.mk?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/connectivity/source/drivers/odbc/makefile.mk (original)
+++ openoffice/branches/l10n/main/connectivity/source/drivers/odbc/makefile.mk Fri Mar 15 09:24:52 2013
@@ -55,7 +55,11 @@ SLOFILES=\
# --- ODBC Library -----------------------------------
+.IF "$(GUI)" == "OS2"
+REALNAME:=$(ODBC_TARGET)
+.ELSE
REALNAME:=$(ODBC_TARGET).uno
+.ENDIF
SHL1TARGET=$(REALNAME)$(DLLPOSTFIX)
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
Modified: openoffice/branches/l10n/main/cppu/inc/typelib/typedescription.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/cppu/inc/typelib/typedescription.h?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/cppu/inc/typelib/typedescription.h (original)
+++ openoffice/branches/l10n/main/cppu/inc/typelib/typedescription.h Fri Mar 15 09:24:52 2013
@@ -868,51 +868,6 @@ void SAL_CALL typelib_typedescription_re
/*----------------------------------------------------------------------------*/
/*----------------------------------------------------------------------------*/
-/** Returns true, if the type description reference may lose the type description. Otherwise
- pType is a valid pointer and cannot be discarded through the lifetime of this reference.
- Remark: If the pWeakObj of the type is set too, you can avoid the call of
- ...getDescription(...) and use the description directly. pWeakObj == 0 means, that the
- description is not initialized.
- @internal
-*/
-#define TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK( eTypeClass ) \
- ((eTypeClass) == typelib_TypeClass_INTERFACE_METHOD || \
- (eTypeClass) == typelib_TypeClass_INTERFACE_ATTRIBUTE)
-
-/** Gets a description from the reference. The description may not be locked by this call.
- You must use the TYPELIB_DANGER_RELEASE macro to release the description fetched with
- this macro.
- @internal
-*/
-#define TYPELIB_DANGER_GET( ppDescription, pTypeRef ) \
-{ \
- typelib_TypeDescriptionReference * pMacroTypeRef = (pTypeRef); \
- typelib_TypeDescription ** ppMacroTypeDescr = (ppDescription); \
- if (TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK( pMacroTypeRef->eTypeClass )) \
- { \
- typelib_typedescriptionreference_getDescription( ppMacroTypeDescr, pMacroTypeRef ); \
- } \
- else if (!pMacroTypeRef->pType || !pMacroTypeRef->pType->pWeakRef) \
- { \
- typelib_typedescriptionreference_getDescription( ppMacroTypeDescr, pMacroTypeRef ); \
- if (*ppMacroTypeDescr) \
- typelib_typedescription_release( *ppMacroTypeDescr ); \
- } \
- else \
- { \
- *ppMacroTypeDescr = pMacroTypeRef->pType; \
- } \
-}
-
-/** Releases the description previouse fetched by TYPELIB_DANGER_GET.
- @internal
-*/
-#define TYPELIB_DANGER_RELEASE( pDescription ) \
-{ \
- if (TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK( (pDescription)->eTypeClass )) \
- typelib_typedescription_release( pDescription ); \
-}
-
/** Creates a type description reference. This is a weak reference not holding the description.
If the description is already registered, the previous one is returned.
@@ -1149,6 +1104,52 @@ sal_Bool SAL_CALL typelib_typedescriptio
typelib_TypeDescription ** ppTypeDescr )
SAL_THROW_EXTERN_C();
+/** Returns true, if the type description reference may lose the type description. Otherwise
+ pType is a valid pointer and cannot be discarded through the lifetime of this reference.
+ Remark: If the pWeakObj of the type is set too, you can avoid the call of
+ ...getDescription(...) and use the description directly. pWeakObj == 0 means, that the
+ description is not initialized.
+ @internal
+*/
+inline bool TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK( _typelib_TypeClass eTypeClass )
+{
+ return (eTypeClass == typelib_TypeClass_INTERFACE_METHOD) ||
+ (eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE);
+}
+
+/** Gets a description from the reference. The description may not be locked by this call.
+ You must use the TYPELIB_DANGER_RELEASE macro to release the description fetched with
+ this macro.
+ @internal
+*/
+inline void TYPELIB_DANGER_GET( typelib_TypeDescription** ppMacroTypeDescr,
+ typelib_TypeDescriptionReference* pMacroTypeRef )
+{
+ if (TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK( pMacroTypeRef->eTypeClass ))
+ {
+ typelib_typedescriptionreference_getDescription( ppMacroTypeDescr, pMacroTypeRef );
+ }
+ else if (!pMacroTypeRef->pType || !pMacroTypeRef->pType->pWeakRef)
+ {
+ typelib_typedescriptionreference_getDescription( ppMacroTypeDescr, pMacroTypeRef );
+ if (*ppMacroTypeDescr)
+ typelib_typedescription_release( *ppMacroTypeDescr );
+ }
+ else
+ {
+ *ppMacroTypeDescr = pMacroTypeRef->pType;
+ }
+}
+
+/** Releases the description previouse fetched by TYPELIB_DANGER_GET.
+ @internal
+*/
+inline void TYPELIB_DANGER_RELEASE( typelib_TypeDescription* pDescription )
+{
+ if (TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK( pDescription->eTypeClass ))
+ typelib_typedescription_release( pDescription );
+}
+
#ifdef __cplusplus
}
#endif
Modified: openoffice/branches/l10n/main/cppuhelper/source/findsofficepath.c
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/cppuhelper/source/findsofficepath.c?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/cppuhelper/source/findsofficepath.c (original)
+++ openoffice/branches/l10n/main/cppuhelper/source/findsofficepath.c Fri Mar 15 09:24:52 2013
@@ -86,7 +86,7 @@ static char* getPathFromRegistryKey( HKE
*/
static char* platformSpecific()
{
- const char* SUBKEYNAME = "Software\\Apache OpenOffice\\UNO\\InstallPath";
+ const char* SUBKEYNAME = "Software\\OpenOffice\\UNO\\InstallPath";
char* path = NULL;
Modified: openoffice/branches/l10n/main/cui/source/dialogs/about.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/cui/source/dialogs/about.src?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/cui/source/dialogs/about.src (original)
+++ openoffice/branches/l10n/main/cui/source/dialogs/about.src Fri Mar 15 09:24:52 2013
@@ -33,7 +33,7 @@ ModalDialog RID_DEFAULTABOUT
Moveable = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 200 , 150 ) ;
- Text [ en-US ] = "About %PRODUCTNAME" ;
+ Text [ en-US ] = "About %FULLPRODUCTNAME" ;
OKButton RID_CUI_ABOUT_BTN_OK
{
DefButton = TRUE ;
@@ -48,7 +48,7 @@ ModalDialog RID_DEFAULTABOUT
FixedText RID_CUI_ABOUT_FTXT_VERSION
{
WordBreak = TRUE ;
- Text = "%PRODUCTNAME %ABOUTBOXPRODUCTVERSION %PRODUCTEXTENSION" ;
+ Text = "%FULLPRODUCTNAME %ABOUTBOXPRODUCTVERSION %PRODUCTEXTENSION" ;
};
MultiLineEdit RID_CUI_ABOUT_FTXT_BUILDDATA
{
Modified: openoffice/branches/l10n/main/cui/source/options/optcolor.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/cui/source/options/optcolor.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/cui/source/options/optcolor.cxx (original)
+++ openoffice/branches/l10n/main/cui/source/options/optcolor.cxx Fri Mar 15 09:24:52 2013
@@ -954,15 +954,18 @@ ColorConfigWindow_Impl::ColorConfigWindo
}
aColorBoxes[0]->SetHelpId( aColorLBHids[0] );
+ aColorBoxes[0]->SetDropDownLineCount( 10 );
+ const sal_Int32 nColorLBHids = sizeof( aColorLBHids )/ sizeof( aColorLBHids[0] );
for( sal_Int32 i = 1; i < nCount; i++ )
{
- if(aColorBoxes[i])
- {
- aColorBoxes[i]->CopyEntries( *aColorBoxes[0] );
- if( i < sal_Int32(sizeof(aColorLBHids)/sizeof(aColorLBHids[0])) )
- aColorBoxes[i]->SetHelpId( aColorLBHids[i] );
- }
+ if( !aColorBoxes[i] )
+ continue;
+
+ aColorBoxes[i]->CopyEntries( *aColorBoxes[0] );
+ if( i < nColorLBHids )
+ aColorBoxes[i]->SetHelpId( aColorLBHids[i] );
+ aColorBoxes[i]->SetDropDownLineCount( 10 );
}
}
/* -----------------------------27.03.2002 11:04------------------------------
Modified: openoffice/branches/l10n/main/default_images/framework/res/backing.png
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/default_images/framework/res/backing.png?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/l10n/main/default_images/framework/res/backing_hc.png
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/default_images/framework/res/backing_hc.png?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/l10n/main/default_images/introabout/about.png
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/default_images/introabout/about.png?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/l10n/main/default_images/introabout/intro.png
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/default_images/introabout/intro.png?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/l10n/main/desktop/source/app/app.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/desktop/source/app/app.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/desktop/source/app/app.cxx (original)
+++ openoffice/branches/l10n/main/desktop/source/app/app.cxx Fri Mar 15 09:24:52 2013
@@ -409,6 +409,8 @@ namespace
{
struct BrandName
: public rtl::Static< String, BrandName > {};
+ struct FullProductname
+ : public rtl::Static< String, FullProductname > {};
struct Version
: public rtl::Static< String, Version > {};
struct AboutBoxVersion
@@ -430,9 +432,11 @@ void ReplaceStringHookProc( UniString& r
static int nAll = 0, nPro = 0;
nAll++;
- if ( rStr.SearchAscii( "%PRODUCT" ) != STRING_NOTFOUND )
+ if ( ( rStr.SearchAscii( "%PRODUCT" ) != STRING_NOTFOUND ) ||
+ ( rStr.SearchAscii( "%FULLPRODUCT" ) != STRING_NOTFOUND ) )
{
String &rBrandName = BrandName::get();
+ String& rFullProductname = FullProductname::get();
String &rVersion = Version::get();
String &rAboutBoxVersion = AboutBoxVersion::get();
String &rExtension = Extension::get();
@@ -446,6 +450,10 @@ void ReplaceStringHookProc( UniString& r
aRet >>= aTmp;
rBrandName = aTmp;
+ aRet = ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::FULLPRODUCTNAME );
+ aRet >>= aTmp;
+ rFullProductname = aTmp;
+
aRet = ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTXMLFILEFORMATNAME );
aRet >>= aTmp;
rXMLFileFormatName = aTmp;
@@ -472,6 +480,7 @@ void ReplaceStringHookProc( UniString& r
nPro++;
rStr.SearchAndReplaceAllAscii( "%PRODUCTNAME", rBrandName );
+ rStr.SearchAndReplaceAllAscii( "%FULLPRODUCTNAME", rFullProductname );
rStr.SearchAndReplaceAllAscii( "%PRODUCTVERSION", rVersion );
rStr.SearchAndReplaceAllAscii( "%ABOUTBOXPRODUCTVERSION", rAboutBoxVersion );
rStr.SearchAndReplaceAllAscii( "%PRODUCTEXTENSION", rExtension );
Modified: openoffice/branches/l10n/main/desktop/source/deployment/manager/dp_extensionmanager.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/desktop/source/deployment/manager/dp_extensionmanager.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/desktop/source/deployment/manager/dp_extensionmanager.cxx (original)
+++ openoffice/branches/l10n/main/desktop/source/deployment/manager/dp_extensionmanager.cxx Fri Mar 15 09:24:52 2013
@@ -313,26 +313,59 @@ void ExtensionManager::addExtensionsToMa
{ //will throw an exception if the extension does not exist
extensionList.push_back(getUserRepository()->getDeployedPackage(
identifier, fileName, Reference<ucb::XCommandEnvironment>()));
- } catch(lang::IllegalArgumentException &)
+ }
+ catch(lang::IllegalArgumentException &)
+ {
+ extensionList.push_back(Reference<deploy::XPackage>());
+ }
+ // catch deploy::DeploymentException and ucb::CommandFailedException to avoid unhandled exceptions causing crashes
+ catch( deploy::DeploymentException & )
+ {
+ extensionList.push_back(Reference<deploy::XPackage>());
+ }
+ catch( ucb::CommandFailedException & )
{
extensionList.push_back(Reference<deploy::XPackage>());
}
+
try
{
extensionList.push_back(getSharedRepository()->getDeployedPackage(
identifier, fileName, Reference<ucb::XCommandEnvironment>()));
- } catch (lang::IllegalArgumentException &)
+ }
+ catch (lang::IllegalArgumentException &)
+ {
+ extensionList.push_back(Reference<deploy::XPackage>());
+ }
+ // catch deploy::DeploymentException and ucb::CommandFailedException to avoid unhandled exceptions causing crashes
+ catch( deploy::DeploymentException & )
{
extensionList.push_back(Reference<deploy::XPackage>());
}
+ catch( ucb::CommandFailedException & )
+ {
+ extensionList.push_back(Reference<deploy::XPackage>());
+ }
+
try
{
extensionList.push_back(getBundledRepository()->getDeployedPackage(
identifier, fileName, Reference<ucb::XCommandEnvironment>()));
- } catch (lang::IllegalArgumentException &)
+ }
+ catch (lang::IllegalArgumentException &)
{
extensionList.push_back(Reference<deploy::XPackage>());
}
+ // catch deploy::DeploymentException and ucb::CommandFailedException to avoid unhandled exceptions causing crashes
+ catch( deploy::DeploymentException & )
+ {
+ extensionList.push_back(Reference<deploy::XPackage>());
+ }
+ catch( ucb::CommandFailedException & )
+ {
+ extensionList.push_back(Reference<deploy::XPackage>());
+ }
+
OSL_ASSERT(extensionList.size() == 3);
return extensionList;
}
@@ -1181,7 +1214,6 @@ uno::Sequence< uno::Sequence<Reference<d
uno::Sequence<Reference<deploy::XPackage> > bundledExt =
getBundledRepository()->getDeployedPackages(xAbort, xCmdEnv);
addExtensionsToMap(mapExt, bundledExt, OUSTR("bundled"));
- addExtensionsToMap(mapExt, bundledExt, OUSTR("bundled_prereg"));
// Create the tmp repository to trigger its clean up (deletion
// of old temporary data.)
Modified: openoffice/branches/l10n/main/desktop/source/migration/services/jvmfwk.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/desktop/source/migration/services/jvmfwk.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/desktop/source/migration/services/jvmfwk.cxx (original)
+++ openoffice/branches/l10n/main/desktop/source/migration/services/jvmfwk.cxx Fri Mar 15 09:24:52 2013
@@ -324,7 +324,7 @@ void JavaMigration::migrateJavarc()
return;
OUString sValue;
- rtl::Bootstrap javaini(m_sUserDir + OUSTR("/user/config/"SAL_CONFIGFILE("java")));
+ rtl::Bootstrap javaini(m_sUserDir + OUSTR( "/user/config/" SAL_CONFIGFILE("java")));
sal_Bool bSuccess = javaini.getFrom(OUSTR("Home"), sValue);
OSL_ENSURE(bSuccess, "[Service implementation " IMPL_NAME
"] XJob::execute: Could not get Home entry from java.ini/javarc.");
Modified: openoffice/branches/l10n/main/desktop/source/pkgchk/unopkg/unopkg_app.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/desktop/source/pkgchk/unopkg/unopkg_app.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/desktop/source/pkgchk/unopkg/unopkg_app.cxx (original)
+++ openoffice/branches/l10n/main/desktop/source/pkgchk/unopkg/unopkg_app.cxx Fri Mar 15 09:24:52 2013
@@ -269,7 +269,7 @@ extern "C" int unopkg_main()
return 0;
}
else if (isOption( info_version, &nPos )) {
- dp_misc::writeConsole("\n"APP_NAME" Version 3.3\n");
+ dp_misc::writeConsole( "\n" APP_NAME " Version 3.3\n");
return 0;
}
//consume all bootstrap variables which may occur before the subcommannd
@@ -649,7 +649,7 @@ extern "C" int unopkg_main()
}
if (option_verbose)
- dp_misc::writeConsole(OUSTR("\n"APP_NAME" done.\n"));
+ dp_misc::writeConsole( OUSTR( "\n" APP_NAME " done.\n"));
//Force to release all bridges which connect us to the child processes
disposeBridges(xLocalComponentContext);
return 0;
@@ -661,7 +661,7 @@ extern "C" int unopkg_main()
}
catch (ucb::CommandAbortedException &)
{
- dp_misc::writeConsoleError("\n"APP_NAME" aborted!\n");
+ dp_misc::writeConsoleError( "\n" APP_NAME " aborted!\n");
}
catch (deployment::DeploymentException & exc)
{
@@ -699,7 +699,7 @@ extern "C" int unopkg_main()
OUSTR("\n"));
}
if (!bNoOtherErrorMsg)
- dp_misc::writeConsoleError("\n"APP_NAME" failed.\n");
+ dp_misc::writeConsoleError( "\n" APP_NAME " failed.\n");
disposeBridges(xLocalComponentContext);
return 1;
}