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
311325ee
Kaydet (Commit)
311325ee
authored
Eki 07, 2010
tarafından
Cédric Bosdonnat
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Dotted - dashed borders: Fix build breakage in svx
üst
36c8126b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
13 deletions
+19
-13
boxitem.hxx
editeng/inc/editeng/boxitem.hxx
+1
-1
frmitems.cxx
editeng/source/items/frmitems.cxx
+18
-12
No files found.
editeng/inc/editeng/boxitem.hxx
Dosyayı görüntüle @
311325ee
...
@@ -107,7 +107,7 @@ public:
...
@@ -107,7 +107,7 @@ public:
// keine Line gesetzt ist
// keine Line gesetzt ist
USHORT
CalcLineSpace
(
USHORT
nLine
,
BOOL
bIgnoreLine
=
FALSE
)
const
;
USHORT
CalcLineSpace
(
USHORT
nLine
,
BOOL
bIgnoreLine
=
FALSE
)
const
;
static
com
::
sun
::
star
::
table
::
BorderLine2
SvxLineToLine
(
const
SvxBorderLine
*
pLine
,
sal_Bool
bConvert
);
static
com
::
sun
::
star
::
table
::
BorderLine2
SvxLineToLine
(
const
SvxBorderLine
*
pLine
,
sal_Bool
bConvert
);
static
sal_Bool
LineToSvxLine
(
const
::
com
::
sun
::
star
::
table
::
BorderLine
2
&
rLine
,
SvxBorderLine
&
rSvxLine
,
sal_Bool
bConvert
);
static
sal_Bool
LineToSvxLine
(
const
::
com
::
sun
::
star
::
table
::
BorderLine
&
rLine
,
SvxBorderLine
&
rSvxLine
,
sal_Bool
bConvert
);
};
};
inline
void
SvxBoxItem
::
SetDistance
(
USHORT
nNew
)
inline
void
SvxBoxItem
::
SetDistance
(
USHORT
nNew
)
...
...
editeng/source/items/frmitems.cxx
Dosyayı görüntüle @
311325ee
...
@@ -1938,24 +1938,30 @@ bool SvxBoxItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
...
@@ -1938,24 +1938,30 @@ bool SvxBoxItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
}
}
// -----------------------------------------------------------------------
// -----------------------------------------------------------------------
sal_Bool
SvxBoxItem
::
LineToSvxLine
(
const
::
com
::
sun
::
star
::
table
::
BorderLine
2
&
rLine
,
SvxBorderLine
&
rSvxLine
,
sal_Bool
bConvert
)
sal_Bool
SvxBoxItem
::
LineToSvxLine
(
const
::
com
::
sun
::
star
::
table
::
BorderLine
&
rLine
,
SvxBorderLine
&
rSvxLine
,
sal_Bool
bConvert
)
{
{
rSvxLine
.
SetColor
(
Color
(
rLine
.
Color
));
rSvxLine
.
SetColor
(
Color
(
rLine
.
Color
));
rSvxLine
.
SetInWidth
(
sal_uInt16
(
bConvert
?
MM100_TO_TWIP
(
rLine
.
InnerLineWidth
)
:
rLine
.
InnerLineWidth
));
rSvxLine
.
SetInWidth
(
sal_uInt16
(
bConvert
?
MM100_TO_TWIP
(
rLine
.
InnerLineWidth
)
:
rLine
.
InnerLineWidth
));
rSvxLine
.
SetOutWidth
(
sal_uInt16
(
bConvert
?
MM100_TO_TWIP
(
rLine
.
OuterLineWidth
)
:
rLine
.
OuterLineWidth
));
rSvxLine
.
SetOutWidth
(
sal_uInt16
(
bConvert
?
MM100_TO_TWIP
(
rLine
.
OuterLineWidth
)
:
rLine
.
OuterLineWidth
));
rSvxLine
.
SetDistance
(
sal_uInt16
(
bConvert
?
MM100_TO_TWIP
(
rLine
.
LineDistance
)
:
rLine
.
LineDistance
));
rSvxLine
.
SetDistance
(
sal_uInt16
(
bConvert
?
MM100_TO_TWIP
(
rLine
.
LineDistance
)
:
rLine
.
LineDistance
));
switch
(
rLine
.
LineStyle
)
const
table
::
BorderLine2
*
pLine2
=
static_cast
<
const
table
::
BorderLine2
*
>
(
&
rLine
);
if
(
pLine2
)
{
{
default
:
switch
(
pLine2
->
LineStyle
)
case
table
:
:
BorderLineStyle
::
SOLID
:
{
rSvxLine
.
SetStyle
(
SOLID
);
default
:
break
;
case
table
:
:
BorderLineStyle
::
SOLID
:
case
table
:
:
BorderLineStyle
::
DOTTED
:
rSvxLine
.
SetStyle
(
SOLID
);
rSvxLine
.
SetStyle
(
DOTTED
);
break
;
break
;
case
table
:
:
BorderLineStyle
::
DOTTED
:
case
table
:
:
BorderLineStyle
::
DASHED
:
rSvxLine
.
SetStyle
(
DOTTED
);
rSvxLine
.
SetStyle
(
DASHED
);
break
;
break
;
case
table
:
:
BorderLineStyle
::
DASHED
:
rSvxLine
.
SetStyle
(
DASHED
);
break
;
}
}
}
sal_Bool
bRet
=
rLine
.
InnerLineWidth
>
0
||
rLine
.
OuterLineWidth
>
0
;
sal_Bool
bRet
=
rLine
.
InnerLineWidth
>
0
||
rLine
.
OuterLineWidth
>
0
;
return
bRet
;
return
bRet
;
...
...
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