incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1354497 [17/33] - in /incubator/ooo/branches/alg/aw080: ./ ext_libraries/apr-util/ ext_libraries/apr/ ext_libraries/coinmp/ ext_libraries/serf/ ext_libraries/serf/prj/ ext_libraries/serf/win/ ext_sources/ main/ main/animations/source/animc...
Date Wed, 27 Jun 2012 13:45:34 GMT
Modified: incubator/ooo/branches/alg/aw080/main/sc/uiconfig/scalc/toolbar/toolbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/uiconfig/scalc/toolbar/toolbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/uiconfig/scalc/toolbar/toolbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/uiconfig/scalc/toolbar/toolbar.xml Wed Jun 27 13:44:09 2012
@@ -23,23 +23,23 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:InsertCtrl" toolbar:helpid="helpid:26626"  toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:InsCellsCtrl" toolbar:helpid="helpid:26627"  toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:InsObjCtrl" toolbar:helpid="helpid:26628"  toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:Config" toolbar:helpid="helpid:10593"  toolbar:style="dropdown" />
+ <toolbar:toolbaritem xlink:href=".uno:InsertCtrl" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsCellsCtrl" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsObjCtrl" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:Config" toolbar:style="dropdown"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AutoFormat" toolbar:helpid="helpid:10242"  />
- <toolbar:toolbaritem xlink:href=".uno:ChooseDesign" toolbar:helpid="helpid:26082"  />
- <toolbar:toolbaritem xlink:href=".uno:ThesaurusDialog" toolbar:helpid="helpid:10245"  toolbar:visible="false" />
+ <toolbar:toolbaritem xlink:href=".uno:AutoFormat"/>
+ <toolbar:toolbaritem xlink:href=".uno:ChooseDesign"/>
+ <toolbar:toolbaritem xlink:href=".uno:ThesaurusDialog" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DataFilterAutoFilter" toolbar:helpid="helpid:26325"  />
- <toolbar:toolbaritem xlink:href=".uno:DataFilterStandardFilter" toolbar:helpid="helpid:26323"  toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:DataFilterSpecialFilter" toolbar:helpid="helpid:26324"  toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:DataDataPilotRun" toolbar:helpid="helpid:26151"  toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:EuroConverter" toolbar:helpid="helpid:26083"  toolbar:visible="false" />
+ <toolbar:toolbaritem xlink:href=".uno:DataFilterAutoFilter"/>
+ <toolbar:toolbaritem xlink:href=".uno:DataFilterStandardFilter" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:DataFilterSpecialFilter" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:DataDataPilotRun" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:EuroConverter" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:DefineName" toolbar:helpid="helpid:26271"  toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:GoalSeekDialog" toolbar:helpid="helpid:26153"  toolbar:visible="false" />
- <toolbar:toolbaritem xlink:href=".uno:Group" toolbar:helpid="helpid:26331"  />
- <toolbar:toolbaritem xlink:href=".uno:Ungroup" toolbar:helpid="helpid:26332"  />
+ <toolbar:toolbaritem xlink:href=".uno:DefineName" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:GoalSeekDialog" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:Group"/>
+ <toolbar:toolbaritem xlink:href=".uno:Ungroup"/>
 </toolbar:toolbar>

