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/02/06 20:19:16 UTC
svn commit: r1443148 - in /openoffice/branches/l10n: ./
ext_libraries/ratscan/scan/ main/connectivity/source/manager/
main/desktop/source/deployment/ main/desktop/source/deployment/inc/
main/instsetoo_native/util/ main/l10ntools/source/ main/odk/ main/...
Author: jani
Date: Wed Feb 6 19:19:15 2013
New Revision: 1443148
URL: http://svn.apache.org/viewvc?rev=1443148&view=rev
Log:
merge from trunk
Modified:
openoffice/branches/l10n/ (props changed)
openoffice/branches/l10n/ext_libraries/ratscan/scan/makefile.mk
openoffice/branches/l10n/ext_libraries/ratscan/scan/rat-scan.xml
openoffice/branches/l10n/main/connectivity/source/manager/mdrivermanager.cxx
openoffice/branches/l10n/main/connectivity/source/manager/mdrivermanager.hxx
openoffice/branches/l10n/main/desktop/source/deployment/dp_persmap.cxx
openoffice/branches/l10n/main/desktop/source/deployment/inc/dp_persmap.h
openoffice/branches/l10n/main/instsetoo_native/util/openoffice.lst
openoffice/branches/l10n/main/l10ntools/source/gConSrc.hxx
openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx
openoffice/branches/l10n/main/l10ntools/source/gConSrclex.l
openoffice/branches/l10n/main/odk/cfgWin.js
openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/Makefile
openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk
openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/xml/description.xml
openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/Makefile
openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk
openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/xml/description.xml
openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/Makefile
openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk
openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/xml/description.xml
openoffice/branches/l10n/main/odk/examples/cpp/custompanel/description.xml
openoffice/branches/l10n/main/odk/setsdkenv_unix.sh.in
openoffice/branches/l10n/main/odk/setsdkenv_windows.template
openoffice/branches/l10n/main/odk/util/makefile.pmk
openoffice/branches/l10n/main/offapi/com/sun/star/awt/PrinterServer.idl
openoffice/branches/l10n/main/offapi/com/sun/star/ui/XStatusbarItem.idl
openoffice/branches/l10n/main/sdext/source/minimizer/description.xml
openoffice/branches/l10n/main/sdext/source/pdfimport/config/description.xml
openoffice/branches/l10n/main/sdext/source/presenter/description.xml
openoffice/branches/l10n/main/solenv/gbuild/platform/windows.mk
openoffice/branches/l10n/main/solenv/inc/minor.mk
openoffice/branches/l10n/main/solenv/inc/version.lst
openoffice/branches/l10n/main/swext/mediawiki/src/description.xml
openoffice/branches/l10n/main/sysui/desktop/debian/makefile.mk
openoffice/branches/l10n/main/sysui/desktop/productversion.mk
openoffice/branches/l10n/main/sysui/desktop/slackware/makefile.mk
openoffice/branches/l10n/test/ (props changed)
openoffice/branches/l10n/test/testcommon/source/org/openoffice/test/Run.help
openoffice/branches/l10n/test/testcommon/source/org/openoffice/test/vcl/ (props changed)
openoffice/branches/l10n/test/testgui/source/fvt/gui/sc/validity/ValidityDialogSetting.java
openoffice/branches/l10n/test/testuno/source/fvt/uno/sd/shape/ShapeProperties.java
Propchange: openoffice/branches/l10n/
------------------------------------------------------------------------------
Merged /openoffice/trunk:r1441902-1443136
Modified: openoffice/branches/l10n/ext_libraries/ratscan/scan/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/ext_libraries/ratscan/scan/makefile.mk?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/ext_libraries/ratscan/scan/makefile.mk (original)
+++ openoffice/branches/l10n/ext_libraries/ratscan/scan/makefile.mk Wed Feb 6 19:19:15 2013
@@ -23,7 +23,7 @@ PRJ=..
.INCLUDE : settings.mk
-version=3.5
+version=4.0
.IF "$(RAT_JAR_HOME)"=="BUILD"
rat_jar_home=$(CLASSDIR)
Modified: openoffice/branches/l10n/ext_libraries/ratscan/scan/rat-scan.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/ext_libraries/ratscan/scan/rat-scan.xml?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/ext_libraries/ratscan/scan/rat-scan.xml (original)
+++ openoffice/branches/l10n/ext_libraries/ratscan/scan/rat-scan.xml Wed Feb 6 19:19:15 2013
@@ -25,7 +25,7 @@
<description>
Check over Apache OpenOffice source files for license headers.
</description>
- <property name="version" value="AOO 3.5"/>
+ <property name="version" value="AOO 4.0"/>
<property environment="env"/>
<property name="src-dir" location="${env.SRC_ROOT}/.."/>
Modified: openoffice/branches/l10n/main/connectivity/source/manager/mdrivermanager.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/connectivity/source/manager/mdrivermanager.cxx?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/connectivity/source/manager/mdrivermanager.cxx (original)
+++ openoffice/branches/l10n/main/connectivity/source/manager/mdrivermanager.cxx Wed Feb 6 19:19:15 2013
@@ -119,6 +119,9 @@ Any SAL_CALL ODriverEnumeration::nextEle
/// an STL functor which ensures that a SdbcDriver described by a DriverAccess is loaded
struct EnsureDriver : public ::std::unary_function< DriverAccess, DriverAccess >
{
+ EnsureDriver( const Reference< XComponentContext > &rxContext )
+ : mxContext( rxContext ) {}
+
const DriverAccess& operator()( const DriverAccess& _rDescriptor ) const
{
if ( !_rDescriptor.xDriver.is() )
@@ -126,9 +129,12 @@ Any SAL_CALL ODriverEnumeration::nextEle
if ( _rDescriptor.xComponentFactory.is() )
// we have a factory for it
const_cast< DriverAccess& >( _rDescriptor ).xDriver = _rDescriptor.xDriver.query(
- _rDescriptor.xComponentFactory->createInstanceWithContext( _rDescriptor.xUNOContext ) );
+ _rDescriptor.xComponentFactory->createInstanceWithContext( mxContext ) );
return _rDescriptor;
}
+
+ private:
+ Reference< XComponentContext > mxContext;
};
//---------------------------------------------------------------------
@@ -150,7 +156,8 @@ Any SAL_CALL ODriverEnumeration::nextEle
/// an STL functor which loads a driver described by a DriverAccess, and extracts the SdbcDriver
struct ExtractAfterLoad : public ExtractAfterLoad_BASE
{
- ExtractAfterLoad() : ExtractAfterLoad_BASE( ExtractDriverFromAccess(), EnsureDriver() ) { }
+ ExtractAfterLoad( const Reference< XComponentContext > &rxContext )
+ : ExtractAfterLoad_BASE( ExtractDriverFromAccess(), EnsureDriver( rxContext ) ) {}
};
//---------------------------------------------------------------------
@@ -338,7 +345,6 @@ void OSDBCDriverManager::bootstrapDriver
{ // yes -> no need to load the driver immediately (load it later when needed)
aDriverDescriptor.sImplementationName = xSI->getImplementationName();
aDriverDescriptor.xComponentFactory = xFactory;
- aDriverDescriptor.xUNOContext = m_aContext.getUNOContext();
bValidDescriptor = sal_True;
m_aEventLogger.log( LogLevel::CONFIG,
@@ -523,7 +529,7 @@ Reference< XEnumeration > SAL_CALL OSDBC
ODriverEnumeration::DriverArray aDrivers;
// ensure that all our bootstrapped drivers are insatntiated
- ::std::for_each( m_aDriversBS.begin(), m_aDriversBS.end(), EnsureDriver() );
+ ::std::for_each( m_aDriversBS.begin(), m_aDriversBS.end(), EnsureDriver( m_aContext.getUNOContext() ) );
// copy the bootstrapped drivers
::std::transform(
@@ -704,13 +710,13 @@ Reference< XDriver > OSDBCDriverManager:
aFind = ::std::find_if(
m_aDriversBS.begin(), // begin of search range
m_aDriversBS.end(), // end of search range
- std::unary_compose< AcceptsURL, ExtractAfterLoad >( AcceptsURL( _rURL ), ExtractAfterLoad() )
+ std::unary_compose< AcceptsURL, ExtractAfterLoad >( AcceptsURL( _rURL ), ExtractAfterLoad( m_aContext.getUNOContext() ) )
// compose two functors: extract the driver from the access, then ask the resulting driver for acceptance
);
} // if ( m_aDriversBS.find(sDriverFactoryName ) == m_aDriversBS.end() )
else
{
- EnsureDriver aEnsure;
+ EnsureDriver aEnsure( m_aContext.getUNOContext() );
aEnsure(*aFind);
}
Modified: openoffice/branches/l10n/main/connectivity/source/manager/mdrivermanager.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/connectivity/source/manager/mdrivermanager.hxx?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/connectivity/source/manager/mdrivermanager.hxx (original)
+++ openoffice/branches/l10n/main/connectivity/source/manager/mdrivermanager.hxx Wed Feb 6 19:19:15 2013
@@ -50,12 +50,10 @@ namespace drivermanager
DECLARE_STL_USTRINGACCESS_MAP( SdbcDriver, DriverCollection );
typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > DriverFactory;
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > UNOContext;
struct DriverAccess
{
::rtl::OUString sImplementationName; /// the implementation name of the driver
DriverFactory xComponentFactory; /// the factory to create the driver component (if not already done so)
- UNOContext xUNOContext; /// ensure UNO context propagation
SdbcDriver xDriver; /// the driver itself
};
Modified: openoffice/branches/l10n/main/desktop/source/deployment/dp_persmap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/desktop/source/deployment/dp_persmap.cxx?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/desktop/source/deployment/dp_persmap.cxx (original)
+++ openoffice/branches/l10n/main/desktop/source/deployment/dp_persmap.cxx Wed Feb 6 19:19:15 2013
@@ -26,10 +26,6 @@
#include "dp_persmap.h"
#include "rtl/strbuf.hxx"
-#ifndef DISABLE_BDB2PMAP
-#include <vector>
-#endif
-
using namespace ::rtl;
// the persistent map is used to manage a handful of key-value string pairs
@@ -52,10 +48,6 @@ PersistentMap::PersistentMap( OUString c
, m_bToBeCreated( !readOnly)
, m_bIsDirty( false)
{
-#ifndef DISABLE_BDB2PMAP
- m_MapFileName = expandUnoRcUrl( url_);
-#endif
-
open();
}
@@ -171,11 +163,6 @@ bool PersistentMap::open()
// or create later if needed
m_bToBeCreated &= (rcOpen == osl::File::E_NOENT) && !m_bIsOpen;
-#ifndef DISABLE_BDB2PMAP
- if( m_bToBeCreated)
- importFromBDB();
-#endif // DISABLE_BDB2PMAP
-
if( !m_bIsOpen)
return m_bToBeCreated;
@@ -340,102 +327,5 @@ t_string2string_map PersistentMap::getEn
return m_entries;
}
-//______________________________________________________________________________
-#ifndef DISABLE_BDB2PMAP
-bool PersistentMap::importFromBDB()
-{
- if( m_bReadOnly)
- return false;
-
- // get the name of its BDB counterpart
- rtl::OUString aDBName = m_MapFileName;
- if( !aDBName.endsWithAsciiL( ".pmap", 5))
- return false;
- aDBName = aDBName.replaceAt( aDBName.getLength()-5, 5, OUSTR(".db"));
-
- // open the corresponding BDB file for reading
- osl::File aDBFile( aDBName);
- osl::File::RC rc = aDBFile.open( osl_File_OpenFlag_Read);
- if( rc != osl::File::E_None)
- return false;
- sal_uInt64 nFileSize = 0;
- if( aDBFile.getSize( nFileSize) != osl::File::E_None)
- return false;
-
- // read the BDB file
- std::vector<sal_uInt8> aRawBDB( nFileSize);
- for( sal_uInt64 nOfs = 0; nOfs < nFileSize;) {
- sal_uInt64 nBytesRead = 0;
- rc = aDBFile.read( (void*)&aRawBDB[nOfs], nFileSize - nOfs, nBytesRead);
- if( (rc != osl::File::E_None) || !nBytesRead)
- return false;
- nOfs += nBytesRead;
- }
-
- // check BDB file header for non_encrypted Hash format v4..9
- if( nFileSize < 0x0100)
- return false;
- if( aRawBDB[24] != 0) // only not-encrypted migration
- return false;
- if( aRawBDB[25] != 8) // we expect a P_HASHMETA page
- return false;
- const bool bLE = (aRawBDB[12]==0x61 && aRawBDB[13]==0x15 && aRawBDB[14]==0x06);
- const bool bBE = (aRawBDB[15]==0x61 && aRawBDB[14]==0x15 && aRawBDB[13]==0x06);
- if( bBE == bLE)
- return false;
- if( (aRawBDB[16] < 4) || (9 < aRawBDB[16])) // version
- return false;
- const sal_uInt64 nPgSize = bLE
- ? (aRawBDB[20] + (aRawBDB[21]<<8) + (aRawBDB[22]<<16) + (aRawBDB[23]<<24))
- : (aRawBDB[23] + (aRawBDB[22]<<8) + (aRawBDB[21]<<16) + (aRawBDB[20]<<24));
- const int nPgCount = nFileSize / nPgSize;
- if( nPgCount * nPgSize != nFileSize)
- return false;
-
- // find PackageManager's new_style entries
- // using a simple heuristic for BDB_Hash pages
- int nEntryCount = 0;
- for( int nPgNo = 1; nPgNo < nPgCount; ++nPgNo) {
- // parse the next _db_page
- const sal_uInt8* const pPage = &aRawBDB[ nPgNo * nPgSize];
- const sal_uInt8* const pEnd = pPage + nPgSize;
- const int nHfOffset = bLE ? (pPage[22] + (pPage[23]<<8)) : (pPage[23] + (pPage[22]<<8));
- if( nHfOffset <= 0)
- continue;
- const sal_uInt8* pCur = pPage + nHfOffset;
- // iterate through the entries
- for(; pCur < pEnd; ++pCur) {
- if( pCur[0] != 0x01)
- continue;
- // get the value-candidate
- const sal_uInt8* pVal = pCur + 1;
- while( ++pCur < pEnd)
- if( (*pCur < ' ') || ((*pCur > 0x7F) && (*pCur != 0xFF)))
- break;
- if( pCur >= pEnd)
- break;
- if( (pCur[0] != 0x01) || (pCur[1] != 0xFF))
- continue;
- const OString aVal( (sal_Char*)pVal, pCur - pVal);
- // get the key-candidate
- const sal_uInt8* pKey = pCur + 1;
- while( ++pCur < pEnd)
- if( (*pCur < ' ') || ((*pCur > 0x7F) && (*pCur != 0xFF)))
- break;
- if( (pCur < pEnd) && (*pCur > 0x01))
- continue;
- const OString aKey( (sal_Char*)pKey, pCur - pKey);
- --pCur; // prepare for next round by rewinding to end of key-string
-
- // add the key/value pair
- add( aKey, aVal);
- ++nEntryCount;
- }
- }
-
- return (nEntryCount > 0);
-}
-#endif // DISABLE_BDB2PMAP
-
}
Modified: openoffice/branches/l10n/main/desktop/source/deployment/inc/dp_persmap.h
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/desktop/source/deployment/inc/dp_persmap.h?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/desktop/source/deployment/inc/dp_persmap.h (original)
+++ openoffice/branches/l10n/main/desktop/source/deployment/inc/dp_persmap.h Wed Feb 6 19:19:15 2013
@@ -59,11 +59,6 @@ protected:
bool readAll( void);
void add( ::rtl::OString const & key, ::rtl::OString const & value );
void flush( void);
-
-#ifndef DISABLE_BDB2PMAP
- bool importFromBDB( void);
- ::rtl::OUString m_MapFileName;
-#endif
};
}
Modified: openoffice/branches/l10n/main/instsetoo_native/util/openoffice.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/instsetoo_native/util/openoffice.lst?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/instsetoo_native/util/openoffice.lst (original)
+++ openoffice/branches/l10n/main/instsetoo_native/util/openoffice.lst Wed Feb 6 19:19:15 2013
@@ -5,9 +5,9 @@ Globals
variables
{
APACHEPROJECTNAME Apache OpenOffice
- OOOBASEVERSION 3.5
- OOOPACKAGEVERSION 3.5.0
- UREPACKAGEVERSION 3.5.0
+ OOOBASEVERSION 4.0
+ OOOPACKAGEVERSION 4.0.0
+ UREPACKAGEVERSION 4.0.0
URELAYERVERSION 1
BASISROOTNAME ApacheOpenOffice
UNIXBASISROOTNAME apacheopenoffice
@@ -17,7 +17,7 @@ Globals
UREPACKAGEPREFIX apacheopenoffice
SOLSUREPACKAGEPREFIX apacheopenoffice
USE_FILEVERSION 1
- LIBRARYVERSION 9.5.0
+ LIBRARYVERSION 10.0.0
POOLPRODUCT 1
PROGRESSBARCOLOR 14,133,205
PROGRESSSIZE 320,7
@@ -40,9 +40,9 @@ Globals
OOOXMLFILEFORMATNAME OpenOffice.org XML
OOOXMLFILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- SERVICETAG_PRODUCTNAME Apache OpenOffice 3.5
- SERVICETAG_PRODUCTVERSION 3.5
- SERVICETAG_PARENTNAME Apache OpenOffice 3.5
+ SERVICETAG_PRODUCTNAME Apache OpenOffice 4.0
+ SERVICETAG_PRODUCTVERSION 4.0
+ SERVICETAG_PARENTNAME Apache OpenOffice 4.0
SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
SERVICETAG_URN urn:uuid:500061aa-5666-11e0-8e00-080020a9ed93
REGISTRATION_HOST https://registration.openoffice.org
@@ -59,23 +59,23 @@ Apache_OpenOffice
variables
{
PRODUCTNAME Apache OpenOffice
- PRODUCTVERSION 3.5.0
+ PRODUCTVERSION 4.0.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3
- USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.5.0
- BASEPRODUCTVERSION 3.5
+ BRANDPACKAGEVERSION 4
+ USERDIRPRODUCTVERSION 4
+ ABOUTBOXPRODUCTVERSION 4.0.0
+ BASEPRODUCTVERSION 4.0
PCPFILENAME openoffice.pcp
- UPDATEURL http://www.openoffice.org/projects/update/aoo35/check.Update
+ UPDATEURL http://www.openoffice.org/projects/update/aoo40/check.Update
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
EVAL
- PACKAGEVERSION 3.5.0
+ PACKAGEVERSION 4.0.0
PACKAGEREVISION {milestone}
LICENSENAME ALv2
GLOBALFILEGID gid_File_Lib_Vcl
@@ -90,7 +90,7 @@ Apache_OpenOffice
STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
CHANGETARGETDIR 1
USE_FILEVERSION 1
- LIBRARYVERSION 9.5.0
+ LIBRARYVERSION 10.0.0
PATCHCODEFILE ooo_patchcodes.txt
DOWNLOADBANNER ooobanner.bmp
DOWNLOADBITMAP ooobitmap.bmp
@@ -118,22 +118,22 @@ Apache_OpenOffice_wJRE
variables
{
PRODUCTNAME Apache OpenOffice
- PRODUCTVERSION 3.5.0
+ PRODUCTVERSION 4.0.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3
- USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.5.0
- BASEPRODUCTVERSION 3.5
- UPDATEURL http://www.openoffice.org/projects/update/aoo35/check.Update
+ BRANDPACKAGEVERSION 4
+ USERDIRPRODUCTVERSION 4
+ ABOUTBOXPRODUCTVERSION 4.0.0
+ BASEPRODUCTVERSION 4.0
+ UPDATEURL http://www.openoffice.org/projects/update/aoo40/check.Update
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
EVAL
- PACKAGEVERSION 3.5.0
+ PACKAGEVERSION 4.0.0
PACKAGEREVISION {milestone}
LICENSENAME ALv2
WITHJREPRODUCT 1
@@ -149,7 +149,7 @@ Apache_OpenOffice_wJRE
STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
CHANGETARGETDIR 1
USE_FILEVERSION 1
- LIBRARYVERSION 9.5.0
+ LIBRARYVERSION 10.0.0
PATCHCODEFILE ooo_patchcodes.txt
JAVAPRODUCT 1
DOWNLOADBANNER ooobanner.bmp
@@ -177,7 +177,7 @@ Apache_OpenOffice_Dev
variables
{
PRODUCTNAME AOO-Developer-Build
- PRODUCTVERSION 3.5.0
+ PRODUCTVERSION 4.0.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -185,19 +185,19 @@ Apache_OpenOffice_Dev
UNIXBASISROOTNAME aoodev
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3
- USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.5.0
- BASEPRODUCTVERSION 3.5
+ BRANDPACKAGEVERSION 4
+ USERDIRPRODUCTVERSION 4
+ ABOUTBOXPRODUCTVERSION 4.0.0
+ BASEPRODUCTVERSION 4.0
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX aoobasis-dev
UREPACKAGEPREFIX aoodev
SOLSUREPACKAGEPREFIX aoodev
REGISTRYLAYERNAME LayerDev
- UPDATEURL http://www.openoffice.org/projects/update/aoo35/check.Update
+ UPDATEURL http://www.openoffice.org/projects/update/aoo40/check.Update
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
EVAL
- PACKAGEVERSION 3.5.0
+ PACKAGEVERSION 4.0.0
PACKAGEREVISION {milestone}
LICENSENAME ALv2
GLOBALFILEGID gid_File_Lib_Vcl
@@ -213,7 +213,7 @@ Apache_OpenOffice_Dev
CHANGETARGETDIR 1
USE_FILEVERSION 1
JAVAPRODUCT 0
- LIBRARYVERSION 9.5.0
+ LIBRARYVERSION 10.0.0
PATCHCODEFILE ooodev_patchcodes.txt
CODEFILENAME codes_ooodev.txt
DOWNLOADBANNER ooobanner.bmp
@@ -245,8 +245,8 @@ URE
variables
{
PRODUCTNAME URE
- PRODUCTVERSION 3.5.0
- PACKAGEVERSION 3.5
+ PRODUCTVERSION 4.0.0
+ PACKAGEVERSION 4.0
PACKAGEREVISION 1
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
@@ -287,19 +287,19 @@ Apache_OpenOffice_SDK
variables
{
PRODUCTNAME Apache OpenOffice
- PRODUCTVERSION 3.5.0
+ PRODUCTVERSION 4.0.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
- BRANDPACKAGEVERSION 3
- PACKAGEVERSION 3.5.0
+ BRANDPACKAGEVERSION 4
+ PACKAGEVERSION 4.0.0
PACKAGEREVISION {milestone}
PACK_INSTALLED 1
POOLPRODUCT 0
DMG_VOLUMEEXTENSION SDK
- DATABASENAME openofficeorg34sdk
+ DATABASENAME openofficeorg40sdk
NO_README_IN_ROOTDIR 1
LICENSENAME ALv2
IGNOREDIRECTORYLAYER 1
@@ -334,7 +334,7 @@ Apache_OpenOffice_Dev_SDK
variables
{
PRODUCTNAME AOO-Developer-Build
- PRODUCTVERSION 3.5.0
+ PRODUCTVERSION 4.0.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -342,8 +342,8 @@ Apache_OpenOffice_Dev_SDK
UNIXBASISROOTNAME ooo-dev
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
- BRANDPACKAGEVERSION 3
- PACKAGEVERSION 3.5.0
+ BRANDPACKAGEVERSION 4
+ PACKAGEVERSION 4.0.0
PACKAGEREVISION {milestone}
BASISPACKAGEPREFIX aoobasis-dev
UREPACKAGEPREFIX aoodev
@@ -353,7 +353,7 @@ Apache_OpenOffice_Dev_SDK
PACK_INSTALLED 1
POOLPRODUCT 0
DMG_VOLUMEEXTENSION SDK
- DATABASENAME openofficeorg35devsdk
+ DATABASENAME openofficeorg40devsdk
NO_README_IN_ROOTDIR 1
LICENSENAME ALv2
IGNOREDIRECTORYLAYER 1
Modified: openoffice/branches/l10n/main/l10ntools/source/gConSrc.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConSrc.hxx?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConSrc.hxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConSrc.hxx Wed Feb 6 19:19:15 2013
@@ -54,9 +54,9 @@ class convert_src_impl : public convert_
~convert_src_impl();
void pushKey(string &sText);
- void popKey ();
- void pushNoKey();
- void registerPushKey();
+ void popKey (string &sText);
+ void pushNoKey(string &sText);
+ void registerPushKey(string &sText);
void pushRegistredKey(string &sText);
void saveData(string& sCollectedText);
Modified: openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx Wed Feb 6 19:19:15 2013
@@ -53,27 +53,43 @@ void convert_src_impl::runLex()
/********************** I M P L E M E N T A T I O N **********************/
void convert_src_impl::pushKey(string &sText)
{
+ // write text for merge
+ if (mbMergeMode)
+ writeSourceFile(msCollector + sText);
+ msCollector.clear();
}
/********************** I M P L E M E N T A T I O N **********************/
-void convert_src_impl::popKey()
+void convert_src_impl::popKey(string &sText)
{
+ // write text for merge
+ if (mbMergeMode)
+ writeSourceFile(msCollector + sText);
+ msCollector.clear();
}
/********************** I M P L E M E N T A T I O N **********************/
-void convert_src_impl::pushNoKey()
+void convert_src_impl::pushNoKey(string &sText)
{
+ // write text for merge
+ if (mbMergeMode)
+ writeSourceFile(msCollector + sText);
+ msCollector.clear();
}
/********************** I M P L E M E N T A T I O N **********************/
-void convert_src_impl::registerPushKey()
+void convert_src_impl::registerPushKey(string &sText)
{
+ // write text for merge
+ if (mbMergeMode)
+ writeSourceFile(msCollector + sText);
+ msCollector.clear();
}
@@ -81,18 +97,33 @@ void convert_src_impl::registerPushKey()
/********************** I M P L E M E N T A T I O N **********************/
void convert_src_impl::pushRegistredKey(string &sText)
{
+ // write text for merge
+ if (mbMergeMode)
+ writeSourceFile(msCollector + sText);
+ msCollector.clear();
}
/********************** I M P L E M E N T A T I O N **********************/
-void convert_src_impl::saveData(string& sCollectedText)
+void convert_src_impl::saveData(string &sText)
{
+ // write text for merge
+ if (mbMergeMode)
+ writeSourceFile(msCollector + sText);
+ msCollector.clear();
}
/********************** I M P L E M E N T A T I O N **********************/
-void convert_src_impl::copyData(string& sCollectedText)
+void convert_src_impl::copyData(string &sText)
{
+ msCollector += sText;
+ if (sText == "\n")
+ {
+ if (mbMergeMode)
+ writeSourceFile(msCollector);
+ msCollector.clear();
+ }
}
Modified: openoffice/branches/l10n/main/l10ntools/source/gConSrclex.l
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConSrclex.l?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConSrclex.l (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConSrclex.l Wed Feb 6 19:19:15 2013
@@ -85,11 +85,13 @@
}
"PageList "[^\{]* {
- convert_src::mcpImpl->pushNoKey();
+ string text(yytext);
+ convert_src::mcpImpl->pushNoKey(text);
}
"PageItem "[^\{]* {
- convert_src::mcpImpl->registerPushKey();
+ string text(yytext);
+ convert_src::mcpImpl->registerPushKey(text);
}
"Identifier "[^;]* {
@@ -103,7 +105,8 @@
}
"};" {
- convert_src::mcpImpl->popKey();
+ string text(yytext);
+ convert_src::mcpImpl->popKey(text);
}
.|\n {
Modified: openoffice/branches/l10n/main/odk/cfgWin.js
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/cfgWin.js?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/cfgWin.js (original)
+++ openoffice/branches/l10n/main/odk/cfgWin.js Wed Feb 6 19:19:15 2013
@@ -919,18 +919,18 @@ function writeBatFile(fdir, file)
"REM are necessary for building the examples of the Office Development Kit.\n" +
"REM The Script was developed for the operating systems Windows.\n" +
"REM The SDK name\n" +
- "REM Example: set OO_SDK_NAME=openoffice3.0_sdk\n" +
+ "REM Example: set OO_SDK_NAME=openoffice4.0_sdk\n" +
"set OO_SDK_NAME=" + oo_sdk_name +
"\n\n" +
"REM Installation directory of the Software Development Kit.\n" +
- "REM Example: set OO_SDK_HOME=C:\\Program Files\\Apache OpenOffice\\Basic 3.0\\sdk\n" +
+ "REM Example: set OO_SDK_HOME=C:\\Program Files\\Apache OpenOffice\\Basic 4.0\\sdk\n" +
"set OO_SDK_HOME=" + oo_sdk_home +
"\n\n" +
"REM Office installation directory.\n" +
- "REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice 3\n" +
+ "REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice 4\n" +
"set OFFICE_HOME=" + office_home +
"\n\n" +
- "REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice\\Basis 3.0\n" +
+ "REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice\\Basis 4.0\n" +
"set OFFICE_BASE_HOME=" + office_base_home +
"\n\n" +
"REM URE installation directory.\n" +
Modified: openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/Makefile
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/Makefile?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/Makefile (original)
+++ openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/Makefile Wed Feb 6 19:19:15 2013
@@ -135,6 +135,7 @@ $(COMP_UNOPKG_DESCRIPTION) : xml/descri
-e "s/#DESCRIPTION_IDENTIFIER#/$(DESCRIPTION_IDENTIFIER)/" \
-e "s/#EXTENSION_PLATFORM#/$(EXTENSION_PLATFORM)/" \
-e "s/#DESCRIPTION_OOO_MIN_VER#/$(DESCRIPTION_OOO_MIN_VER)/" \
+ -e "s/#DESCRIPTION_OOO_MAX_VER#/$(DESCRIPTION_OOO_MAX_VER)/" \
-e "s/#DESCRIPTION_DEP_NAME#/$(DESCRIPTION_DEP_NAME)/" \
-e "s/#DESCRIPTION_PUBLISHER_URL#/$(subst /,\/,$(DESCRIPTION_PUBLISHER_URL))/" \
-e "s/#DESCRIPTION_PUBLISHER_NAME#/$(DESCRIPTION_PUBLISHER_NAME)/" \
Modified: openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk (original)
+++ openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk Wed Feb 6 19:19:15 2013
@@ -19,8 +19,9 @@
#
#**************************************************************
-DESCRIPTION_OOO_MIN_VER=3.5.0
-DESCRIPTION_DEP_NAME=Apache OpenOffice $(DESCRIPTION_OOO_MIN_VER)
+DESCRIPTION_OOO_MIN_VER=4.0
+DESCRIPTION_OOO_MAX_VER=4.9
+DESCRIPTION_DEP_NAME=Apache OpenOffice
EXTENSION_ID=org.apache.openoffice.framework.statusbar.ModifiedStatus
EXTENSION_VERSION=0.0.1
Modified: openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/xml/description.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/xml/description.xml?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/xml/description.xml (original)
+++ openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/xml/description.xml Wed Feb 6 19:19:15 2013
@@ -25,6 +25,7 @@
<platform value="#EXTENSION_PLATFORM#"/>
<dependencies>
<OpenOffice.org-minimal-version value="#DESCRIPTION_OOO_MIN_VER#" d:name="#DESCRIPTION_DEP_NAME#"/>
+ <OpenOffice.org-maximal-version value="#DESCRIPTION_OOO_MAX_VER#" d:name="#DESCRIPTION_DEP_NAME#"/>
</dependencies>
<publisher>
<name xlink:href="#DESCRIPTION_PUBLISHER_URL#" lang="en">#DESCRIPTION_PUBLISHER_NAME#</name>
Modified: openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/Makefile
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/Makefile?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/Makefile (original)
+++ openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/Makefile Wed Feb 6 19:19:15 2013
@@ -133,6 +133,7 @@ $(COMP_UNOPKG_DESCRIPTION) : xml/descri
-e "s/#DESCRIPTION_IDENTIFIER#/$(DESCRIPTION_IDENTIFIER)/" \
-e "s/#EXTENSION_PLATFORM#/$(EXTENSION_PLATFORM)/" \
-e "s/#DESCRIPTION_OOO_MIN_VER#/$(DESCRIPTION_OOO_MIN_VER)/" \
+ -e "s/#DESCRIPTION_OOO_MAX_VER#/$(DESCRIPTION_OOO_MAX_VER)/" \
-e "s/#DESCRIPTION_DEP_NAME#/$(DESCRIPTION_DEP_NAME)/" \
-e "s/#DESCRIPTION_PUBLISHER_URL#/$(subst /,\/,$(DESCRIPTION_PUBLISHER_URL))/" \
-e "s/#DESCRIPTION_PUBLISHER_NAME#/$(DESCRIPTION_PUBLISHER_NAME)/" \
Modified: openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk (original)
+++ openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk Wed Feb 6 19:19:15 2013
@@ -19,8 +19,9 @@
#
#**************************************************************
-DESCRIPTION_OOO_MIN_VER=3.5.0
-DESCRIPTION_DEP_NAME=Apache OpenOffice $(DESCRIPTION_OOO_MIN_VER)
+DESCRIPTION_OOO_MIN_VER=4.0
+DESCRIPTION_OOO_MAX_VER=4.9
+DESCRIPTION_DEP_NAME=Apache OpenOffice
EXTENSION_ID=org.apache.openoffice.framework.statusbar.SelectionMode
EXTENSION_VERSION=0.0.1
Modified: openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/xml/description.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/xml/description.xml?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/xml/description.xml (original)
+++ openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/xml/description.xml Wed Feb 6 19:19:15 2013
@@ -25,6 +25,7 @@
<platform value="#EXTENSION_PLATFORM#"/>
<dependencies>
<OpenOffice.org-minimal-version value="#DESCRIPTION_OOO_MIN_VER#" d:name="#DESCRIPTION_DEP_NAME#"/>
+ <OpenOffice.org-maximal-version value="#DESCRIPTION_OOO_MAX_VER#" d:name="#DESCRIPTION_DEP_NAME#"/>
</dependencies>
<publisher>
<name xlink:href="#DESCRIPTION_PUBLISHER_URL#" lang="en">#DESCRIPTION_PUBLISHER_NAME#</name>
Modified: openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/Makefile
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/Makefile?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/Makefile (original)
+++ openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/Makefile Wed Feb 6 19:19:15 2013
@@ -149,6 +149,7 @@ $(COMP_UNOPKG_DESCRIPTION) : xml/descri
-e "s/#DESCRIPTION_IDENTIFIER#/$(DESCRIPTION_IDENTIFIER)/" \
-e "s/#EXTENSION_PLATFORM#/$(EXTENSION_PLATFORM)/" \
-e "s/#DESCRIPTION_OOO_MIN_VER#/$(DESCRIPTION_OOO_MIN_VER)/" \
+ -e "s/#DESCRIPTION_OOO_MAX_VER#/$(DESCRIPTION_OOO_MAX_VER)/" \
-e "s/#DESCRIPTION_DEP_NAME#/$(DESCRIPTION_DEP_NAME)/" \
-e "s/#DESCRIPTION_PUBLISHER_URL#/$(subst /,\/,$(DESCRIPTION_PUBLISHER_URL))/" \
-e "s/#DESCRIPTION_PUBLISHER_NAME#/$(DESCRIPTION_PUBLISHER_NAME)/" \
Modified: openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk (original)
+++ openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk Wed Feb 6 19:19:15 2013
@@ -19,8 +19,9 @@
#
#**************************************************************
-DESCRIPTION_OOO_MIN_VER=3.5.0
-DESCRIPTION_DEP_NAME=Apache OpenOffice $(DESCRIPTION_OOO_MIN_VER)
+DESCRIPTION_OOO_MIN_VER=4.0
+DESCRIPTION_OOO_MAX_VER=4.9
+DESCRIPTION_DEP_NAME=Apache OpenOffice
EXTENSION_ID=org.apache.openoffice.framework.statusbar.StatusWordCount
EXTENSION_VERSION=0.0.1
Modified: openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/xml/description.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/xml/description.xml?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/xml/description.xml (original)
+++ openoffice/branches/l10n/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/xml/description.xml Wed Feb 6 19:19:15 2013
@@ -25,6 +25,7 @@
<platform value="#EXTENSION_PLATFORM#"/>
<dependencies>
<OpenOffice.org-minimal-version value="#DESCRIPTION_OOO_MIN_VER#" d:name="#DESCRIPTION_DEP_NAME#"/>
+ <OpenOffice.org-maximal-version value="#DESCRIPTION_OOO_MAX_VER#" d:name="#DESCRIPTION_DEP_NAME#"/>
</dependencies>
<publisher>
<name xlink:href="#DESCRIPTION_PUBLISHER_URL#" lang="en">#DESCRIPTION_PUBLISHER_NAME#</name>
Modified: openoffice/branches/l10n/main/odk/examples/cpp/custompanel/description.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/examples/cpp/custompanel/description.xml?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/examples/cpp/custompanel/description.xml (original)
+++ openoffice/branches/l10n/main/odk/examples/cpp/custompanel/description.xml Wed Feb 6 19:19:15 2013
@@ -31,6 +31,7 @@
<name>Custom Tool Panel Example</name>
</display-name>
<dependencies>
- <OpenOffice.org-minimal-version value="3.4" d:name="Apache OpenOffice 3.4"/>
+ <OpenOffice.org-minimal-version value="4.0" d:name="Apache OpenOffice"/>
+ <OpenOffice.org-maximal-version value="4.9" d:name="Apache OpenOffice"/>
</dependencies>
</description>
Modified: openoffice/branches/l10n/main/odk/setsdkenv_unix.sh.in
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/setsdkenv_unix.sh.in?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/setsdkenv_unix.sh.in (original)
+++ openoffice/branches/l10n/main/odk/setsdkenv_unix.sh.in Wed Feb 6 19:19:15 2013
@@ -29,11 +29,11 @@ OO_SDK_NAME=@OO_SDK_NAME@
export OO_SDK_NAME
# Installation directory of the Software Development Kit.
-# Example: OO_SDK_HOME=/opt/apacheopenoffice/basis3.0/sdk
+# Example: OO_SDK_HOME=/opt/apacheopenoffice/basis4.0/sdk
OO_SDK_HOME='@OO_SDK_HOME@'
# Office installation directory.
-# Example: OFFICE_HOME=/opt/apacheopenoffice3
+# Example: OFFICE_HOME=/opt/apacheopenoffice4
OFFICE_HOME='@OFFICE_HOME@'
OFFICE_BASE_HOME='@OFFICE_BASE_HOME@'
Modified: openoffice/branches/l10n/main/odk/setsdkenv_windows.template
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/setsdkenv_windows.template?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/setsdkenv_windows.template (original)
+++ openoffice/branches/l10n/main/odk/setsdkenv_windows.template Wed Feb 6 19:19:15 2013
@@ -23,18 +23,18 @@ REM This script sets all enviroment vari
REM are necessary for building the examples of the Office Development Kit.
REM The Script was developed for the operating systems Windows.
REM The SDK name
-REM Example: set OO_SDK_NAME=apacheopenoffice3.0_sdk
-set OO_SDK_NAME=apacheopenoffice3.0_sdk
+REM Example: set OO_SDK_NAME=apacheopenoffice4.0_sdk
+set OO_SDK_NAME=apacheopenoffice4.0_sdk
REM Installation directory of the Software Development Kit.
-REM Example: set OO_SDK_HOME=C:\Program Files\Apache OpenOffice\Basic 3.0\sdk
+REM Example: set OO_SDK_HOME=C:\Program Files\Apache OpenOffice\Basic 4.0\sdk
set OO_SDK_HOME=
REM Office installation directory.
-REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice 3
+REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice 4
set OFFICE_HOME=
-REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice\Basis 3.0
+REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice\Basis 4.0
set OFFICE_BASE_HOME=
REM URE installation directory.
@@ -73,7 +73,7 @@ REM Example: set OO_SDK_JAVA_HOME=C:\Pro
set OO_SDK_JAVA_HOME=
REM Special output directory
-REM Example: set OO_SDK_OUT=C:\apacheopenoffice3.0_sdk
+REM Example: set OO_SDK_OUT=C:\apacheopenoffice4.0_sdk
set OO_SDK_OUT=
REM Automatic deployment
Modified: openoffice/branches/l10n/main/odk/util/makefile.pmk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/odk/util/makefile.pmk?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/odk/util/makefile.pmk (original)
+++ openoffice/branches/l10n/main/odk/util/makefile.pmk Wed Feb 6 19:19:15 2013
@@ -22,7 +22,7 @@
# used for sdk common files
-PRODUCT_RELEASE=3.5
+PRODUCT_RELEASE=4.0
OFFICENAME=Apache OpenOffice
SDKDIRNAME=apacheopenoffice$(PRODUCT_RELEASE)_sdk
OFFICEPRODUCTNAME=$(OFFICENAME) $(PRODUCT_RELEASE)
Modified: openoffice/branches/l10n/main/offapi/com/sun/star/awt/PrinterServer.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/offapi/com/sun/star/awt/PrinterServer.idl?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/offapi/com/sun/star/awt/PrinterServer.idl (original)
+++ openoffice/branches/l10n/main/offapi/com/sun/star/awt/PrinterServer.idl Wed Feb 6 19:19:15 2013
@@ -29,7 +29,7 @@ interface XPrinterServer;
/** manages several printers on one machine.
- @since Apache OpenOffice 3.5
+ @since Apache OpenOffice 4.0
*/
service PrinterServer : XPrinterServer
{
Modified: openoffice/branches/l10n/main/offapi/com/sun/star/ui/XStatusbarItem.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/offapi/com/sun/star/ui/XStatusbarItem.idl?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/offapi/com/sun/star/ui/XStatusbarItem.idl (original)
+++ openoffice/branches/l10n/main/offapi/com/sun/star/ui/XStatusbarItem.idl Wed Feb 6 19:19:15 2013
@@ -31,7 +31,7 @@ module com { module sun { module star
@see <type scope="com::sun::star::frame">XStatusbarController</type>
- @since Apache OpenOffice 3.5
+ @since Apache OpenOffice 4.0
*/
interface XStatusbarItem
{
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=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sdext/source/minimizer/description.xml (original)
+++ openoffice/branches/l10n/main/sdext/source/minimizer/description.xml Wed Feb 6 19:19:15 2013
@@ -28,8 +28,8 @@
<identifier value="UPDATED_IDENTIFIER"/>
<dependencies>
- <OpenOffice.org-minimal-version value="3.4" dep:name="Apache OpenOffice"/>
- <OpenOffice.org-maximal-version value="3.9" dep:name="Apache OpenOffice"/>
+ <OpenOffice.org-minimal-version value="4.0" dep:name="Apache OpenOffice"/>
+ <OpenOffice.org-maximal-version value="4.9" dep:name="Apache OpenOffice"/>
</dependencies>
<registration>
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=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sdext/source/pdfimport/config/description.xml (original)
+++ openoffice/branches/l10n/main/sdext/source/pdfimport/config/description.xml Wed Feb 6 19:19:15 2013
@@ -27,8 +27,8 @@
<identifier value="UPDATED_IDENTIFIER" />
<dependencies>
- <OpenOffice.org-minimal-version value="3.4" dep:name="Apache OpenOffice"/>
- <OpenOffice.org-maximal-version value="3.9" dep:name="Apache OpenOffice"/>
+ <OpenOffice.org-minimal-version value="4.0" dep:name="Apache OpenOffice"/>
+ <OpenOffice.org-maximal-version value="4.9" dep:name="Apache 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=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sdext/source/presenter/description.xml (original)
+++ openoffice/branches/l10n/main/sdext/source/presenter/description.xml Wed Feb 6 19:19:15 2013
@@ -28,8 +28,8 @@
<identifier value="com.sun.PresenterScreen-UPDATED_SUPPORTED_PLATFORM" />
<dependencies>
- <OpenOffice.org-minimal-version value="3.4" dep:name="Apache OpenOffice"/>
- <OpenOffice.org-maximal-version value="3.9" dep:name="Apache OpenOffice"/>
+ <OpenOffice.org-minimal-version value="4.0" dep:name="Apache OpenOffice"/>
+ <OpenOffice.org-maximal-version value="4.9" dep:name="Apache OpenOffice"/>
</dependencies>
<registration>
Modified: openoffice/branches/l10n/main/solenv/gbuild/platform/windows.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/solenv/gbuild/platform/windows.mk?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/solenv/gbuild/platform/windows.mk (original)
+++ openoffice/branches/l10n/main/solenv/gbuild/platform/windows.mk Wed Feb 6 19:19:15 2013
@@ -190,11 +190,7 @@ gb_NoexPrecompiledHeader_NOEXCEPTIONFLAG
gb_LinkTarget_LDFLAGS := \
-MACHINE:IX86 \
-NODEFAULTLIB \
- -OPT:NOREF \
-SUBSYSTEM:CONSOLE \
- -safeseh \
- -nxcompat \
- -dynamicbase \
$(patsubst %,-LIBPATH:%,$(filter-out .,$(subst ;, ,$(subst \,/,$(ILIB))))) \
ifneq ($(ENABLE_CRASHDUMP),)
@@ -438,7 +434,7 @@ endef
# Library class
gb_Library_DEFS := -D_DLL
-gb_Library_TARGETTYPEFLAGS := -DLL
+gb_Library_TARGETTYPEFLAGS := -DLL -OPT:NOREF -SAFESEH -NXCOMPAT -DYNAMICBASE
gb_Library_get_rpath :=
gb_Library_SYSPRE := i
@@ -588,7 +584,7 @@ endef
# Executable class
gb_Executable_EXT := .exe
-gb_Executable_TARGETTYPEFLAGS := -RELEASE -BASE:0x1b000000 -OPT:NOREF -INCREMENTAL:NO -DEBUG
+gb_Executable_TARGETTYPEFLAGS := -RELEASE -BASE:0x1b000000 -OPT:NOREF -INCREMENTAL:NO -DEBUG -SAFESEH -NXCOMPAT -DYNAMICBASE
gb_Executable_get_rpath :=
define gb_Executable_Executable_platform
Modified: openoffice/branches/l10n/main/solenv/inc/minor.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/solenv/inc/minor.mk?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/solenv/inc/minor.mk (original)
+++ openoffice/branches/l10n/main/solenv/inc/minor.mk Wed Feb 6 19:19:15 2013
@@ -1,5 +1,5 @@
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,19 +7,19 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
-RSCVERSION=350
-RSCREVISION=350m1(Build:9611)
-BUILD=9611
+RSCVERSION=400
+RSCREVISION=400m1(Build:9700)
+BUILD=9700
LAST_MINOR=m1
-SOURCEVERSION=AOO350
+SOURCEVERSION=AOO400
Modified: openoffice/branches/l10n/main/solenv/inc/version.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/solenv/inc/version.lst?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/solenv/inc/version.lst (original)
+++ openoffice/branches/l10n/main/solenv/inc/version.lst Wed Feb 6 19:19:15 2013
@@ -19,10 +19,10 @@
#
#**************************************************************
-OOOBASEVERSIONMAJOR=3
-OOOBASEVERSIONMINOR=5
+OOOBASEVERSIONMAJOR=4
+OOOBASEVERSIONMINOR=0
OOOBASEVERSIONMICRO=0
-OOOBASEVERSIONDAY=1
-OOOBASEVERSIONMONTH=4
-OOOBASEVERSIONYEAR=2012
+OOOBASEVERSIONDAY=5
+OOOBASEVERSIONMONTH=2
+OOOBASEVERSIONYEAR=2013
Modified: openoffice/branches/l10n/main/swext/mediawiki/src/description.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/swext/mediawiki/src/description.xml?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/swext/mediawiki/src/description.xml (original)
+++ openoffice/branches/l10n/main/swext/mediawiki/src/description.xml Wed Feb 6 19:19:15 2013
@@ -31,8 +31,8 @@
</simple-license>
</registration>
<dependencies>
- <OpenOffice.org-minimal-version value="3.4" d:name="Apache OpenOffice"/>
- <OpenOffice.org-maximal-version value="3.9" d:name="Apache OpenOffice"/>
+ <OpenOffice.org-minimal-version value="4.0" d:name="Apache OpenOffice"/>
+ <OpenOffice.org-maximal-version value="4.9" d:name="Apache OpenOffice"/>
</dependencies>
<publisher>
<name xlink:href="http://www.openoffice.org" lang="en">Apache Software Foundation</name>
Modified: openoffice/branches/l10n/main/sysui/desktop/debian/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/debian/makefile.mk?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/debian/makefile.mk (original)
+++ openoffice/branches/l10n/main/sysui/desktop/debian/makefile.mk Wed Feb 6 19:19:15 2013
@@ -41,7 +41,7 @@ TARGET=debian
.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/deb//)"
-DEBFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i3.5-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)
+DEBFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i4.0-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)
.ENDIF
@@ -56,22 +56,22 @@ ALLTAR : $(DEBFILES)
%/DEBIAN/control : $$(@:f)
@$(MKDIRHIER) $(@:d) $*$/etc $*$/usr/share/applnk/Office $*$/usr/lib/menu
- ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.5//)) $*$/etc$/
- /bin/sh -c -x "cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/3.5//) && DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr GNOMEDIR=/usr create_tree.sh"
- @cat openoffice.org-debian-menus | sed -e 's/%PRODUCTNAME/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/3.5//)) $(PRODUCTVERSION.$(*:f:s/-/ /:1:s/3.5//))/' -e 's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.5//))/' -e 's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/3.5//))/' > $*$/usr/lib/menu/$(*:f:s/_/ /:1:s/3.5//)
- echo "Package: $(*:f:s/_/ /:1:s/3.5//)" > $@
- cat $(@:f) | tr -d "\015" | sed "s/%productname/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/3.5//))/" >> $@
- echo "Version: $(PKGVERSION.$(*:f:s/-/ /:1:s/3.5//))-$(PKGREV)" >> $@
+ ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.0//)) $*$/etc$/
+ /bin/sh -c -x "cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/4.0//) && DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr GNOMEDIR=/usr create_tree.sh"
+ @cat openoffice.org-debian-menus | sed -e 's/%PRODUCTNAME/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/4.0//)) $(PRODUCTVERSION.$(*:f:s/-/ /:1:s/4.0//))/' -e 's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.0//))/' -e 's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/4.0//))/' > $*$/usr/lib/menu/$(*:f:s/_/ /:1:s/4.0//)
+ echo "Package: $(*:f:s/_/ /:1:s/4.0//)" > $@
+ cat $(@:f) | tr -d "\015" | sed "s/%productname/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/4.0//))/" >> $@
+ echo "Version: $(PKGVERSION.$(*:f:s/-/ /:1:s/4.0//))-$(PKGREV)" >> $@
@du -k -s $* | awk -F ' ' '{ printf "Installed-Size: %s\n", $$1 ; }' >> $@
%/DEBIAN/postinst : $$(@:f)
- @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.5//))/g" > $@
+ @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.0//))/g" > $@
%/DEBIAN/postrm : $$(@:f)
- @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.5//))/g" > $@
+ @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.0//))/g" > $@
%/DEBIAN/prerm : $$(@:f)
- @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.5//))/g" > $@
+ @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.0//))/g" > $@
# --- packaging ---------------------------------------------------
Modified: openoffice/branches/l10n/main/sysui/desktop/productversion.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/productversion.mk?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/productversion.mk (original)
+++ openoffice/branches/l10n/main/sysui/desktop/productversion.mk Wed Feb 6 19:19:15 2013
@@ -47,10 +47,10 @@ PRODUCTLIST = apache_openoffice
# default values to minimize maintainance effort
# CAUTION! $(OOOBASEVERSION) from openoffice.lst NOT available (!)
-PRODUCTVERSION = 3.5
+PRODUCTVERSION = 4.0
# CAUTION! $(BRANDPACKAGEVERSION) from openoffice.lst NOT available (!)
-PRODUCTVERSIONSHORT = 3
+PRODUCTVERSIONSHORT = 4
PKGVERSION = $(PRODUCTVERSION)
# gnome-vfs treats everything behind the last '.' as an icon extension,
Modified: openoffice/branches/l10n/main/sysui/desktop/slackware/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sysui/desktop/slackware/makefile.mk?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sysui/desktop/slackware/makefile.mk (original)
+++ openoffice/branches/l10n/main/sysui/desktop/slackware/makefile.mk Wed Feb 6 19:19:15 2013
@@ -36,7 +36,7 @@ TARGET=slackware
# --- Files --------------------------------------------------------
-MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}3.5-$(TARGET)-menus-$(PKGVERSION)-noarch-$(PKGREV).tgz
+MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}4.0-$(TARGET)-menus-$(PKGVERSION)-noarch-$(PKGREV).tgz
# --- Targets -------------------------------------------------------
@@ -55,26 +55,26 @@ $(MISC)/$(TARGET)/usr/share/applications
# FIXME: removal of *-extension.* only to create identical packages to OOF680
%/usr/share/applications :
@$(MKDIRHIER) $@
- /bin/sh -c "cd $(COMMONMISC)$/$(*:b:s/-/ /:1:s/3.5//); DESTDIR=$(shell @cd $*; pwd) GNOMEDIR="" ICON_PREFIX=$(ICONPREFIX.$(*:b:s/-/ /:1:s/3.5//)) KDEMAINDIR=/opt/kde .$/create_tree.sh"
+ /bin/sh -c "cd $(COMMONMISC)$/$(*:b:s/-/ /:1:s/4.0//); DESTDIR=$(shell @cd $*; pwd) GNOMEDIR="" ICON_PREFIX=$(ICONPREFIX.$(*:b:s/-/ /:1:s/4.0//)) KDEMAINDIR=/opt/kde .$/create_tree.sh"
$(RM) $*$/opt$/kde$/share$/icons$/*$/*$/*$/*-extension.png
$(RM) $*$/opt$/kde$/share$/mimelnk$/application$/*-extension.desktop
$(RM) $*$/usr$/share$/applications$/*.desktop
$(RM) $*$/usr$/bin$/soffice
%$/install$/doinst.sh : update-script
- @echo "( cd etc ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//)) )" > $@
- @echo "( cd etc ; ln -snf /opt/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//):s/-//) $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//)) )" >> $@
+ @echo "( cd etc ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.0//)) )" > $@
+ @echo "( cd etc ; ln -snf /opt/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.0//):s/-//) $(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.0//)) )" >> $@
@echo "( cd usr/bin ; rm -rf soffice )" >> $@
- @echo "( cd usr/bin ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//))/program/soffice soffice )" >> $@
- @echo -e $(foreach,i,$(shell @cat $(COMMONMISC)$/$(*:b:s/-/ /:1:s/3.5//)/launcherlist) "\n( cd usr/share/applications ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//))-$i )\n( cd usr/share/applications ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//))/share/xdg/$i $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//))-$i )") >> $@
+ @echo "( cd usr/bin ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.0//))/program/soffice soffice )" >> $@
+ @echo -e $(foreach,i,$(shell @cat $(COMMONMISC)$/$(*:b:s/-/ /:1:s/4.0//)/launcherlist) "\n( cd usr/share/applications ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.0//))-$i )\n( cd usr/share/applications ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.0//))/share/xdg/$i $(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.0//))-$i )") >> $@
@cat $< >> $@
%$/install$/slack-desc : slack-desc
@$(MKDIRHIER) $(@:d)
- @sed -e "s/PKGNAME/$(*:b:s/-/ /:1:s/3.5//)-$(TARGET)-menus/g" -e "s/PKGVERSION/$(PKGVERSION.$(*:b:s/-/ /:1:s/3.5//))/g" \
- -e "s/LONGPRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/3.5//)) $(PRODUCTVERSION.$(*:b:s/-/ /:1:s/3.5//))/g" \
- -e "s/PRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/3.5//))/g" \
- -e "s/UNIXFILENAME/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//))/g" $< > $@
+ @sed -e "s/PKGNAME/$(*:b:s/-/ /:1:s/4.0//)-$(TARGET)-menus/g" -e "s/PKGVERSION/$(PKGVERSION.$(*:b:s/-/ /:1:s/4.0//))/g" \
+ -e "s/LONGPRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/4.0//)) $(PRODUCTVERSION.$(*:b:s/-/ /:1:s/4.0//))/g" \
+ -e "s/PRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/4.0//))/g" \
+ -e "s/UNIXFILENAME/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.0//))/g" $< > $@
# needed to satisfy the slackware package tools - they need
# the entries like this
Propchange: openoffice/branches/l10n/test/
------------------------------------------------------------------------------
Merged /openoffice/trunk/test:r1441902-1443136
Modified: openoffice/branches/l10n/test/testcommon/source/org/openoffice/test/Run.help
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/test/testcommon/source/org/openoffice/test/Run.help?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/test/testcommon/source/org/openoffice/test/Run.help (original)
+++ openoffice/branches/l10n/test/testcommon/source/org/openoffice/test/Run.help Wed Feb 6 19:19:15 2013
@@ -19,5 +19,5 @@ System Property
Example
run -Dopenoffice.home=/Applications/OpenOffice.org.app/Contents -tp bvt
run -Dopenoffice.home=/Applications/OpenOffice.org.app/Contents -tc bvt:bvt.gui.BasicFunctionTest,bvt.gui.FileTypeTest
- run -Dopenoffice.pack=http://ci.apache.org/projects/openoffice/install/linux64/Apache_OpenOffice_3.5.0_Linux_x86-64_install-arc_en-US.tar.gz -tp bvt
+ run -Dopenoffice.pack=http://ci.apache.org/projects/openoffice/install/linux64/Apache_OpenOffice_4.0.0_Linux_x86-64_install-arc_en-US.tar.gz -tp bvt
\ No newline at end of file
Propchange: openoffice/branches/l10n/test/testcommon/source/org/openoffice/test/vcl/
------------------------------------------------------------------------------
Merged /openoffice/trunk/test/testcommon/source/org/openoffice/test/vcl:r1441902-1443136
Modified: openoffice/branches/l10n/test/testgui/source/fvt/gui/sc/validity/ValidityDialogSetting.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/test/testgui/source/fvt/gui/sc/validity/ValidityDialogSetting.java?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/test/testgui/source/fvt/gui/sc/validity/ValidityDialogSetting.java (original)
+++ openoffice/branches/l10n/test/testgui/source/fvt/gui/sc/validity/ValidityDialogSetting.java Wed Feb 6 19:19:15 2013
@@ -526,7 +526,7 @@ public class ValidityDialogSetting {
scInputBarInput.activate();
typeKeys("13");
typeKeys("<enter>");
- assertEquals("OpenOffice.org Calc", activeMsgBox.getCaption());
+ assertEquals("Apache OpenOffice Calc", activeMsgBox.getCaption());
// assertEquals("Invalid value.",ActiveMsgBox.getMessage()); // Can not
// verify in multi-language
activeMsgBox.ok();
Modified: openoffice/branches/l10n/test/testuno/source/fvt/uno/sd/shape/ShapeProperties.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/test/testuno/source/fvt/uno/sd/shape/ShapeProperties.java?rev=1443148&r1=1443147&r2=1443148&view=diff
==============================================================================
--- openoffice/branches/l10n/test/testuno/source/fvt/uno/sd/shape/ShapeProperties.java (original)
+++ openoffice/branches/l10n/test/testuno/source/fvt/uno/sd/shape/ShapeProperties.java Wed Feb 6 19:19:15 2013
@@ -316,7 +316,7 @@ public class ShapeProperties {
xShape=saveAndLoadShape(1,0);
xPropSet = (XPropertySet) UnoRuntime.queryInterface(
XPropertySet.class, xShape);
- assertEquals("RotateAngle is not 2500", 2500 , xPropSet.getPropertyValue("RotateAngle"));
+ assertEquals("RotateAngle is not 2500", 2500L, xPropSet.getPropertyValue("RotateAngle"));
}