incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1354497 [6/33] - in /incubator/ooo/branches/alg/aw080: ./ ext_libraries/apr-util/ ext_libraries/apr/ ext_libraries/coinmp/ ext_libraries/serf/ ext_libraries/serf/prj/ ext_libraries/serf/win/ ext_sources/ main/ main/animations/source/animco...
Date Wed, 27 Jun 2012 13:45:34 GMT
Modified: incubator/ooo/branches/alg/aw080/main/framework/source/uiconfiguration/imagemanagerimpl.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/framework/source/uiconfiguration/imagemanagerimpl.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/framework/source/uiconfiguration/imagemanagerimpl.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/framework/source/uiconfiguration/imagemanagerimpl.hxx Wed Jun 27 13:44:09 2012
@@ -159,7 +159,7 @@ namespace framework
 
             typedef std::hash_map< rtl::OUString, 
                                    sal_Bool, 
-                                   OUStringHashCode,
+                                   rtl::OUStringHash,
                                    ::std::equal_to< ::rtl::OUString > > ImageNameMap;
             
             enum Layer

Modified: incubator/ooo/branches/alg/aw080/main/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx Wed Jun 27 13:44:09 2012
@@ -777,6 +777,9 @@ void SAL_CALL ModuleUIConfigurationManag
     ResetableGuard aGuard( m_aLock );
     Reference< XComponent > xModuleImageManager( m_xModuleImageManager );
     m_xModuleImageManager.clear();
+    Reference< XComponent > xCompMAM( m_xModuleAcceleratorManager, UNO_QUERY );
+    if ( xCompMAM.is() )
+    	xCompMAM->dispose();
     m_xModuleAcceleratorManager.clear();
     m_aUIElements[LAYER_USERDEFINED].clear();
     m_aUIElements[LAYER_DEFAULT].clear();

Modified: incubator/ooo/branches/alg/aw080/main/framework/source/uiconfiguration/uicategorydescription.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/framework/source/uiconfiguration/uicategorydescription.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/framework/source/uiconfiguration/uicategorydescription.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/framework/source/uiconfiguration/uicategorydescription.cxx Wed Jun 27 13:44:09 2012
@@ -136,7 +136,7 @@ class ConfigurationAccess_UICategory : /
     private:
         typedef ::std::hash_map< ::rtl::OUString,
                                  ::rtl::OUString,
-                                 OUStringHashCode,
+                                 rtl::OUStringHash,
                                  ::std::equal_to< ::rtl::OUString > > IdToInfoCache;
 
         sal_Bool initializeConfigAccess();

Modified: incubator/ooo/branches/alg/aw080/main/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx Wed Jun 27 13:44:09 2012
@@ -154,7 +154,7 @@ namespace framework
 
 		    struct UIElementType;
             friend struct UIElementType;
-		    typedef ::std::hash_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementDataHashMap;
+		    typedef ::std::hash_map< rtl::OUString, UIElementData, rtl::OUStringHash, ::std::equal_to< rtl::OUString > > UIElementDataHashMap;
             
             struct UIElementType
             {
@@ -174,7 +174,7 @@ namespace framework
 
             typedef ::std::vector< UIElementType > UIElementTypesVector;
             typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent > ConfigEventNotifyContainer;
-            typedef ::std::hash_map< rtl::OUString, UIElementInfo, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap;
+            typedef ::std::hash_map< rtl::OUString, UIElementInfo, rtl::OUStringHash, ::std::equal_to< rtl::OUString > > UIElementInfoHashMap;
 
             // private methods
             void            impl_Initialize();

Modified: incubator/ooo/branches/alg/aw080/main/framework/source/uiconfiguration/windowstateconfiguration.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/framework/source/uiconfiguration/windowstateconfiguration.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/framework/source/uiconfiguration/windowstateconfiguration.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/framework/source/uiconfiguration/windowstateconfiguration.cxx Wed Jun 27 13:44:09 2012
@@ -252,7 +252,7 @@ class ConfigurationAccess_WindowState : 
     private:
         typedef ::std::hash_map< ::rtl::OUString,
                                  WindowStateInfo,
-                                 OUStringHashCode,
+                                 rtl::OUStringHash,
                                  ::std::equal_to< ::rtl::OUString > > ResourceURLToInfoCache;
 
         rtl::OUString                     m_aConfigWindowAccess;

Modified: incubator/ooo/branches/alg/aw080/main/framework/source/uielement/menubarmanager.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/framework/source/uielement/menubarmanager.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/framework/source/uielement/menubarmanager.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/framework/source/uielement/menubarmanager.cxx Wed Jun 27 13:44:09 2012
@@ -422,6 +422,9 @@ void SAL_CALL MenuBarManager::dispose() 
         }
         m_xDocImageManager.clear();
         m_xModuleImageManager.clear();
+        Reference< XComponent > xCompGAM( m_xGlobalAcceleratorManager, UNO_QUERY );
+        if ( xCompGAM.is() )
+            xCompGAM->dispose();
         m_xGlobalAcceleratorManager.clear();
         m_xModuleAcceleratorManager.clear();
         m_xDocAcceleratorManager.clear();

Modified: incubator/ooo/branches/alg/aw080/main/framework/source/uielement/recentfilesmenucontroller.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/framework/source/uielement/recentfilesmenucontroller.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/framework/source/uielement/recentfilesmenucontroller.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/framework/source/uielement/recentfilesmenucontroller.cxx Wed Jun 27 13:44:09 2012
@@ -23,57 +23,36 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
-#include <uielement/recentfilesmenucontroller.hxx>
 
-//_________________________________________________________________________________________________________________
-//	my own includes
-//_________________________________________________________________________________________________________________
+#include <uielement/recentfilesmenucontroller.hxx>
 #include <threadhelp/resetableguard.hxx>
-#include "services.h"
-
-#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_
 #include <classes/resource.hrc>
-#endif
 #include <classes/fwkresid.hxx>
 
-//_________________________________________________________________________________________________________________
-//	interface includes
-//_________________________________________________________________________________________________________________
-#include <com/sun/star/awt/XDevice.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/awt/MenuItemStyle.hpp>
 #include <com/sun/star/util/XStringWidth.hpp>
-//_________________________________________________________________________________________________________________
-//	includes of other projects
-//_________________________________________________________________________________________________________________
 
-#ifndef _VCL_MENU_HXX_
-#include <vcl/menu.hxx>
-#endif
-#include <vcl/svapp.hxx>
-#include <vcl/i18nhelp.hxx>
-#include <tools/urlobj.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <unotools/historyoptions.hxx>
 #include <cppuhelper/implbase1.hxx>
-#include <osl/file.hxx>
-//#include <tools/solar.hrc>
 #include <dispatch/uieventloghelper.hxx>
+#include <osl/file.hxx>
+#include <tools/urlobj.hxx>
+#include <unotools/historyoptions.hxx>
+#include <vcl/menu.hxx>
+#include <vcl/svapp.hxx>
 #include <vos/mutex.hxx>
 
-//_________________________________________________________________________________________________________________
-//	Defines
-//_________________________________________________________________________________________________________________
-//
-
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::frame;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::util;
-using namespace com::sun::star::container;
+
+#define MAX_STR_WIDTH   46
+#define MAX_MENU_ITEMS  99
 
 static const char SFX_REFERER_USER[] = "private:user";
+static const char CMD_CLEAR_LIST[]   = ".uno:ClearRecentFileList";
+static const char CMD_PREFIX[]       = "vnd.sun.star.popup:RecentFileList?entry=";
+static const char MENU_SHOTCUT[]     = "~N: ";
 
 namespace framework
 {
@@ -113,8 +92,8 @@ RecentFilesMenuController::~RecentFilesM
 // private function
 void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu )
 {
-    VCLXPopupMenu*                                     pPopupMenu        = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu );
-    PopupMenu*                                         pVCLPopupMenu     = 0;
+    VCLXPopupMenu* pPopupMenu    = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu );
+    PopupMenu*     pVCLPopupMenu = 0;
 
     vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
 
@@ -127,10 +106,7 @@ void RecentFilesMenuController::fillPopu
 	    Sequence< Sequence< PropertyValue > > aHistoryList = SvtHistoryOptions().GetList( ePICKLIST );
 	    Reference< XStringWidth > xStringLength( new RecentFilesStringLength );
 
