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/02/03 14:24:38 UTC

svn commit: r1441909 [28/45] - in /openoffice/branches/l10n: ./ ext_libraries/apr-util/ ext_libraries/apr/ ext_libraries/hunspell/ ext_sources/ extras/l10n/source/ast/ extras/l10n/source/da/ extras/l10n/source/eu/ extras/l10n/source/gd/ extras/l10n/sou...

Modified: openoffice/branches/l10n/main/sc/source/core/tool/interpr3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sc/source/core/tool/interpr3.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sc/source/core/tool/interpr3.cxx (original)
+++ openoffice/branches/l10n/main/sc/source/core/tool/interpr3.cxx Sun Feb  3 13:23:59 2013
@@ -44,6 +44,10 @@
 #include <vector>
 #include <algorithm>
 
+#include <boost/math/special_functions/atanh.hpp>
+#include <boost/math/special_functions/expm1.hpp>
+#include <boost/math/special_functions/log1p.hpp>
+
 using ::std::vector;
 using namespace formula;
 
@@ -853,8 +857,8 @@ double ScInterpreter::GetBeta(double fAl
     fLanczos *= sqrt((fABgm/(fA+fgm))/(fB+fgm));
     double fTempA = fB/(fA+fgm); // (fA+fgm)/fABgm = 1 / ( 1 + fB/(fA+fgm))
     double fTempB = fA/(fB+fgm);
-    double fResult = exp(-fA * ::rtl::math::log1p(fTempA)
-                            -fB * ::rtl::math::log1p(fTempB)-fgm);
+    double fResult = exp(-fA * ::boost::math::log1p(fTempA)
+                            -fB * ::boost::math::log1p(fTempB)-fgm);
     fResult *= fLanczos;
     return fResult;
 }
@@ -882,8 +886,8 @@ double ScInterpreter::GetLogBeta(double 
     fLogLanczos += 0.5*(log(fABgm)-log(fA+fgm)-log(fB+fgm));
     double fTempA = fB/(fA+fgm); // (fA+fgm)/fABgm = 1 / ( 1 + fB/(fA+fgm))
     double fTempB = fA/(fB+fgm);
-    double fResult = -fA * ::rtl::math::log1p(fTempA)
-                        -fB * ::rtl::math::log1p(fTempB)-fgm;
+    double fResult = -fA * ::boost::math::log1p(fTempA)
+                        -fB * ::boost::math::log1p(fTempB)-fgm;
     fResult += fLogLanczos;
     return fResult;
 }
@@ -904,7 +908,7 @@ double ScInterpreter::GetBetaDistPDF(dou
             return HUGE_VAL;
         }
         if (fX <= 0.01)
-            return fB + fB * ::rtl::math::expm1((fB-1.0) * ::rtl::math::log1p(-fX));
+            return fB + fB * ::boost::math::expm1((fB-1.0) * ::boost::math::log1p(-fX));
         else
             return fB * pow(0.5-fX+0.5,fB-1.0);
     }
@@ -943,7 +947,7 @@ double ScInterpreter::GetBetaDistPDF(dou
     // normal cases; result x^(a-1)*(1-x)^(b-1)/Beta(a,b)
     const double fLogDblMax = log( ::std::numeric_limits<double>::max());
     const double fLogDblMin = log( ::std::numeric_limits<double>::min());
-    double fLogY = (fX < 0.1) ? ::rtl::math::log1p(-fX) : log(0.5-fX+0.5);
+    double fLogY = (fX < 0.1) ? ::boost::math::log1p(-fX) : log(0.5-fX+0.5);
     double fLogX = log(fX);
     double fAm1LogX = (fA-1.0) * fLogX;
     double fBm1LogY = (fB-1.0) * fLogY;
@@ -1024,13 +1028,13 @@ double ScInterpreter::GetBetaDist(double
         return pow(fXin, fAlpha);
     if (fAlpha == 1.0)
     //            1.0 - pow(1.0-fX,fBeta) is not accurate enough
-        return -::rtl::math::expm1(fBeta * ::rtl::math::log1p(-fXin));
+        return -::boost::math::expm1(fBeta * ::boost::math::log1p(-fXin));
     //FIXME: need special algorithm for fX near fP for large fA,fB
     double fResult;
     // I use always continued fraction, power series are neither
     // faster nor more accurate.
     double fY = (0.5-fXin)+0.5;
-    double flnY = ::rtl::math::log1p(-fXin);
+    double flnY = ::boost::math::log1p(-fXin);
     double fX = fXin;
     double flnX = log(fXin);
     double fA = fAlpha;
@@ -1141,7 +1145,7 @@ void ScInterpreter::ScFisher()
     if (fabs(fVal) >= 1.0)
         PushIllegalArgument();
     else
-        PushDouble( ::rtl::math::atanh( fVal));
+        PushDouble( ::boost::math::atanh( fVal));
 }
 
 void ScInterpreter::ScFisherInv()

Modified: openoffice/branches/l10n/main/sc/source/core/tool/viewopti.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sc/source/core/tool/viewopti.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sc/source/core/tool/viewopti.cxx (original)
+++ openoffice/branches/l10n/main/sc/source/core/tool/viewopti.cxx Sun Feb  3 13:23:59 2013
@@ -146,9 +146,9 @@ void ScViewOptions::SetDefaults()
 {
 	aOptArr[ VOPT_FORMULAS	  ] =
 	aOptArr[ VOPT_SYNTAX	  ] =
-	aOptArr[ VOPT_HELPLINES   ] =
-	aOptArr[ VOPT_BIGHANDLES  ] = sal_False;
-	aOptArr[ VOPT_NOTES		  ] =
+	aOptArr[ VOPT_HELPLINES   ] = sal_False;
+
+    aOptArr[ VOPT_NOTES		  ] =
 	aOptArr[ VOPT_NULLVALS	  ] =
 	aOptArr[ VOPT_VSCROLL	  ] =
 	aOptArr[ VOPT_HSCROLL	  ] =
@@ -158,7 +158,8 @@ void ScViewOptions::SetDefaults()
 	aOptArr[ VOPT_GRID		  ] =
 	aOptArr[ VOPT_ANCHOR	  ] =
 	aOptArr[ VOPT_PAGEBREAKS  ] =
-	aOptArr[ VOPT_SOLIDHANDLES] =
+	aOptArr[ VOPT_SOLIDHANDLES] =   // default is enhanced handles
+	aOptArr[ VOPT_BIGHANDLES  ] =   // default is big handles
 	aOptArr[ VOPT_CLIPMARKS	  ] = sal_True;
 
 	aModeArr[VOBJ_TYPE_OLE ]  =

Modified: openoffice/branches/l10n/main/sc/source/filter/excel/xiescher.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sc/source/filter/excel/xiescher.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sc/source/filter/excel/xiescher.cxx (original)
+++ openoffice/branches/l10n/main/sc/source/filter/excel/xiescher.cxx Sun Feb  3 13:23:59 2013
@@ -86,6 +86,7 @@
 #include <svx/xlinjoit.hxx>
 #include <svx/xlntrit.hxx>
 #include <svx/xbtmpit.hxx>
+#include <vcl/dibtools.hxx>
 
 #include "document.hxx"
 #include "drwlayer.hxx"
@@ -747,7 +748,7 @@ void XclImpDrawObjBase::ConvertFillStyle
                 aMemStrm << sal_uInt32( pnPattern[ nIdx ] ); // 32-bit little-endian
             aMemStrm.Seek( STREAM_SEEK_TO_BEGIN );
             Bitmap aBitmap;
-            aBitmap.Read( aMemStrm, sal_False );
+            ReadDIB(aBitmap, aMemStrm, false);
             rSdrObj.SetMergedItem(XFillStyleItem(XFILL_BITMAP));
             rSdrObj.SetMergedItem(XFillBitmapItem(EMPTY_STRING, Graphic(aBitmap)));
         }
@@ -3943,7 +3944,7 @@ void XclImpDrawing::ReadBmp( Graphic& rG
     // import the graphic from memory stream
     aMemStrm.Seek( STREAM_SEEK_TO_BEGIN );
     Bitmap aBitmap;
-    if( aBitmap.Read( aMemStrm, sal_False ) )   // read DIB without file header
+    if( ReadDIB(aBitmap, aMemStrm, false) )   // read DIB without file header
         rGraphic = aBitmap;
 }
 

Modified: openoffice/branches/l10n/main/sc/source/ui/app/drwtrans.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sc/source/ui/app/drwtrans.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sc/source/ui/app/drwtrans.cxx (original)
+++ openoffice/branches/l10n/main/sc/source/ui/app/drwtrans.cxx Sun Feb  3 13:23:59 2013
@@ -437,7 +437,7 @@ sal_Bool ScDrawTransferObj::GetData( con
             if ( nFormat == SOT_FORMAT_GDIMETAFILE )
                 bOK = SetGDIMetaFile( aView.GetMarkedObjMetaFile(true), rFlavor );
             else
-                bOK = SetBitmap( aView.GetMarkedObjBitmapEx(true).GetBitmap(), rFlavor );
+                bOK = SetBitmapEx( aView.GetMarkedObjBitmapEx(true), rFlavor );
         }
         else if ( nFormat == SOT_FORMATSTR_ID_SVXB )
         {

Modified: openoffice/branches/l10n/main/sc/source/ui/app/transobj.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sc/source/ui/app/transobj.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sc/source/ui/app/transobj.cxx (original)
+++ openoffice/branches/l10n/main/sc/source/ui/app/transobj.cxx Sun Feb  3 13:23:59 2013
@@ -342,7 +342,7 @@ sal_Bool ScTransferObj::GetData( const d
 
 			aVirtDev.SetMapMode( MapMode( MAP_PIXEL ) );
 			Bitmap aBmp = aVirtDev.GetBitmap( Point(), aVirtDev.GetOutputSize() );
-			bOK = SetBitmap( aBmp, rFlavor );
+			bOK = SetBitmapEx( aBmp, rFlavor );
 		}
 		else if ( nFormat == SOT_FORMAT_GDIMETAFILE )
 		{

Modified: openoffice/branches/l10n/main/sc/source/ui/docshell/docsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sc/source/ui/docshell/docsh.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sc/source/ui/docshell/docsh.cxx (original)
+++ openoffice/branches/l10n/main/sc/source/ui/docshell/docsh.cxx Sun Feb  3 13:23:59 2013
@@ -2999,7 +2999,7 @@ bool ScDocShell::GetProtectionHash( /*ou
     return bRes;
 }    
 
-void ScDocShell::BeforeLoading( SfxMedium& rMedium, const ::rtl::OUString & rstrTypeName, const ::rtl::OUString & rstrFilterName )
+void ScDocShell::BeforeLoading( SfxMedium& /*rMedium*/, const ::rtl::OUString & rstrTypeName, const ::rtl::OUString & /*rstrFilterName*/ )
 {
     const sal_uInt8 nMediumFlag = GetMediumFlag<false>( rstrTypeName );
 
@@ -3012,7 +3012,7 @@ void ScDocShell::BeforeLoading( SfxMediu
     }
 }
 
-void ScDocShell::AfterLoading( SfxMedium& rMedium, const ::rtl::OUString & rstrTypeName, const ::rtl::OUString & rstrFilterName )
+void ScDocShell::AfterLoading( SfxMedium& /*rMedium*/, const ::rtl::OUString & rstrTypeName, const ::rtl::OUString & /*rstrFilterName*/ )
 {
     const sal_uInt8 nMediumFlag = GetMediumFlag<false>( rstrTypeName );
 

Modified: openoffice/branches/l10n/main/sc/source/ui/docshell/docsh2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sc/source/ui/docshell/docsh2.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sc/source/ui/docshell/docsh2.cxx (original)
+++ openoffice/branches/l10n/main/sc/source/ui/docshell/docsh2.cxx Sun Feb  3 13:23:59 2013
@@ -86,8 +86,6 @@ sal_Bool __EXPORT ScDocShell::InitNew( c
 		SetVisAreaOrSize( Rectangle( Point(), aSize ), sal_True );
 	}
 
-    aDocument.SetDrawDefaults();        // drawing layer defaults that are set only in InitNew
-
 	// InitOptions sets the document languages, must be called before CreateStandardStyles
     InitOptions(false);
 

Modified: openoffice/branches/l10n/main/sc/source/ui/inc/viewfunc.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sc/source/ui/inc/viewfunc.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sc/source/ui/inc/viewfunc.hxx (original)
+++ openoffice/branches/l10n/main/sc/source/ui/inc/viewfunc.hxx Sun Feb  3 13:23:59 2013
@@ -139,7 +139,7 @@ public:
 
 	sal_Bool			PasteFile( const Point&, const String&, sal_Bool bLink=sal_False );
     sal_Bool            PasteObject( const Point&, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >&, const Size* = NULL, const Graphic* = NULL, const ::rtl::OUString& = ::rtl::OUString(), sal_Int64 nAspect = ::com::sun::star::embed::Aspects::MSOLE_CONTENT );
-	sal_Bool			PasteBitmap( const Point&, const Bitmap& );
+	sal_Bool			PasteBitmapEx( const Point&, const BitmapEx& );
 	sal_Bool			PasteMetaFile( const Point&, const GDIMetaFile& );
 	sal_Bool			PasteGraphic( const Point& rPos, const Graphic& rGraphic,
 									const String& rFile, const String& rFilter );

Modified: openoffice/branches/l10n/main/sc/source/ui/vba/helperdecl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sc/source/ui/vba/helperdecl.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sc/source/ui/vba/helperdecl.hxx (original)
+++ openoffice/branches/l10n/main/sc/source/ui/vba/helperdecl.hxx Sun Feb  3 13:23:59 2013
@@ -26,7 +26,7 @@
 namespace comphelper {
 namespace service_decl {
 template <typename ImplT_, typename WithArgsT = with_args<false> >
-struct vba_service_class_ : public serviceimpl_base< detail::OwnServiceImpl<ImplT_>, WithArgsT >
+struct vba_service_class_ : public serviceimpl_base< vba_detail::OwnServiceImpl<ImplT_>, WithArgsT >
 {
     typedef serviceimpl_base< detail::OwnServiceImpl<ImplT_>, WithArgsT > baseT;
     /** Default ctor.  Implementation class without args, expecting

Modified: openoffice/branches/l10n/main/sc/source/ui/vba/vbahyperlinks.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sc/source/ui/vba/vbahyperlinks.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sc/source/ui/vba/vbahyperlinks.cxx (original)
+++ openoffice/branches/l10n/main/sc/source/ui/vba/vbahyperlinks.cxx Sun Feb  3 13:23:59 2013
@@ -109,7 +109,7 @@ bool EqualAnchorFunctor::operator()( con
 
 // ============================================================================
 
-namespace detail {
+namespace vba_detail {
 
 class ScVbaHlinkContainer : public ::cppu::WeakImplHelper1< container::XIndexAccess >
 {
@@ -201,13 +201,13 @@ ScVbaHlinkContainerMember::~ScVbaHlinkCo
 {
 }
 
-} // namespace detail
+} // namespace vba_detail
 
 // ============================================================================
 
 ScVbaHyperlinks::ScVbaHyperlinks( const uno::Reference< XHelperInterface >& rxParent,
         const uno::Reference< uno::XComponentContext >& rxContext ) throw (uno::RuntimeException) :
-    detail::ScVbaHlinkContainerMember( new detail::ScVbaHlinkContainer ),
+    vba_detail::ScVbaHlinkContainerMember( new vba_detail::ScVbaHlinkContainer ),
     ScVbaHyperlinks_BASE( rxParent, rxContext, uno::Reference< container::XIndexAccess >( mxContainer.get() ) )
 {
 }
@@ -215,7 +215,7 @@ ScVbaHyperlinks::ScVbaHyperlinks( const 
 ScVbaHyperlinks::ScVbaHyperlinks( const uno::Reference< XHelperInterface >& rxParent,
         const uno::Reference< uno::XComponentContext >& rxContext,
         const ScVbaHyperlinksRef& rxSheetHlinks, const ScRangeList& rScRanges ) throw (uno::RuntimeException) :
-    detail::ScVbaHlinkContainerMember( new detail::ScVbaHlinkContainer( rxSheetHlinks->mxContainer, rScRanges ) ),
+    vba_detail::ScVbaHlinkContainerMember( new vba_detail::ScVbaHlinkContainer( rxSheetHlinks->mxContainer, rScRanges ) ),
     ScVbaHyperlinks_BASE( rxParent, rxContext, uno::Reference< container::XIndexAccess >( mxContainer.get() ) ),
     mxSheetHlinks( rxSheetHlinks )
 {

Modified: openoffice/branches/l10n/main/sc/source/ui/vba/vbahyperlinks.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sc/source/ui/vba/vbahyperlinks.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sc/source/ui/vba/vbahyperlinks.hxx (original)
+++ openoffice/branches/l10n/main/sc/source/ui/vba/vbahyperlinks.hxx Sun Feb  3 13:23:59 2013
@@ -32,7 +32,7 @@ class ScRangeList;
 
 // ============================================================================
 
-namespace detail {
+namespace vba_detail {
 
 class ScVbaHlinkContainer;
 typedef ::rtl::Reference< ScVbaHlinkContainer > ScVbaHlinkContainerRef;
@@ -48,7 +48,7 @@ struct ScVbaHlinkContainerMember
     ~ScVbaHlinkContainerMember();
 };
 
-} // namespace detail
+} // namespace vba_detail
 
 // ============================================================================
 
@@ -103,7 +103,7 @@ typedef CollTestImplHelper< ov::excel::X
 
     End With
  */
-class ScVbaHyperlinks : private detail::ScVbaHlinkContainerMember, public ScVbaHyperlinks_BASE
+class ScVbaHyperlinks : private vba_detail::ScVbaHlinkContainerMember, public ScVbaHyperlinks_BASE
 {
 public:
     explicit ScVbaHyperlinks(

Modified: openoffice/branches/l10n/main/sc/source/ui/vba/vbawindow.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sc/source/ui/vba/vbawindow.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sc/source/ui/vba/vbawindow.cxx (original)
+++ openoffice/branches/l10n/main/sc/source/ui/vba/vbawindow.cxx Sun Feb  3 13:23:59 2013
@@ -310,7 +310,7 @@ ScVbaWindow::ScrollWorkbookTabs( const u
 uno::Any SAL_CALL 
 ScVbaWindow::getCaption() throw (uno::RuntimeException)
 {
-	static rtl::OUString sCrud(RTL_CONSTASCII_USTRINGPARAM(" - OpenOffice.org Calc" ) );
+	static rtl::OUString sCrud(RTL_CONSTASCII_USTRINGPARAM(" - Apache OpenOffice Calc" ) );
 	static sal_Int32 nCrudLen = sCrud.getLength();
 
 	rtl::OUString sTitle;

Modified: openoffice/branches/l10n/main/sc/source/ui/view/gridwin.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sc/source/ui/view/gridwin.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sc/source/ui/view/gridwin.cxx (original)
+++ openoffice/branches/l10n/main/sc/source/ui/view/gridwin.cxx Sun Feb  3 13:23:59 2013
@@ -5344,25 +5344,9 @@ void ScGridWindow::UpdateSelectionOverla
 				aRanges.push_back(aRB);
 			}
 
-            // #i97672# get the system's hilight color and limit it to the maximum
-            // allowed luminance. This is needed to react on too bright hilight colors
-            // which would otherwise vive a bad visualisation
-			Color aHighlight(GetSettings().GetStyleSettings().GetHighlightColor());
-			const SvtOptionsDrawinglayer aSvtOptionsDrawinglayer;
-            const basegfx::BColor aSelection(aHighlight.getBColor());
-            const double fLuminance(aSelection.luminance());
-            const double fMaxLum(aSvtOptionsDrawinglayer.GetSelectionMaximumLuminancePercent() / 100.0);
-
-            if(fLuminance > fMaxLum)
-            {
-                const double fFactor(fMaxLum / fLuminance);
-                const basegfx::BColor aNewSelection(
-                    aSelection.getRed() * fFactor,
-                    aSelection.getGreen() * fFactor,
-                    aSelection.getBlue() * fFactor);
-
-                aHighlight = Color(aNewSelection);
-            }
+            // get the system's hilight color
+            const SvtOptionsDrawinglayer aSvtOptionsDrawinglayer;
+            const Color aHighlight(aSvtOptionsDrawinglayer.getHilightColor());
 
 			sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection(
 				sdr::overlay::OVERLAY_TRANSPARENT, 

Modified: openoffice/branches/l10n/main/sc/source/ui/view/viewfun3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sc/source/ui/view/viewfun3.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sc/source/ui/view/viewfun3.cxx (original)
+++ openoffice/branches/l10n/main/sc/source/ui/view/viewfun3.cxx Sun Feb  3 13:23:59 2013
@@ -845,9 +845,9 @@ sal_Bool ScViewFunc::PasteOnDrawObject( 
 		}
 		else if ( aDataHelper.HasFormat( SOT_FORMAT_BITMAP ) )
 		{
-			Bitmap aBmp;
-			if( aDataHelper.GetBitmap( FORMAT_BITMAP, aBmp ) )
-				bRet = ApplyGraphicToObject( pHitObj, Graphic(aBmp) );
+			BitmapEx aBmpEx;
+			if( aDataHelper.GetBitmapEx( FORMAT_BITMAP, aBmpEx ) )
+				bRet = ApplyGraphicToObject( pHitObj, Graphic(aBmpEx) );
 		}
 	}
 	else

Modified: openoffice/branches/l10n/main/sc/source/ui/view/viewfun5.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sc/source/ui/view/viewfun5.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sc/source/ui/view/viewfun5.cxx (original)
+++ openoffice/branches/l10n/main/sc/source/ui/view/viewfun5.cxx Sun Feb  3 13:23:59 2013
@@ -457,9 +457,9 @@ sal_Bool ScViewFunc::PasteDataFormat( sa
 	}
 	else if (nFormatId == SOT_FORMAT_BITMAP)
 	{
-		Bitmap aBmp;
-		if( aDataHelper.GetBitmap( FORMAT_BITMAP, aBmp ) )
-			bRet = PasteBitmap( aPos, aBmp );
+		BitmapEx aBmpEx;
+		if( aDataHelper.GetBitmapEx( FORMAT_BITMAP, aBmpEx ) )
+			bRet = PasteBitmapEx( aPos, aBmpEx );
 	}
 	else if (nFormatId == SOT_FORMAT_GDIMETAFILE)
 	{

Modified: openoffice/branches/l10n/main/sc/source/ui/view/viewfun7.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sc/source/ui/view/viewfun7.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sc/source/ui/view/viewfun7.cxx (original)
+++ openoffice/branches/l10n/main/sc/source/ui/view/viewfun7.cxx Sun Feb  3 13:23:59 2013
@@ -370,10 +370,10 @@ sal_Bool ScViewFunc::PasteObject( const 
 		return sal_False;
 }
 
-sal_Bool ScViewFunc::PasteBitmap( const Point& rPos, const Bitmap& rBmp )
+sal_Bool ScViewFunc::PasteBitmapEx( const Point& rPos, const BitmapEx& rBmpEx )
 {
 	String aEmpty;
-	Graphic aGraphic(rBmp);
+	Graphic aGraphic(rBmpEx);
 	return PasteGraphic( rPos, aGraphic, aEmpty, aEmpty );
 }
 

Modified: openoffice/branches/l10n/main/sc/util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sc/util/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sc/util/makefile.mk (original)
+++ openoffice/branches/l10n/main/sc/util/makefile.mk Sun Feb  3 13:23:59 2013
@@ -62,7 +62,9 @@ RESLIB1SRSFILES=\
 # --- StarClac DLL
 
 SHL1TARGET= sc$(DLLPOSTFIX)
+.IF "$(GUI)" != "OS2"
 SHL1USE_EXPORTS=name
+.ENDIF
 SHL1IMPLIB= sci
 
 # dynamic libraries

Modified: openoffice/branches/l10n/main/sc/workben/celltrans/parse.py
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sc/workben/celltrans/parse.py?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sc/workben/celltrans/parse.py (original)
+++ openoffice/branches/l10n/main/sc/workben/celltrans/parse.py Sun Feb  3 13:23:59 2013
@@ -25,7 +25,7 @@ import sys
 localeNames = {'fr': 'French', 'hu': 'Hungarian', 'de': 'German'}
 def getLocaleName (code):
     global localeNames
-    if localeNames.has_key(code):
+    if code in localeNames:
         return localeNames[code]
     else:
         return "(unknown locale)"
@@ -42,7 +42,7 @@ class LocaleData(object):
         self.funcList = {}
 
     def addKeywordMap (self, funcName, localeName, engName):
-        if not self.funcList.has_key(funcName):
+        if funcName not in self.funcList:
             self.funcList[funcName] = []
 
         self.funcList[funcName].append([localeName, engName])
@@ -136,7 +136,7 @@ class Parser(object):
         for item in buf:
             sys.stdout.write(chr(item))
         if linefeed:
-            print ''
+            print('')
 
     def parse (self):
 

Modified: openoffice/branches/l10n/main/sc/xml/ScXMLExport.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sc/xml/ScXMLExport.xml?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sc/xml/ScXMLExport.xml (original)
+++ openoffice/branches/l10n/main/sc/xml/ScXMLExport.xml Sun Feb  3 13:23:59 2013
@@ -39,11 +39,11 @@
     <status value="beta"/>
     <supported-service>com.sun.star.xml.XMLExportFilter</supported-service>
     <reference-docu xlink:href="http://xml.openoffice.org/"
-        xlink:title="general OpenOffice.org xml information" />
+        xlink:title="general OpenOffice.org XML information" />
     <reference-docu xlink:title="XML File Format Specification (draft)"
         xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
     <reference-docu xlink:href="http://xml.openoffice.org/filter/"
-        xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+        xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
   </component-description>
 
   <component-description>
@@ -57,11 +57,11 @@
     <status value="beta"/>
     <supported-service>com.sun.star.xml.XMLExportFilter</supported-service>
     <reference-docu xlink:href="http://xml.openoffice.org/"
-        xlink:title="general OpenOffice.org xml information" />
+        xlink:title="general OpenOffice.org XML information" />
     <reference-docu xlink:title="XML File Format Specification (draft)"
         xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
     <reference-docu xlink:href="http://xml.openoffice.org/filter/"
-        xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+        xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
   </component-description>
 
   <component-description>
@@ -75,11 +75,11 @@
     <status value="beta"/>
     <supported-service>com.sun.star.xml.XMLExportFilter</supported-service>
     <reference-docu xlink:href="http://xml.openoffice.org/"
-        xlink:title="general OpenOffice.org xml information" />
+        xlink:title="general OpenOffice.org XML information" />
     <reference-docu xlink:title="XML File Format Specification (draft)"
         xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
     <reference-docu xlink:href="http://xml.openoffice.org/filter/"
-        xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+        xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
   </component-description>
 
   <component-description>
@@ -93,11 +93,11 @@
     <status value="beta"/>
     <supported-service>com.sun.star.xml.XMLExportFilter</supported-service>
     <reference-docu xlink:href="http://xml.openoffice.org/"
-        xlink:title="general OpenOffice.org xml information" />
+        xlink:title="general OpenOffice.org XML information" />
     <reference-docu xlink:title="XML File Format Specification (draft)"
         xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
     <reference-docu xlink:href="http://xml.openoffice.org/filter/"
-        xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+        xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
   </component-description>
 
   <component-description>
@@ -111,11 +111,11 @@
     <status value="beta"/>
     <supported-service>com.sun.star.xml.XMLExportFilter</supported-service>
     <reference-docu xlink:href="http://xml.openoffice.org/"
-        xlink:title="general OpenOffice.org xml information" />
+        xlink:title="general OpenOffice.org XML information" />
     <reference-docu xlink:title="XML File Format Specification (draft)"
         xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
     <reference-docu xlink:href="http://xml.openoffice.org/filter/"
-        xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+        xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
   </component-description>
   <project-build-dependency>cppu</project-build-dependency>
   <project-build-dependency>cppuhelper</project-build-dependency>

Modified: openoffice/branches/l10n/main/sc/xml/ScXMLImport.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sc/xml/ScXMLImport.xml?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sc/xml/ScXMLImport.xml (original)
+++ openoffice/branches/l10n/main/sc/xml/ScXMLImport.xml Sun Feb  3 13:23:59 2013
@@ -39,11 +39,11 @@
     <status value="beta"/>
     <supported-service>com.sun.star.xml.XMLImportFilter</supported-service>
     <reference-docu xlink:href="http://xml.openoffice.org/"
-        xlink:title="general OpenOffice.org xml information" />
+        xlink:title="general OpenOffice.org XML information" />
     <reference-docu xlink:title="XML File Format Specification (draft)"
         xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
     <reference-docu xlink:href="http://xml.openoffice.org/filter/"
-        xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+        xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
   </component-description>
 
   <component-description>
@@ -57,11 +57,11 @@
     <status value="beta"/>
     <supported-service>com.sun.star.xml.XMLImportFilter</supported-service>
     <reference-docu xlink:href="http://xml.openoffice.org/"
-        xlink:title="general OpenOffice.org xml information" />
+        xlink:title="general OpenOffice.org XML information" />
     <reference-docu xlink:title="XML File Format Specification (draft)"
         xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
     <reference-docu xlink:href="http://xml.openoffice.org/filter/"
-        xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+        xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
   </component-description>
 
   <component-description>
@@ -75,11 +75,11 @@
     <status value="beta"/>
     <supported-service>com.sun.star.xml.XMLImportFilter</supported-service>
     <reference-docu xlink:href="http://xml.openoffice.org/"
-        xlink:title="general OpenOffice.org xml information" />
+        xlink:title="general OpenOffice.org XML information" />
     <reference-docu xlink:title="XML File Format Specification (draft)"
         xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
     <reference-docu xlink:href="http://xml.openoffice.org/filter/"
-        xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+        xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
   </component-description>
 
   <component-description>
@@ -93,11 +93,11 @@
     <status value="beta"/>
     <supported-service>com.sun.star.xml.XMLImportFilter</supported-service>
     <reference-docu xlink:href="http://xml.openoffice.org/"
-        xlink:title="general OpenOffice.org xml information" />
+        xlink:title="general OpenOffice.org XML information" />
     <reference-docu xlink:title="XML File Format Specification (draft)"
         xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
     <reference-docu xlink:href="http://xml.openoffice.org/filter/"
-        xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+        xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
   </component-description>
 
   <component-description>
@@ -111,11 +111,11 @@
     <status value="beta"/>
     <supported-service>com.sun.star.xml.XMLImportFilter</supported-service>
     <reference-docu xlink:href="http://xml.openoffice.org/"
-        xlink:title="general OpenOffice.org xml information" />
+        xlink:title="general OpenOffice.org XML information" />
     <reference-docu xlink:title="XML File Format Specification (draft)"
         xlink:href="http://xml.openoffice.org/xml_specification_draft.pdf" />
     <reference-docu xlink:href="http://xml.openoffice.org/filter/"
-        xlink:title="Guide to implement XML-based filters in OpenOffice.org" />
+        xlink:title="Guide to implement XML-based filters in Apache OpenOffice" />
   </component-description>
   <project-build-dependency>cppu</project-build-dependency>
   <project-build-dependency>cppuhelper</project-build-dependency>

Modified: openoffice/branches/l10n/main/scaddins/source/analysis/analysis.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scaddins/source/analysis/analysis.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scaddins/source/analysis/analysis.cxx (original)
+++ openoffice/branches/l10n/main/scaddins/source/analysis/analysis.cxx Sun Feb  3 13:23:59 2013
@@ -27,6 +27,7 @@
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/math.hxx>
+#include <rtl/random.h>
 #include <string.h>
 
 #include <tools/resmgr.hxx>
@@ -808,15 +809,52 @@ double SAL_CALL AnalysisAddIn::getSqrtpi
 
 double SAL_CALL AnalysisAddIn::getRandbetween( double fMin, double fMax ) THROWDEF_RTE_IAE
 {
+    static sal_Int32 nScRandomIx = 0, nScRandomIy = 0, nScRandomIz = 0, nScRandomIt = 0;
+    static rtlRandomPool aPool = rtl_random_createPool();
+    double fScRandomW;
+
     fMin = ::rtl::math::round( fMin, 0, rtl_math_RoundingMode_Up );
     fMax = ::rtl::math::round( fMax, 0, rtl_math_RoundingMode_Up );
 	if( fMin > fMax )
 		THROW_IAE;
 
+    // Seeding for the PRNG: should be good enough but we
+    // monitor the values to keep things under control.
+    if (nScRandomIx <= 0)
+	rtl_random_getBytes(aPool, &nScRandomIx, sizeof(nScRandomIx));
+    if (nScRandomIy <= 0)
+	rtl_random_getBytes(aPool, &nScRandomIy, sizeof(nScRandomIy));
+    if (nScRandomIz <= 0)
+	rtl_random_getBytes(aPool, &nScRandomIz, sizeof(nScRandomIz));
+    if (nScRandomIt <= 0)
+	rtl_random_getBytes(aPool, &nScRandomIt, sizeof(nScRandomIt));
+    
+    // Basically unmodified algorithm from
+    // Wichman and Hill, "Generating good pseudo-random numbers",
+    //		December 5, 2005.
+    
+    nScRandomIx = 11600L * (nScRandomIx % 185127L) - 10379L * (nScRandomIx / 185127L);
+    nScRandomIy = 47003L * (nScRandomIy %  45688L) - 10479L * (nScRandomIy /  45688L);
+    nScRandomIz = 23000L * (nScRandomIz %  93368L) - 19423L * (nScRandomIz /  93368L);
+    nScRandomIt = 33000L * (nScRandomIt %  65075L) -  8123L * (nScRandomIt /  65075L);
+    if (nScRandomIx < 0)
+	nScRandomIx += 2147483579L;
+    if (nScRandomIy < 0)
+	nScRandomIy += 2147483543L;
+    if (nScRandomIz < 0)
+	nScRandomIz += 2147483123L;
+    if (nScRandomIt < 0)
+	nScRandomIt += 2147483123L;
+
+    fScRandomW = (double)nScRandomIx*0.0000000004656613022670 +
+	      	(double)nScRandomIy*0.0000000004656613100760 +
+		(double)nScRandomIz*0.0000000004656613360968 +
+		(double)nScRandomIt*0.0000000004656614011490;
+
+ 
 	// fMax -> range
     double fRet = fMax - fMin + 1.0;
-    fRet *= rand();
-    fRet /= (RAND_MAX + 1.0);
+    fRet *= fScRandomW - (sal_Int32)fScRandomW ;
     fRet += fMin;
     fRet = floor( fRet );   // simple floor is sufficient here
     RETURN_FINITE( fRet );

Modified: openoffice/branches/l10n/main/scaddins/source/analysis/analysishelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scaddins/source/analysis/analysishelper.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scaddins/source/analysis/analysishelper.cxx (original)
+++ openoffice/branches/l10n/main/scaddins/source/analysis/analysishelper.cxx Sun Feb  3 13:23:59 2013
@@ -33,8 +33,6 @@
 using namespace                 ::rtl;
 using namespace                 ::com::sun::star;
 
-
-
 #define UNIQUE              sal_False   // function name does not exist in Calc
 #define DOUBLE              sal_True    // function name exists in Calc
 
@@ -1850,8 +1848,7 @@ sal_Bool Complex::ParseString( const STR
 
 	if( IsImagUnit( *pStr ) && rStr.getLength() == 1)
 	{
-		rCompl.r = 0.0;
-		rCompl.i = 1.0;
+		rCompl.Num= double_complex ( 0.0, 1.0 );
 		rCompl.c = *pStr;
 		return sal_True;
 	}
@@ -1872,8 +1869,7 @@ sal_Bool Complex::ParseString( const STR
 				rCompl.c = pStr[ 1 ];
 				if( pStr[ 2 ] == 0 )
 				{
-					rCompl.r = f;
-					rCompl.i = ( *pStr == '+' )? 1.0 : -1.0;
+					rCompl.Num = double_complex (f, ( *pStr == '+' )? 1.0 : -1.0 );
 					return sal_True;
 				}
 			}
@@ -1883,8 +1879,7 @@ sal_Bool Complex::ParseString( const STR
 				pStr++;
 				if( *pStr == 0 )
 				{
-					rCompl.r = r;
-					rCompl.i = f;
+					rCompl.Num = double_complex (r, f);
 					return sal_True;
 				}
 			}
@@ -1896,14 +1891,12 @@ sal_Bool Complex::ParseString( const STR
 			pStr++;
 			if( *pStr == 0 )
 			{
-				rCompl.i = f;
-				rCompl.r = 0.0;
+				rCompl.Num = double_complex (0.0, f);
 				return sal_True;
 			}
 			break;
 		case 0:		// only real-part
-			rCompl.r = f;
-			rCompl.i = 0.0;
+			rCompl.Num = double_complex (f, 0.0);
 			return sal_True;
 	}
 
@@ -1918,26 +1911,26 @@ STRING Complex::GetString() const THROWD
     static const String aPlus( '+' );
     static const String aMinus( '-' );
 
-    CHK_FINITE(r);
-    CHK_FINITE(i);
+    CHK_FINITE(Num.real());
+    CHK_FINITE(Num.imag());
     STRING aRet;
 
-    bool bHasImag = i != 0.0;
-    bool bHasReal = !bHasImag || (r != 0.0);
+    bool bHasImag = Num.imag() != 0.0;
+    bool bHasReal = !bHasImag || (Num.real() != 0.0);
 
 	if( bHasReal )
-	    aRet = ::GetString( r );
+	    aRet = ::GetString( Num.real() );
     if( bHasImag )
     {
-        if( i == 1.0 )
+        if( Num.imag() == 1.0 )
         {
             if( bHasReal )
                 aRet += aPlus;
         }
-        else if( i == -1.0 )
+        else if( Num.imag() == -1.0 )
             aRet += aMinus;
         else
-            aRet += ::GetString( i, bHasReal );
+            aRet += ::GetString( Num.imag(), bHasReal );
         aRet += (c != 'j') ? aI : aJ;
     }
 
@@ -1947,12 +1940,12 @@ STRING Complex::GetString() const THROWD
 
 double Complex::Arg( void ) const THROWDEF_RTE_IAE
 {
-	if( r == 0.0 && i == 0.0 )
+	if( Num.real() == 0.0 && Num.imag() == 0.0 )
 		THROW_IAE;
 
-	double	phi = acos( r / Abs() );
+	double	phi = acos( Num.real() / Abs() );
 
-	if( i < 0.0 )
+	if( Num.imag() < 0.0 )
 		phi = -phi;
 
 	return phi;
@@ -1961,11 +1954,11 @@ double Complex::Arg( void ) const THROWD
 
 void Complex::Power( double fPower ) THROWDEF_RTE_IAE
 {
-	if( r == 0.0 && i == 0.0 )
+	if( Num.real() == 0.0 && Num.imag() == 0.0 )
 	{
 		if( fPower > 0 )
 		{
-			r = i = 0.0;
+			Num = double_complex ( 0.0, 0.0 );
 			return;
 		}
 		else
@@ -1976,15 +1969,14 @@ void Complex::Power( double fPower ) THR
 
 	p = Abs();
 
-	phi = acos( r / p );
-	if( i < 0.0 )
+	phi = acos( Num.real() / p );
+	if( Num.imag() < 0.0 )
 		phi = -phi;
 
 	p = pow( p, fPower );
 	phi *= fPower;
 
-	r = cos( phi ) * p;
-	i = sin( phi ) * p;
+	Num = double_complex (cos( phi ) * p, sin( phi ) * p);
 }
 
 
@@ -1992,15 +1984,15 @@ void Complex::Sqrt( void )
 {
 	static const double	fMultConst = 0.7071067811865475;	// ...2440084436210485 = 1/sqrt(2)
 	double	p = Abs();
-	double	i_ = sqrt( p - r ) * fMultConst;
+	double	i_ = sqrt( p - Num.real() ) * fMultConst;
 
-	r = sqrt( p + r ) * fMultConst;
-	i = ( i < 0.0 )? -i_ : i_;
+	Num = double_complex (sqrt( p + Num.real() ) * fMultConst, ( Num.imag() < 0.0 )? -i_ : i_);
 }
 
 
 void Complex::Sin( void ) THROWDEF_RTE_IAE
 {
+    double r = Num.real(), i = Num.imag() ;
     if( !::rtl::math::isValidArcArg( r ) )
 		THROW_IAE;
 
@@ -2014,11 +2006,13 @@ void Complex::Sin( void ) THROWDEF_RTE_I
 	}
 	else
 		r = sin( r );
+    Num = double_complex ( r, i );
 }
 
 
 void Complex::Cos( void ) THROWDEF_RTE_IAE
 {
+	double r = Num.real(), i = Num.imag() ;
 	if( !::rtl::math::isValidArcArg( r ) )
 		THROW_IAE;
 
@@ -2032,23 +2026,23 @@ void Complex::Cos( void ) THROWDEF_RTE_I
 	}
 	else
 		r = cos( r );
-}
+	Num = double_complex ( r, i );
 
+}
 
 void Complex::Div( const Complex& z ) THROWDEF_RTE_IAE
 {
-	if( z.r == 0 && z.i == 0 )
+	if( z.Num.real() == 0 && z.Num.imag() == 0 )
 		THROW_IAE;
 
-	double	a1 = r;
-	double	a2 = z.r;
-	double	b1 = i;
-	double	b2 = z.i;
+	double	a1 = Num.real();
+	double	a2 = z.Num.real();
+	double	b1 = Num.imag();
+	double	b2 = z.Num.imag();
 
 	double	f = 1.0 / ( a2 * a2 + b2 * b2 );
 
-	r = ( a1 * a2 + b1 * b2 ) * f;
-	i = ( a2 * b1 - a1 * b2 ) * f;
+	Num = f * double_complex ( a1 * a2 + b1 * b2 ,  a2 * b1 - a1 * b2 );
 
     if( !c ) c = z.c;
 }
@@ -2056,14 +2050,14 @@ void Complex::Div( const Complex& z ) TH
 
 void Complex::Exp( void )
 {
-	double	fE = exp( r );
-	r = fE * cos( i );
-	i = fE * sin( i );
+	double	fE = exp( Num.real() );
+	Num = fE * double_complex ( cos( Num.imag() ), sin( Num.imag() ) );
 }
 
 
 void Complex::Ln( void ) THROWDEF_RTE_IAE
 {
+	double r = Num.real(), i = Num.imag() ;
 	if( r == 0.0 && i == 0.0 )
 		THROW_IAE;
 
@@ -2076,6 +2070,7 @@ void Complex::Ln( void ) THROWDEF_RTE_IA
 		i = -i;
 
 	r = log( fAbs );
+	Num = double_complex ( r, i );
 }
 
 
@@ -2095,6 +2090,7 @@ void Complex::Log2( void ) THROWDEF_RTE_
 
 void Complex::Tan(void) THROWDEF_RTE_IAE
 {
+    double r = Num.real(), i = Num.imag() ;
     if ( i )
     {
         if( !::rtl::math::isValidArcArg( 2.0 * r ) )
@@ -2109,11 +2105,13 @@ void Complex::Tan(void) THROWDEF_RTE_IAE
             THROW_IAE;
         r = tan( r );
     }
+    Num = double_complex ( r, i );
 }
 
 
 void Complex::Sec( void ) THROWDEF_RTE_IAE
 {
+    double r = Num.real(), i = Num.imag() ;
     if( i )
     {
         if( !::rtl::math::isValidArcArg( 2 * r ) )
@@ -2130,11 +2128,13 @@ void Complex::Sec( void ) THROWDEF_RTE_I
             THROW_IAE;
         r = 1.0 / cos( r );
     }
+    Num = double_complex ( r, i );
 }
 
 
 void Complex::Csc( void ) THROWDEF_RTE_IAE
 {
+    double r = Num.real(), i = Num.imag() ;
     if( i )
     {
         if( !::rtl::math::isValidArcArg( 2 * r ) )
@@ -2151,11 +2151,13 @@ void Complex::Csc( void ) THROWDEF_RTE_I
             THROW_IAE;
         r = 1.0 / sin( r );
     }
+    Num = double_complex ( r, i );
 }
 
 
 void Complex::Cot(void) THROWDEF_RTE_IAE
 {
+    double r = Num.real(), i = Num.imag() ;
     if ( i )
     {
         if( !::rtl::math::isValidArcArg( 2.0 * r ) )
@@ -2170,11 +2172,13 @@ void Complex::Cot(void) THROWDEF_RTE_IAE
             THROW_IAE;
         r = 1.0 / tan( r );
     }
+    Num = double_complex ( r, i );
 }
 
 
 void Complex::Sinh( void ) THROWDEF_RTE_IAE
 {
+    double r = Num.real(), i = Num.imag() ;
     if( !::rtl::math::isValidArcArg( r ) )
         THROW_IAE;
 
@@ -2187,11 +2191,13 @@ void Complex::Sinh( void ) THROWDEF_RTE_
 	}
 	else
 		r = sinh( r );
+    Num = double_complex ( r, i );
 }
 
 
 void Complex::Cosh( void ) THROWDEF_RTE_IAE
 {
+    double r = Num.real(), i = Num.imag() ;
     if( !::rtl::math::isValidArcArg( r ) )
         THROW_IAE;
 
@@ -2204,11 +2210,13 @@ void Complex::Cosh( void ) THROWDEF_RTE_
 	}
 	else
 		r = cosh( r );
+    Num = double_complex ( r, i );
 }
 
 
 void Complex::Sech(void) THROWDEF_RTE_IAE
 {
+    double r = Num.real(), i = Num.imag() ;
     if ( i )
     {
         if( !::rtl::math::isValidArcArg( 2.0 * r ) )
@@ -2225,11 +2233,13 @@ void Complex::Sech(void) THROWDEF_RTE_IA
             THROW_IAE;
         r = 1.0 / cosh( r );
     }
+    Num = double_complex ( r, i );
 }
 
 
 void Complex::Csch(void) THROWDEF_RTE_IAE
 {
+    double r = Num.real(), i = Num.imag() ;
     if ( i )
     {
         if( !::rtl::math::isValidArcArg( 2.0 * r ) )
@@ -2246,6 +2256,7 @@ void Complex::Csch(void) THROWDEF_RTE_IA
             THROW_IAE;
         r = 1.0 / sinh( r );
     }
+    Num = double_complex ( r, i );
 }
 
 

Modified: openoffice/branches/l10n/main/scaddins/source/analysis/analysishelper.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scaddins/source/analysis/analysishelper.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scaddins/source/analysis/analysishelper.hxx (original)
+++ openoffice/branches/l10n/main/scaddins/source/analysis/analysishelper.hxx Sun Feb  3 13:23:59 2013
@@ -35,6 +35,19 @@
 
 #include <math.h>
 
+// STLport definitions
+// This works around some issues with Boost
+//
+#ifdef WNT
+#define _STLP_HAS_NATIVE_FLOAT_ABS
+#endif
+
+#include <boost/tr1/complex.hpp>
+using namespace boost::math;
+#ifndef double_complex
+typedef std::complex<double>		double_complex;
+#endif
+
 #include <tools/resid.hxx>
 #include <tools/rc.hxx>
 
@@ -436,11 +449,11 @@ public:
 
 //-----------------------------------------------------------------------------
 
+
 class Complex
 {
-	double					r;
-	double					i;
-    sal_Unicode             c;
+    double_complex		Num;
+    sal_Unicode          c;
 
 public:
     inline                  Complex( double fReal, double fImag = 0.0, sal_Unicode cC = '\0' );
@@ -798,49 +811,44 @@ inline const FuncData* FuncDataList::Get
 
 
 inline Complex::Complex( double fReal, double fImag, sal_Unicode cC ) :
-		r( fReal ), i( fImag ), c( cC )
+		Num( fReal, fImag ), c( cC )
 {
 }
 
 
 inline double Complex::Real( void ) const
 {
-	return r;
+	return Num.real();
 }
 
 
 inline double Complex::Imag( void ) const
 {
-	return i;
+	return Num.imag();
 }
 
 
 inline double Complex::Abs( void ) const
 {
-	return sqrt( r * r + i * i );
+	return std::norm( Num );
 }
 
 
 void Complex::Conjugate( void )
 {
-	i = -i;
+	Num = std::conj( Num );
 }
 
 
 inline void Complex::Mult( double f )
 {
-	i *= f;
-	r *= f;
+	Num = f * Num;
 }
 
 
 inline void Complex::Mult( const Complex& rM )
 {
-	double	r_ = r;
-	double	i_ = i;
-
-	r = r_ * rM.r - i_ * rM.i;
-	i = r_ * rM.i + i_ * rM.r;
+	Num = Num * rM.Num;
 
     if( !c ) c = rM.c;
 }
@@ -848,16 +856,16 @@ inline void Complex::Mult( const Complex
 
 inline void Complex::Sub( const Complex& rC )
 {
-	r -= rC.r;
-	i -= rC.i;
+	Num -= rC.Num;
+
     if( !c ) c = rC.c;
 }
 
 
 inline void Complex::Add( const Complex& rAdd )
 {
-	r += rAdd.r;
-	i += rAdd.i;
+	Num += rAdd.Num;
+
     if( !c ) c = rAdd.c;
 }
 

Modified: openoffice/branches/l10n/main/scp2/inc/macros.inc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/inc/macros.inc?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/inc/macros.inc (original)
+++ openoffice/branches/l10n/main/scp2/inc/macros.inc Sun Feb  3 13:23:59 2013
@@ -386,7 +386,7 @@ End
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
         Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
-        Name = STRING(CONCAT2(OpenOffice.org.,name)); \
+        Name = STRING(CONCAT2(Apache OpenOffice.,name)); \
         Value = " "; \
     End
 
@@ -395,7 +395,7 @@ End
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
         Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
-        Name = STRING(CONCAT2(OpenOffice.org.,name)); \
+        Name = STRING(CONCAT2(Apache OpenOffice.,name)); \
         Value = " "; \
     End
 
@@ -404,7 +404,7 @@ End
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = gid_Module_Root_Reg_##name; \
         Subkey = STRING(CONCAT2(.,key)); \
-        Value = STRING(CONCAT2(OpenOffice.org.,name)); \
+        Value = STRING(CONCAT2(Apache OpenOffice.,name)); \
         ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \
     End
 
@@ -412,7 +412,7 @@ End
     RegistryItem CONCAT2(gid_Regitem_Openoffice_,name) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT2(OpenOffice.org.,name)); \
+        Subkey = STRING(CONCAT2(Apache OpenOffice.,name)); \
         REG_VALUE_LNG(disp_name) \
     End
 
@@ -420,7 +420,7 @@ End
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Defaulticon) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT3(OpenOffice.org.,name,\DefaultIcon)); \
+        Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\DefaultIcon)); \
         Value = "<progpath>\program\soffice.exe," STRING(icon_id); \
     End
 
@@ -428,7 +428,7 @@ End
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell)); \
+        Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell)); \
         Value = STRING(default); \
     End
 
@@ -436,13 +436,13 @@ End
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\new)); \
+        Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\new)); \
         REG_VALUE_LNG(NEW) \
     End \
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New_Command) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\new\command)); \
+        Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\new\command)); \
         Value = "\"<progpath>\program\\" STRING(app) "\" -n \"%1\""; \
     End
 
