[Libreoffice-commits] core.git: extensions/source forms/source fpicker/source lotuswordpro/source
Noel Grandin
noel.grandin at collabora.co.uk
Mon Sep 12 11:10:13 UTC 2016
extensions/source/bibliography/bibbeam.cxx | 4 +--
extensions/source/bibliography/bibbeam.hxx | 2 -
extensions/source/bibliography/bibcont.cxx | 8 +++---
extensions/source/bibliography/bibcont.hxx | 4 +--
extensions/source/propctrlr/browserlistbox.cxx | 4 +--
extensions/source/propctrlr/browserlistbox.hxx | 2 -
extensions/source/propctrlr/formcomponenthandler.cxx | 6 ++--
extensions/source/propctrlr/propertyeditor.cxx | 4 +--
extensions/source/propctrlr/propertyeditor.hxx | 2 -
extensions/source/propctrlr/usercontrol.cxx | 12 ++++-----
extensions/source/propctrlr/usercontrol.hxx | 6 ++--
forms/source/inc/InterfaceContainer.hxx | 8 ------
forms/source/misc/InterfaceContainer.cxx | 25 ++-----------------
forms/source/solar/control/navtoolbar.cxx | 18 ++++++-------
forms/source/solar/inc/navtoolbar.hxx | 10 +++----
fpicker/source/office/QueryFolderName.hxx | 2 -
fpicker/source/office/iodlg.cxx | 5 ---
lotuswordpro/source/filter/bencont.cxx | 9 +-----
lotuswordpro/source/filter/bento.hxx | 2 -
lotuswordpro/source/filter/explode.cxx | 6 ++--
lotuswordpro/source/filter/explode.hxx | 2 -
21 files changed, 54 insertions(+), 87 deletions(-)
New commits:
commit 774d2a94d31c14fb24c07a5c85220e5ef528ad20
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Sep 12 11:32:53 2016 +0200
loplugin:constantparam in extensions..lotuswordpro
Change-Id: Ifb30d5d53536045638d872761626a1b60fa52dad
Reviewed-on: https://gerrit.libreoffice.org/28831
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx
index db118bd..812b305 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -184,8 +184,8 @@ namespace bib
m_xGridWin->setFocus();
}
- BibBeamer::BibBeamer( vcl::Window* _pParent, BibDataManager* _pDM, WinBits _nStyle )
- :BibSplitWindow( _pParent, _nStyle | WB_NOSPLITDRAW )
+ BibBeamer::BibBeamer( vcl::Window* _pParent, BibDataManager* _pDM )
+ :BibSplitWindow( _pParent, WB_3DLOOK | WB_NOSPLITDRAW )
,pDatMan( _pDM )
,pToolBar( nullptr )
,pGridWin( nullptr )
diff --git a/extensions/source/bibliography/bibbeam.hxx b/extensions/source/bibliography/bibbeam.hxx
index 5e5b712..19d5f0e 100644
--- a/extensions/source/bibliography/bibbeam.hxx
+++ b/extensions/source/bibliography/bibbeam.hxx
@@ -65,7 +65,7 @@ namespace bib
css::uno::Reference< css::frame::XDispatchProviderInterception >
getDispatchProviderInterception();
- BibBeamer(vcl::Window* pParent,BibDataManager* pDatMan, WinBits nStyle = WB_3DLOOK );
+ BibBeamer(vcl::Window* pParent,BibDataManager* pDatMan );
virtual ~BibBeamer();
virtual void dispose() override;
diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx
index 9b40d23..53f177b 100644
--- a/extensions/source/bibliography/bibcont.cxx
+++ b/extensions/source/bibliography/bibcont.cxx
@@ -66,8 +66,8 @@ using namespace ::com::sun::star::frame;
#define WIN_MIN_HEIGHT 10
#define WIN_STEP_SIZE 5
-BibWindowContainer::BibWindowContainer( vcl::Window* pParent, BibShortCutHandler* pChildWin, WinBits nStyle ) :
- BibWindow( pParent, nStyle ),
+BibWindowContainer::BibWindowContainer( vcl::Window* pParent, BibShortCutHandler* pChildWin ) :
+ BibWindow( pParent, WB_3DLOOK ),
pChild( pChildWin )
{
if(pChild!=nullptr)
@@ -113,8 +113,8 @@ bool BibWindowContainer::HandleShortCutKey( const KeyEvent& rKeyEvent )
}
-BibBookContainer::BibBookContainer(vcl::Window* pParent, WinBits nStyle):
- BibSplitWindow(pParent,nStyle),
+BibBookContainer::BibBookContainer(vcl::Window* pParent):
+ BibSplitWindow(pParent,WB_3DLOOK),
pTopWin(nullptr),
pBottomWin(nullptr),
aIdle("extensions BibBookContainer Split Idle")
diff --git a/extensions/source/bibliography/bibcont.hxx b/extensions/source/bibliography/bibcont.hxx
index 74648ec..a47cafb 100644
--- a/extensions/source/bibliography/bibcont.hxx
+++ b/extensions/source/bibliography/bibcont.hxx
@@ -41,7 +41,7 @@ class BibWindowContainer : public BibWindow //Window
virtual void Resize() override;
public:
- BibWindowContainer( vcl::Window* pParent, BibShortCutHandler* pChild, WinBits nStyle = WB_3DLOOK);
+ BibWindowContainer( vcl::Window* pParent, BibShortCutHandler* pChild);
virtual ~BibWindowContainer();
virtual void dispose() override;
@@ -82,7 +82,7 @@ class BibBookContainer: public BibSplitWindow
public:
- BibBookContainer(vcl::Window* pParent, WinBits nStyle = WB_3DLOOK );
+ BibBookContainer(vcl::Window* pParent );
virtual ~BibBookContainer();
virtual void dispose() override;
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index 81d9050..bbe2b92 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -331,8 +331,8 @@ namespace pcr
}
}
- OBrowserListBox::OBrowserListBox( vcl::Window* pParent, WinBits nWinStyle)
- :Control(pParent, nWinStyle| WB_CLIPCHILDREN)
+ OBrowserListBox::OBrowserListBox( vcl::Window* pParent)
+ :Control(pParent, WB_DIALOGCONTROL | WB_CLIPCHILDREN)
,m_aLinesPlayground(VclPtr<vcl::Window>::Create(this,WB_DIALOGCONTROL | WB_CLIPCHILDREN))
,m_aVScroll(VclPtr<ScrollBar>::Create(this,WB_VSCROLL|WB_REPEAT|WB_DRAG))
,m_pHelpWindow( VclPtr<InspectorHelpWindow>::Create( this ) )
diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx
index 9ba18cd..60e42da 100644
--- a/extensions/source/propctrlr/browserlistbox.hxx
+++ b/extensions/source/propctrlr/browserlistbox.hxx
@@ -102,7 +102,7 @@ namespace pcr
void Resize() override;
public:
- OBrowserListBox( vcl::Window* pParent, WinBits nWinStyle = WB_DIALOGCONTROL );
+ OBrowserListBox( vcl::Window* pParent );
virtual ~OBrowserListBox();
virtual void dispose() override;
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index e3322ae..0078123 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -1048,7 +1048,7 @@ namespace pcr
case PROPERTY_ID_TARGET_URL:
case PROPERTY_ID_IMAGE_URL:
{
- aDescriptor.Control = new OFileUrlControl( impl_getDefaultDialogParent_nothrow(), WB_TABSTOP | WB_BORDER );
+ aDescriptor.Control = new OFileUrlControl( impl_getDefaultDialogParent_nothrow() );
aDescriptor.PrimaryButtonId = PROPERTY_ID_TARGET_URL == nPropId
? OUString(UID_PROP_DLG_ATTR_TARGET_URL)
@@ -1125,7 +1125,7 @@ namespace pcr
if ( bIsFormatKey )
{
- OFormatSampleControl* pControl = new OFormatSampleControl( impl_getDefaultDialogParent_nothrow(), WB_READONLY | WB_TABSTOP | WB_BORDER );
+ OFormatSampleControl* pControl = new OFormatSampleControl( impl_getDefaultDialogParent_nothrow() );
aDescriptor.Control = pControl;
pControl->SetFormatSupplier( pSupplier );
@@ -1309,7 +1309,7 @@ namespace pcr
{
case PROPERTY_ID_REPEAT_DELAY:
{
- OTimeDurationControl* pControl = new OTimeDurationControl( impl_getDefaultDialogParent_nothrow(), WB_BORDER | WB_TABSTOP );
+ OTimeDurationControl* pControl = new OTimeDurationControl( impl_getDefaultDialogParent_nothrow() );
aDescriptor.Control = pControl;
pControl->setMinValue( Optional< double >( true, 0 ) );
diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx
index fd401e5..128ffa2 100644
--- a/extensions/source/propctrlr/propertyeditor.cxx
+++ b/extensions/source/propctrlr/propertyeditor.cxx
@@ -41,8 +41,8 @@ namespace pcr
// class OPropertyEditor
- OPropertyEditor::OPropertyEditor( vcl::Window* pParent, WinBits nWinStyle)
- :Control(pParent, nWinStyle)
+ OPropertyEditor::OPropertyEditor( vcl::Window* pParent)
+ :Control(pParent, WB_DIALOGCONTROL)
,m_aTabControl( VclPtr<TabControl>::Create(this) )
,m_pListener(nullptr)
,m_pObserver(nullptr)
diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx
index eafdf36..9cc6211 100644
--- a/extensions/source/propctrlr/propertyeditor.hxx
+++ b/extensions/source/propctrlr/propertyeditor.hxx
@@ -69,7 +69,7 @@ namespace pcr
void GetFocus() override;
public:
- OPropertyEditor (vcl::Window* pParent, WinBits nWinStyle = WB_DIALOGCONTROL);
+ OPropertyEditor (vcl::Window* pParent);
virtual ~OPropertyEditor();
virtual void dispose() override;
diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx
index ef15cd7..e18281d 100644
--- a/extensions/source/propctrlr/usercontrol.cxx
+++ b/extensions/source/propctrlr/usercontrol.cxx
@@ -87,8 +87,8 @@ namespace pcr
// OFormatSampleControl
- OFormatSampleControl::OFormatSampleControl( vcl::Window* pParent, WinBits nWinStyle )
- :OFormatSampleControl_Base( PropertyControlType::Unknown, pParent, nWinStyle )
+ OFormatSampleControl::OFormatSampleControl( vcl::Window* pParent )
+ :OFormatSampleControl_Base( PropertyControlType::Unknown, pParent, WB_READONLY | WB_TABSTOP | WB_BORDER )
{
getTypedControlWindow()->setControlHelper(*this);
}
@@ -262,8 +262,8 @@ namespace pcr
//= OFileUrlControl
- OFileUrlControl::OFileUrlControl( vcl::Window* pParent, WinBits nWinStyle )
- :OFileUrlControl_Base( PropertyControlType::Unknown, pParent, nWinStyle | WB_DROPDOWN )
+ OFileUrlControl::OFileUrlControl( vcl::Window* pParent )
+ :OFileUrlControl_Base( PropertyControlType::Unknown, pParent, WB_TABSTOP | WB_BORDER | WB_DROPDOWN )
{
getTypedControlWindow()->SetDropDownLineCount( 10 );
getTypedControlWindow()->SetPlaceHolder( PcrRes( RID_EMBED_IMAGE_PLACEHOLDER ).toString() ) ;
@@ -308,8 +308,8 @@ namespace pcr
//= OTimeDurationControl
- OTimeDurationControl::OTimeDurationControl( vcl::Window* pParent, WinBits nWinStyle )
- :ONumericControl( pParent, nWinStyle )
+ OTimeDurationControl::OTimeDurationControl( vcl::Window* pParent )
+ :ONumericControl( pParent, WB_BORDER | WB_TABSTOP )
{
getTypedControlWindow()->SetUnit( FUNIT_CUSTOM );
getTypedControlWindow()->SetCustomUnitText(" ms");
diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx
index b320a93..2188f54 100644
--- a/extensions/source/propctrlr/usercontrol.hxx
+++ b/extensions/source/propctrlr/usercontrol.hxx
@@ -59,7 +59,7 @@ namespace pcr
class OFormatSampleControl : public OFormatSampleControl_Base
{
public:
- OFormatSampleControl( vcl::Window* pParent, WinBits nWinStyle );
+ OFormatSampleControl( vcl::Window* pParent );
// XPropertyControl
virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
@@ -128,7 +128,7 @@ namespace pcr
class OFileUrlControl : public OFileUrlControl_Base
{
public:
- OFileUrlControl( vcl::Window* pParent, WinBits nWinStyle );
+ OFileUrlControl( vcl::Window* pParent );
// XPropertyControl
virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
@@ -145,7 +145,7 @@ namespace pcr
class OTimeDurationControl : public ONumericControl
{
public:
- OTimeDurationControl( vcl::Window* pParent, WinBits nWinStyle );
+ OTimeDurationControl( vcl::Window* pParent );
virtual ~OTimeDurationControl();
// XPropertyControl
diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx
index 63f3b3a..1bb1676 100644
--- a/forms/source/inc/InterfaceContainer.hxx
+++ b/forms/source/inc/InterfaceContainer.hxx
@@ -267,13 +267,7 @@ private:
// hack for Vba Events
void impl_addVbEvents_nolck_nothrow( const sal_Int32 i_nIndex );
- // the runtime event format has changed from version SO5.2 to OOo
- enum EventFormat
- {
- efVersionSO5x,
- efVersionSO6x
- };
- void transformEvents( const EventFormat _eTargetFormat );
+ void transformEvents();
void impl_createEventAttacher_nothrow();
};
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx
index 9dde69c..e8973e7 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -319,7 +319,7 @@ void SAL_CALL OInterfaceContainer::writeEvents(const Reference<XObjectOutputStre
if ( m_xEventAttacher.is() )
lcl_saveEvents( aSave, m_xEventAttacher, m_aItems.size() );
- transformEvents( efVersionSO5x );
+ transformEvents();
try
{
@@ -377,23 +377,7 @@ struct TransformEventTo52Format : public ::std::unary_function< ScriptEventDescr
};
-struct TransformEventTo60Format : public ::std::unary_function< ScriptEventDescriptor, void >
-{
- void operator()( ScriptEventDescriptor& _rDescriptor )
- {
- if ( _rDescriptor.ScriptType == "StarBasic" )
- { // it's a starbasic macro
- if ( _rDescriptor.ScriptCode.indexOf( ':' ) < 0 )
- { // the macro name does not already contain a :
- // -> default the type to "document"
- _rDescriptor.ScriptCode = "document:" + _rDescriptor.ScriptCode;
- }
- }
- }
-};
-
-
-void OInterfaceContainer::transformEvents( const EventFormat _eTargetFormat )
+void OInterfaceContainer::transformEvents()
{
OSL_ENSURE( m_xEventAttacher.is(), "OInterfaceContainer::transformEvents: no event attacher manager!" );
if ( !m_xEventAttacher.is() )
@@ -417,10 +401,7 @@ void OInterfaceContainer::transformEvents( const EventFormat _eTargetFormat )
ScriptEventDescriptor* pChildEventsEnd = pChildEvents + aChildEvents.getLength();
// do the transformation
- if ( efVersionSO6x == _eTargetFormat )
- ::std::for_each( pChildEvents, pChildEventsEnd, TransformEventTo60Format() );
- else
- ::std::for_each( pChildEvents, pChildEventsEnd, TransformEventTo52Format() );
+ ::std::for_each( pChildEvents, pChildEventsEnd, TransformEventTo52Format() );
// revoke the script events
m_xEventAttacher->revokeScriptEvents( i );
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index 5a72b20..f0f6f0a 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -337,7 +337,7 @@ namespace frm
}
}
- forEachItemWindow( &NavigationToolBar::adjustItemWindowWidth, nullptr );
+ forEachItemWindow( &NavigationToolBar::adjustItemWindowWidth );
implUpdateImages();
}
@@ -486,12 +486,12 @@ namespace frm
break;
case StateChangedType::ControlFont:
- forEachItemWindow( &NavigationToolBar::setItemControlFont, nullptr );
- forEachItemWindow( &NavigationToolBar::adjustItemWindowWidth, nullptr );
+ forEachItemWindow( &NavigationToolBar::setItemControlFont );
+ forEachItemWindow( &NavigationToolBar::adjustItemWindowWidth );
break;
case StateChangedType::ControlForeground:
- forEachItemWindow( &NavigationToolBar::setItemControlForeground, nullptr );
+ forEachItemWindow( &NavigationToolBar::setItemControlForeground );
break;
case StateChangedType::Mirroring:
@@ -556,14 +556,14 @@ namespace frm
}
- void NavigationToolBar::forEachItemWindow( ItemWindowHandler _handler, const void* _pParam )
+ void NavigationToolBar::forEachItemWindow( ItemWindowHandler _handler )
{
for ( sal_uInt16 item = 0; item < m_pToolbar->GetItemCount(); ++item )
{
sal_uInt16 nItemId = m_pToolbar->GetItemId( item );
vcl::Window* pItemWindow = m_pToolbar->GetItemWindow( nItemId );
if ( pItemWindow )
- (this->*_handler)( nItemId, pItemWindow, _pParam );
+ (this->*_handler)( nItemId, pItemWindow );
}
}
@@ -603,7 +603,7 @@ namespace frm
}
#endif
- void NavigationToolBar::setItemControlFont( sal_uInt16 /* _nItemId */, vcl::Window* _pItemWindow, const void* /* _pParam */ ) const
+ void NavigationToolBar::setItemControlFont( sal_uInt16 /* _nItemId */, vcl::Window* _pItemWindow ) const
{
if ( IsControlFont() )
_pItemWindow->SetControlFont( GetControlFont() );
@@ -612,7 +612,7 @@ namespace frm
}
- void NavigationToolBar::setItemControlForeground( sal_uInt16 /* _nItemId */, vcl::Window* _pItemWindow, const void* /* _pParam */ ) const
+ void NavigationToolBar::setItemControlForeground( sal_uInt16 /* _nItemId */, vcl::Window* _pItemWindow ) const
{
if ( IsControlForeground() )
_pItemWindow->SetControlForeground( GetControlForeground() );
@@ -622,7 +622,7 @@ namespace frm
}
- void NavigationToolBar::adjustItemWindowWidth( sal_uInt16 _nItemId, vcl::Window* _pItemWindow, const void* /* _pParam */ ) const
+ void NavigationToolBar::adjustItemWindowWidth( sal_uInt16 _nItemId, vcl::Window* _pItemWindow ) const
{
OUString sItemText;
switch ( _nItemId )
diff --git a/forms/source/solar/inc/navtoolbar.hxx b/forms/source/solar/inc/navtoolbar.hxx
index 74f1505..a9b92b6 100644
--- a/forms/source/solar/inc/navtoolbar.hxx
+++ b/forms/source/solar/inc/navtoolbar.hxx
@@ -137,8 +137,8 @@ namespace frm
void updateFeatureStates( );
// iterating through item windows
- typedef void (NavigationToolBar::*ItemWindowHandler) (sal_uInt16, vcl::Window*, const void*) const;
- void forEachItemWindow( ItemWindowHandler _handler, const void* _pParam );
+ typedef void (NavigationToolBar::*ItemWindowHandler) (sal_uInt16, vcl::Window*) const;
+ void forEachItemWindow( ItemWindowHandler _handler );
typedef void (*ItemWindowHandler2) (sal_uInt16, vcl::Window*, const void*);
void forEachItemWindow( ItemWindowHandler2 _handler, const void* _pParam );
@@ -147,9 +147,9 @@ namespace frm
#if 0
void setItemWindowZoom( sal_uInt16 /* _nItemId */, vcl::Window* _pItemWindow, const void* /* _pParam */ ) const;
#endif
- void setItemControlFont( sal_uInt16 /* _nItemId */, vcl::Window* _pItemWindow, const void* /* _pParam */ ) const;
- void setItemControlForeground( sal_uInt16 /* _nItemId */, vcl::Window* _pItemWindow, const void* /* _pParam */ ) const;
- void adjustItemWindowWidth( sal_uInt16 _nItemId, vcl::Window* _pItemWindow, const void* /* _pParam */ ) const;
+ void setItemControlFont( sal_uInt16 /* _nItemId */, vcl::Window* _pItemWindow ) const;
+ void setItemControlForeground( sal_uInt16 /* _nItemId */, vcl::Window* _pItemWindow ) const;
+ void adjustItemWindowWidth( sal_uInt16 _nItemId, vcl::Window* _pItemWindow ) const;
static void enableItemRTL( sal_uInt16 /*_nItemId*/, vcl::Window* _pItemWindow, const void* _pIsRTLEnabled );
};
diff --git a/fpicker/source/office/QueryFolderName.hxx b/fpicker/source/office/QueryFolderName.hxx
index 24e6bb5..11373df 100644
--- a/fpicker/source/office/QueryFolderName.hxx
+++ b/fpicker/source/office/QueryFolderName.hxx
@@ -37,7 +37,7 @@ private:
public:
QueryFolderNameDialog(vcl::Window* _pParent, const OUString& rTitle,
- const OUString& rDefaultText, OUString* pGroupName = nullptr);
+ const OUString& rDefaultText);
virtual ~QueryFolderNameDialog();
virtual void dispose() override;
OUString GetName() const { return m_pNameEdit->GetText(); }
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 251bd13..eb15bfa 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -2749,7 +2749,7 @@ IMPL_LINK_NOARG_TYPED( SvtFileDialog, Split_Hdl, Splitter*, void )
}
QueryFolderNameDialog::QueryFolderNameDialog(vcl::Window* _pParent,
- const OUString& rTitle, const OUString& rDefaultText, OUString* pGroupName)
+ const OUString& rTitle, const OUString& rDefaultText)
: ModalDialog(_pParent, "FolderNameDialog", "fps/ui/foldernamedialog.ui")
{
get(m_pNameEdit, "entry");
@@ -2761,9 +2761,6 @@ QueryFolderNameDialog::QueryFolderNameDialog(vcl::Window* _pParent,
m_pNameEdit->SetSelection( Selection( 0, rDefaultText.getLength() ) );
m_pOKBtn->SetClickHdl( LINK( this, QueryFolderNameDialog, OKHdl ) );
m_pNameEdit->SetModifyHdl( LINK( this, QueryFolderNameDialog, NameHdl ) );
-
- if (pGroupName)
- m_pNameLine->set_label( *pGroupName );
};
QueryFolderNameDialog::~QueryFolderNameDialog()
diff --git a/lotuswordpro/source/filter/bencont.cxx b/lotuswordpro/source/filter/bencont.cxx
index b126b48..506b2ed 100644
--- a/lotuswordpro/source/filter/bencont.cxx
+++ b/lotuswordpro/source/filter/bencont.cxx
@@ -219,10 +219,9 @@ BenError LtcBenContainer::SeekFromEnd(long Offset)
/**
* Find the next value stream with property name
* @param string of property name
-* @param current value stream pointer with the property name
* @return next value stream pointer with the property names
*/
-LtcUtBenValueStream * LtcBenContainer::FindNextValueStreamWithPropertyName(const char * sPropertyName, LtcUtBenValueStream * pCurrentValueStream)
+LtcUtBenValueStream * LtcBenContainer::FindNextValueStreamWithPropertyName(const char * sPropertyName)
{
CBenPropertyName * pPropertyName(nullptr);
RegisterPropertyName(sPropertyName, &pPropertyName); // Get property name object
@@ -232,10 +231,6 @@ LtcUtBenValueStream * LtcBenContainer::FindNextValueStreamWithPropertyName(const
// Get current object
CBenObject * pObj = nullptr;
- if (pCurrentValueStream != nullptr)
- {
- pObj = pCurrentValueStream->GetValue()->GetProperty()->GetBenObject();
- }
pObj =FindNextObjectWithProperty(pObj, pPropertyName->GetID()); // Get next object with same property name
if (nullptr == pObj)
@@ -258,7 +253,7 @@ LtcUtBenValueStream * LtcBenContainer::FindNextValueStreamWithPropertyName(const
*/
LtcUtBenValueStream * LtcBenContainer::FindValueStreamWithPropertyName(const char * sPropertyName)
{
- return FindNextValueStreamWithPropertyName(sPropertyName, nullptr);
+ return FindNextValueStreamWithPropertyName(sPropertyName);
}
/**
* <description>
diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx
index 1530f03..ef157e9 100644
--- a/lotuswordpro/source/filter/bento.hxx
+++ b/lotuswordpro/source/filter/bento.hxx
@@ -221,7 +221,7 @@ public: // Internal methods
CUtList& GetObjects() { return cObjects; }
CUtList& GetNamedObjects() { return cNamedObjects; }
- LtcUtBenValueStream * FindNextValueStreamWithPropertyName(const char * sPropertyName, LtcUtBenValueStream * pCurrentValueStream);
+ LtcUtBenValueStream * FindNextValueStreamWithPropertyName(const char * sPropertyName);
LtcUtBenValueStream * FindValueStreamWithPropertyName(const char * sPropertyName);
void CreateGraphicStream(SvStream * &pStream, const char *pObjectName);
diff --git a/lotuswordpro/source/filter/explode.cxx b/lotuswordpro/source/filter/explode.cxx
index 87f4049..0d8515a 100644
--- a/lotuswordpro/source/filter/explode.cxx
+++ b/lotuswordpro/source/filter/explode.cxx
@@ -451,11 +451,11 @@ void Decompression::fillArray()
}
}
-HuffmanTreeNode::HuffmanTreeNode(sal_uInt32 nValue , HuffmanTreeNode * pLeft , HuffmanTreeNode * pRight )
+HuffmanTreeNode::HuffmanTreeNode(sal_uInt32 nValue )
{
value = nValue;
- left = pLeft;
- right = pRight;
+ left = nullptr;
+ right = nullptr;
}
HuffmanTreeNode::~HuffmanTreeNode()
{
diff --git a/lotuswordpro/source/filter/explode.hxx b/lotuswordpro/source/filter/explode.hxx
index 04c4cf5..27fc427 100644
--- a/lotuswordpro/source/filter/explode.hxx
+++ b/lotuswordpro/source/filter/explode.hxx
@@ -67,7 +67,7 @@ public:
HuffmanTreeNode * right;
sal_uInt32 value;
- HuffmanTreeNode(sal_uInt32 value = 0xffffffff, HuffmanTreeNode * left = nullptr, HuffmanTreeNode * right = nullptr) ;
+ HuffmanTreeNode(sal_uInt32 value = 0xffffffff) ;
~HuffmanTreeNode() ;
HuffmanTreeNode * InsertNode(sal_uInt32 nValue, const sal_Char * pInCode);
HuffmanTreeNode * QueryNode(const sal_Char *pCode);
More information about the Libreoffice-commits
mailing list