Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
6124ad4c
Kaydet (Commit)
6124ad4c
authored
Nis 09, 2015
tarafından
Miklos Vajna
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
DocxAttributeOutput::m_pPostponedGraphic: use std::unique_ptr<>
Change-Id: I033cc6fce66203ad2967064211f9144b0edf8d1e
üst
4cca0169
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
12 deletions
+10
-12
docxattributeoutput.cxx
sw/source/filter/ww8/docxattributeoutput.cxx
+9
-11
docxattributeoutput.hxx
sw/source/filter/ww8/docxattributeoutput.hxx
+1
-1
No files found.
sw/source/filter/ww8/docxattributeoutput.cxx
Dosyayı görüntüle @
6124ad4c
...
...
@@ -1596,8 +1596,8 @@ void DocxAttributeOutput::StartRunProperties()
}
InitCollectedRunProperties();
OSL_ASSERT(
m_postponedGraphic == NULL
);
m_p
ostponedGraphic = new std::list< PostponedGraphic >
;
OSL_ASSERT(
!m_pPostponedGraphic
);
m_p
PostponedGraphic.reset(new std::list<PostponedGraphic>())
;
OSL_ASSERT( m_postponedDiagram == NULL );
m_postponedDiagram = new std::list< PostponedDiagram >;
...
...
@@ -1962,12 +1962,11 @@ void DocxAttributeOutput::GetSdtEndBefore(const SdrObject* pSdrObj)
void DocxAttributeOutput::WritePostponedGraphic()
{
for( std::list< PostponedGraphic >::const_iterator it = m_postponedGraphic->begin();
it != m_postponedGraphic->end();
for( std::list< PostponedGraphic >::const_iterator it = m_p
P
ostponedGraphic->begin();
it != m_p
P
ostponedGraphic->end();
++it )
FlyFrameGraphic( it->grfNode, it->size, it->mOLEFrmFmt, it->mOLENode, it->pSdrObj );
delete m_postponedGraphic;
m_postponedGraphic = NULL;
m_pPostponedGraphic.reset(0);
}
void DocxAttributeOutput::WritePostponedDiagram()
...
...
@@ -4211,11 +4210,11 @@ void DocxAttributeOutput::WriteOLE2Obj( const SdrObject* pSdrObj, SwOLENode& rOL
if( PostponeOLE( pSdrObj, rOLENode, rSize, pFlyFrmFmt ))
return;
// Then we fall back to just export the object as a graphic.
if(
m_postponedGraphic == NULL
)
if(
!m_pPostponedGraphic
)
FlyFrameGraphic( 0, rSize, pFlyFrmFmt, &rOLENode );
else
// w:drawing should not be inside w:rPr, so write it out later
m_p
ostponedGraphic->push_back( PostponedGraphic( 0, rSize, pFlyFrmFmt, &rOLENode, 0 )
);
m_p
PostponedGraphic->push_back(PostponedGraphic(0, rSize, pFlyFrmFmt, &rOLENode, 0)
);
}
bool DocxAttributeOutput::WriteOLEChart( const SdrObject* pSdrObj, const Size& rSize )
...
...
@@ -4786,7 +4785,7 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po
const SwGrfNode *pGrfNode = pNode ? pNode->GetGrfNode() : 0;
if ( pGrfNode )
{
if
( m_postponedGraphic == NULL
)
if
(!m_pPostponedGraphic
)
{
m_bPostponedProcessingFly = false ;
FlyFrameGraphic( pGrfNode, rFrame.GetLayoutSize(), 0, 0, pSdrObj);
...
...
@@ -4794,7 +4793,7 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po
else // we are writing out attributes, but w:drawing should not be inside w:rPr,
{ // so write it out later
m_bPostponedProcessingFly = true ;
m_p
ostponedGraphic->push_back( PostponedGraphic(
pGrfNode, rFrame.GetLayoutSize(), 0, 0, pSdrObj));
m_p
PostponedGraphic->push_back(PostponedGraphic(
pGrfNode, rFrame.GetLayoutSize(), 0, 0, pSdrObj));
}
}
}
...
...
@@ -8279,7 +8278,6 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, FSHelperPtr pSeri
m_startedHyperlink( false ),
m_nHyperLinkCount(0),
m_nFieldsInHyperlink( 0 ),
m_postponedGraphic( NULL ),
m_postponedDiagram( NULL ),
m_postponedVMLDrawing(NULL),
m_postponedDMLDrawing(NULL),
...
...
sw/source/filter/ww8/docxattributeoutput.hxx
Dosyayı görüntüle @
6124ad4c
...
...
@@ -832,7 +832,7 @@ private:
SwOLENode
*
mOLENode
;
const
SdrObject
*
pSdrObj
;
};
std
::
list
<
PostponedGraphic
>*
m_p
ostponedGraphic
;
std
::
unique_ptr
<
std
::
list
<
PostponedGraphic
>
>
m_pP
ostponedGraphic
;
struct
PostponedDiagram
{
PostponedDiagram
(
const
SdrObject
*
o
,
const
SwFrmFmt
*
frm
)
:
object
(
o
),
frame
(
frm
)
{};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment