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

this can be a reference surely

Browse Source
This commit is contained in:
Caolán McNamara
2012-04-11 16:14:08 +01:00
parent 5c3b81d21d
commit 09fa378e11
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sd/source/core/drawdoc3.cxx
View File

@@ -336,12 +336,12 @@ void SdDrawDocument::IterateBookmarkPages( SdDrawDocument* pBookmarkDoc, List* p
class InsertBookmarkAsPage_FindDuplicateLayouts : public SdDrawDocument::InsertBookmarkAsPage_PageFunctorBase class InsertBookmarkAsPage_FindDuplicateLayouts : public SdDrawDocument::InsertBookmarkAsPage_PageFunctorBase
{ {
public: public:
InsertBookmarkAsPage_FindDuplicateLayouts( std::vector<rtl::OUString> *pLayoutsToTransfer ) InsertBookmarkAsPage_FindDuplicateLayouts( std::vector<rtl::OUString> &rLayoutsToTransfer )
: mpLayoutsToTransfer(pLayoutsToTransfer) {} : mrLayoutsToTransfer(rLayoutsToTransfer) {}
virtual ~InsertBookmarkAsPage_FindDuplicateLayouts() {}; virtual ~InsertBookmarkAsPage_FindDuplicateLayouts() {};
virtual void operator()( SdDrawDocument&, SdPage* ); virtual void operator()( SdDrawDocument&, SdPage* );
private: private:
std::vector<rtl::OUString> *mpLayoutsToTransfer; std::vector<rtl::OUString> &mrLayoutsToTransfer;
}; };
void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc, SdPage* pBMMPage ) void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc, SdPage* pBMMPage )
@@ -355,9 +355,9 @@ void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc
rtl::OUString aLayout(aFullNameLayout); rtl::OUString aLayout(aFullNameLayout);
std::vector<rtl::OUString>::const_iterator pIter = std::vector<rtl::OUString>::const_iterator pIter =
find(mpLayoutsToTransfer->begin(),mpLayoutsToTransfer->end(),aLayout); find(mrLayoutsToTransfer.begin(), mrLayoutsToTransfer.end(),aLayout);
bool bFound = pIter != mpLayoutsToTransfer->end(); bool bFound = pIter != mrLayoutsToTransfer.end();
const sal_uInt16 nMPageCount = rDoc.GetMasterPageCount(); const sal_uInt16 nMPageCount = rDoc.GetMasterPageCount();
for (sal_uInt16 nMPage = 0; nMPage < nMPageCount && !bFound; nMPage++) for (sal_uInt16 nMPage = 0; nMPage < nMPageCount && !bFound; nMPage++)
@@ -376,7 +376,7 @@ void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc
} }
if (!bFound) if (!bFound)
mpLayoutsToTransfer->push_back(aLayout); mrLayoutsToTransfer.push_back(aLayout);
} }
/** Just add one page to the container given to the constructor. /** Just add one page to the container given to the constructor.
@@ -514,7 +514,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
// Refactored copy'n'pasted layout name collection into IterateBookmarkPages // Refactored copy'n'pasted layout name collection into IterateBookmarkPages
// //
std::vector<rtl::OUString> aLayoutsToTransfer; std::vector<rtl::OUString> aLayoutsToTransfer;
InsertBookmarkAsPage_FindDuplicateLayouts aSearchFunctor( &aLayoutsToTransfer ); InsertBookmarkAsPage_FindDuplicateLayouts aSearchFunctor( aLayoutsToTransfer );
IterateBookmarkPages( pBookmarkDoc, pBookmarkList, nBMSdPageCount, aSearchFunctor ); IterateBookmarkPages( pBookmarkDoc, pBookmarkList, nBMSdPageCount, aSearchFunctor );