[Libreoffice-commits] .: 3 commits - sfx2/source xmloff/source
August Sodora
augsod at kemper.freedesktop.org
Wed Jan 11 21:17:12 PST 2012
sfx2/source/doc/docvor.cxx | 29 ++++++++++++-----------------
xmloff/source/meta/xmlversion.cxx | 2 --
xmloff/source/text/txtimp.cxx | 33 ++++++++++++---------------------
3 files changed, 24 insertions(+), 40 deletions(-)
New commits:
commit f447156c0087990edd80680545d2a78d7d51a60b
Author: August Sodora <augsod at gmail.com>
Date: Thu Jan 12 00:16:31 2012 -0500
SvStringsDtor->std::vector
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 0242f54..61021eb 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -532,8 +532,8 @@ struct SAL_DLLPRIVATE XMLTextImportHelper::Impl
::std::auto_ptr<SvXMLTokenMap> m_pTextContourAttrTokenMap;
::std::auto_ptr<SvXMLTokenMap> m_pTextHyperlinkAttrTokenMap;
::std::auto_ptr<SvXMLTokenMap> m_pTextMasterPageElemTokenMap;
- ::std::auto_ptr<SvStringsDtor> m_pPrevFrmNames;
- ::std::auto_ptr<SvStringsDtor> m_pNextFrmNames;
+ ::std::auto_ptr< std::vector<rtl::OUString> > m_pPrevFrmNames;
+ ::std::auto_ptr< std::vector<rtl::OUString> > m_pNextFrmNames;
::std::auto_ptr<XMLTextListsHelper> m_pTextListsHelper;
SAL_WNODEPRECATED_DECLARATIONS_POP
@@ -2737,34 +2737,25 @@ void XMLTextImportHelper::ConnectFrameChains(
{
if (!m_pImpl->m_pPrevFrmNames.get())
{
- m_pImpl->m_pPrevFrmNames.reset( new SvStringsDtor );
- m_pImpl->m_pNextFrmNames.reset( new SvStringsDtor );
+ m_pImpl->m_pPrevFrmNames.reset( new std::vector<rtl::OUString> );
+ m_pImpl->m_pNextFrmNames.reset( new std::vector<rtl::OUString> );
}
- m_pImpl->m_pPrevFrmNames->Insert( new String( rFrmName ),
- m_pImpl->m_pPrevFrmNames->Count() );
- m_pImpl->m_pNextFrmNames->Insert( new String( sNextFrmName ),
- m_pImpl->m_pNextFrmNames->Count() );
+ m_pImpl->m_pPrevFrmNames->push_back(rFrmName);
+ m_pImpl->m_pNextFrmNames->push_back(sNextFrmName);
}
}
- if (m_pImpl->m_pPrevFrmNames.get() && m_pImpl->m_pPrevFrmNames->Count())
+ if (m_pImpl->m_pPrevFrmNames.get() && !m_pImpl->m_pPrevFrmNames->empty())
{
- sal_uInt16 nCount = m_pImpl->m_pPrevFrmNames->Count();
- for( sal_uInt16 i=0; i<nCount; i++ )
+ for(std::vector<rtl::OUString>::iterator i = m_pImpl->m_pPrevFrmNames->begin(), j = m_pImpl->m_pNextFrmNames->begin(); i != m_pImpl->m_pPrevFrmNames->end() && j != m_pImpl->m_pNextFrmNames->end(); ++i, ++j)
{
- String *pNext = (*m_pImpl->m_pNextFrmNames)[i];
- if( OUString(*pNext) == rFrmName )
+ if((*j).equals(rFrmName))
{
// The previuous frame must exist, because it existing than
// inserting the entry
- String *pPrev = (*m_pImpl->m_pPrevFrmNames)[i];
+ rFrmPropSet->setPropertyValue(s_ChainPrevName, makeAny(*i));
- rFrmPropSet->setPropertyValue(s_ChainPrevName,
- makeAny(OUString( *pPrev )));
-
- m_pImpl->m_pPrevFrmNames->Remove( i, 1 );
- m_pImpl->m_pNextFrmNames->Remove( i, 1 );
- delete pPrev;
- delete pNext;
+ i = m_pImpl->m_pPrevFrmNames->erase(i);
+ j = m_pImpl->m_pNextFrmNames->erase(j);
// There cannot be more than one previous frames
break;
commit ba47379b4ac72b830d3d9128ede644cf84bcf55e
Author: August Sodora <augsod at gmail.com>
Date: Thu Jan 12 00:04:04 2012 -0500
Remove unused forward declaration
diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx
index f36bd05..fe01b41 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -41,8 +41,6 @@
#include <com/sun/star/xml/sax/InputSource.hpp>
#include <com/sun/star/xml/sax/XParser.hpp>
-class SvStringsDtor;
-
using namespace ::com::sun::star::xml::sax;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
commit c68506e02bcab748bbf3f4d0f8143a5b087568b8
Author: August Sodora <augsod at gmail.com>
Date: Thu Jan 12 00:01:48 2012 -0500
SvStringsDtor->std::vector
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index 4f56e82..ab7a6bd 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -155,7 +155,7 @@ friend class SfxOrganizeListBox_Impl;
SfxOrganizeMgr aMgr;
sfx2::FileDialogHelper* pFileDlg;
- SvStringsDtor* GetAllFactoryURLs_Impl() const;
+ std::vector<rtl::OUString> GetAllFactoryURLs_Impl() const;
sal_Bool GetServiceName_Impl( String& rFactoryURL, String& rFileURL ) const;
long Dispatch_Impl( sal_uInt16 nId, Menu* _pMenu );
String GetPath_Impl( sal_Bool bOpen, const String& rFileName );
@@ -1691,11 +1691,11 @@ sal_Bool SfxOrganizeDlg_Impl::DontDelete_Impl( SvLBoxEntry* pEntry )
return sal_False;
}
-SvStringsDtor* SfxOrganizeDlg_Impl::GetAllFactoryURLs_Impl( ) const
+std::vector<rtl::OUString> SfxOrganizeDlg_Impl::GetAllFactoryURLs_Impl( ) const
{
SvtModuleOptions aModOpt;
const ::com::sun::star::uno::Sequence < ::rtl::OUString >& aServiceNames = aModOpt.GetAllServiceNames() ;
- SvStringsDtor* pList = new SvStringsDtor;
+ std::vector<rtl::OUString> aList;
sal_Int32 nCount = aServiceNames.getLength();
for( sal_Int32 i=0; i<nCount; ++i )
{
@@ -1703,12 +1703,11 @@ SvStringsDtor* SfxOrganizeDlg_Impl::GetAllFactoryURLs_Impl( ) const
{
SvtModuleOptions::EFactory eFac = SvtModuleOptions::E_WRITER;
SvtModuleOptions::ClassifyFactoryByName( aServiceNames[i], eFac );
- String* pURL = new String( aModOpt.GetFactoryEmptyDocumentURL( eFac ) );
- pList->Insert( pURL, pList->Count() );
+ aList.push_back(aModOpt.GetFactoryEmptyDocumentURL(eFac));
}
}
- return pList;
+ return aList;
}
sal_Bool SfxOrganizeDlg_Impl::GetServiceName_Impl( String& rName, String& rFileURL ) const
@@ -2068,20 +2067,17 @@ IMPL_LINK( SfxOrganizeDlg_Impl, MenuActivate_Impl, Menu *, pMenu )
pMenu->EnableItem( ID_DEFAULT_TEMPLATE, bEnable );
bEnable = sal_True;
- SvStringsDtor* pList = GetAllFactoryURLs_Impl();
- sal_uInt16 nCount = pList->Count();
- if ( nCount > 0 )
+ std::vector<rtl::OUString> aList(GetAllFactoryURLs_Impl());
+ if (!aList.empty())
{
PopupMenu* pSubMenu = new PopupMenu;
sal_uInt16 nItemId = ID_RESET_DEFAULT_TEMPLATE + 1;
- for ( sal_uInt16 i = 0; i < nCount; ++i )
+ for(std::vector<rtl::OUString>::const_iterator i = aList.begin(); i != aList.end(); ++i)
{
- String aObjFacURL( *pList->GetObject(i) );
- String aTitle = SvFileInformationManager::GetDescription(
- INetURLObject(aObjFacURL) );
- pSubMenu->InsertItem( nItemId, aTitle,
- SvFileInformationManager::GetImage(INetURLObject(aObjFacURL), false) );
- pSubMenu->SetItemCommand( nItemId++, aObjFacURL );
+ INetURLObject aObj(*i);
+ String aTitle = SvFileInformationManager::GetDescription(aObj);
+ pSubMenu->InsertItem(nItemId, aTitle, SvFileInformationManager::GetImage(aObj, false));
+ pSubMenu->SetItemCommand(nItemId++, *i);
DBG_ASSERT( nItemId <= ID_RESET_DEFAULT_TEMPLATE_END, "menu item id overflow" );
}
pMenu->SetPopupMenu( ID_RESET_DEFAULT_TEMPLATE, pSubMenu );
@@ -2089,7 +2085,6 @@ IMPL_LINK( SfxOrganizeDlg_Impl, MenuActivate_Impl, Menu *, pMenu )
else
bEnable = sal_False;
- delete pList;
pMenu->EnableItem( ID_RESET_DEFAULT_TEMPLATE, bEnable );
return 1;
More information about the Libreoffice-commits
mailing list