@@ -450,7 +450,7 @@ End
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Open_Command) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\open\command)); \
+        Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\open\command)); \
         Value = "\"<progpath>\program\\" STRING(app) "\" -o \"%1\""; \
     End
 
@@ -458,7 +458,7 @@ End
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Print_Command) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\print\command)); \
+        Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\print\command)); \
         Value = "\"<progpath>\program\\" STRING(app) "\" -p \"%1\""; \
     End
 
@@ -466,7 +466,7 @@ End
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Printto_Command) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\printto\command)); \
+        Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\printto\command)); \
         Value = "\"<progpath>\program\\" STRING(app) "\" -pt \"%2\" \"%1\""; \
     End
 
@@ -476,7 +476,7 @@ End
         ModuleID = modid; \
         Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
         Name = STRING(CONCAT2(.,key)); \
-        Value = STRING(CONCAT2(OpenOffice.org.,name)); \
+        Value = STRING(CONCAT2(Apache OpenOffice.,name)); \
         Styles = (); \
     End
 
@@ -486,7 +486,7 @@ End
         ModuleID = modid; \
         Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
         Name = STRING(CONCAT2(.,key)); \
-        Value = STRING(CONCAT2(OpenOffice.org.,name)); \
+        Value = STRING(CONCAT2(Apache OpenOffice.,name)); \
         Styles = (); \
     End
 

