[Libreoffice-commits] core.git: accessibility/source autodoc/source basic/source chart2/source connectivity/source cppcanvas/source cui/source desktop/source editeng/source filter/source formula/source framework/source helpcompiler/source hwpfilter/source i18npool/source idl/source jvmfwk/source l10ntools/source padmin/source reportdesign/source rsc/source sal/inc sc/qa sc/source sd/source sfx2/source slideshow/source svtools/source svx/source UnoControls/source unotools/source vcl/source vcl/unx writerperfect/source
nccuong
cao.cuong.ngo at gmail.com
Wed Mar 6 04:59:48 PST 2013
UnoControls/source/base/registercontrols.cxx | 9
accessibility/source/extended/accessibleeditbrowseboxcell.cxx | 16
autodoc/source/parser_i/idoc/cx_dsapi.cxx | 2
basic/source/runtime/iosys.cxx | 2
basic/source/sbx/sbxobj.cxx | 6
basic/source/sbx/sbxvalue.cxx | 62
chart2/source/controller/dialogs/tp_DataSource.cxx | 1
chart2/source/controller/main/ChartDropTargetHelper.cxx | 1
chart2/source/controller/main/ChartFrameloader.cxx | 66
chart2/source/model/template/BarChartTypeTemplate.cxx | 2
chart2/source/model/template/ChartTypeTemplate.cxx | 4
connectivity/source/drivers/file/FTable.cxx | 2
connectivity/source/drivers/mork/MResultSetMetaData.cxx | 4
connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx | 3
connectivity/source/drivers/postgresql/pq_xtable.cxx | 3
connectivity/source/drivers/postgresql/pq_xtables.cxx | 4
connectivity/source/drivers/postgresql/pq_xuser.cxx | 1
cppcanvas/source/mtfrenderer/emfplus.cxx | 882 +++---
cui/source/dialogs/cuigaldlg.cxx | 4
cui/source/tabpages/tpbitmap.cxx | 3
cui/source/tabpages/tpgradnt.cxx | 2
cui/source/tabpages/tphatch.cxx | 1
cui/source/tabpages/tplnedef.cxx | 1
desktop/source/app/lockfile2.cxx | 1
editeng/source/misc/hangulhanja.cxx | 2
filter/source/config/cache/filterfactory.cxx | 18
filter/source/graphicfilter/icgm/class2.cxx | 2
filter/source/xsltdialog/xmlfiltertabpagexslt.cxx | 1
formula/source/ui/dlg/funcpage.cxx | 1
framework/source/services/autorecovery.cxx | 24
helpcompiler/source/HelpCompiler.cxx | 3
hwpfilter/source/hwpreader.cxx | 26
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx | 12
idl/source/prj/command.cxx | 202 -
jvmfwk/source/elements.cxx | 4
l10ntools/source/xrmmerge.cxx | 3
padmin/source/adddlg.cxx | 2
reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx | 1
rsc/source/rscpp/cpp5.c | 30
sal/inc/sal/log-areas.dox | 11
sc/qa/unit/helper/qahelper.hxx | 1
sc/qa/unit/subsequent_export-test.cxx | 1
sc/qa/unit/subsequent_filters-test.cxx | 3
sc/source/core/tool/compiler.cxx | 16
sc/source/filter/oox/extlstcontext.cxx | 11
sc/source/ui/drawfunc/drawsh.cxx | 16
sc/source/ui/pagedlg/scuitphfedit.cxx | 2
sc/source/ui/vba/vbafont.cxx | 2
sd/source/filter/eppt/pptx-epptooxml.cxx | 6
sfx2/source/appl/appuno.cxx | 24
sfx2/source/appl/linksrc.cxx | 10
sfx2/source/control/bindings.cxx | 4
sfx2/source/control/dispatch.cxx | 4
sfx2/source/control/shell.cxx | 4
sfx2/source/dialog/dinfdlg.cxx | 2
sfx2/source/dialog/filedlghelper.cxx | 8
sfx2/source/doc/sfxbasemodel.cxx | 4
sfx2/source/menu/mnuitem.cxx | 2
sfx2/source/view/sfxbasecontroller.cxx | 4
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 8
slideshow/source/engine/transitions/fanwipe.cxx | 2
svtools/source/contnr/DocumentInfoPreview.cxx | 2
svx/source/dialog/srchdlg.cxx | 2
svx/source/fmcomp/gridcell.cxx | 2
svx/source/form/navigatortree.cxx | 4
svx/source/gallery2/galobj.cxx | 2
unotools/source/config/configitem.cxx | 25
vcl/source/filter/wmf/enhwmf.cxx | 1414 +++++-----
vcl/source/gdi/pdfwriter_impl.cxx | 2
vcl/source/window/window.cxx | 14
vcl/unx/generic/printer/printerinfomanager.cxx | 2
vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx | 3
writerperfect/source/draw/WPGImportFilter.cxx | 1
73 files changed, 1494 insertions(+), 1537 deletions(-)
New commits:
commit a6b91730053fc61416716ae176081b91de52532b
Author: nccuong <cao.cuong.ngo at gmail.com>
Date: Mon Mar 4 15:25:02 2013 +0100
fdo#60148 Clean up warnings from the Clang compiler plugin
Change-Id: I08d755677c46c476710ecbd067ed9f7e2f54a671
loplugin: clean warnings: unused variables, incorrect indentation and log area.
Reviewed-on: https://gerrit.libreoffice.org/2544
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Eike Rathke <erack at redhat.com>
diff --git a/UnoControls/source/base/registercontrols.cxx b/UnoControls/source/base/registercontrols.cxx
index dfcdfb0..94df3e7 100644
--- a/UnoControls/source/base/registercontrols.cxx
+++ b/UnoControls/source/base/registercontrols.cxx
@@ -122,12 +122,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL ctl_component_getFactory( const s
// Write no ";" at end of line and dont forget "else" ! (see macro)
//=============================================================================
IF_NAME_CREATECOMPONENTFACTORY_SINGLE( FrameControl )
- else
- IF_NAME_CREATECOMPONENTFACTORY_SINGLE( ProgressBar )
- else
- IF_NAME_CREATECOMPONENTFACTORY_SINGLE( ProgressMonitor )
- else
- IF_NAME_CREATECOMPONENTFACTORY_SINGLE( StatusIndicator )
+ else IF_NAME_CREATECOMPONENTFACTORY_SINGLE( ProgressBar )
+ else IF_NAME_CREATECOMPONENTFACTORY_SINGLE( ProgressMonitor )
+ else IF_NAME_CREATECOMPONENTFACTORY_SINGLE( StatusIndicator )
//=============================================================================
// Factory is valid - service was found.
diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
index dcc29fb..146003b 100644
--- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
+++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
@@ -214,15 +214,15 @@ namespace accessibility
{
if ( !m_pBrowseBox || !m_xControlAccessible.is() )
throw DisposedException();
- Reference< XAccessibleContext > xMyContext( m_aContext );
- if ( !xMyContext.is() )
- {
- Reference< XAccessibleContext > xInnerContext = m_xControlAccessible->getAccessibleContext();
- Reference< XAccessible > xMe( this );
+ Reference< XAccessibleContext > xMyContext( m_aContext );
+ if ( !xMyContext.is() )
+ {
+ Reference< XAccessibleContext > xInnerContext = m_xControlAccessible->getAccessibleContext();
+ Reference< XAccessible > xMe( this );
- xMyContext = new EditBrowseBoxTableCell( m_xParent, xMe, xInnerContext, *m_pBrowseBox, m_xFocusWindow, m_nRowPos, m_nColPos );
- m_aContext = xMyContext;
- }
+ xMyContext = new EditBrowseBoxTableCell( m_xParent, xMe, xInnerContext, *m_pBrowseBox, m_xFocusWindow, m_nRowPos, m_nColPos );
+ m_aContext = xMyContext;
+ }
return xMyContext;
}
//--------------------------------------------------------------------
diff --git a/autodoc/source/parser_i/idoc/cx_dsapi.cxx b/autodoc/source/parser_i/idoc/cx_dsapi.cxx
index 9c43d5f..a7d8b65 100644
--- a/autodoc/source/parser_i/idoc/cx_dsapi.cxx
+++ b/autodoc/source/parser_i/idoc/cx_dsapi.cxx
@@ -195,7 +195,7 @@ Context_Docu::PerformStatusFunction( uintt i_nStatusSignal,
throw X_AutodocParser(X_AutodocParser::x_UnexpectedEOF);
else
io_rText.CutToken();
- pNewToken = new Tok_EOF;
+ pNewToken = new Tok_EOF;
break;
case nF_fin_AnyWord:
pNewToken = new Tok_Word(io_rText.CutToken());
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 4daa688..de08aaa 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -704,7 +704,7 @@ namespace
void WriteLines(SvStream &rStream, const rtl::OString& rStr)
{
rtl::OString aStr(convertLineEnd(rStr, rStream.GetLineDelimiter()) );
- write_uInt8s_FromOString(rStream, rStr);
+ write_uInt8s_FromOString(rStream, aStr);
endl( rStream );
}
}
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index 69f9920..da05ce2 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -219,7 +219,7 @@ SbxVariable* SbxObject::Find( const OUString& rName, SbxClassType t )
DbgOutf( "SBX: Search %.*s %s %s in %s",
nLvl++, " ",
( t >= SbxCLASS_DONTCARE && t <= SbxCLASS_OBJECT )
- ? pCls[ t-1 ] : "Unknown class", aNameStr1.getStr(), aNameStr1.getStr() );
+ ? pCls[ t-1 ] : "Unknown class", aNameStr1.getStr(), aNameStr2.getStr() );
#endif
if( !GetAll( t ) )
@@ -504,7 +504,7 @@ void SbxObject::Insert( SbxVariable* pVar )
DbgOutf( "SBX: Insert %s %s in %s",
( pVar->GetClass() >= SbxCLASS_DONTCARE &&
pVar->GetClass() <= SbxCLASS_OBJECT )
- ? pCls[ pVar->GetClass()-1 ] : "Unknown class", aNameStr1.getStr(), aNameStr1.getStr() );
+ ? pCls[ pVar->GetClass()-1 ] : "Unknown class", aNameStr1.getStr(), aNameStr2.getStr() );
#endif
}
}
@@ -547,7 +547,7 @@ void SbxObject::QuickInsert( SbxVariable* pVar )
DbgOutf( "SBX: Insert %s %s in %s",
( pVar->GetClass() >= SbxCLASS_DONTCARE &&
pVar->GetClass() <= SbxCLASS_OBJECT )
- ? pCls[ pVar->GetClass()-1 ] : "Unknown class", aNameStr1.getStr(), aNameStr1.getStr() );
+ ? pCls[ pVar->GetClass()-1 ] : "Unknown class", aNameStr1.getStr(), aNameStr2.getStr() );
#endif
}
}
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index e4d9000..7356f89 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -44,37 +44,39 @@ SbxValue::SbxValue( SbxDataType t, void* p ) : SbxBase()
else
SetFlag( SBX_FIXED );
if( p )
- switch( t & 0x0FFF )
{
- case SbxINTEGER: n |= SbxBYREF; aData.pInteger = (sal_Int16*) p; break;
- case SbxSALUINT64: n |= SbxBYREF; aData.puInt64 = (sal_uInt64*) p; break;
- case SbxSALINT64:
- case SbxCURRENCY: n |= SbxBYREF; aData.pnInt64 = (sal_Int64*) p; break;
- case SbxLONG: n |= SbxBYREF; aData.pLong = (sal_Int32*) p; break;
- case SbxSINGLE: n |= SbxBYREF; aData.pSingle = (float*) p; break;
- case SbxDATE:
- case SbxDOUBLE: n |= SbxBYREF; aData.pDouble = (double*) p; break;
- case SbxSTRING: n |= SbxBYREF; aData.pOUString = (OUString*) p; break;
- case SbxERROR:
- case SbxUSHORT:
- case SbxBOOL: n |= SbxBYREF; aData.pUShort = (sal_uInt16*) p; break;
- case SbxULONG: n |= SbxBYREF; aData.pULong = (sal_uInt32*) p; break;
- case SbxCHAR: n |= SbxBYREF; aData.pChar = (sal_Unicode*) p; break;
- case SbxBYTE: n |= SbxBYREF; aData.pByte = (sal_uInt8*) p; break;
- case SbxINT: n |= SbxBYREF; aData.pInt = (int*) p; break;
- case SbxOBJECT:
- aData.pObj = (SbxBase*) p;
- if( p )
- aData.pObj->AddRef();
- break;
- case SbxDECIMAL:
- aData.pDecimal = (SbxDecimal*) p;
- if( p )
- aData.pDecimal->addRef();
- break;
- default:
- DBG_ASSERT( !this, "Angabe eines Pointers unzulaessig" );
- n = SbxNULL;
+ switch( t & 0x0FFF )
+ {
+ case SbxINTEGER: n |= SbxBYREF; aData.pInteger = (sal_Int16*) p; break;
+ case SbxSALUINT64: n |= SbxBYREF; aData.puInt64 = (sal_uInt64*) p; break;
+ case SbxSALINT64:
+ case SbxCURRENCY: n |= SbxBYREF; aData.pnInt64 = (sal_Int64*) p; break;
+ case SbxLONG: n |= SbxBYREF; aData.pLong = (sal_Int32*) p; break;
+ case SbxSINGLE: n |= SbxBYREF; aData.pSingle = (float*) p; break;
+ case SbxDATE:
+ case SbxDOUBLE: n |= SbxBYREF; aData.pDouble = (double*) p; break;
+ case SbxSTRING: n |= SbxBYREF; aData.pOUString = (OUString*) p; break;
+ case SbxERROR:
+ case SbxUSHORT:
+ case SbxBOOL: n |= SbxBYREF; aData.pUShort = (sal_uInt16*) p; break;
+ case SbxULONG: n |= SbxBYREF; aData.pULong = (sal_uInt32*) p; break;
+ case SbxCHAR: n |= SbxBYREF; aData.pChar = (sal_Unicode*) p; break;
+ case SbxBYTE: n |= SbxBYREF; aData.pByte = (sal_uInt8*) p; break;
+ case SbxINT: n |= SbxBYREF; aData.pInt = (int*) p; break;
+ case SbxOBJECT:
+ aData.pObj = (SbxBase*) p;
+ if( p )
+ aData.pObj->AddRef();
+ break;
+ case SbxDECIMAL:
+ aData.pDecimal = (SbxDecimal*) p;
+ if( p )
+ aData.pDecimal->addRef();
+ break;
+ default:
+ DBG_ASSERT( !this, "Angabe eines Pointers unzulaessig" );
+ n = SbxNULL;
+ }
}
else
memset( &aData, 0, sizeof( SbxValues ) );
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index a13c677..35fe350 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -604,7 +604,6 @@ IMPL_LINK_NOARG(DataSourceTabPage, RoleSelectionChangedHdl)
SvTreeListEntry * pEntry = m_aLB_ROLE.FirstSelected();
if( pEntry )
{
- OUString aRange( m_aEDT_RANGE.GetText());
OUString aSelectedRoleUI = lcl_GetSelectedRole( m_aLB_ROLE, true );
OUString aSelectedRange = lcl_GetSelectedRolesRange( m_aLB_ROLE );
diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx b/chart2/source/controller/main/ChartDropTargetHelper.cxx
index 8669897..83d075a 100644
--- a/chart2/source/controller/main/ChartDropTargetHelper.cxx
+++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx
@@ -111,7 +111,6 @@ sal_Int8 ChartDropTargetHelper::ExecuteDrop( const ExecuteDropEvent& rEvt )
::std::vector< OUString > aStrings( lcl_getStringsFromByteSequence( aBytes ));
if( aStrings.size() >= 3 && aStrings[0] == "soffice" )
{
- OUString aDocName( aStrings[1] );
OUString aRangeString( aStrings[2] );
Reference< container::XChild > xChild( m_xChartDocument, uno::UNO_QUERY );
if( xChild.is())
diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx
index 5ca460b..5b2c03b 100644
--- a/chart2/source/controller/main/ChartFrameloader.cxx
+++ b/chart2/source/controller/main/ChartFrameloader.cxx
@@ -141,45 +141,45 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT
// call initNew() or load() at XLoadable
if(!bHaveLoadedModel)
- try
- {
- comphelper::MediaDescriptor::const_iterator aIt( aMediaDescriptor.find( aMediaDescriptor.PROP_URL()));
- if( aIt != aMediaDescriptor.end())
+ try
{
- ::rtl::OUString aURL( (*aIt).second.get< ::rtl::OUString >());
- if( aURL.matchAsciiL(
- RTL_CONSTASCII_STRINGPARAM( "private:factory/schart" )))
- {
- // create new file
- uno::Reference< frame::XLoadable > xLoadable( xModel, uno::UNO_QUERY_THROW );
- xLoadable->initNew();
- }
- else
+ comphelper::MediaDescriptor::const_iterator aIt( aMediaDescriptor.find( aMediaDescriptor.PROP_URL()));
+ if( aIt != aMediaDescriptor.end())
{
- aMediaDescriptor.addInputStream();
- uno::Sequence< beans::PropertyValue > aCompleteMediaDescriptor;
- aMediaDescriptor >> aCompleteMediaDescriptor;
- apphelper::MediaDescriptorHelper aMDHelper( aCompleteMediaDescriptor );
-
- // load file
- // @todo: replace: aMediaDescriptorHelper.getReducedForModel()
- uno::Reference< frame::XLoadable > xLoadable( xModel, uno::UNO_QUERY_THROW );
- xLoadable->load( aCompleteMediaDescriptor );
-
- //resize standalone files to get correct size:
- if( xComponentWindow.is() && aMDHelper.ISSET_FilterName && aMDHelper.FilterName.equals( "StarChart 5.0") )
+ ::rtl::OUString aURL( (*aIt).second.get< ::rtl::OUString >());
+ if( aURL.matchAsciiL(
+ RTL_CONSTASCII_STRINGPARAM( "private:factory/schart" )))
+ {
+ // create new file
+ uno::Reference< frame::XLoadable > xLoadable( xModel, uno::UNO_QUERY_THROW );
+ xLoadable->initNew();
+ }
+ else
{
- awt::Rectangle aRect( xComponentWindow->getPosSize() );
- sal_Int16 nFlags=0;
- xComponentWindow->setPosSize( aRect.X, aRect.Y, aRect.Width, aRect.Height, nFlags );
+ aMediaDescriptor.addInputStream();
+ uno::Sequence< beans::PropertyValue > aCompleteMediaDescriptor;
+ aMediaDescriptor >> aCompleteMediaDescriptor;
+ apphelper::MediaDescriptorHelper aMDHelper( aCompleteMediaDescriptor );
+
+ // load file
+ // @todo: replace: aMediaDescriptorHelper.getReducedForModel()
+ uno::Reference< frame::XLoadable > xLoadable( xModel, uno::UNO_QUERY_THROW );
+ xLoadable->load( aCompleteMediaDescriptor );
+
+ //resize standalone files to get correct size:
+ if( xComponentWindow.is() && aMDHelper.ISSET_FilterName && aMDHelper.FilterName.equals( "StarChart 5.0") )
+ {
+ awt::Rectangle aRect( xComponentWindow->getPosSize() );
+ sal_Int16 nFlags=0;
+ xComponentWindow->setPosSize( aRect.X, aRect.Y, aRect.Width, aRect.Height, nFlags );
+ }
}
}
}
- }
- catch( const uno::Exception & ex )
- {
- ASSERT_EXCEPTION( ex );
- }
+ catch( const uno::Exception & ex )
+ {
+ ASSERT_EXCEPTION( ex );
+ }
return sal_True;
}
diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx
index 260b12e..1c1ec10 100644
--- a/chart2/source/model/template/BarChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BarChartTypeTemplate.cxx
@@ -188,8 +188,6 @@ sal_Bool SAL_CALL BarChartTypeTemplate::matchesTemplate(
bResult &&
getDimension() == 3 )
{
- ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
- DiagramHelper::getDataSeriesFromDiagram( xDiagram ));
bool bGeomFound = false, bGeomAmbiguous = false;
sal_Int32 aCommonGeom = DiagramHelper::getGeometry3D( xDiagram, bGeomFound, bGeomAmbiguous );
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx
index 3f7899f..7858edf 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -237,8 +237,8 @@ void SAL_CALL ChartTypeTemplate::changeDiagram( const uno::Reference< XDiagram >
}
// remove charttype groups from all coordinate systems
- Sequence< Reference< XChartType > > aOldChartTypesSeq(
- DiagramHelper::getChartTypesFromDiagram(xDiagram) );
+ Sequence< Reference< XChartType > > aOldChartTypesSeq(
+ DiagramHelper::getChartTypesFromDiagram(xDiagram) );
Reference< XCoordinateSystemContainer > xCoordSysCnt( xDiagram, uno::UNO_QUERY );
OSL_ASSERT( xCoordSysCnt.is());
diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx
index d947c25..8dc2c71 100644
--- a/connectivity/source/drivers/file/FTable.cxx
+++ b/connectivity/source/drivers/file/FTable.cxx
@@ -51,8 +51,6 @@ OFileTable::OFileTable(sdbcx::OCollection* _pTables,OConnection* _pConnection)
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "OFileTable::OFileTable" );
DBG_CTOR( file_OFileTable, NULL );
construct();
- TStringVector aVector;
- // m_pColumns = new OColumns(this,m_aMutex,aVector);
m_aColumns = new OSQLColumns();
}
// -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/mork/MResultSetMetaData.cxx b/connectivity/source/drivers/mork/MResultSetMetaData.cxx
index 57f6dea..778bdae 100644
--- a/connectivity/source/drivers/mork/MResultSetMetaData.cxx
+++ b/connectivity/source/drivers/mork/MResultSetMetaData.cxx
@@ -158,10 +158,8 @@ sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLE
}
// -------------------------------------------------------------------------
-sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
{
- ::rtl::OUString sColumnName( getColumnName( column ) );
-
if ( !m_pTable || !m_pTable->getConnection() )
{
OSL_FAIL( "OResultSetMetaData::isSearchable: suspicious: called without table or connection!" );
diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx
index 8f8e68d..b654171 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx
@@ -187,12 +187,11 @@ void IndexColumns::refresh()
void IndexColumns::appendByDescriptor(
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& future )
+ const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& /*future*/ )
throw (::com::sun::star::sdbc::SQLException,
::com::sun::star::container::ElementExistException,
::com::sun::star::uno::RuntimeException)
{
- OUString name = extractStringProperty( future, getStatics().NAME );
throw com::sun::star::sdbc::SQLException(
"SDBC-POSTGRESQL: IndexesColumns.appendByDescriptor not yet implemented",
*this, OUString(), 1, Any() );
diff --git a/connectivity/source/drivers/postgresql/pq_xtable.cxx b/connectivity/source/drivers/postgresql/pq_xtable.cxx
index e6210ea..7ba75f8 100644
--- a/connectivity/source/drivers/postgresql/pq_xtable.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xtable.cxx
@@ -293,8 +293,6 @@ void Table::alterColumnByIndex(
Reference< com::sun::star::container::XIndexAccess > colums =
Reference< com::sun::star::container::XIndexAccess>( getColumns(), UNO_QUERY );
Reference< com::sun::star::beans::XPropertySet> column(colums->getByIndex( index ), UNO_QUERY );
- OUString oldName = extractStringProperty( column, getStatics().NAME );
- OUString newName = extractStringProperty( descriptor, getStatics().NAME );
::pq_sdbc_driver::alterColumnByDescriptor(
extractStringProperty( this, getStatics().SCHEMA_NAME ),
extractStringProperty( this, getStatics().NAME ),
@@ -302,7 +300,6 @@ void Table::alterColumnByIndex(
m_conn->createStatement(),
column,
descriptor );
-// m_pColumns->rename( oldName, newName );
m_pColumns->refresh();
}
diff --git a/connectivity/source/drivers/postgresql/pq_xtables.cxx b/connectivity/source/drivers/postgresql/pq_xtables.cxx
index 705adcf..92c0f12 100644
--- a/connectivity/source/drivers/postgresql/pq_xtables.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xtables.cxx
@@ -321,9 +321,7 @@ void Tables::appendByDescriptor(
while( xEnum.is() && xEnum->hasMoreElements() )
{
Reference< XPropertySet > column( xEnum->nextElement(), UNO_QUERY );
- // help text seems to be used by OOo rather than Description
-// OUString description = extractStringProperty( column, st.HELP_TEXT );
- OUString helpText = extractStringProperty( column,st.DESCRIPTION );
+ description = extractStringProperty( column,st.DESCRIPTION );
if( description.getLength() )
{
buf = OUStringBuffer( 128 );
diff --git a/connectivity/source/drivers/postgresql/pq_xuser.cxx b/connectivity/source/drivers/postgresql/pq_xuser.cxx
index e76b29f..b96450a 100644
--- a/connectivity/source/drivers/postgresql/pq_xuser.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xuser.cxx
@@ -184,7 +184,6 @@ sal_Int32 User::getPrivileges( const ::rtl::OUString& objName, sal_Int32 objType
if( isLog( m_pSettings, LogLevel::INFO ) )
{
Statics & st = getStatics();
- rtl::OUString user = extractStringProperty( this, st.NAME );
rtl::OUStringBuffer buf( 128 );
buf.append( "User::getPrivileges[" + extractStringProperty( this, st.NAME ) +
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index b9a24f1..ddec8e0 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1217,550 +1217,552 @@ namespace cppcanvas
}
if (type != EmfPlusRecordTypeObject || !(flags & 0x8000))
- switch (type) {
- case EmfPlusRecordTypeHeader:
- sal_uInt32 header, version;
-
- rMF >> header >> version >> nHDPI >> nVDPI;
-
- EMFP_DEBUG (printf ("EMF+ Header\n"));
- EMFP_DEBUG (printf ("EMF+\theader: 0x%08x version: %u horizontal DPI: %d vertical DPI: %d dual: %d\n", (int)header, (unsigned int)version, (int)nHDPI, (int)nVDPI,(int)( flags & 1)));
-
- break;
- case EmfPlusRecordTypeEndOfFile:
- EMFP_DEBUG (printf ("EMF+ EndOfFile\n"));
- break;
- case EmfPlusRecordTypeGetDC:
- EMFP_DEBUG (printf ("EMF+ GetDC\n"));
- EMFP_DEBUG (printf ("EMF+\talready used in svtools wmf/emf filter parser\n"));
- break;
- case EmfPlusRecordTypeObject:
- processObjectRecord (rMF, flags, dataSize);
- break;
- case EmfPlusRecordTypeFillPie:
- {
- sal_uInt32 brushIndexOrColor;
- float startAngle, sweepAngle;
-
- rMF >> brushIndexOrColor >> startAngle >> sweepAngle;
-
- EMFP_DEBUG (printf ("EMF+ FillPie colorOrIndex: %x startAngle: %f sweepAngle: %f\n", (unsigned int)brushIndexOrColor, startAngle, sweepAngle));
-
- float dx, dy, dw, dh;
-
- ReadRectangle (rMF, dx, dy, dw, dh, flags & 0x4000);
-
- EMFP_DEBUG (printf ("EMF+ RectData: %f,%f %fx%f\n", dx, dy, dw, dh));
-
- startAngle = 2*M_PI*startAngle/360;
- sweepAngle = 2*M_PI*sweepAngle/360;
-
- B2DPoint mappedCenter (Map (dx + dw/2, dy + dh/2));
- B2DSize mappedSize( MapSize (dw/2, dh/2));
-
- double endAngle = startAngle + sweepAngle;
- if (endAngle < 0)
- endAngle += M_PI*2;
- endAngle = fmod (endAngle, M_PI*2);
-
- if (sweepAngle < 0) {
- double tmp = startAngle;
- startAngle = endAngle;
- endAngle = tmp;
- }
+ {
+ switch (type) {
+ case EmfPlusRecordTypeHeader:
+ sal_uInt32 header, version;
- EMFP_DEBUG (printf ("EMF+ angles: %f,%f ---> %f,%f\n", startAngle, sweepAngle, startAngle, endAngle));
+ rMF >> header >> version >> nHDPI >> nVDPI;
- B2DPolygon polygon = tools::createPolygonFromEllipseSegment (mappedCenter, mappedSize.getX (), mappedSize.getY (), startAngle, endAngle);
- polygon.append (mappedCenter);
- polygon.setClosed (true);
+ EMFP_DEBUG (printf ("EMF+ Header\n"));
+ EMFP_DEBUG (printf ("EMF+\theader: 0x%08x version: %u horizontal DPI: %d vertical DPI: %d dual: %d\n", (int)header, (unsigned int)version, (int)nHDPI, (int)nVDPI,(int)( flags & 1)));
- B2DPolyPolygon polyPolygon (polygon);
- EMFPPlusFillPolygon (polyPolygon, rFactoryParms, rState, rCanvas, flags & 0x8000, brushIndexOrColor);
- }
- break;
- case EmfPlusRecordTypeFillPath:
- {
- sal_uInt32 index = flags & 0xff;
- sal_uInt32 brushIndexOrColor;
+ break;
+ case EmfPlusRecordTypeEndOfFile:
+ EMFP_DEBUG (printf ("EMF+ EndOfFile\n"));
+ break;
+ case EmfPlusRecordTypeGetDC:
+ EMFP_DEBUG (printf ("EMF+ GetDC\n"));
+ EMFP_DEBUG (printf ("EMF+\talready used in svtools wmf/emf filter parser\n"));
+ break;
+ case EmfPlusRecordTypeObject:
+ processObjectRecord (rMF, flags, dataSize);
+ break;
+ case EmfPlusRecordTypeFillPie:
+ {
+ sal_uInt32 brushIndexOrColor;
+ float startAngle, sweepAngle;
- rMF >> brushIndexOrColor;
+ rMF >> brushIndexOrColor >> startAngle >> sweepAngle;
- EMFP_DEBUG (printf ("EMF+ FillPath slot: %u\n", (unsigned int)index));
+ EMFP_DEBUG (printf ("EMF+ FillPie colorOrIndex: %x startAngle: %f sweepAngle: %f\n", (unsigned int)brushIndexOrColor, startAngle, sweepAngle));
- EMFPPlusFillPolygon (((EMFPPath*) aObjects [index])->GetPolygon (*this), rFactoryParms, rState, rCanvas, flags & 0x8000, brushIndexOrColor);
- }
- break;
- case EmfPlusRecordTypeFillRects:
- {
- EMFP_DEBUG (printf ("EMF+ FillRects\n"));
+ float dx, dy, dw, dh;
- sal_uInt32 brushIndexOrColor;
- sal_Int32 rectangles;
- ::basegfx::B2DPolygon polygon;
+ ReadRectangle (rMF, dx, dy, dw, dh, flags & 0x4000);
- rMF >> brushIndexOrColor >> rectangles;
+ EMFP_DEBUG (printf ("EMF+ RectData: %f,%f %fx%f\n", dx, dy, dw, dh));
- EMFP_DEBUG (printf ("EMF+\t%s: 0x%08x\n", (flags & 0x8000) ? "color" : "brush index", (unsigned int)brushIndexOrColor));
+ startAngle = 2*M_PI*startAngle/360;
+ sweepAngle = 2*M_PI*sweepAngle/360;
- for (int i=0; i < rectangles; i++) {
- if (flags & 0x4000) {
- /* 16bit integers */
- sal_Int16 x, y, width, height;
+ B2DPoint mappedCenter (Map (dx + dw/2, dy + dh/2));
+ B2DSize mappedSize( MapSize (dw/2, dh/2));
- rMF >> x >> y >> width >> height;
+ double endAngle = startAngle + sweepAngle;
+ if (endAngle < 0)
+ endAngle += M_PI*2;
+ endAngle = fmod (endAngle, M_PI*2);
- polygon.append (Map (x, y));
- polygon.append (Map (x + width, y));
- polygon.append (Map (x + width, y + height));
- polygon.append (Map (x, y + height));
+ if (sweepAngle < 0) {
+ double tmp = startAngle;
+ startAngle = endAngle;
+ endAngle = tmp;
+ }
- EMFP_DEBUG (printf ("EMF+\trectangle: %d,%d %dx%d\n", x, y, width, height));
- } else {
- /* Single's */
- float x, y, width, height;
+ EMFP_DEBUG (printf ("EMF+ angles: %f,%f ---> %f,%f\n", startAngle, sweepAngle, startAngle, endAngle));
- rMF >> x >> y >> width >> height;
+ B2DPolygon polygon = tools::createPolygonFromEllipseSegment (mappedCenter, mappedSize.getX (), mappedSize.getY (), startAngle, endAngle);
+ polygon.append (mappedCenter);
+ polygon.setClosed (true);
- polygon.append (Map (x, y));
- polygon.append (Map (x + width, y));
- polygon.append (Map (x + width, y + height));
- polygon.append (Map (x, y + height));
+ B2DPolyPolygon polyPolygon (polygon);
+ EMFPPlusFillPolygon (polyPolygon, rFactoryParms, rState, rCanvas, flags & 0x8000, brushIndexOrColor);
+ }
+ break;
+ case EmfPlusRecordTypeFillPath:
+ {
+ sal_uInt32 index = flags & 0xff;
+ sal_uInt32 brushIndexOrColor;
- EMFP_DEBUG (printf ("EMF+\trectangle: %f,%f %fx%f\n", x, y, width, height));
- }
+ rMF >> brushIndexOrColor;
- ::basegfx::B2DPolyPolygon polyPolygon (polygon);
+ EMFP_DEBUG (printf ("EMF+ FillPath slot: %u\n", (unsigned int)index));
- EMFPPlusFillPolygon (polyPolygon, rFactoryParms, rState, rCanvas, flags & 0x8000, brushIndexOrColor);
+ EMFPPlusFillPolygon (((EMFPPath*) aObjects [index])->GetPolygon (*this), rFactoryParms, rState, rCanvas, flags & 0x8000, brushIndexOrColor);
}
break;
- }
- case EmfPlusRecordTypeFillPolygon:
- {
- EMFP_DEBUG (sal_uInt8 index = flags & 0xff);
- sal_uInt32 brushIndexOrColor;
- sal_Int32 points;
+ case EmfPlusRecordTypeFillRects:
+ {
+ EMFP_DEBUG (printf ("EMF+ FillRects\n"));
- rMF >> brushIndexOrColor;
- rMF >> points;
+ sal_uInt32 brushIndexOrColor;
+ sal_Int32 rectangles;
+ ::basegfx::B2DPolygon polygon;
- EMFP_DEBUG (printf ("EMF+ FillPolygon in slot: %d points: %d\n", index, points));
- EMFP_DEBUG (printf ("EMF+\t%s: 0x%08x\n", (flags & 0x8000) ? "color" : "brush index", brushIndexOrColor));
+ rMF >> brushIndexOrColor >> rectangles;
- EMFPPath path (points, true);
- path.Read (rMF, flags, *this);
+ EMFP_DEBUG (printf ("EMF+\t%s: 0x%08x\n", (flags & 0x8000) ? "color" : "brush index", (unsigned int)brushIndexOrColor));
+ for (int i=0; i < rectangles; i++) {
+ if (flags & 0x4000) {
+ /* 16bit integers */
+ sal_Int16 x, y, width, height;
- EMFPPlusFillPolygon (path.GetPolygon (*this), rFactoryParms, rState, rCanvas, flags & 0x8000, brushIndexOrColor);
+ rMF >> x >> y >> width >> height;
- break;
- }
- case EmfPlusRecordTypeDrawLines:
- {
- sal_uInt32 index = flags & 0xff;
- sal_uInt32 points;
+ polygon.append (Map (x, y));
+ polygon.append (Map (x + width, y));
+ polygon.append (Map (x + width, y + height));
+ polygon.append (Map (x, y + height));
- rMF >> points;
+ EMFP_DEBUG (printf ("EMF+\trectangle: %d,%d %dx%d\n", x, y, width, height));
+ } else {
+ /* Single's */
+ float x, y, width, height;
- EMFP_DEBUG (printf ("EMF+ DrawLines in slot: %u points: %u\n", (unsigned int)index, (unsigned int)points));
+ rMF >> x >> y >> width >> height;
- EMFPPath path (points, true);
- path.Read (rMF, flags, *this);
+ polygon.append (Map (x, y));
+ polygon.append (Map (x + width, y));
+ polygon.append (Map (x + width, y + height));
+ polygon.append (Map (x, y + height));
- EMFPPen* pen = (EMFPPen*) aObjects [index];
+ EMFP_DEBUG (printf ("EMF+\trectangle: %f,%f %fx%f\n", x, y, width, height));
+ }
- rState.isFillColorSet = false;
- rState.isLineColorSet = true;
- rState.lineColor = ::vcl::unotools::colorToDoubleSequence (pen->GetColor (),
- rCanvas->getUNOCanvas ()->getDevice()->getDeviceColorSpace() );
- ::basegfx::B2DPolyPolygon& polygon (path.GetPolygon (*this));
+ ::basegfx::B2DPolyPolygon polyPolygon (polygon);
- polygon.transform( rState.mapModeTransform );
+ EMFPPlusFillPolygon (polyPolygon, rFactoryParms, rState, rCanvas, flags & 0x8000, brushIndexOrColor);
+ }
+ break;
+ }
+ case EmfPlusRecordTypeFillPolygon:
+ {
+ EMFP_DEBUG (sal_uInt8 index = flags & 0xff);
+ sal_uInt32 brushIndexOrColor;
+ sal_Int32 points;
- rendering::StrokeAttributes aStrokeAttributes;
+ rMF >> brushIndexOrColor;
+ rMF >> points;
- pen->SetStrokeAttributes (aStrokeAttributes, *this, rState);
+ EMFP_DEBUG (printf ("EMF+ FillPolygon in slot: %d points: %d\n", index, points));
+ EMFP_DEBUG (printf ("EMF+\t%s: 0x%08x\n", (flags & 0x8000) ? "color" : "brush index", brushIndexOrColor));
- ActionSharedPtr pPolyAction(
- internal::PolyPolyActionFactory::createPolyPolyAction(
- polygon, rFactoryParms.mrCanvas, rState, aStrokeAttributes ) );
+ EMFPPath path (points, true);
+ path.Read (rMF, flags, *this);
- if( pPolyAction )
- {
- maActions.push_back(
- MtfAction(
- pPolyAction,
- rFactoryParms.mrCurrActionIndex ) );
- rFactoryParms.mrCurrActionIndex += pPolyAction->getActionCount()-1;
- }
+ EMFPPlusFillPolygon (path.GetPolygon (*this), rFactoryParms, rState, rCanvas, flags & 0x8000, brushIndexOrColor);
- break;
- }
- case EmfPlusRecordTypeDrawPath:
- {
- sal_uInt32 penIndex;
+ break;
+ }
+ case EmfPlusRecordTypeDrawLines:
+ {
+ sal_uInt32 index = flags & 0xff;
+ sal_uInt32 points;
- rMF >> penIndex;
+ rMF >> points;
- EMFP_DEBUG (printf ("EMF+ DrawPath\n"));
- EMFP_DEBUG (printf ("EMF+\tpen: %u\n", (unsigned int)penIndex));
+ EMFP_DEBUG (printf ("EMF+ DrawLines in slot: %u points: %u\n", (unsigned int)index, (unsigned int)points));
- EMFPPath* path = (EMFPPath*) aObjects [flags & 0xff];
- EMFPPen* pen = (EMFPPen*) aObjects [penIndex & 0xff];
+ EMFPPath path (points, true);
+ path.Read (rMF, flags, *this);
- SAL_WARN_IF( !pen, "cppcanvas", "EmfPlusRecordTypeDrawPath missing pen" );
- SAL_WARN_IF( !path, "cppcanvas", "EmfPlusRecordTypeDrawPath missing path" );
+ EMFPPen* pen = (EMFPPen*) aObjects [index];
- if (pen && path)
- {
rState.isFillColorSet = false;
rState.isLineColorSet = true;
rState.lineColor = ::vcl::unotools::colorToDoubleSequence (pen->GetColor (),
- rCanvas->getUNOCanvas ()->getDevice()->getDeviceColorSpace());
- ::basegfx::B2DPolyPolygon& polygon (path->GetPolygon (*this));
+ rCanvas->getUNOCanvas ()->getDevice()->getDeviceColorSpace() );
+ ::basegfx::B2DPolyPolygon& polygon (path.GetPolygon (*this));
polygon.transform( rState.mapModeTransform );
+
rendering::StrokeAttributes aStrokeAttributes;
pen->SetStrokeAttributes (aStrokeAttributes, *this, rState);
- ActionSharedPtr pPolyAction(
- internal::PolyPolyActionFactory::createPolyPolyAction(
- polygon, rFactoryParms.mrCanvas, rState, aStrokeAttributes ) );
+ ActionSharedPtr pPolyAction(
+ internal::PolyPolyActionFactory::createPolyPolyAction(
+ polygon, rFactoryParms.mrCanvas, rState, aStrokeAttributes ) );
- if( pPolyAction )
- {
- maActions.push_back(
- MtfAction(
- pPolyAction,
- rFactoryParms.mrCurrActionIndex ) );
+ if( pPolyAction )
+ {
+ maActions.push_back(
+ MtfAction(
+ pPolyAction,
+ rFactoryParms.mrCurrActionIndex ) );
- rFactoryParms.mrCurrActionIndex += pPolyAction->getActionCount()-1;
- }
- }
- break;
- }
- case EmfPlusRecordTypeDrawImage:
- case EmfPlusRecordTypeDrawImagePoints:
- {
- sal_uInt32 attrIndex;
- sal_Int32 sourceUnit;
+ rFactoryParms.mrCurrActionIndex += pPolyAction->getActionCount()-1;
+ }
- rMF >> attrIndex >> sourceUnit;
+ break;
+ }
+ case EmfPlusRecordTypeDrawPath:
+ {
+ sal_uInt32 penIndex;
- EMFP_DEBUG (printf ("EMF+ %s attributes index: %d source unit: %d\n", type == EmfPlusRecordTypeDrawImagePoints ? "DrawImagePoints" : "DrawImage", (int)attrIndex, (int)sourceUnit));
- EMFP_DEBUG (printf ("EMF+\tTODO: use image attributes\n"));
+ rMF >> penIndex;
- if (sourceUnit == 2 && aObjects [flags & 0xff]) { // we handle only GraphicsUnit.Pixel now
- EMFPImage& image = *(EMFPImage *) aObjects [flags & 0xff];
- float sx, sy, sw, sh;
- sal_Int32 aCount;
+ EMFP_DEBUG (printf ("EMF+ DrawPath\n"));
+ EMFP_DEBUG (printf ("EMF+\tpen: %u\n", (unsigned int)penIndex));
- ReadRectangle (rMF, sx, sy, sw, sh);
+ EMFPPath* path = (EMFPPath*) aObjects [flags & 0xff];
+ EMFPPen* pen = (EMFPPen*) aObjects [penIndex & 0xff];
- EMFP_DEBUG (printf ("EMF+ %s source rectangle: %f,%f %fx%f\n", type == EmfPlusRecordTypeDrawImagePoints ? "DrawImagePoints" : "DrawImage", sx, sy, sw, sh));
+ SAL_WARN_IF( !pen, "cppcanvas", "EmfPlusRecordTypeDrawPath missing pen" );
+ SAL_WARN_IF( !path, "cppcanvas", "EmfPlusRecordTypeDrawPath missing path" );
- ::basegfx::B2DPoint aDstPoint;
- ::basegfx::B2DSize aDstSize;
- bool bValid = false;
+ if (pen && path)
+ {
+ rState.isFillColorSet = false;
+ rState.isLineColorSet = true;
+ rState.lineColor = ::vcl::unotools::colorToDoubleSequence (pen->GetColor (),
+ rCanvas->getUNOCanvas ()->getDevice()->getDeviceColorSpace());
+ ::basegfx::B2DPolyPolygon& polygon (path->GetPolygon (*this));
- if (type == EmfPlusRecordTypeDrawImagePoints) {
- rMF >> aCount;
+ polygon.transform( rState.mapModeTransform );
+ rendering::StrokeAttributes aStrokeAttributes;
- if( aCount == 3) { // TODO: now that we now that this value is count we should support it better
- float x1, y1, x2, y2, x3, y3;
+ pen->SetStrokeAttributes (aStrokeAttributes, *this, rState);
- ReadPoint (rMF, x1, y1, flags);
- ReadPoint (rMF, x2, y2, flags);
- ReadPoint (rMF, x3, y3, flags);
+ ActionSharedPtr pPolyAction(
+ internal::PolyPolyActionFactory::createPolyPolyAction(
+ polygon, rFactoryParms.mrCanvas, rState, aStrokeAttributes ) );
- aDstPoint = Map (x1, y1);
- aDstSize = MapSize(x2 - x1, y3 - y1);
+ if( pPolyAction )
+ {
+ maActions.push_back(
+ MtfAction(
+ pPolyAction,
+ rFactoryParms.mrCurrActionIndex ) );
- bValid = true;
+ rFactoryParms.mrCurrActionIndex += pPolyAction->getActionCount()-1;
}
- } else if (type == EmfPlusRecordTypeDrawImage) {
- float dx, dy, dw, dh;
-
- ReadRectangle (rMF, dx, dy, dw, dh, flags & 0x4000);
-
- aDstPoint = Map (dx, dy);
- aDstSize = MapSize(dw, dh);
-
- bValid = true;
}
+ break;
+ }
+ case EmfPlusRecordTypeDrawImage:
+ case EmfPlusRecordTypeDrawImagePoints:
+ {
+ sal_uInt32 attrIndex;
+ sal_Int32 sourceUnit;
- if (bValid) {
- BitmapEx aBmp( image.graphic.GetBitmapEx () );
- const Rectangle aCropRect (::vcl::unotools::pointFromB2DPoint (basegfx::B2DPoint (sx, sy)),
- ::vcl::unotools::sizeFromB2DSize (basegfx::B2DSize(sw, sh)));
- aBmp.Crop( aCropRect );
+ rMF >> attrIndex >> sourceUnit;
+ EMFP_DEBUG (printf ("EMF+ %s attributes index: %d source unit: %d\n", type == EmfPlusRecordTypeDrawImagePoints ? "DrawImagePoints" : "DrawImage", (int)attrIndex, (int)sourceUnit));
+ EMFP_DEBUG (printf ("EMF+\tTODO: use image attributes\n"));
- Size aSize( aBmp.GetSizePixel() );
- if( aSize.Width() > 0 && aSize.Height() > 0 ) {
- ActionSharedPtr pBmpAction (
- internal::BitmapActionFactory::createBitmapAction (
- aBmp,
- rState.mapModeTransform * aDstPoint,
- rState.mapModeTransform * aDstSize,
- rCanvas,
- rState));
+ if (sourceUnit == 2 && aObjects [flags & 0xff]) { // we handle only GraphicsUnit.Pixel now
+ EMFPImage& image = *(EMFPImage *) aObjects [flags & 0xff];
+ float sx, sy, sw, sh;
+ sal_Int32 aCount;
- if( pBmpAction ) {
- maActions.push_back( MtfAction( pBmpAction,
- rFactoryParms.mrCurrActionIndex ) );
+ ReadRectangle (rMF, sx, sy, sw, sh);
- rFactoryParms.mrCurrActionIndex += pBmpAction->getActionCount()-1;
- }
- } else {
- EMFP_DEBUG (printf ("EMF+ warning: empty bitmap\n"));
- }
- } else {
- EMFP_DEBUG (printf ("EMF+ DrawImage(Points) TODO (fixme)\n"));
- }
- } else {
- EMFP_DEBUG (printf ("EMF+ DrawImage(Points) TODO (fixme) - possibly unsupported source units for crop rectangle\n"));
- }
- break;
- }
- case EmfPlusRecordTypeDrawString:
- {
- EMFP_DEBUG (printf ("EMF+ DrawString\n"));
+ EMFP_DEBUG (printf ("EMF+ %s source rectangle: %f,%f %fx%f\n", type == EmfPlusRecordTypeDrawImagePoints ? "DrawImagePoints" : "DrawImage", sx, sy, sw, sh));
- sal_uInt32 brushId;
- sal_uInt32 formatId;
- sal_uInt32 stringLength;
+ ::basegfx::B2DPoint aDstPoint;
+ ::basegfx::B2DSize aDstSize;
+ bool bValid = false;
- rMF >> brushId >> formatId >> stringLength;
- EMFP_DEBUG (printf ("EMF+ DrawString brushId: %x formatId: %x length: %x\n", brushId, formatId, stringLength));
+ if (type == EmfPlusRecordTypeDrawImagePoints) {
+ rMF >> aCount;
- if (flags & 0x8000) {
- float lx, ly, lw, lh;
+ if( aCount == 3) { // TODO: now that we now that this value is count we should support it better
+ float x1, y1, x2, y2, x3, y3;
- rMF >> lx >> ly >> lw >> lh;
+ ReadPoint (rMF, x1, y1, flags);
+ ReadPoint (rMF, x2, y2, flags);
+ ReadPoint (rMF, x3, y3, flags);
- EMFP_DEBUG (printf ("EMF+ DrawString layoutRect: %f,%f - %fx%f\n", lx, ly, lw, lh));
+ aDstPoint = Map (x1, y1);
+ aDstSize = MapSize(x2 - x1, y3 - y1);
- rtl::OUString text = read_uInt16s_ToOUString(rMF, stringLength);
+ bValid = true;
+ }
+ } else if (type == EmfPlusRecordTypeDrawImage) {
+ float dx, dy, dw, dh;
- double cellSize = setFont (flags & 0xff, rFactoryParms, rState);
- SET_TEXT_COLOR( brushId );
+ ReadRectangle (rMF, dx, dy, dw, dh, flags & 0x4000);
- ActionSharedPtr pTextAction(
- TextActionFactory::createTextAction(
- // position is just rough guess for now
- // we should calculate it exactly from layoutRect or font
- ::vcl::unotools::pointFromB2DPoint ( Map( lx + 0.15*cellSize, ly + cellSize ) ),
- ::Size(),
- ::Color(),
- ::Size(),
- ::Color(),
- text,
- 0,
- stringLength,
- NULL,
- rFactoryParms.mrVDev,
- rFactoryParms.mrCanvas,
- rState,
- rFactoryParms.mrParms,
- false ) );
- if( pTextAction )
- {
- EMFP_DEBUG (printf ("EMF+\t\tadd text action\n"));
+ aDstPoint = Map (dx, dy);
+ aDstSize = MapSize(dw, dh);
- maActions.push_back(
- MtfAction(
- pTextAction,
- rFactoryParms.mrCurrActionIndex ) );
+ bValid = true;
+ }
- rFactoryParms.mrCurrActionIndex += pTextAction->getActionCount()-1;
+ if (bValid) {
+ BitmapEx aBmp( image.graphic.GetBitmapEx () );
+ const Rectangle aCropRect (::vcl::unotools::pointFromB2DPoint (basegfx::B2DPoint (sx, sy)),
+ ::vcl::unotools::sizeFromB2DSize (basegfx::B2DSize(sw, sh)));
+ aBmp.Crop( aCropRect );
+
+
+ Size aSize( aBmp.GetSizePixel() );
+ if( aSize.Width() > 0 && aSize.Height() > 0 ) {
+ ActionSharedPtr pBmpAction (
+ internal::BitmapActionFactory::createBitmapAction (
+ aBmp,
+ rState.mapModeTransform * aDstPoint,
+ rState.mapModeTransform * aDstSize,
+ rCanvas,
+ rState));
+
+ if( pBmpAction ) {
+ maActions.push_back( MtfAction( pBmpAction,
+ rFactoryParms.mrCurrActionIndex ) );
+
+ rFactoryParms.mrCurrActionIndex += pBmpAction->getActionCount()-1;
+ }
+ } else {
+ EMFP_DEBUG (printf ("EMF+ warning: empty bitmap\n"));
+ }
+ } else {
+ EMFP_DEBUG (printf ("EMF+ DrawImage(Points) TODO (fixme)\n"));
+ }
+ } else {
+ EMFP_DEBUG (printf ("EMF+ DrawImage(Points) TODO (fixme) - possibly unsupported source units for crop rectangle\n"));
}
- } else {
- EMFP_DEBUG (printf ("EMF+ DrawString TODO - drawing with brush not yet supported\n"));
+ break;
}
- }
- break;
- case EmfPlusRecordTypeSetPageTransform:
- rMF >> fPageScale;
-
- EMFP_DEBUG (printf ("EMF+ SetPageTransform\n"));
- EMFP_DEBUG (printf ("EMF+\tscale: %f unit: %d\n", fPageScale, flags));
- EMFP_DEBUG (printf ("EMF+\tTODO\n"));
- break;
- case EmfPlusRecordTypeSetRenderingOrigin:
- rMF >> nOriginX >> nOriginY;
- EMFP_DEBUG (printf ("EMF+ SetRenderingOrigin\n"));
- EMFP_DEBUG (printf ("EMF+\torigin [x,y]: %d,%d\n", (int)nOriginX, (int)nOriginY));
- break;
- case EmfPlusRecordTypeSetTextRenderingHint:
- EMFP_DEBUG (printf ("EMF+ SetTextRenderingHint\n"));
- EMFP_DEBUG (printf ("EMF+\tTODO\n"));
- break;
- case EmfPlusRecordTypeSetAntiAliasMode:
- EMFP_DEBUG (printf ("EMF+ SetAntiAliasMode\n"));
- EMFP_DEBUG (printf ("EMF+\tTODO\n"));
- break;
- case EmfPlusRecordTypeSetInterpolationMode:
- EMFP_DEBUG (printf ("EMF+ InterpolationMode\n"));
- EMFP_DEBUG (printf ("EMF+\tTODO\n"));
- break;
- case EmfPlusRecordTypeSetPixelOffsetMode:
- EMFP_DEBUG (printf ("EMF+ SetPixelOffsetMode\n"));
- EMFP_DEBUG (printf ("EMF+\tTODO\n"));
- break;
- case EmfPlusRecordTypeSetCompositingQuality:
- EMFP_DEBUG (printf ("EMF+ SetCompositingQuality\n"));
- EMFP_DEBUG (printf ("EMF+\tTODO\n"));
- break;
- case EmfPlusRecordTypeSave:
- EMFP_DEBUG (printf ("EMF+ Save\n"));
- EMFP_DEBUG (printf ("EMF+\tTODO\n"));
- break;
- case EmfPlusRecordTypeSetWorldTransform: {
- EMFP_DEBUG (printf ("EMF+ SetWorldTransform\n"));
- XForm transform;
- rMF >> transform;
- aWorldTransform.Set (transform);
- EMFP_DEBUG (printf ("EMF+\tm11: %f m12: %f\nEMF+\tm21: %f m22: %f\nEMF+\tdx: %f dy: %f\n",
- aWorldTransform.eM11, aWorldTransform.eM12,
- aWorldTransform.eM21, aWorldTransform.eM22,
- aWorldTransform.eDx, aWorldTransform.eDy));
- break;
- }
- case EmfPlusRecordTypeResetWorldTransform:
- EMFP_DEBUG (printf ("EMF+ ResetWorldTransform\n"));
- aWorldTransform.SetIdentity ();
- break;
- case EmfPlusRecordTypeMultiplyWorldTransform: {
- EMFP_DEBUG (printf ("EMF+ MultiplyWorldTransform\n"));
- XForm transform;
- rMF >> transform;
-
- EMFP_DEBUG (printf ("EMF+\tmatrix m11: %f m12: %f\nEMF+\tm21: %f m22: %f\nEMF+\tdx: %f dy: %f\n",
- transform.eM11, transform.eM12,
- transform.eM21, transform.eM22,
- transform.eDx, transform.eDy));
+ case EmfPlusRecordTypeDrawString:
+ {
+ EMFP_DEBUG (printf ("EMF+ DrawString\n"));
+
+ sal_uInt32 brushId;
+ sal_uInt32 formatId;
+ sal_uInt32 stringLength;
+
+ rMF >> brushId >> formatId >> stringLength;
+ EMFP_DEBUG (printf ("EMF+ DrawString brushId: %x formatId: %x length: %x\n", brushId, formatId, stringLength));
+
+ if (flags & 0x8000) {
+ float lx, ly, lw, lh;
+
+ rMF >> lx >> ly >> lw >> lh;
+
+ EMFP_DEBUG (printf ("EMF+ DrawString layoutRect: %f,%f - %fx%f\n", lx, ly, lw, lh));
+
+ rtl::OUString text = read_uInt16s_ToOUString(rMF, stringLength);
+
+ double cellSize = setFont (flags & 0xff, rFactoryParms, rState);
+ SET_TEXT_COLOR( brushId );
+
+ ActionSharedPtr pTextAction(
+ TextActionFactory::createTextAction(
+ // position is just rough guess for now
+ // we should calculate it exactly from layoutRect or font
+ ::vcl::unotools::pointFromB2DPoint ( Map( lx + 0.15*cellSize, ly + cellSize ) ),
+ ::Size(),
+ ::Color(),
+ ::Size(),
+ ::Color(),
+ text,
+ 0,
+ stringLength,
+ NULL,
+ rFactoryParms.mrVDev,
+ rFactoryParms.mrCanvas,
+ rState,
+ rFactoryParms.mrParms,
+ false ) );
+ if( pTextAction )
+ {
+ EMFP_DEBUG (printf ("EMF+\t\tadd text action\n"));
+
+ maActions.push_back(
+ MtfAction(
+ pTextAction,
+ rFactoryParms.mrCurrActionIndex ) );
+
+ rFactoryParms.mrCurrActionIndex += pTextAction->getActionCount()-1;
+ }
+ } else {
+ EMFP_DEBUG (printf ("EMF+ DrawString TODO - drawing with brush not yet supported\n"));
+ }
+ }
+ break;
+ case EmfPlusRecordTypeSetPageTransform:
+ rMF >> fPageScale;
- if (flags & 0x2000) // post multiply
- aWorldTransform.Multiply (transform);
- else { // pre multiply
- transform.Multiply (aWorldTransform);
+ EMFP_DEBUG (printf ("EMF+ SetPageTransform\n"));
+ EMFP_DEBUG (printf ("EMF+\tscale: %f unit: %d\n", fPageScale, flags));
+ EMFP_DEBUG (printf ("EMF+\tTODO\n"));
+ break;
+ case EmfPlusRecordTypeSetRenderingOrigin:
+ rMF >> nOriginX >> nOriginY;
+ EMFP_DEBUG (printf ("EMF+ SetRenderingOrigin\n"));
+ EMFP_DEBUG (printf ("EMF+\torigin [x,y]: %d,%d\n", (int)nOriginX, (int)nOriginY));
+ break;
+ case EmfPlusRecordTypeSetTextRenderingHint:
+ EMFP_DEBUG (printf ("EMF+ SetTextRenderingHint\n"));
+ EMFP_DEBUG (printf ("EMF+\tTODO\n"));
+ break;
+ case EmfPlusRecordTypeSetAntiAliasMode:
+ EMFP_DEBUG (printf ("EMF+ SetAntiAliasMode\n"));
+ EMFP_DEBUG (printf ("EMF+\tTODO\n"));
+ break;
+ case EmfPlusRecordTypeSetInterpolationMode:
+ EMFP_DEBUG (printf ("EMF+ InterpolationMode\n"));
+ EMFP_DEBUG (printf ("EMF+\tTODO\n"));
+ break;
+ case EmfPlusRecordTypeSetPixelOffsetMode:
+ EMFP_DEBUG (printf ("EMF+ SetPixelOffsetMode\n"));
+ EMFP_DEBUG (printf ("EMF+\tTODO\n"));
+ break;
+ case EmfPlusRecordTypeSetCompositingQuality:
+ EMFP_DEBUG (printf ("EMF+ SetCompositingQuality\n"));
+ EMFP_DEBUG (printf ("EMF+\tTODO\n"));
+ break;
+ case EmfPlusRecordTypeSave:
+ EMFP_DEBUG (printf ("EMF+ Save\n"));
+ EMFP_DEBUG (printf ("EMF+\tTODO\n"));
+ break;
+ case EmfPlusRecordTypeSetWorldTransform: {
+ EMFP_DEBUG (printf ("EMF+ SetWorldTransform\n"));
+ XForm transform;
+ rMF >> transform;
aWorldTransform.Set (transform);
+ EMFP_DEBUG (printf ("EMF+\tm11: %f m12: %f\nEMF+\tm21: %f m22: %f\nEMF+\tdx: %f dy: %f\n",
+ aWorldTransform.eM11, aWorldTransform.eM12,
+ aWorldTransform.eM21, aWorldTransform.eM22,
+ aWorldTransform.eDx, aWorldTransform.eDy));
+ break;
}
- EMFP_DEBUG (printf ("EMF+\tresult world matrix m11: %f m12: %f\nEMF+\tm21: %f m22: %f\nEMF+\tdx: %f dy: %f\n",
- aWorldTransform.eM11, aWorldTransform.eM12,
- aWorldTransform.eM21, aWorldTransform.eM22,
- aWorldTransform.eDx, aWorldTransform.eDy));
- break;
- }
- case EmfPlusRecordTypeSetClipPath:
- {
- EMFP_DEBUG (printf ("EMF+ SetClipPath\n"));
- EMFP_DEBUG (printf ("EMF+\tpath in slot: %d\n", flags & 0xff));
+ case EmfPlusRecordTypeResetWorldTransform:
+ EMFP_DEBUG (printf ("EMF+ ResetWorldTransform\n"));
+ aWorldTransform.SetIdentity ();
+ break;
+ case EmfPlusRecordTypeMultiplyWorldTransform: {
+ EMFP_DEBUG (printf ("EMF+ MultiplyWorldTransform\n"));
+ XForm transform;
+ rMF >> transform;
+
+ EMFP_DEBUG (printf ("EMF+\tmatrix m11: %f m12: %f\nEMF+\tm21: %f m22: %f\nEMF+\tdx: %f dy: %f\n",
+ transform.eM11, transform.eM12,
+ transform.eM21, transform.eM22,
+ transform.eDx, transform.eDy));
+
+ if (flags & 0x2000) // post multiply
+ aWorldTransform.Multiply (transform);
+ else { // pre multiply
+ transform.Multiply (aWorldTransform);
+ aWorldTransform.Set (transform);
+ }
+ EMFP_DEBUG (printf ("EMF+\tresult world matrix m11: %f m12: %f\nEMF+\tm21: %f m22: %f\nEMF+\tdx: %f dy: %f\n",
+ aWorldTransform.eM11, aWorldTransform.eM12,
+ aWorldTransform.eM21, aWorldTransform.eM22,
+ aWorldTransform.eDx, aWorldTransform.eDy));
+ break;
+ }
+ case EmfPlusRecordTypeSetClipPath:
+ {
+ EMFP_DEBUG (printf ("EMF+ SetClipPath\n"));
+ EMFP_DEBUG (printf ("EMF+\tpath in slot: %d\n", flags & 0xff));
- EMFPPath& path = *(EMFPPath*) aObjects [flags & 0xff];
- ::basegfx::B2DPolyPolygon& clipPoly (path.GetPolygon (*this));
+ EMFPPath& path = *(EMFPPath*) aObjects [flags & 0xff];
+ ::basegfx::B2DPolyPolygon& clipPoly (path.GetPolygon (*this));
- clipPoly.transform (rState.mapModeTransform);
- updateClipping (clipPoly, rFactoryParms, false);
+ clipPoly.transform (rState.mapModeTransform);
+ updateClipping (clipPoly, rFactoryParms, false);
+ break;
+ }
+ case EmfPlusRecordTypeSetClipRegion: {
+ EMFP_DEBUG (printf ("EMF+ SetClipRegion\n"));
+ EMFP_DEBUG (printf ("EMF+\tregion in slot: %d combine mode: %d\n", flags & 0xff, (flags & 0xff00) >> 8));
+ EMFPRegion *region = (EMFPRegion*)aObjects [flags & 0xff];
+
+ // reset clip
+ if (region && region->parts == 0 && region->initialState == EmfPlusRegionInitialStateInfinite) {
+ updateClipping (::basegfx::B2DPolyPolygon (), rFactoryParms, false);
+ } else {
+ EMFP_DEBUG (printf ("EMF+\tTODO\n"));
+ }
break;
}
- case EmfPlusRecordTypeSetClipRegion: {
- EMFP_DEBUG (printf ("EMF+ SetClipRegion\n"));
- EMFP_DEBUG (printf ("EMF+\tregion in slot: %d combine mode: %d\n", flags & 0xff, (flags & 0xff00) >> 8));
- EMFPRegion *region = (EMFPRegion*)aObjects [flags & 0xff];
-
- // reset clip
- if (region && region->parts == 0 && region->initialState == EmfPlusRegionInitialStateInfinite) {
- updateClipping (::basegfx::B2DPolyPolygon (), rFactoryParms, false);
- } else {
- EMFP_DEBUG (printf ("EMF+\tTODO\n"));
- }
- break;
- }
- case EmfPlusRecordTypeDrawDriverString: {
- EMFP_DEBUG (printf ("EMF+ DrawDriverString, flags: 0x%04x\n", flags));
- sal_uInt32 brushIndexOrColor;
- sal_uInt32 optionFlags;
- sal_uInt32 hasMatrix;
- sal_uInt32 glyphsCount;
+ case EmfPlusRecordTypeDrawDriverString: {
+ EMFP_DEBUG (printf ("EMF+ DrawDriverString, flags: 0x%04x\n", flags));
+ sal_uInt32 brushIndexOrColor;
+ sal_uInt32 optionFlags;
+ sal_uInt32 hasMatrix;
+ sal_uInt32 glyphsCount;
- rMF >> brushIndexOrColor >> optionFlags >> hasMatrix >> glyphsCount;
+ rMF >> brushIndexOrColor >> optionFlags >> hasMatrix >> glyphsCount;
- EMFP_DEBUG (printf ("EMF+\t%s: 0x%08x\n", (flags & 0x8000) ? "color" : "brush index", (unsigned int)brushIndexOrColor));
- EMFP_DEBUG (printf ("EMF+\toption flags: 0x%08x\n", (unsigned int)optionFlags));
- EMFP_DEBUG (printf ("EMF+\thas matrix: %u\n", (unsigned int)hasMatrix));
- EMFP_DEBUG (printf ("EMF+\tglyphs: %u\n", (unsigned int)glyphsCount));
+ EMFP_DEBUG (printf ("EMF+\t%s: 0x%08x\n", (flags & 0x8000) ? "color" : "brush index", (unsigned int)brushIndexOrColor));
+ EMFP_DEBUG (printf ("EMF+\toption flags: 0x%08x\n", (unsigned int)optionFlags));
+ EMFP_DEBUG (printf ("EMF+\thas matrix: %u\n", (unsigned int)hasMatrix));
+ EMFP_DEBUG (printf ("EMF+\tglyphs: %u\n", (unsigned int)glyphsCount));
- if( ( optionFlags & 1 ) && glyphsCount > 0 ) {
- float *charsPosX = new float[glyphsCount];
- float *charsPosY = new float[glyphsCount];
+ if( ( optionFlags & 1 ) && glyphsCount > 0 ) {
+ float *charsPosX = new float[glyphsCount];
+ float *charsPosY = new float[glyphsCount];
- rtl::OUString text = read_uInt16s_ToOUString(rMF, glyphsCount);
-
- for( sal_uInt32 i=0; i<glyphsCount; i++) {
- rMF >> charsPosX[i] >> charsPosY[i];
- EMFP_DEBUG (printf ("EMF+\tglyphPosition[%u]: %f, %f\n", (unsigned int)i, charsPosX[i], charsPosY[i]));
- }
+ rtl::OUString text = read_uInt16s_ToOUString(rMF, glyphsCount);
- XForm transform;
- if( hasMatrix ) {
- rMF >> transform;
- EMFP_DEBUG (printf ("EMF+\tmatrix:: %f, %f, %f, %f, %f, %f\n", transform.eM11, transform.eM12, transform.eM21, transform.eM22, transform.eDx, transform.eDy));
- }
+ for( sal_uInt32 i=0; i<glyphsCount; i++) {
+ rMF >> charsPosX[i] >> charsPosY[i];
+ EMFP_DEBUG (printf ("EMF+\tglyphPosition[%u]: %f, %f\n", (unsigned int)i, charsPosX[i], charsPosY[i]));
+ }
- // add the text action
- setFont (flags & 0xff, rFactoryParms, rState);
-
- if( flags & 0x8000 )
- SET_TEXT_COLOR(brushIndexOrColor);
-
- ActionSharedPtr pTextAction(
- TextActionFactory::createTextAction(
- ::vcl::unotools::pointFromB2DPoint ( Map( charsPosX[0], charsPosY[0] ) ),
- ::Size(),
- ::Color(),
- ::Size(),
- ::Color(),
- text,
- 0,
- glyphsCount,
- NULL,
- rFactoryParms.mrVDev,
- rFactoryParms.mrCanvas,
- rState,
- rFactoryParms.mrParms,
- false ) );
-
- if( pTextAction )
- {
- EMFP_DEBUG (printf ("EMF+\t\tadd text action\n"));
+ XForm transform;
+ if( hasMatrix ) {
+ rMF >> transform;
+ EMFP_DEBUG (printf ("EMF+\tmatrix:: %f, %f, %f, %f, %f, %f\n", transform.eM11, transform.eM12, transform.eM21, transform.eM22, transform.eDx, transform.eDy));
+ }
- maActions.push_back(
- MtfAction(
- pTextAction,
- rFactoryParms.mrCurrActionIndex ) );
+ // add the text action
+ setFont (flags & 0xff, rFactoryParms, rState);
+
+ if( flags & 0x8000 )
+ SET_TEXT_COLOR(brushIndexOrColor);
+
+ ActionSharedPtr pTextAction(
+ TextActionFactory::createTextAction(
+ ::vcl::unotools::pointFromB2DPoint ( Map( charsPosX[0], charsPosY[0] ) ),
+ ::Size(),
+ ::Color(),
+ ::Size(),
+ ::Color(),
+ text,
+ 0,
+ glyphsCount,
+ NULL,
+ rFactoryParms.mrVDev,
+ rFactoryParms.mrCanvas,
+ rState,
+ rFactoryParms.mrParms,
+ false ) );
+
+ if( pTextAction )
+ {
+ EMFP_DEBUG (printf ("EMF+\t\tadd text action\n"));
- rFactoryParms.mrCurrActionIndex += pTextAction->getActionCount()-1;
- }
+ maActions.push_back(
+ MtfAction(
+ pTextAction,
+ rFactoryParms.mrCurrActionIndex ) );
- delete[] charsPosX;
- delete[] charsPosY;
- } else {
- EMFP_DEBUG (printf ("EMF+\tTODO: fonts (non-unicode glyphs chars)\n"));
- }
+ rFactoryParms.mrCurrActionIndex += pTextAction->getActionCount()-1;
+ }
- break;
- }
- default:
- EMFP_DEBUG (printf ("EMF+ unhandled record type: %d\n", type));
- EMFP_DEBUG (printf ("EMF+\tTODO\n"));
+ delete[] charsPosX;
+ delete[] charsPosY;
+ } else {
+ EMFP_DEBUG (printf ("EMF+\tTODO: fonts (non-unicode glyphs chars)\n"));
}
+ break;
+ }
+ default:
+ EMFP_DEBUG (printf ("EMF+ unhandled record type: %d\n", type));
+ EMFP_DEBUG (printf ("EMF+\tTODO\n"));
+ }
+ }
+
rMF.Seek (next);
if (size <= length)
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index b2d44ea..31af615 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -504,8 +504,8 @@ IMPL_LINK( ActualizeProgress, TimeoutHdl, Timer*, _pTimer )
IMPL_LINK( ActualizeProgress, ActualizeHdl, INetURLObject*, pURL )
{
- for( long i = 0; i < 128; i++ )
- Application::Reschedule();
+ for( long i = 0; i < 128; i++ )
+ Application::Reschedule();
Flush();
Sync();
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index e4ae145..6a4b74b 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -515,8 +515,6 @@ long SvxBitmapTabPage::CheckChanges_Impl()
sal_uInt16 nPos = aLbBitmaps.GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
- String aString = aLbBitmaps.GetSelectEntry();
-
if( bBmpChanged )
{
ResMgr& rMgr = CUI_MGR();
@@ -789,7 +787,6 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickModifyHdl_Impl)
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
{
ResMgr& rMgr = CUI_MGR();
- String aNewName( SVX_RES( RID_SVXSTR_BITMAP ) );
String aDesc( ResId( RID_SVXSTR_DESC_NEW_BITMAP, rMgr ) );
String aName( pBitmapList->GetBitmap( nPos )->GetName() );
String aOldName = aName;
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 2e26f3c..6dc0902 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -259,7 +259,6 @@ long SvxGradientTabPage::CheckChanges_Impl()
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
XGradient aGradient = pGradientList->GetGradient( nPos )->GetGradient();
- String aString = m_pLbGradients->GetSelectEntry();
if( !( aTmpGradient == aGradient ) )
{
@@ -520,7 +519,6 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl)
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
{
ResMgr& rMgr = CUI_MGR();
- String aNewName( SVX_RES( RID_SVXSTR_GRADIENT ) );
String aDesc( CUI_RES( RID_SVXSTR_DESC_GRADIENT ) );
String aName( pGradientList->GetGradient( nPos )->GetName() );
String aOldName = aName;
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 5970907..cb88027 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -568,7 +568,6 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl)
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
{
ResMgr& rMgr = CUI_MGR();
- String aNewName( SVX_RES( RID_SVXSTR_HATCH ) );
String aDesc( CUI_RES( RID_SVXSTR_DESC_HATCH ) );
String aName( pHatchingList->GetHatch( nPos )->GetName() );
String aOldName = aName;
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index d707364..dd88083 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -632,7 +632,6 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl)
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
ResMgr& rMgr = CUI_MGR();
- String aNewName( SVX_RES( RID_SVXSTR_LINESTYLE ) );
String aDesc( ResId( RID_SVXSTR_DESC_LINESTYLE, rMgr ) );
String aName( pDashList->GetDash( nPos )->GetName() );
String aOldName = aName;
diff --git a/desktop/source/app/lockfile2.cxx b/desktop/source/app/lockfile2.cxx
index 9d74709..f56bda1 100644
--- a/desktop/source/app/lockfile2.cxx
+++ b/desktop/source/app/lockfile2.cxx
@@ -35,7 +35,6 @@ bool Lockfile_execWarning( Lockfile * that )
aConfig.SetGroup( LOCKFILE_GROUP );
rtl::OString aHost = aConfig.ReadKey( LOCKFILE_HOSTKEY );
rtl::OString aUser = aConfig.ReadKey( LOCKFILE_USERKEY );
- rtl::OString aStamp = aConfig.ReadKey( LOCKFILE_STAMPKEY );
rtl::OString aTime = aConfig.ReadKey( LOCKFILE_TIMEKEY );
// display warning and return response
diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index 36e020a..2d1e5f2 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -770,7 +770,7 @@ namespace editeng
{
try
{
- ::rtl::OUString aConvText = xExtConverter->getConversionWithOffset(
+ xExtConverter->getConversionWithOffset(
m_sCurrentPortion,
m_nCurrentStartIndex,
m_nCurrentEndIndex - m_nCurrentStartIndex,
diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx
index e6725c1..9270a16 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -260,38 +260,32 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
sDocumentService = ::rtl::OUString( "com.sun.star.text.TextDocument" );
}
- else
- if ( sDocumentService == "web" )
+ else if ( sDocumentService == "web" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
sDocumentService = ::rtl::OUString( "com.sun.star.text.WebDocument" );
}
- else
- if ( sDocumentService == "global" )
+ else if ( sDocumentService == "global" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
sDocumentService = ::rtl::OUString( "com.sun.star.text.GlobalDocument" );
}
- else
- if ( sDocumentService == "calc" )
+ else if ( sDocumentService == "calc" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
sDocumentService = ::rtl::OUString( "com.sun.star.sheet.SpreadsheetDocument" );
}
- else
- if ( sDocumentService == "draw" )
+ else if ( sDocumentService == "draw" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
sDocumentService = ::rtl::OUString( "com.sun.star.drawing.DrawingDocument" );
}
- else
- if ( sDocumentService == "impress" )
+ else if ( sDocumentService == "impress" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
sDocumentService = ::rtl::OUString( "com.sun.star.presentation.PresentationDocument" );
}
- else
- if ( sDocumentService == "math" )
+ else if ( sDocumentService == "math" )
{
OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!");
sDocumentService = ::rtl::OUString( "com.sun.star.formula.FormulaProperties" );
diff --git a/filter/source/graphicfilter/icgm/class2.cxx b/filter/source/graphicfilter/icgm/class2.cxx
index 44cf6ea..2c9e430 100644
--- a/filter/source/graphicfilter/icgm/class2.cxx
+++ b/filter/source/graphicfilter/icgm/class2.cxx
@@ -99,7 +99,7 @@ void CGM::ImplDoClass2()
{
if ( pElement->eVDCType == VDC_INTEGER )
ImplGetRectangle( pElement->aDeviceViewPort );
- ImplSetMapMode();
+ ImplSetMapMode();
}
break;
case 0x09 : /*Device Viewport Specification Mode*/
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
index f07c497..bc6652d 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
@@ -163,7 +163,6 @@ OUString XMLFilterTabPageXSLT::GetURL( SvtURLBox& rURLBox )
}
else
{
- const OUString aBaseURL ( rURLBox.GetBaseURL() );
osl::FileBase::getFileURLFromSystemPath( aStrPath, aURL );
}
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index eaaf6fa..1b37255 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -235,7 +235,6 @@ const IFunctionDescription* FuncPage::GetFuncDesc( sal_uInt16 nPos ) const
void FuncPage::InitLRUList()
{
- ::std::vector< const IFunctionDescription*> aRUFunctions;
m_pFunctionManager->fillLastRecentlyUsedFunctions(aLRUList);
}
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index e6f35e8..f5e464f 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -2817,29 +2817,21 @@ void AutoRecovery::implts_informListener( sal_Int32 eJ
if ((eJob & AutoRecovery::E_PREPARE_EMERGENCY_SAVE) == AutoRecovery::E_PREPARE_EMERGENCY_SAVE)
sFeature.appendAscii(RTL_CONSTASCII_STRINGPARAM(CMD_DO_PREPARE_EMERGENCY_SAVE));
- else
- if ((eJob & AutoRecovery::E_EMERGENCY_SAVE) == AutoRecovery::E_EMERGENCY_SAVE)
+ else if ((eJob & AutoRecovery::E_EMERGENCY_SAVE) == AutoRecovery::E_EMERGENCY_SAVE)
sFeature.appendAscii(RTL_CONSTASCII_STRINGPARAM(CMD_DO_EMERGENCY_SAVE));
- else
- if ((eJob & AutoRecovery::E_RECOVERY) == AutoRecovery::E_RECOVERY)
+ else if ((eJob & AutoRecovery::E_RECOVERY) == AutoRecovery::E_RECOVERY)
sFeature.appendAscii(RTL_CONSTASCII_STRINGPARAM(CMD_DO_RECOVERY));
- else
- if ((eJob & AutoRecovery::E_SESSION_SAVE) == AutoRecovery::E_SESSION_SAVE)
+ else if ((eJob & AutoRecovery::E_SESSION_SAVE) == AutoRecovery::E_SESSION_SAVE)
sFeature.appendAscii(RTL_CONSTASCII_STRINGPARAM(CMD_DO_SESSION_SAVE));
- else
- if ((eJob & AutoRecovery::E_SESSION_QUIET_QUIT) == AutoRecovery::E_SESSION_QUIET_QUIT)
+ else if ((eJob & AutoRecovery::E_SESSION_QUIET_QUIT) == AutoRecovery::E_SESSION_QUIET_QUIT)
sFeature.appendAscii(RTL_CONSTASCII_STRINGPARAM(CMD_DO_SESSION_QUIET_QUIT));
- else
- if ((eJob & AutoRecovery::E_SESSION_RESTORE) == AutoRecovery::E_SESSION_RESTORE)
+ else if ((eJob & AutoRecovery::E_SESSION_RESTORE) == AutoRecovery::E_SESSION_RESTORE)
sFeature.appendAscii(RTL_CONSTASCII_STRINGPARAM(CMD_DO_SESSION_RESTORE));
- else
- if ((eJob & AutoRecovery::E_ENTRY_BACKUP) == AutoRecovery::E_ENTRY_BACKUP)
+ else if ((eJob & AutoRecovery::E_ENTRY_BACKUP) == AutoRecovery::E_ENTRY_BACKUP)
sFeature.appendAscii(RTL_CONSTASCII_STRINGPARAM(CMD_DO_ENTRY_BACKUP));
- else
- if ((eJob & AutoRecovery::E_ENTRY_CLEANUP) == AutoRecovery::E_ENTRY_CLEANUP)
+ else if ((eJob & AutoRecovery::E_ENTRY_CLEANUP) == AutoRecovery::E_ENTRY_CLEANUP)
sFeature.appendAscii(RTL_CONSTASCII_STRINGPARAM(CMD_DO_ENTRY_CLEANUP));
- else
- if ((eJob & AutoRecovery::E_AUTO_SAVE) == AutoRecovery::E_AUTO_SAVE)
+ else if ((eJob & AutoRecovery::E_AUTO_SAVE) == AutoRecovery::E_AUTO_SAVE)
sFeature.appendAscii(RTL_CONSTASCII_STRINGPARAM(CMD_DO_AUTO_SAVE));
#ifdef ENABLE_WARNINGS
else if ( eJob != AutoRecovery::E_NO_JOB )
diff --git a/helpcompiler/source/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx
index 926a6dd..e679d60 100644
--- a/helpcompiler/source/HelpCompiler.cxx
+++ b/helpcompiler/source/HelpCompiler.cxx
@@ -341,8 +341,7 @@ void myparser::traverse( xmlNodePtr parentNode )
if (documentId.empty())
documentId = hid;
extendedHelpText.push_back(hid);
- std::string foo = anchor.empty() ? hid : hid + "#" + anchor;
- HCDBG(std::cerr << "hid pushback" << foo << std::endl);
+ HCDBG(std::cerr << "hid pushback" << (anchor.empty() ? hid : hid + "#" + anchor) << std::endl);
hidlist->push_back( anchor.empty() ? hid : hid + "#" + anchor);
}
else
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index b4fd937..fe99796 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -1903,12 +1903,12 @@ void HwpReader::makeTableStyle(Table *tbl)
// --------------- cell --------------------- //
for (int i = 0 ; i < static_cast<int>(tbl->cells.size()); i++)
{
- std::list<TCell*>::iterator it = tbl->cells.begin();
+ std::list<TCell*>::iterator it = tbl->cells.begin();
- for( int ii = 0; it != tbl->cells.end(); ++it, ii++ ){
- if( ii == i )
- break;
- }
+ for( int ii = 0; it != tbl->cells.end(); ++it, ii++ ){
+ if( ii == i )
+ break;
+ }
TCell *tcell = *it;
sprintf(buf,"Table%d.%c%d",hbox->style.boxnum, 'A'+ tcell->nColumnIndex, tcell->nRowIndex +1);
@@ -2858,8 +2858,9 @@ void HwpReader::make_text_p3(HWPPara * para,sal_Bool bParaStart)
int curr = para->cshape.index;
if( d->bFirstPara && d->bInBody )
{
- if( !pstart )
+ if ( !pstart ) {
STARTP;
+ }
strcpy(buf,"[ë¬¸ì„œì˜ ì²˜ìŒ]"); /* "Begin of Document" */
padd(ascii("text:name"), sXML_CDATA, OUString(buf, strlen(buf), RTL_TEXTENCODING_UTF8));
rstartEl(ascii("text:bookmark"), rList);
@@ -2869,8 +2870,9 @@ void HwpReader::make_text_p3(HWPPara * para,sal_Bool bParaStart)
}
if( d->bInHeader )
{
- if( !pstart )
+ if ( !pstart ) {
STARTP;
+ }
makeShowPageNum();
d->bInHeader = false;
}
@@ -3451,12 +3453,12 @@ void HwpReader::makeTable(TxtBox * hbox)
int j = -1, k = -1;
for (int i = 0 ; i < static_cast<int>(tbl->cells.size()); i++)
{
- std::list<TCell*>::iterator it = tbl->cells.begin();
+ std::list<TCell*>::iterator it = tbl->cells.begin();
- for( int ii = 0; it != tbl->cells.end(); ++it, ii++ ){
- if( ii == i )
- break;
- }
+ for( int ii = 0; it != tbl->cells.end(); ++it, ii++ ){
+ if( ii == i )
+ break;
+ }
TCell *tcell = *it;
if( tcell->nRowIndex > j )
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 66145ef..75818ad 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -300,8 +300,8 @@ OUString toRoman( sal_Int32 n )
n -= ( nOver1000 * nMask );
OUStringBuffer sTmp;
- while(nOver1000--)
- sTmp.append(sal_Unicode(*coRomanArr));
+ while(nOver1000--)
+ sTmp.append(sal_Unicode(*coRomanArr));
while( nMask )
{
@@ -509,11 +509,11 @@ void lcl_formatCharsGR( sal_Unicode table[], int n, OUString& s )
for (int i = 0; i < myriadPower; i++)
sb.append(MYRIAD_SYM);
- sb.append(gr_smallNum(table, n/divisor));
- n %= divisor;
+ sb.append(gr_smallNum(table, n/divisor));
+ n %= divisor;
- if (n > 0)
- sb.append(DOT_SYM);
+ if (n > 0)
+ sb.append(DOT_SYM);
}
}
sb.append(gr_smallNum(table,n));
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index a8b5ef1..a61804f 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -216,80 +216,124 @@ SvCommand::SvCommand( int argc, char ** argv )
StringList aList;
if( ResponseFile( &aList, argc, argv ) )
- for( size_t i = 1; i < aList.size(); i++ )
{
- String aParam( *aList[ i ] );
- sal_Unicode aFirstChar( aParam.GetChar(0) );
- if( '-' == aFirstChar )
+ for( size_t i = 1; i < aList.size(); i++ )
{
- aParam.Erase( 0, 1 );
- aFirstChar = aParam.GetChar(0);
- if( aFirstChar == 'F' || aFirstChar == 'f' )
+ String aParam( *aList[ i ] );
+ sal_Unicode aFirstChar( aParam.GetChar(0) );
+ if( '-' == aFirstChar )
{
aParam.Erase( 0, 1 );
aFirstChar = aParam.GetChar(0);
- String aName( aParam.Copy( 1 ) );
- if( 's' == aFirstChar )
- { // name of slot output
- aSlotMapFile = aName;
- }
- else if( 'l' == aFirstChar )
- { // name of listing
- aListFile = aName;
- }
- else if( 'i' == aFirstChar )
- {
- }
- else if( 'o' == aFirstChar )
- {
- }
- else if( 'd' == aFirstChar )
- { // name of data set file
- aDataBaseFile = aName;
- }
- else if( 'D' == aFirstChar )
- {
- }
- else if( 'C' == aFirstChar )
- {
- }
- else if( 'H' == aFirstChar )
- {
- }
- else if( 'c' == aFirstChar )
+ if( aFirstChar == 'F' || aFirstChar == 'f' )
{
+ aParam.Erase( 0, 1 );
+ aFirstChar = aParam.GetChar(0);
+ String aName( aParam.Copy( 1 ) );
+ if( 's' == aFirstChar )
+ { // name of slot output
+ aSlotMapFile = aName;
+ }
+ else if( 'l' == aFirstChar )
+ { // name of listing
+ aListFile = aName;
+ }
+ else if( 'i' == aFirstChar )
+ {
+ }
+ else if( 'o' == aFirstChar )
+ {
+ }
+ else if( 'd' == aFirstChar )
+ { // name of data set file
+ aDataBaseFile = aName;
+ }
+ else if( 'D' == aFirstChar )
+ {
+ }
+ else if( 'C' == aFirstChar )
+ {
+ }
+ else if( 'H' == aFirstChar )
+ {
+ }
+ else if( 'c' == aFirstChar )
+ {
+ }
+ else if( 'h' == aFirstChar )
+ {
+ }
+ else if( 't' == aFirstChar )
+ {
+ }
+ else if( 'm' == aFirstChar )
+ { // name of info file
+ aTargetFile = aName;
+ }
+ else if( 'r' == aFirstChar )
+ {
+ }
+ else if( 'z' == aFirstChar )
+ { // name of HelpId file
+ aHelpIdFile = aName;
+ }
+ else if( 'y' == aFirstChar )
+ { // name of CSV file
+ aCSVFile = aName;
+ }
+ else if( 'x' == aFirstChar )
+ { // name of IDL file for the CSV file
+ aExportFile = aName;
+ }
+ else if( 'M' == aFirstChar )
+ {
+ m_DepFile = aName;
+ }
+ else
+ {
+ printf(
+ "unknown switch: %s\n",
+ rtl::OUStringToOString(
+ aParam, RTL_TEXTENCODING_UTF8).getStr());
+ exit( -1 );
+ }
}
- else if( 'h' == aFirstChar )
- {
+ else if( aParam.EqualsIgnoreCaseAscii( "help" ) || aParam.EqualsIgnoreCaseAscii( "?" ) )
+ { // help
+ printf( "%s", CommandLineSyntax );
}
- else if( 't' == aFirstChar )
+ else if( aParam.EqualsIgnoreCaseAscii( "quiet" ) )
{
+ nVerbosity = 0;
}
- else if( 'm' == aFirstChar )
- { // name of info file
- aTargetFile = aName;
- }
- else if( 'r' == aFirstChar )
+ else if( aParam.EqualsIgnoreCaseAscii( "verbose" ) )
{
+ nVerbosity = 2;
}
- else if( 'z' == aFirstChar )
- { // name of HelpId file
- aHelpIdFile = aName;
+ else if( aParam.EqualsIgnoreCaseAscii( "syntax" ) )
+ { // help
+ int j = 0;
+ while(SyntaxStrings[j])
+ printf("%s\n",SyntaxStrings[j++]);
}
- else if( 'y' == aFirstChar )
- { // name of CSV file
- aCSVFile = aName;
+ else if( aParam.EqualsIgnoreCaseAscii( "i", 0, 1 ) )
+ { // define include paths
+ String aName( aParam.Copy( 1 ) );
+ if( aPath.Len() )
+ aPath += DirEntry::GetSearchDelimiter();
+ aPath += aName;
}
- else if( 'x' == aFirstChar )
- { // name of IDL file for the CSV file
- aExportFile = aName;
- }
- else if( 'M' == aFirstChar )
- {
- m_DepFile = aName;
+ else if( aParam.EqualsIgnoreCaseAscii( "rsc", 0, 3 ) )
+ { // first line in *.srs file
+ OSL_ENSURE(false, "does anything use this option, doesn't look like it belong here");
+ if( aList[ i + 1 ] )
+ {
+ i++;
+ }
}
else
{
+ // temporary compatibility hack
printf(
"unknown switch: %s\n",
rtl::OUStringToOString(
@@ -297,53 +341,11 @@ SvCommand::SvCommand( int argc, char ** argv )
exit( -1 );
}
}
- else if( aParam.EqualsIgnoreCaseAscii( "help" ) || aParam.EqualsIgnoreCaseAscii( "?" ) )
- { // help
- printf( "%s", CommandLineSyntax );
- }
- else if( aParam.EqualsIgnoreCaseAscii( "quiet" ) )
- {
- nVerbosity = 0;
- }
- else if( aParam.EqualsIgnoreCaseAscii( "verbose" ) )
- {
- nVerbosity = 2;
- }
- else if( aParam.EqualsIgnoreCaseAscii( "syntax" ) )
- { // help
- int j = 0;
- while(SyntaxStrings[j])
- printf("%s\n",SyntaxStrings[j++]);
- }
- else if( aParam.EqualsIgnoreCaseAscii( "i", 0, 1 ) )
- { // define include paths
- String aName( aParam.Copy( 1 ) );
- if( aPath.Len() )
- aPath += DirEntry::GetSearchDelimiter();
- aPath += aName;
- }
- else if( aParam.EqualsIgnoreCaseAscii( "rsc", 0, 3 ) )
- { // first line in *.srs file
- OSL_ENSURE(false, "does anything use this option, doesn't look like it belong here");
- if( aList[ i + 1 ] )
- {
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list