-	    int nPickListMenuItems = ( aHistoryList.getLength() > 99 ) ? 99 : aHistoryList.getLength();
-
-        // New vnd.sun.star.popup: command URL to support direct dispatches
-        const rtl::OUString aCmdPrefix( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.popup:RecentFileList?entry=" ));
+        int nPickListMenuItems = ( aHistoryList.getLength() > MAX_MENU_ITEMS ) ? MAX_MENU_ITEMS : aHistoryList.getLength();
 
         m_aRecentFilesItems.clear();
         if (( nPickListMenuItems > 0 ) && !m_bDisabled )
@@ -160,32 +136,32 @@ void RecentFilesMenuController::fillPopu
 
 	    if ( !m_aRecentFilesItems.empty() )
 	    {
-		    URL aTargetURL;
-
             const sal_uInt32 nCount = m_aRecentFilesItems.size();
             for ( sal_uInt32 i = 0; i < nCount; i++ )
 			{
-				char menuShortCut[5] = "~n: ";
-
-				::rtl::OUString aMenuShortCut;
+                rtl::OUStringBuffer aMenuShortCut;
 				if ( i <= 9 )
 				{
 					if ( i == 9 )
-						aMenuShortCut = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "1~0: " ));
+                        aMenuShortCut.appendAscii( RTL_CONSTASCII_STRINGPARAM( "1~0: " ) );
 					else
 					{
-						menuShortCut[1] = (char)( '1' + i );
-						aMenuShortCut = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( menuShortCut ));
+                        aMenuShortCut.appendAscii( RTL_CONSTASCII_STRINGPARAM( MENU_SHOTCUT ) );
+                        aMenuShortCut.setCharAt( 1, sal_Unicode( i + '1' ) );
 					}
 				}
 				else
 				{
-					aMenuShortCut = rtl::OUString::valueOf((sal_Int32)( i + 1 ));
-					aMenuShortCut += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": " ));
+                    aMenuShortCut.append( sal_Int32( i + 1 ) );
+                    aMenuShortCut.appendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
 				}
 
+                rtl::OUStringBuffer aStrBuffer;
+                aStrBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( CMD_PREFIX ) );
+                aStrBuffer.append( sal_Int32( i ) );
+                rtl::OUString  aURLString( aStrBuffer.makeStringAndClear() );
+
 				// Abbreviate URL
-                rtl::OUString	aURLString( aCmdPrefix + rtl::OUString::valueOf( sal_Int32( i )));
 				rtl::OUString	aTipHelpText;
 				rtl::OUString	aMenuTitle;
 				INetURLObject	aURL( m_aRecentFilesItems[i].aURL );
@@ -194,39 +170,42 @@ void RecentFilesMenuController::fillPopu
 				{
 					// Do handle file URL differently => convert it to a system
 					// path and abbreviate it with a special function:
-					String aFileSystemPath( aURL.getFSysPath( INetURLObject::FSYS_DETECT ) );
+                    rtl::OUString aSystemPath( aURL.getFSysPath( INetURLObject::FSYS_DETECT ) );
+                    aTipHelpText = aSystemPath;
 
-					::rtl::OUString	aSystemPath( aFileSystemPath );
 					::rtl::OUString	aCompactedSystemPath;
-
-					aTipHelpText = aSystemPath;
-					oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, NULL );
-					if ( !nError )
-						aMenuTitle = String( aCompactedSystemPath );
+                    if ( osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, MAX_STR_WIDTH, NULL ) == osl_File_E_None )
+                        aMenuTitle = aCompactedSystemPath;
 					else
 						aMenuTitle = aSystemPath;
 				}
 				else
 				{
 					// Use INetURLObject to abbreviate all other URLs
-					String	aShortURL;
-					aShortURL = aURL.getAbbreviated( xStringLength, 46, INetURLObject::DECODE_UNAMBIGUOUS );
-					aMenuTitle += aShortURL;
+                    aMenuTitle   = aURL.getAbbreviated( xStringLength, MAX_STR_WIDTH, INetURLObject::DECODE_UNAMBIGUOUS );
 					aTipHelpText = aURLString;
 				}
 
-				::rtl::OUString aTitle( aMenuShortCut + aMenuTitle );
+                aMenuShortCut.append( aMenuTitle );
 
-				pVCLPopupMenu->InsertItem( sal_uInt16( i+1 ), aTitle );
+                pVCLPopupMenu->InsertItem( sal_uInt16( i+1 ), aMenuShortCut.makeStringAndClear() );
 				pVCLPopupMenu->SetTipHelpText( sal_uInt16( i+1 ), aTipHelpText );
                 pVCLPopupMenu->SetItemCommand( sal_uInt16( i+1 ), aURLString );
 			}
+
+            pVCLPopupMenu->InsertSeparator();
+            // Clear List menu entry
+            pVCLPopupMenu->InsertItem( sal_uInt16( nCount + 1 ),
+                                       String( FwkResId( STR_CLEAR_RECENT_FILES ) ) );
+            pVCLPopupMenu->SetItemCommand( sal_uInt16( nCount + 1 ),
+                                           rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_CLEAR_LIST ) ) );
+            pVCLPopupMenu->SetHelpText( sal_uInt16( nCount + 1 ),
+                                        String( FwkResId( STR_CLEAR_RECENT_FILES_HELP ) ) );
 		}
         else
         {
             // No recent documents => insert "no document" string
-            String aNoDocumentStr = String( FwkResId( STR_NODOCUMENT ));
-            pVCLPopupMenu->InsertItem( 1, aNoDocumentStr );
+            pVCLPopupMenu->InsertItem( 1, String( FwkResId( STR_NODOCUMENT ) ) );
             pVCLPopupMenu->EnableItem( 1, sal_False );
         }
 	}
@@ -236,20 +215,15 @@ void RecentFilesMenuController::executeE
 {
     static int NUM_OF_PICKLIST_ARGS = 3;
 
-    Reference< css::awt::XPopupMenu > xPopupMenu;
     Reference< XDispatch >            xDispatch;
     Reference< XDispatchProvider >    xDispatchProvider;
-    Reference< XMultiServiceFactory > xServiceManager;
+    css::util::URL                    aTargetURL;
+    Sequence< PropertyValue >         aArgsList;
 
     osl::ClearableMutexGuard aLock( m_aMutex );
-    xPopupMenu          = m_xPopupMenu;
-    xDispatchProvider   = Reference< XDispatchProvider >( m_xFrame, UNO_QUERY );
-    xServiceManager     = m_xServiceManager;
+    xDispatchProvider = Reference< XDispatchProvider >( m_xFrame, UNO_QUERY );
     aLock.clear();
 
-    css::util::URL            aTargetURL;
-    Sequence< PropertyValue > aArgsList;
-
     if (( nIndex >= 0 ) &&
         ( nIndex < sal::static_int_cast<sal_Int32>( m_aRecentFilesItems.size() )))
     {
@@ -260,7 +234,7 @@ void RecentFilesMenuController::executeE
 
         aArgsList.realloc( NUM_OF_PICKLIST_ARGS );
         aArgsList[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer" ));
-        aArgsList[0].Value = makeAny( ::rtl::OUString::createFromAscii( SFX_REFERER_USER ));
+        aArgsList[0].Value = makeAny( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SFX_REFERER_USER )));
 
         // documents in the picklist will never be opened as templates
         aArgsList[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AsTemplate" ));
@@ -285,7 +259,7 @@ void RecentFilesMenuController::executeE
         aArgsList[NUM_OF_PICKLIST_ARGS-1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
         aArgsList[NUM_OF_PICKLIST_ARGS-1].Value <<= aFilter;
 
-        xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString::createFromAscii("_default"), 0 );
+        xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ), 0 );
     }
 
     if ( xDispatch.is() )
@@ -297,8 +271,10 @@ void RecentFilesMenuController::executeE
         pLoadRecentFile->xDispatch  = xDispatch;
         pLoadRecentFile->aTargetURL = aTargetURL;
         pLoadRecentFile->aArgSeq    = aArgsList;
+
         if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-            UiEventLogHelper(::rtl::OUString::createFromAscii("RecentFilesMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgsList);
+            UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RecentFilesMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgsList);
+
         Application::PostUserEvent( STATIC_LINK(0, RecentFilesMenuController, ExecuteHdl_Impl), pLoadRecentFile );
     }
 }