Modified: openoffice/branches/l10n/main/scp2/source/ooo/directory_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/source/ooo/directory_ooo.scp?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/source/ooo/directory_ooo.scp (original)
+++ openoffice/branches/l10n/main/scp2/source/ooo/directory_ooo.scp Sun Feb  3 13:23:59 2013
@@ -891,6 +891,40 @@ Directory gid_Dir_Gallery_Bullets
     DosName = "bullets";
 End
 
+//////////////////////////////////////////////////////////////////////////////
+
+Directory gid_Dir_Gallery_Computers
+    ParentID = gid_Dir_Gallery;
+    DosName = "computers";
+End
+
+Directory gid_Dir_Gallery_Diagrams
+    ParentID = gid_Dir_Gallery;
+    DosName = "diagrams";
+End
+
+Directory gid_Dir_Gallery_Environment
+    ParentID = gid_Dir_Gallery;
+    DosName = "environment";
+End
+
+Directory gid_Dir_Gallery_Finance
+    ParentID = gid_Dir_Gallery;
+    DosName = "finance";
+End
+
+Directory gid_Dir_Gallery_Transport
+    ParentID = gid_Dir_Gallery;
+    DosName = "transport";
+End
+
+Directory gid_Dir_Gallery_Txtshapes
+    ParentID = gid_Dir_Gallery;
+    DosName = "textshapes";
+End
+
+//////////////////////////////////////////////////////////////////////////////
+
 Directory gid_Dir_Gallery_Flags
     ParentID = gid_Dir_Gallery;
     DosName = "flags";

