diff options
-rw-r--r-- | sw/source/filter/ww8/attributeoutputbase.hxx | 3 | ||||
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.hxx | 3 | ||||
-rw-r--r-- | sw/source/filter/ww8/docxexport.cxx | 16 | ||||
-rw-r--r-- | sw/source/filter/ww8/docxexport.hxx | 3 | ||||
-rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.hxx | 3 | ||||
-rw-r--r-- | sw/source/filter/ww8/rtfexport.cxx | 15 | ||||
-rw-r--r-- | sw/source/filter/ww8/rtfexport.hxx | 1 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtww8.cxx | 17 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtww8.hxx | 2 |
9 files changed, 24 insertions, 39 deletions
diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx index 62b80c71b5cd..baad6ac8b117 100644 --- a/sw/source/filter/ww8/attributeoutputbase.hxx +++ b/sw/source/filter/ww8/attributeoutputbase.hxx @@ -597,6 +597,9 @@ public: ( ww8::WW8TableNodeInfoInner * pTableTextNodeInfoInner, sal_uInt32& rPageSize, bool& rRelBoxSize ); + /// Exports the definition (image, size) of a single numbering picture bullet. + virtual void BulletDefinition(int /*nId*/, const Graphic& /*rGraphic*/, Size /*aSize*/) {} + }; #endif // _ATTRIBUTEOUTPUTBASE_HXX_ diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 050980eefc8b..c044ad899ab9 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -685,8 +685,7 @@ public: virtual void WriteOutliner(const OutlinerParaObject& rParaObj); virtual oox::drawingml::DrawingML& GetDrawingML(); - /// Exports the definition (image, size) of a single numbering picture bullet. - void BulletDefinition(int nId, const Graphic& rGraphic, Size aSize); + void BulletDefinition(int nId, const Graphic& rGraphic, Size aSize) SAL_OVERRIDE; }; #endif // _DOCXATTRIBUTEOUTPUT_HXX_ diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index b25b1eb86340..e04f12d93e91 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -61,7 +61,6 @@ #include <comphelper/string.hxx> #include <rtl/ustrbuf.hxx> #include <vcl/font.hxx> -#include <vcl/svapp.hxx> using namespace sax_fastparser; using namespace ::comphelper; @@ -528,21 +527,6 @@ void DocxExport::WritePostitFields() } } -void DocxExport::BulletDefinitions() -{ - for (size_t i = 0; i < m_vecBulletPic.size(); ++i) - { - const MapMode aMapMode(MAP_TWIP); - const Graphic& rGraphic = *m_vecBulletPic[i]; - Size aSize(rGraphic.GetPrefSize()); - if (MAP_PIXEL == rGraphic.GetPrefMapMode().GetMapUnit()) - aSize = Application::GetDefaultDevice()->PixelToLogic(aSize, aMapMode); - else - aSize = OutputDevice::LogicToLogic(aSize,rGraphic.GetPrefMapMode(), aMapMode); - m_pAttrOutput->BulletDefinition(i, rGraphic, aSize); - } -} - void DocxExport::WriteNumbering() { if ( !pUsedNumTbl ) diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx index d8790f8ba420..16bf73effcf6 100644 --- a/sw/source/filter/ww8/docxexport.hxx +++ b/sw/source/filter/ww8/docxexport.hxx @@ -202,9 +202,6 @@ private: /// Write word/settings.xml void WriteSettings(); - /// Write the numbering picture bullets part of word/numbering.xml - void BulletDefinitions(); - /// All xml namespaces to be used at the top of any text .xml file (main doc, headers, footers,...) sax_fastparser::XFastAttributeListRef MainXmlNamespaces( sax_fastparser::FSHelperPtr serializer ); diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx index c4c6e840ada5..bfcb1eaa780e 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.hxx +++ b/sw/source/filter/ww8/rtfattributeoutput.hxx @@ -587,8 +587,7 @@ public: /// Writes binary data as a hex dump. static OString WriteHex(const sal_uInt8* pData, sal_uInt32 nSize, SvStream* pStream = 0, sal_uInt32 nLimit = 64); - /// Exports the definition (image, size) of a single numbering picture bullet. - void BulletDefinition(int nId, const Graphic& rGraphic, Size aSize); + void BulletDefinition(int nId, const Graphic& rGraphic, Size aSize) SAL_OVERRIDE; }; #endif // _RTFATTRIBUTEOUTPUT_HXX_ diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index aaf8a5c48f73..c98b78020505 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -225,21 +225,6 @@ void RtfExport::BuildNumbering() } } -void RtfExport::BulletDefinitions() -{ - for (size_t i = 0; i < m_vecBulletPic.size(); ++i) - { - const MapMode aMapMode(MAP_TWIP); - const Graphic& rGraphic = *m_vecBulletPic[i]; - Size aSize(rGraphic.GetPrefSize()); - if (MAP_PIXEL == rGraphic.GetPrefMapMode().GetMapUnit()) - aSize = Application::GetDefaultDevice()->PixelToLogic(aSize, aMapMode); - else - aSize = OutputDevice::LogicToLogic(aSize,rGraphic.GetPrefMapMode(), aMapMode); - m_pAttrOutput->BulletDefinition(i, rGraphic, aSize); - } -} - void RtfExport::WriteNumbering() { SAL_INFO("sw.rtf", OSL_THIS_FUNC << " start"); diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx index 0481fd608bbf..4f4f24e78e41 100644 --- a/sw/source/filter/ww8/rtfexport.hxx +++ b/sw/source/filter/ww8/rtfexport.hxx @@ -181,7 +181,6 @@ private: void WriteFonts(); void WriteStyles(); - void BulletDefinitions(); void WriteMainText(); void WriteInfo(); /// Writes the writer-specific \pgdsctbl group. diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 2cdc3cbd975c..550e1af2622f 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -107,6 +107,7 @@ #include <filter/msfilter/svxmsbas.hxx> #include <osl/time.h> #include <rtl/random.h> +#include <vcl/svapp.hxx> #include "WW8Sttbf.hxx" #include "WW8FibData.hxx" #include "numrule.hxx"//For i120928 @@ -1447,6 +1448,22 @@ int MSWordExportBase::CollectGrfsOfBullets() return m_vecBulletPic.size(); } + +void MSWordExportBase::BulletDefinitions() +{ + for (size_t i = 0; i < m_vecBulletPic.size(); ++i) + { + const MapMode aMapMode(MAP_TWIP); + const Graphic& rGraphic = *m_vecBulletPic[i]; + Size aSize(rGraphic.GetPrefSize()); + if (MAP_PIXEL == rGraphic.GetPrefMapMode().GetMapUnit()) + aSize = Application::GetDefaultDevice()->PixelToLogic(aSize, aMapMode); + else + aSize = OutputDevice::LogicToLogic(aSize,rGraphic.GetPrefMapMode(), aMapMode); + AttrOutput().BulletDefinition(i, rGraphic, aSize); + } +} + //Export Graphic of Bullets void WW8Export::ExportGrfBullet(const SwTxtNode& rNd) { diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 6e061bca486f..7d33f294aa89 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -826,6 +826,8 @@ protected: /// Populates m_vecBulletPic with all the bullet graphics used by numberings. int CollectGrfsOfBullets(); + /// Write the numbering picture bullets. + void BulletDefinitions(); std::vector<const Graphic*> m_vecBulletPic; ///< Vector to record all the graphics of bullets public: |