openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stev...@apache.org
Subject svn commit: r1470868 [5/40] - in /openoffice/branches/ia2: ./ ext_libraries/coinmp/ ext_libraries/serf/ ext_libraries/serf/win/ extras/l10n/source/fi/ main/ main/animations/source/animcore/ main/automation/source/communi/ main/basctl/source/basicide/ m...
Date Tue, 23 Apr 2013 09:51:53 GMT
Modified: openoffice/branches/ia2/main/editeng/source/outliner/outlvw.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/editeng/source/outliner/outlvw.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/editeng/source/outliner/outlvw.cxx (original)
+++ openoffice/branches/ia2/main/editeng/source/outliner/outlvw.cxx Tue Apr 23 09:51:15 2013
@@ -50,6 +50,7 @@
 #include <editeng/numitem.hxx>
 #include <vcl/window.hxx>
 #include <svl/itemset.hxx>
+#include <svl/eitem.hxx>
 #include <editeng/editstat.hxx>
 
 
@@ -1232,6 +1233,205 @@ void OutlinerView::ToggleBullets()
 	pOwner->UndoActionEnd( OLUNDO_DEPTH );
 }
 
+sal_Bool	OutlinerView::ToggleBullets(sal_Bool bBulletOnOff, sal_Bool bNormalBullet, sal_Bool bMasterView, SvxNumRule* pNumRule, sal_Bool bForceBulletOnOff)
+{
+	pOwner->UndoActionStart( OLUNDO_DEPTH );
+
+	ESelection aSel( pEditView->GetSelection() );
+	aSel.Adjust();
+
+	const bool bUpdate = pOwner->pEditEngine->GetUpdateMode();
+	pOwner->pEditEngine->SetUpdateMode( sal_False );
+
+	sal_Int16 nDepth = -2;
+	sal_Bool bRet = sal_False;
+
+	//Modified by xuezhiy for bullet enhancement
+	bool bBulletOn = sal_True;
+
+	if( bBulletOnOff )
+	{
+		bool bHasBullet = sal_False;
+		for ( sal_uInt16 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
+		{
+			bHasBullet = pOwner->ImplHasBullet(nPara);
+			if(bHasBullet)
+				break;
+		}
+
+		if( bHasBullet )
+		{			
+			bBulletOn = sal_False;
+
+			for ( sal_uInt16 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
+			{
+				Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
+				DBG_ASSERT(pPara, "OutlinerView::ToggleBullets(), illegal selection?");
+
+				// const SfxItemSet& rAttrs = pOwner->GetParaAttribs( nPara );
+				if( pPara )
+				{					
+					const SvxNumberFormat* pFmt = pOwner ->GetNumberFormat(nPara);
+					
+					if( !pFmt )
+					{
+						// Has no Bullet paragraph
+						bBulletOn = sal_True;
+						break;
+					}
+					else if( ( pFmt->GetNumberingType() == SVX_NUM_BITMAP ) || ( pFmt->GetNumberingType() == SVX_NUM_CHAR_SPECIAL ) )
+					{
+						// Normal ==>> Numbering
+						if( !bNormalBullet )
+						{
+							bBulletOn = sal_True;
+							break;
+						}
+					}
+					else
+					{		
+						// Numbering ==>> Normal
+						if( bNormalBullet )
+						{
+							bBulletOn = sal_True;
+							break;
+						}
+					}
+				}
+			}
+		}
+
+	}
+	if (bForceBulletOnOff) {
+		bBulletOn = bBulletOnOff;
+	}
+	for ( sal_uInt16 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
+	{
+		Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
+		DBG_ASSERT(pPara, "OutlinerView::ToggleBullets(), illegal selection?");
+
+		if( pPara )	
+		{			
+			bRet = sal_True;
+
+			nDepth = pOwner->GetDepth(nPara);			
+
+			if( bBulletOn && nDepth == -1 )
+			{
+				// Off ==>> On
+				nDepth = 0;
+			}
+			else if( !bBulletOn && nDepth == 0 )
+			{
+				// On ==>> Off
+				nDepth = -1;
+			}
+			pOwner->SetDepth( pPara, nDepth );
+
+			const SfxItemSet& rAttrs = pOwner->GetParaAttribs( nPara );
+//			bool bBulletState = ((const SfxBoolItem&) rAttrs.Get( EE_PARA_BULLETSTATE ) ).GetValue();
+
+			SfxItemSet aAttrs(rAttrs);
+			aAttrs.Put( SfxBoolItem( EE_PARA_BULLETSTATE, bBulletOn ) );
+			
+			// Change bullet types
+			if( bBulletOn && pNumRule)
+			{
+				bool bSetBulletType = false;
+				if( !bBulletOnOff )
+				{
+					// Not bullet on/off button	
+					bSetBulletType = true;
+				}
+				else
+				{
+					const SvxNumberFormat* pFmt = pOwner ->GetNumberFormat(nPara);				
+
+					if( !pFmt )
+					{
+						// Has no bullet
+						bSetBulletType = true;
+					}
+					else
+					{
+						sal_Int16 nNumType = pFmt->GetNumberingType();
+						if( bNormalBullet && nNumType != SVX_NUM_BITMAP && nNumType != SVX_NUM_CHAR_SPECIAL )
+						{
+							// Set to Normal bullet, old bullet type is Numbering bullet
+							bSetBulletType = true;
+						}
+						else if( !bNormalBullet && (nNumType == SVX_NUM_BITMAP || nNumType == SVX_NUM_CHAR_SPECIAL) )
+						{
+							// Set to Numbering bullet, old bullet type is Normal bullet
+							bSetBulletType = true;
+						}
+					}
+				}
+
+				// Get old bullet space
+				SvxNumRule aNewRule( *pNumRule );
+
+				const SfxPoolItem* pPoolItem=NULL;
+				SfxItemState eState = rAttrs.GetItemState(EE_PARA_NUMBULLET, sal_False, &pPoolItem);
+				if (eState != SFX_ITEM_SET)
+				{
+					// Use default value when has not contain bullet item
+					ESelection aSelection(nPara, 0);
+					SfxItemSet aTmpSet( pOwner->pEditEngine->GetAttribs( aSelection ) );
+					pPoolItem = aTmpSet.GetItem( EE_PARA_NUMBULLET );
+				}
+
+				const SvxNumBulletItem* pNumBulletItem = dynamic_cast< const SvxNumBulletItem* >( pPoolItem );
+				//const SvxNumBulletItem& rNumBullet = (const SvxNumBulletItem&) rAttrs.Get( EE_PARA_NUMBULLET );
+				if( pNumBulletItem )
+				{
+					sal_uInt16 nLevelCnt = pNumBulletItem->GetNumRule()->GetLevelCount();
+					nLevelCnt = Min( nLevelCnt, pNumRule->GetLevelCount() );
+
+					for( sal_uInt16 nLevel = 0; nLevel < nLevelCnt; ++nLevel )
+					{
+						const SvxNumberFormat* pOldFmt = pNumBulletItem->GetNumRule()->Get( nLevel );
+						const SvxNumberFormat* pNewFmt = pNumRule->Get( nLevel );
+
+						if( pOldFmt && pNewFmt && (pOldFmt->GetFirstLineOffset() != pNewFmt->GetFirstLineOffset() 
+							|| pOldFmt->GetAbsLSpace() != pNewFmt->GetAbsLSpace() ) )
+						{						
+							SvxNumberFormat* pNewFmtClone = new SvxNumberFormat( *pNewFmt );
+							pNewFmtClone->SetFirstLineOffset( pOldFmt->GetFirstLineOffset() );
+							pNewFmtClone->SetAbsLSpace( pOldFmt->GetAbsLSpace() );
+
+							aNewRule.SetLevel( nLevel, pNewFmtClone );
+							delete pNewFmtClone;
+						}
+					}
+				}
+
+				// Don't set bullet attribute to paragraph in Master view 
+				// Because it will be set into style sheet
+				if( bSetBulletType && !bMasterView )
+					aAttrs.Put(SvxNumBulletItem( aNewRule ), EE_PARA_NUMBULLET);
+			}
+
+			pOwner->SetParaAttribs( nPara, aAttrs );
+			
+		}
+	}
+
+    // --> OD 2009-03-10 #i100014#
+    // It is not a good idea to substract 1 from a count and cast the result
+    // to sal_uInt16 without check, if the count is 0.
+    sal_uInt16 nParaCount = (sal_uInt16) (pOwner->pParaList->GetParagraphCount());
+    // <--
+    pOwner->ImplCheckParagraphs( aSel.nStartPara, nParaCount );
+    pOwner->pEditEngine->QuickMarkInvalid( ESelection( aSel.nStartPara, 0, nParaCount, 0 ) );
+
+	pOwner->pEditEngine->SetUpdateMode( bUpdate );
+
+	pOwner->UndoActionEnd( OLUNDO_DEPTH );
+
+	return bRet;
+}
+
 void OutlinerView::EnableBullets()
 {
 	pOwner->UndoActionStart( OLUNDO_DEPTH );
@@ -1266,6 +1466,126 @@ void OutlinerView::EnableBullets()
 	pOwner->UndoActionEnd( OLUNDO_DEPTH );
 }
 
+sal_Bool OutlinerView::ToggleAllParagraphsBullets(sal_Bool bBulletOnOffMode, sal_Bool bNormalBullet, sal_Bool bToggleOn, sal_Bool bMasterView, SvxNumRule* pNumRule)
+{
+	if (!pOwner || !pOwner->pEditEngine || !pOwner->pParaList)
+	{
+		return sal_False;
+	}
+
+	sal_Bool bReturn = sal_False;
+	pOwner->UndoActionStart(OLUNDO_DEPTH);
+	const sal_Bool bUpdate = pOwner->pEditEngine->GetUpdateMode();
+	pOwner->pEditEngine->SetUpdateMode(sal_False);
+
+	sal_Int16 nDepth = -2;
+	sal_uInt16 nParaCount = (sal_uInt16)(pOwner->pParaList->GetParagraphCount());
+	for (sal_uInt16 nPara = 0; nPara < nParaCount; nPara++)
+	{
+		Paragraph* pPara = pOwner->pParaList->GetParagraph(nPara);
+		DBG_ASSERT(pPara, "OutlinerView::ToggleAllParagraphsBullets(), illegal selection?");
+
+		if (pPara)
+		{
+			bReturn = sal_True;
+			nDepth = pOwner->GetDepth(nPara);
+			if (bToggleOn && nDepth == -1)
+			{
+				// Off ==>> On
+				nDepth = 0;
+			}
+			else if (!bToggleOn && nDepth == 0)
+			{
+				// On ==>> Off
+				nDepth = -1;
+			}
+			pOwner->SetDepth(pPara, nDepth);
+
+			const SfxItemSet& rAttrs = pOwner->GetParaAttribs(nPara);
+			SfxItemSet aAttrs(rAttrs);
+			aAttrs.Put(SfxBoolItem(EE_PARA_BULLETSTATE, bToggleOn));
+
+			// Change bullet types.
+			if (bToggleOn && pNumRule)
+			{
+				sal_Bool bSetBulletType = sal_False;
+				if (!bBulletOnOffMode)
+				{
+					// Not bullet on/off button.
+					bSetBulletType = sal_True;
+				}
+				else
+				{
+					const SvxNumberFormat* pFmt = pOwner ->GetNumberFormat(nPara);
+					if (!pFmt)
+					{
+						// Has no bullet.
+						bSetBulletType = sal_True;
+					}
+					else
+					{
+						sal_Int16 nNumType = pFmt->GetNumberingType();
+						if (bNormalBullet && nNumType != SVX_NUM_BITMAP && nNumType != SVX_NUM_CHAR_SPECIAL)
+						{
+							// Set to Normal bullet, old bullet type is Numbering bullet.
+							bSetBulletType = sal_True;
+						}
+						else if (!bNormalBullet && (nNumType == SVX_NUM_BITMAP || nNumType == SVX_NUM_CHAR_SPECIAL))
+						{
+							// Set to Numbering bullet, old bullet type is Normal bullet.
+							bSetBulletType = sal_True;
+						}
+					}
+				}
+
+				// Get old bullet space.
+				SvxNumRule aNewRule(*pNumRule);
+				const SfxPoolItem* pPoolItem=NULL;
+				SfxItemState eState = rAttrs.GetItemState(EE_PARA_NUMBULLET, sal_False, &pPoolItem);
+				ESelection aSelection(nPara, 0);
+				SfxItemSet aTmpSet(pOwner->pEditEngine->GetAttribs(aSelection));
+				if (eState != SFX_ITEM_SET)
+				{
+					// Use default value when has not contain bullet item.
+					pPoolItem = aTmpSet.GetItem(EE_PARA_NUMBULLET);
+				}
+
+				const SvxNumBulletItem* pNumBulletItem = dynamic_cast< const SvxNumBulletItem* >(pPoolItem);
+				if (pNumBulletItem)
+				{
+					sal_uInt16 nLevelCnt = pNumBulletItem->GetNumRule()->GetLevelCount();
+					nLevelCnt = Min(nLevelCnt, pNumRule->GetLevelCount());
+
+					for (sal_uInt16 nLevel = 0; nLevel < nLevelCnt; nLevel++)
+					{
+						const SvxNumberFormat* pOldFmt = pNumBulletItem->GetNumRule()->Get(nLevel);
+						const SvxNumberFormat* pNewFmt = pNumRule->Get(nLevel);
+						if (pOldFmt && pNewFmt && (pOldFmt->GetFirstLineOffset() != pNewFmt->GetFirstLineOffset() || pOldFmt->GetAbsLSpace() != pNewFmt->GetAbsLSpace()))
+						{
+							SvxNumberFormat* pNewFmtClone = new SvxNumberFormat(*pNewFmt);
+							pNewFmtClone->SetFirstLineOffset(pOldFmt->GetFirstLineOffset());
+							pNewFmtClone->SetAbsLSpace(pOldFmt->GetAbsLSpace());
+							aNewRule.SetLevel(nLevel, pNewFmtClone);
+							delete pNewFmtClone;
+						}
+					}
+				}
+
+				// Don't set bullet attribute to paragraph in Master view, because it will be set into style sheet.
+				if (bSetBulletType && !bMasterView)
+					aAttrs.Put(SvxNumBulletItem(aNewRule), EE_PARA_NUMBULLET);
+			}
+			pOwner->SetParaAttribs(nPara, aAttrs);
+		}
+	}
+
+	pOwner->ImplCheckParagraphs(0, nParaCount);
+	pOwner->pEditEngine->QuickMarkInvalid(ESelection(0, 0, nParaCount, 0));
+	pOwner->pEditEngine->SetUpdateMode(bUpdate);
+	pOwner->UndoActionEnd(OLUNDO_DEPTH);
+
+	return bReturn;
+}
 
 void OutlinerView::RemoveAttribsKeepLanguages( sal_Bool bRemoveParaAttribs )
 {

Modified: openoffice/branches/ia2/main/extensions.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extensions.lst?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/extensions.lst (original)
+++ openoffice/branches/ia2/main/extensions.lst Tue Apr 23 09:51:15 2013
@@ -34,19 +34,13 @@
 # Some extensions that are installed indepently of the language.
 
 # the presenter console extension
-[ language=all && ENABLE_PRESENTER_SCREEN=YES ]
-    file://presenter/presenter-screen.oxt
-
-# the presentation minimizer
-[ language=all && ENABLE_MINIMIZER=YES ]
-    file://minimizer/presentation-minimizer.oxt
-
-
+# [ language=all && ENABLE_XXX ]
+#    file://XXX.oxt
 
 # English dictionary
 [ language=en.* || language=de || language=it ]
     b7ce02d25eb302e5b23572cdccaea461 http://numbertext.org/tmp/dict-en.oxt
-    
+
 # English (USA, en_US) dictionary
 [ language==nl || language==ru ]
     e2eab80772ab1aa09716954219351a80 http://sourceforge.net/projects/aoo-extensions/files/1470/1/en_US.oxt/download "en_US.oxt"

Modified: openoffice/branches/ia2/main/extensions/source/activex/main/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extensions/source/activex/main/makefile.mk?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/extensions/source/activex/main/makefile.mk (original)
+++ openoffice/branches/ia2/main/extensions/source/activex/main/makefile.mk Tue Apr 23 09:51:15 2013
@@ -137,8 +137,10 @@ SHL1STDLIBS_X64+=\
 SHL1OBJS_X64=$(SLOFILES_X64)
 SHL1DEF_X64=$(TARGET).def
 
-SHL1STDLIBS_X64+= $(ATL_LIB_X64)$/atls.lib  $(ATL_LIB_X64)$/atlthunk.lib 
-
+SHL1STDLIBS_X64+= $(ATL_LIB_X64)$/atls.lib 
+.IF "$(HAVE_ATLTHUNK)" == "YES"
+    SHL1STDLIBS_X64+= $(ATL_LIB_X64)$/atlthunk.lib
+.ENDIF
 .ENDIF # "$(BUILD_X64)"!=""
 
 # --- Targets ----------------------------------

Modified: openoffice/branches/ia2/main/extensions/source/ole/oleobjw.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extensions/source/ole/oleobjw.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/extensions/source/ole/oleobjw.cxx (original)
+++ openoffice/branches/ia2/main/extensions/source/ole/oleobjw.cxx Tue Apr 23 09:51:15 2013
@@ -1589,7 +1589,7 @@ TypeDescription IUnknownWrapper_Impl::ge
 			{
 				typelib_TypeDescriptionReference* pTypeRefMember = pInterface->ppAllMembers[i];
 				typelib_TypeDescription* pDescMember= NULL;
-				TYPELIB_DANGER_GET( &pDescMember, pTypeRefMember)
+				TYPELIB_DANGER_GET( &pDescMember, pTypeRefMember);
 
 				typelib_InterfaceMemberTypeDescription* pInterfaceMember= 
 					(typelib_InterfaceMemberTypeDescription*) pDescMember;
@@ -1598,7 +1598,7 @@ TypeDescription IUnknownWrapper_Impl::ge
 					pMember= pInterfaceMember;
 					break;
 				}
-				TYPELIB_DANGER_RELEASE( pDescMember)
+				TYPELIB_DANGER_RELEASE( pDescMember);
 			}
 
 			if( pMember)

Modified: openoffice/branches/ia2/main/extensions/source/ole/unoconversionutilities.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extensions/source/ole/unoconversionutilities.hxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/extensions/source/ole/unoconversionutilities.hxx (original)
+++ openoffice/branches/ia2/main/extensions/source/ole/unoconversionutilities.hxx Tue Apr 23 09:51:15 2013
@@ -2034,9 +2034,9 @@ void UnoConversionUtilities<T>::dispatch
         typelib_TypeDescriptionReference *pSeqElemDescRef= pSeqDesc->pType; // type of the Sequence' elements
         Type elemType( pSeqElemDescRef);
         _typelib_TypeDescription* pSeqElemDesc=NULL;
-        TYPELIB_DANGER_GET( &pSeqElemDesc, pSeqElemDescRef)
+        TYPELIB_DANGER_GET( &pSeqElemDesc, pSeqElemDescRef);
             sal_uInt32 nelementSize= pSeqElemDesc->nSize;
-        TYPELIB_DANGER_RELEASE( pSeqElemDesc)
+        TYPELIB_DANGER_RELEASE( pSeqElemDesc);
             
             uno_Sequence *p_uno_Seq;
         uno_sequence_construct( &p_uno_Seq, pDesc, NULL, length, cpp_acquire);

Modified: openoffice/branches/ia2/main/extensions/source/propctrlr/formlinkdialog.src
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extensions/source/propctrlr/formlinkdialog.src?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/extensions/source/propctrlr/formlinkdialog.src (original)
+++ openoffice/branches/ia2/main/extensions/source/propctrlr/formlinkdialog.src Tue Apr 23 09:51:15 2013
@@ -153,6 +153,5 @@ ModalDialog RID_DLG_FORMLINKS
     String STR_ERROR_RETRIEVING_COLUMNS
     {
         Text [ en-US ] = "The columns of '#' could not be retrieved.";
-        Text [ x-comment ] ="# will be replace with a name.";
     };
 };

Modified: openoffice/branches/ia2/main/extensions/source/propctrlr/formres.src
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extensions/source/propctrlr/formres.src?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/extensions/source/propctrlr/formres.src (original)
+++ openoffice/branches/ia2/main/extensions/source/propctrlr/formres.src Tue Apr 23 09:51:15 2013
@@ -1492,25 +1492,21 @@ Resource RID_RSC_ENUM_SHEET_ANCHOR_TYPE
 String RID_STR_FONTSTYLE_REGULAR
 {
     Text [ en-US ] = "Regular";
-    Text [ x-comment ] = "That's the 'Regular' as used for a font style (as opposed to 'italic' and 'bold'), so please use a consistent translation.";
 };
 
 String RID_STR_FONTSTYLE_BOLD_ITALIC
 {
     Text [ en-US ] = "Bold Italic";
-    Text [ x-comment ] = "That's the 'Bold Italic' as used for a font style, so please use a consistent translation.";
 };
 
 String RID_STR_FONTSTYLE_ITALIC
 {
     Text [ en-US ] = "Italic";
-    Text [ x-comment ] = "That's the 'Italic' as used for a font style, so please use a consistent translation.";
 };
 
 String RID_STR_FONTSTYLE_BOLD
 {
     Text [ en-US ] = "Bold";
-    Text [ x-comment ] = "That's the 'Bold' as used for a font style, so please use a consistent translation.";
 };
 
 String RID_STR_FONT_DEFAULT

Modified: openoffice/branches/ia2/main/extensions/source/propctrlr/standardcontrol.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extensions/source/propctrlr/standardcontrol.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/extensions/source/propctrlr/standardcontrol.cxx (original)
+++ openoffice/branches/ia2/main/extensions/source/propctrlr/standardcontrol.cxx Tue Apr 23 09:51:15 2013
@@ -682,7 +682,7 @@ namespace pcr
         :OColorControl_Base( PropertyControlType::ColorListBox, pParent, nWinStyle )
 	{
 		// initialize the color listbox
-        XColorTable* pColorTable = NULL;
+        XColorList* pColorTable = NULL;
         SfxObjectShell* pDocSh = SfxObjectShell::Current();
         const SfxPoolItem* pItem = pDocSh ? pDocSh->GetItem( SID_COLOR_TABLE ) : NULL;
         if ( pItem )
@@ -693,7 +693,7 @@ namespace pcr
 
         if ( !pColorTable )
 	    {
-		    pColorTable = XColorTable::GetStdColorTable();
+		    pColorTable = XColorList::GetStdColorList();
 	    }
 
 		

Modified: openoffice/branches/ia2/main/extensions/source/update/check/updatecheck.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extensions/source/update/check/updatecheck.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/extensions/source/update/check/updatecheck.cxx (original)
+++ openoffice/branches/ia2/main/extensions/source/update/check/updatecheck.cxx Tue Apr 23 09:51:15 2013
@@ -120,7 +120,7 @@ static inline rtl::OUString getBuildId()
 //------------------------------------------------------------------------------
 static inline rtl::OUString getBaseInstallation()
 {
-	rtl::OUString aPathVal(UNISTRING("${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap") ":BaseInstallation}"));
+	rtl::OUString aPathVal(UNISTRING("${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap") ":BaseInstallation}"));
 	rtl::Bootstrap::expandMacros(aPathVal);
 	return aPathVal;
 }

Modified: openoffice/branches/ia2/main/extensions/source/update/check/updateprotocol.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extensions/source/update/check/updateprotocol.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/extensions/source/update/check/updateprotocol.cxx (original)
+++ openoffice/branches/ia2/main/extensions/source/update/check/updateprotocol.cxx Tue Apr 23 09:51:15 2013
@@ -66,12 +66,12 @@ getBootstrapData(
     if ( ! rBuildID.getLength() )
         return false;
 
-    rInstallSetID = UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateID}" );
+    rInstallSetID = UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateID}" );
     rtl::Bootstrap::expandMacros( rInstallSetID );
     if ( ! rInstallSetID.getLength() )
         return false;
 
-    rtl::OUString aValue( UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateURL}" ) );
+    rtl::OUString aValue( UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateURL}" ) );
     rtl::Bootstrap::expandMacros( aValue );
 
     if( aValue.getLength() > 0 )

Modified: openoffice/branches/ia2/main/extensions/source/update/feed/updatefeed.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extensions/source/update/feed/updatefeed.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/extensions/source/update/feed/updatefeed.cxx (original)
+++ openoffice/branches/ia2/main/extensions/source/update/feed/updatefeed.cxx Tue Apr 23 09:51:15 2013
@@ -25,7 +25,7 @@
 #include "precompiled_extensions.hxx"
 
 #include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
@@ -37,7 +37,6 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <com/sun/star/ucb/XWebDAVCommandEnvironment.hpp>
 #include <com/sun/star/ucb/XCommandProcessor2.hpp>
 #include <com/sun/star/ucb/XContentIdentifierFactory.hpp>
@@ -137,8 +136,7 @@ public:
 //------------------------------------------------------------------------------
 
 class UpdateInformationProvider :
-    public ::cppu::WeakImplHelper4< deployment::XUpdateInformationProvider,
-                                    ucb::XCommandEnvironment,
+    public ::cppu::WeakImplHelper3< deployment::XUpdateInformationProvider,
                                     ucb::XWebDAVCommandEnvironment,
                                     lang::XServiceInfo >
 {
@@ -180,8 +178,8 @@ public:
         throw ( uno::RuntimeException ) { return  uno::Reference< ucb::XProgressHandler >(); };
 
     // XWebDAVCommandEnvironment
-    virtual uno::Sequence< beans::NamedValue > SAL_CALL getUserRequestHeaders(
-        const rtl::OUString&, const rtl::OUString& )
+    virtual uno::Sequence< beans::StringPair > SAL_CALL getUserRequestHeaders(
+        const rtl::OUString&,  ucb::WebDAVHTTPMethod )
         throw ( uno::RuntimeException ) { return m_aRequestHeaderList; };
 
     // XServiceInfo
@@ -195,7 +193,7 @@ public:
 protected:
 
     virtual ~UpdateInformationProvider();
-    static uno::Any getConfigurationItem(uno::Reference<lang::XMultiServiceFactory> const & configurationProvider, rtl::OUString const & node, rtl::OUString const & item);
+    static rtl::OUString getConfigurationItem(uno::Reference<lang::XMultiServiceFactory> const & configurationProvider, rtl::OUString const & node, rtl::OUString const & item);
 
 private:
     uno::Reference< io::XInputStream > load(const rtl::OUString& rURL);
@@ -216,7 +214,7 @@ private:
     const uno::Reference< xml::dom::XDocumentBuilder > m_xDocumentBuilder;
     const uno::Reference< xml::xpath::XXPathAPI > m_xXPathAPI;
 
-    uno::Sequence< beans::NamedValue > m_aRequestHeaderList;
+    uno::Sequence< beans::StringPair > m_aRequestHeaderList;
 
     uno::Reference< ucb::XCommandProcessor > m_xCommandProcessor;
     uno::Reference< task::XInteractionHandler > m_xInteractionHandler;
@@ -346,33 +344,31 @@ UpdateInformationProvider::UpdateInforma
         uno::UNO_QUERY_THROW);
 
     rtl::OUStringBuffer buf;
