You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by st...@apache.org on 2013/02/01 09:46:35 UTC
svn commit: r1441343 [26/35] - in /openoffice/branches/ia2: ./
ext_libraries/apr-util/ ext_libraries/apr/ ext_sources/
extras/l10n/source/ast/ extras/l10n/source/da/ extras/l10n/source/eu/
extras/l10n/source/gd/ extras/l10n/source/ko/ extras/l10n/sourc...
Modified: openoffice/branches/ia2/main/shell/source/cmdmail/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/shell/source/cmdmail/makefile.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/shell/source/cmdmail/makefile.mk (original)
+++ openoffice/branches/ia2/main/shell/source/cmdmail/makefile.mk Fri Feb 1 08:46:00 2013
@@ -37,7 +37,7 @@ COMP1TYPELIST=$(TARGET)
DLLPRE=
SLOFILES= \
- $(SLO)$/cmdmailsuppl.obj \
+ $(SLO)$/syscmdmail.obj \
$(SLO)$/cmdmailmsg.obj \
$(SLO)$/cmdmailentry.obj
SHL1OBJS=$(SLOFILES)
Modified: openoffice/branches/ia2/main/shell/source/unix/sysshell/recently_used_file_handler.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/shell/source/unix/sysshell/recently_used_file_handler.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/shell/source/unix/sysshell/recently_used_file_handler.cxx (original)
+++ openoffice/branches/ia2/main/shell/source/unix/sysshell/recently_used_file_handler.cxx Fri Feb 1 08:46:00 2013
@@ -405,7 +405,7 @@ namespace /* private */ {
};
//------------------------------------------------
- const char* GROUP_OOO = "openoffice.org";
+ const char* GROUP_OOO = "apacheopenoffice";
const char* GROUP_STAR_OFFICE = "staroffice";
const char* GROUP_STAR_SUITE = "starsuite";
Modified: openoffice/branches/ia2/main/shell/source/win32/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/shell/source/win32/makefile.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/shell/source/win32/makefile.mk (original)
+++ openoffice/branches/ia2/main/shell/source/win32/makefile.mk Fri Feb 1 08:46:00 2013
@@ -61,7 +61,7 @@ DEF1EXPORTFILE= exports.dxp
.INCLUDE : target.mk
INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
+
ALLTAR : $(MISC)/syssh.component
Modified: openoffice/branches/ia2/main/shell/source/win32/shlxthandler/columninfo/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/shell/source/win32/shlxthandler/columninfo/makefile.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/shell/source/win32/shlxthandler/columninfo/makefile.mk (original)
+++ openoffice/branches/ia2/main/shell/source/win32/shlxthandler/columninfo/makefile.mk Fri Feb 1 08:46:00 2013
@@ -51,5 +51,5 @@ SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
.INCLUDE : set_wntx64.mk
.INCLUDE : target.mk
INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
-.INCLUDE : tg_wntx64.mk
\ No newline at end of file
+
+.INCLUDE : tg_wntx64.mk
Modified: openoffice/branches/ia2/main/shell/source/win32/shlxthandler/infotips/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/shell/source/win32/shlxthandler/infotips/makefile.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/shell/source/win32/shlxthandler/infotips/makefile.mk (original)
+++ openoffice/branches/ia2/main/shell/source/win32/shlxthandler/infotips/makefile.mk Fri Feb 1 08:46:00 2013
@@ -52,5 +52,5 @@ SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
.INCLUDE : set_wntx64.mk
.INCLUDE : target.mk
INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
-.INCLUDE : tg_wntx64.mk
\ No newline at end of file
+
+.INCLUDE : tg_wntx64.mk
Modified: openoffice/branches/ia2/main/shell/source/win32/shlxthandler/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/shell/source/win32/shlxthandler/makefile.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/shell/source/win32/shlxthandler/makefile.mk (original)
+++ openoffice/branches/ia2/main/shell/source/win32/shlxthandler/makefile.mk Fri Feb 1 08:46:00 2013
@@ -148,6 +148,6 @@ DEF1EXPORTFILE_X64=exports.dxp
.INCLUDE : set_wntx64.mk
.INCLUDE : target.mk
INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
+
.INCLUDE : tg_wntx64.mk
Modified: openoffice/branches/ia2/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk (original)
+++ openoffice/branches/ia2/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk Fri Feb 1 08:46:00 2013
@@ -133,5 +133,5 @@ DEF1EXPORTFILE_X64=exports.dxp
.INCLUDE : set_wntx64.mk
.INCLUDE : target.mk
INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
+
.INCLUDE : tg_wntx64.mk
Modified: openoffice/branches/ia2/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx (original)
+++ openoffice/branches/ia2/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx Fri Feb 1 08:46:00 2013
@@ -1197,7 +1197,7 @@ namespace /* private */
std::string ClsidEntry = CLSID_GUID_ENTRY;
SubstitutePlaceholder(ClsidEntry, GUID_PLACEHOLDER, ClsidToString(FilterGuid));
- if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry.c_str(), "", "OpenOffice.org Filter"))
+ if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry.c_str(), "", "OpenOffice.org XML Filter"))
return E_FAIL;
ClsidEntry = CLSID_GUID_INPROC_ENTRY;
@@ -1225,7 +1225,7 @@ namespace /* private */
SubstitutePlaceholder(ClsidEntry_Persist, GUID_PLACEHOLDER, ClsidToString(PersistentGuid));
- if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry_Persist.c_str(), "", "OpenOffice.org Persistent Handler"))
+ if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry_Persist.c_str(), "", "Apache OpenOffice Persistent Handler"))
return E_FAIL;
// Add missing entry
Modified: openoffice/branches/ia2/main/shell/source/win32/shlxthandler/prophdl/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/shell/source/win32/shlxthandler/prophdl/makefile.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/shell/source/win32/shlxthandler/prophdl/makefile.mk (original)
+++ openoffice/branches/ia2/main/shell/source/win32/shlxthandler/prophdl/makefile.mk Fri Feb 1 08:46:00 2013
@@ -134,5 +134,5 @@ DEF1EXPORTFILE_X64=exports.dxp
.INCLUDE : set_wntx64.mk
.INCLUDE : target.mk
INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
+
.INCLUDE : tg_wntx64.mk
Modified: openoffice/branches/ia2/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx (original)
+++ openoffice/branches/ia2/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx Fri Feb 1 08:46:00 2013
@@ -56,11 +56,11 @@ struct PROPERTYMAP
PROPERTYMAP g_rgPROPERTYMAP[] =
{
- { PKEY_Title, L"OpenOffice.org", L"Title" },
- { PKEY_Author, L"OpenOffice.org", L"Author" },
- { PKEY_Subject, L"OpenOffice.org", L"Subject" },
- { PKEY_Keywords, L"OpenOffice.org", L"Keyword" },
- { PKEY_Comment, L"OpenOffice.org", L"Comments" },
+ { PKEY_Title, L"Apache OpenOffice", L"Title" },
+ { PKEY_Author, L"Apache OpenOffice", L"Author" },
+ { PKEY_Subject, L"Apache OpenOffice", L"Subject" },
+ { PKEY_Keywords, L"Apache OpenOffice", L"Keyword" },
+ { PKEY_Comment, L"Apache OpenOffice", L"Comments" },
};
size_t gPropertyMapTableSize = sizeof(g_rgPROPERTYMAP)/sizeof(g_rgPROPERTYMAP[0]);
Modified: openoffice/branches/ia2/main/shell/source/win32/shlxthandler/propsheets/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/shell/source/win32/shlxthandler/propsheets/makefile.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/shell/source/win32/shlxthandler/propsheets/makefile.mk (original)
+++ openoffice/branches/ia2/main/shell/source/win32/shlxthandler/propsheets/makefile.mk Fri Feb 1 08:46:00 2013
@@ -57,5 +57,5 @@ SLOFILES_X64=$(SLO_X64)$/propsheets.obj\
.INCLUDE : set_wntx64.mk
.INCLUDE : target.mk
INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
-.INCLUDE : tg_wntx64.mk
\ No newline at end of file
+
+.INCLUDE : tg_wntx64.mk
Modified: openoffice/branches/ia2/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest (original)
+++ openoffice/branches/ia2/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest Fri Feb 1 08:46:00 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<assemblyIdentity version="1.0.0.0" processorArchitecture="x86" name="OpenOffice.shlxthdl" type="win32" />
-<description>OpenOffice Shell Extension</description>
+<assemblyIdentity version="1.0.0.0" processorArchitecture="x86" name="Apache_OpenOffice.shlxthdl" type="win32" />
+<description>Apache OpenOffice Shell Extension</description>
<dependency>
<dependentAssembly>
<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86"
Modified: openoffice/branches/ia2/main/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/shell/source/win32/shlxthandler/thumbviewer/makefile.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/shell/source/win32/shlxthandler/thumbviewer/makefile.mk (original)
+++ openoffice/branches/ia2/main/shell/source/win32/shlxthandler/thumbviewer/makefile.mk Fri Feb 1 08:46:00 2013
@@ -53,6 +53,6 @@ SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
.INCLUDE : set_wntx64.mk
.INCLUDE : target.mk
INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
+
.INCLUDE : tg_wntx64.mk
Modified: openoffice/branches/ia2/main/shell/source/win32/shlxthandler/util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/shell/source/win32/shlxthandler/util/makefile.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/shell/source/win32/shlxthandler/util/makefile.mk (original)
+++ openoffice/branches/ia2/main/shell/source/win32/shlxthandler/util/makefile.mk Fri Feb 1 08:46:00 2013
@@ -59,6 +59,6 @@ SLOFILES_X64=$(SLO_X64)$/dbgmacros.obj\
.INCLUDE : set_wntx64.mk
.INCLUDE : target.mk
INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
+
.INCLUDE : tg_wntx64.mk
Modified: openoffice/branches/ia2/main/shell/source/win32/workbench/TestSmplMail.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/shell/source/win32/workbench/TestSmplMail.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/shell/source/win32/workbench/TestSmplMail.cxx (original)
+++ openoffice/branches/ia2/main/shell/source/win32/workbench/TestSmplMail.cxx Fri Feb 1 08:46:00 2013
@@ -30,7 +30,7 @@
//-----------------------------------------------------------
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/registry/XSimpleRegistry.hpp>
-#include <com/sun/star/system/XSimpleMailClientSupplier.hpp>
+#include <com/sun/star/system/XSystemMailProvider.hpp>
#include <cppuhelper/servicefactory.hxx>
#include <cppuhelper/servicefactory.hxx>
#include <rtl/ustring.hxx>
@@ -103,7 +103,7 @@ int SAL_CALL main(int , char*, char* )
try
{
- Reference< XSimpleMailClientSupplier > xSmplMailClientSuppl(
+ Reference< XSystemMailProvider > xSmplMailClientSuppl(
g_xFactory->createInstance( OUString::createFromAscii( "com.sun.star.system.SimpleSystemMail" ) ), UNO_QUERY );
if ( !xSmplMailClientSuppl.is() )
@@ -112,13 +112,13 @@ int SAL_CALL main(int , char*, char* )
return(-1);
}
- Reference< XSimpleMailClient > xSmplMailClient(
- xSmplMailClientSuppl->querySimpleMailClient( ) );
+ Reference< XMailClient > xSmplMailClient(
+ xSmplMailClientSuppl->queryMailClient( ) );
if ( xSmplMailClient.is( ) )
{
- Reference< XSimpleMailMessage > xSmplMailMsg(
- xSmplMailClient->createSimpleMailMessage( ) );
+ Reference< XMailMessage > xSmplMailMsg(
+ xSmplMailClient->createMailMessage( ) );
if ( xSmplMailMsg.is( ) )
{
@@ -152,7 +152,7 @@ int SAL_CALL main(int , char*, char* )
xSmplMailMsg->setAttachement( attachements );
- xSmplMailClient->sendSimpleMailMessage( xSmplMailMsg, 0 );
+ xSmplMailClient->sendMailMessage( xSmplMailMsg, 0 );
}
}
}
Modified: openoffice/branches/ia2/main/shell/source/win32/workbench/TestSysShExec.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/shell/source/win32/workbench/TestSysShExec.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/shell/source/win32/workbench/TestSysShExec.cxx (original)
+++ openoffice/branches/ia2/main/shell/source/win32/workbench/TestSysShExec.cxx Fri Feb 1 08:46:00 2013
@@ -30,10 +30,7 @@
//-----------------------------------------------------------
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/registry/XSimpleRegistry.hpp>
-
-#ifndef _COM_SUN_STAR_SYS_SHELL_XSYSTEMSHELLEXECUTE_HPP_
#include <com/sun/star/system/XSystemShellExecute.hpp>
-#endif
#include <cppuhelper/servicefactory.hxx>
Modified: openoffice/branches/ia2/main/shell/source/win32/workbench/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/shell/source/win32/workbench/makefile.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/shell/source/win32/workbench/makefile.mk (original)
+++ openoffice/branches/ia2/main/shell/source/win32/workbench/makefile.mk Fri Feb 1 08:46:00 2013
@@ -41,7 +41,6 @@ CFLAGS+=/GX
OBJFILES1=$(OBJ)$/TestSysShExec.obj
OBJFILES2=$(OBJ)$/TestSmplMail.obj
-OBJFILES3=$(OBJ)$/TestProxySet.obj
OBJFILES4=$(OBJ)$/Testfopen.obj
OBJFILES=$(OBJFILES1)\
@@ -70,17 +69,6 @@ APP2STDLIBS+= $(CPPULIB) \
APP2DEF= $(MISC)$/$(APP2TARGET).def
-# --- TestProxy ---
-
-APP3TARGET=$(TARGET2)
-APP3OBJS=$(OBJFILES3)
-
-APP3STDLIBS+= $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(SALLIB)
-
-APP3DEF= $(MISC)$/$(APP3TARGET).def
-
# --- Testfopen ---
APP4TARGET=$(TARGET4)
Modified: openoffice/branches/ia2/main/solenv/bin/cwstouched.py
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/solenv/bin/cwstouched.py?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/solenv/bin/cwstouched.py (original)
+++ openoffice/branches/ia2/main/solenv/bin/cwstouched.py Fri Feb 1 08:46:00 2013
@@ -103,4 +103,4 @@ for outline in output.readlines():
modules.append(newModule)
for module in modules:
- print module
+ print(module)
Modified: openoffice/branches/ia2/main/solenv/bin/modules/installer/download.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/solenv/bin/modules/installer/download.pm?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/solenv/bin/modules/installer/download.pm (original)
+++ openoffice/branches/ia2/main/solenv/bin/modules/installer/download.pm Fri Feb 1 08:46:00 2013
@@ -461,21 +461,44 @@ sub get_downloadname_language
sub get_downloadname_productname
{
- my ($allvariables) = @_;
-
- my $start = "Apache_OpenOffice";
-
- if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) { $start .= ""; }
-
- if ( $allvariables->{'PRODUCTNAME'} eq "OOo-dev" ) { $start .= "-Dev"; }
-
- if (( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start .= "-SDK"; }
+ my ($allvariables) = @_;
- if (( $allvariables->{'PRODUCTNAME'} eq "OOo-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start .= "-Dev-SDK"; }
+ my $start;
- if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start .= "-URE"; }
+ if ( $allvariables->{'AOODOWNLOADNAMEPREFIX'} )
+ {
+ $start = $allvariables->{'AOODOWNLOADNAMEPREFIX'};
+ }
+ else
+ {
+ $start = "Apache_OpenOffice";
+ if ( $allvariables->{'PRODUCTNAME'} eq "Apache OpenOffice" )
+ {
+ if ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )
+ {
+ $start .= "-SDK";
+ }
+ }
+
+ if ( $allvariables->{'PRODUCTNAME'} eq "AOO-Developer-Build" )
+ {
+ if ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )
+ {
+ $start .= "-Dev-SDK";
+ }
+ else
+ {
+ $start .= "-Dev";
+ }
+ }
+
+ if ( $allvariables->{'PRODUCTNAME'} eq "URE" )
+ {
+ $start .= "-URE";
+ }
+ }
- return $start;
+ return $start;
}
#########################################################
@@ -1968,8 +1991,14 @@ sub create_download_sets
# evaluating the name of the download file
- if ( $allvariableshashref->{'OOODOWNLOADNAME'} ) { $downloadname = set_download_filename($languagestringref, $allvariableshashref); }
- else { $downloadname = resolve_variables_in_downloadname($allvariableshashref, $downloadname, $languagestringref); }
+ if ( $allvariableshashref->{'AOODOWNLOADNAME'} )
+ {
+ $downloadname = set_download_filename($languagestringref, $allvariableshashref);
+ }
+ else
+ {
+ $downloadname = resolve_variables_in_downloadname($allvariableshashref, $downloadname, $languagestringref);
+ }
if ( ! $installer::globals::iswindowsbuild ) # Unix specific part
{
@@ -1978,7 +2007,7 @@ sub create_download_sets
my $getuidlibrary = "";
if (( $installer::globals::issolarisbuild ) || ( $installer::globals::islinuxbuild )) { $getuidlibrary = get_path_for_library($includepatharrayref); }
- if ( $allvariableshashref->{'OOODOWNLOADNAME'} )
+ if ( $allvariableshashref->{'AOODOWNLOADNAME'} )
{
my $downloadfile = create_tar_gz_file_from_directory($installationdir, $getuidlibrary, $downloaddir, $downloadname);
}
Modified: openoffice/branches/ia2/main/solenv/bin/modules/installer/epmfile.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/solenv/bin/modules/installer/epmfile.pm?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/solenv/bin/modules/installer/epmfile.pm (original)
+++ openoffice/branches/ia2/main/solenv/bin/modules/installer/epmfile.pm Fri Feb 1 08:46:00 2013
@@ -326,11 +326,11 @@ sub create_epm_header
my $line = "";
my $infoline = "";
- # %product OpenOffice.org Software
+ # %product Apache OpenOffice Software
# %version 2.0
# %description A really great software
# %copyright 1999-2003 by OOo
- # %vendor OpenOffice.org
+ # %vendor Apache OpenOffice project
# %license /test/replace/01/LICENSE01
# %readme /test/replace/01/README01
# %requires foo
@@ -492,7 +492,7 @@ sub create_epm_header
{
# refer to the license in the matching AOO installation
# TODO: sync AOO dest license full path with lpacks/sdks/exts
- my $licpath = "openoffice.org3/program/" . $licensefilename;
+ my $licpath = "apacheopenoffice3/program/" . $licensefilename;
$foundlicensefile = 1;
$line = "%license " . $licpath . "\n";
push(@epmheader, $line);
@@ -550,7 +550,7 @@ sub create_epm_header
}
}
- if ( $installer::globals::debian && $variableshashref->{'UNIXPRODUCTNAME'} eq 'openoffice.org' )
+ if ( $installer::globals::debian && $variableshashref->{'UNIXPRODUCTNAME'} eq 'apache openoffice' )
{
$line = "%provides" . " openoffice.org-unbundled\n";
push(@epmheader, $line);
Modified: openoffice/branches/ia2/main/solenv/bin/modules/installer/simplepackage.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/solenv/bin/modules/installer/simplepackage.pm?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/solenv/bin/modules/installer/simplepackage.pm (original)
+++ openoffice/branches/ia2/main/solenv/bin/modules/installer/simplepackage.pm Fri Feb 1 08:46:00 2013
@@ -333,7 +333,10 @@ sub replace_variables_in_scriptfile
replace_one_variable_in_shellscript($scriptfile, $allvariables->{'PRODUCTVERSION'}, "PRODUCTVERSION" );
my $scriptname = lc($allvariables->{'PRODUCTNAME'}) . "\.script";
- if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) { $scriptname = "org.openoffice.script"; }
+ if ( $allvariables->{'PRODUCTNAME'} eq "Apache OpenOffice" )
+ {
+ $scriptname = "org.openoffice.script";
+ }
replace_one_variable_in_shellscript($scriptfile, $scriptname, "SEARCHSCRIPTNAME" );
}
@@ -616,7 +619,7 @@ sub create_simple_package
my $locallanguage = $installer::globals::csp_languagestring;
- if ( $allvariables->{'OOODOWNLOADNAME'} )
+ if ( $allvariables->{'AOODOWNLOADNAME'} )
{
$packagename = installer::download::set_download_filename(\$locallanguage, $allvariables);
}
Modified: openoffice/branches/ia2/main/solenv/bin/modules/installer/windows/msp.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/solenv/bin/modules/installer/windows/msp.pm?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/solenv/bin/modules/installer/windows/msp.pm (original)
+++ openoffice/branches/ia2/main/solenv/bin/modules/installer/windows/msp.pm Fri Feb 1 08:46:00 2013
@@ -884,7 +884,7 @@ sub change_patchmetadata_table
if ( $allvariables->{'PROPERTYTABLEPRODUCTNAME'} ) { $targetproductnamevalue = $allvariables->{'PROPERTYTABLEPRODUCTNAME'}; }
my $manufacturerstring = "ManufacturerName";
- my $manufacturervalue = "OpenOffice.org";
+ my $manufacturervalue = "Apache OpenOffice";
if ( $installer::globals::longmanufacturer ) { $manufacturervalue = $installer::globals::longmanufacturer; }
my $displaynamestring = "DisplayName";
Modified: openoffice/branches/ia2/main/solenv/bin/modules/installer/ziplist.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/solenv/bin/modules/installer/ziplist.pm?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/solenv/bin/modules/installer/ziplist.pm (original)
+++ openoffice/branches/ia2/main/solenv/bin/modules/installer/ziplist.pm Fri Feb 1 08:46:00 2013
@@ -639,7 +639,7 @@ sub set_manufacturer
{
my ($allvariables) = @_;
- my $openofficeproductname = "OpenOffice.org";
+ my $openofficeproductname = "Apache OpenOffice";
my $sunname = "";
@@ -674,13 +674,6 @@ sub set_default_productversion_if_requir
{
$allvariables->{'PRODUCTVERSION'} = 1; # FAKE
}
-
- # Creating differentiators for BUILD_SPECIAL in layering
- if ( ! $ENV{'BUILD_SPECIAL'} )
- {
- if ( $allvariables->{'REGISTRYLAYERNAME'} ) { $allvariables->{'REGISTRYLAYERNAME'} = $allvariables->{'REGISTRYLAYERNAME'} . "_"; }
- if (( $installer::globals::iswindowsbuild ) && ( $allvariables->{'BASISROOTNAME'} )) { $allvariables->{'BASISROOTNAME'} = $allvariables->{'BASISROOTNAME'} . "_"; }
- }
}
####################################################
Modified: openoffice/branches/ia2/main/solenv/bin/pchdelta.py
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/solenv/bin/pchdelta.py?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/solenv/bin/pchdelta.py (original)
+++ openoffice/branches/ia2/main/solenv/bin/pchdelta.py Fri Feb 1 08:46:00 2013
@@ -101,7 +101,7 @@ def binaryTest(dirlist, lines, pchname,
# Reject one liners
if linecount == 1:
- print indent + "Rejected: " + lines[0]
+ print(indent + "Rejected: " + lines[0])
return acceptedlines
# Recurse with multiline slices
@@ -117,7 +117,7 @@ def binaryTest(dirlist, lines, pchname,
if (splitend - splitstart) == 0:
continue
splitslice = lines[splitstart:splitend]
- print indent + "[" + str(startpoint + splitstart) + ":" + str(startpoint + splitend) + "] (" + str(splitend - splitstart) + ")"
+ print(indent + "[" + str(startpoint + splitstart) + ":" + str(startpoint + splitend) + "] (" + str(splitend - splitstart) + ")")
acceptedlines = binaryTest(dirlist, splitslice, pchname, header, footer, acceptedlines, indent + " ", startpoint + splitstart)
splitstart = splitend
@@ -127,7 +127,7 @@ def binaryTest(dirlist, lines, pchname,
# Main entry point
if len(sys.argv) < 3:
- print "Usage: " + sys.argv[0] + " <pch_target> <dir1> [<dir2> <dir3> ...]"
+ print("Usage: " + sys.argv[0] + " <pch_target> <dir1> [<dir2> <dir3> ...]")
sys.exit(1)
pchname = os.path.abspath(sys.argv[1])
@@ -139,7 +139,7 @@ if os.path.exists("buildlog.txt"):
# test for corner case of everything working from the start
if testSequenceBuild(dirlist):
- print "pch working, nothing to do."
+ print("pch working, nothing to do.")
sys.exit(0)
# Open the header file for reading
@@ -158,10 +158,10 @@ writePch(pchname + "_backup", header, fo
writePch(pchname, header, footer, [], [])
if not testSequenceBuild(dirlist):
writePch(pchname, header, footer, lines, [])
- print "Building with no candidate lines failed. Convergence questionable, aborting."
+ print("Building with no candidate lines failed. Convergence questionable, aborting.")
sys.exit(0)
# Starting pruning
-print "Starting evaluation of " + str(len(lines)) + " lines"
+print("Starting evaluation of " + str(len(lines)) + " lines")
acceptedlines = binaryTest(dirlist, lines, pchname, header, footer, [], "", 0)
writePch(pchname, header, footer, acceptedlines, [])
Modified: openoffice/branches/ia2/main/solenv/bin/srcrelease.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/solenv/bin/srcrelease.xml?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/solenv/bin/srcrelease.xml (original)
+++ openoffice/branches/ia2/main/solenv/bin/srcrelease.xml Fri Feb 1 08:46:00 2013
@@ -21,23 +21,35 @@
***********************************************************-->
<project name="Apache OpenOffice" basedir="." default="pack">
+ <property environment="env"/>
+ <property name="getrevision.script" value="${env.SOLARENV}/bin/getrevision.pl"/>
+
<property name="out.dir" value="."/>
<property name="aoo.name" value="aoo"/>
- <property name="aoo.ver" value="3.5.0"/>
- <property name="release.dir.name" value="${aoo.name}-${aoo.ver}"/>
- <property name="release.file.name" value="${release.dir.name}-src"/>
- <property name="release.zip" value="${out.dir}/${release.file.name}.zip"/>
- <property name="release.tar" value="${out.dir}/${release.file.name}.tar"/>
- <property name="release.tar.gz" value="${out.dir}/${release.file.name}.tar.gz"/>
- <property name="release.tar.bz2" value="${out.dir}/${release.file.name}.tar.bz2"/>
-
+ <property name="aoo.ver" value="4.0.0"/>
+
<property name="excludes.list" value="configure, moz/zipped/*.zip, **/.svn **/.gitignore, **/.git, warn, set_soenv, solver/**, makefile.mk, config.log, config.parms, config.status, bootstrap, autom4te.cache/**, MacOSXX86Env.*, external/unowinreg/unowinreg.dll" />
<property name="excludes.executables" value="solenv/bin/macosx-create-bundle, solenv/bin/linkoo, solenv/bin/localize, solenv/bin/createpdbrelocators, solenv/bin/langwrap, solenv/bin/makedepn, solenv/bin/packmodule, solenv/bin/rpm-wrapper, solenv/bin/relocate, solenv/bin/receditor, solenv/bin/subsequenttests, **/*.sh, **/*.bat, **/*.exe, configure.cmd, oowintool, config.sub, config.guess, **/*.pl"/>
<property name="includes.mk" value="inc/unxmac*.mk inc/unxlng*.mk inc/wntmsci*.mk inc/unxsol*.mk" />
<property name="excludes.outdirs" value="**/unxmacx*/**, **/unxlng*/**, **/unxsol*/**, **/wntmsci*/**" />
- <target name="clean">
+ <target name="getrevision">
+ <exec executable="perl" outputproperty="scm.revision">
+ <arg value="${getrevision.script}" />
+ </exec>
+ </target>
+
+ <target name="declarenames" depends="getrevision">
+ <property name="release.dir.name" value="${aoo.name}-${aoo.ver}"/>
+ <property name="release.file.name" value="${release.dir.name}-r${scm.revision}-src"/>
+ <property name="release.zip" value="${out.dir}/${release.file.name}.zip"/>
+ <property name="release.tar" value="${out.dir}/${release.file.name}.tar"/>
+ <property name="release.tar.gz" value="${out.dir}/${release.file.name}.tar.gz"/>
+ <property name="release.tar.bz2" value="${out.dir}/${release.file.name}.tar.bz2"/>
+ </target>
+
+ <target name="clean" depends="declarenames">
<echo level="verbose" message="### clean output files:"/>
<delete file="${release.zip}" verbose="true"/>
<delete file="${release.tar}" verbose="true"/>
@@ -45,7 +57,7 @@
<delete file="${release.tar.bz2}" verbose="true"/>
</target>
- <target name="source.zip">
+ <target name="source.zip" depends="declarenames">
<echo level="verbose" message="### creating ${release.zip} ..."/>
<echo level="verbose" message="### basedir=${basedir}"/>
<echo level="verbose" message="### source.root=${source.root}"/>
@@ -65,7 +77,7 @@
<echo level="verbose" message=" ... DONE"/>
</target>
- <target name="source.tar">
+ <target name="source.tar" depends="declarenames">
<echo level="verbose" message="### creating intermediate ${release.tar} ..."/>
<tar destfile="${release.tar}" longfile="gnu">
<tarfileset file="main/NOTICE" fullpath="${release.dir.name}/NOTICE"/>
@@ -93,13 +105,6 @@
<echo level="verbose" message=" ... DONE"/>
</target>
- <target name="dummy">
- <zip destfile="${release.zip}">
- <zipfileset file="main/NOTICE" fullpath="${release.dir.name}/NOTICE"/>
- <zipfileset file="main/LICENSE" fullpath="${release.dir.name}/LICENSE"/>
- </zip>
- </target>
-
<target name="pack" depends="clean,source.zip,source.tar.gz,source.tar.bz2">
<echo level="info" message="### Create source release files for Apache OpenOffice ${aoo.ver} ..."/>
</target>
Modified: openoffice/branches/ia2/main/solenv/inc/found_no.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/solenv/inc/found_no.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/solenv/inc/found_no.mk (original)
+++ openoffice/branches/ia2/main/solenv/inc/found_no.mk Fri Feb 1 08:46:00 2013
@@ -18,7 +18,7 @@
# under the License.
#
# *************************************************************
-no_traget:
+no_target:
@echo -----------------------------------------------
@echo Error: No makefile.mk found!
@echo -----------------------------------------------
Modified: openoffice/branches/ia2/main/solenv/inc/rules.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/solenv/inc/rules.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/solenv/inc/rules.mk (original)
+++ openoffice/branches/ia2/main/solenv/inc/rules.mk Fri Feb 1 08:46:00 2013
@@ -88,31 +88,12 @@ $(OBJ)/%.obj : %.cc
.ENDIF
.IF "$(ENABLE_PCH)"!=""
-# workaround for file locking problems on network volumes
-.IF "$(NETWORK_BUILD)"==""
PCHOUTDIR=$(SLO)/pch
PCHEXOUTDIR=$(SLO)/pch_ex
-.ELSE # "$(NETWORK_BUILD)"==""
-PCHOUTDIR=$(TMP)/$(BUILD)$(CWS_WORK_STAMP)$(PRJNAME)$(PROEXT)
-PCHEXOUTDIR=$(TMP)/$(BUILD)$(CWS_WORK_STAMP)$(PRJNAME)_ex$(PROEXT)
-.ENDIF # "$(NETWORK_BUILD)"==""
$(SLO)/precompiled.% .PHONY:
-$(MKDIRHIER) $(SLO)/pch
.IF "$(COM)"=="MSC"
-.IF "$(NETWORK_BUILD)"!=""
- -$(MKDIRHIER) $(PCHOUTDIR)
-.IF "$(HAVE_BIG_TMP)"==""
- $(COMMAND_ECHO)-$(COPY) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST)
-.ENDIF # "$(HAVE_BIG_TMP)"==""
-.ENDIF # "$(NETWORK_BUILD)"!=""
$(COMMAND_ECHO)$(CXX) @$(mktmp -Fp$(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx)
-.IF "$(NETWORK_BUILD)"!=""
- $(COMMAND_ECHO)$(COPY) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST)
-.IF "$(HAVE_BIG_TMP)"==""
- $(COMMAND_ECHO)$(RM) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST)
- $(COMMAND_ECHO)$(RMDIR) $(PCHOUTDIR)
-.ENDIF # "$(HAVE_BIG_TMP)"==""
-.ENDIF # "$(NETWORK_BUILD)"!=""
.ELIF "$(COM)"=="GCC" && "$(CCNUMVER)">="000300040000"
$(COMMAND_ECHO)$(CXX) -o$(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx
@echo "#error Tried to use wrong precompiled header" > $(SLO)/pch/precompiled_$(PRJNAME).hxx
@@ -124,20 +105,7 @@ $(SLO)/precompiled.% .PHONY:
$(SLO)/precompiled_ex.% .PHONY:
-$(MKDIRHIER) $(SLO)/pch_ex
.IF "$(COM)"=="MSC"
-.IF "$(NETWORK_BUILD)"!=""
- -$(MKDIRHIER) $(PCHEXOUTDIR)
-.IF "$(HAVE_BIG_TMP)"==""
- $(COMMAND_ECHO)-$(COPY) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST)
-.ENDIF # "$(HAVE_BIG_TMP)"==""
-.ENDIF # "$(NETWORK_BUILD)"!=""
$(COMMAND_ECHO)$(CXX) @$(mktmp -Fp$(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH:s/pchname/pchname_ex/) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx)
-.IF "$(NETWORK_BUILD)"!=""
- $(COMMAND_ECHO)$(COPY) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST)
-.IF "$(HAVE_BIG_TMP)"==""
- $(COMMAND_ECHO)$(RM) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST)
- $(COMMAND_ECHO)$(RMDIR) $(PCHEXOUTDIR)
-.ENDIF # "$(HAVE_BIG_TMP)"==""
-.ENDIF # "$(NETWORK_BUILD)"!=""
.ELIF "$(COM)"=="GCC" && "$(CCNUMVER)">="000300040000"
$(COMMAND_ECHO)$(CXX) -o$(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx
@echo "#error Tried to use wrong precompiled header" > $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx
Modified: openoffice/branches/ia2/main/solenv/inc/settings.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/solenv/inc/settings.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/solenv/inc/settings.mk (original)
+++ openoffice/branches/ia2/main/solenv/inc/settings.mk Fri Feb 1 08:46:00 2013
@@ -38,12 +38,6 @@ force_dmake_to_error
ENABLE_PCH=TRUE
.ENDIF # "$(USE_PCH)"!=""
-.IF "$(ENABLE_PCH)"!="" && "$(BUILD_SPECIAL)"!=""
-.IF "$(SOLARSRC)"=="$(SRC_ROOT)"
-NETWORK_BUILD:=TRUE
-.ENDIF # "$(SOLARSRC)"=="$(SRC_ROOT)"
-.ENDIF # "$(ENABLE_PCH)"!="" && "$(BUILD_SPECIAL)"!=""
-
.INCLUDE : unitools.mk
.INCLUDE : minor.mk
Modified: openoffice/branches/ia2/main/sot/inc/sot/formats.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sot/inc/sot/formats.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sot/inc/sot/formats.hxx (original)
+++ openoffice/branches/ia2/main/sot/inc/sot/formats.hxx Fri Feb 1 08:46:00 2013
@@ -181,7 +181,8 @@
#define SOT_FORMATSTR_ID_STARMATH_8_TEMPLATE ((sal_uLong)138)
#define SOT_FORMATSTR_ID_STARBASE_8 ((sal_uLong)139)
#define SOT_FORMATSTR_ID_HC_GDIMETAFILE ((sal_uLong)140)
-#define SOT_FORMATSTR_ID_USER_END SOT_FORMATSTR_ID_HC_GDIMETAFILE
+#define SOT_FORMATSTR_ID_PNG ((sal_uLong)141)
+#define SOT_FORMATSTR_ID_USER_END SOT_FORMATSTR_ID_PNG
#endif // _SOT_FORMATS_HXX
Modified: openoffice/branches/ia2/main/sot/source/base/exchange.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sot/source/base/exchange.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sot/source/base/exchange.cxx (original)
+++ openoffice/branches/ia2/main/sot/source/base/exchange.cxx Fri Feb 1 08:46:00 2013
@@ -207,6 +207,7 @@ namespace
/*138 SOT_FORMATSTR_ID_STARMATH_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE_ASCII, "Math 8 Template", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
/*139 SOT_FORMATSTR_ID_STARBASE_8*/ { MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII, "StarBase 8", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
/*140 SOT_FORMAT_GDIMETAFILE*/ { "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"", "High Contrast GDIMetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+ /*141 SOT_FORMATSTR_ID_PNG*/ { "image/png", "Windows Bitmap", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
};
return &aInstance[0];
}
Modified: openoffice/branches/ia2/main/sot/source/base/formats.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sot/source/base/formats.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sot/source/base/formats.cxx (original)
+++ openoffice/branches/ia2/main/sot/source/base/formats.cxx Fri Feb 1 08:46:00 2013
@@ -1590,7 +1590,7 @@ sal_uInt16 SotExchange::GetExchangeActio
aVector.push_back( aFlavorEx );
- if( ( SOT_FORMATSTR_ID_BMP == aFlavorEx.mnSotId ) &&
+ if( (( SOT_FORMATSTR_ID_BMP == aFlavorEx.mnSotId ) || (SOT_FORMATSTR_ID_PNG == aFlavorEx.mnSotId)) &&
!IsFormatSupported( aVector, SOT_FORMAT_BITMAP ) )
{
if( SotExchange::GetFormatDataFlavor( SOT_FORMAT_BITMAP, aFlavorEx ) )
Modified: openoffice/branches/ia2/main/stlport/STLport-4.5.patch
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/stlport/STLport-4.5.patch?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/stlport/STLport-4.5.patch (original)
+++ openoffice/branches/ia2/main/stlport/STLport-4.5.patch Fri Feb 1 08:46:00 2013
@@ -684,143 +684,16 @@
__Named_exception(const string& __str)
--- misc/STLport-4.5/stlport/stl/_bvector.h 2001-05-30 05:45:41.000000000 +0200
+++ misc/build/STLport-4.5/stlport/stl/_bvector.h 2008-07-18 14:13:49.000000000 +0200
-@@ -34,7 +34,7 @@
+@@ -34,7 +34,9 @@
# include <stl/_vector.h>
# endif
--#define __WORD_BIT (int(CHAR_BIT*sizeof(unsigned int)))
-+#define ___WORD_BIT (int(CHAR_BIT*sizeof(unsigned int)))
++#ifndef __WORD_BIT
+ #define __WORD_BIT (int(CHAR_BIT*sizeof(unsigned int)))
++#endif
_STLP_BEGIN_NAMESPACE
-@@ -80,7 +80,7 @@
- unsigned int _M_offset;
-
- void _M_bump_up() {
-- if (_M_offset++ == __WORD_BIT - 1) {
-+ if (_M_offset++ == ___WORD_BIT - 1) {
- _M_offset = 0;
- ++_M_p;
- }
-@@ -88,7 +88,7 @@
-
- void _M_bump_down() {
- if (_M_offset-- == 0) {
-- _M_offset = __WORD_BIT - 1;
-+ _M_offset = ___WORD_BIT - 1;
- --_M_p;
- }
- }
-@@ -100,17 +100,17 @@
-
- void _M_advance (difference_type __i) {
- difference_type __n = __i + _M_offset;
-- _M_p += __n / __WORD_BIT;
-- __n = __n % __WORD_BIT;
-+ _M_p += __n / ___WORD_BIT;
-+ __n = __n % ___WORD_BIT;
- if (__n < 0) {
-- _M_offset = (unsigned int) __n + __WORD_BIT;
-+ _M_offset = (unsigned int) __n + ___WORD_BIT;
- --_M_p;
- } else
- _M_offset = (unsigned int) __n;
- }
-
- difference_type _M_subtract(const _Bit_iterator_base& __x) const {
-- return __WORD_BIT * (_M_p - __x._M_p) + _M_offset - __x._M_offset;
-+ return ___WORD_BIT * (_M_p - __x._M_p) + _M_offset - __x._M_offset;
- }
- };
-
-@@ -242,7 +242,7 @@
- protected:
-
- unsigned int* _M_bit_alloc(size_t __n)
-- { return _M_end_of_storage.allocate((__n + __WORD_BIT - 1)/__WORD_BIT); }
-+ { return _M_end_of_storage.allocate((__n + ___WORD_BIT - 1)/___WORD_BIT); }
- void _M_deallocate() {
- if (_M_start._M_p)
- _M_end_of_storage.deallocate(_M_start._M_p,
-@@ -341,7 +341,7 @@
-
- void _M_initialize(size_type __n) {
- unsigned int* __q = this->_M_bit_alloc(__n);
-- this->_M_end_of_storage._M_data = __q + (__n + __WORD_BIT - 1)/__WORD_BIT;
-+ this->_M_end_of_storage._M_data = __q + (__n + ___WORD_BIT - 1)/___WORD_BIT;
- this->_M_start = iterator(__q, 0);
- this->_M_finish = this->_M_start + difference_type(__n);
- }
-@@ -352,13 +352,13 @@
- ++this->_M_finish;
- }
- else {
-- size_type __len = size() ? 2 * size() : __WORD_BIT;
-+ size_type __len = size() ? 2 * size() : ___WORD_BIT;
- unsigned int* __q = this->_M_bit_alloc(__len);
- iterator __i = copy(begin(), __position, iterator(__q, 0));
- *__i++ = __x;
- this->_M_finish = copy(__position, end(), __i);
- this->_M_deallocate();
-- this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+ this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
- this->_M_start = iterator(__q, 0);
- }
- }
-@@ -411,7 +411,7 @@
- __i = copy(__first, __last, __i);
- this->_M_finish = copy(__position, end(), __i);
- this->_M_deallocate();
-- this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+ this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
- this->_M_start = iterator(__q, 0);
- }
- }
-@@ -609,7 +609,7 @@
- this->_M_finish = copy(begin(), end(), __z);
- this->_M_deallocate();
- this->_M_start = iterator(__q, 0);
-- this->_M_end_of_storage._M_data = __q + (__n + __WORD_BIT - 1)/__WORD_BIT;
-+ this->_M_end_of_storage._M_data = __q + (__n + ___WORD_BIT - 1)/___WORD_BIT;
- }
- }
-
-@@ -681,7 +681,7 @@
- __i = copy(__first, __last, __i);
- this->_M_finish = copy(__position, end(), __i);
- this->_M_deallocate();
-- this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+ this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
- this->_M_start = iterator(__q, 0);
- }
- }
-@@ -702,7 +702,7 @@
- __i = copy(__first, __last, __i);
- this->_M_finish = copy(__position, end(), __i);
- this->_M_deallocate();
-- this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+ this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
- this->_M_start = iterator(__q, 0);
- }
- }
-@@ -722,7 +722,7 @@
- fill_n(__i, __n, __x);
- this->_M_finish = copy(__position, end(), __i + difference_type(__n));
- this->_M_deallocate();
-- this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+ this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
- this->_M_start = iterator(__q, 0);
- }
- }
-@@ -799,7 +799,7 @@
- #undef __BVECTOR_QUALIFIED
- #undef __BVEC_TMPL_HEADER
-
--# undef __WORD_BIT
-+# undef ___WORD_BIT
-
- #endif /* _STLP_INTERNAL_BVECTOR_H */
-
--- misc/STLport-4.5/stlport/stl/_complex.h 2001-07-06 06:16:17.000000000 +0200
+++ misc/build/STLport-4.5/stlport/stl/_complex.h 2008-07-18 14:13:49.000000000 +0200
@@ -18,6 +18,10 @@
Modified: openoffice/branches/ia2/main/svgio/inc/svgio/svgreader/svgnode.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svgio/inc/svgio/svgreader/svgnode.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svgio/inc/svgio/svgreader/svgnode.hxx (original)
+++ openoffice/branches/ia2/main/svgio/inc/svgio/svgreader/svgnode.hxx Fri Feb 1 08:46:00 2013
@@ -59,6 +59,29 @@ namespace svgio
XmlSpace_preserve
};
+ // display property (see SVG 1.1. 11.5), not inheritable
+ enum Display // #121656#
+ {
+ Display_inline, // the default
+ Display_block,
+ Display_list_item,
+ Display_run_in,
+ Display_compact,
+ Display_marker,
+ Display_table,
+ Display_inline_table,
+ Display_table_row_group,
+ Display_table_header_group,
+ Display_table_footer_group,
+ Display_table_row,
+ Display_table_column_group,
+ Display_table_column,
+ Display_table_cell,
+ Display_table_caption,
+ Display_none,
+ Display_inherit
+ };
+
class SvgNode : private boost::noncopyable, public InfoProvider
{
private:
@@ -80,6 +103,9 @@ namespace svgio
/// XmlSpace value
XmlSpace maXmlSpace;
+ /// Display value #121656#
+ Display maDisplay;
+
/// CSS styles
SvgStyleAttributeVector maCssStyleVector;
@@ -122,6 +148,10 @@ namespace svgio
XmlSpace getXmlSpace() const;
void setXmlSpace(XmlSpace eXmlSpace = XmlSpace_notset) { maXmlSpace = eXmlSpace; }
+ /// Display access #121656#
+ Display getDisplay() const { return maDisplay; }
+ void setDisplay(Display eDisplay = Display_inherit) { maDisplay = eDisplay; }
+
/// alternative parent
void setAlternativeParent(const SvgNode* pAlternativeParent = 0) { mpAlternativeParent = pAlternativeParent; }
};
Modified: openoffice/branches/ia2/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx (original)
+++ openoffice/branches/ia2/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx Fri Feb 1 08:46:00 2013
@@ -290,11 +290,11 @@ namespace svgio
void setStopColor(const SvgPaint& rStopColor) { maStopColor = rStopColor; }
/// stroke-width content
- const SvgNumber getStrokeWidth() const;
+ SvgNumber getStrokeWidth() const;
void setStrokeWidth(const SvgNumber& rStrokeWidth = SvgNumber()) { maStrokeWidth = rStrokeWidth; }
/// stop opacity content
- const SvgNumber getStopOpacity() const;
+ SvgNumber getStopOpacity() const;
void setStopOpacity(const SvgNumber& rStopOpacity = SvgNumber()) { maStopOpacity = rStopOpacity; }
/// access to evtl. set fill gradient
@@ -314,11 +314,11 @@ namespace svgio
void setSvgPatternNodeStroke(const SvgPatternNode* pNew) { mpSvgPatternNodeStroke = pNew; }
/// fill opacity content
- const SvgNumber getFillOpacity() const;
+ SvgNumber getFillOpacity() const;
void setFillOpacity(const SvgNumber& rFillOpacity = SvgNumber()) { maFillOpacity = rFillOpacity; }
/// fill rule content
- const FillRule getFillRule() const;
+ FillRule getFillRule() const;
void setFillRule(const FillRule aFillRule = FillRule_notset) { maFillRule = aFillRule; }
/// fill StrokeDasharray content
@@ -330,7 +330,7 @@ namespace svgio
void setStrokeDasharraySet(bool bNew) { mbStrokeDasharraySet = bNew; }
/// StrokeDashOffset content
- const SvgNumber getStrokeDashOffset() const;
+ SvgNumber getStrokeDashOffset() const;
void setStrokeDashOffset(const SvgNumber& rStrokeDashOffset = SvgNumber()) { maStrokeDashOffset = rStrokeDashOffset; }
/// StrokeLinecap content
@@ -342,11 +342,11 @@ namespace svgio
void setStrokeLinejoin(const StrokeLinejoin aStrokeLinejoin = StrokeLinejoin_notset) { maStrokeLinejoin = aStrokeLinejoin; }
/// StrokeMiterLimit content
- const SvgNumber getStrokeMiterLimit() const;
+ SvgNumber getStrokeMiterLimit() const;
void setStrokeMiterLimit(const SvgNumber& rStrokeMiterLimit = SvgNumber()) { maStrokeMiterLimit = rStrokeMiterLimit; }
/// StrokeOpacity content
- const SvgNumber getStrokeOpacity() const;
+ SvgNumber getStrokeOpacity() const;
void setStrokeOpacity(const SvgNumber& rStrokeOpacity = SvgNumber()) { maStrokeOpacity = rStrokeOpacity; }
/// Font content
@@ -354,7 +354,7 @@ namespace svgio
void setFontFamily(const SvgStringVector& rSvgStringVector = SvgStringVector()) { maFontFamily = rSvgStringVector; }
/// FontSize content
- const SvgNumber getFontSize() const;
+ SvgNumber getFontSize() const;
void setFontSize(const SvgNumber& rFontSize = SvgNumber()) { maFontSize = rFontSize; }
/// FontStretch content
@@ -391,7 +391,7 @@ namespace svgio
void setColor(const SvgPaint& rColor) { maColor = rColor; }
/// Opacity content
- const SvgNumber getOpacity() const { return maOpacity; }
+ SvgNumber getOpacity() const { return maOpacity; }
void setOpacity(const SvgNumber& rOpacity = SvgNumber()) { maOpacity = rOpacity; }
// Title content
@@ -403,25 +403,25 @@ namespace svgio
void setDesc(const rtl::OUString& rNew) { maDesc = rNew; }
// ClipPathXLink content
- const rtl::OUString getClipPathXLink() const { return maClipPathXLink; }
+ const rtl::OUString& getClipPathXLink() const { return maClipPathXLink; }
void setClipPathXLink(const rtl::OUString& rNew) { maClipPathXLink = rNew; }
// MaskXLink content
- const rtl::OUString getMaskXLink() const { return maMaskXLink; }
+ const rtl::OUString& getMaskXLink() const { return maMaskXLink; }
void setMaskXLink(const rtl::OUString& rNew) { maMaskXLink = rNew; }
// MarkerStartXLink content
- const rtl::OUString getMarkerStartXLink() const;
+ rtl::OUString getMarkerStartXLink() const;
const SvgMarkerNode* accessMarkerStartXLink() const;
void setMarkerStartXLink(const rtl::OUString& rNew) { maMarkerStartXLink = rNew; }
// MarkerMidXLink content
- const rtl::OUString getMarkerMidXLink() const;
+ rtl::OUString getMarkerMidXLink() const;
const SvgMarkerNode* accessMarkerMidXLink() const;
void setMarkerMidXLink(const rtl::OUString& rNew) { maMarkerMidXLink = rNew; }
// MarkerEndXLink content
- const rtl::OUString getMarkerEndXLink() const;
+ rtl::OUString getMarkerEndXLink() const;
const SvgMarkerNode* accessMarkerEndXLink() const;
void setMarkerEndXLink(const rtl::OUString& rNew) { maMarkerEndXLink = rNew; }
Modified: openoffice/branches/ia2/main/svgio/inc/svgio/svgreader/svgtoken.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svgio/inc/svgio/svgreader/svgtoken.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svgio/inc/svgio/svgreader/svgtoken.hxx (original)
+++ openoffice/branches/ia2/main/svgio/inc/svgio/svgreader/svgtoken.hxx Fri Feb 1 08:46:00 2013
@@ -43,6 +43,7 @@ namespace svgio
SVGTokenViewBox,
SVGTokenTransform,
SVGTokenStyle,
+ SVGTokenDisplay, // #121656#
SVGTokenD,
SVGTokenX,
SVGTokenY,
Modified: openoffice/branches/ia2/main/svgio/source/svgreader/svgclippathnode.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svgio/source/svgreader/svgclippathnode.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svgio/source/svgreader/svgclippathnode.cxx (original)
+++ openoffice/branches/ia2/main/svgio/source/svgreader/svgclippathnode.cxx Fri Feb 1 08:46:00 2013
@@ -133,7 +133,7 @@ namespace svgio
void SvgClipPathNode::apply(drawinglayer::primitive2d::Primitive2DSequence& rContent) const
{
- if(rContent.hasElements())
+ if(rContent.hasElements() && Display_none != getDisplay())
{
const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
drawinglayer::primitive2d::Primitive2DSequence aClipTarget;
Modified: openoffice/branches/ia2/main/svgio/source/svgreader/svgimagenode.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svgio/source/svgreader/svgimagenode.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svgio/source/svgreader/svgimagenode.cxx (original)
+++ openoffice/branches/ia2/main/svgio/source/svgreader/svgimagenode.cxx Fri Feb 1 08:46:00 2013
@@ -261,7 +261,7 @@ namespace svgio
{
const SvgNode* mpXLink = getDocument().findSvgNodeById(maXLink);
- if(mpXLink)
+ if(mpXLink && Display_none != mpXLink->getDisplay())
{
mpXLink->decomposeSvgNode(aNewTarget, true);
Modified: openoffice/branches/ia2/main/svgio/source/svgreader/svgmarkernode.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svgio/source/svgreader/svgmarkernode.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svgio/source/svgreader/svgmarkernode.cxx (original)
+++ openoffice/branches/ia2/main/svgio/source/svgreader/svgmarkernode.cxx Fri Feb 1 08:46:00 2013
@@ -188,7 +188,7 @@ namespace svgio
const drawinglayer::primitive2d::Primitive2DSequence& SvgMarkerNode::getMarkerPrimitives() const
{
- if(!aPrimitives.hasElements())
+ if(!aPrimitives.hasElements() && Display_none != getDisplay())
{
decomposeSvgNode(const_cast< SvgMarkerNode* >(this)->aPrimitives, true);
}
Modified: openoffice/branches/ia2/main/svgio/source/svgreader/svgmasknode.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svgio/source/svgreader/svgmasknode.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svgio/source/svgreader/svgmasknode.cxx (original)
+++ openoffice/branches/ia2/main/svgio/source/svgreader/svgmasknode.cxx Fri Feb 1 08:46:00 2013
@@ -199,7 +199,7 @@ namespace svgio
void SvgMaskNode::apply(drawinglayer::primitive2d::Primitive2DSequence& rTarget) const
{
- if(rTarget.hasElements())
+ if(rTarget.hasElements() && Display_none != getDisplay())
{
drawinglayer::primitive2d::Primitive2DSequence aMaskTarget;
Modified: openoffice/branches/ia2/main/svgio/source/svgreader/svgnode.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svgio/source/svgreader/svgnode.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svgio/source/svgreader/svgnode.cxx (original)
+++ openoffice/branches/ia2/main/svgio/source/svgreader/svgnode.cxx Fri Feb 1 08:46:00 2013
@@ -150,6 +150,7 @@ namespace svgio
mpId(0),
mpClass(0),
maXmlSpace(XmlSpace_notset),
+ maDisplay(Display_inline),
maCssStyleVector()
{
OSL_ENSURE(SVGTokenUnknown != maType, "SvgNode with unknown type created (!)");
@@ -231,6 +232,104 @@ namespace svgio
}
break;
}
+ case SVGTokenDisplay:
+ {
+ if(aContent.getLength())
+ {
+ static rtl::OUString aStrInline(rtl::OUString::createFromAscii("inline"));
+ static rtl::OUString aStrBlock(rtl::OUString::createFromAscii("block"));
+ static rtl::OUString aStrList_item(rtl::OUString::createFromAscii("list-item"));
+ static rtl::OUString aStrRun_in(rtl::OUString::createFromAscii("run-in"));
+ static rtl::OUString aStrCompact(rtl::OUString::createFromAscii("compact"));
+ static rtl::OUString aStrMarker(rtl::OUString::createFromAscii("marker"));
+ static rtl::OUString aStrTable(rtl::OUString::createFromAscii("table"));
+ static rtl::OUString aStrInline_table(rtl::OUString::createFromAscii("inline-table"));
+ static rtl::OUString aStrTable_row_group(rtl::OUString::createFromAscii("table-row-group"));
+ static rtl::OUString aStrTable_header_group(rtl::OUString::createFromAscii("table-header-group"));
+ static rtl::OUString aStrTable_footer_group(rtl::OUString::createFromAscii("table-footer-group"));
+ static rtl::OUString aStrTable_row(rtl::OUString::createFromAscii("table-row"));
+ static rtl::OUString aStrTable_column_group(rtl::OUString::createFromAscii("table-column-group"));
+ static rtl::OUString aStrTable_column(rtl::OUString::createFromAscii("table-column"));
+ static rtl::OUString aStrTable_cell(rtl::OUString::createFromAscii("table-cell"));
+ static rtl::OUString aStrTable_caption(rtl::OUString::createFromAscii("table-caption"));
+ static rtl::OUString aStrNone(rtl::OUString::createFromAscii("none"));
+ static rtl::OUString aStrInherit(rtl::OUString::createFromAscii("inherit"));
+
+ if(aContent.match(aStrInline))
+ {
+ setDisplay(Display_inline);
+ }
+ else if(aContent.match(aStrNone))
+ {
+ setDisplay(Display_none);
+ }
+ else if(aContent.match(aStrInherit))
+ {
+ setDisplay(Display_inherit);
+ }
+ else if(aContent.match(aStrBlock))
+ {
+ setDisplay(Display_block);
+ }
+ else if(aContent.match(aStrList_item))
+ {
+ setDisplay(Display_list_item);
+ }
+ else if(aContent.match(aStrRun_in))
+ {
+ setDisplay(Display_run_in);
+ }
+ else if(aContent.match(aStrCompact))
+ {
+ setDisplay(Display_compact);
+ }
+ else if(aContent.match(aStrMarker))
+ {
+ setDisplay(Display_marker);
+ }
+ else if(aContent.match(aStrTable))
+ {
+ setDisplay(Display_table);
+ }
+ else if(aContent.match(aStrInline_table))
+ {
+ setDisplay(Display_inline_table);
+ }
+ else if(aContent.match(aStrTable_row_group))
+ {
+ setDisplay(Display_table_row_group);
+ }
+ else if(aContent.match(aStrTable_header_group))
+ {
+ setDisplay(Display_table_header_group);
+ }
+ else if(aContent.match(aStrTable_footer_group))
+ {
+ setDisplay(Display_table_footer_group);
+ }
+ else if(aContent.match(aStrTable_row))
+ {
+ setDisplay(Display_table_row);
+ }
+ else if(aContent.match(aStrTable_column_group))
+ {
+ setDisplay(Display_table_column_group);
+ }
+ else if(aContent.match(aStrTable_column))
+ {
+ setDisplay(Display_table_column);
+ }
+ else if(aContent.match(aStrTable_cell))
+ {
+ setDisplay(Display_table_cell);
+ }
+ else if(aContent.match(aStrTable_caption))
+ {
+ setDisplay(Display_table_caption);
+ }
+ }
+ break;
+ }
default:
{
break;
@@ -240,6 +339,11 @@ namespace svgio
void SvgNode::decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const
{
+ if(Display_none == getDisplay())
+ {
+ return;
+ }
+
if(!bReferenced)
{
if(SVGTokenDefs == getType() ||
@@ -259,6 +363,9 @@ namespace svgio
// also not directly used are Markers and Patterns, only indirecty used
// by reference
+
+ // #121656# also do not decompose nodes which have display="none" set
+ // as property
return;
}
}
@@ -273,7 +380,7 @@ namespace svgio
{
SvgNode* pCandidate = rChildren[a];
- if(pCandidate)
+ if(pCandidate && Display_none != pCandidate->getDisplay())
{
drawinglayer::primitive2d::Primitive2DSequence aNewTarget;
Modified: openoffice/branches/ia2/main/svgio/source/svgreader/svgpatternnode.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svgio/source/svgreader/svgpatternnode.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svgio/source/svgreader/svgpatternnode.cxx (original)
+++ openoffice/branches/ia2/main/svgio/source/svgreader/svgpatternnode.cxx Fri Feb 1 08:46:00 2013
@@ -275,7 +275,7 @@ namespace svgio
const drawinglayer::primitive2d::Primitive2DSequence& SvgPatternNode::getPatternPrimitives() const
{
- if(!aPrimitives.hasElements())
+ if(!aPrimitives.hasElements() && Display_none != getDisplay())
{
decomposeSvgNode(const_cast< SvgPatternNode* >(this)->aPrimitives, true);
}
Modified: openoffice/branches/ia2/main/svgio/source/svgreader/svgstyleattributes.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svgio/source/svgreader/svgstyleattributes.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svgio/source/svgreader/svgstyleattributes.cxx (original)
+++ openoffice/branches/ia2/main/svgio/source/svgreader/svgstyleattributes.cxx Fri Feb 1 08:46:00 2013
@@ -1079,6 +1079,18 @@ namespace svgio
aSource = drawinglayer::primitive2d::Primitive2DSequence(&xRef, 1);
}
+ if(pTransform)
+ {
+ // create embedding group element with transformation. This applies the given
+ // transformation to the graphical content, but *not* to mask and/or clip (as needed)
+ const drawinglayer::primitive2d::Primitive2DReference xRef(
+ new drawinglayer::primitive2d::TransformPrimitive2D(
+ *pTransform,
+ aSource));
+
+ aSource = drawinglayer::primitive2d::Primitive2DSequence(&xRef, 1);
+ }
+
if(getClipPathXLink().getLength())
{
// try to access linked ClipPath
@@ -1105,17 +1117,6 @@ namespace svgio
if(aSource.hasElements()) // test again, applied mask may have lead to empty geometry
{
- if(pTransform)
- {
- // create embedding group element with transformation
- const drawinglayer::primitive2d::Primitive2DReference xRef(
- new drawinglayer::primitive2d::TransformPrimitive2D(
- *pTransform,
- aSource));
-
- aSource = drawinglayer::primitive2d::Primitive2DSequence(&xRef, 1);
- }
-
// append to current target
drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(rTarget, aSource);
}
@@ -1960,7 +1961,7 @@ namespace svgio
return 0;
}
- const SvgNumber SvgStyleAttributes::getStrokeWidth() const
+ SvgNumber SvgStyleAttributes::getStrokeWidth() const
{
if(mbIsClipPathContent)
{
@@ -1982,7 +1983,7 @@ namespace svgio
return SvgNumber(1.0);
}
- const SvgNumber SvgStyleAttributes::getStopOpacity() const
+ SvgNumber SvgStyleAttributes::getStopOpacity() const
{
if(maStopOpacity.isSet())
{
@@ -1993,7 +1994,7 @@ namespace svgio
return SvgNumber(1.0);
}
- const SvgNumber SvgStyleAttributes::getFillOpacity() const
+ SvgNumber SvgStyleAttributes::getFillOpacity() const
{
if(mbIsClipPathContent)
{
@@ -2015,7 +2016,7 @@ namespace svgio
return SvgNumber(1.0);
}
- const FillRule SvgStyleAttributes::getFillRule() const
+ FillRule SvgStyleAttributes::getFillRule() const
{
if(FillRule_notset != maFillRule)
{
@@ -2056,7 +2057,7 @@ namespace svgio
return maStrokeDasharray;
}
- const SvgNumber SvgStyleAttributes::getStrokeDashOffset() const
+ SvgNumber SvgStyleAttributes::getStrokeDashOffset() const
{
if(maStrokeDashOffset.isSet())
{
@@ -2110,7 +2111,7 @@ namespace svgio
return StrokeLinejoin_miter;
}
- const SvgNumber SvgStyleAttributes::getStrokeMiterLimit() const
+ SvgNumber SvgStyleAttributes::getStrokeMiterLimit() const
{
if(maStrokeMiterLimit.isSet())
{
@@ -2128,7 +2129,7 @@ namespace svgio
return SvgNumber(4.0);
}
- const SvgNumber SvgStyleAttributes::getStrokeOpacity() const
+ SvgNumber SvgStyleAttributes::getStrokeOpacity() const
{
if(maStrokeOpacity.isSet())
{
@@ -2164,7 +2165,7 @@ namespace svgio
return maFontFamily;
}
- const SvgNumber SvgStyleAttributes::getFontSize() const
+ SvgNumber SvgStyleAttributes::getFontSize() const
{
if(maFontSize.isSet())
{
@@ -2360,7 +2361,7 @@ namespace svgio
return 0;
}
- const rtl::OUString SvgStyleAttributes::getMarkerStartXLink() const
+ rtl::OUString SvgStyleAttributes::getMarkerStartXLink() const
{
if(maMarkerStartXLink.getLength())
{
@@ -2392,7 +2393,7 @@ namespace svgio
return mpMarkerStartXLink;
}
- const rtl::OUString SvgStyleAttributes::getMarkerMidXLink() const
+ rtl::OUString SvgStyleAttributes::getMarkerMidXLink() const
{
if(maMarkerMidXLink.getLength())
{
@@ -2424,7 +2425,7 @@ namespace svgio
return mpMarkerMidXLink;
}
- const rtl::OUString SvgStyleAttributes::getMarkerEndXLink() const
+ rtl::OUString SvgStyleAttributes::getMarkerEndXLink() const
{
if(maMarkerEndXLink.getLength())
{
Modified: openoffice/branches/ia2/main/svgio/source/svgreader/svgtoken.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svgio/source/svgreader/svgtoken.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svgio/source/svgreader/svgtoken.cxx (original)
+++ openoffice/branches/ia2/main/svgio/source/svgreader/svgtoken.cxx Fri Feb 1 08:46:00 2013
@@ -35,6 +35,7 @@ namespace svgio
static rtl::OUString aSVGStrViewBox(rtl::OUString::createFromAscii("viewBox"));
static rtl::OUString aSVGStrTransform(rtl::OUString::createFromAscii("transform"));
static rtl::OUString aSVGStrStyle(rtl::OUString::createFromAscii("style"));
+ static rtl::OUString aSVGStrDisplay(rtl::OUString::createFromAscii("display")); // #121656#
static rtl::OUString aSVGStrD(rtl::OUString::createFromAscii("d"));
static rtl::OUString aSVGStrX(rtl::OUString::createFromAscii("x"));
static rtl::OUString aSVGStrY(rtl::OUString::createFromAscii("y"));
@@ -178,6 +179,7 @@ namespace svgio
aSVGTokenMapperList.insert(SVGTokenValueType(aSVGStrViewBox, SVGTokenViewBox));
aSVGTokenMapperList.insert(SVGTokenValueType(aSVGStrTransform, SVGTokenTransform));
aSVGTokenMapperList.insert(SVGTokenValueType(aSVGStrStyle, SVGTokenStyle));
+ aSVGTokenMapperList.insert(SVGTokenValueType(aSVGStrDisplay, SVGTokenDisplay)); // #121656#
aSVGTokenMapperList.insert(SVGTokenValueType(aSVGStrD, SVGTokenD));
aSVGTokenMapperList.insert(SVGTokenValueType(aSVGStrX, SVGTokenX));
aSVGTokenMapperList.insert(SVGTokenValueType(aSVGStrY, SVGTokenY));
Modified: openoffice/branches/ia2/main/svgio/source/svgreader/svgusenode.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svgio/source/svgreader/svgusenode.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svgio/source/svgreader/svgusenode.cxx (original)
+++ openoffice/branches/ia2/main/svgio/source/svgreader/svgusenode.cxx Fri Feb 1 08:46:00 2013
@@ -151,7 +151,7 @@ namespace svgio
// try to access link to content
const SvgNode* mpXLink = getDocument().findSvgNodeById(maXLink);
- if(mpXLink)
+ if(mpXLink && Display_none != mpXLink->getDisplay())
{
// decompose childs
drawinglayer::primitive2d::Primitive2DSequence aNewTarget;
Modified: openoffice/branches/ia2/main/svgio/source/svguno/xsvgparser.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svgio/source/svguno/xsvgparser.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svgio/source/svguno/xsvgparser.cxx (original)
+++ openoffice/branches/ia2/main/svgio/source/svguno/xsvgparser.cxx Fri Feb 1 08:46:00 2013
@@ -151,7 +151,12 @@ namespace svgio
for(sal_uInt32 a(0); a < nCount; a++)
{
- rResults[a]->decomposeSvgNode(aRetval, false);
+ SvgNode* pCandidate = rResults[a];
+
+ if(Display_none != pCandidate->getDisplay())
+ {
+ pCandidate->decomposeSvgNode(aRetval, false);
+ }
}
}
else
Modified: openoffice/branches/ia2/main/svl/inc/pch/precompiled_svl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svl/inc/pch/precompiled_svl.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svl/inc/pch/precompiled_svl.hxx (original)
+++ openoffice/branches/ia2/main/svl/inc/pch/precompiled_svl.hxx Fri Feb 1 08:46:00 2013
@@ -217,7 +217,6 @@
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
#include <com/sun/star/svg/XSVGWriter.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
-#include <com/sun/star/system/XProxySettings.hpp>
#include <com/sun/star/system/XSystemShellExecute.hpp>
#include <com/sun/star/task/DocumentPasswordRequest.hpp>
#include <com/sun/star/task/DocumentMSPasswordRequest.hpp>
Modified: openoffice/branches/ia2/main/svtools/bmpmaker/bmpcore.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svtools/bmpmaker/bmpcore.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svtools/bmpmaker/bmpcore.cxx (original)
+++ openoffice/branches/ia2/main/svtools/bmpmaker/bmpcore.cxx Fri Feb 1 08:46:00 2013
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svtools.hxx"
@@ -31,7 +29,7 @@
#include <vcl/pngread.hxx>
#include <vcl/pngwrite.hxx>
#include "bmpcore.hxx"
-
+#include <vcl/dibtools.hxx>
#include <vector>
#include <algorithm>
@@ -188,7 +186,9 @@ void BmpCreator::ImplCreate( const ::std
aBmpEx = aPNGReader.Read();
}
else
- aIStm >> aBmpEx;
+ {
+ ReadDIBBitmapEx(aBmpEx, aIStm);
+ }
if( pCollectStm && !aBmpEx.IsEmpty() )
{
@@ -293,7 +293,9 @@ void BmpCreator::ImplCreate( const ::std
aPNGWriter.Write( aOutStream );
}
else
- aOutStream << aTotalBmpEx;
+ {
+ WriteDIBBitmapEx(aTotalBmpEx, aOutStream);
+ }
if( aOutStream.GetError() )
Message( String( RTL_CONSTASCII_USTRINGPARAM( "ERROR: Could not write to output file: " ) ).Append( aOutFileName ), EXIT_IOERROR );
Modified: openoffice/branches/ia2/main/svtools/bmpmaker/bmpsum.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svtools/bmpmaker/bmpsum.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svtools/bmpmaker/bmpsum.cxx (original)
+++ openoffice/branches/ia2/main/svtools/bmpmaker/bmpsum.cxx Fri Feb 1 08:46:00 2013
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svtools.hxx"
@@ -29,7 +27,6 @@
#include <vector>
#include <set>
#include <map>
-
#include <rtl/crc.h>
#include <tools/stream.hxx>
#include <tools/fsys.hxx>
@@ -37,7 +34,7 @@
#include <vcl/bitmap.hxx>
#include <vcl/bmpacc.hxx>
#include <vcl/pngread.hxx>
-
+#include <vcl/dibtools.hxx>
#include "svl/solar.hrc"
#define EXIT_NOERROR 0x00000000
@@ -285,7 +282,7 @@ void BmpSum::ProcessFile( const String&
{
BitmapEx aBmpEx;
- aIStm >> aBmpEx;
+ ReadDIBBitmapEx(aBmpEx, aIStm);
if( !aBmpEx.IsEmpty() )
{
@@ -385,7 +382,7 @@ void BmpSum::ProcessFileList( const Stri
{
BitmapEx aBmpEx;
- aBmpStm >> aBmpEx;
+ ReadDIBBitmapEx(aBmpEx, aBmpStm);
if( !aBmpEx.IsEmpty() )
nCRC = GetCRC( aBmpEx );
Modified: openoffice/branches/ia2/main/svtools/inc/pch/precompiled_svtools.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svtools/inc/pch/precompiled_svtools.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svtools/inc/pch/precompiled_svtools.hxx (original)
+++ openoffice/branches/ia2/main/svtools/inc/pch/precompiled_svtools.hxx Fri Feb 1 08:46:00 2013
@@ -217,7 +217,6 @@
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
#include <com/sun/star/svg/XSVGWriter.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
-#include <com/sun/star/system/XProxySettings.hpp>
#include <com/sun/star/system/XSystemShellExecute.hpp>
#include <com/sun/star/task/DocumentPasswordRequest.hpp>
#include <com/sun/star/task/DocumentMSPasswordRequest.hpp>
Modified: openoffice/branches/ia2/main/svtools/inc/svtools/optionsdrawinglayer.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svtools/inc/svtools/optionsdrawinglayer.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svtools/inc/svtools/optionsdrawinglayer.hxx (original)
+++ openoffice/branches/ia2/main/svtools/inc/svtools/optionsdrawinglayer.hxx Fri Feb 1 08:46:00 2013
@@ -188,6 +188,11 @@ class SVT_DLLPUBLIC SvtOptionsDrawinglay
sal_uInt16 GetTransparentSelectionPercent() const;
sal_uInt16 GetSelectionMaximumLuminancePercent() const;
+ // get system hilight color, limited to the maximum allowed luminance
+ // (defined in GetSelectionMaximumLuminancePercent() in SvtOptionsDrawinglayer,
+ // combined with Application::GetSettings().GetStyleSettings().GetHighlightColor())
+ Color getHilightColor() const;
+
void SetTransparentSelection( sal_Bool bState );
void SetTransparentSelectionPercent( sal_uInt16 nPercent );
void SetSelectionMaximumLuminancePercent( sal_uInt16 nPercent );
Modified: openoffice/branches/ia2/main/svtools/inc/svtools/popupmenucontrollerbase.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svtools/inc/svtools/popupmenucontrollerbase.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svtools/inc/svtools/popupmenucontrollerbase.hxx (original)
+++ openoffice/branches/ia2/main/svtools/inc/svtools/popupmenucontrollerbase.hxx Fri Feb 1 08:46:00 2013
@@ -86,10 +86,10 @@ namespace svt
virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) = 0;
// XMenuListener
- virtual void SAL_CALL highlight( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL select( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL deactivate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL itemHighlighted( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL itemSelected( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL itemActivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL itemDeactivated( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException);
// XDispatchProvider
virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& sTarget, sal_Int32 nFlags ) throw( ::com::sun::star::uno::RuntimeException );
Modified: openoffice/branches/ia2/main/svtools/inc/svtools/transfer.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svtools/inc/svtools/transfer.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svtools/inc/svtools/transfer.hxx (original)
+++ openoffice/branches/ia2/main/svtools/inc/svtools/transfer.hxx Fri Feb 1 08:46:00 2013
@@ -49,7 +49,7 @@
// - Forward declarations -
// ------------------------
-class Bitmap;
+class BitmapEx;
class GDIMetaFile;
class Graphic;
class ImageMap;
@@ -257,7 +257,7 @@ protected:
sal_Bool SetAny( const ::com::sun::star::uno::Any& rAny, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
sal_Bool SetString( const ::rtl::OUString& rString, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
- sal_Bool SetBitmap( const Bitmap& rBitmap, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+ sal_Bool SetBitmapEx( const BitmapEx& rBitmap, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
sal_Bool SetGDIMetaFile( const GDIMetaFile& rMtf, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
sal_Bool SetGraphic( const Graphic& rGraphic, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
sal_Bool SetImageMap( const ImageMap& rIMap, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
@@ -362,8 +362,8 @@ public:
sal_Bool GetString( SotFormatStringId nFormat, ::rtl::OUString& rStr );
sal_Bool GetString( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ::rtl::OUString& rStr );
- sal_Bool GetBitmap( SotFormatStringId nFormat, Bitmap& rBmp );
- sal_Bool GetBitmap( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, Bitmap& rBmp );
+ sal_Bool GetBitmapEx( SotFormatStringId nFormat, BitmapEx& rBmp );
+ sal_Bool GetBitmapEx( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, BitmapEx& rBmp );
sal_Bool GetGDIMetaFile( SotFormatStringId nFormat, GDIMetaFile& rMtf );
sal_Bool GetGDIMetaFile( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, GDIMetaFile& rMtf );
Modified: openoffice/branches/ia2/main/svtools/source/config/optionsdrawinglayer.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svtools/source/config/optionsdrawinglayer.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svtools/source/config/optionsdrawinglayer.cxx (original)
+++ openoffice/branches/ia2/main/svtools/source/config/optionsdrawinglayer.cxx Fri Feb 1 08:46:00 2013
@@ -1667,6 +1667,27 @@ sal_uInt16 SvtOptionsDrawinglayer::GetSe
return aRetval;
}
+Color SvtOptionsDrawinglayer::getHilightColor() const
+{
+ Color aRetval(Application::GetSettings().GetStyleSettings().GetHighlightColor());
+ const basegfx::BColor aSelection(aRetval.getBColor());
+ const double fLuminance(aSelection.luminance());
+ const double fMaxLum(GetSelectionMaximumLuminancePercent() / 100.0);
+
+ if(fLuminance > fMaxLum)
+ {
+ const double fFactor(fMaxLum / fLuminance);
+ const basegfx::BColor aNewSelection(
+ aSelection.getRed() * fFactor,
+ aSelection.getGreen() * fFactor,
+ aSelection.getBlue() * fFactor);
+
+ aRetval = Color(aNewSelection);
+ }
+
+ return aRetval;
+}
+
void SvtOptionsDrawinglayer::SetSelectionMaximumLuminancePercent( sal_uInt16 nPercent )
{
MutexGuard aGuard( GetOwnStaticMutex() );
Modified: openoffice/branches/ia2/main/svtools/source/contnr/templwin.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svtools/source/contnr/templwin.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svtools/source/contnr/templwin.cxx (original)
+++ openoffice/branches/ia2/main/svtools/source/contnr/templwin.cxx Fri Feb 1 08:46:00 2013
@@ -65,7 +65,7 @@
#include <com/sun/star/io/IOException.hpp>
#include <com/sun/star/util/DateTime.hpp>
#include <com/sun/star/script/XTypeConverter.hpp>
-#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <unotools/localedatawrapper.hxx>
#include <com/sun/star/container/XNameContainer.hpp>
@@ -1985,12 +1985,9 @@ IMPL_LINK ( SvtDocumentTemplateDialog, O
{
try
{
- uno::Reference< lang::XMultiServiceFactory > xSMGR =
- ::comphelper::getProcessServiceFactory();
uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShell(
- xSMGR->createInstance( ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SystemShellExecute" ) ) ),
- uno::UNO_QUERY_THROW );
+ com::sun::star::system::SystemShellExecute::create(
+ ::comphelper::getProcessComponentContext() ) );
if ( xSystemShell.is() )
xSystemShell->execute( sURL, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
EndDialog( RET_CANCEL );