openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stev...@apache.org
Subject svn commit: r1441343 [23/35] - in /openoffice/branches/ia2: ./ ext_libraries/apr-util/ ext_libraries/apr/ ext_sources/ extras/l10n/source/ast/ extras/l10n/source/da/ extras/l10n/source/eu/ extras/l10n/source/gd/ extras/l10n/source/ko/ extras/l10n/sourc...
Date Fri, 01 Feb 2013 08:46:35 GMT
Modified: openoffice/branches/ia2/main/readlicense_oo/docs/readme/readme.xrm
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/readlicense_oo/docs/readme/readme.xrm?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/readlicense_oo/docs/readme/readme.xrm (original)
+++ openoffice/branches/ia2/main/readlicense_oo/docs/readme/readme.xrm Fri Feb  1 08:46:00 2013
@@ -39,18 +39,18 @@
 			<h1 id="Welcome" xml:lang="en-US">${PRODUCTNAME} ${PRODUCTVERSION} ReadMe</h1>
 			<p id="LatestUpdates" xml:lang="en-US">For latest updates to this readme file, see <a href="http://www.openoffice.org/welcome/readme.html">http://www.openoffice.org/welcome/readme.html</a></p>
 			<p id="A6" xml:lang="en-US">This file contains important information about this program. Please read this information very carefully before starting work.</p>
-			<p id="A7" xml:lang="en-US">The OpenOffice.org Community, responsible for the development of this product, would like to invite you to participate as a community member. As a new user, you can check out the ${PRODUCTNAME} site with helpful user information at <a href="http://www.openoffice.org/about_us/introduction.html">http://www.openoffice.org/about_us/introduction.html</a></p>
-			<p id="A9" xml:lang="en-US">Also read the sections below about getting involved in the OpenOffice.org project.</p>
+			<p id="A7" xml:lang="en-US">The Apache OpenOffice Community, responsible for the development of this product, would like to invite you to participate as a community member. As a new user, you can check out the ${PRODUCTNAME} site with helpful user information at <a href="http://www.openoffice.org/about_us/introduction.html">http://www.openoffice.org/about_us/introduction.html</a></p>
+			<p id="A9" xml:lang="en-US">Also read the sections below about getting involved in the Apache OpenOffice project.</p>
 			<h3 id="A10" xml:lang="en-US">Is ${PRODUCTNAME} really free for any user? </h3>
 			<p id="A11" xml:lang="en-US">${PRODUCTNAME} is free for use by everybody. You may take this copy of ${PRODUCTNAME} and install it on as many computers as you like, and use it for any purpose you like (including commercial, government, public administration and educational use). For further details see the license text delivered together with ${PRODUCTNAME} or <a href="http://www.openoffice.org/license.html">http://www.openoffice.org/license.html</a></p>
 			<h3 id="A12" xml:lang="en-US">Why is ${PRODUCTNAME} free for any user?</h3>
 			<p id="A13" xml:lang="en-US">You can use this copy of ${PRODUCTNAME} today free of charge because individual contributors and corporate sponsors have designed, developed, tested, translated, documented, supported, marketed, and helped in many other ways to make ${PRODUCTNAME} what it is today - the world's leading open-source office software.</p>
-			<p id="A13b" xml:lang="en-US">If you appreciate their efforts, and would like to ensure OpenOffice.org continues into the future, please consider contributing to the project - see <a href="http://contributing.openoffice.org">http://contributing.openoffice.org</a> for details. Everyone has a contribution to make.</p>
+			<p id="A13b" xml:lang="en-US">If you appreciate their efforts, and would like to ensure Apache OpenOffice continues into the future, please consider contributing to the project - see <a href="http://contributing.openoffice.org">http://contributing.openoffice.org</a> for details. Everyone has a contribution to make.</p>
 		</div>
 
 		<div id="Installation">
 			<h2 id="rr3fgf42r" xml:lang="en-US">Notes on Installation</h2>
-			<p class="note" id="javaneeded" xml:lang="en-US">${PRODUCTNAME} requires a recent version of JAVA for full functionality which is part of the ${PRODUCTNAME} installation package.</p>
+			<p class="note" id="javaneeded" xml:lang="en-US">${PRODUCTNAME} requires a recent version of JAVA for full functionality; JAVA can be downloaded from <a href="http://java.com">http://java.com</a>.</p>
 			<h3 id="sdfsdfgf42r" xml:lang="en-US">System Requirements</h3>
 			<div class="MAC" id="SystemRequirements_OSX">
 				<ul>
@@ -266,7 +266,7 @@
 
 		<div id="UserSupport">
 			<h2 id="support" xml:lang="en-US">User Support</h2>
-			<p id="support1" xml:lang="en-US">The main support page <a href="http://support.openoffice.org/">http://support.openoffice.org/</a> offers various possibilities for help with ${PRODUCTNAME}. Your question may have already been answered - check the Community Forum at <a href="http://user.services.openoffice.org">http://user.services.openoffice.org</a> or search the archives of the 'users@openoffice.org' mailing list at <a href="http://www.openoffice.org/mail_list.html">http://www.openoffice.org/mail_list.html</a>. Alternatively, you can send in your questions to <a href="mailto:users@openoffice.org">users@openoffice.org</a>. How to subscribe to the list (to get an email response) is explained on this page: <a href="http://wiki.services.openoffice.org/wiki/Website/Content/help/mailinglists">http://wiki.services.openoffice.org/wiki/Website/Content/help/mailinglists</a>.</p>
+			<p id="support1" xml:lang="en-US">The main support page <a href="http://support.openoffice.org/">http://support.openoffice.org/</a> offers various possibilities for help with ${PRODUCTNAME}. Your question may have already been answered - check the Community Forum at <a href="http://user.services.openoffice.org">http://user.services.openoffice.org</a> or search the archives of the 'users@openoffice.apache.org' mailing list at <a href="http://www.openoffice.org/mail_list.html">http://www.openoffice.org/mail_list.html</a>. Alternatively, you can send in your questions to <a href="mailto:users@openoffice.apache.org">users@openoffice.apache.org</a>. How to subscribe to the list (to get an email response) is explained on this page: <a href="http://wiki.services.openoffice.org/wiki/Website/Content/help/mailinglists">http://wiki.services.openoffice.org/wiki/Website/Content/help/mailinglists</a>.</p>
 			<p id="faq" url="ahead" xml:lang="en-US">Also check the FAQ section at <a href="http://wiki.services.openoffice.org/wiki/Documentation/FAQ">http://wiki.services.openoffice.org/wiki/Documentation/FAQ.</a></p>
 		</div>
 
@@ -302,13 +302,13 @@
 			</ul>
 			<h3 xml:lang="en-US">Joining the Project</h3>
 			<p id="joining" xml:lang="en-US">You can make major contributions to this important open source project even if you have limited software design or coding experience. Yes, you!</p>
-			<p id="joining1" url="ahead" xml:lang="en-US">At <a href="http://openoffice.apache.org/get-involved.html">http://openoffice.apache.org/get-involved.html</a> you will find a first overview where you can start with, ranging from Localization, QA, user support to some real core coding projects. If you are not a developer, try the Documentation or the Marketing Project. The OpenOffice.org Marketing Project is applying both guerilla and traditional commercial techniques to marketing open source software, and we are doing it across language and cultural barriers, so you can help just by spreading the word and telling a friend about this office suite.</p>
+			<p id="joining1" url="ahead" xml:lang="en-US">At <a href="http://openoffice.apache.org/get-involved.html">http://openoffice.apache.org/get-involved.html</a> you will find a first overview where you can start with, ranging from Localization, QA, user support to some real core coding projects. If you are not a developer, try the Documentation or the Marketing Project. The Apache OpenOffice Marketing Project is applying both guerilla and traditional commercial techniques to marketing open source software, and we are doing it across language and cultural barriers, so you can help just by spreading the word and telling a friend about this office suite.</p>
 			<p id="joining3" xml:lang="en-US">You can help by joining the marktig mailig list ooo-marketing@incubator.apache.org or visit the Marketing Communications &amp; Information Network on <a href="http://marketing.openoffice.org">http://marketing.openoffice.org</a> where you can provide point communication contact with press, media, government agencies, consultants, schools, Linux Users Groups and developers in your country and local community.</p>
 		</div>
 
 		<div id="Credits">
 			<p id="credits" xml:lang="en-US">We hope you enjoy working with the new ${PRODUCTNAME} ${PRODUCTVERSION} and will join us online.</p>
-			<p id="credits2" xml:lang="en-US">The OpenOffice.org Community</p>
+			<p id="credits2" xml:lang="en-US">The Apache OpenOffice Community</p>
 		</div>
 
 		<div id="ModifiedSourceCode">

Modified: openoffice/branches/ia2/main/registry/tools/rdbedit.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/registry/tools/rdbedit.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/registry/tools/rdbedit.cxx (original)
+++ openoffice/branches/ia2/main/registry/tools/rdbedit.cxx Fri Feb  1 08:46:00 2013
@@ -122,7 +122,7 @@ public:
 		{ return m_typeRegName; }
 	const OString& getKeyName()
 		{ return m_keyName; }
-	const Command getCommand()
+	Command getCommand()
 		{ return m_command; }
 	bool verbose()
 		{ return m_bVerbose; }	

Modified: openoffice/branches/ia2/main/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu (original)
+++ openoffice/branches/ia2/main/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu Fri Feb  1 08:46:00 2013
@@ -126,7 +126,7 @@
 	<node oor:name="EntryNames">
 		<node oor:name="SunReportBuilder" oor:op="replace">
 			<prop oor:name="DisplayName">
-				<value xml:lang="en-US">Oracle Report Builder</value>
+				<value xml:lang="en-US">Apache OpenOffice Report Builder</value>
 			</prop>
 			<node oor:name="Entries">
 				<node oor:name="ReportHeader" oor:op="replace">

Modified: openoffice/branches/ia2/main/reportdesign/source/core/api/ImageControl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/reportdesign/source/core/api/ImageControl.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/reportdesign/source/core/api/ImageControl.cxx (original)
+++ openoffice/branches/ia2/main/reportdesign/source/core/api/ImageControl.cxx Fri Feb  1 08:46:00 2013
@@ -125,7 +125,7 @@ OImageControl::OImageControl(uno::Refere
 :ImageControlBase(m_aMutex) 
 ,ImageControlPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getImageOptionals())
 ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext)
-,m_nScaleMode(awt::ImageScaleMode::None)
+,m_nScaleMode(awt::ImageScaleMode::NONE)
 ,m_bPreserveIRI(sal_True)
 {
 	DBG_CTOR( rpt_OImageControl,NULL);
@@ -138,7 +138,7 @@ OImageControl::OImageControl(uno::Refere
 :ImageControlBase(m_aMutex) 
 ,ImageControlPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getImageOptionals())
 ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext)
-,m_nScaleMode(awt::ImageScaleMode::None)
+,m_nScaleMode(awt::ImageScaleMode::NONE)
 ,m_bPreserveIRI(sal_True)
 {
 	DBG_CTOR( rpt_OImageControl,NULL);
@@ -477,7 +477,7 @@ void SAL_CALL OImageControl::setSize( co
 // -----------------------------------------------------------------------------
 void SAL_CALL OImageControl::setScaleMode( ::sal_Int16 _scalemode ) throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
-    if ( _scalemode < awt::ImageScaleMode::None ||_scalemode > awt::ImageScaleMode::Anisotropic )
+    if ( _scalemode < awt::ImageScaleMode::NONE ||_scalemode > awt::ImageScaleMode::ANISOTROPIC )
         throw lang::IllegalArgumentException();
     set(PROPERTY_SCALEMODE,_scalemode,m_nScaleMode);
 }

Modified: openoffice/branches/ia2/main/reportdesign/source/filter/xml/xmlHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/reportdesign/source/filter/xml/xmlHelper.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/reportdesign/source/filter/xml/xmlHelper.cxx (original)
+++ openoffice/branches/ia2/main/reportdesign/source/filter/xml/xmlHelper.cxx Fri Feb  1 08:46:00 2013
@@ -401,9 +401,9 @@ const SvXMLEnumMapEntry* OXMLHelper::Get
 {
        static SvXMLEnumMapEntry s_aXML_EnumMap[] =
        {
-               // { XML_NONE,          awt::ImageScaleMode::None }, // default
-               { XML_ISOTROPIC,        awt::ImageScaleMode::Isotropic },
-               { XML_ANISOTROPIC,      awt::ImageScaleMode::Anisotropic },
+               // { XML_NONE,          awt::ImageScaleMode::NONE }, // default
+               { XML_ISOTROPIC,        awt::ImageScaleMode::ISOTROPIC },
+               { XML_ANISOTROPIC,      awt::ImageScaleMode::ANISOTROPIC },
                { XML_TOKEN_INVALID, 0 }
        };
        return s_aXML_EnumMap;

Modified: openoffice/branches/ia2/main/reportdesign/source/filter/xml/xmlImage.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/reportdesign/source/filter/xml/xmlImage.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/reportdesign/source/filter/xml/xmlImage.cxx (original)
+++ openoffice/branches/ia2/main/reportdesign/source/filter/xml/xmlImage.cxx Fri Feb  1 08:46:00 2013
@@ -86,10 +86,10 @@ OXMLImage::OXMLImage( ORptFilter& rImpor
 					break;
                 case XML_TOK_SCALE:
                     {
-                        sal_uInt16 nRet = awt::ImageScaleMode::None;
+                        sal_uInt16 nRet = awt::ImageScaleMode::NONE;
                         if ( s_sTRUE == sValue )
                         {
-                            nRet = awt::ImageScaleMode::Anisotropic;
+                            nRet = awt::ImageScaleMode::ANISOTROPIC;
                         }
                         else
                         {

Modified: openoffice/branches/ia2/main/ridljar/com/sun/star/uno/UnoRuntime.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/ridljar/com/sun/star/uno/UnoRuntime.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/ridljar/com/sun/star/uno/UnoRuntime.java (original)
+++ openoffice/branches/ia2/main/ridljar/com/sun/star/uno/UnoRuntime.java Fri Feb  1 08:46:00 2013
@@ -165,7 +165,7 @@ public class UnoRuntime {
      * Queries the given UNO object for the given Java class (which must
      * represent a UNO interface type).
      *
-     * @param ifc a Java class representing a UNO interface type
+     * @param zInterface a Java class representing a UNO interface type
      * @param object a reference to any Java object representing (a facet of) a
      * UNO object; may be <code>null</code>
      * @return a reference to the requested UNO interface type if available,

Modified: openoffice/branches/ia2/main/sal/inc/osl/file.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sal/inc/osl/file.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sal/inc/osl/file.hxx (original)
+++ openoffice/branches/ia2/main/sal/inc/osl/file.hxx Fri Feb  1 08:46:00 2013
@@ -1595,7 +1595,7 @@ public:
 class DirectoryCreationObserver
 {          
 public:    
-    virtual ~DirectoryCreationObserver() {};
+    virtual ~DirectoryCreationObserver() {}
     
     /** This method will be called when a new directory has been
         created and needs to be overwritten by derived classes.
@@ -1693,7 +1693,7 @@ public:
         @see close()
     */
 
-	inline sal_Bool isOpen() { return _pData != NULL; };
+	inline sal_Bool isOpen() { return _pData != NULL; }
 
 	/**	Close a directory.
 	

Modified: openoffice/branches/ia2/main/sal/osl/unx/file.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sal/osl/unx/file.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sal/osl/unx/file.cxx (original)
+++ openoffice/branches/ia2/main/sal/osl/unx/file.cxx Fri Feb  1 08:46:00 2013
@@ -348,7 +348,7 @@ oslFileError FileHandle_Impl::readAt (
     if (!(m_state & STATE_READABLE))
         return osl_File_E_BADF;
 
-#if defined(LINUX) || defined(SOLARIS)
+#if defined(LINUX) || defined(SOLARIS) || defined(FREEBSD) || defined(MACOSX)
 
     ssize_t nBytes = ::pread (m_fd, pBuffer, nBytesRequested, nOffset);
     if ((-1 == nBytes) && (EOVERFLOW == errno))
@@ -362,7 +362,7 @@ oslFileError FileHandle_Impl::readAt (
     if (-1 == nBytes)
         return oslTranslateFileError (OSL_FET_ERROR, errno);
 
-#else /* !(LINUX || SOLARIS) */
+#else /* no pread(2) ! */
 
     if (nOffset != m_offset)
 	{
@@ -376,7 +376,7 @@ oslFileError FileHandle_Impl::readAt (
         return oslTranslateFileError (OSL_FET_ERROR, errno);
 	m_offset += nBytes;
 
-#endif /* !(LINUX || SOLARIS) */
+#endif /* no pread(2) ! */
 
     OSL_FILE_TRACE("FileHandle_Impl::readAt(%d, %lld, %ld)", m_fd, nOffset, nBytes);
     *pBytesRead = nBytes;
@@ -397,13 +397,13 @@ oslFileError FileHandle_Impl::writeAt (
     if (!(m_state & STATE_WRITEABLE))
         return osl_File_E_BADF;
 
-#if defined(LINUX) || defined(SOLARIS)
+#if defined(LINUX) || defined(SOLARIS) || defined(FREEBSD) || defined(MACOSX)
 
     ssize_t nBytes = ::pwrite (m_fd, pBuffer, nBytesToWrite, nOffset);
     if (-1 == nBytes)
         return oslTranslateFileError (OSL_FET_ERROR, errno);
 
-#else /* !(LINUX || SOLARIS) */
+#else /* no pwrite(2) ! */
 
     if (nOffset != m_offset)
 	{
@@ -417,7 +417,7 @@ oslFileError FileHandle_Impl::writeAt (
         return oslTranslateFileError (OSL_FET_ERROR, errno);
 	m_offset += nBytes;
 
-#endif /* !(LINUX || SOLARIS) */
+#endif /* no pwrite(2) ! */
 
     OSL_FILE_TRACE("FileHandle_Impl::writeAt(%d, %lld, %ld)", m_fd, nOffset, nBytes);
     m_size = std::max (m_size, sal::static_int_cast< sal_uInt64 >(nOffset + nBytes));

Modified: openoffice/branches/ia2/main/sc/inc/document.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/inc/document.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/inc/document.hxx (original)
+++ openoffice/branches/ia2/main/sc/inc/document.hxx Fri Feb  1 08:46:00 2013
@@ -417,7 +417,6 @@ private:
 
 	sal_uInt8				nAsianCompression;
 	sal_uInt8				nAsianKerning;
-    sal_Bool                bSetDrawDefaults;
 
     sal_Bool                bPastingDrawFromOtherDoc;
 
@@ -477,8 +476,6 @@ public:
 	void					GetLanguage( LanguageType& rLatin, LanguageType& rCjk, LanguageType& rCtl ) const;
 	void					SetLanguage( LanguageType eLatin, LanguageType eCjk, LanguageType eCtl );
 
-    void                    SetDrawDefaults();
-
 	void						SetConsolidateDlgData( const ScConsolidateParam* pData );
 	const ScConsolidateParam*	GetConsolidateDlgData() const { return pConsolidateDlgData; }
 
@@ -1868,7 +1865,6 @@ private: // CLOOK-Impl-Methoden
 
 	void	UpdateDrawPrinter();
 	void	UpdateDrawLanguages();
-    void    UpdateDrawDefaults();
 	SC_DLLPUBLIC void	InitClipPtrs( ScDocument* pSourceDoc );
 
 	void	LoadDdeLinks(SvStream& rStream);

Modified: openoffice/branches/ia2/main/sc/source/core/data/documen2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/core/data/documen2.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/core/data/documen2.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/core/data/documen2.cxx Fri Feb  1 08:46:00 2013
@@ -204,7 +204,6 @@ ScDocument::ScDocument( ScDocumentMode	e
 		nVisSpellState( 0 ),
         nAsianCompression(SC_ASIANCOMPRESSION_INVALID),
         nAsianKerning(SC_ASIANKERNING_INVALID),
-        bSetDrawDefaults( sal_False ),
         bPastingDrawFromOtherDoc( sal_False ),
         nInDdeLinkUpdate( 0 ),
         bInUnoBroadcast( sal_False ),

Modified: openoffice/branches/ia2/main/sc/source/core/data/documen3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/core/data/documen3.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/core/data/documen3.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/core/data/documen3.cxx Fri Feb  1 08:46:00 2013
@@ -1914,12 +1914,6 @@ void ScDocument::SetLanguage( LanguageTy
 	UpdateDrawLanguages();		// set edit engine defaults in drawing layer pool
 }
 
-void ScDocument::SetDrawDefaults()
-{
-    bSetDrawDefaults = sal_True;
-    UpdateDrawDefaults();
-}
-
 Rectangle ScDocument::GetMMRect( SCCOL nStartCol, SCROW nStartRow,
 								SCCOL nEndCol, SCROW nEndRow, SCTAB nTab )
 {

Modified: openoffice/branches/ia2/main/sc/source/core/data/documen9.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/core/data/documen9.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/core/data/documen9.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/core/data/documen9.cxx Fri Feb  1 08:46:00 2013
@@ -192,8 +192,12 @@ void ScDocument::InitDrawLayer( SfxObjec
 		pDrawLayer->SetDefaultTabulator( GetDocOptions().GetTabDistance() );
 
 		UpdateDrawPrinter();
-        UpdateDrawDefaults();
-		UpdateDrawLanguages();
+
+        // set draw defaults directly
+        SfxItemPool& rDrawPool = pDrawLayer->GetItemPool();
+        rDrawPool.SetPoolDefaultItem( SvxAutoKernItem( sal_True, EE_CHAR_PAIRKERNING ) );
+
+        UpdateDrawLanguages();
 		if (bImportingXML)
 			pDrawLayer->EnableAdjust(sal_False);
 
@@ -217,18 +221,6 @@ void ScDocument::UpdateDrawLanguages()
 	}
 }
 
-void ScDocument::UpdateDrawDefaults()
-{
-    // drawing layer defaults that are set for new documents (if InitNew was called)
-
-    if ( pDrawLayer && bSetDrawDefaults )
-    {
-        SfxItemPool& rDrawPool = pDrawLayer->GetItemPool();
-        rDrawPool.SetPoolDefaultItem( SvxAutoKernItem( sal_True, EE_CHAR_PAIRKERNING ) );
-		pDrawLayer->SetDrawingLayerPoolDefaults();
-    }
-}
-
 void ScDocument::UpdateDrawPrinter()
 {
 	if (pDrawLayer)

Modified: openoffice/branches/ia2/main/sc/source/core/inc/interpre.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/core/inc/interpre.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/core/inc/interpre.hxx (original)
+++ openoffice/branches/ia2/main/sc/source/core/inc/interpre.hxx Fri Feb  1 08:46:00 2013
@@ -33,6 +33,19 @@
 #include <math.h>
 #include <map>
 
+// STLport definitions
+// This works around some issues with Boost
+//
+#ifdef WNT
+#define _STLP_HAS_NATIVE_FLOAT_ABS
+#endif
+
+// Math policy definitions for Boost
+// This header must be included before including any Boost
+// math function.
+//
+#define BOOST_MATH_OVERFLOW_ERROR_POLICY errno_on_error
+
 class ScDocument;
 class SbxVariable;
 class ScBaseCell;

Modified: openoffice/branches/ia2/main/sc/source/core/tool/interpr1.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/core/tool/interpr1.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/core/tool/interpr1.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/core/tool/interpr1.cxx Fri Feb  1 08:46:00 2013
@@ -40,7 +40,6 @@
 #include <unotools/transliterationwrapper.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/logfile.hxx>
-#include <rtl/random.h>
 #include <unicode/uchar.h>
 
 #include "interpre.hxx"
@@ -72,6 +71,13 @@
 #include "doubleref.hxx"
 #include "queryparam.hxx"
 
+#include <boost/random/mersenne_twister.hpp>
+#include <boost/random/uniform_01.hpp>
+
+#include <boost/math/special_functions/acosh.hpp>
+#include <boost/math/special_functions/asinh.hpp>
+#include <boost/math/special_functions/atanh.hpp>
+
 #define SC_DOUBLE_MAXVALUE  1.7e307
 
 IMPL_FIXEDMEMPOOL_NEWDEL( ScTokenStack, 8, 4 )
@@ -1542,46 +1548,12 @@ void ScInterpreter::ScPi()
 
 void ScInterpreter::ScRandom()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScRandom" );
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "bst", "ScInterpreter::ScRandom" );
 
-    static sal_Int32 nScRandomIx = 0, nScRandomIy = 0, nScRandomIz = 0, nScRandomIt = 0;
-    static rtlRandomPool aPool = rtl_random_createPool();
-    double fScRandomW;
-
-    // Seeding for the PRNG: should be good enough but we
-    // monitor the values to keep things under control.
-    if (nScRandomIx <= 0)
-	rtl_random_getBytes(aPool, &nScRandomIx, sizeof(nScRandomIx));
-    if (nScRandomIy <= 0)
-	rtl_random_getBytes(aPool, &nScRandomIy, sizeof(nScRandomIy));
-    if (nScRandomIz <= 0)
-	rtl_random_getBytes(aPool, &nScRandomIz, sizeof(nScRandomIz));
-    if (nScRandomIt <= 0)
-	rtl_random_getBytes(aPool, &nScRandomIt, sizeof(nScRandomIt));
+    boost::random::mt19937 ScGen(static_cast<unsigned int>(std::time(0)));
+    static boost::uniform_01<boost::mt19937> ScZeroOne(ScGen);
     
-    // Basically unmodified algorithm from
-    // Wichman and Hill, "Generating good pseudo-random numbers",
-    //		December 5, 2005.
-    
-    nScRandomIx = 11600L * (nScRandomIx % 185127L) - 10379L * (nScRandomIx / 185127L);
-    nScRandomIy = 47003L * (nScRandomIy %  45688L) - 10479L * (nScRandomIy /  45688L);
-    nScRandomIz = 23000L * (nScRandomIz %  93368L) - 19423L * (nScRandomIz /  93368L);
-    nScRandomIt = 33000L * (nScRandomIt %  65075L) -  8123L * (nScRandomIt /  65075L);
-    if (nScRandomIx < 0)
-	nScRandomIx += 2147483579L;
-    if (nScRandomIy < 0)
-	nScRandomIy += 2147483543L;
-    if (nScRandomIz < 0)
-	nScRandomIz += 2147483123L;
-    if (nScRandomIt < 0)
-	nScRandomIt += 2147483123L;
-
-    fScRandomW = (double)nScRandomIx*0.0000000004656613022697297188506231646486 +
-	      	(double)nScRandomIy*0.0000000004656613100759859932486569933169 +
-		(double)nScRandomIz*0.0000000004656613360968421314794009471615 +
-		(double)nScRandomIt*0.0000000004656614011489951998100056779817;
-
-    PushDouble(fScRandomW - (sal_Int32)fScRandomW);
+    PushDouble(ScZeroOne());
 }
 
 
@@ -1702,7 +1674,7 @@ void ScInterpreter::ScCotHyp()
 void ScInterpreter::ScArcSinHyp()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScArcSinHyp" );
-    PushDouble( ::rtl::math::asinh( GetDouble()));
+    PushDouble( ::boost::math::asinh( GetDouble()));
 }
 
 void ScInterpreter::ScArcCosHyp()
@@ -1712,7 +1684,7 @@ void ScInterpreter::ScArcCosHyp()
     if (fVal < 1.0)
         PushIllegalArgument();
     else
-        PushDouble( ::rtl::math::acosh( fVal));
+        PushDouble( ::boost::math::acosh( fVal));
 }
 
 void ScInterpreter::ScArcTanHyp()
@@ -1722,7 +1694,7 @@ void ScInterpreter::ScArcTanHyp()
     if (fabs(fVal) >= 1.0)
         PushIllegalArgument();
     else
-        PushDouble( ::rtl::math::atanh( fVal));
+        PushDouble( ::boost::math::atanh( fVal));
 }
 
 

Modified: openoffice/branches/ia2/main/sc/source/core/tool/interpr2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/core/tool/interpr2.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/core/tool/interpr2.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/core/tool/interpr2.cxx Fri Feb  1 08:46:00 2013
@@ -52,6 +52,9 @@
 #include <string.h>
 #include <math.h>
 
+#include <boost/math/special_functions/expm1.hpp>
+#include <boost/math/special_functions/log1p.hpp>
+
 using namespace formula;
 // STATIC DATA -----------------------------------------------------------
 
@@ -1135,11 +1138,11 @@ double ScInterpreter::ScGetRmz(double fR
     else
     {
         if (fPaytype > 0.0) // payment in advance
-            fPayment = (fFv + fPv * exp( fNper * ::rtl::math::log1p(fRate) ) ) * fRate / 
-                (::rtl::math::expm1( (fNper + 1) * ::rtl::math::log1p(fRate) ) - fRate);
+            fPayment = (fFv + fPv * exp( fNper * ::boost::math::log1p(fRate) ) ) * fRate / 
+                (::boost::math::expm1( (fNper + 1) * ::boost::math::log1p(fRate) ) - fRate);
         else  // payment in arrear
-            fPayment = (fFv + fPv * exp(fNper * ::rtl::math::log1p(fRate) ) ) * fRate / 
-                ::rtl::math::expm1( fNper * ::rtl::math::log1p(fRate) );
+            fPayment = (fFv + fPv * exp(fNper * ::boost::math::log1p(fRate) ) ) * fRate / 
+                ::boost::math::expm1( fNper * ::boost::math::log1p(fRate) );
     }
     return -fPayment;
 }

Modified: openoffice/branches/ia2/main/sc/source/core/tool/interpr3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/core/tool/interpr3.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/core/tool/interpr3.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/core/tool/interpr3.cxx Fri Feb  1 08:46:00 2013
@@ -44,6 +44,10 @@
 #include <vector>
 #include <algorithm>
 
+#include <boost/math/special_functions/atanh.hpp>
+#include <boost/math/special_functions/expm1.hpp>
+#include <boost/math/special_functions/log1p.hpp>
+
 using ::std::vector;
 using namespace formula;
 
@@ -853,8 +857,8 @@ double ScInterpreter::GetBeta(double fAl
     fLanczos *= sqrt((fABgm/(fA+fgm))/(fB+fgm));
     double fTempA = fB/(fA+fgm); // (fA+fgm)/fABgm = 1 / ( 1 + fB/(fA+fgm))
     double fTempB = fA/(fB+fgm);
-    double fResult = exp(-fA * ::rtl::math::log1p(fTempA)
-                            -fB * ::rtl::math::log1p(fTempB)-fgm);
+    double fResult = exp(-fA * ::boost::math::log1p(fTempA)
+                            -fB * ::boost::math::log1p(fTempB)-fgm);
     fResult *= fLanczos;
     return fResult;
 }
@@ -882,8 +886,8 @@ double ScInterpreter::GetLogBeta(double 
     fLogLanczos += 0.5*(log(fABgm)-log(fA+fgm)-log(fB+fgm));
     double fTempA = fB/(fA+fgm); // (fA+fgm)/fABgm = 1 / ( 1 + fB/(fA+fgm))
     double fTempB = fA/(fB+fgm);
-    double fResult = -fA * ::rtl::math::log1p(fTempA)
-                        -fB * ::rtl::math::log1p(fTempB)-fgm;
+    double fResult = -fA * ::boost::math::log1p(fTempA)
+                        -fB * ::boost::math::log1p(fTempB)-fgm;
     fResult += fLogLanczos;
     return fResult;
 }
@@ -904,7 +908,7 @@ double ScInterpreter::GetBetaDistPDF(dou
             return HUGE_VAL;
         }
         if (fX <= 0.01)
-            return fB + fB * ::rtl::math::expm1((fB-1.0) * ::rtl::math::log1p(-fX));
+            return fB + fB * ::boost::math::expm1((fB-1.0) * ::boost::math::log1p(-fX));
         else
             return fB * pow(0.5-fX+0.5,fB-1.0);
     }
@@ -943,7 +947,7 @@ double ScInterpreter::GetBetaDistPDF(dou
     // normal cases; result x^(a-1)*(1-x)^(b-1)/Beta(a,b)
     const double fLogDblMax = log( ::std::numeric_limits<double>::max());
     const double fLogDblMin = log( ::std::numeric_limits<double>::min());
-    double fLogY = (fX < 0.1) ? ::rtl::math::log1p(-fX) : log(0.5-fX+0.5);
+    double fLogY = (fX < 0.1) ? ::boost::math::log1p(-fX) : log(0.5-fX+0.5);
     double fLogX = log(fX);
     double fAm1LogX = (fA-1.0) * fLogX;
     double fBm1LogY = (fB-1.0) * fLogY;
@@ -1024,13 +1028,13 @@ double ScInterpreter::GetBetaDist(double
         return pow(fXin, fAlpha);
     if (fAlpha == 1.0)
     //            1.0 - pow(1.0-fX,fBeta) is not accurate enough
-        return -::rtl::math::expm1(fBeta * ::rtl::math::log1p(-fXin));
+        return -::boost::math::expm1(fBeta * ::boost::math::log1p(-fXin));
     //FIXME: need special algorithm for fX near fP for large fA,fB
     double fResult;
     // I use always continued fraction, power series are neither
     // faster nor more accurate.
     double fY = (0.5-fXin)+0.5;
-    double flnY = ::rtl::math::log1p(-fXin);
+    double flnY = ::boost::math::log1p(-fXin);
     double fX = fXin;
     double flnX = log(fXin);
     double fA = fAlpha;
@@ -1141,7 +1145,7 @@ void ScInterpreter::ScFisher()
     if (fabs(fVal) >= 1.0)
         PushIllegalArgument();
     else
-        PushDouble( ::rtl::math::atanh( fVal));
+        PushDouble( ::boost::math::atanh( fVal));
 }
 
 void ScInterpreter::ScFisherInv()

Modified: openoffice/branches/ia2/main/sc/source/core/tool/viewopti.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/core/tool/viewopti.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/core/tool/viewopti.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/core/tool/viewopti.cxx Fri Feb  1 08:46:00 2013
@@ -146,9 +146,9 @@ void ScViewOptions::SetDefaults()
 {
 	aOptArr[ VOPT_FORMULAS	  ] =
 	aOptArr[ VOPT_SYNTAX	  ] =
-	aOptArr[ VOPT_HELPLINES   ] =
-	aOptArr[ VOPT_BIGHANDLES  ] = sal_False;
-	aOptArr[ VOPT_NOTES		  ] =
+	aOptArr[ VOPT_HELPLINES   ] = sal_False;
+
+    aOptArr[ VOPT_NOTES		  ] =
 	aOptArr[ VOPT_NULLVALS	  ] =
 	aOptArr[ VOPT_VSCROLL	  ] =
 	aOptArr[ VOPT_HSCROLL	  ] =
@@ -158,7 +158,8 @@ void ScViewOptions::SetDefaults()
 	aOptArr[ VOPT_GRID		  ] =
 	aOptArr[ VOPT_ANCHOR	  ] =
 	aOptArr[ VOPT_PAGEBREAKS  ] =
-	aOptArr[ VOPT_SOLIDHANDLES] =
+	aOptArr[ VOPT_SOLIDHANDLES] =   // default is enhanced handles
+	aOptArr[ VOPT_BIGHANDLES  ] =   // default is big handles
 	aOptArr[ VOPT_CLIPMARKS	  ] = sal_True;
 
 	aModeArr[VOBJ_TYPE_OLE ]  =

Modified: openoffice/branches/ia2/main/sc/source/filter/excel/xiescher.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/filter/excel/xiescher.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/filter/excel/xiescher.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/filter/excel/xiescher.cxx Fri Feb  1 08:46:00 2013
@@ -86,6 +86,7 @@
 #include <svx/xlinjoit.hxx>
 #include <svx/xlntrit.hxx>
 #include <svx/xbtmpit.hxx>
+#include <vcl/dibtools.hxx>
 
 #include "document.hxx"
 #include "drwlayer.hxx"
@@ -747,7 +748,7 @@ void XclImpDrawObjBase::ConvertFillStyle
                 aMemStrm << sal_uInt32( pnPattern[ nIdx ] ); // 32-bit little-endian
             aMemStrm.Seek( STREAM_SEEK_TO_BEGIN );
             Bitmap aBitmap;
-            aBitmap.Read( aMemStrm, sal_False );
+            ReadDIB(aBitmap, aMemStrm, false);
             rSdrObj.SetMergedItem(XFillStyleItem(XFILL_BITMAP));
             rSdrObj.SetMergedItem(XFillBitmapItem(EMPTY_STRING, Graphic(aBitmap)));
         }
@@ -3943,7 +3944,7 @@ void XclImpDrawing::ReadBmp( Graphic& rG
     // import the graphic from memory stream
     aMemStrm.Seek( STREAM_SEEK_TO_BEGIN );
     Bitmap aBitmap;
-    if( aBitmap.Read( aMemStrm, sal_False ) )   // read DIB without file header
+    if( ReadDIB(aBitmap, aMemStrm, false) )   // read DIB without file header
         rGraphic = aBitmap;
 }
 

Modified: openoffice/branches/ia2/main/sc/source/ui/app/drwtrans.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/app/drwtrans.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/app/drwtrans.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/app/drwtrans.cxx Fri Feb  1 08:46:00 2013
@@ -437,7 +437,7 @@ sal_Bool ScDrawTransferObj::GetData( con
             if ( nFormat == SOT_FORMAT_GDIMETAFILE )
                 bOK = SetGDIMetaFile( aView.GetMarkedObjMetaFile(true), rFlavor );
             else
-                bOK = SetBitmap( aView.GetMarkedObjBitmapEx(true).GetBitmap(), rFlavor );
+                bOK = SetBitmapEx( aView.GetMarkedObjBitmapEx(true), rFlavor );
         }
         else if ( nFormat == SOT_FORMATSTR_ID_SVXB )
         {

Modified: openoffice/branches/ia2/main/sc/source/ui/app/transobj.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/app/transobj.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/app/transobj.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/app/transobj.cxx Fri Feb  1 08:46:00 2013
@@ -342,7 +342,7 @@ sal_Bool ScTransferObj::GetData( const d
 
 			aVirtDev.SetMapMode( MapMode( MAP_PIXEL ) );
 			Bitmap aBmp = aVirtDev.GetBitmap( Point(), aVirtDev.GetOutputSize() );
-			bOK = SetBitmap( aBmp, rFlavor );
+			bOK = SetBitmapEx( aBmp, rFlavor );
 		}
 		else if ( nFormat == SOT_FORMAT_GDIMETAFILE )
 		{

Modified: openoffice/branches/ia2/main/sc/source/ui/docshell/docsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/docshell/docsh.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/docshell/docsh.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/docshell/docsh.cxx Fri Feb  1 08:46:00 2013
@@ -2999,7 +2999,7 @@ bool ScDocShell::GetProtectionHash( /*ou
     return bRes;
 }    
 
-void ScDocShell::BeforeLoading( SfxMedium& rMedium, const ::rtl::OUString & rstrTypeName, const ::rtl::OUString & rstrFilterName )
+void ScDocShell::BeforeLoading( SfxMedium& /*rMedium*/, const ::rtl::OUString & rstrTypeName, const ::rtl::OUString & /*rstrFilterName*/ )
 {
     const sal_uInt8 nMediumFlag = GetMediumFlag<false>( rstrTypeName );
 
@@ -3012,7 +3012,7 @@ void ScDocShell::BeforeLoading( SfxMediu
     }
 }
 
-void ScDocShell::AfterLoading( SfxMedium& rMedium, const ::rtl::OUString & rstrTypeName, const ::rtl::OUString & rstrFilterName )
+void ScDocShell::AfterLoading( SfxMedium& /*rMedium*/, const ::rtl::OUString & rstrTypeName, const ::rtl::OUString & /*rstrFilterName*/ )
 {
     const sal_uInt8 nMediumFlag = GetMediumFlag<false>( rstrTypeName );
 

Modified: openoffice/branches/ia2/main/sc/source/ui/docshell/docsh2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/docshell/docsh2.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/docshell/docsh2.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/docshell/docsh2.cxx Fri Feb  1 08:46:00 2013
@@ -86,8 +86,6 @@ sal_Bool __EXPORT ScDocShell::InitNew( c
 		SetVisAreaOrSize( Rectangle( Point(), aSize ), sal_True );
 	}
 
-    aDocument.SetDrawDefaults();        // drawing layer defaults that are set only in InitNew
-
 	// InitOptions sets the document languages, must be called before CreateStandardStyles
     InitOptions(false);
 

Modified: openoffice/branches/ia2/main/sc/source/ui/inc/viewfunc.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/inc/viewfunc.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/inc/viewfunc.hxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/inc/viewfunc.hxx Fri Feb  1 08:46:00 2013
@@ -139,7 +139,7 @@ public:
 
 	sal_Bool			PasteFile( const Point&, const String&, sal_Bool bLink=sal_False );
     sal_Bool            PasteObject( const Point&, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >&, const Size* = NULL, const Graphic* = NULL, const ::rtl::OUString& = ::rtl::OUString(), sal_Int64 nAspect = ::com::sun::star::embed::Aspects::MSOLE_CONTENT );
-	sal_Bool			PasteBitmap( const Point&, const Bitmap& );
+	sal_Bool			PasteBitmapEx( const Point&, const BitmapEx& );
 	sal_Bool			PasteMetaFile( const Point&, const GDIMetaFile& );
 	sal_Bool			PasteGraphic( const Point& rPos, const Graphic& rGraphic,
 									const String& rFile, const String& rFilter );

Modified: openoffice/branches/ia2/main/sc/source/ui/vba/helperdecl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/vba/helperdecl.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/vba/helperdecl.hxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/vba/helperdecl.hxx Fri Feb  1 08:46:00 2013
@@ -26,7 +26,7 @@
 namespace comphelper {
 namespace service_decl {
 template <typename ImplT_, typename WithArgsT = with_args<false> >
-struct vba_service_class_ : public serviceimpl_base< detail::OwnServiceImpl<ImplT_>, WithArgsT >
+struct vba_service_class_ : public serviceimpl_base< vba_detail::OwnServiceImpl<ImplT_>, WithArgsT >
 {
     typedef serviceimpl_base< detail::OwnServiceImpl<ImplT_>, WithArgsT > baseT;
     /** Default ctor.  Implementation class without args, expecting

Modified: openoffice/branches/ia2/main/sc/source/ui/vba/vbahyperlinks.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/vba/vbahyperlinks.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/vba/vbahyperlinks.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/vba/vbahyperlinks.cxx Fri Feb  1 08:46:00 2013
@@ -109,7 +109,7 @@ bool EqualAnchorFunctor::operator()( con
 
 // ============================================================================
 
-namespace detail {
+namespace vba_detail {
 
 class ScVbaHlinkContainer : public ::cppu::WeakImplHelper1< container::XIndexAccess >
 {
@@ -201,13 +201,13 @@ ScVbaHlinkContainerMember::~ScVbaHlinkCo
 {
 }
 
-} // namespace detail
+} // namespace vba_detail
 
 // ============================================================================
 
 ScVbaHyperlinks::ScVbaHyperlinks( const uno::Reference< XHelperInterface >& rxParent,
         const uno::Reference< uno::XComponentContext >& rxContext ) throw (uno::RuntimeException) :
-    detail::ScVbaHlinkContainerMember( new detail::ScVbaHlinkContainer ),
+    vba_detail::ScVbaHlinkContainerMember( new vba_detail::ScVbaHlinkContainer ),
     ScVbaHyperlinks_BASE( rxParent, rxContext, uno::Reference< container::XIndexAccess >( mxContainer.get() ) )
 {
 }
@@ -215,7 +215,7 @@ ScVbaHyperlinks::ScVbaHyperlinks( const 
 ScVbaHyperlinks::ScVbaHyperlinks( const uno::Reference< XHelperInterface >& rxParent,
         const uno::Reference< uno::XComponentContext >& rxContext,
         const ScVbaHyperlinksRef& rxSheetHlinks, const ScRangeList& rScRanges ) throw (uno::RuntimeException) :
-    detail::ScVbaHlinkContainerMember( new detail::ScVbaHlinkContainer( rxSheetHlinks->mxContainer, rScRanges ) ),
+    vba_detail::ScVbaHlinkContainerMember( new vba_detail::ScVbaHlinkContainer( rxSheetHlinks->mxContainer, rScRanges ) ),
     ScVbaHyperlinks_BASE( rxParent, rxContext, uno::Reference< container::XIndexAccess >( mxContainer.get() ) ),
     mxSheetHlinks( rxSheetHlinks )
 {

Modified: openoffice/branches/ia2/main/sc/source/ui/vba/vbahyperlinks.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/vba/vbahyperlinks.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/vba/vbahyperlinks.hxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/vba/vbahyperlinks.hxx Fri Feb  1 08:46:00 2013
@@ -32,7 +32,7 @@ class ScRangeList;
 
 // ============================================================================
 
-namespace detail {
+namespace vba_detail {
 
 class ScVbaHlinkContainer;
 typedef ::rtl::Reference< ScVbaHlinkContainer > ScVbaHlinkContainerRef;
@@ -48,7 +48,7 @@ struct ScVbaHlinkContainerMember
     ~ScVbaHlinkContainerMember();
 };
 
-} // namespace detail
+} // namespace vba_detail
 
 // ============================================================================
 
@@ -103,7 +103,7 @@ typedef CollTestImplHelper< ov::excel::X
 
     End With
  */
-class ScVbaHyperlinks : private detail::ScVbaHlinkContainerMember, public ScVbaHyperlinks_BASE
+class ScVbaHyperlinks : private vba_detail::ScVbaHlinkContainerMember, public ScVbaHyperlinks_BASE
 {
 public:
     explicit ScVbaHyperlinks(

Modified: openoffice/branches/ia2/main/sc/source/ui/vba/vbawindow.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/vba/vbawindow.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/vba/vbawindow.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/vba/vbawindow.cxx Fri Feb  1 08:46:00 2013
@@ -310,7 +310,7 @@ ScVbaWindow::ScrollWorkbookTabs( const u
 uno::Any SAL_CALL 
 ScVbaWindow::getCaption() throw (uno::RuntimeException)
 {
-	static rtl::OUString sCrud(RTL_CONSTASCII_USTRINGPARAM(" - OpenOffice.org Calc" ) );
+	static rtl::OUString sCrud(RTL_CONSTASCII_USTRINGPARAM(" - Apache OpenOffice Calc" ) );
 	static sal_Int32 nCrudLen = sCrud.getLength();
 
 	rtl::OUString sTitle;

Modified: openoffice/branches/ia2/main/sc/source/ui/view/gridwin.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/view/gridwin.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/view/gridwin.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/view/gridwin.cxx Fri Feb  1 08:46:00 2013
@@ -5344,25 +5344,9 @@ void ScGridWindow::UpdateSelectionOverla
 				aRanges.push_back(aRB);
 			}
 
-            // #i97672# get the system's hilight color and limit it to the maximum
-            // allowed luminance. This is needed to react on too bright hilight colors
-            // which would otherwise vive a bad visualisation
-			Color aHighlight(GetSettings().GetStyleSettings().GetHighlightColor());
-			const SvtOptionsDrawinglayer aSvtOptionsDrawinglayer;
-            const basegfx::BColor aSelection(aHighlight.getBColor());
-            const double fLuminance(aSelection.luminance());
-            const double fMaxLum(aSvtOptionsDrawinglayer.GetSelectionMaximumLuminancePercent() / 100.0);
-
-            if(fLuminance > fMaxLum)
-            {
-                const double fFactor(fMaxLum / fLuminance);
-                const basegfx::BColor aNewSelection(
-                    aSelection.getRed() * fFactor,
-                    aSelection.getGreen() * fFactor,
-                    aSelection.getBlue() * fFactor);
-
-                aHighlight = Color(aNewSelection);
-            }
+            // get the system's hilight color
+            const SvtOptionsDrawinglayer aSvtOptionsDrawinglayer;
+            const Color aHighlight(aSvtOptionsDrawinglayer.getHilightColor());
 
 			sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection(
 				sdr::overlay::OVERLAY_TRANSPARENT, 

Modified: openoffice/branches/ia2/main/sc/source/ui/view/viewfun3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/view/viewfun3.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/view/viewfun3.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/view/viewfun3.cxx Fri Feb  1 08:46:00 2013
@@ -845,9 +845,9 @@ sal_Bool ScViewFunc::PasteOnDrawObject( 
 		}
 		else if ( aDataHelper.HasFormat( SOT_FORMAT_BITMAP ) )
 		{
-			Bitmap aBmp;
-			if( aDataHelper.GetBitmap( FORMAT_BITMAP, aBmp ) )
-				bRet = ApplyGraphicToObject( pHitObj, Graphic(aBmp) );
+			BitmapEx aBmpEx;
+			if( aDataHelper.GetBitmapEx( FORMAT_BITMAP, aBmpEx ) )
+				bRet = ApplyGraphicToObject( pHitObj, Graphic(aBmpEx) );
 		}
 	}
 	else

Modified: openoffice/branches/ia2/main/sc/source/ui/view/viewfun5.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/view/viewfun5.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/view/viewfun5.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/view/viewfun5.cxx Fri Feb  1 08:46:00 2013
@@ -457,9 +457,9 @@ sal_Bool ScViewFunc::PasteDataFormat( sa
 	}
 	else if (nFormatId == SOT_FORMAT_BITMAP)
 	{
-		Bitmap aBmp;
-		if( aDataHelper.GetBitmap( FORMAT_BITMAP, aBmp ) )
-			bRet = PasteBitmap( aPos, aBmp );
+		BitmapEx aBmpEx;
+		if( aDataHelper.GetBitmapEx( FORMAT_BITMAP, aBmpEx ) )
+			bRet = PasteBitmapEx( aPos, aBmpEx );
 	}
 	else if (nFormatId == SOT_FORMAT_GDIMETAFILE)
 	{

Modified: openoffice/branches/ia2/main/sc/source/ui/view/viewfun7.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/view/viewfun7.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/view/viewfun7.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/view/viewfun7.cxx Fri Feb  1 08:46:00 2013
@@ -370,10 +370,10 @@ sal_Bool ScViewFunc::PasteObject( const 
 		return sal_False;
 }
 
-sal_Bool ScViewFunc::PasteBitmap( const Point& rPos, const Bitmap& rBmp )
+sal_Bool ScViewFunc::PasteBitmapEx( const Point& rPos, const BitmapEx& rBmpEx )
 {
 	String aEmpty;
-	Graphic aGraphic(rBmp);
+	Graphic aGraphic(rBmpEx);
 	return PasteGraphic( rPos, aGraphic, aEmpty, aEmpty );
 }
 

Modified: openoffice/branches/ia2/main/sc/workben/celltrans/parse.py
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/workben/celltrans/parse.py?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/workben/celltrans/parse.py (original)
+++ openoffice/branches/ia2/main/sc/workben/celltrans/parse.py Fri Feb  1 08:46:00 2013
@@ -25,7 +25,7 @@ import sys
 localeNames = {'fr': 'French', 'hu': 'Hungarian', 'de': 'German'}
 def getLocaleName (code):
     global localeNames
-    if localeNames.has_key(code):
+    if code in localeNames:
         return localeNames[code]
     else:
         return "(unknown locale)"
@@ -42,7 +42,7 @@ class LocaleData(object):
         self.funcList = {}
 
     def addKeywordMap (self, funcName, localeName, engName):
-        if not self.funcList.has_key(funcName):
+        if funcName not in self.funcList:
             self.funcList[funcName] = []
 
         self.funcList[funcName].append([localeName, engName])
@@ -136,7 +136,7 @@ class Parser(object):
         for item in buf:
             sys.stdout.write(chr(item))
         if linefeed:
-            print ''
+            print('')
 
     def parse (self):
 

Modified: openoffice/branches/ia2/main/sc/xml/ScXMLExport.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/xml/ScXMLExport.xml?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/xml/ScXMLExport.xml (original)
+++ openoffice/branches/ia2/main/sc/xml/ScXMLExport.xml Fri Feb  1 08:46:00 2013
@@ -39,11 +39,11 @@
     <status value="beta"/>
     <supported-service>com.sun.star.xml.XMLExportFilter</supported-service>
     <reference-docu xlink:href="http://xml.openoffice.org/"
-        xlink:title="general OpenOffice.org xml information" />
+        xlink:title="general OpenOffice.org XML information" />
     <reference-docu xlink:title="XML File Format Specification (draft)"
         xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
     <reference-docu xlink:href="http://xml.openoffice.org/filter/"
-        xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+        xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
   </component-description>
 
   <component-description>
@@ -57,11 +57,11 @@
     <status value="beta"/>
     <supported-service>com.sun.star.xml.XMLExportFilter</supported-service>
     <reference-docu xlink:href="http://xml.openoffice.org/"
-        xlink:title="general OpenOffice.org xml information" />
+        xlink:title="general OpenOffice.org XML information" />
     <reference-docu xlink:title="XML File Format Specification (draft)"
         xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
     <reference-docu xlink:href="http://xml.openoffice.org/filter/"
-        xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+        xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
   </component-description>
 
   <component-description>
@@ -75,11 +75,11 @@
     <status value="beta"/>
     <supported-service>com.sun.star.xml.XMLExportFilter</supported-service>
     <reference-docu xlink:href="http://xml.openoffice.org/"
-        xlink:title="general OpenOffice.org xml information" />
+        xlink:title="general OpenOffice.org XML information" />
     <reference-docu xlink:title="XML File Format Specification (draft)"
         xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
     <reference-docu xlink:href="http://xml.openoffice.org/filter/"
-        xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+        xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
   </component-description>
 
   <component-description>
@@ -93,11 +93,11 @@
     <status value="beta"/>
     <supported-service>com.sun.star.xml.XMLExportFilter</supported-service>
     <reference-docu xlink:href="http://xml.openoffice.org/"
-        xlink:title="general OpenOffice.org xml information" />
+        xlink:title="general OpenOffice.org XML information" />
     <reference-docu xlink:title="XML File Format Specification (draft)"
         xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
     <reference-docu xlink:href="http://xml.openoffice.org/filter/"
-        xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+        xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
   </component-description>
 
   <component-description>
@@ -111,11 +111,11 @@
     <status value="beta"/>
     <supported-service>com.sun.star.xml.XMLExportFilter</supported-service>
     <reference-docu xlink:href="http://xml.openoffice.org/"
-        xlink:title="general OpenOffice.org xml information" />
+        xlink:title="general OpenOffice.org XML information" />
     <reference-docu xlink:title="XML File Format Specification (draft)"
         xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
     <reference-docu xlink:href="http://xml.openoffice.org/filter/"
-        xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+        xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
   </component-description>
   <project-build-dependency>cppu</project-build-dependency>
   <project-build-dependency>cppuhelper</project-build-dependency>

Modified: openoffice/branches/ia2/main/sc/xml/ScXMLImport.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/xml/ScXMLImport.xml?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/xml/ScXMLImport.xml (original)
+++ openoffice/branches/ia2/main/sc/xml/ScXMLImport.xml Fri Feb  1 08:46:00 2013
@@ -39,11 +39,11 @@
     <status value="beta"/>
     <supported-service>com.sun.star.xml.XMLImportFilter</supported-service>
     <reference-docu xlink:href="http://xml.openoffice.org/"
-        xlink:title="general OpenOffice.org xml information" />
+        xlink:title="general OpenOffice.org XML information" />
     <reference-docu xlink:title="XML File Format Specification (draft)"
         xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
     <reference-docu xlink:href="http://xml.openoffice.org/filter/"
-        xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+        xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
   </component-description>
 
   <component-description>
@@ -57,11 +57,11 @@
     <status value="beta"/>
     <supported-service>com.sun.star.xml.XMLImportFilter</supported-service>
     <reference-docu xlink:href="http://xml.openoffice.org/"
-        xlink:title="general OpenOffice.org xml information" />
+        xlink:title="general OpenOffice.org XML information" />
     <reference-docu xlink:title="XML File Format Specification (draft)"
         xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
     <reference-docu xlink:href="http://xml.openoffice.org/filter/"
-        xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+        xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
   </component-description>
 
   <component-description>
@@ -75,11 +75,11 @@
     <status value="beta"/>
     <supported-service>com.sun.star.xml.XMLImportFilter</supported-service>
     <reference-docu xlink:href="http://xml.openoffice.org/"
-        xlink:title="general OpenOffice.org xml information" />
+        xlink:title="general OpenOffice.org XML information" />
     <reference-docu xlink:title="XML File Format Specification (draft)"
         xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
     <reference-docu xlink:href="http://xml.openoffice.org/filter/"
-        xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+        xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
   </component-description>
 
   <component-description>
@@ -93,11 +93,11 @@
     <status value="beta"/>
     <supported-service>com.sun.star.xml.XMLImportFilter</supported-service>
     <reference-docu xlink:href="http://xml.openoffice.org/"
-        xlink:title="general OpenOffice.org xml information" />
+        xlink:title="general OpenOffice.org XML information" />
     <reference-docu xlink:title="XML File Format Specification (draft)"
         xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
     <reference-docu xlink:href="http://xml.openoffice.org/filter/"
-        xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+        xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
   </component-description>
 
   <component-description>
@@ -111,11 +111,11 @@
     <status value="beta"/>
     <supported-service>com.sun.star.xml.XMLImportFilter</supported-service>
     <reference-docu xlink:href="http://xml.openoffice.org/"
-        xlink:title="general OpenOffice.org xml information" />
+        xlink:title="general OpenOffice.org XML information" />
     <reference-docu xlink:title="XML File Format Specification (draft)"
         xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
     <reference-docu xlink:href="http://xml.openoffice.org/filter/"
-        xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+        xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
   </component-description>
   <project-build-dependency>cppu</project-build-dependency>
   <project-build-dependency>cppuhelper</project-build-dependency>

Modified: openoffice/branches/ia2/main/scaddins/source/analysis/analysis.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scaddins/source/analysis/analysis.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scaddins/source/analysis/analysis.cxx (original)
+++ openoffice/branches/ia2/main/scaddins/source/analysis/analysis.cxx Fri Feb  1 08:46:00 2013
@@ -27,6 +27,7 @@
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/math.hxx>
+#include <rtl/random.h>
 #include <string.h>
 
 #include <tools/resmgr.hxx>
@@ -808,15 +809,52 @@ double SAL_CALL AnalysisAddIn::getSqrtpi
 
 double SAL_CALL AnalysisAddIn::getRandbetween( double fMin, double fMax ) THROWDEF_RTE_IAE
 {
+    static sal_Int32 nScRandomIx = 0, nScRandomIy = 0, nScRandomIz = 0, nScRandomIt = 0;
+    static rtlRandomPool aPool = rtl_random_createPool();
+    double fScRandomW;
+
     fMin = ::rtl::math::round( fMin, 0, rtl_math_RoundingMode_Up );
     fMax = ::rtl::math::round( fMax, 0, rtl_math_RoundingMode_Up );
 	if( fMin > fMax )
 		THROW_IAE;
 
+    // Seeding for the PRNG: should be good enough but we
+    // monitor the values to keep things under control.
+    if (nScRandomIx <= 0)
+	rtl_random_getBytes(aPool, &nScRandomIx, sizeof(nScRandomIx));
+    if (nScRandomIy <= 0)
+	rtl_random_getBytes(aPool, &nScRandomIy, sizeof(nScRandomIy));
+    if (nScRandomIz <= 0)
+	rtl_random_getBytes(aPool, &nScRandomIz, sizeof(nScRandomIz));
+    if (nScRandomIt <= 0)
+	rtl_random_getBytes(aPool, &nScRandomIt, sizeof(nScRandomIt));
+    
+    // Basically unmodified algorithm from
+    // Wichman and Hill, "Generating good pseudo-random numbers",
+    //		December 5, 2005.
+    
+    nScRandomIx = 11600L * (nScRandomIx % 185127L) - 10379L * (nScRandomIx / 185127L);
+    nScRandomIy = 47003L * (nScRandomIy %  45688L) - 10479L * (nScRandomIy /  45688L);
+    nScRandomIz = 23000L * (nScRandomIz %  93368L) - 19423L * (nScRandomIz /  93368L);
+    nScRandomIt = 33000L * (nScRandomIt %  65075L) -  8123L * (nScRandomIt /  65075L);
+    if (nScRandomIx < 0)
+	nScRandomIx += 2147483579L;
+    if (nScRandomIy < 0)
+	nScRandomIy += 2147483543L;
+    if (nScRandomIz < 0)
+	nScRandomIz += 2147483123L;
+    if (nScRandomIt < 0)
+	nScRandomIt += 2147483123L;
+
+    fScRandomW = (double)nScRandomIx*0.0000000004656613022670 +
+	      	(double)nScRandomIy*0.0000000004656613100760 +
+		(double)nScRandomIz*0.0000000004656613360968 +
+		(double)nScRandomIt*0.0000000004656614011490;
+
+ 
 	// fMax -> range
     double fRet = fMax - fMin + 1.0;
-    fRet *= rand();
-    fRet /= (RAND_MAX + 1.0);
+    fRet *= fScRandomW - (sal_Int32)fScRandomW ;
     fRet += fMin;
     fRet = floor( fRet );   // simple floor is sufficient here
     RETURN_FINITE( fRet );

Modified: openoffice/branches/ia2/main/scp2/inc/macros.inc
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/inc/macros.inc?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/inc/macros.inc (original)
+++ openoffice/branches/ia2/main/scp2/inc/macros.inc Fri Feb  1 08:46:00 2013
@@ -386,7 +386,7 @@ End
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
         Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
-        Name = STRING(CONCAT2(OpenOffice.org.,name)); \
+        Name = STRING(CONCAT2(Apache OpenOffice.,name)); \
         Value = " "; \
     End
 
@@ -395,7 +395,7 @@ End
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
         Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
-        Name = STRING(CONCAT2(OpenOffice.org.,name)); \
+        Name = STRING(CONCAT2(Apache 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(OpenOffice.org.,name)); \
+        Value = STRING(CONCAT2(Apache 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(OpenOffice.org.,name)); \
+        Subkey = STRING(CONCAT2(Apache 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(OpenOffice.org.,name,\DefaultIcon)); \
+        Subkey = STRING(CONCAT3(Apache 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(OpenOffice.org.,name,\shell)); \
+        Subkey = STRING(CONCAT3(Apache 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(OpenOffice.org.,name,\shell\new)); \
+        Subkey = STRING(CONCAT3(Apache 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(OpenOffice.org.,name,\shell\new\command)); \
+        Subkey = STRING(CONCAT3(Apache 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(OpenOffice.org.,name,\shell\open\command)); \
+        Subkey = STRING(CONCAT3(Apache 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(OpenOffice.org.,name,\shell\print\command)); \
+        Subkey = STRING(CONCAT3(Apache 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(OpenOffice.org.,name,\shell\printto\command)); \
+        Subkey = STRING(CONCAT3(Apache 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(OpenOffice.org.,name)); \
+        Value = STRING(CONCAT2(Apache 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(OpenOffice.org.,name)); \
+        Value = STRING(CONCAT2(Apache OpenOffice.,name)); \
         Styles = (); \
     End
 

Modified: openoffice/branches/ia2/main/scp2/source/ooo/file_improvement.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/ooo/file_improvement.scp?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/ooo/file_improvement.scp (original)
+++ openoffice/branches/ia2/main/scp2/source/ooo/file_improvement.scp Fri Feb  1 08:46:00 2013
@@ -23,7 +23,7 @@
 
 #include "macros.inc"
 
-#if defined(BUILD_SPECIAL)
+#if defined(ENABLE_OOOIMPROVEMENT)
 File gid_File_Share_Registry_Oooimprovement_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
@@ -32,7 +32,7 @@ File gid_File_Share_Registry_Oooimprovem
 End
 #endif
 
-#if defined(BUILD_SPECIAL)
+#if defined(ENABLE_OOOIMPROVEMENT)
 #ifdef OS2
 STD_LIB_FILE( gid_File_Lib_Oooimprovement , oooimp)
 #else

Modified: openoffice/branches/ia2/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/ooo/file_library_ooo.scp?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/branches/ia2/main/scp2/source/ooo/file_library_ooo.scp Fri Feb  1 08:46:00 2013
@@ -26,15 +26,14 @@
 #if defined(WNT) && !defined(DISABLE_ATL)
 File gid_File_Lib_Winaccessibility
 	TXT_FILE_BODY;
-	Styles	= (PACKED,UNO_COMPONENT);
-	RegistryID      = gid_Starregistry_Services_Rdb;
-	Dir	= gid_Dir_Program;
+	Styles	= (PACKED);
+	Dir	= SCP2_OOO_BIN_DIR;
 	Name	= "winaccessibility.dll";
 End
 File gid_File_Lib_UAccCOM
 	BIN_FILE_BODY;
 	Styles	= (PACKED);
-	Dir	= gid_Dir_Program;
+	Dir	= SCP2_OOO_BIN_DIR;
 	Name	= "UAccCOM.dll";
 End
 #endif
@@ -1391,7 +1390,7 @@ File gid_File_Lib_Smplmail
     TXT_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
-    Name = "smplmail.uno.dll";
+    Name = "sysmail.uno.dll";
 End
 
 #endif

Modified: openoffice/branches/ia2/main/scp2/source/ooo/file_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/ooo/file_ooo.scp?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/ooo/file_ooo.scp (original)
+++ openoffice/branches/ia2/main/scp2/source/ooo/file_ooo.scp Fri Feb  1 08:46:00 2013
@@ -1780,7 +1780,7 @@ File gid_File_Share_Registry_Lingucompon
     Name = "lingucomponent.xcd";
 End
 
-// #ifdef BUILD_SPECIAL
+// #ifdef ENABLE_OOOIMPROVEMENT
 // File gid_File_Extension_Oxt_Oooimprovement
 //    Name = "OOoImprovement.oxt";
 //    Dir = gid_Brand_Dir_Share_Extensions_Oooimprovement;

Modified: openoffice/branches/ia2/main/scp2/source/ooo/file_resource_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/ooo/file_resource_ooo.scp?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/ooo/file_resource_ooo.scp (original)
+++ openoffice/branches/ia2/main/scp2/source/ooo/file_resource_ooo.scp Fri Feb  1 08:46:00 2013
@@ -95,7 +95,7 @@ STD_RES_FILE( gid_File_Res_Cui, cui )
 
 STD_RES_FILE( gid_File_Res_Sw, sw )
 
-STD_RES_FILE( gid_File_Res_Tk, tk )
+
 STD_RES_FILE( gid_File_Res_Acc, acc )
 
 STD_RES_FILE( gid_File_Res_Tpl, tpl )

Modified: openoffice/branches/ia2/main/scp2/source/ooo/installation_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/ooo/installation_ooo.scp?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/ooo/installation_ooo.scp (original)
+++ openoffice/branches/ia2/main/scp2/source/ooo/installation_ooo.scp Fri Feb  1 08:46:00 2013
@@ -30,9 +30,9 @@ Installation gid_Installation_Ooo
     OOoBaseVersion = "${OOOBASEVERSION}";
     UserDirProductVersion = "${USERDIRPRODUCTVERSION}";
     JavaVersion = "${JAVAVERSION}";
-    SxwFormatName = "OpenOffice.org";
-    SxwFormatVersion = "1.1";
-    VendorName = "OpenOffice.org";
+    SxwFormatName = "OpenOffice.org XML";
+    SxwFormatVersion = "1.0";
+    VendorName = "Apache OpenOffice";
   #ifdef WNT
     DefaultDestPath = "<winprogpath>\${PRODUCTNAME}${PRODUCTVERSION}";
   #else

Modified: openoffice/branches/ia2/main/scp2/source/ooo/module_hidden_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/ooo/module_hidden_ooo.scp?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/ooo/module_hidden_ooo.scp (original)
+++ openoffice/branches/ia2/main/scp2/source/ooo/module_hidden_ooo.scp Fri Feb  1 08:46:00 2013
@@ -815,7 +815,7 @@ Module gid_Module_Root_Userland
 End
 #endif
 
-// #ifdef BUILD_SPECIAL
+// #ifdef ENABLE_OOOIMPROVEMENT
 // Module gid_Module_Root_Extension_Oooimprovement
 //    Name = "gid_Module_Root_Extension_Oooimprovement";
 //    Description = "gid_Module_Root_Extension_Oooimprovement";

Modified: openoffice/branches/ia2/main/scp2/source/ooo/module_improvement.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/ooo/module_improvement.scp?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/ooo/module_improvement.scp (original)
+++ openoffice/branches/ia2/main/scp2/source/ooo/module_improvement.scp Fri Feb  1 08:46:00 2013
@@ -25,7 +25,7 @@
 
 // OOo improvement module
 
-#if defined(BUILD_SPECIAL)
+#if defined(ENABLE_OOOIMPROVEMENT)
 Module gid_Module_Oooimprovement
     PackageInfo = "packinfo_office.txt";
     Name = "gid_Module_Oooimprovement";

Modified: openoffice/branches/ia2/main/scp2/source/ooo/module_langpack.ulf
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/ooo/module_langpack.ulf?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/ooo/module_langpack.ulf (original)
+++ openoffice/branches/ia2/main/scp2/source/ooo/module_langpack.ulf Fri Feb  1 08:46:00 2013
@@ -710,3 +710,9 @@ en-US = "Asturian"
 
 [STR_DESC_MODULE_LANGPACK_AST]
 en-US = "Installs Asturian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GD]
+en-US = "Gaelic (Scotland)"
+
+[STR_DESC_MODULE_LANGPACK_GD]
+en-US = "Installs Gaelic (Scotland) support in %PRODUCTNAME %PRODUCTVERSION"

Modified: openoffice/branches/ia2/main/scp2/source/ooo/ooo_brand.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/ooo/ooo_brand.scp?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/ooo/ooo_brand.scp (original)
+++ openoffice/branches/ia2/main/scp2/source/ooo/ooo_brand.scp Fri Feb  1 08:46:00 2013
@@ -66,7 +66,7 @@ ProfileItem gid_Brand_Profileitem_Bootst
     Section = "ErrorReport";
     Order = 8;
     Key = "ErrorReportServer";
-  #if defined(BUILD_SPECIAL)
+  #if defined(ENABLE_ERROR_REPORT_SERVER)
     Value = "report.services.openoffice.org";
   #else
     Value = "";

Modified: openoffice/branches/ia2/main/scp2/source/ooo/registryitem_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/ooo/registryitem_ooo.scp?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/ooo/registryitem_ooo.scp (original)
+++ openoffice/branches/ia2/main/scp2/source/ooo/registryitem_ooo.scp Fri Feb  1 08:46:00 2013
@@ -218,7 +218,7 @@ RegistryItem gid_Regitem_Software_Micros
     ModuleID = gid_Module_Root;
     Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
     Name = "Publisher";
-    Value = "Sun Microsystems, Inc. for the OpenOffice.org-Community";
+    Value = "Apache OpenOffice project community";
 End
 
 RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Uninstallstring
@@ -247,7 +247,7 @@ End
 
 RegistryItem gid_Regitem_Software_Openoffice_Productname_Productversion_Path
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\%PRODUCTNAME\%PRODUCTVERSION";
+	Subkey = "Software\Apache 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\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+	Subkey = "Software\Apache 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\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+	Subkey = "Software\Apache 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\OpenOffice.org\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
+	Subkey = "Software\Apache 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\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+	Subkey = "Software\Apache 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\OpenOffice.org\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
+	Subkey = "Software\Apache 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\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+	Subkey = "Software\Apache 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\OpenOffice.org\UNO\InstallPath";
+    Subkey = "Software\Apache 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\OpenOffice.org\UNO\InstallPath";
+    Subkey = "Software\Apache OpenOffice\UNO\InstallPath";
     ModuleID = gid_Module_Root;
     Name = "%PRODUCTNAME %PRODUCTVERSION";
     Value  = "<progpath>\program";

Modified: openoffice/branches/ia2/main/scp2/source/ooo/registryitem_ooo.ulf
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/ooo/registryitem_ooo.ulf?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/ooo/registryitem_ooo.ulf (original)
+++ openoffice/branches/ia2/main/scp2/source/ooo/registryitem_ooo.ulf Fri Feb  1 08:46:00 2013
@@ -28,10 +28,10 @@ en-US = "&New"
 en-US = "&Install"
 
 [STR_REG_VAL_SO60_CONFIGFILE]
-en-US = "%SXWFORMATNAME %SXWFORMATVERSION Configuration File"
+en-US = "OpenOffice.org 1.1 Configuration File"
 
 [STR_REG_VAL_SO50_TEMPLATE_OOO]
 en-US = "StarOffice 5.0 Template"
 
 [STR_REG_VAL_APPCAPABILITY_DESCRIPTION_OOO]
-en-US = "OpenOffice.org"
+en-US = "office productivity suite based on Apache OpenOffice project"

Modified: openoffice/branches/ia2/main/scp2/source/ooo/scpaction_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/ooo/scpaction_ooo.scp?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/ooo/scpaction_ooo.scp (original)
+++ openoffice/branches/ia2/main/scp2/source/ooo/scpaction_ooo.scp Fri Feb  1 08:46:00 2013
@@ -317,11 +317,7 @@ End
 
 #ifdef MACOSX
 ScpAction scp_Copy_Dmg_Background_Image
-  #if defined(BUILD_SPECIAL)
     Copy = "osxdndinstall.png";
-  #else
-    Copy = "osxdndinstall_nologo.png";
-  #endif
     Name = "background.png";
     UnixRights = 444;
     Styles = ();

Modified: openoffice/branches/ia2/main/scp2/source/ooo/ure.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/ooo/ure.scp?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/ooo/ure.scp (original)
+++ openoffice/branches/ia2/main/scp2/source/ooo/ure.scp Fri Feb  1 08:46:00 2013
@@ -1316,7 +1316,7 @@ End
 RegistryItem gid_Regitem_Path
     ModuleID = gid_Module_Root;
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "Software\OpenOffice.org\%PRODUCTNAME";
+    Subkey = "Software\Apache OpenOffice\%PRODUCTNAME";
     Name = "Path";
     Value = "[INSTALLLOCATION]";
 End

Modified: openoffice/branches/ia2/main/scp2/source/ooo/ure_standalone.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/ooo/ure_standalone.scp?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/ooo/ure_standalone.scp (original)
+++ openoffice/branches/ia2/main/scp2/source/ooo/ure_standalone.scp Fri Feb  1 08:46:00 2013
@@ -38,9 +38,9 @@ End
 Directory gid_Dir_Ooo_Openofficeorg
     ParentID = PREDEFINED_PROGDIR;
   #ifdef WNT
-    HostName = "OpenOffice.org";
+    HostName = "Apache OpenOffice";
   #else
-    HostName = "openoffice.org";
+    HostName = "apacheopenoffice";
   #endif
     Styles = (ISINSTALLLOCATION);
 End

Modified: openoffice/branches/ia2/main/scp2/source/quickstart/registryitem_quickstart.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/quickstart/registryitem_quickstart.scp?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/quickstart/registryitem_quickstart.scp (original)
+++ openoffice/branches/ia2/main/scp2/source/quickstart/registryitem_quickstart.scp Fri Feb  1 08:46:00 2013
@@ -25,7 +25,7 @@
 
 RegistryItem gid_Regitem_Software_OpenOffice_Quickstarterinstalled
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\OpenOffice.org";
+    Subkey = "Software\Apache OpenOffice";
     ModuleID = gid_Module_Optional_Quickstart;
     Name = "QuickStarterInstalled";
     Value = "1";

Modified: openoffice/branches/ia2/main/scp2/source/sdkoo/sdkoo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/sdkoo/sdkoo.scp?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/sdkoo/sdkoo.scp (original)
+++ openoffice/branches/ia2/main/scp2/source/sdkoo/sdkoo.scp Fri Feb  1 08:46:00 2013
@@ -53,22 +53,14 @@ End
 #ifndef WNT
 Directory gid_Dir_Ooo_Openofficeorg_Sdk
     ParentID = PREDEFINED_PROGDIR;
-  #ifdef WNT
-    HostName = "${BASISROOTNAME}";
-  #else
     HostName = "${UNIXBASISROOTNAME}";
-  #endif
 End
 #endif
 
 #ifndef WNT
 Directory gid_Dir_Ooo_Basis_Sdk
     ParentID = gid_Dir_Ooo_Openofficeorg_Sdk;
-  #ifdef WNT
-    HostName = "Basis ${OOOBASEVERSION}";
-  #else
     HostName = "basis${OOOBASEVERSION}";
-  #endif
     Styles = (BASISDIRECTORY);
 End
 #endif
@@ -78,8 +70,7 @@ End
 Directory gid_Dir_Basis_Sdk
 #if defined MACOSX
     ParentID = PREDEFINED_PROGDIR;
-    // DosName = "OpenOffice.org${OOOBASEVERSION}_SDK";
-    DosName = "OpenOffice.org_SDK";
+    DosName = "Apache_OpenOffice_SDK";
 #else
   #if defined WNT
     ParentID = gid_Dir_Sdkoo_Root;

Modified: openoffice/branches/ia2/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp (original)
+++ openoffice/branches/ia2/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp Fri Feb  1 08:46:00 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 = "OpenOffice.org Column Handler";
-    Val64 = "OpenOffice.org Column Handler";
+    Value = "Apache OpenOffice Column Handler";
+    Val64 = "Apache OpenOffice Column Handler";
 End
 
 RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32
@@ -108,8 +108,6 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Root;
     Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
-// Better?: "OpenOffice.org Format Filter"
-// old:    Value = "opendocument.org Filter";
 	Styles = (X64_ONLY); // Values: X64
     Value = "OpenDocument Format Filter";
     Val64 = "OpenDocument Format Filter";
@@ -138,8 +136,6 @@ RegistryItem gid_Regitem_Clsid_7BC0E713_
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Root;
     Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-//? Better: "OpenOffice.org Persistent Handler"
-// old:    Value = "opendocument.org Persistent Handler";
 	Styles = (X64); // Values: X64
     Value = "OpenDocument Format Persistent Handler";
     Val64 = "OpenDocument Format Persistent Handler";

Modified: openoffice/branches/ia2/main/scp2/util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/util/makefile.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/util/makefile.mk (original)
+++ openoffice/branches/ia2/main/scp2/util/makefile.mk Fri Feb  1 08:46:00 2013
@@ -187,7 +187,7 @@ SCP1FILES += \
 .ENDIF
 
 # ------------------------------------------------------------------------
-# OpenOffice.org with JRE
+# Apache OpenOffice with JRE
 
 SCP2LINK_PRODUCT_TYPE=osl
 SCP2TARGET = setup_osljre
@@ -327,7 +327,7 @@ SCP2FILES += \
 SCP2FILES += layout.par
 .ENDIF # ENABLE_LAYOUT == TRUE
 
-.IF "$(BUILD_SPECIAL)"!=""
+.IF "$(ENABLE_ONLINE_UPDATE)"!=""
 SCP2FILES += \
              module_onlineupdate.par   \
              file_onlineupdate.par



Mime
View raw message