-    rtl::OUString name;
-    getConfigurationItem(
-        xConfigurationProvider,
-        UNISTRING("org.openoffice.Setup/Product"),
-        UNISTRING("ooName")) >>= name;
-    buf.append(name);
+    buf.append(
+        getConfigurationItem(
+            xConfigurationProvider,
+            UNISTRING("org.openoffice.Setup/Product"),
+            UNISTRING("ooName")));
     buf.append(sal_Unicode(' '));
-    rtl::OUString version;
-    getConfigurationItem(
-        xConfigurationProvider,
-        UNISTRING("org.openoffice.Setup/Product"),
-        UNISTRING("ooSetupVersion")) >>= version;
-    buf.append(version);
+    buf.append(
+        getConfigurationItem(
+            xConfigurationProvider,
+            UNISTRING("org.openoffice.Setup/Product"),
+            UNISTRING("ooSetupVersion")));
     rtl::OUString edition(
         UNISTRING(
-            "${${BRAND_BASE_DIR}/program/edition/edition.ini:"
+            "${${OOO_BASE_DIR}/program/edition/edition.ini:"
             "EDITIONNAME}"));
     rtl::Bootstrap::expandMacros(edition);
     if (edition.getLength() != 0) {
         buf.append(sal_Unicode(' '));
         buf.append(edition);
     }