@@ -327,24 +303,23 @@ void SAL_CALL RecentFilesMenuController:
 
 void SAL_CALL RecentFilesMenuController::select( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
 {
-    Reference< css::awt::XPopupMenu > xPopupMenu;
-    Reference< XDispatch >            xDispatch;
-    Reference< XDispatchProvider >    xDispatchProvider;
-    Reference< XMultiServiceFactory > xServiceManager;
+    Reference< css::awt::XPopupMenu >    xPopupMenu;
+    Reference< css::awt::XMenuExtended > xMenuExt;
 
     osl::ClearableMutexGuard aLock( m_aMutex );
     xPopupMenu          = m_xPopupMenu;
-    xDispatchProvider   = Reference< XDispatchProvider >( m_xFrame, UNO_QUERY );
-    xServiceManager     = m_xServiceManager;
+    xMenuExt            = Reference< css::awt::XMenuExtended >( m_xPopupMenu, UNO_QUERY );
     aLock.clear();
 
-    css::util::URL aTargetURL;
-    Sequence< PropertyValue > aArgsList;
-
-    if ( xPopupMenu.is() && xDispatchProvider.is() )
+    if ( xMenuExt.is() )
     {
-        VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( xPopupMenu );
-        if ( pPopupMenu )
+        const rtl::OUString aCommand( xMenuExt->getCommand( rEvent.MenuId ) );
+        OSL_TRACE( "RecentFilesMenuController::select() - Command : %s",
+                   rtl::OUStringToOString( aCommand, RTL_TEXTENCODING_UTF8 ).getStr() );
+
+        if ( aCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( CMD_CLEAR_LIST ) ) )
+            SvtHistoryOptions().Clear( ePICKLIST );
+        else
             executeEntry( rEvent.MenuId-1 );
     }
 }
@@ -362,27 +337,6 @@ void RecentFilesMenuController::impl_set
         fillPopupMenu( m_xPopupMenu );
 }
 
-void SAL_CALL RecentFilesMenuController::updatePopupMenu() throw (RuntimeException)
-{
-    osl::ClearableMutexGuard aLock( m_aMutex );
-
-    throwIfDisposed();
-
-    Reference< XStatusListener > xStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY );
-    Reference< XDispatch > xDispatch( m_xDispatch );
-    com::sun::star::util::URL aTargetURL;
-    aTargetURL.Complete = m_aCommandURL;
-    m_xURLTransformer->parseStrict( aTargetURL );
-    aLock.clear();
-
-    // Add/remove status listener to get a status update once
-    if ( xDispatch.is() )
-    {
-        xDispatch->addStatusListener( xStatusListener, aTargetURL );
-        xDispatch->removeStatusListener( xStatusListener, aTargetURL );
-    }
-}
-
 // XDispatchProvider
 Reference< XDispatch > SAL_CALL RecentFilesMenuController::queryDispatch(
     const URL& aURL,
@@ -436,26 +390,6 @@ throw( RuntimeException )
     }
 }
 
