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
9eac8b2d
Kaydet (Commit)
9eac8b2d
authored
Kas 25, 2011
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Resolves: fdo#39950 fix dnd crash from default assignment operators
üst
cbb2b42f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
41 additions
and
21 deletions
+41
-21
RptObject.hxx
reportdesign/inc/RptObject.hxx
+4
-0
RptObject.cxx
reportdesign/source/core/sdr/RptObject.cxx
+37
-21
No files found.
reportdesign/inc/RptObject.hxx
Dosyayı görüntüle @
9eac8b2d
...
...
@@ -224,6 +224,8 @@ public:
virtual
OOle2Obj
*
Clone
()
const
;
virtual
void
initializeOle
();
OOle2Obj
&
operator
=
(
const
OOle2Obj
&
rObj
);
void
initializeChart
(
const
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
frame
::
XModel
>&
_xModel
);
};
...
...
@@ -275,6 +277,8 @@ public:
virtual
sal_uInt32
GetObjInventor
()
const
;
virtual
OUnoObject
*
Clone
()
const
;
OUnoObject
&
operator
=
(
const
OUnoObject
&
rObj
);
private
:
void
impl_setReportComponent_nothrow
();
void
impl_initializeModel_nothrow
();
...
...
reportdesign/source/core/sdr/RptObject.cxx
Dosyayı görüntüle @
9eac8b2d
...
...
@@ -941,18 +941,24 @@ uno::Reference< uno::XInterface > OUnoObject::getUnoShape()
{
return
OObjectBase
::
getUnoShapeOf
(
*
this
);
}
// -----------------------------------------------------------------------------
OUnoObject
&
OUnoObject
::
operator
=
(
const
OUnoObject
&
rObj
)
{
if
(
this
==
&
rObj
)
return
*
this
;
SdrUnoObj
::
operator
=
(
rObj
);
Reference
<
XPropertySet
>
xSource
(
const_cast
<
OUnoObject
&>
(
rObj
).
getUnoShape
(),
uno
::
UNO_QUERY
);
Reference
<
XPropertySet
>
xDest
(
getUnoShape
(),
uno
::
UNO_QUERY
);
if
(
xSource
.
is
()
&&
xDest
.
is
()
)
comphelper
::
copyProperties
(
xSource
.
get
(),
xDest
.
get
());
return
*
this
;
}
OUnoObject
*
OUnoObject
::
Clone
()
const
{
OUnoObject
*
pClone
=
CloneHelper
<
OUnoObject
>
();
if
(
pClone
)
{
Reference
<
XPropertySet
>
xSource
(
const_cast
<
OUnoObject
*>
(
this
)
->
getUnoShape
(),
uno
::
UNO_QUERY
);
Reference
<
XPropertySet
>
xDest
(
pClone
->
getUnoShape
(),
uno
::
UNO_QUERY
);
if
(
xSource
.
is
()
&&
xDest
.
is
()
)
comphelper
::
copyProperties
(
xSource
.
get
(),
xDest
.
get
());
}
return
pClone
;
return
CloneHelper
<
OUnoObject
>
();
}
//----------------------------------------------------------------------------
// OOle2Obj
...
...
@@ -1154,22 +1160,32 @@ uno::Reference< chart2::data::XDatabaseDataProvider > lcl_getDataProvider(const
}
return
xSource
;
}
// -----------------------------------------------------------------------------
// Clone() soll eine komplette Kopie des Objektes erzeugen.
OOle2Obj
*
OOle2Obj
::
Clone
()
const
OOle2Obj
&
OOle2Obj
::
operator
=
(
const
OOle2Obj
&
rObj
)
{
OOle2Obj
*
pObj
=
CloneHelper
<
OOle2Obj
>
();
OReportModel
*
pRptModel
=
static_cast
<
OReportModel
*>
(
GetModel
());
svt
::
EmbeddedObjectRef
::
TryRunningState
(
pObj
->
GetObjRef
()
);
pObj
->
impl_createDataProvider_nothrow
(
pRptModel
->
getReportDefinition
().
get
());
if
(
this
==
&
rObj
)
return
*
this
;
SdrOle2Obj
::
operator
=
(
rObj
);
uno
::
Reference
<
chart2
::
data
::
XDatabaseDataProvider
>
xSource
(
lcl_getDataProvider
(
GetObjRef
())
);
uno
::
Reference
<
chart2
::
data
::
XDatabaseDataProvider
>
xDest
(
lcl_getDataProvider
(
pObj
->
GetObjRef
())
);
OReportModel
*
pRptModel
=
static_cast
<
OReportModel
*>
(
rObj
.
GetModel
());
svt
::
EmbeddedObjectRef
::
TryRunningState
(
GetObjRef
()
);
impl_createDataProvider_nothrow
(
pRptModel
->
getReportDefinition
().
get
());
uno
::
Reference
<
chart2
::
data
::
XDatabaseDataProvider
>
xSource
(
lcl_getDataProvider
(
rObj
.
GetObjRef
())
);
uno
::
Reference
<
chart2
::
data
::
XDatabaseDataProvider
>
xDest
(
lcl_getDataProvider
(
GetObjRef
())
);
if
(
xSource
.
is
()
&&
xDest
.
is
()
)
comphelper
::
copyProperties
(
xSource
.
get
(),
xDest
.
get
());
pObj
->
initializeChart
(
pRptModel
->
getReportDefinition
().
get
());
return
pObj
;
initializeChart
(
pRptModel
->
getReportDefinition
().
get
());
return
*
this
;
}
// -----------------------------------------------------------------------------
// Clone() soll eine komplette Kopie des Objektes erzeugen.
OOle2Obj
*
OOle2Obj
::
Clone
()
const
{
return
CloneHelper
<
OOle2Obj
>
();
}
// -----------------------------------------------------------------------------
void
OOle2Obj
::
impl_createDataProvider_nothrow
(
const
uno
::
Reference
<
frame
::
XModel
>&
_xModel
)
...
...
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