-    rtl::OUString extension;
-    getConfigurationItem(
-        xConfigurationProvider,
-        UNISTRING("org.openoffice.Setup/Product"),
-        UNISTRING("ooSetupExtension")) >>= extension;
+    rtl::OUString extension(
+        getConfigurationItem(
+            xConfigurationProvider,
+            UNISTRING("org.openoffice.Setup/Product"),
+            UNISTRING("ooSetupExtension")));
     if (extension.getLength() != 0) {
         buf.append(sal_Unicode(' '));
         buf.append(extension);
@@ -382,10 +378,11 @@ UpdateInformationProvider::UpdateInforma
     rtl::OUString aBaseBuildId( UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}" ) );
     rtl::Bootstrap::expandMacros( aBaseBuildId );
 
-    rtl::OUString aBrandBuildId( UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}" ) );
-    rtl::Bootstrap::expandMacros( aBrandBuildId );
+    rtl::OUString aBrandBuildId(aBaseBuildId);
+    // rtl::OUString aBrandBuildId( UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}" ) );
+    // rtl::Bootstrap::expandMacros( aBrandBuildId );
 
-    rtl::OUString aUserAgent( UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateUserAgent}" ) );
+    rtl::OUString aUserAgent( UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateUserAgent}" ) );
     rtl::Bootstrap::expandMacros( aUserAgent );
 
     if ( ! aBaseBuildId.equals( aBrandBuildId ) )
@@ -406,13 +403,13 @@ UpdateInformationProvider::UpdateInforma
         i += product.getLength();
     }
 