-void SAL_CALL RecentFilesMenuController::addStatusListener(
-    const Reference< XStatusListener >& xControl,
-    const URL& aURL )
-throw( RuntimeException )
-{
-    osl::MutexGuard aLock( m_aMutex );
-
-	throwIfDisposed();
-
-	svt::PopupMenuControllerBase::addStatusListener( xControl, aURL );
-}
-
-void SAL_CALL RecentFilesMenuController::removeStatusListener(
-    const Reference< XStatusListener >& xControl,
-    const URL& aURL )
-throw( RuntimeException )
-{
-	svt::PopupMenuControllerBase::removeStatusListener( xControl, aURL );
-}
-
 IMPL_STATIC_LINK_NOINSTANCE( RecentFilesMenuController, ExecuteHdl_Impl, LoadRecentFile*, pLoadRecentFile )
 {
     try

Modified: incubator/ooo/branches/alg/aw080/main/framework/source/uielement/toolbarmanager.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/framework/source/uielement/toolbarmanager.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/framework/source/uielement/toolbarmanager.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/framework/source/uielement/toolbarmanager.cxx Wed Jun 27 13:44:09 2012
@@ -706,6 +706,9 @@ void SAL_CALL ToolBarManager::dispose() 
 
         m_xFrame.clear();
         m_xServiceManager.clear();
+        Reference< XComponent > xCompGAM( m_xGlobalAcceleratorManager, UNO_QUERY );
+        if ( xCompGAM.is() )
+            xCompGAM->dispose();
         m_xGlobalAcceleratorManager.clear();
         m_xModuleAcceleratorManager.clear();
         m_xDocAcceleratorManager.clear();

Modified: incubator/ooo/branches/alg/aw080/main/framework/source/uielement/toolbarsmenucontroller.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/framework/source/uielement/toolbarsmenucontroller.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/framework/source/uielement/toolbarsmenucontroller.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/framework/source/uielement/toolbarsmenucontroller.cxx Wed Jun 27 13:44:09 2012
@@ -108,7 +108,7 @@ static const char STATIC_INTERNAL_CMD_PA
 namespace framework
 {
 
-typedef std::hash_map< rtl::OUString, rtl::OUString, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ToolbarHashMap;
+typedef std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ToolbarHashMap;
 
 struct ToolBarEntry
 {

Modified: incubator/ooo/branches/alg/aw080/main/framework/source/uielement/uicommanddescription.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/framework/source/uielement/uicommanddescription.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/framework/source/uielement/uicommanddescription.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/framework/source/uielement/uicommanddescription.cxx Wed Jun 27 13:44:09 2012
@@ -171,7 +171,7 @@ class ConfigurationAccess_UICommand : //
     private:
         typedef ::std::hash_map< ::rtl::OUString,
                                  CmdToInfoMap,
-                                 OUStringHashCode,
+                                 rtl::OUStringHash,
                                  ::std::equal_to< ::rtl::OUString > > CommandToInfoCache;
 
         sal_Bool initializeConfigAccess();

Modified: incubator/ooo/branches/alg/aw080/main/framework/uiconfig/startmodule/toolbar/standardbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/framework/uiconfig/startmodule/toolbar/standardbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/framework/uiconfig/startmodule/toolbar/standardbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/framework/uiconfig/startmodule/toolbar/standardbar.xml Wed Jun 27 13:44:09 2012
@@ -24,9 +24,9 @@
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
  <toolbar:toolbaritem xlink:href=".uno:OpenUrl" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:helpid="helpid:5537" toolbar:style="dropdown"/>
- <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:helpid="helpid:5500" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:helpid="helpid:5501"/>
+ <toolbar:toolbaritem xlink:href=".uno:AddDirect" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Open"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:HelpIndex"/>
  <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false"/>

Modified: incubator/ooo/branches/alg/aw080/main/helpcontent2/source/text/scalc/01/04060116.xhp
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/helpcontent2/source/text/scalc/01/04060116.xhp?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/helpcontent2/source/text/scalc/01/04060116.xhp (original)
+++ incubator/ooo/branches/alg/aw080/main/helpcontent2/source/text/scalc/01/04060116.xhp Wed Jun 27 13:44:09 2012
@@ -46,8 +46,6 @@
       </section>
 <sort>
 <section id="imabs">
-         <paragraph xml-lang="en-US" id="par_id3145074" role="paragraph" l10n="E" oldref="166"
-                    localize="false"/>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154959"><bookmark_value>IMABS function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_IMABS" id="bm_id3154541" localize="false"/>
@@ -123,7 +121,67 @@
          <paragraph xml-lang="en-US" id="hd_id3152980" role="heading" level="3" l10n="U"
                     oldref="78">Example</paragraph>
          <paragraph xml-lang="en-US" id="par_id3157901" role="paragraph" l10n="U" oldref="79">
-            <item type="input">=IMCOS("3+4j") </item>returns -27.03-3.85i (rounded).</paragraph>
+            <item type="input">=IMCOS("3+4j") </item>returns -27.03-3.85j (rounded).</paragraph>
+      </section>
+      <section id="imcosh">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3149148"><bookmark_value>IMCOSH function</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_IMCOS" id="bm_id3150380" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149148" role="heading" level="2" oldref="">IMCOSH</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149727" role="paragraph" l10n="New" oldref=""><ahelp hid="HID_AAI_FUNC_IMCOSH">The result is the hyberbolic cosine of a complex number.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3159118" role="heading" level="3" l10n="New"
+                    oldref="">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147417" role="code" l10n="New" oldref="">IMCOSH("ComplexNumber")</paragraph>
+         <embed href="text/scalc/01/04060116.xhp#complex"/>
+         <paragraph xml-lang="en-US" id="hd_id3152982" role="heading" level="3" l10n="New"
+                    oldref="">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3157903" role="paragraph" l10n="New" oldref="">
+            <item type="input">=IMCOSH("3+4j") </item>returns -6.58066304-7.58155274j (rounded).</paragraph>
+      </section>
+      <section id="imcot">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3149149"><bookmark_value>IMCOT function</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_IMCOT" id="bm_id3150381" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149149" role="heading" level="2" oldref="">IMCOT</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149728" role="paragraph" l10n="New" oldref=""><ahelp hid="HID_AAI_FUNC_IMCOT">The result is the cotangent of a complex number.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3159119" role="heading" level="3" l10n="New"
+                    oldref="">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147418" role="code" l10n="New" oldref="">IMCOT("ComplexNumber")</paragraph>
+         <embed href="text/scalc/01/04060116.xhp#complex"/>
+         <paragraph xml-lang="en-US" id="hd_id3152983" role="heading" level="3" l10n="New"
+                    oldref="">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3157904" role="paragraph" l10n="New" oldref="">
+            <item type="input">=IMCOT("3+4j") </item>returns -0.00018759-1.00064439j (rounded).</paragraph>
+      </section>
+      <section id="imcsc">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3149147"><bookmark_value>IMCSC function</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_IMCSC" id="bm_id3150379" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149147" role="heading" level="2" oldref="">IMCSC</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149726" role="paragraph" l10n="New" oldref=""><ahelp hid="HID_AAI_FUNC_IMCSC">The result is the cosecant of a complex number.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3159117" role="heading" level="3" l10n="New"
+                    oldref="">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147416" role="code" l10n="New" oldref="">IMCSC("ComplexNumber")</paragraph>
+         <embed href="text/scalc/01/04060116.xhp#complex"/>
+         <paragraph xml-lang="en-US" id="hd_id3152981" role="heading" level="3" l10n="New"
+                    oldref="">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3157902" role="paragraph" l10n="New" oldref="">
+            <item type="input">=IMCSC("3+4j") </item>returns 0.00517447+0.03627589j (rounded).</paragraph>
+      </section>
+      <section id="imcsch">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3149150"><bookmark_value>IMCSCH function</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_IMCSCH" id="bm_id3150382" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149150" role="heading" level="2" oldref="">IMCSCH</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149729" role="paragraph" l10n="New" oldref=""><ahelp hid="HID_AAI_FUNC_IMCSCH">The result is the hyperbolic cosecant of a complex number.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3159120" role="heading" level="3" l10n="New"
+                    oldref="">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147419" role="code" l10n="New" oldref="">IMCSCH("ComplexNumber")</paragraph>
+         <embed href="text/scalc/01/04060116.xhp#complex"/>
+         <paragraph xml-lang="en-US" id="hd_id3152984" role="heading" level="3" l10n="New"
+                    oldref="">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3157905" role="paragraph" l10n="New" oldref="">
+            <item type="input">=IMCSCH("3+4j") </item>returns -1.30632891+1.51251400j (rounded). </paragraph>
       </section>
       <section id="imdiv">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150024"><bookmark_value>IMDIV function</bookmark_value>
@@ -246,6 +304,36 @@
          <paragraph xml-lang="en-US" id="par_id3155986" role="paragraph" l10n="U" oldref="135">
             <item type="input">=IMREAL("1+3j")</item> returns 1.</paragraph>
       </section>
+      <section id="imsec">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3148430"><bookmark_value>IMSEC function</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_IMSEC" id="bm_id3153715" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148430" role="heading" level="2" oldref="">IMSEC</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152590" role="paragraph" l10n="New" oldref=""><ahelp hid="HID_AAI_FUNC_IMSEC">The result is the secant of a complex number.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149821" role="heading" level="3" l10n="New"
+                    oldref="">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150386" role="code" l10n="New" oldref="">IMSEC("ComplexNumber")</paragraph>
+         <embed href="text/scalc/01/04060116.xhp#complex"/>
+         <paragraph xml-lang="en-US" id="hd_id3150612" role="heading" level="3" l10n="New"
+                    oldref="">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154309" role="paragraph" l10n="New" oldref="">
+            <item type="input">=IMSEC("3+4j")</item> returns -0.03625350+0.00516434j (rounded).</paragraph>
+      </section>
+      <section id="imsech">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3148432"><bookmark_value>IMSECH function</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_IMSECH" id="bm_id3153717" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148432" role="heading" level="2" oldref="">IMSECH</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152592" role="paragraph" l10n="New" oldref=""><ahelp hid="HID_AAI_FUNC_IMSECH">The result is the hyperbolic secant of a complex number.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149823" role="heading" level="3" l10n="New"
+                    oldref="">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150388" role="code" l10n="New" oldref="">IMSECH("ComplexNumber")</paragraph>
+         <embed href="text/scalc/01/04060116.xhp#complex"/>
+         <paragraph xml-lang="en-US" id="hd_id3150614" role="heading" level="3" l10n="New"
+                    oldref="">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154311" role="paragraph" l10n="New" oldref="">
+            <item type="input">=IMSECH("3+4j")</item> returns -1.30823089+1.51467895j (rounded).</paragraph>
+      </section>
       <section id="imsin">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3148431"><bookmark_value>IMSIN function</bookmark_value>
 </bookmark>
@@ -261,6 +349,21 @@
          <paragraph xml-lang="en-US" id="par_id3154310" role="paragraph" l10n="U" oldref="142">
             <item type="input">=IMSIN("3+4j")</item> returns 3.85+27.02j (rounded).</paragraph>
       </section>
+      <section id="imsinh">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3148433"><bookmark_value>IMSINH function</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_IMSINH" id="bm_id3153718" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148433" role="heading" level="2" oldref="">IMSINH</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3152593" role="paragraph" l10n="New" oldref=""><ahelp hid="HID_AAI_FUNC_IMSINH">The result is the hyperbolic sine of a complex number.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3149824" role="heading" level="3" l10n="New"
+                    oldref="">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150389" role="code" l10n="New" oldref="">IMSINH("ComplexNumber")</paragraph>
+         <embed href="text/scalc/01/04060116.xhp#complex"/>
+         <paragraph xml-lang="en-US" id="hd_id3150615" role="heading" level="3" l10n="New"
+                    oldref="">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154312" role="paragraph" l10n="New" oldref="">
+            <item type="input">=IMSINH("3+4j")</item> returns -6.54812004-7.61923172j (rounded).</paragraph>
+      </section>
       <section id="imsub">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3163826"><bookmark_value>IMSUB function</bookmark_value>
 </bookmark>
@@ -306,6 +409,21 @@
          <paragraph xml-lang="en-US" id="par_id3152807" role="paragraph" l10n="U" oldref="173">
             <item type="input">=IMSQRT("3+4i")</item> returns 2+1i.</paragraph>
       </section>
+      <section id="imtan">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3149151"><bookmark_value>IMTAN function</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_IMTAN" id="bm_id3150383" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149151" role="heading" level="2" oldref="">IMTAN</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3149730" role="paragraph" l10n="New" oldref=""><ahelp hid="HID_AAI_FUNC_IMTAN">The result is the tangent of a complex number.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="hd_id3159121" role="heading" level="3" l10n="New"
+                    oldref="">Syntax</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147420" role="code" l10n="New" oldref="">IMTAN("ComplexNumber")</paragraph>
+         <embed href="text/scalc/01/04060116.xhp#complex"/>
+         <paragraph xml-lang="en-US" id="hd_id3152985" role="heading" level="3" l10n="New"
+                    oldref="">Example</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3157906" role="paragraph" l10n="New" oldref="">
+            <item type="input">=IMTAN("3+4j") </item>returns -0.00018734+0.99935599j (rounded).</paragraph>
+      </section>
       <section id="complexfunc">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154054"><bookmark_value>COMPLEX function</bookmark_value>
 </bookmark>

Modified: incubator/ooo/branches/alg/aw080/main/helpcontent2/source/text/swriter/guide/words_count.xhp
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/helpcontent2/source/text/swriter/guide/words_count.xhp?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/helpcontent2/source/text/swriter/guide/words_count.xhp (original)
+++ incubator/ooo/branches/alg/aw080/main/helpcontent2/source/text/swriter/guide/words_count.xhp Wed Jun 27 13:44:09 2012
@@ -52,7 +52,7 @@
          </listitem>
       </list>
       <section id="how">
-         <paragraph xml-lang="en-US" id="hd_id1116200901133957" role="heading" level="2" l10n="NEW">How does $PRODUCTNAME count words?</paragraph>
+         <paragraph xml-lang="en-US" id="hd_id1116200901133957" role="heading" level="2" l10n="NEW">How does %PRODUCTNAME count words?</paragraph>
          <paragraph xml-lang="en-US" id="par_id1116200901133998" role="paragraph" l10n="NEW">In general, every string of characters between two spaces is a word. Tabs, line breaks, and paragraph breaks are word limits, too.</paragraph>
          <paragraph xml-lang="en-US" id="par_id1116200901133985" role="paragraph" l10n="NEW">Words with dashes or always visible hyphens, as in plug-in, add-on, user/config, are counted as one word each.</paragraph>
          <paragraph xml-lang="en-US" id="par_id111620090113399" role="paragraph" l10n="NEW">The words can be a mix of letters, numbers, and special characters. So the following text counts as four words: abc123 1.23 "$" http://www.example.com.</paragraph>

Modified: incubator/ooo/branches/alg/aw080/main/i18npool/source/nativenumber/nativenumbersupplier.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/i18npool/source/nativenumber/nativenumbersupplier.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/i18npool/source/nativenumber/nativenumbersupplier.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/i18npool/source/nativenumber/nativenumbersupplier.cxx Wed Jun 27 13:44:09 2012
@@ -93,7 +93,7 @@ OUString SAL_CALL AsciiToNativeChar( con
             if (useOffset)
                 offset[i] = startPos + i;
         }
-        return OUString(newStr->buffer, nCount);
+        return OUString( newStr, SAL_NO_ACQUIRE);
 }
 
 sal_Bool SAL_CALL AsciiToNative_numberMaker(const sal_Unicode *str, sal_Int32 begin, sal_Int32 len,

Modified: incubator/ooo/branches/alg/aw080/main/i18npool/source/textconversion/textconversion_zh.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/i18npool/source/textconversion/textconversion_zh.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/i18npool/source/textconversion/textconversion_zh.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/i18npool/source/textconversion/textconversion_zh.cxx Wed Jun 27 13:44:09 2012
@@ -84,7 +84,7 @@ TextConversion_zh::getCharConversion(con
     for (sal_Int32 i = 0; i < nLength; i++)
         newStr->buffer[i] = 
             getOneCharConversion(aText[nStartPos+i], Data, Index);
-    return OUString( newStr->buffer, nLength);
+    return OUString( newStr, SAL_NO_ACQUIRE);
 }
 
 OUString SAL_CALL 

Modified: incubator/ooo/branches/alg/aw080/main/instsetoo_native/util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/instsetoo_native/util/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/instsetoo_native/util/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/instsetoo_native/util/makefile.mk Wed Jun 27 13:44:09 2012
@@ -104,11 +104,14 @@ openoffice_$(defaultlangiso) : $$@.archi
 
 .IF "$(VERBOSE)"=="TRUE"
 VERBOSESWITCH=-verbose
-.ENDIF
-.IF "$(VERBOSE)"=="FALSE"
+.ELIF "$(VERBOSE)"=="FALSE"
 VERBOSESWITCH=-quiet
 .ENDIF
 
+.IF "$(VERBOSE_INSTALLER)"=="TRUE"
+VERBOSESWITCH+=-log
+.ENDIF
+
 # New target to prepare a source release
 SRC_RELEASE_OUT_DIR=$(shell cd $(OUT) && pwd)$/AOO_SRC_Release
 
@@ -267,14 +270,14 @@ hack_msitemplates .PHONY:
 	-$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)$/Binary
 	-$(MKDIRHIER) $(MSIURETEMPLATEDIR)$/Binary
 	-$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)$/Binary
-	$(GNUCOPY) -u $(MSIOFFICETEMPLATESOURCE)$/*.* $(MSIOFFICETEMPLATEDIR)
-	$(GNUCOPY) -u $(MSILANGPACKTEMPLATESOURCE)$/*.* $(MSILANGPACKTEMPLATEDIR)
-	$(GNUCOPY) -u $(MSIURETEMPLATESOURCE)$/*.* $(MSIURETEMPLATEDIR)
-	$(GNUCOPY) -u $(MSISDKOOTEMPLATESOURCE)$/*.* $(MSISDKOOTEMPLATEDIR)
-	$(GNUCOPY) -u $(MSIOFFICETEMPLATESOURCE)$/Binary$/*.* $(MSIOFFICETEMPLATEDIR)$/Binary
-	$(GNUCOPY) -u $(MSILANGPACKTEMPLATESOURCE)$/Binary$/*.* $(MSILANGPACKTEMPLATEDIR)$/Binary
-	$(GNUCOPY) -u $(MSIURETEMPLATESOURCE)$/Binary$/*.* $(MSIURETEMPLATEDIR)$/Binary
-	$(GNUCOPY) -u $(MSISDKOOTEMPLATESOURCE)$/Binary$/*.* $(MSISDKOOTEMPLATEDIR)$/Binary
+	$(GNUCOPY) $(MSIOFFICETEMPLATESOURCE)$/*.* $(MSIOFFICETEMPLATEDIR)
+	$(GNUCOPY) $(MSILANGPACKTEMPLATESOURCE)$/*.* $(MSILANGPACKTEMPLATEDIR)
+	$(GNUCOPY) $(MSIURETEMPLATESOURCE)$/*.* $(MSIURETEMPLATEDIR)
+	$(GNUCOPY) $(MSISDKOOTEMPLATESOURCE)$/*.* $(MSISDKOOTEMPLATEDIR)
+	$(GNUCOPY) $(MSIOFFICETEMPLATESOURCE)$/Binary$/*.* $(MSIOFFICETEMPLATEDIR)$/Binary
+	$(GNUCOPY) $(MSILANGPACKTEMPLATESOURCE)$/Binary$/*.* $(MSILANGPACKTEMPLATEDIR)$/Binary
+	$(GNUCOPY) $(MSIURETEMPLATESOURCE)$/Binary$/*.* $(MSIURETEMPLATEDIR)$/Binary
+	$(GNUCOPY) $(MSISDKOOTEMPLATESOURCE)$/Binary$/*.* $(MSISDKOOTEMPLATEDIR)$/Binary
 	$(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
 	$(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
 	$(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp

Modified: incubator/ooo/branches/alg/aw080/main/instsetoo_native/util/openoffice.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/instsetoo_native/util/openoffice.lst?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/instsetoo_native/util/openoffice.lst (original)
+++ incubator/ooo/branches/alg/aw080/main/instsetoo_native/util/openoffice.lst Wed Jun 27 13:44:09 2012
@@ -4,15 +4,15 @@ Globals
 	{
 		variables
 		{
-			OOOBASEVERSION 3.4
-			OOOPACKAGEVERSION 3.4.0
-			UREPACKAGEVERSION 3.4.0
+			OOOBASEVERSION 3.5
+			OOOPACKAGEVERSION 3.5.0
+			UREPACKAGEVERSION 3.5.0
 			URELAYERVERSION 1
 			BASISROOTNAME OpenOffice.org
 			UNIXBASISROOTNAME openoffice.org
-			SERVICETAG_PRODUCTNAME OpenOffice.org 3.4
-			SERVICETAG_PRODUCTVERSION 3.4
-			SERVICETAG_PARENTNAME OpenOffice.org 3.4 
+			SERVICETAG_PRODUCTNAME OpenOffice.org 3.5
+			SERVICETAG_PRODUCTVERSION 3.5
+			SERVICETAG_PARENTNAME OpenOffice.org 3.5 
 			SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
 			SERVICETAG_URN urn:uuid:500061aa-5666-11e0-8e00-080020a9ed93
 			HIDELICENSEDIALOG 1
@@ -54,7 +54,7 @@ OpenOffice
 		variables
 		{
 			PRODUCTNAME OpenOffice.org
-			PRODUCTVERSION 3.4
+			PRODUCTVERSION 3.5
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
 			SHORT_PRODUCTEXTENSION 
@@ -62,8 +62,8 @@ OpenOffice
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
 			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.4.0
-			BASEPRODUCTVERSION 3.4
+			ABOUTBOXPRODUCTVERSION 3.5.0
+			BASEPRODUCTVERSION 3.5
             PCPFILENAME openoffice.pcp
 			UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
@@ -74,7 +74,7 @@ OpenOffice
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.4.0
+			PACKAGEVERSION 3.5.0
 			PACKAGEREVISION {milestone}
 			LICENSENAME ALv2
 			GLOBALFILEGID gid_File_Lib_Vcl
@@ -118,7 +118,7 @@ OpenOffice_wJRE
 		variables
 		{
 			PRODUCTNAME OpenOffice.org
-			PRODUCTVERSION 3.4
+			PRODUCTVERSION 3.5
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
 			SHORT_PRODUCTEXTENSION 
@@ -126,8 +126,8 @@ OpenOffice_wJRE
 			POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
 			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.4.0
-			BASEPRODUCTVERSION 3.4
+			ABOUTBOXPRODUCTVERSION 3.5.0
+			BASEPRODUCTVERSION 3.5
 			UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update
 			ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
@@ -137,7 +137,7 @@ OpenOffice_wJRE
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.4.0
+			PACKAGEVERSION 3.5.0
 			PACKAGEREVISION {milestone}
 			LICENSENAME ALv2
 			WITHJREPRODUCT 1
@@ -182,7 +182,7 @@ OpenOffice_Dev
 		variables
 		{
 			PRODUCTNAME OOo-dev
-			PRODUCTVERSION 3.4
+			PRODUCTVERSION 3.5
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
 			SHORT_PRODUCTEXTENSION 
@@ -192,8 +192,8 @@ OpenOffice_Dev
 			POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
 			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.4.0
-			BASEPRODUCTVERSION 3.4
+			ABOUTBOXPRODUCTVERSION 3.5.0
+			BASEPRODUCTVERSION 3.5
 			DEVELOPMENTPRODUCT 1
 			BASISPACKAGEPREFIX ooobasis-dev
 			UREPACKAGEPREFIX ooodev
@@ -207,7 +207,7 @@ OpenOffice_Dev
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.4.0
+			PACKAGEVERSION 3.5.0
 			PACKAGEREVISION {milestone}
 			LICENSENAME ALv2
 			GLOBALFILEGID gid_File_Lib_Vcl
@@ -255,8 +255,8 @@ URE
         variables
         {
             PRODUCTNAME URE
-            PRODUCTVERSION 3.4
-            PACKAGEVERSION 3.4
+            PRODUCTVERSION 3.5
+            PACKAGEVERSION 3.5
             PACKAGEREVISION 1
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
@@ -296,14 +296,14 @@ OpenOffice_SDK
         variables
         {
             PRODUCTNAME OpenOffice.org
-            PRODUCTVERSION 3.4
+            PRODUCTVERSION 3.5
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
             SHORT_PRODUCTEXTENSION
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
             BRANDPACKAGEVERSION 3
-            PACKAGEVERSION 3.4.0
+            PACKAGEVERSION 3.5.0
             PACKAGEREVISION {milestone}
             PACK_INSTALLED 1
             POOLPRODUCT 0
@@ -342,7 +342,7 @@ OpenOffice_Dev_SDK
         variables
         {
             PRODUCTNAME OOo-dev
-            PRODUCTVERSION 3.4
+            PRODUCTVERSION 3.5
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
             SHORT_PRODUCTEXTENSION
@@ -351,7 +351,7 @@ OpenOffice_Dev_SDK
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
             BRANDPACKAGEVERSION 3
-            PACKAGEVERSION 3.4.0
+            PACKAGEVERSION 3.5.0
             PACKAGEREVISION {milestone}
             BASISPACKAGEPREFIX ooobasis-dev
             UREPACKAGEPREFIX ooodev
@@ -361,7 +361,7 @@ OpenOffice_Dev_SDK
             PACK_INSTALLED 1
             POOLPRODUCT 0
             DMG_VOLUMEEXTENSION SDK
-            DATABASENAME openofficeorg34devsdk
+            DATABASENAME openofficeorg35devsdk
             NO_README_IN_ROOTDIR 1
             LICENSENAME ALv2
             IGNOREDIRECTORYLAYER 1

Modified: incubator/ooo/branches/alg/aw080/main/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml Wed Jun 27 13:44:09 2012
@@ -23,11 +23,11 @@
 <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
- <updated>2011-01-07</updated>
+ <updated>2012-10-06</updated>
 
  <vendorInfos>
   <vendor name="Oracle Corporation">
-    <minVersion>1.7.0</minVersion>
+    <minVersion>1.6.0</minVersion>
   </vendor>
   <vendor name="Sun Microsystems Inc.">
     <minVersion>1.5.0</minVersion>

Modified: incubator/ooo/branches/alg/aw080/main/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml Wed Jun 27 13:44:09 2012
@@ -22,20 +22,24 @@
 
 <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- 
- <updated>2004-01-30</updated>
- 
- <vendorInfos> 
+
+ <updated>2011-01-07</updated>
+
+ <vendorInfos>
+  <vendor name="Oracle Corporation">
+    <minVersion>1.7.0</minVersion>
+  </vendor>
   <vendor name="Sun Microsystems Inc.">
-    <minVersion>1.4.2</minVersion>
+    <minVersion>1.5.0</minVersion>
   </vendor>
   <vendor name="IBM Corporation">
-    <minVersion>1.4.2</minVersion>
+    <minVersion>1.5.0</minVersion>
   </vendor>
  </vendorInfos>
 
  <plugins>
-  <library vendor="Sun Microsystems Inc.">sunjavap.dll</library>
-  <library vendor="IBM Corporation">sunjavap.dll</library>
+  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavap.dll</library>
+  <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavap.dll</library>
+  <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavap.dll</library>
  </plugins>
 </javaSelection>

Modified: incubator/ooo/branches/alg/aw080/main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml Wed Jun 27 13:44:09 2012
@@ -23,11 +23,11 @@
 <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
- <updated>2011-01-07</updated>
+ <updated>2012-10-06</updated>
 
  <vendorInfos>
   <vendor name="Oracle Corporation">
-    <minVersion>1.7.0</minVersion>
+    <minVersion>1.6.0</minVersion>
   </vendor>
   <vendor name="Sun Microsystems Inc.">
     <minVersion>1.5.0</minVersion>

Modified: incubator/ooo/branches/alg/aw080/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx Wed Jun 27 13:44:09 2012
@@ -63,13 +63,17 @@ char const* const* SunInfo::getRuntimePa
 #if defined(WNT)
         "/bin/client/jvm.dll",
         "/bin/hotspot/jvm.dll",
-        "/bin/classic/jvm.dll"
+        "/bin/classic/jvm.dll",
+        "/bin/jrockit/jvm.dll"
 #elif defined(OS2)
         "/bin/classic/jvm.dll",
+        "/bin/client/jvm.dll",
+        // TODO add jrockit here
 #elif UNX
         "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
         "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
-        "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so"
+        "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so",
+        "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so"
 #endif
 
     };

Modified: incubator/ooo/branches/alg/aw080/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx Wed Jun 27 13:44:09 2012
@@ -215,6 +215,10 @@ SunVersion::PreRelease SunVersion::getPr
 {
     if (szRelease == NULL)
         return Rel_NONE;
+#ifdef OS2
+	// all prerelases codes are threated the same way (-ga1, -ga2, ...)
+        return Rel_OS2;
+#endif
     if( ! strcmp(szRelease,"ea"))
         return  Rel_EA;
     else if( ! strcmp(szRelease,"ea1"))

Modified: incubator/ooo/branches/alg/aw080/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx Wed Jun 27 13:44:09 2012
@@ -76,6 +76,10 @@ protected:
 	,
         Rel_FreeBSD
 #endif
+#if defined(OS2)
+	,
+        Rel_OS2
+#endif
     };
 
     //contains major,minor,micro,update

Modified: incubator/ooo/branches/alg/aw080/main/libxml2/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/libxml2/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/libxml2/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/libxml2/makefile.mk Wed Jun 27 13:44:09 2012
@@ -49,6 +49,8 @@ PATCH_FILES=libxml2-configure.patch \
             libxml2-gnome599717.patch \
             libxml2-xpath.patch \
             libxml2-global-symbols.patch \
+            libxml2-testapi.patch \
+            libxml2-runtest.patch
 
 .IF "$(OS)" == "WNT"
 PATCH_FILES+= libxml2-long-path.patch

Modified: incubator/ooo/branches/alg/aw080/main/lingucomponent/source/languageguessing/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/lingucomponent/source/languageguessing/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/lingucomponent/source/languageguessing/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/lingucomponent/source/languageguessing/makefile.mk Wed Jun 27 13:44:09 2012
@@ -24,7 +24,11 @@
 PRJ=..$/..
 PRJNAME=lingucomponent
 
+.IF "$(GUI)"=="OS2"
+TARGET=guesslan
+.ELSE
 TARGET=guesslang
+.ENDIF
 
 ENABLE_EXCEPTIONS=TRUE
 

Modified: incubator/ooo/branches/alg/aw080/main/lingucomponent/source/thesaurus/libnth/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/lingucomponent/source/thesaurus/libnth/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/lingucomponent/source/thesaurus/libnth/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/lingucomponent/source/thesaurus/libnth/makefile.mk Wed Jun 27 13:44:09 2012
@@ -62,7 +62,11 @@ SLOFILES=	\
 		$(SLO)$/nthesimp.obj
 
 
+.IF "$(GUI)"=="OS2"
+REALNAME:=$(TARGET)
+.ELSE
 REALNAME:=$(TARGET).uno
+.ENDIF
 SHL1TARGET= $(REALNAME)$(DLLPOSTFIX)
 
 SHL1STDLIBS= \

Modified: incubator/ooo/branches/alg/aw080/main/linguistic/source/lngsvcmgr.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/linguistic/source/lngsvcmgr.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/linguistic/source/lngsvcmgr.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/linguistic/source/lngsvcmgr.cxx Wed Jun 27 13:44:09 2012
@@ -1414,9 +1414,10 @@ uno::Sequence< OUString > SAL_CALL
 	}
     else if (0 == rServiceName.compareToAscii( SN_GRAMMARCHECKER ))
     {
-        // don't used cached data here (force re-evaluation in order to have downloaded dictionaries
-        // already found without the need to restart the office
-        clearSvcInfoArray(pAvailGrammarSvcs);  pAvailGrammarSvcs = 0;
+        // don't clear cache as it makes start with some extentions so slow it looks
+        // like a freeze (a restart is needed anyway after grammar checker installation),
+        // see https://issues.apache.org/ooo/show_bug.cgi?id=116409
+        //clearSvcInfoArray(pAvailGrammarSvcs);  pAvailGrammarSvcs = 0;
         GetAvailableGrammarSvcs_Impl();
         pInfoArray = pAvailGrammarSvcs;
     }

Modified: incubator/ooo/branches/alg/aw080/main/makefile.rc
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/makefile.rc?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/makefile.rc (original)
+++ incubator/ooo/branches/alg/aw080/main/makefile.rc Wed Jun 27 13:44:09 2012
@@ -61,6 +61,9 @@ distclean .PHONY: clean
 clean .PHONY:
 	-rm -rf */$(INPATH)
 	-rm -rf solver/*/$(INPATH)
+.IF "$(ADDITIONAL_REPOSITORIES)"!=""
+	-rm -rf $(foreach,f,$(ADDITIONAL_REPOSITORIES) $f/*/$(INPATH))
+.ENDIF
 .IF "$(BUILD_DMAKE)"!="NO"
 	-echo cleaning up dmake...
 	-$(GNUMAKE) -C dmake clean

