mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

un-inline isValidXmlId (MSVC doesn't like it anymore)

Browse Source 
Change-Id: I59872f6e7fbdfc73875a45912b93d01b4379aec7
This commit is contained in:
Michael Stahl
2012-06-11 23:18:23 +02:00
parent 22a5dfb949
commit 40b7eff907
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sfx2/inc/sfx2/XmlIdRegistry.hxx
View File

@@ -47,13 +47,8 @@ namespace sfx2 {
/** is i_rIdref a valid NCName ? */
bool SFX2_DLLPUBLIC isValidNCName(::rtl::OUString const & i_rIdref);
extern inline bool
isValidXmlId(::rtl::OUString const & i_rStreamName,
::rtl::OUString const & i_rIdref)
{
return isValidNCName(i_rIdref) && ( i_rStreamName == "content.xml" || i_rStreamName == "styles.xml" );
}
bool SFX2_DLLPUBLIC isValidXmlId(::rtl::OUString const & i_rStreamName,
::rtl::OUString const & i_rIdref);
// XML ID handling ---------------------------------------------------

7
sfx2/source/doc/DocumentMetadataAccess.cxx
View File

@@ -116,6 +116,13 @@ static bool isStylesFile (::rtl::OUString const & i_rPath)
return i_rPath == s_styles;
}
bool isValidXmlId(::rtl::OUString const & i_rStreamName,
::rtl::OUString const & i_rIdref)
{
return isValidNCName(i_rIdref)
&& (isContentFile(i_rStreamName) || isStylesFile(i_rStreamName));
}
static bool isReservedFile(::rtl::OUString const & i_rPath)
{
return isContentFile(i_rPath) || isStylesFile(i_rPath) || i_rPath == s_meta || i_rPath == s_settings;