-    m_aRequestHeaderList[0].Name = UNISTRING("Accept-Language");
-    m_aRequestHeaderList[0].Value = getConfigurationItem( xConfigurationProvider, UNISTRING("org.openoffice.Setup/L10N"), UNISTRING("ooLocale") );
+    m_aRequestHeaderList[0].First = UNISTRING("Accept-Language");
+    m_aRequestHeaderList[0].Second = getConfigurationItem( xConfigurationProvider, UNISTRING("org.openoffice.Setup/L10N"), UNISTRING("ooLocale") );
     if( aUserAgent.getLength() > 0 )
     {
         m_aRequestHeaderList.realloc(2);
-        m_aRequestHeaderList[1].Name = UNISTRING("User-Agent");
-        m_aRequestHeaderList[1].Value = uno::makeAny(aUserAgent);
+        m_aRequestHeaderList[1].First = UNISTRING("User-Agent");
+        m_aRequestHeaderList[1].Second = aUserAgent;
     }
 }
 
@@ -453,9 +450,10 @@ UpdateInformationProvider::~UpdateInform
 
 //------------------------------------------------------------------------------
 
-uno::Any
+rtl::OUString
 UpdateInformationProvider::getConfigurationItem(uno::Reference<lang::XMultiServiceFactory> const & configurationProvider, rtl::OUString const & node, rtl::OUString const & item)
 {
+    rtl::OUString sRet;
     beans::PropertyValue aProperty;
     aProperty.Name  = UNISTRING("nodepath");
     aProperty.Value = uno::makeAny(node);
@@ -469,7 +467,8 @@ UpdateInformationProvider::getConfigurat
             aArgumentList ),
         uno::UNO_QUERY_THROW);
 
-    return xNameAccess->getByName(item);
+    xNameAccess->getByName(item) >>= sRet;
+    return sRet;
 }
 
 //------------------------------------------------------------------------------

Modified: openoffice/branches/ia2/main/external_deps.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/external_deps.lst?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/external_deps.lst (original)
+++ openoffice/branches/ia2/main/external_deps.lst Tue Apr 23 09:51:15 2013
@@ -126,9 +126,9 @@ if ( true )
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if ( true )
-    SHA1 = 231af70b7567a753b49df4216743010c193884b7
-    name = serf-1.1.0.tar.bz2
-    URL1 = http://serf.googlecode.com/files/serf-1.1.0.tar.bz2
+    SHA1 = 30b29bd9214d50887abcc20cf82096aaaf5d1d61
+    name = serf-1.2.0.tar.bz2
+    URL1 = http://serf.googlecode.com/files/serf-1.2.0.tar.bz2
     URL2 = $(OOO_EXTRAS)$(SHA1)-$(name)
 
 if (SOLAR_JAVA==TRUE && (ENABLE_MEDIAWIKI==YES || ENABLE_REPORTBUILDER==YES))

Modified: openoffice/branches/ia2/main/extras/source/palettes/standard.soc
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/palettes/standard.soc?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/extras/source/palettes/standard.soc (original)
+++ openoffice/branches/ia2/main/extras/source/palettes/standard.soc Tue Apr 23 09:51:15 2013
@@ -148,7 +148,7 @@
 
   <!-- #121520# use some 'nice' colors from original palette -->
   <draw:color draw:name="Blue gray" draw:color="#e6e6ff"/>
-  <draw:color draw:name="Blue 9" draw:color="#CFE7F5"/>
+  <draw:color draw:name="Blue nine" draw:color="#CFE7F5"/>
 
   <!-- #121520# add 'pale' colors from original palette -->
   <draw:color draw:name="Violet" draw:color="#9999ff"/>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/HTML__StarCalc__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/HTML__StarCalc__ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/HTML__StarCalc__ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/HTML__StarCalc__ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="HTML (StarCalc)">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">HTML Document (%productname% Calc)</value>
-						<value xml:lang="x-translate">HTML Document (%productname% Calc)</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/HTML__StarWriter__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/HTML__StarWriter__ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/HTML__StarWriter__ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/HTML__StarWriter__ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="HTML (StarWriter)">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">HTML Document (%productname% Writer)</value>
-						<value xml:lang="x-translate">HTML Document (%productname% Writer)</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/HTML_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/HTML_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/HTML_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/HTML_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="HTML">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">HTML Document</value>
-						<value xml:lang="x-translate">HTML Document</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Excel_2003_XML_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Excel_2003_XML_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Excel_2003_XML_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Excel_2003_XML_ui.xcu Tue Apr 23 09:51:15 2013
@@ -21,13 +21,6 @@
 
 	<node oor:name="MS Excel 2003 XML">
 		<prop oor:name="UIName">
-			<value xml:lang="el">Microsoft Excel 2003 XML</value>
 			<value xml:lang="en-US">Microsoft Excel 2003 XML</value>
-			<value xml:lang="hu">Microsoft Excel 2003 XML</value>
-			<value xml:lang="cs">Microsoft Excel 2003 XML</value>
-			<value xml:lang="sk">Microsoft Excel 2003 XML</value>
-			<value xml:lang="sl">Microsoft Excel 2003 XML</value>
-			<value xml:lang="nl">Microsoft Excel 2003 XML</value>
-			<value xml:lang="da">Microsoft Excel 2003 XML</value>
 					</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="MS Excel 4.0 Vorlage/Template">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">Microsoft Excel 4.0 Template</value>
-						<value xml:lang="x-translate">Microsoft Excel 4.0 Template</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="MS Excel 5.0/95 Vorlage/Template">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">Microsoft Excel 5.0 Template</value>
-						<value xml:lang="x-translate">Microsoft Excel 5.0 Template</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="MS Excel 95 Vorlage/Template">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">Microsoft Excel 95 Template</value>
-						<value xml:lang="x-translate">Microsoft Excel 95 Template</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="MS Excel 97 Vorlage/Template">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">Microsoft Excel 97/2000/XP Template</value>
-						<value xml:lang="x-translate">Microsoft Excel 97/2000/XP Template</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="MS PowerPoint 97 Vorlage">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">Microsoft PowerPoint 97/2000/XP Template</value>
-						<value xml:lang="x-translate">Microsoft PowerPoint 97/2000/XP Template</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Word_2003_XML_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Word_2003_XML_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Word_2003_XML_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Word_2003_XML_ui.xcu Tue Apr 23 09:51:15 2013
@@ -21,13 +21,6 @@
 
 	<node oor:name="MS Word 2003 XML">
 		<prop oor:name="UIName">
-			<value xml:lang="el">Microsoft Word 2003 XML</value>
 			<value xml:lang="en-US">Microsoft Word 2003 XML</value>
-			<value xml:lang="hu">Microsoft Word 2003 XML</value>
-			<value xml:lang="cs">Microsoft Word 2003 XML</value>
-			<value xml:lang="sk">Microsoft Word 2003 XML</value>
-			<value xml:lang="sl">Microsoft Word 2003 XML</value>
-			<value xml:lang="nl">Microsoft Word 2003 XML</value>
-			<value xml:lang="da">Microsoft Word 2003 XML</value>
 					</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
     <node oor:name="MS Word 2007 XML Template">
 		<prop oor:name="UIName">
             <value xml:lang="en-US">Microsoft Word 2007 XML Template</value>
-            <value xml:lang="de">Microsoft Word 2007 XML Vorlage</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
     <node oor:name="MS Word 2007 XML">
 		<prop oor:name="UIName">
             <value xml:lang="en-US">Microsoft Word 2007 XML</value>
-            <value xml:lang="de">Microsoft Word 2007 XML</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Word_95_Vorlage_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Word_95_Vorlage_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Word_95_Vorlage_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Word_95_Vorlage_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="MS Word 95 Vorlage">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">Microsoft Word 95 Template</value>
-						<value xml:lang="x-translate">Microsoft Word 95 Template</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Word_97_Vorlage_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Word_97_Vorlage_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Word_97_Vorlage_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/MS_Word_97_Vorlage_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="MS Word 97 Vorlage">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">Microsoft Word 97/2000/XP Template</value>
-						<value xml:lang="x-translate">Microsoft Word 97/2000/XP Template</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/NSO_Calc_UOF2_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/NSO_Calc_UOF2_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/NSO_Calc_UOF2_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/NSO_Calc_UOF2_ui.xcu Tue Apr 23 09:51:15 2013
@@ -21,15 +21,6 @@
 
 	<node oor:name="NSO Calc UOF2">
 		<prop oor:name="UIName">
-			<value xml:lang="el">Uniform Office Format 2 spreadsheet</value>
 			<value xml:lang="en-US">Uniform Office Format 2 spreadsheet</value>
-			<value xml:lang="hu">Uniform Office Format 2 spreadsheet</value>
-			<value xml:lang="cs">Uniform Office Format 2 spreadsheet</value>
-			<value xml:lang="sk">Uniform Office Format 2 spreadsheet</value>
-			<value xml:lang="sl">Uniform Office Format 2 spreadsheet</value>
-			<value xml:lang="nl">Uniform Office Format 2 spreadsheet</value>
-			<value xml:lang="da">Uniform Office Format 2 spreadsheet</value>
-			<value xml:lang="de">Uniform Office Format 2 spreadsheet</value>
-			<value xml:lang="zh-CN">中文办公软件文档格式2 工作簿</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/NSO_Impress_UOF2_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/NSO_Impress_UOF2_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/NSO_Impress_UOF2_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/NSO_Impress_UOF2_ui.xcu Tue Apr 23 09:51:15 2013
@@ -21,15 +21,6 @@
 
 	<node oor:name="NSO Impress UOF2">
 		<prop oor:name="UIName">
-			<value xml:lang="el">Uniform Office Format 2 presentation</value>
 			<value xml:lang="en-US">Uniform Office Format 2 presentation</value>
-			<value xml:lang="hu">Uniform Office Format 2 presentation</value>
-			<value xml:lang="cs">Uniform Office Format 2 presentation</value>
-			<value xml:lang="sk">Uniform Office Format 2 presentation</value>
-			<value xml:lang="sl">Uniform Office Format 2 presentation</value>
-			<value xml:lang="nl">Uniform Office Format 2 presentation</value>
-			<value xml:lang="da">Uniform Office Format 2 presentation</value>
-			<value xml:lang="de">Uniform Office Format 2 presentation</value>
-			<value xml:lang="zh-CN">中文办公软件文档格式2 演示文稿</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/NSO_Writer_UOF2_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/NSO_Writer_UOF2_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/NSO_Writer_UOF2_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/NSO_Writer_UOF2_ui.xcu Tue Apr 23 09:51:15 2013
@@ -21,15 +21,6 @@
 
 	<node oor:name="NSO Writer UOF2">
 		<prop oor:name="UIName">
-			<value xml:lang="el">Uniform Office Format 2 Text</value>
 			<value xml:lang="en-US">Uniform Office Format 2 Text</value>
