Author: jsc
Date: Fri Dec 20 09:33:11 2013
New Revision: 1552559
URL: http://svn.apache.org/r1552559
Log:
#123891# allow OpenOffice since tag only
Modified:
openoffice/trunk/main/autodoc/source/parser_i/idoc/docu_pe2.cxx
Modified: openoffice/trunk/main/autodoc/source/parser_i/idoc/docu_pe2.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/autodoc/source/parser_i/idoc/docu_pe2.cxx?rev=1552559&r1=1552558&r2=1552559&view=diff
==============================================================================
--- openoffice/trunk/main/autodoc/source/parser_i/idoc/docu_pe2.cxx (original)
+++ openoffice/trunk/main/autodoc/source/parser_i/idoc/docu_pe2.cxx Fri Dec 20
09:33:11 2013
@@ -491,7 +491,7 @@ SapiDocu_PE::SetCurSeeAlsoAtTagLinkText_
}
const String
- C_sSinceFormat("Correct version format: \"AOO <major>.<minor>[.<micro> if
micro is not 0]\".");
+ C_sSinceFormat("Correct version format: \"OpenOffice
<major>.<minor>[.<micro> if micro is not 0]\".");
void
SapiDocu_PE::SetCurSinceAtTagVersion_OOo( DYN ary::inf::DocuToken &
let_drNewToken )
@@ -507,7 +507,8 @@ SapiDocu_PE::SetCurSinceAtTagVersion_OOo
const String
sVersion(pToken->GetText());
- if (NOT CheckVersionSyntax_OOo(sVersion))
+// if (NOT CheckVersionSyntax_OOo(sVersion))
+ if (sVersion != "OpenOffice")
{
Cerr() << "Version information in @since tag has incorrect format.\n"
<< "Found: \"" << sVersion << "\"\n"
@@ -521,48 +522,6 @@ SapiDocu_PE::SetCurSinceAtTagVersion_OOo
if (NOT rCommandLine.DoesTransform_SinceTag())
pCurAtTag->AddToken(let_drNewToken);
- if (sVersion=="Apache")
- {
- fCurTokenAddFunction = &SapiDocu_PE::SetCurSinceAtTagVersion_AOO;
- }
- else
- fCurTokenAddFunction = &SapiDocu_PE::SetCurSinceAtTagVersion_Number;
-}
-
-void
-SapiDocu_PE::SetCurSinceAtTagVersion_AOO( DYN ary::inf::DocuToken &
let_drNewToken )
-{
- csv_assert(pCurAtTag);
-
- DT_TextToken * pToken = dynamic_cast< DT_TextToken* >(&let_drNewToken);
- if (pToken == 0)
- {
- delete &let_drNewToken;
- return;
- }
-
- const String
- sVersion(pToken->GetText());
- if (sVersion != "OpenOffice")
- {
- Cerr() << "Version information in @since tag has incorrect format.\n"
- << "Found: Apache \"" << sVersion << "\"\n"
- << "Correct version format: \"Apache OpenOffice
<major>.<minor>[.<micro> if micro is not 0]\"."
- << Endl();
- exit(1);
- }
-
- const autodoc::CommandLine &
- rCommandLine = autodoc::CommandLine::Get_();
- if (NOT rCommandLine.DoesTransform_SinceTag())
- {
- String &
- sValue = pCurAtTag->Access_Text().Access_TextOfFirstToken();
- StreamLock
- sHelp(1000);
- sValue = sHelp() << sValue << " " << sVersion << " " << c_str;
- }
-
fCurTokenAddFunction = &SapiDocu_PE::SetCurSinceAtTagVersion_Number;
}
@@ -648,15 +607,6 @@ SapiDocu_PE::AddDocuToken2SinceAtTag( DY
}
bool
-SapiDocu_PE::CheckVersionSyntax_OOo(const String & i_versionPart1)
-{
- return i_versionPart1 == "OOo"
- OR i_versionPart1 == "Apache"
- OR i_versionPart1 == "AOO"
- OR i_versionPart1 == "OpenOffice.org";
-}
-
-bool
SapiDocu_PE::CheckVersionSyntax_Number(const String & i_versionPart2)
{
if (i_versionPart2.length () == 0)
