Kaydet (Commit) 40b7eff9 authored tarafından Michael Stahl's avatar Michael Stahl

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

Change-Id: I59872f6e7fbdfc73875a45912b93d01b4379aec7
üst 22a5dfb9
...@@ -47,13 +47,8 @@ namespace sfx2 { ...@@ -47,13 +47,8 @@ namespace sfx2 {
/** is i_rIdref a valid NCName ? */ /** is i_rIdref a valid NCName ? */
bool SFX2_DLLPUBLIC isValidNCName(::rtl::OUString const & i_rIdref); bool SFX2_DLLPUBLIC isValidNCName(::rtl::OUString const & i_rIdref);
extern inline bool bool SFX2_DLLPUBLIC isValidXmlId(::rtl::OUString const & i_rStreamName,
isValidXmlId(::rtl::OUString const & i_rStreamName, ::rtl::OUString const & i_rIdref);
::rtl::OUString const & i_rIdref)
{
return isValidNCName(i_rIdref) && ( i_rStreamName == "content.xml" || i_rStreamName == "styles.xml" );
}
// XML ID handling --------------------------------------------------- // XML ID handling ---------------------------------------------------
......
...@@ -116,6 +116,13 @@ static bool isStylesFile (::rtl::OUString const & i_rPath) ...@@ -116,6 +116,13 @@ static bool isStylesFile (::rtl::OUString const & i_rPath)
return i_rPath == s_styles; 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) static bool isReservedFile(::rtl::OUString const & i_rPath)
{ {
return isContentFile(i_rPath) || isStylesFile(i_rPath) || i_rPath == s_meta || i_rPath == s_settings; return isContentFile(i_rPath) || isStylesFile(i_rPath) || i_rPath == s_meta || i_rPath == s_settings;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment