openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1579184 [18/33] - in /openoffice/branches/alg_writerframes: ./ ext_sources/ extras/l10n/source/de/ extras/l10n/source/es/ extras/l10n/source/eu/ extras/l10n/source/hi/ extras/l10n/source/kk/ extras/l10n/source/lt/ extras/l10n/source/nb/ ex...
Date Wed, 19 Mar 2014 10:15:07 GMT
Modified: openoffice/branches/alg_writerframes/main/filter/source/xsltfilter/XSLTFilter.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/filter/source/xsltfilter/XSLTFilter.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/filter/source/xsltfilter/XSLTFilter.cxx (original)
+++ openoffice/branches/alg_writerframes/main/filter/source/xsltfilter/XSLTFilter.cxx Wed Mar 19 10:14:42 2014
@@ -20,7 +20,6 @@
  **************************************************************/
  
  // MARKER(update_precomp.py): autogen include statement, do not remove
-//This file is about the conversion of the UOF v2.0 and ODF document format
 #include "precompiled_filter.hxx"
 
 #include <stdio.h>
@@ -66,16 +65,9 @@
 #include <com/sun/star/beans/NamedValue.hpp>
 
 
-#include <unotools/streamwrap.hxx>
-#include <comphelper/processfactory.hxx>
-#include <tools/stream.hxx>
 #include "uof2splitter.hxx"
-
-#include <xmloff/attrlist.hxx>
 #include "uof2storage.hxx"
 #include "uof2merge.hxx"
-#include <tools/stream.hxx>
-#include <string>
 
 using namespace ::rtl;
 using namespace ::cppu;
