openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stev...@apache.org
Subject svn commit: r1441343 [14/35] - in /openoffice/branches/ia2: ./ ext_libraries/apr-util/ ext_libraries/apr/ ext_sources/ extras/l10n/source/ast/ extras/l10n/source/da/ extras/l10n/source/eu/ extras/l10n/source/gd/ extras/l10n/source/ko/ extras/l10n/sourc...
Date Fri, 01 Feb 2013 08:46:35 GMT
Modified: openoffice/branches/ia2/main/framework/source/fwe/classes/addonsoptions.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/source/fwe/classes/addonsoptions.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/source/fwe/classes/addonsoptions.cxx (original)
+++ openoffice/branches/ia2/main/framework/source/fwe/classes/addonsoptions.cxx Fri Feb  1 08:46:00 2013
@@ -19,8 +19,6 @@
  * 
  *************************************************************/
 
-
-
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
@@ -44,7 +42,7 @@
 #include <comphelper/processfactory.hxx>
 #include <vcl/graph.hxx>
 #include <svtools/filter.hxx>
-
+#include <vcl/dibtools.hxx>
 #include <hash_map>
 #include <algorithm>
 #include <vector>
@@ -64,9 +62,11 @@ using namespace ::com::sun::star::lang	;
 //	const
 //_________________________________________________________________________________________________________________
 
+#define STR_TOOLBARITEMS    "ToolBarItems"
+
 #define ROOTNODE_ADDONMENU                              ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Addons"	))
 #define PATHDELIMITER                                   ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"				))
-#define TOOLBARITEMS									::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ToolBarItems"		))
+#define TOOLBARITEMS									::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_TOOLBARITEMS))
 #define SEPARATOR_URL_STR								"private:separator"
 #define SEPARATOR_URL_LEN								17
 #define SEPARATOR_URL									::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SEPARATOR_URL_STR ))
@@ -79,6 +79,7 @@ using namespace ::com::sun::star::lang	;
 #define PROPERTYNAME_SUBMENU							ADDONSMENUITEM_PROPERTYNAME_SUBMENU
 #define PROPERTYNAME_CONTROLTYPE                        ADDONSMENUITEM_PROPERTYNAME_CONTROLTYPE
 #define PROPERTYNAME_WIDTH                              ADDONSMENUITEM_PROPERTYNAME_WIDTH
+#define PROPERTYNAME_TOOLBARITEMS                       TOOLBARITEMS
 
 #define PROPERTYNAME_ALIGN                              STATUSBARITEM_PROPERTYNAME_ALIGN
 #define PROPERTYNAME_AUTOSIZE                           STATUSBARITEM_PROPERTYNAME_AUTOSIZE
@@ -110,7 +111,7 @@ using namespace ::com::sun::star::lang	;
 #define PROPERTYNAME_MERGETOOLBAR_MERGECOMMANDPARAMETER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergeCommandParameter" ))
 #define PROPERTYNAME_MERGETOOLBAR_MERGEFALLBACK         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergeFallback" ))
 #define PROPERTYNAME_MERGETOOLBAR_MERGECONTEXT          ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergeContext" ))
-#define PROPERTYNAME_MERGETOOLBAR_TOOLBARITEMS          ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ToolBarItems" ))
+#define PROPERTYNAME_MERGETOOLBAR_TOOLBARITEMS          ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(STR_TOOLBARITEMS ))
 
 #define PROPERTYNAME_MERGESTATUSBAR_MERGEPOINT               ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergePoint" ))
 #define PROPERTYNAME_MERGESTATUSBAR_MERGECOMMAND             ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergeCommand" ))
@@ -131,7 +132,8 @@ using namespace ::com::sun::star::lang	;
 #define INDEX_ALIGN             8
 #define INDEX_AUTOSIZE          9
 #define INDEX_OWNERDRAW         10
-#define PROPERTYCOUNT_INDEX     11
+#define INDEX_TOOLBARITEMS      11
+#define PROPERTYCOUNT_INDEX     12
 
 // The following order is mandatory. Please add properties at the end!
 #define PROPERTYCOUNT_MENUITEM							6
@@ -150,6 +152,11 @@ using namespace ::com::sun::star::lang	;
 #define OFFSET_POPUPMENU_URL							3	// Used for property set
 
 // The following order is mandatory. Please add properties at the end!
+#define PROPERTYCOUNT_TOOLBAR                           2
+#define OFFSET_TOOLBAR_TITLE                            0
+#define OFFSET_TOOLBAR_TOOLBARITEMS                     1
+
+// The following order is mandatory. Please add properties at the end!
 #define PROPERTYCOUNT_TOOLBARITEM						7
 #define OFFSET_TOOLBARITEM_URL							0
 #define OFFSET_TOOLBARITEM_TITLE						1
@@ -296,6 +303,7 @@ class AddonsOptions_Impl : public Config
 		const Sequence< Sequence< PropertyValue > >&	GetAddonsMenuBarPart () const ;
         const Sequence< Sequence< PropertyValue > >&	GetAddonsToolBarPart ( sal_uInt32 nIndex ) const ;
         const ::rtl::OUString                           GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const;
+        const ::rtl::OUString                           GetAddonsToolbarUIName( sal_uInt32 nIndex ) const;
 		const Sequence< Sequence< PropertyValue > >&	GetAddonsHelpMenu	 () const ;
 		Image											GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast, sal_Bool bNoScale ) const;
         const MergeMenuInstructionContainer&            GetMergeMenuInstructions() const;
@@ -348,7 +356,9 @@ class AddonsOptions_Impl : public Config
 
 		sal_Bool			 ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >& aAddonMenuSeq );
 		sal_Bool			 ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue > >& aAddonOfficeMenuBarSeq );
-        sal_Bool			 ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars, std::vector< rtl::OUString >& rAddonOfficeToolBarResNames );
+        sal_Bool			 ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars,
+                                                   std::vector< rtl::OUString >& rAddonOfficeToolBarResNames,
+                                                   std::vector< rtl::OUString >& rAddonOfficeToolBarUINames );
         sal_Bool			 ReadToolBarItemSet( const rtl::OUString rToolBarItemSetNodeName, Sequence< Sequence< PropertyValue > >& aAddonOfficeToolBarSeq );
 		sal_Bool			 ReadOfficeHelpSet( Sequence< Sequence< PropertyValue > >& aAddonOfficeHelpMenuSeq );
 		sal_Bool			 ReadImages( ImageManager& aImageManager );
@@ -378,6 +388,7 @@ class AddonsOptions_Impl : public Config
 		Sequence< ::rtl::OUString > GetPropertyNamesMergeMenuInstruction( const ::rtl::OUString& aPropertyRootName ) const;
         Sequence< ::rtl::OUString > GetPropertyNamesMenuItem( const ::rtl::OUString& aPropertyRootNode ) const;
 		Sequence< ::rtl::OUString > GetPropertyNamesPopupMenu( const ::rtl::OUString& aPropertyRootNode ) const;
+        Sequence< ::rtl::OUString > GetPropertyNamesToolBar( const ::rtl::OUString& aPropertyRootNode ) const;
 		Sequence< ::rtl::OUString > GetPropertyNamesToolBarItem( const ::rtl::OUString& aPropertyRootNode ) const;
         Sequence< ::rtl::OUString > GetPropertyNamesStatusbarItem( const ::rtl::OUString& aPropertyRootNode ) const;
 		Sequence< ::rtl::OUString > GetPropertyNamesImages( const ::rtl::OUString& aPropertyRootNode ) const;
@@ -405,6 +416,7 @@ class AddonsOptions_Impl : public Config
 		Sequence< Sequence< PropertyValue > >             m_aCachedMenuBarPartProperties;
         AddonToolBars                                     m_aCachedToolBarPartProperties;
         std::vector< rtl::OUString >                      m_aCachedToolBarPartResourceNames;
+        std::vector< rtl::OUString >                      m_aCachedToolBarPartUINames;
 		Sequence< Sequence< PropertyValue > >             m_aCachedHelpMenuProperties;
 		Reference< com::sun::star::util::XMacroExpander > m_xMacroExpander;
 		ImageManager                                      m_aImageManager;
@@ -442,6 +454,7 @@ AddonsOptions_Impl::AddonsOptions_Impl()
     m_aPropNames[ INDEX_ALIGN           ] = PROPERTYNAME_ALIGN;
     m_aPropNames[ INDEX_AUTOSIZE        ] = PROPERTYNAME_AUTOSIZE;
     m_aPropNames[ INDEX_OWNERDRAW       ] = PROPERTYNAME_OWNERDRAW;
+    m_aPropNames[ INDEX_TOOLBARITEMS    ] = PROPERTYNAME_TOOLBARITEMS;
 
 	// initialize array with fixed images property names
 	m_aPropImagesNames[ OFFSET_IMAGES_SMALL			] = PROPERTYNAME_IMAGESMALL;
@@ -515,11 +528,14 @@ void AddonsOptions_Impl::ReadConfigurati
     m_aCachedToolBarPartProperties = AddonToolBars();
     m_aCachedHelpMenuProperties = Sequence< Sequence< PropertyValue > >();
     m_aCachedToolBarPartResourceNames.clear();
+    m_aCachedToolBarPartUINames.clear();
     m_aImageManager = ImageManager();
 
     ReadAddonMenuSet( m_aCachedMenuProperties );
 	ReadOfficeMenuBarSet( m_aCachedMenuBarPartProperties );
-	ReadOfficeToolBarSet( m_aCachedToolBarPartProperties, m_aCachedToolBarPartResourceNames );
+	ReadOfficeToolBarSet( m_aCachedToolBarPartProperties,
+                          m_aCachedToolBarPartResourceNames,
+                          m_aCachedToolBarPartUINames );
 
 	ReadOfficeHelpSet( m_aCachedHelpMenuProperties );
 	ReadImages( m_aImageManager );
@@ -611,6 +627,15 @@ const ::rtl::OUString AddonsOptions_Impl
         return rtl::OUString();
 }
 
+
+const ::rtl::OUString AddonsOptions_Impl::GetAddonsToolbarUIName( sal_uInt32 nIndex ) const
+{
+    if ( nIndex < m_aCachedToolBarPartUINames.size() )
+        return m_aCachedToolBarPartUINames[nIndex];
+    else
+        return rtl::OUString();
+}
+
 //*****************************************************************************************************************
 //	public method
 //*****************************************************************************************************************
@@ -815,7 +840,10 @@ sal_Bool AddonsOptions_Impl::ReadOfficeM
 //*****************************************************************************************************************
 //	private method
 //*****************************************************************************************************************
-sal_Bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars, std::vector< rtl::OUString >& rAddonOfficeToolBarResNames )
+sal_Bool AddonsOptions_Impl::ReadOfficeToolBarSet(
+    AddonToolBars& rAddonOfficeToolBars,
+    std::vector< rtl::OUString >& rAddonOfficeToolBarResNames,
+    std::vector< rtl::OUString >& rAddonOfficeToolBarUINames )
 {
 	// Read the OfficeToolBar set and fill property sequences
 	::rtl::OUString             aAddonToolBarNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeToolBar" ));
@@ -826,10 +854,24 @@ sal_Bool AddonsOptions_Impl::ReadOfficeT
 
 	for ( sal_uInt32 n = 0; n < nCount; n++ )
 	{
-        ::rtl::OUString aToolBarItemNode( aAddonToolBarNode + aAddonToolBarNodeSeq[n] );
+        ::rtl::OUString aToolBarNode( aAddonToolBarNode + aAddonToolBarNodeSeq[n] + m_aPathDelimiter );
         rAddonOfficeToolBarResNames.push_back( aAddonToolBarNodeSeq[n] );
         rAddonOfficeToolBars.push_back( m_aEmptyAddonToolBar );
-        ReadToolBarItemSet( aToolBarItemNode, rAddonOfficeToolBars[n] );
+
+        Sequence< Any > aToolBarNodeValues = GetProperties( GetPropertyNamesToolBar( aToolBarNode ) );
+
+        rtl::OUString aUIName;
+        aToolBarNodeValues[OFFSET_TOOLBAR_TITLE] >>= aUIName;
+        rAddonOfficeToolBarUINames.push_back( aUIName );
+
+        Reference < XInterface > xToolbarItems;
+        if ( ( aToolBarNodeValues[OFFSET_TOOLBAR_TOOLBARITEMS] >>= xToolbarItems ) && xToolbarItems.is() )
+        {
+            ::rtl::OUStringBuffer aBuffer;
+            aBuffer.append( aToolBarNode );
+            aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( STR_TOOLBARITEMS ) );
+            ReadToolBarItemSet( aBuffer.makeStringAndClear(), rAddonOfficeToolBars[n] );
+        }
 	}
 
 	return ( !rAddonOfficeToolBars.empty() );
@@ -1741,7 +1783,7 @@ sal_Bool AddonsOptions_Impl::CreateImage
 		SvMemoryStream	aMemStream( rBitmapDataSeq.getArray(), rBitmapDataSeq.getLength(), STREAM_STD_READ );
 		BitmapEx 		aBitmapEx;
 
-        aMemStream >> aBitmapEx;
+        ReadDIBBitmapEx(aBitmapEx, aMemStream);
 
 		// Scale bitmap to fit the correct size for the menu/toolbar. Use best quality
 		if ( aBitmapEx.GetSizePixel() != aSize )
@@ -1812,6 +1854,17 @@ Sequence< ::rtl::OUString > AddonsOption
 //*****************************************************************************************************************
 //	private method
 //*****************************************************************************************************************
+Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesToolBar( const ::rtl::OUString& aPropertyRootNode ) const
+{
+    Sequence< ::rtl::OUString > lResult( PROPERTYCOUNT_TOOLBAR );
+
+    // Create property names dependent from the root node name
+    lResult[OFFSET_TOOLBAR_TITLE]        = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] );
+    lResult[OFFSET_TOOLBAR_TOOLBARITEMS] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_TOOLBARITEMS ] );
+
+    return lResult;
+}
+
 Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesToolBarItem( const ::rtl::OUString& aPropertyRootNode ) const
 {
 	Sequence< ::rtl::OUString > lResult( PROPERTYCOUNT_TOOLBARITEM );
@@ -1971,6 +2024,12 @@ const ::rtl::OUString AddonsOptions::Get
     return m_pDataContainer->GetAddonsToolbarResourceName( nIndex );
 }
 
+const ::rtl::OUString AddonsOptions::GetAddonsToolbarUIName( sal_uInt32 nIndex ) const
+{
+    MutexGuard aGuard( GetOwnStaticMutex() );
+    return m_pDataContainer->GetAddonsToolbarUIName( nIndex );
+}
+
 //*****************************************************************************************************************
 //	public method
 //*****************************************************************************************************************

Modified: openoffice/branches/ia2/main/framework/source/fwe/classes/imagewrapper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/source/fwe/classes/imagewrapper.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/source/fwe/classes/imagewrapper.cxx (original)
+++ openoffice/branches/ia2/main/framework/source/fwe/classes/imagewrapper.cxx Fri Feb  1 08:46:00 2013
@@ -31,6 +31,7 @@
 #include <vcl/bitmapex.hxx>
 #include <tools/stream.hxx>
 #include <cppuhelper/typeprovider.hxx>
+#include <vcl/dibtools.hxx>
 
 using namespace com::sun::star::lang;
 using namespace com::sun::star::uno;
@@ -78,7 +79,7 @@ Sequence< sal_Int8 > SAL_CALL ImageWrapp
 	vos::OGuard	aGuard( Application::GetSolarMutex() );
 
 	SvMemoryStream aMem;
-	aMem << m_aImage.GetBitmapEx().GetBitmap();
+    WriteDIB(m_aImage.GetBitmapEx().GetBitmap(), aMem, false, true);
 	return Sequence< sal_Int8 >( (sal_Int8*) aMem.GetData(), aMem.Tell() );
 }
 
@@ -90,13 +91,13 @@ Sequence< sal_Int8 > SAL_CALL ImageWrapp
 	if ( aBmpEx.IsAlpha() )
 	{
 		SvMemoryStream aMem;
-		aMem << aBmpEx.GetAlpha().GetBitmap();
+        WriteDIB(aBmpEx.GetAlpha().GetBitmap(), aMem, false, true);
 		return Sequence< sal_Int8 >( (sal_Int8*) aMem.GetData(), aMem.Tell() );
 	}
 	else if ( aBmpEx.IsTransparent() )
 	{
 		SvMemoryStream aMem;
-		aMem << aBmpEx.GetMask();
+        WriteDIB(aBmpEx.GetMask(), aMem, false, true);
 		return Sequence< sal_Int8 >( (sal_Int8*) aMem.GetData(), aMem.Tell() );
 	}
 

Modified: openoffice/branches/ia2/main/framework/source/fwe/helper/actiontriggerhelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/source/fwe/helper/actiontriggerhelper.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/source/fwe/helper/actiontriggerhelper.cxx (original)
+++ openoffice/branches/ia2/main/framework/source/fwe/helper/actiontriggerhelper.cxx Fri Feb  1 08:46:00 2013
@@ -19,8 +19,6 @@
  * 
  *************************************************************/
 
-
-
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 #include <framework/actiontriggerhelper.hxx>
@@ -36,7 +34,7 @@
 #include <tools/stream.hxx>
 #include <cppuhelper/weak.hxx>
 #include <comphelper/processfactory.hxx>
-
+#include <vcl/dibtools.hxx>
 
 const sal_uInt16 START_ITEMID = 1000;
 
