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
c04fa61c
Kaydet (Commit)
c04fa61c
authored
Şub 11, 2014
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sal_Bool->bool
Change-Id: I9d2b6313b8ae2b02286ed42254a292a853904b81
üst
49b78a5d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
16 deletions
+16
-16
editutil.hxx
sc/inc/editutil.hxx
+7
-7
editutil.cxx
sc/source/core/tool/editutil.cxx
+7
-7
editsrc.cxx
sc/source/ui/unoobj/editsrc.cxx
+1
-1
gridwin4.cxx
sc/source/ui/view/gridwin4.cxx
+1
-1
No files found.
sc/inc/editutil.hxx
Dosyayı görüntüle @
c04fa61c
...
@@ -135,17 +135,17 @@ public:
...
@@ -135,17 +135,17 @@ public:
/// bDeleteEnginePool: Engine becomes the owner of the pool
/// bDeleteEnginePool: Engine becomes the owner of the pool
/// and deletes it on destruction
/// and deletes it on destruction
ScEditEngineDefaulter
(
SfxItemPool
*
pEnginePool
,
ScEditEngineDefaulter
(
SfxItemPool
*
pEnginePool
,
sal_B
ool
bDeleteEnginePool
=
false
);
b
ool
bDeleteEnginePool
=
false
);
/// If rOrg.bDeleteEnginePool: pool gets cloned and will be
/// If rOrg.bDeleteEnginePool: pool gets cloned and will be
/// deleted on destruction. Defaults are not set.
/// deleted on destruction. Defaults are not set.
ScEditEngineDefaulter
(
const
ScEditEngineDefaulter
&
rOrg
);
ScEditEngineDefaulter
(
const
ScEditEngineDefaulter
&
rOrg
);
virtual
~
ScEditEngineDefaulter
();
virtual
~
ScEditEngineDefaulter
();
/// Creates a copy of SfxItemSet if bRememberCopy set
/// Creates a copy of SfxItemSet if bRememberCopy set
void
SetDefaults
(
const
SfxItemSet
&
rDefaults
,
sal_Bool
bRememberCopy
=
sal_T
rue
);
void
SetDefaults
(
const
SfxItemSet
&
rDefaults
,
bool
bRememberCopy
=
t
rue
);
/// Becomes the owner of the SfxItemSet if bTakeOwnership set
/// Becomes the owner of the SfxItemSet if bTakeOwnership set
void
SetDefaults
(
SfxItemSet
*
pDefaults
,
sal_Bool
bTakeOwnership
=
sal_T
rue
);
void
SetDefaults
(
SfxItemSet
*
pDefaults
,
bool
bTakeOwnership
=
t
rue
);
/// Set the item in the default ItemSet which is created
/// Set the item in the default ItemSet which is created
/// if it doesn't exist yet.
/// if it doesn't exist yet.
...
@@ -159,19 +159,19 @@ public:
...
@@ -159,19 +159,19 @@ public:
void
SetText
(
const
EditTextObject
&
rTextObject
);
void
SetText
(
const
EditTextObject
&
rTextObject
);
/// Current defaults are not applied, new defaults are applied
/// Current defaults are not applied, new defaults are applied
void
SetTextNewDefaults
(
const
EditTextObject
&
rTextObject
,
void
SetTextNewDefaults
(
const
EditTextObject
&
rTextObject
,
const
SfxItemSet
&
rDefaults
,
sal_Bool
bRememberCopy
=
sal_T
rue
);
const
SfxItemSet
&
rDefaults
,
bool
bRememberCopy
=
t
rue
);
/// Current defaults are not applied, new defaults are applied
/// Current defaults are not applied, new defaults are applied
void
SetTextNewDefaults
(
const
EditTextObject
&
rTextObject
,
void
SetTextNewDefaults
(
const
EditTextObject
&
rTextObject
,
SfxItemSet
*
pDefaults
,
sal_Bool
bTakeOwnership
=
sal_T
rue
);
SfxItemSet
*
pDefaults
,
bool
bTakeOwnership
=
t
rue
);
/// Overwritten method to be able to apply defaults already set
/// Overwritten method to be able to apply defaults already set
void
SetText
(
const
OUString
&
rText
);
void
SetText
(
const
OUString
&
rText
);
/// Current defaults are not applied, new defaults are applied
/// Current defaults are not applied, new defaults are applied
void
SetTextNewDefaults
(
const
OUString
&
rText
,
void
SetTextNewDefaults
(
const
OUString
&
rText
,
const
SfxItemSet
&
rDefaults
,
sal_Bool
bRememberCopy
=
sal_T
rue
);
const
SfxItemSet
&
rDefaults
,
bool
bRememberCopy
=
t
rue
);
/// Current defaults are not applied, new defaults are applied
/// Current defaults are not applied, new defaults are applied
void
SetTextNewDefaults
(
const
OUString
&
rText
,
void
SetTextNewDefaults
(
const
OUString
&
rText
,
SfxItemSet
*
pDefaults
,
sal_Bool
bTakeOwnership
=
sal_T
rue
);
SfxItemSet
*
pDefaults
,
bool
bTakeOwnership
=
t
rue
);
/// Paragraph attributes that are not defaults are copied to
/// Paragraph attributes that are not defaults are copied to
/// character attributes and all paragraph attributes reset
/// character attributes and all paragraph attributes reset
...
...
sc/source/core/tool/editutil.cxx
Dosyayı görüntüle @
c04fa61c
...
@@ -459,7 +459,7 @@ ScEnginePoolHelper::~ScEnginePoolHelper()
...
@@ -459,7 +459,7 @@ ScEnginePoolHelper::~ScEnginePoolHelper()
}
}
ScEditEngineDefaulter
::
ScEditEngineDefaulter
(
SfxItemPool
*
pEnginePoolP
,
ScEditEngineDefaulter
::
ScEditEngineDefaulter
(
SfxItemPool
*
pEnginePoolP
,
sal_B
ool
bDeleteEnginePoolP
)
b
ool
bDeleteEnginePoolP
)
:
:
ScEnginePoolHelper
(
pEnginePoolP
,
bDeleteEnginePoolP
),
ScEnginePoolHelper
(
pEnginePoolP
,
bDeleteEnginePoolP
),
EditEngine
(
pEnginePoolP
)
EditEngine
(
pEnginePoolP
)
...
@@ -482,7 +482,7 @@ ScEditEngineDefaulter::~ScEditEngineDefaulter()
...
@@ -482,7 +482,7 @@ ScEditEngineDefaulter::~ScEditEngineDefaulter()
{
{
}
}
void
ScEditEngineDefaulter
::
SetDefaults
(
const
SfxItemSet
&
rSet
,
sal_B
ool
bRememberCopy
)
void
ScEditEngineDefaulter
::
SetDefaults
(
const
SfxItemSet
&
rSet
,
b
ool
bRememberCopy
)
{
{
if
(
bRememberCopy
)
if
(
bRememberCopy
)
{
{
...
@@ -508,7 +508,7 @@ void ScEditEngineDefaulter::SetDefaults( const SfxItemSet& rSet, sal_Bool bRemem
...
@@ -508,7 +508,7 @@ void ScEditEngineDefaulter::SetDefaults( const SfxItemSet& rSet, sal_Bool bRemem
EnableUndo
(
sal_True
);
EnableUndo
(
sal_True
);
}
}
void
ScEditEngineDefaulter
::
SetDefaults
(
SfxItemSet
*
pSet
,
sal_B
ool
bTakeOwnership
)
void
ScEditEngineDefaulter
::
SetDefaults
(
SfxItemSet
*
pSet
,
b
ool
bTakeOwnership
)
{
{
if
(
bDeleteDefaults
)
if
(
bDeleteDefaults
)
delete
pDefaults
;
delete
pDefaults
;
...
@@ -552,7 +552,7 @@ void ScEditEngineDefaulter::SetText( const EditTextObject& rTextObject )
...
@@ -552,7 +552,7 @@ void ScEditEngineDefaulter::SetText( const EditTextObject& rTextObject )
}
}
void
ScEditEngineDefaulter
::
SetTextNewDefaults
(
const
EditTextObject
&
rTextObject
,
void
ScEditEngineDefaulter
::
SetTextNewDefaults
(
const
EditTextObject
&
rTextObject
,
const
SfxItemSet
&
rSet
,
sal_B
ool
bRememberCopy
)
const
SfxItemSet
&
rSet
,
b
ool
bRememberCopy
)
{
{
sal_Bool
bUpdateMode
=
GetUpdateMode
();
sal_Bool
bUpdateMode
=
GetUpdateMode
();
if
(
bUpdateMode
)
if
(
bUpdateMode
)
...
@@ -564,7 +564,7 @@ void ScEditEngineDefaulter::SetTextNewDefaults( const EditTextObject& rTextObjec
...
@@ -564,7 +564,7 @@ void ScEditEngineDefaulter::SetTextNewDefaults( const EditTextObject& rTextObjec
}
}
void
ScEditEngineDefaulter
::
SetTextNewDefaults
(
const
EditTextObject
&
rTextObject
,
void
ScEditEngineDefaulter
::
SetTextNewDefaults
(
const
EditTextObject
&
rTextObject
,
SfxItemSet
*
pSet
,
sal_B
ool
bTakeOwnership
)
SfxItemSet
*
pSet
,
b
ool
bTakeOwnership
)
{
{
sal_Bool
bUpdateMode
=
GetUpdateMode
();
sal_Bool
bUpdateMode
=
GetUpdateMode
();
if
(
bUpdateMode
)
if
(
bUpdateMode
)
...
@@ -588,7 +588,7 @@ void ScEditEngineDefaulter::SetText( const OUString& rText )
...
@@ -588,7 +588,7 @@ void ScEditEngineDefaulter::SetText( const OUString& rText )
}
}
void
ScEditEngineDefaulter
::
SetTextNewDefaults
(
const
OUString
&
rText
,
void
ScEditEngineDefaulter
::
SetTextNewDefaults
(
const
OUString
&
rText
,
const
SfxItemSet
&
rSet
,
sal_B
ool
bRememberCopy
)
const
SfxItemSet
&
rSet
,
b
ool
bRememberCopy
)
{
{
sal_Bool
bUpdateMode
=
GetUpdateMode
();
sal_Bool
bUpdateMode
=
GetUpdateMode
();
if
(
bUpdateMode
)
if
(
bUpdateMode
)
...
@@ -600,7 +600,7 @@ void ScEditEngineDefaulter::SetTextNewDefaults( const OUString& rText,
...
@@ -600,7 +600,7 @@ void ScEditEngineDefaulter::SetTextNewDefaults( const OUString& rText,
}
}
void
ScEditEngineDefaulter
::
SetTextNewDefaults
(
const
OUString
&
rText
,
void
ScEditEngineDefaulter
::
SetTextNewDefaults
(
const
OUString
&
rText
,
SfxItemSet
*
pSet
,
sal_B
ool
bTakeOwnership
)
SfxItemSet
*
pSet
,
b
ool
bTakeOwnership
)
{
{
sal_Bool
bUpdateMode
=
GetUpdateMode
();
sal_Bool
bUpdateMode
=
GetUpdateMode
();
if
(
bUpdateMode
)
if
(
bUpdateMode
)
...
...
sc/source/ui/unoobj/editsrc.cxx
Dosyayı görüntüle @
c04fa61c
...
@@ -154,7 +154,7 @@ SvxTextForwarder* ScAnnotationEditSource::GetTextForwarder()
...
@@ -154,7 +154,7 @@ SvxTextForwarder* ScAnnotationEditSource::GetTextForwarder()
{
{
SfxItemPool
*
pEnginePool
=
EditEngine
::
CreatePool
();
SfxItemPool
*
pEnginePool
=
EditEngine
::
CreatePool
();
pEnginePool
->
FreezeIdRanges
();
pEnginePool
->
FreezeIdRanges
();
pEditEngine
=
new
ScEditEngineDefaulter
(
pEnginePool
,
sal_T
rue
);
pEditEngine
=
new
ScEditEngineDefaulter
(
pEnginePool
,
t
rue
);
}
}
pForwarder
=
new
SvxEditEngineForwarder
(
*
pEditEngine
);
pForwarder
=
new
SvxEditEngineForwarder
(
*
pEditEngine
);
}
}
...
...
sc/source/ui/view/gridwin4.cxx
Dosyayı görüntüle @
c04fa61c
...
@@ -940,7 +940,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
...
@@ -940,7 +940,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
else
else
{
{
// use EditEngine to draw mixed-script string
// use EditEngine to draw mixed-script string
pEditEng
=
new
ScEditEngineDefaulter
(
EditEngine
::
CreatePool
(),
sal_T
rue
);
pEditEng
=
new
ScEditEngineDefaulter
(
EditEngine
::
CreatePool
(),
t
rue
);
pEditEng
->
SetRefMapMode
(
pContentDev
->
GetMapMode
()
);
pEditEng
->
SetRefMapMode
(
pContentDev
->
GetMapMode
()
);
SfxItemSet
*
pEditDefaults
=
new
SfxItemSet
(
pEditEng
->
GetEmptyItemSet
()
);
SfxItemSet
*
pEditDefaults
=
new
SfxItemSet
(
pEditEng
->
GetEmptyItemSet
()
);
rDefPattern
.
FillEditItemSet
(
pEditDefaults
);
rDefPattern
.
FillEditItemSet
(
pEditDefaults
);
...
...
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