diff options
-rw-r--r-- | include/svl/grabbagitem.hxx | 12 | ||||
-rw-r--r-- | svl/source/items/grabbagitem.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/docxsdrexport.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/docxsdrexport.hxx | 6 | ||||
-rw-r--r-- | sw/source/filter/ww8/rtfexport.hxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/LatentStyleHandler.hxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/SdtHelper.cxx | 6 | ||||
-rw-r--r-- | writerfilter/source/dmapper/SdtHelper.hxx | 4 | ||||
-rw-r--r-- | writerfilter/source/dmapper/TablePositionHandler.hxx | 2 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 15 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtftokenizer.hxx | 4 |
11 files changed, 27 insertions, 30 deletions
diff --git a/include/svl/grabbagitem.hxx b/include/svl/grabbagitem.hxx index 6454d2c42d6e..7a1191610949 100644 --- a/include/svl/grabbagitem.hxx +++ b/include/svl/grabbagitem.hxx @@ -20,22 +20,22 @@ class SVL_DLLPUBLIC SfxGrabBagItem : public SfxPoolItem { private: - std::map<OUString, com::sun::star::uno::Any> m_aMap; + std::map<OUString, css::uno::Any> m_aMap; public: TYPEINFO_OVERRIDE(); SfxGrabBagItem(); - SfxGrabBagItem(sal_uInt16 nWhich, const std::map<OUString, com::sun::star::uno::Any>* pMap = 0); + SfxGrabBagItem(sal_uInt16 nWhich, const std::map<OUString, css::uno::Any>* pMap = 0); SfxGrabBagItem(const SfxGrabBagItem& rItem); virtual ~SfxGrabBagItem(); - const std::map<OUString, com::sun::star::uno::Any>& GetGrabBag() const + const std::map<OUString, css::uno::Any>& GetGrabBag() const { return m_aMap; } - std::map<OUString, com::sun::star::uno::Any>& GetGrabBag() + std::map<OUString, css::uno::Any>& GetGrabBag() { return m_aMap; } @@ -43,8 +43,8 @@ public: virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; - virtual bool PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0) SAL_OVERRIDE; - virtual bool QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0) const SAL_OVERRIDE; + virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId = 0) SAL_OVERRIDE; + virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const SAL_OVERRIDE; }; #endif diff --git a/svl/source/items/grabbagitem.cxx b/svl/source/items/grabbagitem.cxx index dd1bf247d6ef..77558f2eb0c3 100644 --- a/svl/source/items/grabbagitem.cxx +++ b/svl/source/items/grabbagitem.cxx @@ -72,7 +72,7 @@ bool SfxGrabBagItem::QueryValue(uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { uno::Sequence<beans::PropertyValue> aValue(m_aMap.size()); beans::PropertyValue* pValue = aValue.getArray(); - for (std::map<OUString, com::sun::star::uno::Any>::const_iterator i = m_aMap.begin(); i != m_aMap.end(); ++i) + for (std::map<OUString, uno::Any>::const_iterator i = m_aMap.begin(); i != m_aMap.end(); ++i) { pValue[0].Name = i->first; pValue[0].Value = i->second; diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index 5d5766af58e6..182fb8bf74e6 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -185,7 +185,7 @@ struct DocxSdrExport::Impl /// Writes wp wrapper code around an SdrObject, which itself is written using drawingML syntax. void textFrameShadow(const SwFrmFmt& rFrmFmt); - bool isSupportedDMLShape(com::sun::star::uno::Reference<com::sun::star::drawing::XShape> xShape); + bool isSupportedDMLShape(uno::Reference<drawing::XShape> xShape); }; DocxSdrExport::DocxSdrExport(DocxExport& rExport, sax_fastparser::FSHelperPtr pSerializer, oox::drawingml::DrawingML* pDrawingML) diff --git a/sw/source/filter/ww8/docxsdrexport.hxx b/sw/source/filter/ww8/docxsdrexport.hxx index 7b69b5fa9d57..1ff940421b31 100644 --- a/sw/source/filter/ww8/docxsdrexport.hxx +++ b/sw/source/filter/ww8/docxsdrexport.hxx @@ -95,9 +95,9 @@ public: void writeDMLEffectLst(const SwFrmFmt& rFrmFmt); /// Writes a diagram (smartart). void writeDiagram(const SdrObject* sdrObject, const SwFrmFmt& rFrmFmt, int nAnchorId); - void writeDiagramRels(com::sun::star::uno::Reference< com::sun::star::xml::dom::XDocument> xDom, - const com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::uno::Any > >& xRelSeq, - com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > xOutStream, const OUString& sGrabBagProperyName, + void writeDiagramRels(css::uno::Reference<css::xml::dom::XDocument> xDom, + const css::uno::Sequence< css::uno::Sequence<css::uno::Any> >& xRelSeq, + css::uno::Reference<css::io::XOutputStream> xOutStream, const OUString& sGrabBagProperyName, int nAnchorId); /// Writes text frame in DML format. void writeDMLTextFrame(sw::Frame* pParentFrame, int nAnchorId, bool bTextBoxOnly = false); diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx index f19f067cc8aa..7d2f065be266 100644 --- a/sw/source/filter/ww8/rtfexport.hxx +++ b/sw/source/filter/ww8/rtfexport.hxx @@ -123,7 +123,7 @@ public: const OUString& rHelp, const OUString& ToolTip, const OUString& rSelected, - com::sun::star::uno::Sequence<OUString>& rListItems) SAL_OVERRIDE; + css::uno::Sequence<OUString>& rListItems) SAL_OVERRIDE; virtual void DoFormText(const SwInputField* pFld) SAL_OVERRIDE; diff --git a/writerfilter/source/dmapper/LatentStyleHandler.hxx b/writerfilter/source/dmapper/LatentStyleHandler.hxx index d2aecb0eceed..8b1a697a6255 100644 --- a/writerfilter/source/dmapper/LatentStyleHandler.hxx +++ b/writerfilter/source/dmapper/LatentStyleHandler.hxx @@ -33,7 +33,7 @@ public: LatentStyleHandler(); virtual ~LatentStyleHandler(); - com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> getAttributes() const; + css::uno::Sequence<css::beans::PropertyValue> getAttributes() const; }; typedef std::shared_ptr<LatentStyleHandler> LatentStyleHandlerPtr; diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx index ff6bae8c26f7..2d0a240cdb45 100644 --- a/writerfilter/source/dmapper/SdtHelper.cxx +++ b/writerfilter/source/dmapper/SdtHelper.cxx @@ -169,14 +169,14 @@ void SdtHelper::createControlShape(awt::Size aSize, uno::Reference<awt::XControl m_bHasElements = true; } -void SdtHelper::appendToInteropGrabBag(const com::sun::star::beans::PropertyValue& rValue) +void SdtHelper::appendToInteropGrabBag(const beans::PropertyValue& rValue) { m_aGrabBag.push_back(rValue); } -com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> SdtHelper::getInteropGrabBagAndClear() +uno::Sequence<beans::PropertyValue> SdtHelper::getInteropGrabBagAndClear() { - com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> aRet = comphelper::containerToSequence(m_aGrabBag); + uno::Sequence<beans::PropertyValue> aRet = comphelper::containerToSequence(m_aGrabBag); m_aGrabBag.clear(); return aRet; } diff --git a/writerfilter/source/dmapper/SdtHelper.hxx b/writerfilter/source/dmapper/SdtHelper.hxx index 52576d79f521..28bd0591696c 100644 --- a/writerfilter/source/dmapper/SdtHelper.hxx +++ b/writerfilter/source/dmapper/SdtHelper.hxx @@ -114,8 +114,8 @@ public: /// Create date control from w:sdt's w:date. void createDateControl(OUString& rContentText, const css::beans::PropertyValue& rCharFormat); - void appendToInteropGrabBag(const com::sun::star::beans::PropertyValue& rValue); - com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> getInteropGrabBagAndClear(); + void appendToInteropGrabBag(const css::beans::PropertyValue& rValue); + css::uno::Sequence<css::beans::PropertyValue> getInteropGrabBagAndClear(); bool isInteropGrabBagEmpty(); bool containedInInteropGrabBag(const OUString& rValueName); sal_Int32 getInteropGrabBagSize(); diff --git a/writerfilter/source/dmapper/TablePositionHandler.hxx b/writerfilter/source/dmapper/TablePositionHandler.hxx index 95ff5cd065a6..cdb239f7b711 100644 --- a/writerfilter/source/dmapper/TablePositionHandler.hxx +++ b/writerfilter/source/dmapper/TablePositionHandler.hxx @@ -89,7 +89,7 @@ public: Note that the properties will need to be adjusted with the table properties before actually using them. */ - com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> getTablePosition() const; + css::uno::Sequence<css::beans::PropertyValue> getTablePosition() const; bool operator== (const TablePositionHandler& rHandler) const; }; diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 75f3858b4fa7..d931d6d15c75 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -4149,31 +4149,28 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) switch (nParam) { case 1: - m_aStates.top().aShape.nWrap = com::sun::star::text::WrapTextMode_NONE; + m_aStates.top().aShape.nWrap = css::text::WrapTextMode_NONE; break; case 2: - m_aStates.top().aShape.nWrap = com::sun::star::text::WrapTextMode_PARALLEL; + m_aStates.top().aShape.nWrap = css::text::WrapTextMode_PARALLEL; break; case 3: - m_aStates.top().aShape.nWrap = com::sun::star::text::WrapTextMode_THROUGHT; + m_aStates.top().aShape.nWrap = css::text::WrapTextMode_THROUGHT; m_aStates.top().aCharacterSprms.set(NS_ooxml::LN_EG_WrapType_wrapNone, std::make_shared<RTFValue>()); break; case 4: - m_aStates.top().aShape.nWrap = com::sun::star::text::WrapTextMode_PARALLEL; + m_aStates.top().aShape.nWrap = css::text::WrapTextMode_PARALLEL; m_aStates.top().aCharacterSprms.set(NS_ooxml::LN_EG_WrapType_wrapTight, std::make_shared<RTFValue>()); break; case 5: - m_aStates.top().aShape.nWrap = com::sun::star::text::WrapTextMode_THROUGHT; + m_aStates.top().aShape.nWrap = css::text::WrapTextMode_THROUGHT; break; } } break; case RTF_CELLX: { - int& rCurrentCellX((Destination::NESTEDTABLEPROPERTIES == - m_aStates.top().eDestination) - ? m_nNestedCurrentCellX - : m_nTopLevelCurrentCellX); + int& rCurrentCellX((Destination::NESTEDTABLEPROPERTIES == m_aStates.top().eDestination) ? m_nNestedCurrentCellX : m_nTopLevelCurrentCellX); int nCellX = nParam - rCurrentCellX; const int COL_DFLT_WIDTH = 41; // sw/source/filter/inc/wrtswtbl.hxx, minimal possible width of cells. if (!nCellX) diff --git a/writerfilter/source/rtftok/rtftokenizer.hxx b/writerfilter/source/rtftok/rtftokenizer.hxx index 2be4e7775767..2fc8d0315687 100644 --- a/writerfilter/source/rtftok/rtftokenizer.hxx +++ b/writerfilter/source/rtftok/rtftokenizer.hxx @@ -27,7 +27,7 @@ namespace rtftok class RTFTokenizer { public: - RTFTokenizer(RTFListener& rImport, SvStream* pInStream, com::sun::star::uno::Reference<com::sun::star::task::XStatusIndicator> const& xStatusIndicator); + RTFTokenizer(RTFListener& rImport, SvStream* pInStream, css::uno::Reference<css::task::XStatusIndicator> const& xStatusIndicator); virtual ~RTFTokenizer(); RTFError resolveParse(); @@ -58,7 +58,7 @@ private: RTFListener& m_rImport; SvStream* m_pInStream; - com::sun::star::uno::Reference<com::sun::star::task::XStatusIndicator> const& m_xStatusIndicator; + css::uno::Reference<css::task::XStatusIndicator> const& m_xStatusIndicator; // This is the same as aRTFControlWords, but sorted static std::vector<RTFSymbol> m_aRTFControlWords; static bool m_bControlWordsSorted; |