Kaydet (Commit) a5b909ac authored tarafından Rafael Dominguez's avatar Rafael Dominguez Kaydeden (comit) Luboš Luňák

Return by value instead of passing by reference to get data.

üst 05524106
...@@ -139,7 +139,7 @@ class AbstractSdInsertPagesObjsDlg : public VclAbstractDialog //add for SdInser ...@@ -139,7 +139,7 @@ class AbstractSdInsertPagesObjsDlg : public VclAbstractDialog //add for SdInser
{ {
public: public:
virtual ::Window* GetWindow() = 0; //this method is added for return a ::Window type pointer 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 IsLink() = 0;
virtual sal_Bool IsRemoveUnnessesaryMasterPages() const = 0; virtual sal_Bool IsRemoveUnnessesaryMasterPages() const = 0;
}; };
......
...@@ -115,7 +115,7 @@ void SdInsertPagesObjsDlg::Reset() ...@@ -115,7 +115,7 @@ void SdInsertPagesObjsDlg::Reset()
aCbxMasters.Check( sal_True ); 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 // Bei Draw-Dokumenten muss bei der Selektion des Dokumentes NULL
// zurueckgegeben werden // zurueckgegeben werden
...@@ -129,10 +129,10 @@ void SdInsertPagesObjsDlg::GetList( const sal_uInt16 nType, std::vector<rtl::OUS ...@@ -129,10 +129,10 @@ void SdInsertPagesObjsDlg::GetList( const sal_uInt16 nType, std::vector<rtl::OUS
// wird das gesamte Dokument (und nicht mehr!) eingefuegt. // wird das gesamte Dokument (und nicht mehr!) eingefuegt.
if( aLbTree.GetSelectionCount() == 0 || if( aLbTree.GetSelectionCount() == 0 ||
( aLbTree.IsSelected( aLbTree.First() ) ) ) ( aLbTree.IsSelected( aLbTree.First() ) ) )
return; return std::vector<rtl::OUString>();
} }
aLbTree.GetSelectEntryList( nType,rEntries ); return aLbTree.GetSelectEntryList( nType );
} }
/************************************************************************* /*************************************************************************
......
...@@ -283,9 +283,9 @@ sal_Bool AbstractSdInsertPasteDlg_Impl::IsInsertBefore() const ...@@ -283,9 +283,9 @@ sal_Bool AbstractSdInsertPasteDlg_Impl::IsInsertBefore() const
return (::Window*)pDlg; 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() sal_Bool AbstractSdInsertPagesObjsDlg_Impl::IsLink()
......
...@@ -187,7 +187,7 @@ class AbstractSdInsertPagesObjsDlg_Impl : public AbstractSdInsertPagesObjsDlg ...@@ -187,7 +187,7 @@ class AbstractSdInsertPagesObjsDlg_Impl : public AbstractSdInsertPagesObjsDlg
{ {
DECL_ABSTDLG_BASE(AbstractSdInsertPagesObjsDlg_Impl,SdInsertPagesObjsDlg) DECL_ABSTDLG_BASE(AbstractSdInsertPagesObjsDlg_Impl,SdInsertPagesObjsDlg)
virtual ::Window * GetWindow(); //this method is added for return a Window type pointer 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 IsLink();
virtual sal_Bool IsRemoveUnnessesaryMasterPages() const; virtual sal_Bool IsRemoveUnnessesaryMasterPages() const;
}; };
......
...@@ -661,8 +661,9 @@ String SdPageObjsTLB::GetSelectEntry() ...@@ -661,8 +661,9 @@ String SdPageObjsTLB::GetSelectEntry()
return( GetEntryText( GetCurEntry() ) ); 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(); SvLBoxEntry* pEntry = FirstSelected();
while( pEntry ) while( pEntry )
...@@ -670,10 +671,12 @@ void SdPageObjsTLB::GetSelectEntryList( sal_uInt16 nDepth, std::vector<rtl::OUSt ...@@ -670,10 +671,12 @@ void SdPageObjsTLB::GetSelectEntryList( sal_uInt16 nDepth, std::vector<rtl::OUSt
sal_uInt16 nListDepth = GetModel()->GetDepth( pEntry ); sal_uInt16 nListDepth = GetModel()->GetDepth( pEntry );
if( nListDepth == nDepth ) if( nListDepth == nDepth )
rEntries.push_back(GetEntryText(pEntry)); aEntries.push_back(GetEntryText(pEntry));
pEntry = NextSelected( pEntry ); pEntry = NextSelected( pEntry );
} }
return aEntries;
} }
/************************************************************************* /*************************************************************************
......
...@@ -354,10 +354,9 @@ sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) ...@@ -354,10 +354,9 @@ sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
if( nRet == RET_OK ) 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 // Zuerst Seiten einfuegen
pDlg->GetList( 1, aBookmarkList ); // Seiten std::vector<rtl::OUString> aBookmarkList = pDlg->GetList( 1 ); // Seiten
sal_Bool bLink = pDlg->IsLink(); sal_Bool bLink = pDlg->IsLink();
sal_Bool bReplace = sal_False; sal_Bool bReplace = sal_False;
SdPage* pPage = NULL; SdPage* pPage = NULL;
...@@ -387,8 +386,8 @@ sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) ...@@ -387,8 +386,8 @@ sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
} }
sal_Bool bNameOK; sal_Bool bNameOK;
std::vector<rtl::OUString> aObjectBookmarkList, aExchangeList; std::vector<rtl::OUString> aExchangeList;
pDlg->GetList( 2, aObjectBookmarkList ); // Objekte std::vector<rtl::OUString> aObjectBookmarkList = pDlg->GetList( 2 ); // Objekte
// Es werden ausgewaehlte Seiten und/oder ausgewaehlte Objekte oder // Es werden ausgewaehlte Seiten und/oder ausgewaehlte Objekte oder
// alles eingefuegt, wenn pBookmarkList NULL ist! // alles eingefuegt, wenn pBookmarkList NULL ist!
......
...@@ -69,7 +69,7 @@ public: ...@@ -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 IsLink();
sal_Bool IsRemoveUnnessesaryMasterPages() const; sal_Bool IsRemoveUnnessesaryMasterPages() const;
......
...@@ -215,7 +215,7 @@ public: ...@@ -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); SdDrawDocument* GetBookmarkDoc(SfxMedium* pMedium = NULL);
::sd::DrawDocShell* GetDropDocSh() { return(mpDropDocSh); } ::sd::DrawDocShell* GetDropDocSh() { return(mpDropDocSh); }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment