You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by or...@apache.org on 2012/09/17 10:06:23 UTC
svn commit: r1386501 [2/10] - in /incubator/ooo/branches/writer001: ./
ext_libraries/ratscan/ ext_sources/ main/ main/autodoc/source/display/html/
main/basegfx/inc/basegfx/numeric/ main/basegfx/source/numeric/
main/basegfx/source/tools/ main/basic/sour...
Modified: incubator/ooo/branches/writer001/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx (original)
+++ incubator/ooo/branches/writer001/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx Mon Sep 17 08:06:09 2012
@@ -288,6 +288,7 @@ namespace drawinglayer
const basegfx::B2DPolyPolygon& rPolyPolygon,
const SvgGradientEntryVector& rGradientEntries,
const basegfx::B2DPoint& rStart,
+ bool bUseUnitCoordinates,
SpreadMethod aSpreadMethod)
: maPolyPolygon(rPolyPolygon),
maGradientEntries(rGradientEntries),
@@ -296,7 +297,8 @@ namespace drawinglayer
mbPreconditionsChecked(false),
mbCreatesContent(false),
mbSingleEntry(false),
- mbFullyOpaque(true)
+ mbFullyOpaque(true),
+ mbUseUnitCoordinates(bUseUnitCoordinates)
{
}
@@ -307,6 +309,7 @@ namespace drawinglayer
return (getPolyPolygon() == rCompare.getPolyPolygon()
&& getGradientEntries() == rCompare.getGradientEntries()
&& getStart() == rCompare.getStart()
+ && getUseUnitCoordinates() == rCompare.getUseUnitCoordinates()
&& getSpreadMethod() == rCompare.getSpreadMethod());
}
@@ -398,20 +401,36 @@ namespace drawinglayer
basegfx::tools::createScaleTranslateB2DHomMatrix(
fPolyWidth, fPolyHeight,
aPolyRange.getMinX(), aPolyRange.getMinY()));
-
- // get start, end in object coordinates
- const basegfx::B2DPoint aStart(aObjectTransform * getStart());
- const basegfx::B2DPoint aEnd(aObjectTransform * getEnd());
-
- // create transform from unit vector [0.0 .. 1.0] along the X-Axis to given
- // gradient vector in object coordinates defined by Start, End
- const basegfx::B2DVector aVector(aEnd - aStart);
- const double fVectorLength(aVector.getLength());
basegfx::B2DHomMatrix aUnitGradientToObject;
- aUnitGradientToObject.scale(fVectorLength, 1.0);
- aUnitGradientToObject.rotate(atan2(aVector.getY(), aVector.getX()));
- aUnitGradientToObject.translate(aStart.getX(), aStart.getY());
+ if(getUseUnitCoordinates())
+ {
+ // interpret in unit coordinate system -> object aspect ratio will scale result
+ // create unit transform from unit vector [0.0 .. 1.0] along the X-Axis to given
+ // gradient vector defined by Start,End
+ const basegfx::B2DVector aVector(getEnd() - getStart());
+ const double fVectorLength(aVector.getLength());
+ basegfx::B2DHomMatrix aUnitGradientToGradient;
+
+ aUnitGradientToGradient.scale(fVectorLength, 1.0);
+ aUnitGradientToGradient.rotate(atan2(aVector.getY(), aVector.getX()));
+ aUnitGradientToGradient.translate(getStart().getX(), getStart().getY());
+
+ // create full transform from unit gradient coordinates to object coordinates
+ // including the SvgGradient transformation
+ aUnitGradientToObject = aObjectTransform * aUnitGradientToGradient;
+ }
+ else
+ {
+ // interpret in object coordinate system -> object aspect ratio will not scale result
+ const basegfx::B2DPoint aStart(aObjectTransform * getStart());
+ const basegfx::B2DPoint aEnd(aObjectTransform * getEnd());
+ const basegfx::B2DVector aVector(aEnd - aStart);
+
+ aUnitGradientToObject.scale(aVector.getLength(), 1.0);
+ aUnitGradientToObject.rotate(atan2(aVector.getY(), aVector.getX()));
+ aUnitGradientToObject.translate(aStart.getX(), aStart.getY());
+ }
// create inverse from it
basegfx::B2DHomMatrix aObjectToUnitGradient(aUnitGradientToObject);
@@ -535,9 +554,10 @@ namespace drawinglayer
const SvgGradientEntryVector& rGradientEntries,
const basegfx::B2DPoint& rStart,
const basegfx::B2DPoint& rEnd,
+ bool bUseUnitCoordinates,
SpreadMethod aSpreadMethod)
: BufferedDecompositionPrimitive2D(),
- SvgGradientHelper(rPolyPolygon, rGradientEntries, rStart, aSpreadMethod),
+ SvgGradientHelper(rPolyPolygon, rGradientEntries, rStart, bUseUnitCoordinates, aSpreadMethod),
maEnd(rEnd)
{
}
@@ -715,16 +735,30 @@ namespace drawinglayer
basegfx::tools::createScaleTranslateB2DHomMatrix(
fPolyWidth, fPolyHeight,
aPolyRange.getMinX(), aPolyRange.getMinY()));
+ basegfx::B2DHomMatrix aUnitGradientToObject;
- // create unit transform from unit vector to given linear gradient vector
- basegfx::B2DHomMatrix aUnitGradientToGradient;
-
- aUnitGradientToGradient.scale(getRadius(), getRadius());
- aUnitGradientToGradient.translate(getStart().getX(), getStart().getY());
+ if(getUseUnitCoordinates())
+ {
+ // interpret in unit coordinate system -> object aspect ratio will scale result
+ // create unit transform from unit vector to given linear gradient vector
+ basegfx::B2DHomMatrix aUnitGradientToGradient;
+
+ aUnitGradientToGradient.scale(getRadius(), getRadius());
+ aUnitGradientToGradient.translate(getStart().getX(), getStart().getY());
+
+ // create full transform from unit gradient coordinates to object coordinates
+ // including the SvgGradient transformation
+ aUnitGradientToObject = aObjectTransform * aUnitGradientToGradient;
+ }
+ else
+ {
+ // interpret in object coordinate system -> object aspect ratio will not scale result
+ const double fRadius((aObjectTransform * basegfx::B2DVector(getRadius(), 0.0)).getLength());
+ const basegfx::B2DPoint aStart(aObjectTransform * getStart());
- // create full transform from unit gradient coordinates to object coordinates
- // including the SvgGradient transformation
- basegfx::B2DHomMatrix aUnitGradientToObject(aObjectTransform * aUnitGradientToGradient);
+ aUnitGradientToObject.scale(fRadius, fRadius);
+ aUnitGradientToObject.translate(aStart.getX(), aStart.getY());
+ }
// create inverse from it
basegfx::B2DHomMatrix aObjectToUnitGradient(aUnitGradientToObject);
@@ -797,10 +831,11 @@ namespace drawinglayer
const SvgGradientEntryVector& rGradientEntries,
const basegfx::B2DPoint& rStart,
double fRadius,
+ bool bUseUnitCoordinates,
SpreadMethod aSpreadMethod,
const basegfx::B2DPoint* pFocal)
: BufferedDecompositionPrimitive2D(),
- SvgGradientHelper(rPolyPolygon, rGradientEntries, rStart, aSpreadMethod),
+ SvgGradientHelper(rPolyPolygon, rGradientEntries, rStart, bUseUnitCoordinates, aSpreadMethod),
mfRadius(fRadius),
maFocal(rStart),
maFocalVector(0.0, 0.0),
Modified: incubator/ooo/branches/writer001/main/editeng/inc/editeng/svxenum.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/editeng/inc/editeng/svxenum.hxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/editeng/inc/editeng/svxenum.hxx (original)
+++ incubator/ooo/branches/writer001/main/editeng/inc/editeng/svxenum.hxx Mon Sep 17 08:06:09 2012
@@ -207,7 +207,21 @@ enum SvxExtNumType
SVX_NUM_PAGEDESC, // Numerierung aus der Seitenvorlage
SVX_NUM_BITMAP,
SVX_NUM_CHARS_UPPER_LETTER_N, // zaehlt von a-z, aa-zz, aaa-zzz
- SVX_NUM_CHARS_LOWER_LETTER_N
+ SVX_NUM_CHARS_LOWER_LETTER_N,
+ SVX_NUM_TRANSLITERATION,
+ SVX_NUM_NATIVE_NUMBERING,
+ SVX_NUM_FULL_WIDTH_ARABIC,
+ SVX_NUM_CIRCLE_NUMBER,
+ SVX_NUM_NUMBER_LOWER_ZH,
+ SVX_NUM_NUMBER_UPPER_ZH,
+ SVX_NUM_NUMBER_UPPER_ZH_TW,
+ SVX_NUM_TIAN_GAN_ZH,
+ SVX_NUM_DI_ZI_ZH,
+ SVX_NUM_NUMBER_TRADITIONAL_JA,
+ SVX_NUM_AIU_FULLWIDTH_JA,
+ SVX_NUM_AIU_HALFWIDTH_JA,
+ SVX_NUM_IROHA_FULLWIDTH_JA,
+ SVX_NUM_IROHA_HALFWIDTH_JA
};
Modified: incubator/ooo/branches/writer001/main/editeng/source/editeng/editdoc.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/editeng/source/editeng/editdoc.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/editeng/source/editeng/editdoc.cxx (original)
+++ incubator/ooo/branches/writer001/main/editeng/source/editeng/editdoc.cxx Mon Sep 17 08:06:09 2012
@@ -1817,6 +1817,7 @@ void EditDoc::InsertAttrib( ContentNode*
// Attribut entfernen....
pNode->GetCharAttribs().GetAttribs().Remove(
pNode->GetCharAttribs().GetAttribs().GetPos( pAttr ) );
+ delete pAttr; // #i120865#, need free it explicitly
}
// pruefen, ob ein 'gleiches' Attribut an der Stelle liegt.
Modified: incubator/ooo/branches/writer001/main/editeng/source/editeng/impedit3.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/editeng/source/editeng/impedit3.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/editeng/source/editeng/impedit3.cxx (original)
+++ incubator/ooo/branches/writer001/main/editeng/source/editeng/impedit3.cxx Mon Sep 17 08:06:09 2012
@@ -1343,6 +1343,19 @@ sal_Bool ImpEditEngine::CreateLines( sal
}
}
}
+ else if( rLSItem.GetLineSpaceRule() == SVX_LINE_SPACE_FIX )
+ {
+ sal_uInt16 nTxtHeight = pLine->GetHeight();
+ sal_uInt32 nH = rLSItem.GetLineHeight();
+ if ( nH != nTxtHeight )
+ {
+ long nMaxAscent = pLine->GetMaxAscent() - nTxtHeight + nH;
+ if ( nMaxAscent < 0 )
+ nMaxAscent = 0 ;
+ pLine->SetMaxAscent( (sal_uInt16)nMaxAscent );
+ pLine->SetHeight( (sal_uInt16)nH, nTxtHeight );
+ }
+ }
}
@@ -1688,6 +1701,19 @@ void ImpEditEngine::CreateAndInsertEmpty
}
}
}
+ else if( rLSItem.GetLineSpaceRule() == SVX_LINE_SPACE_FIX )
+ {
+ sal_uInt16 nTxtHeight = pTmpLine->GetHeight();
+ sal_uInt32 nH = rLSItem.GetLineHeight();
+ if ( nH != nTxtHeight )
+ {
+ long nMaxAscent = pTmpLine->GetMaxAscent() - nTxtHeight + nH;
+ if ( nMaxAscent < 0 )
+ nMaxAscent = 0 ;
+ pTmpLine->SetMaxAscent( (sal_uInt16)nMaxAscent );
+ pTmpLine->SetHeight( (sal_uInt16)nH, nTxtHeight );
+ }
+ }
}
if ( !bLineBreak )
Modified: incubator/ooo/branches/writer001/main/editeng/source/misc/txtrange.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/editeng/source/misc/txtrange.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/editeng/source/misc/txtrange.cxx (original)
+++ incubator/ooo/branches/writer001/main/editeng/source/misc/txtrange.cxx Mon Sep 17 08:06:09 2012
@@ -107,6 +107,7 @@ TextRanger::~TextRanger()
delete[] pRangeArr;
delete mpPolyPolygon;
delete mpLinePolyPolygon;
+ delete pBound;
}
/*-----------------17.11.00 09:49-------------------
Modified: incubator/ooo/branches/writer001/main/editeng/source/outliner/outliner.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/editeng/source/outliner/outliner.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/editeng/source/outliner/outliner.cxx (original)
+++ incubator/ooo/branches/writer001/main/editeng/source/outliner/outliner.cxx Mon Sep 17 08:06:09 2012
@@ -256,10 +256,11 @@ void Outliner::Init( sal_uInt16 nMode )
pEditEngine->SetControlWord( nCtrl );
+ const bool bWasUndoEnabled(IsUndoEnabled());
EnableUndo(false);
ImplInitDepth( 0, GetMinDepth(), sal_False );
GetUndoManager().Clear();
- EnableUndo(true);
+ EnableUndo(bWasUndoEnabled);
}
void Outliner::SetMaxDepth( sal_Int16 nDepth, sal_Bool bCheckParagraphs )
Modified: incubator/ooo/branches/writer001/main/editeng/source/uno/unonrule.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/editeng/source/uno/unonrule.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/editeng/source/uno/unonrule.cxx (original)
+++ incubator/ooo/branches/writer001/main/editeng/source/uno/unonrule.cxx Mon Sep 17 08:06:09 2012
@@ -452,6 +452,12 @@ void SvxUnoNumberingRules::setNumberingR
sal_Int16 nSize = sal_Int16();
if( aVal >>= nSize )
{
+ // [Bug 120650] the slide content corrupt when open in Aoo
+ if ((nSize>250)||(nSize<=0))
+ {
+ nSize = 100;
+ }
+
aFmt.SetBulletRelSize( (short)nSize );
continue;
}
Modified: incubator/ooo/branches/writer001/main/embeddedobj/source/msole/olecomponent.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/embeddedobj/source/msole/olecomponent.cxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/embeddedobj/source/msole/olecomponent.cxx (original)
+++ incubator/ooo/branches/writer001/main/embeddedobj/source/msole/olecomponent.cxx Mon Sep 17 08:06:09 2012
@@ -1205,6 +1205,9 @@ awt::Size OleComponent::GetExtent( sal_I
OSL_ENSURE( sal_False, "Unexpected size is provided!" );
}
}
+ // i113605, to release storge medium
+ if ( SUCCEEDED( hr ) )
+ ::ReleaseStgMedium(&aMedium);
}
}
@@ -1578,6 +1581,7 @@ uno::Any SAL_CALL OleComponent::getTrans
if ( SUCCEEDED( hr ) )
{
bSupportedFlavor = m_pNativeImpl->ConvertDataForFlavor( aMedium, aFlavor, aResult );
+ ::ReleaseStgMedium(&aMedium); // i113605, to release storge medium
if ( bSupportedFlavor )
{
// TODO/LATER: bring the optimization back when other aspects are supported
Modified: incubator/ooo/branches/writer001/main/extensions/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extensions/prj/d.lst?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/extensions/prj/d.lst (original)
+++ incubator/ooo/branches/writer001/main/extensions/prj/d.lst Mon Sep 17 08:06:09 2012
@@ -14,12 +14,7 @@ mkdir: %_DEST%\bin%_EXT%\so
..\%__SRC%\lib\updatefeed.uno.so %_DEST%\lib%_EXT%\updatefeed.uno.so
..\%__SRC%\bin\oleautobridge2.uno.dll %_DEST%\bin%_EXT%\odf4ms\oleautobridge.uno.dll
..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\bin\pluginapp.bin %_DEST%\bin%_EXT%\pluginapp.bin
..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-..\%__SRC%\bin\nsplugin.exe %_DEST%\bin%_EXT%\nsplugin.exe
-..\%__SRC%\bin\nsplugin %_DEST%\bin%_EXT%\nsplugin
-..\%__SRC%\bin\npsoplugin.dll %_DEST%\bin%_EXT%\npsoplugin.dll
-..\%__SRC%\bin\npsoplugin_so.dll %_DEST%\bin%_EXT%\so\npsoplugin.dll
..\%__SRC%\bin\x64\so_activex.dll %_DEST%\bin%_EXT%\so_activex_x64.dll
..\%__SRC%\bin\mdibundle.zip %_DEST%\bin%_EXT%\mdibundle.zip
..\%__SRC%\misc\oleautobridge.component %_DEST%\xml%_EXT%\oleautobridge.component
Modified: incubator/ooo/branches/writer001/main/external_deps.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/external_deps.lst?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/external_deps.lst (original)
+++ incubator/ooo/branches/writer001/main/external_deps.lst Mon Sep 17 08:06:09 2012
@@ -27,8 +27,8 @@
# The primary fallback site.
OOO_EXTRAS=http://ooo-extras.apache-extras.org.codespot.com/files/
-# Secondary fallback for category-A libraries.
-SVN_TRUNK=http://svn.apache.org/repos/asf/!svn/bc/1336449/incubator/ooo/trunk/ext_sources/
+# Must not fallback to svn
+# SVN_TRUNK=http://svn.apache.org/repos/asf/!svn/bc/1336449/incubator/ooo/trunk/ext_sources/
###############################################################################
@@ -40,134 +40,115 @@ if ( true )
name = ucpp-1.3.2.tar.gz
URL1 = http://ucpp.googlecode.com/files/ucpp-1.3.2.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if ( true )
MD5 = 067201ea8b126597670b5eff72e1f66c
name = mythes-1.2.0.tar.gz
URL1 = http://sourceforge.net/projects/hunspell/files/MyThes/1.2.0/mythes-1.2.0.tar.gz/download
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if (SYSTEM_LIBTEXTCAT != YES)
MD5 = 128cfc86ed5953e57fe0f5ae98b62c2e
name = libtextcat-2.2.tar.gz
URL1 = http://software.wise-guys.nl/download/libtextcat-2.2.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if (SOLAR_JAVA == TRUE)
MD5 = 17410483b5b5f267aa18b7e00b65e6e0
name = hsqldb_1_8_0.zip
URL1 = http://sourceforge.net/projects/hsqldb/files/hsqldb/hsqldb_1_8_0/hsqldb_1_8_0_10.zip/download
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if ( true )
MD5 = 1756c4fa6c616ae15973c104cd8cb256
name = Adobe-Core35_AFMs-314.tar.gz
URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL2 = $(SVN_TRUNK)$(MD5)-$(name)
if (SOLAR_JAVA == TRUE)
MD5 = 17960f35b2239654ba608cf1f3e256b3
name = lucene-2.9.4-src.tar.gz
- URL1 = http://www.us.apache.org/dist/lucene/java/2.9.4/lucene-2.9.4-src.tar.gz
+ URL1 = http://archive.apache.org/dist/lucene/java/2.9.4/lucene-2.9.4-src.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- # Fall back to a version in SVN from a previous revsion.
- URL3 = http://svn.apache.org/repos/asf/!svn/bc/1337615/incubator/ooo/trunk/ext_sources/$(MD5)-$(name)
if (WITH_MOZILLA != NO)
MD5 = 1f24ab1d39f4a51faf22244c94a6203f
name = xmlsec1-1.2.14.tar.gz
URL1 = ftp://ftp.aleksey.com/pub/xmlsec/releases/xmlsec1-1.2.14.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if (SYSTEM_REDLAND != YES)
MD5 = 284e768eeda0e2898b0d5bf7e26a016e
name = raptor-1.4.18.tar.gz
URL1 = http://download.librdf.org/source/raptor-1.4.18.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if (SYSTEM_REDLAND != YES)
MD5 = ca66e26082cab8bb817185a116db809b
name = redland-1.0.8.tar.gz
URL1 = http://download.librdf.org/source/redland-1.0.8.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if (SYSTEM_REDLAND != YES)
MD5 = fca8706f2c4619e2fa3f8f42f8fc1e9d
name = rasqal-0.9.16.tar.gz
URL1 = http://download.librdf.org/source/rasqal-0.9.16.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if (SOLAR_JAVA==TRUE && ENABLE_MEDIAWIKI==YES)
MD5 = 2c9b0f83ed5890af02c0df1c1776f39b
name = commons-httpclient-3.1-src.tar.gz
URL1 = http://archive.apache.org/dist/httpcomponents/commons-httpclient/source/commons-httpclient-3.1-src.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if (SOLAR_JAVA==TRUE && ENABLE_MEDIAWIKI==YES)
MD5 = 2e482c7567908d334785ce7d69ddfff7
name = commons-codec-1.6-src.tar.gz
- URL1 = http://apache.spinellicreations.com//commons/codec/source/commons-codec-1.6-src.tar.gz
- URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
+ URL1 = http://archive.apache.org/dist/commons/codec/source/commons-codec-1.6-src.tar.gz
+ URL2 = http://apache.spinellicreations.com//commons/codec/source/commons-codec-1.6-src.tar.gz
+ URL3 = $(OOO_EXTRAS)$(MD5)-$(name)
if ( true )
MD5 = 2f6ecca935948f7db92d925d88d0d078
name = icu4c-4_0_1-src.tgz
URL1 = http://download.icu-project.org/files/icu4c/4.0.1/icu4c-4_0_1-src.tgz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if ( true )
SHA1 = 231af70b7567a753b49df4216743010c193884b7
name = serf-1.1.0.tar.bz2
URL1 = http://serf.googlecode.com/files/serf-1.1.0.tar.bz2
URL2 = $(OOO_EXTRAS)$(SHA1)-$(name)
- URL3 = http://svn.apache.org/repos/asf/!svn/bc/1351976/incubator/ooo/trunk/ext_sources/$(SHA1)-$(name)
if (SOLAR_JAVA==TRUE && (ENABLE_MEDIAWIKI==YES || ENABLE_REPORTBUILDER==YES))
MD5 = 3c219630e4302863a9a83d0efde889db
name = commons-logging-1.1.1-src.tar.gz
# This seems to be the original host, but the MD5 sum does not match.
- # URL1 = http://<some-apache-mirror>/commons/logging/source/commons-logging-1.1.1-src.tar.gz
+ # URL1 = http://archive.apache.org/dist/commons/logging/source/commons-logging-1.1.1-src.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if (SOLAR_JAVA==TRUE && ENABLE_MEDIAWIKI==YES)
MD5 = 625ff5f2f968dd908bca43c9469d6e6b
name = commons-lang-2.4-src.tar.gz
URL1 = http://archive.apache.org/dist/commons/lang/source/commons-lang-2.4-src.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE)
MD5 = 63ddc5116488985e820075e65fbe6aa4
name = openssl-0.9.8o.tar.gz
URL1 = http://www.openssl.org/source/openssl-0.9.8o.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if ( true )
MD5 = 97262fe54dddaf583eaaee3497a426e1
name = apr-1.4.5.tar.gz
- URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL2 = $(SVN_TRUNK)$(MD5)-$(name)
+ URL1 = http://archive.apache.org/dist/apr/$(name)
+ URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if ( true )
MD5 = 666a5d56098a9debf998510e304c8095
name = apr-util-1.4.1.tar.gz
- # Can not yet detect automatically the right mirror to use.
- # URL1 = http://<some-apache-mirror>/apr/apr-util-1.4.1.tar.gz
+ URL1 = http://archive.apache.org/dist/apr/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if ( true )
MD5 = c441926f3a552ed3e5b274b62e86af16
@@ -175,34 +156,29 @@ if ( true )
# This seems to be the original host, but the MD5 sum does not match.
# URL1 = http://sourceforge.net/projects/stlport/files/STLport%20archive/STLport%204/STLport-4.0.tar.gz/download
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if ( true )
MD5 = 18f577b374d60b3c760a3a3350407632
name = STLport-4.5.tar.gz
URL1 = http://sourceforge.net/projects/stlport/files/STLport%20archive/STLport%204/STLport-4.5.tar.gz/download
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if ( true )
MD5 = 7376930b0d3f3d77a685d94c4a3acda8
name = STLport-4.5-0119.tar.gz
URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL2 = $(SVN_TRUNK)$(MD5)-$(name)
if (SYSTEM_LIBXML != YES)
MD5 = 7740a8ec23878a2f50120e1faa2730f2
name = libxml2-2.7.6.tar.gz
URL1 = ftp://xmlsoft.org/libxml2/libxml2-2.7.6.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if (SYSTEM_LIBXSLT != YES)
MD5 = e61d0364a30146aaa3001296f853b2b9
name = libxslt-1.1.26.tar.gz
URL1 = ftp://xmlsoft.org/libxml2/libxslt-1.1.26.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if (SOLAR_JAVA == TRUE)
MD5 = 7e4e73c21f031d5a4c93c128baf7fd75
@@ -210,83 +186,71 @@ if (SOLAR_JAVA == TRUE)
# This seems to be the original host, but the MD5 sum does not match.
# URL1 = http://<mirror>/tomcat/tomcat-5/v5.5.35/bin/apache-tomcat-5.5.35.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if (SOLAR_JAVA == TRUE)
MD5 = 980143f96b3f6ce45d2e4947da21a5e9
name = stax-src-1.2.0.zip
URL1 = http://dist.codehaus.org/stax/distributions/stax-src-1.2.0.zip
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if (SYSTEM_JPEG != YES)
MD5 = a2c10c04f396a9ce72894beb18b4e1f9
name = jpeg-8c.tar.gz
URL1 = http://www.ijg.org/files/jpegsrc.v8c.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if (ENABLE_MEDIAWIKI == YES)
MD5 = a7983f859eafb2677d7ff386a023bc40
name = xsltml_2.1.2.zip
URL1 = http://sourceforge.net/projects/xsltml/files/xsltml/v.2.1.2/xsltml_2.1.2.zip/download
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if (SYSTEM_PYTHON != YES)
MD5 = c57477edd6d18bd9eeca2f21add73919
name = Python-2.7.3.tar.bz2
URL1 = http://www.python.org/ftp/python/2.7.3/Python-2.7.3.tar.bz2
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = http://svn.apache.org/repos/asf/!svn/bc/1366182/incubator/ooo/trunk/ext_sources/$(MD5)-$(name)
if (GUI!=UNX || SYSTEM_ZLIB!=YES)
MD5 = c735eab2d659a96e5a594c9e8541ad63
name = zlib-1.2.5.tar.gz
URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL2 = $(SVN_TRUNK)$(MD5)-$(name)
if ( true )
MD5 = cf8a6967f7de535ae257fa411c98eb88
name = mdds_0.3.0.tar.bz2
URL1 = http://multidimalgorithm.googlecode.com/files/mdds_0.3.0.tar.bz2
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if (SYSTEM_VIGRA != YES)
MD5 = ea91f2fb4212a21d708aced277e6e85a
name = vigra1.4.0.tar.gz
URL1 = http://hci.iwr.uni-heidelberg.de/vigra/vigra1.4.0.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if (SYSTEM_CURL != YES)
MD5 = ecb2e37e45c9933e2a963cabe03670ab
name = curl-7.19.7.tar.gz
URL1 = http://curl.haxx.se/download/curl-7.19.7.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if (SYSTEM_EXPAT != YES)
MD5 = ee8b492592568805593f81f8cdf2a04c
name = expat-2.0.1.tar.gz
URL1 = http://sourceforge.net/projects/expat/files/expat/2.0.1/expat-2.0.1.tar.gz/download
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if (WITH_CATA_FONTS == YES)
MD5 = f872f4ac066433d8ff92f5e316b36ff9
name = dejavu-fonts-ttf-2.33.zip
URL1 = http://sourceforge.net/projects/dejavu/files/dejavu/2.33/dejavu-fonts-ttf-2.33.zip/download
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if (SYSTEM_BOOST!=YES || (OS==SOLARIS && COM!=GCC))
MD5 = fcc6df1160753d0b8c835d17fdeeb0a7
name = boost_1_39_0.tar.gz
URL1 = http://sourceforge.net/projects/boost/files/boost/1.39.0/boost_1_39_0.tar.gz/download
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if ( true )
MD5 = fdb27bfe2dbe2e7b57ae194d9bf36bab
@@ -294,8 +258,12 @@ if ( true )
# This seems to be the original host, but the MD5 sum does not match.
# URL1 = http://sourceforge.net/projects/sampleicc/files/sampleicc/SampleICC%201.3.2/SampleICC-1.3.2.zip/download
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
+if (RAT_JAR_HOME==BUILD)
+ MD5 = e4244e69eb3644e71c254aea5952a918
+ name = apache-rat-incubating-0.8-bin.tar.bz2
+ URL1 = http://archive.apache.org/dist/incubator/rat/binaries/$(name)
+ URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
###############################################################################
# Libraries with category B license
@@ -305,7 +273,6 @@ if (ENABLE_CATEGORY_B==YES)
MD5 = 2b5f1ca58d6ef30f18f1415b65bed81c
name = CoinMP-1.6.0.tgz
URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL2 = $(SVN_TRUNK)$(MD5)-$(name)
if (WITH_CATB_FONTS == YES)
MD5 = 35efabc239af896dfb79be7ebdd6e6b9
@@ -313,34 +280,29 @@ if (WITH_CATB_FONTS == YES)
# This seems to be the original host, but the MD5 sum does not match.
# URL1 = http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=GentiumBasic_110&filename=GentiumBasic_110.zip
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if (ENABLE_CATEGORY_B==YES && ENABLE_HYPHEN==YES)
MD5 = 48a9f787f43a09c0a9b7b00cd1fddbbf
name = hyphen-2.7.1.tar.gz
URL1 = http://sourceforge.net/projects/hunspell/files/Hyphen/2.7/hyphen-2.7.1.tar.gz/download
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if (ENABLE_CATEGORY_B==YES && WITH_CATB_FONTS==YES)
MD5 = 61f59e4110781cbe66b46449eadac231
name = croscorefonts-1.21.0.tar.gz
URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL2 = $(SVN_TRUNK)$(MD5)-$(name)
if (ENABLE_CATEGORY_B==YES && ENABLE_HUNSPELL==YES)
name = hunspell-1.3.2.tar.gz
MD5 = 3121aaf3e13e5d88dfff13fb4a5f1ab8
URL1 = http://sourceforge.net/projects/hunspell/files/Hunspell/1.3.2/hunspell-1.3.2.tar.gz/download
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if (ENABLE_CATEGORY_B==YES && SOLAR_JAVA==TRUE && ENABLE_JAVASCRIPT==YES)
MD5 = 99d94103662a8d0b571e247a77432ac5
name = rhino1_7R3.zip
URL1 = ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R3.zip
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if (ENABLE_CATEGORY_B==YES && WITH_MOZILLA!=NO && BUILD_MOZAB==TRUE)
MD5 = a169ab152209200a7bad29a275cb0333
@@ -348,44 +310,37 @@ if (ENABLE_CATEGORY_B==YES && WITH_MOZIL
# This seems to be the original host, but the MD5 sum does not match.
# URL1 = ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.4/seamonkey-1.1.4.source.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if (ENABLE_CATEGORY_B==YES && ENABLE_NSS_MODULE==YES)
MD5 = b92261a5679276c400555004937af965
name = nss-3.12.6-with-nspr-4.8.4.tar.gz
URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL2 = $(SVN_TRUNK)$(MD5)-$(name)
if (ENABLE_CATEGORY_B==YES && SYSTEM_SAXON!=YES && DISABLE_SAXON!=YES && SOLAR_JAVA==TRUE)
MD5 = 24be19595acad0a2cae931af77a0148a
name = LICENSE_source-9.0.0.7-bj.html
URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL2 = $(SVN_TRUNK)$(MD5)-$(name)
if (ENABLE_CATEGORY_B==YES && SYSTEM_SAXON!=YES && DISABLE_SAXON!=YES && SOLAR_JAVA==TRUE)
MD5 = 48470d662650c3c074e1c3fabbc67bbd
name = README_source-9.0.0.7-bj.txt
URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL2 = $(SVN_TRUNK)$(MD5)-$(name)
if (ENABLE_CATEGORY_B==YES && SYSTEM_SAXON!=YES && DISABLE_SAXON!=YES && SOLAR_JAVA==TRUE)
MD5 = ada24d37d8d638b3d8a9985e80bc2978
name = source-9.0.0.7-bj.zip
URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL2 = $(SVN_TRUNK)$(MD5)-$(name)
if (ENABLE_CATEGORY_B==YES && SYSTEM_GRAPHITE!=YES && ENABLE_GRAPHITE==TRUE)
MD5 = 377a60170e5185eb63d3ed2fae98e621
name = README_silgraphite-2.3.1.txt
URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL2 = $(SVN_TRUNK)$(MD5)-$(name)
if (ENABLE_CATEGORY_B==YES && SYSTEM_GRAPHITE!=YES && ENABLE_GRAPHITE==TRUE)
MD5 = d35724900f6a4105550293686688bbb3
name = silgraphite-2.3.1.tar.gz
URL1 = http://sourceforge.net/projects/silgraphite/files/silgraphite/2.3.1/silgraphite-2.3.1.tar.gz/download
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
if (ENABLE_CATEGORY_B==YES && SOLAR_JAVA==TRUE && DISABLE_BEANSHELL!=YES)
MD5 = ea570af93c284aa9e5621cd563f54f4d
@@ -393,4 +348,3 @@ if (ENABLE_CATEGORY_B==YES && SOLAR_JAVA
# This seems to be the original host, but the MD5 sum does not match.
# URL1 = http://www.beanshell.org/bsh-2.0b1.jar
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- URL3 = $(SVN_TRUNK)$(MD5)-$(name)
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/10grey.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/10grey.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/1simple.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/1simple.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/2elegant.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/2elegant.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/3modern.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/3modern.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/4classic.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/4classic.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/5blue.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/5blue.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/6orange.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/6orange.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/7red.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/7red.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/8green.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/8green.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/9colorful.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/9colorful.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/aw-10grey.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/aw-10grey.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/aw-1simple.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/aw-1simple.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/aw-2elegant.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/aw-2elegant.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/aw-4classic.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/aw-4classic.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/aw-5blue.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/aw-5blue.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/aw-6orange.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/aw-6orange.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/aw-7red.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/aw-7red.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/aw-8green.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/aw-8green.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/aw-9colorful.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/es/aw-9colorful.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/10grey.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/10grey.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/1simple.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/1simple.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/2elegant.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/2elegant.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/3modern.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/3modern.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/4classic.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/4classic.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/5blue.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/5blue.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/6orange.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/6orange.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/7red.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/7red.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/8green.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/8green.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/9colorful.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/9colorful.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-10grey.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-10grey.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-1simple.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-1simple.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-2elegant.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-2elegant.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-3modern.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-3modern.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-4classic.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-4classic.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-5blue.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-5blue.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-6orange.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-6orange.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-7red.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-7red.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-8green.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-8green.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-9colorful.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/fr/aw-9colorful.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/10grey.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/10grey.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/1simple.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/1simple.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/2elegant.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/2elegant.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/3modern.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/3modern.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/4classic.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/4classic.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/5blue.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/5blue.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/6orange.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/6orange.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/7red.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/7red.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/8green.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/8green.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/9colorful.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/9colorful.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/aw-10grey.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/aw-10grey.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/aw-1simple.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/aw-1simple.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/aw-2elegant.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/aw-2elegant.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/aw-3modern.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/aw-3modern.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/aw-4classic.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/aw-4classic.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/aw-5blue.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/aw-5blue.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/aw-6orange.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/aw-6orange.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/aw-8green.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/aw-8green.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/aw-9colorful.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/it/aw-9colorful.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/10grey.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/10grey.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/1simple.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/1simple.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/2elegant.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/2elegant.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/3modern.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/3modern.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/4classic.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/4classic.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/5blue.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/5blue.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/6orange.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/6orange.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/7red.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/7red.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/8green.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/8green.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/9colorful.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/9colorful.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-10grey.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-10grey.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-1simple.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-1simple.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-2elegant.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-2elegant.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-3modern.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-3modern.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-4classic.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-4classic.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-5blue.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-5blue.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-6orange.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-6orange.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-7red.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-7red.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-8green.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-8green.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-9colorful.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/ja/aw-9colorful.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/10grey.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/10grey.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/1simple.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/1simple.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/2elegant.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/2elegant.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/3modern.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/3modern.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/4classic.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/4classic.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/5blue.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/5blue.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/6orange.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/6orange.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/7red.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/7red.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/8green.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/8green.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/9colorful.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/9colorful.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-10grey.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-10grey.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-1simple.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-1simple.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-2elegant.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-2elegant.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-3modern.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-3modern.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-4classic.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-4classic.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-5blue.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-5blue.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-6orange.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-6orange.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-7red.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-7red.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-8green.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-8green.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-9colorful.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/agenda/lang/zh-CN/aw-9colorful.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/es/bus-classic-pri_f.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/es/bus-classic-pri_f.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/es/bus-classic_f.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/es/bus-classic_f.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/es/bus-modern-pri_f.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/es/bus-modern-pri_f.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/es/bus-modern_f.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/es/bus-modern_f.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/es/pri-bottle_f.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/es/pri-bottle_f.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/es/pri-fax_f.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/es/pri-fax_f.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/es/pri-lines_f.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/es/pri-lines_f.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/es/pri-marine_f.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/es/pri-marine_f.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/ja/bus-classic-pri_f.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/ja/bus-classic-pri_f.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/ja/bus-classic_f.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/ja/bus-classic_f.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/ja/bus-modern-pri_f.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/ja/bus-modern-pri_f.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/ja/bus-modern_f.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/ja/bus-modern_f.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/ja/pri-bottle_f.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/ja/pri-bottle_f.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/ja/pri-fax_f.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/ja/pri-fax_f.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/ja/pri-lines_f.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/ja/pri-lines_f.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/ja/pri-marine_f.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/ja/pri-marine_f.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/zh-CN/bus-classic-pri_f.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/zh-CN/bus-classic-pri_f.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/zh-CN/bus-classic_f.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/zh-CN/bus-classic_f.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/zh-CN/bus-modern-pri_f.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/zh-CN/bus-modern-pri_f.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/zh-CN/bus-modern_f.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/zh-CN/bus-modern_f.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/zh-CN/pri-bottle_f.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/zh-CN/pri-bottle_f.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/zh-CN/pri-fax_f.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/zh-CN/pri-fax_f.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/zh-CN/pri-lines_f.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/zh-CN/pri-lines_f.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/zh-CN/pri-marine_f.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/fax/lang/zh-CN/pri-marine_f.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/extras/source/templates/wizard/report/lang/sk/cnt-01.ott
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/extras/source/templates/wizard/report/lang/sk/cnt-01.ott?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/ooo/branches/writer001/main/filter/inc/filter/msfilter/escherex.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/filter/inc/filter/msfilter/escherex.hxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/filter/inc/filter/msfilter/escherex.hxx (original)
+++ incubator/ooo/branches/writer001/main/filter/inc/filter/msfilter/escherex.hxx Mon Sep 17 08:06:09 2012
@@ -40,6 +40,7 @@
#include <com/sun/star/beans/PropertyState.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/drawing/BitmapMode.hpp>
+#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
#include <com/sun/star/drawing/Hatch.hpp>
#include <svx/msdffdef.hxx>
#include "filter/msfilter/msfilterdllapi.h"
@@ -1202,6 +1203,9 @@ class MSFILTER_DLLPUBLIC EscherPropertyC
sal_Bool CreateShapeProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape );
sal_Bool CreateOLEGraphicProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXOleObject );
+ sal_Bool CreateGraphicProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape,
+ const GraphicObject& rGraphicObj );
+ sal_Bool CreateMediaGraphicProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXMediaObject );
/** Creates a complex ESCHER_Prop_fillBlip containing the BLIP directly (for Excel charts). */
sal_Bool CreateEmbeddedBitmapProperties( const ::rtl::OUString& rBitmapUrl,
::com::sun::star::drawing::BitmapMode eBitmapMode );
@@ -1215,7 +1219,7 @@ class MSFILTER_DLLPUBLIC EscherPropertyC
sal_Bool CreateGraphicProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
const String& rSource, const sal_Bool bCreateFillBitmap, const sal_Bool bCreateCroppingAttributes = sal_False,
const sal_Bool bFillBitmapModeAllowed = sal_True );
-
+ sal_Bool CreateBlipPropertiesforOLEControl( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape);
sal_Bool CreatePolygonProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
sal_uInt32 nFlags, sal_Bool bBezier, ::com::sun::star::awt::Rectangle& rGeoRect, Polygon* pPolygon = NULL );
@@ -1237,6 +1241,8 @@ class MSFILTER_DLLPUBLIC EscherPropertyC
// It activ only when at least a FillStyle or LineStyle is set.
sal_Bool CreateShadowProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & );
+ sal_Int32 GetValueForEnhancedCustomShapeParameter( const ::com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter,
+ const std::vector< sal_Int32 >& rEquationOrder, sal_Bool bAdjustTrans = sal_False );
// creates all necessary CustomShape properties, this includes also Text-, Shadow-, Fill-, and LineProperties
void CreateCustomShapeProperties( const MSO_SPT eShapeType, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & );
sal_Bool IsFontWork() const;
@@ -1251,7 +1257,7 @@ class MSFILTER_DLLPUBLIC EscherPropertyC
static sal_Bool GetLineArrow( const sal_Bool bLineStart,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
ESCHER_LineEnd& reLineEnd, sal_Int32& rnArrowLength, sal_Int32& rnArrowWidth );
- static sal_Bool IsDefaultObject( SdrObjCustomShape* pCustoShape );
+ static sal_Bool IsDefaultObject( SdrObjCustomShape* pCustoShape, const MSO_SPT eShapeType );
static void LookForPolarHandles( const MSO_SPT eShapeType, sal_Int32& nAdjustmentsWhichNeedsToBeConverted );
static sal_Bool GetAdjustmentValue( const com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue & rkProp, sal_Int32 nIndex, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, sal_Int32& nValue );
};
Modified: incubator/ooo/branches/writer001/main/filter/inc/filter/msfilter/msocximex.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/filter/inc/filter/msfilter/msocximex.hxx?rev=1386501&r1=1386500&r2=1386501&view=diff
==============================================================================
--- incubator/ooo/branches/writer001/main/filter/inc/filter/msfilter/msocximex.hxx (original)
+++ incubator/ooo/branches/writer001/main/filter/inc/filter/msfilter/msocximex.hxx Mon Sep 17 08:06:09 2012
@@ -172,7 +172,7 @@ class OCX_FontData
{
public:
OCX_FontData() : nFontNameLen(0), fBold(0), fItalic(0), fUnderline(0),
- fStrike(0), nFontSize(12), nJustification(1), pFontName(0),
+ fStrike(0), nFontSize(12), nJustification(1), nDefaultAlign(0), pFontName(0),
bHasAlign(sal_False), bHasFont(sal_True) {}
~OCX_FontData() {
if (pFontName)
@@ -206,7 +206,7 @@ public:
sal_uInt16 nLanguageID;
sal_uInt8 nJustification;
sal_uInt16 nFontWeight;
-
+ sal_Int16 nDefaultAlign;
char *pFontName;
void SetHasAlign(sal_Bool bIn) {bHasAlign=bIn;}
void SetHasFont(sal_Bool bIn) {bHasFont=bIn;}
@@ -1115,6 +1115,7 @@ public:
msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlButtonModel");
mnForeColor = 0x80000012L;
mnBackColor = 0x8000000FL;
+ aFontData.SetHasAlign(sal_True);
}
~OCX_CommandButton() {