diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-07-30 13:14:51 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-08-03 22:42:20 +0200 |
| commit | f264ff6aad5684fbcc4789a9a8094f5443586ad2 (patch) | |
| tree | fdf2894211a5c2db89d26e2e922772066179756e | |
| parent | 7f36e996a07ed7f39a33fffb2d2c523adf00eefc (diff) | |
put ReadThroughComponent to anon. namespace to avoid redefinition
Change-Id: Idcc97e067b0f389a5d9e01013ab2fc20d2dd4ccd
| -rw-r--r-- | sd/source/filter/xml/sdxmlwrp.cxx | 5 | ||||
| -rw-r--r-- | sw/source/filter/xml/swxml.cxx | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index dd6d8cd47acb..73ce0215790c 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -174,6 +174,9 @@ SdXMLFilter::~SdXMLFilter(void) { } +namespace +{ + sal_Int32 ReadThroughComponent( Reference<io::XInputStream> xInputStream, Reference<XComponent> xModelComponent, @@ -410,6 +413,8 @@ sal_Int32 ReadThroughComponent( return SD_XML_READERROR; } +} + bool SdXMLFilter::Import( ErrCode& nError ) { sal_uInt32 nRet = 0; diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index afce16264c55..4c0c0089c873 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -119,6 +119,9 @@ int XMLReader::GetReaderType() return SW_STORAGE_READER; } +namespace +{ + /// read a component (file + filter version) sal_Int32 ReadThroughComponent( uno::Reference<io::XInputStream> xInputStream, @@ -365,6 +368,8 @@ sal_Int32 ReadThroughComponent( return ERR_SWG_READ_ERROR; } +} + // #i44177# static void lcl_AdjustOutlineStylesForOOo(SwDoc& _rDoc) { |