[Libreoffice-commits] .: oox/inc oox/Library_oox.mk oox/Package_inc.mk oox/source oox/util sc/Library_scfilt.mk sc/source sc/util
Noel Power
noelp at kemper.freedesktop.org
Fri Mar 16 05:32:28 PDT 2012
oox/Library_oox.mk | 60
oox/Package_inc.mk | 46
oox/inc/oox/core/binarycodec.hxx | 7
oox/inc/oox/core/binaryfilterbase.hxx | 2
oox/inc/oox/core/contexthandler.hxx | 3
oox/inc/oox/core/contexthandler2.hxx | 5
oox/inc/oox/core/fragmenthandler.hxx | 3
oox/inc/oox/core/fragmenthandler2.hxx | 3
oox/inc/oox/core/relations.hxx | 3
oox/inc/oox/drawingml/clrscheme.hxx | 3
oox/inc/oox/drawingml/color.hxx | 3
oox/inc/oox/drawingml/connectorshapecontext.hxx | 3
oox/inc/oox/drawingml/fillproperties.hxx | 2
oox/inc/oox/drawingml/graphicshapecontext.hxx | 5
oox/inc/oox/drawingml/lineproperties.hxx | 2
oox/inc/oox/drawingml/linepropertiescontext.hxx | 3
oox/inc/oox/drawingml/shape.hxx | 3
oox/inc/oox/drawingml/shapecontext.hxx | 3
oox/inc/oox/drawingml/shapegroupcontext.hxx | 3
oox/inc/oox/drawingml/shapepropertymap.hxx | 5
oox/inc/oox/drawingml/theme.hxx | 3
oox/inc/oox/drawingml/themefragmenthandler.hxx | 3
oox/inc/oox/helper/attributelist.hxx | 5
oox/inc/oox/helper/binaryinputstream.hxx | 6
oox/inc/oox/helper/binaryoutputstream.hxx | 2
oox/inc/oox/helper/binarystreambase.hxx | 7
oox/inc/oox/helper/containerhelper.hxx | 5
oox/inc/oox/helper/progressbar.hxx | 5
oox/inc/oox/helper/propertymap.hxx | 3
oox/inc/oox/helper/propertyset.hxx | 3
oox/inc/oox/ole/axcontrol.hxx | 49
oox/inc/oox/ole/axfontdata.hxx | 3
oox/inc/oox/ole/vbaproject.hxx | 5
oox/inc/oox/vml/vmldrawing.hxx | 9
oox/inc/oox/vml/vmldrawingfragment.hxx | 3
oox/inc/oox/vml/vmlformatting.hxx | 3
oox/inc/oox/vml/vmlshape.hxx | 3
oox/inc/oox/vml/vmltextbox.hxx | 5
oox/inc/oox/xls/addressconverter.hxx | 672 ----
oox/inc/oox/xls/autofilterbuffer.hxx | 285 -
oox/inc/oox/xls/autofiltercontext.hxx | 117
oox/inc/oox/xls/biffcodec.hxx | 190 -
oox/inc/oox/xls/biffdetector.hxx | 100
oox/inc/oox/xls/biffhelper.hxx | 672 ----
oox/inc/oox/xls/biffinputstream.hxx | 411 --
oox/inc/oox/xls/biffoutputstream.hxx | 161 -
oox/inc/oox/xls/chartsheetfragment.hxx | 83
oox/inc/oox/xls/commentsbuffer.hxx | 129
oox/inc/oox/xls/commentsfragment.hxx | 73
oox/inc/oox/xls/condformatbuffer.hxx | 195 -
oox/inc/oox/xls/condformatcontext.hxx | 65
oox/inc/oox/xls/connectionsbuffer.hxx | 189 -
oox/inc/oox/xls/connectionsfragment.hxx | 81
oox/inc/oox/xls/defnamesbuffer.hxx | 235 -
oox/inc/oox/xls/drawingbase.hxx | 157 -
oox/inc/oox/xls/drawingfragment.hxx | 238 -
oox/inc/oox/xls/drawingmanager.hxx | 491 ---
oox/inc/oox/xls/excelchartconverter.hxx | 64
oox/inc/oox/xls/excelfilter.hxx | 125
oox/inc/oox/xls/excelhandlers.hxx | 252 -
oox/inc/oox/xls/excelvbaproject.hxx | 68
oox/inc/oox/xls/externallinkbuffer.hxx | 405 --
oox/inc/oox/xls/externallinkfragment.hxx | 164 -
oox/inc/oox/xls/formulabase.hxx | 845 -----
oox/inc/oox/xls/formulaparser.hxx | 166 -
oox/inc/oox/xls/numberformatsbuffer.hxx | 141
oox/inc/oox/xls/ooxformulaparser.hxx | 111
oox/inc/oox/xls/pagesettings.hxx | 224 -
oox/inc/oox/xls/pivotcachebuffer.hxx | 532 ---
oox/inc/oox/xls/pivotcachefragment.hxx | 158 -
oox/inc/oox/xls/pivottablebuffer.hxx | 453 ---
oox/inc/oox/xls/pivottablefragment.hxx | 120
oox/inc/oox/xls/querytablebuffer.hxx | 112
oox/inc/oox/xls/querytablefragment.hxx | 79
oox/inc/oox/xls/richstring.hxx | 313 --
oox/inc/oox/xls/richstringcontext.hxx | 74
oox/inc/oox/xls/scenariobuffer.hxx | 158 -
oox/inc/oox/xls/scenariocontext.hxx | 83
oox/inc/oox/xls/sharedstringsbuffer.hxx | 68
oox/inc/oox/xls/sharedstringsfragment.hxx | 61
oox/inc/oox/xls/sheetdatabuffer.hxx | 343 --
oox/inc/oox/xls/sheetdatacontext.hxx | 196 -
oox/inc/oox/xls/stylesbuffer.hxx | 1099 -------
oox/inc/oox/xls/stylesfragment.hxx | 158 -
oox/inc/oox/xls/tablebuffer.hxx | 142
oox/inc/oox/xls/tablefragment.hxx | 65
oox/inc/oox/xls/themebuffer.hxx | 66
oox/inc/oox/xls/unitconverter.hxx | 123
oox/inc/oox/xls/viewsettings.hxx | 235 -
oox/inc/oox/xls/workbookfragment.hxx | 101
oox/inc/oox/xls/workbookhelper.hxx | 302 --
oox/inc/oox/xls/workbooksettings.hxx | 168 -
oox/inc/oox/xls/worksheetbuffer.hxx | 136
oox/inc/oox/xls/worksheetfragment.hxx | 193 -
oox/inc/oox/xls/worksheethelper.hxx | 339 --
oox/inc/oox/xls/worksheetsettings.hxx | 147 -
oox/source/core/services.cxx | 12
oox/source/dump/dumperbase.cxx | 6
oox/source/dump/pptxdumper.cxx | 6
oox/source/export/chartexport.cxx | 3
oox/source/xls/addressconverter.cxx | 760 -----
oox/source/xls/autofilterbuffer.cxx | 871 ------
oox/source/xls/autofiltercontext.cxx | 186 -
oox/source/xls/biffcodec.cxx | 382 --
oox/source/xls/biffdetector.cxx | 232 -
oox/source/xls/biffhelper.cxx | 334 --
oox/source/xls/biffinputstream.cxx | 555 ---
oox/source/xls/biffoutputstream.cxx | 212 -
oox/source/xls/chartsheetfragment.cxx | 292 --
oox/source/xls/commentsbuffer.cxx | 325 --
oox/source/xls/commentsfragment.cxx | 161 -
oox/source/xls/condformatbuffer.cxx | 779 -----
oox/source/xls/condformatcontext.cxx | 105
oox/source/xls/connectionsbuffer.cxx | 504 ---
oox/source/xls/connectionsfragment.cxx | 182 -
oox/source/xls/defnamesbuffer.cxx | 696 ----
oox/source/xls/drawingbase.cxx | 355 --
oox/source/xls/drawingfragment.cxx | 772 -----
oox/source/xls/drawingmanager.cxx | 1359 ---------
oox/source/xls/excelchartconverter.cxx | 139
oox/source/xls/excelfilter.cxx | 360 --
oox/source/xls/excelhandlers.cxx | 217 -
oox/source/xls/excelvbaproject.cxx | 150 -
oox/source/xls/externallinkbuffer.cxx | 1136 -------
oox/source/xls/externallinkfragment.cxx | 551 ---
oox/source/xls/formulabase.cxx | 1639 -----------
oox/source/xls/formulaparser.cxx | 2930 --------------------
oox/source/xls/numberformatsbuffer.cxx | 2117 --------------
oox/source/xls/ooxformulaparser.cxx | 205 -
oox/source/xls/pagesettings.cxx | 1285 --------
oox/source/xls/pivotcachebuffer.cxx | 1607 -----------
oox/source/xls/pivotcachefragment.cxx | 478 ---
oox/source/xls/pivottablebuffer.cxx | 1590 -----------
oox/source/xls/pivottablefragment.cxx | 322 --
oox/source/xls/querytablebuffer.cxx | 393 --
oox/source/xls/querytablefragment.cxx | 109
oox/source/xls/richstring.cxx | 668 ----
oox/source/xls/richstringcontext.cxx | 108
oox/source/xls/scenariobuffer.cxx | 302 --
oox/source/xls/scenariocontext.cxx | 129
oox/source/xls/sharedformulabuffer.cxx | 213 -
oox/source/xls/sharedstringsbuffer.cxx | 87
oox/source/xls/sharedstringsfragment.cxx | 105
oox/source/xls/sheetdatabuffer.cxx | 897 ------
oox/source/xls/sheetdatacontext.cxx | 1009 -------
oox/source/xls/stylesbuffer.cxx | 3443 ------------------------
oox/source/xls/stylesfragment.cxx | 332 --
oox/source/xls/tablebuffer.cxx | 171 -
oox/source/xls/tablefragment.cxx | 109
oox/source/xls/themebuffer.cxx | 126
oox/source/xls/unitconverter.cxx | 255 -
oox/source/xls/viewsettings.cxx | 832 -----
oox/source/xls/workbookfragment.cxx | 777 -----
oox/source/xls/workbookhelper.cxx | 960 ------
oox/source/xls/workbooksettings.cxx | 384 --
oox/source/xls/worksheetbuffer.cxx | 261 -
oox/source/xls/worksheetfragment.cxx | 1223 --------
oox/source/xls/worksheethelper.cxx | 1667 -----------
oox/source/xls/worksheetsettings.cxx | 351 --
oox/util/oox.component | 20
sc/Library_scfilt.mk | 59
sc/source/filter/excel/xestream.cxx | 14
sc/source/filter/inc/addressconverter.hxx | 672 ++++
sc/source/filter/inc/autofilterbuffer.hxx | 285 +
sc/source/filter/inc/autofiltercontext.hxx | 117
sc/source/filter/inc/biffcodec.hxx | 190 +
sc/source/filter/inc/biffdetector.hxx | 100
sc/source/filter/inc/biffhelper.hxx | 672 ++++
sc/source/filter/inc/biffinputstream.hxx | 411 ++
sc/source/filter/inc/biffoutputstream.hxx | 161 +
sc/source/filter/inc/chartsheetfragment.hxx | 83
sc/source/filter/inc/commentsbuffer.hxx | 129
sc/source/filter/inc/commentsfragment.hxx | 73
sc/source/filter/inc/condformatbuffer.hxx | 195 +
sc/source/filter/inc/condformatcontext.hxx | 65
sc/source/filter/inc/connectionsbuffer.hxx | 189 +
sc/source/filter/inc/connectionsfragment.hxx | 81
sc/source/filter/inc/defnamesbuffer.hxx | 235 +
sc/source/filter/inc/drawingbase.hxx | 157 +
sc/source/filter/inc/drawingfragment.hxx | 238 +
sc/source/filter/inc/drawingmanager.hxx | 491 +++
sc/source/filter/inc/excelchartconverter.hxx | 64
sc/source/filter/inc/excelfilter.hxx | 125
sc/source/filter/inc/excelhandlers.hxx | 252 +
sc/source/filter/inc/excelvbaproject.hxx | 67
sc/source/filter/inc/externallinkbuffer.hxx | 405 ++
sc/source/filter/inc/externallinkfragment.hxx | 164 +
sc/source/filter/inc/formulabase.hxx | 845 +++++
sc/source/filter/inc/formulaparser.hxx | 166 +
sc/source/filter/inc/numberformatsbuffer.hxx | 141
sc/source/filter/inc/ooxformulaparser.hxx | 111
sc/source/filter/inc/pagesettings.hxx | 224 +
sc/source/filter/inc/pivotcachebuffer.hxx | 532 +++
sc/source/filter/inc/pivotcachefragment.hxx | 158 +
sc/source/filter/inc/pivottablebuffer.hxx | 453 +++
sc/source/filter/inc/pivottablefragment.hxx | 120
sc/source/filter/inc/querytablebuffer.hxx | 112
sc/source/filter/inc/querytablefragment.hxx | 79
sc/source/filter/inc/richstring.hxx | 313 ++
sc/source/filter/inc/richstringcontext.hxx | 74
sc/source/filter/inc/scenariobuffer.hxx | 158 +
sc/source/filter/inc/scenariocontext.hxx | 83
sc/source/filter/inc/sharedstringsbuffer.hxx | 68
sc/source/filter/inc/sharedstringsfragment.hxx | 61
sc/source/filter/inc/sheetdatabuffer.hxx | 343 ++
sc/source/filter/inc/sheetdatacontext.hxx | 196 +
sc/source/filter/inc/stylesbuffer.hxx | 1099 +++++++
sc/source/filter/inc/stylesfragment.hxx | 158 +
sc/source/filter/inc/tablebuffer.hxx | 142
sc/source/filter/inc/tablefragment.hxx | 65
sc/source/filter/inc/themebuffer.hxx | 66
sc/source/filter/inc/unitconverter.hxx | 123
sc/source/filter/inc/viewsettings.hxx | 235 +
sc/source/filter/inc/workbookfragment.hxx | 101
sc/source/filter/inc/workbookhelper.hxx | 302 ++
sc/source/filter/inc/workbooksettings.hxx | 168 +
sc/source/filter/inc/worksheetbuffer.hxx | 136
sc/source/filter/inc/worksheetfragment.hxx | 193 +
sc/source/filter/inc/worksheethelper.hxx | 339 ++
sc/source/filter/inc/worksheetsettings.hxx | 147 +
sc/source/filter/oox/addressconverter.cxx | 760 +++++
sc/source/filter/oox/autofilterbuffer.cxx | 871 ++++++
sc/source/filter/oox/autofiltercontext.cxx | 186 +
sc/source/filter/oox/biffcodec.cxx | 382 ++
sc/source/filter/oox/biffdetector.cxx | 232 +
sc/source/filter/oox/biffhelper.cxx | 334 ++
sc/source/filter/oox/biffinputstream.cxx | 555 +++
sc/source/filter/oox/biffoutputstream.cxx | 212 +
sc/source/filter/oox/chartsheetfragment.cxx | 292 ++
sc/source/filter/oox/commentsbuffer.cxx | 325 ++
sc/source/filter/oox/commentsfragment.cxx | 161 +
sc/source/filter/oox/condformatbuffer.cxx | 779 +++++
sc/source/filter/oox/condformatcontext.cxx | 105
sc/source/filter/oox/connectionsbuffer.cxx | 504 +++
sc/source/filter/oox/connectionsfragment.cxx | 182 +
sc/source/filter/oox/defnamesbuffer.cxx | 696 ++++
sc/source/filter/oox/drawingbase.cxx | 355 ++
sc/source/filter/oox/drawingfragment.cxx | 772 +++++
sc/source/filter/oox/drawingmanager.cxx | 1359 +++++++++
sc/source/filter/oox/excelchartconverter.cxx | 139
sc/source/filter/oox/excelfilter.cxx | 360 ++
sc/source/filter/oox/excelhandlers.cxx | 217 +
sc/source/filter/oox/excelvbaproject.cxx | 150 +
sc/source/filter/oox/externallinkbuffer.cxx | 1136 +++++++
sc/source/filter/oox/externallinkfragment.cxx | 551 +++
sc/source/filter/oox/formulabase.cxx | 1639 +++++++++++
sc/source/filter/oox/formulaparser.cxx | 2930 ++++++++++++++++++++
sc/source/filter/oox/numberformatsbuffer.cxx | 2117 ++++++++++++++
sc/source/filter/oox/ooxformulaparser.cxx | 205 +
sc/source/filter/oox/pagesettings.cxx | 1285 ++++++++
sc/source/filter/oox/pivotcachebuffer.cxx | 1607 +++++++++++
sc/source/filter/oox/pivotcachefragment.cxx | 478 +++
sc/source/filter/oox/pivottablebuffer.cxx | 1590 +++++++++++
sc/source/filter/oox/pivottablefragment.cxx | 322 ++
sc/source/filter/oox/querytablebuffer.cxx | 393 ++
sc/source/filter/oox/querytablefragment.cxx | 109
sc/source/filter/oox/richstring.cxx | 668 ++++
sc/source/filter/oox/richstringcontext.cxx | 108
sc/source/filter/oox/scenariobuffer.cxx | 302 ++
sc/source/filter/oox/scenariocontext.cxx | 129
sc/source/filter/oox/sharedformulabuffer.cxx | 213 +
sc/source/filter/oox/sharedstringsbuffer.cxx | 87
sc/source/filter/oox/sharedstringsfragment.cxx | 105
sc/source/filter/oox/sheetdatabuffer.cxx | 897 ++++++
sc/source/filter/oox/sheetdatacontext.cxx | 1009 +++++++
sc/source/filter/oox/stylesbuffer.cxx | 3443 ++++++++++++++++++++++++
sc/source/filter/oox/stylesfragment.cxx | 332 ++
sc/source/filter/oox/tablebuffer.cxx | 171 +
sc/source/filter/oox/tablefragment.cxx | 109
sc/source/filter/oox/themebuffer.cxx | 126
sc/source/filter/oox/unitconverter.cxx | 255 +
sc/source/filter/oox/viewsettings.cxx | 832 +++++
sc/source/filter/oox/workbookfragment.cxx | 777 +++++
sc/source/filter/oox/workbookhelper.cxx | 960 ++++++
sc/source/filter/oox/workbooksettings.cxx | 384 ++
sc/source/filter/oox/worksheetbuffer.cxx | 261 +
sc/source/filter/oox/worksheetfragment.cxx | 1223 ++++++++
sc/source/filter/oox/worksheethelper.cxx | 1667 +++++++++++
sc/source/filter/oox/worksheetsettings.cxx | 351 ++
sc/util/scfilt.component | 7
280 files changed, 52071 insertions(+), 52008 deletions(-)
New commits:
commit 8ada1cd2846e5e60ad63250c68ddea3a9356546f
Author: Noel Power <noel.power at novell.com>
Date: Fri Mar 16 12:28:31 2012 +0000
move excel related oox bits to sc
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 0857f46..4224cf1 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -201,12 +201,10 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
oox/source/drawingml/themeelementscontext \
oox/source/drawingml/themefragmenthandler \
oox/source/drawingml/transform2dcontext \
- oox/source/dump/biffdumper \
oox/source/dump/dffdumper \
oox/source/dump/dumperbase \
oox/source/dump/oledumper \
oox/source/dump/pptxdumper \
- oox/source/dump/xlsbdumper \
oox/source/export/chartexport \
oox/source/export/ColorPropertySet \
oox/source/export/drawingml \
@@ -290,64 +288,6 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
oox/source/vml/vmlshape \
oox/source/vml/vmltextboxcontext \
oox/source/vml/vmltextbox \
- oox/source/xls/addressconverter \
- oox/source/xls/autofilterbuffer \
- oox/source/xls/autofiltercontext \
- oox/source/xls/biffcodec \
- oox/source/xls/biffdetector \
- oox/source/xls/biffhelper \
- oox/source/xls/biffinputstream \
- oox/source/xls/biffoutputstream \
- oox/source/xls/chartsheetfragment \
- oox/source/xls/commentsbuffer \
- oox/source/xls/commentsfragment \
- oox/source/xls/condformatbuffer \
- oox/source/xls/condformatcontext \
- oox/source/xls/connectionsbuffer \
- oox/source/xls/connectionsfragment \
- oox/source/xls/defnamesbuffer \
- oox/source/xls/drawingbase \
- oox/source/xls/drawingfragment \
- oox/source/xls/drawingmanager \
- oox/source/xls/excelchartconverter \
- oox/source/xls/excelfilter \
- oox/source/xls/excelhandlers \
- oox/source/xls/excelvbaproject \
- oox/source/xls/externallinkbuffer \
- oox/source/xls/externallinkfragment \
- oox/source/xls/formulabase \
- oox/source/xls/formulaparser \
- oox/source/xls/numberformatsbuffer \
- oox/source/xls/ooxformulaparser \
- oox/source/xls/pagesettings \
- oox/source/xls/pivotcachebuffer \
- oox/source/xls/pivotcachefragment \
- oox/source/xls/pivottablebuffer \
- oox/source/xls/pivottablefragment \
- oox/source/xls/querytablebuffer \
- oox/source/xls/querytablefragment \
- oox/source/xls/richstringcontext \
- oox/source/xls/richstring \
- oox/source/xls/scenariobuffer \
- oox/source/xls/scenariocontext \
- oox/source/xls/sharedstringsbuffer \
- oox/source/xls/sharedstringsfragment \
- oox/source/xls/sheetdatabuffer \
- oox/source/xls/sheetdatacontext \
- oox/source/xls/stylesbuffer \
- oox/source/xls/stylesfragment \
- oox/source/xls/tablebuffer \
- oox/source/xls/tablefragment \
- oox/source/xls/themebuffer \
- oox/source/xls/unitconverter \
- oox/source/xls/viewsettings \
- oox/source/xls/workbookfragment \
- oox/source/xls/workbookhelper \
- oox/source/xls/workbooksettings \
- oox/source/xls/worksheetbuffer \
- oox/source/xls/worksheetfragment \
- oox/source/xls/worksheethelper \
- oox/source/xls/worksheetsettings \
))
$(eval $(call gb_Library_add_generated_exception_objects,oox,\
diff --git a/oox/Package_inc.mk b/oox/Package_inc.mk
index 9c7f5d3..19d818a 100644
--- a/oox/Package_inc.mk
+++ b/oox/Package_inc.mk
@@ -32,15 +32,48 @@ $(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/filterdetect.hxx,oox/core
$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/fragmenthandler2.hxx,oox/core/fragmenthandler2.hxx))
$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/relations.hxx,oox/core/relations.hxx))
$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/xmlfilterbase.hxx,oox/core/xmlfilterbase.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/binarycodec.hxx,oox/core/binarycodec.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/contexthandler.hxx,oox/core/contexthandler.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/contexthandler2.hxx,oox/core/contexthandler2.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/fragmenthandler.hxx,oox/core/fragmenthandler.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/binaryfilterbase.hxx,oox/core/binaryfilterbase.hxx))
$(eval $(call gb_Package_add_file,oox_inc,inc/oox/dllapi.h,oox/dllapi.h))
$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/chart/chartconverter.hxx,oox/drawingml/chart/chartconverter.hxx))
$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/table/tablestylelist.hxx,oox/drawingml/table/tablestylelist.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/color.hxx,oox/drawingml/color.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/theme.hxx,oox/drawingml/theme.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/clrscheme.hxx,oox/drawingml/clrscheme.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/shape.hxx,oox/drawingml/shape.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/drawingmltypes.hxx,oox/drawingml/drawingmltypes.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/customshapeproperties.hxx,oox/drawingml/customshapeproperties.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/textliststyle.hxx,oox/drawingml/textliststyle.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/colorchoicecontext.hxx,oox/drawingml/colorchoicecontext.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/textparagraphproperties.hxx,oox/drawingml/textparagraphproperties.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/fillproperties.hxx,oox/drawingml/fillproperties.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/fillpropertiesgroupcontext.hxx,oox/drawingml/fillpropertiesgroupcontext.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/shapepropertiescontext.hxx,oox/drawingml/shapepropertiescontext.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/shapegroupcontext.hxx,oox/drawingml/shapegroupcontext.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/shapecontext.hxx,oox/drawingml/shapecontext.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/embeddedwavaudiofile.hxx,oox/drawingml/embeddedwavaudiofile.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/textcharacterproperties.hxx,oox/drawingml/textcharacterproperties.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/textspacing.hxx,oox/drawingml/textspacing.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/shape3dproperties.hxx,oox/drawingml/shape3dproperties.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/connectorshapecontext.hxx,oox/drawingml/connectorshapecontext.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/graphicshapecontext.hxx,oox/drawingml/graphicshapecontext.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/textfont.hxx,oox/drawingml/textfont.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/lineproperties.hxx,oox/drawingml/lineproperties.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/shapepropertymap.hxx,oox/drawingml/shapepropertymap.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/themefragmenthandler.hxx,oox/drawingml/themefragmenthandler.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/chart/datasourcemodel.hxx,oox/drawingml/chart/datasourcemodel.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/chart/modelbase.hxx,oox/drawingml/chart/modelbase.hxx))
$(eval $(call gb_Package_add_file,oox_inc,inc/oox/export/chartexport.hxx,oox/export/chartexport.hxx))
$(eval $(call gb_Package_add_file,oox_inc,inc/oox/export/drawingml.hxx,oox/export/drawingml.hxx))
$(eval $(call gb_Package_add_file,oox_inc,inc/oox/export/shapes.hxx,oox/export/shapes.hxx))
$(eval $(call gb_Package_add_file,oox_inc,inc/oox/export/utils.hxx,oox/export/utils.hxx))
$(eval $(call gb_Package_add_file,oox_inc,inc/oox/export/vmlexport.hxx,oox/export/vmlexport.hxx))
$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/binarystreambase.hxx,oox/helper/binarystreambase.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/binaryinputstream.hxx,oox/helper/binaryinputstream.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/binaryoutputstream.hxx,oox/helper/binaryoutputstream.hxx))
$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/containerhelper.hxx,oox/helper/containerhelper.hxx))
$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/graphichelper.hxx,oox/helper/graphichelper.hxx))
$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/helper.hxx,oox/helper/helper.hxx))
@@ -48,6 +81,10 @@ $(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/refmap.hxx,oox/helper/r
$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/refvector.hxx,oox/helper/refvector.hxx))
$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/storagebase.hxx,oox/helper/storagebase.hxx))
$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/zipstorage.hxx,oox/helper/zipstorage.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/propertymap.hxx,oox/helper/propertymap.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/propertyset.hxx,oox/helper/propertyset.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/attributelist.hxx,oox/helper/attributelist.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/progressbar.hxx,oox/helper/progressbar.hxx))
$(eval $(call gb_Package_add_file,oox_inc,inc/oox/mathml/export.hxx,oox/mathml/export.hxx))
$(eval $(call gb_Package_add_file,oox_inc,inc/oox/mathml/import.hxx,oox/mathml/import.hxx))
$(eval $(call gb_Package_add_file,oox_inc,inc/oox/mathml/importutils.hxx,oox/mathml/importutils.hxx))
@@ -55,8 +92,15 @@ $(eval $(call gb_Package_add_file,oox_inc,inc/oox/ole/olehelper.hxx,oox/ole/oleh
$(eval $(call gb_Package_add_file,oox_inc,inc/oox/ole/oleobjecthelper.hxx,oox/ole/oleobjecthelper.hxx))
$(eval $(call gb_Package_add_file,oox_inc,inc/oox/ole/olestorage.hxx,oox/ole/olestorage.hxx))
$(eval $(call gb_Package_add_file,oox_inc,inc/oox/ole/vbaproject.hxx,oox/ole/vbaproject.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/ole/vbaprojectfilter.hxx,oox/ole/vbaprojectfilter.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/ole/axcontrol.hxx,oox/ole/axcontrol.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/ole/axbinaryreader.hxx,oox/ole/axbinaryreader.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/ole/axfontdata.hxx,oox/ole/axfontdata.hxx))
$(eval $(call gb_Package_add_file,oox_inc,inc/oox/vml/vmldrawing.hxx,oox/vml/vmldrawing.hxx))
$(eval $(call gb_Package_add_file,oox_inc,inc/oox/vml/vmlshape.hxx,oox/vml/vmlshape.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/xls/excelvbaproject.hxx,oox/xls/excelvbaproject.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/vml/vmlformatting.hxx,oox/vml/vmlformatting.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/vml/vmldrawingfragment.hxx,oox/vml/vmldrawingfragment.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/vml/vmltextbox.hxx,oox/vml/vmltextbox.hxx))
+$(eval $(call gb_Package_add_file,oox_inc,inc/oox/vml/vmlshapecontainer.hxx,oox/vml/vmlshapecontainer.hxx))
# vim: set noet sw=4 ts=4:
diff --git a/oox/inc/oox/core/binarycodec.hxx b/oox/inc/oox/core/binarycodec.hxx
index c182877..e578685 100644
--- a/oox/inc/oox/core/binarycodec.hxx
+++ b/oox/inc/oox/core/binarycodec.hxx
@@ -34,6 +34,7 @@
#include <rtl/cipher.h>
#include <rtl/digest.h>
+#include "oox/dllapi.h"
namespace oox { class AttributeList; }
@@ -42,7 +43,7 @@ namespace core {
// ============================================================================
-class CodecHelper
+class OOX_DLLPUBLIC CodecHelper
{
public:
/** Returns the password hash if it is in the required 16-bit limit. */
@@ -60,7 +61,7 @@ private:
Implements a simple XOR encoding/decoding algorithm used in MS Office
versions up to MSO 95.
*/
-class BinaryCodec_XOR
+class OOX_DLLPUBLIC BinaryCodec_XOR
{
public:
/** Enumerates codec types supported by this XOR codec implementation. */
@@ -186,7 +187,7 @@ private:
Implementation is based on the wvDecrypt package by Caolan McNamara:
http://www.csn.ul.ie/~caolan/docs/wvDecrypt.html
*/
-class BinaryCodec_RCF
+class OOX_DLLPUBLIC BinaryCodec_RCF
{
public:
/** Default constructor.
diff --git a/oox/inc/oox/core/binaryfilterbase.hxx b/oox/inc/oox/core/binaryfilterbase.hxx
index 77d747b..5664525 100644
--- a/oox/inc/oox/core/binaryfilterbase.hxx
+++ b/oox/inc/oox/core/binaryfilterbase.hxx
@@ -37,7 +37,7 @@ namespace core {
// ============================================================================
-class BinaryFilterBase : public FilterBase
+class OOX_DLLPUBLIC BinaryFilterBase : public FilterBase
{
public:
explicit BinaryFilterBase(
diff --git a/oox/inc/oox/core/contexthandler.hxx b/oox/inc/oox/core/contexthandler.hxx
index 94a095b..f0562ec 100644
--- a/oox/inc/oox/core/contexthandler.hxx
+++ b/oox/inc/oox/core/contexthandler.hxx
@@ -35,6 +35,7 @@
#include <rtl/ref.hxx>
#include "oox/token/namespaces.hxx"
#include "oox/token/tokens.hxx"
+#include "oox/dllapi.h"
namespace com { namespace sun { namespace star {
namespace xml { namespace sax { class XLocator; } }
@@ -60,7 +61,7 @@ typedef ::boost::shared_ptr< FragmentBaseData > FragmentBaseDataRef;
typedef ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XFastContextHandler > ContextHandler_BASE;
-class ContextHandler : public ContextHandler_BASE
+class OOX_DLLPUBLIC ContextHandler : public ContextHandler_BASE
{
public:
explicit ContextHandler( const ContextHandler& rParent );
diff --git a/oox/inc/oox/core/contexthandler2.hxx b/oox/inc/oox/core/contexthandler2.hxx
index 96121eb..af412c2 100644
--- a/oox/inc/oox/core/contexthandler2.hxx
+++ b/oox/inc/oox/core/contexthandler2.hxx
@@ -34,6 +34,7 @@
#include "oox/helper/attributelist.hxx"
#include "oox/helper/binaryinputstream.hxx"
#include "oox/core/contexthandler.hxx"
+#include "oox/dllapi.h"
namespace oox {
namespace core {
@@ -69,7 +70,7 @@ struct ElementInfo;
and implEndRecord() functions of this helper. Again, this is implemented
already in the classes ContextHandler2 and FragmentHandler2.
*/
-class ContextHandler2Helper
+class OOX_DLLPUBLIC ContextHandler2Helper
{
public:
explicit ContextHandler2Helper( bool bEnableTrimSpace );
@@ -219,7 +220,7 @@ private:
// ============================================================================
-class ContextHandler2 : public ContextHandler, public ContextHandler2Helper
+class OOX_DLLPUBLIC ContextHandler2 : public ContextHandler, public ContextHandler2Helper
{
public:
explicit ContextHandler2( ContextHandler2Helper& rParent );
diff --git a/oox/inc/oox/core/fragmenthandler.hxx b/oox/inc/oox/core/fragmenthandler.hxx
index 05c6453..ca71a30 100644
--- a/oox/inc/oox/core/fragmenthandler.hxx
+++ b/oox/inc/oox/core/fragmenthandler.hxx
@@ -33,6 +33,7 @@
#include <cppuhelper/implbase1.hxx>
#include "oox/core/contexthandler.hxx"
#include "oox/core/relations.hxx"
+#include "oox/dllapi.h"
namespace com { namespace sun { namespace star {
namespace io { class XInputStream; }
@@ -84,7 +85,7 @@ struct RecordInfo
typedef ::cppu::ImplInheritanceHelper1< ContextHandler, ::com::sun::star::xml::sax::XFastDocumentHandler > FragmentHandler_BASE;
-class FragmentHandler : public FragmentHandler_BASE
+class OOX_DLLPUBLIC FragmentHandler : public FragmentHandler_BASE
{
public:
explicit FragmentHandler( XmlFilterBase& rFilter, const ::rtl::OUString& rFragmentPath );
diff --git a/oox/inc/oox/core/fragmenthandler2.hxx b/oox/inc/oox/core/fragmenthandler2.hxx
index f129444..781ed85 100644
--- a/oox/inc/oox/core/fragmenthandler2.hxx
+++ b/oox/inc/oox/core/fragmenthandler2.hxx
@@ -32,13 +32,14 @@
#include "oox/core/contexthandler2.hxx"
#include "oox/core/fragmenthandler.hxx"
#include <vector>
+#include "oox/dllapi.h"
namespace oox {
namespace core {
// ============================================================================
-class FragmentHandler2 : public FragmentHandler, public ContextHandler2Helper
+class OOX_DLLPUBLIC FragmentHandler2 : public FragmentHandler, public ContextHandler2Helper
{
private:
enum MCE_STATE
diff --git a/oox/inc/oox/core/relations.hxx b/oox/inc/oox/core/relations.hxx
index 1b504f0..e7d558b 100644
--- a/oox/inc/oox/core/relations.hxx
+++ b/oox/inc/oox/core/relations.hxx
@@ -32,6 +32,7 @@
#include <map>
#include <boost/shared_ptr.hpp>
#include "oox/helper/helper.hxx"
+#include "oox/dllapi.h"
namespace oox {
namespace core {
@@ -70,7 +71,7 @@ struct Relation
class Relations;
typedef ::boost::shared_ptr< Relations > RelationsRef;
-class Relations : public ::std::map< ::rtl::OUString, Relation >
+class OOX_DLLPUBLIC Relations : public ::std::map< ::rtl::OUString, Relation >
{
public:
explicit Relations( const ::rtl::OUString& rFragmentPath );
diff --git a/oox/inc/oox/drawingml/clrscheme.hxx b/oox/inc/oox/drawingml/clrscheme.hxx
index 73af9c1..0c74436 100644
--- a/oox/inc/oox/drawingml/clrscheme.hxx
+++ b/oox/inc/oox/drawingml/clrscheme.hxx
@@ -33,6 +33,7 @@
#include <map>
#include <vector>
#include "oox/drawingml/color.hxx"
+#include "oox/dllapi.h"
namespace oox { namespace drawingml {
@@ -48,7 +49,7 @@ public:
typedef boost::shared_ptr< ClrMap > ClrMapPtr;
-class ClrScheme
+class OOX_DLLPUBLIC ClrScheme
{
std::map < sal_Int32, sal_Int32 > maClrScheme;
diff --git a/oox/inc/oox/drawingml/color.hxx b/oox/inc/oox/drawingml/color.hxx
index 62767ad..7021d7a 100644
--- a/oox/inc/oox/drawingml/color.hxx
+++ b/oox/inc/oox/drawingml/color.hxx
@@ -35,6 +35,7 @@
#include <rtl/instance.hxx>
#include <rtl/ustring.hxx>
#include "oox/helper/helper.hxx"
+#include "oox/dllapi.h"
namespace oox { class GraphicHelper; }
@@ -43,7 +44,7 @@ namespace drawingml {
// ============================================================================
-class Color
+class OOX_DLLPUBLIC Color
{
public:
Color();
diff --git a/oox/inc/oox/drawingml/connectorshapecontext.hxx b/oox/inc/oox/drawingml/connectorshapecontext.hxx
index e98f1a4..6cd9c2c 100644
--- a/oox/inc/oox/drawingml/connectorshapecontext.hxx
+++ b/oox/inc/oox/drawingml/connectorshapecontext.hxx
@@ -31,10 +31,11 @@
#include "oox/drawingml/shape.hxx"
#include "oox/drawingml/shapecontext.hxx"
+#include "oox/dllapi.h"
namespace oox { namespace drawingml {
-class ConnectorShapeContext : public ShapeContext
+class OOX_DLLPUBLIC ConnectorShapeContext : public ShapeContext
{
public:
ConnectorShapeContext( ::oox::core::ContextHandler& rParent, ShapePtr pMasterShapePtr, ShapePtr pGroupShapePtr );
diff --git a/oox/inc/oox/drawingml/fillproperties.hxx b/oox/inc/oox/drawingml/fillproperties.hxx
index b528eae..dd30edf 100644
--- a/oox/inc/oox/drawingml/fillproperties.hxx
+++ b/oox/inc/oox/drawingml/fillproperties.hxx
@@ -109,7 +109,7 @@ struct BlipFillProperties
// ============================================================================
-struct FillProperties
+struct OOX_DLLPUBLIC FillProperties
{
OptValue< sal_Int32 > moFillType; /// Fill type (OOXML token).
Color maFillColor; /// Solid fill color and transparence.
diff --git a/oox/inc/oox/drawingml/graphicshapecontext.hxx b/oox/inc/oox/drawingml/graphicshapecontext.hxx
index 0abfbaa..719dba5 100644
--- a/oox/inc/oox/drawingml/graphicshapecontext.hxx
+++ b/oox/inc/oox/drawingml/graphicshapecontext.hxx
@@ -31,12 +31,13 @@
#include "oox/drawingml/shape.hxx"
#include "oox/drawingml/shapecontext.hxx"
+#include "oox/dllapi.h"
namespace oox { namespace vml { struct OleObjectInfo; } }
namespace oox { namespace drawingml {
-class GraphicShapeContext : public ShapeContext
+class OOX_DLLPUBLIC GraphicShapeContext : public ShapeContext
{
public:
GraphicShapeContext( ::oox::core::ContextHandler& rParent, ShapePtr pMasterShapePtr, ShapePtr pShapePtr );
@@ -47,7 +48,7 @@ public:
// ====================================================================
-class GraphicalObjectFrameContext : public ShapeContext
+class OOX_DLLPUBLIC GraphicalObjectFrameContext : public ShapeContext
{
public:
GraphicalObjectFrameContext( ::oox::core::ContextHandler& rParent, ShapePtr pMasterShapePtr, ShapePtr pShapePtr, bool bEmbedShapesInChart );
diff --git a/oox/inc/oox/drawingml/lineproperties.hxx b/oox/inc/oox/drawingml/lineproperties.hxx
index 8de222d..0aaee3d 100644
--- a/oox/inc/oox/drawingml/lineproperties.hxx
+++ b/oox/inc/oox/drawingml/lineproperties.hxx
@@ -48,7 +48,7 @@ struct LineArrowProperties
// ============================================================================
-struct LineProperties
+struct OOX_DLLPUBLIC LineProperties
{
typedef ::std::pair< sal_Int32, sal_Int32 > DashStop;
typedef ::std::vector< DashStop > DashStopVector;
diff --git a/oox/inc/oox/drawingml/linepropertiescontext.hxx b/oox/inc/oox/drawingml/linepropertiescontext.hxx
index 445c47d..b30d631 100644
--- a/oox/inc/oox/drawingml/linepropertiescontext.hxx
+++ b/oox/inc/oox/drawingml/linepropertiescontext.hxx
@@ -30,6 +30,7 @@
#define OOX_DRAWINGML_LINEPROPERTIESCONTEXT_HXX
#include "oox/core/contexthandler.hxx"
+#include "oox/dllapi.h"
namespace oox { namespace drawingml {
@@ -37,7 +38,7 @@ namespace oox { namespace drawingml {
struct LineProperties;
-class LinePropertiesContext : public ::oox::core::ContextHandler
+class OOX_DLLPUBLIC LinePropertiesContext : public ::oox::core::ContextHandler
{
public:
LinePropertiesContext( ::oox::core::ContextHandler& rParent,
diff --git a/oox/inc/oox/drawingml/shape.hxx b/oox/inc/oox/drawingml/shape.hxx
index 772f699..b360098 100644
--- a/oox/inc/oox/drawingml/shape.hxx
+++ b/oox/inc/oox/drawingml/shape.hxx
@@ -42,6 +42,7 @@
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <vector>
#include <map>
+#include "oox/dllapi.h"
namespace oox { namespace vml {
struct OleObjectInfo;
@@ -75,7 +76,7 @@ struct ChartShapeInfo
// ============================================================================
-class Shape
+class OOX_DLLPUBLIC Shape
: public boost::enable_shared_from_this< Shape >
{
public:
diff --git a/oox/inc/oox/drawingml/shapecontext.hxx b/oox/inc/oox/drawingml/shapecontext.hxx
index 89298f5..ccd5ab4 100644
--- a/oox/inc/oox/drawingml/shapecontext.hxx
+++ b/oox/inc/oox/drawingml/shapecontext.hxx
@@ -34,10 +34,11 @@
#include "oox/core/contexthandler.hxx"
#include "oox/drawingml/shape.hxx"
#include "oox/drawingml/shapepropertiescontext.hxx"
+#include "oox/dllapi.h"
namespace oox { namespace drawingml {
-class ShapeContext : public ::oox::core::ContextHandler
+class OOX_DLLPUBLIC ShapeContext : public ::oox::core::ContextHandler
{
public:
ShapeContext( ::oox::core::ContextHandler& rParent, ShapePtr pMasterShapePtr, ShapePtr pShapePtr );
diff --git a/oox/inc/oox/drawingml/shapegroupcontext.hxx b/oox/inc/oox/drawingml/shapegroupcontext.hxx
index 784058f..38d0374 100644
--- a/oox/inc/oox/drawingml/shapegroupcontext.hxx
+++ b/oox/inc/oox/drawingml/shapegroupcontext.hxx
@@ -31,10 +31,11 @@
#include "oox/drawingml/shape.hxx"
#include "oox/drawingml/shapecontext.hxx"
+#include "oox/dllapi.h"
namespace oox { namespace drawingml {
-class ShapeGroupContext : public ::oox::core::ContextHandler
+class OOX_DLLPUBLIC ShapeGroupContext : public ::oox::core::ContextHandler
{
public:
ShapeGroupContext( ::oox::core::ContextHandler& rParent, ShapePtr pMasterShapePtr, ShapePtr pGroupShapePtr );
diff --git a/oox/inc/oox/drawingml/shapepropertymap.hxx b/oox/inc/oox/drawingml/shapepropertymap.hxx
index b467288..69b9cfa 100644
--- a/oox/inc/oox/drawingml/shapepropertymap.hxx
+++ b/oox/inc/oox/drawingml/shapepropertymap.hxx
@@ -30,6 +30,7 @@
#define OOX_DRAWINGML_SHAPEPROPERTYMAP_HXX
#include "oox/helper/propertymap.hxx"
+#include "oox/dllapi.h"
namespace oox { class ModelObjectHelper; }
@@ -74,7 +75,7 @@ enum ShapePropertyId
// ============================================================================
-struct ShapePropertyInfo
+struct OOX_DLLPUBLIC ShapePropertyInfo
{
const sal_Int32* mpnPropertyIds; /// Pointer to array of property identifiers for all SHAPEPROP properties.
bool mbNamedLineMarker; /// True = use named line marker instead of explicit line marker.
@@ -97,7 +98,7 @@ struct ShapePropertyInfo
// ============================================================================
-class ShapePropertyMap : public PropertyMap
+class OOX_DLLPUBLIC ShapePropertyMap : public PropertyMap
{
public:
explicit ShapePropertyMap(
diff --git a/oox/inc/oox/drawingml/theme.hxx b/oox/inc/oox/drawingml/theme.hxx
index b2a039d..c83c7ed 100644
--- a/oox/inc/oox/drawingml/theme.hxx
+++ b/oox/inc/oox/drawingml/theme.hxx
@@ -33,6 +33,7 @@
#include "oox/drawingml/shape.hxx"
#include "oox/drawingml/textfont.hxx"
#include <com/sun/star/xml/dom/XDocument.hpp>
+#include "oox/dllapi.h"
namespace oox {
namespace drawingml {
@@ -50,7 +51,7 @@ typedef RefMap< sal_Int32, TextCharacterProperties > FontScheme;
// ============================================================================
-class Theme
+class OOX_DLLPUBLIC Theme
{
public:
explicit Theme();
diff --git a/oox/inc/oox/drawingml/themefragmenthandler.hxx b/oox/inc/oox/drawingml/themefragmenthandler.hxx
index 177cbd2..c3d32e3 100644
--- a/oox/inc/oox/drawingml/themefragmenthandler.hxx
+++ b/oox/inc/oox/drawingml/themefragmenthandler.hxx
@@ -30,6 +30,7 @@
#define OOX_DRAWINGML_THEMEFRAGMENTHANDLER_HXX
#include "oox/core/fragmenthandler2.hxx"
+#include "oox/dllapi.h"
namespace oox {
namespace drawingml {
@@ -38,7 +39,7 @@ class Theme;
// ============================================================================
-class ThemeFragmentHandler : public ::oox::core::FragmentHandler2
+class OOX_DLLPUBLIC ThemeFragmentHandler : public ::oox::core::FragmentHandler2
{
public:
explicit ThemeFragmentHandler(
diff --git a/oox/inc/oox/helper/attributelist.hxx b/oox/inc/oox/helper/attributelist.hxx
index c60c6f8..db03107 100644
--- a/oox/inc/oox/helper/attributelist.hxx
+++ b/oox/inc/oox/helper/attributelist.hxx
@@ -34,6 +34,7 @@
#include "oox/helper/helper.hxx"
#include "oox/token/namespaces.hxx"
#include "oox/token/tokens.hxx"
+#include "oox/dllapi.h"
namespace oox {
@@ -42,7 +43,7 @@ namespace oox {
/** Static helpers for conversion of strings to attribute values of various
different data types.
*/
-class AttributeConversion
+class OOX_DLLPUBLIC AttributeConversion
{
public:
/** Returns the XML token identifier from the passed string. */
@@ -76,7 +77,7 @@ public:
convenience functions that convert the string value of an attribute to
various other data types.
*/
-class AttributeList
+class OOX_DLLPUBLIC AttributeList
{
public:
explicit AttributeList(
diff --git a/oox/inc/oox/helper/binaryinputstream.hxx b/oox/inc/oox/helper/binaryinputstream.hxx
index 6e952a2..deed567 100644
--- a/oox/inc/oox/helper/binaryinputstream.hxx
+++ b/oox/inc/oox/helper/binaryinputstream.hxx
@@ -47,7 +47,7 @@ class BinaryOutputStream;
The binary data in the stream is assumed to be in little-endian format.
*/
-class BinaryInputStream : public virtual BinaryStreamBase
+class OOX_DLLPUBLIC BinaryInputStream : public virtual BinaryStreamBase
{
public:
/** Derived classes implement reading nBytes bytes to the passed sequence.
@@ -281,7 +281,7 @@ void BinaryInputStream::skipArray( sal_Int32 nElemCount )
The binary data in the stream is assumed to be in little-endian format.
*/
-class BinaryXInputStream : public BinaryXSeekableStream, public BinaryInputStream
+class OOX_DLLPUBLIC BinaryXInputStream : public BinaryXSeekableStream, public BinaryInputStream
{
public:
/** Constructs the wrapper object for the passed input stream.
@@ -333,7 +333,7 @@ private:
The binary data in the stream is assumed to be in little-endian format.
*/
-class SequenceInputStream : public SequenceSeekableStream, public BinaryInputStream
+class OOX_DLLPUBLIC SequenceInputStream : public SequenceSeekableStream, public BinaryInputStream
{
public:
/** Constructs the wrapper object for the passed data sequence.
diff --git a/oox/inc/oox/helper/binaryoutputstream.hxx b/oox/inc/oox/helper/binaryoutputstream.hxx
index b0cc8b2..773f0d0 100644
--- a/oox/inc/oox/helper/binaryoutputstream.hxx
+++ b/oox/inc/oox/helper/binaryoutputstream.hxx
@@ -166,7 +166,7 @@ private:
construction, the stream points to the beginning of the passed data
sequence. The data sequence is expanded automatically while writing to it.
*/
-class SequenceOutputStream : public SequenceSeekableStream, public BinaryOutputStream
+class OOX_DLLPUBLIC SequenceOutputStream : public SequenceSeekableStream, public BinaryOutputStream
{
public:
/** Constructs the wrapper object for the passed data sequence.
diff --git a/oox/inc/oox/helper/binarystreambase.hxx b/oox/inc/oox/helper/binarystreambase.hxx
index 5d2d3ca..5f7926b 100644
--- a/oox/inc/oox/helper/binarystreambase.hxx
+++ b/oox/inc/oox/helper/binarystreambase.hxx
@@ -32,6 +32,7 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <boost/shared_ptr.hpp>
#include "oox/helper/helper.hxx"
+#include "oox/dllapi.h"
namespace com { namespace sun { namespace star {
namespace io { class XSeekable; }
@@ -45,7 +46,7 @@ typedef ::com::sun::star::uno::Sequence< sal_Int8 > StreamDataSequence;
/** Base class for binary stream classes.
*/
-class BinaryStreamBase
+class OOX_DLLPUBLIC BinaryStreamBase
{
public:
virtual ~BinaryStreamBase();
@@ -134,7 +135,7 @@ private:
/** Base class for binary input and output streams wrapping a UNO stream,
seekable via the com.sun.star.io.XSeekable interface.
*/
-class BinaryXSeekableStream : public virtual BinaryStreamBase
+class OOX_DLLPUBLIC BinaryXSeekableStream : public virtual BinaryStreamBase
{
public:
virtual ~BinaryXSeekableStream();
@@ -166,7 +167,7 @@ private:
wrapper. The data sequence MUST NOT be changed from outside as long as this
stream wrapper is used to modify it.
*/
-class SequenceSeekableStream : public virtual BinaryStreamBase
+class OOX_DLLPUBLIC SequenceSeekableStream : public virtual BinaryStreamBase
{
public:
/** Returns the size of the wrapped data sequence. */
diff --git a/oox/inc/oox/helper/containerhelper.hxx b/oox/inc/oox/helper/containerhelper.hxx
index eef9429..ce71d52 100644
--- a/oox/inc/oox/helper/containerhelper.hxx
+++ b/oox/inc/oox/helper/containerhelper.hxx
@@ -33,6 +33,7 @@
#include <vector>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Sequence.h>
+#include "oox/dllapi.h"
namespace rtl { class OUString; }
@@ -73,7 +74,7 @@ typedef ::std::vector< ValueRange > ValueRangeVector;
/** An ordered list of value ranges. The insertion operation will merge
consecutive value ranges.
*/
-class ValueRangeSet
+class OOX_DLLPUBLIC ValueRangeSet
{
public:
inline explicit ValueRangeSet() {}
@@ -164,7 +165,7 @@ private:
// ============================================================================
/** Static helper functions for improved API container handling. */
-class ContainerHelper
+class OOX_DLLPUBLIC ContainerHelper
{
public:
// com.sun.star.container.XIndexContainer ---------------------------------
diff --git a/oox/inc/oox/helper/progressbar.hxx b/oox/inc/oox/helper/progressbar.hxx
index 898ede1..f0f350a 100644
--- a/oox/inc/oox/helper/progressbar.hxx
+++ b/oox/inc/oox/helper/progressbar.hxx
@@ -31,6 +31,7 @@
#include <boost/shared_ptr.hpp>
#include <com/sun/star/uno/Reference.hxx>
+#include "oox/dllapi.h"
namespace rtl { class OUString; }
@@ -92,7 +93,7 @@ public:
/** A simple progress bar.
*/
-class ProgressBar : public IProgressBar
+class OOX_DLLPUBLIC ProgressBar : public IProgressBar
{
public:
explicit ProgressBar(
@@ -116,7 +117,7 @@ private:
/** A progress bar containing several independent segments.
*/
-class SegmentProgressBar : public ISegmentProgressBar
+class OOX_DLLPUBLIC SegmentProgressBar : public ISegmentProgressBar
{
public:
explicit SegmentProgressBar(
diff --git a/oox/inc/oox/helper/propertymap.hxx b/oox/inc/oox/helper/propertymap.hxx
index dabd2e4..3cc8e1e 100644
--- a/oox/inc/oox/helper/propertymap.hxx
+++ b/oox/inc/oox/helper/propertymap.hxx
@@ -35,6 +35,7 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <rtl/ustring.hxx>
#include "oox/token/properties.hxx"
+#include "oox/dllapi.h"
namespace com { namespace sun { namespace star { namespace beans {
struct PropertyValue;
@@ -56,7 +57,7 @@ typedef ::std::map< sal_Int32, ::com::sun::star::uno::Any > PropertyMapBase;
name mapping is done internally while the properties are written to
property sets.
*/
-class PropertyMap : public PropertyMapBase
+class OOX_DLLPUBLIC PropertyMap : public PropertyMapBase
{
public:
explicit PropertyMap();
diff --git a/oox/inc/oox/helper/propertyset.hxx b/oox/inc/oox/helper/propertyset.hxx
index 14ca79b..fcdf66c 100644
--- a/oox/inc/oox/helper/propertyset.hxx
+++ b/oox/inc/oox/helper/propertyset.hxx
@@ -33,6 +33,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include "oox/token/properties.hxx"
+#include "oox/dllapi.h"
namespace oox {
@@ -55,7 +56,7 @@ class PropertyMap;
implementation does not support the XMultiPropertySet interface, all
properties are handled separately in a loop.
*/
-class PropertySet
+class OOX_DLLPUBLIC PropertySet
{
public:
inline explicit PropertySet() {}
diff --git a/oox/inc/oox/ole/axcontrol.hxx b/oox/inc/oox/ole/axcontrol.hxx
index ee3a9ac..b204b92 100644
--- a/oox/inc/oox/ole/axcontrol.hxx
+++ b/oox/inc/oox/ole/axcontrol.hxx
@@ -34,6 +34,7 @@
#include "oox/helper/propertyset.hxx"
#include "oox/ole/axbinaryreader.hxx"
#include "oox/ole/olehelper.hxx"
+#include "oox/dllapi.h"
namespace com { namespace sun { namespace star {
namespace awt { class XControlModel; }
@@ -197,7 +198,7 @@ enum ApiDefaultStateMode
/** A base class with useful helper functions for something that is able to
convert ActiveX and ComCtl form controls.
*/
-class ControlConverter
+class OOX_DLLPUBLIC ControlConverter
{
public:
explicit ControlConverter(
@@ -349,7 +350,7 @@ private:
// ============================================================================
/** Base class for all models of form controls. */
-class ControlModelBase
+class OOX_DLLPUBLIC ControlModelBase
{
public:
explicit ControlModelBase();
@@ -484,7 +485,7 @@ private:
// ============================================================================
/** Base class for all models of Form 2.0 form controls. */
-class AxControlModelBase : public ControlModelBase
+class OOX_DLLPUBLIC AxControlModelBase : public ControlModelBase
{
public:
explicit AxControlModelBase();
@@ -495,7 +496,7 @@ public:
// ============================================================================
/** Base class for Forms 2.0 controls supporting text formatting. */
-class AxFontDataModel : public AxControlModelBase
+class OOX_DLLPUBLIC AxFontDataModel : public AxControlModelBase
{
public:
explicit AxFontDataModel( bool bSupportsAlign = true );
@@ -519,7 +520,7 @@ private:
// ============================================================================
/** Model for a Forms 2.0 command button. */
-class AxCommandButtonModel : public AxFontDataModel
+class OOX_DLLPUBLIC AxCommandButtonModel : public AxFontDataModel
{
public:
explicit AxCommandButtonModel();
@@ -548,7 +549,7 @@ public: // direct access needed for legacy VML drawing controls
// ============================================================================
/** Model for a Forms 2.0 label. */
-class AxLabelModel : public AxFontDataModel
+class OOX_DLLPUBLIC AxLabelModel : public AxFontDataModel
{
public:
explicit AxLabelModel();
@@ -576,7 +577,7 @@ public: // direct access needed for legacy VML drawing controls
// ============================================================================
/** Model for a Forms 2.0 image. */
-class AxImageModel : public AxControlModelBase
+class OOX_DLLPUBLIC AxImageModel : public AxControlModelBase
{
public:
explicit AxImageModel();
@@ -605,7 +606,7 @@ private:
// ============================================================================
/** Base class for a Forms 2.0 morph data control. */
-class AxMorphDataModelBase : public AxFontDataModel
+class OOX_DLLPUBLIC AxMorphDataModelBase : public AxFontDataModel
{
public:
explicit AxMorphDataModelBase();
@@ -642,7 +643,7 @@ public: // direct access needed for legacy VML drawing controls
// ============================================================================
/** Model for a Forms 2.0 toggle button. */
-class AxToggleButtonModel : public AxMorphDataModelBase
+class OOX_DLLPUBLIC AxToggleButtonModel : public AxMorphDataModelBase
{
public:
explicit AxToggleButtonModel();
@@ -656,7 +657,7 @@ public:
// ============================================================================
/** Model for a Forms 2.0 check box. */
-class AxCheckBoxModel : public AxMorphDataModelBase
+class OOX_DLLPUBLIC AxCheckBoxModel : public AxMorphDataModelBase
{
public:
explicit AxCheckBoxModel();
@@ -670,7 +671,7 @@ public:
// ============================================================================
/** Model for a Forms 2.0 option button. */
-class AxOptionButtonModel : public AxMorphDataModelBase
+class OOX_DLLPUBLIC AxOptionButtonModel : public AxMorphDataModelBase
{
public:
explicit AxOptionButtonModel();
@@ -687,7 +688,7 @@ public:
// ============================================================================
/** Model for a Forms 2.0 text box. */
-class AxTextBoxModel : public AxMorphDataModelBase
+class OOX_DLLPUBLIC AxTextBoxModel : public AxMorphDataModelBase
{
public:
explicit AxTextBoxModel();
@@ -701,7 +702,7 @@ public:
// ============================================================================
/** Model for a numeric field (legacy drawing controls only). */
-class AxNumericFieldModel : public AxMorphDataModelBase
+class OOX_DLLPUBLIC AxNumericFieldModel : public AxMorphDataModelBase
{
public:
explicit AxNumericFieldModel();
@@ -715,7 +716,7 @@ public:
// ============================================================================
/** Model for a Forms 2.0 list box. */
-class AxListBoxModel : public AxMorphDataModelBase
+class OOX_DLLPUBLIC AxListBoxModel : public AxMorphDataModelBase
{
public:
explicit AxListBoxModel();
@@ -729,7 +730,7 @@ public:
// ============================================================================
/** Model for a Forms 2.0 combo box. */
-class AxComboBoxModel : public AxMorphDataModelBase
+class OOX_DLLPUBLIC AxComboBoxModel : public AxMorphDataModelBase
{
public:
explicit AxComboBoxModel();
@@ -743,7 +744,7 @@ public:
// ============================================================================
/** Model for a Forms 2.0 spin button. */
-class AxSpinButtonModel : public AxControlModelBase
+class OOX_DLLPUBLIC AxSpinButtonModel : public AxControlModelBase
{
public:
explicit AxSpinButtonModel();
@@ -772,7 +773,7 @@ public: // direct access needed for legacy VML drawing controls
// ============================================================================
/** Model for a Forms 2.0 scroll bar. */
-class AxScrollBarModel : public AxControlModelBase
+class OOX_DLLPUBLIC AxScrollBarModel : public AxControlModelBase
{
public:
explicit AxScrollBarModel();
@@ -803,7 +804,7 @@ public: // direct access needed for legacy VML drawing controls
// ============================================================================
/** Model for a Forms 2.0 tabstrip control. */
-class AxTabStripModel : public AxFontDataModel
+class OOX_DLLPUBLIC AxTabStripModel : public AxFontDataModel
{
public:
explicit AxTabStripModel();
@@ -833,7 +834,7 @@ typedef ::boost::shared_ptr< AxTabStripModel > AxTabStripModelRef;
typedef ::std::vector< ::rtl::OUString > AxClassTable;
/** Base class for ActiveX container controls. */
-class AxContainerModelBase : public AxFontDataModel
+class OOX_DLLPUBLIC AxContainerModelBase : public AxFontDataModel
{
public:
explicit AxContainerModelBase( bool bFontSupport = false );
@@ -874,7 +875,7 @@ typedef ::boost::shared_ptr< AxContainerModelBase > AxContainerModelRef;
// ============================================================================
/** Model for a Forms 2.0 frame control. */
-class AxFrameModel : public AxContainerModelBase
+class OOX_DLLPUBLIC AxFrameModel : public AxContainerModelBase
{
public:
explicit AxFrameModel();
@@ -886,7 +887,7 @@ public:
// ============================================================================
/** Model for a Forms 2.0 formpage control (a single page in a multipage control). */
-class AxFormPageModel : public AxContainerModelBase
+class OOX_DLLPUBLIC AxFormPageModel : public AxContainerModelBase
{
public:
explicit AxFormPageModel();
@@ -899,7 +900,7 @@ public:
/** Model for a Forms 2.0 multipage control. Contains the tabstrip control
(class AxTabStripModel) and the single pages (class AxFormPageModel). */
-class AxMultiPageModel : public AxContainerModelBase
+class OOX_DLLPUBLIC AxMultiPageModel : public AxContainerModelBase
{
public:
explicit AxMultiPageModel();
@@ -918,7 +919,7 @@ private:
// ============================================================================
/** Model for a Forms 2.0 user form. */
-class AxUserFormModel : public AxContainerModelBase
+class OOX_DLLPUBLIC AxUserFormModel : public AxContainerModelBase
{
public:
explicit AxUserFormModel();
@@ -947,7 +948,7 @@ public:
/** A form control embedded in a document draw page. Contains a specific model
structure according to the type of the control. */
-class EmbeddedControl
+class OOX_DLLPUBLIC EmbeddedControl
{
public:
explicit EmbeddedControl( const ::rtl::OUString& rName );
diff --git a/oox/inc/oox/ole/axfontdata.hxx b/oox/inc/oox/ole/axfontdata.hxx
index 2fba2ed..47a2db1 100644
--- a/oox/inc/oox/ole/axfontdata.hxx
+++ b/oox/inc/oox/ole/axfontdata.hxx
@@ -32,6 +32,7 @@
#include "oox/helper/binaryinputstream.hxx"
#include "oox/helper/binaryoutputstream.hxx"
#include "oox/helper/refvector.hxx"
+#include "oox/dllapi.h"
namespace oox {
namespace ole {
@@ -52,7 +53,7 @@ const sal_Int32 AX_FONTDATA_RIGHT = 2;
const sal_Int32 AX_FONTDATA_CENTER = 3;
/** All entries of a font property. */
-struct AxFontData
+struct OOX_DLLPUBLIC AxFontData
{
::rtl::OUString maFontName; /// Name of the used font.
sal_uInt32 mnFontEffects; /// Font effect flags.
diff --git a/oox/inc/oox/ole/vbaproject.hxx b/oox/inc/oox/ole/vbaproject.hxx
index f4af24a..cb1ee4f 100644
--- a/oox/inc/oox/ole/vbaproject.hxx
+++ b/oox/inc/oox/ole/vbaproject.hxx
@@ -33,6 +33,7 @@
#include <com/sun/star/uno/XInterface.hpp>
#include "oox/helper/refvector.hxx"
#include "oox/helper/storagebase.hxx"
+#include "oox/dllapi.h"
namespace com { namespace sun { namespace star {
namespace container { class XNameContainer; }
@@ -50,7 +51,7 @@ namespace ole {
// ============================================================================
-class VbaFilterConfig
+class OOX_DLLPUBLIC VbaFilterConfig
{
public:
explicit VbaFilterConfig(
@@ -89,7 +90,7 @@ private:
store all information needed to finally attach the macro to the action,
once the VBA project has been imported.
*/
-class VbaMacroAttacherBase
+class OOX_DLLPUBLIC VbaMacroAttacherBase
{
public:
explicit VbaMacroAttacherBase( const ::rtl::OUString& rMacroName );
diff --git a/oox/inc/oox/vml/vmldrawing.hxx b/oox/inc/oox/vml/vmldrawing.hxx
index 2b6ef0e..5415dee 100644
--- a/oox/inc/oox/vml/vmldrawing.hxx
+++ b/oox/inc/oox/vml/vmldrawing.hxx
@@ -33,6 +33,7 @@
#include <memory>
#include <vector>
#include <oox/ole/oleobjecthelper.hxx>
+#include "oox/dllapi.h"
namespace com { namespace sun { namespace star {
namespace awt { struct Rectangle; }
@@ -68,7 +69,7 @@ enum DrawingType
// ============================================================================
/** Contains information about an OLE object embedded in a draw page. */
-struct OleObjectInfo : public ::oox::ole::OleObjectInfo
+struct OOX_DLLPUBLIC OleObjectInfo : public ::oox::ole::OleObjectInfo
{
::rtl::OUString maShapeId; /// Shape identifier for shape lookup.
::rtl::OUString maName; /// Programmatical name of the OLE object.
@@ -81,10 +82,10 @@ struct OleObjectInfo : public ::oox::ole::OleObjectInfo
void setShapeId( sal_Int32 nShapeId );
};
-// ============================================================================
+// =========================================/===================================
/** Contains information about a form control embedded in a draw page. */
-struct ControlInfo
+struct OOX_DLLPUBLIC ControlInfo
{
::rtl::OUString maShapeId; /// Shape identifier for shape lookup.
::rtl::OUString maFragmentPath; /// Path to the fragment describing the form control properties.
@@ -99,7 +100,7 @@ struct ControlInfo
// ============================================================================
/** Represents the collection of VML shapes for a complete draw page. */
-class Drawing
+class OOX_DLLPUBLIC Drawing
{
public:
explicit Drawing(
diff --git a/oox/inc/oox/vml/vmldrawingfragment.hxx b/oox/inc/oox/vml/vmldrawingfragment.hxx
index 2b6be0e..8d630c7 100644
--- a/oox/inc/oox/vml/vmldrawingfragment.hxx
+++ b/oox/inc/oox/vml/vmldrawingfragment.hxx
@@ -30,6 +30,7 @@
#define OOX_VML_VMLDRAWINGFRAGMENT_HXX
#include "oox/core/fragmenthandler2.hxx"
+#include "oox/dllapi.h"
namespace oox {
namespace vml {
@@ -38,7 +39,7 @@ class Drawing;
// ============================================================================
-class DrawingFragment : public ::oox::core::FragmentHandler2
+class OOX_DLLPUBLIC DrawingFragment : public ::oox::core::FragmentHandler2
{
public:
explicit DrawingFragment(
diff --git a/oox/inc/oox/vml/vmlformatting.hxx b/oox/inc/oox/vml/vmlformatting.hxx
index 627da96..25f7a55 100644
--- a/oox/inc/oox/vml/vmlformatting.hxx
+++ b/oox/inc/oox/vml/vmlformatting.hxx
@@ -30,6 +30,7 @@
#define OOX_VML_VMLFORMATTING_HXX
#include "oox/helper/helper.hxx"
+#include "oox/dllapi.h"
namespace oox {
class GraphicHelper;
@@ -47,7 +48,7 @@ typedef ::std::pair< double, double > DoublePair;
// ============================================================================
-class ConversionHelper
+class OOX_DLLPUBLIC ConversionHelper
{
public:
/** Returns two values contained in rValue separated by cSep.
diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index 65683f7..1998a02 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -33,6 +33,7 @@
#include <vector>
#include <com/sun/star/awt/Point.hpp>
#include "oox/vml/vmlformatting.hxx"
+#include "oox/dllapi.h"
namespace com { namespace sun { namespace star {
namespace awt { struct Rectangle; }
@@ -196,7 +197,7 @@ struct ShapeModel
/** A shape object that is part of a drawing. May inherit properties from a
shape template. */
-class ShapeBase : public ShapeType
+class OOX_DLLPUBLIC ShapeBase : public ShapeType
{
public:
/** Returns read/write access to the shape model structure. */
diff --git a/oox/inc/oox/vml/vmltextbox.hxx b/oox/inc/oox/vml/vmltextbox.hxx
index 6ba9e12..cc2e41b 100644
--- a/oox/inc/oox/vml/vmltextbox.hxx
+++ b/oox/inc/oox/vml/vmltextbox.hxx
@@ -32,6 +32,7 @@
#include <vector>
#include <rtl/ustring.hxx>
#include "oox/helper/helper.hxx"
+#include "oox/dllapi.h"
namespace oox {
namespace vml {
@@ -39,7 +40,7 @@ namespace vml {
// ============================================================================
/** Font settings for a text portion in a textbox. */
-struct TextFontModel
+struct OOX_DLLPUBLIC TextFontModel
{
OptValue< ::rtl::OUString > moName; /// Font name.
OptValue< ::rtl::OUString > moColor; /// Font color, HTML encoded, sort of.
@@ -67,7 +68,7 @@ struct TextPortionModel
// ============================================================================
/** The textbox contains all text contents and properties. */
-class TextBox
+class OOX_DLLPUBLIC TextBox
{
public:
explicit TextBox();
diff --git a/oox/inc/oox/xls/addressconverter.hxx b/oox/inc/oox/xls/addressconverter.hxx
deleted file mode 100644
index 47de4ba..0000000
--- a/oox/inc/oox/xls/addressconverter.hxx
+++ /dev/null
@@ -1,672 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef OOX_XLS_ADDRESSCONVERTER_HXX
-#define OOX_XLS_ADDRESSCONVERTER_HXX
-
-#include <vector>
-#include <com/sun/star/table/CellAddress.hpp>
-#include <com/sun/star/table/CellRangeAddress.hpp>
-#include "oox/xls/workbookhelper.hxx"
-
-namespace oox {
-namespace xls {
-
-class BiffInputStream;
-class BiffOutputStream;
-
-// ============================================================================
-// ============================================================================
-
-/** A vector of com.sun.star.table.CellRangeAddress elements and additional
- functionality. */
-class ApiCellRangeList : public ::std::vector< ::com::sun::star::table::CellRangeAddress >
-{
-public:
- inline explicit ApiCellRangeList() {}
-
- /** Returns the base address of this range list (top-left cell of first range). */
- ::com::sun::star::table::CellAddress
- getBaseAddress() const;
-};
-
-// ============================================================================
-
-/** A 2D cell address struct for binary filters. */
-struct BinAddress
-{
- sal_Int32 mnCol;
- sal_Int32 mnRow;
-
- inline explicit BinAddress() : mnCol( 0 ), mnRow( 0 ) {}
- inline explicit BinAddress( sal_Int32 nCol, sal_Int32 nRow ) : mnCol( nCol ), mnRow( nRow ) {}
- inline explicit BinAddress( const ::com::sun::star::table::CellAddress& rAddr ) : mnCol( rAddr.Column ), mnRow( rAddr.Row ) {}
-
- inline void set( sal_Int32 nCol, sal_Int32 nRow ) { mnCol = nCol; mnRow = nRow; }
- inline void set( const ::com::sun::star::table::CellAddress& rAddr ) { mnCol = rAddr.Column; mnRow = rAddr.Row; }
-
- void read( SequenceInputStream& rStrm );
- void read( BiffInputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false );
- void write( BiffOutputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false ) const;
-};
-
-// ----------------------------------------------------------------------------
-
-inline bool operator==( const BinAddress& rL, const BinAddress& rR )
-{
- return (rL.mnCol == rR.mnCol) && (rL.mnRow == rR.mnRow);
-}
-
-inline bool operator<( const BinAddress& rL, const BinAddress& rR )
-{
- return (rL.mnCol < rR.mnCol) || ((rL.mnCol == rR.mnCol) && (rL.mnRow < rR.mnRow));
-}
-
-inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, BinAddress& orPos )
-{
- orPos.read( rStrm );
- return rStrm;
-}
-
-inline BiffInputStream& operator>>( BiffInputStream& rStrm, BinAddress& orPos )
-{
- orPos.read( rStrm );
- return rStrm;
-}
-
-inline BiffOutputStream& operator<<( BiffOutputStream& rStrm, const BinAddress& rPos )
-{
- rPos.write( rStrm );
- return rStrm;
-}
-
-// ============================================================================
-
-/** A 2D cell range address struct for binary filters. */
-struct BinRange
-{
- BinAddress maFirst;
- BinAddress maLast;
-
- inline explicit BinRange() {}
- inline explicit BinRange( const BinAddress& rAddr ) : maFirst( rAddr ), maLast( rAddr ) {}
- inline explicit BinRange( const BinAddress& rFirst, const BinAddress& rLast ) : maFirst( rFirst ), maLast( rLast ) {}
- inline explicit BinRange( sal_Int32 nCol1, sal_Int32 nRow1, sal_Int32 nCol2, sal_Int32 nRow2 ) :
- maFirst( nCol1, nRow1 ), maLast( nCol2, nRow2 ) {}
- inline explicit BinRange( const ::com::sun::star::table::CellAddress& rAddr ) : maFirst( rAddr ), maLast( rAddr ) {}
- inline explicit BinRange( const ::com::sun::star::table::CellAddress& rFirst, const ::com::sun::star::table::CellAddress& rLast ) : maFirst( rFirst ), maLast( rLast ) {}
- inline explicit BinRange( const ::com::sun::star::table::CellRangeAddress& rRange ) : maFirst( rRange.StartColumn, rRange.StartRow ), maLast( rRange.EndColumn, rRange.EndRow ) {}
-
- inline void set( const BinAddress& rFirst, const BinAddress& rLast )
- { maFirst = rFirst; maLast = rLast; }
- inline void set( sal_Int32 nCol1, sal_Int32 nRow1, sal_Int32 nCol2, sal_Int32 nRow2 )
- { maFirst.set( nCol1, nRow1 ); maLast.set( nCol2, nRow2 ); }
- inline void set( const ::com::sun::star::table::CellAddress& rFirst, const ::com::sun::star::table::CellAddress& rLast )
- { maFirst.set( rFirst ); maLast.set( rLast ); }
- inline void set( const ::com::sun::star::table::CellRangeAddress& rRange )
- { maFirst.set( rRange.StartColumn, rRange.StartRow ); maLast.set( rRange.EndColumn, rRange.EndRow ); }
-
- inline sal_Int32 getColCount() const { return maLast.mnCol - maFirst.mnCol + 1; }
- inline sal_Int32 getRowCount() const { return maLast.mnRow - maFirst.mnRow + 1; }
- bool contains( const BinAddress& rAddr ) const;
-
- void read( SequenceInputStream& rStrm );
- void read( BiffInputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false );
- void write( BiffOutputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false ) const;
-};
-
-// ----------------------------------------------------------------------------
-
-inline bool operator==( const BinRange& rL, const BinRange& rR )
-{
- return (rL.maFirst == rR.maFirst) && (rL.maLast == rR.maLast);
-}
-
-inline bool operator<( const BinRange& rL, const BinRange& rR )
-{
- return (rL.maFirst < rR.maFirst) || ((rL.maFirst == rR.maFirst) && (rL.maLast < rR.maLast));
-}
-
-inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, BinRange& orRange )
-{
- orRange.read( rStrm );
- return rStrm;
-}
-
-inline BiffInputStream& operator>>( BiffInputStream& rStrm, BinRange& orRange )
-{
- orRange.read( rStrm );
- return rStrm;
-}
-
-inline BiffOutputStream& operator<<( BiffOutputStream& rStrm, const BinRange& rRange )
-{
- rRange.write( rStrm );
- return rStrm;
-}
-
-// ============================================================================
-
-/** A 2D cell range address list for binary filters. */
-class BinRangeList : public ::std::vector< BinRange >
-{
-public:
- inline explicit BinRangeList() {}
-
- void read( SequenceInputStream& rStrm );
- void read( BiffInputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false );
- void write( BiffOutputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false ) const;
- void writeSubList( BiffOutputStream& rStrm,
- size_t nBegin, size_t nCount, bool bCol16Bit = true, bool bRow32Bit = false ) const;
-};
-
-// ----------------------------------------------------------------------------
-
-inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, BinRangeList& orRanges )
-{
- orRanges.read( rStrm );
- return rStrm;
-}
-
-inline BiffInputStream& operator>>( BiffInputStream& rStrm, BinRangeList& orRanges )
-{
- orRanges.read( rStrm );
- return rStrm;
-}
-
-inline BiffOutputStream& operator<<( BiffOutputStream& rStrm, const BinRangeList& rRanges )
-{
- rRanges.write( rStrm );
- return rStrm;
-}
-
-// ============================================================================
-
-/** Different target types that can be encoded in a BIFF URL. */
-enum BiffTargetType
-{
- BIFF_TARGETTYPE_URL, /// URL, URL with sheet name, or sheet name.
- BIFF_TARGETTYPE_SAMESHEET, /// Target for special '!A1' syntax to refer to current sheet.
- BIFF_TARGETTYPE_LIBRARY, /// Library directory in application installation.
- BIFF_TARGETTYPE_DDE_OLE, /// DDE server/topic or OLE class/target.
- BIFF_TARGETTYPE_UNKNOWN /// Unknown/unsupported target type.
-};
-
-// ============================================================================
-// ============================================================================
-
-/** Converter for cell addresses and cell ranges for OOXML and BIFF filters.
- */
-class AddressConverter : public WorkbookHelper
-{
-public:
- explicit AddressConverter( const WorkbookHelper& rHelper );
-
- // ------------------------------------------------------------------------
-
- /** Tries to parse the passed string for a 2d cell address in A1 notation.
-
- This function accepts all strings that match the regular expression
- "[a-zA-Z]{1,6}0*[1-9][0-9]{0,8}" (without quotes), i.e. 1 to 6 letters
- for the column index (translated to 0-based column indexes from 0 to
- 321,272,405), and 1 to 9 digits for the 1-based row index (translated
- to 0-based row indexes from 0 to 999,999,998). The row number part may
- contain leading zeros, they will be ignored. It is up to the caller to
- handle cell addresses outside of a specific valid range (e.g. the
- entire spreadsheet).
-
- @param ornColumn (out-parameter) Returns the converted column index.
- @param ornRow (out-parameter) returns the converted row index.
- @param rString The string containing the cell address.
- @param nStart Start index of string part in rString to be parsed.
- @param nLength Length of string part in rString to be parsed.
-
- @return true = Parsed string was valid, returned values can be used.
- */
- static bool parseOoxAddress2d(
- sal_Int32& ornColumn, sal_Int32& ornRow,
- const ::rtl::OUString& rString,
- sal_Int32 nStart = 0,
- sal_Int32 nLength = SAL_MAX_INT32 );
-
- /** Tries to parse the passed string for a 2d cell range in A1 notation.
-
- This function accepts all strings that match the regular expression
- "ADDR(:ADDR)?" (without quotes), where ADDR is a cell address accepted
- by the parseOoxAddress2d() function of this class. It is up to the
- caller to handle cell ranges outside of a specific valid range (e.g.
- the entire spreadsheet).
-
- @param ornStartColumn (out-parameter) Returns the converted start column index.
- @param ornStartRow (out-parameter) returns the converted start row index.
- @param ornEndColumn (out-parameter) Returns the converted end column index.
- @param ornEndRow (out-parameter) returns the converted end row index.
- @param rString The string containing the cell address.
- @param nStart Start index of string part in rString to be parsed.
- @param nLength Length of string part in rString to be parsed.
-
- @return true = Parsed string was valid, returned values can be used.
- */
- static bool parseOoxRange2d(
- sal_Int32& ornStartColumn, sal_Int32& ornStartRow,
- sal_Int32& ornEndColumn, sal_Int32& ornEndRow,
- const ::rtl::OUString& rString,
- sal_Int32 nStart = 0,
- sal_Int32 nLength = SAL_MAX_INT32 );
-
- /** Tries to parse an encoded name of an external link target in BIFF
- documents, e.g. from EXTERNSHEET or SUPBOOK records.
-
- @param orClassName (out-parameter) DDE server name or OLE class name.
- @param orTargetUrl (out-parameter) Target URL, DDE topic or OLE object name.
- @param orSheetName (out-parameter) Sheet name in target document.
- @param rBiffEncoded Encoded name of the external link target.
- @param bFromDConRec True = path from DCONREF/DCONNAME/DCONBINAME records, false = other records.
-
- @return Type of the decoded target.
- */
- BiffTargetType parseBiffTargetUrl(
- ::rtl::OUString& orClassName,
- ::rtl::OUString& orTargetUrl,
- ::rtl::OUString& orSheetName,
- const ::rtl::OUString& rBiffTargetUrl,
- bool bFromDConRec = false );
-
- // ------------------------------------------------------------------------
-
- /** Returns the biggest valid cell address in the own Calc document. */
- inline const ::com::sun::star::table::CellAddress&
- getMaxApiAddress() const { return maMaxApiPos; }
-
- /** Returns the biggest valid cell address in the imported/exported
- Excel document. */
- inline const ::com::sun::star::table::CellAddress&
- getMaxXlsAddress() const { return maMaxXlsPos; }
-
- /** Returns the biggest valid cell address in both Calc and the
- imported/exported Excel document. */
- inline const ::com::sun::star::table::CellAddress&
- getMaxAddress() const { return maMaxPos; }
-
- /** Returns the column overflow status. */
- inline bool isColOverflow() const { return mbColOverflow; }
- /** Returns the row overflow status. */
- inline bool isRowOverflow() const { return mbRowOverflow; }
- /** Returns the sheet overflow status. */
- inline bool isTabOverflow() const { return mbTabOverflow; }
-
- // ------------------------------------------------------------------------
-
- /** Checks if the passed column index is valid.
-
- @param nCol The column index to check.
- @param bTrackOverflow true = Update the internal overflow flag, if the
- column index is outside of the supported limits.
- @return true = Passed column index is valid (no index overflow).
- */
- bool checkCol( sal_Int32 nCol, bool bTrackOverflow );
-
- /** Checks if the passed row index is valid.
-
- @param nRow The row index to check.
- @param bTrackOverflow true = Update the internal overflow flag, if the
- row index is outside of the supported limits.
- @return true = Passed row index is valid (no index overflow).
- */
- bool checkRow( sal_Int32 nRow, bool bTrackOverflow );
-
- /** Checks if the passed sheet index is valid.
-
- @param nSheet The sheet index to check.
- @param bTrackOverflow true = Update the internal overflow flag, if the
- sheet index is outside of the supported limits.
- @return true = Passed sheet index is valid (no index overflow).
- */
- bool checkTab( sal_Int16 nSheet, bool bTrackOverflow );
-
- // ------------------------------------------------------------------------
-
- /** Checks the passed cell address if it fits into the spreadsheet limits.
-
- @param rAddress The cell address to be checked.
- @param bTrackOverflow true = Update the internal overflow flags, if
- the address is outside of the supported sheet limits.
- @return true = Passed address is valid (no index overflow).
- */
- bool checkCellAddress(
- const ::com::sun::star::table::CellAddress& rAddress,
- bool bTrackOverflow );
-
- /** Converts the passed string to a single cell address, without checking
- any sheet limits.
-
- @param orAddress (out-parameter) Returns the converted cell address.
- @param rString Cell address string in A1 notation.
- @param nSheet Sheet index to be inserted into orAddress.
- @return true = Cell address could be parsed from the passed string.
- */
- bool convertToCellAddressUnchecked(
- ::com::sun::star::table::CellAddress& orAddress,
- const ::rtl::OUString& rString,
- sal_Int16 nSheet );
-
- /** Tries to convert the passed string to a single cell address.
-
- @param orAddress (out-parameter) Returns the converted cell address.
- @param rString Cell address string in A1 notation.
- @param nSheet Sheet index to be inserted into orAddress (will be checked).
- @param bTrackOverflow true = Update the internal overflow flags, if
- the address is outside of the supported sheet limits.
- @return true = Converted address is valid (no index overflow).
- */
- bool convertToCellAddress(
- ::com::sun::star::table::CellAddress& orAddress,
- const ::rtl::OUString& rString,
- sal_Int16 nSheet,
- bool bTrackOverflow );
-
- /** Returns a valid cell address by moving it into allowed dimensions.
-
- @param rString Cell address string in A1 notation.
- @param nSheet Sheet index for the returned address (will be checked).
- @param bTrackOverflow true = Update the internal overflow flags, if
- the address is outside of the supported sheet limits.
- @return A valid API cell address struct. */
- ::com::sun::star::table::CellAddress
- createValidCellAddress(
- const ::rtl::OUString& rString,
- sal_Int16 nSheet,
- bool bTrackOverflow );
-
- /** Converts the passed address to a single cell address, without checking
- any sheet limits.
-
- @param orAddress (out-parameter) Returns the converted cell address.
- @param rBinAddress Binary cell address struct.
- @param nSheet Sheet index to be inserted into orAddress.
- */
- void convertToCellAddressUnchecked(
- ::com::sun::star::table::CellAddress& orAddress,
- const BinAddress& rBinAddress,
- sal_Int16 nSheet );
-
- /** Tries to convert the passed address to a single cell address.
-
- @param orAddress (out-parameter) Returns the converted cell address.
- @param rBinAddress Binary cell address struct.
- @param nSheet Sheet index to be inserted into orAddress (will be checked).
- @param bTrackOverflow true = Update the internal overflow flags, if
- the address is outside of the supported sheet limits.
- @return true = Converted address is valid (no index overflow).
- */
- bool convertToCellAddress(
- ::com::sun::star::table::CellAddress& orAddress,
- const BinAddress& rBinAddress,
- sal_Int16 nSheet,
- bool bTrackOverflow );
-
- /** Returns a valid cell address by moving it into allowed dimensions.
-
- @param rBinAddress Binary cell address struct.
- @param nSheet Sheet index for the returned address (will be checked).
- @param bTrackOverflow true = Update the internal overflow flags, if
- the address is outside of the supported sheet limits.
- @return A valid API cell address struct. */
- ::com::sun::star::table::CellAddress
- createValidCellAddress(
- const BinAddress& rBinAddress,
- sal_Int16 nSheet,
- bool bTrackOverflow );
-
- // ------------------------------------------------------------------------
-
- /** Checks the passed cell range if it fits into the spreadsheet limits.
-
- @param rRange The cell range address to be checked.
- @param bAllowOverflow true = Allow ranges that start inside the
- supported sheet limits but may end outside of these limits.
- false = Do not allow ranges that overflow the supported limits.
- @param bTrackOverflow true = Update the internal overflow flags, if
- the passed range contains cells outside of the supported sheet
- limits.
- @return true = Cell range is valid. This function returns also true,
- if only parts of the range are outside the current sheet limits and
- such an overflow is allowed via parameter bAllowOverflow. Returns
- false, if the entire range is outside the sheet limits, or if
- overflow is not allowed via parameter bAllowOverflow.
- */
- bool checkCellRange(
- const ::com::sun::star::table::CellRangeAddress& rRange,
- bool bAllowOverflow, bool bTrackOverflow );
-
- /** Checks the passed cell range, may try to fit it to current sheet limits.
-
- First, this function reorders the column and row indexes so that the
- starting indexes are less than or equal to the end indexes. Then,
- depending on the parameter bAllowOverflow, the range is just checked or
- cropped to the current sheet limits.
-
- @param orRange (in-out-parameter) Converts the passed cell range
- into a valid cell range address. If the passed range contains cells
- outside the currently supported spreadsheet limits, it will be
- cropped to these limits.
- @param bAllowOverflow true = Allow ranges that start inside the
- supported sheet limits but may end outside of these limits. The
- cell range returned in orRange will be cropped to these limits.
- false = Do not allow ranges that overflow the supported limits. The
- function will return false when the range overflows the sheet limits.
- @param bTrackOverflow true = Update the internal overflow flags, if
- the original range contains cells outside of the supported sheet
- limits.
- @return true = Converted range address is valid. This function
- returns also true, if overflowing ranges are allowed via parameter
- bAllowOverflow and the range has been cropped, but still contains
- cells inside the current sheet limits. Returns false, if the entire
- range is outside the sheet limits or overflowing ranges are not
- allowed via parameter bAllowOverflow.
- */
- bool validateCellRange(
- ::com::sun::star::table::CellRangeAddress& orRange,
- bool bAllowOverflow, bool bTrackOverflow );
-
- /** Converts the passed string to a cell range address, without checking
- any sheet limits.
-
- @param orRange (out-parameter) Returns the converted range address.
- @param rString Cell range string in A1 notation.
- @param nSheet Sheet index to be inserted into orRange.
- @return true = Range address could be parsed from the passed string.
- */
- bool convertToCellRangeUnchecked(
- ::com::sun::star::table::CellRangeAddress& orRange,
- const ::rtl::OUString& rString,
- sal_Int16 nSheet );
-
- /** Tries to convert the passed string to a cell range address.
-
- @param orRange (out-parameter) Returns the converted cell range
- address. If the original range in the passed string contains cells
- outside the currently supported spreadsheet limits, and parameter
- bAllowOverflow is set to true, the range will be cropped to these
- limits. Example: the range string "A1:ZZ100000" may be converted to
- the range A1:IV65536.
- @param rString Cell range string in A1 notation.
- @param nSheet Sheet index to be inserted into orRange (will be checked).
- @param bAllowOverflow true = Allow ranges that start inside the
- supported sheet limits but may end outside of these limits. The
- cell range returned in orRange will be cropped to these limits.
- false = Do not allow ranges that overflow the supported limits.
- @param bTrackOverflow true = Update the internal overflow flags, if
- the original range contains cells outside of the supported sheet
- limits.
- @return true = Converted and returned range is valid. This function
- returns also true, if overflowing ranges are allowed via parameter
- bAllowOverflow and the range has been cropped, but still contains
- cells inside the current sheet limits. Returns false, if the entire
- range is outside the sheet limits or overflowing ranges are not
- allowed via parameter bAllowOverflow.
- */
- bool convertToCellRange(
- ::com::sun::star::table::CellRangeAddress& orRange,
- const ::rtl::OUString& rString,
- sal_Int16 nSheet,
- bool bAllowOverflow, bool bTrackOverflow );
-
- /** Converts the passed range to a cell range address, without checking any
- sheet limits.
-
- @param orRange (out-parameter) Returns the converted range address.
- @param rBinRange Binary cell range struct.
- @param nSheet Sheet index to be inserted into orRange.
- */
- void convertToCellRangeUnchecked(
- ::com::sun::star::table::CellRangeAddress& orRange,
- const BinRange& rBinRange,
- sal_Int16 nSheet );
-
- /** Tries to convert the passed range to a cell range address.
-
- @param orRange (out-parameter) Returns the converted cell range
- address. If the passed original range contains cells outside the
- currently supported spreadsheet limits, and parameter bAllowOverflow
- is set to true, the range will be cropped to these limits.
- @param rBinRange Binary cell range struct.
- @param nSheet Sheet index to be inserted into orRange (will be checked).
- @param bAllowOverflow true = Allow ranges that start inside the
- supported sheet limits but may end outside of these limits. The
- cell range returned in orRange will be cropped to these limits.
- false = Do not allow ranges that overflow the supported limits.
- @param bTrackOverflow true = Update the internal overflow flags, if
- the original range contains cells outside of the supported sheet
- limits.
- @return true = Converted and returned range is valid. This function
- returns also true, if overflowing ranges are allowed via parameter
- bAllowOverflow and the range has been cropped, but still contains
- cells inside the current sheet limits. Returns false, if the entire
- range is outside the sheet limits or if overflowing ranges are not
- allowed via parameter bAllowOverflow.
- */
- bool convertToCellRange(
- ::com::sun::star::table::CellRangeAddress& orRange,
- const BinRange& rBinRange,
- sal_Int16 nSheet,
- bool bAllowOverflow, bool bTrackOverflow );
-
- // ------------------------------------------------------------------------
-
- /** Tries to restrict the passed cell range list to current sheet limits.
-
- @param orRanges (in-out-parameter) Restricts the cell range addresses
- in the passed list to the current sheet limits and removes invalid
- ranges from the list.
- @param bTrackOverflow true = Update the internal overflow flags, if
- the original ranges contain cells outside of the supported sheet
- limits.
- */
- void validateCellRangeList(
- ApiCellRangeList& orRanges,
- bool bTrackOverflow );
-
- /** Tries to convert the passed string to a cell range list.
-
- @param orRanges (out-parameter) Returns the converted cell range
- addresses. If a range in the passed string contains cells outside
- the currently supported spreadsheet limits, it will be cropped to
- these limits. Example: the range string "A1:ZZ100000" may be
- converted to the range A1:IV65536. If a range is completely outside
- the limits, it will be omitted.
- @param rString Cell range list string in A1 notation, space separated.
- @param nSheet Sheet index to be inserted into orRanges (will be checked).
- @param bTrackOverflow true = Update the internal overflow flags, if
- the original ranges contain cells outside of the supported sheet
- limits.
- */
- void convertToCellRangeList(
- ApiCellRangeList& orRanges,
- const ::rtl::OUString& rString,
- sal_Int16 nSheet,
- bool bTrackOverflow );
-
- /** Tries to convert the passed range list to a cell range list.
-
- @param orRanges (out-parameter) Returns the converted cell range
- addresses. If a range in the passed string contains cells outside
- the currently supported spreadsheet limits, it will be cropped to
- these limits. Example: the range string "A1:ZZ100000" may be
- converted to the range A1:IV65536. If a range is completely outside
- the limits, it will be omitted.
- @param rBinRanges List of binary cell range objects.
- @param nSheet Sheet index to be inserted into orRanges (will be checked).
- @param bTrackOverflow true = Update the internal overflow flags, if
- the original ranges contain cells outside of the supported sheet
- limits.
- */
- void convertToCellRangeList(
- ApiCellRangeList& orRanges,
- const BinRangeList& rBinRanges,
- sal_Int16 nSheet,
- bool bTrackOverflow );
-
- // ------------------------------------------------------------------------
-private:
- void initializeMaxPos(
- sal_Int16 nMaxXlsTab, sal_Int32 nMaxXlsCol, sal_Int32 nMaxXlsRow );
-
-private:
- struct ControlCharacters
- {
- sal_Unicode mcThisWorkbook; /// Control character: Link to current workbook.
- sal_Unicode mcExternal; /// Control character: Link to external workbook/sheet.
- sal_Unicode mcThisSheet; /// Control character: Link to current sheet.
- sal_Unicode mcInternal; /// Control character: Link to internal sheet.
- sal_Unicode mcSameSheet; /// Control character: Link to same sheet (special '!A1' syntax).
-
- void set(
- sal_Unicode cThisWorkbook, sal_Unicode cExternal,
- sal_Unicode cThisSheet, sal_Unicode cInternal,
- sal_Unicode cSameSheet );
- };
-
- ::com::sun::star::table::CellAddress maMaxApiPos; /// Maximum valid cell address in Calc.
- ::com::sun::star::table::CellAddress maMaxXlsPos; /// Maximum valid cell address in Excel.
- ::com::sun::star::table::CellAddress maMaxPos; /// Maximum valid cell address in Calc/Excel.
- ControlCharacters maLinkChars; /// Control characters for external link import (BIFF).
- ControlCharacters maDConChars; /// Control characters for DCON* record import (BIFF).
- bool mbColOverflow; /// Flag for "columns overflow".
- bool mbRowOverflow; /// Flag for "rows overflow".
- bool mbTabOverflow; /// Flag for "tables overflow".
-};
-
-// ============================================================================
-
-} // namespace xls
-} // namespace oox
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/inc/oox/xls/autofilterbuffer.hxx b/oox/inc/oox/xls/autofilterbuffer.hxx
deleted file mode 100644
index 493c512..0000000
--- a/oox/inc/oox/xls/autofilterbuffer.hxx
+++ /dev/null
@@ -1,285 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef OOX_XLS_AUTOFILTERBUFFER_HXX
-#define OOX_XLS_AUTOFILTERBUFFER_HXX
-
-#include <com/sun/star/table/CellRangeAddress.hpp>
-#include "oox/helper/refvector.hxx"
-#include "oox/xls/workbookhelper.hxx"
-
-namespace com { namespace sun { namespace star {
- namespace sheet { struct TableFilterField3; }
- namespace sheet { class XDatabaseRange; }
- namespace sheet { class XSheetFilterDescriptor3; }
-} } }
-
-namespace oox {
-namespace xls {
-
-// ============================================================================
-
-/** Contains UNO API filter settings for a column in a filtered range. */
-struct ApiFilterSettings
-{
- typedef ::std::vector<com::sun::star::sheet::TableFilterField3> FilterFieldVector;
-
- FilterFieldVector maFilterFields; /// List of UNO API filter settings.
- OptValue< bool > mobNeedsRegExp; /// If set, requires regular expressions to be enabled/disabled.
-
- explicit ApiFilterSettings();
-
- void appendField( bool bAnd, sal_Int32 nOperator, double fValue );
- void appendField( bool bAnd, sal_Int32 nOperator, const ::rtl::OUString& rValue );
- void appendField( bool bAnd, const std::vector<rtl::OUString>& rValues );
-};
-
-// ============================================================================
-
-/** Base class for specific filter settings for a column in a filtered range.
- */
-class FilterSettingsBase : public WorkbookHelper
-{
-public:
- explicit FilterSettingsBase( const WorkbookHelper& rHelper );
-
- /** Derived classes import filter settings from the passed attribute list. */
- virtual void importAttribs( sal_Int32 nElement, const AttributeList& rAttribs );
- /** Derived classes import filter settings from the passed record. */
- virtual void importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm );
- /** Derived classes import filter settings from the FILTERCOLUMN record. */
- virtual void importBiffRecord( BiffInputStream& rStrm, sal_uInt16 nFlags );
-
- /** Derived classes return converted UNO API filter settings representing all filter settings. */
- virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount );
-};
-
-typedef ::boost::shared_ptr< FilterSettingsBase > FilterSettingsRef;
-
-// ============================================================================
-
-/** Settings for a discrete filter, specifying a list of values to be shown in
- the filtered range.
- */
-class DiscreteFilter : public FilterSettingsBase
-{
-public:
- explicit DiscreteFilter( const WorkbookHelper& rHelper );
-
- /** Imports filter settings from the filters and filter elements. */
- virtual void importAttribs( sal_Int32 nElement, const AttributeList& rAttribs );
- /** Imports filter settings from the FILTERS and FILTER records. */
- virtual void importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm );
-
- /** Returns converted UNO API filter settings representing all filter settings. */
- virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount );
-
-private:
- typedef ::std::vector< ::rtl::OUString > FilterValueVector;
-
- FilterValueVector maValues;
- sal_Int32 mnCalendarType;
- bool mbShowBlank;
-};
-
-// ============================================================================
-
-/** Settings for a top-10 filter. */
-class Top10Filter : public FilterSettingsBase
-{
-public:
- explicit Top10Filter( const WorkbookHelper& rHelper );
-
- /** Imports filter settings from the filters and filter elements. */
- virtual void importAttribs( sal_Int32 nElement, const AttributeList& rAttribs );
- /** Imports filter settings from the FILTERS and FILTER records. */
- virtual void importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm );
- /** Imports filter settings from the FILTERCOLUMN record. */
- virtual void importBiffRecord( BiffInputStream& rStrm, sal_uInt16 nFlags );
-
- /** Returns converted UNO API filter settings representing all filter settings. */
- virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount );
-
-private:
- double mfValue; /// Number of items or percentage.
- bool mbTop; /// True = show top (greatest) items/percentage.
- bool mbPercent; /// True = percentage, false = number of items.
-};
-
-// ============================================================================
-
-/** A filter criterion for a custom filter. */
-struct FilterCriterionModel
-{
- ::com::sun::star::uno::Any maValue; /// Comparison operand.
- sal_Int32 mnOperator; /// Comparison operator.
- sal_uInt8 mnDataType; /// Operand data type (BIFF only).
- sal_uInt8 mnStrLen; /// Length of string operand (BIFF5-BIFF8 only).
-
- explicit FilterCriterionModel();
-
- /** Sets the passed BIFF operator constant. */
- void setBiffOperator( sal_uInt8 nOperator );
-
- /** Imports the criterion model from the passed BIFF12 stream. */
- void readBiffData( SequenceInputStream& rStrm );
- /** Imports the initial criterion data from the passed BIFF5/BIFF8 stream. */
- void readBiffData( BiffInputStream& rStrm );
- /** Imports the trailing string data from the passed BIFF5/BIFF8 stream. */
- void readString( BiffInputStream& rStrm, BiffType eBiff, rtl_TextEncoding eTextEnc );
-};
-
-// ----------------------------------------------------------------------------
-
-/** Settings for a custom filter, specifying one or two comparison operators
- associated with some values.
- */
-class CustomFilter : public FilterSettingsBase
-{
-public:
- explicit CustomFilter( const WorkbookHelper& rHelper );
-
- /** Imports filter settings from the filters and filter elements. */
- virtual void importAttribs( sal_Int32 nElement, const AttributeList& rAttribs );
- /** Imports filter settings from the FILTERS and FILTER records. */
- virtual void importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm );
- /** Imports filter settings from the FILTERCOLUMN record. */
- virtual void importBiffRecord( BiffInputStream& rStrm, sal_uInt16 nFlags );
-
- /** Returns converted UNO API filter settings representing all filter settings. */
- virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount );
-
-private:
- /** Apeends the passed filter criteriom, if it contains valid settings. */
- void appendCriterion( const FilterCriterionModel& rCriterion );
-
-private:
- typedef ::std::vector< FilterCriterionModel > FilterCriterionVector;
-
- FilterCriterionVector maCriteria;
- bool mbAnd;
-};
-
-// ============================================================================
-
-/** A column in a filtered range. Contains an object with specific filter
- settings for the cells in the column.
- */
-class FilterColumn : public WorkbookHelper
-{
-public:
- explicit FilterColumn( const WorkbookHelper& rHelper );
-
- /** Imports auto filter column settings from the filterColumn element. */
- void importFilterColumn( const AttributeList& rAttribs );
- /** Imports auto filter column settings from the FILTERCOLUMN record. */
- void importFilterColumn( SequenceInputStream& rStrm );
- /** Imports auto filter column settings from the FILTERCOLUMN record. */
- void importFilterColumn( BiffInputStream& rStrm );
-
- /** Creates and returns the specified filter settings object. */
- template< typename FilterSettingsType >
- inline FilterSettingsBase& createFilterSettings()
- { mxSettings.reset( new FilterSettingsType( *this ) ); return *mxSettings; }
-
- /** Returns the index of the column in the filtered range this object is related to. */
- inline sal_Int32 getColumnId() const { return mnColId; }
-
- /** Returns converted UNO API filter settings representing all filter
- settings of this column. */
- ApiFilterSettings finalizeImport( sal_Int32 nMaxCount );
-
-private:
- FilterSettingsRef mxSettings;
- sal_Int32 mnColId;
- bool mbHiddenButton;
- bool mbShowButton;
-};
-
-// ============================================================================
-
-class AutoFilter : public WorkbookHelper
-{
-public:
- explicit AutoFilter( const WorkbookHelper& rHelper );
-
- /** Imports auto filter settings from the autoFilter element. */
- void importAutoFilter( const AttributeList& rAttribs, sal_Int16 nSheet );
- /** Imports auto filter settings from the AUTOFILTER record. */
- void importAutoFilter( SequenceInputStream& rStrm, sal_Int16 nSheet );
-
- /** Creates a new auto filter column and stores it internally. */
- FilterColumn& createFilterColumn();
-
- /** Applies the filter to the passed filter descriptor. */
- void finalizeImport(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::sheet::XSheetFilterDescriptor3>& rxFilterDesc );
-
-private:
- typedef RefVector< FilterColumn > FilterColumnVector;
-
- FilterColumnVector maFilterColumns;
- ::com::sun::star::table::CellRangeAddress maRange;
-};
-
-// ============================================================================
-
-class AutoFilterBuffer : public WorkbookHelper
-{
-public:
- explicit AutoFilterBuffer( const WorkbookHelper& rHelper );
-
- /** Creates a new auto filter and stores it internally. */
- AutoFilter& createAutoFilter();
-
- /** Applies filter settings to a new database range object (used for sheet
- autofilter or advanced filter as specified by built-in defined names). */
- void finalizeImport( sal_Int16 nSheet );
-
- /** Applies the filters to the passed database range object.
- @return True = this buffer contains valid auto filter settings. */
- bool finalizeImport( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDatabaseRange >& rxDatabaseRange );
-
-private:
- /** Returns the auto filter object used to perform auto filtering. */
- AutoFilter* getActiveAutoFilter();
-
-private:
- typedef RefVector< AutoFilter > AutoFilterVector;
- AutoFilterVector maAutoFilters;
-};
-
-// ============================================================================
-
-} // namespace xls
-} // namespace oox
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/inc/oox/xls/autofiltercontext.hxx b/oox/inc/oox/xls/autofiltercontext.hxx
deleted file mode 100644
index 7860f60..0000000
--- a/oox/inc/oox/xls/autofiltercontext.hxx
+++ /dev/null
@@ -1,117 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef OOX_XLS_AUTOFILTERCONTEXT_HXX
-#define OOX_XLS_AUTOFILTERCONTEXT_HXX
-
-#include "oox/xls/excelhandlers.hxx"
-
-namespace oox {
-namespace xls {
-
-class AutoFilter;
-class FilterColumn;
-class FilterSettingsBase;
-
-// ============================================================================
-
-class FilterSettingsContext : public WorksheetContextBase
-{
-public:
- explicit FilterSettingsContext( WorksheetContextBase& rParent, FilterSettingsBase& rFilterSettings );
-
-protected:
- virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
- virtual void onStartElement( const AttributeList& rAttribs );
-
- virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
- virtual void onStartRecord( SequenceInputStream& rStrm );
-
-private:
- FilterSettingsBase& mrFilterSettings;
-};
-
-// ============================================================================
-
-class FilterColumnContext : public WorksheetContextBase
-{
-public:
- explicit FilterColumnContext( WorksheetContextBase& rParent, FilterColumn& rFilterColumn );
-
-protected:
- virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
- virtual void onStartElement( const AttributeList& rAttribs );
-
- virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
- virtual void onStartRecord( SequenceInputStream& rStrm );
-
-private:
- FilterColumn& mrFilterColumn;
-};
-
-// ============================================================================
-
-class AutoFilterContext : public WorksheetContextBase
-{
-public:
- explicit AutoFilterContext( WorksheetFragmentBase& rFragment, AutoFilter& rAutoFilter );
-
-protected:
- virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs );
- virtual void onStartElement( const AttributeList& rAttribs );
-
- virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm );
- virtual void onStartRecord( SequenceInputStream& rStrm );
-
-private:
- AutoFilter& mrAutoFilter;
-};
-
-// ============================================================================
-
-class BiffAutoFilterContext : public BiffWorksheetContextBase
-{
-public:
- explicit BiffAutoFilterContext( const WorksheetHelper& rHelper, AutoFilter& rAutoFilter );
-
-protected:
- /** Imports all records related to the current auto filter. */
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list