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
c64945bc
Kaydet (Commit)
c64945bc
authored
Agu 25, 2014
tarafından
Miklos Vajna
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sc HTML export: indent conditional block
Change-Id: Ia96d201ce10fcb58b213b709506a54760c053643
üst
1ee98159
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
55 additions
and
55 deletions
+55
-55
htmlexp.cxx
sc/source/filter/html/htmlexp.cxx
+55
-55
No files found.
sc/source/filter/html/htmlexp.cxx
Dosyayı görüntüle @
c64945bc
...
...
@@ -313,11 +313,11 @@ sal_uLong ScHTMLExport::Write()
{
if
(
!
mbSkipHeaderFooter
)
{
rStrm
.
WriteChar
(
'<'
).
WriteCharPtr
(
OOO_STRING_SVTOOLS_HTML_doctype
).
WriteChar
(
' '
).
WriteCharPtr
(
OOO_STRING_SVTOOLS_HTML_doctype40
).
WriteChar
(
'>'
)
.
WriteCharPtr
(
SAL_NEWLINE_STRING
).
WriteCharPtr
(
SAL_NEWLINE_STRING
);
TAG_ON_LF
(
OOO_STRING_SVTOOLS_HTML_html
);
WriteHeader
();
OUT_LF
();
rStrm
.
WriteChar
(
'<'
).
WriteCharPtr
(
OOO_STRING_SVTOOLS_HTML_doctype
).
WriteChar
(
' '
).
WriteCharPtr
(
OOO_STRING_SVTOOLS_HTML_doctype40
).
WriteChar
(
'>'
)
.
WriteCharPtr
(
SAL_NEWLINE_STRING
).
WriteCharPtr
(
SAL_NEWLINE_STRING
);
TAG_ON_LF
(
OOO_STRING_SVTOOLS_HTML_html
);
WriteHeader
();
OUT_LF
();
}
WriteBody
();
OUT_LF
();
...
...
@@ -555,70 +555,70 @@ void ScHTMLExport::WriteBody()
// default text color black
if
(
!
mbSkipHeaderFooter
)
{
rStrm
.
WriteChar
(
'<'
).
WriteCharPtr
(
OOO_STRING_SVTOOLS_HTML_body
);
rStrm
.
WriteChar
(
'<'
).
WriteCharPtr
(
OOO_STRING_SVTOOLS_HTML_body
);
if
(
!
mbSkipImages
)
{
if
(
bAll
&&
GPOS_NONE
!=
pBrushItem
->
GetGraphicPos
()
)
if
(
!
mbSkipImages
)
{
OUString
aLink
=
pBrushItem
->
GetGraphicLink
();
OUString
aGrfNm
;
// Embedded graphic -> write using WriteGraphic
if
(
aLink
.
isEmpty
()
)
if
(
bAll
&&
GPOS_NONE
!=
pBrushItem
->
GetGraphicPos
()
)
{
const
Graphic
*
pGrf
=
pBrushItem
->
GetGraphic
();
if
(
pGrf
)
OUString
aLink
=
pBrushItem
->
GetGraphicLink
();
OUString
aGrfNm
;
// Embedded graphic -> write using WriteGraphic
if
(
aLink
.
isEmpty
()
)
{
// Save graphic as (JPG) file
aGrfNm
=
aStreamPath
;
sal_uInt16
nErr
=
XOutBitmap
::
WriteGraphic
(
*
pGrf
,
aGrfNm
,
"JPG"
,
XOUTBMP_USE_NATIVE_IF_POSSIBLE
);
if
(
!
nErr
)
// Contains errors, as we have nothing to output
const
Graphic
*
pGrf
=
pBrushItem
->
GetGraphic
();
if
(
pGrf
)
{
aGrfNm
=
URIHelper
::
SmartRel2Abs
(
INetURLObject
(
aBaseURL
),
aGrfNm
,
URIHelper
::
GetMaybeFileHdl
(),
true
,
false
);
// Save graphic as (JPG) file
aGrfNm
=
aStreamPath
;
sal_uInt16
nErr
=
XOutBitmap
::
WriteGraphic
(
*
pGrf
,
aGrfNm
,
"JPG"
,
XOUTBMP_USE_NATIVE_IF_POSSIBLE
);
if
(
!
nErr
)
// Contains errors, as we have nothing to output
{
aGrfNm
=
URIHelper
::
SmartRel2Abs
(
INetURLObject
(
aBaseURL
),
aGrfNm
,
URIHelper
::
GetMaybeFileHdl
(),
true
,
false
);
if
(
HasCId
()
)
MakeCIdURL
(
aGrfNm
);
aLink
=
aGrfNm
;
}
}
}
else
{
aGrfNm
=
aLink
;
if
(
bCopyLocalFileToINet
||
HasCId
()
)
{
CopyLocalFileToINet
(
aGrfNm
,
aStreamPath
);
if
(
HasCId
()
)
MakeCIdURL
(
aGrfNm
);
aLink
=
aGrfNm
;
}
else
aGrfNm
=
URIHelper
::
SmartRel2Abs
(
INetURLObject
(
aBaseURL
),
aGrfNm
,
URIHelper
::
GetMaybeFileHdl
(),
true
,
false
);
aLink
=
aGrfNm
;
}
}
else
{
aGrfNm
=
aLink
;
if
(
bCopyLocalFileToINet
||
HasCId
()
)
if
(
!
aLink
.
isEmpty
()
)
{
CopyLocalFileToINet
(
aGrfNm
,
aStreamPath
);
if
(
HasCId
()
)
MakeCIdURL
(
aGrfNm
);
rStrm
.
WriteChar
(
' '
).
WriteCharPtr
(
OOO_STRING_SVTOOLS_HTML_O_background
).
WriteCharPtr
(
"=
\"
"
);
OUT_STR
(
URIHelper
::
simpleNormalizedMakeRelative
(
aBaseURL
,
aLink
)
).
WriteChar
(
'\"'
);
}
else
aGrfNm
=
URIHelper
::
SmartRel2Abs
(
INetURLObject
(
aBaseURL
),
aGrfNm
,
URIHelper
::
GetMaybeFileHdl
(),
true
,
false
);
aLink
=
aGrfNm
;
}
if
(
!
aLink
.
isEmpty
()
)
{
rStrm
.
WriteChar
(
' '
).
WriteCharPtr
(
OOO_STRING_SVTOOLS_HTML_O_background
).
WriteCharPtr
(
"=
\"
"
);
OUT_STR
(
URIHelper
::
simpleNormalizedMakeRelative
(
aBaseURL
,
aLink
)
).
WriteChar
(
'\"'
);
}
}
}
if
(
!
aHTMLStyle
.
aBackgroundColor
.
GetTransparency
()
)
{
// A transparent background color should always result in default
// background of the browser. Also, HTMLOutFuncs::Out_Color() writes
// black #000000 for COL_AUTO which is the same as white #ffffff with
// transparency set to 0xff, our default background.
OUT_SP_CSTR_ASS
(
OOO_STRING_SVTOOLS_HTML_O_bgcolor
);
HTMLOutFuncs
::
Out_Color
(
rStrm
,
aHTMLStyle
.
aBackgroundColor
);
}
if
(
!
aHTMLStyle
.
aBackgroundColor
.
GetTransparency
()
)
{
// A transparent background color should always result in default
// background of the browser. Also, HTMLOutFuncs::Out_Color() writes
// black #000000 for COL_AUTO which is the same as white #ffffff with
// transparency set to 0xff, our default background.
OUT_SP_CSTR_ASS
(
OOO_STRING_SVTOOLS_HTML_O_bgcolor
);
HTMLOutFuncs
::
Out_Color
(
rStrm
,
aHTMLStyle
.
aBackgroundColor
);
}
rStrm
.
WriteChar
(
'>'
);
OUT_LF
();
rStrm
.
WriteChar
(
'>'
);
OUT_LF
();
}
if
(
bAll
)
...
...
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