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
03fa6020
Kaydet (Commit)
03fa6020
authored
Eki 25, 2013
tarafından
Armin Le Grand
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
i123497 corrected modify implementations for bitmap, lineend and color
üst
3b16c984
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
14 deletions
+28
-14
tpbitmap.cxx
cui/source/tabpages/tpbitmap.cxx
+5
-2
tpcolor.cxx
cui/source/tabpages/tpcolor.cxx
+6
-4
tplneend.cxx
cui/source/tabpages/tplneend.cxx
+17
-8
No files found.
cui/source/tabpages/tpbitmap.cxx
Dosyayı görüntüle @
03fa6020
...
@@ -756,9 +756,12 @@ IMPL_LINK( SvxBitmapTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
...
@@ -756,9 +756,12 @@ IMPL_LINK( SvxBitmapTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
bLoop
=
sal_False
;
bLoop
=
sal_False
;
const
BitmapEx
aBitmapEx
(
aBitmapCtl
.
GetBitmapEx
());
const
BitmapEx
aBitmapEx
(
aBitmapCtl
.
GetBitmapEx
());
const
XBitmapEntry
aEntry
(
Graphic
(
aBitmapEx
),
aName
);
aLbBitmaps
.
Modify
(
rStyleSettings
.
GetListBoxPreviewDefaultPixelSize
(),
aEntry
,
nPos
);
// #123497# Need to replace the existing entry with a new one (old returned needs to be deleted)
XBitmapEntry
*
pEntry
=
new
XBitmapEntry
(
Graphic
(
aBitmapEx
),
aName
);
delete
maBitmapList
->
Replace
(
pEntry
,
nPos
);
aLbBitmaps
.
Modify
(
rStyleSettings
.
GetListBoxPreviewDefaultPixelSize
(),
*
pEntry
,
nPos
);
aLbBitmaps
.
SelectEntryPos
(
nPos
);
aLbBitmaps
.
SelectEntryPos
(
nPos
);
// Flag fuer modifiziert setzen
// Flag fuer modifiziert setzen
...
...
cui/source/tabpages/tpcolor.cxx
Dosyayı görüntüle @
03fa6020
...
@@ -631,13 +631,15 @@ IMPL_LINK( SvxColorTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
...
@@ -631,13 +631,15 @@ IMPL_LINK( SvxColorTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
if
(
eCM
!=
CM_RGB
)
if
(
eCM
!=
CM_RGB
)
ConvertColorValues
(
aTmpColor
,
CM_RGB
);
ConvertColorValues
(
aTmpColor
,
CM_RGB
);
const
XColorEntry
aEntry
(
aTmpColor
,
aName
);
// #123497# Need to replace the existing entry with a new one (old returned needs to be deleted)
XColorEntry
*
pEntry
=
new
XColorEntry
(
aTmpColor
,
aName
);
delete
maColorTab
->
Replace
(
pEntry
,
nPos
);
aLbColor
.
Modify
(
a
Entry
,
nPos
);
aLbColor
.
Modify
(
*
p
Entry
,
nPos
);
aLbColor
.
SelectEntryPos
(
nPos
);
aLbColor
.
SelectEntryPos
(
nPos
);
aValSetColorTable
.
SetItemColor
(
nPos
+
1
,
aEntry
.
GetColor
()
);
aValSetColorTable
.
SetItemColor
(
nPos
+
1
,
pEntry
->
GetColor
()
);
aValSetColorTable
.
SetItemText
(
nPos
+
1
,
aEntry
.
GetName
()
);
aValSetColorTable
.
SetItemText
(
nPos
+
1
,
pEntry
->
GetName
()
);
aEdtName
.
SetText
(
aName
);
aEdtName
.
SetText
(
aName
);
aCtlPreviewOld
.
Invalidate
();
aCtlPreviewOld
.
Invalidate
();
...
...
cui/source/tabpages/tplneend.cxx
Dosyayı görüntüle @
03fa6020
...
@@ -402,19 +402,28 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
...
@@ -402,19 +402,28 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
// Wenn nicht vorhanden, wird Eintrag aufgenommen
// Wenn nicht vorhanden, wird Eintrag aufgenommen
if
(
bDifferent
)
if
(
bDifferent
)
{
{
const
XLineEndEntry
*
pEntry
=
maLineEndList
->
GetLineEnd
(
nPos
);
const
XLineEndEntry
*
p
Old
Entry
=
maLineEndList
->
GetLineEnd
(
nPos
);
aEdtName
.
SetText
(
aName
);
if
(
pOldEntry
)
{
// #123497# Need to replace the existing entry with a new one (old returned needs to be deleted)
XLineEndEntry
*
pEntry
=
new
XLineEndEntry
(
pOldEntry
->
GetLineEnd
(),
aName
);
delete
maLineEndList
->
Replace
(
pEntry
,
nPos
);
const
XLineEndEntry
aEntry
(
pEntry
->
GetLineEnd
(),
aName
);
aEdtName
.
SetText
(
aName
);
aLbLineEnds
.
Modify
(
a
Entry
,
nPos
,
maLineEndList
->
GetUiBitmap
(
nPos
)
);
aLbLineEnds
.
Modify
(
*
p
Entry
,
nPos
,
maLineEndList
->
GetUiBitmap
(
nPos
)
);
aLbLineEnds
.
SelectEntryPos
(
nPos
);
aLbLineEnds
.
SelectEntryPos
(
nPos
);
// Flag fuer modifiziert setzen
// Flag fuer modifiziert setzen
*
pnLineEndListState
|=
CT_MODIFIED
;
*
pnLineEndListState
|=
CT_MODIFIED
;
*
pPageType
=
3
;
*
pPageType
=
3
;
}
else
{
OSL_ENSURE
(
false
,
"LineEnd to be modified not existing (!)"
);
}
}
}
}
}
return
(
0L
);
return
(
0L
);
...
...
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