-			<value xml:lang="hu">Uniform Office Format 2 Text</value>
-			<value xml:lang="cs">Uniform Office Format 2 Text</value>
-			<value xml:lang="sk">Uniform Office Format 2 Text</value>
-			<value xml:lang="sl">Uniform Office Format 2 Text</value>
-			<value xml:lang="nl">Uniform Office Format 2 Text</value>
-			<value xml:lang="da">Uniform Office Format 2 Text</value>
-			<value xml:lang="de">Uniform Office Format 2 Text</value>
-			<value xml:lang="zh-CN">中文办公软件文档格式2 字处理文档</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarCalc_3_0_Vorlage_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarCalc_3_0_Vorlage_Template_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarCalc_3_0_Vorlage_Template_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarCalc_3_0_Vorlage_Template_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="StarCalc 3.0 Vorlage/Template">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">StarCalc 3.0 Template</value>
-						<value xml:lang="x-translate">StarCalc 3.0 Template</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarCalc_4_0_Vorlage_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarCalc_4_0_Vorlage_Template_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarCalc_4_0_Vorlage_Template_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarCalc_4_0_Vorlage_Template_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="StarCalc 4.0 Vorlage/Template">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">StarCalc 4.0 Template</value>
-						<value xml:lang="x-translate">StarCalc 4.0 Template</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarCalc_5_0_Vorlage_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarCalc_5_0_Vorlage_Template_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarCalc_5_0_Vorlage_Template_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarCalc_5_0_Vorlage_Template_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="StarCalc 5.0 Vorlage/Template">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">StarCalc 5.0 Template</value>
-						<value xml:lang="x-translate">StarCalc 5.0 Template</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage__StarImpress__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage__StarImpress__ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage__StarImpress__ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage__StarImpress__ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="StarDraw 3.0 Vorlage (StarImpress)">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">StarDraw 3.0 Template (%productname% Impress)</value>
-						<value xml:lang="x-translate">StarDraw 3.0 Template (%productname% Impress)</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarDraw_3_0_Vorlage_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="StarDraw 3.0 Vorlage">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">StarDraw 3.0 Template</value>
-						<value xml:lang="x-translate">StarDraw 3.0 Template</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage__StarImpress__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage__StarImpress__ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage__StarImpress__ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage__StarImpress__ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="StarDraw 5.0 Vorlage (StarImpress)">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">StarDraw 5.0 Template (%productname% Impress)</value>
-						<value xml:lang="x-translate">StarDraw 5.0 Template (%productname% Impress)</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarDraw_5_0_Vorlage_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="StarDraw 5.0 Vorlage">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">StarDraw 5.0 Template</value>
-						<value xml:lang="x-translate">StarDraw 5.0 Template</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarImpress_4_0_Vorlage_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarImpress_4_0_Vorlage_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarImpress_4_0_Vorlage_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarImpress_4_0_Vorlage_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="StarImpress 4.0 Vorlage">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">StarImpress 4.0 Template</value>
-						<value xml:lang="x-translate">StarImpress 4.0 Template</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarImpress_5_0_Vorlage_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarImpress_5_0_Vorlage_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarImpress_5_0_Vorlage_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarImpress_5_0_Vorlage_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="StarImpress 5.0 Vorlage">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">StarImpress 5.0 Template</value>
-						<value xml:lang="x-translate">StarImpress 5.0 Template</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarImpress_5_0__packed__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarImpress_5_0__packed__ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarImpress_5_0__packed__ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarImpress_5_0__packed__ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="StarImpress 5.0 (packed)">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">StarImpress 5.0 Packed</value>
-						<value xml:lang="x-translate">StarImpress 5.0 Packed</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="StarOffice XML (Calc)">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Spreadsheet</value>
-						<value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Spreadsheet</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="StarOffice XML (Chart)">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Chart</value>
-						<value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Chart</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="StarOffice XML (Draw)">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Drawing</value>
-						<value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Drawing</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="StarOffice XML (Impress)">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Presentation</value>
-						<value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Presentation</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="StarOffice XML (Math)">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Formula</value>
-						<value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Formula</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="StarOffice XML (Writer)">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Text Document</value>
-						<value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Text Document</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarWriter_3_0_Vorlage_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarWriter_3_0_Vorlage_Template_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarWriter_3_0_Vorlage_Template_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarWriter_3_0_Vorlage_Template_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="StarWriter 3.0 Vorlage/Template">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">StarWriter 3.0 Template</value>
-						<value xml:lang="x-translate">StarWriter 3.0 Template</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarWriter_4_0_GlobalDocument_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarWriter_4_0_GlobalDocument_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarWriter_4_0_GlobalDocument_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarWriter_4_0_GlobalDocument_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="StarWriter 4.0/GlobalDocument">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">StarWriter 4.0 Master Document</value>
-						<value xml:lang="x-translate">StarWriter 4.0 Master Document</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarWriter_4_0_Vorlage_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarWriter_4_0_Vorlage_Template_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarWriter_4_0_Vorlage_Template_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarWriter_4_0_Vorlage_Template_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="StarWriter 4.0 Vorlage/Template">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">StarWriter 4.0 Template</value>
-						<value xml:lang="x-translate">StarWriter 4.0 Template</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarWriter_5_0_GlobalDocument_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarWriter_5_0_GlobalDocument_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarWriter_5_0_GlobalDocument_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarWriter_5_0_GlobalDocument_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="StarWriter 5.0/GlobalDocument">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">StarWriter 5.0 Master Document</value>
-						<value xml:lang="x-translate">StarWriter 5.0 Master Document</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarWriter_5_0_Vorlage_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarWriter_5_0_Vorlage_Template_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarWriter_5_0_Vorlage_Template_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarWriter_5_0_Vorlage_Template_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="StarWriter 5.0 Vorlage/Template">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">StarWriter 5.0 Template</value>
-						<value xml:lang="x-translate">StarWriter 5.0 Template</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarWriter_Web_4_0_Vorlage_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarWriter_Web_4_0_Vorlage_Template_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarWriter_Web_4_0_Vorlage_Template_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarWriter_Web_4_0_Vorlage_Template_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="StarWriter/Web 4.0 Vorlage/Template">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">StarWriter/Web 4.0 Template</value>
-						<value xml:lang="x-translate">StarWriter/Web 4.0 Template</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarWriter_Web_5_0_Vorlage_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarWriter_Web_5_0_Vorlage_Template_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarWriter_Web_5_0_Vorlage_Template_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/StarWriter_Web_5_0_Vorlage_Template_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="StarWriter/Web 5.0 Vorlage/Template">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">StarWriter/Web 5.0 Template</value>
-						<value xml:lang="x-translate">StarWriter/Web 5.0 Template</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/Text__StarWriter_Web__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/Text__StarWriter_Web__ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/Text__StarWriter_Web__ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/Text__StarWriter_Web__ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="Text (StarWriter/Web)">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">Text (%productname% Writer/Web)</value>
-						<value xml:lang="x-translate">Text (%productname% Writer/Web)</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/Text___txt___csv__StarCalc__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/Text___txt___csv__StarCalc__ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/Text___txt___csv__StarCalc__ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/Text___txt___csv__StarCalc__ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="Text - txt - csv (StarCalc)">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">Text CSV</value>
-						<value xml:lang="x-translate">Text CSV</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="Text (encoded) (StarWriter/GlobalDocument)">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">Text Encoded (%productname% Master Document)</value>
-						<value xml:lang="x-translate">Text Encoded (%productname% Master Document)</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="Text (encoded) (StarWriter/Web)">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">Text Encoded (%productname% Writer/Web)</value>
-						<value xml:lang="x-translate">Text Encoded (%productname% Writer/Web)</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/Text__encoded__ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/Text__encoded__ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/Text__encoded__ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/Text__encoded__ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="Text (encoded)">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">Text Encoded</value>
-						<value xml:lang="x-translate">Text Encoded</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/Text_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/Text_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/Text_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/Text_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="Text">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">Text</value>
-						<value xml:lang="x-translate">Text</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/UOF_presentation_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/UOF_presentation_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/UOF_presentation_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/UOF_presentation_ui.xcu Tue Apr 23 09:51:15 2013
@@ -21,14 +21,6 @@
 
 	<node oor:name="UOF presentation" oor:op="replace">
 		 <prop oor:name="UIName">
