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
9c9ef9f2
Kaydet (Commit)
9c9ef9f2
authored
Mar 31, 2015
tarafından
Miklos Vajna
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
RTF export: indentation fixes
Change-Id: I86ee19578546b55d4f1e3e6e9cecad2021ac49b2
üst
77315c18
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
rtfattributeoutput.cxx
sw/source/filter/ww8/rtfattributeoutput.cxx
+6
-6
rtfsdrexport.cxx
sw/source/filter/ww8/rtfsdrexport.cxx
+1
-1
No files found.
sw/source/filter/ww8/rtfattributeoutput.cxx
Dosyayı görüntüle @
9c9ef9f2
...
...
@@ -3639,7 +3639,7 @@ void RtfAttributeOutput::FlyFrameOLEReplacement(const SwFlyFrmFmt* pFlyFrmFmt, S
SAL_WARN
(
"sw.rtf"
,
"failed to export the graphic"
);
aStream
.
Seek
(
STREAM_SEEK_TO_END
);
sal_uInt32
nSize
=
aStream
.
Tell
();
pGraphicAry
=
static_cast
<
sal_uInt8
const
*>
(
aStream
.
GetData
());
pGraphicAry
=
static_cast
<
sal_uInt8
const
*>
(
aStream
.
GetData
());
m_aRunText
->
append
(
ExportPICT
(
pFlyFrmFmt
,
aSize
,
aRendered
,
aMapped
,
rCr
,
pBLIPType
,
pGraphicAry
,
nSize
,
m_rExport
));
m_aRunText
->
append
(
"}"
);
// shppict
m_aRunText
->
append
(
"{"
OOO_STRING_SVTOOLS_RTF_NONSHPPICT
);
...
...
@@ -3649,7 +3649,7 @@ void RtfAttributeOutput::FlyFrameOLEReplacement(const SwFlyFrmFmt* pFlyFrmFmt, S
SAL_WARN
(
"sw.rtf"
,
"failed to export the graphic"
);
aWmfStream
.
Seek
(
STREAM_SEEK_TO_END
);
nSize
=
aWmfStream
.
Tell
();
pGraphicAry
=
static_cast
<
sal_uInt8
const
*>
(
aWmfStream
.
GetData
());
pGraphicAry
=
static_cast
<
sal_uInt8
const
*>
(
aWmfStream
.
GetData
());
m_aRunText
->
append
(
ExportPICT
(
pFlyFrmFmt
,
aSize
,
aRendered
,
aMapped
,
rCr
,
pBLIPType
,
pGraphicAry
,
nSize
,
m_rExport
));
m_aRunText
->
append
(
"}"
);
// nonshppict
}
...
...
@@ -3753,7 +3753,7 @@ void RtfAttributeOutput::FlyFrameGraphic(const SwFlyFrmFmt* pFlyFrmFmt, const Sw
OOO_STRING_SVTOOLS_RTF_PNGBLIP
:
OOO_STRING_SVTOOLS_RTF_WMETAFILE
;
aStream
.
Seek
(
STREAM_SEEK_TO_END
);
nSize
=
aStream
.
Tell
();
pGraphicAry
=
static_cast
<
sal_uInt8
const
*>
(
aStream
.
GetData
());
pGraphicAry
=
static_cast
<
sal_uInt8
const
*>
(
aStream
.
GetData
());
}
}
...
...
@@ -3851,7 +3851,7 @@ void RtfAttributeOutput::FlyFrameGraphic(const SwFlyFrmFmt* pFlyFrmFmt, const Sw
pBLIPType
=
OOO_STRING_SVTOOLS_RTF_WMETAFILE
;
aStream
.
Seek
(
STREAM_SEEK_TO_END
);
nSize
=
aStream
.
Tell
();
pGraphicAry
=
static_cast
<
sal_uInt8
const
*>
(
aStream
.
GetData
());
pGraphicAry
=
static_cast
<
sal_uInt8
const
*>
(
aStream
.
GetData
());
ExportPICT
(
pFlyFrmFmt
,
aSize
,
aRendered
,
aMapped
,
rCr
,
pBLIPType
,
pGraphicAry
,
nSize
,
m_rExport
,
&
m_rExport
.
Strm
(),
bWritePicProp
);
}
...
...
@@ -3868,7 +3868,7 @@ void RtfAttributeOutput::FlyFrameGraphic(const SwFlyFrmFmt* pFlyFrmFmt, const Sw
pBLIPType
=
OOO_STRING_SVTOOLS_RTF_WMETAFILE
;
aStream
.
Seek
(
STREAM_SEEK_TO_END
);
nSize
=
aStream
.
Tell
();
pGraphicAry
=
static_cast
<
sal_uInt8
const
*>
(
aStream
.
GetData
());
pGraphicAry
=
static_cast
<
sal_uInt8
const
*>
(
aStream
.
GetData
());
ExportPICT
(
pFlyFrmFmt
,
aSize
,
aRendered
,
aMapped
,
rCr
,
pBLIPType
,
pGraphicAry
,
nSize
,
m_rExport
,
&
m_rExport
.
Strm
());
...
...
@@ -3898,7 +3898,7 @@ void RtfAttributeOutput::BulletDefinition(int /*nId*/, const Graphic& rGraphic,
SAL_WARN
(
"sw.rtf"
,
"failed to export the numbering picture bullet"
);
aStream
.
Seek
(
STREAM_SEEK_TO_END
);
sal_uInt32
nSize
=
aStream
.
Tell
();
pGraphicAry
=
static_cast
<
sal_uInt8
const
*>
(
aStream
.
GetData
());
pGraphicAry
=
static_cast
<
sal_uInt8
const
*>
(
aStream
.
GetData
());
RtfAttributeOutput
::
WriteHex
(
pGraphicAry
,
nSize
,
&
m_rExport
.
Strm
());
m_rExport
.
Strm
().
WriteCharPtr
(
"}}"
);
// pict, shppict
}
...
...
sw/source/filter/ww8/rtfsdrexport.cxx
Dosyayı görüntüle @
9c9ef9f2
...
...
@@ -459,7 +459,7 @@ void RtfSdrExport::impl_writeGraphic()
GraphicConverter
::
Export
(
aStream
,
aGraphic
,
CVT_PNG
);
aStream
.
Seek
(
STREAM_SEEK_TO_END
);
sal_uInt32
nSize
=
aStream
.
Tell
();
const
sal_uInt8
*
pGraphicAry
=
static_cast
<
sal_uInt8
const
*>
(
aStream
.
GetData
());
const
sal_uInt8
*
pGraphicAry
=
static_cast
<
sal_uInt8
const
*>
(
aStream
.
GetData
());
Size
aMapped
(
aGraphic
.
GetPrefSize
());
...
...
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