diff options
| -rw-r--r-- | chart2/source/controller/main/SelectionHelper.cxx | 3 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/HtmlReader.cxx | 5 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/RtfReader.cxx | 5 |
3 files changed, 5 insertions, 8 deletions
diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx index ee54fc8b90a3..fab28f5fbbad 100644 --- a/chart2/source/controller/main/SelectionHelper.cxx +++ b/chart2/source/controller/main/SelectionHelper.cxx @@ -256,14 +256,13 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper* bool bBackGroundHit = m_aSelectedOID.getObjectCID().equals( aPageCID ) || m_aSelectedOID.getObjectCID().equals( aWallCID ) || !m_aSelectedOID.isAutoGeneratedObject(); if( bBackGroundHit ) { - //todo: if more than one diagram is available in future do chack the list of all diagrams here + //todo: if more than one diagram is available in future do check the list of all diagrams here SdrObject* pDiagram = pDrawViewWrapper->getNamedSdrObject( aDiagramCID ); if( pDiagram ) { if( pDrawViewWrapper->IsObjectHit( pDiagram, rMousePos ) ) { m_aSelectedOID = ObjectIdentifier( aDiagramCID ); - pNewObj = pDiagram; } } } diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index fc573d092785..56470b3f3842 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -412,7 +412,6 @@ bool OHTMLReader::CreateTable(int nToken) aTempName = aTempName.getToken(0,' '); aTempName = ::dbtools::createUniqueName(m_xTables, aTempName); - int nTmpToken2 = nToken; bool bCaption = false; bool bTableHeader = false; OUString aColumnName; @@ -423,7 +422,7 @@ bool OHTMLReader::CreateTable(int nToken) sal_Int32 nTextColor = 0; do { - switch(nTmpToken2) + switch(nToken) { case HTML_TEXTTOKEN: case HTML_SINGLECHAR: @@ -492,7 +491,7 @@ bool OHTMLReader::CreateTable(int nToken) break; } } - while((nTmpToken2 = GetNextToken()) != HTML_TABLEROW_OFF); + while( GetNextToken() != HTML_TABLEROW_OFF ); if ( !m_sCurrent.isEmpty() ) aColumnName = m_sCurrent; diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx index f76125642190..4e89f2a7aa57 100644 --- a/dbaccess/source/ui/misc/RtfReader.cxx +++ b/dbaccess/source/ui/misc/RtfReader.cxx @@ -253,13 +253,12 @@ bool ORTFReader::CreateTable(int nToken) aTableName = aTableName.getToken(0,' '); aTableName = ::dbtools::createUniqueName(m_xTables, aTableName); - int nTmpToken2 = nToken; OUString aColumnName; FontDescriptor aFont = VCLUnoHelper::CreateFontDescriptor(Application::GetSettings().GetStyleSettings().GetAppFont()); do { - switch(nTmpToken2) + switch(nToken) { case RTF_UNKNOWNCONTROL: case RTF_UNKNOWNDATA: @@ -303,7 +302,7 @@ bool ORTFReader::CreateTable(int nToken) break; } } - while((nTmpToken2 = GetNextToken()) != RTF_TROWD && eState != SVPAR_ERROR && eState != SVPAR_ACCEPTED); + while( GetNextToken() != RTF_TROWD && eState != SVPAR_ERROR && eState != SVPAR_ACCEPTED ); bool bOk = !m_vDestVector.empty(); if(bOk) |