Modified: incubator/ooo/branches/alg/aw080/main/more_fonts/fonts/ttf_croscore/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/more_fonts/fonts/ttf_croscore/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/more_fonts/fonts/ttf_croscore/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/more_fonts/fonts/ttf_croscore/makefile.mk Wed Jun 27 13:44:09 2012
@@ -39,7 +39,6 @@ TARGET=ttf_croscore
 
 TARFILE_NAME=croscorefonts-1.21.0
 TARFILE_MD5=61f59e4110781cbe66b46449eadac231
-TARFILE_ROOTDIR=.
 
 PATCH_FILES=
 

Modified: incubator/ooo/branches/alg/aw080/main/moz/zipped/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/moz/zipped/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/moz/zipped/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/moz/zipped/makefile.mk Wed Jun 27 13:44:09 2012
@@ -72,7 +72,8 @@ $(MISC)$/unpacked_$(TARGET)_inc : $(OS)$
 .ENDIF
 
 $(BIN)$/mozruntime%zip : $(OS)$(COM)$(CPU)runtime.zip
-	$(COPY) $(OS)$(COM)$(CPU)runtime.zip $(BIN)$/mozruntime.zip
+	$(COPY) $(OS)$(COM)$(CPU)runtime.zip $(BIN)$/mozruntime.zip && \
+	chmod u+w $(BIN)$/mozruntime.zip
 
 # add alternative rules for universal binary moz-zips
 .IF "$(GUIBASE)" == "aqua"

