[Libreoffice-commits] core.git: 13 commits - accessibility/inc accessibility/source avmedia/source basctl/source binaryurp/source bridges/source chart2/source configmgr/source dbaccess/source framework/source include/vcl reportdesign/source sc/source sd/source svtools/source svx/source sw/source vcl/inc vcl/source
Stephan Bergmann
sbergman at redhat.com
Fri Feb 7 09:44:04 PST 2014
accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx | 6
accessibility/inc/accessibility/extended/AccessibleGridControl.hxx | 5
accessibility/inc/accessibility/extended/textwindowaccessibility.hxx | 4
accessibility/inc/accessibility/helper/characterattributeshelper.hxx | 2
accessibility/source/extended/textwindowaccessibility.cxx | 9
accessibility/source/standard/vclxaccessiblemenuitem.cxx | 10
accessibility/source/standard/vclxaccessiblestatusbaritem.cxx | 7
accessibility/source/standard/vclxaccessibletabpage.cxx | 7
accessibility/source/standard/vclxaccessibletextcomponent.cxx | 6
avmedia/source/viewer/mediawindow.cxx | 3
basctl/source/basicide/basides1.cxx | 3
basctl/source/basicide/basobj2.cxx | 8
basctl/source/basicide/bastype2.cxx | 69
basctl/source/basicide/bastype2.hxx | 4
basctl/source/basicide/documentenumeration.hxx | 4
basctl/source/basicide/moduldl2.cxx | 14
basctl/source/basicide/moduldlg.cxx | 14
basctl/source/basicide/scriptdocument.cxx | 4
binaryurp/source/bridge.cxx | 4
binaryurp/source/reader.cxx | 10
bridges/source/jni_uno/jni_bridge.cxx | 11
bridges/source/jni_uno/jni_data.cxx | 31
bridges/source/jni_uno/jni_helper.h | 6
bridges/source/jni_uno/jni_uno2java.cxx | 7
chart2/source/controller/dialogs/dlg_DataEditor.cxx | 14
configmgr/source/childaccess.hxx | 6
dbaccess/source/ui/dlg/indexdialog.cxx | 4
framework/source/uielement/complextoolbarcontroller.cxx | 10
framework/source/uielement/generictoolbarcontroller.cxx | 8
framework/source/uielement/toolbarmanager.cxx | 2
framework/source/uielement/toolbarmerger.cxx | 2
include/vcl/toolbox.hxx | 6
reportdesign/source/ui/dlg/AddField.cxx | 4
reportdesign/source/ui/dlg/GroupsSorting.cxx | 10
sc/source/ui/navipi/navipi.cxx | 2
sd/source/ui/dlg/navigatr.cxx | 12
svtools/source/contnr/templwin.cxx | 10
svx/source/dialog/imapdlg.cxx | 18
svx/source/gallery2/galbrws2.cxx | 16
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 36
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 12
sw/source/core/edit/autofmt.cxx | 894 ++++------
vcl/inc/toolbox.h | 2
vcl/source/window/toolbox.cxx | 18
vcl/source/window/toolbox2.cxx | 24
45 files changed, 635 insertions(+), 723 deletions(-)
New commits:
commit 85cdb06fd5ba0c974e729a56dcb0e323c4cdfd25
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Feb 7 17:54:14 2014 +0100
sal_Bool -> bool
Change-Id: Ifc80202e0865b59931af6e50d3d60f5021f8b52e
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index ddd9cc5..20f345c 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -168,13 +168,13 @@ void DataEditor::SetReadOnly( bool bReadOnly )
m_bReadOnly = bReadOnly;
if( m_bReadOnly )
{
- m_aTbxData.EnableItem( TBI_DATA_INSERT_ROW, sal_False );
- m_aTbxData.EnableItem( TBI_DATA_INSERT_COL, sal_False );
- m_aTbxData.EnableItem( TBI_DATA_INSERT_TEXT_COL, sal_False );
- m_aTbxData.EnableItem( TBI_DATA_DELETE_ROW, sal_False );
- m_aTbxData.EnableItem( TBI_DATA_DELETE_COL, sal_False );
- m_aTbxData.EnableItem( TBI_DATA_SWAP_COL, sal_False );
- m_aTbxData.EnableItem( TBI_DATA_SWAP_ROW, sal_False );
+ m_aTbxData.EnableItem( TBI_DATA_INSERT_ROW, false );
+ m_aTbxData.EnableItem( TBI_DATA_INSERT_COL, false );
+ m_aTbxData.EnableItem( TBI_DATA_INSERT_TEXT_COL, false );
+ m_aTbxData.EnableItem( TBI_DATA_DELETE_ROW, false );
+ m_aTbxData.EnableItem( TBI_DATA_DELETE_COL, false );
+ m_aTbxData.EnableItem( TBI_DATA_SWAP_COL, false );
+ m_aTbxData.EnableItem( TBI_DATA_SWAP_ROW, false );
}
m_apBrwData->SetReadOnly( m_bReadOnly );
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index e87dfe0..d302a03 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -268,8 +268,8 @@ namespace dbaui
}
else
{
- m_aActions.EnableItem(ID_INDEX_SAVE, sal_False);
- m_aActions.EnableItem(ID_INDEX_RESET, sal_False);
+ m_aActions.EnableItem(ID_INDEX_SAVE, false);
+ m_aActions.EnableItem(ID_INDEX_RESET, false);
}
m_aActions.EnableItem(ID_INDEX_DROP, bSelectedAnything);
m_aActions.EnableItem(ID_INDEX_RENAME, bSelectedAnything);
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index 1a987d9..8049855 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -163,7 +163,7 @@ throw ( RuntimeException )
{
// Boolean, treat it as checked/unchecked
if ( m_bMadeInvisible )
- m_pToolbar->ShowItem( m_nID, sal_True );
+ m_pToolbar->ShowItem( m_nID, true );
m_pToolbar->CheckItem( m_nID, bValue );
if ( bValue )
eTri = STATE_CHECK;
@@ -176,14 +176,14 @@ throw ( RuntimeException )
m_pToolbar->SetQuickHelpText( m_nID, aText );
if ( m_bMadeInvisible )
- m_pToolbar->ShowItem( m_nID, sal_True );
+ m_pToolbar->ShowItem( m_nID, true );
}
else if ( Event.State >>= aItemState )
{
eTri = STATE_DONTKNOW;
nItemBits |= TIB_CHECKABLE;
if ( m_bMadeInvisible )
- m_pToolbar->ShowItem( m_nID, sal_True );
+ m_pToolbar->ShowItem( m_nID, true );
}
else if ( Event.State >>= aItemVisibility )
{
@@ -194,11 +194,11 @@ throw ( RuntimeException )
{
executeControlCommand( aControlCommand );
if ( m_bMadeInvisible )
- m_pToolbar->ShowItem( m_nID, sal_True );
+ m_pToolbar->ShowItem( m_nID, true );
}
else if ( m_bMadeInvisible )
- m_pToolbar->ShowItem( m_nID, sal_True );
+ m_pToolbar->ShowItem( m_nID, true );
m_pToolbar->SetItemState( m_nID, eTri );
m_pToolbar->SetItemBits( m_nID, nItemBits );
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index c8df613..55fcd6f 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -202,7 +202,7 @@ throw ( RuntimeException )
{
// Boolean, treat it as checked/unchecked
if ( m_bMadeInvisible )
- m_pToolbar->ShowItem( m_nID, sal_True );
+ m_pToolbar->ShowItem( m_nID, true );
m_pToolbar->CheckItem( m_nID, bValue );
if ( bValue )
eTri = STATE_CHECK;
@@ -250,14 +250,14 @@ throw ( RuntimeException )
}
if ( m_bMadeInvisible )
- m_pToolbar->ShowItem( m_nID, sal_True );
+ m_pToolbar->ShowItem( m_nID, true );
}
else if (( Event.State >>= aItemState ) && !m_bEnumCommand )
{
eTri = STATE_DONTKNOW;
nItemBits |= TIB_CHECKABLE;
if ( m_bMadeInvisible )
- m_pToolbar->ShowItem( m_nID, sal_True );
+ m_pToolbar->ShowItem( m_nID, true );
}
else if ( Event.State >>= aItemVisibility )
{
@@ -265,7 +265,7 @@ throw ( RuntimeException )
m_bMadeInvisible = !aItemVisibility.bVisible;
}
else if ( m_bMadeInvisible )
- m_pToolbar->ShowItem( m_nID, sal_True );
+ m_pToolbar->ShowItem( m_nID, true );
m_pToolbar->SetItemState( m_nID, eTri );
m_pToolbar->SetItemBits( m_nID, nItemBits );
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index e36f49a..1b44174 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1313,7 +1313,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
{
m_pToolBar->SetItemText( nId, aString );
}
- m_pToolBar->EnableItem( nId, sal_True );
+ m_pToolBar->EnableItem( nId, true );
m_pToolBar->SetItemState( nId, STATE_NOCHECK );
// Fill command map. It stores all our commands and from what
diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx
index b0d7256..4d398a1 100644
--- a/framework/source/uielement/toolbarmerger.cxx
+++ b/framework/source/uielement/toolbarmerger.cxx
@@ -667,7 +667,7 @@ void ToolBarMerger::CreateToolbarItem( ToolBox* pToolbar, CommandToInfoMap& rCom
pToolbar->SetItemCommand( nItemId, rItem.aCommandURL );
pToolbar->SetQuickHelpText( nItemId, rItem.aLabel );
pToolbar->SetItemText( nItemId, rItem.aLabel );
- pToolbar->EnableItem( nItemId, sal_True );
+ pToolbar->EnableItem( nItemId, true );
pToolbar->SetItemState( nItemId, STATE_NOCHECK );
CommandToInfoMap::iterator pIter = rCommandMap.find( rItem.aCommandURL );
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index bcc444e..8d421bb 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -428,18 +428,18 @@ public:
void CheckItem( sal_uInt16 nItemId, sal_Bool bCheck = sal_True );
sal_Bool IsItemChecked( sal_uInt16 nItemId ) const;
- void EnableItem( sal_uInt16 nItemId, sal_Bool bEnable = sal_True );
+ void EnableItem( sal_uInt16 nItemId, bool bEnable = true );
sal_Bool IsItemEnabled( sal_uInt16 nItemId ) const;
void TriggerItem( sal_uInt16 nItemId, sal_Bool bShift = sal_False, sal_Bool bCtrl = sal_False );
/// Shows or hides items.
- void ShowItem(sal_uInt16 nItemId, sal_Bool bVisible = sal_True);
+ void ShowItem(sal_uInt16 nItemId, bool bVisible = true);
/// Overload to provide ShowItem via command id.
void ShowItem(const OUString& rCommand, bool bVisible = true) { ShowItem(GetItemId(rCommand), bVisible); }
/// Convenience method to hide items (via ShowItem).
- void HideItem(sal_uInt16 nItemId) { ShowItem( nItemId, sal_False ); }
+ void HideItem(sal_uInt16 nItemId) { ShowItem( nItemId, false ); }
/// Overload to provide HideItem via command id.
void HideItem(const OUString& rCommand) { ShowItem(rCommand, false); }
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index d301053..9c5f33f 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -171,7 +171,7 @@ OAddFieldWindow::OAddFieldWindow(Window* pParent
m_aActions.SetSelectHdl(LINK(this, OAddFieldWindow, OnSortAction));
setToolBox(&m_aActions);
m_aActions.CheckItem(SID_FM_SORTUP);
- m_aActions.EnableItem(SID_ADD_CONTROL_PAIR, sal_False);
+ m_aActions.EnableItem(SID_ADD_CONTROL_PAIR, false);
m_pListBox->SetDoubleClickHdl(LINK( this, OAddFieldWindow, OnDoubleClickHdl ) );
m_pListBox->SetSelectHdl(LINK( this, OAddFieldWindow, OnSelectHdl ) );
@@ -310,7 +310,7 @@ void OAddFieldWindow::Update()
const sal_uInt16 nItemCount = m_aActions.GetItemCount();
for (sal_uInt16 j = 0; j< nItemCount; ++j)
{
- m_aActions.EnableItem(m_aActions.GetItemId(j),sal_False);
+ m_aActions.EnableItem(m_aActions.GetItemId(j),false);
}
OUString aTitle(ModuleRes(RID_STR_FIELDSELECTION));
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index aba1052..fa705dd 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -1379,19 +1379,19 @@ void OGroupsSortingDialog::checkButtons(sal_Int32 _nRow)
if (bEnabled && _nRow > 0 )
{
- m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_UP, sal_True);
+ m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_UP, true);
}
else
{
- m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_UP, sal_False);
+ m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_UP, false);
}
if (bEnabled && _nRow < (nRowCount - 1) )
{
- m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_DOWN, sal_True);
+ m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_DOWN, true);
}
else
{
- m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_DOWN, sal_False);
+ m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_DOWN, false);
}
sal_Int32 nGroupPos = m_pFieldExpression->getGroupPosition(_nRow);
@@ -1402,7 +1402,7 @@ void OGroupsSortingDialog::checkButtons(sal_Int32 _nRow)
}
else
{
- m_aToolBox.EnableItem(SID_RPT_GROUPSORT_DELETE, sal_False);
+ m_aToolBox.EnableItem(SID_RPT_GROUPSORT_DELETE, false);
}
}
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index b1e3e51..09140eb 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -485,7 +485,7 @@ void CommandToolBox::UpdateButtons()
}
else
{
- EnableItem( IID_CHANGEROOT, sal_True );
+ EnableItem( IID_CHANGEROOT, true );
sal_Bool bRootSet = rDlg.aLbEntries.GetRootType() != SC_CONTENT_ROOT;
CheckItem( IID_CHANGEROOT, bRootSet );
}
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 9f960c6..bf25bbe 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -197,7 +197,7 @@ void SdNavigatorWin::InitTreeLB( const SdDrawDocument* pDoc )
// Disable the shape filter drop down menu when there is a running slide
// show.
if (pViewShell!=NULL && sd::SlideShow::IsRunning( pViewShell->GetViewShellBase() ))
- maToolbox.EnableItem(TBI_SHAPE_FILTER, sal_False);
+ maToolbox.EnableItem(TBI_SHAPE_FILTER, false);
else
maToolbox.EnableItem(TBI_SHAPE_FILTER);
@@ -904,7 +904,7 @@ void SdNavigatorControllerItem::StateChanged( sal_uInt16 nSId,
pNavigatorWin->maToolbox.EnableItem( TBI_PEN );
if( nState & NAVBTN_PEN_DISABLED &&
pNavigatorWin->maToolbox.IsItemEnabled( TBI_PEN ) )
- pNavigatorWin->maToolbox.EnableItem( TBI_PEN, sal_False );
+ pNavigatorWin->maToolbox.EnableItem( TBI_PEN, false );
if( nState & NAVBTN_PEN_CHECKED &&
!pNavigatorWin->maToolbox.IsItemChecked( TBI_PEN ) )
pNavigatorWin->maToolbox.CheckItem( TBI_PEN );
@@ -922,7 +922,7 @@ void SdNavigatorControllerItem::StateChanged( sal_uInt16 nSId,
pNavigatorWin->maToolbox.EnableItem( TBI_FIRST );
if( nState & NAVBTN_FIRST_DISABLED &&
pNavigatorWin->maToolbox.IsItemEnabled( TBI_FIRST ) )
- pNavigatorWin->maToolbox.EnableItem( TBI_FIRST, sal_False );
+ pNavigatorWin->maToolbox.EnableItem( TBI_FIRST, false );
// Prev
if( nState & NAVBTN_PREV_ENABLED &&
@@ -930,7 +930,7 @@ void SdNavigatorControllerItem::StateChanged( sal_uInt16 nSId,
pNavigatorWin->maToolbox.EnableItem( TBI_PREVIOUS );
if( nState & NAVBTN_PREV_DISABLED &&
pNavigatorWin->maToolbox.IsItemEnabled( TBI_PREVIOUS ) )
- pNavigatorWin->maToolbox.EnableItem( TBI_PREVIOUS, sal_False );
+ pNavigatorWin->maToolbox.EnableItem( TBI_PREVIOUS, false );
// Last
if( nState & NAVBTN_LAST_ENABLED &&
@@ -938,7 +938,7 @@ void SdNavigatorControllerItem::StateChanged( sal_uInt16 nSId,
pNavigatorWin->maToolbox.EnableItem( TBI_LAST );
if( nState & NAVBTN_LAST_DISABLED &&
pNavigatorWin->maToolbox.IsItemEnabled( TBI_LAST ) )
- pNavigatorWin->maToolbox.EnableItem( TBI_LAST, sal_False );
+ pNavigatorWin->maToolbox.EnableItem( TBI_LAST, false );
// Next
if( nState & NAVBTN_NEXT_ENABLED &&
@@ -946,7 +946,7 @@ void SdNavigatorControllerItem::StateChanged( sal_uInt16 nSId,
pNavigatorWin->maToolbox.EnableItem( TBI_NEXT );
if( nState & NAVBTN_NEXT_DISABLED &&
pNavigatorWin->maToolbox.IsItemEnabled( TBI_NEXT ) )
- pNavigatorWin->maToolbox.EnableItem( TBI_NEXT, sal_False );
+ pNavigatorWin->maToolbox.EnableItem( TBI_NEXT, false );
if( nState & NAVTLB_UPDATE )
{
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index 95e16bd..41e2f51 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -864,7 +864,7 @@ IMPL_LINK_NOARG(SvtTemplateWindow , IconClickHdl_Impl)
{
pFileWin->OpenRoot( aURL );
pIconWin->InvalidateIconControl();
- aFileViewTB.EnableItem( TI_DOCTEMPLATE_PRINT, sal_False );
+ aFileViewTB.EnableItem( TI_DOCTEMPLATE_PRINT, false );
}
return 0;
}
@@ -901,7 +901,7 @@ IMPL_LINK_NOARG(SvtTemplateWindow , FileDblClickHdl_Impl)
IMPL_LINK_NOARG(SvtTemplateWindow , NewFolderHdl_Impl)
{
pFrameWin->OpenFile( "", sal_True, sal_False, sal_False );
- aFileViewTB.EnableItem( TI_DOCTEMPLATE_PRINT, sal_False );
+ aFileViewTB.EnableItem( TI_DOCTEMPLATE_PRINT, false );
OUString sURL = pFileWin->GetFolderURL();
sal_uLong nPos = pIconWin->GetRootPos( sURL );
@@ -1065,9 +1065,9 @@ void SvtTemplateWindow::InitToolBoxes()
aFrameWinTB.SetOutStyle( TOOLBOX_STYLE_FLAT );
}
- aFileViewTB.EnableItem( TI_DOCTEMPLATE_BACK, sal_False );
- aFileViewTB.EnableItem( TI_DOCTEMPLATE_PREV, sal_False );
- aFileViewTB.EnableItem( TI_DOCTEMPLATE_PRINT, sal_False );
+ aFileViewTB.EnableItem( TI_DOCTEMPLATE_BACK, false );
+ aFileViewTB.EnableItem( TI_DOCTEMPLATE_PREV, false );
+ aFileViewTB.EnableItem( TI_DOCTEMPLATE_PRINT, false );
Link aLink = LINK( this, SvtTemplateWindow, ClickHdl_Impl );
aFileViewTB.SetClickHdl( aLink );
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index c873f6a..c7c1cd4 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -180,9 +180,9 @@ SvxIMapDlg::SvxIMapDlg( SfxBindings *_pBindings, SfxChildWindow *pCW,
pOwnData->aTimer.SetTimeout( 100 );
pOwnData->aTimer.SetTimeoutHdl( LINK( this, SvxIMapDlg, UpdateHdl ) );
- aTbxIMapDlg1.EnableItem( TBI_ACTIVE, sal_False );
- aTbxIMapDlg1.EnableItem( TBI_MACRO, sal_False );
- aTbxIMapDlg1.EnableItem( TBI_PROPERTY, sal_False );
+ aTbxIMapDlg1.EnableItem( TBI_ACTIVE, false );
+ aTbxIMapDlg1.EnableItem( TBI_MACRO, false );
+ aTbxIMapDlg1.EnableItem( TBI_PROPERTY, false );
}
SvxIMapDlg::~SvxIMapDlg()
@@ -599,9 +599,9 @@ IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow*, pWnd )
if ( !rInfo.bOneMarked )
{
aTbxIMapDlg1.CheckItem( TBI_ACTIVE, sal_False );
- aTbxIMapDlg1.EnableItem( TBI_ACTIVE, sal_False );
- aTbxIMapDlg1.EnableItem( TBI_MACRO, sal_False );
- aTbxIMapDlg1.EnableItem( TBI_PROPERTY, sal_False );
+ aTbxIMapDlg1.EnableItem( TBI_ACTIVE, false );
+ aTbxIMapDlg1.EnableItem( TBI_MACRO, false );
+ aTbxIMapDlg1.EnableItem( TBI_PROPERTY, false );
aStbStatus.SetItemText( 1, aStr );
aFtURL.Disable();
@@ -616,10 +616,10 @@ IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow*, pWnd )
}
else
{
- aTbxIMapDlg1.EnableItem( TBI_ACTIVE, sal_True );
+ aTbxIMapDlg1.EnableItem( TBI_ACTIVE, true );
aTbxIMapDlg1.CheckItem( TBI_ACTIVE, !rInfo.bActivated );
- aTbxIMapDlg1.EnableItem( TBI_MACRO, sal_True );
- aTbxIMapDlg1.EnableItem( TBI_PROPERTY, sal_True );
+ aTbxIMapDlg1.EnableItem( TBI_MACRO, true );
+ aTbxIMapDlg1.EnableItem( TBI_PROPERTY, true );
aFtURL.Enable();
maURLBox.Enable();
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index ed1ec44..fb483ed 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -777,8 +777,8 @@ void GalleryBrowser2::SelectTheme( const OUString& rThemeName )
Resize();
ImplUpdateViews( 1 );
- maViewBox.EnableItem( TBX_ID_ICON, sal_True );
- maViewBox.EnableItem( TBX_ID_LIST, sal_True );
+ maViewBox.EnableItem( TBX_ID_ICON, true );
+ maViewBox.EnableItem( TBX_ID_LIST, true );
maViewBox.CheckItem( ( GALLERYBROWSERMODE_ICON == GetMode() ) ? TBX_ID_ICON : TBX_ID_LIST, sal_True );
if(maInfoBar.GetText().isEmpty())
@@ -806,8 +806,8 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode )
mpIconView->Show();
- maViewBox.EnableItem( TBX_ID_ICON, sal_True );
- maViewBox.EnableItem( TBX_ID_LIST, sal_True );
+ maViewBox.EnableItem( TBX_ID_ICON, true );
+ maViewBox.EnableItem( TBX_ID_LIST, true );
maViewBox.CheckItem( TBX_ID_ICON, sal_True );
maViewBox.CheckItem( TBX_ID_LIST, sal_False );
@@ -824,8 +824,8 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode )
mpListView->Show();
- maViewBox.EnableItem( TBX_ID_ICON, sal_True );
- maViewBox.EnableItem( TBX_ID_LIST, sal_True );
+ maViewBox.EnableItem( TBX_ID_ICON, true );
+ maViewBox.EnableItem( TBX_ID_LIST, true );
maViewBox.CheckItem( TBX_ID_ICON, sal_False );
maViewBox.CheckItem( TBX_ID_LIST, sal_True );
@@ -854,8 +854,8 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode )
if( mpCurTheme && mpCurTheme->GetObjectKind( nPos ) == SGA_OBJ_SOUND )
mpPreview->PreviewMedia( mpCurTheme->GetObjectURL( nPos ) );
- maViewBox.EnableItem( TBX_ID_ICON, sal_False );
- maViewBox.EnableItem( TBX_ID_LIST, sal_False );
+ maViewBox.EnableItem( TBX_ID_ICON, false );
+ maViewBox.EnableItem( TBX_ID_LIST, false );
}
}
break;
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 219d8fc..f307c20 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -538,15 +538,15 @@ void ParaPropertyPanel::VertStateChanged(sal_uInt16 nSID, SfxItemState eState, c
mpTBxVertAlign->SetItemState(nIdVertTop, STATE_NOCHECK);
mpTBxVertAlign->SetItemState(nIdVertCenter, STATE_NOCHECK);
mpTBxVertAlign->SetItemState(nIdVertBottom, STATE_NOCHECK);
- mpTBxVertAlign->EnableItem(nIdVertTop, sal_False);
- mpTBxVertAlign->EnableItem(nIdVertCenter, sal_False);
- mpTBxVertAlign->EnableItem(nIdVertBottom, sal_False);
+ mpTBxVertAlign->EnableItem(nIdVertTop, false);
+ mpTBxVertAlign->EnableItem(nIdVertCenter, false);
+ mpTBxVertAlign->EnableItem(nIdVertBottom, false);
}
else
{
- mpTBxVertAlign->EnableItem(nIdVertTop, sal_True);
- mpTBxVertAlign->EnableItem(nIdVertCenter, sal_True);
- mpTBxVertAlign->EnableItem(nIdVertBottom, sal_True);
+ mpTBxVertAlign->EnableItem(nIdVertTop, true);
+ mpTBxVertAlign->EnableItem(nIdVertCenter, true);
+ mpTBxVertAlign->EnableItem(nIdVertBottom, true);
if ( (eState >= SFX_ITEM_DEFAULT) && (pState->ISA(SfxBoolItem)))
{
const SfxBoolItem* pItem= (const SfxBoolItem*)pState;
@@ -1163,16 +1163,16 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat
const sal_uInt16 nIdIncrIndent = mpTbxIndent_IncDec->GetItemId(UNO_INCREMENTINDENT);
const sal_uInt16 nIdDecrIndent = mpTbxIndent_IncDec->GetItemId(UNO_DECREMENTINDENT);
- mpTbxIndent_IncDec->EnableItem(nIdHangingIndent, sal_True);
+ mpTbxIndent_IncDec->EnableItem(nIdHangingIndent, true);
if ( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Text)
&& maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Default)
&& maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Table) )
{
- mpTbxIndent_IncDec->EnableItem(nIdIncrIndent, sal_True);
- mpTbxIndent_IncDec->EnableItem(nIdDecrIndent, sal_True);
+ mpTbxIndent_IncDec->EnableItem(nIdIncrIndent, true);
+ mpTbxIndent_IncDec->EnableItem(nIdDecrIndent, true);
}
- mpTbxProDemote->EnableItem(nIdHangingIndent2, sal_True);
+ mpTbxProDemote->EnableItem(nIdHangingIndent2, true);
}
else if( eState == SFX_ITEM_DISABLED )
{
@@ -1185,10 +1185,10 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat
maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Table) )
mpTbxIndent_IncDec->Disable();
else
- mpTbxIndent_IncDec->EnableItem(nIdHangingIndent, sal_False);
+ mpTbxIndent_IncDec->EnableItem(nIdHangingIndent, false);
// maTbxProDemote->Disable();
- mpTbxProDemote->EnableItem(nIdHangingIndent2, sal_False);
+ mpTbxProDemote->EnableItem(nIdHangingIndent2, false);
}
else
{
@@ -1200,8 +1200,8 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat
maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Table) )
mpTbxIndent_IncDec->Disable();
else
- mpTbxIndent_IncDec->EnableItem(nIdHangingIndent, sal_False);
- mpTbxProDemote->EnableItem(nIdHangingIndent2, sal_False);
+ mpTbxIndent_IncDec->EnableItem(nIdHangingIndent, false);
+ mpTbxProDemote->EnableItem(nIdHangingIndent2, false);
}
}
@@ -1276,15 +1276,15 @@ void ParaPropertyPanel::StateChangeOutLineImpl( sal_uInt16 nSID, SfxItemState eS
const sal_uInt16 nIdDemote = mpTbxProDemote->GetItemId(UNO_DEMOTE);
if(mbOutLineLeft)
- mpTbxProDemote->EnableItem(nIdDemote, sal_True);
+ mpTbxProDemote->EnableItem(nIdDemote, true);
else
- mpTbxProDemote->EnableItem(nIdDemote, sal_False);
+ mpTbxProDemote->EnableItem(nIdDemote, false);
const sal_uInt16 nIdPromote = mpTbxProDemote->GetItemId(UNO_PROMOTE);
if(mbOutLineRight)
- mpTbxProDemote->EnableItem(nIdPromote, sal_True);
+ mpTbxProDemote->EnableItem(nIdPromote, true);
else
- mpTbxProDemote->EnableItem(nIdPromote, sal_False);
+ mpTbxProDemote->EnableItem(nIdPromote, false);
}
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 9a425d2..04b141e 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -427,12 +427,12 @@ void SAL_CALL FindTextToolbarController::initialize( const css::uno::Sequence< :
OUString sItemCommand = pToolBox->GetItemCommand(i);
if ( sItemCommand == COMMAND_DOWNSEARCH )
{
- pToolBox->EnableItem(i, sal_False);
+ pToolBox->EnableItem(i, false);
m_nDownSearchId = i;
}
else if ( sItemCommand == COMMAND_UPSEARCH )
{
- pToolBox->EnableItem(i, sal_False);
+ pToolBox->EnableItem(i, false);
m_nUpSearchId = i;
}
}
@@ -486,16 +486,16 @@ IMPL_LINK_NOARG(FindTextToolbarController, EditModifyHdl)
if (!m_pFindTextFieldControl->GetText().isEmpty())
{
if ( !pToolBox->IsItemEnabled(m_nDownSearchId) )
- pToolBox->EnableItem(m_nDownSearchId, sal_True);
+ pToolBox->EnableItem(m_nDownSearchId, true);
if ( !pToolBox->IsItemEnabled(m_nUpSearchId) )
- pToolBox->EnableItem(m_nUpSearchId, sal_True);
+ pToolBox->EnableItem(m_nUpSearchId, true);
}
else
{
if ( pToolBox->IsItemEnabled(m_nDownSearchId) )
- pToolBox->EnableItem(m_nDownSearchId, sal_False);
+ pToolBox->EnableItem(m_nDownSearchId, false);
if ( pToolBox->IsItemEnabled(m_nUpSearchId) )
- pToolBox->EnableItem(m_nUpSearchId, sal_False);
+ pToolBox->EnableItem(m_nUpSearchId, false);
}
}
diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h
index 8ea1cb1..6c8bd8e 100644
--- a/vcl/inc/toolbox.h
+++ b/vcl/inc/toolbox.h
@@ -70,7 +70,7 @@ struct ImplToolItem
ToolBoxItemBits mnBits;
TriState meState;
sal_uInt16 mnId;
- sal_Bool mbEnabled:1,
+ bool mbEnabled:1,
mbVisible:1,
mbEmptyBtn:1,
mbShowWindow:1,
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 9a54b3f..3cc5a8f 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1817,7 +1817,7 @@ sal_Bool ToolBox::ImplCalcItem()
sal_Bool bImage;
sal_Bool bText;
- it->mbVisibleText = sal_False; // indicates if text will definitely be drawn, influences dropdown pos
+ it->mbVisibleText = false; // indicates if text will definitely be drawn, influences dropdown pos
if ( it->meType == TOOLBOXITEM_BUTTON )
{
@@ -1834,7 +1834,7 @@ sal_Bool ToolBox::ImplCalcItem()
if ( bImage || bText )
{
- it->mbEmptyBtn = sal_False;
+ it->mbEmptyBtn = false;
if ( tmpButtonType == BUTTON_SYMBOL )
{
@@ -1847,7 +1847,7 @@ sal_Bool ToolBox::ImplCalcItem()
{
it->maItemSize = Size( GetCtrlTextWidth( it->maText )+TB_TEXTOFFSET,
GetTextHeight() );
- it->mbVisibleText = sal_True;
+ it->mbVisibleText = true;
}
}
else if ( tmpButtonType == BUTTON_TEXT )
@@ -1857,7 +1857,7 @@ sal_Bool ToolBox::ImplCalcItem()
{
it->maItemSize = Size( GetCtrlTextWidth( it->maText )+TB_TEXTOFFSET,
GetTextHeight() );
- it->mbVisibleText = sal_True;
+ it->mbVisibleText = true;
}
else
{
@@ -1885,7 +1885,7 @@ sal_Bool ToolBox::ImplCalcItem()
else
{ // no image and no text
it->maItemSize = Size( nDefWidth, nDefHeight );
- it->mbEmptyBtn = sal_True;
+ it->mbEmptyBtn = true;
}
// save the content size
@@ -2099,7 +2099,7 @@ sal_uInt16 ToolBox::ImplCalcBreaks( long nWidth, long* pMaxLineWidth, sal_Bool b
nLineWidth = 0;
nLineStart = it - mpData->m_aItems.begin();
nGroupStart = nLineStart;
- it->mbBreak = sal_True;
+ it->mbBreak = true;
bBreak = sal_False;
}
else
@@ -2229,7 +2229,7 @@ static void lcl_hideDoubleSeparators( std::vector< ImplToolItem >& rItems )
{
if ( it->meType == TOOLBOXITEM_SEPARATOR )
{
- it->mbVisible = sal_False;
+ it->mbVisible = false;
if ( !bLastSep )
{
// check if any visible items have to appear behind it
@@ -2239,7 +2239,7 @@ static void lcl_hideDoubleSeparators( std::vector< ImplToolItem >& rItems )
if ( ((temp_it->meType == TOOLBOXITEM_BUTTON) &&
temp_it->mbVisible) )
{
- it->mbVisible = sal_True;
+ it->mbVisible = true;
break;
}
}
@@ -2521,7 +2521,7 @@ void ToolBox::ImplFormat( sal_Bool bResize )
it = mpData->m_aItems.begin();
while ( it != mpData->m_aItems.end() )
{
- it->mbShowWindow = sal_False;
+ it->mbShowWindow = false;
// check for line break and advance nX/nY accordingly
if ( it->mbBreak )
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index aced93f..3fc9e3e 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -105,11 +105,11 @@ void ImplToolItem::init(sal_uInt16 nItemId, ToolBoxItemBits nItemBits,
meType = TOOLBOXITEM_BUTTON;
mnBits = nItemBits;
meState = STATE_NOCHECK;
- mbEnabled = sal_True;
- mbVisible = sal_True;
+ mbEnabled = true;
+ mbVisible = true;
mbEmptyBtn = bEmptyBtn;
- mbShowWindow = sal_False;
- mbBreak = sal_False;
+ mbShowWindow = false;
+ mbBreak = false;
mnSepSize = TB_SEP_SIZE;
mnDropDownArrowWidth = TB_DROPDOWNARROWWIDTH;
mnImageAngle = 0;
@@ -248,7 +248,7 @@ Size ImplToolItem::GetSize( sal_Bool bHorz, sal_Bool bCheckMaxWidth, long maxWid
{
aSize.Width() = aWinSize.Width();
aSize.Height() = aWinSize.Height();
- mbShowWindow = sal_True;
+ mbShowWindow = true;
}
else
{
@@ -831,7 +831,7 @@ void ToolBox::InsertSpace( sal_uInt16 nPos )
// Item anlegen und in die Liste einfuegen
ImplToolItem aItem;
aItem.meType = TOOLBOXITEM_SPACE;
- aItem.mbEnabled = sal_False;
+ aItem.mbEnabled = false;
mpData->m_aItems.insert( (nPos < mpData->m_aItems.size()) ? mpData->m_aItems.begin()+nPos : mpData->m_aItems.end(), aItem );
mpData->ImplClearLayoutData();
@@ -849,7 +849,7 @@ void ToolBox::InsertSeparator( sal_uInt16 nPos, sal_uInt16 nPixSize )
// Item anlegen und in die Liste einfuegen
ImplToolItem aItem;
aItem.meType = TOOLBOXITEM_SEPARATOR;
- aItem.mbEnabled = sal_False;
+ aItem.mbEnabled = false;
if ( nPixSize )
aItem.mnSepSize = nPixSize;
mpData->m_aItems.insert( (nPos < mpData->m_aItems.size()) ? mpData->m_aItems.begin()+nPos : mpData->m_aItems.end(), aItem );
@@ -869,7 +869,7 @@ void ToolBox::InsertBreak( sal_uInt16 nPos )
// Item anlegen und in die Liste einfuegen
ImplToolItem aItem;
aItem.meType = TOOLBOXITEM_BREAK;
- aItem.mbEnabled = sal_False;
+ aItem.mbEnabled = false;
mpData->m_aItems.insert( (nPos < mpData->m_aItems.size()) ? mpData->m_aItems.begin()+nPos : mpData->m_aItems.end(), aItem );
mpData->ImplClearLayoutData();
@@ -931,7 +931,7 @@ void ToolBox::CopyItem( const ToolBox& rToolBox, sal_uInt16 nItemId,
ImplToolItem aNewItem = rToolBox.mpData->m_aItems[nPos];
// Bestimme Daten zuruecksetzen
aNewItem.mpWindow = NULL;
- aNewItem.mbShowWindow = sal_False;
+ aNewItem.mbShowWindow = false;
mpData->m_aItems.insert( (nNewPos < mpData->m_aItems.size()) ? mpData->m_aItems.begin()+nNewPos : mpData->m_aItems.end(), aNewItem );
mpData->ImplClearLayoutData();
@@ -1755,7 +1755,7 @@ TriState ToolBox::GetItemState( sal_uInt16 nItemId ) const
// -----------------------------------------------------------------------
-void ToolBox::EnableItem( sal_uInt16 nItemId, sal_Bool bEnable )
+void ToolBox::EnableItem( sal_uInt16 nItemId, bool bEnable )
{
sal_uInt16 nPos = GetItemPos( nItemId );
@@ -1763,7 +1763,7 @@ void ToolBox::EnableItem( sal_uInt16 nItemId, sal_Bool bEnable )
{
ImplToolItem* pItem = &mpData->m_aItems[nPos];
if ( bEnable )
- bEnable = sal_True;
+ bEnable = true;
if ( pItem->mbEnabled != bEnable )
{
pItem->mbEnabled = bEnable;
@@ -1799,7 +1799,7 @@ sal_Bool ToolBox::IsItemEnabled( sal_uInt16 nItemId ) const
// -----------------------------------------------------------------------
-void ToolBox::ShowItem( sal_uInt16 nItemId, sal_Bool bVisible )
+void ToolBox::ShowItem( sal_uInt16 nItemId, bool bVisible )
{
sal_uInt16 nPos = GetItemPos( nItemId );
mpData->ImplClearLayoutData();
commit b20888e1299464249875652ac3794258a75c593b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Feb 7 16:27:32 2014 +0100
auto_ptr -> scoped_ptr
Change-Id: I5e405ec2689000c973cf8ff1f86c1c2d6202eda9
diff --git a/configmgr/source/childaccess.hxx b/configmgr/source/childaccess.hxx
index ef1444a..8eb688e 100644
--- a/configmgr/source/childaccess.hxx
+++ b/configmgr/source/childaccess.hxx
@@ -22,16 +22,16 @@
#include "sal/config.h"
-#include <memory>
#include <vector>
+#include "boost/scoped_ptr.hpp"
+#include "boost/shared_ptr.hpp"
#include "com/sun/star/container/XChild.hpp"
#include "com/sun/star/lang/NoSupportException.hpp"
#include "com/sun/star/lang/XUnoTunnel.hpp"
#include "com/sun/star/uno/Reference.hxx"
#include "com/sun/star/uno/RuntimeException.hpp"
#include "com/sun/star/uno/Sequence.hxx"
-#include "boost/shared_ptr.hpp"
#include "rtl/ref.hxx"
#include "sal/types.h"
@@ -134,7 +134,7 @@ private:
rtl::Reference< Access > parent_; // null if free node
OUString name_;
rtl::Reference< Node > node_;
- std::auto_ptr< com::sun::star::uno::Any > changedValue_;
+ boost::scoped_ptr< com::sun::star::uno::Any > changedValue_;
bool inTransaction_;
// to determine if a free node can be inserted underneath some root
boost::shared_ptr<osl::Mutex> lock_;
commit ae2ccda11747689e56688936bf9aa30b76ca1b26
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Feb 7 16:05:55 2014 +0100
auto_ptr -> heap_ptr
Change-Id: I2c6bb5c0ad9a844826498a1c8495249dd88a9942
diff --git a/bridges/source/jni_uno/jni_bridge.cxx b/bridges/source/jni_uno/jni_bridge.cxx
index 7de0a7e..26b0300 100644
--- a/bridges/source/jni_uno/jni_bridge.cxx
+++ b/bridges/source/jni_uno/jni_bridge.cxx
@@ -25,12 +25,11 @@
#include <boost/static_assert.hpp>
#include "jvmaccess/unovirtualmachine.hxx"
+#include "o3tl/heap_ptr.hxx"
#include "rtl/ref.hxx"
#include "rtl/strbuf.hxx"
#include "uno/lbnames.h"
-
-using namespace ::std;
using namespace ::rtl;
using namespace ::osl;
using namespace ::jni_uno;
@@ -311,11 +310,9 @@ void JNI_context::java_exc_occurred() const
}
jsize len = m_env->GetStringLength( (jstring) jo_descr.get() );
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- auto_ptr< rtl_mem > ustr_mem(
+ o3tl::heap_ptr< rtl_mem > ustr_mem(
rtl_mem::allocate(
sizeof (rtl_uString) + (len * sizeof (sal_Unicode)) ) );
- SAL_WNODEPRECATED_DECLARATIONS_POP
rtl_uString * ustr = (rtl_uString *)ustr_mem.get();
m_env->GetStringRegion( (jstring) jo_descr.get(), 0, len, ustr->buffer );
if (m_env->ExceptionCheck())
@@ -389,11 +386,9 @@ OUString JNI_context::get_stack_trace( jobject jo_exc ) const
{
jsize len =
m_env->GetStringLength( (jstring) jo_stack_trace.get() );
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- auto_ptr< rtl_mem > ustr_mem(
+ o3tl::heap_ptr< rtl_mem > ustr_mem(
rtl_mem::allocate(
sizeof (rtl_uString) + (len * sizeof (sal_Unicode)) ) );
- SAL_WNODEPRECATED_DECLARATIONS_POP
rtl_uString * ustr = (rtl_uString *)ustr_mem.get();
m_env->GetStringRegion(
(jstring) jo_stack_trace.get(), 0, len, ustr->buffer );
diff --git a/bridges/source/jni_uno/jni_data.cxx b/bridges/source/jni_uno/jni_data.cxx
index 36b3906..06063bd 100644
--- a/bridges/source/jni_uno/jni_data.cxx
+++ b/bridges/source/jni_uno/jni_data.cxx
@@ -23,11 +23,10 @@
#include "jni_bridge.h"
+#include "o3tl/heap_ptr.hxx"
#include "rtl/strbuf.hxx"
#include "uno/sequence2.h"
-
-using namespace ::std;
using namespace ::rtl;
namespace jni_uno
@@ -36,10 +35,8 @@ namespace jni_uno
//------------------------------------------------------------------------------
inline rtl_mem * seq_allocate( sal_Int32 nElements, sal_Int32 nSize )
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- auto_ptr< rtl_mem > seq(
+ o3tl::heap_ptr< rtl_mem > seq(
rtl_mem::allocate( SAL_SEQUENCE_HEADER_SIZE + (nElements * nSize) ) );
- SAL_WNODEPRECATED_DECLARATIONS_POP
uno_Sequence * p = (uno_Sequence *)seq.get();
p->nRefCount = 1;
p->nElements = nElements;
@@ -130,9 +127,7 @@ void createDefaultUnoValue(
case typelib_TypeClass_SEQUENCE:
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- auto_ptr< rtl_mem > seq(seq_allocate(0, 0));
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ o3tl::heap_ptr< rtl_mem > seq(seq_allocate(0, 0));
if (assign) {
uno_type_destructData(uno_data, type, 0);
}
@@ -566,10 +561,8 @@ void Bridge::map_to_uno(
}
else
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- auto_ptr< rtl_mem > mem(
+ o3tl::heap_ptr< rtl_mem > mem(
rtl_mem::allocate( sizeof (sal_Int64) ) );
- SAL_WNODEPRECATED_DECLARATIONS_POP
*(jlong *) mem.get() = jni->CallLongMethodA(
java_data.l, m_jni_info->m_method_Long_longValue, 0 );
jni.ensure_no_exception();
@@ -586,10 +579,8 @@ void Bridge::map_to_uno(
}
else
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- auto_ptr< rtl_mem > mem(
+ o3tl::heap_ptr< rtl_mem > mem(
rtl_mem::allocate( sizeof (float) ) );
- SAL_WNODEPRECATED_DECLARATIONS_POP
*(jfloat *) mem.get() = jni->CallFloatMethodA(
java_data.l, m_jni_info->m_method_Float_floatValue, 0 );
jni.ensure_no_exception();
@@ -608,10 +599,8 @@ void Bridge::map_to_uno(
}
else
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- auto_ptr< rtl_mem > mem(
+ o3tl::heap_ptr< rtl_mem > mem(
rtl_mem::allocate( sizeof (double) ) );
- SAL_WNODEPRECATED_DECLARATIONS_POP
*(jdouble *) mem.get() =
jni->CallDoubleMethodA(
java_data.l,
@@ -641,10 +630,8 @@ void Bridge::map_to_uno(
case typelib_TypeClass_STRUCT:
case typelib_TypeClass_EXCEPTION:
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- auto_ptr< rtl_mem > mem(
+ o3tl::heap_ptr< rtl_mem > mem(
rtl_mem::allocate( value_td.get()->nSize ) );
- SAL_WNODEPRECATED_DECLARATIONS_POP
map_to_uno(
jni, mem.get(), java_data, value_td.get()->pWeakRef, 0,
false /* no assign */, false /* no out param */ );
@@ -985,9 +972,7 @@ void Bridge::map_to_uno(
typelib_TypeDescriptionReference * element_type =
((typelib_IndirectTypeDescription *)td.get())->pType;
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- auto_ptr< rtl_mem > seq;
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ o3tl::heap_ptr< rtl_mem > seq;
sal_Int32 nElements = jni->GetArrayLength( (jarray) java_data.l );
switch (element_type->eTypeClass)
diff --git a/bridges/source/jni_uno/jni_helper.h b/bridges/source/jni_uno/jni_helper.h
index 2d85145..ab158b4 100644
--- a/bridges/source/jni_uno/jni_helper.h
+++ b/bridges/source/jni_uno/jni_helper.h
@@ -20,6 +20,8 @@
#ifndef INCLUDED_JNI_HELPER_H
#define INCLUDED_JNI_HELPER_H
+#include <o3tl/heap_ptr.hxx>
+
#include "jni_base.h"
#include "jni_info.h"
@@ -38,11 +40,9 @@ inline void jstring_to_ustring(
else
{
jsize len = jni->GetStringLength( jstr );
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< rtl_mem > mem(
+ o3tl::heap_ptr< rtl_mem > mem(
rtl_mem::allocate(
sizeof (rtl_uString) + (len * sizeof (sal_Unicode)) ) );
- SAL_WNODEPRECATED_DECLARATIONS_POP
rtl_uString * ustr = (rtl_uString *)mem.get();
jni->GetStringRegion( jstr, 0, len, (jchar *) ustr->buffer );
jni.ensure_no_exception();
diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx
index 2465df3..beb4ac0 100644
--- a/bridges/source/jni_uno/jni_uno2java.cxx
+++ b/bridges/source/jni_uno/jni_uno2java.cxx
@@ -21,6 +21,7 @@
#include <cassert>
+#include <o3tl/heap_ptr.hxx>
#include <sal/alloca.h>
#include "com/sun/star/uno/RuntimeException.hpp"
@@ -29,8 +30,6 @@
#include "jni_bridge.h"
-
-using namespace ::std;
using namespace ::rtl;
namespace
@@ -96,9 +95,7 @@ void Bridge::handle_java_exc(
+ jni.get_stack_trace( jo_exc.get() ) );
}
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- auto_ptr< rtl_mem > uno_data( rtl_mem::allocate( td.get()->nSize ) );
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ o3tl::heap_ptr< rtl_mem > uno_data( rtl_mem::allocate( td.get()->nSize ) );
jvalue val;
val.l = jo_exc.get();
map_to_uno(
commit cf1f27affccb3fa97c4b4157dd34fe5c6ef6c6c8
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Feb 7 16:00:27 2014 +0100
auto_ptr -> heap_ptr
Change-Id: I8e7845c8148339fb305666e316b74fd134774ea3
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index 4402888..99b2744 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -21,7 +21,6 @@
#include <cassert>
#include <exception>
-#include <memory>
#include <vector>
#include "boost/scoped_ptr.hpp"
@@ -36,6 +35,7 @@
#include "com/sun/star/uno/XCurrentContext.hpp"
#include "com/sun/star/uno/XInterface.hpp"
#include "cppu/unotype.hxx"
+#include "o3tl/heap_ptr.hxx"
#include "rtl/byteseq.h"
#include "rtl/ustring.hxx"
#include "sal/types.h"
@@ -341,12 +341,10 @@ void Reader::readMessage(Unmarshal & unmarshal) {
}
break;
}
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- std::auto_ptr< IncomingRequest > req(
+ o3tl::heap_ptr< IncomingRequest > req(
new IncomingRequest(
bridge_, tid, oid, obj, type, functionId, synchronous, memberTd,
setter, inArgs, ccMode, cc));
- SAL_WNODEPRECATED_DECLARATIONS_POP
if (synchronous) {
bridge_->incrementActiveCalls();
}
@@ -457,10 +455,8 @@ void Reader::readReplyMessage(Unmarshal & unmarshal, sal_uInt8 flags1) {
switch (req.kind) {
case OutgoingRequest::KIND_NORMAL:
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- std::auto_ptr< IncomingReply > resp(
+ o3tl::heap_ptr< IncomingReply > resp(
new IncomingReply(exc, ret, outArgs));
- SAL_WNODEPRECATED_DECLARATIONS_POP
uno_threadpool_putJob(
bridge_->getThreadPool(), tid.getHandle(), resp.get(), 0,
false);
commit 6606611c425823726f1f40ea085acc982906cef6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Feb 7 16:00:07 2014 +0100
auto_ptr -> scoped_ptr
Change-Id: Iebfb88b6326873642356f5ba566b36c7a3672815
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index 63cc9a7..c2d604d 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -23,10 +23,10 @@
#include <cassert>
#include <cstddef>
#include <limits>
-#include <memory>
#include <vector>
#include "boost/noncopyable.hpp"
+#include "boost/scoped_ptr.hpp"
#include "com/sun/star/bridge/InvalidProtocolChangeException.hpp"
#include "com/sun/star/bridge/XBridge.hpp"
#include "com/sun/star/bridge/XInstanceProvider.hpp"
@@ -609,7 +609,7 @@ bool Bridge::makeCall(
bool setter, std::vector< BinaryAny > const & inArguments,
BinaryAny * returnValue, std::vector< BinaryAny > * outArguments)
{
- std::auto_ptr< IncomingReply > resp;
+ boost::scoped_ptr< IncomingReply > resp;
{
uno_ThreadPool tp = getThreadPool();
AttachThread att(tp);
commit bf28399df0b73364b12309032e4a8b571389c2cf
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Feb 7 15:54:45 2014 +0100
auto_ptr -> heap_ptr
Change-Id: I401505ee15f71e8655570233b953951aa22ad668
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index c899447..522e5e4 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#include <memory>
-
#include <vcl/bitmap.hxx>
#include <vcl/builder.hxx>
@@ -43,6 +40,7 @@
#include <comphelper/processfactory.hxx>
#include <sfx2/dispatch.hxx>
+#include <cassert>
#include <map>
#include <com/sun/star/script/ModuleType.hpp>
#include <com/sun/star/script/vba/XVBAModuleInfo.hpp>
@@ -249,14 +247,11 @@ void TreeListBox::ScanEntry( const ScriptDocument& rDocument, LibraryLocation eL
OUString aRootName( GetRootEntryName( rDocument, eLocation ) );
Image aImage;
GetRootEntryBitmaps( rDocument, aImage );
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
+ o3tl::heap_ptr<Entry> e(new DocumentEntry(rDocument, eLocation));
AddEntry(
aRootName,
aImage,
- 0, true,
- std::auto_ptr<Entry>(new DocumentEntry(rDocument, eLocation))
- );
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ 0, true, &e);
}
SetUpdateMode(true);
@@ -315,14 +310,11 @@ void TreeListBox::ImpCreateLibEntries( SvTreeListEntry* pDocumentRootEntry, cons
}
else
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
+ o3tl::heap_ptr<Entry> e(new Entry(OBJ_TYPE_LIBRARY));
AddEntry(
aLibName,
Image( IDEResId( nId ) ),
- pDocumentRootEntry, true,
- std::auto_ptr<Entry>(new Entry(OBJ_TYPE_LIBRARY))
- );
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ pDocumentRootEntry, true, &e);
}
}
}
@@ -354,14 +346,11 @@ void TreeListBox::ImpCreateLibSubEntries( SvTreeListEntry* pLibRootEntry, const
SvTreeListEntry* pModuleEntry = FindEntry( pLibRootEntry, aModName, OBJ_TYPE_MODULE );
if ( !pModuleEntry )
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
+ o3tl::heap_ptr<Entry> e(new Entry(OBJ_TYPE_MODULE));
pModuleEntry = AddEntry(
aModName,
Image( IDEResId( RID_IMG_MODULE ) ),
- pLibRootEntry, false,
- std::auto_ptr<Entry>(new Entry(OBJ_TYPE_MODULE))
- );
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ pLibRootEntry, false, &e);
}
// methods
@@ -377,14 +366,12 @@ void TreeListBox::ImpCreateLibSubEntries( SvTreeListEntry* pLibRootEntry, const
SvTreeListEntry* pEntry = FindEntry( pModuleEntry, aName, OBJ_TYPE_METHOD );
if ( !pEntry )
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
+ o3tl::heap_ptr<Entry> e(
+ new Entry(OBJ_TYPE_METHOD));
pEntry = AddEntry(
aName,
Image( IDEResId( RID_IMG_MACRO ) ),
- pModuleEntry, false,
- std::auto_ptr<Entry>(new Entry(OBJ_TYPE_METHOD))
- );
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ pModuleEntry, false, &e);
}
}
}
@@ -418,14 +405,11 @@ void TreeListBox::ImpCreateLibSubEntries( SvTreeListEntry* pLibRootEntry, const
SvTreeListEntry* pDialogEntry = FindEntry( pLibRootEntry, aDlgName, OBJ_TYPE_DIALOG );
if ( !pDialogEntry )
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
+ o3tl::heap_ptr<Entry> e(new Entry(OBJ_TYPE_DIALOG));
pDialogEntry = AddEntry(
aDlgName,
Image( IDEResId( RID_IMG_DIALOG ) ),
- pLibRootEntry, false,
- std::auto_ptr<Entry>(new Entry(OBJ_TYPE_DIALOG))
- );
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ pLibRootEntry, false, &e);
}
}
}
@@ -460,14 +444,11 @@ void TreeListBox::ImpCreateLibSubEntriesInVBAMode( SvTreeListEntry* pLibRootEntr
}
else
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
+ o3tl::heap_ptr<Entry> e(new Entry(eType));
AddEntry(
aEntryName,
Image( IDEResId( RID_IMG_MODLIB ) ),
- pLibRootEntry, true,
- std::auto_ptr<Entry>(new Entry(eType))
- );
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ pLibRootEntry, true, &e);
}
}
}
@@ -525,14 +506,11 @@ void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvTreeListEntry* pLibSubRo
SvTreeListEntry* pModuleEntry = FindEntry( pLibSubRootEntry, aEntryName, OBJ_TYPE_MODULE );
if ( !pModuleEntry )
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
+ o3tl::heap_ptr<Entry> e(new Entry(OBJ_TYPE_MODULE));
pModuleEntry = AddEntry(
aEntryName,
Image( IDEResId( RID_IMG_MODULE ) ),
- pLibSubRootEntry, false,
- std::auto_ptr<Entry>(new Entry(OBJ_TYPE_MODULE))
- );
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ pLibSubRootEntry, false, &e);
}
// methods
@@ -548,14 +526,11 @@ void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvTreeListEntry* pLibSubRo
SvTreeListEntry* pEntry = FindEntry( pModuleEntry, aName, OBJ_TYPE_METHOD );
if ( !pEntry )
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
+ o3tl::heap_ptr<Entry> e(new Entry(OBJ_TYPE_METHOD));
pEntry = AddEntry(
aName,
Image( IDEResId( RID_IMG_MACRO ) ),
- pModuleEntry, false,
- std::auto_ptr<Entry>(new Entry(OBJ_TYPE_METHOD))
- );
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ pModuleEntry, false, &e);
}
}
}
@@ -761,22 +736,22 @@ bool TreeListBox::IsEntryProtected( SvTreeListEntry* pEntry )
return bProtected;
}
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
SvTreeListEntry* TreeListBox::AddEntry(
OUString const& rText,
const Image& rImage,
SvTreeListEntry* pParent,
bool bChildrenOnDemand,
- std::auto_ptr<Entry> aUserData
+ o3tl::heap_ptr<Entry> * aUserData
)
{
+ assert(aUserData != 0);
SvTreeListEntry* p = InsertEntry(
rText, rImage, rImage, pParent, bChildrenOnDemand, LIST_APPEND,
- aUserData.release() // XXX possible leak
+ aUserData->get()
);
+ aUserData->release();
return p;
}
-SAL_WNODEPRECATED_DECLARATIONS_POP
void TreeListBox::SetEntryBitmaps( SvTreeListEntry * pEntry, const Image& rImage )
{
diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx
index bc7d669..4828996 100644
--- a/basctl/source/basicide/bastype2.hxx
+++ b/basctl/source/basicide/bastype2.hxx
@@ -21,7 +21,7 @@
#include "doceventnotifier.hxx"
-#include <memory>
+#include <o3tl/heap_ptr.hxx>
#include <tools/solar.h>
#include <svtools/treelistbox.hxx>
@@ -231,7 +231,7 @@ public:
SvTreeListEntry* AddEntry(
const OUString& rText, const Image& rImage,
SvTreeListEntry* pParent, bool bChildrenOnDemand,
- std::auto_ptr<Entry> aUserData
+ o3tl::heap_ptr<Entry> * aUserData
);
void RemoveEntry (SvTreeListEntry*);
void RemoveEntry (ScriptDocument const&);
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index a27cf45..475d182 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -1597,26 +1597,20 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
sal_uInt16 nMode = pBasicBox->GetMode();
bool bDlgMode = ( nMode & BROWSEMODE_DIALOGS ) && !( nMode & BROWSEMODE_MODULES );
sal_uInt16 nId = bDlgMode ? RID_IMG_DLGLIB : RID_IMG_MODLIB;
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
+ o3tl::heap_ptr<Entry> e(new Entry(OBJ_TYPE_LIBRARY));
SvTreeListEntry* pNewLibEntry = pBasicBox->AddEntry(
aLibName,
Image( IDEResId( nId ) ),
- pRootEntry, false,
- std::auto_ptr<Entry>(new Entry(OBJ_TYPE_LIBRARY))
- );
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ pRootEntry, false, &e);
DBG_ASSERT( pNewLibEntry, "InsertEntry fehlgeschlagen!" );
if( pNewLibEntry )
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
+ o3tl::heap_ptr<Entry>(new Entry(OBJ_TYPE_MODULE));
SvTreeListEntry* pEntry_ = pBasicBox->AddEntry(
aModName,
Image( IDEResId( RID_IMG_MODULE ) ),
- pNewLibEntry, false,
- std::auto_ptr<Entry>(new Entry(OBJ_TYPE_MODULE))
- );
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ pNewLibEntry, false, &e);
DBG_ASSERT( pEntry_, "InsertEntry fehlgeschlagen!" );
pBasicBox->SetCurEntry( pEntry_ );
pBasicBox->Select( pBasicBox->GetCurEntry() ); // OV-Bug?!
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index 0d27f1b..793e873 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -855,14 +855,11 @@ void ObjectPage::NewDialog()
SvTreeListEntry* pEntry = m_pBasicBox->FindEntry( pLibEntry, aDlgName, OBJ_TYPE_DIALOG );
if ( !pEntry )
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
+ o3tl::heap_ptr<Entry> e(new Entry(OBJ_TYPE_DIALOG));
pEntry = m_pBasicBox->AddEntry(
aDlgName,
Image( IDEResId( RID_IMG_DIALOG ) ),
- pLibEntry, false,
- std::auto_ptr<Entry>(new Entry(OBJ_TYPE_DIALOG))
- );
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ pLibEntry, false, &e);
DBG_ASSERT( pEntry, "InsertEntry fehlgeschlagen!" );
}
m_pBasicBox->SetCurEntry( pEntry );
@@ -1013,14 +1010,11 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument,
SvTreeListEntry* pEntry = rBasicBox.FindEntry( pSubRootEntry, aModName, OBJ_TYPE_MODULE );
if ( !pEntry )
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
+ o3tl::heap_ptr<Entry> e(new Entry(OBJ_TYPE_MODULE));
pEntry = rBasicBox.AddEntry(
aModName,
Image( IDEResId( RID_IMG_MODULE ) ),
- pSubRootEntry, false,
- std::auto_ptr<Entry>(new Entry(OBJ_TYPE_MODULE))
- );
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ pSubRootEntry, false, &e);
DBG_ASSERT( pEntry, "InsertEntry fehlgeschlagen!" );
}
rBasicBox.SetCurEntry( pEntry );
commit aef614d0931d9b1ef0431ebc6aa8aad38d0445c1
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Feb 7 15:42:03 2014 +0100
auto_ptr -> scoped_ptr
Change-Id: I19fbc4f6e0fb0d53a72759e5faf9c86c595e8e17
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 38317e0..59f2887 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -31,6 +31,7 @@
#include <basic/basmgr.hxx>
#include <basic/sbmeth.hxx>
+#include <boost/scoped_ptr.hpp>
#include <com/sun/star/frame/XLayoutManager.hpp>
#include <com/sun/star/script/XLibraryContainerPassword.hpp>
#include <com/sun/star/task/XStatusIndicatorFactory.hpp>
@@ -560,7 +561,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
break;
case SID_BASICIDE_SHOWWINDOW:
{
- ::std::auto_ptr< ScriptDocument > pDocument;
+ boost::scoped_ptr< ScriptDocument > pDocument;
SFX_REQUEST_ARG( rReq, pDocumentItem, SfxStringItem, SID_BASICIDE_ARG_DOCUMENT, false );
if ( pDocumentItem )
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index be60543..721ab89 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -34,6 +34,7 @@
#include <basic/sbmeth.hxx>
#include <basic/sbx.hxx>
+#include <boost/scoped_ptr.hpp>
#include <framework/documentundoguard.hxx>
#include <tools/diagnose_ex.h>
#include <unotools/moduleoptions.hxx>
@@ -41,7 +42,6 @@
#include <vector>
#include <algorithm>
-#include <memory>
#include <basic/basmgr.hxx>
namespace basctl
{
@@ -241,13 +241,13 @@ namespace
(void)pThis;
ENSURE_OR_RETURN( i_pData, "wrong MacroExecutionData", 0L );
// take ownership of the data
- ::std::auto_ptr< MacroExecutionData > pData( i_pData );
+ boost::scoped_ptr< MacroExecutionData > pData( i_pData );
SAL_WARN_IF( !(pData->xMethod->GetParent()->GetFlags() & SBX_EXTSEARCH), "basctl.basicide","No EXTSEARCH!" );
// in case this is a document-local macro, try to protect the document's Undo Manager from
// flawed scripts
- ::std::auto_ptr< ::framework::DocumentUndoGuard > pUndoGuard;
+ boost::scoped_ptr< ::framework::DocumentUndoGuard > pUndoGuard;
if ( pData->aDocument.isDocument() )
pUndoGuard.reset( new ::framework::DocumentUndoGuard( pData->aDocument.getDocument() ) );
@@ -271,7 +271,7 @@ OUString ChooseMacro( const uno::Reference< frame::XModel >& rxLimitToDocument,
bool bError = false;
SbMethod* pMethod = NULL;
- ::std::auto_ptr< MacroChooser > pChooser( new MacroChooser( NULL, true ) );
+ boost::scoped_ptr< MacroChooser > pChooser( new MacroChooser( NULL, true ) );
if ( bChooseOnly || !SvtModuleOptions().IsBasicIDE() )
pChooser->SetMode(MacroChooser::ChooseOnly);
diff --git a/basctl/source/basicide/documentenumeration.hxx b/basctl/source/basicide/documentenumeration.hxx
index cd4af37..f9e322d 100644
--- a/basctl/source/basicide/documentenumeration.hxx
+++ b/basctl/source/basicide/documentenumeration.hxx
@@ -20,11 +20,11 @@
#ifndef BASCTL_DOCUMENTENUMERATION_HXX
#define BASCTL_DOCUMENTENUMERATION_HXX
+#include <boost/scoped_ptr.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <memory>
#include <vector>
namespace com { namespace sun { namespace star { namespace uno {
@@ -92,7 +92,7 @@ namespace basctl { namespace docs {
) const;
private:
- ::std::auto_ptr< DocumentEnumeration_Data > m_pData;
+ boost::scoped_ptr< DocumentEnumeration_Data > m_pData;
};
//........................................................................
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index 3016719..8789734 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -25,6 +25,7 @@
#include "doceventnotifier.hxx"
#include "documentenumeration.hxx"
+#include <boost/scoped_ptr.hpp>
#include <com/sun/star/uri/UriReferenceFactory.hpp>
#include <com/sun/star/util/theMacroExpander.hpp>
#include <com/sun/star/document/MacroExecMode.hpp>
@@ -201,8 +202,7 @@ namespace basctl
Reference< XModel > m_xDocument;
Reference< XModifiable > m_xDocModify;
Reference< XEmbeddedScripts > m_xScriptAccess;
- ::std::auto_ptr< DocumentEventNotifier >
- m_pDocListener;
+ boost::scoped_ptr< DocumentEventNotifier > m_pDocListener;
public:
Impl ();
commit 860b6deee0fad17923499adf4c0b6d74df3fc500
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Feb 7 15:36:10 2014 +0100
auto_ptr -> scoped_ptr
Change-Id: Ia84ebb07de6c2b5c62340b530c908fc919b34b0a
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 33c2618..3835bc1 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -20,6 +20,7 @@
#include <stdio.h>
#include <avmedia/mediawindow.hxx>
+#include <boost/scoped_ptr.hpp>
#include "mediawindow_impl.hxx"
#include "mediamisc.hxx"
#include "mediawindow.hrc"
@@ -398,7 +399,7 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const OUString& rURL
{
uno::Reference< media::XPlayer > xPlayer( createPlayer( rURL, rReferer ) );
uno::Reference< graphic::XGraphic > xRet;
- ::std::auto_ptr< Graphic > apGraphic;
+ boost::scoped_ptr< Graphic > apGraphic;
if( xPlayer.is() )
{
commit 660c1889c9fc975477a56aab2f45da65bbd29466
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Feb 7 15:34:22 2014 +0100
std::less is the default here
Change-Id: I57428772187d3487668eca2f553c74e18e4f736e
diff --git a/accessibility/inc/accessibility/helper/characterattributeshelper.hxx b/accessibility/inc/accessibility/helper/characterattributeshelper.hxx
index 4c4c604..7b4d414 100644
--- a/accessibility/inc/accessibility/helper/characterattributeshelper.hxx
+++ b/accessibility/inc/accessibility/helper/characterattributeshelper.hxx
@@ -34,7 +34,7 @@ class CharacterAttributesHelper
{
private:
- typedef ::std::map< OUString, ::com::sun::star::uno::Any, ::std::less< OUString > > AttributeMap;
+ typedef ::std::map< OUString, ::com::sun::star::uno::Any > AttributeMap;
AttributeMap m_aAttributeMap;
commit 2935c2999e699ee28bb96fb8680868ec74e20893
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Feb 7 15:32:30 2014 +0100
auto_ptr -> scoped_ptr
Change-Id: I05c461deca118f1a1b75d94b4d00ce797987e8d6
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
index 81dd760..7682590 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
@@ -22,12 +22,10 @@
#define ACCESSIBILITY_EXT_ACCESSIBLEBROWSEBOX_HXX
#include <accessibility/extended/AccessibleBrowseBoxBase.hxx>
+#include <boost/scoped_ptr.hpp>
#include <cppuhelper/weakref.hxx>
#include <svtools/accessibletableprovider.hxx>
-
-#include <memory>
-
// ============================================================================
namespace accessibility {
@@ -191,7 +189,7 @@ protected:
private:
// members ----------------------------------------------------------------
- ::std::auto_ptr< AccessibleBrowseBoxImpl > m_pImpl;
+ boost::scoped_ptr< AccessibleBrowseBoxImpl > m_pImpl;
};
// ============================================================================
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
index 8996a64..dfbf0f5 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
@@ -22,11 +22,10 @@
#include <accessibility/extended/AccessibleGridControlBase.hxx>
#include <accessibility/extended/AccessibleGridControlTable.hxx>
+#include <boost/scoped_ptr.hpp>
#include <cppuhelper/weakref.hxx>
#include <svtools/accessibletable.hxx>
-#include <memory>
-
// ============================================================================
namespace accessibility {
@@ -178,7 +177,7 @@ protected:
private:
// members ----------------------------------------------------------------
- ::std::auto_ptr< AccessibleGridControl_Impl > m_pImpl;
+ boost::scoped_ptr< AccessibleGridControl_Impl > m_pImpl;
};
// ============================================================================
diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
index 5ef21b3..f527ba6 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -51,8 +51,8 @@
#include "svtools/svtools.hrc"
#include <vcl/svapp.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
-#include <memory>
#include <queue>
+#include <boost/scoped_ptr.hpp>
#include <boost/unordered_map.hpp>
class TextEngine;
@@ -661,7 +661,7 @@ private:
// All the following members have valid values only after calling init:
- ::std::auto_ptr< Paragraphs > m_xParagraphs;
+ boost::scoped_ptr< Paragraphs > m_xParagraphs;
// m_nViewOffset is from the start of the document (0) to the start of the
// current view, and m_nViewHeight is the height of the view:
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 002326f..d13525d 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -1800,13 +1800,11 @@ void Document::init()
if (m_xParagraphs.get() == 0)
{
::sal_uLong nCount = m_rEngine.GetParagraphCount();
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< Paragraphs > p(new Paragraphs);
- SAL_WNODEPRECATED_DECLARATIONS_POP
- p->reserve(static_cast< Paragraphs::size_type >(nCount));
+ m_xParagraphs.reset(new Paragraphs);
+ m_xParagraphs->reserve(static_cast< Paragraphs::size_type >(nCount));
// numeric overflow is harmless here
for (::sal_uLong i = 0; i < nCount; ++i)
- p->push_back(ParagraphInfo(static_cast< ::sal_Int32 >(
+ m_xParagraphs->push_back(ParagraphInfo(static_cast< ::sal_Int32 >(
m_rEngine.GetTextHeight(i))));
// XXX numeric overflow
m_nViewOffset = static_cast< ::sal_Int32 >(
@@ -1814,7 +1812,6 @@ void Document::init()
m_nViewHeight = static_cast< ::sal_Int32 >(
m_rView.GetWindow()->GetOutputSizePixel().Height());
// XXX numeric overflow
- m_xParagraphs = p;
determineVisibleRange();
m_nSelectionFirstPara = -1;
m_nSelectionFirstPos = -1;
commit 2b04d0a17f74a5e8b2f81521710ee91d4daa267f
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Feb 7 15:32:07 2014 +0100
Avoid unnecessary heap allocation
Change-Id: I7bc1a0960cc100c51b90c50838a5ef620f3c763f
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index a8f76ed..cc426a9 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -36,9 +36,6 @@
#include <vcl/menu.hxx>
#include <vcl/unohelp2.hxx>
-#include <memory>
-
-
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
@@ -239,7 +236,6 @@ Sequence< PropertyValue > VCLXAccessibleMenuItem::getCharacterAttributes( sal_In
{
OExternalLockGuard aGuard( this );
- Sequence< PropertyValue > aValues;
OUString sText( implGetText() );
if ( !implIsValidIndex( nIndex, sText.getLength() ) )
@@ -248,10 +244,8 @@ Sequence< PropertyValue > VCLXAccessibleMenuItem::getCharacterAttributes( sal_In
Font aFont = Application::GetSettings().GetStyleSettings().GetMenuFont();
sal_Int32 nBackColor = getBackground();
sal_Int32 nColor = getForeground();
- ::std::auto_ptr< CharacterAttributesHelper > pHelper( new CharacterAttributesHelper( aFont, nBackColor, nColor ) );
- aValues = pHelper->GetCharacterAttributes( aRequestedAttributes );
-
- return aValues;
+ return CharacterAttributesHelper( aFont, nBackColor, nColor )
+ .GetCharacterAttributes( aRequestedAttributes );
}
// -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
index f026fb5..dbf5d30 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
@@ -35,9 +35,6 @@
#include <vcl/status.hxx>
#include <vcl/controllayout.hxx>
-#include <memory>
-
-
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -516,8 +513,8 @@ Sequence< PropertyValue > VCLXAccessibleStatusBarItem::getCharacterAttributes( s
Font aFont = m_pStatusBar->GetFont();
sal_Int32 nBackColor = getBackground();
sal_Int32 nColor = getForeground();
- ::std::auto_ptr< CharacterAttributesHelper > pHelper( new CharacterAttributesHelper( aFont, nBackColor, nColor ) );
- aValues = pHelper->GetCharacterAttributes( aRequestedAttributes );
+ aValues = CharacterAttributesHelper( aFont, nBackColor, nColor )
+ .GetCharacterAttributes( aRequestedAttributes );
}
return aValues;
diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx
index 67a4c87..f4a5e13 100644
--- a/accessibility/source/standard/vclxaccessibletabpage.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpage.cxx
@@ -35,9 +35,6 @@
#include <vcl/tabctrl.hxx>
#include <vcl/tabpage.hxx>
-#include <memory>
-
-
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -590,8 +587,8 @@ Sequence< PropertyValue > VCLXAccessibleTabPage::getCharacterAttributes( sal_Int
Font aFont = m_pTabControl->GetFont();
sal_Int32 nBackColor = getBackground();
sal_Int32 nColor = getForeground();
- ::std::auto_ptr< CharacterAttributesHelper > pHelper( new CharacterAttributesHelper( aFont, nBackColor, nColor ) );
- aValues = pHelper->GetCharacterAttributes( aRequestedAttributes );
+ aValues = CharacterAttributesHelper( aFont, nBackColor, nColor )
+ .GetCharacterAttributes( aRequestedAttributes );
}
return aValues;
diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
index aa43522..d0002ab 100644
--- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx
+++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
@@ -32,7 +32,6 @@
#include <vcl/unohelp2.hxx>
#include <vcl/ctrl.hxx>
-#include <memory>
#include <vector>
using namespace ::com::sun::star;
@@ -237,9 +236,8 @@ Sequence< PropertyValue > VCLXAccessibleTextComponent::getCharacterAttributes( s
}
*/
- ::std::auto_ptr< CharacterAttributesHelper > pHelper( new CharacterAttributesHelper( aFont, nBackColor, nColor ) );
-
- aValues = pHelper->GetCharacterAttributes( aRequestedAttributes );
+ aValues = CharacterAttributesHelper( aFont, nBackColor, nColor )
+ .GetCharacterAttributes( aRequestedAttributes );
}
return aValues;
commit 115457292ff792b151994303e8bbbb2b9c98bd72
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Feb 7 15:17:38 2014 +0100
Use boost::scoped_ptr
Change-Id: I049347686d0c7012494ec98743b7867ba4595a97
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 64000bb..92bcfc0 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -96,7 +96,7 @@ class SwAutoFormat
SwDoc* m_pDoc;
SwTxtNode* m_pCurTxtNd; // the current TextNode
SwTxtFrm* m_pCurTxtFrm; // frame of the current TextNode
- CharClass* m_pCharClass; // Character classification
+ boost::scoped_ptr<CharClass> m_pCharClass; // Character classification
sal_uLong m_nEndNdIdx; // for the percentage-display
LanguageType m_eCharClassLang;
@@ -228,9 +228,6 @@ class SwAutoFormat
public:
SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
SwNodeIndex* pSttNd = 0, SwNodeIndex* pEndNd = 0 );
- ~SwAutoFormat() {
- delete m_pCharClass;
- }
};
const sal_Unicode* StrChr( const sal_Unicode* pSrc, sal_Unicode c )
@@ -259,8 +256,7 @@ SwTxtFrm* SwAutoFormat::GetFrm( const SwTxtNode& rTxtNd ) const
void SwAutoFormat::_GetCharClass( LanguageType eLang )
{
- delete m_pCharClass;
- m_pCharClass = new CharClass( LanguageTag( eLang ));
+ m_pCharClass.reset( new CharClass( LanguageTag( eLang ) ) );
m_eCharClassLang = eLang;
}
@@ -2099,7 +2095,6 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
m_pEditShell( pEdShell ),
m_pDoc( pEdShell->GetDoc() ),
m_pCurTxtNd( 0 ), m_pCurTxtFrm( 0 ),
- m_pCharClass( 0 ),
m_nRedlAutoFmtSeqId( 0 )
{
OSL_ENSURE( (pSttNd && pEndNd) || (!pSttNd && !pEndNd),
commit 8a54c7b6f78f761054e8160d3c3fe22f72e91733
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Feb 7 15:13:54 2014 +0100
Consistently use m_ prefix for SwAutoFormat members
...but removed effectively unused nLastEnumLvl, nLastCalcEnumLvl members.
Change-Id: Iaec855484ede16c334ee07c2a89949910421cc8c
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 84e3d99..64000bb 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -87,22 +87,21 @@ const sal_uInt16 cnNumBullColls = 4;
class SwAutoFormat
{
- SvxSwAutoFmtFlags aFlags;
- SwPaM aDelPam; // a Pam that can be used
- SwNodeIndex aNdIdx; // the index on the current TextNode
- SwNodeIndex aEndNdIdx; // index on the end of the area
-
- SwEditShell* pEditShell;
- SwDoc* pDoc;
- SwTxtNode* pCurTxtNd; // the current TextNode
- SwTxtFrm* pCurTxtFrm; // frame of the current TextNode
- CharClass* pCharClass; // Character classification
- sal_uLong nEndNdIdx; // for the percentage-display
- LanguageType eCharClassLang;
-
- sal_uInt16 nLastHeadLvl, nLastCalcHeadLvl;
- sal_uInt16 nLastEnumLvl, nLastCalcEnumLvl;
- sal_uInt16 nRedlAutoFmtSeqId;
+ SvxSwAutoFmtFlags m_aFlags;
+ SwPaM m_aDelPam; // a Pam that can be used
+ SwNodeIndex m_aNdIdx; // the index on the current TextNode
+ SwNodeIndex m_aEndNdIdx; // index on the end of the area
+
+ SwEditShell* m_pEditShell;
+ SwDoc* m_pDoc;
+ SwTxtNode* m_pCurTxtNd; // the current TextNode
+ SwTxtFrm* m_pCurTxtFrm; // frame of the current TextNode
+ CharClass* m_pCharClass; // Character classification
+ sal_uLong m_nEndNdIdx; // for the percentage-display
+ LanguageType m_eCharClassLang;
+
+ sal_uInt16 m_nLastHeadLvl, m_nLastCalcHeadLvl;
+ sal_uInt16 m_nRedlAutoFmtSeqId;
enum
{
@@ -130,22 +129,22 @@ class SwAutoFormat
TST_TXT_BODY,
HAS_FMTCOLL,
IS_END
- } eStat;
+ } m_eStat;
bool m_bEnd : 1;
- bool bEmptyLine : 1;
- bool bMoreLines : 1;
+ bool m_bEmptyLine : 1;
+ bool m_bMoreLines : 1;
// ------------- private methods -----------------------------
void _GetCharClass( LanguageType eLang );
CharClass& GetCharClass( LanguageType eLang ) const
{
- if( !pCharClass || eLang != eCharClassLang )
+ if( !m_pCharClass || eLang != m_eCharClassLang )
{
SwAutoFormat* pThis = (SwAutoFormat*)this;
pThis->_GetCharClass( eLang );
}
- return *pCharClass;
+ return *m_pCharClass;
}
bool IsSpace( const sal_Unicode c ) const
@@ -210,7 +209,7 @@ class SwAutoFormat
!IsNoAlphaLine( *pTxtNd) &&
!IsEnumericChar( *pTxtNd ) &&
((COMPLETE_STRING - 50 - pTxtNd->GetTxt().getLength()) >
- pCurTxtNd->GetTxt().getLength()) &&
+ m_pCurTxtNd->GetTxt().getLength()) &&
!HasBreakAttr( *pTxtNd );
}
@@ -222,15 +221,15 @@ class SwAutoFormat
void _SetRedlineTxt( sal_uInt16 nId );
bool SetRedlineTxt( sal_uInt16 nId )
- { if( aFlags.bWithRedlining ) _SetRedlineTxt( nId ); return true; }
+ { if( m_aFlags.bWithRedlining ) _SetRedlineTxt( nId ); return true; }
bool ClearRedlineTxt()
- { if( aFlags.bWithRedlining ) pDoc->SetAutoFmtRedlineComment(0); return true; }
+ { if( m_aFlags.bWithRedlining ) m_pDoc->SetAutoFmtRedlineComment(0); return true; }
public:
SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
SwNodeIndex* pSttNd = 0, SwNodeIndex* pEndNd = 0 );
~SwAutoFormat() {
- delete pCharClass;
+ delete m_pCharClass;
}
};
@@ -244,9 +243,9 @@ const sal_Unicode* StrChr( const sal_Unicode* pSrc, sal_Unicode c )
SwTxtFrm* SwAutoFormat::GetFrm( const SwTxtNode& rTxtNd ) const
{
// get the Frame
- const SwCntntFrm *pFrm = rTxtNd.getLayoutFrm( pEditShell->GetLayout() );
+ const SwCntntFrm *pFrm = rTxtNd.getLayoutFrm( m_pEditShell->GetLayout() );
OSL_ENSURE( pFrm, "For Autoformat a Layout is needed" );
- if( aFlags.bAFmtByInput && !pFrm->IsValid() )
+ if( m_aFlags.bAFmtByInput && !pFrm->IsValid() )
{
SwRect aTmpFrm( pFrm->Frm() );
SwRect aTmpPrt( pFrm->Prt() );
@@ -260,9 +259,9 @@ SwTxtFrm* SwAutoFormat::GetFrm( const SwTxtNode& rTxtNd ) const
void SwAutoFormat::_GetCharClass( LanguageType eLang )
{
- delete pCharClass;
- pCharClass = new CharClass( LanguageTag( eLang ));
- eCharClassLang = eLang;
+ delete m_pCharClass;
+ m_pCharClass = new CharClass( LanguageTag( eLang ));
+ m_eCharClassLang = eLang;
}
void SwAutoFormat::_SetRedlineTxt( sal_uInt16 nActionId )
@@ -288,7 +287,7 @@ void SwAutoFormat::_SetRedlineTxt( sal_uInt16 nActionId )
case STR_AUTOFMTREDL_DASH:
case STR_AUTOFMTREDL_ORDINAL:
case STR_AUTOFMTREDL_NON_BREAK_SPACE:
- nSeqNo = ++nRedlAutoFmtSeqId;
+ nSeqNo = ++m_nRedlAutoFmtSeqId;
break;
}
}
@@ -297,7 +296,7 @@ void SwAutoFormat::_SetRedlineTxt( sal_uInt16 nActionId )
sTxt = "Action text is missing";
#endif
- pDoc->SetAutoFmtRedlineComment( &sTxt, nSeqNo );
+ m_pDoc->SetAutoFmtRedlineComment( &sTxt, nSeqNo );
}
OUString SwAutoFormat::GoNextPara()
@@ -305,20 +304,20 @@ OUString SwAutoFormat::GoNextPara()
SwNode* pNewNd = 0;
do {
// has to be checked twice before and after incrementation
- if( aNdIdx.GetIndex() >= aEndNdIdx.GetIndex() )
+ if( m_aNdIdx.GetIndex() >= m_aEndNdIdx.GetIndex() )
{
m_bEnd = true;
return OUString();
}
- aNdIdx++;
- if( aNdIdx.GetIndex() >= aEndNdIdx.GetIndex() )
+ m_aNdIdx++;
+ if( m_aNdIdx.GetIndex() >= m_aEndNdIdx.GetIndex() )
{
m_bEnd = true;
return OUString();
}
else
- pNewNd = &aNdIdx.GetNode();
+ pNewNd = &m_aNdIdx.GetNode();
// not a TextNode ->
// TableNode : skip table
@@ -330,22 +329,22 @@ OUString SwAutoFormat::GoNextPara()
return OUString();
}
else if( pNewNd->IsTableNode() )
- aNdIdx = *pNewNd->EndOfSectionNode();
+ m_aNdIdx = *pNewNd->EndOfSectionNode();
else if( pNewNd->IsSectionNode() )
{
const SwSection& rSect = pNewNd->GetSectionNode()->GetSection();
if( rSect.IsHiddenFlag() || rSect.IsProtectFlag() )
- aNdIdx = *pNewNd->EndOfSectionNode();
+ m_aNdIdx = *pNewNd->EndOfSectionNode();
}
} while( !pNewNd->IsTxtNode() );
- if( !aFlags.bAFmtByInput )
- ::SetProgressState( aNdIdx.GetIndex() + nEndNdIdx - aEndNdIdx.GetIndex(),
- pDoc->GetDocShell() );
+ if( !m_aFlags.bAFmtByInput )
+ ::SetProgressState( m_aNdIdx.GetIndex() + m_nEndNdIdx - m_aEndNdIdx.GetIndex(),
+ m_pDoc->GetDocShell() );
- pCurTxtNd = (SwTxtNode*)pNewNd;
- pCurTxtFrm = GetFrm( *pCurTxtNd );
- return pCurTxtNd->GetTxt();
+ m_pCurTxtNd = (SwTxtNode*)pNewNd;
+ m_pCurTxtFrm = GetFrm( *m_pCurTxtNd );
+ return m_pCurTxtNd->GetTxt();
}
bool SwAutoFormat::HasObjects( const SwNode& rNd )
@@ -353,7 +352,7 @@ bool SwAutoFormat::HasObjects( const SwNode& rNd )
// Is there something bound to the paragraph in the paragraph
// like borders, DrawObjects, ...
bool bRet = false;
- const SwFrmFmts& rFmts = *pDoc->GetSpzFrmFmts();
+ const SwFrmFmts& rFmts = *m_pDoc->GetSpzFrmFmts();
for( sal_uInt16 n = 0; n < rFmts.size(); ++n )
{
const SwFmtAnchor& rAnchor = rFmts[ n ]->GetAnchor();
@@ -370,9 +369,9 @@ bool SwAutoFormat::HasObjects( const SwNode& rNd )
const SwTxtNode* SwAutoFormat::GetNextNode() const
{
- if( aNdIdx.GetIndex()+1 >= aEndNdIdx.GetIndex() )
+ if( m_aNdIdx.GetIndex()+1 >= m_aEndNdIdx.GetIndex() )
return 0;
- return pDoc->GetNodes()[ aNdIdx.GetIndex() + 1 ]->GetTxtNode();
+ return m_pDoc->GetNodes()[ m_aNdIdx.GetIndex() + 1 ]->GetTxtNode();
}
sal_Bool SwAutoFormat::IsOneLine( const SwTxtNode& rNd ) const
@@ -383,11 +382,11 @@ sal_Bool SwAutoFormat::IsOneLine( const SwTxtNode& rNd ) const
sal_Bool SwAutoFormat::IsFastFullLine( const SwTxtNode& rNd ) const
{
- sal_Bool bRet = aFlags.bRightMargin;
+ sal_Bool bRet = m_aFlags.bRightMargin;
if( bRet )
{
SwTxtFrmInfo aFInfo( GetFrm( rNd ) );
- bRet = aFInfo.IsFilled( aFlags.nRightMargin );
+ bRet = aFInfo.IsFilled( m_aFlags.nRightMargin );
}
return bRet;
}
@@ -451,7 +450,7 @@ sal_uInt16 SwAutoFormat::CalcLevel( const SwTxtNode& rNd, sal_uInt16 *pDigitLvl
if( RES_POOLCOLL_TEXT_MOVE == rNd.GetTxtColl()->GetPoolFmtId() )
{
- if( aFlags.bAFmtByInput )
+ if( m_aFlags.bAFmtByInput )
{
nLvl = rNd.GetAutoFmtLvl();
((SwTxtNode&)rNd).SetAutoFmtLvl( 0 );
@@ -482,10 +481,10 @@ sal_uInt16 SwAutoFormat::CalcLevel( const SwTxtNode& rNd, sal_uInt16 *pDigitLvl
sal_Int32 SwAutoFormat::GetBigIndent( sal_Int32& rAktSpacePos ) const
{
- SwTxtFrmInfo aFInfo( GetFrm( *pCurTxtNd ) );
+ SwTxtFrmInfo aFInfo( GetFrm( *m_pCurTxtNd ) );
const SwTxtFrm* pNxtFrm = 0;
- if( !bMoreLines )
+ if( !m_bMoreLines )
{
const SwTxtNode* pNxtNd = GetNextNode();
if( !CanJoin( pNxtNd ) || !IsOneLine( *pNxtNd ) )
@@ -520,10 +519,10 @@ sal_Bool SwAutoFormat::IsNoAlphaLine( const SwTxtNode& rNd ) const
bool SwAutoFormat::DoUnderline()
{
- if( !aFlags.bSetBorder )
+ if( !m_aFlags.bSetBorder )
return false;
- OUString const& rTxt(pCurTxtNd->GetTxt());
+ OUString const& rTxt(m_pCurTxtNd->GetTxt());
int eState = 0;
sal_Int32 nCnt = 0;
while (nCnt < rTxt.getLength())
@@ -551,8 +550,8 @@ bool SwAutoFormat::DoUnderline()
{
// then underline the previous paragraph if one exists
DelEmptyLine( false );
- aDelPam.SetMark();
- aDelPam.GetMark()->nContent = 0;
+ m_aDelPam.SetMark();
+ m_aDelPam.GetMark()->nContent = 0;
editeng::SvxBorderLine aLine;
switch( eState )
@@ -582,7 +581,7 @@ bool SwAutoFormat::DoUnderline()
aLine.SetWidth( DEF_LINE_WIDTH_2 );
break;
}
- SfxItemSet aSet(pDoc->GetAttrPool(),
+ SfxItemSet aSet(m_pDoc->GetAttrPool(),
RES_PARATR_CONNECT_BORDER, RES_PARATR_CONNECT_BORDER,
RES_BOX, RES_BOX,
0);
@@ -591,20 +590,20 @@ bool SwAutoFormat::DoUnderline()
aBox.SetLine( &aLine, BOX_LINE_BOTTOM );
aBox.SetDistance( 42 ); // ~0,75 mm
aSet.Put(aBox);
- pDoc->InsertItemSet( aDelPam, aSet, 0 );
+ m_pDoc->InsertItemSet( m_aDelPam, aSet, 0 );
- aDelPam.DeleteMark();
+ m_aDelPam.DeleteMark();
}
return 2 < nCnt;
}
bool SwAutoFormat::DoTable()
{
- if( !aFlags.bCreateTable || !aFlags.bAFmtByInput ||
- pCurTxtNd->FindTableNode() )
+ if( !m_aFlags.bCreateTable || !m_aFlags.bAFmtByInput ||
+ m_pCurTxtNd->FindTableNode() )
return false;
- const OUString& rTmp = pCurTxtNd->GetTxt();
+ const OUString& rTmp = m_pCurTxtNd->GetTxt();
sal_Int32 nSttPlus = GetLeadingBlanks( rTmp );
sal_Int32 nEndPlus = GetTrailingBlanks( rTmp );
sal_Unicode cChar;
@@ -614,7 +613,7 @@ bool SwAutoFormat::DoTable()
( '+' != ( cChar = rTmp[nEndPlus - 1]) && '|' != cChar ))
return false;
- SwTxtFrmInfo aInfo( pCurTxtFrm );
+ SwTxtFrmInfo aInfo( m_pCurTxtFrm );
sal_Int32 n = nSttPlus;
std::vector<sal_uInt16> aPosArr;
@@ -648,7 +647,7 @@ bool SwAutoFormat::DoTable()
sal_uInt16 nColCnt = aPosArr.size() - 1;
SwTwips nSttPos = aPosArr[ 0 ];
sal_Int16 eHori;
- switch( pCurTxtNd->GetSwAttrSet().GetAdjust().GetAdjust() )
+ switch( m_pCurTxtNd->GetSwAttrSet().GetAdjust().GetAdjust() )
{
case SVX_ADJUST_CENTER: eHori = text::HoriOrientation::CENTER; break;
case SVX_ADJUST_RIGHT: eHori = text::HoriOrientation::RIGHT; break;
@@ -658,7 +657,7 @@ bool SwAutoFormat::DoTable()
{
eHori = text::HoriOrientation::NONE;
// then - as last - we need to add the current frame width into the array
- aPosArr.push_back( static_cast<sal_uInt16>(pCurTxtFrm->Frm().Width()) );
+ aPosArr.push_back( static_cast<sal_uInt16>(m_pCurTxtFrm->Frm().Width()) );
}
else
eHori = text::HoriOrientation::LEFT;
@@ -667,12 +666,12 @@ bool SwAutoFormat::DoTable()
// then create a table that matches the character
DelEmptyLine();
- SwNodeIndex aIdx( aDelPam.GetPoint()->nNode );
- aDelPam.Move( fnMoveForward );
- pDoc->InsertTable( SwInsertTableOptions( tabopts::ALL_TBL_INS_ATTR , 1 ),
- *aDelPam.GetPoint(), 1, nColCnt, eHori,
+ SwNodeIndex aIdx( m_aDelPam.GetPoint()->nNode );
+ m_aDelPam.Move( fnMoveForward );
+ m_pDoc->InsertTable( SwInsertTableOptions( tabopts::ALL_TBL_INS_ATTR , 1 ),
+ *m_aDelPam.GetPoint(), 1, nColCnt, eHori,
0, &aPosArr );
- aDelPam.GetPoint()->nNode = aIdx;
+ m_aDelPam.GetPoint()->nNode = aIdx;
}
return 1 < aPosArr.size();
}
@@ -978,21 +977,21 @@ CHECK_ROMAN_5:
void SwAutoFormat::SetColl( sal_uInt16 nId, bool bHdLineOrText )
{
- aDelPam.DeleteMark();
- aDelPam.GetPoint()->nNode = aNdIdx;
- aDelPam.GetPoint()->nContent.Assign( pCurTxtNd, 0 );
+ m_aDelPam.DeleteMark();
+ m_aDelPam.GetPoint()->nNode = m_aNdIdx;
+ m_aDelPam.GetPoint()->nContent.Assign( m_pCurTxtNd, 0 );
// keep hard tabs, alignment, language, hyphenation, DropCaps and nearly all frame attributes
- SfxItemSet aSet( pDoc->GetAttrPool(),
+ SfxItemSet aSet( m_pDoc->GetAttrPool(),
RES_PARATR_ADJUST, RES_PARATR_ADJUST,
RES_PARATR_TABSTOP, RES_PARATR_DROP,
RES_CHRATR_LANGUAGE, RES_CHRATR_LANGUAGE,
RES_BACKGROUND, RES_SHADOW,
0 );
- if( pCurTxtNd->HasSwAttrSet() )
+ if( m_pCurTxtNd->HasSwAttrSet() )
{
- aSet.Put( *pCurTxtNd->GetpSwAttrSet() );
+ aSet.Put( *m_pCurTxtNd->GetpSwAttrSet() );
// take HeaderLine/TextBody only if centered or right aligned, otherwise only justification
SvxAdjustItem* pAdj;
if( SFX_ITEM_SET == aSet.GetItemState( RES_PARATR_ADJUST,
@@ -1006,7 +1005,7 @@ void SwAutoFormat::SetColl( sal_uInt16 nId, bool bHdLineOrText )
}
}
- pDoc->SetTxtFmtCollByAutoFmt( *aDelPam.GetPoint(), nId, &aSet );
+ m_pDoc->SetTxtFmtCollByAutoFmt( *m_aDelPam.GetPoint(), nId, &aSet );
}
bool SwAutoFormat::HasSelBlanks( SwPaM& rPam ) const
@@ -1067,47 +1066,47 @@ bool SwAutoFormat::IsSentenceAtEnd( const SwTxtNode& rTxtNd ) const
/// Delete beginning and/or end in a node
void SwAutoFormat::DeleteCurrentParagraph( bool bStart, bool bEnd )
{
- if( aFlags.bAFmtByInput
- ? aFlags.bAFmtByInpDelSpacesAtSttEnd
- : aFlags.bAFmtDelSpacesAtSttEnd )
+ if( m_aFlags.bAFmtByInput
+ ? m_aFlags.bAFmtByInpDelSpacesAtSttEnd
+ : m_aFlags.bAFmtDelSpacesAtSttEnd )
{
// delete blanks at the end of the current and at the beginning of the next one
- aDelPam.DeleteMark();
- aDelPam.GetPoint()->nNode = aNdIdx;
+ m_aDelPam.DeleteMark();
+ m_aDelPam.GetPoint()->nNode = m_aNdIdx;
sal_Int32 nPos(0);
- if( bStart && 0 != ( nPos = GetLeadingBlanks( pCurTxtNd->GetTxt() )))
+ if( bStart && 0 != ( nPos = GetLeadingBlanks( m_pCurTxtNd->GetTxt() )))
{
- aDelPam.GetPoint()->nContent.Assign( pCurTxtNd, 0 );
- aDelPam.SetMark();
- aDelPam.GetPoint()->nContent = nPos;
- DeleteSel( aDelPam );
- aDelPam.DeleteMark();
+ m_aDelPam.GetPoint()->nContent.Assign( m_pCurTxtNd, 0 );
+ m_aDelPam.SetMark();
+ m_aDelPam.GetPoint()->nContent = nPos;
+ DeleteSel( m_aDelPam );
+ m_aDelPam.DeleteMark();
}
- if (bEnd && pCurTxtNd->GetTxt().getLength() !=
- ( nPos = GetTrailingBlanks( pCurTxtNd->GetTxt() )) )
+ if (bEnd && m_pCurTxtNd->GetTxt().getLength() !=
+ ( nPos = GetTrailingBlanks( m_pCurTxtNd->GetTxt() )) )
{
- aDelPam.GetPoint()->nContent.Assign(
- pCurTxtNd, pCurTxtNd->GetTxt().getLength());
- aDelPam.SetMark();
- aDelPam.GetPoint()->nContent = nPos;
- DeleteSel( aDelPam );
- aDelPam.DeleteMark();
+ m_aDelPam.GetPoint()->nContent.Assign(
+ m_pCurTxtNd, m_pCurTxtNd->GetTxt().getLength());
+ m_aDelPam.SetMark();
+ m_aDelPam.GetPoint()->nContent = nPos;
+ DeleteSel( m_aDelPam );
+ m_aDelPam.DeleteMark();
}
}
}
void SwAutoFormat::DeleteSel( SwPaM& rDelPam )
{
- if( aFlags.bWithRedlining )
+ if( m_aFlags.bWithRedlining )
{
// Add to Shell-Cursor-Ring so that DelPam will be moved as well!
- SwPaM* pShCrsr = pEditShell->_GetCrsr();
- SwPaM aTmp( *pCurTxtNd, 0, pShCrsr );
+ SwPaM* pShCrsr = m_pEditShell->_GetCrsr();
+ SwPaM aTmp( *m_pCurTxtNd, 0, pShCrsr );
Ring *pPrev = rDelPam.GetPrev();
rDelPam.MoveRingTo( pShCrsr );
- pEditShell->DeleteSel( rDelPam );
+ m_pEditShell->DeleteSel( rDelPam );
// and remove Pam again:
Ring *p, *pNext = (Ring*)&rDelPam;
@@ -1117,41 +1116,41 @@ void SwAutoFormat::DeleteSel( SwPaM& rDelPam )
p->MoveTo( &rDelPam );
} while( p != pPrev );
- aNdIdx = aTmp.GetPoint()->nNode;
- pCurTxtNd = aNdIdx.GetNode().GetTxtNode();
+ m_aNdIdx = aTmp.GetPoint()->nNode;
+ m_pCurTxtNd = m_aNdIdx.GetNode().GetTxtNode();
}
else
- pEditShell->DeleteSel( rDelPam );
+ m_pEditShell->DeleteSel( rDelPam );
}
bool SwAutoFormat::DeleteCurNxtPara( const OUString& rNxtPara )
{
// delete blanks at the end of the current and at the beginning of the next one
- aDelPam.DeleteMark();
- aDelPam.GetPoint()->nNode = aNdIdx;
- aDelPam.GetPoint()->nContent.Assign( pCurTxtNd,
- GetTrailingBlanks( pCurTxtNd->GetTxt() ) );
- aDelPam.SetMark();
-
- aDelPam.GetPoint()->nNode++;
- SwTxtNode* pTNd = aDelPam.GetNode()->GetTxtNode();
+ m_aDelPam.DeleteMark();
+ m_aDelPam.GetPoint()->nNode = m_aNdIdx;
+ m_aDelPam.GetPoint()->nContent.Assign( m_pCurTxtNd,
+ GetTrailingBlanks( m_pCurTxtNd->GetTxt() ) );
+ m_aDelPam.SetMark();
+
+ m_aDelPam.GetPoint()->nNode++;
+ SwTxtNode* pTNd = m_aDelPam.GetNode()->GetTxtNode();
if( !pTNd )
{
// then delete only up to end of the paragraph
- aDelPam.GetPoint()->nNode--;
- aDelPam.GetPoint()->nContent = pCurTxtNd->GetTxt().getLength();
+ m_aDelPam.GetPoint()->nNode--;
+ m_aDelPam.GetPoint()->nContent = m_pCurTxtNd->GetTxt().getLength();
}
else
- aDelPam.GetPoint()->nContent.Assign( pTNd,
+ m_aDelPam.GetPoint()->nContent.Assign( pTNd,
GetLeadingBlanks( rNxtPara ));
// Is there a Blank at the beginning or end?
// Do not delete it, it will be inserted again.
- bool bHasBlnks = HasSelBlanks( aDelPam );
+ bool bHasBlnks = HasSelBlanks( m_aDelPam );
- if( *aDelPam.GetPoint() != *aDelPam.GetMark() )
- DeleteSel( aDelPam );
- aDelPam.DeleteMark();
+ if( *m_aDelPam.GetPoint() != *m_aDelPam.GetMark() )
+ DeleteSel( m_aDelPam );
+ m_aDelPam.DeleteMark();
return !bHasBlnks;
}
@@ -1160,94 +1159,94 @@ void SwAutoFormat::DelEmptyLine( bool bTstNextPara )
{
SetRedlineTxt( STR_AUTOFMTREDL_DEL_EMPTY_PARA );
// delete blanks in empty paragraph
- aDelPam.DeleteMark();
- aDelPam.GetPoint()->nNode = aNdIdx;
- aDelPam.GetPoint()->nContent.Assign(
- pCurTxtNd, pCurTxtNd->GetTxt().getLength() );
- aDelPam.SetMark();
-
- aDelPam.GetMark()->nNode--;
- SwTxtNode* pTNd = aDelPam.GetNode( false )->GetTxtNode();
+ m_aDelPam.DeleteMark();
+ m_aDelPam.GetPoint()->nNode = m_aNdIdx;
+ m_aDelPam.GetPoint()->nContent.Assign(
+ m_pCurTxtNd, m_pCurTxtNd->GetTxt().getLength() );
+ m_aDelPam.SetMark();
+
+ m_aDelPam.GetMark()->nNode--;
+ SwTxtNode* pTNd = m_aDelPam.GetNode( false )->GetTxtNode();
if( pTNd )
// first use the previous text node
- aDelPam.GetMark()->nContent.Assign(pTNd, pTNd->GetTxt().getLength());
+ m_aDelPam.GetMark()->nContent.Assign(pTNd, pTNd->GetTxt().getLength());
else if( bTstNextPara )
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list