Modified: openoffice/branches/l10n/main/scp2/source/ooo/file_extra_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/source/ooo/file_extra_ooo.scp?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/source/ooo/file_extra_ooo.scp (original)
+++ openoffice/branches/l10n/main/scp2/source/ooo/file_extra_ooo.scp Sun Feb  3 13:23:59 2013
@@ -245,6 +245,70 @@ File gid_File_Extra_Gallroot
     Name = "gallroot.zip";
 End
 
+//////////////////////////////////////////////////////////////////////////////
+
+File gid_File_Extra_Gallarrows
+    Dir = gid_Dir_Gallery_Arrows;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "gallarrows.zip";
+End
+
+File gid_File_Extra_Gallcomputers
+    Dir = gid_Dir_Gallery_Computers;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "gallcomputers.zip";
+End
+
+File gid_File_Extra_Galldiagrams
+    Dir = gid_Dir_Gallery_Diagrams;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "galldiagrams.zip";
+End
+
+File gid_File_Extra_Galleducation
+    Dir = gid_Dir_Gallery_Education;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "galleducation.zip";
+End
+
+File gid_File_Extra_Gallenvironment
+    Dir = gid_Dir_Gallery_Environment;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "gallenvironment.zip";
+End
+
+File gid_File_Extra_Gallfinance
+    Dir = gid_Dir_Gallery_Finance;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "gallfinance.zip";
+End
+
+File gid_File_Extra_Gallpeople
+    Dir = gid_Dir_Gallery_People;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "gallpeople.zip";
+End
+
+File gid_File_Extra_Gallsymbols
+    Dir = gid_Dir_Gallery_Symbols;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "gallsymbols.zip";
+End
+
+File gid_File_Extra_Galltransport
+    Dir = gid_Dir_Gallery_Transport;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "galltransport.zip";
+End
+
+File gid_File_Extra_Galltxtshapes
+    Dir = gid_Dir_Gallery_Txtshapes;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "galltxtshapes.zip";
+End
+
+//////////////////////////////////////////////////////////////////////////////
+
 File gid_File_Extra_Gallrulers
     Dir = gid_Dir_Gallery_Rulers;
     ARCHIVE_TXT_FILE_BODY;

Modified: openoffice/branches/l10n/main/scp2/source/ooo/file_improvement.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/source/ooo/file_improvement.scp?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/source/ooo/file_improvement.scp (original)
+++ openoffice/branches/l10n/main/scp2/source/ooo/file_improvement.scp Sun Feb  3 13:23:59 2013
@@ -23,7 +23,7 @@
 
 #include "macros.inc"
 
-#if defined(BUILD_SPECIAL)
+#if defined(ENABLE_OOOIMPROVEMENT)
 File gid_File_Share_Registry_Oooimprovement_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
@@ -32,7 +32,7 @@ File gid_File_Share_Registry_Oooimprovem
 End
 #endif
 
-#if defined(BUILD_SPECIAL)
+#if defined(ENABLE_OOOIMPROVEMENT)
 #ifdef OS2
 STD_LIB_FILE( gid_File_Lib_Oooimprovement , oooimp)
 #else

Modified: openoffice/branches/l10n/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/source/ooo/file_library_ooo.scp?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/branches/l10n/main/scp2/source/ooo/file_library_ooo.scp Sun Feb  3 13:23:59 2013
@@ -1375,7 +1375,7 @@ File gid_File_Lib_Smplmail
     TXT_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
-    Name = "smplmail.uno.dll";
+    Name = "sysmail.uno.dll";
 End
 
 #endif

Modified: openoffice/branches/l10n/main/scp2/source/ooo/file_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/source/ooo/file_ooo.scp?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/source/ooo/file_ooo.scp (original)
+++ openoffice/branches/l10n/main/scp2/source/ooo/file_ooo.scp Sun Feb  3 13:23:59 2013
@@ -1780,7 +1780,7 @@ File gid_File_Share_Registry_Lingucompon
     Name = "lingucomponent.xcd";
 End
 
-// #ifdef BUILD_SPECIAL
+// #ifdef ENABLE_OOOIMPROVEMENT
 // File gid_File_Extension_Oxt_Oooimprovement
 //    Name = "OOoImprovement.oxt";
 //    Dir = gid_Brand_Dir_Share_Extensions_Oooimprovement;

Modified: openoffice/branches/l10n/main/scp2/source/ooo/file_resource_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/source/ooo/file_resource_ooo.scp?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/source/ooo/file_resource_ooo.scp (original)
+++ openoffice/branches/l10n/main/scp2/source/ooo/file_resource_ooo.scp Sun Feb  3 13:23:59 2013
@@ -80,7 +80,7 @@ STD_RES_FILE( gid_File_Res_Spa, spa )
 
 #endif
 
-STD_RES_FILE( gid_File_Res_Stt, stt )
+#STD_RES_FILE( gid_File_Res_Stt, stt )
 STD_RES_FILE( gid_File_Res_Sb, sb )
 
 STD_RES_FILE( gid_File_Res_Svl, svl )
@@ -95,7 +95,7 @@ STD_RES_FILE( gid_File_Res_Cui, cui )
 
 STD_RES_FILE( gid_File_Res_Sw, sw )
 
-STD_RES_FILE( gid_File_Res_Tk, tk )
+
 STD_RES_FILE( gid_File_Res_Acc, acc )
 
 STD_RES_FILE( gid_File_Res_Tpl, tpl )