@@ -196,7 +194,7 @@ void InsertSubMenuItems( Menu* pSubMenu,
 									{
 										aDIBSeq = xBitmap->getDIB();
 										SvMemoryStream aMem( (void *)aDIBSeq.getConstArray(), aDIBSeq.getLength(), STREAM_READ );
-										aMem >> aBitmap;
+                                        ReadDIB(aBitmap, aMem, true);
 									}
 
 									aDIBSeq = xBitmap->getMaskDIB();
@@ -204,7 +202,7 @@ void InsertSubMenuItems( Menu* pSubMenu,
 									{
 										Bitmap aMaskBitmap;
 										SvMemoryStream aMem( (void *)aDIBSeq.getConstArray(), aDIBSeq.getLength(), STREAM_READ );
-										aMem >> aMaskBitmap;
+                                        ReadDIB(aMaskBitmap, aMem, true);
 										aImage = Image( aBitmap, aMaskBitmap );
 									}
 									else

Modified: openoffice/branches/ia2/main/framework/source/jobs/shelljob.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/source/jobs/shelljob.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/source/jobs/shelljob.cxx (original)
+++ openoffice/branches/ia2/main/framework/source/jobs/shelljob.cxx Fri Feb  1 08:46:00 2013
@@ -44,8 +44,6 @@
 //_______________________________________________
 // include interfaces
 
-#include <com/sun/star/system/XSystemShellExecute.hpp>
-#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
 #include <com/sun/star/util/XStringSubstitution.hpp>
 
 //_______________________________________________

Modified: openoffice/branches/ia2/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx (original)
+++ openoffice/branches/ia2/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx Fri Feb  1 08:46:00 2013
@@ -1004,7 +1004,10 @@ void ToolbarLayoutManager::implts_create
                     catch ( uno::Exception& ) {}
                 }
 
-                ::rtl::OUString aGenericAddonTitle = implts_generateGenericAddonToolbarTitle( i+1 );
+                ::rtl::OUString aAddonUIName = m_pAddonOptions->GetAddonsToolbarUIName( i );
+                const bool bAddonUIName = aAddonUIName.getLength();
+                ::rtl::OUString aAddonTitle = bAddonUIName ?
+                    aAddonUIName : implts_generateGenericAddonToolbarTitle( i+1 );
 
                 if ( aElement.m_aName.getLength() > 0 )
                 {
@@ -1012,9 +1015,9 @@ void ToolbarLayoutManager::implts_create
                     // UI changes for this document.
                     implts_setElementData( aElement, xDockWindow );
                     aElement.m_xUIElement = xUIElement;
-                    if ( aElement.m_aUIName.getLength() == 0 )
+                    if ( aElement.m_aUIName.getLength() == 0 && !bAddonUIName)
                     {
-                        aElement.m_aUIName = aGenericAddonTitle;
+                        aElement.m_aUIName = aAddonTitle;
                         implts_writeWindowStateData( aElement );
                     }
                 }
@@ -1025,9 +1028,9 @@ void ToolbarLayoutManager::implts_create
                     aNewToolbar.m_bFloating = true;
                     implts_readWindowStateData( aAddonToolBarName, aNewToolbar );
                     implts_setElementData( aNewToolbar, xDockWindow );
-                    if ( aNewToolbar.m_aUIName.getLength() == 0 )
+                    if ( aNewToolbar.m_aUIName.getLength() == 0 && !bAddonUIName)
                     {
-                        aNewToolbar.m_aUIName = aGenericAddonTitle;
+                        aNewToolbar.m_aUIName = aAddonTitle;
                         implts_writeWindowStateData( aNewToolbar );
                     }
                     implts_insertToolbar( aNewToolbar );
@@ -1040,7 +1043,7 @@ void ToolbarLayoutManager::implts_create
                     vos::OGuard aGuard( Application::GetSolarMutex() );
                     Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
                     if ( pWindow->GetText().Len() == 0 )
-                        pWindow->SetText( aGenericAddonTitle );
+                        pWindow->SetText( aAddonTitle );
                     if ( pWindow->GetType() == WINDOW_TOOLBOX )
                     {
                         ToolBox* pToolbar = (ToolBox *)pWindow;
@@ -1696,7 +1699,7 @@ void ToolbarLayoutManager::implts_writeW
     {
         try
         {
-            uno::Sequence< beans::PropertyValue > aWindowState( 8 );
+            uno::Sequence< beans::PropertyValue > aWindowState( 9 );
 
             aWindowState[0].Name  = ::rtl::OUString::createFromAscii( WINDOWSTATE_PROPERTY_DOCKED );
             aWindowState[0].Value = ::uno::makeAny( sal_Bool( !rElementData.m_bFloating ));
@@ -1725,6 +1728,8 @@ void ToolbarLayoutManager::implts_writeW
             aWindowState[6].Value = uno::makeAny( rElementData.m_aUIName );
             aWindowState[7].Name  = ::rtl::OUString::createFromAscii( WINDOWSTATE_PROPERTY_LOCKED );
             aWindowState[7].Value = uno::makeAny( rElementData.m_aDockedData.m_bLocked );
+            aWindowState[8].Name  = ::rtl::OUString::createFromAscii( WINDOWSTATE_PROPERTY_STYLE );
+            aWindowState[8].Value = uno::makeAny( rElementData.m_nStyle );
 
             ::rtl::OUString aName = rElementData.m_aName;
             if ( xPersistentWindowState->hasByName( aName ))

Modified: openoffice/branches/ia2/main/framework/source/services/backingwindow.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/source/services/backingwindow.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/source/services/backingwindow.cxx (original)
+++ openoffice/branches/ia2/main/framework/source/services/backingwindow.cxx Fri Feb  1 08:46:00 2013
@@ -54,7 +54,7 @@
 
 #include "com/sun/star/lang/XMultiServiceFactory.hpp"
 #include "com/sun/star/container/XNameAccess.hpp"
-#include "com/sun/star/system/XSystemShellExecute.hpp"
+#include "com/sun/star/system/SystemShellExecute.hpp"
 #include "com/sun/star/system/SystemShellExecuteFlags.hpp"
 #include "com/sun/star/task/XJobExecutor.hpp"
 #include "com/sun/star/util/XStringWidth.hpp"
@@ -697,6 +697,8 @@ void BackingWindow::layoutButton(
 
 void BackingWindow::Paint( const Rectangle& )
 {
+	Resize();
+	
     Wallpaper aBack( GetSettings().GetStyleSettings().GetWorkspaceGradient() );
     Region aClip( Rectangle( Point( 0, 0 ), GetOutputSizePixel() ) );
     Rectangle aBmpRect(maControlRect);
@@ -884,6 +886,9 @@ void BackingWindow::Resize()
     nYPos += nB2Delta - nDiff;
     maOpenButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos, nYPos ), Size( mnTextColumnWidth[0], maButtonImageSize.Height() ) );
     maTemplateButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos + mnColumnWidth[0], nYPos ), Size( mnTextColumnWidth[1], maButtonImageSize.Height() ) );
+
+	if( !IsInPaint())
+		Invalidate();
 }
 
 IMPL_LINK( BackingWindow, ToolboxHdl, void*, EMPTYARG )
@@ -966,9 +971,8 @@ IMPL_LINK( BackingWindow, ToolboxHdl, vo
                     sURL = aURLObj.GetMainURL( INetURLObject::NO_DECODE );
 
                     Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
-                        comphelper::getProcessServiceFactory()->createInstance(
-                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SystemShellExecute" ) ) ),
-                        UNO_QUERY_THROW);
+                        com::sun::star::system::SystemShellExecute::create(
+                            ::comphelper::getProcessComponentContext() ) );
                     //throws css::lang::IllegalArgumentException, css::system::SystemShellExecuteException
                     xSystemShellExecute->execute( sURL, rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS);
                 }

Modified: openoffice/branches/ia2/main/framework/source/uielement/controlmenucontroller.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/source/uielement/controlmenucontroller.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/source/uielement/controlmenucontroller.cxx (original)
+++ openoffice/branches/ia2/main/framework/source/uielement/controlmenucontroller.cxx Fri Feb  1 08:46:00 2013
@@ -346,7 +346,7 @@ void ControlMenuController::impl_select(
     }
 }
 
-void SAL_CALL ControlMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
+void SAL_CALL ControlMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException)
 {
     osl::ResettableMutexGuard aLock( m_aMutex );
     

Modified: openoffice/branches/ia2/main/framework/source/uielement/fontmenucontroller.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/source/uielement/fontmenucontroller.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/source/uielement/fontmenucontroller.cxx (original)
+++ openoffice/branches/ia2/main/framework/source/uielement/fontmenucontroller.cxx Fri Feb  1 08:46:00 2013
@@ -187,7 +187,7 @@ void FontMenuController::impl_select(con
 		_xDispatch->dispatch( aTargetURL, aArgs );
 }
 
-void SAL_CALL FontMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
+void SAL_CALL FontMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException)
 {
     osl::MutexGuard aLock( m_aMutex );
     

Modified: openoffice/branches/ia2/main/framework/source/uielement/langselectionmenucontroller.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/source/uielement/langselectionmenucontroller.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/source/uielement/langselectionmenucontroller.cxx (original)
+++ openoffice/branches/ia2/main/framework/source/uielement/langselectionmenucontroller.cxx Fri Feb  1 08:46:00 2013
@@ -54,7 +54,6 @@
 #ifndef _VCL_MNEMONIC_HXX_
 #include <vcl/mnemonic.hxx>
 #endif
-#include <com/sun/star/awt/XMenuExtended.hpp>
 #include <comphelper/processfactory.hxx>
 
 #include <com/sun/star/document/XDocumentLanguages.hpp>

Modified: openoffice/branches/ia2/main/framework/source/uielement/langselectionstatusbarcontroller.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/source/uielement/langselectionstatusbarcontroller.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/source/uielement/langselectionstatusbarcontroller.cxx (original)
+++ openoffice/branches/ia2/main/framework/source/uielement/langselectionstatusbarcontroller.cxx Fri Feb  1 08:46:00 2013
@@ -203,10 +203,7 @@ throw (::com::sun::star::uno::RuntimeExc
     //
 
 	Reference< awt::XWindowPeer > xParent( m_xParentWindow, UNO_QUERY );
-	com::sun::star::awt::Rectangle aRectangle;
-    aRectangle.X = aPos.X;
-	aRectangle.Y = aPos.Y;
-	sal_Int16 nId = xPopupMenu->execute( xParent, aRectangle, com::sun::star::awt::PopupMenuDirection::EXECUTE_UP+16 );
+	sal_Int16 nId = xPopupMenu->execute( xParent, aPos, com::sun::star::awt::PopupMenuDirection::EXECUTE_UP+16 );
     //click "More..."
     if ( nId && m_xFrame.is() )
     {

Modified: openoffice/branches/ia2/main/framework/source/uielement/newmenucontroller.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/source/uielement/newmenucontroller.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/source/uielement/newmenucontroller.cxx (original)
+++ openoffice/branches/ia2/main/framework/source/uielement/newmenucontroller.cxx Fri Feb  1 08:46:00 2013
@@ -412,7 +412,7 @@ void SAL_CALL NewMenuController::statusC
 }
 
 // XMenuListener
-void SAL_CALL NewMenuController::select( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
+void SAL_CALL NewMenuController::itemSelected( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
 {
     Reference< css::awt::XPopupMenu > xPopupMenu;
     Reference< XDispatch >            xDispatch;
@@ -470,7 +470,7 @@ void SAL_CALL NewMenuController::select(
     }
 }
 
-void SAL_CALL NewMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
+void SAL_CALL NewMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException)
 {
     vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
     if ( m_xFrame.is() && m_xPopupMenu.is() )

Modified: openoffice/branches/ia2/main/framework/source/uielement/popupmenucontroller.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/source/uielement/popupmenucontroller.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/source/uielement/popupmenucontroller.cxx (original)
+++ openoffice/branches/ia2/main/framework/source/uielement/popupmenucontroller.cxx Fri Feb  1 08:46:00 2013
@@ -211,7 +211,7 @@ Reference< awt::XWindow > SAL_CALL Popup
 
 		if( !mxPopupMenu.is() )
 		{
-			mxPopupMenu = Reference< awt::XPopupMenu >( getServiceManager()->createInstance( DECLARE_ASCII( "stardiv.Toolkit.VCLXPopupMenu" ) ), UNO_QUERY_THROW );
+			mxPopupMenu = Reference< awt::XPopupMenu >( getServiceManager()->createInstance( DECLARE_ASCII( "com.sun.star.awt.PopupMenu" ) ), UNO_QUERY_THROW );
 			mxPopupMenuController->setPopupMenu( mxPopupMenu );
 		}
 		else
@@ -221,7 +221,7 @@ Reference< awt::XWindow > SAL_CALL Popup
 		}
 		pToolBox->SetItemDown( nItemId, sal_True );
 		Reference< awt::XWindowPeer > xPeer( getParent(), UNO_QUERY_THROW );
-		mxPopupMenu->execute( xPeer, VCLUnoHelper::ConvertToAWTRect( aRect ), 0 );
+		mxPopupMenu->execute( xPeer, awt::Point( aRect.getX(), aRect.getY() ), 0 );
 		pToolBox->SetItemDown( nItemId, sal_False );
 	}
 	catch( Exception& )

Modified: openoffice/branches/ia2/main/framework/source/uielement/recentfilesmenucontroller.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/source/uielement/recentfilesmenucontroller.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/source/uielement/recentfilesmenucontroller.cxx (original)
+++ openoffice/branches/ia2/main/framework/source/uielement/recentfilesmenucontroller.cxx Fri Feb  1 08:46:00 2013
@@ -301,20 +301,18 @@ void SAL_CALL RecentFilesMenuController:
     m_bDisabled = !Event.IsEnabled;
 }
 
-void SAL_CALL RecentFilesMenuController::select( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
+void SAL_CALL RecentFilesMenuController::itemSelected( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
 {
-    Reference< css::awt::XPopupMenu >    xPopupMenu;
-    Reference< css::awt::XMenuExtended > xMenuExt;
+    Reference< css::awt::XPopupMenu > xPopupMenu;
 
     osl::ClearableMutexGuard aLock( m_aMutex );
-    xPopupMenu          = m_xPopupMenu;
-    xMenuExt            = Reference< css::awt::XMenuExtended >( m_xPopupMenu, UNO_QUERY );
+    xPopupMenu = m_xPopupMenu;
     aLock.clear();
 
-    if ( xMenuExt.is() )
+    if ( xPopupMenu.is() )
     {
-        const rtl::OUString aCommand( xMenuExt->getCommand( rEvent.MenuId ) );
-        OSL_TRACE( "RecentFilesMenuController::select() - Command : %s",
+        const rtl::OUString aCommand( xPopupMenu->getCommand( rEvent.MenuId ) );
+        OSL_TRACE( "RecentFilesMenuController::itemSelected() - Command : %s",
                    rtl::OUStringToOString( aCommand, RTL_TEXTENCODING_UTF8 ).getStr() );
 
         if ( aCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( CMD_CLEAR_LIST ) ) )
@@ -324,7 +322,7 @@ void SAL_CALL RecentFilesMenuController:
     }
 }
 
-void SAL_CALL RecentFilesMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
+void SAL_CALL RecentFilesMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException)
 {
     osl::MutexGuard aLock( m_aMutex );
     impl_setPopupMenu();

Modified: openoffice/branches/ia2/main/framework/source/uielement/toolbarsmenucontroller.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/framework/source/uielement/toolbarsmenucontroller.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/framework/source/uielement/toolbarsmenucontroller.cxx (original)
+++ openoffice/branches/ia2/main/framework/source/uielement/toolbarsmenucontroller.cxx Fri Feb  1 08:46:00 2013
@@ -187,8 +187,7 @@ void ToolbarsMenuController::addCommand(
         aLabel = rLabel;
 
 	rPopupMenu->insertItem( nItemId, aLabel, 0, nItemId );
-    Reference< awt::XMenuExtended > xMenuExtended( m_xPopupMenu, UNO_QUERY );
-    xMenuExtended->setCommand( nItemId, rCommandURL );
+    rPopupMenu->setCommand( nItemId, rCommandURL );
 
     bool bInternal = ( rCommandURL.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STATIC_INTERNAL_CMD_PART ))) == 0);
     if ( !bInternal )
@@ -377,9 +376,8 @@ void ToolbarsMenuController::fillPopupMe
     m_aCommandVector.clear();
 
     // Retrieve layout manager for additional information
-    rtl::OUString                   aEmptyString;
-    Reference< awt::XMenuExtended > xMenuExtended( rPopupMenu, UNO_QUERY );
-    Reference< XLayoutManager >     xLayoutManager( getLayoutManagerFromFrame( m_xFrame ));
+    rtl::OUString aEmptyString;
+    Reference< XLayoutManager > xLayoutManager( getLayoutManagerFromFrame( m_xFrame ));
 
     m_bResetActive = sal_False;
     if ( xLayoutManager.is() )
@@ -490,7 +488,7 @@ void ToolbarsMenuController::fillPopupMe
 
             // Store complete uno-command so it can also be dispatched. This is necessary to support
             // the test tool!
-		    xMenuExtended->setCommand( nIndex, aCmd );
+		    rPopupMenu->setCommand( nIndex, aCmd );
             ++nIndex;
         }
 