@@ -94,32 +86,6 @@ namespace XSLT {
 
 class XSLTFilter : public WeakImplHelper4< XImportFilter, XExportFilter, XDocumentHandler, XStreamListener>
 {
-private:
-    // the UNO ServiceFactory
-    Reference< XMultiServiceFactory > m_rServiceFactory;
-
-    // DocumentHandler interface of the css::xml::sax::Writer service
-    Reference < XExtendedDocumentHandler > m_rDocumentHandler;
-    Reference < XOutputStream > m_rOutputStream;
-
-    // controls pretty-printing
-    sal_Bool m_bPrettyPrint;
-
-    Reference< XActiveDataControl > m_tcontrol;
-    oslCondition  m_cTransformed;
-
-	//UOF v2.0 export
-	Reference< XActiveDataControl > m_splitControl;
-
-    sal_Bool m_bTerminated;
-    sal_Bool m_bError;
-
-    OUString m_aExportBaseUrl;
-    OUString m_aOldBaseUrl;
-
-    OUString rel2abs(const OUString&);
-    OUString expandUrl(const OUString&);
-
 public:
 
     // ctor...
@@ -163,18 +129,51 @@ public:
         throw (com::sun::star::xml::sax::SAXException,RuntimeException);
     virtual void SAL_CALL setDocumentLocator(const Reference<XLocator>& doclocator)
         throw (SAXException,RuntimeException);
-	// UOF v2.0 export
+
 private:
-	Reference< XStream > m_rStream;
-	UOF2Splitter * pSplitter;
-	
+    // the UNO ServiceFactory
+    Reference< XMultiServiceFactory > m_rServiceFactory;
+
+    // DocumentHandler interface of the css::xml::sax::Writer service
+    Reference < XExtendedDocumentHandler > m_rDocumentHandler;
+    Reference < XOutputStream > m_rOutputStream;
+
+    // controls pretty-printing
+    sal_Bool m_bPrettyPrint;
+
+    Reference< XActiveDataControl > m_tcontrol;
+    oslCondition m_cTransformed;
+
+    sal_Bool m_bTerminated;
+    sal_Bool m_bError;
+
+    OUString m_aExportBaseUrl;
+    OUString m_aOldBaseUrl;
+
+    OUString rel2abs(const OUString&);
+    OUString expandUrl(const OUString&);
+
+    // for support of UOF v2.0
+    Reference< XActiveDataControl > m_splitControl;
+    Reference< XStream > m_rStream;
+
+    bool isUOF2ExportStyleSheet( const OUString& rExportStyleSheet );
+
 };
 
 XSLTFilter::XSLTFilter( const Reference< XMultiServiceFactory > &r )
-    : m_rServiceFactory(r)
-    , m_bPrettyPrint(sal_True)
-    , m_bTerminated(sal_False)
-    , m_bError(sal_False)
+    : m_rServiceFactory( r )
+    , m_rDocumentHandler()
+    , m_rOutputStream()
+    , m_bPrettyPrint( sal_True )
+    , m_tcontrol()
+    , m_cTransformed()
+    , m_bTerminated( sal_False )
+    , m_bError( sal_False )
+    , m_aExportBaseUrl()
+    , m_aOldBaseUrl()
+    , m_splitControl()
+    , m_rStream()
 {
     m_cTransformed = osl_createCondition();
 }
@@ -250,37 +249,39 @@ sal_Bool XSLTFilter::importer(
     throw (RuntimeException)
 {
     if ( msUserData.getLength() < 5 )
-		return sal_False;
+        return sal_False;
 
-	OUString udImport = msUserData[2];
-	OUString udStyleSheet = rel2abs(msUserData[4]);
+    const OUString udStyleSheet = rel2abs( msUserData[4] );
 
     // get information from media descriptor
     // the imput stream that represents the imported file
     // is most important here since we need to supply it to
     // the sax parser that drives the supplied document handler
-    sal_Int32 nLength = aSourceData.getLength();
-    OUString aName, aFileName, aURL;
+    const sal_Int32 nLength = aSourceData.getLength();
+    OUString aFileName;
+    OUString aURL;
     Reference< XInputStream > xInputStream;
     for ( sal_Int32 i = 0 ; i < nLength; i++)
-	{
-        aName = aSourceData[i].Name;
-	    if (aName.equalsAscii("InputStream"))
+    {
+        const OUString aName = aSourceData[i].Name;
+        if ( aName.equalsAscii( "InputStream" ) )
             aSourceData[i].Value >>= xInputStream;
-	    else if ( aName.equalsAscii("FileName"))
-			aSourceData[i].Value >>= aFileName;
-	    else if ( aName.equalsAscii("URL"))
-			aSourceData[i].Value >>= aURL;
-	}
+        else if ( aName.equalsAscii( "FileName" ) )
+            aSourceData[i].Value >>= aFileName;
+        else if ( aName.equalsAscii( "URL" ) )
+            aSourceData[i].Value >>= aURL;
+    }
     OSL_ASSERT(xInputStream.is());
-    if (!xInputStream.is()) return sal_False;
+    if ( !xInputStream.is() )
+        return sal_False;
 
     // create SAX parser that will read the document file
     // and provide events to xHandler passed to this call
 	Reference < XParser > xSaxParser( m_rServiceFactory->createInstance(
         OUString::createFromAscii("com.sun.star.xml.sax.Parser")), UNO_QUERY );
     OSL_ASSERT(xSaxParser.is());
-	if(!xSaxParser.is())return sal_False;
+	if( !xSaxParser.is() )
+	    return sal_False;
 
     // create transformer
     Sequence< Any > args(3);
@@ -309,16 +310,18 @@ sal_Bool XSLTFilter::importer(
 
             // connect input to transformer
             Reference< XActiveDataSink > tsink(m_tcontrol, UNO_QUERY);
-			//UOF v2 import
-			UOF2Storage aUOF2Storage(m_rServiceFactory, xInputStream);
-			if(aUOF2Storage.isValidUOF2Doc())
-			{
-				UOF2Merge aUOF2Merge(aUOF2Storage, m_rServiceFactory);
-				aUOF2Merge.merge();
-				tsink->setInputStream(aUOF2Merge.getMergedInStream());
-			}
-			else
-            tsink->setInputStream(xInputStream);
+            //UOF v2 import
+            UOF2Storage aUOF2Storage( m_rServiceFactory, xInputStream );
+            if ( aUOF2Storage.isValidUOF2Doc() )
+            {
+                UOF2Merge aUOF2Merge( aUOF2Storage, m_rServiceFactory );
+                aUOF2Merge.merge();
+                tsink->setInputStream( aUOF2Merge.getMergedInStream() );
+            }
+            else
+            {
+                tsink->setInputStream( xInputStream );
+            }
 
             // create pipe
             Reference< XOutputStream > pipeout(m_rServiceFactory->createInstance(
@@ -367,52 +370,65 @@ sal_Bool XSLTFilter::importer(
     }
 }
 
+bool XSLTFilter::isUOF2ExportStyleSheet( const OUString& rExportStyleSheet )
+{
+    bool bIsUOFDocumentType = false;
+
+    if ( rExportStyleSheet.endsWithAsciiL( "uof.xsl", 7 ) )
+    {
+        bIsUOFDocumentType = true;
+    }
+
+    return bIsUOFDocumentType;
+}
+
 sal_Bool XSLTFilter::exporter(
         const Sequence<PropertyValue>& aSourceData,
         const Sequence<OUString>& msUserData)
     throw (RuntimeException)
 {
     if ( msUserData.getLength() < 6 )
-		return sal_False;
+        return sal_False;
 
     // get interesting values from user data
-    OUString udImport = msUserData[2];
-	OUString udStyleSheet = rel2abs(msUserData[5]);
+    const OUString udStyleSheet = rel2abs( msUserData[5] );
 
     // read source data
     // we are especially interested in the output stream
     // since that is where our xml-writer will push the data
     // from it's data-source interface
-    OUString aName, sURL;
+    OUString sURL;
     sal_Bool bIndent = sal_False;
     OUString aDoctypePublic;
     OUString aDoctypeSystem;
-    // Reference<XOutputStream> rOutputStream;
-    sal_Int32 nLength = aSourceData.getLength();
-    for ( sal_Int32 i = 0 ; i < nLength; i++)
     {
-        aName = aSourceData[i].Name;
-        if ( aName.equalsAscii("Indent"))
-	        aSourceData[i].Value >>= bIndent;
-        if ( aName.equalsAscii("DocType_Public"))
-	        aSourceData[i].Value >>= aDoctypePublic;
-        if ( aName.equalsAscii("DocType_System"))
-	        aSourceData[i].Value >>= aDoctypeSystem;
-        if ( aName.equalsAscii("OutputStream"))
-	        aSourceData[i].Value >>= m_rOutputStream;
-        else if ( aName.equalsAscii("URL" ))
-            aSourceData[i].Value >>= sURL;
-		//UOF v2.0 export, get Stream for constructing UOF2Storage
-		if ( aName.equalsAscii("StreamForOutput"))
-			aSourceData[i].Value >>= m_rStream;
+        const sal_Int32 nLength = aSourceData.getLength();
+        for ( sal_Int32 i = 0; i < nLength; i++ )
+        {
+            const OUString aName = aSourceData[i].Name;
+            if ( aName.equalsAscii( "Indent" ) )
+                aSourceData[i].Value >>= bIndent;
+            if ( aName.equalsAscii( "DocType_Public" ) )
+                aSourceData[i].Value >>= aDoctypePublic;
+            if ( aName.equalsAscii( "DocType_System" ) )
+                aSourceData[i].Value >>= aDoctypeSystem;
+            if ( aName.equalsAscii( "OutputStream" ) )
+                aSourceData[i].Value >>= m_rOutputStream;
+            else if ( aName.equalsAscii( "URL" ) )
+                aSourceData[i].Value >>= sURL;
+            //UOF v2.0 export, get Stream for constructing UOF2Storage
+            if ( aName.equalsAscii( "StreamForOutput" ) )
+                aSourceData[i].Value >>= m_rStream;
+        }
     }
 
-    if (!m_rDocumentHandler.is()) {
+    if (!m_rDocumentHandler.is())
+    {
         // get the document writer
         m_rDocumentHandler = Reference<XExtendedDocumentHandler>(
             m_rServiceFactory->createInstance(
-            OUString::createFromAscii("com.sun.star.xml.sax.Writer")),
-                UNO_QUERY);
+                OUString::createFromAscii("com.sun.star.xml.sax.Writer") ),
+            UNO_QUERY);
     }
 
     // create transformer
@@ -457,30 +473,45 @@ sal_Bool XSLTFilter::exporter(
         Reference< XActiveDataSink > tsink(m_tcontrol, UNO_QUERY);
         tsink->setInputStream(pipein);
 
-		
-		//creating pipe2
-		Reference< XOutputStream > x_Pipeout( m_rServiceFactory->createInstance(
-			OUString::createFromAscii("com.sun.star.io.Pipe")), UNO_QUERY );
-		Reference< XInputStream > x_Pipein( x_Pipeout, UNO_QUERY );
-
-		// connect transformer to pipe2
-		Reference< XActiveDataSource > tsource(m_tcontrol, UNO_QUERY);
-		tsource->setOutputStream( x_Pipeout );
-
-		pSplitter = new UOF2Splitter( m_rServiceFactory, sURL );
-		m_splitControl = Reference< XActiveDataControl >( static_cast< cppu::OWeakObject* >( pSplitter), UNO_QUERY );
-		//m_splitControl->addListener( Reference< XStreamListener >(this));
-		// connect pipe2 to splitter
-		Reference< XActiveDataSink > splitsink( m_splitControl, UNO_QUERY );
-		splitsink->setInputStream( x_Pipein );
-		// connect splitter to output
-		Reference< XActiveDataStreamer > splitout( m_splitControl, UNO_QUERY );
-		splitout->setStream( m_rStream );
-		m_rOutputStream = m_rStream->getOutputStream();
+        // connect transformer to output
+        Reference< XActiveDataSource > tsource( m_tcontrol, UNO_QUERY );
+        if ( isUOF2ExportStyleSheet( udStyleSheet ) )
+        {
+            // special handling for UOF 2
+
+            if ( !m_rStream.is() )
+            {
+                return sal_False;
+            }
+
+            //creating pipe2
+            Reference< XOutputStream > x_Pipeout(
+                m_rServiceFactory->createInstance(
+                    OUString::createFromAscii( "com.sun.star.io.Pipe" ) ), UNO_QUERY );
+            Reference< XInputStream > x_Pipein( x_Pipeout, UNO_QUERY );
+
+            // connect transformer to pipe2
+            tsource->setOutputStream( x_Pipeout );
+
+            UOF2Splitter* pSplitter = new UOF2Splitter( m_rServiceFactory, sURL );
+            m_splitControl =
+                Reference< XActiveDataControl >(
+                    static_cast< cppu::OWeakObject* >( pSplitter ), UNO_QUERY );
+            // connect pipe2 to splitter
+            Reference< XActiveDataSink > splitsink( m_splitControl, UNO_QUERY );
+            splitsink->setInputStream( x_Pipein );
+            // connect splitter to output
+            Reference< XActiveDataStreamer > splitout( m_splitControl, UNO_QUERY );
+            splitout->setStream( m_rStream );
+            m_rOutputStream = m_rStream->getOutputStream();
+        }
+        else
+        {
+            tsource->setOutputStream( m_rOutputStream );
+        }
 
         // we will start receiving events after returning 'true'.
-        // we will start the transformation as soon as we receive the startDocument 
-        // event.
+        // we will start the transformation as soon as we receive the startDocument event.
         return sal_True;
     }
     else
@@ -502,8 +533,12 @@ void XSLTFilter::endDocument() throw (SA
     OSL_ASSERT(m_rDocumentHandler.is());
     m_rDocumentHandler->endDocument();
 
-	//when the inputStream(outputStream of filter) was closed, start to parse it.
-	m_splitControl->start();
+    // m_splitControl only set for UOF 2
+    if ( m_splitControl.is() )
+    {
+        //when the inputStream(outputStream of filter) was closed, start to parse it.
+        m_splitControl->start();
+    }
 
     // wait for the transformer to finish
     osl_waitCondition(m_cTransformed, 0);

Modified: openoffice/branches/alg_writerframes/main/framework/inc/uielement/genericstatusbarcontroller.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/framework/inc/uielement/genericstatusbarcontroller.hxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/framework/inc/uielement/genericstatusbarcontroller.hxx (original)
+++ openoffice/branches/alg_writerframes/main/framework/inc/uielement/genericstatusbarcontroller.hxx Wed Mar 19 10:14:42 2014
@@ -29,7 +29,7 @@
 namespace framework
 {
 
-class AddonStatusbarItemData;
+struct AddonStatusbarItemData;
 
 class GenericStatusbarController : public svt::StatusbarController
 {

Modified: openoffice/branches/alg_writerframes/main/framework/source/layoutmanager/layoutmanager.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/framework/source/layoutmanager/layoutmanager.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/framework/source/layoutmanager/layoutmanager.cxx (original)
+++ openoffice/branches/alg_writerframes/main/framework/source/layoutmanager/layoutmanager.cxx Wed Mar 19 10:14:42 2014
@@ -181,6 +181,7 @@ LayoutManager::~LayoutManager()
 {
     Application::RemoveEventListener( LINK( this, LayoutManager, SettingsChanged ) );
     m_aAsyncLayoutTimer.Stop();
+    setDockingAreaAcceptor(NULL);
 }
 
 // Internal helper function
@@ -2895,6 +2896,8 @@ throw( RuntimeException )
         // Our frame gets disposed, release all our references that depends on a working frame reference.
         Application::RemoveEventListener( LINK( this, LayoutManager, SettingsChanged ) );
 
+        setDockingAreaAcceptor( Reference< ui::XDockingAreaAcceptor >() );
+
         // destroy all elements, it's possible that dettaching is NOT called!
         implts_destroyElements();
         impl_clearUpMenuBar();
@@ -2939,7 +2942,6 @@ throw( RuntimeException )
         m_xFrame.clear();
         delete m_pGlobalSettings;
         m_pGlobalSettings = 0;
-                m_xDockingAreaAcceptor = Reference< ui::XDockingAreaAcceptor >();
 
         bDisposeAndClear = sal_True;
     }

Modified: openoffice/branches/alg_writerframes/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx (original)
+++ openoffice/branches/alg_writerframes/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx Wed Mar 19 10:14:42 2014
@@ -259,110 +259,107 @@ void ToolbarLayoutManager::doLayout(cons
 bool ToolbarLayoutManager::implts_isParentWindowVisible() const
 {
     ReadGuard aReadLock( m_aLock );
-    bool bVisible( false );    
+    bool bVisible( false );
     if ( m_xContainerWindow.is() )
         bVisible = m_xContainerWindow->isVisible();
 
     return bVisible;
 }
 
-Rectangle ToolbarLayoutManager::implts_calcDockingArea()
+namespace
 {
-    ReadGuard aReadLock( m_aLock );
-    UIElementVector aWindowVector( m_aUIElements );
-    aReadLock.unlock();
+    void insertDockingAreaSize(
+        const UIElement& rUIElement,
+        const awt::Rectangle& rUIElementPosSize,
+        std::vector< sal_Int32 >& rDockingAreaData )
+    {
+        sal_Int32 nAreaPos = 0;
+        sal_Int32 nSize = 0;
+        if ( isHorizontalDockingArea( rUIElement.m_aDockedData.m_nDockedArea ) )
+        {
+            nAreaPos = rUIElement.m_aDockedData.m_aPos.Y();
+            nSize = rUIElementPosSize.Height;
+        }
+        else
+        {
+            nAreaPos = rUIElement.m_aDockedData.m_aPos.X();
+            nSize = rUIElementPosSize.Width;
+        }
 
-    Rectangle                aBorderSpace;
-    sal_Int32                nCurrRowColumn( 0 );
-    sal_Int32                nCurrPos( 0 );
-    sal_Int32                nCurrDockingArea( ui::DockingArea_DOCKINGAREA_TOP );
-    std::vector< sal_Int32 > aRowColumnSizes[DOCKINGAREAS_COUNT];
-    UIElementVector::const_iterator pConstIter;
+        const sal_uInt32 nIndexPos = nAreaPos >= 0 ? static_cast< sal_uInt32 >(nAreaPos) : 0;
+        if ( rDockingAreaData.size() < nIndexPos + 1 )
+        {
+            rDockingAreaData.resize( nIndexPos + 1, 0 );
+        }
 
-    // initialize rectangle with zero values!
-    aBorderSpace.setWidth(0);
-    aBorderSpace.setHeight(0);
+        if ( rDockingAreaData[nIndexPos] < nSize )
+        {
+            rDockingAreaData[nIndexPos] = nSize;
+        }
+    }
 
-    aRowColumnSizes[nCurrDockingArea].clear();
-    aRowColumnSizes[nCurrDockingArea].push_back( 0 );
 
-    for ( pConstIter = aWindowVector.begin(); pConstIter != aWindowVector.end(); pConstIter++ )
+    sal_Int32 calcDockingAreaSize( const std::vector< sal_Int32 >& rDockingAreaData )
     {
-        uno::Reference< ui::XUIElement > xUIElement( pConstIter->m_xUIElement, uno::UNO_QUERY );
-        if ( xUIElement.is() )
+        sal_Int32 nDockingAreaSize = 0;
+
+        std::vector< sal_Int32 >::const_iterator iDockingAreaDataEnd = rDockingAreaData.end();
+        for ( std::vector< sal_Int32 >::const_iterator iDockingAreaData = rDockingAreaData.begin();
+              iDockingAreaData != iDockingAreaDataEnd;
+              ++iDockingAreaData )
         {
-            uno::Reference< awt::XWindow > xWindow( xUIElement->getRealInterface(), uno::UNO_QUERY );
-            uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, uno::UNO_QUERY );
-            if ( xWindow.is() && xDockWindow.is() )
-            {
-                vos::OGuard aGuard( Application::GetSolarMutex() );
+                nDockingAreaSize += *(iDockingAreaData);
+        }
 
-                Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-                if ( pWindow && !xDockWindow->isFloating() && pConstIter->m_bVisible )
-                {
-                    awt::Rectangle aPosSize = xWindow->getPosSize();
-                    if ( pConstIter->m_aDockedData.m_nDockedArea != nCurrDockingArea )
-                    {
-                        nCurrDockingArea = pConstIter->m_aDockedData.m_nDockedArea;
-                        nCurrRowColumn   = 0;
-                        nCurrPos         = 0;
-                        aRowColumnSizes[nCurrDockingArea].clear();
-                        aRowColumnSizes[nCurrDockingArea].push_back( 0 );
-                    }
+        return nDockingAreaSize;
+    }
+}
 
-                    if ( pConstIter->m_aDockedData.m_nDockedArea == nCurrDockingArea )
-                    {
-                        if ( isHorizontalDockingArea( pConstIter->m_aDockedData.m_nDockedArea ))
-                        {
-                            if ( pConstIter->m_aDockedData.m_aPos.Y() > nCurrPos )
-                            {
-                                ++nCurrRowColumn;
-                                nCurrPos = pConstIter->m_aDockedData.m_aPos.Y();
-                                aRowColumnSizes[nCurrDockingArea].push_back( 0 );
-                            }
 
-                            if ( aPosSize.Height > aRowColumnSizes[nCurrDockingArea][nCurrRowColumn] )
-                                aRowColumnSizes[nCurrDockingArea][nCurrRowColumn] = aPosSize.Height;
-                        }
-                        else
-                        {
-                            if ( pConstIter->m_aDockedData.m_aPos.X() > nCurrPos )
-                            {
-                                ++nCurrRowColumn;
-                                nCurrPos = pConstIter->m_aDockedData.m_aPos.X();
-                                aRowColumnSizes[nCurrDockingArea].push_back( 0 );
-                            }
+Rectangle ToolbarLayoutManager::implts_calcDockingArea()
+{
+    Rectangle aBorderSpace( 0, 0, 0, 0 );
 
-                            if ( aPosSize.Width > aRowColumnSizes[nCurrDockingArea][nCurrRowColumn] )
-                                aRowColumnSizes[nCurrDockingArea][nCurrRowColumn] = aPosSize.Width;
-                        }
+    // For each docking area one container of UIElement sizes.
+    std::vector< std::vector< sal_Int32 > >aDockingAreaSizeDatas( DOCKINGAREAS_COUNT );
+
+    {
+        ReadGuard aReadLock( m_aLock );
+        vos::OGuard aGuard( Application::GetSolarMutex() );
+
+        // Iterate over the UIElements and collect corresponding docking area data
+        // for non-floating and visible ones separated for the each docking area.
+        // Note: For each docking area row resp. column only the size of largest UIElement is collected.
+        for ( UIElementVector::const_iterator pConstIter = m_aUIElements.begin(); pConstIter != m_aUIElements.end(); ++pConstIter )
+        {
+            uno::Reference< ui::XUIElement > xUIElement( pConstIter->m_xUIElement, uno::UNO_QUERY );
+            if ( xUIElement.is() )
+            {
+                uno::Reference< awt::XWindow > xWindow( xUIElement->getRealInterface(), uno::UNO_QUERY );
+                uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, uno::UNO_QUERY );
+                if ( xWindow.is() && xDockWindow.is() )
+                {
+                    Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+                    if ( pWindow && !xDockWindow->isFloating() && pConstIter->m_bVisible )
+                    {
+                        const awt::Rectangle aPosSize = xWindow->getPosSize();
+                        insertDockingAreaSize(
+                            *(pConstIter),
+                            aPosSize,
+                            aDockingAreaSizeDatas[pConstIter->m_aDockedData.m_nDockedArea] );
                     }
                 }
             }
         }
-    }
 
-    // Sum up max heights from every row/column
-    if ( !aWindowVector.empty() )
-    {
-        for ( sal_Int32 i = 0; i <= ui::DockingArea_DOCKINGAREA_RIGHT; i++ )
-        {
-            sal_Int32 nSize( 0 );
-            const sal_uInt32 nCount = aRowColumnSizes[i].size();
-            for ( sal_uInt32 j = 0; j < nCount; j++ )
-                nSize += aRowColumnSizes[i][j];
-
-            if ( i == ui::DockingArea_DOCKINGAREA_TOP )
-                aBorderSpace.Top() = nSize;
-            else if ( i == ui::DockingArea_DOCKINGAREA_BOTTOM )
-                aBorderSpace.Bottom() = nSize;
-            else if ( i == ui::DockingArea_DOCKINGAREA_LEFT )
-                aBorderSpace.Left() = nSize;
-            else
-                aBorderSpace.Right() = nSize;
-        }
+        aReadLock.unlock();
     }
 
+    aBorderSpace.Top() = calcDockingAreaSize( aDockingAreaSizeDatas[ui::DockingArea_DOCKINGAREA_TOP] );
+    aBorderSpace.Bottom() = calcDockingAreaSize( aDockingAreaSizeDatas[ui::DockingArea_DOCKINGAREA_BOTTOM] );
+    aBorderSpace.Left() = calcDockingAreaSize( aDockingAreaSizeDatas[ui::DockingArea_DOCKINGAREA_LEFT] );
+    aBorderSpace.Right() = calcDockingAreaSize( aDockingAreaSizeDatas[ui::DockingArea_DOCKINGAREA_RIGHT] );
+
     return aBorderSpace;
 }
 
@@ -553,62 +550,67 @@ void ToolbarLayoutManager::destroyToolba
     }
 }
 
-bool ToolbarLayoutManager::showToolbar( const ::rtl::OUString& rResourceURL )
+bool ToolbarLayoutManager::implts_setToolbarVisibility(
+    bool bVisible,
+    UIElement aUIElement )
 {
-    UIElement aUIElement = implts_findToolbar( rResourceURL );
-    
+    bool bRet = false;
+
     vos::OGuard aGuard( Application::GetSolarMutex() );
     Window* pWindow = getWindowFromXUIElement( aUIElement.m_xUIElement );
     if ( pWindow )
     {
+        if ( bVisible )
+        {
+            pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+        }
+        else
+        {
+            pWindow->Show( sal_False );
+        }
         if ( !aUIElement.m_bFloating )
+        {
             implts_setLayoutDirty();
-        else
-            pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
-        
-        aUIElement.m_bVisible = true;
+        }
+        aUIElement.m_bVisible = bVisible;
         implts_writeWindowStateData( aUIElement );
         implts_setToolbar( aUIElement );
-        return true;
+
+        bRet = true;
     }
-    
-    return false;
+
+    return bRet;
 }
 
-bool ToolbarLayoutManager::hideToolbar( const ::rtl::OUString& rResourceURL )
+bool ToolbarLayoutManager::showToolbar( const ::rtl::OUString& rResourceURL )
 {
     UIElement aUIElement = implts_findToolbar( rResourceURL );
+    const bool bRet = implts_setToolbarVisibility( true, aUIElement );
+    implts_sortUIElements();
+    return bRet;
+}
 
-    vos::OGuard aGuard( Application::GetSolarMutex() );
-    Window* pWindow = getWindowFromXUIElement( aUIElement.m_xUIElement );
-    if ( pWindow )
-    {
-        pWindow->Show( sal_False );
-        if ( !aUIElement.m_bFloating )
-            implts_setLayoutDirty();
-        
-        aUIElement.m_bVisible = false;
-        implts_writeWindowStateData( aUIElement );
-        implts_setToolbar( aUIElement );
-        return true;
-    }
-
-    return false;
+bool ToolbarLayoutManager::hideToolbar( const ::rtl::OUString& rResourceURL )
+{
+    UIElement aUIElement = implts_findToolbar( rResourceURL );
+    const bool bRet = implts_setToolbarVisibility( false, aUIElement );
+    implts_sortUIElements();
+    return bRet;
 }
 
 void ToolbarLayoutManager::refreshToolbarsVisibility( bool bAutomaticToolbars )
 {
-    UIElementVector aUIElementVector;
+    if ( !bAutomaticToolbars )
+        return;
 
     ReadGuard aReadLock( m_aLock );
-    bool bVisible( m_bVisible );
-    aReadLock.unlock();
-
-    if ( !bVisible || !bAutomaticToolbars )
+    if ( !m_bVisible )
         return;
+    aReadLock.unlock();
 
+    UIElementVector aUIElementVector;
     implts_getUIElementVectorCopy( aUIElementVector );
-    
+
     UIElement aUIElement;
     vos::OGuard aGuard( Application::GetSolarMutex() );
     UIElementVector::iterator pIter;
@@ -655,28 +657,17 @@ void ToolbarLayoutManager::setVisible( b
 {
     UIElementVector aUIElementVector;
     implts_getUIElementVectorCopy( aUIElementVector );
-    
+
     vos::OGuard aGuard( Application::GetSolarMutex() );
     UIElementVector::iterator pIter;
     for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); pIter++ )
     {
         pIter->m_bMasterHide = !bVisible;
-        Window* pWindow = getWindowFromXUIElement( pIter->m_xUIElement );
-        if ( pWindow )
-        {
-            bool bSetVisible( pIter->m_bVisible & bVisible );
-            if ( !bSetVisible )
-                pWindow->Hide();
-            else
-            {
-                if ( pIter->m_bFloating )
-                    pWindow->Show(true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
-                else
-                    implts_setLayoutDirty();
-            }
-        }
+        implts_setToolbarVisibility( bVisible, *pIter );
     }
-        
+
+    implts_sortUIElements();
+
     if ( !bVisible )
         resetDockingArea();
 }

Modified: openoffice/branches/alg_writerframes/main/framework/source/layoutmanager/toolbarlayoutmanager.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/framework/source/layoutmanager/toolbarlayoutmanager.hxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/framework/source/layoutmanager/toolbarlayoutmanager.hxx (original)
+++ openoffice/branches/alg_writerframes/main/framework/source/layoutmanager/toolbarlayoutmanager.hxx Wed Mar 19 10:14:42 2014
@@ -219,6 +219,7 @@ class ToolbarLayoutManager : public ::cp
         rtl::OUString    implts_generateGenericAddonToolbarTitle( sal_Int32 nNumber ) const;
         void             implts_setElementData( UIElement& rUIElement, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDockableWindow >& rDockWindow );
         void             implts_destroyDockingAreaWindows();
+        bool             implts_setToolbarVisibility( bool bVisible, UIElement aUIElement );
 
         //---------------------------------------------------------------------------------------------------------
         // layout methods
@@ -233,7 +234,7 @@ class ToolbarLayoutManager : public ::cp
         void             implts_setLayoutDirty();
         void             implts_setLayoutInProgress( bool bInProgress = true );
         bool             implts_isLayoutInProgress() const { return m_bLayoutInProgress; }
-        
+
         //---------------------------------------------------------------------------------------------------------
         // lookup/container methods
         //---------------------------------------------------------------------------------------------------------
@@ -246,7 +247,7 @@ class ToolbarLayoutManager : public ::cp
         void             implts_setToolbar( const UIElement& rUIElement );
         ::Size           implts_getTopBottomDockingAreaSizes();
         void             implts_getUIElementVectorCopy( UIElementVector& rCopy );
-        
+
         //---------------------------------------------------------------------------------------------------------
         // internal docking methods
         //---------------------------------------------------------------------------------------------------------
@@ -265,12 +266,12 @@ class ToolbarLayoutManager : public ::cp
                                                             const ::Rectangle& rTrackingRect,
                                                             const ::Rectangle& rRowColumnRect,
                                                             const ::Size& rContainerWinSize );
-        
+
         void             implts_getDockingAreaElementInfos( ::com::sun::star::ui::DockingArea DockingArea, std::vector< SingleRowColumnWindowData >& rRowColumnsWindowData );
         void             implts_getDockingAreaElementInfoOnSingleRowCol( ::com::sun::star::ui::DockingArea, sal_Int32 nRowCol, SingleRowColumnWindowData& rRowColumnWindowData );
         void             implts_findNextDockingPos( ::com::sun::star::ui::DockingArea DockingArea, const ::Size& aUIElementSize, ::Point& rVirtualPos, ::Point& rPixelPos );
         void             implts_setTrackingRect( ::com::sun::star::ui::DockingArea eDockingArea, const ::Point& rMousePos, ::Rectangle& rTrackingRect );
-        
+
         //---------------------------------------------------------------------------------------------------------
         // creation methods
         //---------------------------------------------------------------------------------------------------------
@@ -283,14 +284,14 @@ class ToolbarLayoutManager : public ::cp
         css::uno::Reference< css::ui::XUIElement > implts_createElement( const ::rtl::OUString& aName );
         void             implts_setToolbarCreation( bool bStart = true );
         bool             implts_isToolbarCreationActive();
-        
+
         //---------------------------------------------------------------------------------------------------------
         // persistence methods
         //---------------------------------------------------------------------------------------------------------
         sal_Bool         implts_readWindowStateData( const rtl::OUString& aName, UIElement& rElementData );
         void             implts_writeWindowStateData( const UIElement& rElementData );
         void             implts_writeNewWindowStateData( const rtl::OUString aName, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& xWindow );
-        
+
         //---------------------------------------------------------------------------------------------------------
         // members
         //---------------------------------------------------------------------------------------------------------

Modified: openoffice/branches/alg_writerframes/main/framework/source/uielement/uicommanddescription.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/framework/source/uielement/uicommanddescription.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/framework/source/uielement/uicommanddescription.cxx (original)
+++ openoffice/branches/alg_writerframes/main/framework/source/uielement/uicommanddescription.cxx Wed Mar 19 10:14:42 2014
@@ -761,7 +761,7 @@ throw (::com::sun::star::uno::RuntimeExc
     ModuleToCommandFileMap::const_iterator pIter = m_aModuleToCommandFileMap.begin();
     while ( pIter != m_aModuleToCommandFileMap.end() )
     {
-        aSeq[n] = pIter->first;
+        aSeq[n++] = pIter->first;
         ++pIter;
     }
 

Modified: openoffice/branches/alg_writerframes/main/graphite/graphite-2.3.1.patch
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/graphite/graphite-2.3.1.patch?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/graphite/graphite-2.3.1.patch (original)
+++ openoffice/branches/alg_writerframes/main/graphite/graphite-2.3.1.patch Wed Mar 19 10:14:42 2014
@@ -2427,3 +2427,28 @@
  #include "GrAppData.h"
  
  namespace gr
+--- misc/silgraphite-2.3.1/engine/include/graphite/SegmentAux.h	Thu Jan 22 00:36:40 2009
++++ misc/build/silgraphite-2.3.1/engine/include/graphite/SegmentAux.h	Sat Aug 22 19:36:32 2009
+@@ -232,8 +232,12 @@
+ protected:
+ 	// Constructor that includes output-slot mapping list, used for non-contiguous lists:
+ 	GlyphSetIterator(Segment & seg, size_t islout, RcVector * qvislout)
+-		: m_pseg(&seg), m_vit(qvislout->Vector().begin() + islout)
++		: m_pseg(&seg), m_vit(qvislout->Vector().begin())
+ 	{
++		if( islout < qvislout->Vector().size())
++			m_vit += islout;
++		else
++			m_vit = qvislout->Vector().end();
+ 		m_qvislout = qvislout;
+ 		m_qvislout->IncRefCount();
+ 	}
+@@ -289,7 +293,7 @@
+  
+ 	// Relational operators.
+   	// Forward iterator requirements
+-	bool operator==(const GlyphSetIterator & rhs) const throw()	{ return m_vit == rhs.m_vit; }
++	bool operator==(const GlyphSetIterator & rhs) const throw()	{ return (m_qvislout == NULL) || (m_vit == rhs.m_vit); }
+ 	bool operator!=(const GlyphSetIterator & rhs) const throw()	{ return !(*this == rhs); }
+ 
+ 	// Random access iterator requirements

Modified: openoffice/branches/alg_writerframes/main/helpcontent2/helpers/README
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/helpcontent2/helpers/README?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/helpcontent2/helpers/README (original)
+++ openoffice/branches/alg_writerframes/main/helpcontent2/helpers/README Wed Mar 19 10:14:42 2014
@@ -1,5 +1,9 @@
-2006-05-15
+2013-02-04
 
-New location for helpers that are not used by the 
-build process is documentation/www/online_help/helpers
+Some help content helpers are contained in this directory.
+
+Some are in /main/helpauthoring.
+
+Available documentation can be found at:
+http://www.openoffice.org/documentation/online_help/
 

Modified: openoffice/branches/alg_writerframes/main/helpcontent2/source/text/scalc/01/12120100.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/helpcontent2/source/text/scalc/01/12120100.xhp?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/helpcontent2/source/text/scalc/01/12120100.xhp (original)
+++ openoffice/branches/alg_writerframes/main/helpcontent2/source/text/scalc/01/12120100.xhp Wed Mar 19 10:14:42 2014
@@ -129,8 +129,8 @@ YJ: checked</lastedited>
 
 <!-- removed HID SC:TRISTATEBOX:TP_VALIDATION_VALUES:TSB_ALLOW_BLANKS -->
 <bookmark xml-lang="en-US" branch="hid/sc:CheckBox:TP_VALIDATION_VALUES:TSB_ALLOW_BLANKS" id="bm_id263985" localize="false"/>
-<paragraph role="heading" id="hd_id3154704" xml-lang="en-US" level="2" l10n="CHG" oldref="7">Allow blank cells</paragraph>
-<paragraph role="paragraph" id="par_id3153967" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SC:TRISTATEBOX:TP_VALIDATION_VALUES:TSB_ALLOW_BLANKS">In conjunction with <emph>Tools - Detective - Mark invalid Data</emph>, this defines that blank cells are shown as invalid data (disabled) or not (enabled).</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3154704" xml-lang="en-US" level="2" l10n="CHG" oldref="7">Allow empty cells</paragraph>
+<paragraph role="paragraph" id="par_id3153967" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SC:TRISTATEBOX:TP_VALIDATION_VALUES:TSB_ALLOW_BLANKS">In conjunction with <emph>Tools - Detective - Mark invalid Data</emph>, this defines that empty cells are shown as invalid data (disabled) or not (enabled).</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sc:CheckBox:TP_VALIDATION_VALUES:CB_SHOWLIST" id="bm_id5339518" localize="false"/>
 <paragraph role="heading" id="par_idN10709" xml-lang="en-US" level="2" l10n="NEW">Show selection list</paragraph>
 <paragraph role="paragraph" id="par_idN1070D" xml-lang="en-US" l10n="NEW"><ahelp hid="sc:CheckBox:TP_VALIDATION_VALUES:CB_SHOWLIST">Shows a list of all valid strings or values to select from. The list can also be opened by selecting the cell and pressing Ctrl+D (Mac: Command+D).</ahelp></paragraph>

Modified: openoffice/branches/alg_writerframes/main/i18npool/source/textconversion/data/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/i18npool/source/textconversion/data/makefile.mk?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/i18npool/source/textconversion/data/makefile.mk (original)
+++ openoffice/branches/alg_writerframes/main/i18npool/source/textconversion/data/makefile.mk Wed Mar 19 10:14:42 2014
@@ -36,6 +36,10 @@ CDEFS+=-Zm300
 
 # --- Files --------------------------------------------------------
 
+.IF "$(GUI)" == "OS2"
+SHL1STDLIBS+= $(SALLIB) $(CPPULIB)
+.ENDIF
+
 # collator data library
 SHL1TARGET=$(TARGET)
 SHL1IMPLIB=i$(SHL1TARGET)

Modified: openoffice/branches/alg_writerframes/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
Binary files - no diff available.

Modified: openoffice/branches/alg_writerframes/main/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
Binary files - no diff available.

Modified: openoffice/branches/alg_writerframes/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
Binary files - no diff available.

Modified: openoffice/branches/alg_writerframes/main/instsetoo_native/util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/instsetoo_native/util/makefile.mk?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/instsetoo_native/util/makefile.mk (original)
+++ openoffice/branches/alg_writerframes/main/instsetoo_native/util/makefile.mk Wed Mar 19 10:14:42 2014
@@ -25,6 +25,7 @@ TARGET=util
 
 .INCLUDE:  settings.mk
 .INCLUDE: $(SOLARINCDIR)$/rtlbootstrap.mk
+#.INCLUDE: $(SOLARENVINC)$/version.mk
 
 # watch for the path delimiter
 .IF "$(GUI)"=="WNT"
@@ -77,11 +78,13 @@ help .PHONY :
 	@echo "    aoo_srcrelease         packs the source release package"
 	@echo "    updatepack"
 	@echo "    openofficedev          devloper snapshot"
-	@echo "    openofficewithjre"
 	@echo "    ooolanguagepack"
+	@echo "    ooobetalanguagepack"
 	@echo "    ooodevlanguagepack"
-	@echo "    sdkoo"
-	@echo "    sdkoodev"
+	@echo "    sdkoo                  builds the developer SDK package"
+	@echo "    sdkoobeta              like sdkoo but with 'Beta' appended to the product name"
+	@echo "    sdkoodev               builds the developer snapshot of the SDK"
+	@echo "    openofficebeta         like openoffice but with 'Beta' appended to product name"
 	@echo 
 	@echo "experimental targets:"
 	@echo "    patch-create           create a patch for updating an installed office (Windows only)"
@@ -136,7 +139,7 @@ VERBOSESWITCH=-verbose
 VERBOSESWITCH=-quiet
 .ENDIF
 
-.IF "$(release:U)"=="T"
+.IF "$(release)"!=""
 RELEASE_SWITCH=-release
 $(foreach,i,$(alllangiso) openoffice_$i.msi) : prepare_release_build
 .ELSE
@@ -180,10 +183,12 @@ openoffice:
 # Add dependencies of basic targets on language specific targets.
 openoffice: $(foreach,i,$(alllangiso) openoffice_$i)
 openofficedev: $(foreach,i,$(alllangiso) openofficedev_$i)
-openofficewithjre: $(foreach,i,$(alllangiso) openofficewithjre_$i)
+openofficebeta: $(foreach,i,$(alllangiso) openofficebeta_$i)
 ooolanguagepack : $(foreach,i,$(alllangiso) ooolanguagepack_$i)
+ooobetalanguagepack : $(foreach,i,$(alllangiso) ooobetalanguagepack_$i)
 ooodevlanguagepack: $(foreach,i,$(alllangiso) ooodevlanguagepack_$i)
 sdkoo: $(foreach,i,$(alllangiso) sdkoo_$i)
+sdkoobeta: $(foreach,i,$(alllangiso) sdkoobeta_$i)
 sdkoodev: $(foreach,i,$(alllangiso) sdkoodev_$i)
 patch-create: $(foreach,i,$(alllangiso) patch-create_$i)
 
@@ -193,6 +198,7 @@ MSISDKOOTEMPLATESOURCE=$(PRJ)$/inc_sdkoo
 
 NOLOGOSPLASH:=$(BIN)$/intro.zip
 DEVNOLOGOSPLASH:=$(BIN)$/dev$/intro.zip
+BETA_LOGO_SPLASH:=$(BIN)$/beta$/intro.zip $(BIN)$/beta$/images.zip
 MSIOFFICETEMPLATEDIR=$(MISC)$/openoffice$/msi_templates
 MSILANGPACKTEMPLATEDIR=$(MISC)$/ooolangpack$/msi_templates
 MSISDKOOTEMPLATEDIR=$(MISC)$/sdkoo$/msi_templates
@@ -214,10 +220,12 @@ updatepack : local_python_files
 $(foreach,i,$(alllangiso) openoffice_$i) : adddeps
 openoffice_$(defaultlangiso).archive : adddeps
 $(foreach,i,$(alllangiso) openofficedev_$i) : adddeps
-$(foreach,i,$(alllangiso) openofficewithjre_$i) : adddeps
+$(foreach,i,$(alllangiso) openofficebeta_$i) : adddeps $(BETA_LOGO_SPLASH)
 $(foreach,i,$(alllangiso) ooolanguagepack_$i) : adddeps
+$(foreach,i,$(alllangiso) ooobetalanguagepack_$i) : adddeps
 $(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : adddeps
 $(foreach,i,$(alllangiso) sdkoo_$i) : adddeps
+$(foreach,i,$(alllangiso) sdkoobeta_$i) : adddeps
 $(foreach,i,$(alllangiso) sdkoodev_$i) : adddeps
 
 # Create targets that take the package formats into account.  Together with language dependency we
@@ -225,11 +233,13 @@ $(foreach,i,$(alllangiso) sdkoodev_$i) :
 # where $language ranges over all languages in $(alllangiso) 
 # and $package ranges over all package formats in $(PKGFORMAT)
 $(foreach,i,$(alllangiso) openoffice_$i) : $$@{$(PKGFORMAT:^".")}
-$(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
 $(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}
+$(foreach,i,$(alllangiso) openofficebeta_$i) : $$@{$(PKGFORMAT:^".")}
 $(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
+$(foreach,i,$(alllangiso) ooobetalanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
 $(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
 $(foreach,i,$(alllangiso) sdkoo_$i) : $$@{$(PKGFORMAT:^".")}
+$(foreach,i,$(alllangiso) sdkoobeta_$i) : $$@{$(PKGFORMAT:^".")}
 $(foreach,i,$(alllangiso) sdkoodev_$i) : $$@{$(PKGFORMAT:^".")}
 $(foreach,i,$(alllangiso) patch-create_$i) : $$@{$(PKGFORMAT:^".")}
 
@@ -267,9 +277,6 @@ $(foreach,P,$(PACKAGE_FORMATS) $(foreach
 		$(PRJ)$/util$/update.xml	\
 		> $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 
-#openofficewithjre_%{$(PKGFORMAT:^".")} :
-$(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) openofficewithjre_$L.$P)) .PHONY :
-	$(MAKE_INSTALLER_COMMAND) -p Apache_OpenOffice_wJRE -msitemplate $(MSIOFFICETEMPLATEDIR)
 
 #openofficedev_%{$(PKGFORMAT:^".")} :
 $(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) openofficedev_$L.$P)) .PHONY :
@@ -281,6 +288,15 @@ $(foreach,P,$(PACKAGE_FORMATS) $(foreach
 		$(PRJ)$/util$/update.xml 		\
 		> $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 
+$(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) openofficebeta_$L.$P)) .PHONY :
+	$(MAKE_INSTALLER_COMMAND)		\
+		-p Apache_OpenOffice_Beta	\
+		-msitemplate $(MSIOFFICETEMPLATEDIR)
+	$(GEN_UPDATE_INFO_COMMAND)			\
+		--product Apache_OpenOffice_Beta 	\
+		$(PRJ)$/util$/update.xml 		\
+		> $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+
 #ooolanguagepack_%{$(PKGFORMAT:^".")} :
 $(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) ooolanguagepack_$L.$P)) .PHONY :
 	$(MAKE_INSTALLER_COMMAND)			\
@@ -288,6 +304,13 @@ $(foreach,P,$(PACKAGE_FORMATS) $(foreach
 		-msitemplate $(MSILANGPACKTEMPLATEDIR)	\
 		-languagepack
 
+#ooobetalanguagepack_%{$(PKGFORMAT:^".")} :
+$(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) ooobetalanguagepack_$L.$P)) .PHONY :
+	$(MAKE_INSTALLER_COMMAND)			\
+		-p Apache_OpenOffice_Beta			\
+		-msitemplate $(MSILANGPACKTEMPLATEDIR)	\
+		-languagepack
+
 #ooodevlanguagepack_%{$(PKGFORMAT:^".")} :
 $(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) ooodevlanguagepack_$L.$P)) .PHONY :
 	$(MAKE_INSTALLER_COMMAND) -p Apache_OpenOffice_Dev -msitemplate $(MSILANGPACKTEMPLATEDIR) -languagepack
@@ -296,6 +319,10 @@ $(foreach,P,$(PACKAGE_FORMATS) $(foreach
 $(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) sdkoo_$L.$P)) .PHONY :
 	$(MAKE_INSTALLER_COMMAND) -p Apache_OpenOffice_SDK -msitemplate $(MSISDKOOTEMPLATEDIR) -dontstrip
 
+#sdkoobeta_%{$(PKGFORMAT:^".")} :
+$(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) sdkoobeta_$L.$P)) .PHONY :
+	$(MAKE_INSTALLER_COMMAND) -p Apache_OpenOffice_Beta_SDK -msitemplate $(MSISDKOOTEMPLATEDIR) -dontstrip
+
 #sdkoodev_%{$(PKGFORMAT:^".")} :
 $(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) sdkoodev_$L.$P)) .PHONY :
 	$(MAKE_INSTALLER_COMMAND) -p Apache_OpenOffice_Dev_SDK -msitemplate $(MSISDKOOTEMPLATEDIR) -dontstrip
@@ -312,11 +339,26 @@ $(BIN)$/dev$/intro.zip : $(SOLARCOMMONPC
 	@-$(MKDIR) $(@:d)
 	$(COPY) $< $@
 
+$(BIN)$/beta$/intro.zip : $(SOLARCOMMONPCKDIR)$/openoffice_beta$/intro.zip
+	@-$(MKDIR) $(@:d)
+	$(COPY) $< $@
+
+# Replace framework/res/*.png with *-beta.png
+$(BIN)$/beta$/images.zip : $(SOLARBINDIR)$/images.zip
+	$(COPY) $< $@
+	$(PERL) $(SOLARENV)$/bin/replace_in_zip.pl	\
+		$@				\
+		framework/res/			\
+		$(SRC_ROOT)/default_images/framework/res/beta/	\
+		backing.png			\
+		backing_hc.png			\
+		backing_rtl_left.png		\
+		backing_rtl_left_hc.png
 
 .IF "$(OS)" == "WNT"
 $(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) patch-create_$L.$P)) .PHONY :
 	@echo building $@
-	perl -I $(SOLARENV)$/bin/modules $(SOLARENV)$/bin$/patch_tool.pl	\
+	$(PERL) -I $(SOLARENV)$/bin/modules $(SOLARENV)$/bin$/patch_tool.pl	\
 		create								\
 		--product-name Apache_OpenOffice				\
 		--output-path $(OUT)						\
@@ -325,7 +367,7 @@ $(foreach,P,$(PACKAGE_FORMATS) $(foreach
 		--language $(subst,$(@:s/_/ /:1)_, $(@:b))			\
 		--package-format $(@:e:s/.//)
 patch-apply .PHONY :
-	perl -I $(SOLARENV)$/bin/modules $(SOLARENV)$/bin$/patch_tool.pl	\
+	$(PERL) -I $(SOLARENV)$/bin/modules $(SOLARENV)$/bin$/patch_tool.pl	\
 		apply								\
 		--product-name Apache_OpenOffice				\
 		--output-path $(OUT)						\
@@ -333,7 +375,7 @@ patch-apply .PHONY :
 		--language en-US						\
 		--package-format msi
 patch-update-releases-xml .PHONY:
-	perl -I $(SOLARENV)$/bin/modules $(SOLARENV)$/bin$/patch_tool.pl	\
+	$(PERL) -I $(SOLARENV)$/bin/modules $(SOLARENV)$/bin$/patch_tool.pl	\
 		update-releases-xml						\
 		--product-name Apache_OpenOffice				\
 		--output-path $(OUT)						\
@@ -341,7 +383,7 @@ patch-update-releases-xml .PHONY:
 		--target-version 4.0.1
 $(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) patch-check_$L.$P)) .PHONY :
 	@echo building $@
-	perl -I $(SOLARENV)$/bin/modules $(SOLARENV)$/bin$/patch_tool.pl	\
+	$(PERL) -I $(SOLARENV)$/bin/modules $(SOLARENV)$/bin$/patch_tool.pl	\
 		check								\
 		--product-name Apache_OpenOffice				\
 		--output-path $(OUT)						\

Modified: openoffice/branches/alg_writerframes/main/instsetoo_native/util/openoffice.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/instsetoo_native/util/openoffice.lst?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/instsetoo_native/util/openoffice.lst (original)
+++ openoffice/branches/alg_writerframes/main/instsetoo_native/util/openoffice.lst Wed Mar 19 10:14:42 2014
@@ -70,7 +70,7 @@ Apache_OpenOffice
             ABOUTBOXPRODUCTVERSION 4.1.0
             BASEPRODUCTVERSION 4.1
             PCPFILENAME openoffice.pcp
-            UPDATEURL https://ooo-updates.apache.org/aoo410/check.Update
+            UPDATEURL https://ooo-updates.apache.org/aoonext/check.Update
             ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
             REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
             ADDSYSTEMINTEGRATION 1
@@ -111,65 +111,6 @@ Apache_OpenOffice
     }
 }
 
-Apache_OpenOffice_wJRE
-{
-    Settings
-    {
-        variables
-        {
-            FULLPRODUCTNAME Apache OpenOffice
-            PRODUCTNAME OpenOffice
-            PRODUCTVERSION 4.1.0
-            PRODUCTEXTENSION 
-            LONG_PRODUCTEXTENSION 
-            SHORT_PRODUCTEXTENSION 
-            POSTVERSIONEXTENSION
-            POSTVERSIONEXTENSIONUNIX
-            BRANDPACKAGEVERSION 4
-            USERDIRPRODUCTVERSION 4
-            ABOUTBOXPRODUCTVERSION 4.1.0
-            BASEPRODUCTVERSION 4.1
-            UPDATEURL https://ooo-updates.apache.org/aoo410/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 4.1.0
-            PACKAGEREVISION {milestone}
-            LICENSENAME ALv2
-            WITHJREPRODUCT 1
-            GLOBALFILEGID gid_File_Lib_Vcl
-            GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
-            SPELLCHECKERFILE spellchecker_selection.txt
-            OPENSOURCE 1
-            SETSTATICPATH 1
-            AOODOWNLOADNAME 1
-            AOODOWNLOADNAMEPREFIX Apache_OpenOffice_wJRE
-            XPDINSTALLER 1
-            BETAUPGRADECODE
-            STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
-            CHANGETARGETDIR 1
-            USE_FILEVERSION 1
-            LIBRARYVERSION 10.0.0
-            PATCHCODEFILE ooo_patchcodes.txt
-            JAVAPRODUCT 1
-            DOWNLOADBANNER	ooobanner.bmp
-            DOWNLOADBITMAP	ooobitmap.bmp
-            DOWNLOADSETUPICO	ooosetup.ico
-            RELATIVE_PATHES_IN_DDF 1
-            STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
-            STARTCENTER_INFO_URL http://www.openoffice.org
-            STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
-            STARTCENTER_LAYOUT_STYLE 0
-            DICT_REPO_URL http://extensions.openoffice.org/dictionaries
-        }
-        active			1
-        compression		5
-        script			setup_osljre
-        downloadname	Apache_OpenOffice_{productversion}_{os}_installwjre_{languages}
-        include			{solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
-    }
-}
 
 Apache_OpenOffice_Dev
 {
@@ -196,7 +137,7 @@ Apache_OpenOffice_Dev
             UREPACKAGEPREFIX aoodev
             SOLSUREPACKAGEPREFIX aoodev
             REGISTRYLAYERNAME LayerDev
-            UPDATEURL https://ooo-updates.apache.org/aoo410/check.Update
+            UPDATEURL https://ooo-updates.apache.org/aoonextdev/check.Update
             ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
             EVAL
             PACKAGEVERSION 4.1.0
@@ -249,6 +190,7 @@ Apache_OpenOffice_SDK
         {
             FULLPRODUCTNAME Apache OpenOffice
             PRODUCTNAME OpenOffice
+			PRODUCTDIRNAME OpenOffice_SDK
             PRODUCTVERSION 4.1.0
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
@@ -287,6 +229,53 @@ Apache_OpenOffice_SDK
     }
 }
 
+Apache_OpenOffice_Beta_SDK
+{
+    Settings
+    {
+        downloadname Apache_OpenOffice-Beta-SDK_{packageversion}_{os}_install_{languages}
+        variables
+        {
+            FULLPRODUCTNAME Apache OpenOffice Beta
+            PRODUCTNAME OpenOffice Beta
+            PRODUCTDIRNAME OpenOffice_SDK_Beta
+            PRODUCTVERSION 4.1.0
+            PRODUCTEXTENSION
+            SHORT_PRODUCTEXTENSION
+            POSTVERSIONEXTENSION SDK
+            POSTVERSIONEXTENSIONUNIX sdk
+            BRANDPACKAGEVERSION 4
+            PACKAGEVERSION 4.1.0
+            PACKAGEREVISION {milestone}
+            PACK_INSTALLED 1
+            POOLPRODUCT 0
+            DMG_VOLUMEEXTENSION SDK
+            DATABASENAME openofficeorg410betasdk
+            NO_README_IN_ROOTDIR 1
+            LICENSENAME ALv2
+            IGNOREDIRECTORYLAYER 1
+            NOSPACEINDIRECTORYNAME 1
+            NOLANGUAGESELECTIONPRODUCT 1
+            CHANGETARGETDIR 1
+            DOWNLOADBANNER ooosdkbanner.bmp
+            DOWNLOADBITMAP ooosdkbitmap.bmp
+            DOWNLOADSETUPICO ooosetup.ico
+            DONTUSESTARTMENUFOLDER 1
+            RELATIVE_PATHES_IN_DDF 1
+            AOODOWNLOADNAMEPREFIX Apache_OpenOffice_Beta-SDK
+            STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
+            STARTCENTER_INFO_URL http://www.openoffice.org
+            STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
+            STARTCENTER_LAYOUT_STYLE 0
+            DICT_REPO_URL http://extensions.openoffice.org/dictionaries
+        }
+        active 1
+        compression 5
+        script sdkoo
+        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarenvpath}/{os}/MS
+    }
+}
+
 Apache_OpenOffice_Dev_SDK
 {
     Settings
@@ -340,3 +329,63 @@ Apache_OpenOffice_Dev_SDK
         include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarenvpath}/{os}/MS
     }
 }
