diff options
-rw-r--r-- | xmloff/inc/RDFaExportHelper.hxx | 2 | ||||
-rw-r--r-- | xmloff/inc/RDFaImportHelper.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/core/RDFaImportHelper.cxx | 8 | ||||
-rw-r--r-- | xmloff/source/core/xmlexp.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/core/xmlimp.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/text/XMLPropertyBackpatcher.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/text/txtimp.cxx | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/xmloff/inc/RDFaExportHelper.hxx b/xmloff/inc/RDFaExportHelper.hxx index dbc01337277b..56e4c0a6157a 100644 --- a/xmloff/inc/RDFaExportHelper.hxx +++ b/xmloff/inc/RDFaExportHelper.hxx @@ -37,7 +37,7 @@ class SvXMLExport; namespace xmloff { -class SAL_DLLPRIVATE RDFaExportHelper +class RDFaExportHelper { private: SvXMLExport & m_rExport; diff --git a/xmloff/inc/RDFaImportHelper.hxx b/xmloff/inc/RDFaImportHelper.hxx index 9fdeaaaf98bd..75c10dd4c095 100644 --- a/xmloff/inc/RDFaImportHelper.hxx +++ b/xmloff/inc/RDFaImportHelper.hxx @@ -40,7 +40,7 @@ namespace xmloff { struct RDFaEntry; struct ParsedRDFaAttributes; -class SAL_DLLPRIVATE RDFaImportHelper +class RDFaImportHelper { private: diff --git a/xmloff/source/core/RDFaImportHelper.cxx b/xmloff/source/core/RDFaImportHelper.cxx index 55372d42aa23..81ef976b1eef 100644 --- a/xmloff/source/core/RDFaImportHelper.cxx +++ b/xmloff/source/core/RDFaImportHelper.cxx @@ -49,7 +49,7 @@ using namespace ::com::sun::star; namespace xmloff { /** a bit of context for parsing RDFa attributes */ -class SAL_DLLPRIVATE RDFaReader +class RDFaReader { const SvXMLImport & m_rImport; @@ -84,7 +84,7 @@ public: }; /** helper to insert RDFa statements into the RDF repository */ -class SAL_DLLPRIVATE RDFaInserter +class RDFaInserter { const uno::Reference<uno::XComponentContext> m_xContext; uno::Reference< rdf::XDocumentRepository > m_xRepository; @@ -114,7 +114,7 @@ public: }; /** store parsed RDFa attributes */ -struct SAL_DLLPRIVATE ParsedRDFaAttributes +struct ParsedRDFaAttributes { OUString m_About; ::std::vector< OUString > m_Properties; @@ -134,7 +134,7 @@ struct SAL_DLLPRIVATE ParsedRDFaAttributes }; /** store metadatable object and its RDFa attributes */ -struct SAL_DLLPRIVATE RDFaEntry +struct RDFaEntry { uno::Reference<rdf::XMetadatable> m_xObject; ::boost::shared_ptr<ParsedRDFaAttributes> m_pRDFaAttributes; diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 0c9e3dcb851d..28e9af270bc2 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -138,7 +138,7 @@ const XMLServiceMapEntry_Impl aServiceMap[] = { 0, 0, 0, 0 } }; -class SAL_DLLPRIVATE SettingsExportFacade : public ::xmloff::XMLSettingsExportContext +class SettingsExportFacade : public ::xmloff::XMLSettingsExportContext { public: SettingsExportFacade( SvXMLExport& i_rExport ) @@ -236,7 +236,7 @@ void SAL_CALL SvXMLExportEventListener::disposing( const lang::EventObject& ) } } -class SAL_DLLPRIVATE SvXMLExport_Impl +class SvXMLExport_Impl { public: SvXMLExport_Impl(); diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index fdab947fcdd3..001970b5597e 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -244,7 +244,7 @@ getBuildIdsProperty(uno::Reference<beans::XPropertySet> const& xImportInfo) }; } -class SAL_DLLPRIVATE SvXMLImport_Impl +class SvXMLImport_Impl { public: FontToSubsFontConverter hBatsFontConv; @@ -1863,7 +1863,7 @@ void SvXMLImport::SetXmlId(uno::Reference<uno::XInterface> const & i_xIfc, } } -SAL_DLLPRIVATE ::xmloff::RDFaImportHelper & +::xmloff::RDFaImportHelper & SvXMLImport::GetRDFaImportHelper() { if (!mpImpl->mpRDFaHelper.get()) diff --git a/xmloff/source/text/XMLPropertyBackpatcher.cxx b/xmloff/source/text/XMLPropertyBackpatcher.cxx index 796009710f82..270b446b076e 100644 --- a/xmloff/source/text/XMLPropertyBackpatcher.cxx +++ b/xmloff/source/text/XMLPropertyBackpatcher.cxx @@ -152,7 +152,7 @@ void XMLPropertyBackpatcher<A>::SetDefault() template class XMLPropertyBackpatcher<sal_Int16>; template class XMLPropertyBackpatcher<OUString>; -struct SAL_DLLPRIVATE XMLTextImportHelper::BackpatcherImpl +struct XMLTextImportHelper::BackpatcherImpl { SAL_WNODEPRECATED_DECLARATIONS_PUSH /// backpatcher for references to footnotes and endnotes diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 8226f14260c5..0f47e718d7ea 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -481,7 +481,7 @@ static const SvXMLTokenMapEntry aTextFieldAttrTokenMap[] = // maximum allowed length of combined characters field #define MAX_COMBINED_CHARACTERS 6 -struct SAL_DLLPRIVATE XMLTextImportHelper::Impl +struct XMLTextImportHelper::Impl : private ::boost::noncopyable { boost::scoped_ptr<SvXMLTokenMap> m_pTextElemTokenMap; |