@@ -619,7 +617,7 @@ void SAL_CALL ToolbarsMenuController::st
 }
 
 // XMenuListener
-void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
+void SAL_CALL ToolbarsMenuController::itemSelected( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
 {
     Reference< css::awt::XPopupMenu >   xPopupMenu;
     Reference< XMultiServiceFactory >   xServiceManager;
@@ -780,7 +778,7 @@ void SAL_CALL ToolbarsMenuController::se
     }
 }
 
-void SAL_CALL ToolbarsMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
+void SAL_CALL ToolbarsMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException)
 {
     std::vector< rtl::OUString >   aCmdVector;
     Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );

Modified: openoffice/branches/ia2/main/graphite/graphite-2.3.1.patch
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/graphite/graphite-2.3.1.patch?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/graphite/graphite-2.3.1.patch (original)
+++ openoffice/branches/ia2/main/graphite/graphite-2.3.1.patch Fri Feb  1 08:46:00 2013
@@ -2394,3 +2394,16 @@
  {
  	bool fRet = true;
  
+--- misc/silgraphite-2.3.1/engine/include/graphite/GrFeature.h		2009-01-21 17:36:40.000000000 -0500
++++ misc/build/silgraphite-2.3.1/engine/include/graphite/GrFeature.h	2013-01-15 15:38:54.000000000 -0500
+@@ -21,6 +21,10 @@
+ 
+ //:End Ignore
+ 
++#ifdef __FreeBSD__
++#define wstring basic_string<wchar_t> //quick dirty hack for not finding _STL::wstring
++#endif
++
+ #include "GrAppData.h"
+ 
+ namespace gr

Modified: openoffice/branches/ia2/main/helpauthoring/Addons.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/helpauthoring/Addons.xcu?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/helpauthoring/Addons.xcu (original)
+++ openoffice/branches/ia2/main/helpauthoring/Addons.xcu Fri Feb  1 08:46:00 2013
@@ -22,547 +22,190 @@
 
 
 <oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Addons" oor:package="org.openoffice.Office">
-	<node oor:name="AddonUI">
-		<node oor:name="OfficeMenuBar">
-			<node oor:name="org.openoffice.helpauthoring" oor:op="replace">
-				<prop oor:name="Title" oor:type="xs:string">
-					<value/>
-					<value xml:lang="en-US">Help Authoring</value>
-				</prop>
-				<prop oor:name="Context" oor:type="xs:string">
-					<value>com.sun.star.text.TextDocument</value>
-				</prop>
-				<node oor:name="Submenu">
-					<node oor:name="m01" oor:op="replace">
-						<prop oor:name="URL" oor:type="xs:string">
-							<value>vnd.sun.star.script:HelpAuthoring._Main.CreateFile?language=Basic&amp;location=application</value>
-						</prop>
-						<prop oor:name="Title" oor:type="xs:string">
-							<value/>
-							<value xml:lang="en-US">Create Help File</value>
-						</prop>
-					</node>
-					<node oor:name="m02" oor:op="replace">
-						<prop oor:name="URL" oor:type="xs:string">
-							<value>vnd.sun.star.script:HelpAuthoring._Main.DisplayVersion?language=Basic&amp;location=application</value>
-						</prop>
-						<prop oor:name="Title" oor:type="xs:string">
-							<value/>
-							<value xml:lang="en-US">About</value>
-						</prop>
-					</node>
-					<node oor:name="m03" oor:op="replace">
-						<prop oor:name="URL" oor:type="xs:string">
-							<value>vnd.sun.star.script:HelpAuthoring.Helpers.SetDocumentRoot?language=Basic&amp;location=application</value>
-						</prop>
-						<prop oor:name="Title" oor:type="xs:string">
-							<value/>
-							<value xml:lang="en-US">Set Document Root</value>
-						</prop>
-					</node>
-					<node oor:name="m04" oor:op="replace">
-						<prop oor:name="URL" oor:type="xs:string">
-							<value>vnd.sun.star.script:HelpAuthoring.Meta.Main?language=Basic&amp;location=application</value>
-						</prop>
-						<prop oor:name="Title" oor:type="xs:string">
-							<value/>
-							<value xml:lang="en-US">Edit Meta Data </value>
-						</prop>
-					</node>
-					<node oor:name="m05" oor:op="replace">
-						<prop oor:name="URL" oor:type="xs:string">
-							<value>vnd.sun.star.script:HelpAuthoring.Validate.Validate?language=Basic&amp;location=application</value>
-						</prop>
-						<prop oor:name="Title" oor:type="xs:string">
-							<value/>
-							<value xml:lang="en-US">Validate this Help File </value>
-						</prop>
-					</node>
-					<node oor:name="m06" oor:op="replace">
-						<prop oor:name="URL" oor:type="xs:string">
-							<value>vnd.sun.star.script:HelpAuthoring.OtherElements.ToggleParaL10NStatus?language=Basic&amp;location=application</value>
-						</prop>
-						<prop oor:name="Title" oor:type="xs:string">
-							<value/>
-							<value xml:lang="en-US">Toggle L10N </value>
-						</prop>
-					</node>
-					<node oor:name="m07" oor:op="replace">
-						<prop oor:name="URL" oor:type="xs:string">
-							<value>vnd.sun.star.script:HelpAuthoring.Helpers.InsertNewParaData?language=Basic&amp;location=application</value>
-						</prop>
-						<prop oor:name="Title" oor:type="xs:string">
-							<value/>
-							<value xml:lang="en-US">Assign ID </value>
-						</prop>
-					</node>
-					<node oor:name="m08" oor:op="replace">
-						<prop oor:name="URL" oor:type="xs:string">
-							<value>vnd.sun.star.script:HelpAuthoring.Comment.Main?language=Basic&amp;location=application</value>
-						</prop>
-						<prop oor:name="Title" oor:type="xs:string">
-							<value/>
-							<value xml:lang="en-US">Insert Comment </value>
-						</prop>
-					</node>
-					<node oor:name="m09" oor:op="replace">
-						<prop oor:name="URL" oor:type="xs:string">
-							<value>vnd.sun.star.script:HelpAuthoring.Table.Main?language=Basic&amp;location=application</value>
-						</prop>
-						<prop oor:name="Title" oor:type="xs:string">
-							<value/>
-							<value xml:lang="en-US">Insert Table </value>
-						</prop>
-					</node>
-					<node oor:name="m10" oor:op="replace">
-						<prop oor:name="URL" oor:type="xs:string">
-							<value>vnd.sun.star.script:HelpAuthoring.Link.Main?language=Basic&amp;location=application</value>
-						</prop>
-						<prop oor:name="Title" oor:type="xs:string">
-							<value/>
-							<value xml:lang="en-US">Insert Link </value>
-						</prop>
-					</node>
-					<node oor:name="m11" oor:op="replace">
-						<prop oor:name="URL" oor:type="xs:string">
-							<value>vnd.sun.star.script:HelpAuthoring.HID.Main?language=Basic&amp;location=application</value>
-						</prop>
-						<prop oor:name="Title" oor:type="xs:string">
-							<value/>
-							<value xml:lang="en-US">Insert Help ID </value>
-						</prop>
-					</node>
-					<node oor:name="m12" oor:op="replace">
-						<prop oor:name="URL" oor:type="xs:string">
-							<value>vnd.sun.star.script:HelpAuthoring.IND.Main?language=Basic&amp;location=application</value>
-						</prop>
-						<prop oor:name="Title" oor:type="xs:string">
-							<value/>
-							<value xml:lang="en-US">Insert Index Entry </value>
-						</prop>
-					</node>
-					<node oor:name="m13" oor:op="replace">
-						<prop oor:name="URL" oor:type="xs:string">
-							<value>vnd.sun.star.script:HelpAuthoring.OtherElements.InsertExtendedTip?language=Basic&amp;location=application</value>
-						</prop>
-						<prop oor:name="Title" oor:type="xs:string">
-							<value/>
-							<value xml:lang="en-US">Insert Extended Tip </value>
-						</prop>
-					</node>
-					<node oor:name="m14" oor:op="replace">
-						<prop oor:name="URL" oor:type="xs:string">
-							<value>vnd.sun.star.script:HelpAuthoring.OtherElements.InsertHowToGet?language=Basic&amp;location=application</value>
-						</prop>
-						<prop oor:name="Title" oor:type="xs:string">
-							<value/>
-							<value xml:lang="en-US">&quot;How to Get&quot; Section </value>
-						</prop>
-					</node>
-					<node oor:name="m15" oor:op="replace">
-						<prop oor:name="URL" oor:type="xs:string">
-							<value>vnd.sun.star.script:HelpAuthoring.OtherElements.InsertGraphic?language=Basic&amp;location=application</value>
-						</prop>
-						<prop oor:name="Title" oor:type="xs:string">
-							<value/>
-							<value xml:lang="en-US">Insert Image </value>
-						</prop>
-					</node>
-					<node oor:name="m16" oor:op="replace">
-						<prop oor:name="URL" oor:type="xs:string">
-							<value>vnd.sun.star.script:HelpAuthoring.OtherElements.InsertSection?language=Basic&amp;location=application</value>
-						</prop>
-						<prop oor:name="Title" oor:type="xs:string">
-							<value/>
-							<value xml:lang="en-US">Insert Section </value>
-						</prop>
-					</node>
-					<node oor:name="m17" oor:op="replace">
-						<prop oor:name="URL" oor:type="xs:string">
-							<value>vnd.sun.star.script:HelpAuthoring.OtherElements.InsertVariable?language=Basic&amp;location=application</value>
-						</prop>
-						<prop oor:name="Title" oor:type="xs:string">
-							<value/>
-							<value xml:lang="en-US">Insert Variable </value>
-						</prop>
-					</node>
-					<node oor:name="m18" oor:op="replace">
-						<prop oor:name="URL" oor:type="xs:string">
-							<value>vnd.sun.star.script:HelpAuthoring.Embed.Main?language=Basic&amp;location=application</value>
-						</prop>
-						<prop oor:name="Title" oor:type="xs:string">
-							<value/>
-							<value xml:lang="en-US">Transclude (Embed) </value>
-						</prop>
-					</node>
-					<node oor:name="m19" oor:op="replace">
-						<prop oor:name="URL" oor:type="xs:string">
-							<value>vnd.sun.star.script:HelpAuthoring.OtherElements.InsertRelatedTopics?language=Basic&amp;location=application</value>
-						</prop>
-						<prop oor:name="Title" oor:type="xs:string">
-							<value/>
-							<value xml:lang="en-US">&quot;Related Topics&quot; Section </value>
-						</prop>
-					</node>
-				</node>
-			</node>
-		</node>
-		<!--
-		<node oor:name="OfficeToolBar">
-			<node oor:name="org.openoffice.helpauthoring" oor:op="replace">
-				<prop oor:name="Title" oor:type="xs:string">
-					<value/>
-					<value xml:lang="en-US">Help Authoring</value>
-				</prop>
-				<prop oor:name="Context" oor:type="xs:string">
-					<value>com.sun.star.text.TextDocument</value>
-				</prop>
-				<node oor:name="m01" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-						<value>vnd.sun.star.script:HelpAuthoring._Main.CreateFile?language=Basic&amp;location=application</value>
-					</prop>
-					<prop oor:name="Title" oor:type="xs:string">
-						<value/>
-						<value xml:lang="en-US">Create Help File</value>
-					</prop>
-					<prop oor:name="ImageIdentifier" oor:type="xs:string">
-						<value xml:lang="en-US">images/favorites.png</value>
-					</prop>
-					<prop oor:name="Target" oor:type="xs:string">
-						<value>_self</value>
-					</prop>
-					<prop oor:name="Context" oor:type="xs:string">
-						<value>com.sun.star.text.TextDocument</value>
-					</prop>
-				</node>
-					
-				<node oor:name="m02" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-						<value>vnd.sun.star.script:HelpAuthoring._Main.DisplayVersion?language=Basic&amp;location=application</value>
-					</prop>
-					<prop oor:name="Title" oor:type="xs:string">
-						<value/>
-						<value xml:lang="en-US">About</value>
-					</prop>
-					<prop oor:name="ImageIdentifier" oor:type="xs:string">
-						<value/>
-					</prop>
-					<prop oor:name="Target" oor:type="xs:string">
-						<value>_self</value>
-					</prop>
-					<prop oor:name="Context" oor:type="xs:string">
-						<value>com.sun.star.text.TextDocument</value>
-					</prop>
-				</node>
-					
-				<node oor:name="m03" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-						<value>vnd.sun.star.script:HelpAuthoring.Helpers.SetDocumentRoot?language=Basic&amp;location=application</value>
-					</prop>
-					<prop oor:name="Title" oor:type="xs:string">
-						<value/>
-						<value xml:lang="en-US">Set Document Root</value>
-					</prop>
-					<prop oor:name="ImageIdentifier" oor:type="xs:string">
-						<value/>
-					</prop>
-					<prop oor:name="Target" oor:type="xs:string">
-						<value>_self</value>
-					</prop>
-					<prop oor:name="Context" oor:type="xs:string">
-						<value>com.sun.star.text.TextDocument</value>
-					</prop>
-				</node>
-				<node oor:name="m04" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-						<value>vnd.sun.star.script:HelpAuthoring.Meta.Main?language=Basic&amp;location=application</value>
-					</prop>
-					<prop oor:name="Title" oor:type="xs:string">
-						<value/>
-						<value xml:lang="en-US">Edit Meta Data </value>
-					</prop>
-					<prop oor:name="ImageIdentifier" oor:type="xs:string">
-						<value/>
-					</prop>
-					<prop oor:name="Target" oor:type="xs:string">
-						<value>_self</value>
-					</prop>
-					<prop oor:name="Context" oor:type="xs:string">
-						<value>com.sun.star.text.TextDocument</value>
-					</prop>
-				</node>
-				<node oor:name="m05" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-						<value>vnd.sun.star.script:HelpAuthoring.Validate.Validate?language=Basic&amp;location=application</value>
-					</prop>
-					<prop oor:name="Title" oor:type="xs:string">
-						<value/>
-						<value xml:lang="en-US">Validate this Help File </value>
-					</prop>
-					<prop oor:name="ImageIdentifier" oor:type="xs:string">
-						<value/>
-					</prop>
-					<prop oor:name="Target" oor:type="xs:string">
-						<value>_self</value>
-					</prop>
-					<prop oor:name="Context" oor:type="xs:string">
-						<value>com.sun.star.text.TextDocument</value>
-					</prop>
-				</node>
-				<node oor:name="m06" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-						<value>vnd.sun.star.script:HelpAuthoring.OtherElements.ToggleParaL10NStatus?language=Basic&amp;location=application</value>
-					</prop>
-					<prop oor:name="Title" oor:type="xs:string">
-						<value/>
-						<value xml:lang="en-US">Toggle L10N </value>
-					</prop>
-					<prop oor:name="ImageIdentifier" oor:type="xs:string">
-						<value/>
-					</prop>
-					<prop oor:name="Target" oor:type="xs:string">
-						<value>_self</value>
-					</prop>
-					<prop oor:name="Context" oor:type="xs:string">
-						<value>com.sun.star.text.TextDocument</value>
-					</prop>
-				</node>
-				<node oor:name="m07" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-						<value>vnd.sun.star.script:HelpAuthoring.Helpers.InsertNewParaData?language=Basic&amp;location=application</value>
-					</prop>
-					<prop oor:name="Title" oor:type="xs:string">
-						<value/>
-						<value xml:lang="en-US">Assign ID </value>
-					</prop>
-					<prop oor:name="ImageIdentifier" oor:type="xs:string">
-						<value/>
-					</prop>
-					<prop oor:name="Target" oor:type="xs:string">
-						<value>_self</value>
-					</prop>
-					<prop oor:name="Context" oor:type="xs:string">
-						<value>com.sun.star.text.TextDocument</value>
-					</prop>
-				</node>
-				<node oor:name="m08" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-						<value>vnd.sun.star.script:HelpAuthoring.Comment.Main?language=Basic&amp;location=application</value>
-					</prop>
-					<prop oor:name="Title" oor:type="xs:string">
-						<value/>
-						<value xml:lang="en-US">Insert Comment </value>
-					</prop>
-					<prop oor:name="ImageIdentifier" oor:type="xs:string">
-						<value/>
-					</prop>
-					<prop oor:name="Target" oor:type="xs:string">
-						<value>_self</value>
-					</prop>
-					<prop oor:name="Context" oor:type="xs:string">
-						<value>com.sun.star.text.TextDocument</value>
-					</prop>
-				</node>
-				<node oor:name="m09" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-						<value>vnd.sun.star.script:HelpAuthoring.Table.Main?language=Basic&amp;location=application</value>
-					</prop>
-					<prop oor:name="Title" oor:type="xs:string">
-						<value/>
-						<value xml:lang="en-US">Insert Table </value>
-					</prop>
-					<prop oor:name="ImageIdentifier" oor:type="xs:string">
-						<value/>
-					</prop>
-					<prop oor:name="Target" oor:type="xs:string">
-						<value>_self</value>
-					</prop>
-					<prop oor:name="Context" oor:type="xs:string">
-						<value>com.sun.star.text.TextDocument</value>
-					</prop>
-				</node>
-				<node oor:name="m10" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-						<value>vnd.sun.star.script:HelpAuthoring.Link.Main?language=Basic&amp;location=application</value>
-					</prop>
-					<prop oor:name="Title" oor:type="xs:string">
-						<value/>
-						<value xml:lang="en-US">Insert Link </value>
-					</prop>
-					<prop oor:name="ImageIdentifier" oor:type="xs:string">
-						<value/>
-					</prop>
-					<prop oor:name="Target" oor:type="xs:string">
-						<value>_self</value>
-					</prop>
-					<prop oor:name="Context" oor:type="xs:string">
-						<value>com.sun.star.text.TextDocument</value>
-					</prop>
-				</node>
-				<node oor:name="m11" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-						<value>vnd.sun.star.script:HelpAuthoring.HID.Main?language=Basic&amp;location=application</value>
-					</prop>
-					<prop oor:name="Title" oor:type="xs:string">
-						<value/>
-						<value xml:lang="en-US">Insert Help ID </value>
-					</prop>
-					<prop oor:name="ImageIdentifier" oor:type="xs:string">
-						<value/>
-					</prop>
-					<prop oor:name="Target" oor:type="xs:string">
-						<value>_self</value>
-					</prop>
-					<prop oor:name="Context" oor:type="xs:string">
-						<value>com.sun.star.text.TextDocument</value>
-					</prop>
-				</node>
-				<node oor:name="m12" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-						<value>vnd.sun.star.script:HelpAuthoring.IND.Main?language=Basic&amp;location=application</value>
-					</prop>
-					<prop oor:name="Title" oor:type="xs:string">
-						<value/>
-						<value xml:lang="en-US">Insert Index Entry </value>
-					</prop>
-					<prop oor:name="ImageIdentifier" oor:type="xs:string">
-						<value/>
-					</prop>
-					<prop oor:name="Target" oor:type="xs:string">
-						<value>_self</value>
-					</prop>
-					<prop oor:name="Context" oor:type="xs:string">
-						<value>com.sun.star.text.TextDocument</value>
-					</prop>
-				</node>
-				<node oor:name="m13" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-						<value>vnd.sun.star.script:HelpAuthoring.OtherElements.InsertExtendedTip?language=Basic&amp;location=application</value>
-					</prop>
-					<prop oor:name="Title" oor:type="xs:string">
-						<value/>
-						<value xml:lang="en-US">Insert Extended Tip </value>
-					</prop>
-					<prop oor:name="ImageIdentifier" oor:type="xs:string">
-						<value/>
-					</prop>
-					<prop oor:name="Target" oor:type="xs:string">
-						<value>_self</value>
-					</prop>
-					<prop oor:name="Context" oor:type="xs:string">
-						<value>com.sun.star.text.TextDocument</value>
-					</prop>
-				</node>
-				<node oor:name="m14" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-						<value>vnd.sun.star.script:HelpAuthoring.OtherElements.InsertHowToGet?language=Basic&amp;location=application</value>
-					</prop>
-					<prop oor:name="Title" oor:type="xs:string">
-						<value/>
-						<value xml:lang="en-US">&quot;How to Get&quot; Section </value>
-					</prop>
-					<prop oor:name="ImageIdentifier" oor:type="xs:string">
-						<value/>
-					</prop>
-					<prop oor:name="Target" oor:type="xs:string">
-						<value>_self</value>
-					</prop>
-					<prop oor:name="Context" oor:type="xs:string">
-						<value>com.sun.star.text.TextDocument</value>
-					</prop>
-				</node>
-				<node oor:name="m15" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-						<value>vnd.sun.star.script:HelpAuthoring.OtherElements.InsertGraphic?language=Basic&amp;location=application</value>
-					</prop>
-					<prop oor:name="Title" oor:type="xs:string">
-						<value/>
-						<value xml:lang="en-US">Insert Image </value>
-					</prop>
-					<prop oor:name="ImageIdentifier" oor:type="xs:string">
-						<value/>
-					</prop>
-					<prop oor:name="Target" oor:type="xs:string">
-						<value>_self</value>
-					</prop>
-					<prop oor:name="Context" oor:type="xs:string">
-						<value>com.sun.star.text.TextDocument</value>
-					</prop>
-				</node>
-				<node oor:name="m16" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-						<value>vnd.sun.star.script:HelpAuthoring.OtherElements.InsertSection?language=Basic&amp;location=application</value>
-					</prop>
-					<prop oor:name="Title" oor:type="xs:string">
-						<value/>
-						<value xml:lang="en-US">Insert Section </value>
-					</prop>
-					<prop oor:name="ImageIdentifier" oor:type="xs:string">
-						<value/>
-					</prop>
-					<prop oor:name="Target" oor:type="xs:string">
-						<value>_self</value>
-					</prop>
-					<prop oor:name="Context" oor:type="xs:string">
-						<value>com.sun.star.text.TextDocument</value>
-					</prop>
-				</node>
-				<node oor:name="m17" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-						<value>vnd.sun.star.script:HelpAuthoring.OtherElements.InsertVariable?language=Basic&amp;location=application</value>
-					</prop>
-					<prop oor:name="Title" oor:type="xs:string">
-						<value/>
-						<value xml:lang="en-US">Insert Variable </value>
-					</prop>
-					<prop oor:name="ImageIdentifier" oor:type="xs:string">
-						<value/>
-					</prop>
-					<prop oor:name="Target" oor:type="xs:string">
-						<value>_self</value>
-					</prop>
-					<prop oor:name="Context" oor:type="xs:string">
-						<value>com.sun.star.text.TextDocument</value>
-					</prop>
-				</node>
-				<node oor:name="m18" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-						<value>vnd.sun.star.script:HelpAuthoring.Embed.Main?language=Basic&amp;location=application</value>
-					</prop>
-					<prop oor:name="Title" oor:type="xs:string">
-						<value/>
-						<value xml:lang="en-US">Transclude (Embed) </value>
-					</prop>
-					<prop oor:name="ImageIdentifier" oor:type="xs:string">
-						<value/>
-					</prop>
-					<prop oor:name="Target" oor:type="xs:string">
-						<value>_self</value>
-					</prop>
-					<prop oor:name="Context" oor:type="xs:string">
-						<value>com.sun.star.text.TextDocument</value>
-					</prop>
-				</node>
-				<node oor:name="m19" oor:op="replace">
-					<prop oor:name="URL" oor:type="xs:string">
-						<value>vnd.sun.star.script:HelpAuthoring.OtherElements.InsertRelatedTopics?language=Basic&amp;location=application</value>
-					</prop>
-					<prop oor:name="Title" oor:type="xs:string">
-						<value/>
-						<value xml:lang="en-US">&quot;Related Topics&quot; Section </value>
-					</prop>
-					<prop oor:name="ImageIdentifier" oor:type="xs:string">
-						<value/>
-					</prop>
-					<prop oor:name="Target" oor:type="xs:string">
-						<value>_self</value>
-					</prop>
-					<prop oor:name="Context" oor:type="xs:string">
-						<value>com.sun.star.text.TextDocument</value>
-					</prop>
-				</node>
-			</node>
-		</node>
-		//-->
-	</node>
+    <node oor:name="AddonUI">
+        <node oor:name="OfficeMenuBar">
+            <node oor:name="org.openoffice.helpauthoring" oor:op="replace">
+                <prop oor:name="Title" oor:type="xs:string">
+                    <value/>
+                    <value xml:lang="en-US">Help Authoring</value>
+                </prop>
+                <prop oor:name="Context" oor:type="xs:string">
+                    <value>com.sun.star.text.TextDocument</value>
+                </prop>
+                <node oor:name="Submenu">
+                    <node oor:name="m01" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>vnd.sun.star.script:HelpAuthoring._Main.CreateFile?language=Basic&amp;location=application</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Create Help File</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m02" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>vnd.sun.star.script:HelpAuthoring._Main.DisplayVersion?language=Basic&amp;location=application</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">About</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m03" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>vnd.sun.star.script:HelpAuthoring.Helpers.SetDocumentRoot?language=Basic&amp;location=application</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Set Document Root</value>
+                        </prop>
+                    </node>
+                    <node oor:name="m04" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>vnd.sun.star.script:HelpAuthoring.Meta.Main?language=Basic&amp;location=application</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Edit Meta Data </value>
+                        </prop>
+                    </node>
+                    <node oor:name="m05" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>vnd.sun.star.script:HelpAuthoring.Validate.Validate?language=Basic&amp;location=application</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Validate this Help File </value>
+                        </prop>
+                    </node>
+                    <node oor:name="m06" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>vnd.sun.star.script:HelpAuthoring.OtherElements.ToggleParaL10NStatus?language=Basic&amp;location=application</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Toggle L10N </value>
+                        </prop>
+                    </node>
+                    <node oor:name="m07" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>vnd.sun.star.script:HelpAuthoring.Helpers.InsertNewParaData?language=Basic&amp;location=application</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Assign ID </value>
+                        </prop>
+                    </node>
+                    <node oor:name="m08" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>vnd.sun.star.script:HelpAuthoring.Comment.Main?language=Basic&amp;location=application</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Insert Comment </value>
+                        </prop>
+                    </node>
+                    <node oor:name="m09" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>vnd.sun.star.script:HelpAuthoring.Table.Main?language=Basic&amp;location=application</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Insert Table </value>
+                        </prop>
+                    </node>
+                    <node oor:name="m10" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>vnd.sun.star.script:HelpAuthoring.Link.Main?language=Basic&amp;location=application</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Insert Link </value>
+                        </prop>
+                    </node>
+                    <node oor:name="m11" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>vnd.sun.star.script:HelpAuthoring.HID.Main?language=Basic&amp;location=application</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Insert Help ID </value>
+                        </prop>
+                    </node>
+                    <node oor:name="m12" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>vnd.sun.star.script:HelpAuthoring.IND.Main?language=Basic&amp;location=application</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Insert Index Entry </value>
+                        </prop>
+                    </node>
+                    <node oor:name="m13" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>vnd.sun.star.script:HelpAuthoring.OtherElements.InsertExtendedTip?language=Basic&amp;location=application</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Insert Extended Tip </value>
+                        </prop>
+                    </node>
+                    <node oor:name="m14" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>vnd.sun.star.script:HelpAuthoring.OtherElements.InsertHowToGet?language=Basic&amp;location=application</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">&quot;How to Get&quot; Section </value>
+                        </prop>
+                    </node>
+                    <node oor:name="m15" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>vnd.sun.star.script:HelpAuthoring.OtherElements.InsertGraphic?language=Basic&amp;location=application</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Insert Image </value>
+                        </prop>
+                    </node>
+                    <node oor:name="m16" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>vnd.sun.star.script:HelpAuthoring.OtherElements.InsertSection?language=Basic&amp;location=application</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Insert Section </value>
+                        </prop>
+                    </node>
+                    <node oor:name="m17" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>vnd.sun.star.script:HelpAuthoring.OtherElements.InsertVariable?language=Basic&amp;location=application</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Insert Variable </value>
+                        </prop>
+                    </node>
+                    <node oor:name="m18" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>vnd.sun.star.script:HelpAuthoring.Embed.Main?language=Basic&amp;location=application</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">Transclude (Embed) </value>
+                        </prop>
+                    </node>
+                    <node oor:name="m19" oor:op="replace">
+                        <prop oor:name="URL" oor:type="xs:string">
+                            <value>vnd.sun.star.script:HelpAuthoring.OtherElements.InsertRelatedTopics?language=Basic&amp;location=application</value>
+                        </prop>
+                        <prop oor:name="Title" oor:type="xs:string">
+                            <value/>
+                            <value xml:lang="en-US">&quot;Related Topics&quot; Section </value>
+                        </prop>
+                    </node>
+                </node>
+            </node>
+        </node>
+    </node>
 </oor:component-data>

Modified: openoffice/branches/ia2/main/helpcontent2/source/text/shared/00/00000021.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/helpcontent2/source/text/shared/00/00000021.xhp?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/helpcontent2/source/text/shared/00/00000021.xhp (original)
+++ openoffice/branches/ia2/main/helpcontent2/source/text/shared/00/00000021.xhp Fri Feb  1 08:46:00 2013
@@ -217,10 +217,10 @@
                <paragraph xml-lang="en-US" id="par_id0514200811565762" role="tablecontent" l10n="NEW">ODF 1.2</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0519200811530440" role="tablecontent" l10n="NEW">to be announced</paragraph>
+               <paragraph xml-lang="en-US" id="par_id0519200811530440" role="tablecontent" l10n="NEW">2011-09-29</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph role="tablecontent" id="par_id0519200811530471" xml-lang="en-US" l10n="NEW">OpenOffice.org 3, StarOffice 9, Oracle Open Office</paragraph>
+               <paragraph role="tablecontent" id="par_id0519200811530471" xml-lang="en-US" l10n="NEW">OpenOffice.org 3, StarOffice 9, Apache Open Office</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
@@ -263,7 +263,7 @@
 <paragraph role="heading" id="hd_id3154299" xml-lang="en-US" level="2" l10n="U" oldref="38">Definition of the XML formats</paragraph>
 <paragraph role="paragraph" id="par_idN10AAD" xml-lang="en-US" l10n="NEW">The schema for the OpenDocument formats can be found on the <link href="http://www.oasis-open.org">www.oasis-open.org</link> web site.</paragraph>
 <paragraph role="paragraph" id="par_id3149561" xml-lang="en-US" l10n="CHG" oldref="39">The DTD (Document Type Description) files for the older formats can be found in the installation folder.<comment>removed path</comment></paragraph>
-<paragraph role="paragraph" id="par_id3152596" xml-lang="en-US" l10n="U" oldref="40">Note that the formats are subject to certain licenses. You can find notes on the licenses at the start of the DTD files. More detailed information can be found on the <link href="http://www.openoffice.org" name="OpenOffice.org">OpenOffice.org</link> website.</paragraph>
+<paragraph role="paragraph" id="par_id3152596" xml-lang="en-US" l10n="U" oldref="40">Note that the formats are subject to certain licenses. You can find notes on the licenses at the start of the DTD files. More detailed information can be found on the <link href="http://www.openoffice.org" name="Apache OpenOffice">Apache OpenOffice</link> website.</paragraph>
 <section id="relatedtopics">
 <embed href="text/shared/guide/doc_open.xhp#doc_open"/>
 <embed href="text/shared/guide/doc_save.xhp#doc_save"/>

Modified: openoffice/branches/ia2/main/helpcontent2/source/text/shared/01/06150200.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/helpcontent2/source/text/shared/01/06150200.xhp?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/helpcontent2/source/text/shared/01/06150200.xhp (original)
+++ openoffice/branches/ia2/main/helpcontent2/source/text/shared/01/06150200.xhp Fri Feb  1 08:46:00 2013
@@ -65,7 +65,7 @@
 <paragraph role="heading" id="hd_id3163802" xml-lang="en-US" level="3" l10n="U" oldref="15">Transform file</paragraph>
 <bookmark xml-lang="en-US" branch="hid/FILTER_HID_XML_FILTER_TEST_IMPORT_DISPLAY_SOURCE" id="bm_id3149812" localize="false"/>
 <paragraph role="heading" id="hd_id3147242" xml-lang="en-US" level="4" l10n="U" oldref="16">Display source</paragraph>
-<paragraph role="paragraph" id="par_id3150444" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="HID_XML_FILTER_TEST_IMPORT_DISPLAY_SOURCE">Opens the <embedvar href="text/shared/01/06150210.xhp#xmlfilteroutput"/> window, where the XML source of the selected document is displayed. The document is used to test the import filter.</ahelp> The <emph>Validate</emph> button in the window validates the XML source of the document against the OpenOffice.org DTD.</paragraph>
+<paragraph role="paragraph" id="par_id3150444" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="HID_XML_FILTER_TEST_IMPORT_DISPLAY_SOURCE">Opens the <embedvar href="text/shared/01/06150210.xhp#xmlfilteroutput"/> window, where the XML source of the selected document is displayed. The document is used to test the import filter.</ahelp> The <emph>Validate</emph> button in the window validates the XML source of the document.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/FILTER_HID_XML_FILTER_TEST_IMPORT_BROWSE" id="bm_id3154577" localize="false"/>
 <paragraph role="heading" id="hd_id3147078" xml-lang="en-US" level="4" l10n="U" oldref="18">Browse</paragraph>
 <paragraph role="paragraph" id="par_id3149885" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="HID_XML_FILTER_TEST_IMPORT_BROWSE">Opens a file selection dialog. The selected file is opened using the current XML import filter.</ahelp></paragraph>

Modified: openoffice/branches/ia2/main/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/helpcontent2/source/text/shared/explorer/database/rep_main.xhp?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/helpcontent2/source/text/shared/explorer/database/rep_main.xhp (original)
+++ openoffice/branches/ia2/main/helpcontent2/source/text/shared/explorer/database/rep_main.xhp Fri Feb  1 08:46:00 2013
@@ -33,7 +33,7 @@
    </meta>
    <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id1614429"><bookmark_value>Report Builder</bookmark_value>
-<bookmark_value>Oracle Report Builder</bookmark_value>
+<bookmark_value>Apache OpenOffice Report Builder</bookmark_value>
 </bookmark>
 <paragraph xml-lang="en-US" id="hd_id8773155" role="heading" level="1" l10n="NEW"><variable id="rep_main"><link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link>
 </variable></paragraph>
@@ -245,4 +245,4 @@
 	</image> and double-click your last saved report. A new Writer document will be created which shows the new data.</paragraph>
       <paragraph xml-lang="en-US" id="par_id8147221" role="paragraph" l10n="NEW">To print a report, choose <item type="menuitem">File - Print</item> from the Writer document.</paragraph>
    </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>

Modified: openoffice/branches/ia2/main/helpcontent2/source/text/shared/guide/assistive.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/helpcontent2/source/text/shared/guide/assistive.xhp?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/helpcontent2/source/text/shared/guide/assistive.xhp (original)
+++ openoffice/branches/ia2/main/helpcontent2/source/text/shared/guide/assistive.xhp Fri Feb  1 08:46:00 2013
@@ -43,7 +43,7 @@
 <paragraph role="heading" id="hd_id3147399" xml-lang="en-US" level="1" l10n="U" oldref="22"><variable id="assistive"><link href="text/shared/guide/assistive.xhp" name="Assistive Tools in $[officename]">Assistive Tools in $[officename]</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3143267" xml-lang="en-US" l10n="U" oldref="25">$[officename] supports some assistive technology tools like screen magnification software, screen readers, and on-screen keyboards. Most of these tools communicate with $[officename] by means of the Java(TM) Access Bridge software, that uses the Java Accessibility API, a part of the Java runtime environment.</paragraph>
-<paragraph role="tip" id="par_id8847010" xml-lang="en-US" l10n="NEW">A current list of supported assistive tools can be found on the OpenOffice.org Wiki at <link href="http://wiki.services.openoffice.org/wiki/Accessibility">http://wiki.services.openoffice.org/wiki/Accessibility</link>.</paragraph>
+<paragraph role="tip" id="par_id8847010" xml-lang="en-US" l10n="NEW">A current list of supported assistive tools can be found on the Apache OpenOffice Wiki at <link href="http://wiki.services.openoffice.org/wiki/Accessibility">http://wiki.services.openoffice.org/wiki/Accessibility</link>.</paragraph>
 <paragraph role="heading" id="hd_id3145345" xml-lang="en-US" level="2" l10n="U" oldref="12">Requirements to use assistive tools in $[officename]</paragraph>
 <list type="unordered">
 <listitem>

Modified: openoffice/branches/ia2/main/helpcontent2/source/text/shared/guide/language_select.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/helpcontent2/source/text/shared/guide/language_select.xhp?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/helpcontent2/source/text/shared/guide/language_select.xhp (original)
+++ openoffice/branches/ia2/main/helpcontent2/source/text/shared/guide/language_select.xhp Fri Feb  1 08:46:00 2013
@@ -148,7 +148,7 @@
             <paragraph xml-lang="en-US" id="par_id121158" role="paragraph" l10n="NEW">Select another UI language in the "User interface" listbox.</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3806878" role="paragraph" l10n="NEW">Click OK and restart the OpenOffice.org software.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3806878" role="paragraph" l10n="NEW">Click OK and restart the %PRODUCTNAME software.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id130619" role="paragraph" l10n="NEW">If the listbox doesn't list the language that you want, see "Adding More UI Languages".</paragraph>

Modified: openoffice/branches/ia2/main/helpcontent2/source/text/shared/guide/scripting.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/helpcontent2/source/text/shared/guide/scripting.xhp?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/helpcontent2/source/text/shared/guide/scripting.xhp (original)
+++ openoffice/branches/ia2/main/helpcontent2/source/text/shared/guide/scripting.xhp Fri Feb  1 08:46:00 2013
@@ -60,7 +60,7 @@
             <paragraph xml-lang="en-US" id="par_id6797082" role="paragraph" l10n="CHG">Python</paragraph>
          </listitem>
       </list>
-      <paragraph xml-lang="en-US" id="par_idN1091F" role="paragraph" l10n="NEW">In addition, developers can use high-level languages, for example Java programming language, to control %PRODUCTNAME externally. See the API project at OpenOffice.org.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1091F" role="paragraph" l10n="NEW">In addition, developers can use high-level languages, for example Java programming language, to control %PRODUCTNAME externally. See the API project at Apache OpenOffice.</paragraph>
       <paragraph xml-lang="en-US" id="par_idN10751" role="heading" level="2" l10n="NEW">To assign a script to a new menu entry</paragraph>
       <list type="ordered">
          <listitem>

Modified: openoffice/branches/ia2/main/helpcontent2/source/text/shared/optionen/improvement.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/helpcontent2/source/text/shared/optionen/improvement.xhp?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/helpcontent2/source/text/shared/optionen/improvement.xhp (original)
+++ openoffice/branches/ia2/main/helpcontent2/source/text/shared/optionen/improvement.xhp Fri Feb  1 08:46:00 2013
@@ -46,7 +46,7 @@
       <section id="howtoget">
          <embed href="text/shared/00/00000406.xhp#improvement"/>
       </section>
-      <paragraph xml-lang="en-US" id="par_id0526200903594966" role="paragraph" l10n="NEW">The Improvement Program was initiated by the User Experience project to improve the usability of %PRODUCTNAME. The User Experience project can be found at the OpenOffice.org web site: <link href="http://ux.openoffice.org/">http://ux.openoffice.org/</link>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0526200903594966" role="paragraph" l10n="NEW">The Improvement Program was initiated by the User Experience project to improve the usability of %PRODUCTNAME. The User Experience project can be found at the Apache OpenOffice website: <link href="http://ux.openoffice.org/">http://ux.openoffice.org/</link>.</paragraph>
       <paragraph xml-lang="en-US" id="par_id0526200903594946" role="paragraph" l10n="NEW">The second time you start your new %PRODUCTNAME software, you see a window that gives information about the Improvement Program. </paragraph>
       <paragraph xml-lang="en-US" id="par_id0526200904094345" role="paragraph" l10n="NEW">At this time you can choose to accept or deny your participation.</paragraph>
       <list type="ordered">

Modified: openoffice/branches/ia2/main/i18npool/source/localedata/data/et_EE.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/i18npool/source/localedata/data/et_EE.xml?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/i18npool/source/localedata/data/et_EE.xml (original)
+++ openoffice/branches/ia2/main/i18npool/source/localedata/data/et_EE.xml Fri Feb  1 08:46:00 2013
@@ -331,7 +331,14 @@
     </Calendar>
   </LC_CALENDAR>
   <LC_CURRENCY>
-    <Currency default="true" usedInCompatibleFormatCodes="true">
+    <Currency default="true" usedInCompatibleFormatCodes="false">
+      <CurrencyID>EUR</CurrencyID>
+      <CurrencySymbol>€</CurrencySymbol>
+      <BankSymbol>EUR</BankSymbol>
+      <CurrencyName>euro</CurrencyName>
+      <DecimalPlaces>2</DecimalPlaces>
+    </Currency>
+    <Currency default="false" usedInCompatibleFormatCodes="true">
       <CurrencyID>EEK</CurrencyID>
       <CurrencySymbol>kr</CurrencySymbol>
       <BankSymbol>EEK</BankSymbol>

Modified: openoffice/branches/ia2/main/i18npool/source/search/textsearch.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/i18npool/source/search/textsearch.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/i18npool/source/search/textsearch.cxx (original)
+++ openoffice/branches/ia2/main/i18npool/source/search/textsearch.cxx Fri Feb  1 08:46:00 2013
@@ -64,7 +64,7 @@ static sal_Int32 COMPLEX_TRANS_MASK_TMP 
     TransliterationModules_ignoreKiKuFollowedBySa_ja_JP |
     TransliterationModules_ignoreProlongedSoundMark_ja_JP;
 static const sal_Int32 COMPLEX_TRANS_MASK = COMPLEX_TRANS_MASK_TMP | TransliterationModules_IGNORE_KANA | TransliterationModules_FULLWIDTH_HALFWIDTH;
-static const sal_Int32 SIMPLE_TRANS_MASK = ~COMPLEX_TRANS_MASK;
+static const sal_Int32 SIMPLE_TRANS_MASK = ~(COMPLEX_TRANS_MASK | TransliterationModules_IGNORE_CASE | TransliterationModules_UPPERCASE_LOWERCASE | TransliterationModules_LOWERCASE_UPPERCASE);
     // Above 2 transliteration is simple but need to take effect in
     // complex transliteration
 
@@ -715,8 +715,10 @@ void TextSearch::RESrchPrepare( const ::
 	// REG_NOSUB is not used anywhere => not implemented
 	// NORM_WORD_ONLY is only used for SearchAlgorithm==Absolute
 	// LEV_RELAXED is only used for SearchAlgorithm==Approximate
-	// why is even ALL_IGNORE_CASE deprecated in UNO? because of transliteration taking care of it???
-	if( (rOptions.searchFlag & com::sun::star::util::SearchFlags::ALL_IGNORE_CASE) != 0)
+	// Note that the search flag ALL_IGNORE_CASE is deprecated in UNO
+	// probably because the transliteration flag IGNORE_CASE handles it as well.
+	if( (rOptions.searchFlag & com::sun::star::util::SearchFlags::ALL_IGNORE_CASE) != 0
+	||  (rOptions.transliterateFlags & TransliterationModules_IGNORE_CASE) != 0)
 		nIcuSearchFlags |= UREGEX_CASE_INSENSITIVE;
 	UErrorCode nIcuErr = U_ZERO_ERROR;
 	// assumption: transliteration didn't mangle regexp control chars
@@ -753,13 +755,13 @@ SearchResult TextSearch::RESrchFrwrd( co
 	aRet.subRegExpressions = 0;
 	if( !pRegexMatcher)
 		return aRet;
-	
+
 	if( endPos > searchStr.getLength())
 		endPos = searchStr.getLength();
 
 	// use the ICU RegexMatcher to find the matches
 	UErrorCode nIcuErr = U_ZERO_ERROR;
-	const IcuUniString aSearchTargetStr( (const UChar*)searchStr.getStr(), searchStr.getLength());
+	const IcuUniString aSearchTargetStr( (const UChar*)searchStr.getStr(), endPos);
 	pRegexMatcher->reset( aSearchTargetStr);
 	// search until there is a valid match
 	for(;;)
@@ -801,7 +803,7 @@ SearchResult TextSearch::RESrchBkwrd( co
 	aRet.subRegExpressions = 0;
 	if( !pRegexMatcher)
 		return aRet;
-	
+
 	if( startPos > searchStr.getLength())
 		startPos = searchStr.getLength();
 
@@ -816,9 +818,15 @@ SearchResult TextSearch::RESrchBkwrd( co
 
 	// find the last match
 	int nLastPos = 0;
+	int nFoundEnd = 0;
 	do {
 		nLastPos = pRegexMatcher->start( nIcuErr);
-	} while( pRegexMatcher->find( nLastPos + 1, nIcuErr));
+		nFoundEnd = pRegexMatcher->end( nIcuErr);
+		if( nFoundEnd >= startPos)
+			break;
+		if( nFoundEnd == nLastPos)
+			++nFoundEnd;
+	} while( pRegexMatcher->find( nFoundEnd, nIcuErr));
 
 	// find last match again to get its details
 	pRegexMatcher->find( nLastPos, nIcuErr);

Modified: openoffice/branches/ia2/main/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt (original)
+++ openoffice/branches/ia2/main/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt Fri Feb  1 08:46:00 2013
@@ -1,7 +1,7 @@
 Signature_	Root	Key	Name	Type
 s72	i2	s255	S255	I2
 RegLocator	Signature_
-installuser	1	Software\OpenOffice.org\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
-installuser_	1	Software\OpenOffice.org\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
-installmachine	2	Software\OpenOffice.org\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
-installmachine_	2	Software\OpenOffice.org\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
+installuser	1	Software\Apache OpenOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
+installuser_	1	Software\Apache OpenOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
+installmachine	2	Software\Apache OpenOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
+installmachine_	2	Software\Apache OpenOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2



Mime
View raw message