Modified: incubator/ooo/branches/alg/aw080/main/o3tl/inc/o3tl/lazy_update.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/o3tl/inc/o3tl/lazy_update.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/o3tl/inc/o3tl/lazy_update.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/o3tl/inc/o3tl/lazy_update.hxx Wed Jun 27 13:44:09 2012
@@ -97,12 +97,12 @@ output( myValue.getOutValue() );
 
             void               setInValue( input_type const& rIn ) { Functor::m_bCacheDirty = true; m_aInput = rIn; }
             input_type const&  getInValue()  const                 { return m_aInput; }
-            output_type const& getOutValue() const                 { return implUpdateValue(m_aInput); }
+            output_type const& getOutValue() const                 { return this->implUpdateValue(m_aInput); }
         
             input_type& operator*()  { Functor::m_bCacheDirty = true; return m_aInput;  }
             input_type* operator->() { Functor::m_bCacheDirty = true; return &m_aInput; }
 
-            output_type const& operator*() const  { return implUpdateValue(m_aInput);  }
+            output_type const& operator*() const  { return this->implUpdateValue(m_aInput);  }
             output_type const* operator->() const { return &implUpdateValue(m_aInput); }
         
         private:

Modified: incubator/ooo/branches/alg/aw080/main/o3tl/inc/o3tl/vector_pool.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/o3tl/inc/o3tl/vector_pool.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/o3tl/inc/o3tl/vector_pool.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/o3tl/inc/o3tl/vector_pool.hxx Wed Jun 27 13:44:09 2012
@@ -60,7 +60,7 @@ namespace o3tl
                 }
                 else
                 {
-                    push_back(value_type(rCopy));
+                    this->push_back(value_type(rCopy));
                     return this->size()-1;
                 }
             }