Modified: incubator/ooo/branches/alg/aw080/main/sc/uiconfig/scalc/toolbar/viewerbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/uiconfig/scalc/toolbar/viewerbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/uiconfig/scalc/toolbar/viewerbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/uiconfig/scalc/toolbar/viewerbar.xml Wed Jun 27 13:44:09 2012
@@ -23,18 +23,18 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:helpid="helpid:5502"  />
+ <toolbar:toolbaritem xlink:href=".uno:SaveAs"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="helpid:6312"  />
- <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:helpid="helpid:5331"  />
+ <toolbar:toolbaritem xlink:href=".uno:EditDoc"/>
+ <toolbar:toolbaritem xlink:href=".uno:SendMail"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF" toolbar:helpid="helpid:6674"  />
- <toolbar:toolbaritem xlink:href=".uno:PrintDefault" toolbar:helpid="helpid:5509"  />
+ <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
+ <toolbar:toolbaritem xlink:href=".uno:PrintDefault"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Copy" toolbar:helpid="helpid:5711"  />
+ <toolbar:toolbaritem xlink:href=".uno:Copy"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:SearchDialog" toolbar:helpid="helpid:5961"  />
- <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:helpid="helpid:10366"  />
+ <toolbar:toolbaritem xlink:href=".uno:SearchDialog"/>
+ <toolbar:toolbaritem xlink:href=".uno:Navigator"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:helpid="helpid:10000"  />
+ <toolbar:toolbaritem xlink:href=".uno:Zoom"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sc/util/hidother.src
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/util/hidother.src?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/util/hidother.src (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/util/hidother.src Wed Jun 27 13:44:09 2012
@@ -449,6 +449,14 @@ hidspecial HID_AAI_FUNC_IMSIN		{ HelpID 
 hidspecial HID_AAI_FUNC_IMSUB		{ HelpID = HID_AAI_FUNC_IMSUB; };
 hidspecial HID_AAI_FUNC_IMSUM		{ HelpID = HID_AAI_FUNC_IMSUM; };
 hidspecial HID_AAI_FUNC_IMSQRT		{ HelpID = HID_AAI_FUNC_IMSQRT; };
+hidspecial HID_AAI_FUNC_IMTAN       { HelpID = HID_AAI_FUNC_IMTAN; };
+hidspecial HID_AAI_FUNC_IMSEC       { HelpID = HID_AAI_FUNC_IMSEC; };
+hidspecial HID_AAI_FUNC_IMCSC       { HelpID = HID_AAI_FUNC_IMCSC; };
+hidspecial HID_AAI_FUNC_IMCOT       { HelpID = HID_AAI_FUNC_IMCOT; };
+hidspecial HID_AAI_FUNC_IMSINH      { HelpID = HID_AAI_FUNC_IMSINH; };
+hidspecial HID_AAI_FUNC_IMCOSH      { HelpID = HID_AAI_FUNC_IMCOSH; };
+hidspecial HID_AAI_FUNC_IMSECH      { HelpID = HID_AAI_FUNC_IMSECH; };
+hidspecial HID_AAI_FUNC_IMCSCH      { HelpID = HID_AAI_FUNC_IMCSCH; };
 hidspecial HID_AAI_FUNC_COMPLEX		{ HelpID = HID_AAI_FUNC_COMPLEX; };
 hidspecial HID_AAI_FUNC_OCT2BIN		{ HelpID = HID_AAI_FUNC_OCT2BIN; };
 hidspecial HID_AAI_FUNC_OCT2DEZ		{ HelpID = HID_AAI_FUNC_OCT2DEZ; };

Modified: incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysis.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysis.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysis.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysis.cxx Wed Jun 27 13:44:09 2012
@@ -1240,6 +1240,86 @@ STRING SAL_CALL AnalysisAddIn::getImsqrt
 }
 
 
+STRING SAL_CALL AnalysisAddIn::getImtan( const STRING& aNum ) THROWDEF_RTE_IAE
+{
+    Complex     z( aNum );
+
+    z.Tan();
+
+    return z.GetString();
+}
+
+
+STRING SAL_CALL AnalysisAddIn::getImsec( const STRING& aNum ) THROWDEF_RTE_IAE
+{
+    Complex     z( aNum );
+
+    z.Sec();
+
+    return z.GetString();
+}
+
+
+STRING SAL_CALL AnalysisAddIn::getImcsc( const STRING& aNum ) THROWDEF_RTE_IAE
+{
+    Complex     z( aNum );
+
+    z.Csc();
+
+    return z.GetString();
+}
+
+
+STRING SAL_CALL AnalysisAddIn::getImcot( const STRING& aNum ) THROWDEF_RTE_IAE
+{
+    Complex     z( aNum );
+
+    z.Cot();
+
+    return z.GetString();
+}
+
+
+STRING SAL_CALL AnalysisAddIn::getImsinh( const STRING& aNum ) THROWDEF_RTE_IAE
+{
+    Complex     z( aNum );
+
+    z.Sinh();
+
+    return z.GetString();
+}
+
+
+STRING SAL_CALL AnalysisAddIn::getImcosh( const STRING& aNum ) THROWDEF_RTE_IAE
+{
+    Complex     z( aNum );
+
+    z.Cosh();
+
+    return z.GetString();
+}
+
+
+STRING SAL_CALL AnalysisAddIn::getImsech( const STRING& aNum ) THROWDEF_RTE_IAE
+{
+    Complex     z( aNum );
+
+    z.Sech();
+
+    return z.GetString();
+}
+
+
+STRING SAL_CALL AnalysisAddIn::getImcsch( const STRING& aNum ) THROWDEF_RTE_IAE
+{
+    Complex     z( aNum );
+
+    z.Csch();
+
+    return z.GetString();
+}
+
+
 STRING SAL_CALL AnalysisAddIn::getComplex( double fR, double fI, const ANY& rSuff ) THROWDEF_RTE_IAE
 {
 	sal_Bool	bi;

Modified: incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysis.hrc
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysis.hrc?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysis.hrc (original)
+++ incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysis.hrc Wed Jun 27 13:44:09 2012
@@ -127,7 +127,14 @@
 #define ANALYSIS_Couppcd					(ANALYSIS_FUNCDESC_START+90)
 #define ANALYSIS_Coupnum					(ANALYSIS_FUNCDESC_START+91)
 #define ANALYSIS_Fvschedule					(ANALYSIS_FUNCDESC_START+92)
-
+#define ANALYSIS_Imtan                      (ANALYSIS_FUNCDESC_START+93)
+#define ANALYSIS_Imsec                      (ANALYSIS_FUNCDESC_START+94)
+#define ANALYSIS_Imcsc                      (ANALYSIS_FUNCDESC_START+95)
+#define ANALYSIS_Imcot                      (ANALYSIS_FUNCDESC_START+96)
+#define ANALYSIS_Imsinh                     (ANALYSIS_FUNCDESC_START+97)
+#define ANALYSIS_Imcosh                     (ANALYSIS_FUNCDESC_START+98)
+#define ANALYSIS_Imsech                     (ANALYSIS_FUNCDESC_START+99)
+#define ANALYSIS_Imcsch                     (ANALYSIS_FUNCDESC_START+100)
 
 #define ANALYSIS_FUNCNAME_START				(1)
 
@@ -224,7 +231,14 @@
 #define ANALYSIS_FUNCNAME_Couppcd			(ANALYSIS_FUNCNAME_START+90)
 #define ANALYSIS_FUNCNAME_Coupnum			(ANALYSIS_FUNCNAME_START+91)
 #define ANALYSIS_FUNCNAME_Fvschedule		(ANALYSIS_FUNCNAME_START+92)
-
+#define ANALYSIS_FUNCNAME_Imtan             (ANALYSIS_FUNCNAME_START+93)
+#define ANALYSIS_FUNCNAME_Imsec             (ANALYSIS_FUNCNAME_START+94)
+#define ANALYSIS_FUNCNAME_Imcsc             (ANALYSIS_FUNCNAME_START+95)
+#define ANALYSIS_FUNCNAME_Imcot             (ANALYSIS_FUNCNAME_START+96)
+#define ANALYSIS_FUNCNAME_Imsinh            (ANALYSIS_FUNCNAME_START+97)
+#define ANALYSIS_FUNCNAME_Imcosh            (ANALYSIS_FUNCNAME_START+98)
+#define ANALYSIS_FUNCNAME_Imsech            (ANALYSIS_FUNCNAME_START+99)
+#define ANALYSIS_FUNCNAME_Imcsch            (ANALYSIS_FUNCNAME_START+100)
 
 #define ANALYSIS_DEFFUNCNAME_START			(RID_ANALYSIS_DEFFUNCTION_NAMES+1)
 
@@ -321,6 +335,13 @@
 #define ANALYSIS_DEFFUNCNAME_Couppcd		(ANALYSIS_DEFFUNCNAME_START+90)
 #define ANALYSIS_DEFFUNCNAME_Coupnum		(ANALYSIS_DEFFUNCNAME_START+91)
 #define ANALYSIS_DEFFUNCNAME_Fvschedule		(ANALYSIS_DEFFUNCNAME_START+92)
-
+#define ANALYSIS_DEFFUNCNAME_Imtan          (ANALYSIS_DEFFUNCNAME_START+93)
+#define ANALYSIS_DEFFUNCNAME_Imsec          (ANALYSIS_DEFFUNCNAME_START+94)
+#define ANALYSIS_DEFFUNCNAME_Imcsc          (ANALYSIS_DEFFUNCNAME_START+95)
+#define ANALYSIS_DEFFUNCNAME_Imcot          (ANALYSIS_DEFFUNCNAME_START+96)
+#define ANALYSIS_DEFFUNCNAME_Imsinh         (ANALYSIS_DEFFUNCNAME_START+97)
+#define ANALYSIS_DEFFUNCNAME_Imcosh         (ANALYSIS_DEFFUNCNAME_START+98)
+#define ANALYSIS_DEFFUNCNAME_Imsech         (ANALYSIS_DEFFUNCNAME_START+99)
+#define ANALYSIS_DEFFUNCNAME_Imcsch         (ANALYSIS_DEFFUNCNAME_START+100)
 
 #endif

Modified: incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysis.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysis.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysis.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysis.hxx Wed Jun 27 13:44:09 2012
@@ -188,6 +188,14 @@ public:
     virtual STRING SAL_CALL     getImsum( constREFXPS& xOpt, const SEQSEQ( STRING )& aNum1, const SEQ( ANY )& aFollowingPars ) THROWDEF_RTE_IAE;
 
 	virtual STRING SAL_CALL		getImsqrt( const STRING& aNum ) THROWDEF_RTE_IAE;
+    virtual STRING SAL_CALL     getImtan( const STRING& aNum ) THROWDEF_RTE_IAE;
+    virtual STRING SAL_CALL     getImsec( const STRING& aNum ) THROWDEF_RTE_IAE;
+    virtual STRING SAL_CALL     getImcsc( const STRING& aNum ) THROWDEF_RTE_IAE;
+    virtual STRING SAL_CALL     getImcot( const STRING& aNum ) THROWDEF_RTE_IAE;
+    virtual STRING SAL_CALL     getImsinh( const STRING& aNum ) THROWDEF_RTE_IAE;
+    virtual STRING SAL_CALL     getImcosh( const STRING& aNum ) THROWDEF_RTE_IAE;
+    virtual STRING SAL_CALL     getImsech( const STRING& aNum ) THROWDEF_RTE_IAE;
+    virtual STRING SAL_CALL     getImcsch( const STRING& aNum ) THROWDEF_RTE_IAE;
 	virtual STRING SAL_CALL		getComplex( double fReal, double fImaginary, const ANY& rSuffix ) THROWDEF_RTE_IAE;
 
 	virtual double SAL_CALL		getConvert( double fVal, const STRING& aFromUnit, const STRING& aToUnit ) THROWDEF_RTE_IAE;

Modified: incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysis.src
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysis.src?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysis.src (original)
+++ incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysis.src Wed Jun 27 13:44:09 2012
@@ -1350,6 +1350,150 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTI
 
 	};
 
+    Resource ANALYSIS_Imtan
+    {
+        String 1    // description Imtan
+        {
+            Text [ en-US ] = "Returns the tangent of a complex number";
+        };
+
+        String 2 // name of parameter 1         Imtan
+        {
+            Text [ en-US ] = "Complex number";
+        };
+
+        String 3 // description of parameter 1  Imtan
+        {
+            Text [ en-US ] = "A complex number";
+        };
+    };
+
+    Resource ANALYSIS_Imsec
+    {
+        String 1    // description Imsec
+        {
+            Text [ en-US ] = "Returns the secant of a complex number";
+        };
+
+        String 2 // name of parameter 1         Imsec
+        {
+            Text [ en-US ] = "Complex number";
+        };
+
+        String 3 // description of parameter 1  Imsec
+        {
+            Text [ en-US ] = "A complex number";
+        };
+    };
+
+    Resource ANALYSIS_Imcsc
+    {
+        String 1    // description Imcsc
+        {
+            Text [ en-US ] = "Returns the cosecant of a complex number";
+        };
+
+        String 2 // name of parameter 1         Imcsc
+        {
+            Text [ en-US ] = "Complex number";
+        };
+
+        String 3 // description of parameter 1  Imcsc
+        {
+            Text [ en-US ] = "A complex number";
+        };
+    };
+
+    Resource ANALYSIS_Imcot
+    {
+        String 1    // description Imcot
+        {
+            Text [ en-US ] = "Returns the cotangent of a complex number";
+        };
+
+        String 2 // name of parameter 1         Imcot
+        {
+            Text [ en-US ] = "Complex number";
+        };
+
+        String 3 // description of parameter 1  Imcot
+        {
+            Text [ en-US ] = "A complex number";
+        };
+    };
+
+    Resource ANALYSIS_Imsinh
+    {
+        String 1    // description Imsinh
+        {
+            Text [ en-US ] = "Returns the hyperbolic sine of a complex number";
+        };
+
+        String 2 // name of parameter 1         Imsinh
+        {
+            Text [ en-US ] = "Complex number";
+        };
+
+        String 3 // description of parameter 1  Imsinh
+        {
+            Text [ en-US ] = "A complex number";
+        };
+    };
+
+    Resource ANALYSIS_Imcosh
+    {
+        String 1    // description Imcosh
+        {
+            Text [ en-US ] = "Returns the hyperbolic cosine of a complex number";
+        };
+
+        String 2 // name of parameter 1         Imcosh
+        {
+            Text [ en-US ] = "Complex number";
+        };
+
+        String 3 // description of parameter 1  Imcosh
+        {
+            Text [ en-US ] = "A complex number";
+        };
+    };
+
+    Resource ANALYSIS_Imsech
+    {
+        String 1    // description Imsech
+        {
+            Text [ en-US ] = "Returns the hyperbolic secant of a complex number";
+        };
+
+        String 2 // name of parameter 1         Imsech
+        {
+            Text [ en-US ] = "Complex number";
+        };
+
+        String 3 // description of parameter 1  Imsech
+        {
+            Text [ en-US ] = "A complex number";
+        };
+    };
+
+    Resource ANALYSIS_Imcsch
+    {
+        String 1    // description Imcsch
+        {
+            Text [ en-US ] = "Returns the hyperbolic cosecant of a complex number";
+        };
+
+        String 2 // name of parameter 1         Imcsch
+        {
+            Text [ en-US ] = "Complex number";
+        };
+
+        String 3 // description of parameter 1  Imcsch
+        {
+            Text [ en-US ] = "A complex number";
+        };
+    };
+
 	Resource ANALYSIS_Complex
 	{
 		String 1	// description Complex

Modified: incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysis_deffuncnames.src
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysis_deffuncnames.src?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysis_deffuncnames.src (original)
+++ incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysis_deffuncnames.src Wed Jun 27 13:44:09 2012
@@ -811,6 +811,78 @@ Resource RID_ANALYSIS_DEFFUNCTION_NAMES
 		};
 	};
 
