You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ja...@apache.org on 2013/11/19 23:39:57 UTC

svn commit: r1543609 [7/32] - in /openoffice/branches/l10n40/main: ./ accessibility/inc/accessibility/extended/ accessibility/inc/accessibility/helper/ accessibility/inc/accessibility/standard/ accessibility/source/extended/ accessibility/source/helper...

Modified: openoffice/branches/l10n40/main/editeng/source/uno/unoedhlp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/editeng/source/uno/unoedhlp.cxx?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/editeng/source/uno/unoedhlp.cxx (original)
+++ openoffice/branches/l10n40/main/editeng/source/uno/unoedhlp.cxx Tue Nov 19 22:39:40 2013
@@ -28,7 +28,10 @@
 #include <editeng/unoedhlp.hxx>
 #include <editeng/editdata.hxx>
 #include <editeng/editeng.hxx>
+//IAccessibility2 Implementation 2009-----
+#include <svl/itemset.hxx>
 
+//-----IAccessibility2 Implementation 2009
 //------------------------------------------------------------------------
 
 TYPEINIT1( SvxEditSourceHint, TextHint );
@@ -76,7 +79,9 @@ void SvxEditSourceHint::SetEndValue( sal
 {
     mnEnd = n; 
 }
-
+//IAccessibility2 Implementation 2009-----
+TYPEINIT1( SvxEditSourceHintEndPara , SvxEditSourceHint );
+//-----IAccessibility2 Implementation 2009
 //------------------------------------------------------------------------
 
 ::std::auto_ptr<SfxHint> SvxEditSourceHelper::EENotification2Hint( EENotify* aNotify )
@@ -117,7 +122,10 @@ void SvxEditSourceHint::SetEndValue( sal
 
             case EE_NOTIFY_INPUT_END:
                 return ::std::auto_ptr<SfxHint>( new TextHint( TEXT_HINT_INPUT_END, 0 ) );
-
+	//IAccessibility2 Implementation 2009-----
+			case EE_NOTIFY_TEXTVIEWSELECTIONCHANGED_ENDD_PARA:
+				return ::std::auto_ptr<SfxHint>( new SvxEditSourceHintEndPara( EDITSOURCE_HINT_SELECTIONCHANGED ) );
+	//-----IAccessibility2 Implementation 2009
             default:
                 DBG_ERROR( "SvxEditSourceHelper::EENotification2Hint unknown notification" );
                 break;
@@ -126,9 +134,166 @@ void SvxEditSourceHint::SetEndValue( sal
 
     return ::std::auto_ptr<SfxHint>( new SfxHint() );
 }
-
-sal_Bool SvxEditSourceHelper::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, const EditEngine& rEE, sal_uInt16 nPara, sal_uInt16 nIndex )
+sal_Bool SvxEditSourceHelper::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, const EditEngine& rEE, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell )
 {
+	// IA2 CWS introduced bInCell, but also did many other changes here.
+	// Need to verify implementation with AT (IA2 and ATK)
+	// Old implementation at the end of the method for reference...
+
+#if 1 // IA2 CWS
+
+    //added dummy attributes for the default text
+	EECharAttribArray aCharAttribs, aTempCharAttribs;
+	rEE.GetCharAttribs( nPara, aTempCharAttribs );
+	if ( aTempCharAttribs.Count() )
+	{
+		sal_uInt32 nIndex2 = 0;
+		sal_uInt32 nParaLen = rEE.GetTextLen(nPara);
+		for ( sal_uInt16 nAttr = 0; nAttr < aTempCharAttribs.Count(); nAttr++ )
+		{
+			if ( nIndex2 < aTempCharAttribs[nAttr].nStart )
+			{
+				EECharAttrib aEEAttr;
+				aEEAttr.nStart = sal_uInt16(nIndex2);
+				aEEAttr.nEnd = aTempCharAttribs[nAttr].nStart;
+				aCharAttribs.Insert( aEEAttr, nAttr );
+			}
+			nIndex2 = aTempCharAttribs[nAttr].nEnd;
+			aCharAttribs.Insert( aTempCharAttribs[nAttr], aCharAttribs.Count() );
+		}
+		if ( nIndex2 != nParaLen )
+		{
+			EECharAttrib aEEAttr;
+			aEEAttr.nStart = sal_uInt16(nIndex2);
+			aEEAttr.nEnd = sal_uInt16(nParaLen);
+			aCharAttribs.Insert( aEEAttr, aCharAttribs.Count() );
+		}
+	}
+    // find closest index in front of nIndex
+    sal_uInt16 nAttr, nCurrIndex;
+    sal_Int32 nClosestStartIndex;
+	sal_Int32 nClosestStartIndex_s, nClosestStartIndex_e;
+    for( nAttr=0, nClosestStartIndex_s=0, nClosestStartIndex_e=0; nAttr<aCharAttribs.Count(); ++nAttr )
+    {
+        nCurrIndex = aCharAttribs[nAttr].nStart;
+        
+        //if( nCurrIndex > nIndex )
+        //    break; // aCharAttribs array is sorted in increasing order for nStart values
+
+        if( nCurrIndex > nClosestStartIndex_s &&
+			nCurrIndex <= nIndex)
+        {
+            nClosestStartIndex_s = nCurrIndex;
+        }
+		nCurrIndex = aCharAttribs[nAttr].nEnd;
+		if ( nCurrIndex > nClosestStartIndex_e &&
+			nCurrIndex < nIndex )
+		{
+			nClosestStartIndex_e = nCurrIndex;
+		}
+    }
+	nClosestStartIndex = nClosestStartIndex_s > nClosestStartIndex_e ? nClosestStartIndex_s : nClosestStartIndex_e;
+
+    // find closest index behind of nIndex
+    sal_Int32 nClosestEndIndex;
+	sal_Int32 nClosestEndIndex_s, nClosestEndIndex_e;
+    for( nAttr=0, nClosestEndIndex_s=nClosestEndIndex_e=rEE.GetTextLen(nPara); nAttr<aCharAttribs.Count(); ++nAttr )
+    {
+        nCurrIndex = aCharAttribs[nAttr].nEnd;
+
+        if( nCurrIndex > nIndex &&
+            nCurrIndex < nClosestEndIndex_e )
+        {
+            nClosestEndIndex_e = nCurrIndex;
+        }
+		nCurrIndex = aCharAttribs[nAttr].nStart;
+		if ( nCurrIndex > nIndex &&
+			nCurrIndex < nClosestEndIndex_s)
+		{
+			nClosestEndIndex_s = nCurrIndex;
+		}
+    }
+	nClosestEndIndex = nClosestEndIndex_s < nClosestEndIndex_e ? nClosestEndIndex_s : nClosestEndIndex_e;
+
+    nStartIndex = static_cast<sal_uInt16>( nClosestStartIndex );
+    nEndIndex = static_cast<sal_uInt16>( nClosestEndIndex );
+	if ( bInCell )
+	{
+		EPosition aStartPos( nPara, nStartIndex ), aEndPos( nPara, nEndIndex );
+		sal_uInt32 nParaCount = rEE.GetParagraphCount();
+		sal_uInt32 nCrrntParaLen = rEE.GetTextLen(nPara);
+		//need to find closest index in front of nIndex in the previous paragraphs
+		if ( aStartPos.nIndex == 0 )
+		{
+			SfxItemSet aCrrntSet = rEE.GetAttribs( nPara, 0, 1, GETATTRIBS_CHARATTRIBS );
+			for ( sal_Int32 nParaIdx = nPara-1; nParaIdx >= 0; nParaIdx-- )
+			{
+				sal_uInt32 nLen = rEE.GetTextLen( sal_uInt16(nParaIdx) );
+				if ( nLen )
+				{
+					sal_uInt16 nStartIdx, nEndIdx;
+					GetAttributeRun( nStartIdx, nEndIdx, rEE, sal_uInt16(nParaIdx), sal_uInt16(nLen), sal_False );
+					SfxItemSet aSet = rEE.GetAttribs( sal_uInt16(nParaIdx), sal_uInt16(nLen-1), sal_uInt16(nLen), GETATTRIBS_CHARATTRIBS );
+					if ( aSet == aCrrntSet )
+					{
+						aStartPos.nPara = sal_uInt16(nParaIdx);
+						aStartPos.nIndex = nStartIdx;
+						if ( aStartPos.nIndex != 0 )
+						{
+							break;
+						}
+					}
+				}
+			}
+		}
+		//need find closest index behind nIndex in the following paragrphs
+		if ( aEndPos.nIndex == nCrrntParaLen )
+		{
+			SfxItemSet aCrrntSet = rEE.GetAttribs( nPara, sal_uInt16(nCrrntParaLen-1), sal_uInt16(nCrrntParaLen), GETATTRIBS_CHARATTRIBS );
+			for ( sal_uInt32 nParaIdx = nPara+1; nParaIdx < nParaCount; nParaIdx++ )
+			{
+				sal_uInt32 nLen = rEE.GetTextLen( sal_uInt16(nParaIdx) );
+				if ( nLen )
+				{
+					sal_uInt16 nStartIdx, nEndIdx;
+					GetAttributeRun( nStartIdx, nEndIdx, rEE, sal_uInt16(nParaIdx), 0, sal_False );
+					SfxItemSet aSet = rEE.GetAttribs( sal_uInt16(nParaIdx), 0, 1, GETATTRIBS_CHARATTRIBS );
+					if ( aSet == aCrrntSet )
+					{
+						aEndPos.nPara = sal_uInt16(nParaIdx);
+						aEndPos.nIndex = nEndIdx;
+						if ( aEndPos.nIndex != nLen )
+						{
+							break;
+						}
+					}
+				}
+			}
+		}
+		nStartIndex = 0;
+		if ( aStartPos.nPara > 0 )
+		{
+			for ( sal_uInt16 i = 0; i < aStartPos.nPara; i++ )
+			{
+				nStartIndex += rEE.GetTextLen(i)+1;
+			}
+		}
+		nStartIndex += aStartPos.nIndex;
+		nEndIndex = 0;
+		if ( aEndPos.nPara > 0 )
+		{
+			for ( sal_uInt16 i = 0; i < aEndPos.nPara; i++ )
+			{
+				nEndIndex += rEE.GetTextLen(i)+1;
+			}
+		}
+		nEndIndex += aEndPos.nIndex;
+	}
+
+    return sal_True;
+
+#else // old implementation	
+
     EECharAttribArray aCharAttribs;
     
     rEE.GetCharAttribs( nPara, aCharAttribs );
@@ -166,6 +331,8 @@ sal_Bool SvxEditSourceHelper::GetAttribu
     nEndIndex = static_cast<sal_uInt16>( nClosestEndIndex );
 
     return sal_True;
+
+#endif
 }
 
 Point SvxEditSourceHelper::EEToUserSpace( const Point& rPoint, const Size& rEESize, bool bIsVertical )

