You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ja...@apache.org on 2013/03/15 10:24:56 UTC
svn commit: r1456826 [4/6] - in /openoffice/branches/l10n/main: ./
autodoc/source/display/html/ automation/packimages/ automation/prj/
automation/source/communi/ automation/source/miniapp/
automation/source/testtool/ automation/util/ bridges/source/cpp...
Modified: openoffice/branches/l10n/main/scp2/inc/macros.inc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/inc/macros.inc?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/inc/macros.inc (original)
+++ openoffice/branches/l10n/main/scp2/inc/macros.inc Fri Mar 15 09:24:52 2013
@@ -386,7 +386,7 @@ End
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
- Name = STRING(CONCAT2(Apache OpenOffice.,name)); \
+ Name = STRING(CONCAT2(OpenOffice.,name)); \
Value = " "; \
End
@@ -395,7 +395,7 @@ End
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
- Name = STRING(CONCAT2(Apache OpenOffice.,name)); \
+ Name = STRING(CONCAT2(OpenOffice.,name)); \
Value = " "; \
End
@@ -404,7 +404,7 @@ End
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = gid_Module_Root_Reg_##name; \
Subkey = STRING(CONCAT2(.,key)); \
- Value = STRING(CONCAT2(Apache OpenOffice.,name)); \
+ Value = STRING(CONCAT2(OpenOffice.,name)); \
ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \
End
@@ -412,7 +412,7 @@ End
RegistryItem CONCAT2(gid_Regitem_Openoffice_,name) \
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
- Subkey = STRING(CONCAT2(Apache OpenOffice.,name)); \
+ Subkey = STRING(CONCAT2(OpenOffice.,name)); \
REG_VALUE_LNG(disp_name) \
End
@@ -420,7 +420,7 @@ End
RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Defaulticon) \
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
- Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\DefaultIcon)); \
+ Subkey = STRING(CONCAT3(OpenOffice.,name,\DefaultIcon)); \
Value = "<progpath>\program\soffice.exe," STRING(icon_id); \
End
@@ -428,7 +428,7 @@ End
RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell) \
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
- Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell)); \
+ Subkey = STRING(CONCAT3(OpenOffice.,name,\shell)); \
Value = STRING(default); \
End
@@ -436,13 +436,13 @@ End
RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New) \
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
- Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\new)); \
+ Subkey = STRING(CONCAT3(OpenOffice.,name,\shell\new)); \
REG_VALUE_LNG(NEW) \
End \
RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New_Command) \
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
- Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\new\command)); \
+ Subkey = STRING(CONCAT3(OpenOffice.,name,\shell\new\command)); \
Value = "\"<progpath>\program\\" STRING(app) "\" -n \"%1\""; \
End
@@ -450,7 +450,7 @@ End
RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Open_Command) \
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
- Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\open\command)); \
+ Subkey = STRING(CONCAT3(OpenOffice.,name,\shell\open\command)); \
Value = "\"<progpath>\program\\" STRING(app) "\" -o \"%1\""; \
End
@@ -458,7 +458,7 @@ End
RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Print_Command) \
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
- Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\print\command)); \
+ Subkey = STRING(CONCAT3(OpenOffice.,name,\shell\print\command)); \
Value = "\"<progpath>\program\\" STRING(app) "\" -p \"%1\""; \
End
@@ -466,7 +466,7 @@ End
RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Printto_Command) \
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
- Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\printto\command)); \
+ Subkey = STRING(CONCAT3(OpenOffice.,name,\shell\printto\command)); \
Value = "\"<progpath>\program\\" STRING(app) "\" -pt \"%2\" \"%1\""; \
End
@@ -476,7 +476,7 @@ End
ModuleID = modid; \
Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
Name = STRING(CONCAT2(.,key)); \
- Value = STRING(CONCAT2(Apache OpenOffice.,name)); \
+ Value = STRING(CONCAT2(OpenOffice.,name)); \
Styles = (); \
End
@@ -486,7 +486,7 @@ End
ModuleID = modid; \
Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
Name = STRING(CONCAT2(.,key)); \
- Value = STRING(CONCAT2(Apache OpenOffice.,name)); \
+ Value = STRING(CONCAT2(OpenOffice.,name)); \
Styles = (); \
End
Modified: openoffice/branches/l10n/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/source/ooo/file_library_ooo.scp?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/branches/l10n/main/scp2/source/ooo/file_library_ooo.scp Fri Mar 15 09:24:52 2013
@@ -1058,8 +1058,13 @@ End
#endif
#endif
+#if defined(OS2)
+STD_LIB_FILE(gid_File_Lib_Mysql,mysql)
+STD_LIB_FILE(gid_File_Lib_Odbc,odbc)
+#else
STD_LIB_FILE(gid_File_Lib_Mysql,mysql.uno)
STD_LIB_FILE(gid_File_Lib_Odbc,odbc.uno)
+#endif
// STD_LIB_FILE( gid_File_Lib_Ofa , ofa)
Modified: openoffice/branches/l10n/main/scp2/source/ooo/file_resource_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/source/ooo/file_resource_ooo.scp?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/source/ooo/file_resource_ooo.scp (original)
+++ openoffice/branches/l10n/main/scp2/source/ooo/file_resource_ooo.scp Fri Mar 15 09:24:52 2013
@@ -80,7 +80,6 @@ STD_RES_FILE( gid_File_Res_Spa, spa )
#endif
-#STD_RES_FILE( gid_File_Res_Stt, stt )
STD_RES_FILE( gid_File_Res_Sb, sb )
STD_RES_FILE( gid_File_Res_Svl, svl )
Modified: openoffice/branches/l10n/main/scp2/source/ooo/registryitem_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/source/ooo/registryitem_ooo.scp?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/source/ooo/registryitem_ooo.scp (original)
+++ openoffice/branches/l10n/main/scp2/source/ooo/registryitem_ooo.scp Fri Mar 15 09:24:52 2013
@@ -247,7 +247,7 @@ End
RegistryItem gid_Regitem_Software_Openoffice_Productname_Productversion_Path
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Apache OpenOffice\%PRODUCTNAME\%PRODUCTVERSION";
+ Subkey = "Software\OpenOffice\%PRODUCTNAME\%PRODUCTVERSION";
ModuleID = gid_Module_Root;
Name = "Path";
Value = "<progpath>\program\soffice.exe";
@@ -273,7 +273,7 @@ End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Install
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+ Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
ModuleID = gid_Module_Root;
Name = "INSTALLLOCATION";
Value = "[INSTALLLOCATION]";
@@ -318,7 +318,7 @@ End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+ Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
ModuleID = gid_Module_Root;
Name = "OFFICEINSTALLLOCATION";
Value = "[INSTALLLOCATION]";
@@ -345,7 +345,7 @@ End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
+ Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
ModuleID = gid_Module_Root;
Name = "BASISINSTALLLOCATION";
Value = "[INSTALLLOCATION]Basis\\";
@@ -354,7 +354,7 @@ End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstall
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+ Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
ModuleID = gid_Module_Root;
Name = "BASISINSTALLLOCATION";
Value = "[INSTALLLOCATION]Basis\\";
@@ -381,7 +381,7 @@ End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
+ Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
ModuleID = gid_Module_Root;
Name = "UREINSTALLLOCATION";
Value = "[INSTALLLOCATION]URE\\";
@@ -390,7 +390,7 @@ End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+ Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
ModuleID = gid_Module_Root;
Name = "UREINSTALLLOCATION";
Value = "[INSTALLLOCATION]URE\\";
@@ -513,14 +513,14 @@ End
RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Apache OpenOffice\UNO\InstallPath";
+ Subkey = "Software\OpenOffice\UNO\InstallPath";
ModuleID = gid_Module_Root;
Value = "<progpath>\program";
End
RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath_Branded
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Apache OpenOffice\UNO\InstallPath";
+ Subkey = "Software\OpenOffice\UNO\InstallPath";
ModuleID = gid_Module_Root;
Name = "%PRODUCTNAME %PRODUCTVERSION";
Value = "<progpath>\program";
Modified: openoffice/branches/l10n/main/scp2/source/ooo/ure.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/source/ooo/ure.scp?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/source/ooo/ure.scp (original)
+++ openoffice/branches/l10n/main/scp2/source/ooo/ure.scp Fri Mar 15 09:24:52 2013
@@ -1316,7 +1316,7 @@ End
RegistryItem gid_Regitem_Path
ModuleID = gid_Module_Root;
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = "Software\Apache OpenOffice\%PRODUCTNAME";
+ Subkey = "Software\OpenOffice\%PRODUCTNAME";
Name = "Path";
Value = "[INSTALLLOCATION]";
End
Modified: openoffice/branches/l10n/main/scp2/source/ooo/ure_standalone.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/source/ooo/ure_standalone.scp?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/source/ooo/ure_standalone.scp (original)
+++ openoffice/branches/l10n/main/scp2/source/ooo/ure_standalone.scp Fri Mar 15 09:24:52 2013
@@ -38,9 +38,9 @@ End
Directory gid_Dir_Ooo_Openofficeorg
ParentID = PREDEFINED_PROGDIR;
#ifdef WNT
- HostName = "Apache OpenOffice";
+ HostName = "OpenOffice";
#else
- HostName = "apacheopenoffice";
+ HostName = "openoffice";
#endif
Styles = (ISINSTALLLOCATION);
End
Modified: openoffice/branches/l10n/main/scp2/source/quickstart/registryitem_quickstart.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/source/quickstart/registryitem_quickstart.scp?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/source/quickstart/registryitem_quickstart.scp (original)
+++ openoffice/branches/l10n/main/scp2/source/quickstart/registryitem_quickstart.scp Fri Mar 15 09:24:52 2013
@@ -25,7 +25,7 @@
RegistryItem gid_Regitem_Software_OpenOffice_Quickstarterinstalled
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Apache OpenOffice";
+ Subkey = "Software\OpenOffice";
ModuleID = gid_Module_Optional_Quickstart;
Name = "QuickStarterInstalled";
Value = "1";
Modified: openoffice/branches/l10n/main/scp2/source/sdkoo/sdkoo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/source/sdkoo/sdkoo.scp?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/source/sdkoo/sdkoo.scp (original)
+++ openoffice/branches/l10n/main/scp2/source/sdkoo/sdkoo.scp Fri Mar 15 09:24:52 2013
@@ -70,7 +70,7 @@ End
Directory gid_Dir_Basis_Sdk
#if defined MACOSX
ParentID = PREDEFINED_PROGDIR;
- DosName = "Apache_OpenOffice_SDK";
+ DosName = "OpenOffice_SDK";
#else
#if defined WNT
ParentID = gid_Dir_Sdkoo_Root;
Modified: openoffice/branches/l10n/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp (original)
+++ openoffice/branches/l10n/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp Fri Mar 15 09:24:52 2013
@@ -77,8 +77,8 @@ RegistryItem gid_Regitem_Folder_shellex_
ModuleID = gid_Module_Optional_Winexplorerext;
Styles = (X64);
Subkey = "Folder\shellex\ColumnHandlers\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}";
- Value = "Apache OpenOffice Column Handler";
- Val64 = "Apache OpenOffice Column Handler";
+ Value = "OpenOffice Column Handler";
+ Val64 = "OpenOffice Column Handler";
End
RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32
Modified: openoffice/branches/l10n/main/scripting/java/build.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scripting/java/build.xml?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scripting/java/build.xml (original)
+++ openoffice/branches/l10n/main/scripting/java/build.xml Fri Mar 15 09:24:52 2013
@@ -25,7 +25,7 @@
<!-- =================== Environmental Properties ======================= -->
<property name="prj" value=".."/>
- <property name="build.compiler" value="classic"/>
+ <property name="build.compiler" value="modern"/>
<property name="optimize" value="off"/>
<property name="debug" value="on"/>
<property name="jardir" value="${out}/class"/>
Modified: openoffice/branches/l10n/main/scripting/workben/build.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scripting/workben/build.xml?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scripting/workben/build.xml (original)
+++ openoffice/branches/l10n/main/scripting/workben/build.xml Fri Mar 15 09:24:52 2013
@@ -26,7 +26,7 @@
<property name="prj" value=".."/>
<property file="${prj}/java/build.env"/>
- <property name="build.compiler" value="classic"/>
+ <property name="build.compiler" value="modern"/>
<property name="optimize" value="on"/>
<property name="debug" value="on"/>
<property name="installerclasses" value="${out}/class/sframeworkinstall"/>
Modified: openoffice/branches/l10n/main/sd/source/filter/eppt/epptso.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sd/source/filter/eppt/epptso.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sd/source/filter/eppt/epptso.cxx (original)
+++ openoffice/branches/l10n/main/sd/source/filter/eppt/epptso.cxx Fri Mar 15 09:24:52 2013
@@ -5746,7 +5746,7 @@ void PPTWriter::ImplCreateTable( uno::Re
std::vector< std::pair< sal_Int32, sal_Int32 > > aRows;
awt::Point aPosition( ImplMapPoint( rXShape->getPosition() ) );
- sal_uInt32 nPosition = aPosition.X;
+ sal_Int32 nPosition = aPosition.X;
for ( sal_Int32 x = 0; x < nColumnCount; x++ )
{
uno::Reference< beans::XPropertySet > xPropSet( xColumns->getByIndex( x ), uno::UNO_QUERY_THROW );
Modified: openoffice/branches/l10n/main/sd/source/filter/ppt/pptinanimations.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sd/source/filter/ppt/pptinanimations.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sd/source/filter/ppt/pptinanimations.cxx (original)
+++ openoffice/branches/l10n/main/sd/source/filter/ppt/pptinanimations.cxx Fri Mar 15 09:24:52 2013
@@ -2197,7 +2197,7 @@ void AnimationImporter::importCommandCon
mrStCtrl >> nBits;
mrStCtrl >> nCommandType;
- if( nBits && 1 )
+ if( nBits & 1 )
{
dump( " type=\"%s\"", (nCommandType == 0) ? "event" : ( nCommandType == 1) ? "call" : "verb" );
}
@@ -2208,7 +2208,7 @@ void AnimationImporter::importCommandCon
{
if ( importAttributeValue( pChildAtom, aValue ) )
{
- if( nBits && 2 )
+ if( nBits & 2 )
{
dump( " cmd=\"" );
dump( aValue );
Modified: openoffice/branches/l10n/main/sdext/source/minimizer/description.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sdext/source/minimizer/description.xml?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sdext/source/minimizer/description.xml (original)
+++ openoffice/branches/l10n/main/sdext/source/minimizer/description.xml Fri Mar 15 09:24:52 2013
@@ -28,8 +28,8 @@
<identifier value="UPDATED_IDENTIFIER"/>
<dependencies>
- <OpenOffice.org-minimal-version value="4.0" dep:name="Apache OpenOffice"/>
- <OpenOffice.org-maximal-version value="4.9" dep:name="Apache OpenOffice"/>
+ <OpenOffice.org-minimal-version value="4.0" dep:name="OpenOffice"/>
+ <OpenOffice.org-maximal-version value="4.9" dep:name="OpenOffice"/>
</dependencies>
<registration>
Modified: openoffice/branches/l10n/main/sdext/source/minimizer/fileopendialog.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sdext/source/minimizer/fileopendialog.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sdext/source/minimizer/fileopendialog.cxx (original)
+++ openoffice/branches/l10n/main/sdext/source/minimizer/fileopendialog.cxx Fri Mar 15 09:24:52 2013
@@ -55,6 +55,7 @@
#include <com/sun/star/view/XControlAccess.hpp>
#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
+#include <rtl/ustrbuf.hxx>
using namespace ::rtl;
using namespace ::com::sun::star::uno;
@@ -138,6 +139,13 @@ FileOpenDialog::FileOpenDialog( const Re
// mxFilePicker->setDefaultName( );
+ const char filter[] = "*.";
+ // the filter title must be formed in the same it is currently done
+ // in the internal implementation: "UIName (.<extension>)"
+ rtl::OUStringBuffer aUIName;
+ // the filter must be in the form "*.<extension>"
+ rtl::OUStringBuffer aFilter;
+ rtl::OUString aExtension;
Reference< XFilterManager > xFilterManager( mxFilePicker, UNO_QUERY_THROW );
std::vector< FilterEntry >::iterator aIter( aFilterEntryList.begin() );
while( aIter != aFilterEntryList.end() )
@@ -158,7 +166,18 @@ FileOpenDialog::FileOpenDialog( const Re
}
if ( aExtensions.getLength() )
{
- xFilterManager->appendFilter( aIter->maUIName, aExtensions[ 0 ] );
+ aExtension = aExtensions[0];
+ // form the title: "<UIName> (.<extension)"
+ aUIName.append( aIter->maUIName );
+ aUIName.appendAscii( RTL_CONSTASCII_STRINGPARAM( " (." ));
+ aUIName.append( aExtension );
+ aUIName.append( sal_Unicode( ')' ) );
+ // form the filter: "(*.<extension>)"
+ aFilter.appendAscii( RTL_CONSTASCII_STRINGPARAM( filter ) );
+ aFilter.append( aExtensions[0] );
+
+ xFilterManager->appendFilter( aUIName.makeStringAndClear(),
+ aFilter.makeStringAndClear() );
if ( aIter->maFlags & 0x100 )
xFilterManager->setCurrentFilter( aIter->maUIName );
}
Modified: openoffice/branches/l10n/main/sdext/source/minimizer/informationdialog.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sdext/source/minimizer/informationdialog.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sdext/source/minimizer/informationdialog.cxx (original)
+++ openoffice/branches/l10n/main/sdext/source/minimizer/informationdialog.cxx Fri Mar 15 09:24:52 2013
@@ -92,8 +92,15 @@ rtl::OUString InsertFixedText( Informati
return rControlName;
}
-rtl::OUString InsertImage( InformationDialog& rInformationDialog, const OUString& rControlName, const OUString& rURL,
- sal_Int32 nPosX, sal_Int32 nPosY, sal_Int32 nWidth, sal_Int32 nHeight )
+rtl::OUString InsertImage(
+ InformationDialog& rInformationDialog,
+ const OUString& rControlName,
+ const OUString& rURL,
+ sal_Int32 nPosX,
+ sal_Int32 nPosY,
+ sal_Int32 nWidth,
+ sal_Int32 nHeight,
+ sal_Bool bScale )
{
OUString pNames[] = {
TKGet( TK_Border ),
@@ -110,7 +117,7 @@ rtl::OUString InsertImage( InformationDi
Any( rURL ),
Any( nPosX ),
Any( nPosY ),
- Any( sal_True ),
+ Any( bScale ),
Any( nWidth ) };
sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
@@ -204,41 +211,6 @@ static OUString ImpValueOfInMB( const sa
return aVal.makeStringAndClear();
}
-OUString InformationDialog::ImpGetStandardImage( const OUString& sPrivateURL )
-{
- rtl::OUString sURL;
- try
- {
- mxTempFile = Reference< XStream >( mxMSF->getServiceManager()->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.io.TempFile" ), mxMSF ), UNO_QUERY_THROW );
- Reference< XPropertySet > xPropSet( mxTempFile, UNO_QUERY );
- Reference< XOutputStream > xOutputStream( mxTempFile->getOutputStream() );
- if ( xOutputStream.is() && xPropSet.is() )
- {
- Reference< graphic::XGraphicProvider > xGraphicProvider( mxMSF->getServiceManager()->createInstanceWithContext(
- OUString::createFromAscii( "com.sun.star.graphic.GraphicProvider" ), mxMSF ), UNO_QUERY_THROW );
- Sequence< PropertyValue > aArgs( 1 );
- aArgs[ 0 ].Name = OUString::createFromAscii( "URL" );
- aArgs[ 0 ].Value <<= sPrivateURL;
- Reference< graphic::XGraphic > xGraphic( xGraphicProvider->queryGraphic( aArgs ) );
- if ( xGraphic.is() )
- {
- OUString aDestMimeType( RTL_CONSTASCII_USTRINGPARAM( "image/png" ) );
- Sequence< PropertyValue > aArgs2( 2 );
- aArgs2[ 0 ].Name = TKGet( TK_MimeType ); // the GraphicProvider is using "MimeType", the GraphicExporter "MediaType"...
- aArgs2[ 0 ].Value <<= aDestMimeType;
- aArgs2[ 1 ].Name = TKGet( TK_OutputStream );
- aArgs2[ 1 ].Value <<= xOutputStream;
- xGraphicProvider->storeGraphic( xGraphic, aArgs2 );
- }
- xPropSet->getPropertyValue( OUString::createFromAscii( "Uri" ) ) >>= sURL;
- }
- }
- catch( Exception& )
- {
- }
- return sURL;
-}
-
void InformationDialog::InitDialog()
{
sal_Int32 nDialogHeight = DIALOG_HEIGHT;
@@ -330,8 +302,11 @@ void InformationDialog::InitDialog()
if ( k >= 0 )
aInfoString = aInfoString.replaceAt( k, aTitlePlaceholder.getLength(), aTitle );
- com::sun::star::uno::Reference< com::sun::star::awt::XItemListener > xItemListener;
- InsertImage( *this, rtl::OUString( rtl::OUString::createFromAscii( "aboutimage" ) ), ImpGetStandardImage( rtl::OUString::createFromAscii( "private:standardimage/query" ) ), 5, 5, 25, 25 );
+ com::sun::star::uno::Reference< com::sun::star::awt::XItemListener > xItemListener;
+ InsertImage( *this,
+ rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "aboutimage" ) ),
+ rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:standardimage/query" ) ),
+ 5, 5, 25, 25, sal_False );
InsertFixedText( *this, rtl::OUString( rtl::OUString::createFromAscii( "fixedtext" ) ), aInfoString, PAGE_POS_X, 6, PAGE_WIDTH, 24, sal_True, 0 );
if ( maSaveAsURL.getLength() )
InsertCheckBox( *this, TKGet( TK_OpenNewDocument ), xItemListener, getString( STR_AUTOMATICALLY_OPEN ), PAGE_POS_X, 42, PAGE_WIDTH, 8, 1 );
Modified: openoffice/branches/l10n/main/sdext/source/minimizer/informationdialog.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sdext/source/minimizer/informationdialog.hxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sdext/source/minimizer/informationdialog.hxx (original)
+++ openoffice/branches/l10n/main/sdext/source/minimizer/informationdialog.hxx Fri Mar 15 09:24:52 2013
@@ -65,7 +65,6 @@ private :
com::sun::star::uno::Reference< com::sun::star::awt::XActionListener > mxActionListener;
- rtl::OUString ImpGetStandardImage( const rtl::OUString& rPrivateURL );
void InitDialog();
sal_Int64 mnSourceSize;
Modified: openoffice/branches/l10n/main/sdext/source/pdfimport/config/description.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sdext/source/pdfimport/config/description.xml?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sdext/source/pdfimport/config/description.xml (original)
+++ openoffice/branches/l10n/main/sdext/source/pdfimport/config/description.xml Fri Mar 15 09:24:52 2013
@@ -27,8 +27,8 @@
<identifier value="UPDATED_IDENTIFIER" />
<dependencies>
- <OpenOffice.org-minimal-version value="4.0" dep:name="Apache OpenOffice"/>
- <OpenOffice.org-maximal-version value="4.9" dep:name="Apache OpenOffice"/>
+ <OpenOffice.org-minimal-version value="4.0" dep:name="OpenOffice"/>
+ <OpenOffice.org-maximal-version value="4.9" dep:name="OpenOffice"/>
</dependencies>
<registration>
Modified: openoffice/branches/l10n/main/sdext/source/presenter/description.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sdext/source/presenter/description.xml?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sdext/source/presenter/description.xml (original)
+++ openoffice/branches/l10n/main/sdext/source/presenter/description.xml Fri Mar 15 09:24:52 2013
@@ -28,8 +28,8 @@
<identifier value="com.sun.PresenterScreen-UPDATED_SUPPORTED_PLATFORM" />
<dependencies>
- <OpenOffice.org-minimal-version value="4.0" dep:name="Apache OpenOffice"/>
- <OpenOffice.org-maximal-version value="4.9" dep:name="Apache OpenOffice"/>
+ <OpenOffice.org-minimal-version value="4.0" dep:name="OpenOffice"/>
+ <OpenOffice.org-maximal-version value="4.9" dep:name="OpenOffice"/>
</dependencies>
<registration>
Modified: openoffice/branches/l10n/main/set_soenv.in
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/set_soenv.in?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/set_soenv.in (original)
+++ openoffice/branches/l10n/main/set_soenv.in Fri Mar 15 09:24:52 2013
@@ -102,12 +102,12 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAV
$UPD, $WORK_STAMP, $SOURCE_ROOT_DIR , $gb_REPOS,
$SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $WORKDIR, $OUTDIR, $SOLARENV,
$STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI,
- $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH,
+ $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH, $CXX_X64_BINARY, $LINK_X64_BINARY, $LIBMGR_X64_BINARY,
$MSPDB_PATH, $MIDL_PATH, $CSC_PATH,
$PATH, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB,
$SOLARINC, $LOCALINI, $FRAMEWORKSHOME, $COMEX, $PERL,
$COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $USE_NEW_SDK, $FRAME_HOME,
- $USE_DIRECTX5, $ATL_LIB, $HAVE_ATLTHUNK, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $TMPDIR,
+ $USE_DIRECTX5, $ATL_LIB, $ATL_LIB_X64, $HAVE_ATLTHUNK, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $TMPDIR,
$COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
$WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD,
$PROEXT, $TARFILE_LOCATION,
@@ -695,6 +695,9 @@ elsif ( $platform =~ m/cygwin/ )
else # The MSVC section starts here
{ $outfile = "winenv.set";
$COMPATH = PathFormat('@COMPATH@');
+ $CXX_X64_BINARY = PathFormat('@COMPATH@/bin/amd64/cl.exe');
+ $LINK_X64_BINARY = PathFormat('@COMPATH@/bin/amd64/link.exe');
+ $LIBMGR_X64_BINARY = PathFormat('@COMPATH@/bin/amd64/lib.exe');
$COM = "MSC";
$OUTPATH = "wntmsci@COMEX@";
$INPATH = $OUTPATH.$PROEXT;
@@ -1726,6 +1729,9 @@ ToFile( "SOLAR_JAVA", $SOLAR_JAVA
ToFile( "BIG_SVX", $BIG_SVX, "e" );
ToFile( "COM", $COM, "e" );
ToFile( "COMPATH", $COMPATH, "e" );
+ToFile( "CXX_X64_BINARY", $CXX_X64_BINARY, "e" );
+ToFile( "LINK_X64_BINARY", $LINK_X64_BINARY, "e" );
+ToFile( "LIBMGR_X64_BINARY", $LIBMGR_X64_BINARY, "e" );
ToFile( "CPU", $CPU, "e" );
ToFile( "CPUNAME", $CPUNAME, "e" );
ToFile( "CVER", $CVER, "e" );
@@ -1768,6 +1774,7 @@ if ( $platform =~ m/cygwin/ )
ToFile( "DIRECTXSDK_LIB", $DIRECTXSDK_LIB, "e" );
ToFile( "USE_DIRECTX5", $USE_DIRECTX5, "e" );
ToFile( "ATL_LIB", "@ATL_LIB@", "e" );
+ ToFile( "ATL_LIB_X64", "@ATL_LIB_X64@", "e" );
ToFile( "ATL_INCLUDE", "@ATL_INCLUDE@", "e" );
ToFile( "HAVE_ATLTHUNK", "@HAVE_ATLTHUNK@", "e" );
ToFile( "MFC_LIB", "@MFC_LIB@", "e" );
@@ -1778,9 +1785,10 @@ if ( $platform =~ m/cygwin/ )
ToFile( "USE_NEW_SDK", $USE_NEW_SDK, "e" );
# Hack around dmake's mktmp not generating DOS paths.
- my $tmpdir = qx{cygpath -m "/tmp"};
- chomp($tmpdir);
- ToFile( "TMPDIR", $tmpdir, "e" );
+# my $tmpdir = qx{cygpath -m "/tmp"};
+# chomp($tmpdir);
+# ToFile( "TMPDIR", $tmpdir, "e" );
+ ToFile( "TMPDIR", "/tmp", "e" );
}
ToFile( "ENABLE_HUNSPELL", "@ENABLE_HUNSPELL@", "e" );
ToFile( "ENABLE_HYPHEN", "@ENABLE_HYPHEN@", "e" );
@@ -1862,6 +1870,7 @@ ToFile( "SYSTEM_GRAPHITE", "@SYSTEM_GR
ToFile( "GRAPHITE_LIBS", "@GRAPHITE_LIBS@", "e");
ToFile( "GRAPHITE_CFLAGS", "@GRAPHITE_CFLAGS@", "e");
ToFile( "VC_STANDARD", "@VC_STANDARD@", "e" );
+ToFile( "BUILD_X64", "@BUILD_X64@", "e" );
ToFile( "ENABLE_CATEGORY_B", "@ENABLE_CATEGORY_B@", "e");
ToFile( "BUNDLED_EXTENSION_BLOBS", "@BUNDLED_EXTENSION_BLOBS@", "e");
ToFile( "BUNDLED_PREREG_EXTENSIONS", "@BUNDLED_PREREG_EXTENSIONS@", "e");
Modified: openoffice/branches/l10n/main/setup_native/source/mac/ooo/DS_Store
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/setup_native/source/mac/ooo/DS_Store?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/l10n/main/setup_native/source/mac/ooo/DS_Store_Dev
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/setup_native/source/mac/ooo/DS_Store_Dev?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/l10n/main/setup_native/source/mac/ooo/DS_Store_Langpack
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/setup_native/source/mac/ooo/DS_Store_Langpack?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/l10n/main/setup_native/source/mac/ooo/osxdndinstall.png
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/setup_native/source/mac/ooo/osxdndinstall.png?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/l10n/main/setup_native/source/mac/sdk/DS_Store_SDK
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/setup_native/source/mac/sdk/DS_Store_SDK?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/l10n/main/setup_native/source/mac/sdk/osxdndinstall_sdk.png
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/setup_native/source/mac/sdk/osxdndinstall_sdk.png?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/l10n/main/setup_native/source/opensolaris/bundledextensions/README
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/setup_native/source/opensolaris/bundledextensions/README?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/setup_native/source/opensolaris/bundledextensions/README (original)
+++ openoffice/branches/l10n/main/setup_native/source/opensolaris/bundledextensions/README Fri Mar 15 09:24:52 2013
@@ -26,7 +26,7 @@ bundled extensions. This path changes wi
the version number which is part of a folder name. The
current value is:
-EXTENSIONPATH=/opt/apacheopenoffice3/share/extension/install
+EXTENSIONPATH=/opt/openoffice3/share/extension/install
The service was tested with OpenSolaris release 2009.6 and may not work with a
previous release.
@@ -38,7 +38,7 @@ What do these files do
The three files constitute a SMF service. When this service is started, then it
installes the bundled extensions which are contained in
-/opt/apacheopenoffice3/share/extension/install. To install them, the service calls
+/opt/openoffice3/share/extension/install. To install them, the service calls
"unopkg add --shared ..." with the appropriate arguments.
The service is started initially after the installation of
@@ -58,7 +58,7 @@ file in every release. Otherwise IPS wou
The update procedure of OOo will replace 'installed'. 'installed' is associated
with a restart_fmri of the service ooo_bundled_extensions. That is after
copying 'installed' the service will be restarted. It then installes all
-extensions contained in /opt/apacheopenoffice3/share/extension/install, because
+extensions contained in /opt/openoffice3/share/extension/install, because
the newly installed 'installed' file does not contain any entries yet, except
for the version string.
Modified: openoffice/branches/l10n/main/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions (original)
+++ openoffice/branches/l10n/main/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions Fri Mar 15 09:24:52 2013
@@ -49,11 +49,11 @@
#Create the folder which contains the temporary user installation
INSTDIR=`/usr/bin/mktemp -d "/tmp/userinstall.XXXXXX"`
-OOO_BASE_DIR="/opt/apacheopenoffice/basis${OOOBASEVERSION}"
+OOO_BASE_DIR="/opt/openoffice/basis${OOOBASEVERSION}"
case "$1" in
'start')
- EXTENSIONDIR=/opt/apacheopenoffice${OOOBRANDPACKAGEVERSION}/share/extension/install
+ EXTENSIONDIR=/opt/openoffice${OOOBRANDPACKAGEVERSION}/share/extension/install
for FILE in $EXTENSIONDIR/*.oxt
do
#We check if the file exist, because if there is no extension
@@ -70,7 +70,7 @@ case "$1" in
#list. That is, it has not been installed (with unopkg) yet.
#Therefore we do it now.
echo installing $FILE
- /opt/apacheopenoffice${OOOBRANDPACKAGEVERSION}/program/unopkg add --shared --bundled "$FILE" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
+ /opt/openoffice${OOOBRANDPACKAGEVERSION}/program/unopkg add --shared --bundled "$FILE" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
#Let us remember that this extensions has been installed
#by adding the path name of the extension to the file
#installed
@@ -98,7 +98,7 @@ case "$1" in
# #share/extension/install. Now we remove the installed
# #extension
# echo removing `basename $LINE`
-# /opt/apacheopenoffice${OOOBRANDPACKAGEVERSION}/program/unopkg remove --shared --bundled "`basename $LINE`" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
+# /opt/openoffice${OOOBRANDPACKAGEVERSION}/program/unopkg remove --shared --bundled "`basename $LINE`" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
# REMOVED=1
# else
# NEWCONTENT+=$LINE
Modified: openoffice/branches/l10n/main/setup_native/source/packinfo/shellscripts_brand.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/setup_native/source/packinfo/shellscripts_brand.txt?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/setup_native/source/packinfo/shellscripts_brand.txt (original)
+++ openoffice/branches/l10n/main/setup_native/source/packinfo/shellscripts_brand.txt Fri Mar 15 09:24:52 2013
@@ -44,11 +44,11 @@ Linux)
esac
# creating link to basis layer
-if [ -d $$BASISDIR/apacheopenoffice/basisBASISDIRECTORYVERSION ]
+if [ -d $$BASISDIR/openoffice/basisBASISDIRECTORYVERSION ]
then
- ln -s $$BASISDIR/apacheopenoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1
+ ln -s $$BASISDIR/openoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1
else
- ln -s ../apacheopenoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1
+ ln -s ../openoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1
fi
exit 0
Modified: openoffice/branches/l10n/main/setup_native/source/packinfo/shellscripts_core01.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/setup_native/source/packinfo/shellscripts_core01.txt?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/setup_native/source/packinfo/shellscripts_core01.txt (original)
+++ openoffice/branches/l10n/main/setup_native/source/packinfo/shellscripts_core01.txt Fri Mar 15 09:24:52 2013
@@ -44,11 +44,11 @@ Linux)
esac
# creating link to ure
-if [ -d $$UREDIR/apacheopenoffice/ure ]
+if [ -d $$UREDIR/openoffice/ure ]
then
- ln -s $$UREDIR/apacheopenoffice/ure $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1
+ ln -s $$UREDIR/openoffice/ure $$PRODUCTINSTALLLOCATION/openoffice/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1
else
- ln -s ../ure $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1
+ ln -s ../ure $$PRODUCTINSTALLLOCATION/openoffice/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1
fi
exit 0
@@ -80,11 +80,11 @@ Linux)
;;
esac
-if [ -h $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION/ure-link -a $$LASTUNINSTALL -eq 1 ]
+if [ -h $$PRODUCTINSTALLLOCATION/openoffice/basisBASISDIRECTORYVERSION/ure-link -a $$LASTUNINSTALL -eq 1 ]
then
- rm -f $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION/ure-link 2>/dev/null
- rmdir $$PRODUCTINSTALLLOCATION/apacheopenoffice/basisBASISDIRECTORYVERSION 2>/dev/null
- rmdir $$PRODUCTINSTALLLOCATION/apacheopenoffice 2>/dev/null
+ rm -f $$PRODUCTINSTALLLOCATION/openoffice/basisBASISDIRECTORYVERSION/ure-link 2>/dev/null
+ rmdir $$PRODUCTINSTALLLOCATION/openoffice/basisBASISDIRECTORYVERSION 2>/dev/null
+ rmdir $$PRODUCTINSTALLLOCATION/openoffice 2>/dev/null
fi
exit 0
Modified: openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx (original)
+++ openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx Fri Mar 15 09:24:52 2013
@@ -116,7 +116,7 @@ static BOOL CheckExtensionInRegistry( LP
{ // We will replace registration for our (former) own types, too
bRet = true;
}
- else if ( strncmp( szBuffer, "Apache OpenOffice.", 18 ) == 0 )
+ else if ( strncmp( szBuffer, "OpenOffice.", 11 ) == 0 )
{ // We will replace registration for our own types, too
bRet = true;
}
Modified: openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx (original)
+++ openoffice/branches/l10n/main/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx Fri Mar 15 09:24:52 2013
@@ -77,10 +77,10 @@ namespace /* private */
Registrar::Registrar(const RegistrationContextInformation& RegContext) :
m_ContextInformation(RegContext),
- FORWARD_KEY_PREFIX(L"Apache OpenOffice"),
+ FORWARD_KEY_PREFIX(L"OpenOffice"),
DEFAULT_VALUE_NAME(L""),
BACKUP_VALUE_NAME(L"Backup"),
- PRIVATE_BACKUP_KEY_NAME(L"Apache OpenOffice.reg4msdocmsi"),//PRIVATE_BACKUP_KEY_NAME(L"soffice6.bak"),
+ PRIVATE_BACKUP_KEY_NAME(L"OpenOffice.reg4msdocmsi"),//PRIVATE_BACKUP_KEY_NAME(L"soffice6.bak"),
REGISTRATION_STATE(L"Reg4MsDocState")
{
m_RootKey = WindowsRegistry().GetClassesRootKey();
Modified: openoffice/branches/l10n/main/setup_native/source/win32/customactions/relnotes/relnotes.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/setup_native/source/win32/customactions/relnotes/relnotes.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/setup_native/source/win32/customactions/relnotes/relnotes.cxx (original)
+++ openoffice/branches/l10n/main/setup_native/source/win32/customactions/relnotes/relnotes.cxx Fri Mar 15 09:24:52 2013
@@ -158,7 +158,7 @@ extern "C" UINT __stdcall ShowSurveyAfte
std::wstring prodname;
GetMsiProp( handle, TEXT("ProductName"), prodname );
- std::wstring::size_type nIndex = prodname.find( TEXT( "Apache OpenOffice" ) );
+ std::wstring::size_type nIndex = prodname.find( TEXT( "OpenOffice" ) );
if( std::wstring::npos == nIndex )
return ERROR_SUCCESS;
Modified: openoffice/branches/l10n/main/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx (original)
+++ openoffice/branches/l10n/main/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx Fri Mar 15 09:24:52 2013
@@ -54,10 +54,10 @@
</MSDN>
We add the following entries to the respective registry key
- "{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"="Apache OpenOffice Column Handler"
- "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"="Apache OpenOffice Infotip Handler"
- "{63542C48-9552-494A-84F7-73AA6A7C99C1}"="Apache OpenOffice Property Sheet Handler"
- "{3B092F0C-7696-40E3-A80F-68D74DA84210}"="Apache OpenOffice Thumbnail Viewer"
+ "{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"="OpenOffice Column Handler"
+ "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"="OpenOffice Infotip Handler"
+ "{63542C48-9552-494A-84F7-73AA6A7C99C1}"="OpenOffice Property Sheet Handler"
+ "{3B092F0C-7696-40E3-A80F-68D74DA84210}"="OpenOffice Thumbnail Viewer"
These shell extensions are implemented in the 'shell' project. We ignore registration
failures because of insufficient privileges. The reason is: On systems which restrict the
@@ -90,10 +90,10 @@ struct RegistryEntry
TCHAR* Value;
};
-RegistryEntry ColumnHandler = { TEXT("{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"), TEXT("Apache OpenOffice Column Handler") };
-RegistryEntry InfotipHandler = { TEXT("{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"), TEXT("Apache OpenOffice Infotip Handler") };
-RegistryEntry PropHandler = { TEXT("{63542C48-9552-494A-84F7-73AA6A7C99C1}"), TEXT("Apache OpenOffice Property Sheet Handler") };
-RegistryEntry ThumbViewer = { TEXT("{3B092F0C-7696-40E3-A80F-68D74DA84210}"), TEXT("Apache OpenOffice Thumbnail Viewer") };
+RegistryEntry ColumnHandler = { TEXT("{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"), TEXT("OpenOffice Column Handler") };
+RegistryEntry InfotipHandler = { TEXT("{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"), TEXT("OpenOffice Infotip Handler") };
+RegistryEntry PropHandler = { TEXT("{63542C48-9552-494A-84F7-73AA6A7C99C1}"), TEXT("OpenOffice Property Sheet Handler") };
+RegistryEntry ThumbViewer = { TEXT("{3B092F0C-7696-40E3-A80F-68D74DA84210}"), TEXT("OpenOffice Thumbnail Viewer") };
BOOL GetMsiProp( MSIHANDLE hMSI, const char* pPropName, char** ppValue )
{
Modified: openoffice/branches/l10n/main/setup_native/source/win32/nsis/ooobitmap.bmp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/setup_native/source/win32/nsis/ooobitmap.bmp?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/l10n/main/sfx2/inc/sfx2/event.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sfx2/inc/sfx2/event.hxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sfx2/inc/sfx2/event.hxx (original)
+++ openoffice/branches/l10n/main/sfx2/inc/sfx2/event.hxx Fri Mar 15 09:24:52 2013
@@ -25,6 +25,7 @@
#include "sal/config.h"
#include "sfx2/dllapi.h"
+#include "sfx2/sfx.hrc"
#include <tools/string.hxx>
#include <svl/hint.hxx>
#include <unotools/eventcfg.hxx>
@@ -33,6 +34,9 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/frame/XController2.hpp>
+#include <com/sun/star/view/PrintableState.hpp>
+
+namespace css = ::com::sun::star;
class SfxObjectShell;
@@ -66,22 +70,22 @@ public:
class SFX2_DLLPUBLIC SfxViewEventHint : public SfxEventHint
{
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 > xViewController;
+ ::com::sun::star::uno::Reference< css::frame::XController2 > xViewController;
public:
TYPEINFO();
- SfxViewEventHint( sal_uInt16 nId, const ::rtl::OUString& aName, SfxObjectShell *pObj, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController )
+ SfxViewEventHint( sal_uInt16 nId, const ::rtl::OUString& aName, SfxObjectShell *pObj, const css::uno::Reference< css::frame::XController >& xController )
: SfxEventHint( nId, aName, pObj )
- , xViewController( xController, ::com::sun::star::uno::UNO_QUERY )
+ , xViewController( xController, css::uno::UNO_QUERY )
{}
- SfxViewEventHint( sal_uInt16 nId, const ::rtl::OUString& aName, SfxObjectShell *pObj, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& xController )
+ SfxViewEventHint( sal_uInt16 nId, const ::rtl::OUString& aName, SfxObjectShell *pObj, const css::uno::Reference< css::frame::XController2 >& xController )
: SfxEventHint( nId, aName, pObj )
, xViewController( xController )
{}
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 > GetController() const
+ css::uno::Reference< css::frame::XController2 > GetController() const
{ return xViewController; }
};
@@ -116,23 +120,35 @@ public:
};
class Printer;
-class SfxPrintingHint : public SfxHint
+
+class SfxPrintingHint : public SfxViewEventHint
{
- sal_Int32 nWhich;
- com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aOpts;
+ sal_Int32 mnPrintableState;
+ com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aOpts;
public:
- TYPEINFO();
- SfxPrintingHint( sal_Int32 nEvent, const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& rOpts )
- : nWhich( nEvent )
- , aOpts( rOpts )
- {}
+ TYPEINFO();
- SfxPrintingHint( sal_Int32 nEvent )
- : nWhich( nEvent )
- {}
+ SfxPrintingHint(
+ sal_Int32 nEvent,
+ const css::uno::Sequence < css::beans::PropertyValue >& rOpts,
+ SfxObjectShell *pObj,
+ const css::uno::Reference< css::frame::XController2 >& xController )
+ : SfxViewEventHint(
+ SFX_EVENT_PRINTDOC,
+ GlobalEventConfig::GetEventName( STR_EVENT_PRINTDOC ),
+ pObj,
+ xController )
+ , mnPrintableState( nEvent )
+ , aOpts( rOpts )
+ {}
+
+ SfxPrintingHint( sal_Int32 nEvent )
+ : SfxViewEventHint( SFX_EVENT_PRINTDOC, rtl::OUString(), 0, css::uno::Reference< css::frame::XController >() )
+ , mnPrintableState( nEvent )
+ {}
- sal_Int32 GetWhich() const { return nWhich; }
- const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& GetOptions() { return aOpts; }
+ sal_Int32 GetWhich() const { return mnPrintableState; }
+ const css::uno::Sequence < css::beans::PropertyValue >& GetOptions() { return aOpts; }
};
#endif
Modified: openoffice/branches/l10n/main/sfx2/source/doc/printhelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sfx2/source/doc/printhelper.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sfx2/source/doc/printhelper.cxx (original)
+++ openoffice/branches/l10n/main/sfx2/source/doc/printhelper.cxx Fri Mar 15 09:24:52 2013
@@ -60,6 +60,8 @@
#include <sfx2/objsh.hxx>
#include <sfx2/event.hxx>
+#define SFX_PRINTABLESTATE_CANCELJOB -2
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -143,7 +145,7 @@ void SAL_CALL SfxPrintJob_Impl::cancelJo
{
// FIXME: how to cancel PrintJob via API?!
if( m_pData->m_pObjectShell.Is() )
- m_pData->m_pObjectShell->Broadcast( SfxPrintingHint( -2 ) );
+ m_pData->m_pObjectShell->Broadcast( SfxPrintingHint( SFX_PRINTABLESTATE_CANCELJOB ) );
}
SfxPrintHelper::SfxPrintHelper()
@@ -785,32 +787,31 @@ void SAL_CALL SfxPrintHelper::print(cons
void IMPL_PrintListener_DataContainer::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
- if ( &rBC == m_pObjectShell )
- {
- SfxPrintingHint* pPrintHint = PTR_CAST( SfxPrintingHint, &rHint );
- if ( pPrintHint )
- {
- if ( pPrintHint->GetWhich() == com::sun::star::view::PrintableState_JOB_STARTED )
- {
- if ( !m_xPrintJob.is() )
- m_xPrintJob = new SfxPrintJob_Impl( this );
- m_aPrintOptions = pPrintHint->GetOptions();
- }
- else if ( pPrintHint->GetWhich() != -2 ) // -2 : CancelPrintJob
- {
- view::PrintJobEvent aEvent;
- aEvent.Source = m_xPrintJob;
- aEvent.State = (com::sun::star::view::PrintableState) pPrintHint->GetWhich();
- ::cppu::OInterfaceContainerHelper* pContainer = m_aInterfaceContainer.getContainer( ::getCppuType( ( const uno::Reference< view::XPrintJobListener >*) NULL ) );
- if ( pContainer!=NULL )
- {
- ::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
- while (pIterator.hasMoreElements())
- ((view::XPrintJobListener*)pIterator.next())->printJobEvent( aEvent );
- }
- }
- }
- }
+ SfxPrintingHint* pPrintHint = PTR_CAST( SfxPrintingHint, &rHint );
+ if ( &rBC != m_pObjectShell
+ || !pPrintHint
+ || pPrintHint->GetWhich() == SFX_PRINTABLESTATE_CANCELJOB )
+ return;
+
+ if ( pPrintHint->GetWhich() == com::sun::star::view::PrintableState_JOB_STARTED )
+ {
+ if ( !m_xPrintJob.is() )
+ m_xPrintJob = new SfxPrintJob_Impl( this );
+ m_aPrintOptions = pPrintHint->GetOptions();
+ }
+
+ ::cppu::OInterfaceContainerHelper* pContainer = m_aInterfaceContainer.getContainer(
+ ::getCppuType( ( const uno::Reference< view::XPrintJobListener >*) NULL ) );
+ if ( !pContainer )
+ return;
+
+ view::PrintJobEvent aEvent;
+ aEvent.Source = m_xPrintJob;
+ aEvent.State = (com::sun::star::view::PrintableState) pPrintHint->GetWhich();
+
+ ::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
+ while (pIterator.hasMoreElements())
+ ((view::XPrintJobListener*)pIterator.next())->printJobEvent( aEvent );
}
void SAL_CALL SfxPrintHelper::addPrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
Modified: openoffice/branches/l10n/main/sfx2/source/view/viewprn.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sfx2/source/view/viewprn.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sfx2/source/view/viewprn.cxx (original)
+++ openoffice/branches/l10n/main/sfx2/source/view/viewprn.cxx Fri Mar 15 09:24:52 2013
@@ -25,7 +25,6 @@
#include "precompiled_sfx2.hxx"
#include <com/sun/star/document/XDocumentProperties.hpp>
-#include <com/sun/star/view/PrintableState.hpp>
#include "com/sun/star/view/XRenderable.hpp"
#include <svl/itempool.hxx>
@@ -61,7 +60,7 @@
using namespace com::sun::star;
using namespace com::sun::star::uno;
-TYPEINIT1(SfxPrintingHint, SfxHint);
+TYPEINIT1(SfxPrintingHint, SfxViewEventHint);
// -----------------------------------------------------------------------
class SfxPrinterController : public vcl::PrinterController, public SfxListener
@@ -305,9 +304,15 @@ void SfxPrinterController::jobStarted()
now.Get100Sec(), now.GetSec(), now.GetMin(), now.GetHour(),
now.GetDay(), now.GetMonth(), now.GetYear() ) );
- // FIXME: how to get all print options incl. AdditionalOptions easily?
uno::Sequence < beans::PropertyValue > aOpts;
- mpObjectShell->Broadcast( SfxPrintingHint( view::PrintableState_JOB_STARTED, aOpts ) );
+ aOpts = getJobProperties( aOpts );
+
+ uno::Reference< frame::XController2 > xController;
+ if ( mpViewShell )
+ xController.set( mpViewShell->GetController(), uno::UNO_QUERY );
+
+ mpObjectShell->Broadcast( SfxPrintingHint(
+ view::PrintableState_JOB_STARTED, aOpts, mpObjectShell, xController ) );
}
}
Modified: openoffice/branches/l10n/main/shell/inc/internal/config.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/inc/internal/config.hxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/inc/internal/config.hxx (original)
+++ openoffice/branches/l10n/main/shell/inc/internal/config.hxx Fri Mar 15 09:24:52 2013
@@ -40,10 +40,10 @@
#define MODULE_NAME_FILTER TEXT("ooofilt.dll")
#endif
-#define COLUMN_HANDLER_DESCRIPTIVE_NAME TEXT("Apache OpenOffice Column Handler")
-#define INFOTIP_HANDLER_DESCRIPTIVE_NAME TEXT("Apache OpenOffice Infotip Handler")
-#define PROPSHEET_HANDLER_DESCRIPTIVE_NAME TEXT("Apache OpenOffice Property Sheet Handler")
-#define THUMBVIEWER_HANDLER_DESCRIPTIVAE_NAME TEXT("Apache OpenOffice Thumbnail Viewer")
+#define COLUMN_HANDLER_DESCRIPTIVE_NAME TEXT("OpenOffice Column Handler")
+#define INFOTIP_HANDLER_DESCRIPTIVE_NAME TEXT("OpenOffice Infotip Handler")
+#define PROPSHEET_HANDLER_DESCRIPTIVE_NAME TEXT("OpenOffice Property Sheet Handler")
+#define THUMBVIEWER_HANDLER_DESCRIPTIVAE_NAME TEXT("OpenOffice Thumbnail Viewer")
#define META_CONTENT_NAME "meta.xml"
#define DOC_CONTENT_NAME "content.xml"
Modified: openoffice/branches/l10n/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx (original)
+++ openoffice/branches/l10n/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx Fri Mar 15 09:24:52 2013
@@ -1225,7 +1225,7 @@ namespace /* private */
SubstitutePlaceholder(ClsidEntry_Persist, GUID_PLACEHOLDER, ClsidToString(PersistentGuid));
- if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry_Persist.c_str(), "", "Apache OpenOffice Persistent Handler"))
+ if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry_Persist.c_str(), "", "OpenOffice Persistent Handler"))
return E_FAIL;
// Add missing entry
Modified: openoffice/branches/l10n/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx (original)
+++ openoffice/branches/l10n/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx Fri Mar 15 09:24:52 2013
@@ -56,11 +56,11 @@ struct PROPERTYMAP
PROPERTYMAP g_rgPROPERTYMAP[] =
{
- { 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" },
+ { PKEY_Title, L"OpenOffice", L"Title" },
+ { PKEY_Author, L"OpenOffice", L"Author" },
+ { PKEY_Subject, L"OpenOffice", L"Subject" },
+ { PKEY_Keywords, L"OpenOffice", L"Keyword" },
+ { PKEY_Comment, L"OpenOffice", L"Comments" },
};
size_t gPropertyMapTableSize = sizeof(g_rgPROPERTYMAP)/sizeof(g_rgPROPERTYMAP[0]);
Modified: openoffice/branches/l10n/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest (original)
+++ openoffice/branches/l10n/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest Fri Mar 15 09:24:52 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="Apache_OpenOffice.shlxthdl" type="win32" />
-<description>Apache OpenOffice Shell Extension</description>
+<description>OpenOffice Shell Extension</description>
<dependency>
<dependentAssembly>
<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86"
Modified: openoffice/branches/l10n/main/shell/source/win32/sysmail/sysmailclient.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/source/win32/sysmail/sysmailclient.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/source/win32/sysmail/sysmailclient.cxx (original)
+++ openoffice/branches/l10n/main/shell/source/win32/sysmail/sysmailclient.cxx Fri Mar 15 09:24:52 2013
@@ -129,7 +129,7 @@ namespace /* private */
{
rtl::OUString altSenddocUrl;
HKEY hkey;
- LONG lret = RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\Apache OpenOffice\\SendAsEMailClient", &hkey);
+ LONG lret = RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\OpenOffice\\SendAsEMailClient", &hkey);
if (lret == ERROR_SUCCESS)
{
wchar_t buff[MAX_PATH];
Modified: openoffice/branches/l10n/main/solenv/bin/make_installer.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/solenv/bin/make_installer.pl?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/solenv/bin/make_installer.pl (original)
+++ openoffice/branches/l10n/main/solenv/bin/make_installer.pl Fri Mar 15 09:24:52 2013
@@ -339,7 +339,7 @@ if ( $installer::globals::iswindowsbuild
####################################################################
# MacOS dmg build requires special DS_Store file to arrange icons
####################################################################
-if (($installer::globals::ismacdmgbuild) && ($installer::globals::product eq "OpenOffice_Dev")) { $installer::globals::devsnapshotbuild = 1; }
+if (($installer::globals::ismacdmgbuild) && ($installer::globals::product =~ /OpenOffice_Dev/)) { $installer::globals::devsnapshotbuild = 1; }
#####################################################################
# Including additional inc files for variable settings, if defined
Modified: openoffice/branches/l10n/main/solenv/bin/modules/installer/download.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/solenv/bin/modules/installer/download.pm?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/solenv/bin/modules/installer/download.pm (original)
+++ openoffice/branches/l10n/main/solenv/bin/modules/installer/download.pm Fri Mar 15 09:24:52 2013
@@ -472,7 +472,7 @@ sub get_downloadname_productname
else
{
$start = "Apache_OpenOffice";
- if ( $allvariables->{'PRODUCTNAME'} eq "Apache OpenOffice" )
+ if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice" )
{
if ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )
{
Modified: openoffice/branches/l10n/main/solenv/bin/modules/installer/epmfile.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/solenv/bin/modules/installer/epmfile.pm?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/solenv/bin/modules/installer/epmfile.pm (original)
+++ openoffice/branches/l10n/main/solenv/bin/modules/installer/epmfile.pm Fri Mar 15 09:24:52 2013
@@ -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 = "apacheopenoffice3/program/" . $licensefilename;
+ my $licpath = "openoffice4/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 'apache openoffice' )
+ if ( $installer::globals::debian && $variableshashref->{'UNIXPRODUCTNAME'} eq 'openoffice' )
{
$line = "%provides" . " openoffice.org-unbundled\n";
push(@epmheader, $line);
@@ -3435,7 +3435,6 @@ sub finalize_linux_patch
my $productname = $allvariables->{'PRODUCTNAME'};
$productname = lc($productname);
$productname =~ s/ /_/g; # abc office -> abc_office
-# $productname =~ s/\.//g; # openoffice.org -> openofficeorg
$infoline = "Adding productname $productname into Linux patch script\n";
push( @installer::globals::logfileinfo, $infoline);
Modified: openoffice/branches/l10n/main/solenv/bin/modules/installer/simplepackage.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/solenv/bin/modules/installer/simplepackage.pm?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/solenv/bin/modules/installer/simplepackage.pm (original)
+++ openoffice/branches/l10n/main/solenv/bin/modules/installer/simplepackage.pm Fri Mar 15 09:24:52 2013
@@ -333,7 +333,7 @@ sub replace_variables_in_scriptfile
replace_one_variable_in_shellscript($scriptfile, $allvariables->{'PRODUCTVERSION'}, "PRODUCTVERSION" );
my $scriptname = lc($allvariables->{'PRODUCTNAME'}) . "\.script";
- if ( $allvariables->{'PRODUCTNAME'} eq "Apache OpenOffice" )
+ if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice" )
{
$scriptname = "org.openoffice.script";
}
Modified: openoffice/branches/l10n/main/solenv/bin/modules/installer/windows/property.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/solenv/bin/modules/installer/windows/property.pm?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/solenv/bin/modules/installer/windows/property.pm (original)
+++ openoffice/branches/l10n/main/solenv/bin/modules/installer/windows/property.pm Fri Mar 15 09:24:52 2013
@@ -479,10 +479,6 @@ sub update_property_table
my $arpcomments = get_arpcomments_for_property_table($allvariables, $languagestringref);
my $installlevel = get_installlevel_for_property_table();
my $ischeckforproductupdates = get_ischeckforproductupdates_for_property_table();
-# my $manufacturer = get_manufacturer_for_property_table();
-# tweak publisher name in the registry to OOOVENDOR=Apache Software Foundation. The global change of the
-# manufacturer from "OpenOffice.org" to "Apache Software Foundation" requires more analysis and testing
-# because more registry entries/keys are potentially affected. For example test product updates etc.
my $manufacturer = $allvariables->{'OOOVENDOR'};
my $productlanguage = get_productlanguage_for_property_table($language);
my $productname = get_productname_for_property_table($allvariables);
Modified: openoffice/branches/l10n/main/solenv/bin/modules/installer/ziplist.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/solenv/bin/modules/installer/ziplist.pm?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/solenv/bin/modules/installer/ziplist.pm (original)
+++ openoffice/branches/l10n/main/solenv/bin/modules/installer/ziplist.pm Fri Mar 15 09:24:52 2013
@@ -639,7 +639,7 @@ sub set_manufacturer
{
my ($allvariables) = @_;
- my $openofficeproductname = "Apache OpenOffice";
+ my $openofficeproductname = "OpenOffice";
my $sunname = "";
Modified: openoffice/branches/l10n/main/solenv/inc/set_wntx64.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/solenv/inc/set_wntx64.mk?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/solenv/inc/set_wntx64.mk (original)
+++ openoffice/branches/l10n/main/solenv/inc/set_wntx64.mk Fri Mar 15 09:24:52 2013
@@ -110,7 +110,7 @@ STDSLOCUI_X64=
IMPLIBFLAGS_X64=-machine:X64
-LIBPATH_X64=$(PSDK)/lib/x64
+LIBPATH_X64=$(PSDK_HOME)/lib/x64
LIBPATH_VC_X64=$(COMPATH)/lib/amd64
ADVAPI32LIB_X64=$(LIBPATH_X64)/advapi32.lib
Modified: openoffice/branches/l10n/main/svl/inc/svl/svarray.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/svl/inc/svl/svarray.hxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/svl/inc/svl/svarray.hxx (original)
+++ openoffice/branches/l10n/main/svl/inc/svl/svarray.hxx Fri Mar 15 09:24:52 2013
@@ -25,6 +25,12 @@
#define _SVARRAY_HXX
#if 0
+// Nobody wants to touch this code, not even with a ten-foot pole.
+// If one has to read it then the following mapping might be useful:
+// "nm" seems to be "type name" of the array
+// "AE" means "type of array element"
+// "IS" means "initial size", i.e. the initial number of elements
+// "GS" means "growth size"
***********************************************************************
*
* Hier folgt die Beschreibung fuer die exportierten Makros:
@@ -763,23 +769,9 @@ SV_IMPL_VARARR(nm##_SAR, AE)\
_SV_IMPL_SORTAR_ALG( nm,AE )\
_SV_SEEK_OBJECT( nm,AE )
-#if defined (C40) || defined (C41) || defined (C42) || defined(C50) || defined(C52)
-#define C40_INSERT( c, p, n) Insert( (c const *) p, n )
-#define C40_PTR_INSERT( c, p) Insert( (c const *) p )
-#define C40_REPLACE( c, p, n) Replace( (c const *) p, n )
-#define C40_GETPOS( c, r) GetPos( (c const *)r )
-#else
-#if defined WTC || defined ICC || defined HPUX || (defined GCC && __GNUC__ >= 3) || (defined(WNT) && _MSC_VER >= 1400)
#define C40_INSERT( c, p, n ) Insert( (c const *&) p, n )
#define C40_PTR_INSERT( c, p ) Insert( (c const *&) p )
#define C40_REPLACE( c, p, n ) Replace( (c const *&) p, n )
#define C40_GETPOS( c, r) GetPos( (c const *&) r )
-#else
-#define C40_INSERT( c, p, n ) Insert( p, n )
-#define C40_PTR_INSERT( c, p ) Insert( p )
-#define C40_REPLACE( c, p, n ) Replace( p, n )
-#define C40_GETPOS( c, r) GetPos( r )
-#endif
-#endif
#endif //_SVARRAY_HXX
Modified: openoffice/branches/l10n/main/svl/source/misc/mediatyp.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/svl/source/misc/mediatyp.src?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/svl/source/misc/mediatyp.src (original)
+++ openoffice/branches/l10n/main/svl/source/misc/mediatyp.src Fri Mar 15 09:24:52 2013
@@ -539,42 +539,42 @@ String STR_SVT_MIMETYPE_INET_MULTI_MIXED
String STR_SVT_MIMETYPE_APP_SXCALC
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet" ;
};
String STR_SVT_MIMETYPE_APP_SXCHART
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Chart" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Chart" ;
};
String STR_SVT_MIMETYPE_APP_SXDRAW
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Drawing" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Drawing" ;
};
String STR_SVT_MIMETYPE_APP_SXMATH
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Formula" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Formula" ;
};
String STR_SVT_MIMETYPE_APP_SXWRITER
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Text Document" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Text Document" ;
};
String STR_SVT_MIMETYPE_APP_SXIMPRESS
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentation" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Presentation" ;
};
String STR_SVT_MIMETYPE_APP_SXGLOBAL
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Master Document" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Master Document" ;
};
String STR_SVT_MIMETYPE_APP_SXIPACKED
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentation (packed)" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Presentation (packed)" ;
};
Modified: openoffice/branches/l10n/main/svtools/source/misc/imagemgr.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/svtools/source/misc/imagemgr.src?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/svtools/source/misc/imagemgr.src (original)
+++ openoffice/branches/l10n/main/svtools/source/misc/imagemgr.src Fri Mar 15 09:24:52 2013
@@ -327,19 +327,19 @@ String STR_DESCRIPTION_FACTORY_DATABASE
};
String STR_DESCRIPTION_CALC_TEMPLATE
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet Template" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet Template" ;
};
String STR_DESCRIPTION_DRAW_TEMPLATE
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Drawing Template" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Drawing Template" ;
};
String STR_DESCRIPTION_IMPRESS_TEMPLATE
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentation Template" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Presentation Template" ;
};
String STR_DESCRIPTION_WRITER_TEMPLATE
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Text Document Template" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Text Document Template" ;
};
String STR_DESCRIPTION_LOCALE_VOLUME
{
@@ -374,37 +374,37 @@ String STR_DESCRIPTION_POWERPOINT_SHOW
String STR_DESCRIPTION_SXMATH_DOC
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Formula" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Formula" ;
};
String STR_DESCRIPTION_SXCHART_DOC
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Chart" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Chart" ;
};
String STR_DESCRIPTION_SXDRAW_DOC
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Drawing" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Drawing" ;
};
String STR_DESCRIPTION_SXCALC_DOC
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet" ;
};
String STR_DESCRIPTION_SXIMPRESS_DOC
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentation" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Presentation" ;
};
String STR_DESCRIPTION_SXWRITER_DOC
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Text Document" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Text Document" ;
};
String STR_DESCRIPTION_SXGLOBAL_DOC
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Master Document" ;
+ Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Master Document" ;
};
String STR_DESCRIPTION_MATHML_DOC
{
Modified: openoffice/branches/l10n/main/svx/inc/svx/EnhancedCustomShapeGeometry.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/svx/inc/svx/EnhancedCustomShapeGeometry.hxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/svx/inc/svx/EnhancedCustomShapeGeometry.hxx (original)
+++ openoffice/branches/l10n/main/svx/inc/svx/EnhancedCustomShapeGeometry.hxx Fri Mar 15 09:24:52 2013
@@ -83,7 +83,13 @@ struct mso_CustomShape
sal_uInt32 nHandles;
};
-#define MSO_I | (sal_Int32)0x80000000
+// 0x80000000 is used as magic constant all over the customshape code where
+// it is squeezed into signed int32 type that cannot preserve this value. Good
+// compilers notice the problem and have every right to complain or error-out.
+// Using the magic constant already casted down consolidates the problem and is
+// the least invasive way to fix it until the code gets its well deserved makeover.
+#define Mx80000000 static_cast<sal_Int32>(0x80000000)
+#define MSO_I | Mx80000000
sal_Bool SortFilledObjectsToBackByDefault( MSO_SPT eSpType );
SVX_DLLPUBLIC sal_Bool IsCustomShapeFilledByDefault( MSO_SPT eSpType );
Modified: openoffice/branches/l10n/main/svx/source/customshapes/EnhancedCustomShape2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/svx/source/customshapes/EnhancedCustomShape2d.cxx?rev=1456826&r1=1456825&r2=1456826&view=diff
==============================================================================
--- openoffice/branches/l10n/main/svx/source/customshapes/EnhancedCustomShape2d.cxx (original)
+++ openoffice/branches/l10n/main/svx/source/customshapes/EnhancedCustomShape2d.cxx Fri Mar 15 09:24:52 2013
@@ -697,8 +697,8 @@ EnhancedCustomShape2d::EnhancedCustomSha
nCoordTop ( 0 ),
nCoordWidth ( 21600 ),
nCoordHeight ( 21600 ),
- nXRef ( 0x80000000 ),
- nYRef ( 0x80000000 ),
+ nXRef ( Mx80000000 ),
+ nYRef ( Mx80000000 ),
nFlags ( 0 ),
nColorData ( 0 ),
bTextFlow ( sal_False ),
@@ -798,7 +798,7 @@ EnhancedCustomShape2d::EnhancedCustomSha
}
fXScale = nCoordWidth == 0 ? 0.0 : (double)aLogicRect.GetWidth() / (double)nCoordWidth;
fYScale = nCoordHeight == 0 ? 0.0 : (double)aLogicRect.GetHeight() / (double)nCoordHeight;
- if ( (sal_uInt32)nXRef != 0x80000000 && aLogicRect.GetHeight() )
+ if( (nXRef != Mx80000000) && aLogicRect.GetHeight() )
{
fXRatio = (double)aLogicRect.GetWidth() / (double)aLogicRect.GetHeight();
if ( fXRatio > 1 )
@@ -808,7 +808,7 @@ EnhancedCustomShape2d::EnhancedCustomSha
}
else
fXRatio = 1.0;
- if ( (sal_uInt32)nYRef != 0x80000000 && aLogicRect.GetWidth() )
+ if( (nYRef != Mx80000000) && aLogicRect.GetWidth() )
{
fYRatio = (double)aLogicRect.GetHeight() / (double)aLogicRect.GetWidth();
if ( fYRatio > 1 )