+
+Apache_OpenOffice_Beta
+{
+    Settings
+    {
+        variables
+        {
+            FULLPRODUCTNAME Apache OpenOffice Beta
+            PRODUCTNAME OpenOffice Beta
+            PRODUCTVERSION 4.1.0
+            PRODUCTEXTENSION
+            SHORT_PRODUCTEXTENSION
+            BASISROOTNAME AOOBeta
+            BASISPACKAGEPREFIX aoobeta
+            UREPACKAGEPREFIX aoobeta
+            SOLSUREPACKAGEPREFIX aoobeta
+            POSTVERSIONEXTENSION
+            BRANDPACKAGEVERSION 4
+            USERDIRPRODUCTVERSION 4
+            ABOUTBOXPRODUCTVERSION 4.1.0
+            BASEPRODUCTVERSION 4.1
+            UPDATEURL https://ooo-updates.apache.org/aoonextbeta/check.Update
+            ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
+            REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
+            ADDSYSTEMINTEGRATION 0
+            EVAL
+            PACKAGEVERSION 4.1.0
+            PACKAGEREVISION {milestone}
+            LICENSENAME ALv2
+            GLOBALFILEGID gid_File_Lib_Vcl
+            GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
+            SPELLCHECKERFILE spellchecker_selection.txt
+            SETSTATICPATH 1
+            AOODOWNLOADNAME 1
+            AOODOWNLOADNAMEPREFIX Apache_OpenOffice_Beta
+            XPDINSTALLER 0
+            BETAUPGRADECODE
+            STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
+            CHANGETARGETDIR 1
+            USE_FILEVERSION 1
+            LIBRARYVERSION 10.0.0
+            PATCHCODEFILE ooo_patchcodes.txt
+            DOWNLOADBANNER	ooobanner.bmp
+            DOWNLOADBITMAP	ooobitmap.bmp
+            DOWNLOADSETUPICO	ooosetup.ico
+            RELATIVE_PATHES_IN_DDF 1
+            STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
+            STARTCENTER_INFO_URL http://www.openoffice.org
+            STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
+            STARTCENTER_LAYOUT_STYLE 0
+            DICT_REPO_URL http://extensions.openoffice.org/dictionaries
+        }
+        active			1
+        compression		5
+        script			setup_osl
+        downloadname	Apache_OpenOffice_Beta_{productversion}_{os}_install_{languages}
+        langpackdownloadname	Apache_OpenOffice_Beta_{productversion}_languagepack_{os}_install_{languages}
+        include			{solarenvpath}/{os}/loader2,.,{localpath}/bin/beta,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+    }
+}

Modified: openoffice/branches/alg_writerframes/main/instsetoo_native/util/pack.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/instsetoo_native/util/pack.lst?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/instsetoo_native/util/pack.lst (original)
+++ openoffice/branches/alg_writerframes/main/instsetoo_native/util/pack.lst Wed Mar 19 10:14:42 2014
@@ -9,7 +9,6 @@
 
 OpenOffice      unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro    en-US   openoffice
 OpenOffice      unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12                                     en-US   openoffice
-#OpenOffice_wJRE unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,wntmsci12                    en-US   openofficewithjre
 OpenOffice_Dev  unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxmacxi.pro,unxlngx6.pro    en-US   openofficedev
 #OpenOffice_SDK  unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12  en-US   sdkoo
 OpenOffice_Dev_SDK  unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12  en-US   sdkoodev

Modified: openoffice/branches/alg_writerframes/main/jurt/com/sun/star/lib/util/NativeLibraryLoader.java
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/jurt/com/sun/star/lib/util/NativeLibraryLoader.java?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/jurt/com/sun/star/lib/util/NativeLibraryLoader.java (original)
+++ openoffice/branches/alg_writerframes/main/jurt/com/sun/star/lib/util/NativeLibraryLoader.java Wed Mar 19 10:14:42 2014
@@ -48,8 +48,18 @@ public final class NativeLibraryLoader {
         library name is system dependent
      */
     public static void loadLibrary(ClassLoader loader, String libname) {
+        String syslibname = System.mapLibraryName(libname);
+        
         File path = getResource(loader, System.mapLibraryName(libname));
         if (path == null) {
+            // check special jni lib extension on Mac
+            if (syslibname.contains("dylib")) {
+                syslibname = syslibname.replace("dylib", "jnilib");
+            }
+            path = getResource(loader, syslibname);
+        }
+
+        if (path == null) {
             // If the library cannot be found as a class loader resource, try
             // the global System.loadLibrary as a last resort:
             System.loadLibrary(libname);

Modified: openoffice/branches/alg_writerframes/main/jvmfwk/source/framework.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/jvmfwk/source/framework.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/jvmfwk/source/framework.cxx (original)
+++ openoffice/branches/alg_writerframes/main/jvmfwk/source/framework.cxx Wed Mar 19 10:14:42 2014
@@ -644,7 +644,9 @@ sal_Bool SAL_CALL jfw_areEqualJavaInfo(
         && sLocation.equals(pInfoB->sLocation) == sal_True
         && sVersion.equals(pInfoB->sVersion) == sal_True
         && pInfoA->nFeatures == pInfoB->nFeatures
+#ifndef MACOSX
         && pInfoA->nRequirements == pInfoB->nRequirements
+#endif
         && sData == pInfoB->arVendorData)
     {
         return sal_True;

Modified: openoffice/branches/alg_writerframes/main/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx (original)
+++ openoffice/branches/alg_writerframes/main/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx Wed Mar 19 10:14:42 2014
@@ -266,7 +266,7 @@ sal_Int16 MacSpellChecker::GetSpellFailu
             aLang = [aLang  stringByAppendingString:aTaggedCountry];
         }
 
-        int aCount;
+        NSInteger aCount;
         NSRange range = [macSpell checkSpellingOfString:aNSStr startingAt:0 language:aLang wrap:sal_False inSpellDocumentWithTag:macTag wordCount:&aCount];
 		int rVal = 0;
 		if(range.length>0)

Modified: openoffice/branches/alg_writerframes/main/nss/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/nss/makefile.mk?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/nss/makefile.mk (original)
+++ openoffice/branches/alg_writerframes/main/nss/makefile.mk Wed Mar 19 10:14:42 2014
@@ -45,7 +45,7 @@ TARFILE_ROOTDIR=nss-3.14.4
 PATCH_FILES=nss.patch
 
 .IF "$(OS)"=="MACOSX"
-MACOS_SDK_DIR=/Developer/SDKs/MacOSX10.4u.sdk
+MACOS_SDK_DIR=$(SDK_PATH)
 .EXPORT : MACOS_SDK_DIR
 PATCH_FILES+=nss_macosx.patch
 .ENDIF # "$(OS)"=="MACOSX"
@@ -56,31 +56,11 @@ BUILD_OPT=1
 .EXPORT: BUILD_OPT
 .ENDIF
 
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)$(COM)"=="LINUXGCC"
 .IF "$(BUILD64)"=="1"
-# force 64-bit buildmode
+# force the 64-bit build mode for 64bit targets
 USE_64:=1
 .EXPORT : USE_64
-.ENDIF			# "$(CPU)"=="X"
-.ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
-
-.IF "$(OS)$(COM)"=="FREEBSDGCC"
-.IF "$(CPU)"=="X"
-# force 64-bit buildmode
-USE_64:=1
-.EXPORT : USE_64
-.ENDIF			# "$(CPU)"=="X"
-.ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
-
-.IF "$(OS)"=="MACOSX"
-.IF "$(EXTRA_CFLAGS)"!=""
-CPP:=gcc -E $(EXTRA_CFLAGS)
-CXX:=g++ $(EXTRA_CFLAGS)
-CC:=gcc $(EXTRA_CFLAGS)
-.EXPORT : CPP
-.ENDIF # "$(EXTRA_CFLAGS)"!=""
-.ENDIF # "$(OS)"=="MACOSX"
+.ENDIF # "$(BUILD64)"=="1"
 
 OUT2LIB=mozilla$/dist$/out$/lib$/*$(DLLPOST)
 
@@ -92,8 +72,6 @@ BUILD_ACTION+=FREEBL_NO_DEPEND=1 FREEBL_
 PATCH_FILES+=nss_linux.patch
 .ENDIF
 
-.ENDIF			# "$(GUI)"=="UNX"
-
 
 .IF "$(GUI)"=="WNT"
 

Modified: openoffice/branches/alg_writerframes/main/nss/nss_linux.patch
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/nss/nss_linux.patch?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/nss/nss_linux.patch (original)
+++ openoffice/branches/alg_writerframes/main/nss/nss_linux.patch Wed Mar 19 10:14:42 2014
@@ -9,3 +9,16 @@
  OS_LIBS			= $(OS_PTHREAD) -ldl -lc
  
  ifdef USE_PTHREADS
+--- misc/nss-3.14.4/mozilla/security/nss/lib/freebl/Makefile	2013-01-31 02:08:59.000000000 +0100
++++ misc/build/nss-3.14.4/mozilla/security/nss/lib/freebl/Makefile	2014-01-10 13:57:48.000000000 +0100
+@@ -186,8 +186,8 @@
+     DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
+ #   DEFINES += -DMPI_AMD64_ADD
+     # comment the next two lines to turn off intel HW accelleration
+-    DEFINES += -DUSE_HW_AES
+-    ASFILES += intel-aes.s intel-gcm.s
++#    DEFINES += -DUSE_HW_AES
++#    ASFILES += intel-aes.s intel-gcm.s
+     EXTRA_SRCS += intel-gcm-wrap.c
+     INTEL_GCM = 1
+     MPI_SRCS += mpi_amd64.c mp_comba.c

Modified: openoffice/branches/alg_writerframes/main/odk/configure.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/odk/configure.pl?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/odk/configure.pl (original)
+++ openoffice/branches/alg_writerframes/main/odk/configure.pl Wed Mar 19 10:14:42 2014
@@ -82,8 +82,19 @@ if ( $main::operatingSystem =~ m/solaris
 	$main::cppName = "CC";
 	$main::cppVersion = "5.2";
 }
+if ( $main::operatingSystem =~ m/darwin/ )
+{
+	$main::cppName = "clang";
+	$main::cppVersion = "4.2";
+}
 $main::OO_SDK_CC_55_OR_HIGHER = "";
-$main::OO_SDK_CPP_HOME_SUGGESTION = searchprog($main::cppName);
+if ( $main::operatingSystem =~ m/darwin/ )
+{
+	$clangpath = `xcrun -f clang++`;
+	$main::OO_SDK_CPP_HOME_SUGGESTION = substr($clangpath, 0, rindex($clangpath, "/"));
+} else {
+	$main::OO_SDK_CPP_HOME_SUGGESTION = searchprog($main::cppName);
+}
 
 $main::OO_SDK_JAVA_HOME = "";
 $main::OO_SDK_JAVA_BIN_DIR = "bin";
@@ -348,18 +359,28 @@ while ( (!$main::correctVersion) &&
 	print " C++ compilers where for example a language binding exist:\n";
 	print "  - Solaris, Sun WorkShop 6 update 1 C++ 5.2 2000/09/11 or higher\n";
 	print "  - Linux, GNU C++ compiler, gcc version 4.0.1 or higher\n";
-	print "  - MacOS, GNU C++ compiler, gcc version 4.0.1 or higher\n";
-	print " Enter the directory of the C++ compiler, the directory\n";
-	print " where the compiler is located (optional) [$main::OO_SDK_CPP_HOME_SUGGESTION]: ";
-	
-	$main::OO_SDK_CPP_HOME = readStdIn();
-	chop($main::OO_SDK_CPP_HOME);
-	if ( $main::OO_SDK_CPP_HOME eq "" ) 
+	print "  - MacOS 64bit, Apple LLVM version 4.2 (clang-425.0.28) or higher\n";
+	print "    on MacOS auto detected using xcrun -f clang'\n";
+
+	if ( $main::operatingSystem =~ m/darwin/ )
 	{
+		# xcrun is used to find the correct clang compiler, just print the result as information
 		$main::OO_SDK_CPP_HOME = $main::OO_SDK_CPP_HOME_SUGGESTION;
+		print " Used clang compiler: $main::OO_SDK_CPP_HOME\n";
+	} else 
+	{
+		print " Enter the directory of the C++ compiler, the directory\n";
+		print " where the compiler is located (optional) [$main::OO_SDK_CPP_HOME_SUGGESTION]: ";
+	
+		$main::OO_SDK_CPP_HOME = readStdIn();
+		chop($main::OO_SDK_CPP_HOME);
+		if ( $main::OO_SDK_CPP_HOME eq "" ) 
+		{
+			$main::OO_SDK_CPP_HOME = $main::OO_SDK_CPP_HOME_SUGGESTION;
+		}
 	}
 
-	if ( ! $main::OO_SDK_CPP_HOME eq "" ) 
+	if ( (!$main::operatingSystem =~ m/darwin/) && (! $main::OO_SDK_CPP_HOME eq "") ) 
 	{
 		if ( (! -d "$main::OO_SDK_CPP_HOME") || 
 			 ((-d "$main::OO_SDK_CPP_HOME") && (! -e "$main::OO_SDK_CPP_HOME/$main::cppName")) )

Modified: openoffice/branches/alg_writerframes/main/odk/docs/install.html
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/odk/docs/install.html?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/odk/docs/install.html (original)
+++ openoffice/branches/alg_writerframes/main/odk/docs/install.html Wed Mar 19 10:14:42 2014
@@ -68,7 +68,7 @@
 		  </td>
 		  </tr> 
 		  <tr valign="top"> 
-          <td><b>Apache OpenOffice %PRODUCT_RELEASE% installation</td>
+          <td><b>Apache OpenOffice %PRODUCT_RELEASE% installation</b></td>
           <td class="content80">The SDK works on top of an existing office 
 		  installation and uses the same libraries as the office installation.</td>
           </tr>
@@ -77,7 +77,7 @@
             <td colspan="2"><img class="line" src="images/sdk_line-1.gif"></td>
           </tr>
 		  <tr valign="top"> 
-          <td><b>JDK (1.5 or higher)<b></td>
+          <td><b>JDK (1.5 or higher)</b></td>
           <td class="content80">
 		  <p>A JDK is necessary for developing Java components or applications. An appropriate Java SDK can be found on <a target="_blank" href="http://java.sun.com/products" title="link to the Java SDK download page (online)">http://java.sun.com/products</a>.</p>
 		  <p>Recommendation is to use Java 6 excepting for Mac OS because initially Mac OS supported a 64bit version of Java 6 only.</p>
@@ -87,7 +87,7 @@
             <td colspan="2"><img class="line" src="images/sdk_line-1.gif"></td>
           </tr>
 		  <tr valign="top"> 
-          <td><b>C++ compiler<b></td>
+          <td><b>C++ compiler</b></td>
           <td class="content80">A C++ compiler is necessary for developing C++ 
 		  components or applications. UNO depends on a compiler dependent language 
 		  binding, so that we use the appropriate compiler where a language binding 
@@ -106,13 +106,13 @@
 		  <td class="cell80">Microsoft C++ Compiler, Microsoft Visual Studio 2008 or the Express version (cl, version 15.00.21022)</td>
 		  </tr>
 		  </table>
-		  <p><b>Note</b>: The C++ compiler is <b><u>optional</u></b>! If you use the Express edition you have to ensure that the <a href="http://www.microsoft.com/downloads/details.aspx?familyid=9B2DA534-3E03-4391-8A4D-074B9F2BC1BF&displaylang=en">Microsoft Visual Studio 2008 Redistributable Package</a> is also installed. You can download this package from Microsoft directly.</a></p></td>
+		  <p><b>Note</b>: The C++ compiler is <b><u>optional</u></b>! If you use the Express edition you have to ensure that the <a href="http://www.microsoft.com/downloads/details.aspx?familyid=9B2DA534-3E03-4391-8A4D-074B9F2BC1BF&displaylang=en">Microsoft Visual Studio 2008 Redistributable Package</a> is also installed. You can download this package from Microsoft directly.</p></td>
           </tr>
 		  <tr valign="middle"> 
             <td colspan="2"><img class="line" src="images/sdk_line-1.gif"></td>
           </tr>
 		  <tr valign="top"> 
-          <td><b>Microsoft .NET Framework SDK version 1.0 or higher<b></td>
+          <td><b>Microsoft .NET Framework SDK version 1.0 or higher</b></td>
           <td class="content80">The SDK is required for building CLI applications. 
 		  That is, programs written in languages, such as C# or VB.NET.<br>
 		  <p><b>Note</b>: The .NET Framework is <b><u>optional</u></b>!</p></td>
@@ -121,7 +121,7 @@
             <td colspan="2"><img class="line" src="images/sdk_line-1.gif"></td>
           </tr>
 		  <tr valign="top"> 
-          <td><b>GNU make (3.79.1 or higher)<b></td>
+          <td><b>GNU make (3.79.1 or higher)</b></td>
           <td class="content80">
 		  <p>GNU make is used to build the examples of the SDK. GNU make is available from <a target="_blank" href="http://www.gnu.org" title="link to www.gnu.org (online)">http://www.gnu.org</a>. It can be ftped via <a target="_blank" href="ftp://ftp.gnu.org/gnu/make" title="link to gnumake on www.gnu.org (online)">ftp://ftp.gnu.org/gnu/make</a></p>
 		  <p><b>Note</b>: Windows user can find an executable of gnu make under <a target="_blank" href="http://www.mingw.org/wiki/Getting_Started" title="link to the MinGW Getting Started wiki (online)">http://www.mingw.org/wiki/Getting_Started</a> (see the mingw32-make link under &quot;Manual Installation&quot;). Do not use the Cygwin make, because it does not
@@ -131,7 +131,7 @@
             <td colspan="2"><img class="line" src="images/sdk_line-1.gif"></td>
           </tr>
 		  <tr valign="top"> 
-          <td><b>zip tool (2.3 or higher)<b></td>
+          <td><b>zip tool (2.3 or higher)</b></td>
           <td class="content80">The zip tool is used to create UNO packages. zip is 
 		  a new requirement to make the SDK independent of a Java SDK.<br>
 		  If you do not have these already, you can download them from <a target="_blank" href="http://www.info-zip.org" title="link to www.ubfi-zip.org (online)">http://www.info-zip.org</a>. Note: The cygwin zip.exe does not work for the build under 
@@ -141,7 +141,7 @@
             <td colspan="2"><img class="line" src="images/sdk_line-1.gif"></td>
           </tr>
           <tr valign="top">
-          <td><b>cat and sed tools<b></td>
+          <td><b>cat and sed tools</b></td>
           <td class="content80">The cat and set tools are used to create some extensions.
           <p><b>Note for Windows users</b>: If you do not have these already, you can download them from
           <a target="_blank" href="http://sourceforge.net/projects/unxutils/files/latest/downloadg" title="link to UnxUtils (online)">http://sourceforge.net/projects/unxutils/files/latest/download</a>.</p>
@@ -150,7 +150,7 @@
 		  <tr valign="middle"> 
             <td colspan="2"><img class="line" src="images/sdk_line-1.gif"></td>
           </tr>
-          <td><b>Boost (<b>Unix only</b> and optional)<b></td>
+          <td><b>Boost (<b>Unix only</b> and optional)</b></td>
           <td class="content80">The boost library is used today on Unix systems as replacement for the stlport library. The stlport library is removed and replaced by either the compiler stl (on Windows) or the boost stl on all Unix based systems. We are planning to switch to the compiler stl completely as soon as possible. The boost headers/library are <b>optional</b> and for C++ development only if stl containers are used.
           <p><b>Download:</b> <a target="_blank" href="http://sourceforge.net/projects/boost/files/boost/1.48.0/boost_1_48_0.tar.bz2/download" title="link to boost version 1.48.0 (online)">http://sourceforge.net/projects/boost/files/boost/1.48.0/boost_1_48_0.tar.bz2/download</a>.</p>
           </td>
@@ -184,7 +184,7 @@
 		  Perl version under <a target="_blank" href="http://www.sunfreeware.com/" title="link to www.sunfreeware.com (online)">http://www.sunfreeware.com/</a> if 
 		  necessary. On Windows, the configure script uses Windows Script and 
 		  a JScipt. If you have problems with Windows Script, you can download a 
-		  newer version of <a href ="http://www.microsoft.com/downloads/details.aspx?FamilyId=C717D943-7E4B-4622-86EB-95A22B832CAA&displaylang=en" link"link to the download page for the Windows Script">Windows Script</a>.
+		  newer version of <a href="http://www.microsoft.com/downloads/details.aspx?FamilyId=C717D943-7E4B-4622-86EB-95A22B832CAA&amp;displaylang=en" title="link to the download page for the Windows Script">Windows Script</a>.
           </p>
           <p>On other versions of Windows, use the batch 
 		  file template <b>&lt;OO_SDK_HOME&gt;\setsdkenv_windows.template</b>, 
@@ -366,7 +366,7 @@
 		  </td>
 		  </tr>
           <tr>
-          <td colspan="2" class="cell80"Based OFFICE_HOME, the script
+          <td colspan="2" class="cell80">Based OFFICE_HOME, the script
           additionally creates symbolic links to the public dynamic libraries of
           the office UNO runtime in <i>$OO_SDK_HOME/(solsparc|solintel)/lib</i>, which are
           needed for linking.</td>

Modified: openoffice/branches/alg_writerframes/main/odk/docs/tools.html
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/odk/docs/tools.html?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/odk/docs/tools.html (original)
+++ openoffice/branches/alg_writerframes/main/odk/docs/tools.html Wed Mar 19 10:14:42 2014
@@ -237,7 +237,7 @@
           <tr>
             <td class="cell15"><code>--log-file &lt;file&gt;</code></td>
 			<td class="cell85">custom log file; default: 
-			<i>&lt;cache-dir&gt/log.txt</i>.</td>
+			<i>&lt;cache-dir&gt;/log.txt</i>.</td>
           </tr>
           <tr>
             <td class="cell15"><code>--shared</code></td>
@@ -246,7 +246,7 @@
 			running!</td>
           </tr>
           <tr>
-		    <td class="cell15"><code>--deployment-context &lt;context&gt</code>
+		    <td class="cell15"><code>--deployment-context &lt;context&gt;</code>
 			</td>
 			<td class="cell85">expert feature: explicit deployment context</td>
           </tr>
@@ -353,7 +353,6 @@
 		  <p>You can easily connect to a server started with the 
 		  <code>-u (url)</code> option by using this service, giving the same url 
 		  to resolve. The service provides you an instance from remote.</p>
-		  </p>
 		  </td>
 		</tr>  
       </table>

Modified: openoffice/branches/alg_writerframes/main/odk/examples/examples.html
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/odk/examples/examples.html?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/odk/examples/examples.html (original)
+++ openoffice/branches/alg_writerframes/main/odk/examples/examples.html Wed Mar 19 10:14:42 2014
@@ -296,7 +296,7 @@
 		  existing document.</td>
 		  </tr>		  
 		  <tr>
-		  <td class="cell20"><a href="java/DocumentHandling/"title="link to the source directory of the Java DocumentHandling examples">DocumentPrinter</a></td>
+		  <td class="cell20"><a href="java/DocumentHandling/" title="link to the source directory of the Java DocumentHandling examples">DocumentPrinter</a></td>
 		  <td class="cell80">The <i>DocumentPrinter</i> allows you to print the 
 		  favored pages of a specified document on your favored printer.</td>
 		  </tr>		  
@@ -424,7 +424,7 @@
 		  <td class="cell80">Description</td>
 		  </tr>
 		  <tr>
-		  <td class="cell20"><a href="cpp/DocumentLoader/"title="link to the source directory of the C++ DocumentLoader example">DocumentLoader</a></td>
+		  <td class="cell20"><a href="cpp/DocumentLoader/" title="link to the source directory of the C++ DocumentLoader example">DocumentLoader</a></td>
 		  <td class="cell80">This component works the same as the appropriate Java 
 		  example, but is implemented in C++.</td>
 		  </tr>		  

Modified: openoffice/branches/alg_writerframes/main/odk/index.html
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/odk/index.html?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/odk/index.html (original)
+++ openoffice/branches/alg_writerframes/main/odk/index.html Wed Mar 19 10:14:42 2014
@@ -185,9 +185,9 @@
 			    <td colspan="4"><img class="nothing8" src="docs/images/nada.gif"></td>
               </tr>
               <tr valign="middle"> 
-                <td class="content4"><img class="arrow" src="docs/images/arrow-1.gif"</td>
+                <td class="content4"><img class="arrow" src="docs/images/arrow-1.gif"></td>
                 <td width="5%"><a target="_blank" href="http://www.openoffice.org/" title="link to the Apache OpenOffice homepage (online)"><img class="appicon" src="docs/images/ooo-main-app_32.png"></a></td>
-                <td width="21%"><a target="_blank" href="http://www.openoffice.org/" title="link to the Apache OpenOffice homepage (online)">Apache OpenOffice&#153</a></td>
+                <td width="21%"><a target="_blank" href="http://www.openoffice.org/" title="link to the Apache OpenOffice homepage (online)">Apache OpenOffice&#153;</a></td>
                 <td class="content70">Open Source community project of office-productivity software.</td>
               </tr>
             </table>

Modified: openoffice/branches/alg_writerframes/main/odk/setsdkenv_unix.sh.in
URL: http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/odk/setsdkenv_unix.sh.in?rev=1579184&r1=1579183&r2=1579184&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/odk/setsdkenv_unix.sh.in (original)
+++ openoffice/branches/alg_writerframes/main/odk/setsdkenv_unix.sh.in Wed Mar 19 10:14:42 2014
@@ -151,7 +151,6 @@ case ${sdk_platform} in
 	platform='Solaris x86'
     fi
     comid=C52
-    pltfrm=sunpro
     soext=so
     exampleout=SOLARISexample.out
     stldebug=_debug
@@ -162,13 +161,12 @@ case ${sdk_platform} in
   darwin*)
     if [ -n "$OO_SDK_CPP_HOME" ]
     then
-	SDK_GXX_INCLUDE_PATH=`echo "#include <cstring>" | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
+	SDK_GXX_INCLUDE_PATH=`echo "#include <cstring>" | ${OO_SDK_CPP_HOME}/clang++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
 	export SDK_GXX_INCLUDE_PATH
     fi	
 
     directoryname=macosx
-    comid=gcc3
-    pltfrm=gcc
+    comid=s5abi
     soext=dylib
     exampleout=MACOSXexample.out
     platform=MacOSX
@@ -186,7 +184,6 @@ case ${sdk_platform} in
 
     directoryname=linux
     comid=gcc3
-    pltfrm=gcc
     soext=so
     exampleout=LINUXexample.out
     platform=Linux
@@ -204,7 +201,6 @@ case ${sdk_platform} in
 
     directoryname=freebsd
     comid=gcc3
-    pltfrm=gcc
     soext=so
     exampleout=FREEBSDexample.out
     platform=FreeBSD



Mime
View raw message