Modified: openoffice/branches/l10n40/main/editeng/source/uno/unoedprx.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/editeng/source/uno/unoedprx.cxx?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/editeng/source/uno/unoedprx.cxx (original)
+++ openoffice/branches/l10n40/main/editeng/source/uno/unoedprx.cxx Tue Nov 19 22:39:40 2013
@@ -508,6 +508,9 @@ String SvxAccessibleTextAdapter::GetText
     EBulletInfo aBulletInfo1 = GetBulletInfo( static_cast< sal_uInt16 >(aStartIndex.GetParagraph()) );
     EBulletInfo aBulletInfo2 = GetBulletInfo( static_cast< sal_uInt16 >(aEndIndex.GetParagraph()) );
 
+    //IAccessibility2 Implementation 2009-----
+	// MT: This was done in OOo, commented out in IA2 CWS...
+    /*
     if( aStartIndex.InBullet() )
     {
         // prepend leading bullet
@@ -521,8 +524,8 @@ String SvxAccessibleTextAdapter::GetText
 
         sBullet += sStr;
         sStr = sBullet;
-    }
-
+    }*/
+    //-----IAccessibility2 Implementation 2009
     if( aEndIndex.InBullet() )
     {
         // append trailing bullet
@@ -751,7 +754,16 @@ EBulletInfo SvxAccessibleTextAdapter::Ge
 
     return mrTextForwarder->GetBulletInfo( nPara );
 }
-
+//IAccessible2 Implementation 2009----
+void	SvxAccessibleTextAdapter::SetUpdateModeForAcc( sal_Bool bUp)
+{
+	return mrTextForwarder->SetUpdateModeForAcc( bUp );
+}
+sal_Bool	SvxAccessibleTextAdapter::GetUpdateModeForAcc( ) const
+{
+	return mrTextForwarder->GetUpdateModeForAcc( );
+}
+//-----IAccessible2 Implementation 2009
 Rectangle SvxAccessibleTextAdapter::GetCharBounds( sal_uInt16 nPara, sal_uInt16 nIndex ) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
@@ -976,8 +988,7 @@ sal_Bool SvxAccessibleTextAdapter::GetWo
 
     return sal_True;
 }
-
-sal_Bool SvxAccessibleTextAdapter::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const
+sal_Bool SvxAccessibleTextAdapter::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool /* bInCell */) const
 {
     DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 

Modified: openoffice/branches/l10n40/main/editeng/source/uno/unofored.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/editeng/source/uno/unofored.cxx?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/editeng/source/uno/unofored.cxx (original)
+++ openoffice/branches/l10n40/main/editeng/source/uno/unofored.cxx Tue Nov 19 22:39:40 2013
@@ -453,10 +453,9 @@ sal_Bool SvxEditEngineForwarder::GetWord
 
     return sal_False;
 }
-
-sal_Bool SvxEditEngineForwarder::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const
+sal_Bool SvxEditEngineForwarder::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell ) const
 {
-    return SvxEditSourceHelper::GetAttributeRun( nStartIndex, nEndIndex, rEditEngine, nPara, nIndex );
+    return SvxEditSourceHelper::GetAttributeRun( nStartIndex, nEndIndex, rEditEngine, nPara, nIndex, bInCell );
 }
 
 sal_uInt16 SvxEditEngineForwarder::GetLineCount( sal_uInt16 nPara ) const

Modified: openoffice/branches/l10n40/main/editeng/source/uno/unoforou.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/editeng/source/uno/unoforou.cxx?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/editeng/source/uno/unoforou.cxx (original)
+++ openoffice/branches/l10n40/main/editeng/source/uno/unoforou.cxx Tue Nov 19 22:39:40 2013
@@ -411,10 +411,9 @@ sal_Bool SvxOutlinerForwarder::GetWordIn
 
     return sal_False;
 }
-
-sal_Bool SvxOutlinerForwarder::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const
+sal_Bool SvxOutlinerForwarder::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell ) const
 {
-    return SvxEditSourceHelper::GetAttributeRun( nStartIndex, nEndIndex, rOutliner.GetEditEngine(), nPara, nIndex );
+    return SvxEditSourceHelper::GetAttributeRun( nStartIndex, nEndIndex, rOutliner.GetEditEngine(), nPara, nIndex, bInCell );
 }
 
 sal_uInt16 SvxOutlinerForwarder::GetLineCount( sal_uInt16 nPara ) const

Modified: openoffice/branches/l10n40/main/editeng/source/uno/unoipset.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/editeng/source/uno/unoipset.cxx?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/editeng/source/uno/unoipset.cxx (original)
+++ openoffice/branches/l10n40/main/editeng/source/uno/unoipset.cxx Tue Nov 19 22:39:40 2013
@@ -27,8 +27,6 @@
 #include <svl/eitem.hxx>
 #include <tools/list.hxx>
 
-#include <hash_map>
-#include <vector>
 #include <svl/itemprop.hxx>
 
 #include <editeng/unoipset.hxx>

Modified: openoffice/branches/l10n40/main/editeng/source/uno/unonrule.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/editeng/source/uno/unonrule.cxx?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/editeng/source/uno/unonrule.cxx (original)
+++ openoffice/branches/l10n40/main/editeng/source/uno/unonrule.cxx Tue Nov 19 22:39:40 2013
@@ -221,11 +221,16 @@ Sequence<beans::PropertyValue> SvxUnoNum
 	}
 
 	{
+	//IAccessibility2 Implementation 2009-----
+		if(SVX_NUM_CHAR_SPECIAL == rFmt.GetNumberingType())
+	//-----IAccessibility2 Implementation 2009
+		{
 		sal_Unicode nCode = rFmt.GetBulletChar();
 		OUString aStr( &nCode, 1 );
 		aVal <<= aStr;
 		beans::PropertyValue aBulletProp( OUString(RTL_CONSTASCII_USTRINGPARAM("BulletChar")), -1, aVal, beans::PropertyState_DIRECT_VALUE);
 		pArray[nIdx++] = aBulletProp;
+		}
 	}
 
 	if( rFmt.GetBulletFont() )

Modified: openoffice/branches/l10n40/main/editeng/source/uno/unotext.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/editeng/source/uno/unotext.cxx?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/editeng/source/uno/unotext.cxx (original)
+++ openoffice/branches/l10n40/main/editeng/source/uno/unotext.cxx Tue Nov 19 22:39:40 2013
@@ -2650,7 +2650,7 @@ sal_Bool SvxDummyTextSource::GetWordIndi
     return sal_False;
 }
 
-sal_Bool SvxDummyTextSource::GetAttributeRun( sal_uInt16&, sal_uInt16&, sal_uInt16, sal_uInt16 ) const
+sal_Bool SvxDummyTextSource::GetAttributeRun( sal_uInt16&, sal_uInt16&, sal_uInt16, sal_uInt16, sal_Bool ) const
 {
     return sal_False;
 }

Modified: openoffice/branches/l10n40/main/external/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/external/prj/d.lst?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/external/prj/d.lst (original)
+++ openoffice/branches/l10n40/main/external/prj/d.lst Tue Nov 19 22:39:40 2013
@@ -17,18 +17,6 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\
 
 ..\gdiplus\gdiplus.dll %_DEST%\bin%_EXT%\gdiplus.dll
 
