mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prepare for removal of non-const operator[] from Sequence in basctl

Browse Source 
Change-Id: Icc6ea4eea08a1cd3fffbfb211f420ab91602e8de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124336
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski
2021-10-28 16:03:49 +03:00
parent c131f32fcf
commit dd97bfce99
4 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
basctl/source/basicide/baside3.cxx
View File

@@ -1010,13 +1010,14 @@ bool implImportDialog(weld::Window* pWin, const ScriptDocument& rDocument, const
if( nOnlyInImportLanguageCount > 1 ) if( nOnlyInImportLanguageCount > 1 )
{ {
Sequence< lang::Locale > aRemainingLocaleSeq( nOnlyInImportLanguageCount - 1 ); Sequence< lang::Locale > aRemainingLocaleSeq( nOnlyInImportLanguageCount - 1 );
auto pRemainingLocaleSeq = aRemainingLocaleSeq.getArray();
lang::Locale aTmpLocale; lang::Locale aTmpLocale;
int iSeq = 0; int iSeq = 0;
for( int i = 0 ; i < nOnlyInImportLanguageCount ; ++i ) for( int i = 0 ; i < nOnlyInImportLanguageCount ; ++i )
{ {
aTmpLocale = aOnlyInImportLanguages[i]; aTmpLocale = aOnlyInImportLanguages[i];
if( !localesAreEqual( aFirstLocale, aTmpLocale ) ) if( !localesAreEqual( aFirstLocale, aTmpLocale ) )
aRemainingLocaleSeq[iSeq++] = aTmpLocale; pRemainingLocaleSeq[iSeq++] = aTmpLocale;
} }
pCurMgr->handleAddLocales( aRemainingLocaleSeq ); pCurMgr->handleAddLocales( aRemainingLocaleSeq );
} }

20
basctl/source/dlged/dlged.cxx
View File

@@ -182,8 +182,14 @@ DlgEditor::DlgEditor (
,pVScroll(nullptr) ,pVScroll(nullptr)
,pDlgEdModel(new DlgEdModel()) ,pDlgEdModel(new DlgEdModel())
,pDlgEdPage(new DlgEdPage(*pDlgEdModel)) ,pDlgEdPage(new DlgEdPage(*pDlgEdModel))
,m_ClipboardDataFlavors(1) // set clipboard data flavors
,m_ClipboardDataFlavorsResource(2) ,m_ClipboardDataFlavors{ { /* MimeType */ "application/vnd.sun.xml.dialog",
/* HumanPresentableName */ "Dialog 6.0",
/* DataType */ cppu::UnoType<Sequence< sal_Int8 >>::get() } }
,m_ClipboardDataFlavorsResource{ m_ClipboardDataFlavors[0],
{ /* MimeType */ "application/vnd.sun.xml.dialogwithresource",
/* HumanPresentableName */ "Dialog 8.0",
/* DataType */ cppu::UnoType<Sequence< sal_Int8 >>::get() } }
,pObjFac(new DlgEdFactory(xModel)) ,pObjFac(new DlgEdFactory(xModel))
,rWindow(rWindow_) ,rWindow(rWindow_)
,pFunc(new DlgEdFuncSelect(*this)) ,pFunc(new DlgEdFuncSelect(*this))
@@ -207,16 +213,6 @@ DlgEditor::DlgEditor (
pDlgEdModel->InsertPage(pDlgEdPage); pDlgEdModel->InsertPage(pDlgEdPage);
// set clipboard data flavors
m_ClipboardDataFlavors[0].MimeType = "application/vnd.sun.xml.dialog" ;
m_ClipboardDataFlavors[0].HumanPresentableName = "Dialog 6.0" ;
m_ClipboardDataFlavors[0].DataType = cppu::UnoType<Sequence< sal_Int8 >>::get();
m_ClipboardDataFlavorsResource[0] = m_ClipboardDataFlavors[0];
m_ClipboardDataFlavorsResource[1].MimeType = "application/vnd.sun.xml.dialogwithresource" ;
m_ClipboardDataFlavorsResource[1].HumanPresentableName = "Dialog 8.0" ;
m_ClipboardDataFlavorsResource[1].DataType = cppu::UnoType<Sequence< sal_Int8 >>::get();
aMarkIdle.SetInvokeHandler( LINK( this, DlgEditor, MarkTimeout ) ); aMarkIdle.SetInvokeHandler( LINK( this, DlgEditor, MarkTimeout ) );
rWindow.SetMapMode( MapMode( MapUnit::Map100thMM ) ); rWindow.SetMapMode( MapMode( MapUnit::Map100thMM ) );

3
basctl/source/dlged/dlgedobj.cxx
View File

@@ -1685,8 +1685,7 @@ void DlgEdObj::MakeDataAware( const Reference< frame::XModel >& xModel )
aValue.Name = "BoundCell"; aValue.Name = "BoundCell";
aValue.Value <<= aApiAddress; aValue.Value <<= aApiAddress;
Sequence< Any > aArgs( 1 ); Sequence< Any > aArgs{ Any(aValue) };
aArgs[ 0 ] <<= aValue;
if ( xBindable.is() ) if ( xBindable.is() )
{ {

3
basctl/source/dlged/managelang.cxx
View File

@@ -162,12 +162,13 @@ IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl, weld::Button&, void)
int nPos = m_xLanguageLB->get_selected_index(); int nPos = m_xLanguageLB->get_selected_index();
// remove locales // remove locales
Sequence< Locale > aLocaleSeq( nCount ); Sequence< Locale > aLocaleSeq( nCount );
auto aLocaleSeqRange = asNonConstRange(aLocaleSeq);
for (int i = 0; i < nCount; ++i) for (int i = 0; i < nCount; ++i)
{ {
const sal_Int32 nSelPos = aSelection[i]; const sal_Int32 nSelPos = aSelection[i];
LanguageEntry* pEntry = reinterpret_cast<LanguageEntry*>(m_xLanguageLB->get_id(nSelPos).toInt64()); LanguageEntry* pEntry = reinterpret_cast<LanguageEntry*>(m_xLanguageLB->get_id(nSelPos).toInt64());
if ( pEntry ) if ( pEntry )
aLocaleSeq[i] = pEntry->m_aLocale; aLocaleSeqRange[i] = pEntry->m_aLocale;
} }
m_xLocalizationMgr->handleRemoveLocales( aLocaleSeq ); m_xLocalizationMgr->handleRemoveLocales( aLocaleSeq );
// update listbox // update listbox