You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/12/18 10:29:53 UTC
svn commit: r1551890 - in /openoffice/branches/rejuvenate01: ./
main/comphelper/inc/comphelper/ main/comphelper/source/misc/
main/instsetoo_native/util/ main/solenv/bin/
main/solenv/bin/modules/installer/windows/ main/tools/inc/tools/
main/vcl/aqua/sou...
Author: hdu
Date: Wed Dec 18 09:29:52 2013
New Revision: 1551890
URL: http://svn.apache.org/r1551890
Log:
updated "rejuvenate" branch to trunk (as of 2013/12/18, r1551885)
Modified:
openoffice/branches/rejuvenate01/ (props changed)
openoffice/branches/rejuvenate01/main/comphelper/inc/comphelper/locale.hxx
openoffice/branches/rejuvenate01/main/comphelper/source/misc/locale.cxx
openoffice/branches/rejuvenate01/main/instsetoo_native/util/makefile.mk
openoffice/branches/rejuvenate01/main/solenv/bin/make_installer.pl
openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/windows/binary.pm
openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/windows/idtglobal.pm
openoffice/branches/rejuvenate01/main/solenv/bin/patch_tool.pl
openoffice/branches/rejuvenate01/main/tools/inc/tools/prex.h
openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salgdi.cxx
openoffice/branches/rejuvenate01/main/vcl/inc/aqua/salgdi.h
openoffice/branches/rejuvenate01/main/vcl/inc/os2/salgdi.h
openoffice/branches/rejuvenate01/main/vcl/inc/salgdi.hxx
openoffice/branches/rejuvenate01/main/vcl/inc/unx/pspgraphics.h
openoffice/branches/rejuvenate01/main/vcl/inc/unx/salgdi.h
openoffice/branches/rejuvenate01/main/vcl/inc/win/salgdi.h
openoffice/branches/rejuvenate01/main/vcl/os2/source/gdi/salgdi.cxx
openoffice/branches/rejuvenate01/main/vcl/os2/source/gdi/salgdi2.cxx
openoffice/branches/rejuvenate01/main/vcl/source/gdi/salgdilayout.cxx
openoffice/branches/rejuvenate01/main/vcl/unx/generic/app/i18n_xkb.cxx
openoffice/branches/rejuvenate01/main/vcl/unx/generic/gdi/pspgraphics.cxx
openoffice/branches/rejuvenate01/main/vcl/unx/generic/gdi/salgdi.cxx
openoffice/branches/rejuvenate01/main/vcl/unx/generic/gdi/salgdi3.cxx
openoffice/branches/rejuvenate01/main/vcl/unx/headless/svpgdi.cxx
openoffice/branches/rejuvenate01/main/vcl/unx/headless/svpgdi.hxx
openoffice/branches/rejuvenate01/main/vcl/unx/headless/svppspgraphics.cxx
openoffice/branches/rejuvenate01/main/vcl/unx/headless/svppspgraphics.hxx
openoffice/branches/rejuvenate01/main/vcl/win/source/gdi/salgdi.cxx
openoffice/branches/rejuvenate01/main/vcl/win/source/gdi/salgdi2.cxx
openoffice/branches/rejuvenate01/test/ (props changed)
openoffice/branches/rejuvenate01/test/testcommon/source/org/openoffice/test/common/XMLReporter.java
Propchange: openoffice/branches/rejuvenate01/
------------------------------------------------------------------------------
Merged /openoffice/trunk:r1551246-1551885
Modified: openoffice/branches/rejuvenate01/main/comphelper/inc/comphelper/locale.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/comphelper/inc/comphelper/locale.hxx?rev=1551890&r1=1551889&r2=1551890&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/comphelper/inc/comphelper/locale.hxx (original)
+++ openoffice/branches/rejuvenate01/main/comphelper/inc/comphelper/locale.hxx Wed Dec 18 09:29:52 2013
@@ -64,41 +64,41 @@ class COMPHELPER_DLLPUBLIC Locale
static const sal_Unicode SEPERATOR_CV_LINUX;
/** @short some predefined Locale objects. */
- static const Locale EN_US();
- static const Locale EN();
- static const Locale DE_DE();
- static const Locale DE_CH();
- static const Locale DE_AT();
- static const Locale AR();
- static const Locale CA();
- static const Locale CS();
- static const Locale DA();
- static const Locale EL();
- static const Locale ES();
- static const Locale FI();
- static const Locale FR();
- static const Locale HE();
- static const Locale HI_IN();
- static const Locale HU();
- static const Locale IT();
- static const Locale JA();
- static const Locale KO();
- static const Locale NL();
- static const Locale PL();
- static const Locale PT();
- static const Locale PT_BR();
- static const Locale RU();
- static const Locale SK();
- static const Locale SL();
- static const Locale SV();
- static const Locale TH();
- static const Locale TR();
- static const Locale X_DEFAULT();
- static const Locale X_COMMENT();
- static const Locale X_TRANSLATE();
- static const Locale X_NOTRANSLATE();
- static const Locale ZH_CN();
- static const Locale ZH_TW();
+ static const Locale& EN_US();
+ static const Locale& EN();
+ static const Locale& DE_DE();
+ static const Locale& DE_CH();
+ static const Locale& DE_AT();
+ static const Locale& AR();
+ static const Locale& CA();
+ static const Locale& CS();
+ static const Locale& DA();
+ static const Locale& EL();
+ static const Locale& ES();
+ static const Locale& FI();
+ static const Locale& FR();
+ static const Locale& HE();
+ static const Locale& HI_IN();
+ static const Locale& HU();
+ static const Locale& IT();
+ static const Locale& JA();
+ static const Locale& KO();
+ static const Locale& NL();
+ static const Locale& PL();
+ static const Locale& PT();
+ static const Locale& PT_BR();
+ static const Locale& RU();
+ static const Locale& SK();
+ static const Locale& SL();
+ static const Locale& SV();
+ static const Locale& TH();
+ static const Locale& TR();
+ static const Locale& X_DEFAULT();
+ static const Locale& X_COMMENT();
+ static const Locale& X_TRANSLATE();
+ static const Locale& X_NOTRANSLATE();
+ static const Locale& ZH_CN();
+ static const Locale& ZH_TW();
//-------------------------------------------
// types
Modified: openoffice/branches/rejuvenate01/main/comphelper/source/misc/locale.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/comphelper/source/misc/locale.cxx?rev=1551890&r1=1551889&r2=1551890&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/comphelper/source/misc/locale.cxx (original)
+++ openoffice/branches/rejuvenate01/main/comphelper/source/misc/locale.cxx Wed Dec 18 09:29:52 2013
@@ -40,7 +40,7 @@ const sal_Unicode Locale::SEPERATOR_CV
const sal_Unicode Locale::SEPERATOR_CV_LINUX = (sal_Unicode)'.';
//-----------------------------------------------
-const Locale Locale::X_DEFAULT()
+const Locale& Locale::X_DEFAULT()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("x"),
@@ -49,7 +49,7 @@ const Locale Locale::X_DEFAULT()
}
//-----------------------------------------------
-const Locale Locale::EN()
+const Locale& Locale::EN()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("en"),
@@ -58,7 +58,7 @@ const Locale Locale::EN()
}
//-----------------------------------------------
-const Locale Locale::EN_US()
+const Locale& Locale::EN_US()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("en"),
@@ -67,7 +67,7 @@ const Locale Locale::EN_US()
}
//-----------------------------------------------
-const Locale Locale::DE_DE()
+const Locale& Locale::DE_DE()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("de"),
@@ -76,7 +76,7 @@ const Locale Locale::DE_DE()
}
//-----------------------------------------------
-const Locale Locale::DE_CH()
+const Locale& Locale::DE_CH()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("de"),
@@ -85,7 +85,7 @@ const Locale Locale::DE_CH()
}
//-----------------------------------------------
-const Locale Locale::DE_AT()
+const Locale& Locale::DE_AT()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("de"),
@@ -94,7 +94,7 @@ const Locale Locale::DE_AT()
}
//-----------------------------------------------
-const Locale Locale::AR()
+const Locale& Locale::AR()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("ar"),
@@ -103,7 +103,7 @@ const Locale Locale::AR()
}
//-----------------------------------------------
-const Locale Locale::CA()
+const Locale& Locale::CA()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("ca"),
@@ -112,7 +112,7 @@ const Locale Locale::CA()
}
//-----------------------------------------------
-const Locale Locale::CS()
+const Locale& Locale::CS()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("cs"),
@@ -121,7 +121,7 @@ const Locale Locale::CS()
}
//-----------------------------------------------
-const Locale Locale::DA()
+const Locale& Locale::DA()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("da"),
@@ -130,7 +130,7 @@ const Locale Locale::DA()
}
//-----------------------------------------------
-const Locale Locale::EL()
+const Locale& Locale::EL()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("el"),
@@ -139,7 +139,7 @@ const Locale Locale::EL()
}
//-----------------------------------------------
-const Locale Locale::ES()
+const Locale& Locale::ES()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("es"),
@@ -148,7 +148,7 @@ const Locale Locale::ES()
}
//-----------------------------------------------
-const Locale Locale::FI()
+const Locale& Locale::FI()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("fi"),
@@ -157,7 +157,7 @@ const Locale Locale::FI()
}
//-----------------------------------------------
-const Locale Locale::FR()
+const Locale& Locale::FR()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("fr"),
@@ -166,7 +166,7 @@ const Locale Locale::FR()
}
//-----------------------------------------------
-const Locale Locale::HE()
+const Locale& Locale::HE()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("he"),
@@ -175,7 +175,7 @@ const Locale Locale::HE()
}
//-----------------------------------------------
-const Locale Locale::HI_IN()
+const Locale& Locale::HI_IN()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("hi"),
@@ -184,7 +184,7 @@ const Locale Locale::HI_IN()
}
//-----------------------------------------------
-const Locale Locale::HU()
+const Locale& Locale::HU()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("hu"),
@@ -193,7 +193,7 @@ const Locale Locale::HU()
}
//-----------------------------------------------
-const Locale Locale::IT()
+const Locale& Locale::IT()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("it"),
@@ -202,7 +202,7 @@ const Locale Locale::IT()
}
//-----------------------------------------------
-const Locale Locale::JA()
+const Locale& Locale::JA()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("ja"),
@@ -211,7 +211,7 @@ const Locale Locale::JA()
}
//-----------------------------------------------
-const Locale Locale::KO()
+const Locale& Locale::KO()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("ko"),
@@ -220,7 +220,7 @@ const Locale Locale::KO()
}
//-----------------------------------------------
-const Locale Locale::NL()
+const Locale& Locale::NL()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("nl"),
@@ -229,7 +229,7 @@ const Locale Locale::NL()
}
//-----------------------------------------------
-const Locale Locale::PL()
+const Locale& Locale::PL()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("pl"),
@@ -238,7 +238,7 @@ const Locale Locale::PL()
}
//-----------------------------------------------
-const Locale Locale::PT()
+const Locale& Locale::PT()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("pt"),
@@ -247,7 +247,7 @@ const Locale Locale::PT()
}
//-----------------------------------------------
-const Locale Locale::PT_BR()
+const Locale& Locale::PT_BR()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("pt"),
@@ -256,7 +256,7 @@ const Locale Locale::PT_BR()
}
//-----------------------------------------------
-const Locale Locale::RU()
+const Locale& Locale::RU()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("ru"),
@@ -265,7 +265,7 @@ const Locale Locale::RU()
}
//-----------------------------------------------
-const Locale Locale::SK()
+const Locale& Locale::SK()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("sk"),
@@ -274,7 +274,7 @@ const Locale Locale::SK()
}
//-----------------------------------------------
-const Locale Locale::SL()
+const Locale& Locale::SL()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("sl"),
@@ -283,7 +283,7 @@ const Locale Locale::SL()
}
//-----------------------------------------------
-const Locale Locale::SV()
+const Locale& Locale::SV()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("sv"),
@@ -292,7 +292,7 @@ const Locale Locale::SV()
}
//-----------------------------------------------
-const Locale Locale::TH()
+const Locale& Locale::TH()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("th"),
@@ -301,7 +301,7 @@ const Locale Locale::TH()
}
//-----------------------------------------------
-const Locale Locale::TR()
+const Locale& Locale::TR()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("tr"),
@@ -310,7 +310,7 @@ const Locale Locale::TR()
}
//-----------------------------------------------
-const Locale Locale::X_COMMENT()
+const Locale& Locale::X_COMMENT()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("x"),
@@ -319,7 +319,7 @@ const Locale Locale::X_COMMENT()
}
//-----------------------------------------------
-const Locale Locale::X_TRANSLATE()
+const Locale& Locale::X_TRANSLATE()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("x"),
@@ -328,7 +328,7 @@ const Locale Locale::X_TRANSLATE()
}
//-----------------------------------------------
-const Locale Locale::X_NOTRANSLATE()
+const Locale& Locale::X_NOTRANSLATE()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("x"),
@@ -337,7 +337,7 @@ const Locale Locale::X_NOTRANSLATE()
}
//-----------------------------------------------
-const Locale Locale::ZH_CN()
+const Locale& Locale::ZH_CN()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("zh"),
@@ -346,7 +346,7 @@ const Locale Locale::ZH_CN()
}
//-----------------------------------------------
-const Locale Locale::ZH_TW()
+const Locale& Locale::ZH_TW()
{
static Locale aLocale(
::rtl::OUString::createFromAscii("zh"),
Modified: openoffice/branches/rejuvenate01/main/instsetoo_native/util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/instsetoo_native/util/makefile.mk?rev=1551890&r1=1551889&r2=1551890&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/instsetoo_native/util/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/instsetoo_native/util/makefile.mk Wed Dec 18 09:29:52 2013
@@ -90,10 +90,12 @@ help .PHONY :
@echo " patch-check check if patch can be created (part of patch-create)"
@echo
@echo "Most targets (all except aoo_srcrelease and updatepack) accept suffixes"
- @echo " add _<language> to build a target for one language only"
+ @echo " append _<language> to build a target for one language only"
@echo " the default set of languages is alllangiso=$(alllangiso)"
- @echo " add .<package_format> to build a target for one package format only"
+ @echo " append .<package_format> to build a target for one package format only"
@echo " the default set of package formats is archive and PKGFORMAT=$(PKGFORMAT)"
+ @echo " known package formats are: "
+ @echo " archive, bsd, deb, dmg, installed, msi, native, osx, pkg, portable, rpm"
LOCALPYFILES= \
@@ -443,7 +445,23 @@ MSI_LANGPACK_TEMPLATE_FILES= \
components.txt \
ooo_patchcodes.txt \
ooodev_patchcodes.txt \
- Binary/Banner.bmp
+ Binary/Banner.bmp \
+ Binary/Image.bmp \
+ Binary/caution.ico \
+ Binary/dontinstall.ico \
+ Binary/install.ico \
+ Binary/installfirstuse.ico \
+ Binary/installpartial.ico \
+ Binary/installstatemenu.ico \
+ Binary/networkinstall.ico \
+ Binary/newfolder.ico \
+ Binary/openfolder.ico \
+ Binary/setup.ico \
+ Binary/setupcomplete.ico \
+ Binary/setuppartial.ico \
+ Binary/setuprepair.ico \
+ Binary/trashcan.ico \
+ Binary/up.ico
MSI_SDK_TEMPLATE_FILES= \
ActionTe.idt \
Modified: openoffice/branches/rejuvenate01/main/solenv/bin/make_installer.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/bin/make_installer.pl?rev=1551890&r1=1551889&r2=1551890&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/bin/make_installer.pl (original)
+++ openoffice/branches/rejuvenate01/main/solenv/bin/make_installer.pl Wed Dec 18 09:29:52 2013
@@ -213,11 +213,15 @@ sub MakeWindowsBuild ($$$$$$$$$$$$$$$$$$
installer::systemactions::create_directory($newidtdir);
# Collecting all files with flag "BINARYTABLE"
- my $binarytablefiles = installer::worker::collect_all_items_with_special_flag($filesinproductlanguageresolvedarrayref ,"BINARYTABLE");
+ my $binarytablefiles = installer::worker::collect_all_items_with_special_flag(
+ $filesinproductlanguageresolvedarrayref,
+ "BINARYTABLE");
# Removing all files with flag "BINARYTABLE_ONLY"
@installer::globals::binarytableonlyfiles = ();
- $filesinproductlanguageresolvedarrayref = installer::worker::remove_all_items_with_special_flag($filesinproductlanguageresolvedarrayref ,"BINARYTABLE_ONLY");
+ $filesinproductlanguageresolvedarrayref = installer::worker::remove_all_items_with_special_flag(
+ $filesinproductlanguageresolvedarrayref,
+ "BINARYTABLE_ONLY");
# Collecting all profileitems with flag "INIFILETABLE" for table "IniFile"
my $inifiletableentries = installer::worker::collect_all_items_with_special_flag($profileitemsinproductlanguageresolvedarrayref ,"INIFILETABLE");
@@ -400,7 +404,14 @@ sub MakeWindowsBuild ($$$$$$$$$$$$$$$$$$
installer::logger::include_header_into_logfile("Copying idt files to $languageidtdir:");
- installer::windows::idtglobal::prepare_language_idt_directory($languageidtdir, $newidtdir, $onelanguage, $filesinproductlanguageresolvedarrayref, \@iconfilecollector, $binarytablefiles, $allvariableshashref);
+ installer::windows::idtglobal::prepare_language_idt_directory(
+ $languageidtdir,
+ $newidtdir,
+ $onelanguage,
+ $filesinproductlanguageresolvedarrayref,
+ \@iconfilecollector,
+ $binarytablefiles,
+ $allvariableshashref);
if (( ! $installer::globals::languagepack ) && ( ! $allvariableshashref->{'NOLANGUAGESELECTIONPRODUCT'} ))
{
@@ -513,7 +524,10 @@ sub MakeWindowsBuild ($$$$$$$$$$$$$$$$$$
installer::windows::property::update_checkbox_table($languageidtdir, $allvariableshashref);
# adding the files from the binary directory into the binary table
- installer::windows::binary::update_binary_table($languageidtdir, $filesinproductlanguageresolvedarrayref, $binarytablefiles);
+ installer::windows::binary::update_binary_table(
+ $languageidtdir,
+ $filesinproductlanguageresolvedarrayref,
+ $binarytablefiles);
# setting patch codes to detect installed products
Modified: openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/windows/binary.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/windows/binary.pm?rev=1551890&r1=1551889&r2=1551890&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/windows/binary.pm (original)
+++ openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/windows/binary.pm Wed Dec 18 09:29:52 2013
@@ -19,14 +19,14 @@
#
#**************************************************************
-
-
package installer::windows::binary;
use installer::existence;
use installer::files;
use installer::globals;
+use strict;
+
###########################################################################################################
# Updating the table Binary dynamically with all files from $binarytablefiles
# Content:
@@ -45,22 +45,15 @@ sub update_binary_table
# Only the iconfiles, that are used in the shortcut table for the
# FolderItems (entries in Windows startmenu) are added into the icon table.
- for ( my $i = 0; $i <= $#{$binarytablefiles}; $i++ )
+ foreach my $binaryfile (@$binarytablefiles)
{
- my $binaryfile = ${$binarytablefiles}[$i];
my $binaryfilename = $binaryfile->{'Name'};
my $binaryfiledata = $binaryfilename;
-
- $binaryfilename =~ s/\.//g; # removing "." in filename: "abc.dll" to "abcdll" in name column
-
- my %binary = ();
-
- $binary{'Name'} = $binaryfilename;
- $binary{'Data'} = $binaryfiledata;
- my $oneline = $binary{'Name'} . "\t" . $binary{'Data'} . "\n";
-
- push(@{$binaryidttable}, $oneline);
+ # removing "." in filename: "abc.dll" to "abcdll" in name column
+ $binaryfilename =~ s/\.//g;
+
+ push @$binaryidttable, $binaryfilename . "\t" . $binaryfiledata . "\n";
}
# Saving the file
Modified: openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/windows/idtglobal.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/windows/idtglobal.pm?rev=1551890&r1=1551889&r2=1551890&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/windows/idtglobal.pm (original)
+++ openoffice/branches/rejuvenate01/main/solenv/bin/modules/installer/windows/idtglobal.pm Wed Dec 18 09:29:52 2013
@@ -779,7 +779,7 @@ sub translate_idtfile
# into one language specific directory
##############################################################
-sub prepare_language_idt_directory
+sub prepare_language_idt_directory ($$$$$$$)
{
my ($destinationdir, $newidtdir, $onelanguage, $filesref, $iconfilecollector, $binarytablefiles, $allvariables) = @_;
@@ -794,13 +794,21 @@ sub prepare_language_idt_directory
if ( -d $installer::globals::idttemplatepath . $installer::globals::separator . "Binary")
{
installer::systemactions::create_directory($destinationdir . $installer::globals::separator . "Binary");
- installer::systemactions::copy_directory($installer::globals::idttemplatepath . $installer::globals::separator . "Binary", $destinationdir . $installer::globals::separator . "Binary");
+ installer::systemactions::copy_directory(
+ $installer::globals::idttemplatepath . $installer::globals::separator . "Binary",
+ $destinationdir . $installer::globals::separator . "Binary");
if ((( $installer::globals::patch ) && ( $allvariables->{'WINDOWSPATCHBITMAPDIRECTORY'} )) || ( $allvariables->{'WINDOWSBITMAPDIRECTORY'} ))
{
my $bitmapdir = "";
- if ( $allvariables->{'WINDOWSPATCHBITMAPDIRECTORY'} ) { $bitmapdir = $allvariables->{'WINDOWSPATCHBITMAPDIRECTORY'}; }
- if ( $allvariables->{'WINDOWSBITMAPDIRECTORY'} ) { $bitmapdir = $allvariables->{'WINDOWSBITMAPDIRECTORY'}; }
+ if ( $allvariables->{'WINDOWSPATCHBITMAPDIRECTORY'} )
+ {
+ $bitmapdir = $allvariables->{'WINDOWSPATCHBITMAPDIRECTORY'};
+ }
+ if ( $allvariables->{'WINDOWSBITMAPDIRECTORY'} )
+ {
+ $bitmapdir = $allvariables->{'WINDOWSBITMAPDIRECTORY'};
+ }
my $newsourcedir = $installer::globals::unpackpath . $installer::globals::separator . $bitmapdir; # path setting in list file dependent from unpackpath !?
$installer::logger::Lang->printf("\n");
@@ -812,9 +820,13 @@ sub prepare_language_idt_directory
if ( ! -d $newsourcedir )
{
my $currentdir = cwd();
- installer::exiter::exit_program("ERROR: Directory $newsourcedir does not exist! Current directory is: $currentdir", "prepare_language_idt_directory");
+ installer::exiter::exit_program(
+ "ERROR: Directory $newsourcedir does not exist! Current directory is: $currentdir",
+ "prepare_language_idt_directory");
}
- installer::systemactions::copy_directory($newsourcedir, $destinationdir . $installer::globals::separator . "Binary");
+ installer::systemactions::copy_directory(
+ $newsourcedir,
+ $destinationdir . $installer::globals::separator . "Binary");
}
}
@@ -822,7 +834,9 @@ sub prepare_language_idt_directory
if ( -d $installer::globals::idttemplatepath . $installer::globals::separator . "Icon")
{
- installer::systemactions::copy_directory($installer::globals::idttemplatepath . $installer::globals::separator . "Icon", $destinationdir . $installer::globals::separator . "Icon");
+ installer::systemactions::copy_directory(
+ $installer::globals::idttemplatepath . $installer::globals::separator . "Icon",
+ $destinationdir . $installer::globals::separator . "Icon");
}
# Copying all files in $iconfilecollector, that describe icons of folderitems
@@ -831,18 +845,24 @@ sub prepare_language_idt_directory
{
my $iconfilename = ${$iconfilecollector}[$i];
installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$iconfilename);
- installer::systemactions::copy_one_file(${$iconfilecollector}[$i], $destinationdir . $installer::globals::separator . "Icon" . $installer::globals::separator . $iconfilename);
+ installer::systemactions::copy_one_file(
+ ${$iconfilecollector}[$i],
+ $destinationdir . $installer::globals::separator . "Icon" . $installer::globals::separator . $iconfilename);
}
# Copying all files in $binarytablefiles in the binary directory
- for ( my $i = 0; $i <= $#{$binarytablefiles}; $i++ )
+ foreach my $binaryfile (@$binarytablefiles)
{
- my $binaryfile = ${$binarytablefiles}[$i];
my $binaryfilepath = $binaryfile->{'sourcepath'};
my $binaryfilename = $binaryfilepath;
+ $installer::logger::Lang->printf("copying binary file %s to %s\n",
+ $binaryfilepath,
+ $binaryfilename);
installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$binaryfilename);
- installer::systemactions::copy_one_file($binaryfilepath, $destinationdir . $installer::globals::separator . "Binary" . $installer::globals::separator . $binaryfilename);
+ installer::systemactions::copy_one_file(
+ $binaryfilepath,
+ $destinationdir . $installer::globals::separator . "Binary" . $installer::globals::separator . $binaryfilename);
}
# Copying all new created and language independent idt-files to the destination $destinationdir.
Modified: openoffice/branches/rejuvenate01/main/solenv/bin/patch_tool.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/bin/patch_tool.pl?rev=1551890&r1=1551889&r2=1551890&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/bin/patch_tool.pl (original)
+++ openoffice/branches/rejuvenate01/main/solenv/bin/patch_tool.pl Wed Dec 18 09:29:52 2013
@@ -2203,9 +2203,9 @@ sub UpdateReleasesXML($$)
sub main ()
{
my $context = ProcessCommandline();
- installer::logger::starttime();
- $installer::logger::Global->add_timestamp("starting logging");
-# installer::logger::SetupSimpleLogging(undef);
+# installer::logger::starttime();
+# $installer::logger::Global->add_timestamp("starting logging");
+ installer::logger::SetupSimpleLogging(undef);
die "ERROR: list file is not defined, please use --lst-file option"
unless defined $context->{'lst-file'};
@@ -2222,15 +2222,19 @@ sub main ()
if ($context->{'command'} =~ /create|check/)
{
- $installer::logger::Lang->set_filename(
- File::Spec->catfile(
- $context->{'output-path'},
- $context->{'product-name'},
- "msp",
- $context->{'source-version-dash'} . "_" . $context->{'target-version-dash'},
- $context->{'language'},
- "log",
- "patch-creation.log"));
+ my $filename = File::Spec->catfile(
+ $context->{'output-path'},
+ $context->{'product-name'},
+ "msp",
+ $context->{'source-version-dash'} . "_" . $context->{'target-version-dash'},
+ $context->{'language'},
+ "log",
+ "patch-creation.log");
+ my $dirname = dirname($filename);
+ File::Path::make_path($dirname) unless -d $dirname;
+ printf("directing output to $filename\n");
+
+ $installer::logger::Lang->set_filename($filename);
$installer::logger::Lang->copy_lines_from($installer::logger::Global);
$installer::logger::Lang->set_forward(undef);
$installer::logger::Info->set_forward($installer::logger::Lang);
Modified: openoffice/branches/rejuvenate01/main/tools/inc/tools/prex.h
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/tools/inc/tools/prex.h?rev=1551890&r1=1551889&r2=1551890&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/tools/inc/tools/prex.h (original)
+++ openoffice/branches/rejuvenate01/main/tools/inc/tools/prex.h Wed Dec 18 09:29:52 2013
@@ -39,20 +39,13 @@
extern "C" {
#endif
-#if defined(LINUX) || defined(FREEBSD) || defined(MACOSX) // should really check for xfree86 or for X11R6.1 and higher
-#define __XKeyboardExtension__ 1
-#else
-#define __XKeyboardExtension__ 0
-#endif
-
#include <X11/X.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/StringDefs.h>
#include <X11/extensions/Xrender.h>
-#if __XKeyboardExtension__
#include <X11/XKBlib.h>
-#endif
+
typedef unsigned long Pixel;
#undef DestroyAll
Modified: openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salgdi.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salgdi.cxx?rev=1551890&r1=1551889&r2=1551890&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salgdi.cxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/aqua/source/gdi/salgdi.cxx Wed Dec 18 09:29:52 2013
@@ -734,13 +734,13 @@ void AquaSalGraphics::drawRect( long nX,
// -----------------------------------------------------------------------
-static void getBoundRect( sal_uLong nPoints, const SalPoint *pPtAry, long &rX, long& rY, long& rWidth, long& rHeight )
+static void getBoundRect( sal_uInt32 nPoints, const SalPoint* pPtAry, long &rX, long& rY, long& rWidth, long& rHeight )
{
long nX1 = pPtAry->mnX;
long nX2 = nX1;
long nY1 = pPtAry->mnY;
long nY2 = nY1;
- for( sal_uLong n = 1; n < nPoints; n++ )
+ for( sal_uInt32 n = 1; n < nPoints; ++n )
{
if( pPtAry[n].mnX < nX1 )
nX1 = pPtAry[n].mnX;
@@ -764,7 +764,7 @@ static inline void alignLinePoint( const
o_fY = static_cast<float>(i_pIn->mnY ) + 0.5;
}
-void AquaSalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint *pPtAry )
+void AquaSalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
if( nPoints < 1 )
return;
@@ -780,7 +780,7 @@ void AquaSalGraphics::drawPolyLine( sal_
alignLinePoint( pPtAry, fX, fY );
CGContextMoveToPoint( mrContext, fX, fY );
pPtAry++;
- for( sal_uLong nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ )
+ for( sal_uInt32 nPoint = 1; nPoint < nPoints; ++nPoint, ++pPtAry )
{
alignLinePoint( pPtAry, fX, fY );
CGContextAddLineToPoint( mrContext, fX, fY );
@@ -792,7 +792,7 @@ void AquaSalGraphics::drawPolyLine( sal_
// -----------------------------------------------------------------------
-void AquaSalGraphics::drawPolygon( sal_uLong nPoints, const SalPoint *pPtAry )
+void AquaSalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
if( nPoints <= 1 )
return;
@@ -820,7 +820,7 @@ void AquaSalGraphics::drawPolygon( sal_u
alignLinePoint( pPtAry, fX, fY );
CGContextMoveToPoint( mrContext, fX, fY );
pPtAry++;
- for( sal_uLong nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ )
+ for( sal_uInt32 nPoint = 1; nPoint < nPoints; ++nPoint, ++pPtAry )
{
alignLinePoint( pPtAry, fX, fY );
CGContextAddLineToPoint( mrContext, fX, fY );
@@ -830,7 +830,7 @@ void AquaSalGraphics::drawPolygon( sal_u
{
CGContextMoveToPoint( mrContext, pPtAry->mnX, pPtAry->mnY );
pPtAry++;
- for( sal_uLong nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ )
+ for( sal_uInt32 nPoint = 1; nPoint < nPoints; ++nPoint, ++pPtAry )
CGContextAddLineToPoint( mrContext, pPtAry->mnX, pPtAry->mnY );
}
@@ -840,7 +840,7 @@ void AquaSalGraphics::drawPolygon( sal_u
// -----------------------------------------------------------------------
-void AquaSalGraphics::drawPolyPolygon( sal_uInt32 nPolyCount, const sal_uInt32 *pPoints, PCONSTSALPOINT *ppPtAry )
+void AquaSalGraphics::drawPolyPolygon( sal_uInt32 nPolyCount, const sal_uInt32* pPoints, PCONSTSALPOINT* ppPtAry )
{
if( nPolyCount <= 0 )
return;
@@ -887,7 +887,7 @@ void AquaSalGraphics::drawPolyPolygon( s
{
for( sal_uLong nPoly = 0; nPoly < nPolyCount; nPoly++ )
{
- const sal_uLong nPoints = pPoints[nPoly];
+ const sal_uInt32 nPoints = pPoints[nPoly];
if( nPoints > 1 )
{
const SalPoint *pPtAry = ppPtAry[nPoly];
@@ -895,7 +895,7 @@ void AquaSalGraphics::drawPolyPolygon( s
alignLinePoint( pPtAry, fX, fY );
CGContextMoveToPoint( mrContext, fX, fY );
pPtAry++;
- for( sal_uLong nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ )
+ for( sal_uInt32 nPoint = 1; nPoint < nPoints; ++nPoint, ++pPtAry )
{
alignLinePoint( pPtAry, fX, fY );
CGContextAddLineToPoint( mrContext, fX, fY );
@@ -908,13 +908,13 @@ void AquaSalGraphics::drawPolyPolygon( s
{
for( sal_uLong nPoly = 0; nPoly < nPolyCount; nPoly++ )
{
- const sal_uLong nPoints = pPoints[nPoly];
+ const sal_uInt32 nPoints = pPoints[nPoly];
if( nPoints > 1 )
{
const SalPoint *pPtAry = ppPtAry[nPoly];
CGContextMoveToPoint( mrContext, pPtAry->mnX, pPtAry->mnY );
pPtAry++;
- for( sal_uLong nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ )
+ for( sal_uInt32 nPoint = 1; nPoint < nPoints; ++nPoint, ++pPtAry )
CGContextAddLineToPoint( mrContext, pPtAry->mnX, pPtAry->mnY );
CGContextClosePath(mrContext);
}
@@ -1064,14 +1064,14 @@ bool AquaSalGraphics::drawPolyLine(
// -----------------------------------------------------------------------
-sal_Bool AquaSalGraphics::drawPolyLineBezier( sal_uLong, const SalPoint*, const sal_uInt8* )
+sal_Bool AquaSalGraphics::drawPolyLineBezier( sal_uInt32, const SalPoint*, const sal_uInt8* )
{
return sal_False;
}
// -----------------------------------------------------------------------
-sal_Bool AquaSalGraphics::drawPolygonBezier( sal_uLong, const SalPoint*, const sal_uInt8* )
+sal_Bool AquaSalGraphics::drawPolygonBezier( sal_uInt32, const SalPoint*, const sal_uInt8* )
{
return sal_False;
}
@@ -1409,7 +1409,7 @@ void AquaSalGraphics::invert( long nX, l
// -----------------------------------------------------------------------
-void AquaSalGraphics::invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nSalFlags )
+void AquaSalGraphics::invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nSalFlags )
{
CGPoint* CGpoints ;
if ( CheckContext() )
Modified: openoffice/branches/rejuvenate01/main/vcl/inc/aqua/salgdi.h
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/inc/aqua/salgdi.h?rev=1551890&r1=1551889&r2=1551890&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/inc/aqua/salgdi.h (original)
+++ openoffice/branches/rejuvenate01/main/vcl/inc/aqua/salgdi.h Wed Dec 18 09:29:52 2013
@@ -232,12 +232,12 @@ public:
virtual void drawPixel( long nX, long nY, SalColor nSalColor );
virtual void drawLine( long nX1, long nY1, long nX2, long nY2 );
virtual void drawRect( long nX, long nY, long nWidth, long nHeight );
- virtual void drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry );
- virtual void drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry );
+ virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry );
+ virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry );
virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry );
virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
- virtual sal_Bool drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
- virtual sal_Bool drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
+ virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
+ virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry );
virtual bool drawPolyLine(
const ::basegfx::B2DPolygon&,
@@ -269,7 +269,7 @@ public:
// invert --> ClipRegion (only Windows or VirDevs)
virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags);
- virtual void invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags );
+ virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags );
virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize );
Modified: openoffice/branches/rejuvenate01/main/vcl/inc/os2/salgdi.h
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/inc/os2/salgdi.h?rev=1551890&r1=1551889&r2=1551890&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/inc/os2/salgdi.h (original)
+++ openoffice/branches/rejuvenate01/main/vcl/inc/os2/salgdi.h Wed Dec 18 09:29:52 2013
@@ -162,9 +162,9 @@ protected:
virtual void drawPixel( long nX, long nY, SalColor nSalColor );
virtual void drawLine( long nX1, long nY1, long nX2, long nY2 );
virtual void drawRect( long nX, long nY, long nWidth, long nHeight );
- virtual void drawPolyLine( ULONG nPoints, const SalPoint* pPtAry );
- virtual void drawPolygon( ULONG nPoints, const SalPoint* pPtAry );
- virtual void drawPolyPolygon( ULONG nPoly, const ULONG* pPoints, PCONSTSALPOINT* pPtAry );
+ virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry );
+ virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry );
+ virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry );
virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
virtual bool drawPolyLine(
const ::basegfx::B2DPolygon&,
@@ -172,8 +172,8 @@ protected:
const ::basegfx::B2DVector& rLineWidth,
basegfx::B2DLineJoin,
com::sun::star::drawing::LineCap);
- virtual sal_Bool drawPolyLineBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
- virtual sal_Bool drawPolygonBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
+ virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
+ virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry );
// CopyArea --> No RasterOp, but ClipRegion
@@ -199,7 +199,7 @@ protected:
// invert --> ClipRegion (only Windows or VirDevs)
virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags);
- virtual void invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags );
+ virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags );
virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
Modified: openoffice/branches/rejuvenate01/main/vcl/inc/salgdi.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/inc/salgdi.hxx?rev=1551890&r1=1551889&r2=1551890&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/inc/salgdi.hxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/inc/salgdi.hxx Wed Dec 18 09:29:52 2013
@@ -116,8 +116,8 @@ protected:
virtual void drawPixel( long nX, long nY, SalColor nSalColor ) = 0;
virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ) = 0;
virtual void drawRect( long nX, long nY, long nWidth, long nHeight ) = 0;
- virtual void drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry ) = 0;
- virtual void drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry ) = 0;
+ virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) = 0;
+ virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) = 0;
virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ) = 0;
virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ) = 0;
virtual bool drawPolyLine(
@@ -126,8 +126,8 @@ protected:
const ::basegfx::B2DVector& rLineWidths,
basegfx::B2DLineJoin,
com::sun::star::drawing::LineCap) = 0;
- virtual sal_Bool drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) = 0;
- virtual sal_Bool drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) = 0;
+ virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) = 0;
+ virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) = 0;
virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry ) = 0;
// CopyArea --> No RasterOp, but ClipRegion
@@ -153,7 +153,7 @@ protected:
// invert --> ClipRegion (only Windows or VirDevs)
virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags) = 0;
- virtual void invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags ) = 0;
+ virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) = 0;
virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) = 0;
@@ -369,8 +369,8 @@ public:
void DrawPixel( long nX, long nY, SalColor nSalColor, const OutputDevice *pOutDev );
void DrawLine( long nX1, long nY1, long nX2, long nY2, const OutputDevice *pOutDev );
void DrawRect( long nX, long nY, long nWidth, long nHeight, const OutputDevice *pOutDev );
- void DrawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev );
- void DrawPolygon( sal_uLong nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev );
+ void DrawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev );
+ void DrawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev );
void DrawPolyPolygon( sal_uInt32 nPoly,
const sal_uInt32* pPoints,
PCONSTSALPOINT* pPtAry,
@@ -385,11 +385,11 @@ public:
com::sun::star::drawing::LineCap i_eLineCap,
const OutputDevice* i_pOutDev);
- sal_Bool DrawPolyLineBezier( sal_uLong nPoints,
+ sal_Bool DrawPolyLineBezier( sal_uInt32 nPoints,
const SalPoint* pPtAry,
const sal_uInt8* pFlgAry,
const OutputDevice *pOutDev );
- sal_Bool DrawPolygonBezier( sal_uLong nPoints,
+ sal_Bool DrawPolygonBezier( sal_uInt32 nPoints,
const SalPoint* pPtAry,
const sal_uInt8* pFlgAry,
const OutputDevice *pOutDev );
@@ -437,7 +437,7 @@ public:
// invert --> ClipRegion (only Windows)
void Invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags, const OutputDevice *pOutDev );
- void Invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags, const OutputDevice *pOutDev );
+ void Invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags, const OutputDevice *pOutDev );
sal_Bool DrawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize, const OutputDevice *pOutDev );
Modified: openoffice/branches/rejuvenate01/main/vcl/inc/unx/pspgraphics.h
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/inc/unx/pspgraphics.h?rev=1551890&r1=1551889&r2=1551890&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/inc/unx/pspgraphics.h (original)
+++ openoffice/branches/rejuvenate01/main/vcl/inc/unx/pspgraphics.h Wed Dec 18 09:29:52 2013
@@ -130,8 +130,8 @@ public:
virtual void drawPixel( long nX, long nY, SalColor nSalColor );
virtual void drawLine( long nX1, long nY1, long nX2, long nY2 );
virtual void drawRect( long nX, long nY, long nWidth, long nHeight );
- virtual void drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry );
- virtual void drawPolygon( sal_uIntPtr nPoints, const SalPoint* pPtAry );
+ virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry );
+ virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry );
virtual void drawPolyPolygon( sal_uInt32 nPoly,
const sal_uInt32* pPoints,
PCONSTSALPOINT* pPtAry );
@@ -142,10 +142,10 @@ public:
const basegfx::B2DVector& rLineWidths,
basegfx::B2DLineJoin,
com::sun::star::drawing::LineCap);
- virtual sal_Bool drawPolyLineBezier( sal_uIntPtr nPoints,
+ virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints,
const SalPoint* pPtAry,
const sal_uInt8* pFlgAry );
- virtual sal_Bool drawPolygonBezier( sal_uIntPtr nPoints,
+ virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints,
const SalPoint* pPtAry,
const sal_uInt8* pFlgAry );
virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly,
@@ -175,7 +175,7 @@ public:
virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight );
virtual SalColor getPixel( long nX, long nY );
virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags );
- virtual void invert( sal_uIntPtr nPoints, const SalPoint* pPtAry, SalInvert nFlags );
+ virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags );
virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize );
virtual bool filterText( const String& rOrigText, String& rNewText, xub_StrLen nIndex, xub_StrLen& rLen, xub_StrLen& rCutStart, xub_StrLen& rCutStop );
Modified: openoffice/branches/rejuvenate01/main/vcl/inc/unx/salgdi.h
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/inc/unx/salgdi.h?rev=1551890&r1=1551889&r2=1551890&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/inc/unx/salgdi.h (original)
+++ openoffice/branches/rejuvenate01/main/vcl/inc/unx/salgdi.h Wed Dec 18 09:29:52 2013
@@ -277,9 +277,9 @@ public:
virtual void drawPixel( long nX, long nY, SalColor nSalColor );
virtual void drawLine( long nX1, long nY1, long nX2, long nY2 );
virtual void drawRect( long nX, long nY, long nWidth, long nHeight );
- void drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry, bool bClose );
- virtual void drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry );
- virtual void drawPolygon( sal_uIntPtr nPoints, const SalPoint* pPtAry );
+ void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry, bool bClose );
+ virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry );
+ virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry );
virtual void drawPolyPolygon( sal_uInt32 nPoly,
const sal_uInt32* pPoints,
PCONSTSALPOINT* pPtAry );
@@ -293,10 +293,10 @@ public:
virtual bool drawFilledTrapezoids( const ::basegfx::B2DTrapezoid*, int nTrapCount, double fTransparency );
#if 1 // TODO: remove these obselete methods
- virtual sal_Bool drawPolyLineBezier( sal_uIntPtr nPoints,
+ virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints,
const SalPoint* pPtAry,
const sal_uInt8* pFlgAry );
- virtual sal_Bool drawPolygonBezier( sal_uIntPtr nPoints,
+ virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints,
const SalPoint* pPtAry,
const sal_uInt8* pFlgAry );
virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly,
@@ -328,7 +328,7 @@ public:
virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight );
virtual SalColor getPixel( long nX, long nY );
virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags );
- virtual void invert( sal_uIntPtr nPoints, const SalPoint* pPtAry, SalInvert nFlags );
+ virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags );
virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize );
Modified: openoffice/branches/rejuvenate01/main/vcl/inc/win/salgdi.h
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/inc/win/salgdi.h?rev=1551890&r1=1551889&r2=1551890&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/inc/win/salgdi.h (original)
+++ openoffice/branches/rejuvenate01/main/vcl/inc/win/salgdi.h Wed Dec 18 09:29:52 2013
@@ -190,8 +190,8 @@ protected:
virtual void drawPixel( long nX, long nY, SalColor nSalColor );
virtual void drawLine( long nX1, long nY1, long nX2, long nY2 );
virtual void drawRect( long nX, long nY, long nWidth, long nHeight );
- virtual void drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry );
- virtual void drawPolygon( sal_uIntPtr nPoints, const SalPoint* pPtAry );
+ virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry );
+ virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry );
virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry );
virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
virtual bool drawPolyLine(
@@ -200,8 +200,8 @@ protected:
const ::basegfx::B2DVector& rLineWidth,
basegfx::B2DLineJoin,
com::sun::star::drawing::LineCap);
- virtual sal_Bool drawPolyLineBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
- virtual sal_Bool drawPolygonBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
+ virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
+ virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry );
// CopyArea --> No RasterOp, but ClipRegion
@@ -227,7 +227,7 @@ protected:
// invert --> ClipRegion (only Windows or VirDevs)
virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags);
- virtual void invert( sal_uIntPtr nPoints, const SalPoint* pPtAry, SalInvert nFlags );
+ virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags );
virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize );
Modified: openoffice/branches/rejuvenate01/main/vcl/os2/source/gdi/salgdi.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/os2/source/gdi/salgdi.cxx?rev=1551890&r1=1551889&r2=1551890&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/os2/source/gdi/salgdi.cxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/os2/source/gdi/salgdi.cxx Wed Dec 18 09:29:52 2013
@@ -151,13 +151,16 @@ static SalColor ImplGetROPSalColor( SalR
// -----------------------------------------------------------------------
-void Os2SalGraphics::GetResolution( long& rDPIX, long& rDPIY )
+void Os2SalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY )
{
// since OOo asks for DPI, I will query FONT_RES, which seems to be
// more correct than _RESOLUTION fields (on my wide screen lcd)
// and does not require conversion
- DevQueryCaps( mhDC, CAPS_HORIZONTAL_FONT_RES, 1, &rDPIX );
- DevQueryCaps( mhDC, CAPS_VERTICAL_FONT_RES, 1, &rDPIY );
+ long nDPIX = 72, nDPIY = 72;
+ DevQueryCaps( mhDC, CAPS_HORIZONTAL_FONT_RES, 1, &nDPIX );
+ DevQueryCaps( mhDC, CAPS_VERTICAL_FONT_RES, 1, &nDPIY );
+ rDPIX = nDPIX;
+ rDPIY = nDPIY;
}
// -----------------------------------------------------------------------
@@ -501,13 +504,13 @@ void Os2SalGraphics::drawRect( long nX,
// -----------------------------------------------------------------------
-void Os2SalGraphics::drawPolyLine( ULONG nPoints, const SalPoint* pPtAry )
+void Os2SalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
// convert all points to sys orientation
POINTL* pOS2PtAry = new POINTL[ nPoints ];
POINTL* pTempOS2PtAry = pOS2PtAry;
const SalPoint* pTempPtAry = pPtAry;
- ULONG nTempPoints = nPoints;
+ sal_uInt32 nTempPoints = nPoints;
long nHeight = mnHeight - 1;
while( nTempPoints-- )
@@ -525,7 +528,7 @@ void Os2SalGraphics::drawPolyLine( ULONG
// -----------------------------------------------------------------------
-void Os2SalGraphics::drawPolygon( ULONG nPoints, const SalPoint* pPtAry )
+void Os2SalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
PM_POLYGON aPolygon;
@@ -536,7 +539,7 @@ void Os2SalGraphics::drawPolygon( ULONG
// convert all points to sys orientation
POINTL* pTempOS2PtAry = aPolygon.aPointl;
const SalPoint* pTempPtAry = pPtAry;
- ULONG nTempPoints = nPoints;
+ sal_uInt32 nTempPoints = nPoints;
long nHeight = mnHeight - 1;
while( nTempPoints-- )
@@ -593,7 +596,7 @@ void Os2SalGraphics::drawPolygon( ULONG
// -----------------------------------------------------------------------
-void Os2SalGraphics::drawPolyPolygon( ULONG nPoly, const ULONG* pPoints,
+void Os2SalGraphics::drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints,
PCONSTSALPOINT* pPtAry )
{
ULONG i;
@@ -691,21 +694,21 @@ bool Os2SalGraphics::drawPolyLine(
// -----------------------------------------------------------------------
-sal_Bool Os2SalGraphics::drawPolyLineBezier( ULONG nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
+sal_Bool Os2SalGraphics::drawPolyLineBezier( sal_uInt32 /*nPoints*/, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
{
return sal_False;
}
// -----------------------------------------------------------------------
-sal_Bool Os2SalGraphics::drawPolygonBezier( ULONG nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
+sal_Bool Os2SalGraphics::drawPolygonBezier( sal_uInt32 /*nPoints*/, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
{
return sal_False;
}
// -----------------------------------------------------------------------
-sal_Bool Os2SalGraphics::drawPolyPolygonBezier( ULONG nPoly, const ULONG* pPoints,
+sal_Bool Os2SalGraphics::drawPolyPolygonBezier( sal_uInt32 /*nPoly*/, const sal_uInt32* /*pPoints*/,
const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry )
{
return sal_False;
Modified: openoffice/branches/rejuvenate01/main/vcl/os2/source/gdi/salgdi2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/os2/source/gdi/salgdi2.cxx?rev=1551890&r1=1551889&r2=1551890&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/os2/source/gdi/salgdi2.cxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/os2/source/gdi/salgdi2.cxx Wed Dec 18 09:29:52 2013
@@ -743,7 +743,7 @@ void Os2SalGraphics::invert( long nX, lo
// -----------------------------------------------------------------------
-void Os2SalGraphics::invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags )
+void Os2SalGraphics::invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags )
{
if( nFlags & SAL_INVERT_TRACKFRAME )
{
Modified: openoffice/branches/rejuvenate01/main/vcl/source/gdi/salgdilayout.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/source/gdi/salgdilayout.cxx?rev=1551890&r1=1551889&r2=1551890&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/source/gdi/salgdilayout.cxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/source/gdi/salgdilayout.cxx Wed Dec 18 09:29:52 2013
@@ -440,7 +440,7 @@ bool SalGraphics::drawPolyLine(
return false;
}
-void SalGraphics::DrawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev )
+void SalGraphics::DrawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev )
{
if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
{
@@ -453,7 +453,7 @@ void SalGraphics::DrawPolyLine( sal_uLon
drawPolyLine( nPoints, pPtAry );
}
-void SalGraphics::DrawPolygon( sal_uLong nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev )
+void SalGraphics::DrawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev )
{
if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
{
@@ -508,7 +508,7 @@ bool SalGraphics::drawPolyPolygon( const
return false;
}
-sal_Bool SalGraphics::DrawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry, const OutputDevice* pOutDev )
+sal_Bool SalGraphics::DrawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry, const OutputDevice* pOutDev )
{
sal_Bool bResult = sal_False;
if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
@@ -523,7 +523,7 @@ sal_Bool SalGraphics::DrawPolyLineBezier
return bResult;
}
-sal_Bool SalGraphics::DrawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry, const OutputDevice* pOutDev )
+sal_Bool SalGraphics::DrawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry, const OutputDevice* pOutDev )
{
sal_Bool bResult = sal_False;
if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
@@ -681,7 +681,7 @@ void SalGraphics::Invert( long nX, long
mirror( nX, nWidth, pOutDev );
invert( nX, nY, nWidth, nHeight, nFlags );
}
-void SalGraphics::Invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags, const OutputDevice *pOutDev )
+void SalGraphics::Invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags, const OutputDevice *pOutDev )
{
if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
{
Modified: openoffice/branches/rejuvenate01/main/vcl/unx/generic/app/i18n_xkb.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/unx/generic/app/i18n_xkb.cxx?rev=1551890&r1=1551889&r2=1551890&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/unx/generic/app/i18n_xkb.cxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/unx/generic/app/i18n_xkb.cxx Wed Dec 18 09:29:52 2013
@@ -31,16 +31,10 @@
#include "unx/saldata.hxx"
#include "unx/i18n_xkb.hxx"
-SalI18N_KeyboardExtension::SalI18N_KeyboardExtension( Display*
-#if __XKeyboardExtension__
-pDisplay
-#endif
-)
- : mbUseExtension( (sal_Bool)__XKeyboardExtension__ ),
- mnDefaultGroup( 0 )
+SalI18N_KeyboardExtension::SalI18N_KeyboardExtension( Display* pDisplay)
+: mbUseExtension( true )
+, mnDefaultGroup( 0 )
{
- #if __XKeyboardExtension__
-
mpDisplay = pDisplay;
// allow user to set the default keyboard group idx or to disable the usage
@@ -89,19 +83,11 @@ pDisplay
XkbGetState( mpDisplay, XkbUseCoreKbd, &aStateRecord );
mnGroup = aStateRecord.group;
}
-
- #endif // __XKeyboardExtension__
}
void
-SalI18N_KeyboardExtension::Dispatch( XEvent*
-#if __XKeyboardExtension__
-pEvent
-#endif
-)
+SalI18N_KeyboardExtension::Dispatch( XEvent* pEvent)
{
- #if __XKeyboardExtension__
-
// must the event be handled?
if ( !mbUseExtension
|| (pEvent->type != mnEventBase) )
@@ -119,41 +105,21 @@ pEvent
default:
- #if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 1
fprintf(stderr, "Got unrequested XkbAnyEvent %#x/%i\n",
- static_cast<unsigned int>(nXKBType), static_cast<int>(nXKBType) );
- #endif
+ static_cast<unsigned int>(nXKBType), static_cast<int>(nXKBType) );
+#endif
break;
}
- #endif // __XKeyboardExtension__
}
-#if __XKeyboardExtension__
-sal_uInt32
-SalI18N_KeyboardExtension::LookupKeysymInGroup( sal_uInt32 nKeyCode,
- sal_uInt32 nShiftState,
- sal_uInt32 nGroup ) const
-#else
-sal_uInt32
-SalI18N_KeyboardExtension::LookupKeysymInGroup( sal_uInt32,sal_uInt32,sal_uInt32 ) const
-#endif
+sal_uInt32 SalI18N_KeyboardExtension::LookupKeysymInGroup( sal_uInt32 nKeyCode,
+ sal_uInt32 nShiftState, sal_uInt32 nGroup ) const
{
- #if __XKeyboardExtension__
-
- if ( !mbUseExtension )
- return NoSymbol;
-
nShiftState &= ShiftMask;
- KeySym nKeySymbol;
- nKeySymbol = XkbKeycodeToKeysym( mpDisplay, nKeyCode, nGroup, nShiftState );
+ KeySym nKeySymbol = XkbKeycodeToKeysym( mpDisplay, nKeyCode, nGroup, nShiftState );
return nKeySymbol;
-
- #else
-
- return NoSymbol;
-
- #endif // __XKeyboardExtension__
}
Modified: openoffice/branches/rejuvenate01/main/vcl/unx/generic/gdi/pspgraphics.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/unx/generic/gdi/pspgraphics.cxx?rev=1551890&r1=1551889&r2=1551890&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/unx/generic/gdi/pspgraphics.cxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/unx/generic/gdi/pspgraphics.cxx Wed Dec 18 09:29:52 2013
@@ -401,12 +401,12 @@ void PspGraphics::drawRect( long nX, lon
m_pPrinterGfx->DrawRect (Rectangle(Point(nX, nY), Size(nDX, nDY)));
}
-void PspGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint *pPtAry )
+void PspGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint *pPtAry )
{
m_pPrinterGfx->DrawPolyLine (nPoints, (Point*)pPtAry);
}
-void PspGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry )
+void PspGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
// Point must be equal to SalPoint! see vcl/inc/salgtype.hxx
m_pPrinterGfx->DrawPolygon (nPoints, (Point*)pPtAry);
@@ -436,13 +436,13 @@ bool PspGraphics::drawPolyLine(
return false;
}
-sal_Bool PspGraphics::drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
+sal_Bool PspGraphics::drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
{
m_pPrinterGfx->DrawPolyLineBezier (nPoints, (Point*)pPtAry, pFlgAry);
return sal_True;
}
-sal_Bool PspGraphics::drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
+sal_Bool PspGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
{
m_pPrinterGfx->DrawPolygonBezier (nPoints, (Point*)pPtAry, pFlgAry);
return sal_True;
@@ -458,12 +458,11 @@ sal_Bool PspGraphics::drawPolyPolygonBez
return sal_True;
}
-void PspGraphics::invert( sal_uLong,
- const SalPoint*,
- SalInvert )
+void PspGraphics::invert( sal_uInt32, const SalPoint*, SalInvert )
{
DBG_ASSERT( 0, "Error: PrinterGfx::Invert() not implemented" );
}
+
sal_Bool PspGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize )
{
return m_pPrinterGfx->DrawEPS( Rectangle( Point( nX, nY ), Size( nWidth, nHeight ) ), pPtr, nSize );
Modified: openoffice/branches/rejuvenate01/main/vcl/unx/generic/gdi/salgdi.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/unx/generic/gdi/salgdi.cxx?rev=1551890&r1=1551889&r2=1551890&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/unx/generic/gdi/salgdi.cxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/unx/generic/gdi/salgdi.cxx Wed Dec 18 09:29:52 2013
@@ -843,13 +843,13 @@ void X11SalGraphics::drawRect( long nX,
}
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void X11SalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint *pPtAry )
+void X11SalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint *pPtAry )
{
drawPolyLine( nPoints, pPtAry, false );
}
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void X11SalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint *pPtAry, bool bClose )
+void X11SalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint *pPtAry, bool bClose )
{
if( nPenColor_ != SALCOLOR_NONE)
{
@@ -860,7 +860,7 @@ void X11SalGraphics::drawPolyLine( sal_u
}
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void X11SalGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry )
+void X11SalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
if( nPoints == 0 )
return;
@@ -927,7 +927,7 @@ void X11SalGraphics::drawPolygon( sal_uL
}
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void X11SalGraphics::drawPolyPolygon( sal_uInt32 nPoly,
+void X11SalGraphics::drawPolyPolygon( sal_uInt32 nPoly,
const sal_uInt32 *pPoints,
PCONSTSALPOINT *pPtAry )
{
@@ -976,14 +976,14 @@ void X11SalGraphics::drawPolyPolygon( sa
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-sal_Bool X11SalGraphics::drawPolyLineBezier( sal_uLong, const SalPoint*, const BYTE* )
+sal_Bool X11SalGraphics::drawPolyLineBezier( sal_uInt32, const SalPoint*, const BYTE* )
{
return sal_False;
}
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-sal_Bool X11SalGraphics::drawPolygonBezier( sal_uLong, const SalPoint*, const BYTE* )
+sal_Bool X11SalGraphics::drawPolygonBezier( sal_uInt32, const SalPoint*, const BYTE* )
{
return sal_False;
}
@@ -998,7 +998,7 @@ sal_Bool X11SalGraphics::drawPolyPolygon
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void X11SalGraphics::invert( sal_uLong nPoints,
+void X11SalGraphics::invert( sal_uInt32 nPoints,
const SalPoint* pPtAry,
SalInvert nFlags )
{
Modified: openoffice/branches/rejuvenate01/main/vcl/unx/generic/gdi/salgdi3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/unx/generic/gdi/salgdi3.cxx?rev=1551890&r1=1551889&r2=1551890&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/unx/generic/gdi/salgdi3.cxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/unx/generic/gdi/salgdi3.cxx Wed Dec 18 09:29:52 2013
@@ -1279,10 +1279,8 @@ SalLayout* X11SalGraphics::GetTextLayout
if (!bDisableGraphite_ &&
GraphiteFontAdaptor::IsGraphiteEnabledFont(*mpServerFont[nFallbackLevel]))
{
- sal_Int32 xdpi, ydpi;
-
- xdpi = GetDisplay()->GetResolution().A();
- ydpi = GetDisplay()->GetResolution().B();
+ sal_Int32 xdpi = GetDisplay()->GetResolution().A();
+ sal_Int32 ydpi = GetDisplay()->GetResolution().B();
GraphiteFontAdaptor * pGrfont = new GraphiteFontAdaptor( *mpServerFont[nFallbackLevel], xdpi, ydpi);
if (!pGrfont) return NULL;
Modified: openoffice/branches/rejuvenate01/main/vcl/unx/headless/svpgdi.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/unx/headless/svpgdi.cxx?rev=1551890&r1=1551889&r2=1551890&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/unx/headless/svpgdi.cxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/unx/headless/svpgdi.cxx Wed Dec 18 09:29:52 2013
@@ -341,7 +341,7 @@ void SvpSalGraphics::drawRect( long nX,
dbgOut( m_aDevice );
}
-void SvpSalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry )
+void SvpSalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
if( m_bUseLineColor && nPoints )
{
@@ -355,7 +355,7 @@ void SvpSalGraphics::drawPolyLine( sal_u
dbgOut( m_aDevice );
}
-void SvpSalGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry )
+void SvpSalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
if( ( m_bUseLineColor || m_bUseFillColor ) && nPoints )
{
@@ -377,7 +377,7 @@ void SvpSalGraphics::drawPolygon( sal_uL
dbgOut( m_aDevice );
}
-void SvpSalGraphics::drawPolyPolygon( sal_uInt32 nPoly,
+void SvpSalGraphics::drawPolyPolygon( sal_uInt32 nPoly,
const sal_uInt32* pPointCounts,
PCONSTSALPOINT* pPtAry )
{
@@ -425,14 +425,14 @@ bool SvpSalGraphics::drawPolyLine(
return false;
}
-sal_Bool SvpSalGraphics::drawPolyLineBezier( sal_uLong,
+sal_Bool SvpSalGraphics::drawPolyLineBezier( sal_uInt32,
const SalPoint*,
const sal_uInt8* )
{
return sal_False;
}
-sal_Bool SvpSalGraphics::drawPolygonBezier( sal_uLong,
+sal_Bool SvpSalGraphics::drawPolygonBezier( sal_uInt32,
const SalPoint*,
const sal_uInt8* )
{
@@ -574,7 +574,7 @@ void SvpSalGraphics::invert( long nX, lo
dbgOut( m_aDevice );
}
-void SvpSalGraphics::invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert /*nFlags*/ )
+void SvpSalGraphics::invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert /*nFlags*/ )
{
// FIXME: handle SAL_INVERT_50 and SAL_INVERT_TRACKFRAME
B2DPolygon aPoly;
Modified: openoffice/branches/rejuvenate01/main/vcl/unx/headless/svpgdi.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/unx/headless/svpgdi.hxx?rev=1551890&r1=1551889&r2=1551890&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/unx/headless/svpgdi.hxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/unx/headless/svpgdi.hxx Wed Dec 18 09:29:52 2013
@@ -127,15 +127,15 @@ public:
const ::basegfx::B2DVector& rLineWidths,
basegfx::B2DLineJoin,
com::sun::star::drawing::LineCap);
- virtual void drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry );
- virtual void drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry );
+ virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry );
+ virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry );
virtual void drawPolyPolygon( sal_uInt32 nPoly,
const sal_uInt32* pPoints,
PCONSTSALPOINT* pPtAry );
- virtual sal_Bool drawPolyLineBezier( sal_uLong nPoints,
+ virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints,
const SalPoint* pPtAry,
const sal_uInt8* pFlgAry );
- virtual sal_Bool drawPolygonBezier( sal_uLong nPoints,
+ virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints,
const SalPoint* pPtAry,
const sal_uInt8* pFlgAry );
virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly,
@@ -166,7 +166,7 @@ public:
virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight );
virtual SalColor getPixel( long nX, long nY );
virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags );
- virtual void invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags );
+ virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags );
virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize );
Modified: openoffice/branches/rejuvenate01/main/vcl/unx/headless/svppspgraphics.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/unx/headless/svppspgraphics.cxx?rev=1551890&r1=1551889&r2=1551890&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/unx/headless/svppspgraphics.cxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/unx/headless/svppspgraphics.cxx Wed Dec 18 09:29:52 2013
@@ -335,20 +335,18 @@ void PspGraphics::drawRect( long nX, lon
m_pPrinterGfx->DrawRect (Rectangle(Point(nX, nY), Size(nDX, nDY)));
}
-void PspGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint *pPtAry )
+void PspGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
m_pPrinterGfx->DrawPolyLine (nPoints, (Point*)pPtAry);
}
-void PspGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry )
+void PspGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
// Point must be equal to SalPoint! see vcl/inc/salgtype.hxx
m_pPrinterGfx->DrawPolygon (nPoints, (Point*)pPtAry);
}
-void PspGraphics::drawPolyPolygon( sal_uInt32 nPoly,
- const sal_uInt32 *pPoints,
- PCONSTSALPOINT *pPtAry )
+void PspGraphics::drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry )
{
m_pPrinterGfx->DrawPolyPolygon (nPoly, pPoints, (const Point**)pPtAry);
}
@@ -364,13 +362,13 @@ bool PspGraphics::drawPolyLine(
return false;
}
-sal_Bool PspGraphics::drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
+sal_Bool PspGraphics::drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
{
m_pPrinterGfx->DrawPolyLineBezier (nPoints, (Point*)pPtAry, pFlgAry);
return sal_True;
}
-sal_Bool PspGraphics::drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
+sal_Bool PspGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
{
m_pPrinterGfx->DrawPolygonBezier (nPoints, (Point*)pPtAry, pFlgAry);
return sal_True;
@@ -392,7 +390,7 @@ bool PspGraphics::drawPolyPolygon( const
return false;
}
-void PspGraphics::invert( sal_uLong /*nPoints*/,
+void PspGraphics::invert( sal_uInt32 /*nPoints*/,
const SalPoint* /*pPtAry*/,
SalInvert /*nFlags*/ )
{
Modified: openoffice/branches/rejuvenate01/main/vcl/unx/headless/svppspgraphics.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/unx/headless/svppspgraphics.hxx?rev=1551890&r1=1551889&r2=1551890&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/unx/headless/svppspgraphics.hxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/unx/headless/svppspgraphics.hxx Wed Dec 18 09:29:52 2013
@@ -139,8 +139,8 @@ public:
virtual void drawPixel( long nX, long nY, SalColor nSalColor );
virtual void drawLine( long nX1, long nY1, long nX2, long nY2 );
virtual void drawRect( long nX, long nY, long nWidth, long nHeight );
- virtual void drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry );
- virtual void drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry );
+ virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry );
+ virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry );
virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
virtual bool drawPolyLine(
const ::basegfx::B2DPolygon&,
@@ -151,10 +151,10 @@ public:
virtual void drawPolyPolygon( sal_uInt32 nPoly,
const sal_uInt32* pPoints,
PCONSTSALPOINT* pPtAry );
- virtual sal_Bool drawPolyLineBezier( sal_uLong nPoints,
+ virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints,
const SalPoint* pPtAry,
const sal_uInt8* pFlgAry );
- virtual sal_Bool drawPolygonBezier( sal_uLong nPoints,
+ virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints,
const SalPoint* pPtAry,
const sal_uInt8* pFlgAry );
virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly,
@@ -185,7 +185,7 @@ public:
virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight );
virtual SalColor getPixel( long nX, long nY );
virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags );
- virtual void invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags );
+ virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags );
virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize );
virtual bool filterText( const String& rOrigText, String& rNewText, xub_StrLen nIndex, xub_StrLen& rLen, xub_StrLen& rCutStart, xub_StrLen& rCutStop );
Modified: openoffice/branches/rejuvenate01/main/vcl/win/source/gdi/salgdi.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/win/source/gdi/salgdi.cxx?rev=1551890&r1=1551889&r2=1551890&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/win/source/gdi/salgdi.cxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/win/source/gdi/salgdi.cxx Wed Dec 18 09:29:52 2013
@@ -791,7 +791,7 @@ WinSalGraphics::~WinSalGraphics()
// -----------------------------------------------------------------------
-void WinSalGraphics::GetResolution( long& rDPIX, long& rDPIY )
+void WinSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY )
{
rDPIX = GetDeviceCaps( getHDC(), LOGPIXELSX );
rDPIY = GetDeviceCaps( getHDC(), LOGPIXELSY );
@@ -1409,7 +1409,7 @@ void WinSalGraphics::drawRect( long nX,
// -----------------------------------------------------------------------
-void WinSalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry )
+void WinSalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
// Unter NT koennen wir das Array direkt weiterreichen
DBG_ASSERT( sizeof( POINT ) == sizeof( SalPoint ),
@@ -1424,7 +1424,7 @@ void WinSalGraphics::drawPolyLine( sal_u
// -----------------------------------------------------------------------
-void WinSalGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry )
+void WinSalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
// Unter NT koennen wir das Array direkt weiterreichen
DBG_ASSERT( sizeof( POINT ) == sizeof( SalPoint ),
@@ -1512,7 +1512,7 @@ void WinSalGraphics::drawPolyPolygon( sa
// -----------------------------------------------------------------------
-sal_Bool WinSalGraphics::drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry )
+sal_Bool WinSalGraphics::drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry )
{
#ifdef USE_GDI_BEZIERS
// Unter NT koennen wir das Array direkt weiterreichen
@@ -1529,7 +1529,7 @@ sal_Bool WinSalGraphics::drawPolyLineBez
// -----------------------------------------------------------------------
-sal_Bool WinSalGraphics::drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry )
+sal_Bool WinSalGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry )
{
#ifdef USE_GDI_BEZIERS
// Unter NT koennen wir das Array direkt weiterreichen
Modified: openoffice/branches/rejuvenate01/main/vcl/win/source/gdi/salgdi2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/win/source/gdi/salgdi2.cxx?rev=1551890&r1=1551889&r2=1551890&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/win/source/gdi/salgdi2.cxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/win/source/gdi/salgdi2.cxx Wed Dec 18 09:29:52 2013
@@ -777,7 +777,7 @@ void WinSalGraphics::invert( long nX, lo
// -----------------------------------------------------------------------
-void WinSalGraphics::invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nSalFlags )
+void WinSalGraphics::invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nSalFlags )
{
HPEN hPen;
HPEN hOldPen;
Propchange: openoffice/branches/rejuvenate01/test/
------------------------------------------------------------------------------
Merged /openoffice/trunk/test:r1551246-1551885
Modified: openoffice/branches/rejuvenate01/test/testcommon/source/org/openoffice/test/common/XMLReporter.java
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/test/testcommon/source/org/openoffice/test/common/XMLReporter.java?rev=1551890&r1=1551889&r2=1551890&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/test/testcommon/source/org/openoffice/test/common/XMLReporter.java (original)
+++ openoffice/branches/rejuvenate01/test/testcommon/source/org/openoffice/test/common/XMLReporter.java Wed Dec 18 09:29:52 2013
@@ -64,6 +64,7 @@ public class XMLReporter extends RunList
private long ignored = 0;
+ private long runStart = 0;
private long testStart = 0;
@Override
@@ -139,6 +140,7 @@ public class XMLReporter extends RunList
public void testRunStarted(Description description) throws Exception {
suiteName = description.getDisplayName();
FileUtil.deleteFile(outputDir);//clear all old output
+ runStart = System.currentTimeMillis();
startSuite();
}
@@ -191,8 +193,15 @@ public class XMLReporter extends RunList
props.appendChild(prop);
}
- SimpleDateFormat dateFormat = new SimpleDateFormat( "yyyy-MM-dd HH-mm-ss");
- System.setProperty( "info.test.date", dateFormat.format( new Date()));
+ SimpleDateFormat dateFormat = new SimpleDateFormat( "yyyy/MM/dd HH:mm:ss");
+ String aRunStartStr = dateFormat.format( new Date( runStart));
+ long nRunEnd = System.currentTimeMillis();
+ String aRunEndStr = dateFormat.format( new Date( nRunEnd));
+ double fDuration = (nRunEnd - runStart) / 1000.0;
+ if( fDuration < 20*3600e3) // strip the end date if it is obvious
+ aRunEndStr = aRunEndStr.substring( 11);
+ String aTestTimeStr = String.format( "From %s to %s (%.1f secs)", aRunStartStr, aRunEndStr, fDuration);
+ System.setProperty( "info.test.date", aTestTimeStr);
FileUtil.storeXML(doc, file);
File htmlFile = new File(outputDir, "result.html");