You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2012/06/27 15:45:34 UTC
svn commit: r1354497 [14/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...
Modified: incubator/ooo/branches/alg/aw080/main/ooo.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/ooo.lst?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/ooo.lst (original)
+++ incubator/ooo/branches/alg/aw080/main/ooo.lst Wed Jun 27 13:44:09 2012
@@ -1,64 +1 @@
-# Format of this file:
-# Comments start with '#' and are ignored.
-# Empty lines (except for whitespace) are ignored.
-# Full URLs (http and ftp) are loaded as is.
-# Partial URLs (http and ftp) end in '/' and are added to the following lines.
-
-# Load libraries from svn.apache.org. When the source code was checked out
-# with SVN then these should already be present.
-http://svn.apache.org/repos/asf/incubator/ooo/trunk/ext_sources/
-# Libraries with category A license
-0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
-067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
-128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz
-17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
-17960f35b2239654ba608cf1f3e256b3-lucene-2.9.4-src.tar.gz
-18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz
-2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz
-2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz
-3b179ed18f65c43141528aa6d2440db4-serf-1.0.0.tar.bz2
-3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
-63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz
-666a5d56098a9debf998510e304c8095-apr-util-1.4.1.tar.gz
-7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
-7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
-7e4e73c21f031d5a4c93c128baf7fd75-apache-tomcat-5.5.35-src.tar.gz
-97262fe54dddaf583eaaee3497a426e1-apr-1.4.5.tar.gz
-980143f96b3f6ce45d2e4947da21a5e9-stax-src-1.2.0.zip
-a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz
-a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1
-c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
-c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz
-ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz
-cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2
-e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz
-e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2
-ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz
-ecb2e37e45c9933e2a963cabe03670ab-curl-7.19.7.tar.gz
-ee8b492592568805593f81f8cdf2a04c-expat-2.0.1.tar.gz
-WITH_CATA_FONTS:f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip
-fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
-fcc6df1160753d0b8c835d17fdeeb0a7-boost_1_39_0.tar.gz
-fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-
-# Libraries with category B license
-24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html
-2b5f1ca58d6ef30f18f1415b65bed81c-CoinMP-1.6.0.tgz
-377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt
-WITH_CATB_FONTS:35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
-48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt
-48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz
-WITH_CATB_FONTS:61f59e4110781cbe66b46449eadac231-croscorefonts-1.21.0.tar.gz
-68dd2e8253d9a7930e9fd50e2d7220d0-hunspell-1.2.9.tar.gz
-99d94103662a8d0b571e247a77432ac5-rhino1_7R3.zip
-a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz
-b92261a5679276c400555004937af965-nss-3.12.6-with-nspr-4.8.4.tar.gz
-ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
-d35724900f6a4105550293686688bbb3-silgraphite-2.3.1.tar.gz
-ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
+# This file has been replaced by main/external_deps.lst
Modified: incubator/ooo/branches/alg/aw080/main/oox/inc/oox/drawingml/chart/modelbase.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/oox/inc/oox/drawingml/chart/modelbase.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/oox/inc/oox/drawingml/chart/modelbase.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/oox/inc/oox/drawingml/chart/modelbase.hxx Wed Jun 27 13:44:09 2012
@@ -46,13 +46,13 @@ public:
inline bool is() const { return this->get() != 0; }
- inline ModelType& create() { reset( new ModelType ); return **this; }
+ inline ModelType& create() { this->reset( new ModelType ); return **this; }
template< typename Param1Type >
- inline ModelType& create( const Param1Type& rParam1 ) { reset( new ModelType( rParam1 ) ); return **this; }
+ inline ModelType& create( const Param1Type& rParam1 ) { this->reset( new ModelType( rParam1 ) ); return **this; }
- inline ModelType& getOrCreate() { if( !*this ) reset( new ModelType ); return **this; }
+ inline ModelType& getOrCreate() { if( !*this ) this->reset( new ModelType ); return **this; }
template< typename Param1Type >
- inline ModelType& getOrCreate( const Param1Type& rParam1 ) { if( !*this ) reset( new ModelType( rParam1 ) ); return **this; }
+ inline ModelType& getOrCreate( const Param1Type& rParam1 ) { if( !*this ) this->reset( new ModelType( rParam1 ) ); return **this; }
};
// ============================================================================
Modified: incubator/ooo/branches/alg/aw080/main/oox/inc/oox/drawingml/textparagraphproperties.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/oox/inc/oox/drawingml/textparagraphproperties.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/oox/inc/oox/drawingml/textparagraphproperties.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/oox/inc/oox/drawingml/textparagraphproperties.hxx Wed Jun 27 13:44:09 2012
@@ -90,6 +90,7 @@ public:
sal_Int16 getLevel( ) const { return mnLevel; }
PropertyMap& getTextParagraphPropertyMap() { return maTextParagraphPropertyMap; }
BulletList& getBulletList() { return maBulletList; }
+ const BulletList& getBulletList() const { return maBulletList; }
TextCharacterProperties& getTextCharacterProperties() { return maTextCharacterProperties; }
const TextCharacterProperties& getTextCharacterProperties() const { return maTextCharacterProperties; }
Modified: incubator/ooo/branches/alg/aw080/main/oox/inc/oox/helper/refmap.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/oox/inc/oox/helper/refmap.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/oox/inc/oox/helper/refmap.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/oox/inc/oox/helper/refmap.hxx Wed Jun 27 13:44:09 2012
@@ -165,7 +165,7 @@ private:
inline const mapped_type* getRef( key_type nKey ) const
{
- typename container_type::const_iterator aIt = find( nKey );
+ typename container_type::const_iterator aIt = this->find( nKey );
return (aIt == this->end()) ? 0 : &aIt->second;
}
};
Modified: incubator/ooo/branches/alg/aw080/main/oox/source/drawingml/chart/typegroupconverter.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/oox/source/drawingml/chart/typegroupconverter.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/oox/source/drawingml/chart/typegroupconverter.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/oox/source/drawingml/chart/typegroupconverter.cxx Wed Jun 27 13:44:09 2012
@@ -446,19 +446,19 @@ void TypeGroupConverter::convertMarker(
// symbol style
cssc::Symbol aSymbol;
aSymbol.Style = cssc::SymbolStyle_STANDARD;
- switch( nOoxSymbol )
+ switch( nOoxSymbol ) // compare with XclChPropSetHelper::WriteMarkerProperties in xlchart.cxx
{
case XML_auto: aSymbol.Style = cssc::SymbolStyle_AUTO; break;
case XML_none: aSymbol.Style = cssc::SymbolStyle_NONE; break;
case XML_square: aSymbol.StandardSymbol = 0; break; // square
case XML_diamond: aSymbol.StandardSymbol = 1; break; // diamond
case XML_triangle: aSymbol.StandardSymbol = 3; break; // arrow up
- case XML_x: aSymbol.StandardSymbol = 6; break; // bow tie
- case XML_star: aSymbol.StandardSymbol = 7; break; // sand glass
+ case XML_x: aSymbol.StandardSymbol = 10; break; // X, legacy bow tie
+ case XML_star: aSymbol.StandardSymbol = 12; break; // asterisk, legacy sand glass
case XML_dot: aSymbol.StandardSymbol = 4; break; // arrow right
- case XML_dash: aSymbol.StandardSymbol = 2; break; // arrow down
- case XML_circle: aSymbol.StandardSymbol = 4; break; // arrow right
- case XML_plus: aSymbol.StandardSymbol = 5; break; // arrow left
+ case XML_dash: aSymbol.StandardSymbol = 13; break; // horizontal bar, legacy arrow down
+ case XML_circle: aSymbol.StandardSymbol = 8; break; // circle, legacy arrow right
+ case XML_plus: aSymbol.StandardSymbol = 11; break; // plus, legacy arrow left
}
// symbol size (points in OOXML, 1/100 mm in Chart2)
Modified: incubator/ooo/branches/alg/aw080/main/oox/source/drawingml/table/tablecell.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/oox/source/drawingml/table/tablecell.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/oox/source/drawingml/table/tablecell.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/oox/source/drawingml/table/tablecell.cxx Wed Jun 27 13:44:09 2012
@@ -36,6 +36,7 @@
#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
#include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
#include <com/sun/star/text/XText.hpp>
+#include <com/sun/star/text/WritingMode.hpp>
using rtl::OUString;
using namespace ::oox::core;
@@ -150,6 +151,15 @@ void applyTableCellProperties( const Ref
xPropSet->setPropertyValue( sVerticalAdjust, Any( eVA ) );
}
+// save char color from tblstyle for combination later
+void lcl_getCharPropFromTblStylePart(TextCharacterProperties& rDstCharProp, const TableStylePart& rSrcTblStyle)
+{
+ const Color& clr = const_cast<TableStylePart&>(rSrcTblStyle).getTextColor();
+ if (clr.isUsed())
+ rDstCharProp.maCharColor = clr;
+ // TODO: there may be other similar properties from tblstyle which need combination later
+}
+
void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oox::drawingml::TextListStylePtr pMasterTextListStyle,
const ::com::sun::star::uno::Reference < ::com::sun::star::table::XCell >& rxCell, const TableProperties& rTableProperties,
const TableStyle& rTableStyle, sal_Int32 nColumn, sal_Int32 nMaxColumn, sal_Int32 nRow, sal_Int32 nMaxRow )
@@ -161,8 +171,6 @@ void TableCell::pushToXCell( const ::oox
Reference< text::XTextCursor > xAt = xText->createTextCursor();
applyTableCellProperties( rxCell, *this );
- TextCharacterProperties aTextStyleProps;
- getTextBody()->insertAt( rFilterBase, xText, xAt, aTextStyleProps, pMasterTextListStyle );
Reference< XPropertySet > xPropSet( rxCell, UNO_QUERY_THROW );
oox::drawingml::FillProperties aFillProperties;
@@ -186,6 +194,10 @@ void TableCell::pushToXCell( const ::oox
aLinePropertiesBottomLeftToTopRight,
rTable.getWholeTbl() );
+ // get char color from tblstyle for combination later
+ TextCharacterProperties aTextCharProps;
+ lcl_getCharPropFromTblStylePart(aTextCharProps, rTable.getWholeTbl());
+
if ( rProperties.isFirstRow() && ( nRow == 0 ) )
{
applyTableStylePart( rFilterBase, rxCell, aFillProperties,
@@ -196,6 +208,7 @@ void TableCell::pushToXCell( const ::oox
aLinePropertiesTopLeftToBottomRight,
aLinePropertiesBottomLeftToTopRight,
rTable.getFirstRow() );
+ lcl_getCharPropFromTblStylePart(aTextCharProps, rTable.getFirstRow());
}
if ( rProperties.isLastRow() && ( nRow == nMaxRow ) )
{
@@ -207,6 +220,7 @@ void TableCell::pushToXCell( const ::oox
aLinePropertiesTopLeftToBottomRight,
aLinePropertiesBottomLeftToTopRight,
rTable.getLastRow() );
+ lcl_getCharPropFromTblStylePart(aTextCharProps, rTable.getLastRow());
}
if ( rProperties.isFirstCol() && ( nColumn == 0 ) )
{
@@ -218,6 +232,7 @@ void TableCell::pushToXCell( const ::oox
aLinePropertiesTopLeftToBottomRight,
aLinePropertiesBottomLeftToTopRight,
rTable.getFirstCol() );
+ lcl_getCharPropFromTblStylePart(aTextCharProps, rTable.getFirstCol());
}
if ( rProperties.isLastCol() && ( nColumn == nMaxColumn ) )
{
@@ -229,6 +244,7 @@ void TableCell::pushToXCell( const ::oox
aLinePropertiesTopLeftToBottomRight,
aLinePropertiesBottomLeftToTopRight,
rTable.getLastCol() );
+ lcl_getCharPropFromTblStylePart(aTextCharProps, rTable.getLastCol());
}
if ( rProperties.isBandRow() )
{
@@ -248,6 +264,7 @@ void TableCell::pushToXCell( const ::oox
aLinePropertiesTopLeftToBottomRight,
aLinePropertiesBottomLeftToTopRight,
rTable.getBand2H() );
+ lcl_getCharPropFromTblStylePart(aTextCharProps, rTable.getBand2H());
}
else
{
@@ -259,6 +276,7 @@ void TableCell::pushToXCell( const ::oox
aLinePropertiesTopLeftToBottomRight,
aLinePropertiesBottomLeftToTopRight,
rTable.getBand1H() );
+ lcl_getCharPropFromTblStylePart(aTextCharProps, rTable.getBand1H());
}
}
}
@@ -272,6 +290,7 @@ void TableCell::pushToXCell( const ::oox
aLinePropertiesTopLeftToBottomRight,
aLinePropertiesBottomLeftToTopRight,
rTable.getNwCell() );
+ lcl_getCharPropFromTblStylePart(aTextCharProps, rTable.getNwCell());
}
if ( ( nRow == nMaxRow ) && ( nColumn == 0 ) )
{
@@ -283,6 +302,7 @@ void TableCell::pushToXCell( const ::oox
aLinePropertiesTopLeftToBottomRight,
aLinePropertiesBottomLeftToTopRight,
rTable.getSwCell() );
+ lcl_getCharPropFromTblStylePart(aTextCharProps, rTable.getSwCell());
}
if ( ( nRow == 0 ) && ( nColumn == nMaxColumn ) )
{
@@ -294,6 +314,7 @@ void TableCell::pushToXCell( const ::oox
aLinePropertiesTopLeftToBottomRight,
aLinePropertiesBottomLeftToTopRight,
rTable.getNeCell() );
+ lcl_getCharPropFromTblStylePart(aTextCharProps, rTable.getNeCell());
}
if ( ( nRow == nMaxColumn ) && ( nColumn == nMaxColumn ) )
{
@@ -305,6 +326,7 @@ void TableCell::pushToXCell( const ::oox
aLinePropertiesTopLeftToBottomRight,
aLinePropertiesBottomLeftToTopRight,
rTable.getSeCell() );
+ lcl_getCharPropFromTblStylePart(aTextCharProps, rTable.getSeCell());
}
if ( rProperties.isBandCol() )
{
@@ -324,6 +346,7 @@ void TableCell::pushToXCell( const ::oox
aLinePropertiesTopLeftToBottomRight,
aLinePropertiesBottomLeftToTopRight,
rTable.getBand2V() );
+ lcl_getCharPropFromTblStylePart(aTextCharProps, rTable.getBand2V());
}
else
{
@@ -335,9 +358,13 @@ void TableCell::pushToXCell( const ::oox
aLinePropertiesTopLeftToBottomRight,
aLinePropertiesBottomLeftToTopRight,
rTable.getBand1V() );
+ lcl_getCharPropFromTblStylePart(aTextCharProps, rTable.getBand1V());
}
}
}
+
+ getTextBody()->insertAt( rFilterBase, xText, xAt, aTextCharProps, pMasterTextListStyle );
+
aLinePropertiesLeft.assignUsed( maLinePropertiesLeft );
aLinePropertiesRight.assignUsed( maLinePropertiesRight );
aLinePropertiesTop.assignUsed( maLinePropertiesTop );
@@ -356,6 +383,11 @@ void TableCell::pushToXCell( const ::oox
// TODO: phClr?
aFillProperties.pushToPropMap( aPropMap, rFilterBase.getGraphicHelper() );
PropertySet( xPropSet ).setProperties( aPropMap );
+
+ if ( getVertToken() == XML_eaVert )
+ {
+ xPropSet->setPropertyValue(::rtl::OUString::createFromAscii( "TextWritingMode" ) , Any(com::sun::star::text::WritingMode_TB_RL) );
+ }
}
} } }
Modified: incubator/ooo/branches/alg/aw080/main/oox/source/drawingml/textcharacterproperties.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/oox/source/drawingml/textcharacterproperties.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/oox/source/drawingml/textcharacterproperties.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/oox/source/drawingml/textcharacterproperties.cxx Wed Jun 27 13:44:09 2012
@@ -50,7 +50,10 @@ void TextCharacterProperties::assignUsed
maAsianFont.assignIfUsed( rSourceProps.maAsianFont );
maComplexFont.assignIfUsed( rSourceProps.maComplexFont );
maSymbolFont.assignIfUsed( rSourceProps.maSymbolFont );
- maCharColor.assignIfUsed( rSourceProps.maCharColor );
+ // keep existing char color
+ if (!maCharColor.isUsed())
+ maCharColor.assignIfUsed( rSourceProps.maCharColor );
+
maHighlightColor.assignIfUsed( rSourceProps.maHighlightColor );
maUnderlineColor.assignIfUsed( rSourceProps.maUnderlineColor );
moHeight.assignIfUsed( rSourceProps.moHeight );
Modified: incubator/ooo/branches/alg/aw080/main/oox/source/drawingml/textparagraph.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/oox/source/drawingml/textparagraph.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/oox/source/drawingml/textparagraph.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/oox/source/drawingml/textparagraph.cxx Wed Jun 27 13:44:09 2012
@@ -46,6 +46,16 @@ TextParagraph::~TextParagraph()
{
}
+void lcl_getBulletclr(Color& bulletClr,
+ const TextRunVector& rRuns)
+{
+ // color of closest text in runs
+ if (rRuns.begin() != rRuns.end() && ((*rRuns.begin())->getTextCharacterProperties()).maCharColor.isUsed())
+ {
+ bulletClr = ((*rRuns.begin())->getTextCharacterProperties()).maCharColor;
+ }
+}
+
void TextParagraph::insertAt(
const ::oox::core::XmlFilterBase& rFilterBase,
const Reference < XText > &xText,
@@ -101,6 +111,15 @@ void TextParagraph::insertAt(
pTextParagraphStyle->pushToPropSet( rFilterBase, xProps, aioBulletList, NULL, sal_False, fCharacterSize );
fCharacterSize = pTextParagraphStyle->getCharHeightPoints( 18 );
}
+
+ // bullet color inherits from closest text
+ if (maProperties.getBulletList().maBulletColorPtr && !(maProperties.getBulletList().maBulletColorPtr)->isUsed())
+ {
+ Color bulletClr;
+ lcl_getBulletclr(bulletClr, maRuns);
+ (maProperties.getBulletList().maBulletColorPtr)->assignIfUsed(bulletClr);
+ }
+
maProperties.pushToPropSet( rFilterBase, xProps, aioBulletList, &pTextParagraphStyle->getBulletList(), sal_True, fCharacterSize );
// empty paragraphs do not have bullets in ppt
Modified: incubator/ooo/branches/alg/aw080/main/oox/source/token/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/oox/source/token/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/oox/source/token/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/oox/source/token/makefile.mk Wed Jun 27 13:44:09 2012
@@ -43,7 +43,7 @@ SLOFILES = \
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
-.IF "$(GPERF)" == "" || !DEFINED $(GPERF)
+.IF "$(GPERF)" == ""
GPERF=gperf
.ENDIF
Modified: incubator/ooo/branches/alg/aw080/main/packimages/pack/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/packimages/pack/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/packimages/pack/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/packimages/pack/makefile.mk Wed Jun 27 13:44:09 2012
@@ -30,6 +30,15 @@ TARGET=packimages
RSCCUSTOMIMG*=$(PRJ)
.INCLUDE: target.mk
+
+.IF "$(VERBOSE_PACKIMG)"=="TRUE"
+VERBOSESWITCH=-vv
+.ELIF "$(VERBOSE)"=="TRUE"
+VERBOSESWITCH=-v
+.ELSE
+VERBOSESWITCH=
+.ENDIF
+
IMAGES := $(COMMONBIN)$/images.zip
SORTED_LIST=$(RES)$/img$/sorted.lst
# Custom sets, at 24x24 & 16x16 fall-back to industrial preferentially
@@ -54,10 +63,10 @@ $(RES)$/img$/commandimagelist.ilst .PHON
$(PERL) $(SOLARENV)$/bin$/diffmv.pl $@.$(INPATH) $@
$(COMMONBIN)$/images.zip .PHONY: $(RES)$/img$/commandimagelist.ilst
- $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@
+ $(PERL) $(SOLARENV)$/bin$/packimages.pl $(VERBOSESWITCH) -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@
images_% : $(RES)$/img$/commandimagelist.ilst
- $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(SOLARSRC)$/ooo_custom_images$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$@.zip
+ $(PERL) $(SOLARENV)$/bin$/packimages.pl $(VERBOSESWITCH) -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(SOLARSRC)$/ooo_custom_images$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$@.zip
# make sure to have one to keep packing happy
$(COMMONBIN)$/images_brand.zip:
Modified: incubator/ooo/branches/alg/aw080/main/padmin/prj/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/padmin/prj/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/padmin/prj/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/padmin/prj/makefile.mk Wed Jun 27 13:44:09 2012
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
VERBOSEFLAG := -s
.ENDIF
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT)
Modified: incubator/ooo/branches/alg/aw080/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/postprocess/packcomponents/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/postprocess/packcomponents/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/postprocess/packcomponents/makefile.mk Wed Jun 27 13:44:09 2012
@@ -179,7 +179,7 @@ my_components = \
.IF "$(OS)" == "MACOSX"
my_components += component/vcl/vcl.macosx
.ELSE
-.IF "$(OS)" == "WNT"
+.IF "$(OS)" == "WNT" || "$(OS)" == "OS2"
my_components += component/vcl/vcl.windows
.ELSE
my_components += component/vcl/vcl.unx
@@ -316,6 +316,12 @@ my_components += \
wininetbe1
.END
+.IF "$(OS)" == "OS2"
+my_components += \
+ dtrans \
+ sysdtrans
+.END
+
.IF "$(OS)" == "WNT" && "$(DISABLE_ATL)" == ""
my_components += \
emser \
Modified: incubator/ooo/branches/alg/aw080/main/postprocess/signing/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/postprocess/signing/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/postprocess/signing/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/postprocess/signing/makefile.mk Wed Jun 27 13:44:09 2012
@@ -32,25 +32,33 @@ TARGET=signing
# PFXFILE has to be set elsewhere
# PFXPASSWORD has to be set elsewhere
+.IF "$(VISTA_SIGNING)"!=""
+.IF "$(COM)"=="MSC"
+.IF "$(product)"=="full"
+
EXCLUDELIST=no_signing.txt
LOGFILE=$(MISC)$/signing_log.txt
IMAGENAMES=$(SOLARBINDIR)$/*.dll $(SOLARBINDIR)$/so$/*.dll $(SOLARBINDIR)$/*.exe $(SOLARBINDIR)$/so$/*.exe
TIMESTAMPURL*="http://timestamp.verisign.com/scripts/timstamp.dll"
-signing.done :
-.IF "$(VISTA_SIGNING)"!=""
-.IF "$(COM)"=="MSC"
-.IF "$(product)"=="full"
- $(PERL) signing.pl -e $(EXCLUDELIST) -f $(PFXFILE) -p $(PFXPASSWORD) -t $(TIMESTAMPURL) $(IMAGENAMES) && $(TOUCH) $(MISC)$/signing.done
+signing.done : $(MISC)/signing-filelist.txt
+ $(PERL) signing.pl -e $(EXCLUDELIST) -f $(PFXFILE) -p $(PFXPASSWORD) -t $(TIMESTAMPURL) -i $(MISC)/signing-filelist.txt && $(TOUCH) $(MISC)$/signing.done
+
+# Create a file that contains all dlls that are to be signed.
+$(MISC)/signing-filelist.txt :
+ -ls -1U $(IMAGENAMES) > $@ 2>/dev/null
+
+.INCLUDE : target.mk
+
.ELSE # "$(product)"=="full"
+all :
@echo Doing nothing on non product builds ...
.ENDIF # "$(product)"=="full"
.ELSE # "$(GUI)"=="MSC"
+all :
@echo Nothing to do, signing is Windows \(MSC\) only.
.ENDIF # "$(GUI)"=="MSC"
.ELSE # "$(VISTA_SIGNING)"!=""
+all :
@echo Doing nothing. To switch on signing set VISTA_SIGNING=TRUE ...
.ENDIF # "$(VISTA_SIGNING)"!=""
-
-.INCLUDE : target.mk
-
Modified: incubator/ooo/branches/alg/aw080/main/postprocess/signing/signing.pl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/postprocess/signing/signing.pl?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/postprocess/signing/signing.pl (original)
+++ incubator/ooo/branches/alg/aw080/main/postprocess/signing/signing.pl Wed Jun 27 13:44:09 2012
@@ -82,9 +82,10 @@ sub parse_options #09.07.2007 08:13
{
# e exclude list file
# v verbose
+ my $filelist_filename = undef;
my $success = GetOptions('h' => \$opt_help,
'd=s' => \$opt_dir, 'e=s'=>\$opt_exclude, 'f=s'=>\$opt_pfxfile, 'l=s'=>\$opt_log,
- 'p=s'=>\$opt_pass,'v'=>\$opt_verbose, 't=s'=>\$opt_timestamp_url);
+ 'p=s'=>\$opt_pass,'v'=>\$opt_verbose, 't=s'=>\$opt_timestamp_url, 'i=s'=>\$filelist_filename);
if ( !$success || $opt_help ) {
usage();
exit(1);
@@ -94,7 +95,17 @@ sub parse_options #09.07.2007 08:13
usage();
exit(1);
}
- return @ARGV;
+
+ # Read the names of files to sign from the given file.
+ die "no list of files given" unless defined $filelist_filename;
+ open my $in, $filelist_filename;
+ my @filelist = ();
+ while (<$in>)
+ {
+ chomp($_);
+ push @filelist, $_;
+ }
+ return @filelist;
} ##parse_options
############################################################################
@@ -251,7 +262,7 @@ sub print_error #09.07.2007 11:21
sub usage #09.07.2007 08:39
############################################################################
{
- print "Usage:\t $myname <-e filename> <-f filename> <-p password> <-t timestamp> [-l filename] [-v] <file[list]> \n";
+ print "Usage:\t $myname <-e filename> <-f filename> <-p password> <-t timestamp> <-i filename> [-l filename] [-v]\n";
print "Options:\n";
print "\t -e filename\t\t\tFile which contains a list of files which don't have to be signed.\n";
print "Mandatory.\n";
@@ -259,11 +270,8 @@ sub usage #09.07.2007 08:39
print "Mandatory.\n";
print "\t -p password\t\t\tPassword for \"Personal Information Exchange\" file. Mandatory.\n";
print "\t -t timestamp\t\t\tTimestamp URL e.g. \"http://timestamp.verisign.com/scripts/timstamp.dll\"\n";
+ print "\t -i filename\t\t\tName of the file that contains the names of files to sign.\"\n";
print "\t\t\t\t\tMandatory.\n";
print "\t -l log_filename\t\tFile for logging.\n";
print "\t -v\t\t\t\tVerbose.\n";
} ##usage
-
-
-
-
Modified: incubator/ooo/branches/alg/aw080/main/python/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/python/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/python/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/python/makefile.mk Wed Jun 27 13:44:09 2012
@@ -47,10 +47,11 @@ PATCH_FILES=\
Python-$(PYVERSION).patch \
Python-parallel-make.patch \
Python-ssl.patch \
- Python-2.6.1-sysbase.patch\
+ Python-2.6.1-sysbase.patch\
Python-2.6.1-nohardlink.patch \
Python-disable-dbm.patch \
- Python-linux3.patch
+ Python-linux3.patch \
+ Python-subversion-1-7.patch
CONFIGURE_DIR=
Modified: incubator/ooo/branches/alg/aw080/main/reportbuilder/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/reportbuilder/prj/d.lst?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/reportbuilder/prj/d.lst (original)
+++ incubator/ooo/branches/alg/aw080/main/reportbuilder/prj/d.lst Wed Jun 27 13:44:09 2012
@@ -9,4 +9,3 @@ mkdir: %_DEST%\bin%_EXT%\reportbuilder
..\license\license_en-US.html %_DEST%\bin%_EXT%\reportbuilder\license_en-US.html
..\license\readme_en-US.html %_DEST%\bin%_EXT%\reportbuilder\readme_en-US.html
..\license\readme_en-US.txt %_DEST%\bin%_EXT%\reportbuilder\readme_en-US.txt
-..\license\THIRDPARTYREADMELICENSE.html %_DEST%\bin%_EXT%\reportbuilder\THIRDPARTYREADMELICENSE.html
Modified: incubator/ooo/branches/alg/aw080/main/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu (original)
+++ incubator/ooo/branches/alg/aw080/main/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu Wed Jun 27 13:44:09 2012
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,135 +8,81 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
-
-
+<!DOCTYPE oor:component-data SYSTEM "../../../../../component-update.dtd">
<oor:component-data oor:name="ReportCommands" oor:package="org.openoffice.Office.UI" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<node oor:name="UserInterface">
<node oor:name="Commands">
- <node oor:name=".uno:ReportHeaderFooter" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Report Header/Footer</value>
- </prop>
- </node>
- <node oor:name=".uno:PageHeaderFooter" oor:op="replace">
+ <node oor:name=".uno:ColumnHeaderFooter" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Page Header/Footer</value>
+ <value xml:lang="en-US">Column Header/Footer</value>
</prop>
</node>
- <node oor:name=".uno:ShowRuler" oor:op="replace">
+ <node oor:name=".uno:ConditionalFormatting" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Ruler</value>
+ <value xml:lang="en-US">Conditional Formatting...</value>
</prop>
</node>
<node oor:name=".uno:DbSortingAndGrouping" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Sorting and Grouping</value>
+ <value xml:lang="en-US">Sorting and Grouping</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:AddField" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Add Field</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
- <node oor:name=".uno:ConditionalFormatting" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Conditional Formatting...</value>
- </prop>
- </node>
- <node oor:name=".uno:PageDialog" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Page Settings</value>
- </prop>
- <prop oor:name="ContextLabel" oor:type="xs:string">
- <value xml:lang="en-US">~Page...</value>
- </prop>
- </node>
- <node oor:name=".uno:ResetAttributes" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Default Formatting</value>
- </prop>
- </node>
- <node oor:name=".uno:InsertPageNumberField" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Page Numbers...</value>
- </prop>
- </node>
- <node oor:name=".uno:InsertDateTimeField" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Date and Time...</value>
- </prop>
- </node>
- <node oor:name=".uno:SelectReport" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Select Report</value>
- </prop>
- </node>
- <node oor:name=".uno:SubReportInNewWindow" oor:op="replace">
+ <node oor:name=".uno:Distribution" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Subreport in New Window...</value>
+ <value xml:lang="en-US">Distribution...</value>
</prop>
</node>
- <node oor:name=".uno:FontColor" oor:op="replace">
+ <node oor:name=".uno:ExecuteReport" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Font Color</value>
+ <value xml:lang="en-US">Execute Report...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:GridMenu" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Gr~id</value>
- </prop>
- </node>
- <node oor:name=".uno:ColumnHeaderFooter" oor:op="replace">
+ <node oor:name=".uno:GreatestHeight" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Column Header/Footer</value>
+ <value xml:lang="en-US">Fit to greatest height</value>
</prop>
- </node>
- <node oor:name=".uno:PasteSpecial" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Paste ~Special...</value>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
</prop>
</node>
- <node oor:name=".uno:ExecuteReport" oor:op="replace">
+ <node oor:name=".uno:GreatestWidth" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Execute Report...</value>
+ <value xml:lang="en-US">Fit to greatest width</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:ImageControl" oor:op="replace">
+ <node oor:name=".uno:InsertDateTimeField" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Graphic...</value>
+ <value xml:lang="en-US">Date and Time...</value>
</prop>
</node>
- <node oor:name=".uno:TextDocument" oor:op="replace">
+ <node oor:name=".uno:PageHeaderFooter" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Text Document</value>
+ <value xml:lang="en-US">Page Header/Footer</value>
</prop>
</node>
- <node oor:name=".uno:Spreadsheet" oor:op="replace">
+ <node oor:name=".uno:ReportHeaderFooter" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Spreadsheet Document</value>
+ <value xml:lang="en-US">Report Header/Footer</value>
</prop>
</node>
<node oor:name=".uno:ReportNavigator" oor:op="replace">
@@ -147,99 +93,83 @@
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:SmallestWidth" oor:op="replace">
+ <node oor:name=".uno:SectionAlignBottom" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Fit to smallest width</value>
+ <value xml:lang="en-US">Bottom Align on Section</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:SmallestHeight" oor:op="replace">
+ <node oor:name=".uno:SectionAlignCenter" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Fit to smallest height</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
+ <value xml:lang="en-US">Centered on Section</value>
</prop>
</node>
- <node oor:name=".uno:GreatestWidth" oor:op="replace">
+ <node oor:name=".uno:SectionAlignLeft" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Fit to greatest width</value>
+ <value xml:lang="en-US">Left Align on Section</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:GreatestHeight" oor:op="replace">
+ <node oor:name=".uno:SectionAlignMiddle" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Fit to greatest height</value>
+ <value xml:lang="en-US">Middle on Section</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:ControlProperties" oor:op="replace">
+ <node oor:name=".uno:SectionAlignRight" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Properties</value>
+ <value xml:lang="en-US">Right Align on Section</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:Distribution" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Distribution...</value>
- </prop>
- </node>
- <node oor:name=".uno:SelectAllInSection" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Select Objects in Section</value>
- </prop>
- </node>
- <node oor:name=".uno:SectionAlignLeft" oor:op="replace">
+ <node oor:name=".uno:SectionAlignTop" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Left Align on Section</value>
+ <value xml:lang="en-US">Top Align on Section</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:SectionAlignRight" oor:op="replace">
+ <node oor:name=".uno:SectionShrink" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Right Align on Section</value>
+ <value xml:lang="en-US">Shrink</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:SectionAlignTop" oor:op="replace">
+ <node oor:name=".uno:SectionShrinkBottom" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Top Align on Section</value>
+ <value xml:lang="en-US">Shrink from bottom</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:SectionAlignBottom" oor:op="replace">
+ <node oor:name=".uno:SectionShrinkTop" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Bottom Align on Section</value>
+ <value xml:lang="en-US">Shrink from top</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:SectionAlignCenter" oor:op="replace">
+ <node oor:name=".uno:SelectAllEdits" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Centered on Section</value>
+ <value xml:lang="en-US">Select all Formatted Fields</value>
</prop>
</node>
- <node oor:name=".uno:SectionAlignMiddle" oor:op="replace">
+ <node oor:name=".uno:SelectAllInSection" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Middle on Section</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
+ <value xml:lang="en-US">Select Objects in Section</value>
</prop>
</node>
<node oor:name=".uno:SelectAllLabels" oor:op="replace">
@@ -247,151 +177,122 @@
<value xml:lang="en-US">Select all Labels</value>
</prop>
</node>
- <node oor:name=".uno:SelectAllEdits" oor:op="replace">
+ <node oor:name=".uno:SelectReport" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Select all Formatted Fields</value>
+ <value xml:lang="en-US">Select Report</value>
</prop>
</node>
-
- <!-- U will find corresponding icons in default_images/res/commandimagelist. -->
- <!-- The name has no .uno: prefix but lc_ or lch_ or sc_ or sch_ -->
-
- <node oor:name=".uno:EditShapeMenu" oor:op="replace">
+ <node oor:name=".uno:SmallestHeight" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Shape Arrange</value>
+ <value xml:lang="en-US">Fit to smallest height</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
</prop>
</node>
-
- <node oor:name=".uno:EditControlMenu" oor:op="replace">
+ <node oor:name=".uno:SmallestWidth" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Control</value>
+ <value xml:lang="en-US">Fit to smallest width</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
</prop>
</node>
-
- <!--
- <node oor:name=".uno:EditSectionMenu" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Section</value>
- </prop>
- </node>
--->
-
- <node oor:name=".uno:AlignmentMenu" oor:op="replace">
+ <node oor:name=".uno:Spreadsheet" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Alignment</value>
+ <value xml:lang="en-US">Spreadsheet Document</value>
</prop>
</node>
-
- <node oor:name=".uno:ResizeMenu" oor:op="replace">
+ <node oor:name=".uno:SubReportInNewWindow" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Resize</value>
+ <value xml:lang="en-US">Subreport in New Window...</value>
</prop>
</node>
-
- <node oor:name=".uno:SectionAlignmentMenu" oor:op="replace">
+ <node oor:name=".uno:TextDocument" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Section alignment</value>
+ <value xml:lang="en-US">Text Document</value>
</prop>
</node>
-
- <node oor:name=".uno:ReportControlMenu" oor:op="replace">
+ </node>
+ <node oor:name="Popups">
+ <node oor:name=".uno:AlignmentMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Report Controls</value>
+ <value xml:lang="en-US">Alignment</value>
</prop>
</node>
-
- <node oor:name=".uno:ShapesMenu" oor:op="replace">
+ <node oor:name=".uno:ArrowShapesMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Shapes</value>
+ <value xml:lang="en-US">Arrow Shapes</value>
</prop>
</node>
-
<node oor:name=".uno:BasicShapesMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Basic Shapes</value>
</prop>
</node>
-
- <node oor:name=".uno:SymbolShapesMenu" oor:op="replace">
+ <node oor:name=".uno:CalloutShapesMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Symbol Shapes</value>
+ <value xml:lang="en-US">Callout Shapes</value>
</prop>
</node>
-
- <node oor:name=".uno:ArrowShapesMenu" oor:op="replace">
+ <node oor:name=".uno:EditControlMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Arrow Shapes</value>
+ <value xml:lang="en-US">Control</value>
</prop>
</node>
-
- <node oor:name=".uno:FlowChartShapesMenu" oor:op="replace">
+ <node oor:name=".uno:EditShapeMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">FlowChart Shapes</value>
+ <value xml:lang="en-US">Shape Arrange</value>
</prop>
</node>
-
- <node oor:name=".uno:CalloutShapesMenu" oor:op="replace">
+ <node oor:name=".uno:ExportReportTo" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Callout Shapes</value>
+ <value xml:lang="en-US">Report Output Format</value>
</prop>
</node>
-
- <node oor:name=".uno:StarShapesMenu" oor:op="replace">
+ <node oor:name=".uno:FlowChartShapesMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Star Shapes</value>
+ <value xml:lang="en-US">FlowChart Shapes</value>
</prop>
</node>
-
- <node oor:name=".uno:SectionShrinkMenu" oor:op="replace">
+ <node oor:name=".uno:ObjectResize" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Section</value>
+ <value xml:lang="en-US">Object Resizing</value>
</prop>
</node>
- <node oor:name=".uno:SectionShrink" oor:op="replace">
+ <node oor:name=".uno:ReportControlMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Shrink</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
+ <value xml:lang="en-US">Report Controls</value>
</prop>
</node>
- <node oor:name=".uno:SectionShrinkTop" oor:op="replace">
+ <node oor:name=".uno:ResizeMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Shrink from top</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
+ <value xml:lang="en-US">Resize</value>
</prop>
</node>
- <node oor:name=".uno:SectionShrinkBottom" oor:op="replace">
+ <node oor:name=".uno:SectionAlignmentMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Shrink from bottom</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
+ <value xml:lang="en-US">Section alignment</value>
</prop>
</node>
-
- </node>
- <node oor:name="Popups">
- <node oor:name=".uno:ExportReportTo" oor:op="replace">
+ <node oor:name=".uno:SectionShrinkMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Report Output Format</value>
+ <value xml:lang="en-US">Section</value>
</prop>
</node>
- <node oor:name=".uno:SnapLinesMenu" oor:op="replace">
+ <node oor:name=".uno:ShapesMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Guides</value>
+ <value xml:lang="en-US">Shapes</value>
</prop>
</node>
- <node oor:name=".uno:ObjectResize" oor:op="replace">
+ <node oor:name=".uno:StarShapesMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Object Resizing</value>
+ <value xml:lang="en-US">Star Shapes</value>
</prop>
</node>
- <node oor:name=".uno:ArrangeMenu" oor:op="replace">
+ <node oor:name=".uno:SymbolShapesMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">A~rrange</value>
+ <value xml:lang="en-US">Symbol Shapes</value>
</prop>
</node>
</node>
Modified: incubator/ooo/branches/alg/aw080/main/reportbuilder/template/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/reportbuilder/template/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/reportbuilder/template/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/reportbuilder/template/makefile.mk Wed Jun 27 13:44:09 2012
@@ -59,9 +59,8 @@ ODR_FILES := \
$(ZIP1DIR)$/template$/wizard$/report$/finance_2.odr \
$(ZIP1DIR)$/template$/wizard$/report$/yellow.odr
-HTMLFILES := $(ZIP1DIR)$/THIRDPARTYREADMELICENSE.html \
- $(ZIP1DIR)$/readme_en-US.html \
- $(ZIP1DIR)$/readme_en-US.txt
+HTMLFILES := $(ZIP1DIR)$/readme_en-US.html \
+ $(ZIP1DIR)$/readme_en-US.txt
.IF "$(GUI)"!="WNT"
TXTFILES:=$(foreach,i,$(alllangiso) $(ZIP1DIR)$/registration$/LICENSE_$i)
@@ -108,10 +107,6 @@ $(ZIP1DIR)$/readme_en-US.% : $(PRJ)$/lic
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
-$(ZIP1DIR)$/THIRDPARTYREADMELICENSE.html : $(PRJ)$/license$/THIRDPARTYREADMELICENSE.html
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
.ELSE # "$(SOLAR_JAVA)"!=""
.INCLUDE : target.mk
.ENDIF # "$(SOLAR_JAVA)"!=""
Modified: incubator/ooo/branches/alg/aw080/main/reportbuilder/util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/reportbuilder/util/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/reportbuilder/util/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/reportbuilder/util/makefile.mk Wed Jun 27 13:44:09 2012
@@ -76,8 +76,7 @@ COMPONENT_IMAGES= \
$(EXTENSIONDIR)$/images$/extension_32.png \
$(EXTENSIONDIR)$/images$/extension_32_h.png
-COMPONENT_HTMLFILES = $(EXTENSIONDIR)$/THIRDPARTYREADMELICENSE.html \
- $(EXTENSIONDIR)$/readme_en-US.html \
+COMPONENT_HTMLFILES = $(EXTENSIONDIR)$/readme_en-US.html \
$(EXTENSIONDIR)$/readme_en-US.txt
COMPONENT_JARFILES = \
@@ -134,10 +133,6 @@ $(EXTENSIONDIR)$/readme_en-US.% : $(PRJ)
$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
-
-$(EXTENSIONDIR)$/THIRDPARTYREADMELICENSE.html : $(PRJ)$/license$/THIRDPARTYREADMELICENSE.html
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
$(COMPONENT_HELP) : $$(@:f)
@@-$(MKDIRHIER) $(@:d)
Modified: incubator/ooo/branches/alg/aw080/main/reportdesign/source/ui/report/ViewsWindow.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/reportdesign/source/ui/report/ViewsWindow.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/reportdesign/source/ui/report/ViewsWindow.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/reportdesign/source/ui/report/ViewsWindow.cxx Wed Jun 27 13:44:09 2012
@@ -751,7 +751,7 @@ void OViewsWindow::collectBoundResizeRec
SdrObjTransformInfoRec aInfo;
const SdrObject* pObj = aRectIter->second.first;
pObj->TakeObjInfo(aInfo);
- sal_Bool bHasFixed = !aInfo.bMoveAllowed || pObj->IsMoveProtect();
+ sal_Bool bHasFixed = !aInfo.mbMoveAllowed || pObj->IsMoveProtect();
if ( bHasFixed )
_rBound.Union(aObjRect);
else
@@ -845,7 +845,7 @@ void OViewsWindow::alignMarkedObjects(sa
Point aCenter(aBound.Center());
SdrObjTransformInfoRec aInfo;
pObj->TakeObjInfo(aInfo);
- if (aInfo.bMoveAllowed && !pObj->IsMoveProtect())
+ if (aInfo.mbMoveAllowed && !pObj->IsMoveProtect())
{
long nXMov = 0;
long nYMov = 0;
Modified: incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/menubar/menubar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/menubar/menubar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/menubar/menubar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/menubar/menubar.xml Wed Jun 27 13:44:09 2012
@@ -176,13 +176,13 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ControlProperties"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:Label" />
- <menu:menuitem menu:id=".uno:Edit" />
- <menu:menuitem menu:id=".uno:ImageControl" />
+ <menu:menuitem menu:id=".uno:Label"/>
+ <menu:menuitem menu:id=".uno:Edit"/>
+ <menu:menuitem menu:id=".uno:ImageControl"/>
<menu:menuitem menu:id=".uno:InsertObjectChart" />
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HFixedLine" />
- <menu:menuitem menu:id=".uno:VFixedLine" />
+ <menu:menuitem menu:id=".uno:HFixedLine"/>
+ <menu:menuitem menu:id=".uno:VFixedLine"/>
</menu:menupopup>
</menu:menu>
@@ -324,13 +324,13 @@
<menu:menu menu:id=".uno:CalloutShapesMenu" >
<menu:menupopup>
- <menu:menuitem menu:id=".uno:CalloutShapes.rectangular-callout" />
- <menu:menuitem menu:id=".uno:CalloutShapes.round-rectangular-callout" />
- <menu:menuitem menu:id=".uno:CalloutShapes.round-callout" />
- <menu:menuitem menu:id=".uno:CalloutShapes.cloud-callout" />
- <menu:menuitem menu:id=".uno:CalloutShapes.line-callout-1" />
- <menu:menuitem menu:id=".uno:CalloutShapes.line-callout-2" />
- <menu:menuitem menu:id=".uno:CalloutShapes.line-callout-3" />
+ <menu:menuitem menu:id=".uno:CalloutShapes.rectangular-callout"/>
+ <menu:menuitem menu:id=".uno:CalloutShapes.round-rectangular-callout"/>
+ <menu:menuitem menu:id=".uno:CalloutShapes.round-callout"/>
+ <menu:menuitem menu:id=".uno:CalloutShapes.cloud-callout"/>
+ <menu:menuitem menu:id=".uno:CalloutShapes.line-callout-1"/>
+ <menu:menuitem menu:id=".uno:CalloutShapes.line-callout-2"/>
+ <menu:menuitem menu:id=".uno:CalloutShapes.line-callout-3"/>
</menu:menupopup>
</menu:menu>
Modified: incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/statusbar/statusbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/statusbar/statusbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/statusbar/statusbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/statusbar/statusbar.xml Wed Jun 27 13:44:09 2012
@@ -21,6 +21,6 @@
*
***********************************************************-->
<statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <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="35" statusbar:helpid="helpid:10000"/>
+ <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="35"/>
</statusbar:statusbar>
Modified: incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/Formatting.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/Formatting.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/Formatting.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/Formatting.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:toolbaritem xlink:href=".uno:SelectObject" toolbar:visible="false" />
+ <toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:CharFontName" />
+ <toolbar:toolbaritem xlink:href=".uno:CharFontName"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontHeight" />
+ <toolbar:toolbaritem xlink:href=".uno:FontHeight"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Bold" />
- <toolbar:toolbaritem xlink:href=".uno:Italic" />
- <toolbar:toolbaritem xlink:href=".uno:Underline" />
+ <toolbar:toolbaritem xlink:href=".uno:Bold"/>
+ <toolbar:toolbaritem xlink:href=".uno:Italic"/>
+ <toolbar:toolbaritem xlink:href=".uno:Underline"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:helpid="helpid:10031" toolbar:text="" toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:LeftPara" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:CenterPara" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:RightPara" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:JustifyPara" toolbar:style="radio"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontColor" toolbar:style="dropdown" />
- <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:style="dropdown" />
+ <toolbar:toolbaritem xlink:href=".uno:FontColor" toolbar:style="dropdown"/>
+ <toolbar:toolbaritem xlink:href=".uno:BackgroundColor" toolbar:style="dropdown"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:visible="false" />
+ <toolbar:toolbaritem xlink:href=".uno:FontDialog" toolbar:visible="false"/>
</toolbar:toolbar>
Modified: incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/arrowshapes.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/arrowshapes.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/arrowshapes.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/arrowshapes.xml Wed Jun 27 13:44:09 2012
@@ -40,17 +40,17 @@
<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: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: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: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:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow"/>
+ <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
Modified: incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/basicshapes.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/basicshapes.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/basicshapes.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/basicshapes.xml Wed Jun 27 13:44:09 2012
@@ -40,12 +40,12 @@
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon"/>
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc"/>
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper"/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame"/>
</toolbar:toolbar>
\ No newline at end of file
Modified: incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/calloutshapes.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/calloutshapes.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/calloutshapes.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/calloutshapes.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:CalloutShapes.rectangular-callout" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-rectangular-callout" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-callout" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.cloud-callout" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-1" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-2" />
- <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-3" />
+ <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.rectangular-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-rectangular-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.round-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.cloud-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-1"/>
+ <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-2"/>
+ <toolbar:toolbaritem xlink:href=".uno:CalloutShapes.line-callout-3"/>
</toolbar:toolbar>
\ No newline at end of file
Modified: incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/flowchartshapes.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/flowchartshapes.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/flowchartshapes.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/flowchartshapes.xml Wed Jun 27 13:44:09 2012
@@ -40,19 +40,19 @@
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-connector"/>
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-off-page-connector"/>
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-card"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or"/>
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay"/>
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage"/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage"/>
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display"/>
</toolbar:toolbar>
\ No newline at end of file
Modified: incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml Wed Jun 27 13:44:09 2012
@@ -23,17 +23,17 @@
<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:SelectObject" toolbar:style="radio auto" />
+ <toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:style="radio auto"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ControlProperties"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Label" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:Edit" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ImageControl" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:style="radio auto" />
+ <toolbar:toolbaritem xlink:href=".uno:Label" toolbar:style="radio auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:Edit" toolbar:style="radio auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:ImageControl" toolbar:style="radio auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:style="radio auto"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HFixedLine" toolbar:style="radio" />
- <toolbar:toolbaritem xlink:href=".uno:VFixedLine" toolbar:style="radio" />
+ <toolbar:toolbaritem xlink:href=".uno:HFixedLine" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:VFixedLine" toolbar:style="radio"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GridVisible" toolbar:style="radio auto" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:GridUse" toolbar:visible="false"/>
Modified: incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/symbolshapes.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/symbolshapes.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/symbolshapes.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/symbolshapes.xml Wed Jun 27 13:44:09 2012
@@ -40,7 +40,7 @@
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.brace-pair"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-brace"/>
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-brace"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel"/>
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel"/>
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel"/>
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel"/>
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel"/>
</toolbar:toolbar>
\ No newline at end of file
Modified: incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/toolbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/toolbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/toolbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/reportdesign/uiconfig/dbreport/toolbar/toolbar.xml Wed Jun 27 13:44:09 2012
@@ -23,22 +23,22 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <toolbar:toolbaritem xlink:href=".uno:Save" />
+ <toolbar:toolbaritem xlink:href=".uno:Save"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:EditDoc" />
+ <toolbar:toolbaritem xlink:href=".uno:EditDoc"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Cut" />
- <toolbar:toolbaritem xlink:href=".uno:Copy" />
- <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:text="" toolbar:style="dropdown" />
+ <toolbar:toolbaritem xlink:href=".uno:Cut"/>
+ <toolbar:toolbaritem xlink:href=".uno:Copy"/>
+ <toolbar:toolbaritem xlink:href=".uno:Paste" toolbar:style="dropdown"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:Undo" />
- <toolbar:toolbaritem xlink:href=".uno:Redo" />
+ <toolbar:toolbaritem xlink:href=".uno:Undo"/>
+ <toolbar:toolbaritem xlink:href=".uno:Redo"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AddField" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:ReportNavigator" toolbar:style="radio auto" />
- <toolbar:toolbaritem xlink:href=".uno:DbSortingAndGrouping" />
- <toolbar:toolbaritem xlink:href=".uno:ExecuteReport" />
+ <toolbar:toolbaritem xlink:href=".uno:AddField" toolbar:style="radio auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:ReportNavigator" toolbar:style="radio auto"/>
+ <toolbar:toolbaritem xlink:href=".uno:DbSortingAndGrouping"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExecuteReport"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HelpIndex" />
- <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false" />
+ <toolbar:toolbaritem xlink:href=".uno:HelpIndex"/>
+ <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false"/>
</toolbar:toolbar>
Modified: incubator/ooo/branches/alg/aw080/main/sal/osl/os2/module.c
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sal/osl/os2/module.c?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sal/osl/os2/module.c (original)
+++ incubator/ooo/branches/alg/aw080/main/sal/osl/os2/module.c Wed Jun 27 13:44:09 2012
@@ -103,7 +103,7 @@ oslModule SAL_CALL osl_loadModule(rtl_uS
}
_makepath( buffer, drive, dir, fname, ext);
-#if OSL_DEBUG_LEVEL>0
+#if OSL_DEBUG_LEVEL>10
debug_printf("osl_loadModule module %s", buffer);
#endif
//rc = _DosLoadModule( szErrorMessage, sizeof( szErrorMessage), (PCSZ)buffer, &hModule);
@@ -124,7 +124,8 @@ oslModule SAL_CALL osl_loadModule(rtl_uS
#if OSL_DEBUG_LEVEL>0
fprintf( stderr, szError);
#endif
- //OSL_TRACE(szError);
+ debug_printf("osl_loadModule error %s", szError);
+
#ifndef OSL_DEBUG_LEVEL
WinMessageBox(HWND_DESKTOP,HWND_DESKTOP,
szError, "Critical error: DosLoadModule failed",
Modified: incubator/ooo/branches/alg/aw080/main/sal/osl/w32/file_dirvol.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sal/osl/w32/file_dirvol.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sal/osl/w32/file_dirvol.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sal/osl/w32/file_dirvol.cxx Wed Jun 27 13:44:09 2012
@@ -431,6 +431,8 @@ static HANDLE WINAPI OpenDirectory( rtl_
pDirectory = NULL;
}
}
+
+ rtl_freeMemory(szFileMask); // #119939#, memory leak
}
}