Modified: incubator/ooo/branches/alg/aw080/main/odk/examples/CLI/CSharp/Spreadsheet/Makefile
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/odk/examples/CLI/CSharp/Spreadsheet/Makefile?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/odk/examples/CLI/CSharp/Spreadsheet/Makefile (original)
+++ incubator/ooo/branches/alg/aw080/main/odk/examples/CLI/CSharp/Spreadsheet/Makefile Wed Jun 27 13:44:09 2012
@@ -1,23 +1,23 @@
-/**************************************************************
- * 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- *************************************************************/
+#**************************************************************
+#
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+#**************************************************************
 
 # Builds the SpreadSheet examples of the Developers Guide.
 

Modified: incubator/ooo/branches/alg/aw080/main/odk/examples/CLI/VB.NET/WriterDemo/Makefile
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/odk/examples/CLI/VB.NET/WriterDemo/Makefile?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/odk/examples/CLI/VB.NET/WriterDemo/Makefile (original)
+++ incubator/ooo/branches/alg/aw080/main/odk/examples/CLI/VB.NET/WriterDemo/Makefile Wed Jun 27 13:44:09 2012
@@ -1,23 +1,24 @@
-/**************************************************************
- * 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- *************************************************************/
+#**************************************************************
+#
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+#**************************************************************
+
 
 # Builds the WriterDemo examples of the Developers Guide.
 

Modified: incubator/ooo/branches/alg/aw080/main/odk/index.html
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/odk/index.html?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/odk/index.html (original)
+++ incubator/ooo/branches/alg/aw080/main/odk/index.html Wed Jun 27 13:44:09 2012
@@ -71,7 +71,7 @@
 			  Currently supported platforms of the SDK are Linux, Solaris (sparc, 
 			  x86), and Windows.</p>
             <p>The SDK also contains <a href="docs/common/ref/com/sun/star/module-ix.html" title="link to the IDL reference documentation"> reference</a> documentation 
