[Libreoffice-commits] core.git: 11 commits - accessibility/inc accessibility/source basctl/source basic/source connectivity/source cui/source dbaccess/source desktop/source drawinglayer/source editeng/source extensions/source filter/source
Noel Grandin
noel at peralex.com
Wed Mar 23 09:23:07 UTC 2016
accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx | 9
accessibility/source/standard/vclxaccessibletoolbox.cxx | 66 +-
basctl/source/basicide/basides1.cxx | 2
basctl/source/basicide/basidesh.cxx | 4
basctl/source/inc/basidesh.hxx | 2
basic/source/inc/runtime.hxx | 2
basic/source/runtime/runtime.cxx | 10
connectivity/source/drivers/calc/CTable.cxx | 9
connectivity/source/drivers/dbase/DTable.cxx | 31 -
connectivity/source/drivers/file/FResultSet.cxx | 14
connectivity/source/drivers/file/FTable.cxx | 2
connectivity/source/drivers/flat/ETable.cxx | 13
connectivity/source/drivers/hsqldb/HColumns.cxx | 10
connectivity/source/drivers/hsqldb/HTable.cxx | 4
connectivity/source/drivers/mysql/YColumns.cxx | 10
connectivity/source/drivers/mysql/YTable.cxx | 2
connectivity/source/drivers/odbc/OResultSet.cxx | 18
connectivity/source/inc/calc/CTable.hxx | 2
connectivity/source/inc/dbase/DTable.hxx | 4
connectivity/source/inc/file/FTable.hxx | 4
connectivity/source/inc/flat/ETable.hxx | 2
connectivity/source/inc/hsqldb/HColumns.hxx | 4
connectivity/source/inc/mysql/YColumns.hxx | 4
connectivity/source/inc/odbc/OResultSet.hxx | 2
cui/source/options/optfltr.cxx | 9
cui/source/options/optfltr.hxx | 2
dbaccess/source/ui/inc/QueryDesignView.hxx | 2
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 14
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 8
desktop/source/deployment/gui/dp_gui_dialog2.hxx | 2
desktop/source/deployment/manager/dp_activepackages.cxx | 5
desktop/source/deployment/manager/dp_activepackages.hxx | 2
desktop/source/deployment/manager/dp_manager.cxx | 2
drawinglayer/source/processor2d/vclhelperbufferdevice.cxx | 10
drawinglayer/source/processor2d/vclhelperbufferdevice.hxx | 3
drawinglayer/source/processor2d/vclprocessor2d.cxx | 6
editeng/source/editeng/editeng.cxx | 2
editeng/source/editeng/edtspell.cxx | 4
editeng/source/editeng/edtspell.hxx | 2
editeng/source/editeng/impedit.hxx | 6
editeng/source/editeng/impedit2.cxx | 6
editeng/source/editeng/impedit3.cxx | 222 +---------
editeng/source/editeng/impedit4.cxx | 2
extensions/source/bibliography/loadlisteneradapter.cxx | 4
extensions/source/bibliography/loadlisteneradapter.hxx | 3
extensions/source/scanner/grid.cxx | 4
extensions/source/scanner/grid.hxx | 2
filter/source/graphicfilter/idxf/dxf2mtf.cxx | 4
filter/source/graphicfilter/idxf/dxfreprd.cxx | 64 +-
filter/source/graphicfilter/idxf/dxfreprd.hxx | 2
filter/source/msfilter/eschesdo.cxx | 17
filter/source/msfilter/eschesdo.hxx | 5
filter/source/svg/svgwriter.cxx | 80 +--
filter/source/svg/svgwriter.hxx | 10
54 files changed, 247 insertions(+), 487 deletions(-)
New commits:
commit 16611ad233292c838085cb8ee8dad04f6bf5b64d
Author: Noel Grandin <noel at peralex.com>
Date: Wed Mar 23 11:10:15 2016 +0200
loplugin:constantparam in accessiblity
Change-Id: I31c6a6b323d1d58c2304114652ca2881847a5b91
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx
index 3ae3852..c5a5b4d 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx
@@ -39,18 +39,18 @@ class VCLXAccessibleToolBox : public VCLXAccessibleComponent, public VCLXAccessi
private:
ToolBoxItemsMap m_aAccessibleChildren;
- VCLXAccessibleToolBoxItem* GetItem_Impl( sal_Int32 _nPos, bool _bMustHaveFocus );
+ VCLXAccessibleToolBoxItem* GetItem_Impl( sal_Int32 _nPos );
void UpdateFocus_Impl();
void ReleaseFocus_Impl( sal_Int32 _nPos );
void UpdateChecked_Impl( sal_Int32 _nPos );
void UpdateIndeterminate_Impl( sal_Int32 _nPos );
- void UpdateItem_Impl( sal_Int32 _nPos, bool _bItemAdded );
+ void UpdateItem_Impl( sal_Int32 _nPos );
void UpdateAllItems_Impl();
void UpdateItemName_Impl( sal_Int32 _nPos );
void UpdateItemEnabled_Impl( sal_Int32 _nPos );
void UpdateCustomPopupItemp_Impl( vcl::Window* pWindow, bool bOpen );
- void HandleSubToolBarEvent( const VclWindowEvent& rVclWindowEvent, bool _bShow );
+ void HandleSubToolBarEvent( const VclWindowEvent& rVclWindowEvent );
void ReleaseSubToolBox( ToolBox* _pSubToolBox );
protected:
@@ -96,8 +96,7 @@ public:
private:
void implReleaseToolboxItem(
ToolBoxItemsMap::iterator& _rMapPos,
- bool _bNotifyRemoval,
- bool _bDispose
+ bool _bNotifyRemoval
);
};
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index 4654682..1a7095a 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -181,11 +181,11 @@ VCLXAccessibleToolBox::~VCLXAccessibleToolBox()
{
}
-VCLXAccessibleToolBoxItem* VCLXAccessibleToolBox::GetItem_Impl( sal_Int32 _nPos, bool _bMustHaveFocus )
+VCLXAccessibleToolBoxItem* VCLXAccessibleToolBox::GetItem_Impl( sal_Int32 _nPos )
{
VCLXAccessibleToolBoxItem* pItem = nullptr;
VclPtr< ToolBox > pToolBox = GetAs< ToolBox >();
- if ( pToolBox && ( !_bMustHaveFocus || pToolBox->HasFocus() ) )
+ if ( pToolBox )
{
ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.find( _nPos );
// returns only toolbox buttons, not windows
@@ -308,7 +308,7 @@ void VCLXAccessibleToolBox::UpdateIndeterminate_Impl( sal_Int32 _nPos )
}
void VCLXAccessibleToolBox::implReleaseToolboxItem( ToolBoxItemsMap::iterator& _rMapPos,
- bool _bNotifyRemoval, bool _bDispose )
+ bool _bNotifyRemoval )
{
Reference< XAccessible > xItemAcc( _rMapPos->second );
if ( !xItemAcc.is() )
@@ -323,23 +323,19 @@ void VCLXAccessibleToolBox::implReleaseToolboxItem( ToolBoxItemsMap::iterator& _
if ( !OToolBoxWindowItem::isWindowItem( xItemAcc, &pWindowItem ) )
{
static_cast< VCLXAccessibleToolBoxItem* >( xItemAcc.get() )->ReleaseToolBox();
- if ( _bDispose )
- ::comphelper::disposeComponent( xItemAcc );
+ ::comphelper::disposeComponent( xItemAcc );
}
else
{
- if ( _bDispose )
+ if ( pWindowItem )
{
- if ( pWindowItem )
- {
- Reference< XAccessibleContext > xContext( pWindowItem->getContextNoCreate() );
- ::comphelper::disposeComponent( xContext );
- }
+ Reference< XAccessibleContext > xContext( pWindowItem->getContextNoCreate() );
+ ::comphelper::disposeComponent( xContext );
}
}
}
-void VCLXAccessibleToolBox::UpdateItem_Impl( sal_Int32 _nPos, bool _bItemAdded )
+void VCLXAccessibleToolBox::UpdateItem_Impl( sal_Int32 _nPos)
{
if ( _nPos < sal_Int32( m_aAccessibleChildren.size() ) )
{
@@ -350,17 +346,6 @@ void VCLXAccessibleToolBox::UpdateItem_Impl( sal_Int32 _nPos, bool _bItemAdded )
VclPtr< ToolBox > pToolBox = GetAs< ToolBox >();
if ( pToolBox )
{
- if ( !_bItemAdded )
- { // the item was removed
- // -> destroy the old item
- ToolBoxItemsMap::iterator aItemPos = m_aAccessibleChildren.find( _nPos );
- if ( m_aAccessibleChildren.end() != aItemPos )
- {
- implReleaseToolboxItem( aItemPos, true, true );
- m_aAccessibleChildren.erase( aItemPos );
- }
- }
-
// adjust the "index-in-parent"s
ToolBoxItemsMap::iterator aIndexAdjust = m_aAccessibleChildren.upper_bound( _nPos );
while ( m_aAccessibleChildren.end() != aIndexAdjust )
@@ -374,7 +359,7 @@ void VCLXAccessibleToolBox::UpdateItem_Impl( sal_Int32 _nPos, bool _bItemAdded )
if ( pItem )
{
sal_Int32 nIndex = pItem->getIndexInParent( );
- nIndex += (_bItemAdded ? +1 : -1);
+ nIndex++;
pItem->setIndexInParent( nIndex );
}
}
@@ -383,7 +368,7 @@ void VCLXAccessibleToolBox::UpdateItem_Impl( sal_Int32 _nPos, bool _bItemAdded )
if ( pWindowItem )
{
sal_Int32 nIndex = pWindowItem->getIndexInParent( );
- nIndex += (_bItemAdded ? +1 : -1);
+ nIndex++;
pWindowItem->setIndexInParent( nIndex );
}
}
@@ -391,13 +376,10 @@ void VCLXAccessibleToolBox::UpdateItem_Impl( sal_Int32 _nPos, bool _bItemAdded )
++aIndexAdjust;
}
- if ( _bItemAdded )
- {
- // TODO: we should make this dependent on the existence of event listeners
- // with the current implementation, we always create accessible object
- Any aNewChild = makeAny( getAccessibleChild( (sal_Int32)_nPos ) );
- NotifyAccessibleEvent( AccessibleEventId::CHILD, Any(), aNewChild );
- }
+ // TODO: we should make this dependent on the existence of event listeners
+ // with the current implementation, we always create accessible object
+ Any aNewChild = makeAny( getAccessibleChild( (sal_Int32)_nPos ) );
+ NotifyAccessibleEvent( AccessibleEventId::CHILD, Any(), aNewChild );
}
}
@@ -410,7 +392,7 @@ void VCLXAccessibleToolBox::UpdateAllItems_Impl()
for ( ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.begin();
aIter != m_aAccessibleChildren.end(); ++aIter )
{
- implReleaseToolboxItem( aIter, true, true );
+ implReleaseToolboxItem( aIter, true );
}
m_aAccessibleChildren.clear();
@@ -450,19 +432,19 @@ void VCLXAccessibleToolBox::UpdateCustomPopupItemp_Impl( vcl::Window* pWindow, b
void VCLXAccessibleToolBox::UpdateItemName_Impl( sal_Int32 _nPos )
{
- VCLXAccessibleToolBoxItem* pItem = GetItem_Impl( _nPos, false );
+ VCLXAccessibleToolBoxItem* pItem = GetItem_Impl( _nPos );
if ( pItem )
pItem->NameChanged();
}
void VCLXAccessibleToolBox::UpdateItemEnabled_Impl( sal_Int32 _nPos )
{
- VCLXAccessibleToolBoxItem* pItem = GetItem_Impl( _nPos, false );
+ VCLXAccessibleToolBoxItem* pItem = GetItem_Impl( _nPos );
if ( pItem )
pItem->ToggleEnableState();
}
-void VCLXAccessibleToolBox::HandleSubToolBarEvent( const VclWindowEvent& rVclWindowEvent, bool _bShow )
+void VCLXAccessibleToolBox::HandleSubToolBarEvent( const VclWindowEvent& rVclWindowEvent )
{
vcl::Window* pChildWindow = static_cast<vcl::Window *>(rVclWindowEvent.GetData());
VclPtr< ToolBox > pToolBox = GetAs< ToolBox >();
@@ -479,7 +461,7 @@ void VCLXAccessibleToolBox::HandleSubToolBarEvent( const VclWindowEvent& rVclWin
VCLXAccessibleToolBoxItem* pItem =
static_cast< VCLXAccessibleToolBoxItem* >( xItem.get() );
pItem->SetChild( xChild );
- pItem->NotifyChildEvent( xChild, _bShow );
+ pItem->NotifyChildEvent( xChild, true/*_bShow*/ );
}
}
}
@@ -571,7 +553,7 @@ void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindow
break;
case VCLEVENT_TOOLBOX_ITEMADDED :
- UpdateItem_Impl( (sal_Int32)reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData()), true );
+ UpdateItem_Impl( (sal_Int32)reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData()) );
break;
case VCLEVENT_TOOLBOX_ITEMREMOVED :
@@ -587,7 +569,7 @@ void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindow
ToolBoxItemsMap::iterator aAccessiblePos( m_aAccessibleChildren.find( nPos ) );
if ( m_aAccessibleChildren.end() != aAccessiblePos )
{
- implReleaseToolboxItem( aAccessiblePos, false, true );
+ implReleaseToolboxItem( aAccessiblePos, false );
m_aAccessibleChildren.erase (aAccessiblePos);
}
@@ -631,7 +613,7 @@ void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindow
for ( ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.begin();
aIter != m_aAccessibleChildren.end(); ++aIter )
{
- implReleaseToolboxItem( aIter, false, true );
+ implReleaseToolboxItem( aIter, false );
}
m_aAccessibleChildren.clear();
@@ -653,7 +635,7 @@ void VCLXAccessibleToolBox::ProcessWindowChildEvent( const VclWindowEvent& rVclW
if ( xReturn.is() )
NotifyAccessibleEvent( AccessibleEventId::CHILD, Any(), makeAny(xReturn) );
else
- HandleSubToolBarEvent( rVclWindowEvent, true );
+ HandleSubToolBarEvent( rVclWindowEvent );
}
break;
@@ -678,7 +660,7 @@ void SAL_CALL VCLXAccessibleToolBox::disposing()
for ( ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.begin();
aIter != m_aAccessibleChildren.end(); ++aIter )
{
- implReleaseToolboxItem( aIter, false, true );
+ implReleaseToolboxItem( aIter, false );
}
m_aAccessibleChildren.clear();
}
commit c92d8866af8f115c0a43786abda7f08c53999a3a
Author: Noel Grandin <noel at peralex.com>
Date: Wed Mar 23 11:06:31 2016 +0200
loplugin:constantparam in basctl
Change-Id: I08ab924a9bb69bede4247cfe8c50921520a4f4a7
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 9e412f8..b4b5090 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -467,7 +467,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
{
if ( m_aCurLibName.isEmpty() || ( aDocument == m_aCurDocument && aLibName == m_aCurLibName ) )
{
- RemoveWindows( aDocument, aLibName, true );
+ RemoveWindows( aDocument, aLibName );
if ( aDocument == m_aCurDocument && aLibName == m_aCurLibName )
{
m_aCurDocument = ScriptDocument::getApplicationScriptDocument();
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 54c92e6..18ff4da 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -575,7 +575,7 @@ void Shell::CheckWindows()
}
-void Shell::RemoveWindows( const ScriptDocument& rDocument, const OUString& rLibName, bool bDestroy )
+void Shell::RemoveWindows( const ScriptDocument& rDocument, const OUString& rLibName )
{
bool bChangeCurWindow = pCurWin;
std::vector<VclPtr<BaseWindow> > aDeleteVec;
@@ -591,7 +591,7 @@ void Shell::RemoveWindows( const ScriptDocument& rDocument, const OUString& rLib
if ( pWin == pCurWin )
bChangeCurWindow = true;
pWin->StoreData();
- RemoveWindow( pWin, bDestroy, false );
+ RemoveWindow( pWin, true/*bDestroy*/, false );
}
if ( bChangeCurWindow )
SetCurWindow( FindApplicationWindow(), true );
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index 46b0b40..1fb6dd8 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -93,7 +93,7 @@ private:
void InitTabBar();
void InitScrollBars();
void CheckWindows();
- void RemoveWindows( const ScriptDocument& rDocument, const OUString& rLibName, bool bDestroy );
+ void RemoveWindows( const ScriptDocument& rDocument, const OUString& rLibName );
void UpdateWindows();
static void InvalidateBasicIDESlots();
void StoreAllWindowData( bool bPersistent = true );
commit 402572e25c0c9eb1f01c928f2ae422ab62a55ba1
Author: Noel Grandin <noel at peralex.com>
Date: Wed Mar 23 11:05:25 2016 +0200
loplugin:constantparam in basic
Change-Id: I6831cb8628eed76db35070934f62dccb1345ba12
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index b7374ea..ed4cf42 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -339,7 +339,7 @@ class SbiRuntime
// all opcodes with two operands
void StepRTL( sal_uInt32, sal_uInt32 ), StepPUBLIC( sal_uInt32, sal_uInt32 ), StepPUBLIC_P( sal_uInt32, sal_uInt32 );
void StepPUBLIC_Impl( sal_uInt32, sal_uInt32, bool bUsedForClassModule );
- void StepFIND_Impl( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError, bool bLocal, bool bStatic = false );
+ void StepFIND_Impl( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError, bool bStatic = false );
void StepFIND( sal_uInt32, sal_uInt32 ), StepELEM( sal_uInt32, sal_uInt32 );
void StepGLOBAL( sal_uInt32, sal_uInt32 ), StepLOCAL( sal_uInt32, sal_uInt32 );
void StepPARAM( sal_uInt32, sal_uInt32), StepCREATE( sal_uInt32, sal_uInt32 );
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 881c161..412f569 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -3970,19 +3970,19 @@ void SbiRuntime::StepRTL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
}
void SbiRuntime::StepFIND_Impl( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2,
- SbError nNotFound, bool bLocal, bool bStatic )
+ SbError nNotFound, bool bStatic )
{
if( !refLocals )
{
refLocals = new SbxArray;
}
- PushVar( FindElement( pObj, nOp1, nOp2, nNotFound, bLocal, bStatic ) );
+ PushVar( FindElement( pObj, nOp1, nOp2, nNotFound, true/*bLocal*/, bStatic ) );
}
// loading a local/global variable (+StringID+type)
void SbiRuntime::StepFIND( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
- StepFIND_Impl( pMod, nOp1, nOp2, ERRCODE_BASIC_PROC_UNDEFINED, true );
+ StepFIND_Impl( pMod, nOp1, nOp2, ERRCODE_BASIC_PROC_UNDEFINED );
}
// Search inside a class module (CM) to enable global search in time
@@ -3994,7 +3994,7 @@ void SbiRuntime::StepFIND_CM( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
pMod->SetFlag( SbxFlagBits::GlobalSearch );
}
- StepFIND_Impl( pMod, nOp1, nOp2, ERRCODE_BASIC_PROC_UNDEFINED, true );
+ StepFIND_Impl( pMod, nOp1, nOp2, ERRCODE_BASIC_PROC_UNDEFINED);
if( pClassModuleObject )
{
@@ -4004,7 +4004,7 @@ void SbiRuntime::StepFIND_CM( sal_uInt32 nOp1, sal_uInt32 nOp2 )
void SbiRuntime::StepFIND_STATIC( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
- StepFIND_Impl( pMod, nOp1, nOp2, ERRCODE_BASIC_PROC_UNDEFINED, true, true );
+ StepFIND_Impl( pMod, nOp1, nOp2, ERRCODE_BASIC_PROC_UNDEFINED, true );
}
// loading an object-element (+StringID+type)
commit 0eeb811f5e390c82ff85e61ec9909253a0a03d0d
Author: Noel Grandin <noel at peralex.com>
Date: Wed Mar 23 11:02:50 2016 +0200
loplugin:constantparam in connectivity
Change-Id: Idfc7d9709a917ce2ebbc06119a906daf4cee8d48
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index 1c871ad..5fa70b3 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -783,7 +783,7 @@ End:
}
bool OCalcTable::fetchRow( OValueRefRow& _rRow, const OSQLColumns & _rCols,
- bool _bUseTableDefs, bool bRetrieveData )
+ bool bRetrieveData )
{
// read the bookmark
@@ -804,12 +804,7 @@ bool OCalcTable::fetchRow( OValueRefRow& _rRow, const OSQLColumns & _rCols,
{
if ( (_rRow->get())[i]->isBound() )
{
- sal_Int32 nType = 0;
- if ( _bUseTableDefs )
- nType = m_aTypes[i-1];
- else
- (*aIter)->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nType;
-
+ sal_Int32 nType = m_aTypes[i-1];
lcl_SetValue( (_rRow->get())[i]->get(), m_xSheet, m_nStartCol, m_nStartRow, m_bHasHeaders,
m_aNullDate, m_nFilePos, i, nType );
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 2aab28139..928e471 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -778,7 +778,7 @@ sal_Int64 ODbaseTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (R
: ODbaseTable_BASE::getSomething(rId);
}
-bool ODbaseTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool _bUseTableDefs, bool bRetrieveData)
+bool ODbaseTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool bRetrieveData)
{
if (!m_pBuffer)
return false;
@@ -805,16 +805,8 @@ bool ODbaseTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool
// Lengths depending on data type:
sal_Int32 nLen = 0;
sal_Int32 nType = 0;
- if(_bUseTableDefs)
- {
- nLen = m_aPrecisions[i-1];
- nType = m_aTypes[i-1];
- }
- else
- {
- (*aIter)->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)) >>= nLen;
- (*aIter)->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nType;
- }
+ nLen = m_aPrecisions[i-1];
+ nType = m_aTypes[i-1];
switch(nType)
{
@@ -828,10 +820,7 @@ bool ODbaseTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool
nLen = m_aRealFieldLengths[i-1];
break;
case DataType::DECIMAL:
- if(_bUseTableDefs)
- nLen = SvDbaseConverter::ConvertPrecisionToDbase(nLen,m_aScales[i-1]);
- else
- nLen = SvDbaseConverter::ConvertPrecisionToDbase(nLen,getINT32((*aIter)->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))));
+ nLen = SvDbaseConverter::ConvertPrecisionToDbase(nLen,m_aScales[i-1]);
break; // the sign and the comma
case DataType::BINARY:
@@ -1500,7 +1489,7 @@ bool ODbaseTable::DropImpl()
}
-bool ODbaseTable::InsertRow(OValueRefVector& rRow, bool bFlush, const Reference<XIndexAccess>& _xCols)
+bool ODbaseTable::InsertRow(OValueRefVector& rRow, const Reference<XIndexAccess>& _xCols)
{
// fill buffer with blanks
if (!AllocBuffer())
@@ -1542,9 +1531,7 @@ bool ODbaseTable::InsertRow(OValueRefVector& rRow, bool bFlush, const Reference<
m_pFileStream->Seek( 4L );
(*m_pFileStream).WriteUInt32( m_aHeader.db_anz + 1 );
- // if AppendOnly no flush!
- if (bFlush)
- m_pFileStream->Flush();
+ m_pFileStream->Flush();
// raise number if successfully
m_aHeader.db_anz++;
@@ -1598,7 +1585,7 @@ bool ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
OValueRefRow aRow = new OValueRefVector(_rCols.get().size());
- if (!fetchRow(aRow,_rCols,true,true))
+ if (!fetchRow(aRow,_rCols,true))
return false;
Reference<XPropertySet> xCol;
@@ -2542,7 +2529,7 @@ void ODbaseTable::copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos)
bool bOk = seekRow( IResultSetHelper::BOOKMARK, nRowPos+1, nCurPos );
if ( bOk )
{
- bOk = fetchRow( aRow, *m_aColumns, true, true);
+ bOk = fetchRow( aRow, *m_aColumns, true);
if ( bOk && !aRow->isDeleted() ) // copy only not deleted rows
{
// special handling when pos == 0 then we don't have to distinguish between the two rows
@@ -2559,7 +2546,7 @@ void ODbaseTable::copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos)
}
}
}
- bOk = _pNewTable->InsertRow(*aInsertRow,true,_pNewTable->m_pColumns);
+ bOk = _pNewTable->InsertRow(*aInsertRow,_pNewTable->m_pColumns);
SAL_WARN_IF(!bOk, "connectivity.drivers", "Row could not be inserted!"); (void)bOk;
}
else
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index fd27982..49ee0d3 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -536,7 +536,7 @@ void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException, st
// we know that we append new rows at the end
// so we have to know where the end is
(void)m_aSkipDeletedSet.skipDeleted(IResultSetHelper::LAST,1,false);
- m_bRowInserted = m_pTable->InsertRow(*m_aInsertRow, true, m_xColsIdx);
+ m_bRowInserted = m_pTable->InsertRow(*m_aInsertRow, m_xColsIdx);
if(m_bRowInserted && m_pFileSet.is())
{
sal_Int32 nPos = (m_aInsertRow->get())[0]->getValue();
@@ -798,11 +798,11 @@ again:
if (!bEvaluate) // If no evaluation runs, then just fill the results-row
{
- m_pTable->fetchRow(m_aRow,rTableCols, true,bRetrieveData);
+ m_pTable->fetchRow(m_aRow,rTableCols, bRetrieveData);
}
else
{
- m_pTable->fetchRow(m_aEvaluateRow, rTableCols, true,bRetrieveData || bHasRestriction);
+ m_pTable->fetchRow(m_aEvaluateRow, rTableCols, bRetrieveData || bHasRestriction);
if ( ( !m_bShowDeleted
&& m_aEvaluateRow->isDeleted()
@@ -869,7 +869,7 @@ again:
if (bEvaluate)
{
// read the actual result-row
- bOK = m_pTable->fetchRow(m_aEvaluateRow, *(m_pTable->getTableColumns()), true,true);
+ bOK = m_pTable->fetchRow(m_aEvaluateRow, *(m_pTable->getTableColumns()), true);
}
if (bOK)
@@ -884,7 +884,7 @@ again:
bool bOK = true;
if (bEvaluate)
{
- bOK = m_pTable->fetchRow(m_aEvaluateRow, *(m_pTable->getTableColumns()), true,true);
+ bOK = m_pTable->fetchRow(m_aEvaluateRow, *(m_pTable->getTableColumns()), true);
}
if (bOK)
{
@@ -985,7 +985,7 @@ bool OResultSet::Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOff
if (bOK)
{
// read the results again
- m_pTable->fetchRow(m_aRow, *(m_pTable->getTableColumns()), true,bRetrieveData);
+ m_pTable->fetchRow(m_aRow, *(m_pTable->getTableColumns()), bRetrieveData);
// now set the bookmark for outside
*(*m_aRow->get().begin()) = sal_Int32(m_nRowPos + 1);
@@ -1390,7 +1390,7 @@ bool OResultSet::OpenImpl()
m_nRowCountResult = 0;
OSL_ENSURE(m_aAssignValues.is(),"No assign values set!");
- if(!m_pTable->InsertRow(*m_aAssignValues, true,m_xColsIdx))
+ if(!m_pTable->InsertRow(*m_aAssignValues, m_xColsIdx))
{
m_nFilePos = 0;
return false;
diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx
index dbaa935..6f5ce7d 100644
--- a/connectivity/source/drivers/file/FTable.cxx
+++ b/connectivity/source/drivers/file/FTable.cxx
@@ -175,7 +175,7 @@ void SAL_CALL OFileTable::release() throw()
OTable_TYPEDEF::release();
}
-bool OFileTable::InsertRow(OValueRefVector& /*rRow*/, bool /*bFlush*/, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/)
+bool OFileTable::InsertRow(OValueRefVector& /*rRow*/, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/)
{
return false;
}
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 6600515..2db1007 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -577,7 +577,7 @@ sal_Int64 OFlatTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (Ru
: OFlatTable_BASE::getSomething(rId);
}
-bool OFlatTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool bIsTable, bool bRetrieveData)
+bool OFlatTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool bRetrieveData)
{
*(_rRow->get())[0] = m_nFilePos;
@@ -618,16 +618,7 @@ bool OFlatTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool
}
else
{
- sal_Int32 nType = 0;
- if(bIsTable)
- {
- nType = m_aTypes[i-1];
- }
- else
- {
- Reference< XPropertySet> xColumn = *aIter;
- xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nType;
- }
+ sal_Int32 nType = m_aTypes[i-1];
switch(nType)
{
case DataType::TIMESTAMP:
diff --git a/connectivity/source/drivers/hsqldb/HColumns.cxx b/connectivity/source/drivers/hsqldb/HColumns.cxx
index 42bd2a7..a63d829 100644
--- a/connectivity/source/drivers/hsqldb/HColumns.cxx
+++ b/connectivity/source/drivers/hsqldb/HColumns.cxx
@@ -33,22 +33,20 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
OHSQLColumns::OHSQLColumns( ::cppu::OWeakObject& _rParent
- ,bool _bCase
,::osl::Mutex& _rMutex
,const TStringVector &_rVector
- ,bool _bUseHardRef
- ) : OColumnsHelper(_rParent,_bCase,_rMutex,_rVector,_bUseHardRef)
+ ) : OColumnsHelper(_rParent,true/*_bCase*/,_rMutex,_rVector,true/*_bUseHardRef*/)
{
}
Reference< XPropertySet > OHSQLColumns::createDescriptor()
{
- return new OHSQLColumn(true);
+ return new OHSQLColumn;
}
-OHSQLColumn::OHSQLColumn( bool _bCase)
- : connectivity::sdbcx::OColumn( _bCase )
+OHSQLColumn::OHSQLColumn()
+ : connectivity::sdbcx::OColumn( true/*_bCase*/ )
{
construct();
}
diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx
index 8727c15..ef8d674 100644
--- a/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/connectivity/source/drivers/hsqldb/HTable.cxx
@@ -111,7 +111,7 @@ void OHSQLTable::construct()
sdbcx::OCollection* OHSQLTable::createColumns(const TStringVector& _rNames)
{
- OHSQLColumns* pColumns = new OHSQLColumns(*this,true,m_aMutex,_rNames);
+ OHSQLColumns* pColumns = new OHSQLColumns(*this,m_aMutex,_rNames);
pColumns->setParent(this);
return pColumns;
}
@@ -280,7 +280,7 @@ void OHSQLTable::alterColumnType(sal_Int32 nNewType,const OUString& _rColName, c
(void)_rColName;
#endif
- OHSQLColumn* pColumn = new OHSQLColumn(true);
+ OHSQLColumn* pColumn = new OHSQLColumn;
Reference<XPropertySet> xProp = pColumn;
::comphelper::copyProperties(_xDescriptor,xProp);
xProp->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE),makeAny(nNewType));
diff --git a/connectivity/source/drivers/mysql/YColumns.cxx b/connectivity/source/drivers/mysql/YColumns.cxx
index 2f380e50..2864f5b 100644
--- a/connectivity/source/drivers/mysql/YColumns.cxx
+++ b/connectivity/source/drivers/mysql/YColumns.cxx
@@ -33,22 +33,20 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
OMySQLColumns::OMySQLColumns( ::cppu::OWeakObject& _rParent
- ,bool _bCase
,::osl::Mutex& _rMutex
,const TStringVector &_rVector
- ,bool _bUseHardRef
- ) : OColumnsHelper(_rParent,_bCase,_rMutex,_rVector,_bUseHardRef)
+ ) : OColumnsHelper(_rParent,true/*_bCase*/,_rMutex,_rVector,true/*_bUseHardRef*/)
{
}
Reference< XPropertySet > OMySQLColumns::createDescriptor()
{
- return new OMySQLColumn(true);
+ return new OMySQLColumn;
}
-OMySQLColumn::OMySQLColumn( bool _bCase)
- : connectivity::sdbcx::OColumn( _bCase )
+OMySQLColumn::OMySQLColumn()
+ : connectivity::sdbcx::OColumn( true )
{
construct();
}
diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx
index 8e154d4..bdece3d 100644
--- a/connectivity/source/drivers/mysql/YTable.cxx
+++ b/connectivity/source/drivers/mysql/YTable.cxx
@@ -130,7 +130,7 @@ void OMySQLTable::construct()
sdbcx::OCollection* OMySQLTable::createColumns(const TStringVector& _rNames)
{
- OMySQLColumns* pColumns = new OMySQLColumns(*this,true,m_aMutex,_rNames);
+ OMySQLColumns* pColumns = new OMySQLColumns(*this,m_aMutex,_rNames);
pColumns->setParent(this);
return pColumns;
}
diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx
index 5a2b122..7c089cf 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -726,28 +726,28 @@ void SAL_CALL OResultSet::close( ) throw(SQLException, RuntimeException, std::e
sal_Bool SAL_CALL OResultSet::first( ) throw(SQLException, RuntimeException, std::exception)
{
- return moveImpl(IResultSetHelper::FIRST,0,true);
+ return moveImpl(IResultSetHelper::FIRST,0);
}
sal_Bool SAL_CALL OResultSet::last( ) throw(SQLException, RuntimeException, std::exception)
{
- return moveImpl(IResultSetHelper::LAST,0,true);
+ return moveImpl(IResultSetHelper::LAST,0);
}
sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception)
{
- return moveImpl(IResultSetHelper::ABSOLUTE1,row,true);
+ return moveImpl(IResultSetHelper::ABSOLUTE1,row);
}
sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception)
{
- return moveImpl(IResultSetHelper::RELATIVE1,row,true);
+ return moveImpl(IResultSetHelper::RELATIVE1,row);
}
sal_Bool SAL_CALL OResultSet::previous( ) throw(SQLException, RuntimeException, std::exception)
{
- return moveImpl(IResultSetHelper::PRIOR,0,true);
+ return moveImpl(IResultSetHelper::PRIOR,0);
}
Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException, RuntimeException, std::exception)
@@ -792,7 +792,7 @@ sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeExceptio
sal_Bool SAL_CALL OResultSet::next( ) throw(SQLException, RuntimeException, std::exception)
{
- return moveImpl(IResultSetHelper::NEXT,1,true);
+ return moveImpl(IResultSetHelper::NEXT,1);
}
@@ -1763,13 +1763,13 @@ bool OResultSet::isRowDeleted() const
return m_pRowStatusArray[0] == SQL_ROW_DELETED;
}
-bool OResultSet::moveImpl(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, bool _bRetrieveData)
+bool OResultSet::moveImpl(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset)
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
return (m_pSkipDeletedSet != nullptr)
- ? m_pSkipDeletedSet->skipDeleted(_eCursorPosition,_nOffset,_bRetrieveData)
- : move(_eCursorPosition,_nOffset,_bRetrieveData);
+ ? m_pSkipDeletedSet->skipDeleted(_eCursorPosition,_nOffset,true/*_bRetrieveData*/)
+ : move(_eCursorPosition,_nOffset,true/*_bRetrieveData*/);
}
void OResultSet::fillNeededData(SQLRETURN _nRet)
diff --git a/connectivity/source/inc/calc/CTable.hxx b/connectivity/source/inc/calc/CTable.hxx
index afbbc6a..26683cd 100644
--- a/connectivity/source/inc/calc/CTable.hxx
+++ b/connectivity/source/inc/calc/CTable.hxx
@@ -74,7 +74,7 @@ namespace connectivity
virtual sal_Int32 getCurrentLastPos() const override;
virtual bool seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Int32& nCurPos) override;
- virtual bool fetchRow(OValueRefRow& _rRow, const OSQLColumns& _rCols, bool _bUseTableDefs, bool bRetrieveData) override;
+ virtual bool fetchRow(OValueRefRow& _rRow, const OSQLColumns& _rCols, bool bRetrieveData) override;
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
//XTypeProvider
diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx
index 0fdea0c..79a61d8 100644
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -140,7 +140,7 @@ namespace connectivity
virtual sal_Int32 getCurrentLastPos() const override;
virtual bool seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Int32& nCurPos) override;
- virtual bool fetchRow(OValueRefRow& _rRow,const OSQLColumns& _rCols, bool _bUseTableDefs, bool bRetrieveData) override;
+ virtual bool fetchRow(OValueRefRow& _rRow,const OSQLColumns& _rCols, bool bRetrieveData) override;
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
//XTypeProvider
@@ -160,7 +160,7 @@ namespace connectivity
bool CreateImpl();
- virtual bool InsertRow(OValueRefVector& rRow, bool bFlush, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols) override;
+ virtual bool InsertRow(OValueRefVector& rRow, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols) override;
virtual bool DeleteRow(const OSQLColumns& _rCols) override;
virtual bool UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols) override;
diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx
index 7180300..5e3229b 100644
--- a/connectivity/source/inc/file/FTable.hxx
+++ b/connectivity/source/inc/file/FTable.hxx
@@ -74,10 +74,10 @@ namespace connectivity
virtual sal_Int32 getCurrentLastPos() const {return -1;}
virtual bool seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Int32& nCurPos) = 0;
- virtual bool fetchRow(OValueRefRow& _rRow, const OSQLColumns& _rCols, bool _bUseTableDefs, bool bRetrieveData) = 0;
+ virtual bool fetchRow(OValueRefRow& _rRow, const OSQLColumns& _rCols, bool bRetrieveData) = 0;
::rtl::Reference<OSQLColumns> getTableColumns() const {return m_aColumns;}
- virtual bool InsertRow(OValueRefVector& rRow, bool bFlush, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
+ virtual bool InsertRow(OValueRefVector& rRow, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
virtual bool DeleteRow(const OSQLColumns& _rCols);
virtual bool UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
virtual void addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& descriptor);
diff --git a/connectivity/source/inc/flat/ETable.hxx b/connectivity/source/inc/flat/ETable.hxx
index 7769a2b..4e0e9a2 100644
--- a/connectivity/source/inc/flat/ETable.hxx
+++ b/connectivity/source/inc/flat/ETable.hxx
@@ -88,7 +88,7 @@ namespace connectivity
void construct() override; // can throw any exception
virtual bool seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Int32& nCurPos) override;
- virtual bool fetchRow(OValueRefRow& _rRow, const OSQLColumns& _rCols, bool bIsTable, bool bRetrieveData) override;
+ virtual bool fetchRow(OValueRefRow& _rRow, const OSQLColumns& _rCols, bool bRetrieveData) override;
virtual void refreshHeader() override;
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
diff --git a/connectivity/source/inc/hsqldb/HColumns.hxx b/connectivity/source/inc/hsqldb/HColumns.hxx
index c25c3e3..4ccedf9 100644
--- a/connectivity/source/inc/hsqldb/HColumns.hxx
+++ b/connectivity/source/inc/hsqldb/HColumns.hxx
@@ -31,10 +31,8 @@ namespace connectivity
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor() override;
public:
OHSQLColumns( ::cppu::OWeakObject& _rParent
- ,bool _bCase
,::osl::Mutex& _rMutex
,const TStringVector &_rVector
- ,bool _bUseHardRef = true
);
};
@@ -51,7 +49,7 @@ namespace connectivity
virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
public:
- OHSQLColumn(bool _bCase);
+ OHSQLColumn();
virtual void construct() override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
diff --git a/connectivity/source/inc/mysql/YColumns.hxx b/connectivity/source/inc/mysql/YColumns.hxx
index 876701d..db5f105 100644
--- a/connectivity/source/inc/mysql/YColumns.hxx
+++ b/connectivity/source/inc/mysql/YColumns.hxx
@@ -31,10 +31,8 @@ namespace connectivity
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor() override;
public:
OMySQLColumns( ::cppu::OWeakObject& _rParent
- ,bool _bCase
,::osl::Mutex& _rMutex
,const TStringVector &_rVector
- ,bool _bUseHardRef = true
);
};
@@ -51,7 +49,7 @@ namespace connectivity
virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
public:
- OMySQLColumn(bool _bCase);
+ OMySQLColumn();
virtual void construct() override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx
index 448e16f..7cb58db 100644
--- a/connectivity/source/inc/odbc/OResultSet.hxx
+++ b/connectivity/source/inc/odbc/OResultSet.hxx
@@ -170,7 +170,7 @@ namespace connectivity
void releaseBuffer();
void updateValue(sal_Int32 columnIndex,SQLSMALLINT _nType,void* _pValue) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
void fillNeededData(SQLRETURN _nRet);
- bool moveImpl(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, bool _bRetrieveData);
+ bool moveImpl(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset);
TVoidPtr allocBindColumn(sal_Int32 _nType,sal_Int32 _nColumnIndex);
SQLRETURN unbind(bool _bUnbindHandle = true);
SWORD impl_getColumnType_nothrow(sal_Int32 columnIndex);
commit 6dc6b7914057934fcab41212472bdee51a48079b
Author: Noel Grandin <noel at peralex.com>
Date: Wed Mar 23 10:52:46 2016 +0200
loplugin:constantparam in cui
Change-Id: Ia495bf0810355c7c74fd7de17759432832ea6711
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 937eed4..2bf67f9 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -276,7 +276,7 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet* )
InsertEntry( sChgToFromCalc, static_cast< sal_IntPtr >( Calc ) );
if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::IMPRESS ) )
InsertEntry( sChgToFromImpress, static_cast< sal_IntPtr >( Impress ) );
- InsertEntry( sChgToFromSmartArt, static_cast< sal_IntPtr >( SmartArt ), true, false );
+ InsertEntry( sChgToFromSmartArt, static_cast< sal_IntPtr >( SmartArt ), false );
static struct ChkCBoxEntries{
MSFltrPg2_CheckBoxEntries eType;
@@ -325,11 +325,11 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet* )
void OfaMSFilterTabPage2::InsertEntry( const OUString& _rTxt, sal_IntPtr _nType )
{
- InsertEntry( _rTxt, _nType, true, true );
+ InsertEntry( _rTxt, _nType, true );
}
void OfaMSFilterTabPage2::InsertEntry( const OUString& _rTxt, sal_IntPtr _nType,
- bool loadEnabled, bool saveEnabled )
+ bool saveEnabled )
{
SvTreeListEntry* pEntry = new SvTreeListEntry;
@@ -339,8 +339,7 @@ void OfaMSFilterTabPage2::InsertEntry( const OUString& _rTxt, sal_IntPtr _nType,
pEntry->AddItem(std::unique_ptr<SvLBoxContextBmp>(
new SvLBoxContextBmp(Image(), Image(), false)));
pEntry->AddItem(std::unique_ptr<SvLBoxButton>(
- new SvLBoxButton(loadEnabled ? SvLBoxButtonKind::EnabledCheckbox
- : SvLBoxButtonKind::DisabledCheckbox,
+ new SvLBoxButton(SvLBoxButtonKind::EnabledCheckbox,
pCheckButtonData)));
pEntry->AddItem(std::unique_ptr<SvLBoxButton>(
new SvLBoxButton(saveEnabled ? SvLBoxButtonKind::EnabledCheckbox
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index 1607a52..ac825b7 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -92,7 +92,7 @@ class OfaMSFilterTabPage2 : public SfxTabPage
void InsertEntry( const OUString& _rTxt, sal_IntPtr _nType );
void InsertEntry( const OUString& _rTxt, sal_IntPtr _nType,
- bool loadEnabled, bool saveEnabled );
+ bool saveEnabled );
SvTreeListEntry* GetEntry4Type( sal_IntPtr _nType ) const;
public:
commit 26d02747847a8ec9745713d7e2409c72b5fd7138
Author: Noel Grandin <noel at peralex.com>
Date: Wed Mar 23 10:50:37 2016 +0200
loplugin:constantparam in dbaccess
Change-Id: I81c1385ec6881fe9b8f75b5506268f5e7b03e2cb
diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx
index 82b1b61..743b33d 100644
--- a/dbaccess/source/ui/inc/QueryDesignView.hxx
+++ b/dbaccess/source/ui/inc/QueryDesignView.hxx
@@ -108,7 +108,7 @@ namespace dbaui
css::lang::Locale getLocale() const { return m_aLocale;}
OUString getDecimalSeparator() const { return m_sDecimalSep;}
- SqlParseError InsertField( const OTableFieldDescRef& rInfo, bool bVis = true, bool bActivate = true);
+ SqlParseError InsertField( const OTableFieldDescRef& rInfo, bool bActivate = true);
bool HasFieldByAliasName(const OUString& rFieldName, OTableFieldDescRef& rInfo) const;
// save the position of the table window and the pos of the splitters
// called when fields are deleted
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 00d4b66..bee37f8 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2107,7 +2107,7 @@ namespace
OTableFieldDescRef aInfo = new OTableFieldDesc();
if (pTabWin->ExistsField( "*", aInfo ))
{
- eErrorCode = _pView->InsertField(aInfo, true, bFirstField);
+ eErrorCode = _pView->InsertField(aInfo, bFirstField);
bFirstField = false;
}
}
@@ -2165,7 +2165,7 @@ namespace
if (SQL_ISRULE(pColumnRef,column_ref))
{
InsertColumnRef(_pView,pColumnRef,aColumnName,aColumnAlias,aTableRange,aInfo,pTabList);
- eErrorCode = _pView->InsertField(aInfo, true, bFirstField);
+ eErrorCode = _pView->InsertField(aInfo, bFirstField);
bFirstField = false;
}
else if(SQL_ISRULEOR3(pColumnRef, general_set_fct, set_fct_spec, position_exp) ||
@@ -2244,7 +2244,7 @@ namespace
else
aInfo->SetFunctionType(nFunctionType|FKT_OTHER);
- eErrorCode = _pView->InsertField(aInfo, true, bFirstField);
+ eErrorCode = _pView->InsertField(aInfo, bFirstField);
bFirstField = false;
}
else
@@ -2272,7 +2272,7 @@ namespace
aInfo->SetFieldAlias(aColumnAlias);
aInfo->SetFunctionType(FKT_NUMERIC | FKT_OTHER);
- eErrorCode = _pView->InsertField(aInfo, true, bFirstField);
+ eErrorCode = _pView->InsertField(aInfo, bFirstField);
bFirstField = false;
}
@@ -2717,9 +2717,9 @@ bool OQueryDesignView::HasFieldByAliasName(const OUString& rFieldName, OTableFie
return m_pSelectionBox->HasFieldByAliasName( rFieldName, rInfo);
}
-SqlParseError OQueryDesignView::InsertField( const OTableFieldDescRef& rInfo, bool bVis, bool bActivate)
+SqlParseError OQueryDesignView::InsertField( const OTableFieldDescRef& rInfo, bool bActivate)
{
- return m_pSelectionBox->InsertField( rInfo, BROWSER_INVALIDID,bVis, bActivate ).is() ? eOk : eTooManyColumns;
+ return m_pSelectionBox->InsertField( rInfo, BROWSER_INVALIDID, true/*bVis*/, bActivate ).is() ? eOk : eTooManyColumns;
}
sal_Int32 OQueryDesignView::getColWidth(sal_uInt16 _nColPos) const
@@ -3139,7 +3139,7 @@ void OQueryDesignView::initByFieldDescriptions( const Sequence< PropertyValue >&
{
::rtl::Reference< OTableFieldDesc > pField( new OTableFieldDesc() );
pField->Load( *field, true );
- InsertField( pField, true, false );
+ InsertField( pField, false );
}
rController.ClearUndoManager();
commit 46377531593cf3484f4b48c5398a03bbaaf0d053
Author: Noel Grandin <noel at peralex.com>
Date: Wed Mar 23 10:43:26 2016 +0200
loplugin:constantparam in desktop
Change-Id: I9c7cab31a37214479e3f66d4b8a71de75a50f2e0
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index fcdbde1..95b652d 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -650,12 +650,12 @@ bool DialogHelper::installForAllUsers( bool &bInstallForAll ) const
return true;
}
-void DialogHelper::PostUserEvent( const Link<void*,void>& rLink, void* pCaller, bool bReferenceLink )
+void DialogHelper::PostUserEvent( const Link<void*,void>& rLink, void* pCaller )
{
if ( m_nEventID )
Application::RemoveUserEvent( m_nEventID );
- m_nEventID = Application::PostUserEvent( rLink, pCaller, bReferenceLink );
+ m_nEventID = Application::PostUserEvent( rLink, pCaller, true/*bReferenceLink*/ );
}
// ExtMgrDialog
@@ -1009,7 +1009,7 @@ void ExtMgrDialog::showProgress( bool _bStart )
OSL_TRACE( "showProgress stop!" );
}
- DialogHelper::PostUserEvent( LINK( this, ExtMgrDialog, startProgress ), reinterpret_cast<void*>(bStart), true );
+ DialogHelper::PostUserEvent( LINK( this, ExtMgrDialog, startProgress ), reinterpret_cast<void*>(bStart) );
}
@@ -1318,7 +1318,7 @@ void UpdateRequiredDialog::showProgress( bool _bStart )
OSL_TRACE( "showProgress stop!" );
}
- DialogHelper::PostUserEvent( LINK( this, UpdateRequiredDialog, startProgress ), reinterpret_cast<void*>(bStart), true );
+ DialogHelper::PostUserEvent( LINK( this, UpdateRequiredDialog, startProgress ), reinterpret_cast<void*>(bStart) );
}
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 4fd0035..82616dd 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -68,7 +68,7 @@ public:
void openWebBrowser( const OUString & sURL, const OUString & sTitle ) const;
Dialog* getWindow() const { return m_pVCLWindow; };
- void PostUserEvent( const Link<void*,void>& rLink, void* pCaller, bool bReferenceLink = false );
+ void PostUserEvent( const Link<void*,void>& rLink, void* pCaller );
void clearEventID() { m_nEventID = nullptr; }
virtual void showProgress( bool bStart ) = 0;
diff --git a/desktop/source/deployment/manager/dp_activepackages.cxx b/desktop/source/deployment/manager/dp_activepackages.cxx
index 6e227cb..83bb347 100644
--- a/desktop/source/deployment/manager/dp_activepackages.cxx
+++ b/desktop/source/deployment/manager/dp_activepackages.cxx
@@ -116,13 +116,12 @@ namespace dp_manager {
ActivePackages::ActivePackages() {}
-ActivePackages::ActivePackages(OUString const & url, bool readOnly)
+ActivePackages::ActivePackages(OUString const & url)
#if HAVE_FEATURE_EXTENSIONS
- : m_map(url, readOnly)
+ : m_map(url, false/*readOnly*/)
#endif
{
(void) url;
- (void) readOnly;
}
ActivePackages::~ActivePackages() {}
diff --git a/desktop/source/deployment/manager/dp_activepackages.hxx b/desktop/source/deployment/manager/dp_activepackages.hxx
index 4f83d0a..70770ba 100644
--- a/desktop/source/deployment/manager/dp_activepackages.hxx
+++ b/desktop/source/deployment/manager/dp_activepackages.hxx
@@ -65,7 +65,7 @@ public:
ActivePackages();
- ActivePackages(OUString const & url, bool readOnly);
+ ActivePackages(OUString const & url);
~ActivePackages();
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 46d327f..1cd7349 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -172,7 +172,7 @@ void PackageManagerImpl::initActivationLayer(
dbName = m_registrationData_expanded + "/extensions.pmap";
}
// The data base can always be written because it is always in the user installation
- m_activePackagesDB.reset( new ActivePackages( dbName, false ) );
+ m_activePackagesDB.reset( new ActivePackages( dbName ) );
if (! m_readOnly && ! (m_context == "bundled"))
{
commit 1900790736610f71b12c5f0b260672b090b0701c
Author: Noel Grandin <noel at peralex.com>
Date: Wed Mar 23 10:40:09 2016 +0200
loplugin:constantparam in drawinglayer
Change-Id: I93b14a4ced909fa87bc3ad69d6fe9741a218018f
diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
index c0e0db7..9519507 100644
--- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
@@ -248,8 +248,7 @@ namespace drawinglayer
impBufferDevice::impBufferDevice(
OutputDevice& rOutDev,
- const basegfx::B2DRange& rRange,
- bool bAddOffsetToMapping)
+ const basegfx::B2DRange& rRange)
: mrOutDev(rOutDev),
mpContent(nullptr),
mpMask(nullptr),
@@ -287,11 +286,8 @@ namespace drawinglayer
MapMode aNewMapMode(mrOutDev.GetMapMode());
- if(bAddOffsetToMapping)
- {
- const Point aLogicTopLeft(mrOutDev.PixelToLogic(maDestPixel.TopLeft()));
- aNewMapMode.SetOrigin(Point(-aLogicTopLeft.X(), -aLogicTopLeft.Y()));
- }
+ const Point aLogicTopLeft(mrOutDev.PixelToLogic(maDestPixel.TopLeft()));
+ aNewMapMode.SetOrigin(Point(-aLogicTopLeft.X(), -aLogicTopLeft.Y()));
mpContent->SetMapMode(aNewMapMode);
diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx
index b56cf58..6dcd5d8 100644
--- a/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx
+++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx
@@ -43,8 +43,7 @@ namespace drawinglayer
public:
impBufferDevice(
OutputDevice& rOutDev,
- const basegfx::B2DRange& rRange,
- bool bAddOffsetToMapping);
+ const basegfx::B2DRange& rRange);
~impBufferDevice();
void paint(double fTrans = 0.0);
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index bfb5e46..e6ce0f5 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -856,7 +856,7 @@ namespace drawinglayer
{
aMask.transform(maCurrentTransformation);
const basegfx::B2DRange aRange(basegfx::tools::getRange(aMask));
- impBufferDevice aBufferDevice(*mpOutputDevice, aRange, true);
+ impBufferDevice aBufferDevice(*mpOutputDevice, aRange);
if(aBufferDevice.isVisible())
{
@@ -933,7 +933,7 @@ namespace drawinglayer
// transparence is in visible range
basegfx::B2DRange aRange(rTransCandidate.getChildren().getB2DRange(getViewInformation2D()));
aRange.transform(maCurrentTransformation);
- impBufferDevice aBufferDevice(*mpOutputDevice, aRange, true);
+ impBufferDevice aBufferDevice(*mpOutputDevice, aRange);
if(aBufferDevice.isVisible())
{
@@ -962,7 +962,7 @@ namespace drawinglayer
{
basegfx::B2DRange aRange(rTransCandidate.getChildren().getB2DRange(getViewInformation2D()));
aRange.transform(maCurrentTransformation);
- impBufferDevice aBufferDevice(*mpOutputDevice, aRange, true);
+ impBufferDevice aBufferDevice(*mpOutputDevice, aRange);
if(aBufferDevice.isVisible())
{
commit 168efab3c49b14f17bf455e74b8a9f153f5534a9
Author: Noel Grandin <noel at peralex.com>
Date: Wed Mar 23 10:39:00 2016 +0200
loplugin:constantparam in editeng
Change-Id: I50ee4a0a3403cbed2aa8cdd6daaa951c9d0dad37
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 64b5a6d..09e4b2d 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1269,7 +1269,7 @@ bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, v
}
else
{
- aCurSel = pImpEditEngine->InsertText( (const EditSelection&)aCurSel, nCharCode, !pEditView->IsInsertMode(), true );
+ aCurSel = pImpEditEngine->InsertTextUserInput( (const EditSelection&)aCurSel, nCharCode, !pEditView->IsInsertMode() );
}
// AutoComplete ???
if ( pImpEditEngine->GetStatus().DoAutoComplete() && ( nCharCode != ' ' ) )
diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx
index 25efa4f..21cdf56 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -41,8 +41,8 @@ using namespace com::sun::star::linguistic2;
EditSpellWrapper::EditSpellWrapper( vcl::Window* _pWin,
- bool bIsStart, bool bIsAllRight, EditView* pView ) :
- SvxSpellWrapper( _pWin, bIsStart, bIsAllRight )
+ bool bIsStart, EditView* pView ) :
+ SvxSpellWrapper( _pWin, bIsStart, false/*bIsAllRight*/ )
{
SAL_WARN_IF( !pView, "editeng", "One view has to be abandoned!" );
// Keep IgnoreList, delete ReplaceList...
diff --git a/editeng/source/editeng/edtspell.hxx b/editeng/source/editeng/edtspell.hxx
index 6ce5768..659cbec 100644
--- a/editeng/source/editeng/edtspell.hxx
+++ b/editeng/source/editeng/edtspell.hxx
@@ -55,7 +55,7 @@ protected:
public:
EditSpellWrapper( vcl::Window* pWin,
bool bIsStart,
- bool bIsAllRight, EditView* pView );
+ EditView* pView );
};
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index bfbe38e..ff7d328 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -554,7 +554,7 @@ private:
void CreateTextPortions( ParaPortion* pParaPortion, sal_Int32& rStartPos /*, sal_Bool bCreateBlockPortions */ );
void RecalcTextPortion( ParaPortion* pParaPortion, sal_Int32 nStartPos, sal_Int32 nNewChars );
sal_Int32 SplitTextPortion( ParaPortion* pParaPortion, sal_Int32 nPos, EditLine* pCurLine = nullptr );
- void SeekCursor( ContentNode* pNode, sal_Int32 nPos, SvxFont& rFont, OutputDevice* pOut = nullptr, sal_uInt16 nIgnoreWhich = 0 );
+ void SeekCursor( ContentNode* pNode, sal_Int32 nPos, SvxFont& rFont, OutputDevice* pOut = nullptr );
void RecalcFormatterFontMetrics( FormatterFontMetric& rCurMetrics, SvxFont& rFont );
void CheckAutoPageSize();
@@ -742,7 +742,7 @@ public:
void FormatDoc();
void FormatFullDoc();
void UpdateViews( EditView* pCurView = nullptr );
- void Paint( ImpEditView* pView, const Rectangle& rRect, OutputDevice* pTargetDevice = nullptr, bool bUseVirtDev = false );
+ void Paint( ImpEditView* pView, const Rectangle& rRect, OutputDevice* pTargetDevice = nullptr );
void Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aStartPos, bool bStripOnly = false, short nOrientation = 0 );
bool MouseButtonUp( const MouseEvent& rMouseEvent, EditView* pView );
@@ -778,7 +778,7 @@ public:
void SetText(const OUString& rText);
EditPaM DeleteSelected(const EditSelection& rEditSelection);
- EditPaM InsertText( const EditSelection& rCurEditSelection, sal_Unicode c, bool bOverwrite, bool bIsUserInput = false );
+ EditPaM InsertTextUserInput( const EditSelection& rCurEditSelection, sal_Unicode c, bool bOverwrite );
EditPaM InsertText(const EditSelection& aCurEditSelection, const OUString& rStr);
EditPaM AutoCorrect( const EditSelection& rCurEditSelection, sal_Unicode c, bool bOverwrite, vcl::Window* pFrameWin = nullptr );
EditPaM DeleteLeftOrRight( const EditSelection& rEditSelection, sal_uInt8 nMode, sal_uInt8 nDelMode = DELMODE_SIMPLE );
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index caa34e1..ce82d71 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2528,8 +2528,8 @@ EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, sal_Unicode c,
}
-EditPaM ImpEditEngine::InsertText( const EditSelection& rCurSel,
- sal_Unicode c, bool bOverwrite, bool bIsUserInput )
+EditPaM ImpEditEngine::InsertTextUserInput( const EditSelection& rCurSel,
+ sal_Unicode c, bool bOverwrite )
{
OSL_ENSURE( c != '\t', "Tab for InsertText ?" );
OSL_ENSURE( c != '\n', "Word wrapping for InsertText ?");
@@ -2559,7 +2559,7 @@ EditPaM ImpEditEngine::InsertText( const EditSelection& rCurSel,
if ( aPaM.GetNode()->Len() < MAXCHARSINPARA )
{
- if (bIsUserInput && IsInputSequenceCheckingRequired( c, rCurSel ))
+ if (IsInputSequenceCheckingRequired( c, rCurSel ))
{
uno::Reference < i18n::XExtendedInputSequenceChecker > _xISC( ImplGetInputSequenceChecker() );
if (!pCTLOptions)
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index ac74c7c..07285a9 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -84,8 +84,6 @@ using namespace ::com::sun::star::linguistic2;
#define CH_HYPH '-'
-#define RESDIFF 10
-
#define WRONG_SHOW_MIN 5
struct TabInfo
@@ -2573,7 +2571,7 @@ void ImpEditEngine::SetFixedCellHeight( bool bUseFixedCellHeight )
}
}
-void ImpEditEngine::SeekCursor( ContentNode* pNode, sal_Int32 nPos, SvxFont& rFont, OutputDevice* pOut, sal_uInt16 nIgnoreWhich )
+void ImpEditEngine::SeekCursor( ContentNode* pNode, sal_Int32 nPos, SvxFont& rFont, OutputDevice* pOut )
{
// It was planned, SeekCursor( nStartPos, nEndPos, ... ), so that it would
// only be searched anew at the StartPosition.
@@ -2644,7 +2642,7 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, sal_Int32 nPos, SvxFont& rFo
// are considered (used) as these are just set. But do not use empty
// attributes: When just set and empty => no effect on font
// In a blank paragraph, set characters take effect immediately.
- if ( ( pAttrib->Which() != nIgnoreWhich ) &&
+ if ( ( pAttrib->Which() != 0 ) &&
( ( ( pAttrib->GetStart() < nPos ) && ( pAttrib->GetEnd() >= nPos ) )
|| ( !pNode->Len() ) ) )
{
@@ -3679,7 +3677,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt
pOutDev->SetFont( aOldFont );
}
-void ImpEditEngine::Paint( ImpEditView* pView, const Rectangle& rRect, OutputDevice* pTargetDevice, bool bUseVirtDev )
+void ImpEditEngine::Paint( ImpEditView* pView, const Rectangle& rRect, OutputDevice* pTargetDevice )
{
DBG_ASSERT( pView, "No View - No Paint!" );
@@ -3692,196 +3690,48 @@ void ImpEditEngine::Paint( ImpEditView* pView, const Rectangle& rRect, OutputDev
OutputDevice* pTarget = pTargetDevice ? pTargetDevice : pView->GetWindow();
- if ( bUseVirtDev )
+ Point aStartPos;
+ if ( !IsVertical() )
{
- Rectangle aClipRecPixel( pTarget->LogicToPixel( aClipRect ) );
- if ( !IsVertical() )
- {
- // etwas mehr, falls abgerundet!
- aClipRecPixel.Right() += 1;
- aClipRecPixel.Bottom() += 1;
- }
- else
- {
- aClipRecPixel.Left() -= 1;
- aClipRecPixel.Bottom() += 1;
- }
-
- // If aClipRecPixel > XXXX, then invalidate?!
-
- VirtualDevice* pVDev = GetVirtualDevice( pTarget->GetMapMode(), pTarget->GetDrawMode() );
- pVDev->SetDigitLanguage( GetRefDevice()->GetDigitLanguage() );
-
- /*
- * Set the appropriate background color according
- * to text criteria
- */
- {
-
- Color aBackgroundColor( pView->GetBackgroundColor() );
- // #i47161# Check if text is visible on background
- SvxFont aTmpFont;
- ContentNode* pNode = GetEditDoc().GetObject( 0 );
- SeekCursor( pNode, 1, aTmpFont );
-
-
- Color aFontColor( aTmpFont.GetColor() );
- if( (aFontColor == COL_AUTO) || IsForceAutoColor() )
- aFontColor = GetAutoColor();
-
- // #i69346# check for reverse color of input method attribute
- if( mpIMEInfos && (mpIMEInfos->aPos.GetNode() == pNode &&
- mpIMEInfos->pAttribs))
- {
- sal_uInt16 nAttr = mpIMEInfos->pAttribs[ 0 ];
- if ( nAttr & EXTTEXTINPUT_ATTR_HIGHLIGHT )
- {
- const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
- aFontColor = rStyleSettings.GetHighlightColor() ;
- }
- }
-
- sal_uInt8 nColorDiff = aFontColor.GetColorError( aBackgroundColor );
- if( nColorDiff < 8 )
- aBackgroundColor = aFontColor.IsDark() ? COL_WHITE : COL_BLACK;
-
- pVDev->SetBackground( aBackgroundColor );
- }
-
- bool bVDevValid = true;
- Size aOutSz( pVDev->GetOutputSizePixel() );
- if ( ( aOutSz.Width() < aClipRecPixel.GetWidth() ) ||
- ( aOutSz.Height() < aClipRecPixel.GetHeight() ) )
- {
- bVDevValid = pVDev->SetOutputSizePixel( aClipRecPixel.GetSize() );
- }
- else
- {
- // The VirtDev can become very big during a Resize =>
- // eventually make it smaller!
- if ( ( aOutSz.Height() > ( aClipRecPixel.GetHeight() + RESDIFF ) ) ||
- ( aOutSz.Width() > ( aClipRecPixel.GetWidth() + RESDIFF ) ) )
- {
- bVDevValid = pVDev->SetOutputSizePixel( aClipRecPixel.GetSize() );
- }
- else
- {
- pVDev->Erase();
- }
- }
- DBG_ASSERT( bVDevValid, "VDef could not be enlarged!" );
- if ( !bVDevValid )
- {
- Paint( pView, rRect );
- return;
- }
-
- // PaintRect for VDev not with aligned size,
- // Otherwise, the line below must also be printed out:
- Rectangle aTmpRect( Point( 0, 0 ), aClipRect.GetSize() );
-
- aClipRect = pTarget->PixelToLogic( aClipRecPixel );
- Point aStartPos;
- if ( !IsVertical() )
- {
- aStartPos = aClipRect.TopLeft();
- aStartPos = pView->GetDocPos( aStartPos );
- aStartPos.X() *= (-1);
- aStartPos.Y() *= (-1);
- }
- else
- {
- aStartPos = aClipRect.TopRight();
- Point aDocPos( pView->GetDocPos( aStartPos ) );
- aStartPos.X() = aClipRect.GetSize().Width() + aDocPos.Y();
- aStartPos.Y() = -aDocPos.X();
- }
-
- Paint( pVDev, aTmpRect, aStartPos );
-
- bool bClipRegion = false;
- vcl::Region aOldRegion;
- MapMode aOldMapMode;
- if ( GetTextRanger() )
- {
- // Some problems here with push/pop, why?!
-// pTarget->Push( PushFlags::CLIPREGION|PushFlags::MAPMODE );
- bClipRegion = pTarget->IsClipRegion();
- aOldRegion = pTarget->GetClipRegion();
- // How do I get the polygon to the right place??
- // The polygon is based on the view, not the Window
- // => reset origin...
- aOldMapMode = pTarget->GetMapMode();
- Point aOrigin = aOldMapMode.GetOrigin();
- Point aViewPos = pView->GetOutputArea().TopLeft();
- aOrigin.Move( aViewPos.X(), aViewPos.Y() );
- aClipRect.Move( -aViewPos.X(), -aViewPos.Y() );
- MapMode aNewMapMode( aOldMapMode );
- aNewMapMode.SetOrigin( aOrigin );
- pTarget->SetMapMode( aNewMapMode );
- pTarget->SetClipRegion( vcl::Region( GetTextRanger()->GetPolyPolygon() ) );
- }
-
- pTarget->DrawOutDev( aClipRect.TopLeft(), aClipRect.GetSize(),
- Point(0,0), aClipRect.GetSize(), *pVDev );
-
- if ( GetTextRanger() )
- {
-// pTarget->Pop();
- if ( bClipRegion )
- pTarget->SetClipRegion( aOldRegion );
- else
- pTarget->SetClipRegion();
- pTarget->SetMapMode( aOldMapMode );
- }
-
- pView->DrawSelection(pView->GetEditSelection(), nullptr, pTarget);
+ aStartPos = pView->GetOutputArea().TopLeft();
+ aStartPos.X() -= pView->GetVisDocLeft();
+ aStartPos.Y() -= pView->GetVisDocTop();
}
else
{
- Point aStartPos;
- if ( !IsVertical() )
- {
- aStartPos = pView->GetOutputArea().TopLeft();
- aStartPos.X() -= pView->GetVisDocLeft();
- aStartPos.Y() -= pView->GetVisDocTop();
- }
- else
- {
- aStartPos = pView->GetOutputArea().TopRight();
- aStartPos.X() += pView->GetVisDocTop();
- aStartPos.Y() -= pView->GetVisDocLeft();
- }
+ aStartPos = pView->GetOutputArea().TopRight();
+ aStartPos.X() += pView->GetVisDocTop();
+ aStartPos.Y() -= pView->GetVisDocLeft();
+ }
- // If Doc-width < Output Area,Width and not wrapped fields,
- // the fields usually protrude if > line.
- // (Not at the top, since there the Doc-width from formatting is already
- // there)
- if ( !IsVertical() && ( pView->GetOutputArea().GetWidth() > GetPaperSize().Width() ) )
- {
- long nMaxX = pView->GetOutputArea().Left() + GetPaperSize().Width();
- if ( aClipRect.Left() > nMaxX )
- return;
- if ( aClipRect.Right() > nMaxX )
- aClipRect.Right() = nMaxX;
- }
+ // If Doc-width < Output Area,Width and not wrapped fields,
+ // the fields usually protrude if > line.
+ // (Not at the top, since there the Doc-width from formatting is already
+ // there)
+ if ( !IsVertical() && ( pView->GetOutputArea().GetWidth() > GetPaperSize().Width() ) )
+ {
+ long nMaxX = pView->GetOutputArea().Left() + GetPaperSize().Width();
+ if ( aClipRect.Left() > nMaxX )
+ return;
+ if ( aClipRect.Right() > nMaxX )
+ aClipRect.Right() = nMaxX;
+ }
- bool bClipRegion = pTarget->IsClipRegion();
- vcl::Region aOldRegion = pTarget->GetClipRegion();
- pTarget->IntersectClipRegion( aClipRect );
+ bool bClipRegion = pTarget->IsClipRegion();
+ vcl::Region aOldRegion = pTarget->GetClipRegion();
+ pTarget->IntersectClipRegion( aClipRect );
- Paint( pTarget, aClipRect, aStartPos );
+ Paint( pTarget, aClipRect, aStartPos );
- if ( bClipRegion )
- pTarget->SetClipRegion( aOldRegion );
- else
- pTarget->SetClipRegion();
+ if ( bClipRegion )
+ pTarget->SetClipRegion( aOldRegion );
+ else
+ pTarget->SetClipRegion();
- // In case of tiled rendering pass a region to DrawSelection(), so that
- // selection callbacks are not emitted during every repaint.
- vcl::Region aRegion;
- pView->DrawSelection(pView->GetEditSelection(), comphelper::LibreOfficeKit::isActive() ? &aRegion : nullptr, pTarget);
- }
+ // In case of tiled rendering pass a region to DrawSelection(), so that
+ // selection callbacks are not emitted during every repaint.
+ vcl::Region aRegion;
+ pView->DrawSelection(pView->GetEditSelection(), comphelper::LibreOfficeKit::isActive() ? &aRegion : nullptr, pTarget);
}
void ImpEditEngine::InsertContent( ContentNode* pNode, sal_Int32 nPos )
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 29a1117..bbce370 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -1499,7 +1499,7 @@ EESpellState ImpEditEngine::Spell( EditView* pEditView, bool bMultipleDoc )
bIsStart = true;
EditSpellWrapper* pWrp = new EditSpellWrapper( Application::GetDefDialogParent(),
- bIsStart, false, pEditView );
+ bIsStart, pEditView );
pWrp->SpellDocument();
delete pWrp;
commit 121912a5022b07fc04db4ed017c6b9606cec469c
Author: Noel Grandin <noel at peralex.com>
Date: Wed Mar 23 10:33:33 2016 +0200
loplugin:constantparam in extensins
Change-Id: Iab77bb089e77460f75466259d7b63ed49453b8f4
diff --git a/extensions/source/bibliography/loadlisteneradapter.cxx b/extensions/source/bibliography/loadlisteneradapter.cxx
index 505155c..bb452bf 100644
--- a/extensions/source/bibliography/loadlisteneradapter.cxx
+++ b/extensions/source/bibliography/loadlisteneradapter.cxx
@@ -126,8 +126,8 @@ namespace bib
m_xComponent = nullptr;
}
- OLoadListenerAdapter::OLoadListenerAdapter( const Reference< XLoadable >& _rxLoadable, bool _bAutoRelease )
- :OComponentAdapterBase( Reference< XComponent >( _rxLoadable, UNO_QUERY ), _bAutoRelease )
+ OLoadListenerAdapter::OLoadListenerAdapter( const Reference< XLoadable >& _rxLoadable )
+ :OComponentAdapterBase( Reference< XComponent >( _rxLoadable, UNO_QUERY ), true/*_bAutoRelease*/ )
{
}
diff --git a/extensions/source/bibliography/loadlisteneradapter.hxx b/extensions/source/bibliography/loadlisteneradapter.hxx
index 90880fc..5e7f4e4 100644
--- a/extensions/source/bibliography/loadlisteneradapter.hxx
+++ b/extensions/source/bibliography/loadlisteneradapter.hxx
@@ -133,8 +133,7 @@ namespace bib
public:
OLoadListenerAdapter(
- const css::uno::Reference< css::form::XLoadable >& _rxLoadable,
- bool _bAutoRelease = true
+ const css::uno::Reference< css::form::XLoadable >& _rxLoadable
);
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx
index a4e6ab7..08dffad 100644
--- a/extensions/source/scanner/grid.cxx
+++ b/extensions/source/scanner/grid.cxx
@@ -200,14 +200,14 @@ Size GridWindow::GetOptimalSize() const
return LogicToPixel(Size(240, 200), MAP_APPFONT);
}
-GridDialog::GridDialog(double* pXValues, double* pYValues, int nValues, vcl::Window* pParent, bool bCutValues )
+GridDialog::GridDialog(double* pXValues, double* pYValues, int nValues, vcl::Window* pParent )
: ModalDialog(pParent, "GridDialog", "modules/scanner/ui/griddialog.ui")
{
get(m_pOKButton, "ok");
get(m_pResetTypeBox, "resetTypeCombobox");
get(m_pResetButton, "resetButton");
get(m_pGridWindow, "gridwindow");
- m_pGridWindow->Init(pXValues, pYValues, nValues, bCutValues, get<FixedImage>("handle")->GetImage().GetBitmapEx());
+ m_pGridWindow->Init(pXValues, pYValues, nValues, true/*bCutValues*/, get<FixedImage>("handle")->GetImage().GetBitmapEx());
m_pResetTypeBox->SelectEntryPos( 0 );
diff --git a/extensions/source/scanner/grid.hxx b/extensions/source/scanner/grid.hxx
index 5d100b9..1167a84 100644
--- a/extensions/source/scanner/grid.hxx
+++ b/extensions/source/scanner/grid.hxx
@@ -48,7 +48,7 @@ class GridDialog : public ModalDialog
public:
GridDialog(double* pXValues, double* pYValues, int nValues,
- vcl::Window* pParent, bool bCutValues = true);
+ vcl::Window* pParent);
virtual ~GridDialog();
virtual void dispose() override;
void setBoundings(double fMinX, double fMinY, double fMaxX, double fMaxY);
commit dbf54937c46051b65605822407158b073132b927
Author: Noel Grandin <noel at peralex.com>
Date: Wed Mar 23 10:31:27 2016 +0200
loplugin:constantparam in filter
Change-Id: I383770bc8bd75e5b5325e133587eda2fe28f9fdd
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
index fb732c8..72af29d 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
@@ -427,7 +427,7 @@ void DXF2GDIMetaFile::DrawTextEntity(const DXFTextEntity & rE, const DXFTransfor
aT.TransDir(DXFVector(1,0,0),aV);
if ( SetFontAttribute( rE,nAng, nHeight, aV. Abs() ) )
{
- OUString const aUString(pDXF->ToOUString(rE.m_sText, true));
+ OUString const aUString(pDXF->ToOUString(rE.m_sText));
aT.Transform( DXFVector( 0, 0, 0 ), aPt );
pVirDev->DrawText( aPt, aUString );
}
@@ -485,7 +485,7 @@ void DXF2GDIMetaFile::DrawAttribEntity(const DXFAttribEntity & rE, const DXFTran
aT.TransDir(DXFVector(1,0,0),aV);
if (SetFontAttribute(rE,nAng,nHeight,aV.Abs()))
{
- OUString const aUString(pDXF->ToOUString(rE.m_sText, true));
+ OUString const aUString(pDXF->ToOUString(rE.m_sText));
aT.Transform( DXFVector( 0, 0, 0 ), aPt );
pVirDev->DrawText( aPt, aUString );
}
diff --git a/filter/source/graphicfilter/idxf/dxfreprd.cxx b/filter/source/graphicfilter/idxf/dxfreprd.cxx
index 6c1993e..f33fdef 100644
--- a/filter/source/graphicfilter/idxf/dxfreprd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfreprd.cxx
@@ -400,44 +400,42 @@ namespace {
}
}
-OUString DXFRepresentation::ToOUString(const OString& s, bool bSpecials) const
+OUString DXFRepresentation::ToOUString(const OString& s) const
{
OUString result = OStringToOUString(s, getTextEncoding());
- if (bSpecials) {
- result = result.replaceAll("%%o", "") // Overscore - simply remove
- .replaceAll("%%u", "") // Underscore - simply remove
- .replaceAll("%%d", OUString(sal_Unicode(L'\u00B0'))) // Degrees symbol (°)
- .replaceAll("%%p", OUString(sal_Unicode(L'\u00B1'))) // Tolerance symbol (±)
- .replaceAll("%%c", OUString(sal_Unicode(L'\u2205'))) // Diameter symbol
- .replaceAll("%%%", "%"); // Percent symbol
-
- sal_Int32 pos = result.indexOf("%%"); // %%nnn, where nnn - 3-digit decimal ASCII code
- while (pos != -1 && pos <= result.getLength() - 5) {
- OUString asciiNum = result.copy(pos + 2, 3);
- if (lcl_isDec(asciiNum[0]) &&
- lcl_isDec(asciiNum[1]) &&
- lcl_isDec(asciiNum[2]))
- {
- char ch = static_cast<char>(asciiNum.toUInt32());
- OUString codePt(&ch, 1, mEnc);
- result = result.replaceAll(result.copy(pos, 5), codePt, pos);
- }
- pos = result.indexOf("%%", pos + 1);
+ result = result.replaceAll("%%o", "") // Overscore - simply remove
+ .replaceAll("%%u", "") // Underscore - simply remove
+ .replaceAll("%%d", OUString(sal_Unicode(L'\u00B0'))) // Degrees symbol (°)
+ .replaceAll("%%p", OUString(sal_Unicode(L'\u00B1'))) // Tolerance symbol (±)
+ .replaceAll("%%c", OUString(sal_Unicode(L'\u2205'))) // Diameter symbol
+ .replaceAll("%%%", "%"); // Percent symbol
+
+ sal_Int32 pos = result.indexOf("%%"); // %%nnn, where nnn - 3-digit decimal ASCII code
+ while (pos != -1 && pos <= result.getLength() - 5) {
+ OUString asciiNum = result.copy(pos + 2, 3);
+ if (lcl_isDec(asciiNum[0]) &&
+ lcl_isDec(asciiNum[1]) &&
+ lcl_isDec(asciiNum[2]))
+ {
+ char ch = static_cast<char>(asciiNum.toUInt32());
+ OUString codePt(&ch, 1, mEnc);
+ result = result.replaceAll(result.copy(pos, 5), codePt, pos);
}
+ pos = result.indexOf("%%", pos + 1);
+ }
- pos = result.indexOf("\\U+"); // \U+XXXX, where XXXX - 4-digit hex unicode
- while (pos != -1 && pos <= result.getLength() - 7) {
- OUString codePtNum = result.copy(pos + 3, 4);
- if (lcl_isHex(codePtNum[0]) &&
- lcl_isHex(codePtNum[1]) &&
- lcl_isHex(codePtNum[2]) &&
- lcl_isHex(codePtNum[3]))
- {
- OUString codePt(static_cast<sal_Unicode>(codePtNum.toUInt32(16)));
- result = result.replaceAll(result.copy(pos, 7), codePt, pos);
- }
- pos = result.indexOf("\\U+", pos + 1);
+ pos = result.indexOf("\\U+"); // \U+XXXX, where XXXX - 4-digit hex unicode
+ while (pos != -1 && pos <= result.getLength() - 7) {
+ OUString codePtNum = result.copy(pos + 3, 4);
+ if (lcl_isHex(codePtNum[0]) &&
+ lcl_isHex(codePtNum[1]) &&
+ lcl_isHex(codePtNum[2]) &&
+ lcl_isHex(codePtNum[3]))
+ {
+ OUString codePt(static_cast<sal_Unicode>(codePtNum.toUInt32(16)));
+ result = result.replaceAll(result.copy(pos, 7), codePt, pos);
}
+ pos = result.indexOf("\\U+", pos + 1);
}
return result;
}
diff --git a/filter/source/graphicfilter/idxf/dxfreprd.hxx b/filter/source/graphicfilter/idxf/dxfreprd.hxx
index 93d78a3..a7ad753 100644
--- a/filter/source/graphicfilter/idxf/dxfreprd.hxx
+++ b/filter/source/graphicfilter/idxf/dxfreprd.hxx
@@ -99,7 +99,7 @@ public:
rtl_TextEncoding getTextEncoding() const;
void setTextEncoding(rtl_TextEncoding aEnc);
- OUString ToOUString(const OString& s, bool bSpecials=false) const;
+ OUString ToOUString(const OString& s) const;
double getGlobalLineTypeScale() const;
void setGlobalLineTypeScale(double fGlobalLineTypeScale);
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index 6e94cb52..7ba2f6a 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -154,7 +154,7 @@ void ImplEESdrWriter::ImplFlipBoundingBox( ImplEESdrObject& rObj, EscherProperty
sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
EscherSolverContainer& rSolverContainer,
- ImplEESdrPageType ePageType, const bool bOOxmlExport )
+ const bool bOOxmlExport )
{
sal_uInt32 nShapeID = 0;
sal_uInt16 nShapeType = 0;
@@ -216,7 +216,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
if( aObj.IsValid() )
{
aObj.SetOOXML(bOOxmlExport);
- ImplWriteShape( aObj, rSolverContainer, ePageType, bOOxmlExport );
+ ImplWriteShape( aObj, rSolverContainer, bOOxmlExport );
}
}
mpEscherEx->LeaveGroup();
@@ -518,7 +518,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
mpEscherEx->OpenContainer( ESCHER_SpContainer );
// a GraphicObject can also be a ClickMe element
- if( rObj.IsEmptyPresObj() && ( ePageType == NORMAL ) )
+ if( rObj.IsEmptyPresObj() )
{
ADD_SHAPE( ESCHER_ShpInst_Rectangle, 0x220 ); // Flags: HaveAnchor | HaveMaster
sal_uInt32 nTxtBxId = mpEscherEx->QueryTextID( rObj.GetShapeRef(),
@@ -584,7 +584,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
else if ( rObj.GetType() == "drawing.OLE2" )
{
mpEscherEx->OpenContainer( ESCHER_SpContainer );
- if( rObj.IsEmptyPresObj() && ( ePageType == NORMAL ) )
+ if( rObj.IsEmptyPresObj() )
{
ADD_SHAPE( ESCHER_ShpInst_Rectangle, 0x220 ); // Flags: HaveAnchor | HaveMaster
sal_uInt32 nTxtBxId = mpEscherEx->QueryTextID( rObj.GetShapeRef(),
@@ -821,8 +821,7 @@ bool ImplEESdrWriter::ImplInitPageValues()
}
void ImplEESdrWriter::ImplWritePage(
- EscherSolverContainer& rSolverContainer,
- ImplEESdrPageType ePageType )
+ EscherSolverContainer& rSolverContainer )
{
ImplInitPageValues();
@@ -844,7 +843,7 @@ void ImplEESdrWriter::ImplWritePage(
mXShapes->getByIndex( n ).getValue()) );
if( aObj.IsValid() )
{
- ImplWriteShape( aObj, rSolverContainer, ePageType );
+ ImplWriteShape( aObj, rSolverContainer );
}
}
mnPagesWritten++;
@@ -934,14 +933,14 @@ void ImplEscherExSdr::ImplFlushSolverContainer()
void ImplEscherExSdr::ImplWriteCurrentPage()
{
assert(mpSolverContainer && "ImplEscherExSdr::ImplWriteCurrentPage: no SolverContainer");
- ImplWritePage( *mpSolverContainer, NORMAL );
+ ImplWritePage( *mpSolverContainer );
ImplExitPage();
}
sal_uInt32 ImplEscherExSdr::ImplWriteTheShape( ImplEESdrObject& rObj , bool ooxmlExport )
{
assert(mpSolverContainer && "ImplEscherExSdr::ImplWriteShape: no SolverContainer");
- return ImplWriteShape( rObj, *mpSolverContainer, NORMAL, ooxmlExport );
+ return ImplWriteShape( rObj, *mpSolverContainer, ooxmlExport );
}
void EscherEx::AddSdrPage( const SdrPage& rPage )
diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx
index 7473676..448df68 100644
--- a/filter/source/msfilter/eschesdo.hxx
+++ b/filter/source/msfilter/eschesdo.hxx
@@ -140,12 +140,11 @@ protected:
bool ImplInitPageValues();
void ImplWritePage(
- EscherSolverContainer& rSolver,
- ImplEESdrPageType ePageType );
+ EscherSolverContainer& rSolver );
sal_uInt32 ImplWriteShape( ImplEESdrObject& rObj,
EscherSolverContainer& rSolver,
- ImplEESdrPageType ePageType, const bool bOOxmlExport = false ); // returns ShapeID
+ const bool bOOxmlExport = false ); // returns ShapeID
static void ImplFlipBoundingBox( ImplEESdrObject& rObj, EscherPropertyContainer& rPropOpt );
void ImplWriteAdditionalText(
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 67bc12b..33d2501 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1563,14 +1563,14 @@ void SVGTextWriter::writeTextPortion( const Point& rPos,
if( true || !bTextSpecial )
{
- implWriteTextPortion( rPos, rText, mpVDev->GetTextColor(), true/*bApplyMapping*/ );
+ implWriteTextPortion( rPos, rText, mpVDev->GetTextColor() );
}
else
{
// to be implemented
}
#else
- implWriteTextPortion( rPos, rText, mpVDev->GetTextColor(), true/*bApplyMapping*/ );
+ implWriteTextPortion( rPos, rText, mpVDev->GetTextColor() );
#endif
if( bStandAloneTextPortion )
@@ -1582,8 +1582,7 @@ void SVGTextWriter::writeTextPortion( const Point& rPos,
void SVGTextWriter::implWriteTextPortion( const Point& rPos,
const OUString& rText,
- Color aTextColor,
- bool bApplyMapping )
+ Color aTextColor )
{
Point aPos;
Point aBaseLinePos( rPos );
@@ -1595,10 +1594,7 @@ void SVGTextWriter::implWriteTextPortion( const Point& rPos,
else if( rFont.GetAlignment() == ALIGN_BOTTOM )
aBaseLinePos.Y() -= aMetric.GetDescent();
- if( bApplyMapping )
- implMap( rPos, aPos );
- else
- aPos = rPos;
+ implMap( rPos, aPos );
if( mbPositioningNeeded )
{
@@ -1858,20 +1854,12 @@ BitmapChecksum SVGActionWriter::GetChecksum( const MetaAction* pAction )
void SVGActionWriter::ImplWriteLine( const Point& rPt1, const Point& rPt2,
- const Color* pLineColor, bool bApplyMapping )
+ const Color* pLineColor )
{
Point aPt1, aPt2;
- if( bApplyMapping )
- {
- ImplMap( rPt1, aPt1 );
- ImplMap( rPt2, aPt2 );
- }
- else
- {
- aPt1 = rPt1;
- aPt2 = rPt2;
- }
+ ImplMap( rPt1, aPt1 );
+ ImplMap( rPt2, aPt2 );
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX1, OUString::number( aPt1.X() ) );
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY1, OUString::number( aPt1.Y() ) );
@@ -1890,15 +1878,11 @@ void SVGActionWriter::ImplWriteLine( const Point& rPt1, const Point& rPt2,
}
-void SVGActionWriter::ImplWriteRect( const Rectangle& rRect, long nRadX, long nRadY,
- bool bApplyMapping )
+void SVGActionWriter::ImplWriteRect( const Rectangle& rRect, long nRadX, long nRadY )
{
Rectangle aRect;
- if( bApplyMapping )
- ImplMap( rRect, aRect );
- else
- aRect = rRect;
+ ImplMap( rRect, aRect );
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::number( aRect.Left() ) );
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::number( aRect.Top() ) );
@@ -1906,14 +1890,12 @@ void SVGActionWriter::ImplWriteRect( const Rectangle& rRect, long nRadX, long nR
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrHeight, OUString::number( aRect.GetHeight() ) );
if( nRadX )
- mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRX, OUString::number( bApplyMapping ? ImplMap( nRadX ) : nRadX ) );
+ mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRX, OUString::number( ImplMap( nRadX ) ) );
if( nRadY )
- mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRY, OUString::number( bApplyMapping ? ImplMap( nRadY ) : nRadY ) );
+ mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRY, OUString::number( ImplMap( nRadY ) ) );
- {
- SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemRect, true, true );
- }
+ SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemRect, true, true );
}
@@ -2394,7 +2376,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
if( !bTextSpecial )
{
- ImplWriteText( rPos, rText, pDXArray, nWidth, mpVDev->GetTextColor(), true/*bApplyMapping*/ );
+ ImplWriteText( rPos, rText, pDXArray, nWidth, mpVDev->GetTextColor() );
}
else
{
@@ -2422,8 +2404,8 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
aPos += aOffset;
}
- ImplWriteText( aPos, rText, pDXArray, nWidth, aReliefColor, true/*bApplyMapping*/ );
- ImplWriteText( rPos, rText, pDXArray, nWidth, aTextColor, true/*bApplyMapping*/ );
+ ImplWriteText( aPos, rText, pDXArray, nWidth, aReliefColor );
+ ImplWriteText( rPos, rText, pDXArray, nWidth, aTextColor );
}
else
{
@@ -2441,34 +2423,34 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
Point aPos( rPos );
aPos += Point( nOff, nOff );
- ImplWriteText( aPos, rText, pDXArray, nWidth, aShadowColor, true/*bApplyMapping*/ );
+ ImplWriteText( aPos, rText, pDXArray, nWidth, aShadowColor );
if( !aMetric.IsOutline() )
{
- ImplWriteText( rPos, rText, pDXArray, nWidth, aTextColor, true/*bApplyMapping*/ );
+ ImplWriteText( rPos, rText, pDXArray, nWidth, aTextColor );
}
}
if( aMetric.IsOutline() )
{
Point aPos = rPos + Point( -6, -6 );
- ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor(), true/*bApplyMapping*/ );
+ ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor() );
aPos = rPos + Point( +6, +6);
- ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor(), true/*bApplyMapping*/ );
+ ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor() );
aPos = rPos + Point( -6, +0);
- ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor(), true/*bApplyMapping*/ );
+ ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor() );
aPos = rPos + Point( -6, +6);
- ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor(), true/*bApplyMapping*/ );
+ ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor() );
aPos = rPos + Point( +0, +6);
- ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor(), true/*bApplyMapping*/ );
+ ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor() );
aPos = rPos + Point( +0, -6);
- ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor(), true/*bApplyMapping*/ );
+ ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor() );
aPos = rPos + Point( +6, -1);
- ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor(), true/*bApplyMapping*/ );
+ ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor() );
aPos = rPos + Point( +6, +0);
- ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor(), true/*bApplyMapping*/ );
+ ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor() );
- ImplWriteText( rPos, rText, pDXArray, nWidth, Color( COL_WHITE ), true/*bApplyMapping*/ );
+ ImplWriteText( rPos, rText, pDXArray, nWidth, Color( COL_WHITE ) );
}
}
}
@@ -2477,7 +2459,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
const long* pDXArray, long nWidth,
- Color aTextColor, bool bApplyMapping )
+ Color aTextColor )
{
sal_Int32 nLen = rText.getLength();
Size aNormSize;
@@ -2491,10 +2473,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
else if( rFont.GetAlignment() == ALIGN_BOTTOM )
aBaseLinePos.Y() -= aMetric.GetDescent();
- if( bApplyMapping )
- ImplMap( rPos, aPos );
- else
- aPos = rPos;
+ ImplMap( rPos, aPos );
std::unique_ptr<long[]> xTmpArray(new long[nLen]);
// get text sizes
@@ -2604,8 +2583,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
{
// #118796# do NOT access pDXArray, it may be zero (!)
sal_Int32 nDXWidth = pDX[ nCurPos - 1 ];
- if ( bApplyMapping )
- nDXWidth = ImplMap( nDXWidth );
+ nDXWidth = ImplMap( nDXWidth );
nX = aPos.X() + nDXWidth;
}
}
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 5c01077..132d93b 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -215,7 +215,7 @@ class SVGTextWriter
void implWriteEmbeddedBitmaps();
void writeTextPortion( const Point& rPos, const OUString& rText );
void implWriteTextPortion( const Point& rPos, const OUString& rText,
- Color aTextColor, bool bApplyMapping );
+ Color aTextColor );
void setVirtualDevice( VirtualDevice* pVDev, MapMode& rTargetMapMode )
{
@@ -298,10 +298,8 @@ private:
tools::Polygon& ImplMap( const tools::Polygon& rPoly, tools::Polygon& rDstPoly ) const;
tools::PolyPolygon& ImplMap( const tools::PolyPolygon& rPolyPoly, tools::PolyPolygon& rDstPolyPoly ) const;
- void ImplWriteLine( const Point& rPt1, const Point& rPt2, const Color* pLineColor = nullptr,
- bool bApplyMapping = true );
- void ImplWriteRect( const Rectangle& rRect, long nRadX = 0, long nRadY = 0,
- bool bApplyMapping = true );
+ void ImplWriteLine( const Point& rPt1, const Point& rPt2, const Color* pLineColor = nullptr );
+ void ImplWriteRect( const Rectangle& rRect, long nRadX = 0, long nRadY = 0 );
void ImplWriteEllipse( const Point& rCenter, long nRadX, long nRadY );
void ImplWritePattern( const tools::PolyPolygon& rPolyPoly, const Hatch* pHatch, const Gradient* pGradient, sal_uInt32 nWriteFlags );
void ImplAddLineAttr( const LineInfo &rAttrs );
@@ -315,7 +313,7 @@ private:
static Color ImplGetGradientColor( const Color& rStartColor, const Color& rEndColor, double fOffset );
void ImplWriteMask( GDIMetaFile& rMtf, const Point& rDestPt, const Size& rDestSize, const Gradient& rGradient, sal_uInt32 nWriteFlags );
void ImplWriteText( const Point& rPos, const OUString& rText, const long* pDXArray, long nWidth );
- void ImplWriteText( const Point& rPos, const OUString& rText, const long* pDXArray, long nWidth, Color aTextColor, bool bApplyMapping );
+ void ImplWriteText( const Point& rPos, const OUString& rText, const long* pDXArray, long nWidth, Color aTextColor );
void ImplWriteBmp( const BitmapEx& rBmpEx, const Point& rPt, const Size& rSz, const Point& rSrcPt, const Size& rSrcSz );
void ImplWriteActions( const GDIMetaFile& rMtf,
More information about the Libreoffice-commits
mailing list