You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ja...@apache.org on 2013/02/03 14:24:38 UTC
svn commit: r1441909 [44/45] - in /openoffice/branches/l10n: ./
ext_libraries/apr-util/ ext_libraries/apr/ ext_libraries/hunspell/
ext_sources/ extras/l10n/source/ast/ extras/l10n/source/da/
extras/l10n/source/eu/ extras/l10n/source/gd/ extras/l10n/sou...
Modified: openoffice/branches/l10n/main/vcl/win/source/window/salframe.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/win/source/window/salframe.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/win/source/window/salframe.cxx (original)
+++ openoffice/branches/l10n/main/vcl/win/source/window/salframe.cxx Sun Feb 3 13:23:59 2013
@@ -1053,16 +1053,16 @@ WinSalFrame::~WinSalFrame()
// Release Cache DC
if ( mpGraphics2 &&
- mpGraphics2->mhDC )
+ mpGraphics2->getHDC() )
ReleaseGraphics( mpGraphics2 );
// destroy saved DC
if ( mpGraphics )
{
if ( mpGraphics->mhDefPal )
- SelectPalette( mpGraphics->mhDC, mpGraphics->mhDefPal, TRUE );
+ SelectPalette( mpGraphics->getHDC(), mpGraphics->mhDefPal, TRUE );
ImplSalDeInitGraphics( mpGraphics );
- ReleaseDC( mhWnd, mpGraphics->mhDC );
+ ReleaseDC( mhWnd, mpGraphics->getHDC() );
delete mpGraphics;
mpGraphics = NULL;
}
@@ -1109,7 +1109,7 @@ SalGraphics* WinSalFrame::GetGraphics()
if ( !mpGraphics2 )
{
mpGraphics2 = new WinSalGraphics;
- mpGraphics2->mhDC = 0;
+ mpGraphics2->setHDC(0);
mpGraphics2->mhWnd = mhWnd;
mpGraphics2->mbPrinter = FALSE;
mpGraphics2->mbVirDev = FALSE;
@@ -1122,7 +1122,7 @@ SalGraphics* WinSalFrame::GetGraphics()
(WPARAM)mhWnd, 0 );
if ( hDC )
{
- mpGraphics2->mhDC = hDC;
+ mpGraphics2->setHDC(hDC);
if ( pSalData->mhDitherPal )
{
mpGraphics2->mhDefPal = SelectPalette( hDC, pSalData->mhDitherPal, TRUE );
@@ -1145,7 +1145,7 @@ SalGraphics* WinSalFrame::GetGraphics()
if ( hDC )
{
mpGraphics = new WinSalGraphics;
- mpGraphics->mhDC = hDC;
+ mpGraphics->setHDC(hDC);
mpGraphics->mhWnd = mhWnd;
mpGraphics->mbPrinter = FALSE;
mpGraphics->mbVirDev = FALSE;
@@ -1173,17 +1173,17 @@ void WinSalFrame::ReleaseGraphics( SalGr
{
if ( mpGraphics2 == pGraphics )
{
- if ( mpGraphics2->mhDC )
+ if ( mpGraphics2->getHDC() )
{
SalData* pSalData = GetSalData();
if ( mpGraphics2->mhDefPal )
- SelectPalette( mpGraphics2->mhDC, mpGraphics2->mhDefPal, TRUE );
+ SelectPalette( mpGraphics2->getHDC(), mpGraphics2->mhDefPal, TRUE );
ImplSalDeInitGraphics( mpGraphics2 );
ImplSendMessage( pSalData->mpFirstInstance->mhComWnd,
SAL_MSG_RELEASEDC,
(WPARAM)mhWnd,
- (LPARAM)mpGraphics2->mhDC );
- mpGraphics2->mhDC = 0;
+ (LPARAM)mpGraphics2->getHDC() );
+ mpGraphics2->setHDC(0);
pSalData->mnCacheDCInUse--;
}
}
@@ -1679,12 +1679,12 @@ static void ImplSetParentFrame( WinSalFr
// Release Cache DC
if ( pThis->mpGraphics2 &&
- pThis->mpGraphics2->mhDC )
+ pThis->mpGraphics2->getHDC() )
{
// save current gdi objects before hdc is gone
- hFont = (HFONT) GetCurrentObject( pThis->mpGraphics2->mhDC, OBJ_FONT);
- hPen = (HPEN) GetCurrentObject( pThis->mpGraphics2->mhDC, OBJ_PEN);
- hBrush = (HBRUSH) GetCurrentObject( pThis->mpGraphics2->mhDC, OBJ_BRUSH);
+ hFont = (HFONT) GetCurrentObject( pThis->mpGraphics2->getHDC(), OBJ_FONT);
+ hPen = (HPEN) GetCurrentObject( pThis->mpGraphics2->getHDC(), OBJ_PEN);
+ hBrush = (HBRUSH) GetCurrentObject( pThis->mpGraphics2->getHDC(), OBJ_BRUSH);
pThis->ReleaseGraphics( pThis->mpGraphics2 );
// recreate cache dc only if it was destroyed
@@ -1695,9 +1695,9 @@ static void ImplSetParentFrame( WinSalFr
if ( pThis->mpGraphics )
{
if ( pThis->mpGraphics->mhDefPal )
- SelectPalette( pThis->mpGraphics->mhDC, pThis->mpGraphics->mhDefPal, TRUE );
+ SelectPalette( pThis->mpGraphics->getHDC(), pThis->mpGraphics->mhDefPal, TRUE );
ImplSalDeInitGraphics( pThis->mpGraphics );
- ReleaseDC( pThis->mhWnd, pThis->mpGraphics->mhDC );
+ ReleaseDC( pThis->mhWnd, pThis->mpGraphics->getHDC() );
}
// create a new hwnd with the same styles
@@ -1725,7 +1725,7 @@ static void ImplSetParentFrame( WinSalFr
(WPARAM) hWnd, 0 );
if ( hDC )
{
- pThis->mpGraphics2->mhDC = hDC;
+ pThis->mpGraphics2->setHDC(hDC);
if ( pSalData->mhDitherPal )
{
pThis->mpGraphics2->mhDefPal = SelectPalette( hDC, pSalData->mhDitherPal, TRUE );
@@ -1754,11 +1754,11 @@ static void ImplSetParentFrame( WinSalFr
{
// re-create DC
pThis->mpGraphics->mhWnd = hWnd;
- pThis->mpGraphics->mhDC = GetDC( hWnd );
+ pThis->mpGraphics->setHDC( GetDC( hWnd ) );
if ( GetSalData()->mhDitherPal )
{
- pThis->mpGraphics->mhDefPal = SelectPalette( pThis->mpGraphics->mhDC, GetSalData()->mhDitherPal, TRUE );
- RealizePalette( pThis->mpGraphics->mhDC );
+ pThis->mpGraphics->mhDefPal = SelectPalette( pThis->mpGraphics->getHDC(), GetSalData()->mhDitherPal, TRUE );
+ RealizePalette( pThis->mpGraphics->getHDC() );
}
ImplSalInitGraphics( pThis->mpGraphics );
pThis->mbGraphics = TRUE;
@@ -3724,8 +3724,8 @@ static long ImplHandleKeyMsg( HWND hWnd,
// Wir restaurieren den Background-Modus bei jeder Texteingabe,
// da einige Tools wie RichWin uns diesen hin- und wieder umsetzen
if ( pFrame->mpGraphics &&
- pFrame->mpGraphics->mhDC )
- SetBkMode( pFrame->mpGraphics->mhDC, TRANSPARENT );
+ pFrame->mpGraphics->getHDC() )
+ SetBkMode( pFrame->mpGraphics->getHDC(), TRANSPARENT );
// determine modifiers
if ( GetKeyState( VK_SHIFT ) & 0x8000 )
@@ -4088,7 +4088,7 @@ static bool ImplHandlePaintMsg( HWND hWn
// Clip-Region muss zurueckgesetzt werden, da wir sonst kein
// ordentliches Bounding-Rectangle bekommen
if ( pFrame->mpGraphics && pFrame->mpGraphics->mhRegion )
- SelectClipRgn( pFrame->mpGraphics->mhDC, 0 );
+ SelectClipRgn( pFrame->mpGraphics->getHDC(), 0 );
// Laut Window-Doku soll man erst abfragen, ob ueberhaupt eine
// Paint-Region anliegt
@@ -4105,7 +4105,7 @@ static bool ImplHandlePaintMsg( HWND hWn
// ClipRegion wieder herstellen
if ( pFrame->mpGraphics && pFrame->mpGraphics->mhRegion )
{
- SelectClipRgn( pFrame->mpGraphics->mhDC,
+ SelectClipRgn( pFrame->mpGraphics->getHDC(),
pFrame->mpGraphics->mhRegion );
}
@@ -4127,7 +4127,7 @@ static bool ImplHandlePaintMsg( HWND hWn
// ClipRegion wieder herstellen
if ( pFrame->mpGraphics && pFrame->mpGraphics->mhRegion )
{
- SelectClipRgn( pFrame->mpGraphics->mhDC,
+ SelectClipRgn( pFrame->mpGraphics->getHDC(),
pFrame->mpGraphics->mhRegion );
}
}
@@ -4510,8 +4510,8 @@ static void ImplHandleForcePalette( HWND
WinSalGraphics* pGraphics = pFrame->mpGraphics;
if ( pGraphics && pGraphics->mhDefPal )
{
- SelectPalette( pGraphics->mhDC, hPal, FALSE );
- if ( RealizePalette( pGraphics->mhDC ) )
+ SelectPalette( pGraphics->getHDC(), hPal, FALSE );
+ if ( RealizePalette( pGraphics->getHDC() ) )
{
InvalidateRect( hWnd, NULL, FALSE );
UpdateWindow( hWnd );
@@ -4575,7 +4575,7 @@ static LRESULT ImplHandlePalette( sal_Bo
pGraphics = pTempVD->mpGraphics;
if ( pGraphics->mhDefPal )
{
- SelectPalette( pGraphics->mhDC,
+ SelectPalette( pGraphics->getHDC(),
pGraphics->mhDefPal,
TRUE );
}
@@ -4587,7 +4587,7 @@ static LRESULT ImplHandlePalette( sal_Bo
pGraphics = pTempFrame->mpGraphics;
if ( pGraphics && pGraphics->mhDefPal )
{
- SelectPalette( pGraphics->mhDC,
+ SelectPalette( pGraphics->getHDC(),
pGraphics->mhDefPal,
TRUE );
}
@@ -4600,7 +4600,7 @@ static LRESULT ImplHandlePalette( sal_Bo
pFrame = GetWindowPtr( hWnd );
if ( pFrame && pFrame->mpGraphics )
{
- hDC = pFrame->mpGraphics->mhDC;
+ hDC = pFrame->mpGraphics->getHDC();
bStdDC = TRUE;
}
else
@@ -4625,8 +4625,8 @@ static LRESULT ImplHandlePalette( sal_Bo
pGraphics = pTempVD->mpGraphics;
if ( pGraphics->mhDefPal )
{
- SelectPalette( pGraphics->mhDC, hPal, TRUE );
- RealizePalette( pGraphics->mhDC );
+ SelectPalette( pGraphics->getHDC(), hPal, TRUE );
+ RealizePalette( pGraphics->getHDC() );
}
pTempVD = pTempVD->mpNext;
}
@@ -4638,8 +4638,8 @@ static LRESULT ImplHandlePalette( sal_Bo
pGraphics = pTempFrame->mpGraphics;
if ( pGraphics && pGraphics->mhDefPal )
{
- SelectPalette( pGraphics->mhDC, hPal, TRUE );
- if ( RealizePalette( pGraphics->mhDC ) )
+ SelectPalette( pGraphics->getHDC(), hPal, TRUE );
+ if ( RealizePalette( pGraphics->getHDC() ) )
bUpdate = TRUE;
}
}
@@ -5520,8 +5520,8 @@ static sal_Bool ImplHandleIMEComposition
// Wir restaurieren den Background-Modus bei jeder Texteingabe,
// da einige Tools wie RichWin uns diesen hin- und wieder umsetzen
if ( pFrame->mpGraphics &&
- pFrame->mpGraphics->mhDC )
- SetBkMode( pFrame->mpGraphics->mhDC, TRANSPARENT );
+ pFrame->mpGraphics->getHDC() )
+ SetBkMode( pFrame->mpGraphics->getHDC(), TRANSPARENT );
}
if ( pFrame && pFrame->mbHandleIME )
Modified: openoffice/branches/l10n/main/vcl/workben/svpclient.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/vcl/workben/svpclient.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/vcl/workben/svpclient.cxx (original)
+++ openoffice/branches/l10n/main/vcl/workben/svpclient.cxx Sun Feb 3 13:23:59 2013
@@ -176,7 +176,7 @@ MyWin::MyWin( Window* pParent, WinBits n
m_aSvpBitmaps.Show();
m_aImage.SetPosSizePixel( Point( 170, 10 ), Size( 400, 400 ) );
- m_aImage.SetScaleMode( com::sun::star::awt::ImageScaleMode::None );
+ m_aImage.SetScaleMode( com::sun::star::awt::ImageScaleMode::NONE );
m_aImage.Show();
m_aQuitButton.SetPosSizePixel( Point( 10, 300 ), Size( 120,25 ) );
Modified: openoffice/branches/l10n/main/wizards/com/sun/star/wizards/document/DatabaseControl.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/wizards/com/sun/star/wizards/document/DatabaseControl.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/wizards/com/sun/star/wizards/document/DatabaseControl.java (original)
+++ openoffice/branches/l10n/main/wizards/com/sun/star/wizards/document/DatabaseControl.java Sun Feb 3 13:23:59 2013
@@ -250,7 +250,7 @@ public class DatabaseControl extends Con
// }
else if (getControlType() == FormHandler.SOIMAGECONTROL)
{
- xPropertySet.setPropertyValue("ScaleMode", com.sun.star.awt.ImageScaleMode.Isotropic);
+ xPropertySet.setPropertyValue("ScaleMode", com.sun.star.awt.ImageScaleMode.ISOTROPIC);
}
}
catch (Exception e)
Modified: openoffice/branches/l10n/main/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java (original)
+++ openoffice/branches/l10n/main/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java Sun Feb 3 13:23:59 2013
@@ -801,7 +801,7 @@ abstract public class ReportBuilderLayou
{
// xImageControl.setScaleImage(true);
- xImageControl.setScaleMode(com.sun.star.awt.ImageScaleMode.Isotropic);
+ xImageControl.setScaleMode(com.sun.star.awt.ImageScaleMode.ISOTROPIC);
}
}
else
Modified: openoffice/branches/l10n/main/writerfilter/source/dmapper/DomainMapper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/writerfilter/source/dmapper/DomainMapper.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/writerfilter/source/dmapper/DomainMapper.cxx (original)
+++ openoffice/branches/l10n/main/writerfilter/source/dmapper/DomainMapper.cxx Sun Feb 3 13:23:59 2013
@@ -2847,7 +2847,7 @@ void DomainMapper::sprmWithProps( Sprm&
{
//get value from style sheet and invert it
sal_Int16 nStyleValue = 0;
- double fDoubleValue;
+ double fDoubleValue = 0;
uno::Any aStyleVal = m_pImpl->GetPropertyFromStyleSheet(ePropertyId);
if( !aStyleVal.hasValue() )
{
@@ -3262,7 +3262,7 @@ void DomainMapper::sprmWithProps( Sprm&
/* WRITERFILTERSTATUS: done: 50, planned: 2, spent: 0 */
/* break type
0 - No break
- 1 - New Colunn
+ 1 - New Column
2 - New page
3 - Even page
4 - odd page
Modified: openoffice/branches/l10n/main/writerfilter/source/dmapper/PropertyMap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/writerfilter/source/dmapper/PropertyMap.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/writerfilter/source/dmapper/PropertyMap.cxx (original)
+++ openoffice/branches/l10n/main/writerfilter/source/dmapper/PropertyMap.cxx Sun Feb 3 13:23:59 2013
@@ -998,7 +998,7 @@ void SectionPropertyMap::CloseSectionGro
else
xRangeProperties = uno::Reference< beans::XPropertySet >( m_xStartingRange, uno::UNO_QUERY_THROW );
/* break type
- 0 - No break 1 - New Colunn 2 - New page 3 - Even page 4 - odd page */
+ 0 - No break 1 - New Column 2 - New page 3 - Even page 4 - odd page */
xRangeProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_PAGE_DESC_NAME ),
uno::makeAny( m_bTitlePage ? m_sFirstPageStyleName : m_sFollowPageStyleName ));
// todo: page breaks with odd/even page numbering are not available - find out current page number to check how to change the number
Modified: openoffice/branches/l10n/main/writerfilter/source/dmapper/ThemeTable.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/writerfilter/source/dmapper/ThemeTable.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/writerfilter/source/dmapper/ThemeTable.cxx (original)
+++ openoffice/branches/l10n/main/writerfilter/source/dmapper/ThemeTable.cxx Sun Feb 3 13:23:59 2013
@@ -28,6 +28,10 @@
#endif
#include "dmapperLoggers.hxx"
+#ifdef DEBUG_DOMAINMAPPER
+#include <resourcemodel/QNameToString.hxx>
+#endif
+
namespace writerfilter {
namespace dmapper
{
Modified: openoffice/branches/l10n/main/writerfilter/source/doctok/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/writerfilter/source/doctok/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/writerfilter/source/doctok/makefile.mk (original)
+++ openoffice/branches/l10n/main/writerfilter/source/doctok/makefile.mk Sun Feb 3 13:23:59 2013
@@ -65,10 +65,8 @@ SLOFILES= \
SHL1TARGET=$(TARGET)
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
+.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC" || "$(GUI)"=="OS2"
RESOURCEMODELLIB=-lresourcemodel
-.ELIF "$(GUI)"=="OS2"
-RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
.ELIF "$(GUI)"=="WNT"
.IF "$(COM)"=="GCC"
RESOURCEMODELLIB=-lresourcemodel
Modified: openoffice/branches/l10n/main/writerfilter/source/ooxml/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/writerfilter/source/ooxml/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/writerfilter/source/ooxml/makefile.mk (original)
+++ openoffice/branches/l10n/main/writerfilter/source/ooxml/makefile.mk Sun Feb 3 13:23:59 2013
@@ -82,10 +82,8 @@ SLOFILES= \
SHL1TARGET=$(TARGET)
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
+.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC" || "$(GUI)"=="OS2"
RESOURCEMODELLIB=-lresourcemodel
-.ELIF "$(GUI)"=="OS2"
-RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
.ELIF "$(GUI)"=="WNT"
.IF "$(COM)"=="GCC"
RESOURCEMODELLIB=-lresourcemodel
Modified: openoffice/branches/l10n/main/writerfilter/unocomponent/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/writerfilter/unocomponent/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/writerfilter/unocomponent/makefile.mk (original)
+++ openoffice/branches/l10n/main/writerfilter/unocomponent/makefile.mk Sun Feb 3 13:23:59 2013
@@ -40,14 +40,10 @@ SLOFILES=$(SLO)$/component.obj
SHL1TARGET=$(TARGET)
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
+.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC" || "$(GUI)"=="OS2"
DOCTOKLIB=-ldoctok
OOXMLLIB=-looxml
RESOURCEMODELLIB=-lresourcemodel
-.ELIF "$(GUI)"=="OS2"
-DOCTOKLIB=$(LB)$/idoctok.lib
-OOXMLLIB=$(LB)$/iooxml.lib
-RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
.ELIF "$(GUI)"=="WNT"
.IF "$(COM)"=="GCC"
DOCTOKLIB=-ldoctok
Modified: openoffice/branches/l10n/main/xmerge/source/activesync/XMergeFilter.cpp
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/activesync/XMergeFilter.cpp?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/activesync/XMergeFilter.cpp (original)
+++ openoffice/branches/l10n/main/xmerge/source/activesync/XMergeFilter.cpp Sun Feb 3 13:23:59 2013
@@ -38,8 +38,8 @@
const LPTSTR CXMergeFilter::m_pszPSWExportCLSID = _T("{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}");
const LPTSTR CXMergeFilter::m_pszPSWExportExt = _T("sxw");
-const LPTSTR CXMergeFilter::m_pszPSWExportDesc = _T("OpenOffice.org Writer XML Document");
-const LPTSTR CXMergeFilter::m_pszPSWExportShortDesc = _T("OpenOffice.org Writer");
+const LPTSTR CXMergeFilter::m_pszPSWExportDesc = _T("OpenOffice.org XML Writer Document");
+const LPTSTR CXMergeFilter::m_pszPSWExportShortDesc = _T("OpenOffice.org XML Writer");
const LPTSTR CXMergeFilter::m_pszPSWImportCLSID = _T("{CB43F086-838D-4FA4-B5F6-3406B9A57439}");
const LPTSTR CXMergeFilter::m_pszPSWImportExt = _T("psw");
@@ -48,8 +48,8 @@ const LPTSTR CXMergeFilter::m_pszPSWImpo
const LPTSTR CXMergeFilter::m_pszPXLExportCLSID = _T("{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}");
const LPTSTR CXMergeFilter::m_pszPXLExportExt = _T("sxc");
-const LPTSTR CXMergeFilter::m_pszPXLExportDesc = _T("OpenOffice.org Calc XML Document");
-const LPTSTR CXMergeFilter::m_pszPXLExportShortDesc = _T("OpenOffice.org Calc");
+const LPTSTR CXMergeFilter::m_pszPXLExportDesc = _T("OpenOffice.org XML Calc Document");
+const LPTSTR CXMergeFilter::m_pszPXLExportShortDesc = _T("OpenOffice.org XML Calc");
const LPTSTR CXMergeFilter::m_pszPXLImportCLSID = _T("{43887C67-4D5D-4127-BAAC-87A288494C7C}");
const LPTSTR CXMergeFilter::m_pszPXLImportExt = _T("pxl");
@@ -237,7 +237,7 @@ STDMETHODIMP CXMergeFilter::NextConvertF
}
}
- // Get the StarOffice/OpenOffice class directory
+ // Get the Apache OpenOffice class directory
if (m_szClasspath == NULL)
{
m_szClasspath = GetXMergeClassPath();
Modified: openoffice/branches/l10n/main/xmerge/source/aportisdoc/converter.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/aportisdoc/converter.xml?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/aportisdoc/converter.xml (original)
+++ openoffice/branches/l10n/main/xmerge/source/aportisdoc/converter.xml Sun Feb 3 13:23:59 2013
@@ -29,7 +29,7 @@
<converter-description>
StarWriter XML to/from AportisDoc conversion
</converter-description>
- <converter-vendor>OpenOffice.org</converter-vendor>
+ <converter-vendor>Apache OpenOffice</converter-vendor>
<converter-class-impl>
org.openoffice.xmerge.converter.xml.sxw.aportisdoc.PluginFactoryImpl
</converter-class-impl>
Modified: openoffice/branches/l10n/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java (original)
+++ openoffice/branches/l10n/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java Sun Feb 3 13:23:59 2013
@@ -32,8 +32,7 @@ import org.openoffice.xmerge.util.Resour
import org.openoffice.xmerge.util.Debug;
/**
- * This class is used by {@link
- * org.openoffice.xmerge.converter.xml.sxw.DocumentDeserializerImpl}
+ * This class is used by {@link DocumentDeserializerImpl}
* to decode the AportisDoc format. It currently decodes
* the text content into a single <code>String</code> object.
*
@@ -61,7 +60,7 @@ final class DocDecoder implements DocCon
* Decode the text records into a single <code>String</code>
* of text content.
*
- * @param Record <code>Record</code> array holding AportisDoc
+ * @param recs <code>Record</code> array holding AportisDoc
* contents.
*
* @throws IOException If any I/O error occurs.
@@ -119,7 +118,7 @@ final class DocDecoder implements DocCon
* with the encoding of that PDB and throw
* <code>IOException</code>.</p>
*
- * @param bytes Compressed <code>byte</code> array.
+ * @param cBytes Compressed <code>byte</code> array.
* @param textRecordSize Size of uncompressed
* <code>byte</code> array.
*
Modified: openoffice/branches/l10n/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java (original)
+++ openoffice/branches/l10n/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java Sun Feb 3 13:23:59 2013
@@ -32,9 +32,7 @@ import java.util.ArrayList;
import org.openoffice.xmerge.converter.palm.Record;
/**
- * This class is used by {@link
- * org.openoffice.xmerge.converter.xml.sxw.DocumentSerializerImpl
- * DocumentSerializerImpl} to encode the AportisDoc format.
+ * This class is used by {@link DocumentSerializerImpl} to encode the AportisDoc format.
* It does not deal with any XML tags. It only knows how to encode
* from <code>String</code>.
*
Modified: openoffice/branches/l10n/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html (original)
+++ openoffice/branches/l10n/main/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/package.html Sun Feb 3 13:23:59 2013
@@ -163,7 +163,7 @@ then passed back to the client via the <
<tt><text:change*></tt> [Not implemented yet]</p>
<p>Change tracking elements are not supported yet on the current
- OpenOffice XML filters, will have to watch out on this. The text
+ OpenOffice.org XML filters, will have to watch out on this. The text
within these elements have to be interpreted properly during the
conversion process.</p>
</li>
Modified: openoffice/branches/l10n/main/xmerge/source/htmlsoff/converter.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/htmlsoff/converter.xml?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/htmlsoff/converter.xml (original)
+++ openoffice/branches/l10n/main/xmerge/source/htmlsoff/converter.xml Sun Feb 3 13:23:59 2013
@@ -30,7 +30,7 @@
<converter-description>
Converter which performs xslt transformations
</converter-description>
- <converter-vendor>OpenOffice.org</converter-vendor>
+ <converter-vendor>Apache OpenOffice</converter-vendor>
<converter-class-impl>
org.openoffice.xmerge.converter.xml.xslt.PluginFactoryImpl
</converter-class-impl>
Modified: openoffice/branches/l10n/main/xmerge/source/htmlsoff/package.html
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/htmlsoff/package.html?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/htmlsoff/package.html (original)
+++ openoffice/branches/l10n/main/xmerge/source/htmlsoff/package.html Sun Feb 3 13:23:59 2013
@@ -38,8 +38,8 @@ Transformation</B></FONT></FONT></P>
of one or more XSLT style sheets, which are used in the
DocumentSerializer and DocumentDeserializer, to perform the actual
translations. The location of these stylesheets is extracted from the {@link org.openoffice.xmerge.util.registry.ConverterInfo ConverterInfo} data structure, and are specified using the optional converter-xslt-serialize and converter-xsltdeserialize tags in a plugins converter.xml file. Please refer to the SDK document for more information about how to implement a Plugin Configuration XML File for a specific plugin.
-A sample OpenOffice to Html stylesheet and Html to
-Openffice stylesheet, has been provided as a sample implementation.
+A sample OpenOffice.org XML to Html stylesheet and Html to
+Openffice.org XML stylesheet, has been provided as a sample implementation.
The converter also makes use of an XsltPlugin.properties file, which may be edited by the user to provide MIME-TYPE to file extension mappings. This file is used by the {@link org.openoffice.xmerge.converter.xml.xslt.PluginFactoryImpl getDeviceFileExtension} method.
</p>
Modified: openoffice/branches/l10n/main/xmerge/source/minicalc/converter.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/minicalc/converter.xml?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/minicalc/converter.xml (original)
+++ openoffice/branches/l10n/main/xmerge/source/minicalc/converter.xml Sun Feb 3 13:23:59 2013
@@ -29,7 +29,7 @@
<converter-description>
StarCalc XML to/from Minicalc 6.4 conversion
</converter-description>
- <converter-vendor>OpenOffice.org</converter-vendor>
+ <converter-vendor>Apache OpenOffice</converter-vendor>
<converter-class-impl>
org.openoffice.xmerge.converter.xml.sxc.minicalc.PluginFactoryImpl
</converter-class-impl>
Modified: openoffice/branches/l10n/main/xmerge/source/pexcel/converter.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/pexcel/converter.xml?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/pexcel/converter.xml (original)
+++ openoffice/branches/l10n/main/xmerge/source/pexcel/converter.xml Sun Feb 3 13:23:59 2013
@@ -29,7 +29,7 @@
<converter-description>
StarCalc XML to/from Pocket Excel 2.0 conversion
</converter-description>
- <converter-vendor>OpenOffice.org</converter-vendor>
+ <converter-vendor>Apache OpenOffice</converter-vendor>
<converter-class-impl>
org.openoffice.xmerge.converter.xml.sxc.pexcel.PluginFactoryImpl
</converter-class-impl>
Modified: openoffice/branches/l10n/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java (original)
+++ openoffice/branches/l10n/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java Sun Feb 3 13:23:59 2013
@@ -39,8 +39,7 @@ import org.openoffice.xmerge.converter.x
import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.*;
/**
- * This class is used by {@link
- * org.openoffice.xmerge.converter.xml.sxc.SxcDocumentDeserializerImpl}
+ * This class is used by {@link SxcDocumentDeserializerImpl}
* SxcDocumentDeserializerImpl} to decode the Pocket Excel format.
*
* @author Paul Rank
@@ -78,7 +77,7 @@ final class PocketExcelDecoder extends S
* converts it into a PocketWord WorkSheet. The WorkSheet is then
* added to the WorkBook.
*
- * @param InputStream An <code>ConvertData</code> containing a
+ * @param cd An <code>ConvertData</code> containing a
* Pocket Excel WorkSheet.
*
* @throws IOException If any I/O error occurs.
Modified: openoffice/branches/l10n/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java (original)
+++ openoffice/branches/l10n/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java Sun Feb 3 13:23:59 2013
@@ -35,9 +35,7 @@ import org.openoffice.xmerge.converter.x
import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Workbook;
/**
- * This class is used by {@link
- * org.openoffice.xmerge.converter.xml.sxc.SxcDocumentSerializerImpl
- * SxcDocumentSerializerImpl} to encode the Pocket Excel format.
+ * This class is used by {@link SxcDocumentSerializerImpl} to encode the Pocket Excel format.
*
* @author Martin Maher
*/
Modified: openoffice/branches/l10n/main/xmerge/source/pocketword/converter.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/pocketword/converter.xml?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/pocketword/converter.xml (original)
+++ openoffice/branches/l10n/main/xmerge/source/pocketword/converter.xml Sun Feb 3 13:23:59 2013
@@ -30,10 +30,10 @@
Pocket Word
</converter-display-name>
<converter-description>
- OpenOffice Writer XML to/from Pocket Word conversion.
+ OpenOffice.org XML Writer to/from Pocket Word conversion.
</converter-description>
<converter-vendor>
- OpenOffice.org
+ Apache OpenOffice
</converter-vendor>
<converter-class-impl>
org.openoffice.xmerge.converter.xml.sxw.pocketword.PluginFactoryImpl
Modified: openoffice/branches/l10n/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java (original)
+++ openoffice/branches/l10n/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java Sun Feb 3 13:23:59 2013
@@ -53,7 +53,7 @@ import org.w3c.dom.Element;
* org.openoffice.xmerge.converter.xml.sxw.pocketword.PluginFactoryImpl
* PluginFactoryImpl}.</p>
*
- * <p>This converts a Pocket Word file to an OpenOffice Writer XML DOM.</p>
+ * <p>This converts a Pocket Word file to an OpenOffice.org XML Writer DOM.</p>
*
* @author Mark Murnane
* @version 1.1
@@ -94,7 +94,7 @@ public final class DocumentDeserializerI
/**
* <p>Convert the data passed into the <code>DocumentDeserializer</code>
- * constructor into the OpenOffice Writer <code>Document</code>
+ * constructor into the OpenOffice.org XML Writer <code>Document</code>
* format.</p>
*
* <p>This method may or may not be thread-safe. It is expected
@@ -120,7 +120,7 @@ public final class DocumentDeserializerI
}
catch (Exception e) {
e.printStackTrace();
- throw new ConvertException("Error building OpenOffice Writer DOM: "
+ throw new ConvertException("Error building OpenOffice.org XML Writer DOM: "
+ e.toString());
}
@@ -134,8 +134,6 @@ public final class DocumentDeserializerI
*
* @param data An Enumeration of all Paragraphs in the Pocket Word doc.
*
- * @return The OpenOffice Writer XML representation of the data.
- *
* @throws IOException If any I/O errors occur.
*/
private void buildDocument(Enumeration data) throws IOException {
Modified: openoffice/branches/l10n/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java (original)
+++ openoffice/branches/l10n/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java Sun Feb 3 13:23:59 2013
@@ -48,7 +48,7 @@ import java.io.IOException;
* org.openoffice.xmerge.converter.xml.sxw.pocketword.PluginFactoryImpl
* PluginFactoryImpl}.</p>
*
- * <p>This converts an OpenOffice Writer XML files to a Pocket Word file<.</p>
+ * <p>This converts an OpenOffice.org XML Writer files to a Pocket Word file<.</p>
*
* @author Mark Murnane
* @version 1.1
Modified: openoffice/branches/l10n/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ParagraphTextSegment.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ParagraphTextSegment.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ParagraphTextSegment.java (original)
+++ openoffice/branches/l10n/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ParagraphTextSegment.java Sun Feb 3 13:23:59 2013
@@ -80,7 +80,7 @@ class ParagraphTextSegment implements Po
/**
* <p>Sets the style for this segment.</p>
*
- * @param data The style describing this segment.
+ * @param style The style describing this segment.
*/
public void setStyle (TextStyle style) {
pStyle = style;
Modified: openoffice/branches/l10n/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java (original)
+++ openoffice/branches/l10n/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java Sun Feb 3 13:23:59 2013
@@ -69,7 +69,7 @@ public final class PluginFactoryImpl ext
/**
* <p>The <code>DocumentSerializer</code> is used to convert
- * from the OpenOffice Writer <code>Document</code> format
+ * from the OpenOffice.org XML Writer <code>Document</code> format
* to the Pocket Word <code>Document</code> format.</p>
*
* <p>The <code>ConvertData</code> object is passed along to the
@@ -92,7 +92,7 @@ public final class PluginFactoryImpl ext
/**
* The <code>DocumentDeserializer</code> is used to convert
* from the Pocket Word <code>Document</code> format to
- * the OpenOffice Writer <code>Document</code> format.</p>
+ * the OpenOffice.org XML Writer <code>Document</code> format.</p>
*
* The <code>ConvertData</code> object is passed along to the
* created <code>DocumentDeserializer</code> via its constructor.
Modified: openoffice/branches/l10n/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java (original)
+++ openoffice/branches/l10n/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java Sun Feb 3 13:23:59 2013
@@ -41,7 +41,7 @@ import java.util.Vector;
* <p>Class representing a Pocket Word Document.</p>
*
* <p><code>PocketWordDocument</code> is used to create new Pocket Word documents
- * and to read existing data to allow for conversion to OpenOffice Writer
+ * and to read existing data to allow for conversion to OpenOffice.org XML Writer
* format.</p>
*
* @author Mark Murnane
Modified: openoffice/branches/l10n/main/xmerge/source/wordsmith/converter.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/wordsmith/converter.xml?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/wordsmith/converter.xml (original)
+++ openoffice/branches/l10n/main/xmerge/source/wordsmith/converter.xml Sun Feb 3 13:23:59 2013
@@ -27,7 +27,7 @@
<converter-description>
StarWriter XML to/from WordSmith conversion
</converter-description>
- <converter-vendor>OpenOffice.org</converter-vendor>
+ <converter-vendor>Apache OpenOffice</converter-vendor>
<converter-class-impl>
org.openoffice.xmerge.converter.xml.sxw.wordsmith.PluginFactoryImpl
</converter-class-impl>
Modified: openoffice/branches/l10n/main/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java (original)
+++ openoffice/branches/l10n/main/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java Sun Feb 3 13:23:59 2013
@@ -287,7 +287,7 @@ implements DOCConstants, OfficeConstants
* <code>SXWDocument</code>.
*
* @param docName <code>Document</code> name
- * @param str Text content of WordSmith format
+ * @param data Text content of WordSmith format
*
* @return Resulting <code>SXWDocument</code> object.
*
Modified: openoffice/branches/l10n/main/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentSerializerImpl.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentSerializerImpl.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentSerializerImpl.java (original)
+++ openoffice/branches/l10n/main/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentSerializerImpl.java Sun Feb 3 13:23:59 2013
@@ -462,7 +462,7 @@ implements OfficeConstants, DocumentSeri
* <i>text:h</i>, <i>text:unordered-list</i> and
* <i>text:ordered-list</i>.
*
- * @param Node <code>Node</code> to traverse.
+ * @param node <code>Node</code> to traverse.
*
* @throws IOException If any I/O error occurs.
*/
Modified: openoffice/branches/l10n/main/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/PluginFactoryImpl.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/PluginFactoryImpl.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/PluginFactoryImpl.java (original)
+++ openoffice/branches/l10n/main/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/PluginFactoryImpl.java Sun Feb 3 13:23:59 2013
@@ -131,8 +131,6 @@ public final class PluginFactoryImpl ext
* which is an implementation of the <code>DocumentMerger</code>
* interface.
*
- * @param doc <code>Document</code> to merge.
- *
* @return A Device Document object
*/
public Document createDeviceDocument(String name, InputStream is)
Modified: openoffice/branches/l10n/main/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java (original)
+++ openoffice/branches/l10n/main/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java Sun Feb 3 13:23:59 2013
@@ -61,7 +61,7 @@ final class WSDecoder implements DOCCons
/**
* Decode the text records into a single <code>byte</code> array.
*
- * @param Record <code>Record</code> array holding WordSmith
+ * @param recs <code>Record</code> array holding WordSmith
* contents.
*
* @throws IOException If any I/O error occurs.
@@ -118,7 +118,7 @@ final class WSDecoder implements DOCCons
/**
* Decode the text records into a <code>Wse</code> array.
*
- * @param Record[] <code>Record</code> array holding DOC
+ * @param recs <code>Record</code> array holding DOC
* contents.
*
* @throws IOException If any I/O error occurs.
@@ -178,7 +178,7 @@ final class WSDecoder implements DOCCons
* it as a problem with the encoding of that PDB and
* throw <code>IOException</code>.</p>
*
- * @param bytes Compressed <code>byte</code> array
+ * @param cBytes Compressed <code>byte</code> array
* @param textRecordSize Size of uncompressed <code>byte</code>
* array
*
Modified: openoffice/branches/l10n/main/xmerge/source/xmerge/build.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/xmerge/build.xml?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/xmerge/build.xml (original)
+++ openoffice/branches/l10n/main/xmerge/source/xmerge/build.xml Sun Feb 3 13:23:59 2013
@@ -64,8 +64,8 @@
includes="**/*.properties" />
<manifest>
<attribute name="Main-Class" value="org.openoffice.xmerge.test.Driver"/>
- <attribute name="Specification-Title" value="OpenOffice XMerge Framework"/>
- <attribute name="Specification-Vendor" value="OpenOffice.org"/>
+ <attribute name="Specification-Title" value="Apache OpenOffice XMerge Framework"/>
+ <attribute name="Specification-Vendor" value="Apache OpenOffice"/>
<attribute name="Specification-Version" value="0.6.0"/>
<attribute name="Implementation-Version" value="#IMPL-VERSION#"/>
<attribute name="Class-Path" value="xml-apis.jar xercesImpl.jar serializer.jar"/>
Modified: openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java (original)
+++ openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java Sun Feb 3 13:23:59 2013
@@ -235,7 +235,7 @@ public class DOMDocument
* <p>TODO: remove dependency on com.sun.xml.tree.XmlDocument
* package!</p>
*
- * @param Document DOM <code>Document</code> object.
+ * @param doc DOM <code>Document</code> object.
*
* @return <code>byte</code> array of DOM <code>Document</code>
* object.
@@ -369,7 +369,7 @@ public class DOMDocument
/**
* <p>Creates a new DOM <code>Document</code> containing minimum
- * OpenOffice XML tags.</p>
+ * OpenOffice.org XML tags.</p>
*
* <p>This method uses the subclass
* <code>getOfficeClassAttribute</code> method to get the
Modified: openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbHeader.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbHeader.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbHeader.java (original)
+++ openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbHeader.java Sun Feb 3 13:23:59 2013
@@ -106,7 +106,7 @@ final class PdbHeader {
* Read in the data for the PDB header. Need to
* preserve the unsigned value for some of the fields.
*
- * @param di A <code>DataInput</code> object.
+ * @param in A <code>DataInput</code> object.
*
* @throws IOException If any I/O error occurs.
*/
Modified: openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java (original)
+++ openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java Sun Feb 3 13:23:59 2013
@@ -107,8 +107,6 @@ public class EmbeddedBinaryObject extend
/**
* Package private method that constructs the manifest.xml entries for this
* embedded object.
- *
- * @return Document <code>Document</code> containing the manifest entries.
*/
void writeManifestData(Document manifestDoc) throws DOMException {
Element objNode = manifestDoc.createElement(OfficeConstants.TAG_MANIFEST_FILE);
Modified: openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedObject.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedObject.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedObject.java (original)
+++ openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedObject.java Sun Feb 3 13:23:59 2013
@@ -105,8 +105,6 @@ public abstract class EmbeddedObject {
/**
* Package private method that constructs the manifest.xml entries for this
* embedded object.
- *
- * @return Document <code>Document</code> containing the manifest entries.
*/
abstract void writeManifestData(Document manifestDoc) throws DOMException;
-}
\ No newline at end of file
+}
Modified: openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java (original)
+++ openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java Sun Feb 3 13:23:59 2013
@@ -843,7 +843,7 @@ public abstract class OfficeDocument
* <p>TODO: remove dependency on com.sun.xml.tree.XmlDocument
* package!</p>
*
- * @param Document DOM <code>Document</code> object.
+ * @param doc DOM <code>Document</code> object.
*
* @return <code>byte</code> array of DOM <code>Document</code>
* object.
@@ -1022,7 +1022,7 @@ public abstract class OfficeDocument
/**
* <p>Creates a new DOM <code>Document</code> containing minimum
- * OpenOffice XML tags.</p>
+ * OpenOffice.org XML tags.</p>
*
* <p>This method uses the subclass
* <code>getOfficeClassAttribute</code> method to get the
@@ -1061,7 +1061,7 @@ public abstract class OfficeDocument
/**
* <p>Creates a new DOM <code>Document</code> containing minimum
- * OpenOffice XML tags.</p>
+ * OpenOffice.org XML tags.</p>
*
* <p>This method uses the subclass
* <code>getOfficeClassAttribute</code> method to get the
Modified: openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java (original)
+++ openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java Sun Feb 3 13:23:59 2013
@@ -39,7 +39,7 @@ import org.openoffice.xmerge.util.Debug;
/**
* Class used by {@link
- * org.openoffice.xmerge.converter.OfficeDocument
+ * org.openoffice.xmerge.converter.xml.OfficeDocument
* OfficeDocument} to handle reading and writing
* from a ZIP file, as well as storing ZIP entries.
*
Modified: openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java (original)
+++ openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java Sun Feb 3 13:23:59 2013
@@ -446,7 +446,7 @@ public class TextStyle extends Style imp
* Private function to return the value as an element in
* a Comma Separated Value (CSV) format.
*
- * @param The value to format.
+ * @param value The value to format.
*
* @return The formatted value.
*/
Modified: openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java (original)
+++ openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java Sun Feb 3 13:23:59 2013
@@ -116,7 +116,7 @@ public class BookSettings implements Off
* Adds an XML entry for a particular setting
*
* @param root the root node at which to add the xml entry
- * @param attriute the name of the attribute to add
+ * @param attribute the name of the attribute to add
* @param type the attribute type (int, short etc)
* @param value the value of the attribute
*/
Modified: openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java (original)
+++ openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java Sun Feb 3 13:23:59 2013
@@ -236,7 +236,7 @@ public class SheetSettings implements Of
* Adds an XML entry for a particular setting
*
* @param root the root node at which to add the xml entry
- * @param attriute the name of the attribute to add
+ * @param attribute the name of the attribute to add
* @param type the attribute type (int, short etc)
* @param value the value of the attribute
*/
Modified: openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java (original)
+++ openoffice/branches/l10n/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java Sun Feb 3 13:23:59 2013
@@ -43,7 +43,7 @@ public class OfficeUtil implements Offic
/**
* <p>Method to replace whitespace character within text with appropriate
- * OpenOffice tags.</p>
+ * OpenOffice.org XML tags.</p>
*
* @param text The text to parse for whitespace.
*
Modified: openoffice/branches/l10n/main/xmerge/util/build.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/util/build.xml?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/util/build.xml (original)
+++ openoffice/branches/l10n/main/xmerge/util/build.xml Sun Feb 3 13:23:59 2013
@@ -53,8 +53,8 @@
nodeprecated="true"
nodeprecatedlist="true"
use="true"
- Doctitle="OpenOffice XMerge API"
- windowtitle="OpenOffice XMerge API"
+ Doctitle="Apache OpenOffice XMerge API"
+ windowtitle="Apache OpenOffice XMerge API"
classpathref="classpath">
<fileset dir="../source/bridge" defaultexcludes="yes">
<include name="**/*.java"/>
Modified: openoffice/branches/l10n/main/xmerge/util/xmerge.mf
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmerge/util/xmerge.mf?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmerge/util/xmerge.mf (original)
+++ openoffice/branches/l10n/main/xmerge/util/xmerge.mf Sun Feb 3 13:23:59 2013
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Main-Class: org.openoffice.xmerge.test.Driver
Class-Path: xml-apis.jar xercesImpl.jar serializer.jar
-Specification-Title: OpenOffice XMerge Framework
-Specification-Vendor: OpenOffice.org
+Specification-Title: Apache OpenOffice XMerge Framework
+Specification-Vendor: Apache OpenOffice
Specification-Version: 0.6.0
Implementation-Version: #IMPL-VERSION#
Modified: openoffice/branches/l10n/main/xmlhelp/source/cxxhelp/provider/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmlhelp/source/cxxhelp/provider/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmlhelp/source/cxxhelp/provider/makefile.mk (original)
+++ openoffice/branches/l10n/main/xmlhelp/source/cxxhelp/provider/makefile.mk Sun Feb 3 13:23:59 2013
@@ -39,7 +39,7 @@ NO_BSYMBOLIC=TRUE
# technique though, so this warning is plain wrong and has been fixed
# in gcc 4.3. Unfortunately there is no way at all to suppress this warning.
# Some files in this directory use zero allocated arrays, we need to
-# diable the WaE mechanism for the GCC 4.2.x series.
+# disable the WaE mechanism for the GCC 4.2.x series.
.IF "$(COM)"=="GCC"
.IF "$(CCNUMVER)">="000400020000" && "$(CCNUMVER)"<="000400020003"
CFLAGSWERRCXX:=
Modified: openoffice/branches/l10n/main/xmloff/dtd/office.dtd
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmloff/dtd/office.dtd?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmloff/dtd/office.dtd (original)
+++ openoffice/branches/l10n/main/xmloff/dtd/office.dtd Sun Feb 3 13:23:59 2013
@@ -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,19 +8,29 @@
* 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.
- *
+ *
***********************************************************-->
+<!-- This DTD and the entities it includes are for the
+ XML document format produced by OpenOffice.org 1.x.
+ This DTD is for reference from the XML prolog of documents
+ in that OpenOffice.org 1.x format. It can be used for the
+ DTD validation of those XML documents.
+
+ This DTD is not applicable to ODF documents. ODF support
+ began in OpenOffice.org 2.x releases. ODF XML documents
+ have Relax NG Schemas.
+ -->
<!ENTITY % dtypes-mod SYSTEM "dtypes.mod">
%dtypes-mod;
Modified: openoffice/branches/l10n/main/xmloff/source/chart/PropertyMap.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmloff/source/chart/PropertyMap.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmloff/source/chart/PropertyMap.hxx (original)
+++ openoffice/branches/l10n/main/xmloff/source/chart/PropertyMap.hxx Sun Feb 3 13:23:59 2013
@@ -87,11 +87,11 @@
#define XML_SCH_CONTEXT_SPECIAL_LABEL_SEPARATOR ( XML_SCH_CTF_START + 24 )
#define MAP_FULL( ApiName, NameSpace, XMLTokenName, XMLType, ContextId, EarliestODFVersionForExport ) { ApiName, sizeof(ApiName)-1, XML_NAMESPACE_##NameSpace, xmloff::token::XMLTokenName, XMLType|XML_TYPE_PROP_CHART, ContextId, EarliestODFVersionForExport }
-#define MAP_ENTRY( a, ns, nm, t ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0, SvtSaveOptions::ODFVER_010 }
-#define MAP_ENTRY_ODF12( a, ns, nm, t ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0, SvtSaveOptions::ODFVER_012 }
-#define MAP_CONTEXT( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, c, SvtSaveOptions::ODFVER_010 }
-#define MAP_SPECIAL( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART | MID_FLAG_SPECIAL_ITEM, c, SvtSaveOptions::ODFVER_010 }
-#define MAP_SPECIAL_ODF12( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART | MID_FLAG_SPECIAL_ITEM, c, SvtSaveOptions::ODFVER_012 }
+#define MAP_ENTRY( a, ns, nm, t ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, static_cast<sal_Int32>(t|XML_TYPE_PROP_CHART), 0, SvtSaveOptions::ODFVER_010 }
+#define MAP_ENTRY_ODF12( a, ns, nm, t ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, static_cast<sal_Int32>(t|XML_TYPE_PROP_CHART), 0, SvtSaveOptions::ODFVER_012 }
+#define MAP_CONTEXT( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, static_cast<sal_Int32>(t|XML_TYPE_PROP_CHART), c, SvtSaveOptions::ODFVER_010 }
+#define MAP_SPECIAL( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, static_cast<sal_Int32>(t|XML_TYPE_PROP_CHART | MID_FLAG_SPECIAL_ITEM), c, SvtSaveOptions::ODFVER_010 }
+#define MAP_SPECIAL_ODF12( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, static_cast<sal_Int32>(t|XML_TYPE_PROP_CHART | MID_FLAG_SPECIAL_ITEM), c, SvtSaveOptions::ODFVER_012 }
#define MAP_ENTRY_END { 0,0,0,xmloff::token::XML_TOKEN_INVALID,0,0,SvtSaveOptions::ODFVER_010 }
// ---------------------------------------------------------
Modified: openoffice/branches/l10n/main/xmloff/source/core/xmlimp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmloff/source/core/xmlimp.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmloff/source/core/xmlimp.cxx (original)
+++ openoffice/branches/l10n/main/xmloff/source/core/xmlimp.cxx Sun Feb 3 13:23:59 2013
@@ -210,7 +210,7 @@ namespace
~DocumentInfo()
{}
- const sal_uInt16 getGeneratorVersion() const
+ sal_uInt16 getGeneratorVersion() const
{
return mnGeneratorVersion;
}
@@ -278,7 +278,7 @@ public:
}
// --> ORW
- const sal_uInt16 getGeneratorVersion( const SvXMLImport& rImport )
+ sal_uInt16 getGeneratorVersion( const SvXMLImport& rImport )
{
if ( !mpDocumentInfo.get() )
{
Modified: openoffice/branches/l10n/main/xmloff/source/draw/sdpropls.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmloff/source/draw/sdpropls.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmloff/source/draw/sdpropls.cxx (original)
+++ openoffice/branches/l10n/main/xmloff/source/draw/sdpropls.cxx Sun Feb 3 13:23:59 2013
@@ -84,10 +84,10 @@ using namespace ::xmloff::token;
#define _MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_010 }
#define _MAPV(name,prefix,token,type,context,version) { name, sizeof(name)-1, prefix, token, type, context, version }
-#define GMAP(name,prefix,token,type,context) _MAP(name,prefix,token,type|XML_TYPE_PROP_GRAPHIC,context)
-#define GMAPV(name,prefix,token,type,context,version) _MAPV(name,prefix,token,type|XML_TYPE_PROP_GRAPHIC,context,version)
-#define DPMAP(name,prefix,token,type,context) _MAP(name,prefix,token,type|XML_TYPE_PROP_DRAWING_PAGE,context)
-#define TMAP(name,prefix,token,type,context) _MAP(name,prefix,token,type|XML_TYPE_PROP_TEXT,context)
+#define GMAP(name,prefix,token,type,context) _MAP(name,prefix,token,static_cast<sal_Int32>(type|XML_TYPE_PROP_GRAPHIC),context)
+#define GMAPV(name,prefix,token,type,context,version) _MAPV(name,prefix,token,static_cast<sal_Int32>(type|XML_TYPE_PROP_GRAPHIC),context,version)
+#define DPMAP(name,prefix,token,type,context) _MAP(name,prefix,token,static_cast<sal_Int32>(type|XML_TYPE_PROP_DRAWING_PAGE),context)
+#define TMAP(name,prefix,token,type,context) _MAP(name,prefix,token,static_cast<sal_Int32>(type|XML_TYPE_PROP_TEXT),context)
#define PMAP(name,prefix,token,type,context) _MAP(name,prefix,token,type|XML_TYPE_PROP_PARAGRAPH,context)
#define MAP_END() { 0L, 0, 0, XML_EMPTY, 0 ,0, SvtSaveOptions::ODFVER_010}
Modified: openoffice/branches/l10n/main/xmloff/source/draw/shapeexport4.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmloff/source/draw/shapeexport4.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmloff/source/draw/shapeexport4.cxx (original)
+++ openoffice/branches/l10n/main/xmloff/source/draw/shapeexport4.cxx Sun Feb 3 13:23:59 2013
@@ -473,7 +473,7 @@ void ImpExportEnhancedGeometry( SvXMLExp
if ( aGeoPropSet >>= aGeoPropSeq )
{
- const rtl::OUString sCustomShapeType( RTL_CONSTASCII_USTRINGPARAM( "NonPrimitive" ) );
+ const rtl::OUString sCustomShapeType( RTL_CONSTASCII_USTRINGPARAM( "non-primitive" ) );
rtl::OUString aCustomShapeType( sCustomShapeType );
sal_Int32 j, nGeoPropCount = aGeoPropSeq.getLength();
Modified: openoffice/branches/l10n/main/xmloff/source/forms/controlpropertymap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmloff/source/forms/controlpropertymap.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmloff/source/forms/controlpropertymap.cxx (original)
+++ openoffice/branches/l10n/main/xmloff/source/forms/controlpropertymap.cxx Sun Feb 3 13:23:59 2013
@@ -43,9 +43,9 @@ namespace xmloff
{
//.........................................................................
-#define MAP_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 }
-#define MAP_CONST( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 }
-#define MAP_CONST_P( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_PARAGRAPH, context, SvtSaveOptions::ODFVER_010 }
+#define MAP_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, static_cast<sal_Int32>(type|XML_TYPE_PROP_TEXT), context, SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, static_cast<sal_Int32>(type|XML_TYPE_PROP_TEXT), context, SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST_P( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, static_cast<sal_Int32>(type|XML_TYPE_PROP_PARAGRAPH), context, SvtSaveOptions::ODFVER_010 }
#define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0, 0, SvtSaveOptions::ODFVER_010 }
XMLPropertyMapEntry* getControlStylePropertyMap_Access( )
Modified: openoffice/branches/l10n/main/xmloff/source/forms/formenums.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmloff/source/forms/formenums.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmloff/source/forms/formenums.cxx (original)
+++ openoffice/branches/l10n/main/xmloff/source/forms/formenums.cxx Sun Feb 3 13:23:59 2013
@@ -320,11 +320,11 @@ namespace xmloff
{
static const SvXMLEnumMapEntry aScaleModeMap[] =
{
- { XML_BACKGROUND_NO_REPEAT, ImageScaleMode::None },
- { XML_REPEAT, ImageScaleMode::None }, // repeating the image is not supported
- { XML_STRETCH, ImageScaleMode::Anisotropic },
- { XML_SCALE, ImageScaleMode::Isotropic },
- { XML_TOKEN_INVALID, ImageScaleMode::None }
+ { XML_BACKGROUND_NO_REPEAT, ImageScaleMode::NONE },
+ { XML_REPEAT, ImageScaleMode::NONE }, // repeating the image is not supported
+ { XML_STRETCH, ImageScaleMode::ANISOTROPIC },
+ { XML_SCALE, ImageScaleMode::ISOTROPIC },
+ { XML_TOKEN_INVALID, ImageScaleMode::NONE }
};
rReturn = aScaleModeMap;
}
Modified: openoffice/branches/l10n/main/xmloff/source/style/PageMasterStyleMap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmloff/source/style/PageMasterStyleMap.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmloff/source/style/PageMasterStyleMap.cxx (original)
+++ openoffice/branches/l10n/main/xmloff/source/style/PageMasterStyleMap.cxx Sun Feb 3 13:23:59 2013
@@ -31,7 +31,7 @@
using namespace ::xmloff::token;
-#define _MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_010 }
+#define _MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, static_cast<sal_Int32>(type), context, SvtSaveOptions::ODFVER_010 }
#define PLMAP(name,prefix,token,type,context) \
_MAP(name,prefix,token,type|XML_TYPE_PROP_PAGE_LAYOUT,context)
#define HFMAP(name,prefix,token,type,context) \
Modified: openoffice/branches/l10n/main/xmloff/source/text/txtprmap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmloff/source/text/txtprmap.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmloff/source/text/txtprmap.cxx (original)
+++ openoffice/branches/l10n/main/xmloff/source/text/txtprmap.cxx Sun Feb 3 13:23:59 2013
@@ -37,13 +37,13 @@ using namespace ::com::sun::star::uno;
using namespace ::xmloff::token;
#define _M_E( a, p, l, t, c ) \
- { a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l, t, c, SvtSaveOptions::ODFVER_010 }
+ { a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l, static_cast<sal_Int32>(t), c, SvtSaveOptions::ODFVER_010 }
#define _M_EV( a, p, l, t, c, v ) \
- { a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l, t, c, v }
+ { a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l, static_cast<sal_Int32>(t), c, v }
#define _M_ED( a, p, l, t, c ) \
- { a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l, (t) | MID_FLAG_DEFAULT_ITEM_EXPORT, c, SvtSaveOptions::ODFVER_010 }
+ { a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l, static_cast<sal_Int32>((t) | MID_FLAG_DEFAULT_ITEM_EXPORT), c, SvtSaveOptions::ODFVER_010 }
// text properties
#define MT_E( a, p, l, t, c ) \
Modified: openoffice/branches/l10n/main/xmloff/source/transform/TransformerActionInit.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmloff/source/transform/TransformerActionInit.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmloff/source/transform/TransformerActionInit.hxx (original)
+++ openoffice/branches/l10n/main/xmloff/source/transform/TransformerActionInit.hxx Sun Feb 3 13:23:59 2013
@@ -36,7 +36,7 @@ struct XMLTransformerActionInit
sal_uInt32 m_nParam2;
sal_uInt32 m_nParam3;
- static sal_Int32 QNameParam( sal_uInt16 nPrefix,
+ static sal_uInt32 QNameParam( sal_uInt16 nPrefix,
::xmloff::token::XMLTokenEnum eLocalName )
{
return (static_cast< sal_uInt32 >( nPrefix ) << 16) +
Modified: openoffice/branches/l10n/main/xmlreader/source/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmlreader/source/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmlreader/source/makefile.mk (original)
+++ openoffice/branches/l10n/main/xmlreader/source/makefile.mk Sun Feb 3 13:23:59 2013
@@ -43,9 +43,7 @@ SHL1RPATH = URELIB
SHL1STDLIBS = \
$(SALLIB)
SHL1TARGET = xmlreader
-.IF "$(GUI)" != "OS2"
SHL1USE_EXPORTS = name
-.ENDIF
DEF1NAME = $(SHL1TARGET)
.INCLUDE: target.mk
Modified: openoffice/branches/l10n/main/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmlsecurity/source/dialogs/digitalsignaturesdialog.src?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmlsecurity/source/dialogs/digitalsignaturesdialog.src (original)
+++ openoffice/branches/l10n/main/xmlsecurity/source/dialogs/digitalsignaturesdialog.src Sun Feb 3 13:23:59 2013
@@ -200,7 +200,7 @@ ErrorBox RID_XMLSECDLG_OLD_ODF_FORMAT
Buttons = WB_OK ;
DefButton = WB_DEF_OK ;
Message [ en-US ] =
- "This document contains signatures in ODF 1.1 (OpenOffice.org 2.x) format. "
+ "This document contains signatures in ODF 1.1 format. "
"Signing documents in %PRODUCTNAME %PRODUCTVERSION requires ODF 1.2 format version. "
"Thus no signatures can be added or removed to this document.\n\n"
"Save document in ODF 1.2 format and add all desired signatures again.";
Modified: openoffice/branches/l10n/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx (original)
+++ openoffice/branches/l10n/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx Sun Feb 3 13:23:59 2013
@@ -87,7 +87,7 @@ using ::rtl::OString;
#define IMPLEMENTATION_NAME "com.sun.star.xml.security.bridge.xmlsec.NSSInitializer_NssImpl"
-#define ROOT_CERTS "Root Certs for OpenOffice.org"
+#define ROOT_CERTS "Root Certs for Apache OpenOffice"
extern "C" void nsscrypto_finalize();
Propchange: openoffice/branches/l10n/test/
------------------------------------------------------------------------------
Merged /openoffice/branches/alg/clibboard/test:r1428975-1437368
Merged /openoffice/trunk/test:r1413471-1441901
Merged /incubator/ooo/trunk/test:r1412675-1413470
Modified: openoffice/branches/l10n/test/build.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/test/build.xml?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/test/build.xml (original)
+++ openoffice/branches/l10n/test/build.xml Sun Feb 3 13:23:59 2013
@@ -144,7 +144,7 @@
</condition>
<pathconvert property="openoffice.pack" setonempty="false">
<path>
- <fileset dir="${env.SRC_ROOT}/instsetoo_native/${env.INPATH}/OpenOffice/archive/install/en-US" includes="*.tar.gz,*.zip" erroronmissingdir="false"/>
+ <fileset dir="${env.SRC_ROOT}/instsetoo_native/${env.INPATH}/Apache_OpenOffice/archive/install/en-US" includes="*.tar.gz,*.zip" erroronmissingdir="false"/>
</path>
</pathconvert>
<condition property="test.arg0" value="-Dopenoffice.pack=${openoffice.pack}">
Modified: openoffice/branches/l10n/test/testcommon/source/org/openoffice/test/Run.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/test/testcommon/source/org/openoffice/test/Run.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/test/testcommon/source/org/openoffice/test/Run.java (original)
+++ openoffice/branches/l10n/test/testcommon/source/org/openoffice/test/Run.java Sun Feb 3 13:23:59 2013
@@ -28,6 +28,7 @@ import java.util.logging.Level;
import org.junit.runner.JUnitCore;
import org.junit.runner.Result;
import org.junit.runner.notification.RunListener;
+import org.junit.runner.notification.Failure;
import org.openoffice.test.common.FileUtil;
import org.openoffice.test.common.Logger;
import org.openoffice.test.common.NamedRequest;
@@ -142,10 +143,15 @@ public class Run {
int code = 0;
for (NamedRequest request : requests) {
Result result = core.run(request.getRunner());
- if (!result.wasSuccessful())
+ if (!result.wasSuccessful()) {
code = 1;
+ java.util.List<Failure> failureList = result.getFailures();
+ for( Failure f: failureList)
+ log.log( Level.SEVERE, "Failure in "+request.getName()+" :"+ f.toString(), f.getException());
+ }
}
System.exit(code);
}
}
+
Modified: openoffice/branches/l10n/test/testcommon/source/org/openoffice/test/common/FileProvider.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/test/testcommon/source/org/openoffice/test/common/FileProvider.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/test/testcommon/source/org/openoffice/test/common/FileProvider.java (original)
+++ openoffice/branches/l10n/test/testcommon/source/org/openoffice/test/common/FileProvider.java Sun Feb 3 13:23:59 2013
@@ -138,7 +138,7 @@ public class FileProvider extends Suite
if (a != null) {
Object v = f.get(null);
if (v != null && !(v instanceof Integer))
- throw new InitializationError(String.format("Field annotated FileFilter '%s' must be String.", f.getName()));
+ throw new InitializationError(String.format("Field annotated FileFilter '%s' must be Integer.", f.getName()));
repeat = (Integer) v;
}
Modified: openoffice/branches/l10n/test/testcommon/source/org/openoffice/test/common/XMLReporter.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/test/testcommon/source/org/openoffice/test/common/XMLReporter.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/test/testcommon/source/org/openoffice/test/common/XMLReporter.java (original)
+++ openoffice/branches/l10n/test/testcommon/source/org/openoffice/test/common/XMLReporter.java Sun Feb 3 13:23:59 2013
@@ -177,9 +177,10 @@ public class XMLReporter extends RunList
System.setProperty("info.os.name", SystemUtil.getOSName());
System.setProperty("info.os.version", SystemUtil.getOSVersion());
System.setProperty("info.os.arch", SystemUtil.getOSArch());
- System.setProperty("info.os.arch", SystemUtil.getOSArch());
- System.setProperty("info.ip", SystemUtil.getIPAddress());
- System.setProperty("info.hostname", SystemUtil.getHostName());
+ String ipaddrStr = SystemUtil.getIPAddress();
+ System.setProperty("info.ip", (ipaddrStr!=null) ? ipaddrStr : "UNKNOWN");
+ String hostnameStr = SystemUtil.getHostName();
+ System.setProperty("info.hostname", (hostnameStr!=null) ? hostnameStr : "UNKNOWN");
Set<Entry<Object, Object>> entries = System.getProperties().entrySet();
for (Entry<Object, Object> e : entries) {
Element prop = doc.createElement("property");
@@ -198,3 +199,4 @@ public class XMLReporter extends RunList
}
}
+
Propchange: openoffice/branches/l10n/test/testcommon/source/org/openoffice/test/vcl/
------------------------------------------------------------------------------
Merged /openoffice/trunk/test/testcommon/source/org/openoffice/test/vcl:r1413471-1441901
Merged /openoffice/branches/alg/clibboard/test/testcommon/source/org/openoffice/test/vcl:r1428975-1437368
Merged /incubator/ooo/trunk/test/testcommon/source/org/openoffice/test/vcl:r1412675-1413470
Modified: openoffice/branches/l10n/test/testgui/source/fvt/gui/formula/catalog/CharacterFromCatalogDlg.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/test/testgui/source/fvt/gui/formula/catalog/CharacterFromCatalogDlg.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/test/testgui/source/fvt/gui/formula/catalog/CharacterFromCatalogDlg.java (original)
+++ openoffice/branches/l10n/test/testgui/source/fvt/gui/formula/catalog/CharacterFromCatalogDlg.java Sun Feb 3 13:23:59 2013
@@ -29,11 +29,16 @@ import static testlib.gui.UIMap.*;
import org.junit.After;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
+import org.openoffice.test.common.Logger;
import testlib.gui.AppTool;
public class CharacterFromCatalogDlg {
+
+ @Rule
+ public Logger log = Logger.getLogger(this);
@Before
public void setUp() throws Exception {
Modified: openoffice/branches/l10n/test/testgui/source/fvt/gui/formula/catalog/SymbolsFromCatalog.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/test/testgui/source/fvt/gui/formula/catalog/SymbolsFromCatalog.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/test/testgui/source/fvt/gui/formula/catalog/SymbolsFromCatalog.java (original)
+++ openoffice/branches/l10n/test/testgui/source/fvt/gui/formula/catalog/SymbolsFromCatalog.java Sun Feb 3 13:23:59 2013
@@ -29,7 +29,9 @@ import static testlib.gui.UIMap.*;
import org.junit.After;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
+import org.openoffice.test.common.Logger;
import org.openoffice.test.vcl.widgets.VclDialog;
import testlib.gui.AppTool;
@@ -37,6 +39,9 @@ import testlib.gui.AppTool;
public class SymbolsFromCatalog {
+ @Rule
+ public Logger log = Logger.getLogger(this);
+
@Before
public void setUp() throws Exception {
app.start(true);
Modified: openoffice/branches/l10n/test/testgui/source/fvt/gui/formula/importexport/FormulaInDifferentWays.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/test/testgui/source/fvt/gui/formula/importexport/FormulaInDifferentWays.java?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/test/testgui/source/fvt/gui/formula/importexport/FormulaInDifferentWays.java (original)
+++ openoffice/branches/l10n/test/testgui/source/fvt/gui/formula/importexport/FormulaInDifferentWays.java Sun Feb 3 13:23:59 2013
@@ -33,13 +33,18 @@ import static testlib.gui.UIMap.*;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
+import org.junit.Rule;
import org.junit.Test;
import org.openoffice.test.common.FileUtil;
+import org.openoffice.test.common.Logger;
import testlib.gui.AppTool;
public class FormulaInDifferentWays {
+
+ @Rule
+ public Logger log = Logger.getLogger(this);
@Before
public void setUp() throws Exception {