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
bcf295f9
Kaydet (Commit)
bcf295f9
authored
Nis 27, 2015
tarafından
Markus Mohrhard
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
support axis text properties during OOXML export, tdf#90532
Change-Id: Ied2b21154e31754f8b8461c349fe0e52ce7455e8
üst
38a5e500
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
4 deletions
+27
-4
chartexport.hxx
include/oox/export/chartexport.hxx
+1
-0
drawingml.hxx
include/oox/export/drawingml.hxx
+2
-1
chartexport.cxx
oox/source/export/chartexport.cxx
+21
-0
drawingml.cxx
oox/source/export/drawingml.cxx
+3
-3
No files found.
include/oox/export/chartexport.hxx
Dosyayı görüntüle @
bcf295f9
...
...
@@ -154,6 +154,7 @@ private:
void
exportSeriesValues
(
const
css
::
uno
::
Reference
<
css
::
chart2
::
data
::
XDataSequence
>&
xValueSeq
,
sal_Int32
nValueType
=
XML_val
);
void
exportShapeProps
(
css
::
uno
::
Reference
<
css
::
beans
::
XPropertySet
>
xPropSet
);
void
exportTextProps
(
css
::
uno
::
Reference
<
css
::
beans
::
XPropertySet
>
xPropSet
);
void
exportDataPoints
(
const
css
::
uno
::
Reference
<
css
::
beans
::
XPropertySet
>&
xSeriesProperties
,
sal_Int32
nSeriesLength
);
...
...
include/oox/export/drawingml.hxx
Dosyayı görüntüle @
bcf295f9
...
...
@@ -29,6 +29,7 @@
#include <tools/poly.hxx>
#include <filter/msfilter/escherex.hxx>
#include "oox/drawingml/drawingmltypes.hxx"
#include <oox/token/tokens.hxx>
#ifndef OOX_DRAWINGML_EXPORT_ROTATE_CLOCKWISIFY
// Our rotation is counter-clockwise and is in 100ths of a degree.
// drawingML rotation is clockwise and is in 60000ths of a degree.
...
...
@@ -172,7 +173,7 @@ public:
void
WriteParagraphNumbering
(
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
beans
::
XPropertySet
>
rXPropSet
,
sal_Int16
nLevel
);
void
WriteRun
(
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
text
::
XTextRange
>
rRun
);
void
WriteRunProperties
(
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
beans
::
XPropertySet
>
rRun
,
bool
bIsField
);
void
WriteRunProperties
(
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
beans
::
XPropertySet
>
rRun
,
bool
bIsField
,
sal_Int32
nElement
=
XML_rPr
);
void
WritePresetShape
(
const
char
*
pShape
);
void
WritePresetShape
(
const
char
*
pShape
,
MSO_SPT
eShapeType
,
bool
bPredefinedHandlesUsed
,
sal_Int32
nAdjustmentsWhichNeedsToBeConverted
,
const
::
com
::
sun
::
star
::
beans
::
PropertyValue
&
rProp
);
...
...
oox/source/export/chartexport.cxx
Dosyayı görüntüle @
bcf295f9
...
...
@@ -2306,6 +2306,25 @@ void ChartExport::exportShapeProps( Reference< XPropertySet > xPropSet )
pFS
->
endElement
(
FSNS
(
XML_c
,
XML_spPr
)
);
}
void
ChartExport
::
exportTextProps
(
Reference
<
XPropertySet
>
xPropSet
)
{
FSHelperPtr
pFS
=
GetFS
();
pFS
->
startElement
(
FSNS
(
XML_c
,
XML_txPr
),
FSEND
);
pFS
->
startElement
(
FSNS
(
XML_c
,
XML_bodyPr
),
FSEND
);
pFS
->
endElement
(
FSNS
(
XML_c
,
XML_bodyPr
));
pFS
->
startElement
(
FSNS
(
XML_a
,
XML_p
),
FSEND
);
pFS
->
startElement
(
FSNS
(
XML_a
,
XML_pPr
),
FSEND
);
WriteRunProperties
(
xPropSet
,
false
,
XML_defRPr
);
pFS
->
endElement
(
FSNS
(
XML_a
,
XML_pPr
));
pFS
->
endElement
(
FSNS
(
XML_a
,
XML_p
));
pFS
->
endElement
(
FSNS
(
XML_c
,
XML_txPr
));
}
void
ChartExport
::
InitPlotArea
(
)
{
Reference
<
XPropertySet
>
xDiagramProperties
(
mxDiagram
,
uno
::
UNO_QUERY
);
...
...
@@ -2680,6 +2699,8 @@ void ChartExport::_exportAxis(
// shape properties
exportShapeProps
(
xAxisProp
);
exportTextProps
(
xAxisProp
);
pFS
->
singleElement
(
FSNS
(
XML_c
,
XML_crossAx
),
XML_val
,
I32S
(
rAxisIdPair
.
nCrossAx
),
FSEND
);
...
...
oox/source/export/drawingml.cxx
Dosyayı görüntüle @
bcf295f9
...
...
@@ -1167,7 +1167,7 @@ void DrawingML::WriteShapeTransformation( Reference< XShape > rXShape, sal_Int32
WriteTransformation
(
Rectangle
(
Point
(
aPos
.
X
,
aPos
.
Y
),
Size
(
aSize
.
Width
,
aSize
.
Height
)
),
nXmlNamespace
,
bFlipH
,
bFlipV
,
OOX_DRAWINGML_EXPORT_ROTATE_CLOCKWISIFY
(
nRotation
)
);
}
void
DrawingML
::
WriteRunProperties
(
Reference
<
XPropertySet
>
rRun
,
bool
bIsField
)
void
DrawingML
::
WriteRunProperties
(
Reference
<
XPropertySet
>
rRun
,
bool
bIsField
,
sal_Int32
nElement
/*= XML_rPr*/
)
{
Reference
<
XPropertySet
>
rXPropSet
(
rRun
,
UNO_QUERY
);
Reference
<
XPropertyState
>
rXPropState
(
rRun
,
UNO_QUERY
);
...
...
@@ -1318,7 +1318,7 @@ void DrawingML::WriteRunProperties( Reference< XPropertySet > rRun, bool bIsFiel
}
}
mpFS
->
startElementNS
(
XML_a
,
XML_rPr
,
mpFS
->
startElementNS
(
XML_a
,
nElement
,
XML_b
,
bold
,
XML_i
,
italic
,
XML_lang
,
usLanguage
.
isEmpty
()
?
NULL
:
USS
(
usLanguage
),
...
...
@@ -1405,7 +1405,7 @@ void DrawingML::WriteRunProperties( Reference< XPropertySet > rRun, bool bIsFiel
}
}
mpFS
->
endElementNS
(
XML_a
,
XML_rPr
);
mpFS
->
endElementNS
(
XML_a
,
nElement
);
}
const
char
*
DrawingML
::
GetFieldType
(
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
text
::
XTextRange
>
rRun
,
bool
&
bIsField
)
...
...
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