+    StringArray ANALYSIS_DEFFUNCNAME_Imtan
+    {
+        ItemList =
+        {
+            < "IMTAN"; >;
+            < "IMTAN"; >;
+        };
+    };
+
+    StringArray ANALYSIS_DEFFUNCNAME_Imsec
+    {
+        ItemList =
+        {
+            < "IMSEC"; >;
+            < "IMSEC"; >;
+        };
+    };
+
+    StringArray ANALYSIS_DEFFUNCNAME_Imcsc
+    {
+        ItemList =
+        {
+            < "IMCSC"; >;
+            < "IMCSC"; >;
+        };
+    };
+
+    StringArray ANALYSIS_DEFFUNCNAME_Imcot
+    {
+        ItemList =
+        {
+            < "IMCOT"; >;
+            < "IMCOT"; >;
+        };
+    };
+
+    StringArray ANALYSIS_DEFFUNCNAME_Imsinh
+    {
+        ItemList =
+        {
+            < "IMSINH"; >;
+            < "IMSINH"; >;
+        };
+    };
+
+    StringArray ANALYSIS_DEFFUNCNAME_Imcosh
+    {
+        ItemList =
+        {
+            < "IMCOSH"; >;
+            < "IMCOSH"; >;
+        };
+    };
+
+    StringArray ANALYSIS_DEFFUNCNAME_Imsech
+    {
+        ItemList =
+        {
+            < "IMSECH"; >;
+            < "IMSECH"; >;
+        };
+    };
+
+    StringArray ANALYSIS_DEFFUNCNAME_Imcsch
+    {
+        ItemList =
+        {
+            < "IMCSCH"; >;
+            < "IMCSCH"; >;
+        };
+    };
+
 	StringArray ANALYSIS_DEFFUNCNAME_Complex
 	{
 		ItemList =

Modified: incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysis_funcnames.src
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysis_funcnames.src?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysis_funcnames.src (original)
+++ incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysis_funcnames.src Wed Jun 27 13:44:09 2012
@@ -463,6 +463,46 @@ Resource RID_ANALYSIS_FUNCTION_NAMES
 		Text [ en-US ] = "IMSQRT";
 	};
 
+    String ANALYSIS_FUNCNAME_Imtan
+    {
+        Text [ en-US ] = "IMTAN";
+    };
+
+    String ANALYSIS_FUNCNAME_Imsec
+    {
+        Text [ en-US ] = "IMSEC";
+    };
+
+    String ANALYSIS_FUNCNAME_Imcsc
+    {
+        Text [ en-US ] = "IMCSC";
+    };
+
+    String ANALYSIS_FUNCNAME_Imcot
+    {
+        Text [ en-US ] = "IMCOT";
+    };
+
+    String ANALYSIS_FUNCNAME_Imsinh
+    {
+        Text [ en-US ] = "IMSINH";
+    };
+
+    String ANALYSIS_FUNCNAME_Imcosh
+    {
+        Text [ en-US ] = "IMCOSH";
+    };
+
+    String ANALYSIS_FUNCNAME_Imsech
+    {
+        Text [ en-US ] = "IMSECH";
+    };
+
+    String ANALYSIS_FUNCNAME_Imcsch
+    {
+        Text [ en-US ] = "IMCSCH";
+    };
+
 	String ANALYSIS_FUNCNAME_Complex
 	{
 		Text [ en-US ] = "COMPLEX";

Modified: incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysisadd.idl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysisadd.idl?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysisadd.idl (original)
+++ incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysisadd.idl Wed Jun 27 13:44:09 2012
@@ -328,6 +328,38 @@ module addin
         string getImsqrt( [in] string Num )
             raises( com::sun::star::lang::IllegalArgumentException );
 
+        /// imtan.
+        string getImtan( [in] string Num )
+            raises( com::sun::star::lang::IllegalArgumentException );
+
+        /// imsec.
+        string getImsec( [in] string Num)
+            raises( com::sun::star::lang::IllegalArgumentException );
+
+        /// imcsc.
+        string getImcsc( [in] string Num )
+            raises( com::sun::star::lang::IllegalArgumentException );
+
+        /// imcot.
+        string getImcot( [in] string Num )
+            raises( com::sun::star::lang::IllegalArgumentException );
+
+        /// imsinh.
+        string getImsinh( [in] string Num )
+            raises( com::sun::star::lang::IllegalArgumentException );
+
+        /// imcosh.
+        string getImcosh( [in] string Num )
+            raises( com::sun::star::lang::IllegalArgumentException );
+
+        /// imsech.
+        string getImsech( [in] string Num)
+            raises( com::sun::star::lang::IllegalArgumentException );
+
+        /// imcsch.
+        string getImcsch( [in] string Num )
+            raises( com::sun::star::lang::IllegalArgumentException );
+
         /// complex.
         string getComplex( [in] double Real, [in] double Imaginary, [in] any Suffix )
             raises( com::sun::star::lang::IllegalArgumentException );

Modified: incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysishelper.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysishelper.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysishelper.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysishelper.cxx Wed Jun 27 13:44:09 2012
@@ -102,6 +102,14 @@ const FuncDataBase pFuncDatas[] =
     FUNCDATA( Imsub,            UNIQUE,     STDPAR,     2,          FDCat_Tech ),
     FUNCDATA( Imsqrt,           UNIQUE,     STDPAR,     1,          FDCat_Tech ),
     FUNCDATA( Imsum,            UNIQUE,     INTPAR,     1,          FDCat_Tech ),
+    FUNCDATA( Imtan,            UNIQUE,     STDPAR,     1,          FDCat_Tech ),
+    FUNCDATA( Imsec,            UNIQUE,     STDPAR,     1,          FDCat_Tech ),
+    FUNCDATA( Imcsc,            UNIQUE,     STDPAR,     1,          FDCat_Tech ),
+    FUNCDATA( Imcot,            UNIQUE,     STDPAR,     1,          FDCat_Tech ),
+    FUNCDATA( Imsinh,           UNIQUE,     STDPAR,     1,          FDCat_Tech ),
+    FUNCDATA( Imcosh,           UNIQUE,     STDPAR,     1,          FDCat_Tech ),
+    FUNCDATA( Imsech,           UNIQUE,     STDPAR,     1,          FDCat_Tech ),
+    FUNCDATA( Imcsch,           UNIQUE,     STDPAR,     1,          FDCat_Tech ),
     FUNCDATA( Complex,          UNIQUE,     STDPAR,     3,          FDCat_Tech ),
     FUNCDATA( Convert,          DOUBLE,     STDPAR,     3,          FDCat_Tech ),
     FUNCDATA( Amordegrc,        UNIQUE,     INTPAR,     7,          FDCat_Finance ),
@@ -1991,15 +1999,9 @@ void Complex::Sqrt( void )
 }
 
 
-inline sal_Bool SinOverflow( double f )
-{
-	return fabs( f ) >= 134217728;
-}
-
-
 void Complex::Sin( void ) THROWDEF_RTE_IAE
 {
-	if( SinOverflow( r ) )
+    if( !::rtl::math::isValidArcArg( r ) )
 		THROW_IAE;
 
 	if( i )
@@ -2017,7 +2019,7 @@ void Complex::Sin( void ) THROWDEF_RTE_I
 
 void Complex::Cos( void ) THROWDEF_RTE_IAE
 {
-	if( SinOverflow( r ) )
+	if( !::rtl::math::isValidArcArg( r ) )
 		THROW_IAE;
 
 	if( i )
@@ -2091,6 +2093,160 @@ void Complex::Log2( void ) THROWDEF_RTE_
 }
 
 
+void Complex::Tan(void) THROWDEF_RTE_IAE
+{
+    if ( i )
+    {
+        if( !::rtl::math::isValidArcArg( 2.0 * r ) )
+            THROW_IAE;
+        double fScale =1.0 / ( cos( 2.0 * r ) + cosh( 2.0 * i ));
+        r = sin( 2.0 * r ) * fScale;
+        i = sinh( 2.0 * i ) * fScale;
+    }
+    else
+    {
+        if( !::rtl::math::isValidArcArg( r ) )
+            THROW_IAE;
+        r = tan( r );
+    }
+}
+
+
+void Complex::Sec( void ) THROWDEF_RTE_IAE
+{
+    if( i )
+    {
+        if( !::rtl::math::isValidArcArg( 2 * r ) )
+            THROW_IAE;
+        double fScale = 1.0 / (cosh( 2.0 * i) + cos ( 2.0 * r));
+        double  r_;
+        r_ = 2.0 * cos( r ) * cosh( i ) * fScale;
+        i = 2.0 * sin( r ) * sinh( i ) * fScale;
+        r = r_;
+    }
+    else
+    {
+        if( !::rtl::math::isValidArcArg( r ) )
+            THROW_IAE;
+        r = 1.0 / cos( r );
+    }
+}
+
+
+void Complex::Csc( void ) THROWDEF_RTE_IAE
+{
+    if( i )
+    {
+        if( !::rtl::math::isValidArcArg( 2 * r ) )
+            THROW_IAE;
+        double fScale = 1.0 / (cosh( 2.0 * i) - cos ( 2.0 * r));
+        double  r_;
+        r_ = 2.0 * sin( r ) * cosh( i ) * fScale;
+        i = -2.0 * cos( r ) * sinh( i ) * fScale;
+        r = r_;
+    }
+    else
+    {
+        if( !::rtl::math::isValidArcArg( r ) )
+            THROW_IAE;
+        r = 1.0 / sin( r );
+    }
+}
+
+
+void Complex::Cot(void) THROWDEF_RTE_IAE
+{
+    if ( i )
+    {
+        if( !::rtl::math::isValidArcArg( 2.0 * r ) )
+            THROW_IAE;
+        double fScale =1.0 / ( cosh( 2.0 * i ) - cos( 2.0 * r ) );
+        r = sin( 2.0 * r ) * fScale;
+        i = - ( sinh( 2.0 * i ) * fScale );
+    }
+    else
+    {
+        if( !::rtl::math::isValidArcArg( r ) )
+            THROW_IAE;
+        r = 1.0 / tan( r );
+    }
+}
+
+
+void Complex::Sinh( void ) THROWDEF_RTE_IAE
+{
+    if( !::rtl::math::isValidArcArg( r ) )
+        THROW_IAE;
+
+    if( i )
+    {
+        double	r_;
+        r_ = sinh( r ) * cos( i );
+		i = cosh( r ) * sin( i );
+		r = r_;
+	}
+	else
+		r = sinh( r );
+}
+
+
+void Complex::Cosh( void ) THROWDEF_RTE_IAE
+{
+    if( !::rtl::math::isValidArcArg( r ) )
+        THROW_IAE;
+
+    if( i )
+    {
+        double	r_;
+        r_ = cosh( r ) * cos( i );
+		i = sinh( r ) * sin( i );
+		r = r_;
+	}
+	else
+		r = cosh( r );
+}
+
+
+void Complex::Sech(void) THROWDEF_RTE_IAE
+{
+    if ( i )
+    {
+        if( !::rtl::math::isValidArcArg( 2.0 * r ) )
+            THROW_IAE;
+        double fScale =1.0 / ( cosh( 2.0 * r ) + cos( 2.0 * i ));
+        double r_;
+        r_ = 2.0 * cosh( 2.0 * r ) * cos( i ) * fScale;
+        i = - (2.0 * sinh( 2.0 * r ) * sin( i ) * fScale );
+        r = r_ ;
+    }
+    else
+    {
+        if( !::rtl::math::isValidArcArg( r ) )
+            THROW_IAE;
+        r = 1.0 / cosh( r );
+    }
+}
+
+
+void Complex::Csch(void) THROWDEF_RTE_IAE
+{
+    if ( i )
+    {
+        if( !::rtl::math::isValidArcArg( 2.0 * r ) )
+            THROW_IAE;
+        double fScale =1.0 / ( cosh( 2.0 * r ) - cos( 2.0 * i ));
+        double r_;
+        r_ = 2.0 * sinh( 2.0 * r ) * cos( i ) * fScale;
+        i = - ( 2.0 * cosh( 2.0 * r ) * sin( i ) * fScale );
+        r = r_ ;
+    }
+    else
+    {
+        if( !::rtl::math::isValidArcArg( r ) )
+            THROW_IAE;
+        r = 1.0 / sinh( r );
+    }
+}
 
 
 ComplexList::~ComplexList()

Modified: incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysishelper.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysishelper.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysishelper.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/scaddins/source/analysis/analysishelper.hxx Wed Jun 27 13:44:09 2012
@@ -443,7 +443,7 @@ class Complex
     sal_Unicode             c;
 
 public:
-    inline                  Complex( double fReal, double fImag = 0.0, sal_Char cC = '\0' );
+    inline                  Complex( double fReal, double fImag = 0.0, sal_Unicode cC = '\0' );
 							Complex( const STRING& rComplexAsString ) THROWDEF_RTE_IAE;
 
 	inline static sal_Bool	IsImagUnit( sal_Unicode c );
@@ -471,6 +471,15 @@ public:
 	inline void				Mult( const Complex& rMult );
 	inline void				Sub( const Complex& rMult );
 	inline void				Add( const Complex& rAdd );
+    void                    Tan( void ) THROWDEF_RTE_IAE;
+    void                    Sec( void ) THROWDEF_RTE_IAE;
+    void                    Csc( void ) THROWDEF_RTE_IAE;
+    void                    Cot( void ) THROWDEF_RTE_IAE;
+    void                    Sinh( void ) THROWDEF_RTE_IAE;
+    void                    Cosh( void ) THROWDEF_RTE_IAE;
+    void                    Sech( void ) THROWDEF_RTE_IAE;
+    void                    Csch( void ) THROWDEF_RTE_IAE;
+
 };
 
 
@@ -788,7 +797,7 @@ inline const FuncData* FuncDataList::Get
 }
 
 
-inline Complex::Complex( double fReal, double fImag, sal_Char cC ) :
+inline Complex::Complex( double fReal, double fImag, sal_Unicode cC ) :
 		r( fReal ), i( fImag ), c( cC )
 {
 }

Modified: incubator/ooo/branches/alg/aw080/main/sccomp/source/solver/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sccomp/source/solver/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sccomp/source/solver/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/sccomp/source/solver/makefile.mk Wed Jun 27 13:44:09 2012
@@ -58,14 +58,22 @@ SHL1STDLIBS=    $(COMPHELPERLIB)    \
                 $(CPPUHELPERLIB)    \
                 $(CPPULIB)          \
                 $(SALLIB)           \
-                $(TOOLSLIB)         \
-                $(COINMPLIBS)
+                $(TOOLSLIB)
 
 SHL1DEPN=       makefile.mk
 SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
 SHL1VERSIONMAP= $(SOLARENV)/src/component.map
 DEF1NAME=       $(SHL1TARGET)
 
+.IF "$(SYSTEM_COINMP)" == "YES"
+CFLAGS+= $(COINMP_CFLAGS) -DSYSTEM_COINMP
+# Use the library flags from configure
+SHL1STDLIBS+=$(COINMP_LIBS)
+.ELSE
+# Use the library flags from solenv
+SHL1STDLIBS+=$(COINMPLIBS)
+.ENDIF
+
 # --- Resources --------------------------------
 
 RESLIB1LIST=$(SRS)$/solver.srs

Modified: incubator/ooo/branches/alg/aw080/main/sccomp/source/solver/solver.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sccomp/source/solver/solver.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sccomp/source/solver/solver.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sccomp/source/solver/solver.cxx Wed Jun 27 13:44:09 2012
@@ -20,8 +20,11 @@
  *************************************************************/
 
 
-
+#ifdef SYSTEM_COINMP
+#include <coin/CoinMP.h>
+#else
 #include <coinmp/CoinMP.h>
+#endif
 
 #include "solver.hxx"
 #include "solver.hrc"

Modified: incubator/ooo/branches/alg/aw080/main/scp2/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/scp2/prj/build.lst?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/scp2/prj/build.lst (original)
+++ incubator/ooo/branches/alg/aw080/main/scp2/prj/build.lst Wed Jun 27 13:44:09 2012
@@ -1,4 +1,4 @@
-cp    scp2    :    L10N:l10n i18npool setup_native l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt serf NULL
+cp    scp2    :    L10N:l10n i18npool setup_native l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt APR:apr APR_UTIL:apr-util SERF:serf NULL
 cp    scp2                        usr1     -    all    cp_mkout NULL
 cp    scp2\macros                 nmake    -    all    cp_langmacros NULL
 cp    scp2\source\templates       nmake    -    all    cp_langtemplates NULL

Modified: incubator/ooo/branches/alg/aw080/main/scp2/source/calc/file_calc.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/scp2/source/calc/file_calc.scp?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/scp2/source/calc/file_calc.scp (original)
+++ incubator/ooo/branches/alg/aw080/main/scp2/source/calc/file_calc.scp Wed Jun 27 13:44:09 2012
@@ -64,7 +64,9 @@ File gid_File_Lib_CbcSolver
     Name = SPECIAL_NAME_VER(CbcSolver,3);
     PACKED_LIB_FILE_BODY;
 End
-#else
+#endif
+
+#ifdef ADD_MAIN_COINMP_LIBRARY
 // On Windows only the CoinMP library is built and used.
 // Version numbering is not used either.
 File gid_File_Lib_CoinMP

Modified: incubator/ooo/branches/alg/aw080/main/scp2/source/calc/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/scp2/source/calc/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/scp2/source/calc/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/scp2/source/calc/makefile.mk Wed Jun 27 13:44:09 2012
@@ -35,10 +35,14 @@ TARGETTYPE=CUI
 
 .IF "$(ENABLE_COINMP)" == "YES"
 SCPDEFS+=-DENABLE_COINMP
+.IF "$(SYSTEM_COINMP)" == "NO"
 .IF "$(GUI)"!="WNT"
 # For the non-Windows platforms all libraries related to CoinMP have to be
 # added explicitly.
 SCPDEFS+=-DADD_ALL_COINMP_LIBRARIES
+.ELSE
+SCPDEFS+=-DADD_MAIN_COINMP_LIBRARY
+.ENDIF
 .ENDIF
 .ENDIF
 

Modified: incubator/ooo/branches/alg/aw080/main/scp2/source/ooo/common_brand.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/scp2/source/ooo/common_brand.scp?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/scp2/source/ooo/common_brand.scp (original)
+++ incubator/ooo/branches/alg/aw080/main/scp2/source/ooo/common_brand.scp Wed Jun 27 13:44:09 2012
@@ -110,8 +110,7 @@ Module gid_Module_Langpack_Brand_Templat
             gid_Brand_Dir_Readme,
             gid_Brand_Dir_Share,
             gid_Brand_Dir_Share_Readme);
-    Files = (gid_Brand_File_Res_About,
-             gid_Brand_File_Res_Oirm,
+    Files = (gid_Brand_File_Res_Oirm,
              gid_Brand_File_Readme_Readme,
              gid_Brand_File_Readme_Readme_Html,
              gid_Brand_File_Share_Registry_Cjk_Xcd,
@@ -1325,6 +1324,3 @@ File gid_Brand_File_Bin_Python
     Styles = (PACKED);
 End
 #endif
-
-BRAND_RES_FILE( gid_Brand_File_Res_About, about )
-

Modified: incubator/ooo/branches/alg/aw080/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/scp2/source/ooo/file_library_ooo.scp?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ incubator/ooo/branches/alg/aw080/main/scp2/source/ooo/file_library_ooo.scp Wed Jun 27 13:44:09 2012
@@ -1422,7 +1422,11 @@ STD_LIB_FILE( gid_File_Lib_Editeng, edit
 
 STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter)
 
+#ifdef OS2
+STD_LIB_FILE( gid_File_Lib_Sw , swoo)
+#else
 STD_LIB_FILE( gid_File_Lib_Sw , sw)
+#endif
 STD_LIB_FILE( gid_File_Lib_Swui, swui)
 
 STD_LIB_FILE( gid_File_Lib_Msword, msword )
@@ -1532,7 +1536,11 @@ SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpe
 File gid_File_Lib_Lnth
     TXT_FILE_BODY;
     Styles = (PACKED);
+#ifdef OS2
+    Name = LIBNAME(lnth);
+#else
     Name = LIBNAME(lnth.uno);
+#endif
     Dir = SCP2_OOO_BIN_DIR;
 End
 
@@ -1994,8 +2002,10 @@ End
 #endif
 #endif
 
+// AF: is this still needed with explicit support for system apr,apr-util,serf ?
 #if !defined(OS2) // using system libs
 
+#ifdef APR_MAJOR 
 File gid_File_Lib_Apr
      #ifdef WNT
         Name = SPECIAL_NAME(libapr-1);
@@ -2012,7 +2022,9 @@ File gid_File_Lib_Apr
      #endif
      PACKED_LIB_FILE_BODY;
 End
+#endif
 
+#ifdef APR_UTIL_MAJOR
 File gid_File_Lib_AprUtil
     #ifdef WNT
         Name = SPECIAL_NAME(apr-util);
@@ -2029,7 +2041,9 @@ File gid_File_Lib_AprUtil
     #endif
     PACKED_LIB_FILE_BODY;
 End
+#endif
 
+#ifdef SERF_MAJOR
 File gid_File_Lib_Serf
     #ifdef WNT
         Name = SPECIAL_NAME(serf);
@@ -2037,14 +2051,15 @@ File gid_File_Lib_Serf
 	// Looks like the major version number is part of the name, not
 	// part of the suffix.  An error?
 	#ifdef MACOSX
-            Name = STRING(CONCAT6(libserf-1,.0.,SERF_MINOR,.,SERF_MICRO,UNXSUFFIX));
+            Name = STRING(CONCAT4(libserf-,SERF_MAJOR,.0.0.0,UNXSUFFIX));
 	#elif FREEBSD
             Name = STRING(CONCAT3(libserf-1,UNXSUFFIX,.0));
 	#else
-            Name = STRING(CONCAT6(libserf-1,UNXSUFFIX,.0.,SERF_MINOR,.,SERF_MICRO));
+            Name = STRING(CONCAT3(libserf-1,UNXSUFFIX,.0.0.0));
 	#endif
     #endif
     PACKED_LIB_FILE_BODY;
 End
+#endif
 
 #endif // !defined(OS2)

Modified: incubator/ooo/branches/alg/aw080/main/scp2/source/ooo/file_resource_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/scp2/source/ooo/file_resource_ooo.scp?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/scp2/source/ooo/file_resource_ooo.scp (original)
+++ incubator/ooo/branches/alg/aw080/main/scp2/source/ooo/file_resource_ooo.scp Wed Jun 27 13:44:09 2012
@@ -123,7 +123,9 @@ STD_RES_FILE( gid_File_Res_XMLSecurity, 
 
 STD_RES_FILE( gid_File_Res_UpdChk, updchk )
 
+#if defined(ENABLE_ONLINE_UPDATE)
 STD_RES_FILE( gid_File_Res_Upd, upd )
+#endif
 
 STD_RES_FILE( gid_File_Res_T602Filter, t602filter )
 

Modified: incubator/ooo/branches/alg/aw080/main/scp2/source/ooo/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/scp2/source/ooo/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/scp2/source/ooo/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/scp2/source/ooo/makefile.mk Wed Jun 27 13:44:09 2012
@@ -241,19 +241,27 @@ SCPDEFS+=-DDISABLE_ATL
 .ENDIF
 
 # Detect version numbers for apr, apr-util, serf.
+.IF "$(SYSTEM_APR)"!="YES"
 .INCLUDE : apr_version.mk
-.INCLUDE : aprutil_version.mk
-.INCLUDE : serf_version.mk
 SCPDEFS+=\
     -DAPR_MAJOR=$(APR_MAJOR)		\
     -DAPR_MINOR=$(APR_MINOR)		\
-    -DAPR_MICRO=$(APR_MICRO)		\
+    -DAPR_MICRO=$(APR_MICRO)
+.ENDIF
+.IF "$(SYSTEM_APR_UTIL)"!="YES"
+.INCLUDE : aprutil_version.mk
+SCPDEFS+=\
     -DAPR_UTIL_MAJOR=$(APR_UTIL_MAJOR)	\
     -DAPR_UTIL_MINOR=$(APR_UTIL_MINOR)	\
-    -DAPR_UTIL_MICRO=$(APR_UTIL_MICRO)	\
+    -DAPR_UTIL_MICRO=$(APR_UTIL_MICRO)
+.ENDIF
+.IF "$(SYSTEM_SERF)"!="YES"
+.INCLUDE : serf_version.mk
+SCPDEFS+=\
     -DSERF_MAJOR=$(SERF_MAJOR)		\
     -DSERF_MINOR=$(SERF_MINOR)		\
     -DSERF_MICRO=$(SERF_MICRO)
+.ENDIF
 
 .IF "$(SYSTEM_PYTHON)" == "YES"
 SCPDEFS+=-DSYSTEM_PYTHON

Modified: incubator/ooo/branches/alg/aw080/main/scp2/source/ooo/shortcut_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/scp2/source/ooo/shortcut_ooo.scp?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/scp2/source/ooo/shortcut_ooo.scp (original)
+++ incubator/ooo/branches/alg/aw080/main/scp2/source/ooo/shortcut_ooo.scp Wed Jun 27 13:44:09 2012
@@ -96,6 +96,7 @@ End
 // The major version number is handled in a non-standard way (part of the name).
 // Therefore the hard-coded .0 suffix.
 
+#ifdef APR_MAJOR 
 Shortcut gid_Shortcut_Lib_Apr
     FileID = gid_File_Lib_Apr;
     Dir = SCP2_OOO_BIN_DIR;
@@ -106,7 +107,9 @@ Shortcut gid_Shortcut_Lib_Apr
     #endif
     Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
 End
+#endif
 
+#ifdef APR_UTIL_MAJOR
 Shortcut gid_Shortcut_Lib_AprUtil
     FileID = gid_File_Lib_AprUtil;
     Dir = SCP2_OOO_BIN_DIR;
@@ -117,7 +120,9 @@ Shortcut gid_Shortcut_Lib_AprUtil
     #endif
     Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
 End
+#endif
 
+#ifdef SERF_MAJOR
 Shortcut gid_Shortcut_Lib_Serf
     FileID = gid_File_Lib_Serf;
     Dir = SCP2_OOO_BIN_DIR;
@@ -128,6 +133,7 @@ Shortcut gid_Shortcut_Lib_Serf
     #endif
     Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
 End
+#endif
 
 #endif
 

Modified: incubator/ooo/branches/alg/aw080/main/scripting/source/pyprov/pythonscript.py
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/scripting/source/pyprov/pythonscript.py?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/scripting/source/pyprov/pythonscript.py (original)
+++ incubator/ooo/branches/alg/aw080/main/scripting/source/pyprov/pythonscript.py Wed Jun 27 13:44:09 2012
@@ -113,9 +113,9 @@ log.debug( "pythonscript loading" )
 from com.sun.star.uno import RuntimeException
 from com.sun.star.lang import XServiceInfo
 from com.sun.star.io import IOException
-from com.sun.star.ucb import CommandAbortedException, XCommandEnvironment, XProgressHandler
+from com.sun.star.ucb import CommandAbortedException, XCommandEnvironment, XProgressHandler, Command
 from com.sun.star.task import XInteractionHandler
-from com.sun.star.beans import XPropertySet
+from com.sun.star.beans import XPropertySet, Property
 from com.sun.star.container import XNameContainer
 from com.sun.star.xml.sax import XDocumentHandler, InputSource
 from com.sun.star.uno import Exception as UnoException
@@ -247,12 +247,15 @@ def checkForPythonPathBesideScript( url 
         
     
 class ScriptContext(unohelper.Base):
-    def __init__( self, ctx, doc ):
+    def __init__( self, ctx, doc, inv ):
         self.ctx = ctx
         self.doc = doc
+        self.inv = inv
        
    # XScriptContext
     def getDocument(self):
+        if self.doc:
+            return self.doc
         return self.getDesktop().getCurrentComponent()
 
     def getDesktop(self):
@@ -262,6 +265,9 @@ class ScriptContext(unohelper.Base):
     def getComponentContext(self):
         return self.ctx
 
+    def getInvocationContext(self):
+        return self.inv
+
 #----------------------------------
 # Global Module Administration
 # does not fit together with script
@@ -726,7 +732,32 @@ class CommandEnvironment(unohelper.Base,
 #        log.isDebugLevel() and log.debug( "pythonscript: ModifyListener.modified " + str( event ) )
 #    def disposing( self, event ):
 #        log.isDebugLevel() and log.debug( "pythonscript: ModifyListener.disposing " + str( event ) )
+
+def getModelFromDocUrl(ctx, url):
+    """Get document model from document url."""
+    doc = None
+    args = ("Local", "Office")
+    ucb = ctx.getServiceManager().createInstanceWithArgumentsAndContext(
+        "com.sun.star.ucb.UniversalContentBroker", args, ctx)
+    identifier = ucb.createContentIdentifier(url)
+    content = ucb.queryContent(identifier)
+    p = Property()
+    p.Name = "DocumentModel"
+    p.Handle = -1
+    
+    c = Command()
+    c.Handle = -1
+    c.Name = "getPropertyValues"
+    c.Argument = uno.Any("[]com.sun.star.beans.Property", (p,))
     
+    env = CommandEnvironment()
+    try:
+        ret = content.execute(c, 0, env)
+        doc = ret.getObject(1, None)
+    except Exception, e:
+        log.isErrorLevel() and log.error("getModelFromDocUrl: %s" % url)
+    return doc
+
 def mapStorageType2PackageContext( storageType ):
     ret = storageType
     if( storageType == "share:uno_packages" ):
@@ -853,11 +884,26 @@ class PythonScriptProvider( unohelper.Ba
                 mystr = mystr + str(i)
             log.debug( "Entering PythonScriptProvider.ctor" + mystr )
 
+        doc = None
+        inv = None
         storageType = ""
+
         if isinstance(args[0],unicode ):
             storageType = args[0]
+            if storageType.startswith( "vnd.sun.star.tdoc" ):
+                doc = getModelFromDocUrl(ctx, storageType)
         else:
-            storageType = args[0].SCRIPTING_DOC_URI
+            inv = args[0]
+            try:
+                doc = inv.ScriptContainer
+                content = ctx.getServiceManager().createInstanceWithContext(
+                    "com.sun.star.frame.TransientDocumentsDocumentContentFactory", 
+                    ctx).createDocumentContent(doc)
+                storageType = content.getIdentifier().getContentIdentifier()
+            except Exception, e:
+                text = lastException2String()
+                log.error( text )
+
         isPackage = storageType.endswith( ":uno_packages" )
 
         try:
@@ -876,7 +922,7 @@ class PythonScriptProvider( unohelper.Ba
                 raise RuntimeException(
                     "PythonScriptProvider couldn't instantiate " +ucbService, self)
             self.provCtx = ProviderContext(
-                storageType, sfa, urlHelper, ScriptContext( uno.getComponentContext(), None ) )
+                storageType, sfa, urlHelper, ScriptContext( uno.getComponentContext(), doc, inv ) )
             if isPackage:
                 mapPackageName2Path = getPackageName2PathMap( sfa, storageType )
                 self.provCtx.setPackageAttributes( mapPackageName2Path , rootUrl )

Modified: incubator/ooo/branches/alg/aw080/main/sd/inc/app.hrc
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/inc/app.hrc?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/inc/app.hrc (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/inc/app.hrc Wed Jun 27 13:44:09 2012
@@ -59,6 +59,7 @@
 #define HID_PSEUDOSHEET_BACKGROUND          (HID_SD_START + 97)
 #define HID_PSEUDOSHEET_NOTES               (HID_SD_START + 98)
 #define HID_PSEUDOSHEET_SUBTITLE            (HID_SD_START + 101)
+#define HID_POOLSHEET_OBJNOLINENOFILL       (HID_SD_START + 102)
 
 #define HID_SD_CELL_STYLE_DEFAULT							(HID_SD_START + 194)
 #define HID_SD_CELL_STYLE_BANDED							(HID_SD_START + 195)

Modified: incubator/ooo/branches/alg/aw080/main/sd/inc/glob.hrc
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/inc/glob.hrc?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/inc/glob.hrc (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/inc/glob.hrc Wed Jun 27 13:44:09 2012
@@ -102,6 +102,8 @@
 #define STR_POOLSHEET_FIRST_COLUMN				RID_GLOB_START+73
 #define STR_POOLSHEET_LAST_COLUMN				RID_GLOB_START+74
 //
+#define STR_POOLSHEET_OBJNOLINENOFILL           RID_GLOB_START+75
+//
 #define STR_PSEUDOSHEET_TITLE                   RID_GLOB_START+80
 #define STR_PSEUDOSHEET_OUTLINE                 RID_GLOB_START+81
 #define STR_PSEUDOSHEET_BACKGROUNDOBJECTS       RID_GLOB_START+82

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/core/CustomAnimationEffect.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/core/CustomAnimationEffect.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/core/CustomAnimationEffect.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/core/CustomAnimationEffect.cxx Wed Jun 27 13:44:09 2012
@@ -3511,15 +3511,7 @@ bool MainSequence::disposeShape( const R
 	InteractiveSequenceList::iterator aIter;
 	for( aIter = maInteractiveSequenceList.begin(); aIter != maInteractiveSequenceList.end();  )
 	{
-		if( (*aIter)->getTriggerShape() == xShape )
-		{
-			aIter = maInteractiveSequenceList.erase( aIter );
-			bChanges = true;
-		}
-		else
-		{		
 			bChanges |= (*aIter++)->disposeShape( xShape );
-		}
 	}
 
 	if( bChanges )

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/core/drawdoc.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/core/drawdoc.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/core/drawdoc.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/core/drawdoc.cxx Wed Jun 27 13:44:09 2012
@@ -612,6 +612,9 @@ void SdDrawDocument::NewOrLoadCompleted(
 	String aName( SdResId(STR_STANDARD_STYLESHEET_NAME));
 	SetDefaultStyleSheet(static_cast<SfxStyleSheet*>(GetStyleSheetPool()->Find(aName, SD_STYLE_FAMILY_GRAPHICS)));
 
+    // #119287# Set default StyleSheet for SdrGrafObj and SdrOle2Obj
+	SetDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj(static_cast<SfxStyleSheet*>(mxStyleSheetPool->Find(String( SdResId(STR_POOLSHEET_OBJNOLINENOFILL)), SD_STYLE_FAMILY_GRAPHICS)));
+
 	// Draw-Outliner und  Dokument Outliner initialisieren,
 	// aber nicht den globalen Outliner, den der ist ja nicht
 	// dokumentspezifisch wie StyleSheetPool und StyleRequestHandler

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/core/drawdoc4.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/core/drawdoc4.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/core/drawdoc4.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/core/drawdoc4.cxx Wed Jun 27 13:44:09 2012
@@ -318,6 +318,17 @@ void SdDrawDocument::CreateLayoutTemplat
 	pISet->Put(XFillStyleItem(XFILL_NONE));
 	pISet->Put(XLineColorItem(String(), RGB_Color(COL_BLACK)));
 
+	// ---- Object no fill no line -------------------------------------------
+
+	aName = String(SdResId(STR_POOLSHEET_OBJNOLINENOFILL));
+	pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
+	pSheet->SetParent(aStdName);
+	pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJNOLINENOFILL );
+	pISet = &pSheet->GetItemSet();
+
+	pISet->Put(XFillStyleItem(XFILL_NONE));
+	pISet->Put(XLineStyleItem(XLINE_NONE));
+
 	// ---- Text ----------------------------------------------------------
 
 	aName = String(SdResId(STR_POOLSHEET_TEXT));
@@ -1187,8 +1198,7 @@ void SdDrawDocument::RenameLayoutTemplat
 	// erase everything after '~LT~'
 	aOldName.Erase(nPos + sizeof(SD_LT_SEPARATOR) - 1 );
 	sal_uInt16 nLen = aOldName.Len();
-
-	List aReplList;
+    std::vector< StyleReplaceData* > aRememberedStyleReplaceData; // #120074#
 	SfxStyleSheetIterator aIter(GetStyleSheetPool(), SD_STYLE_FAMILY_MASTERPAGE);
 	SfxStyleSheetBase* pSheet = aIter.First();
 
@@ -1207,7 +1217,7 @@ void SdDrawDocument::RenameLayoutTemplat
 			pReplData->nNewFamily = pSheet->GetFamily();
 			pReplData->aName	  = pSheet->GetName();
 			pReplData->aNewName   = aSheetName;
-			aReplList.Insert(pReplData, LIST_APPEND);
+			aRememberedStyleReplaceData.push_back(pReplData);
 
 			pSheet->SetName(aSheetName);
 		}
@@ -1249,13 +1259,11 @@ void SdDrawDocument::RenameLayoutTemplat
 
 							if (pOPO)
 							{
-								StyleReplaceData* pReplData = (StyleReplaceData*) aReplList.First();
-
-								while( pReplData )
-								{
-									pOPO->ChangeStyleSheets( pReplData->aName, pReplData->nFamily, pReplData->aNewName, pReplData->nNewFamily );
-									pReplData = (StyleReplaceData*) aReplList.Next();
-								}
+                                for(std::vector< StyleReplaceData* >::const_iterator aData(aRememberedStyleReplaceData.begin());
+                                    aData != aRememberedStyleReplaceData.end(); aData++)
+                                {
+									pOPO->ChangeStyleSheets((*aData)->aName, (*aData)->nFamily, (*aData)->aNewName, (*aData)->nNewFamily);
+                                }
 							}
 						}
 						break;
@@ -1297,13 +1305,11 @@ void SdDrawDocument::RenameLayoutTemplat
 
 							if (pOPO)
 							{
-								StyleReplaceData* pReplData = (StyleReplaceData*) aReplList.First();
-
-								while( pReplData )
-								{
-									pOPO->ChangeStyleSheets( pReplData->aName, pReplData->nFamily, pReplData->aNewName, pReplData->nNewFamily );
-									pReplData = (StyleReplaceData*) aReplList.Next();
-								}
+                                for(std::vector< StyleReplaceData* >::const_iterator aData(aRememberedStyleReplaceData.begin());
+                                    aData != aRememberedStyleReplaceData.end(); aData++)
+                                {
+									pOPO->ChangeStyleSheets((*aData)->aName, (*aData)->nFamily, (*aData)->aNewName, (*aData)->nNewFamily);
+                                }
 							}
 						}
 						break;
@@ -1315,6 +1321,13 @@ void SdDrawDocument::RenameLayoutTemplat
 			}
 		}
 	}
+
+    // #120074# was not freed in older versoins, memory leak
+    while(!aRememberedStyleReplaceData.empty())
+    {
+        delete aRememberedStyleReplaceData[aRememberedStyleReplaceData.size() - 1];
+        aRememberedStyleReplaceData.pop_back();
+    }
 }
 
 /*************************************************************************

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/core/glob.src
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/core/glob.src?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/core/glob.src (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/core/glob.src Wed Jun 27 13:44:09 2012
@@ -250,6 +250,10 @@ String STR_POOLSHEET_MEASURE
 {
 	Text [ en-US ] = "Dimension Line" ;
 };
+String STR_POOLSHEET_OBJNOLINENOFILL
+{
+	Text [ en-US ] = "Object with no fill and no line" ;
+};
 String STR_POOLSHEET_OBJWITHARROW
 {
 	Text [ en-US ] = "Object with arrow" ;

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/core/stlpool.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/core/stlpool.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/core/stlpool.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/core/stlpool.cxx Wed Jun 27 13:44:09 2012
@@ -915,6 +915,7 @@ void SdStyleSheetPool::UpdateStdNames()
 				case HID_POOLSHEET_OBJWITHARROW:	nNameId = STR_POOLSHEET_OBJWITHARROW;	break;
 				case HID_POOLSHEET_OBJWITHSHADOW:	nNameId = STR_POOLSHEET_OBJWITHSHADOW;	break;
 				case HID_POOLSHEET_OBJWITHOUTFILL:	nNameId = STR_POOLSHEET_OBJWITHOUTFILL;	break;
+				case HID_POOLSHEET_OBJNOLINENOFILL:	nNameId = STR_POOLSHEET_OBJNOLINENOFILL;break;
 				case HID_POOLSHEET_TEXT:			nNameId = STR_POOLSHEET_TEXT;			break;
 				case HID_POOLSHEET_TEXTBODY:		nNameId = STR_POOLSHEET_TEXTBODY;		break;
 				case HID_POOLSHEET_TEXTBODY_JUSTIFY:nNameId = STR_POOLSHEET_TEXTBODY_JUSTIFY;break;

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/epptso.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/epptso.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/epptso.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/epptso.cxx Wed Jun 27 13:44:09 2012
@@ -4637,6 +4637,9 @@ void PPTWriter::ImplWritePage( const PHL
 
                 mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
                 ImplCreateShape( nSpType, nSpFlags, aSolverContainer );
+
+                // #119459# for connector shape, the start point and end point is fixed, and should not be rotated.
+                mfObjectRotation = 0.0;
             }
             else if ( mType == "drawing.Measure" )
             {

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/pptexanimations.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/pptexanimations.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/pptexanimations.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/pptexanimations.cxx Wed Jun 27 13:44:09 2012
@@ -290,6 +290,16 @@ AnimationExporter::AnimationExporter( co
 static sal_Int16 GetFillMode( const Reference< XAnimationNode >& xNode, const sal_Int16 nFillDefault )
 {
     sal_Int16 nFill = xNode->getFill();
+	//[bug 119699] <Animation> The animation effect "Emphasis->FlashBulb" play incorrectly in Aoo saves a .ppt to another .ppt and plays the saved one.
+	//[bug 119740] <Animation> The animation effect "Entrance->Flash Once" fails to play in Aoo while Aoo saves a .ppt to another .ppt and plays the saved one.
+	if ((xNode->getType() == AnimationNodeType::ANIMATE)
+		||(xNode->getType() == AnimationNodeType::SET)
+		||(xNode->getType() == AnimationNodeType::TRANSITIONFILTER))
+	{
+		if ( nFill == AnimationFill::DEFAULT )
+			return nFill;
+	}
+
 	if ( ( nFill == AnimationFill::DEFAULT ) ||
 		( nFill == AnimationFill::INHERIT ) )
 	{

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/animations/CustomAnimationDialog.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/animations/CustomAnimationDialog.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/animations/CustomAnimationDialog.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/animations/CustomAnimationDialog.cxx Wed Jun 27 13:44:09 2012
@@ -2386,15 +2386,20 @@ void CustomAnimationTextAnimTabPage::upd
 				pSet->setPropertyValue( nHandleTextGroupingAuto, makeAny( fTextGroupingAuto ) );
 		}
 	}
+	//bug 120049
+	//[crash] Aoo crash when modify the "Random effects" animation effect's trigger condition to "Start effect on click of" .
+	//If this control is disabled, we should ignore its value
+	if (maCBXAnimateForm.IsEnabled())
+	{
+		sal_Bool bAnimateForm = maCBXAnimateForm.IsChecked();
+		sal_Bool bOldAnimateForm = !bAnimateForm;
 
-	sal_Bool bAnimateForm = maCBXAnimateForm.IsChecked();
-	sal_Bool bOldAnimateForm = !bAnimateForm;
-
-	if(mpSet->getPropertyState( nHandleAnimateForm ) != STLPropertyState_AMBIGUOUS)
-		mpSet->getPropertyValue( nHandleAnimateForm ) >>= bOldAnimateForm;
+		if(mpSet->getPropertyState( nHandleAnimateForm ) != STLPropertyState_AMBIGUOUS)
+			mpSet->getPropertyValue( nHandleAnimateForm ) >>= bOldAnimateForm;
 
-	if( bAnimateForm != bOldAnimateForm )
-		pSet->setPropertyValue( nHandleAnimateForm, makeAny( bAnimateForm ) );
+		if( bAnimateForm != bOldAnimateForm )
+			pSet->setPropertyValue( nHandleAnimateForm, makeAny( bAnimateForm ) );
+	}
 }
 
 void CustomAnimationTextAnimTabPage::updateControlStates()

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/animations/CustomAnimationPane.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/animations/CustomAnimationPane.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/animations/CustomAnimationPane.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/animations/CustomAnimationPane.cxx Wed Jun 27 13:44:09 2012
@@ -1699,6 +1699,69 @@ void CustomAnimationPane::changeSelectio
 				bChanged = true;
 			}
 
+			//#Bug 119988#
+			/************************************************************************/
+			/* 
+			Note, the setAnimateForm means set the animation from TextGroup to Object's Shape
+			And on the UI in means "Animate attached shape" in "Effect Option" dialog
+			The setTextGrouping means set animation to Object's Text, 
+			the nTextGrouping is Text Animation Type
+			nTextGrouping = -1 is "As one Object", means no text animation.
+
+			The previous call order first do the setTextGrouping and then do the setAnimateForm,
+			that will cause such defect: in the setTextGrouping, the effect has been removed, 
+			but in setAnimateForm still need this effect, then a NULL pointer of that effect will
+			be gotten, and cause crash.
+
+			[]bHasAnimateForm means the UI has changed, bAnimateForm is it value
+
+			So if create a new textgroup animation, the following animation will never be run!
+			Since the ¡°Animate attached shape¡± is default checked.
+			And the bHasAnimateForm default is false, and if user uncheck it the value bAnimateForm will be false, 
+			it same as the TextGroup¡¯s default value, also could not be run setAnimateForm.
+			if( bHasAnimateForm )
+			{
+			if( pTextGroup->getAnimateForm() != bAnimateForm )
+			{
+			pEffectSequence->setAnimateForm( pTextGroup, bAnimateForm );
+			bChanged = true;
+			}
+			}
+
+			In setTextGrouping, there are three case:
+			1.	Create new text effects for empty TextGroup
+			2.	Remove all text effects of TextGroup (nTextGrouping == -1)
+			3.	Change all the text effects¡¯ start type
+
+			So here is the right logic:
+			If set the animation from text to shape and remove text animation, 
+			should do setAnimateForm first, then do setTextGrouping.
+			Other case,do setTextGrouping first, then do setAnimateForm. 
+
+			*/
+			/************************************************************************/
+
+			bool	bDoSetAnimateFormFirst = false;
+			bool	bNeedDoSetAnimateForm = false;
+
+			if( bHasAnimateForm )
+			{
+				if( pTextGroup->getAnimateForm() != bAnimateForm )
+				{
+					if( (pTextGroup->getTextGrouping() >= 0) && (nTextGrouping == -1 ) )
+					{
+						bDoSetAnimateFormFirst = true;
+					}
+					bNeedDoSetAnimateForm = true;
+				}
+			}
+
+			if (bDoSetAnimateFormFirst)
+			{
+				pEffectSequence->setAnimateForm( pTextGroup, bAnimateForm );
+				bChanged = true;
+			}
+			
 			if( bHasTextGrouping )
 			{
 				if( (pTextGroup->getTextGrouping() != nTextGrouping) )
@@ -1708,13 +1771,10 @@ void CustomAnimationPane::changeSelectio
 				}
 			}
 
-			if( bHasAnimateForm )
+			if (!bDoSetAnimateFormFirst&&bNeedDoSetAnimateForm)
 			{
-				if( pTextGroup->getAnimateForm() != bAnimateForm )
-				{
-					pEffectSequence->setAnimateForm( pTextGroup, bAnimateForm );
-					bChanged = true;
-				}
+				pEffectSequence->setAnimateForm( pTextGroup, bAnimateForm );
+				bChanged = true;
 			}
 
 			if( bHasTextGroupingAuto )

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/app/optsitem.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/app/optsitem.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/app/optsitem.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/app/optsitem.cxx Wed Jun 27 13:44:09 2012
@@ -145,8 +145,8 @@ void SdOptionsGeneric::Init() const
 
 SdOptionsGeneric::~SdOptionsGeneric()
 {
-	if( mpCfgItem )
-		delete mpCfgItem;
+	delete mpCfgItem;
+	mpCfgItem = NULL;
 }
 
 // -----------------------------------------------------------------------------

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/dlg/headerfooterdlg.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/dlg/headerfooterdlg.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/dlg/headerfooterdlg.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/dlg/headerfooterdlg.cxx Wed Jun 27 13:44:09 2012
@@ -729,7 +729,8 @@ void HeaderFooterTabPage::GetOrSetDateTi
 		}
 
 		// and set it, or just get it from the handout master page