-..\msvcp70\msvcp70.dll %_DEST%\bin%_EXT%\msvcp70.dll
-..\msvcp70\msvcr70.dll %_DEST%\bin%_EXT%\msvcr70.dll
-
-..\msvcp71\msvcp71*.dll %_DEST%\bin%_EXT%
-..\msvcp71\msvcr71*.dll %_DEST%\bin%_EXT%
-
-..\msvcp80\msvcm80*.dll %_DEST%\bin%_EXT%
-..\msvcp80\msvcp80*.dll %_DEST%\bin%_EXT%
-..\msvcp80\msvcr80*.dll %_DEST%\bin%_EXT%
-..\msvcp80\Microsoft.VC80.CRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.CRT.manifest
-..\msvcp80\Microsoft.VC80.DebugCRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.DebugCRT.manifest
-
 ..\msvcp90\msvcm90*.dll %_DEST%\bin%_EXT%
 ..\msvcp90\msvcp90*.dll %_DEST%\bin%_EXT%
 ..\msvcp90\msvcr90*.dll %_DEST%\bin%_EXT%

Modified: openoffice/branches/l10n40/main/external_deps.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/external_deps.lst?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/external_deps.lst (original)
+++ openoffice/branches/l10n40/main/external_deps.lst Tue Nov 19 22:39:40 2013
@@ -76,7 +76,7 @@ if (SOLAR_JAVA==TRUE && SYSTEM_LUCENE!=Y
     URL1 = http://archive.apache.org/dist/lucene/java/2.9.4/lucene-2.9.4-src.tar.gz
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
-if (WITH_MOZILLA != NO)
+if (ENABLE_NSS_MODULE!=NO && SYSTEM_NSS!=YES)
     MD5 = 1f24ab1d39f4a51faf22244c94a6203f
     name = xmlsec1-1.2.14.tar.gz
     URL1 = ftp://ftp.aleksey.com/pub/xmlsec/releases/xmlsec1-1.2.14.tar.gz
@@ -168,24 +168,6 @@ if ( true )
     URL1 = http://archive.apache.org/dist/apr/$(name)
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
-if ( USE_SYSTEM_STL != YES )
-    MD5 = c441926f3a552ed3e5b274b62e86af16
-    name = STLport-4.0.tar.gz
-    # This seems to be the original host, but the MD5 sum does not match.
-    # URL1 = http://sourceforge.net/projects/stlport/files/STLport%20archive/STLport%204/STLport-4.0.tar.gz/download
-    URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
-
-if ( USE_SYSTEM_STL != YES )
-    MD5 = 18f577b374d60b3c760a3a3350407632
-    name = STLport-4.5.tar.gz
-    URL1 = http://sourceforge.net/projects/stlport/files/STLport%20archive/STLport%204/STLport-4.5.tar.gz/download
-    URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
-
-if ( USE_SYSTEM_STL != YES )
-    MD5 = 7376930b0d3f3d77a685d94c4a3acda8
-    name = STLport-4.5-0119.tar.gz
-    URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
-
 if (SYSTEM_LIBXML != YES)
     MD5 = 8127a65e8c3b08856093099b52599c86
     name = libxml2-2.7.8.tar.gz
@@ -304,17 +286,11 @@ if (ENABLE_CATEGORY_B==YES && SOLAR_JAVA
     URL1 = ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R3.zip
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
-if (ENABLE_CATEGORY_B==YES && WITH_MOZILLA!=NO && BUILD_MOZAB==TRUE)
-    MD5 = a169ab152209200a7bad29a275cb0333
-    name = seamonkey-1.1.14.source.tar.gz
-    # This seems to be the original host, but the MD5 sum does not match.
-    # URL1 = ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.4/seamonkey-1.1.4.source.tar.gz
-    URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
-
 if (ENABLE_CATEGORY_B==YES && ENABLE_NSS_MODULE==YES)
-    MD5 = b92261a5679276c400555004937af965
-    name = nss-3.12.6-with-nspr-4.8.4.tar.gz
-    URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
+    MD5 = 067a04150b1d8b64f7da3019688a7547
+    name = nss-3.14.4-with-nspr-4.9.5.tar.gz
+    URL1 = ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_14_4_RTM/src/nss-3.14.4-with-nspr-4.9.5.tar.gz
+    URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (ENABLE_CATEGORY_B==YES && SYSTEM_SAXON!=YES && DISABLE_SAXON!=YES && SOLAR_JAVA==TRUE)
     MD5 = 24be19595acad0a2cae931af77a0148a

Modified: openoffice/branches/l10n40/main/filter/source/pdf/impdialog.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/filter/source/pdf/impdialog.cxx?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/filter/source/pdf/impdialog.cxx (original)
+++ openoffice/branches/l10n40/main/filter/source/pdf/impdialog.cxx Tue Nov 19 22:39:40 2013
@@ -643,7 +643,7 @@ SfxTabPage*  ImpPDFTabGeneralPage::Creat
 IMPL_LINK( ImpPDFTabGeneralPage, TogglePagesHdl, void*, EMPTYARG )
 {
     maEdPages.Enable( maRbRange.IsChecked() );
-    //Sym2_5805, When the control is disabled, it is also readonly. So here, it is not necessary to set it as readonly.
+    //When the control is disabled, it is also readonly. So here, it is not necessary to set it as readonly.
     //maEdPages.SetReadOnly( !maRbRange.IsChecked() );
     return 0;
 }

Modified: openoffice/branches/l10n40/main/formula/source/ui/dlg/ControlHelper.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/formula/source/ui/dlg/ControlHelper.hxx?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/formula/source/ui/dlg/ControlHelper.hxx (original)
+++ openoffice/branches/l10n40/main/formula/source/ui/dlg/ControlHelper.hxx Tue Nov 19 22:39:40 2013
@@ -183,6 +183,7 @@ public:
 	void Hide();
 	void Show();
 
+	void UpdateAccessibleNames();
 };
 
 }

Modified: openoffice/branches/l10n40/main/formula/source/ui/dlg/formdlgs.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/formula/source/ui/dlg/formdlgs.src?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/formula/source/ui/dlg/formdlgs.src (original)
+++ openoffice/branches/l10n40/main/formula/source/ui/dlg/formdlgs.src Tue Nov 19 22:39:40 2013
@@ -225,11 +225,17 @@ ModalDialog RID_FORMULADLG_FORMULA_MODAL
 	    Right = TRUE ;
 	    Text [ en-US ] = "Function result" ;
     };
-    Window WND_RESULT
+//IAccessibility2 Implementation 2009-----
+    //Window WND_RESULT
+	FixedText WND_RESULT
+//-----IAccessibility2 Implementation 2009
     {
 	    Border = TRUE ;
 	    Pos = MAP_APPFONT ( 255 , 4 ) ;
 	    Size = MAP_APPFONT ( 60 , 12 ) ;
+//IAccessibility2 Implementation 2009-----
+		Text [ en-US ] = "Function result" ;
+//-----IAccessibility2 Implementation 2009
     };
     FixedText FT_FORMULA_RESULT
     {

Modified: openoffice/branches/l10n40/main/formula/source/ui/dlg/funcutl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/formula/source/ui/dlg/funcutl.cxx?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/formula/source/ui/dlg/funcutl.cxx (original)
+++ openoffice/branches/l10n40/main/formula/source/ui/dlg/funcutl.cxx Tue Nov 19 22:39:40 2013
@@ -34,6 +34,9 @@
 #include "ControlHelper.hxx"
 #include "ModuleHelper.hxx"
 #include "ForResId.hrc"
+// IAccessibility2 implementation 2009. ------
+#include "com/sun/star/accessibility/AccessibleRole.hpp"
+// ------ IAccessibility2 implementation 2009.
 
 
 namespace formula
@@ -69,6 +72,7 @@ ValWnd::ValWnd( Window* pParent, const R
 	aRectOut = Rectangle( Point( 1, ( nDiff<2 ) ? 1 : nDiff/2),
 						  Size ( aSzWnd.Width()-2, nHeight ) );
 	SetClipRegion( Region( aRectOut ) );
+	SetAccessibleRole( ::com::sun::star::accessibility::AccessibleRole::LABEL );
 }
 
 //----------------------------------------------------------------------------
@@ -472,7 +476,21 @@ void ArgInput::Show()
 		pRefBtn->Show();
 	}
 }
+//IAccessibility2 Implementation 2009-----
+void ArgInput::UpdateAccessibleNames()
+{
+	String aArgName = String::CreateFromAscii(":");
+	aArgName += pFtArg->GetText();
 
+	String aName = pBtnFx->GetQuickHelpText();
+	aName += aArgName;
+	pBtnFx->SetAccessibleName(aName);
+	
+	aName = pRefBtn->GetQuickHelpText();
+	aName += aArgName;
+	pRefBtn->SetAccessibleName(aName);	
+}
+	
 /*************************************************************************
 #*	Member:		FxClick										Datum:13.01.97
 #*------------------------------------------------------------------------

Modified: openoffice/branches/l10n40/main/formula/source/ui/dlg/parawin.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/formula/source/ui/dlg/parawin.cxx?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/formula/source/ui/dlg/parawin.cxx (original)
+++ openoffice/branches/l10n40/main/formula/source/ui/dlg/parawin.cxx Tue Nov 19 22:39:40 2013
@@ -374,6 +374,7 @@ void ParaWin::SetEditDesc(const String& 
 void ParaWin::SetArgName(sal_uInt16 no,const String& aText)
 {
 	aArgInput[no].SetArgName(aText);
+	aArgInput[no].UpdateAccessibleNames();
 }
 
 void ParaWin::SetArgNameFont(sal_uInt16 no,const Font& aFont)
@@ -419,6 +420,7 @@ void ParaWin::InitArgInput( sal_uInt16 n
 	aArgInput[nPos].SetFxFocusHdl	( LINK( this, ParaWin, GetFxFocusHdl ) );
 	aArgInput[nPos].SetEdFocusHdl	( LINK( this, ParaWin, GetEdFocusHdl ) );
 	aArgInput[nPos].SetEdModifyHdl	( LINK( this, ParaWin, ModifyHdl ) );
+	aArgInput[nPos].UpdateAccessibleNames();
 }
 
 void ParaWin::ClearAll()
@@ -516,6 +518,7 @@ void ParaWin::SliderMoved()
 		aArgInput[nEdFocus].SetArgSelection(Selection(0,SELECTION_MAX ));
 		nActiveLine=nEdFocus+nOffset;
 		ArgumentModified();
+		aArgInput[nEdFocus].UpdateAccessibleNames();
 	}
 	aScrollLink.Call(this);
 }
@@ -596,6 +599,7 @@ IMPL_LINK( ParaWin, GetEdFocusHdl, ArgIn
 		UpdateArgDesc( nEdFocus );
 		nActiveLine=nEdFocus+nOffset;
 		ArgumentModified();
+		aArgInput[nEdFocus].UpdateAccessibleNames();
 	}
 
 	return 0;

Modified: openoffice/branches/l10n40/main/framework/source/loadenv/loadenv.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/framework/source/loadenv/loadenv.cxx?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/framework/source/loadenv/loadenv.cxx (original)
+++ openoffice/branches/l10n40/main/framework/source/loadenv/loadenv.cxx Tue Nov 19 22:39:40 2013
@@ -187,6 +187,11 @@ css::uno::Reference< css::lang::XCompone
           css::io::IOException               ,
           css::uno::RuntimeException         )
 {
+	//IAccessibility2 Implementation 2009-----
+#ifdef WNT	
+	CEnableAccessInterface e;
+#endif
+	//-----IAccessibility2 Implementation 2009
     css::uno::Reference< css::lang::XComponent > xComponent;
 
     try

Modified: openoffice/branches/l10n40/main/graphite/graphite-2.3.1.patch
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/graphite/graphite-2.3.1.patch?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/graphite/graphite-2.3.1.patch (original)
+++ openoffice/branches/l10n40/main/graphite/graphite-2.3.1.patch Tue Nov 19 22:39:40 2013
@@ -2347,7 +2347,7 @@
  	}
  
 -	~GrSlotAbstract()
-+	virtual ~GrSlotAbstract()
++	virtual ~GrSlotAbstract()
  	{
  		// the table manager is responsible for destroying the contents of m_prgnVarLenBuf
  	}
@@ -2356,7 +2356,7 @@
  	}
  
 -	~GrSlotState()
-+	virtual ~GrSlotState()
++	virtual ~GrSlotState()
  	{
  	}
  

Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/shared/03020401.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/shared/03020401.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/shared/03020401.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/shared/03020401.xhp Tue Nov 19 22:39:40 2013
@@ -43,7 +43,7 @@
 <paragraph role="paragraph" id="par_id3153126" xml-lang="en-US" l10n="U" oldref="2">Changes the current directory or drive.</paragraph>
 </section>
 <section id="i30692">
-<paragraph role="warning" id="par_id9783013" xml-lang="en-US" l10n="NEW">This runtime statement currently does not work as documented. See <link href="http://www.openoffice.org/issues/show_bug.cgi?id=30692">this issue</link> for more information.</paragraph>
+<paragraph role="warning" id="par_id9783013" xml-lang="en-US" l10n="NEW">This runtime statement currently does not work as documented. See <link href="https://www.openoffice.org/issues/show_bug.cgi?id=30692">this issue</link> for more information.</paragraph>
 </section>
 <paragraph role="heading" id="hd_id3154347" xml-lang="en-US" level="2" l10n="U" oldref="3">Syntax:</paragraph>
 <paragraph role="code" id="par_id3153897" xml-lang="en-US" l10n="U" oldref="4">ChDir Text As String</paragraph>

Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/shared/03131600.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/shared/03131600.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/shared/03131600.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/shared/03131600.xhp Tue Nov 19 22:39:40 2013
@@ -45,7 +45,7 @@ dedr: reviewed</lastedited>
 </section>
 <paragraph role="heading" id="hd_id3152801" xml-lang="en-US" level="2" l10n="U" oldref="3">Syntax:</paragraph>
 <paragraph role="paragraph" id="par_id3153346" xml-lang="en-US" l10n="U" oldref="4">oService = CreateUnoService( Uno service name )</paragraph>
-<paragraph role="paragraph" id="par_idN1060F" xml-lang="en-US" l10n="NEW">For a list of available services, go to: http://api.openoffice.org/docs/common/ref/com/sun/star/module-ix.html</paragraph>
+<paragraph role="paragraph" id="par_idN1060F" xml-lang="en-US" l10n="NEW">For a list of available services, see the <link href="https://api.openoffice.org/docs/common/ref/com/sun/star/module-ix.html">API reference</link>.</paragraph>
 <paragraph role="heading" id="hd_id3151111" xml-lang="en-US" level="2" l10n="U" oldref="5">Examples:</paragraph>
 <paragraph role="paragraph" id="par_id3154046" xml-lang="en-US" l10n="U" oldref="6">oIntrospection = CreateUnoService( "com.sun.star.beans.Introspection" )</paragraph>
 <bookmark xml-lang="en-US" branch="index" id="bm_id8334604"><bookmark_value>filepicker;API service</bookmark_value>

Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/shared/03132500.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/shared/03132500.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/shared/03132500.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/shared/03132500.xhp Tue Nov 19 22:39:40 2013
@@ -42,6 +42,6 @@
 <paragraph role="heading" id="par_idN10580" xml-lang="en-US" level="1" l10n="NEW"><link href="text/sbasic/shared/03132500.xhp">GetDefaultContext Function [Runtime]</link></paragraph>
 <paragraph role="paragraph" id="par_idN10590" xml-lang="en-US" l10n="NEW">Returns the default context of the process service factory, if existent, else returns a null reference. </paragraph>
 </section>
-<paragraph role="paragraph" id="par_idN10593" xml-lang="en-US" l10n="NEW">This runtime function returns the default component context to be used, if instantiating services via XmultiServiceFactory. See the <item type="literal">Professional UNO</item> chapter in the <item type="literal">Developer's Guide</item> on <link href="http://api.openoffice.org">api.openoffice.org</link> for more information.</paragraph>
+<paragraph role="paragraph" id="par_idN10593" xml-lang="en-US" l10n="NEW">This runtime function returns the default component context to be used, if instantiating services via XmultiServiceFactory. See the <item type="literal">Professional UNO</item> chapter in the <item type="literal">Developer's Guide</item> on <link href="https://api.openoffice.org">api.openoffice.org</link> for more information.</paragraph>
 </body>
 </helpdocument>

Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/shared/main0601.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/shared/main0601.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/shared/main0601.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/sbasic/shared/main0601.xhp Tue Nov 19 22:39:40 2013
@@ -40,8 +40,8 @@
 <bookmark xml-lang="en-US" branch="hid/HID_GLOBAL_FALLBACK" id="bm_id3143284" localize="false"/>
 <paragraph role="heading" id="hd_id3154232" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/main0601.xhp" name="$[officename] Basic Help">%PRODUCTNAME Basic Help</link></paragraph>
 <section id="basicalt">
-<paragraph role="paragraph" id="par_id3153894" xml-lang="en-US" l10n="U" oldref="4">%PRODUCTNAME %PRODUCTVERSION provides an Application Programming Interface (API) that allows controlling the $[officename] components with different programming languages by using the $[officename] Software Development Kit (SDK). For more information about the $[officename] API and the Software Development Kit, visit <link href="http://api.openoffice.org/" name="http://api.openoffice.org">http://api.openoffice.org</link></paragraph>
-<paragraph role="paragraph" id="par_id3147226" xml-lang="en-US" l10n="CHG" oldref="10">This help section explains the most common runtime functions of %PRODUCTNAME Basic. For more in-depth information please refer to the <link href="http://wiki.services.openoffice.org/wiki/Documentation/BASIC_Guide">OpenOffice.org BASIC Programming Guide</link> on the OpenOffice.org Wiki.</paragraph>
+<paragraph role="paragraph" id="par_id3153894" xml-lang="en-US" l10n="U" oldref="4">%PRODUCTNAME %PRODUCTVERSION provides an Application Programming Interface (API) that allows controlling the $[officename] components with different programming languages by using the $[officename] Software Development Kit (SDK). For more information about the $[officename] API and the Software Development Kit, visit <link href="https://api.openoffice.org/" name="https://api.openoffice.org">https://api.openoffice.org</link></paragraph>
+<paragraph role="paragraph" id="par_id3147226" xml-lang="en-US" l10n="CHG" oldref="10">This help section explains the most common runtime functions of %PRODUCTNAME Basic. For more in-depth information please refer to the <link href="https://wiki.openoffice.org/wiki/Documentation/BASIC_Guide">OpenOffice.org BASIC Programming Guide</link> on the OpenOffice.org Wiki.</paragraph>
 </section>
 <paragraph role="heading" id="hd_id3146957" xml-lang="en-US" level="3" l10n="U" oldref="9">Working with %PRODUCTNAME Basic</paragraph>
 <embed href="text/sbasic/shared/01000000.xhp#doc_title"/>

Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/01/04060100.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/01/04060100.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/01/04060100.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/01/04060100.xhp Tue Nov 19 22:39:40 2013
@@ -39,7 +39,7 @@
 <paragraph xml-lang="en-US" id="hd_id3154944" role="heading" level="1" l10n="CHG"
                  oldref="16">Functions by Category</paragraph>
       <paragraph xml-lang="en-US" id="par_id3149378" role="paragraph" l10n="CHG" oldref="2">This section describes the functions of $[officename] Calc. The various functions are divided into categories in the Function Wizard.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id0120200910234570" role="tip" l10n="NEW">You can find detailed explanations, illustrations, and examples of Calc functions in the <link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_Functions_listed_by_category">OpenOffice.org Wiki</link>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0120200910234570" role="tip" l10n="NEW">You can find detailed explanations, illustrations, and examples of Calc functions in the <link href="https://wiki.openoffice.org/wiki/Documentation/How_Tos/Calc:_Functions_listed_by_category">OpenOffice.org Wiki</link>.</paragraph>
       <paragraph xml-lang="en-US" id="hd_id3146972" role="heading" level="2" l10n="U" oldref="3"><link href="text/scalc/01/04060101.xhp" name="Database">Database</link></paragraph>
       <embed href="text/scalc/01/04060101.xhp#datenbanktext"/>
       <paragraph xml-lang="en-US" id="hd_id3155443" role="heading" level="2" l10n="U" oldref="4"><link href="text/scalc/01/04060102.xhp" name="Date &amp; Time">Date &amp; Time</link></paragraph>
@@ -69,7 +69,7 @@
       <embed href="text/scalc/01/04060111.xhp#addintext"/>
       <paragraph xml-lang="en-US" id="par_id3150715" role="paragraph" l10n="U" oldref="14"><link href="text/scalc/01/04060199.xhp" name="Operators">Operators</link> are also available.</paragraph>
       <section id="relatedtopics">
-         <paragraph xml-lang="en-US" id="par_id0902200809540918" role="paragraph" l10n="NEW"><variable id="drking"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_Functions_listed_by_category">Calc functions in the OpenOffice.org Wiki</link>
+         <paragraph xml-lang="en-US" id="par_id0902200809540918" role="paragraph" l10n="NEW"><variable id="drking"><link href="https://wiki.openoffice.org/wiki/Documentation/How_Tos/Calc:_Functions_listed_by_category">Calc functions in the OpenOffice.org Wiki</link>
 </variable></paragraph>
       </section>
    </body>

Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/01/04060101.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/01/04060101.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/01/04060101.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/01/04060101.xhp Tue Nov 19 22:39:40 2013
@@ -495,7 +495,7 @@
       <paragraph xml-lang="en-US" id="par_id3147083" role="paragraph" l10n="U" oldref="87">
 <emph>SearchCriteria</emph> is the cell range containing search criteria. If you write several criteria in one row they are connected by AND. If you write the criteria in different rows they are connected by OR. Empty cells in the search criteria range will be ignored.</paragraph>
       <paragraph xml-lang="en-US" id="par_id3151188" role="paragraph" l10n="U" oldref="188">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060500.xhp" name="Spreadsheet - Calculate">%PRODUCTNAME Calc - Calculate</link> to define how $[officename] Calc acts when searching for identical entries.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3882869" role="paragraph" l10n="NEW">See also the Wiki page about <link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Conditional_Counting_and_Summation">Conditional Counting and Summation</link>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3882869" role="paragraph" l10n="NEW">See also the Wiki page about <link href="https://wiki.openoffice.org/wiki/Documentation/How_Tos/Conditional_Counting_and_Summation">Conditional Counting and Summation</link>.</paragraph>
 <sort order="asc">
 <section id="Section1">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150882"><bookmark_value>DCOUNT function</bookmark_value>

Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/01/04060110.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/01/04060110.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/01/04060110.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/01/04060110.xhp Tue Nov 19 22:39:40 2013
@@ -68,7 +68,7 @@
 <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_ASC" id="bm_id3187353" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id7723929" role="heading" level="2" l10n="NEW">ASC</paragraph>
          <paragraph xml-lang="en-US" id="par_id8455153" role="paragraph" l10n="NEW"><ahelp hid=".">The ASC function converts full-width to half-width ASCII and katakana characters. Returns a text string.</ahelp></paragraph>
-         <paragraph xml-lang="en-US" id="par_id9912411" role="paragraph" l10n="NEW">See <link href="http://wiki.services.openoffice.org/mwiki/index.php?title=Calc/Features/JIS_and_ASC_functions">http://wiki.services.openoffice.org/mwiki/index.php?title=Calc/Features/JIS_and_ASC_functions</link> for a conversion table.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id9912411" role="paragraph" l10n="NEW">See <link href="https://wiki.openoffice.org/wiki/Calc/Features/JIS_and_ASC_functions">JIS and ASC Spreadsheet Functions</link> for a conversion table.</paragraph>
          <paragraph xml-lang="en-US" id="hd_id9204992" role="heading" level="3" l10n="NEW">Syntax</paragraph>
          <paragraph xml-lang="en-US" id="par_id1993774" role="code" l10n="NEW">ASC("Text")</paragraph>
          <paragraph xml-lang="en-US" id="par_id2949919" role="paragraph" l10n="NEW">
@@ -300,7 +300,7 @@
 <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_JIS" id="bm_id3818475" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3666188" role="heading" level="2" l10n="NEW">JIS</paragraph>
          <paragraph xml-lang="en-US" id="par_id964384" role="paragraph" l10n="NEW"><ahelp hid=".">The JIS function converts half-width to full-width ASCII and katakana characters. Returns a text string.</ahelp></paragraph>
-         <paragraph xml-lang="en-US" id="par_id1551561" role="paragraph" l10n="NEW">See <link href="http://wiki.services.openoffice.org/mwiki/index.php?title=Calc/Features/JIS_and_ASC_functions">http://wiki.services.openoffice.org/mwiki/index.php?title=Calc/Features/JIS_and_ASC_functions</link> for a conversion table.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id1551561" role="paragraph" l10n="NEW">See <link href="https://wiki.openoffice.org/wiki/Calc/Features/JIS_and_ASC_functions">JIS and ASC Spreadsheet Functions</link> for a conversion table.</paragraph>
          <paragraph xml-lang="en-US" id="hd_id2212897" role="heading" level="3" l10n="NEW">Syntax</paragraph>
          <paragraph xml-lang="en-US" id="par_id2504654" role="code" l10n="NEW">JIS("Text")</paragraph>
          <paragraph xml-lang="en-US" id="par_id5292519" role="paragraph" l10n="NEW">

Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/01/04060111.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/01/04060111.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/01/04060111.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/01/04060111.xhp Tue Nov 19 22:39:40 2013
@@ -166,7 +166,7 @@
 </section>
 </sort>
 <paragraph role="heading" id="hd_id3157901" xml-lang="en-US" level="2" l10n="U" oldref="72">Add-ins through %PRODUCTNAME API</paragraph>
-<paragraph role="paragraph" id="par_id3149351" xml-lang="en-US" l10n="U" oldref="73">Add-ins can also be implemented through the %PRODUCTNAME <link href="http://api.openoffice.org/">API</link>.</paragraph>
+<paragraph role="paragraph" id="par_id3149351" xml-lang="en-US" l10n="U" oldref="73">Add-ins can also be implemented through the %PRODUCTNAME <link href="https://api.openoffice.org/">API</link>.</paragraph>
 <section id="relatedtopics">
 <embed href="text/scalc/01/04060100.xhp#drking"/>
 </section>

Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/01/04060116.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/01/04060116.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/01/04060116.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/01/04060116.xhp Tue Nov 19 22:39:40 2013
@@ -665,7 +665,7 @@
             <emph>FromUnit</emph> is the unit from which conversion is taking place.</paragraph>
          <paragraph xml-lang="en-US" id="par_id3153790" role="paragraph" l10n="U" oldref="213">
             <emph>ToUnit</emph> is the unit to which conversion is taking place. Both units must be of the same type.</paragraph>
-<paragraph xml-lang="en-US" id="par_id09022809540918" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_CONVERT_ADD_function">Current list of CONVERT_ADD units in the OpenOffice.org Wiki.</link></paragraph>
+<paragraph xml-lang="en-US" id="par_id09022809540918" role="paragraph" l10n="NEW"><link href="https://wiki.openoffice.org/wiki/Documentation/How_Tos/Calc:_CONVERT_ADD_function">Current list of CONVERT_ADD units in the OpenOffice.org Wiki.</link></paragraph>
          <paragraph xml-lang="en-US" id="hd_id3156270" role="heading" level="3" l10n="U"
                     oldref="214">Examples</paragraph>
          <paragraph xml-lang="en-US" id="par_id3156336" role="paragraph" l10n="U" oldref="215">

Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/01/04060182.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/01/04060182.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/01/04060182.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/01/04060182.xhp Tue Nov 19 22:39:40 2013
@@ -277,7 +277,7 @@
             <emph>mu</emph> is the known mean of the population.</paragraph>
          <paragraph xml-lang="en-US" id="par_id3154740" role="paragraph" l10n="CHG" oldref="109">
             <emph>Sigma</emph> (optional) is the known standard deviation of the population. If omitted, the standard deviation of the given sample is used.</paragraph>
-	 <paragraph xml-lang="en-US" id="par_id0305200911372999" role="paragraph" l10n="NEW">See also the <link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_ZTEST_function">Wiki page</link>.</paragraph>
+	 <paragraph xml-lang="en-US" id="par_id0305200911372999" role="paragraph" l10n="NEW">See also the <link href="https://wiki.openoffice.org/wiki/Documentation/How_Tos/Calc:_ZTEST_function">Wiki page</link>.</paragraph>
       </section>
       <section id="harmean">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153623"><bookmark_value>HARMEAN function</bookmark_value>

Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/01/04060185.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/01/04060185.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/01/04060185.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/01/04060185.xhp Tue Nov 19 22:39:40 2013
@@ -515,7 +515,7 @@
                     oldref="183">Example</paragraph>
          <paragraph xml-lang="en-US" id="par_id3146077" role="paragraph" l10n="U" oldref="184">
             <item type="input">=WEIBULL(2;1;1;1)</item> returns 0.86.</paragraph>
-         <paragraph xml-lang="en-US" id="par_id0305200911372899" role="paragraph" l10n="NEW">See also the <link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_WEIBULL_function">Wiki page</link>.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0305200911372899" role="paragraph" l10n="NEW">See also the <link href="https://wiki.openoffice.org/wiki/Documentation/How_Tos/Calc:_WEIBULL_function">Wiki page</link>.</paragraph>
       </section>
 </sort>
 <section id="relatedtopics">

Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/guide/database_filter.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/guide/database_filter.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/guide/database_filter.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/guide/database_filter.xhp Tue Nov 19 22:39:40 2013
@@ -90,7 +90,7 @@
          <embed href="text/scalc/guide/database_sort.xhp#database_sort"/>
          <embed href="text/scalc/guide/cellcopy.xhp#cellcopy"/>
          <embed href="text/scalc/guide/specialfilter.xhp#specialfilter"/>
-         <paragraph xml-lang="en-US" id="par_id4525284" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Defining_a_Data_Range">Wiki page about defining a data range</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id4525284" role="paragraph" l10n="NEW"><link href="https://wiki.openoffice.org/wiki/Documentation/How_Tos/Defining_a_Data_Range">Wiki page about defining a data range</link></paragraph>
       </section>
    </body>
 </helpdocument>
\ No newline at end of file

Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/guide/database_sort.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/guide/database_sort.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/guide/database_sort.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/scalc/guide/database_sort.xhp Tue Nov 19 22:39:40 2013
@@ -58,7 +58,7 @@
       <section id="relatedtopics">
          <embed href="text/scalc/guide/database_define.xhp#database_define"/>
          <embed href="text/scalc/guide/database_filter.xhp#database_filter"/>
-         <paragraph xml-lang="en-US" id="par_id1846980" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Defining_a_Data_Range">Wiki page about defining a data range</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id1846980" role="paragraph" l10n="NEW"><link href="https://wiki.openoffice.org/wiki/Documentation/How_Tos/Defining_a_Data_Range">Wiki page about defining a data range</link></paragraph>
       </section>
    </body>
 </helpdocument>
\ No newline at end of file

Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/shared/00/00000021.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/shared/00/00000021.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/shared/00/00000021.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/shared/00/00000021.xhp Tue Nov 19 22:39:40 2013
@@ -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="Apache OpenOffice">Apache OpenOffice</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="https://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/l10n40/main/helpcontent2/source/text/shared/01/01160000.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/shared/01/01160000.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/shared/01/01160000.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/shared/01/01160000.xhp Tue Nov 19 22:39:40 2013
@@ -70,7 +70,7 @@
 <paragraph role="paragraph" id="par_id5421918" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a new window in your default e-mail program with the current document as an attachment. The Microsoft Word file format is used.</ahelp></paragraph>
 </case>
 </switch>
-<embed href="text/shared/01/ref_pdf_send_as.xhp#ref_pdf_send_as"/>
+<paragraph role="heading" id="hd_id9155399" xml-lang="en-US" level="2" l10n="U"><embedvar href="text/shared/01/ref_pdf_send_as.xhp#ref_pdf_send_as"/></paragraph>
 <embed href="text/shared/01/ref_pdf_send_as.xhp#ref_pdf_send_as_text"/>
 <switch select="appl">
 <case select="WRITER"><comment>UFI: removed 2 help ids</comment>

Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/shared/01/02100001.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/shared/01/02100001.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/shared/01/02100001.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/shared/01/02100001.xhp Tue Nov 19 22:39:40 2013
@@ -342,8 +342,8 @@
          <embed href="text/swriter/guide/finding.xhp#finding"/>
 </case>
 </switch>
-<paragraph xml-lang="en-US" id="par_id1751457" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Regular_Expressions_in_Writer">Wiki page about regular expressions in Writer</link></paragraph>
-         <paragraph xml-lang="en-US" id="par_id5483870" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Regular_Expressions_in_Calc">Wiki page about regular expressions in Calc</link></paragraph>
+<paragraph xml-lang="en-US" id="par_id1751457" role="paragraph" l10n="NEW"><link href="https://wiki.openoffice.org/wiki/Documentation/How_Tos/Regular_Expressions_in_Writer">Wiki page about regular expressions in Writer</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id5483870" role="paragraph" l10n="NEW"><link href="https://wiki.openoffice.org/wiki/Documentation/How_Tos/Regular_Expressions_in_Calc">Wiki page about regular expressions in Calc</link></paragraph>
       </section>
    </body>
 </helpdocument>

Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/shared/01/04060000.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/shared/01/04060000.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/shared/01/04060000.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/shared/01/04060000.xhp Tue Nov 19 22:39:40 2013
@@ -43,7 +43,7 @@
 <paragraph role="paragraph" id="par_id3154926" xml-lang="en-US" l10n="U" oldref="2"><variable id="scan"><ahelp hid=".uno:Scan">Inserts a scanned image into your document.</ahelp>
 </variable></paragraph>
 </section>
-<paragraph role="paragraph" id="par_id3153124" xml-lang="en-US" l10n="U" oldref="5">To insert a scanned image, the driver for your scanner must be installed. <switchinline select="sys"><caseinline select="UNIX">Under UNIX systems, install the SANE package found at http://www.mostang.com/sane/. The SANE package must use the same libc as $[officename].
+<paragraph role="paragraph" id="par_id3153124" xml-lang="en-US" l10n="U" oldref="5">To insert a scanned image, the driver for your scanner must be installed. <switchinline select="sys"><caseinline select="UNIX">Under UNIX systems, install the SANE package found at <link href="http://www.sane-project.org/">http://www.sane-project.org/</link>. The SANE package must use the same libc as $[officename].
 </caseinline></switchinline></paragraph>
 <section id="howtoget">
   <embed href="text/shared/00/00000404.xhp#scannen"/>

Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/shared/01/06020000.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/shared/01/06020000.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/shared/01/06020000.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/shared/01/06020000.xhp Tue Nov 19 22:39:40 2013
@@ -67,7 +67,7 @@
 
 <bookmark xml-lang="en-US" branch="hid/svx:MenuButton:RID_SVXDLG_THESAURUS:MB_LANGUAGE" id="bm_id3149763" localize="false"/>
 <paragraph role="heading" id="hd_id3146775" xml-lang="en-US" level="2" l10n="U" oldref="15">Language</paragraph>
-<paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid=".">Select a language for the thesaurus.</ahelp> You can install languages with a thesaurus library from the <link href="http://extensions.services.openoffice.org/">Extensions</link> web page.</paragraph>
+<paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid=".">Select a language for the thesaurus.</ahelp> You can install languages with a thesaurus library from the <link href="http://extensions.openoffice.org/">Extensions</link> web page.</paragraph>
 
 </body>
 </helpdocument>

Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/shared/01/packagemanager.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/shared/01/packagemanager.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/shared/01/packagemanager.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/shared/01/packagemanager.xhp Tue Nov 19 22:39:40 2013
@@ -73,7 +73,7 @@
 </list><comment>UFI: Extension Guide needed. Until we have that guide, I'll add some more info in this file.</comment>
 <paragraph id="hd_id3895382" role="heading" xml-lang="en-US" level="2">To install an extension</paragraph>
 <paragraph id="par_id9143955" role="paragraph" xml-lang="en-US">An extension is available as a file with the file extension .oxt.</paragraph>
-<paragraph id="par_id7857905" role="paragraph" xml-lang="en-US">You can find a collection of extensions on the Web. Click the "Get more extensions here" link in the Extension Manager to open your Web browser and see the <link href="http://extensions.services.openoffice.org/">http://extensions.services.openoffice.org/</link> page.<comment># i78606</comment></paragraph>
+<paragraph id="par_id7857905" role="paragraph" xml-lang="en-US">You can find a collection of extensions on the Web. Click the "Get more extensions here" link in the Extension Manager to open your Web browser and see the <link href="http://extensions.openoffice.org/">http://extensions.openoffice.org/</link> page.<comment># i78606</comment></paragraph>
 <paragraph id="hd_id5016937" role="heading" xml-lang="en-US" level="3">To install a user extension</paragraph>
 <paragraph id="par_id1856440" role="paragraph" xml-lang="en-US">Do any of the following:</paragraph>
 <list type="ordered">

Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/shared/05/00000001.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/shared/05/00000001.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/shared/05/00000001.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/shared/05/00000001.xhp Tue Nov 19 22:39:40 2013
@@ -41,24 +41,24 @@
 <paragraph xml-lang="en-US" id="hd_id3146873" role="heading" level="1" l10n="U" oldref="1"><variable id="00000001"><link href="text/shared/05/00000001.xhp" name="Getting Support">Getting Support</link>
 </variable></paragraph>
          <paragraph xml-lang="en-US" id="par_id9173253" role="paragraph" l10n="NEW">Many questions and answers are the same for %PRODUCTNAME software and for the commercial office software.</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3150667" role="paragraph" l10n="CHG" oldref="8">You can find support on the %PRODUCTNAME website at <link href="http://support.openoffice.org">support.openoffice.org</link>.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3150667" role="paragraph" l10n="CHG" oldref="8">You can find support on the %PRODUCTNAME website at <link href="https://support.openoffice.org">support.openoffice.org</link>.</paragraph>
 
          <paragraph xml-lang="en-US" id="par_id3154230" role="paragraph" l10n="U" oldref="3">For a summary of the current support services refer to the <emph>Readme</emph> file in the <item type="productname">%PRODUCTNAME</item> folder.</paragraph>
 <paragraph xml-lang="en-US" id="hd_id26327" role="heading" level="2" l10n="NEW">Local language support pages</paragraph>
-         <paragraph xml-lang="en-US" id="par_id1318380" role="paragraph" l10n="CHG">The %PRODUCTNAME localization projects offer support pages in local languages. Find an overview of the native language projects at <link href="http://projects.openoffice.org/native-lang.html">projects.openoffice.org/native-lang.html</link>. You can find help and support in English language on the %PRODUCTNAME website at <link href="http://support.openoffice.org">support.openoffice.org</link>.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id1318380" role="paragraph" l10n="CHG">The %PRODUCTNAME localization projects offer support pages in local languages. Find an overview of the native language projects at <link href="https://projects.openoffice.org/native-lang.html">projects.openoffice.org/native-lang.html</link>. You can find help and support in English language on the %PRODUCTNAME website at <link href="https://support.openoffice.org">support.openoffice.org</link>.</paragraph>
          <paragraph xml-lang="en-US" id="hd_id2611386" role="heading" level="2" l10n="NEW">Mailing lists</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3166335" role="paragraph" l10n="NEW">Ask about %PRODUCTNAME, find help by volunteers, and discuss topics on the public mailing lists. You can find many general and specialized mailing lists on the %PRODUCTNAME website at <link href="http://www.openoffice.org/mail_list.html">www.openoffice.org/mail_list.html</link>.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3166335" role="paragraph" l10n="NEW">Ask about %PRODUCTNAME, find help by volunteers, and discuss topics on the public mailing lists. You can find many general and specialized mailing lists on the %PRODUCTNAME website at <link href="https://www.openoffice.org/mail_list.html">www.openoffice.org/mail_list.html</link>.</paragraph>
          <paragraph xml-lang="en-US" id="hd_id0915200811081722" role="heading" level="2" l10n="NEW">Forum</paragraph>
          <paragraph xml-lang="en-US" id="par_id0915200811081778" role="paragraph" l10n="NEW">You can access web forums to ask and answer questions about %PRODUCTNAME.</paragraph>
          <paragraph xml-lang="en-US" id="hd_id0804200803314150" role="heading" level="2" l10n="NEW">Security</paragraph>
-         <paragraph xml-lang="en-US" id="par_id0804200803314235" role="paragraph" l10n="NEW">In case you are concerned about any security issue with using this software, please refer to the <link href="http://www.openoffice.org/security/index.html">%PRODUCTNAME Security</link> page on our website.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0804200803314235" role="paragraph" l10n="NEW">In case you are concerned about any security issue with using this software, please refer to the <link href="https://www.openoffice.org/security/index.html">%PRODUCTNAME Security</link> page on our website.</paragraph>
          <paragraph xml-lang="en-US" id="hd_id3168534" role="heading" level="2" l10n="NEW">Downloads</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3028143" role="paragraph" l10n="CHG">You can download the latest version of %PRODUCTNAME at <link href="http://download.openoffice.org/">download.openoffice.org</link>.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3028143" role="paragraph" l10n="CHG">You can download the latest version of %PRODUCTNAME at <link href="https://download.openoffice.org/">download.openoffice.org</link>.</paragraph>
          <paragraph xml-lang="en-US" id="hd_id2602967" role="heading" level="2" l10n="NEW">Documentation</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3497211" role="paragraph" l10n="NEW">You can download documentation as PDF files, how-tos, and guides from the %PRODUCTNAME website at <link href="http://documentation.openoffice.org">documentation.openoffice.org</link>.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3497211" role="paragraph" l10n="NEW">You can download documentation as PDF files, how-tos, and guides from the %PRODUCTNAME website at <link href="https://documentation.openoffice.org">documentation.openoffice.org</link>.</paragraph>
          <paragraph xml-lang="en-US" id="hd_id0120200910361765" role="heading" level="2" l10n="NEW">Participate and give back</paragraph>
          <paragraph xml-lang="en-US" id="par_id0120200910361848" role="paragraph" l10n="NEW">If you want to take an active role in the worldwide %PRODUCTNAME community, you are very welcome to give feedback, discuss features, propose enhancements, write your own article in an FAQ, how-to, manual, create a video tutorial, etc.</paragraph>
-         <paragraph xml-lang="en-US" id="par_id0120200910361874" role="paragraph" l10n="NEW">Visit the <link href="http://documentation.openoffice.org/">documentation web site</link> or the <link href="http://wiki.openoffice.org/wiki/Documentation">Wiki starting page</link> and follow the links for contributors.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0120200910361874" role="paragraph" l10n="NEW">Visit the <link href="https://documentation.openoffice.org/">documentation web site</link> or the <link href="https://wiki.openoffice.org/wiki/Documentation">Wiki starting page</link> and follow the links for contributors.</paragraph>
       </section>
    </body>
 </helpdocument>
\ No newline at end of file

Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp Tue Nov 19 22:39:40 2013
@@ -39,7 +39,7 @@
 </bookmark><comment>mw added 2 new index entries</comment><paragraph role="heading" id="par_idN1053D" xml-lang="en-US" level="1" l10n="NEW"><variable id="access"><link href="text/shared/explorer/database/dabawiz02access.xhp">Microsoft Access Connection</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_idN10541" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Specifies the settings for importing a database file in Microsoft Access or Access 2007 format.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id1142772" xml-lang="en-US" l10n="NEW">See also the English Wiki page <link href="http://wiki.services.openoffice.org/wiki/MSA-Base_Faq">http://wiki.services.openoffice.org/wiki/MSA-Base_Faq</link>.</paragraph>
+<paragraph role="paragraph" id="par_id1142772" xml-lang="en-US" l10n="NEW">See also the English Wiki page <link href="https://wiki.openoffice.org/wiki/MSA-Base_Faq">wiki.openoffice.org/wiki/MSA-Base_Faq</link>.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION" id="bm_id627155" localize="false"/><paragraph role="heading" id="par_idN10544" xml-lang="en-US" level="2" l10n="NEW">Microsoft Access database file</paragraph>
 <paragraph role="paragraph" id="par_idN10548" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the path to the database file.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION" id="bm_id8335215" localize="false"/><paragraph role="heading" id="par_idN1054B" xml-lang="en-US" level="2" l10n="NEW">Browse</paragraph>

Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/shared/explorer/database/main.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/shared/explorer/database/main.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/shared/explorer/database/main.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/shared/explorer/database/main.xhp Tue Nov 19 22:39:40 2013
@@ -102,7 +102,7 @@
 <embedvar href="text/shared/explorer/database/toolbars.xhp#toolbars"/>
 </paragraph>
 <embed href="text/shared/04/01020000.xhp#DB_keys"/>
-<paragraph role="paragraph" id="par_id6474806" xml-lang="en-US" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Database">Wiki page about Base</link></paragraph>
+<paragraph role="paragraph" id="par_id6474806" xml-lang="en-US" l10n="NEW"><link href="https://wiki.openoffice.org/wiki/Database">Wiki page about Base</link></paragraph>
 </section>
 </body>
 </helpdocument>

Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp Tue Nov 19 22:39:40 2013
@@ -56,7 +56,7 @@
       <embed href="text/shared/00/00000001.xhp#finish"/>
       <embed href="text/shared/00/00000001.xhp#abbrechen"/>
       <section id="relatedtopics">
-         <paragraph xml-lang="en-US" id="par_id0112200902353554" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Macros_in_Database_Documents">An in depth explanation by the developers (Wiki).</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id0112200902353554" role="paragraph" l10n="NEW"><link href="https://wiki.openoffice.org/wiki/Macros_in_Database_Documents">An in depth explanation by the developers (Wiki).</link></paragraph>
       </section>
    </body>
 </helpdocument>
\ No newline at end of file

Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/shared/explorer/database/rep_main.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/shared/explorer/database/rep_main.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/shared/explorer/database/rep_main.xhp Tue Nov 19 22:39:40 2013
@@ -45,7 +45,7 @@
             <paragraph xml-lang="en-US" id="par_id5284279" role="paragraph" l10n="NEW">Choose Tools - Extension Manager to open the <link href="text/shared/01/packagemanager.xhp">Extension Manager</link>.</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id4494766" role="paragraph" l10n="CHG">If you see the Report Builder in the Extension Manager list, then you do not need to install the extension. Else click the link "Get more extensions here". This opens your web browser at the address <link href="http://extensions.services.openoffice.org">http://extensions.services.openoffice.org</link> and shows a list of available extensions.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id4494766" role="paragraph" l10n="CHG">If you see the Report Builder in the Extension Manager list, then you do not need to install the extension. Else click the link "Get more extensions here". This opens your web browser at the address <link href="http://extensions.openoffice.org">http://extensions.openoffice.org</link> and shows a list of available extensions.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id7858516" role="paragraph" l10n="NEW">Find the Report Builder extension. Click at the icon or the "click here" text link. This opens the download page for the extension.</paragraph>

Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp Tue Nov 19 22:39:40 2013
@@ -45,7 +45,7 @@
 <paragraph role="heading" id="hd_id2932828" xml-lang="en-US" level="2" l10n="NEW">To enter functions to the report</paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:NewFunction" id="bm_id974456" localize="false"/><paragraph role="paragraph" id="par_id5091708" xml-lang="en-US" l10n="NEW"><ahelp hid=".">In the context menu of the Report Navigator, you see the same commands as in the Report Builder view, plus additional commands to create new functions or to delete them.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id9449446" xml-lang="en-US" l10n="NEW">Functions can be entered using a syntax as specified by the <link href="http://en.wikipedia.org/wiki/OpenFormula">OpenFormula</link> proposal.</paragraph>
-<paragraph role="paragraph" id="par_id4095583" xml-lang="en-US" l10n="NEW">See <link href="http://wiki.services.openoffice.org/wiki/Database">Wiki page about Base</link> for some more help regarding the functions in a report.</paragraph>
+<paragraph role="paragraph" id="par_id4095583" xml-lang="en-US" l10n="NEW">See <link href="https://wiki.openoffice.org/wiki/Database">Wiki page about Base</link> for some more help regarding the functions in a report.</paragraph>
 <paragraph role="heading" id="hd_id311593" xml-lang="en-US" level="3" l10n="NEW">To calculate a sum for each client<comment>copied from a mail by Ocke - did not test</comment></paragraph>
 <list type="ordered">
 <listitem>

Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/shared/guide/assistive.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/shared/guide/assistive.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/shared/guide/assistive.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/shared/guide/assistive.xhp Tue Nov 19 22:39:40 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 Apache OpenOffice 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 <link href="https://wiki.openoffice.org/wiki/Accessibility">Apache OpenOffice Wiki</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/l10n40/main/helpcontent2/source/text/shared/guide/digital_signatures.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/shared/guide/digital_signatures.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/shared/guide/digital_signatures.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/shared/guide/digital_signatures.xhp Tue Nov 19 22:39:40 2013
@@ -102,7 +102,7 @@
       <paragraph xml-lang="en-US" id="par_id6075624" role="paragraph" l10n="NEW">On Windows operating systems, the Windows features of validating a signature are used. On Solaris and Linux systems, files that are supplied by Thunderbird, Mozilla or Firefox are used. You must ensure that the files that are in use within your system are really the original files that were supplied by the original developers. For malevolent intruders, there are numerous ways to replace original files with other files that they supply.</paragraph>
       <paragraph xml-lang="en-US" id="par_id6819971" role="warning" l10n="NEW">The messages about validation of a signature that you see in %PRODUCTNAME are the messages that the validation files return. The %PRODUCTNAME software has no way to ensure that the messages reflect the true status of any certificate. The %PRODUCTNAME software only displays the messages that other files that are not under control of %PRODUCTNAME report. There is no legal responsibility of %PRODUCTNAME that the displayed messages reflect the true status of a digital signature.</paragraph>
       <section id="relatedtopics">
-         <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="https://wiki.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
          <paragraph xml-lang="en-US" id="par_id486465" role="paragraph" l10n="NEW"><link href="text/shared/guide/digitalsign_send.xhp">Applying digital signatures</link></paragraph>
          <paragraph xml-lang="en-US" id="par_id3448591" role="paragraph" l10n="NEW"><link href="text/shared/guide/digitalsign_receive.xhp">Opening a document using WebDAV over HTTPS</link></paragraph>
       </section>

Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp Tue Nov 19 22:39:40 2013
@@ -90,7 +90,7 @@
   <paragraph xml-lang="en-US" id="par_id3397320" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">If you enable <emph>Remember password till end of session</emph>, your password will be remembered for subsequent WebDAV connections until you exit %PRODUCTNAME.</ahelp></paragraph>
   <section id="relatedtopics">
    
-   <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
+   <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="https://wiki.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
    <paragraph xml-lang="en-US" id="par_id2182378" role="paragraph" l10n="NEW"><link href="text/shared/guide/digital_signatures.xhp">About digital signatures</link></paragraph>
    
   </section>

Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/shared/guide/digitalsign_send.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/shared/guide/digitalsign_send.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/shared/guide/digitalsign_send.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/shared/guide/digitalsign_send.xhp Tue Nov 19 22:39:40 2013
@@ -103,7 +103,7 @@
 <!-- removed HID 1311736326 -->
 <paragraph xml-lang="en-US" id="par_id7705618" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Choose this setting to cancel the connection.</ahelp></paragraph>
       <section id="relatedtopics">
-         <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="https://wiki.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
          <paragraph xml-lang="en-US" id="par_id5166173" role="paragraph" l10n="NEW"><link href="text/shared/guide/digital_signatures.xhp">About digital signatures</link></paragraph>
       </section>
    </body>

Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/shared/guide/language_select.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/shared/guide/language_select.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/shared/guide/language_select.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/shared/guide/language_select.xhp Tue Nov 19 22:39:40 2013
@@ -157,7 +157,7 @@
       <paragraph xml-lang="en-US" id="hd_id9999694" role="heading" level="2" l10n="NEW">Adding More UI Languages</paragraph>
       <list type="ordered">
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id2216559" role="paragraph" l10n="NEW">Open your Web browser and enter <link href="http://wiki.services.openoffice.org/wiki/Download_OpenOffice.org_LanguagePacks">http://wiki.services.openoffice.org/wiki/Download_OpenOffice.org_LanguagePacks</link></paragraph>
+            <paragraph xml-lang="en-US" id="par_id2216559" role="paragraph" l10n="NEW">Open your Web browser and enter <link href="https://wiki.openoffice.org/wiki/Download_OpenOffice.org_LanguagePacks">https://wiki.openoffice.org/wiki/Download_OpenOffice.org_LanguagePacks</link></paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id7869502" role="paragraph" l10n="CHG">Select and download the correct language pack for your version of %PRODUCTNAME software.</paragraph>

Modified: openoffice/branches/l10n40/main/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp?rev=1543609&r1=1543608&r2=1543609&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp (original)
+++ openoffice/branches/l10n40/main/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp Tue Nov 19 22:39:40 2013
@@ -121,7 +121,7 @@
 <paragraph role="paragraph" id="par_id0811200801491972" xml-lang="en-US" l10n="NEW">In Excel, the formula =A1+A2 returns 2, but the formula =SUM(A1,A2) returns 0.<comment>in SUM(A1&lt;limiter&gt;A2), use the Excel limiter comma , in English and semicolon ; in German</comment></paragraph>
 </listitem>
 </list>
-<paragraph role="note" id="par_id3150439" xml-lang="en-US" l10n="CHG" oldref="30">For a detailed overview about converting documents to and from Microsoft Office format, see the <link href="http://wiki.services.openoffice.org/wiki/Documentation/OOoAuthors_User_Manual/Migration_Guide">Migration Guide</link>.</paragraph>
+<paragraph role="note" id="par_id3150439" xml-lang="en-US" l10n="CHG" oldref="30">For a detailed overview about converting documents to and from Microsoft Office format, see the <link href="https://wiki.openoffice.org/wiki/Documentation/OOoAuthors_User_Manual/Migration_Guide">Migration Guide</link>.</paragraph>
 <paragraph role="heading" id="par_idN10A9F" xml-lang="en-US" level="2" l10n="NEW">Opening Microsoft Office Documents That Are Protected With a Password</paragraph>
 <paragraph role="paragraph" id="par_id8699606" xml-lang="en-US" l10n="NEW">%PRODUCTNAME can open the following Microsoft Office document types that are protected by a password.</paragraph>
 <table id="tbl_id4497512">