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
991eeb32
Kaydet (Commit)
991eeb32
authored
Haz 23, 2014
tarafından
Matúš Kukan
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Remove unused mpOwner in SvxTextEditSource.
Change-Id: I824e8436945e056840386960308b8e63627a603f
üst
b8f7ea5d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
15 deletions
+11
-15
unoshtxt.hxx
include/svx/unoshtxt.hxx
+1
-1
cell.cxx
svx/source/table/cell.cxx
+1
-1
unoshape.cxx
svx/source/unodraw/unoshape.cxx
+3
-3
unoshtxt.cxx
svx/source/unodraw/unoshtxt.cxx
+6
-10
No files found.
include/svx/unoshtxt.hxx
Dosyayı görüntüle @
991eeb32
...
...
@@ -44,7 +44,7 @@ class SdrText;
class
SVX_DLLPUBLIC
SvxTextEditSource
:
public
SvxEditSource
,
public
SvxViewForwarder
{
public
:
SvxTextEditSource
(
SdrObject
*
pObj
,
SdrText
*
pText
,
::
com
::
sun
::
star
::
uno
::
XInterface
*
pOwner
);
SvxTextEditSource
(
SdrObject
*
pObj
,
SdrText
*
pText
);
/** Since the views don't broadcast their dying, make sure that
this object gets destroyed if the view becomes invalid
...
...
svx/source/table/cell.cxx
Dosyayı görüntüle @
991eeb32
...
...
@@ -420,7 +420,7 @@ void Cell::SetModel(SdrModel* pNewModel)
}
else
{
SetEditSource
(
new
SvxTextEditSource
(
&
GetObject
(),
this
,
static_cast
<
XWeak
*
>
(
this
)
)
);
SetEditSource
(
new
SvxTextEditSource
(
&
GetObject
(),
this
)
);
}
SetStyleSheet
(
0
,
true
);
...
...
svx/source/unodraw/unoshape.cxx
Dosyayı görüntüle @
991eeb32
...
...
@@ -3962,7 +3962,7 @@ SvxShapeText::SvxShapeText( SdrObject* pObject ) throw ()
:
SvxShape
(
pObject
,
getSvxMapProvider
().
GetMap
(
SVXMAP_TEXT
),
getSvxMapProvider
().
GetPropertySet
(
SVXMAP_TEXT
,
SdrObject
::
GetGlobalDrawObjectItemPool
())
),
SvxUnoTextBase
(
ImplGetSvxUnoOutlinerTextCursorSvxPropertySet
()
)
{
if
(
pObject
&&
pObject
->
GetModel
()
)
SetEditSource
(
new
SvxTextEditSource
(
pObject
,
0
,
static_cast
<
uno
::
XWeak
*
>
(
this
)
)
);
SetEditSource
(
new
SvxTextEditSource
(
pObject
,
0
)
);
}
...
...
@@ -3970,7 +3970,7 @@ SvxShapeText::SvxShapeText( SdrObject* pObject, const SfxItemPropertyMapEntry* p
:
SvxShape
(
pObject
,
pPropertyMap
,
pPropertySet
),
SvxUnoTextBase
(
ImplGetSvxUnoOutlinerTextCursorSvxPropertySet
()
)
{
if
(
pObject
&&
pObject
->
GetModel
()
)
SetEditSource
(
new
SvxTextEditSource
(
pObject
,
0
,
static_cast
<
uno
::
XWeak
*
>
(
this
)
)
);
SetEditSource
(
new
SvxTextEditSource
(
pObject
,
0
)
);
}
...
...
@@ -3984,7 +3984,7 @@ SvxShapeText::~SvxShapeText() throw ()
void
SvxShapeText
::
Create
(
SdrObject
*
pNewObj
,
SvxDrawPage
*
pNewPage
)
{
if
(
pNewObj
&&
(
NULL
==
GetEditSource
()))
SetEditSource
(
new
SvxTextEditSource
(
pNewObj
,
0
,
static_cast
<
uno
::
XWeak
*
>
(
this
)
)
);
SetEditSource
(
new
SvxTextEditSource
(
pNewObj
,
0
)
);
SvxShape
::
Create
(
pNewObj
,
pNewPage
);
}
...
...
svx/source/unodraw/unoshtxt.cxx
Dosyayı görüntüle @
991eeb32
...
...
@@ -102,7 +102,6 @@ private:
bool
mbShapeIsEditMode
;
// #104157# only true, if HINT_BEGEDIT was received
bool
mbNotificationsDisabled
;
// prevent EditEngine/Outliner notifications (e.g. when setting up forwarder)
XInterface
*
mpOwner
;
SvxUnoTextRangeBaseList
maTextRanges
;
SvxTextForwarder
*
GetBackgroundTextForwarder
();
...
...
@@ -121,7 +120,7 @@ private:
void
dispose
();
public
:
SvxTextEditSourceImpl
(
SdrObject
*
pObject
,
SdrText
*
pText
,
XInterface
*
pOwner
);
SvxTextEditSourceImpl
(
SdrObject
*
pObject
,
SdrText
*
pText
);
SvxTextEditSourceImpl
(
SdrObject
&
rObject
,
SdrText
*
pText
,
SdrView
&
rView
,
const
Window
&
rWindow
);
virtual
~
SvxTextEditSourceImpl
();
...
...
@@ -158,7 +157,7 @@ public:
SvxTextEditSourceImpl
::
SvxTextEditSourceImpl
(
SdrObject
*
pObject
,
SdrText
*
pText
,
XInterface
*
pOwner
)
SvxTextEditSourceImpl
::
SvxTextEditSourceImpl
(
SdrObject
*
pObject
,
SdrText
*
pText
)
:
maRefCount
(
0
),
mpObject
(
pObject
),
mpText
(
pText
),
...
...
@@ -175,8 +174,7 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject* pObject, SdrText* pText
mbOldUndoMode
(
false
),
mbForwarderIsEditMode
(
false
),
mbShapeIsEditMode
(
false
),
mbNotificationsDisabled
(
false
),
mpOwner
(
pOwner
)
mbNotificationsDisabled
(
false
)
{
DBG_ASSERT
(
mpObject
,
"invalid pObject!"
);
...
...
@@ -213,8 +211,7 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText
mbOldUndoMode
(
false
),
mbForwarderIsEditMode
(
false
),
mbShapeIsEditMode
(
true
),
mbNotificationsDisabled
(
false
),
mpOwner
(
0
)
mbNotificationsDisabled
(
false
)
{
if
(
!
mpText
)
{
...
...
@@ -304,7 +301,6 @@ void SvxTextEditSourceImpl::ChangeModel( SdrModel* pNewModel )
mpWindow
=
0
;
m_xLinguServiceManager
.
clear
();
mpOwner
=
0
;
mpModel
=
pNewModel
;
...
...
@@ -1039,9 +1035,9 @@ IMPL_LINK(SvxTextEditSourceImpl, NotifyHdl, EENotify*, aNotify)
// SvxTextEditSource
SvxTextEditSource
::
SvxTextEditSource
(
SdrObject
*
pObject
,
SdrText
*
pText
,
XInterface
*
pOwner
)
SvxTextEditSource
::
SvxTextEditSource
(
SdrObject
*
pObject
,
SdrText
*
pText
)
{
mpImpl
=
new
SvxTextEditSourceImpl
(
pObject
,
pText
,
pOwner
);
mpImpl
=
new
SvxTextEditSourceImpl
(
pObject
,
pText
);
mpImpl
->
acquire
();
}
...
...
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