-		GetOrSetDateTimeLanguage( rLanguage, bSet, mpDoc->GetMasterSdPage( 0, PK_HANDOUT ) );
+// bug119985 2012.06.14
+		GetOrSetDateTimeLanguage( rLanguage, bSet, mpDoc->GetMasterSdPage( 0, PK_NOTES ) );
 	}
 	else
 	{
@@ -777,9 +778,13 @@ void HeaderFooterTabPage::GetOrSetDateTi
 					aFieldInfo = pEdit->GetFieldInfo( nPara, nField );
 					if( aFieldInfo.pFieldItem )
 					{
-						const SvxDateTimeField* pSvxDateTimeField = dynamic_cast< const SvxDateTimeField* >(aFieldInfo.pFieldItem->GetField());
+						const SvxFieldData* pFieldData = aFieldInfo.pFieldItem->GetField();
 
-						if( pSvxDateTimeField )
+                        // bug119985 2012.06.14
+                        if(pFieldData && (dynamic_cast< const SvxDateTimeField* >(pFieldData) || dynamic_cast< const SvxDateField* >(pFieldData)))
+                        {
+							break;
+                        }
 						{
 							break;
 						}

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fuinsert.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fuinsert.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fuinsert.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fuinsert.cxx Wed Jun 27 13:44:09 2012
@@ -89,6 +89,7 @@
 #include "sdgrffilter.hxx"
 #include "sdxfer.hxx"
 #include "undo/undoobjects.hxx"
+#include "glob.hrc"
 
 using namespace com::sun::star;
 

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/slideshow/slideshowimpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/slideshow/slideshowimpl.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/slideshow/slideshowimpl.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/slideshow/slideshowimpl.cxx Wed Jun 27 13:44:09 2012
@@ -1912,10 +1912,20 @@ IMPL_LINK( SlideshowImpl, PostYieldListe
 {
     Application::EnableNoYieldMode(false);
     Application::RemovePostYieldListener(LINK(this, SlideshowImpl, PostYieldListener));
+
     if (mbDisposed)
         return 0;
+
+    // Call Reschedule() but make sure that we are not destroyed during its
+    // execution (we still can be disposed, though.)
+    const rtl::Reference<SlideshowImpl> pSelf (this);
     Application::Reschedule(true);
-    return updateSlideShow();
+
+    // Update the slide show if we are still alive.
+    if ( ! mbDisposed)
+        return updateSlideShow();
+    else
+        return 0;
 }
 
 
@@ -3322,9 +3332,14 @@ void SAL_CALL SlideshowImpl::gotoNextSli
 					{
 						if( mpShowWindow )
 						{
-							Graphic aGraphic( SfxApplication::GetApplicationLogo().GetBitmapEx() );
-							mpShowWindow->SetPauseMode( 0, maPresSettings.mnPauseTimeout, &aGraphic );
-						}
+                            if ( maPresSettings.mbShowPauseLogo )
+                            {
+                                Graphic aGraphic( SfxApplication::GetApplicationLogo().GetBitmapEx() );
+                                mpShowWindow->SetPauseMode( 0, maPresSettings.mnPauseTimeout, &aGraphic );
+                            }
+                            else
+                                mpShowWindow->SetPauseMode( 0, maPresSettings.mnPauseTimeout );
+                        }
 					}
 					else
 					{

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx Wed Jun 27 13:44:09 2012
@@ -36,6 +36,8 @@ template <class T>
 class Enumeration
 {
 public:
+    virtual ~Enumeration (void) {}
+
     virtual bool HasMoreElements (void) const = 0;
     /** Returns T instead of T& so that it can handle shared pointers.
     */

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/outlnvs2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/outlnvs2.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/outlnvs2.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/outlnvs2.cxx Wed Jun 27 13:44:09 2012
@@ -249,7 +249,8 @@ void OutlineViewShell::FuTemporary(SfxRe
 				else
 					xPresentation->rehearseTimings();
             }
-            rReq.Done();
+			Cancel();
+			rReq.Done();
         }
         break;
 

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview4.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview4.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview4.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview4.cxx Wed Jun 27 13:44:09 2012
@@ -67,6 +67,7 @@
 
 #include <sfx2/ipclient.hxx>
 #include <svx/svdlegacy.hxx>
+#include "glob.hrc"
 
 using namespace com::sun::star;
 

Modified: incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/statusbar/statusbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/statusbar/statusbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/statusbar/statusbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/statusbar/statusbar.xml Wed Jun 27 13:44:09 2012
@@ -21,12 +21,12 @@
  * 
  ***********************************************************-->
 <statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <statusbar:statusbaritem xlink:href=".uno:Context" statusbar:align="left" statusbar:autosize="true" statusbar:width="184" statusbar:helpid="helpid:5310"/>
- <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="208" statusbar:helpid="helpid:10224"/>
- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:width="14" statusbar:helpid="helpid:5584"/>
- <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16" statusbar:helpid="helpid:5699"/>
- <statusbar:statusbaritem xlink:href=".uno:PageStatus" statusbar:align="left" statusbar:width="124" statusbar:helpid="helpid:27086"/>
- <statusbar:statusbaritem xlink:href=".uno:LayoutStatus" statusbar:align="left" statusbar:autosize="true" statusbar:width="54" statusbar:helpid="helpid:27087"/>
- <statusbar:statusbaritem xlink:href=".uno:ZoomSlider" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="130" statusbar:helpid="helpid:11065"/>
- <statusbar:statusbaritem xlink:href=".uno:Zoom" statusbar:align="center" statusbar:width="36" statusbar:helpid="helpid:10000"/>
+ <statusbar:statusbaritem xlink:href=".uno:Context" statusbar:align="left" statusbar:autosize="true" statusbar:width="184"/>
+ <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="208"/>
+ <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:width="14"/>
+ <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16"/>
+ <statusbar:statusbaritem xlink:href=".uno:PageStatus" statusbar:align="left" statusbar:width="124"/>
+ <statusbar:statusbaritem xlink:href=".uno:LayoutStatus" statusbar:align="left" statusbar:autosize="true" statusbar:width="54"/>
+ <statusbar:statusbaritem xlink:href=".uno:ZoomSlider" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="130"/>
+ <statusbar:statusbaritem xlink:href=".uno:Zoom" statusbar:align="center" statusbar:width="36"/>
 </statusbar:statusbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/3dobjectsbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/3dobjectsbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/3dobjectsbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/3dobjectsbar.xml Wed Jun 27 13:44:09 2012
@@ -23,13 +23,13 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:Cube" toolbar:helpid="helpid:27296"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Sphere" toolbar:helpid="helpid:27297"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Cylinder" toolbar:helpid="helpid:27298"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Cone" toolbar:helpid="helpid:27299"  toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:Cube" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Sphere" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Cylinder" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Cone" toolbar:style="radio"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Cyramid" toolbar:helpid="helpid:27300"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Torus" toolbar:helpid="helpid:27312"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:Shell3D" toolbar:helpid="helpid:27311"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:HalfSphere" toolbar:helpid="helpid:27313"  toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:Cyramid" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Torus" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:Shell3D" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:HalfSphere" toolbar:style="radio"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/alignmentbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/alignmentbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/alignmentbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/alignmentbar.xml Wed Jun 27 13:44:09 2012
@@ -23,11 +23,11 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft" toolbar:helpid="helpid:10131" />
- <toolbar:toolbaritem xlink:href=".uno:AlignCenter" toolbar:helpid="helpid:10132" />
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight" toolbar:helpid="helpid:10133" />
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignCenter"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:AlignUp" toolbar:helpid="helpid:10134" />
- <toolbar:toolbaritem xlink:href=".uno:AlignMiddle" toolbar:helpid="helpid:10135" />
- <toolbar:toolbaritem xlink:href=".uno:AlignDown" toolbar:helpid="helpid:10136" />
+ <toolbar:toolbaritem xlink:href=".uno:AlignUp"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignMiddle"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignDown"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/arrowsbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/arrowsbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/arrowsbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/arrowsbar.xml Wed Jun 27 13:44:09 2012
@@ -23,16 +23,16 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="helpid:10102"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:LineArrowEnd" toolbar:helpid="helpid:27173"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:LineArrowCircle" toolbar:helpid="helpid:27175"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:LineArrowSquare" toolbar:helpid="helpid:27177"  toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineArrowEnd" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineArrowCircle" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineArrowSquare" toolbar:style="radio"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Line_Diagonal" toolbar:helpid="helpid:10103"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:LineArrowStart" toolbar:helpid="helpid:27172"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:LineCircleArrow" toolbar:helpid="helpid:27176"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:LineSquareArrow" toolbar:helpid="helpid:27178"  toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:Line_Diagonal" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineArrowStart" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineCircleArrow" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineSquareArrow" toolbar:style="radio"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:MeasureLine" toolbar:helpid="helpid:27051"  toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:LineArrows" toolbar:helpid="helpid:27174"  toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:MeasureLine" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:LineArrows" toolbar:style="radio"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/arrowshapes.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/arrowshapes.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/arrowshapes.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/uiconfig/sdraw/toolbar/arrowshapes.xml Wed Jun 27 13:44:09 2012
@@ -23,34 +23,34 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.corner-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.striped-right-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-down-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.corner-right-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.striped-right-arrow"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron" toolbar:helpid="helpid:11004"  />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004"  /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" /> 
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" /> 
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" /> 
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow"/>
 </toolbar:toolbar>
\ No newline at end of file



Mime
View raw message