[Libreoffice-commits] .: 4 commits - sd/inc sd/source writerfilter/source
Lubos Lunak
llunak at kemper.freedesktop.org
Mon Apr 16 09:46:15 PDT 2012
sd/inc/drawdoc.hxx | 5 +++--
sd/inc/sdabstdlg.hxx | 2 +-
sd/source/core/drawdoc3.cxx | 17 +++++++++++------
sd/source/core/pglink.cxx | 3 +--
sd/source/ui/app/sdxfer.cxx | 3 +--
sd/source/ui/dlg/inspagob.cxx | 6 +++---
sd/source/ui/dlg/sddlgfact.cxx | 4 ++--
sd/source/ui/dlg/sddlgfact.hxx | 2 +-
sd/source/ui/dlg/sdtreelb.cxx | 7 +++++--
sd/source/ui/func/fuinsfil.cxx | 11 +++++------
sd/source/ui/inc/View.hxx | 2 --
sd/source/ui/inc/inspagob.hxx | 2 +-
sd/source/ui/inc/sdtreelb.hxx | 2 +-
sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 8 +++-----
sd/source/ui/view/ViewClipboard.cxx | 5 ++---
sd/source/ui/view/sdview2.cxx | 11 -----------
writerfilter/source/dmapper/GraphicImport.cxx | 1 -
17 files changed, 40 insertions(+), 51 deletions(-)
New commits:
commit a5b909ac6d6dd41559eba271d27140ebc21c72fc
Author: Rafael Dominguez <venccsralph at gmail.com>
Date: Sat Apr 14 23:03:08 2012 -0430
Return by value instead of passing by reference to get data.
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 8e01fbc..95ae85d 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -139,7 +139,7 @@ class AbstractSdInsertPagesObjsDlg : public VclAbstractDialog //add for SdInser
{
public:
virtual ::Window* GetWindow() = 0; //this method is added for return a ::Window type pointer
- virtual void GetList ( const sal_uInt16 nType, std::vector<rtl::OUString> &rEntries ) = 0;
+ virtual std::vector<rtl::OUString> GetList ( const sal_uInt16 nType ) = 0;
virtual sal_Bool IsLink() = 0;
virtual sal_Bool IsRemoveUnnessesaryMasterPages() const = 0;
};
diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx
index 90e41a9..d433ee5 100644
--- a/sd/source/ui/dlg/inspagob.cxx
+++ b/sd/source/ui/dlg/inspagob.cxx
@@ -115,7 +115,7 @@ void SdInsertPagesObjsDlg::Reset()
aCbxMasters.Check( sal_True );
}
-void SdInsertPagesObjsDlg::GetList( const sal_uInt16 nType, std::vector<rtl::OUString> &rEntries )
+std::vector<rtl::OUString> SdInsertPagesObjsDlg::GetList( const sal_uInt16 nType )
{
// Bei Draw-Dokumenten muss bei der Selektion des Dokumentes NULL
// zurueckgegeben werden
@@ -129,10 +129,10 @@ void SdInsertPagesObjsDlg::GetList( const sal_uInt16 nType, std::vector<rtl::OUS
// wird das gesamte Dokument (und nicht mehr!) eingefuegt.
if( aLbTree.GetSelectionCount() == 0 ||
( aLbTree.IsSelected( aLbTree.First() ) ) )
- return;
+ return std::vector<rtl::OUString>();
}
- aLbTree.GetSelectEntryList( nType,rEntries );
+ return aLbTree.GetSelectEntryList( nType );
}
/*************************************************************************
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index fb08787..6eb2795 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -283,9 +283,9 @@ sal_Bool AbstractSdInsertPasteDlg_Impl::IsInsertBefore() const
return (::Window*)pDlg;
}
-void AbstractSdInsertPagesObjsDlg_Impl::GetList (const sal_uInt16 nType, std::vector<rtl::OUString> &rEntries)
+std::vector<rtl::OUString> AbstractSdInsertPagesObjsDlg_Impl::GetList(const sal_uInt16 nType)
{
- pDlg->GetList(nType,rEntries);
+ return pDlg->GetList(nType);
}
sal_Bool AbstractSdInsertPagesObjsDlg_Impl::IsLink()
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index 34d9a6c..c06200e 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -187,7 +187,7 @@ class AbstractSdInsertPagesObjsDlg_Impl : public AbstractSdInsertPagesObjsDlg
{
DECL_ABSTDLG_BASE(AbstractSdInsertPagesObjsDlg_Impl,SdInsertPagesObjsDlg)
virtual ::Window * GetWindow(); //this method is added for return a Window type pointer
- virtual void GetList ( const sal_uInt16 nType, std::vector<rtl::OUString> &rEntries);
+ virtual std::vector<rtl::OUString> GetList ( const sal_uInt16 nType );
virtual sal_Bool IsLink();
virtual sal_Bool IsRemoveUnnessesaryMasterPages() const;
};
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 1ce334a..4962369 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -661,8 +661,9 @@ String SdPageObjsTLB::GetSelectEntry()
return( GetEntryText( GetCurEntry() ) );
}
-void SdPageObjsTLB::GetSelectEntryList( sal_uInt16 nDepth, std::vector<rtl::OUString> &rEntries ) const
+std::vector<rtl::OUString> SdPageObjsTLB::GetSelectEntryList( const sal_uInt16 nDepth ) const
{
+ std::vector<rtl::OUString> aEntries;
SvLBoxEntry* pEntry = FirstSelected();
while( pEntry )
@@ -670,10 +671,12 @@ void SdPageObjsTLB::GetSelectEntryList( sal_uInt16 nDepth, std::vector<rtl::OUSt
sal_uInt16 nListDepth = GetModel()->GetDepth( pEntry );
if( nListDepth == nDepth )
- rEntries.push_back(GetEntryText(pEntry));
+ aEntries.push_back(GetEntryText(pEntry));
pEntry = NextSelected( pEntry );
}
+
+ return aEntries;
}
/*************************************************************************
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 624f309..260d6cb 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -354,10 +354,9 @@ sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
if( nRet == RET_OK )
{
- std::vector<rtl::OUString> aBookmarkList; // Liste mit Seitennamen (wenn NULL, dann alle Seiten)
-
+ // Liste mit Seitennamen (wenn NULL, dann alle Seiten)
// Zuerst Seiten einfuegen
- pDlg->GetList( 1, aBookmarkList ); // Seiten
+ std::vector<rtl::OUString> aBookmarkList = pDlg->GetList( 1 ); // Seiten
sal_Bool bLink = pDlg->IsLink();
sal_Bool bReplace = sal_False;
SdPage* pPage = NULL;
@@ -387,8 +386,8 @@ sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
}
sal_Bool bNameOK;
- std::vector<rtl::OUString> aObjectBookmarkList, aExchangeList;
- pDlg->GetList( 2, aObjectBookmarkList ); // Objekte
+ std::vector<rtl::OUString> aExchangeList;
+ std::vector<rtl::OUString> aObjectBookmarkList = pDlg->GetList( 2 ); // Objekte
// Es werden ausgewaehlte Seiten und/oder ausgewaehlte Objekte oder
// alles eingefuegt, wenn pBookmarkList NULL ist!
diff --git a/sd/source/ui/inc/inspagob.hxx b/sd/source/ui/inc/inspagob.hxx
index deea96c..651979b 100644
--- a/sd/source/ui/inc/inspagob.hxx
+++ b/sd/source/ui/inc/inspagob.hxx
@@ -69,7 +69,7 @@ public:
|*
\************************************************************************/
- void GetList ( const sal_uInt16 nType, std::vector<rtl::OUString> &rEntries);
+ std::vector<rtl::OUString> GetList ( const sal_uInt16 nType ) ;
sal_Bool IsLink();
sal_Bool IsRemoveUnnessesaryMasterPages() const;
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index 5a26745..63ac738 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -215,7 +215,7 @@ public:
|*
\************************************************************************/
- void GetSelectEntryList (sal_uInt16 nDepth, std::vector<rtl::OUString> &rEntries) const;
+ std::vector<rtl::OUString> GetSelectEntryList (const sal_uInt16 nDepth) const;
SdDrawDocument* GetBookmarkDoc(SfxMedium* pMedium = NULL);
::sd::DrawDocShell* GetDropDocSh() { return(mpDropDocSh); }
commit 05524106d17ec7396aa1133fbe8ba9996c27f139
Author: Rafael Dominguez <venccsralph at gmail.com>
Date: Sat Apr 14 21:53:15 2012 -0430
Remove deprecated function.
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index 99901a5..7c3fa7d 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -166,8 +166,6 @@ public:
virtual SfxStyleSheet* GetStyleSheet() const;
- sal_Bool GetExchangeList( List*& rpExchangeList, List* pBookmarkList, sal_uInt16 nType );
-
/*************************************************************************
|*
|* Rueckgabeparameter:
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index fc366db..2e15340 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -908,17 +908,6 @@ IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEv
return 0;
}
-/*************************************************************************
-|*
-|* Rueckgabeparameter:
-|* pExchangeList == NULL -> Namen sind alle eindeutig
-|* bNameOK == sal_False -> Benutzer hat abgebrochen
-|* nType == 0 -> Seiten
-|* nType == 1 -> Objekte
-|* nType == 2 -> Seiten + Objekte
-|*
-\************************************************************************/
-
bool View::GetExchangeList (std::vector<rtl::OUString> &rExchangeList,
std::vector<rtl::OUString> &rBookmarkList,
const sal_uInt16 nType)
commit ae7ad6dab30463f961798f3203ef10c69b76c632
Author: Rafael Dominguez <venccsralph at gmail.com>
Date: Sat Apr 14 21:37:36 2012 -0430
Make an out argument a pointer instead of a reference.
- Fix some style issues.
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index c9f69c9..65aec09 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -324,14 +324,15 @@ public:
page, or preserve the old name
*/
- sal_Bool InsertBookmarkAsPage(const std::vector<rtl::OUString> &rBookmarkList, std::vector<rtl::OUString> &rExchangeList,
+ sal_Bool InsertBookmarkAsPage(const std::vector<rtl::OUString> &rBookmarkList,
+ std::vector<rtl::OUString> *pExchangeList,
sal_Bool bLink, sal_Bool bReplace, sal_uInt16 nPgPos,
sal_Bool bNoDialogs, ::sd::DrawDocShell* pBookmarkDocSh,
sal_Bool bCopy, sal_Bool bMergeMasterPages,
sal_Bool bPreservePageNames);
sal_Bool InsertBookmarkAsObject(const std::vector<rtl::OUString> &rBookmarkList,
- std::vector<rtl::OUString> &rExchangeList,
+ const std::vector<rtl::OUString> &rExchangeList,
sal_Bool bLink, ::sd::DrawDocShell* pBookmarkDocSh,
Point* pObjPos, bool bCalcObjCount = false);
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 63ce713..71b792d 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -353,7 +353,7 @@ sal_Bool SdDrawDocument::InsertBookmark(
if ( bOK && bInsertPages )
{
// Zuerst werden alle Seiten-Bookmarks eingefuegt
- bOK = InsertBookmarkAsPage(rBookmarkList, rExchangeList, bLink, bReplace,
+ bOK = InsertBookmarkAsPage(rBookmarkList, &rExchangeList, bLink, bReplace,
nInsertPos, bNoDialogs, pBookmarkDocSh, bCopy, sal_True, sal_False);
}
@@ -369,7 +369,7 @@ sal_Bool SdDrawDocument::InsertBookmark(
sal_Bool SdDrawDocument::InsertBookmarkAsPage(
const std::vector<rtl::OUString> &rBookmarkList,
- std::vector<rtl::OUString> &rExchangeList, // Liste der zu verwendenen Namen
+ std::vector<rtl::OUString> *pExchangeList, // Liste der zu verwendenen Namen
sal_Bool bLink,
sal_Bool bReplace,
sal_uInt16 nInsertPos,
@@ -816,12 +816,16 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
nSdPageEnd = nSdPageStart + nReplacedStandardPages - 1;
}
- std::vector<rtl::OUString>::iterator pExchangeIter = rExchangeList.begin();
+ std::vector<rtl::OUString>::iterator pExchangeIter;
+
+ if (pExchangeList)
+ pExchangeIter = pExchangeList->begin();
+
for (sal_uInt16 nSdPage = nSdPageStart; nSdPage <= nSdPageEnd; nSdPage++)
{
pRefPage = GetSdPage(nSdPage, PK_STANDARD);
- if (pExchangeIter != rExchangeList.end())
+ if (pExchangeList && pExchangeIter != pExchangeList->end())
{
// Zuverwendener Name aus Exchange-Liste holen
String aExchangeName (*pExchangeIter);
@@ -879,7 +883,8 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
}
///Remove processed elements, to avoid doings hacks in InsertBookmarkAsObject
- rExchangeList.erase(rExchangeList.begin(),pExchangeIter);
+ if ( pExchangeList )
+ pExchangeList->erase(pExchangeList->begin(),pExchangeIter);
for (sal_uInt16 nPage = nMPageCount; nPage < nNewMPageCount; nPage++)
{
@@ -930,7 +935,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
sal_Bool SdDrawDocument::InsertBookmarkAsObject(
const std::vector<rtl::OUString> &rBookmarkList,
- std::vector<rtl::OUString> &rExchangeList, // Liste der zu verwendenen Namen
+ const std::vector<rtl::OUString> &rExchangeList, // Liste der zu verwendenen Namen
sal_Bool /* bLink */,
::sd::DrawDocShell* pBookmarkDocSh,
Point* pObjPos, bool bCalcObjCount)
diff --git a/sd/source/core/pglink.cxx b/sd/source/core/pglink.cxx
index f40dfdb..bae8a47 100644
--- a/sd/source/core/pglink.cxx
+++ b/sd/source/core/pglink.cxx
@@ -116,8 +116,7 @@ SdPageLink::~SdPageLink()
bCopy = sal_True;
}
- std::vector<rtl::OUString> aExchangeList;
- pDoc->InsertBookmarkAsPage(aBookmarkList, aExchangeList, bLink, bReplace,
+ pDoc->InsertBookmarkAsPage(aBookmarkList, NULL, bLink, bReplace,
nInsertPos, bNoDialogs, NULL, bCopy, sal_True, sal_True);
if( !pDoc->pDocLockedInsertingLinks )
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 2f4c93f..fe168f7 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -724,9 +724,8 @@ void SdTransferable::SetPageBookmarks( const std::vector<rtl::OUString> &rPageBo
if( bPersistent )
{
- std::vector<rtl::OUString> aExchangeList;
mpSdDrawDocument->CreateFirstPages(mpSourceDoc);
- mpSdDrawDocument->InsertBookmarkAsPage( rPageBookmarks, aExchangeList, sal_False, sal_True, 1, sal_True,
+ mpSdDrawDocument->InsertBookmarkAsPage( rPageBookmarks, NULL, sal_False, sal_True, 1, sal_True,
mpSourceDoc->GetDocSh(), sal_True, sal_True, sal_False );
}
else
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index dce5dd6..624f309 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -401,7 +401,7 @@ sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
bNameOK = mpView->GetExchangeList( aExchangeList, aBookmarkList, 0 );
if( bNameOK )
- bOK = mpDoc->InsertBookmarkAsPage( aBookmarkList, aExchangeList,
+ bOK = mpDoc->InsertBookmarkAsPage( aBookmarkList, &aExchangeList,
bLink, bReplace, nPos,
sal_False, NULL, sal_True, sal_True, sal_False );
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index ec3ea1d..0ff1eb0 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -344,14 +344,13 @@ sal_Int32 Clipboard::PasteTransferable (sal_Int32 nInsertPosition)
sal_Int32 nInsertPageCount (0);
if (pClipTransferable->HasPageBookmarks())
{
- std::vector<rtl::OUString> aExchangeList;
const std::vector<rtl::OUString> &rBookmarkList = pClipTransferable->GetPageBookmarks();
const SolarMutexGuard aGuard;
nInsertPageCount = (sal_uInt16) rBookmarkList.size();
rModel.GetDocument()->InsertBookmarkAsPage(
rBookmarkList,
- aExchangeList,
+ NULL,
sal_False,
sal_False,
nInsertIndex,
@@ -370,14 +369,13 @@ sal_Int32 Clipboard::PasteTransferable (sal_Int32 nInsertPosition)
if (pDataDoc!=NULL
&& pDataDoc->GetSdPageCount(PK_STANDARD))
{
- std::vector<rtl::OUString> aBookmarkList, aExchangeList;
const SolarMutexGuard aGuard;
bMergeMasterPages = (pDataDoc != rModel.GetDocument());
nInsertPageCount = pDataDoc->GetSdPageCount( PK_STANDARD );
rModel.GetDocument()->InsertBookmarkAsPage(
- aBookmarkList,
- aExchangeList,
+ std::vector<rtl::OUString>(),
+ NULL,
sal_False,
sal_False,
nInsertIndex,
diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx
index 2470adb..7c03b8c 100644
--- a/sd/source/ui/view/ViewClipboard.cxx
+++ b/sd/source/ui/view/ViewClipboard.cxx
@@ -246,10 +246,9 @@ sal_uInt16 ViewClipboard::InsertSlides (
if( bWait )
pWin->LeaveWait();
- std::vector<rtl::OUString> aExchangeList;
rDoc.InsertBookmarkAsPage(
- *pBookmarkList,
- aExchangeList,
+ pBookmarkList ? *pBookmarkList : std::vector<rtl::OUString>(),
+ NULL,
sal_False,
sal_False,
nInsertPosition,
commit 6242b36b78a563823d45aeb1e757bcb88ca03b69
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Mon Apr 16 15:15:22 2012 +0200
remove unused variable
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 1d7d632..e74951b 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -941,7 +941,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
uno::makeAny
(m_pImpl->rDomainMapper.GetCurrentTextRange()));
- awt::Point aPoint(m_xShape->getPosition());
awt::Size aSize(m_xShape->getSize());
if (m_pImpl->isXSizeValid())
More information about the Libreoffice-commits
mailing list