Modified: openoffice/branches/l10n/main/scp2/source/ooo/installation_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/source/ooo/installation_ooo.scp?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/source/ooo/installation_ooo.scp (original)
+++ openoffice/branches/l10n/main/scp2/source/ooo/installation_ooo.scp Sun Feb  3 13:23:59 2013
@@ -30,9 +30,9 @@ Installation gid_Installation_Ooo
     OOoBaseVersion = "${OOOBASEVERSION}";
     UserDirProductVersion = "${USERDIRPRODUCTVERSION}";
     JavaVersion = "${JAVAVERSION}";
-    SxwFormatName = "OpenOffice.org";
-    SxwFormatVersion = "1.1";
-    VendorName = "OpenOffice.org";
+    SxwFormatName = "OpenOffice.org XML";
+    SxwFormatVersion = "1.0";
+    VendorName = "Apache OpenOffice";
   #ifdef WNT
     DefaultDestPath = "<winprogpath>\${PRODUCTNAME}${PRODUCTVERSION}";
   #else

Modified: openoffice/branches/l10n/main/scp2/source/ooo/module_hidden_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/source/ooo/module_hidden_ooo.scp?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/source/ooo/module_hidden_ooo.scp (original)
+++ openoffice/branches/l10n/main/scp2/source/ooo/module_hidden_ooo.scp Sun Feb  3 13:23:59 2013
@@ -813,7 +813,7 @@ Module gid_Module_Root_Userland
 End
 #endif
 
-// #ifdef BUILD_SPECIAL
+// #ifdef ENABLE_OOOIMPROVEMENT
 // Module gid_Module_Root_Extension_Oooimprovement
 //    Name = "gid_Module_Root_Extension_Oooimprovement";
 //    Description = "gid_Module_Root_Extension_Oooimprovement";

Modified: openoffice/branches/l10n/main/scp2/source/ooo/module_improvement.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/source/ooo/module_improvement.scp?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/source/ooo/module_improvement.scp (original)
+++ openoffice/branches/l10n/main/scp2/source/ooo/module_improvement.scp Sun Feb  3 13:23:59 2013
@@ -25,7 +25,7 @@
 
 // OOo improvement module
 
-#if defined(BUILD_SPECIAL)
+#if defined(ENABLE_OOOIMPROVEMENT)
 Module gid_Module_Oooimprovement
     PackageInfo = "packinfo_office.txt";
     Name = "gid_Module_Oooimprovement";

Modified: openoffice/branches/l10n/main/scp2/source/ooo/module_langpack.ulf
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/source/ooo/module_langpack.ulf?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/source/ooo/module_langpack.ulf (original)
+++ openoffice/branches/l10n/main/scp2/source/ooo/module_langpack.ulf Sun Feb  3 13:23:59 2013
@@ -710,3 +710,9 @@ en-US = "Asturian"
 
 [STR_DESC_MODULE_LANGPACK_AST]
 en-US = "Installs Asturian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GD]
+en-US = "Gaelic (Scotland)"
+
+[STR_DESC_MODULE_LANGPACK_GD]
+en-US = "Installs Gaelic (Scotland) support in %PRODUCTNAME %PRODUCTVERSION"

Modified: openoffice/branches/l10n/main/scp2/source/ooo/ooo_brand.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/source/ooo/ooo_brand.scp?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/source/ooo/ooo_brand.scp (original)
+++ openoffice/branches/l10n/main/scp2/source/ooo/ooo_brand.scp Sun Feb  3 13:23:59 2013
@@ -66,7 +66,7 @@ ProfileItem gid_Brand_Profileitem_Bootst
     Section = "ErrorReport";
     Order = 8;
     Key = "ErrorReportServer";
-  #if defined(BUILD_SPECIAL)
+  #if defined(ENABLE_ERROR_REPORT_SERVER)
     Value = "report.services.openoffice.org";
   #else
     Value = "";

Modified: openoffice/branches/l10n/main/scp2/source/ooo/registryitem_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/source/ooo/registryitem_ooo.scp?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/source/ooo/registryitem_ooo.scp (original)
+++ openoffice/branches/l10n/main/scp2/source/ooo/registryitem_ooo.scp Sun Feb  3 13:23:59 2013
@@ -218,7 +218,7 @@ RegistryItem gid_Regitem_Software_Micros
     ModuleID = gid_Module_Root;
     Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
     Name = "Publisher";
-    Value = "Sun Microsystems, Inc. for the OpenOffice.org-Community";
+    Value = "Apache OpenOffice project community";
 End
 
 RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Uninstallstring
@@ -247,7 +247,7 @@ End
 
 RegistryItem gid_Regitem_Software_Openoffice_Productname_Productversion_Path
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\%PRODUCTNAME\%PRODUCTVERSION";
+	Subkey = "Software\Apache OpenOffice\%PRODUCTNAME\%PRODUCTVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "Path";
 	Value = "<progpath>\program\soffice.exe";
@@ -273,7 +273,7 @@ End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Install
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+	Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "INSTALLLOCATION";
 	Value = "[INSTALLLOCATION]";
@@ -318,7 +318,7 @@ End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+	Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "OFFICEINSTALLLOCATION";
 	Value = "[INSTALLLOCATION]";
@@ -345,7 +345,7 @@ End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
+	Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
 	Value = "[INSTALLLOCATION]Basis\\";
@@ -354,7 +354,7 @@ End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstall
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+	Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
 	Value = "[INSTALLLOCATION]Basis\\";
@@ -381,7 +381,7 @@ End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
+	Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
 	Value = "[INSTALLLOCATION]URE\\";
@@ -390,7 +390,7 @@ End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+	Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
 	Value = "[INSTALLLOCATION]URE\\";
@@ -513,14 +513,14 @@ End
 
 RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\OpenOffice.org\UNO\InstallPath";
+    Subkey = "Software\Apache OpenOffice\UNO\InstallPath";
     ModuleID = gid_Module_Root;
     Value  = "<progpath>\program";
 End
 
 RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath_Branded
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\OpenOffice.org\UNO\InstallPath";
+    Subkey = "Software\Apache OpenOffice\UNO\InstallPath";
     ModuleID = gid_Module_Root;
     Name = "%PRODUCTNAME %PRODUCTVERSION";
     Value  = "<progpath>\program";

Modified: openoffice/branches/l10n/main/scp2/source/ooo/registryitem_ooo.ulf
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/source/ooo/registryitem_ooo.ulf?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/source/ooo/registryitem_ooo.ulf (original)
+++ openoffice/branches/l10n/main/scp2/source/ooo/registryitem_ooo.ulf Sun Feb  3 13:23:59 2013
@@ -28,10 +28,10 @@ en-US = "&New"
 en-US = "&Install"
 
 [STR_REG_VAL_SO60_CONFIGFILE]
-en-US = "%SXWFORMATNAME %SXWFORMATVERSION Configuration File"
+en-US = "OpenOffice.org 1.1 Configuration File"
 
 [STR_REG_VAL_SO50_TEMPLATE_OOO]
 en-US = "StarOffice 5.0 Template"
 
 [STR_REG_VAL_APPCAPABILITY_DESCRIPTION_OOO]
-en-US = "OpenOffice.org"
+en-US = "office productivity suite based on Apache OpenOffice project"

Modified: openoffice/branches/l10n/main/scp2/source/ooo/scpaction_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/source/ooo/scpaction_ooo.scp?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/source/ooo/scpaction_ooo.scp (original)
+++ openoffice/branches/l10n/main/scp2/source/ooo/scpaction_ooo.scp Sun Feb  3 13:23:59 2013
@@ -317,11 +317,7 @@ End
 
 #ifdef MACOSX
 ScpAction scp_Copy_Dmg_Background_Image
-  #if defined(BUILD_SPECIAL)
     Copy = "osxdndinstall.png";
-  #else
-    Copy = "osxdndinstall_nologo.png";
-  #endif
     Name = "background.png";
     UnixRights = 444;
     Styles = ();

Modified: openoffice/branches/l10n/main/scp2/source/ooo/ure.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/source/ooo/ure.scp?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/source/ooo/ure.scp (original)
+++ openoffice/branches/l10n/main/scp2/source/ooo/ure.scp Sun Feb  3 13:23:59 2013
@@ -1316,7 +1316,7 @@ End
 RegistryItem gid_Regitem_Path
     ModuleID = gid_Module_Root;
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "Software\OpenOffice.org\%PRODUCTNAME";
+    Subkey = "Software\Apache OpenOffice\%PRODUCTNAME";
     Name = "Path";
     Value = "[INSTALLLOCATION]";
 End

Modified: openoffice/branches/l10n/main/scp2/source/ooo/ure_standalone.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/source/ooo/ure_standalone.scp?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/source/ooo/ure_standalone.scp (original)
+++ openoffice/branches/l10n/main/scp2/source/ooo/ure_standalone.scp Sun Feb  3 13:23:59 2013
@@ -38,9 +38,9 @@ End
 Directory gid_Dir_Ooo_Openofficeorg
     ParentID = PREDEFINED_PROGDIR;
   #ifdef WNT
-    HostName = "OpenOffice.org";
+    HostName = "Apache OpenOffice";
   #else
-    HostName = "openoffice.org";
+    HostName = "apacheopenoffice";
   #endif
     Styles = (ISINSTALLLOCATION);
 End

Modified: openoffice/branches/l10n/main/scp2/source/quickstart/registryitem_quickstart.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/source/quickstart/registryitem_quickstart.scp?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/source/quickstart/registryitem_quickstart.scp (original)
+++ openoffice/branches/l10n/main/scp2/source/quickstart/registryitem_quickstart.scp Sun Feb  3 13:23:59 2013
@@ -25,7 +25,7 @@
 
 RegistryItem gid_Regitem_Software_OpenOffice_Quickstarterinstalled
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\OpenOffice.org";
+    Subkey = "Software\Apache OpenOffice";
     ModuleID = gid_Module_Optional_Quickstart;
     Name = "QuickStarterInstalled";
     Value = "1";

Modified: openoffice/branches/l10n/main/scp2/source/sdkoo/sdkoo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/source/sdkoo/sdkoo.scp?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/source/sdkoo/sdkoo.scp (original)
+++ openoffice/branches/l10n/main/scp2/source/sdkoo/sdkoo.scp Sun Feb  3 13:23:59 2013
@@ -53,22 +53,14 @@ End
 #ifndef WNT
 Directory gid_Dir_Ooo_Openofficeorg_Sdk
     ParentID = PREDEFINED_PROGDIR;