-			<value xml:lang="el">Unified Office Format presentation</value>
 			<value xml:lang="en-US">Unified Office Format presentation</value>
-			<value xml:lang="hu">Unified Office Format presentation</value>
-			<value xml:lang="cs">Unified Office Format presentation</value>
-			<value xml:lang="sk">Unified Office Format presentation</value>
-			<value xml:lang="sl">Unified Office Format presentation</value>
-			<value xml:lang="nl">Unified Office Format presentation</value>
-			<value xml:lang="da">Unified Office Format presentation</value>
-			<value xml:lang="de">Unified Office Format presentation</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/UOF_spreadsheet_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/UOF_spreadsheet_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/UOF_spreadsheet_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/UOF_spreadsheet_ui.xcu Tue Apr 23 09:51:15 2013
@@ -21,14 +21,6 @@
 
 	<node oor:name="UOF spreadsheet" oor:op="replace">
 		 <prop oor:name="UIName">
-			<value xml:lang="el">Unified Office Format spreadsheet</value>
 			<value xml:lang="en-US">Unified Office Format spreadsheet</value>
-			<value xml:lang="hu">Unified Office Format spreadsheet</value>
-			<value xml:lang="cs">Unified Office Format spreadsheet</value>
-			<value xml:lang="sk">Unified Office Format spreadsheet</value>
-			<value xml:lang="sl">Unified Office Format spreadsheet</value>
-			<value xml:lang="nl">Unified Office Format spreadsheet</value>
-			<value xml:lang="da">Unified Office Format spreadsheet</value>
-			<value xml:lang="de">Unified Office Format spreadsheet</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/UOF_text_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/UOF_text_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/UOF_text_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/UOF_text_ui.xcu Tue Apr 23 09:51:15 2013
@@ -21,14 +21,6 @@
 
 	<node oor:name="UOF text" oor:op="replace">
 		 <prop oor:name="UIName">
-			<value xml:lang="el">Unified Office Format text</value>
 			<value xml:lang="en-US">Unified Office Format text</value>
-			<value xml:lang="hu">Unified Office Format text</value>
-			<value xml:lang="cs">Unified Office Format text</value>
-			<value xml:lang="sk">Unified Office Format text</value>
-			<value xml:lang="sl">Unified Office Format text</value>
-			<value xml:lang="nl">Unified Office Format text</value>
-			<value xml:lang="da">Unified Office Format text</value>
-			<value xml:lang="de">Unified Office Format text</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/calc_HTML_WebQuery_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/calc_HTML_WebQuery_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/calc_HTML_WebQuery_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/calc_HTML_WebQuery_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="calc_HTML_WebQuery">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">Web Page Query (%productname% Calc)</value>
-						<value xml:lang="x-translate">Web Page Query (%productname% Calc)</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 <node oor:name="Calc MS Excel 2007 Binary">
 	<prop oor:name="UIName">
 		<value xml:lang="en-US">Microsoft Excel 2007 Binary</value>
-		<value xml:lang="de">Microsoft Excel 2007 Binär</value>
 	</prop>
 </node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 <node oor:name="Calc MS Excel 2007 XML Template">
 	<prop oor:name="UIName">
 		<value xml:lang="en-US">Microsoft Excel 2007 XML Template</value>
-		<value xml:lang="de">Microsoft Excel 2007 XML Vorlage</value>
 	</prop>
 </node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 <node oor:name="Calc MS Excel 2007 XML">
 	<prop oor:name="UIName">
 		<value xml:lang="en-US">Microsoft Excel 2007 XML</value>
-		<value xml:lang="de">Microsoft Excel 2007 XML</value>
 	</prop>
 </node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="calc_StarOffice_XML_Calc_Template">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Spreadsheet Template</value>
-						<value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Spreadsheet Template</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="draw_StarOffice_XML_Draw_Template">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Drawing Template</value>
-						<value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Drawing Template</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/draw_html_Export_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/draw_html_Export_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/draw_html_Export_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/draw_html_Export_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="draw_html_Export">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">HTML Document (%productname% Draw)</value>
-						<value xml:lang="x-translate">HTML Document (%productname% Draw)</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 <node oor:name="Impress MS PowerPoint 2007 XML Template">
 	<prop oor:name="UIName">
 		<value xml:lang="en-US">Microsoft PowerPoint 2007 XML Template</value>
-		<value xml:lang="de">Microsoft PowerPoint 2007 XML Vorlage</value>
 	</prop>
 </node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 <node oor:name="Impress MS PowerPoint 2007 XML">
 	<prop oor:name="UIName">
 		<value xml:lang="en-US">Microsoft PowerPoint 2007 XML</value>
-		<value xml:lang="de">Microsoft PowerPoint 2007 XML</value>
 	</prop>
 </node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="impress_StarOffice_XML_Draw">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Drawing (%productname% Impress)</value>
-						<value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Drawing (%productname% Impress)</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="impress_StarOffice_XML_Impress_Template">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Presentation Template</value>
-						<value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Presentation Template</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/impress_html_Export_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/impress_html_Export_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/impress_html_Export_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/impress_html_Export_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="impress_html_Export">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">HTML Document (%productname% Impress)</value>
-						<value xml:lang="x-translate">HTML Document (%productname% Impress)</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="writer_StarOffice_XML_Writer_Template">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Text Document Template</value>
-						<value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Text Document Template</value>
 		</prop>
 	</node>

Modified: openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu (original)
+++ openoffice/branches/ia2/main/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu Tue Apr 23 09:51:15 2013
@@ -22,6 +22,5 @@
 	<node oor:name="writer_globaldocument_StarOffice_XML_Writer_GlobalDocument">
 		<prop oor:name="UIName">
 			<value xml:lang="en-US">%oooxmlformatname% %oooxmlformatversion% Master Document</value>
-						<value xml:lang="x-translate">%oooxmlformatname% %oooxmlformatversion% Master Document</value>
 		</prop>
 	</node>



Mime
View raw message