-              for the API and a complete <a href="http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/Apache OpenOffice_Developers_Guide" title="link to the Developer's Guide in the Wiki">Developer's Guide</a> is availbale online in the Apache OpenOffice Wiki, with 
+              for the API and a complete <a href="http://wiki.services.openoffice.org/wiki/Documentation/DevGuide" title="link to the Developer's Guide in the Wiki">Developer's Guide</a> is availbale online in the Apache OpenOffice Wiki, with 
 			  lots of examples, which introduce the API, explain the concepts behind
 			  it, and make it possible for all users to quickly get started with 
 			  the Office API.</p>
@@ -105,7 +105,7 @@
               </tr>
               <tr valign="top"> 
                 <td class="content4"><img src="docs/images/arrow-1.gif"></td>
-                <td colspan="2"><a href="http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/Apache OpenOffice_Developers_Guide" title="link to the Developer's Guide in the Wiki">Developer's Guide</a></td>
+                <td colspan="2"><a href="http://wiki.services.openoffice.org/wiki/Documentation/DevGuide" title="link to the Developer's Guide in the Wiki">Developer's Guide</a></td>
                 <td class="content70">Detailed documentation, explaining the Apache OpenOffice %PRODUCT_RELEASE% 
 				API and the concepts behind it, with a rich set of examples, 
 				implemented mainly in Java. This documentation is online in the 
@@ -168,7 +168,7 @@
               </tr>
               <tr valign="top"> 
                 <td class="content4"><img src="docs/images/arrow-1.gif"></td>
-                <td colspan="2"><a href="share/readme/LICENSE_en-US.html" title="link to the SDK license file">License</a></td>
+                <td colspan="2"><a href="LICENSE" title="link to the SDK license file">License</a></td>
                 <td class="content70">The license for the Apache OpenOffice %PRODUCT_RELEASE% SDK.</td>
               </tr>
               <tr valign="middle"> 

Modified: incubator/ooo/branches/alg/aw080/main/offapi/com/sun/star/awt/grid/XMutableGridDataModel.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/offapi/com/sun/star/awt/grid/XMutableGridDataModel.idl?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/offapi/com/sun/star/awt/grid/XMutableGridDataModel.idl (original)
+++ incubator/ooo/branches/alg/aw080/main/offapi/com/sun/star/awt/grid/XMutableGridDataModel.idl Wed Jun 27 13:44:09 2012
@@ -132,7 +132,7 @@ published interface XMutableGridDataMode
 			specifies the new values of the cells.
         @throws ::com::sun::star::lang::IndexOutOfBoundsException
             if one of the row indexes or the column index is invalid
-        @throws ::com::sun::star::lang::IndexOutOfBoundsException
+        @throws ::com::sun::star::lang::IllegalArgumentException
             if the lengths of the <code>ColumnIndexes</code> and <code>Values</code> sequences are not equal.
 	*/
 	void updateRowData( [in] sequence< long > ColumnIndexes, [in] long RowIndex, [in] sequence< any > Values )

Modified: incubator/ooo/branches/alg/aw080/main/offapi/type_reference/typelibrary_history.txt
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/offapi/type_reference/typelibrary_history.txt?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/offapi/type_reference/typelibrary_history.txt (original)
+++ incubator/ooo/branches/alg/aw080/main/offapi/type_reference/typelibrary_history.txt Wed Jun 27 13:44:09 2012
@@ -186,3 +186,6 @@
 01/28/11 (JSC): TaskID=116682
   Update css.awt.UnoControlDialog to reflect the supported XDialog2 interface
   additionally to XDialog
+
+06/11/2012 (JSC): TaskID=119944
+  Update reference type library to 3.4 version

Modified: incubator/ooo/branches/alg/aw080/main/offapi/type_reference/types.rdb
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/offapi/type_reference/types.rdb?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/ooo/branches/alg/aw080/main/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu (original)
+++ incubator/ooo/branches/alg/aw080/main/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu Wed Jun 27 13:44:09 2012
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -8,25 +8,23 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  ***********************************************************-->
-
-
 <!DOCTYPE oor:component-data SYSTEM "../../../../../component-update.dtd">
 <oor:component-data oor:name="BasicIDECommands" oor:package="org.openoffice.Office.UI" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<node oor:name="UserInterface">
-		<node oor:name="Commands">
-		</node>
-		<node oor:name="Popups">
-		</node>
-	</node>
+    <node oor:name="UserInterface">
+        <node oor:name="Commands">
+        </node>
+        <node oor:name="Popups">
+        </node>
+    </node>
 </oor:component-data>

Modified: incubator/ooo/branches/alg/aw080/main/officecfg/registry/data/org/openoffice/Office/UI/BibliographyCommands.xcu
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/officecfg/registry/data/org/openoffice/Office/UI/BibliographyCommands.xcu?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/officecfg/registry/data/org/openoffice/Office/UI/BibliographyCommands.xcu (original)
+++ incubator/ooo/branches/alg/aw080/main/officecfg/registry/data/org/openoffice/Office/UI/BibliographyCommands.xcu Wed Jun 27 13:44:09 2012
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -8,79 +8,68 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  ***********************************************************-->
-
-
 <!DOCTYPE oor:component-data SYSTEM "../../../../../component-update.dtd">
 <oor:component-data oor:name="BibliographyCommands" oor:package="org.openoffice.Office.UI" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<node oor:name="UserInterface">
-		<node oor:name="Commands">
-			<node oor:name=".uno:Bib/Mapping" oor:op="replace">
-				<prop oor:name="Label" oor:type="xs:string">
-					
-					<value xml:lang="en-US">~Column Arrangement...</value>
-				</prop>
-			</node>
-			<node oor:name=".uno:Bib/standardFilter" oor:op="replace">
-				<prop oor:name="Label" oor:type="xs:string">
-					
-					<value xml:lang="en-US">~Filter...</value>
-				</prop>
-			</node>
-			<node oor:name=".uno:Bib/DeleteRecord" oor:op="replace">
-				<prop oor:name="Label" oor:type="xs:string">
-					
-					<value xml:lang="en-US">Delete ~Record</value>
-				</prop>
-			</node>
-			<node oor:name=".uno:Bib/InsertRecord" oor:op="replace">
-				<prop oor:name="Label" oor:type="xs:string">
-					
-					<value xml:lang="en-US">~Record</value>
-				</prop>
-			</node>
-			<node oor:name=".uno:Bib/sdbsource" oor:op="replace">
-				<prop oor:name="Label" oor:type="xs:string">
-					
-					<value xml:lang="en-US">~Choose Data Source...</value>
-				</prop>
-			</node>
-			<node oor:name=".uno:Bib/source" oor:op="replace">
-				<prop oor:name="Label" oor:type="xs:string">
-				    
-				    <value xml:lang="en-US">Table</value>
-				</prop>
-			</node>			
-			<node oor:name=".uno:Bib/query" oor:op="replace">
-				<prop oor:name="Label" oor:type="xs:string">
-				    
-				    <value xml:lang="en-US">Search Key</value>
-				</prop>
-			</node>
-			<node oor:name=".uno:Bib/autoFilter" oor:op="replace">
-				<prop oor:name="Label" oor:type="xs:string">
-				    
-				    <value xml:lang="en-US">AutoFilter</value>
-				</prop>
-			</node>
-			<node oor:name=".uno:Bib/removeFilter" oor:op="replace">
-				<prop oor:name="Label" oor:type="xs:string">
-				    
-				    <value xml:lang="en-US">Remove Filter</value>
-				</prop>
-			</node>
-		</node>
-		<node oor:name="Popups">
-		</node>
-	</node>
+    <node oor:name="UserInterface">
+        <node oor:name="Commands">
+            <node oor:name=".uno:Bib/DeleteRecord" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Delete Record</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:Bib/InsertRecord" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Record</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:Bib/Mapping" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Column Arrangement...</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:Bib/autoFilter" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">AutoFilter</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:Bib/query" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Search Key</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:Bib/removeFilter" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Remove Filter</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:Bib/sdbsource" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Choose Data Source...</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:Bib/source" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Table</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:Bib/standardFilter" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Filter...</value>
+                </prop>
+            </node>
+        </node>
+        <node oor:name="Popups">
+        </node>
+    </node>
 </oor:component-data>



Mime
View raw message