-  #ifdef WNT
-    HostName = "${BASISROOTNAME}";
-  #else
     HostName = "${UNIXBASISROOTNAME}";
-  #endif
 End
 #endif
 
 #ifndef WNT
 Directory gid_Dir_Ooo_Basis_Sdk
     ParentID = gid_Dir_Ooo_Openofficeorg_Sdk;
-  #ifdef WNT
-    HostName = "Basis ${OOOBASEVERSION}";
-  #else
     HostName = "basis${OOOBASEVERSION}";
-  #endif
     Styles = (BASISDIRECTORY);
 End
 #endif
@@ -78,8 +70,7 @@ End
 Directory gid_Dir_Basis_Sdk
 #if defined MACOSX
     ParentID = PREDEFINED_PROGDIR;
-    // DosName = "OpenOffice.org${OOOBASEVERSION}_SDK";
-    DosName = "OpenOffice.org_SDK";
+    DosName = "Apache_OpenOffice_SDK";
 #else
   #if defined WNT
     ParentID = gid_Dir_Sdkoo_Root;

Modified: openoffice/branches/l10n/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp (original)
+++ openoffice/branches/l10n/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp Sun Feb  3 13:23:59 2013
@@ -77,8 +77,8 @@ RegistryItem gid_Regitem_Folder_shellex_
     ModuleID = gid_Module_Optional_Winexplorerext;
     Styles = (X64);
     Subkey = "Folder\shellex\ColumnHandlers\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}";
-    Value = "OpenOffice.org Column Handler";
-    Val64 = "OpenOffice.org Column Handler";
+    Value = "Apache OpenOffice Column Handler";
+    Val64 = "Apache OpenOffice Column Handler";
 End
 
 RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32
@@ -108,8 +108,6 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Root;
     Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
-// Better?: "OpenOffice.org Format Filter"
-// old:    Value = "opendocument.org Filter";
 	Styles = (X64_ONLY); // Values: X64
     Value = "OpenDocument Format Filter";
     Val64 = "OpenDocument Format Filter";
@@ -138,8 +136,6 @@ RegistryItem gid_Regitem_Clsid_7BC0E713_
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Root;
     Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-//? Better: "OpenOffice.org Persistent Handler"
-// old:    Value = "opendocument.org Persistent Handler";
 	Styles = (X64); // Values: X64
     Value = "OpenDocument Format Persistent Handler";
     Val64 = "OpenDocument Format Persistent Handler";

Modified: openoffice/branches/l10n/main/scp2/util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scp2/util/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scp2/util/makefile.mk (original)
+++ openoffice/branches/l10n/main/scp2/util/makefile.mk Sun Feb  3 13:23:59 2013
@@ -187,7 +187,7 @@ SCP1FILES += \
 .ENDIF
 
 # ------------------------------------------------------------------------
-# OpenOffice.org with JRE
+# Apache OpenOffice with JRE
 
 SCP2LINK_PRODUCT_TYPE=osl
 SCP2TARGET = setup_osljre
@@ -327,7 +327,7 @@ SCP2FILES += \
 SCP2FILES += layout.par
 .ENDIF # ENABLE_LAYOUT == TRUE
 
-.IF "$(BUILD_SPECIAL)"!=""
+.IF "$(ENABLE_ONLINE_UPDATE)"!=""
 SCP2FILES += \
              module_onlineupdate.par   \
              file_onlineupdate.par

Modified: openoffice/branches/l10n/main/scripting/examples/java/build.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scripting/examples/java/build.xml?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scripting/examples/java/build.xml (original)
+++ openoffice/branches/l10n/main/scripting/examples/java/build.xml Sun Feb  3 13:23:59 2013
@@ -42,7 +42,7 @@
     <mkdir dir="${outdir}/HelloWorld"/>
 
     <javac srcdir="HelloWorld" destdir="${outdir}/HelloWorld"
-           includes="**/*.java" classpathref="idlclasspath"
+           includes="**/*.java" classpathref="idlclasspath" includeantruntime="false"
            debug="${debug}" optimize="${optimize}" deprecation="on"/>
 
     <copy file="HelloWorld/HelloWorld.java" todir="${outdir}/HelloWorld"/>
@@ -64,7 +64,7 @@
     <mkdir dir="${outdir}/Highlight"/>
 
     <javac srcdir="Highlight" destdir="${outdir}/Highlight"
-           includes="**/*.java" classpathref="idlclasspath"
+           includes="**/*.java" classpathref="idlclasspath" includeantruntime="false"
            debug="${debug}" optimize="${optimize}" deprecation="on"/>
 
     <copy file="Highlight/HighlightText.java" todir="${outdir}/Highlight"/>
@@ -86,7 +86,7 @@
     <mkdir dir="${outdir}/MemoryUsage"/>
 
     <javac srcdir="MemoryUsage" destdir="${outdir}/MemoryUsage"
-           includes="**/*.java" classpathref="idlclasspath"
+           includes="**/*.java" classpathref="idlclasspath" includeantruntime="false"
            debug="${debug}" optimize="${optimize}" deprecation="on"/>
 
     <copy file="MemoryUsage/MemoryUsage.java" todir="${outdir}/MemoryUsage"/>

Modified: openoffice/branches/l10n/main/scripting/java/build.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scripting/java/build.xml?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scripting/java/build.xml (original)
+++ openoffice/branches/l10n/main/scripting/java/build.xml Sun Feb  3 13:23:59 2013
@@ -102,7 +102,7 @@
   <!-- ======================== Compile Classes ========================== -->
   <target name="compile" depends="prepare, eval_environment">
     <javac srcdir="com" destdir="${jardir}"
-         includes="**/*.java" classpathref="idlclasspath"
+         includes="**/*.java" classpathref="idlclasspath" includeantruntime="false"
          debug="${debug}" optimize="${optimize}" deprecation="off">
       <exclude name="**/provider/javascript/*.java" unless="with_rhino" />
       <exclude name="**/provider/beanshell/*.java" unless="with_beanshell" />
@@ -110,7 +110,7 @@
     </javac>
     <javac srcdir="Framework/" destdir="${jardir}"
          includes="**/*.java" classpathref="idlclasspath" debug="${debug}" 
-         optimize="${optimize}" deprecation="off">
+         optimize="${optimize}" deprecation="off" includeantruntime="false">
      <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/>
     </javac>
   </target>

Modified: openoffice/branches/l10n/main/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java (original)
+++ openoffice/branches/l10n/main/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java Sun Feb  3 13:23:59 2013
@@ -240,8 +240,7 @@ public class ParcelContainer implements 
      * @param   language language for which entries are stored
      * @param   loadParcels set to <tt>true</tt> if parcels are to be loaded
      *          on construction.
-     * @return    name of <tt>ParcelContainer</tt>
-     * @throws    IllegalArgumentException
+     * @throws    com.sun.star.lang.IllegalArgumentException
      * @throws    WrappedTargetException
      */    
     public ParcelContainer( XComponentContext xCtx, String containerUrl, String language, boolean loadParcels ) throws com.sun.star.lang.IllegalArgumentException, com.sun.star.lang.WrappedTargetException

Modified: openoffice/branches/l10n/main/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java (original)
+++ openoffice/branches/l10n/main/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java Sun Feb  3 13:23:59 2013
@@ -240,4 +240,4 @@ class GlyphGutter extends JComponent {
         g.setColor(Color.black);
         g.drawPolygon(arrow);
     }
-};
+}

Modified: openoffice/branches/l10n/main/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java (original)
+++ openoffice/branches/l10n/main/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java Sun Feb  3 13:23:59 2013
@@ -189,9 +189,8 @@ public class ScriptEditorForBeanShell
      *  If an editor window is already open for that data it will be
      *  moved to the front.
      *
-     * @param  metadata    The metadata describing the script
      * @param  context     The context in which to execute the script
-     *
+     * @param  entry       The metadata describing the script
      */
     public void edit(final XScriptContext context, ScriptMetaData entry) {
         if (entry != null ) {

Modified: openoffice/branches/l10n/main/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java (original)
+++ openoffice/branches/l10n/main/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java Sun Feb  3 13:23:59 2013
@@ -165,7 +165,7 @@ class ScriptImpl implements XScript
          *  Invoke
          *
          *
-         * @param aParams           All parameters; pure, out params are undefined in
+         * @param params            All parameters; pure, out params are undefined in
          *                      sequence, i.e., the value has to be ignored by the callee
          * @param aOutParamIndex    Out indices
          * @param aOutParam         Out parameters
@@ -173,7 +173,7 @@ class ScriptImpl implements XScript
          * @throws IllegalArgumentException If there is no matching script name
          * @throws CannotConvertException   If args do not match or cannot be converted
          *                              the those of the invokee
-         * @throws InvocationTargetException If the running script throws an exception
+         * @throws com.sun.star.reflection.InvocationTargetException If the running script throws an exception
          *              this information is captured and rethrown as this exception type.
          */
 

Modified: openoffice/branches/l10n/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java (original)
+++ openoffice/branches/l10n/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java Sun Feb  3 13:23:59 2013
@@ -172,9 +172,8 @@ public class ScriptEditorForJavaScript i
      *  If an editor window is already open for that data it will be
      *  moved to the front.
      *
-     * @param  metadata    The metadata describing the script
      * @param  context     The context in which to execute the script
-     *
+     * @param  entry       The metadata describing the script
      */
     public void edit(final XScriptContext context, ScriptMetaData entry)
     {

Modified: openoffice/branches/l10n/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java (original)
+++ openoffice/branches/l10n/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java Sun Feb  3 13:23:59 2013
@@ -154,7 +154,7 @@ class ScriptImpl implements XScript
          *
          *
          *
-         * @param aParams           All parameters; pure, out params are
+         * @param params            All parameters; pure, out params are
          *                          undefined in sequence, i.e., the value
          *                          has to be ignored by the callee
          *