[Libreoffice-commits] .: 5 commits - autodoc/inc autodoc/source cosv/inc cosv/source cppcanvas/source drawinglayer/source filter/source formula/source sc/source slideshow/source solenv/gbuild svx/source sw/source tools/inc tools/source udm/inc udm/source unusedcode.easy vcl/inc vcl/source xml2cmp/Executable_xml2cmp.mk xml2cmp/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Jan 24 08:54:44 PST 2012
autodoc/inc/ary/info/all_tags.hxx | 91 ---
autodoc/inc/ary/info/ci_attag.hxx | 2
autodoc/inc/ary/info/ci_text.hxx | 2
autodoc/inc/ary/info/infodisp.hxx | 13
autodoc/source/ary/info/all_tags.cxx | 209 --------
autodoc/source/ary/info/ci_attag.cxx | 8
autodoc/source/ary/info/ci_text.cxx | 12
autodoc/source/display/idl/hfi_linklist.cxx | 380 ----------------
autodoc/source/display/idl/hfi_linklist.hxx | 147 ------
autodoc/source/display/idl/hfi_method.hxx | 4
autodoc/source/inc/tools/tkpchars.hxx | 3
autodoc/source/parser/inc/tokens/stmstate.hxx | 3
autodoc/source/parser/inc/tokens/stmstfin.hxx | 82 ---
autodoc/source/parser/inc/tokens/tkp.hxx | 8
autodoc/source/parser/inc/tokens/tkpcontx.hxx | 4
autodoc/source/parser/inc/tokens/tkpstama.hxx | 125 -----
autodoc/source/parser/tokens/makefile.mk | 2
autodoc/source/parser/tokens/stmstate.cxx | 7
autodoc/source/parser/tokens/stmstfin.cxx | 63 --
autodoc/source/parser/tokens/tkp.cxx | 15
autodoc/source/parser/tokens/tkpcontx.cxx | 10
autodoc/source/parser/tokens/tkpstama.cxx | 175 -------
autodoc/source/tools/tkpchars.cxx | 22
cosv/inc/cosv/file.hxx | 4
cosv/inc/cosv/streamstr.hxx | 7
cosv/source/storage/file.cxx | 9
cosv/source/strings/streamstr.cxx | 48 --
cppcanvas/source/mtfrenderer/implrenderer.cxx | 8
drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 8
filter/source/msfilter/msdffimp.cxx | 2
filter/source/msfilter/mstoolbar.cxx | 2
filter/source/svg/svgwriter.cxx | 2
formula/source/core/inc/core_resource.hxx | 18
formula/source/core/resource/core_resource.cxx | 12
formula/source/ui/dlg/formula.cxx | 13
sc/source/filter/dif/difexp.cxx | 2
sc/source/ui/docshell/docsh.cxx | 2
slideshow/source/engine/shapes/gdimtftools.cxx | 6
solenv/gbuild/extensions/post_BuildplTargets.mk | 2
svx/source/table/tablelayouter.cxx | 24 -
svx/source/table/tablelayouter.hxx | 6
sw/source/filter/ww8/ww8par.cxx | 4
sw/source/filter/ww8/ww8par3.cxx | 18
sw/source/filter/ww8/ww8scan.cxx | 19
sw/source/filter/ww8/ww8scan.hxx | 8
sw/source/filter/ww8/ww8toolbar.cxx | 4
tools/inc/tools/stream.hxx | 86 ++-
tools/source/stream/stream.cxx | 60 +-
udm/inc/udm/html/htmlitem.hxx | 8
udm/source/html/htmlitem.cxx | 29 -
unusedcode.easy | 14
vcl/inc/vcl/field.hxx | 4
vcl/inc/vcl/image.hxx | 1
vcl/inc/vcl/longcurr.hxx | 2
vcl/inc/vcl/metaact.hxx | 52 +-
vcl/source/control/field.cxx | 21
vcl/source/control/field2.cxx | 28 -
vcl/source/control/longcurr.cxx | 35 -
vcl/source/gdi/gdimtf.cxx | 8
vcl/source/gdi/image.cxx | 11
vcl/source/gdi/metaact.cxx | 76 ---
xml2cmp/Executable_xml2cmp.mk | 1
xml2cmp/source/xcd/cr_index.cxx | 276 -----------
xml2cmp/source/xcd/cr_index.hxx | 92 ---
xml2cmp/source/xcd/main.cxx | 3
xml2cmp/source/xcd/xmlelem.cxx | 6
xml2cmp/source/xcd/xmlelem.hxx | 2
xml2cmp/source/xcd/xmltree.cxx | 10
xml2cmp/source/xcd/xmltree.hxx | 3
69 files changed, 201 insertions(+), 2242 deletions(-)
New commits:
commit 3ee84cb27e49d26acc50e235abafd7aa5e6a8c72
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 24 16:44:15 2012 +0000
use write_uInt16s_FromOUString pattern
diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx
index 38c168a..b3da5a3 100644
--- a/sc/source/filter/dif/difexp.cxx
+++ b/sc/source/filter/dif/difexp.cxx
@@ -255,7 +255,7 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc
nPos = aTmpStr.Search( cStrDelim, nPos+2 );
}
rOut.WriteUniOrByteChar( cStrDelim, eCharSet );
- rOut.WriteUnicodeText(aTmpStr);
+ write_uInt16s_FromOUString(rOut, aTmpStr);
rOut.WriteUniOrByteChar( cStrDelim, eCharSet );
}
else if ( bContextOrNotAsciiEncoding )
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 1041126..7454882 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -1947,7 +1947,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt
}
if ( bNeedQuotes )
rStream.WriteUniOrByteChar( cStrDelim, eCharSet );
- rStream.WriteUnicodeText( aUniString );
+ write_uInt16s_FromOUString(rStream, aUniString);
if ( bNeedQuotes )
rStream.WriteUniOrByteChar( cStrDelim, eCharSet );
}
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index 0e1c6f7..9fcb729 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -515,6 +515,50 @@ rtl::OUString read_lenPrefixed_uInt16s_ToOUString(SvStream& rStrm)
return read_uInt16s_ToOUString(rStrm, nUnits);
}
+//Attempt to write a prefixed sequence of nUnits 16bit units from an OUString,
+//returned value is number of bytes written
+TOOLS_DLLPUBLIC sal_Size write_uInt16s_FromOUString(SvStream& rStrm,
+ const rtl::OUString& rStr, sal_Size nUnits);
+
+TOOLS_DLLPUBLIC inline sal_Size write_uInt16s_FromOUString(SvStream& rStrm,
+ const rtl::OUString& rStr)
+{
+ return write_uInt16s_FromOUString(rStrm, rStr, rStr.getLength());
+}
+
+namespace streamdetail
+{
+ //Attempt to write a pascal-style length (of type prefix) prefixed sequence of
+ //units from a string-type, returned value is number of bytes written (including
+ //byte-count of prefix)
+ template<typename prefix, typename S, sal_Size (*writeOper)(SvStream&, const S&, sal_Size)>
+ sal_Size write_lenPrefixed_seq_From_str(SvStream& rStrm, const S &rStr)
+ {
+ SAL_WARN_IF(rStr.getLength() > std::numeric_limits<prefix>::max(),
+ "tools.stream",
+ "string too long for prefix count to fit in output type");
+
+ sal_Size nWritten = 0;
+ prefix nUnits = std::min<sal_Size>(rStr.getLength(), std::numeric_limits<prefix>::max());
+ rStrm << nUnits;
+ if (rStrm.good())
+ {
+ nWritten += sizeof(prefix);
+ nWritten += writeOper(rStrm, rStr, nUnits);
+ }
+ return nWritten;
+ }
+}
+
+//Attempt to write a pascal-style length (of type prefix) prefixed sequence of
+//16bit units from an OUString, returned value is number of bytes written (including
+//byte-count of prefix)
+template<typename prefix> sal_Size write_lenPrefixed_uInt16s_FromOUString(SvStream& rStrm,
+ const rtl::OUString &rStr)
+{
+ return streamdetail::write_lenPrefixed_seq_From_str<prefix, rtl::OUString, write_uInt16s_FromOUString>(rStrm, rStr);
+}
+
//Attempt to read 8bit units to an OString until a zero terminator is
//encountered, returned rtl::OString's length is number of units *definitely*
//successfully read, check SvStream::good() to see if null terminator was
@@ -546,25 +590,26 @@ rtl::OUString read_lenPrefixed_uInt8s_ToOUString(SvStream& rStrm,
return rtl::OStringToOUString(read_lenPrefixed_uInt8s_ToOString<prefix>(rStrm), eEnc);
}
+//Attempt to write a prefixed sequence of nUnits 8bit units from an OString,
+//returned value is number of bytes written
+TOOLS_DLLPUBLIC inline sal_Size write_uInt8s_FromOString(SvStream& rStrm, const rtl::OString& rStr,
+ sal_Size nUnits)
+{
+ return rStrm.Write(rStr.getStr(), nUnits);
+}
+
+TOOLS_DLLPUBLIC inline sal_Size write_uInt8s_FromOString(SvStream& rStrm, const rtl::OString& rStr)
+{
+ return write_uInt8s_FromOString(rStrm, rStr, rStr.getLength());
+}
+
//Attempt to write a pascal-style length (of type prefix) prefixed sequence of
//8bit units from an OString, returned value is number of bytes written (including
//byte-count of prefix)
template<typename prefix> sal_Size write_lenPrefixed_uInt8s_FromOString(SvStream& rStrm,
const rtl::OString &rStr)
{
- SAL_WARN_IF(rStr.getLength() > std::numeric_limits<prefix>::max(),
- "tools.stream",
- "string too long for prefix count to fit in output type");
-
- sal_Size nWritten = 0;
- prefix nUnits = std::min<sal_Size>(rStr.getLength(), std::numeric_limits<prefix>::max());
- rStrm << nUnits;
- if (rStrm.good())
- {
- nWritten += sizeof(prefix);
- nWritten += rStrm.Write(rStr.getStr(), nUnits);
- }
- return nWritten;
+ return streamdetail::write_lenPrefixed_seq_From_str<prefix, rtl::OString, write_uInt8s_FromOString>(rStrm, rStr);
}
//Attempt to write a pascal-style length (of type prefix) prefixed sequence of
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 11cfe33..0e89905 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -856,21 +856,21 @@ rtl::OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStream, rtl_TextE
read_zeroTerminated_uInt8s_ToOString(rStream), eEnc);
}
-/*************************************************************************
-|*
-|* Stream::WriteUnicodeText()
-|*
-*************************************************************************/
-
-sal_Bool SvStream::WriteUnicodeText( const String& rStr )
-{
- DBG_ASSERT( sizeof(sal_Unicode) == sizeof(sal_uInt16), "WriteUnicodeText: swapping sizeof(sal_Unicode) not implemented" );
- if ( bSwap )
+//Attempt to write a prefixed sequence of nUnits 16bit units from an OUString,
+//returned value is number of bytes written
+sal_Size write_uInt16s_FromOUString(SvStream& rStrm, const rtl::OUString& rStr,
+ sal_Size nUnits)
+{
+ DBG_ASSERT( sizeof(sal_Unicode) == sizeof(sal_uInt16), "write_uInt16s_FromOUString: swapping sizeof(sal_Unicode) not implemented" );
+ sal_Size nWritten;
+ if (!rStrm.IsEndianSwap())
+ nWritten = rStrm.Write( (char*)rStr.getStr(), nUnits * sizeof(sal_Unicode) );
+ else
{
- xub_StrLen nLen = rStr.Len();
+ sal_Size nLen = nUnits;
sal_Unicode aBuf[384];
sal_Unicode* const pTmp = ( nLen > 384 ? new sal_Unicode[nLen] : aBuf);
- memcpy( pTmp, rStr.GetBuffer(), nLen * sizeof(sal_Unicode) );
+ memcpy( pTmp, rStr.getStr(), nLen * sizeof(sal_Unicode) );
sal_Unicode* p = pTmp;
const sal_Unicode* const pStop = pTmp + nLen;
while ( p < pStop )
@@ -878,23 +878,36 @@ sal_Bool SvStream::WriteUnicodeText( const String& rStr )
SwapUShort( *p );
p++;
}
- Write( (char*)pTmp, nLen * sizeof(sal_Unicode) );
+ nWritten = rStrm.Write( (char*)pTmp, nLen * sizeof(sal_Unicode) );
if ( pTmp != aBuf )
delete [] pTmp;
}
- else
- Write( (char*)rStr.GetBuffer(), rStr.Len() * sizeof(sal_Unicode) );
+ return nWritten;
+}
+
+/*************************************************************************
+|*
+|* Stream::WriteUnicodeText()
+|*
+*************************************************************************/
+
+sal_Bool SvStream::WriteUnicodeText( const String& rStr )
+{
+ write_uInt16s_FromOUString(*this, rStr, rStr.Len());
return nError == SVSTREAM_OK;
}
sal_Bool SvStream::WriteUnicodeOrByteText( const String& rStr, rtl_TextEncoding eDestCharSet )
{
if ( eDestCharSet == RTL_TEXTENCODING_UNICODE )
- return WriteUnicodeText( rStr );
+ {
+ write_uInt16s_FromOUString(*this, rStr, rStr.Len());
+ return nError == SVSTREAM_OK;
+ }
else
{
rtl::OString aStr(rtl::OUStringToOString(rStr, eDestCharSet));
- Write(aStr.getStr(), aStr.getLength());
+ write_uInt8s_FromOString(*this, aStr, aStr.getLength());
return nError == SVSTREAM_OK;
}
}
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 2d0c94c..f67c1cc 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -1263,13 +1263,7 @@ void MetaTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
rOStm << mnIndex;
rOStm << mnLen;
- sal_uInt16 nLen = sal::static_int_cast<sal_uInt16>(maStr.getLength()); // version 2
- rOStm << nLen;
- for (sal_uInt16 i = 0; i < nLen; ++i )
- {
- sal_Unicode nUni = maStr[i];
- rOStm << nUni;
- }
+ write_lenPrefixed_uInt16s_FromOUString<sal_uInt16>(rOStm, maStr); // version 2
}
// ------------------------------------------------------------------------
@@ -1410,13 +1404,7 @@ void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
for( sal_uLong i = 0UL; i < nAryLen; i++ )
rOStm << mpDXAry[ i ];
- sal_uInt16 nLen = sal::static_int_cast<sal_uInt16>(maStr.getLength()); // version 2
- rOStm << nLen;
- for (sal_uInt16 j = 0; j < nLen; ++j )
- {
- sal_Unicode nUni = maStr[j];
- rOStm << nUni;
- }
+ write_lenPrefixed_uInt16s_FromOUString<sal_uInt16>(rOStm, maStr); // version 2
}
// ------------------------------------------------------------------------
@@ -1550,13 +1538,7 @@ void MetaStretchTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
rOStm << mnIndex;
rOStm << mnLen;
- sal_uInt16 nLen = sal::static_int_cast<sal_uInt16>(maStr.getLength()); // version 2
- rOStm << nLen;
- for ( sal_uInt16 i = 0; i < nLen; ++i )
- {
- sal_Unicode nUni = maStr[i];
- rOStm << nUni;
- }
+ write_lenPrefixed_uInt16s_FromOUString<sal_uInt16>(rOStm, maStr); // version 2
}
// ------------------------------------------------------------------------
@@ -1637,13 +1619,7 @@ void MetaTextRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet );
rOStm << mnStyle;
- sal_uInt16 nLen = sal::static_int_cast<sal_uInt16>(maStr.getLength()); // version 2
- rOStm << nLen;
- for (sal_uInt16 i = 0; i < nLen; ++i)
- {
- sal_Unicode nUni = maStr[i];
- rOStm << nUni;
- }
+ write_lenPrefixed_uInt16s_FromOUString<sal_uInt16>(rOStm, maStr); // version 2
}
// ------------------------------------------------------------------------
commit 17ecf0036d44657b954de6c8f7efd536ab5c4809
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 24 11:08:48 2012 +0000
callcatcher: update list, remove newly unused methods
diff --git a/autodoc/inc/ary/info/all_tags.hxx b/autodoc/inc/ary/info/all_tags.hxx
index 79bb4de..4753601 100644
--- a/autodoc/inc/ary/info/all_tags.hxx
+++ b/autodoc/inc/ary/info/all_tags.hxx
@@ -138,25 +138,6 @@ class ImplementsTag : public AtTag
AtTag * pNext;
};
-class KeywordTag : public AtTag
-{
- public:
- KeywordTag();
-
- virtual bool Add_SpecialMeaningToken(
- const char * i_sText,
- intt i_nNr );
- virtual const char *
- Title() const;
- virtual UINT8 NrOfSpecialMeaningTokens() const;
- virtual AtTag * GetFollower();
-
- private:
- virtual DocuText * Text();
-
- StringVector sKeys;
-};
-
class ParameterTag : public AtTag
{
public:
@@ -184,30 +165,6 @@ class ParameterTag : public AtTag
AtTag * pNext;
};
-class SeeTag : public AtTag
-{
- public:
- SeeTag();
-
- virtual bool Add_SpecialMeaningToken(
- const char * i_sText,
- intt i_nNr );
- virtual const char *
- Title() const;
- virtual UINT8 NrOfSpecialMeaningTokens() const;
- virtual AtTag * GetFollower();
-
- const std::vector< QualifiedName > &
- References() const { return sReferences; }
- private:
- virtual void do_StoreAt(
- DocuDisplay & o_rDisplay ) const;
- virtual DocuText * Text();
-
- std::vector< QualifiedName >
- sReferences;
-};
-
class TemplateTag : public AtTag
{
public:
@@ -235,54 +192,6 @@ class TemplateTag : public AtTag
AtTag * pNext;
};
-class LabelTag : public AtTag
-{
- public:
- LabelTag();
-
- virtual bool Add_SpecialMeaningToken(
- const char * i_sText,
- intt i_nNr );
- virtual const char *
- Title() const;
- virtual UINT8 NrOfSpecialMeaningTokens() const;
- virtual AtTag * GetFollower();
-
- private:
- virtual DocuText * Text();
-
- String sLabel;
-};
-
-class SinceTag : public AtTag
-{
- public:
- SinceTag();
-
- virtual bool Add_SpecialMeaningToken(
- const char * i_sText,
- intt i_nNr );
- virtual const char *
- Title() const;
- virtual UINT8 NrOfSpecialMeaningTokens() const;
- virtual AtTag * GetFollower();
-
- const String & Version() const { return sVersion; }
-
- private:
- virtual void do_StoreAt(
- DocuDisplay & o_rDisplay ) const;
- virtual DocuText * Text();
-
- // Data
- String sVersion;
-};
-
-
-
-// IMPLEMENTATION
-
-
}
}
diff --git a/autodoc/inc/ary/info/ci_attag.hxx b/autodoc/inc/ary/info/ci_attag.hxx
index 720e601..2e32e24 100644
--- a/autodoc/inc/ary/info/ci_attag.hxx
+++ b/autodoc/inc/ary/info/ci_attag.hxx
@@ -51,8 +51,6 @@ class AtTag
public:
virtual ~AtTag() {}
- void Set_HtmlUseInDocuText(
- bool i_bUseIt );
virtual bool Add_SpecialMeaningToken( /// @return false, if token was not spüecial.
const char * i_sText,
intt i_nNr ) = 0;
diff --git a/autodoc/inc/ary/info/ci_text.hxx b/autodoc/inc/ary/info/ci_text.hxx
index 9c4331c..4e8bf7a 100644
--- a/autodoc/inc/ary/info/ci_text.hxx
+++ b/autodoc/inc/ary/info/ci_text.hxx
@@ -61,8 +61,6 @@ class DocuText
DYN DocuToken & let_drToken )
{ aTokens.push_back(&let_drToken); }
const TokenList & Tokens() const { return aTokens; }
- void StoreAt(
- DocuDisplay & o_rDisplay ) const;
bool IsNoHtml() const { return NOT bUsesHtml; }
bool IsEmpty() const { return aTokens.size() == 0; }
diff --git a/autodoc/inc/ary/info/infodisp.hxx b/autodoc/inc/ary/info/infodisp.hxx
index 38aae93..1a2f350 100644
--- a/autodoc/inc/ary/info/infodisp.hxx
+++ b/autodoc/inc/ary/info/infodisp.hxx
@@ -44,12 +44,8 @@ namespace info
class BaseTag;
class ExceptionTag;
class ImplementsTag;
- class KeywordTag;
class ParameterTag;
- class SeeTag;
class TemplateTag;
- class LabelTag;
- class SinceTag;
class DT_Text;
class DT_MaybeLink;
class DT_Whitespace;
@@ -79,20 +75,11 @@ class DocuDisplay
virtual void Display_ImplementsTag(
const ImplementsTag &
i_rData ) = 0;
- virtual void Display_KeywordTag(
- const KeywordTag & i_rData ) = 0;
virtual void Display_ParameterTag(
const ParameterTag &
i_rData ) = 0;
- virtual void Display_SeeTag(
- const SeeTag & i_rData ) = 0;
virtual void Display_TemplateTag(
const TemplateTag & i_rData ) = 0;
- virtual void Display_LabelTag(
- const LabelTag & i_rData ) = 0;
- virtual void Display_SinceTag(
- const ary::info::SinceTag &
- i_rData ) = 0;
virtual void Display_DT_Text(
const DT_Text & i_rData ) = 0;
virtual void Display_DT_MaybeLink(
diff --git a/autodoc/source/ary/info/all_tags.cxx b/autodoc/source/ary/info/all_tags.cxx
index 5699efc..897ab6f 100644
--- a/autodoc/source/ary/info/all_tags.cxx
+++ b/autodoc/source/ary/info/all_tags.cxx
@@ -244,49 +244,6 @@ ImplementsTag::Text()
return 0;
}
-
-//***************************** KeywordTag ***********************//
-
-
-KeywordTag::KeywordTag()
-// : sKeys
-{
-}
-
-bool
-KeywordTag::Add_SpecialMeaningToken( const char * i_sText,
- intt )
-{
- sKeys.push_back(i_sText);
- return true;
-}
-
-const char *
-KeywordTag::Title() const
-{
- return "Keywords";
-}
-
-UINT8
-KeywordTag::NrOfSpecialMeaningTokens() const
-{
- return std::numeric_limits<UINT8>::max();
-}
-
-AtTag *
-KeywordTag::GetFollower()
-{
- return this;
-}
-
-DocuText *
-KeywordTag::Text()
-{
- return 0;
-}
-
-
-
//***************************** ParameterTag ***********************//
@@ -344,60 +301,6 @@ ParameterTag::do_StoreAt( DocuDisplay & o_rDisplay ) const
o_rDisplay.Display_ParameterTag( *this );
}
-
-
-//***************************** SeeTag ***********************//
-
-
-
-SeeTag::SeeTag()
-// : sReferences
-{
-}
-
-bool
-SeeTag::Add_SpecialMeaningToken( const char * i_sText,
- intt )
-{
- static QualifiedName aNull_;
- sReferences.push_back(aNull_);
- sReferences.back().AssignText(i_sText,"::");
-
- return true;
-}
-
-const char *
-SeeTag::Title() const
-{
- return "See Also";
-}
-
-UINT8
-SeeTag::NrOfSpecialMeaningTokens() const
-{
- return std::numeric_limits<UINT8>::max();
-}
-
-AtTag *
-SeeTag::GetFollower()
-{
- return this;
-}
-
-void
-SeeTag::do_StoreAt( DocuDisplay & o_rDisplay ) const
-{
- o_rDisplay.Display_SeeTag( *this );
-}
-
-DocuText *
-SeeTag::Text()
-{
- return 0;
-}
-
-
-
//***************************** TemplateTag ***********************//
@@ -453,118 +356,6 @@ TemplateTag::Text()
return &aText;
}
-
-//***************************** LabelTag ***********************//
-
-
-
-LabelTag::LabelTag()
- : sLabel()
-{
-}
-
-bool
-LabelTag::Add_SpecialMeaningToken( const char * i_sText,
- intt i_nNr )
-{
- if ( i_nNr == 1 AND sLabel.length() == 0 )
- {
- sLabel = i_sText;
- return true;
- }
- // KORR_FUTURE
-// else // Throw exception because of double label.
- return false;
-}
-
-const char *
-LabelTag::Title() const
-{
- return "Label";
-}
-
-UINT8
-LabelTag::NrOfSpecialMeaningTokens() const
-{
- return 1;
-}
-
-AtTag *
-LabelTag::GetFollower()
-{
- return this;
-}
-
-DocuText *
-LabelTag::Text()
-{
- return 0;
-}
-
-
-//***************************** SinceTag ***********************//
-
-SinceTag::SinceTag()
- : sVersion()
-{
-}
-
-bool
-SinceTag::Add_SpecialMeaningToken( const char * i_sText,
- intt )
-{
- const char cCiphersend = '9' + 1;
- if ( sVersion.empty()
- AND NOT csv::in_range('0', *i_sText, cCiphersend)
- AND autodoc::CommandLine::Get_().DoesTransform_SinceTag() )
- {
- return true;
- }
-
- if (sVersion.empty())
- {
- sVersion = i_sText;
- }
- else
- {
- StreamLock sHelp(100);
- sVersion = sHelp() << sVersion << " " << i_sText << c_str;
- }
-
- return true;
-}
-
-const char *
-SinceTag::Title() const
-{
- return "Label";
-}
-
-UINT8
-SinceTag::NrOfSpecialMeaningTokens() const
-{
- return UINT8(-1);
-}
-
-AtTag *
-SinceTag::GetFollower()
-{
- return this;
-}
-
-void
-SinceTag::do_StoreAt( DocuDisplay & o_rDisplay ) const
-{
- o_rDisplay.Display_SinceTag( *this );
-}
-
-DocuText *
-SinceTag::Text()
-{
- return 0;
-}
-
-
} // namespace info
} // namespace ary
diff --git a/autodoc/source/ary/info/ci_attag.cxx b/autodoc/source/ary/info/ci_attag.cxx
index 73da1be..b8f6a20 100644
--- a/autodoc/source/ary/info/ci_attag.cxx
+++ b/autodoc/source/ary/info/ci_attag.cxx
@@ -41,14 +41,6 @@ namespace info
{
void
-AtTag::Set_HtmlUseInDocuText( bool i_bUseIt )
-{
- DocuText * pText = Text();
- if ( pText != 0 )
- pText->Set_HtmlUse(i_bUseIt);
-}
-
-void
AtTag::Add_Token( const char * i_sText )
{
DocuText * pText = Text();
diff --git a/autodoc/source/ary/info/ci_text.cxx b/autodoc/source/ary/info/ci_text.cxx
index bf4aa5e..e6f9460 100644
--- a/autodoc/source/ary/info/ci_text.cxx
+++ b/autodoc/source/ary/info/ci_text.cxx
@@ -54,18 +54,6 @@ DocuText::~DocuText()
}
}
-void
-DocuText::StoreAt( DocuDisplay & o_rDisplay ) const
-{
- ary::info::DocuText::TokenList::const_iterator itEnd = aTokens.end();
- for ( ary::info::DocuText::TokenList::const_iterator it = aTokens.begin();
- it != itEnd;
- ++it )
- {
- (*it)->StoreAt(o_rDisplay);
- }
-}
-
} // namespace info
} // namespace ary
diff --git a/autodoc/source/display/idl/hfi_linklist.cxx b/autodoc/source/display/idl/hfi_linklist.cxx
deleted file mode 100644
index f0cf47e..0000000
--- a/autodoc/source/display/idl/hfi_linklist.cxx
+++ /dev/null
@@ -1,380 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <precomp.h>
-#include "hfi_linklist.hxx"
-
-
-// NOT FULLY DEFINED SERVICES
-#include <ary/idl/i_ce.hxx>
-#include <ary/idl/i_gate.hxx>
-#include <ary/idl/ip_ce.hxx>
-#include <ary/idl/ip_type.hxx>
-#include <toolkit/hf_docentry.hxx>
-#include <toolkit/hf_title.hxx>
-#include "hfi_doc.hxx"
-#include "hfi_tag.hxx"
-#include "hfi_typetext.hxx"
-#include "hi_ary.hxx"
-#include "hi_env.hxx"
-
-
-
-
-//******************* HF_CommentedLink_Table **********************************//
-
-HF_CommentedLink_Table::HF_CommentedLink_Table( Environment & io_rEnv,
- Xml::Element & o_rOut,
- const String & i_sTitle,
- const String & i_sLabel,
- bool i_bBorder )
- : HtmlFactory_Idl(io_rEnv,&o_rOut),
- pTable( new Html::Table( (i_bBorder ? "1" : "0"), "100%", "5", "0") ),
- pCurLinkColumn(0),
- pCurCommentColumn(0)
-{
- *pTable
- << new Html::ClassAttr("commentedlinks");
-
- CurOut()
- >> *new Html::Label(i_sLabel)
- << new Html::LineBreak;
- CurOut()
- << pTable;
-// HF_SubTitle aTitle(*pTable);
-// aTitle.Produce_it(i_sTitle);
-}
-
-HF_CommentedLink_Table::~HF_CommentedLink_Table()
-{
-}
-
-void
-HF_CommentedLink_Table::Add_Line()
-{
- Html::TableRow &
- rRow = pTable->AddRow();
-
- pCurLinkColumn = & (rRow.AddCell()
- << new Html::WidthAttr("30%")
- << new Xml::AnAttribute("valign","top") );
- pCurCommentColumn = & rRow.AddCell();
-}
-
-Xml::Element &
-HF_CommentedLink_Table::Cur_LinkColumn()
-{
- csv_assert(pCurLinkColumn != 0);
- return *pCurLinkColumn;
-}
-
-Xml::Element &
-HF_CommentedLink_Table::Cur_CommentColumn()
-{
- csv_assert(pCurCommentColumn != 0);
- return *pCurCommentColumn;
-}
-
-
-//******************* HF_MemberTable **********************************//
-
-HF_MemberTable::HF_MemberTable( Environment & io_rEnv,
- Xml::Element & o_rOut,
- const String & i_sTitle,
- const String & i_sLabel,
- bool i_bInline )
- : HtmlFactory_Idl(io_rEnv,&o_rOut),
- pTable( new Html::Table("1", "100%", "5", "0") ),
- pCurDeclaration(0),
- pCurDescription(0),
- bInline(i_bInline)
-{
- *pTable
- << new Html::ClassAttr("memberlist");
-
- CurOut()
- >> *new Html::Label(i_sLabel)
- << new Html::LineBreak;
- CurOut()
- << pTable;
-// HF_SubTitle aTitle(*pTable);
-// aTitle.Produce_it(i_sTitle);
-}
-
-HF_MemberTable::~HF_MemberTable()
-{
-}
-
-void
-HF_MemberTable::Add_Line()
-{
- if (bInline)
- {
- Html::TableRow & rRow = pTable->AddRow();
-
- pCurDeclaration = &( rRow.AddCell()
- << new Xml::AnAttribute("valign","top")
- << new Html::WidthAttr("30%") );
- pCurDescription = & rRow.AddCell();
- }
- else
- {
- Html::DefList *
- pMemberSpace = new Html::DefList;
- *pMemberSpace
- << new Html::ClassAttr("member");
-
- pTable->AddRow().AddCell() << pMemberSpace;
-
- pCurDeclaration =
- & ( *pMemberSpace
- >> *new Html::DefListTerm
- << new Html::ClassAttr("member") );
- pCurDescription =
- & ( *pMemberSpace
- >> *new Html::DefListDefinition()
- << new Html::ClassAttr("member") );
- }
-}
-
-Xml::Element &
-HF_MemberTable::Cur_Declaration()
-{
- csv_assert(pCurDeclaration != 0);
- return *pCurDeclaration;
-}
-
-Xml::Element &
-HF_MemberTable::Cur_Description()
-{
- csv_assert(pCurDescription != 0);
- return *pCurDescription;
-}
-
-
-
-//******************* HF_IdlLinkList **********************************//
-
-HF_IdlLinkList::HF_IdlLinkList( Environment & io_rEnv,
- Xml::Element * o_pOut )
- : HtmlFactory_Idl(io_rEnv,o_pOut)
-{
-}
-
-HF_IdlLinkList::~HF_IdlLinkList()
-{
-}
-
-void
-HF_IdlLinkList::Produce_NamespaceMembers( const String & i_sTitle,
- const String & i_sLabel,
- const std::vector<ary::idl::Ce_id> & i_rList,
- bool i_bNestedNamespaces ) const
-{
- HF_CommentedLink_Table
- aTableMaker( Env(), CurOut(),
- i_sTitle, i_sLabel,
- true );
-
- std::vector<ary::idl::Ce_id>::const_iterator itEnd = i_rList.end();
- for ( std::vector<ary::idl::Ce_id>::const_iterator it = i_rList.begin();
- it != itEnd;
- ++it )
- {
- static String sEntryName;
- static String sEntryLink;
- const ce_info *
- pDocu = 0;
- Get_EntryData_NamespaceMembers( sEntryName, sEntryLink, pDocu, *it, i_bNestedNamespaces );
- aTableMaker.Add_Line();
-
- aTableMaker.Cur_LinkColumn()
- >> *new Html::Link(sEntryLink)
- << sEntryName;
-
- if ( pDocu != 0 )
- {
- HF_IdlShortDocu
- aTextDisplay(Env(), aTableMaker.Cur_CommentColumn() );
- aTextDisplay.Produce_byData( pDocu );
- }
- } // end for
-}
-
-void
-HF_IdlLinkList::Produce_GlobalLinks( const String & i_sTitle,
- const String & i_sLabel,
- ce_list & i_rList ) const
-{
- HF_CommentedLink_Table
- aTableMaker( Env(), CurOut(),
- i_sTitle, i_sLabel,
- true );
-
- for ( ; i_rList; ++i_rList )
- {
- aTableMaker.Add_Line();
- HF_IdlTypeText
- aLinkText( Env(), aTableMaker.Cur_LinkColumn(), true );
- aLinkText.Produce_byData(*i_rList);
-
- const ce_info *
- pDocu = Get_EntryDocu(*i_rList);
- if ( pDocu != 0 )
- {
- HF_IdlShortDocu
- aTextDisplay(Env(), aTableMaker.Cur_CommentColumn() );
- aTextDisplay.Produce_byData( pDocu, *i_rList );
- }
- }
-}
-
-void
-HF_IdlLinkList::Produce_GlobalCommentedLinks( const String & i_sTitle,
- const String & i_sLabel,
- comref_list & i_rList ) const
-{
- HF_CommentedLink_Table
- aTableMaker( Env(), CurOut(),
- i_sTitle, i_sLabel,
- true );
-/*
- for ( ; i_rList; ++i_rList )
- {
- aTableMaker.Add_Line();
- HF_IdlTypeText
- aLinkText( Env(), aTableMaker.Cur_LinkColumn(), true );
- aLinkText.Produce_byData( (*i_rList).first );
-
- HF_DocEntryList
- aDocList( aTableMaker.Cur_CommentColumn() );
- if ( (*i_rList).second != 0 )
- {
- HF_IdlDocu
- aDocuDisplay( Env(), aDocList );
- aDocuDisplay.Produce_byData( (*i_rList).second );
- }
- else
- {
- const ce_info *
- pShort = Get_EntryDocu(
- Env().Gate().Types().Search_CeRelatedTo(
- (*i_rList).first) );
- if ( pShort != 0 )
- {
- if (pShort->IsDeprecated())
- {
- aDocList.Produce_Term()
- << "[ DEPRECATED ]";
- }
- if (pShort->IsOptional())
- {
- aDocList.Produce_Term()
- << "[ OPTIONAL ]";
- }
-
- aDocList.Produce_Term()
- << "Description";
-
- HF_IdlDocuTextDisplay
- aShortDisplay( Env(), &aDocList.Produce_Definition() );
- aShortDisplay.Set_CurScopeTo(
- Env().Gate().Types().Search_CeRelatedTo((*i_rList).first) );
- pShort->Short().DisplayAt(aShortDisplay);
- }
- }
- }
-*/
-}
-
-void
-HF_IdlLinkList::Produce_MemberLinks( const String & i_sTitle,
- const String & i_sLabel,
- ce_list & i_rList ) const
-{
- HF_CommentedLink_Table
- aTableMaker( Env(), CurOut(),
- i_sTitle, i_sLabel,
- true );
-
-/*
- for ( ; i_rList; ++i_rList )
- {
- const ary::idl::CodeEntity &
- rCe = Env().Gate().Ces().Find_Ce(*i_rList);
-
- aTableMaker.Add_Line();
- aTableMaker.Cur_LinkColumn()
- >> *new Html::Link(
- StreamLock(200)() << "#" << rCe.LocalName() << c_str)
- << rCe.LocalName();
-
- const ce_info *
- pDocu = rCe.Docu();
- if ( pDocu != 0 )
- {
- HF_IdlShortDocu
- aTextDisplay(Env(), aTableMaker.Cur_CommentColumn() );
- aTextDisplay.Produce_byData( *pDocu );
- }
- } // end for
-*/
-}
-
-void
-HF_IdlLinkList::Get_EntryData_NamespaceMembers(
- String & o_sEntryName,
- String & o_sEntryLink,
- const ce_info * & o_pDocu,
- ce_id i_nMemberId,
- bool i_bIsNestedNamespace ) const
-{
- const ary::idl::CodeEntity &
- rCe = Env().Data().Find_Ce(i_nMemberId);
-
- o_sEntryName = rCe.LocalName();
- o_sEntryLink = StreamLock(200)() << rCe.LocalName()
- << ( i_bIsNestedNamespace
- ? "/module-ix"
- : "" )
- << ".html"
- << c_str;
- o_pDocu = rCe.Docu();
-}
-
-const ary::doc::OldIdlDocu *
-HF_IdlLinkList::Get_EntryDocu(ce_id i_nMemberId) const
-{
- if (i_nMemberId.IsValid())
- return Env().Data().Find_Ce(i_nMemberId).Docu();
- else
- return 0;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_linklist.hxx b/autodoc/source/display/idl/hfi_linklist.hxx
deleted file mode 100644
index 83a8998..0000000
--- a/autodoc/source/display/idl/hfi_linklist.hxx
+++ /dev/null
@@ -1,147 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef ADC_DISPLAY_HFI_LINKLIST_HXX
-#define ADC_DISPLAY_HFI_LINKLIST_HXX
-
-
-
-// USED SERVICES
- // BASE CLASSES
-#include "hi_factory.hxx"
- // COMPONENTS
- // PARAMETERS
-#include <ary/idl/i_comrela.hxx>
-#include <ary_i/ci_text2.hxx>
-#include <ary/doc/d_oldidldocu.hxx>
-
-
-
-
-class HF_CommentedLink_Table : public HtmlFactory_Idl
-{
- public:
- HF_CommentedLink_Table(
- Environment & io_rEnv,
- Xml::Element & o_rOut,
- const String & i_sTitle,
- const String & i_sLabel,
- bool i_bBorder = false );
- virtual ~HF_CommentedLink_Table();
-
- void Add_Line();
- Xml::Element & Cur_LinkColumn();
- Xml::Element & Cur_CommentColumn();
-
- private:
- // DATA
- Html::Table * pTable;
- Xml::Element * pCurLinkColumn;
- Xml::Element * pCurCommentColumn;
-};
-
-class HF_MemberTable : public HtmlFactory_Idl
-{
- public:
- HF_MemberTable(
- Environment & io_rEnv,
- Xml::Element & o_rOut,
- const String & i_sTitle,
- const String & i_sLabel,
- bool i_bInline = false );
- virtual ~HF_MemberTable();
-
- void Add_Line();
- Xml::Element & Cur_Declaration();
- Xml::Element & Cur_Description();
-
- private:
- // DATA
- Html::Table * pTable;
- Xml::Element * pCurDeclaration;
- Xml::Element * pCurDescription;
- bool bInline;
-};
-
-
-
-
-class HF_IdlLinkList : public HtmlFactory_Idl
-{
- public:
- typedef ary::StdConstIterator<ary::idl::CommentedRelation>
- comref_list;
-
- HF_IdlLinkList(
- Environment & io_rEnv,
- Xml::Element * o_pOut );
- virtual ~HF_IdlLinkList();
-
- void Produce_NamespaceMembers(
- const String & i_sTitle,
- const String & i_sLabel,
- const std::vector<ary::idl::Ce_id> &
- i_rList,
- bool i_bNestedNamespaces = false ) const;
- void Produce_GlobalLinks(
- const String & i_sTitle,
- const String & i_sLabel,
- ce_list & i_rList ) const;
- void Produce_GlobalCommentedLinks(
- const String & i_sTitle,
- const String & i_sLabel,
- comref_list & i_rList ) const;
- void Produce_MemberLinks(
- const String & i_sTitle,
- const String & i_sLabel,
- ce_list & i_rList ) const;
- private:
- void Get_EntryData_NamespaceMembers(
- String & o_sEntryName,
- String & o_sEntryLink,
- const ce_info * & o_pDocuText,
- ce_id i_nMemberId,
- bool i_bIsNestedNamespace ) const;
- const ce_info * Get_EntryDocu(
- ce_id i_nMemberId ) const;
-};
-
-
-
-
-
-
-
-
-// IMPLEMENTATION
-
-
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_method.hxx b/autodoc/source/display/idl/hfi_method.hxx
index 7da0e5f..55f99db 100644
--- a/autodoc/source/display/idl/hfi_method.hxx
+++ b/autodoc/source/display/idl/hfi_method.hxx
@@ -38,10 +38,6 @@
// PARAMETERS
#include <ary/idl/i_param.hxx>
#include <ary/doc/d_oldidldocu.hxx>
-typedef ary::doc::OldIdlDocu CodeInfo;
-#include "hfi_linklist.hxx"
-
-
namespace csi
{
diff --git a/autodoc/source/inc/tools/tkpchars.hxx b/autodoc/source/inc/tools/tkpchars.hxx
index 780352b..c5b952f 100644
--- a/autodoc/source/inc/tools/tkpchars.hxx
+++ b/autodoc/source/inc/tools/tkpchars.hxx
@@ -75,9 +75,6 @@ class CharacterSource
void LoadText(
csv::bstream & io_rSource);
- void InsertTextAtCurPos(
- const char * i_sText2Insert );
-
/// @return CurChar() after moving forward one char.
char MoveOn();
/** @return
diff --git a/autodoc/source/parser/inc/tokens/stmstate.hxx b/autodoc/source/parser/inc/tokens/stmstate.hxx
index e966b47..9a60f73 100644
--- a/autodoc/source/parser/inc/tokens/stmstate.hxx
+++ b/autodoc/source/parser/inc/tokens/stmstate.hxx
@@ -34,7 +34,6 @@
// COMPONENTS
// PARAMETERS
class StmArrayStatus;
-class StmBoundsStatus;
/** A StmStatus is a state within a StateMachine.
There are two kinds of it. Either its an array of pointers to
@@ -55,8 +54,6 @@ class StmStatus // := "State machine status"
// OPERATIONS
virtual StmArrayStatus *
AsArray();
- virtual StmBoundsStatus *
- AsBounds();
// INQUIRY
virtual bool IsADefault() const = 0;
diff --git a/autodoc/source/parser/inc/tokens/stmstfin.hxx b/autodoc/source/parser/inc/tokens/stmstfin.hxx
deleted file mode 100644
index 7ded649..0000000
--- a/autodoc/source/parser/inc/tokens/stmstfin.hxx
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef ADC_STMSTFIN_HXX
-#define ADC_STMSTFIN_HXX
-
-// USED SERVICES
- // BASE CLASSES
-#include <tokens/stmstate.hxx>
- // COMPONENTS
- // PARAMETERS
-
-
-class TkpContext;
-class StateMachineContext;
-
-/**
-**/
-class StmBoundsStatus : public StmStatus
-{
- public:
- // LIFECYCLE
- StmBoundsStatus(
- StateMachineContext &
- o_rOwner,
- TkpContext & i_rFollowUpContext,
- uintt i_nStatusFunctionNr,
- bool i_bIsDefault );
- // INQUIRY
- TkpContext * FollowUpContext();
- uintt StatusFunctionNr() const;
- virtual bool IsADefault() const;
-
- // ACCESS
- virtual StmBoundsStatus *
- AsBounds();
-
- private:
- StateMachineContext *
- pOwner;
- TkpContext * pFollowUpContext;
- uintt nStatusFunctionNr;
- bool bIsDefault;
-};
-
-inline TkpContext *
-StmBoundsStatus::FollowUpContext()
- { return pFollowUpContext; }
-inline uintt
-StmBoundsStatus::StatusFunctionNr() const
- { return nStatusFunctionNr; }
-
-
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/tokens/tkp.hxx b/autodoc/source/parser/inc/tokens/tkp.hxx
index 97fc957..4105daf 100644
--- a/autodoc/source/parser/inc/tokens/tkp.hxx
+++ b/autodoc/source/parser/inc/tokens/tkp.hxx
@@ -42,9 +42,6 @@ class TkpContext;
a text.
Start() starts to parse the text from the given i_rSource.
- GetNextToken() returns a Token on the heap as long as there are
- still characters in the text left. This can be checked by
- HasMore().
The algorithms for parsing tokens from the text are an issue of
the derived classes.
@@ -65,11 +62,6 @@ class TokenParser
CharacterSource &
i_rSource );
- /** @short Gets the next identifiable token out of the
- source code.
- */
- void GetNextToken();
-
/// @return true, if there are more tokens to parse.
bool HasMore() const { return bHasMore; }
diff --git a/autodoc/source/parser/inc/tokens/tkpcontx.hxx b/autodoc/source/parser/inc/tokens/tkpcontx.hxx
index c8818b4..dda63d0 100644
--- a/autodoc/source/parser/inc/tokens/tkpcontx.hxx
+++ b/autodoc/source/parser/inc/tokens/tkpcontx.hxx
@@ -88,9 +88,6 @@ class TkpContext
virtual bool PassNewToken() = 0;
virtual TkpContext &
FollowUpContext() = 0;
-
- static TkpNullContext &
- Null_();
};
class StateMachineContext
@@ -100,7 +97,6 @@ class StateMachineContext
virtual ~StateMachineContext() {}
- /// Is used by StmBoundsStatus only.
virtual void PerformStatusFunction(
uintt i_nStatusSignal,
F_CRTOK i_fTokenCreateFunction,
diff --git a/autodoc/source/parser/inc/tokens/tkpstama.hxx b/autodoc/source/parser/inc/tokens/tkpstama.hxx
deleted file mode 100644
index 9c09ba6..0000000
--- a/autodoc/source/parser/inc/tokens/tkpstama.hxx
+++ /dev/null
@@ -1,125 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef ADC_TKPSTAMA_HXX
-#define ADC_TKPSTAMA_HXX
-
-// USED SERVICES
- // BASE CLASSES
-#include <tokens/tkpcontx.hxx>
- // COMPONENTS
-#include <tokens/stmstarr.hxx>
-#include <tokens/stmstfin.hxx>
-
-/** @descr
- This state-machine models state transitions from one state to another
- per indices of branches. If the indices represent ascii-char-values,
- the state-machine can be used for recognising tokens of text.
-
- The state-machine can be a status itself.
-
- StateMachine needs the array-size of all stati as a guess, how many stati
- the state machine will contain, when at work.
-
-
-**/
-class StateMachine
-{
- public:
- // Types
- typedef StmStatus::Branch Branch;
- typedef StmStatus * * StatusList;
-
- //# Interface self
- // LIFECYCLE
- StateMachine(
- intt in_nStatusSize,
- intt in_nInitial_StatusListSize ); /// The user of the constructor should guess
- /// the approximate number of stati here to
- /// avoid multiple reallocations.
- /// @#AddStatus
- intt AddStatus( /// @return the new #Status' ID
- DYN StmStatus * let_dpStatus);
- /// @#AddToken
- void AddToken(
- const char * in_sToken,
- TextToken::F_CRTOK in_fTokenCreateFunction,
- const INT16 * in_aBranches,
- INT16 in_nBoundsStatus );
- ~StateMachine();
-
-
- // OPERATIONS
- StmBoundsStatus &
- GetCharChain(
- TextToken::F_CRTOK &
- o_nTokenCreateFunction,
- CharacterSource & io_rText );
- private:
- // SERVICE FUNCTIONS
- StmStatus & Status(
- intt in_nStatusNr) const;
- StmArrayStatus &
- CurrentStatus() const;
- StmBoundsStatus *
- BoundsStatus() const;
-
- /// Sets the PeekedStatus.
- void Peek(
- intt in_nBranch);
-
- void ResizeStati(); // Adds space for 32 stati.
-
- // DATA
- StatusList pStati; /// List of Status, implemented as simple C-array of length #nStatiSpace
- /// with nStatiLength valid members (beginning from zero).
- intt nCurrentStatus;
- intt nPeekedStatus;
-
- intt nStatusSize; /// Size of the branch array of a single status.
-
- intt nNrofStati; /// Nr of Stati so far.
- intt nStatiSpace; /// Size of allocated array for #pStati (size in items).
-};
-
-
-
-/** @#AddToken
- @descr
- Adds a token, which will be recogniszeds by the
- statemachine.
-
-
-**/
-
-
-
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/tokens/makefile.mk b/autodoc/source/parser/tokens/makefile.mk
index beb3207..32bfac8 100644
--- a/autodoc/source/parser/tokens/makefile.mk
+++ b/autodoc/source/parser/tokens/makefile.mk
@@ -47,8 +47,6 @@ PRJINC=$(PRJ)$/source
OBJFILES= \
$(OBJ)$/stmstarr.obj \
$(OBJ)$/stmstate.obj \
- $(OBJ)$/stmstfin.obj \
- $(OBJ)$/tkpstama.obj \
$(OBJ)$/tkp.obj \
$(OBJ)$/tkpcontx.obj \
$(OBJ)$/tokdeal.obj
diff --git a/autodoc/source/parser/tokens/stmstate.cxx b/autodoc/source/parser/tokens/stmstate.cxx
index 6530ebb..9063b61 100644
--- a/autodoc/source/parser/tokens/stmstate.cxx
+++ b/autodoc/source/parser/tokens/stmstate.cxx
@@ -38,11 +38,4 @@ StmStatus::AsArray()
return 0;
}
-StmBoundsStatus *
-StmStatus::AsBounds()
-{
- return 0;
-}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/tokens/stmstfin.cxx b/autodoc/source/parser/tokens/stmstfin.cxx
deleted file mode 100644
index 84b7a9c..0000000
--- a/autodoc/source/parser/tokens/stmstfin.cxx
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <precomp.h>
-#include <tokens/stmstfin.hxx>
-
-
-// NOT FULLY DECLARED SERVICES
-#include <tokens/tkpcontx.hxx>
-
-
-StmBoundsStatus::StmBoundsStatus( StateMachineContext &
- o_rOwner,
- TkpContext & i_rFollowUpContext,
- uintt i_nStatusFunctionNr,
- bool i_bIsDefault )
- : pOwner(&o_rOwner),
- pFollowUpContext(&i_rFollowUpContext),
- nStatusFunctionNr(i_nStatusFunctionNr),
- bIsDefault(i_bIsDefault)
-{
-}
-
-bool
-StmBoundsStatus::IsADefault() const
-{
- return bIsDefault;
-}
-
-StmBoundsStatus *
-StmBoundsStatus::AsBounds()
-{
- return this;
-}
-
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/tokens/tkp.cxx b/autodoc/source/parser/tokens/tkp.cxx
index 7be7bcb..8d90ff0 100644
--- a/autodoc/source/parser/tokens/tkp.cxx
+++ b/autodoc/source/parser/tokens/tkp.cxx
@@ -48,21 +48,6 @@ TokenParser::Start( CharacterSource & i_rSource )
}
void
-TokenParser::GetNextToken()
-{
- csv_assert(pChars != 0);
-
- bHasMore = NOT pChars->IsFinished();
-
- for ( bool bDone = NOT bHasMore; NOT bDone; )
- {
- CurrentContext().ReadCharChain(*pChars);
- bDone = CurrentContext().PassNewToken();
- SetCurrentContext(CurrentContext().FollowUpContext());
- }
-}
-
-void
TokenParser::InitSource( CharacterSource & i_rSource )
{
pChars = &i_rSource;
diff --git a/autodoc/source/parser/tokens/tkpcontx.cxx b/autodoc/source/parser/tokens/tkpcontx.cxx
index c1979bf..06f4da5 100644
--- a/autodoc/source/parser/tokens/tkpcontx.cxx
+++ b/autodoc/source/parser/tokens/tkpcontx.cxx
@@ -31,16 +31,6 @@
// NOT FULLY DECLARED SERVICES
-
-
-TkpNullContext G_aNullContext;
-
-TkpNullContext &
-TkpContext::Null_()
-{
- return G_aNullContext;
-}
-
TkpNullContext::~TkpNullContext()
{
}
diff --git a/autodoc/source/parser/tokens/tkpstama.cxx b/autodoc/source/parser/tokens/tkpstama.cxx
deleted file mode 100644
index f3e88b3..0000000
--- a/autodoc/source/parser/tokens/tkpstama.cxx
+++ /dev/null
@@ -1,175 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <precomp.h>
-#include <tokens/tkpstama.hxx>
-
-// NOT FULLY DECLARED SERVICES
-#include <tokens/stmstarr.hxx>
-#include <tools/tkpchars.hxx>
-
-const intt C_nStatuslistResizeValue = 32;
-const intt C_nTopStatus = 0;
-
-StateMachine::StateMachine( intt in_nStatusSize,
- intt in_nInitial_StatusListSize )
- : pStati(new StmStatus*[in_nInitial_StatusListSize]),
- nCurrentStatus(C_nTopStatus),
- nPeekedStatus(C_nTopStatus),
- nStatusSize(in_nStatusSize),
- nNrofStati(0),
- nStatiSpace(in_nInitial_StatusListSize)
-{
- csv_assert(in_nStatusSize > 0);
- csv_assert(in_nInitial_StatusListSize > 0);
-
- memset(pStati, 0, sizeof(StmStatus*) * nStatiSpace);
-}
-
-intt
-StateMachine::AddStatus(StmStatus * let_dpStatus)
-{
- if (nNrofStati == nStatiSpace)
- {
- ResizeStati();
- }
- pStati[nNrofStati] = let_dpStatus;
- return nNrofStati++;
-}
-
-void
-StateMachine::AddToken( const char * in_sToken,
- TextToken::F_CRTOK in_fTokenCreateFunction,
- const INT16 * in_aBranches,
- INT16 in_nBoundsStatus )
-{
- if (csv::no_str(in_sToken))
- return;
-
-
- nCurrentStatus = 0;
- nPeekedStatus = 0;
-
- for ( const char * pChar = in_sToken;
- *pChar != NULCH;
- ++pChar )
- {
- Peek(*pChar);
- StmStatus & rPst = Status(nPeekedStatus);
- if ( rPst.IsADefault() OR rPst.AsBounds() != 0 )
- {
- nPeekedStatus = AddStatus( new StmArrayStatus(nStatusSize, in_aBranches, 0, false ) );
- CurrentStatus().SetBranch( *pChar, nPeekedStatus );
- }
- nCurrentStatus = nPeekedStatus;
- } // end for
- StmArrayStatus & rLastStatus = CurrentStatus();
- rLastStatus.SetTokenCreateFunction(in_fTokenCreateFunction);
- for (intt i = 0; i < nStatusSize; i++)
- {
- if (Status(rLastStatus.NextBy(i)).AsBounds() != 0)
- rLastStatus.SetBranch(i,in_nBoundsStatus);
- } // end for
-}
-
-StateMachine::~StateMachine()
-{
- for (intt i = 0; i < nNrofStati; i++)
- {
- delete pStati[i];
- }
- delete [] pStati;
-}
-
-StmBoundsStatus &
-StateMachine::GetCharChain( TextToken::F_CRTOK & o_nTokenCreateFunction,
- CharacterSource & io_rText )
-{
- nCurrentStatus = C_nTopStatus;
-
- Peek(io_rText.CurChar());
- while (BoundsStatus() == 0)
- {
- nCurrentStatus = nPeekedStatus;
- Peek(io_rText.MoveOn());
- }
- o_nTokenCreateFunction = CurrentStatus().TokenCreateFunction();
-
- return *BoundsStatus();
-}
-
-void
-StateMachine::ResizeStati()
-{
- intt nNewSize = nStatiSpace + C_nStatuslistResizeValue;
- intt i = 0;
- StatusList pNewStati = new StmStatus*[nNewSize];
-
- for ( ; i < nNrofStati; i++)
- {
- pNewStati[i] = pStati[i];
- }
- memset( pNewStati+i,
- 0,
- (nNewSize-i) * sizeof(StmStatus*) );
-
- delete [] pStati;
- pStati = pNewStati;
- nStatiSpace = nNewSize;
-}
-
-StmStatus &
-StateMachine::Status(intt in_nStatusNr) const
-{
- csv_assert( csv::in_range(intt(0), in_nStatusNr, intt(nNrofStati)) );
- return *pStati[in_nStatusNr];
-}
-
-StmArrayStatus &
-StateMachine::CurrentStatus() const
-{
- StmArrayStatus * pCurSt = Status(nCurrentStatus).AsArray();
-
- csv_assert(pCurSt != 0);
- return *pCurSt;
-}
-
-StmBoundsStatus *
-StateMachine::BoundsStatus() const
-{
- return Status(nPeekedStatus).AsBounds();
-}
-
-void
-StateMachine::Peek(intt in_nBranch)
-{
- StmArrayStatus & rSt = CurrentStatus();
- nPeekedStatus = rSt.NextBy(in_nBranch);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/tools/tkpchars.cxx b/autodoc/source/tools/tkpchars.cxx
index ad5d3f0..92d91d5 100644
--- a/autodoc/source/tools/tkpchars.cxx
+++ b/autodoc/source/tools/tkpchars.cxx
@@ -73,28 +73,6 @@ CharacterSource::LoadText(csv::bstream & io_rSource)
BeginSource();
}
-/// KORR_FUTURE: So far, this works only when tokens do not cross inserted text boundaries.
-void
-CharacterSource::InsertTextAtCurPos( const char * i_sText2Insert )
-{
- if ( !i_sText2Insert || !i_sText2Insert[0] )
- return;
-
- aSourcesStack.push( S_SourceState(
- dpSource,
- nSourceSize,
- nCurPos,
- nLastCut,
- nLastTokenStart,
- cCharAtLastCut ) );
-
- nSourceSize = strlen(i_sText2Insert);
- dpSource = new char[nSourceSize+1];
- strcpy( dpSource, i_sText2Insert); // SAFE STRCPY (#100211# - checked)
-
- BeginSource();
-}
-
const char *
CharacterSource::CutToken()
{
diff --git a/cosv/inc/cosv/file.hxx b/cosv/inc/cosv/file.hxx
index 9d12cac..b005a21 100644
--- a/cosv/inc/cosv/file.hxx
+++ b/cosv/inc/cosv/file.hxx
@@ -58,10 +58,6 @@ class File : public bstream,
public:
// LIFECYCLE
File(
- const ::csv::ploc::Path &
- i_rLocation,
- uintt i_nMode = CFM_RW );
- File(
const char * i_sLocation,
uintt in_nMode = CFM_RW );
File(
diff --git a/cosv/inc/cosv/streamstr.hxx b/cosv/inc/cosv/streamstr.hxx
index f91cef4..67d22a5 100644
--- a/cosv/inc/cosv/streamstr.hxx
+++ b/cosv/inc/cosv/streamstr.hxx
@@ -88,9 +88,6 @@ class StreamStr : public bostream
// LIFECYCLE
StreamStr(
size_type i_nCapacity );
- StreamStr(
- const char * i_sInitStr,
- size_type i_nCapacity ); /// Only used if > strlen(i_sInitStr).
/// Copies also insert_mode and current position.
StreamStr(
const self & i_rOther );
@@ -207,10 +204,6 @@ class StreamStr : public bostream
char i_cCarToSearch,
char i_cReplacement );
- StreamStr & to_upper(
- position_type i_nStart = 0,
- size_type i_nLength = str::maxsize );
-
// INQUIRY
const char * c_str() const;
const char * data() const;
diff --git a/cosv/source/storage/file.cxx b/cosv/source/storage/file.cxx
index 2656cbd..16665d7 100644
--- a/cosv/source/storage/file.cxx
+++ b/cosv/source/storage/file.cxx
@@ -43,15 +43,6 @@ namespace csv
{
-File::File( const ploc::Path & i_rLocation,
- uintt i_nMode )
- : aPath(i_rLocation),
- pStream(0),
- nMode(i_nMode),
- eLastIO(io_none)
-{
-}
-
File::File( const char * i_sLocation,
uintt i_nMode )
: aPath(i_sLocation),
diff --git a/cosv/source/strings/streamstr.cxx b/cosv/source/strings/streamstr.cxx
index ef266ac..309b9fc 100644
--- a/cosv/source/strings/streamstr.cxx
+++ b/cosv/source/strings/streamstr.cxx
@@ -74,23 +74,6 @@ StreamStr::StreamStr( size_type i_nCapacity )
*pEnd = '\0';
}
-StreamStr::StreamStr( const char * i_sInitStr,
- size_type i_nCapacity )
- : bostream(),
- nCapacity1(0),
- dpData(0),
- pEnd(0),
- pCur(0),
- eMode(str::overwrite)
-{
- size_type nLength = strlen(i_sInitStr);
- nCapacity1 = csv::max(nLength, i_nCapacity) + 1;
- dpData = new char [nCapacity1];
- strcpy(dpData, i_sInitStr); // SAFE STRCPY (#100211# - checked)
- pCur = dpData + nLength;
- pEnd = pCur;
-}
-
StreamStr::StreamStr( const self & i_rOther )
: bostream(),
nCapacity1( i_rOther.nCapacity1 ),
@@ -477,37 +460,6 @@ StreamStr::replace_all( char i_cCarToSearch,
}
}
-StreamStr &
-StreamStr::to_upper( position_type i_nStart,
- size_type i_nLength )
-{
- static char cUpper[128] =
- { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 123,124,125,126,127 };
-
- if ( i_nStart < length() )
- {
- char * pStop = i_nStart + i_nLength < length()
- ? dpData + i_nStart + i_nLength
- : pEnd;
- for ( char * pChange = dpData + i_nStart;
- pChange != pStop;
- ++pChange )
- {
- *pChange = (static_cast< unsigned char >(*pChange) & 0x80) == 0
- ? cUpper[ UINT8(*pChange) ]
- : *pChange;
- }
- }
- return *this;
-}
-
class StreamStrPool
{
public:
diff --git a/formula/source/core/inc/core_resource.hxx b/formula/source/core/inc/core_resource.hxx
index d581321..6dc198d 100644
--- a/formula/source/core/inc/core_resource.hxx
+++ b/formula/source/core/inc/core_resource.hxx
@@ -60,24 +60,6 @@ namespace formula
static void revokeClient();
public:
- /** loads the string with the specified resource id
- */
- static ::rtl::OUString loadString(sal_uInt16 _nResId);
-
- /** loads a string from the resource file, substituting a placeholder with a given string
-
- @param _nResId
- the resource ID of the string to loAD
- @param _pPlaceholderAscii
- the ASCII representation of the placeholder string
- @param _rReplace
- the string which should substutite the placeholder
- */
- static ::rtl::OUString loadString(
- sal_uInt16 _nResId,
- const sal_Char* _pPlaceholderAscii,
- const ::rtl::OUString& _rReplace
- );
static ResMgr* getResManager();
};
diff --git a/formula/source/core/resource/core_resource.cxx b/formula/source/core/resource/core_resource.cxx
index 139d52a..9521db8 100644
--- a/formula/source/core/resource/core_resource.cxx
+++ b/formula/source/core/resource/core_resource.cxx
@@ -56,18 +56,6 @@ namespace formula
m_pImpl = ResMgr::CreateResMgr("for", aLocale);
}
- //------------------------------------------------------------------
- ::rtl::OUString ResourceManager::loadString(sal_uInt16 _nResId)
- {
- ::rtl::OUString sReturn;
-
- ensureImplExists();
- if (m_pImpl)
- sReturn = String(ResId(_nResId,*m_pImpl));
-
- return sReturn;
- }
-
//-------------------------------------------------------------------------
void ResourceManager::registerClient()
{
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 685b42f..23febcc 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -119,7 +119,6 @@ namespace formula
void SaveArg( sal_uInt16 nEd );
void UpdateSelection();
void DoEnter( sal_Bool bOk );
- void ResizeArgArr( const IFunctionDescription* pNewFunc );
void FillListboxes();
void FillControls(sal_Bool &rbNext, sal_Bool &rbPrev);
@@ -1026,18 +1025,6 @@ IMPL_LINK( FormulaDlg_Impl, BtnHdl, PushButton*, pBtn )
// Functions for 1. Page
// --------------------------------------------------------------------------
-void FormulaDlg_Impl::ResizeArgArr( const IFunctionDescription* pNewFunc )
-{
- if ( pFuncDesc != pNewFunc )
- {
- DeleteArgs();
-
- if ( pNewFunc )
- nArgs = pNewFunc->getSuppressedArgumentCount();
-
- pFuncDesc = pNewFunc;
- }
-}
// -----------------------------------------------------------------------------
// Handler for Listboxes
diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk
index ee500a8..2af8930 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -155,7 +155,7 @@ findunusedcode:
| grep -v ^cppu:: \
| grep -v ^boost:: \
| grep -v ^CIcc \
- | grep -v ^CAtom \
+ | grep -v ^Atom \
> unusedcode.easy
subsequentcheck: dev-install
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index 2842ecf..7cd3556 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -164,20 +164,6 @@ sal_Int32 TableLayouter::getRowHeight( sal_Int32 nRow ) const
}
// -----------------------------------------------------------------------------
-
-void TableLayouter::setRowHeight( sal_Int32 nRow, sal_Int32 nHeight )
-{
- if( isValidRow(nRow) )
- {
- maRows[nRow].mnSize = nHeight;
- }
- else
- {
- OSL_FAIL( "TableLayouter::setRowHeight(), row out of range!" );
- }
-}
-
-// -----------------------------------------------------------------------------
sal_Int32 TableLayouter::getColumnWidth( sal_Int32 nColumn ) const
{
if( isValidColumn(nColumn) )
@@ -188,16 +174,6 @@ sal_Int32 TableLayouter::getColumnWidth( sal_Int32 nColumn ) const
// -----------------------------------------------------------------------------
-void TableLayouter::setColumnWidth( sal_Int32 nColumn, sal_Int32 nWidth )
-{
- if( isValidColumn(nColumn) )
- maColumns[nColumn].mnSize = nWidth;
- else
- OSL_FAIL( "TableLayouter::setColumnWidth(), column out of range!" );
-}
-
-// -----------------------------------------------------------------------------
-
bool TableLayouter::isEdgeVisible( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHorizontal ) const
{
const BorderLineMap& rMap = bHorizontal ? maHorizontalBorders : maVerticalBorders;
diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx
index 98b3157..7381255 100644
--- a/svx/source/table/tablelayouter.hxx
+++ b/svx/source/table/tablelayouter.hxx
@@ -88,14 +88,8 @@ public:
::sal_Int32 getColumnCount() const { return static_cast< ::sal_Int32 >( maColumns.size() ); }
sal_Int32 getRowHeight( sal_Int32 nRow ) const;
- // sets the layout height of the given row hard, LayoutTable must be called directly after calling this method! */
- void setRowHeight( sal_Int32 nRow, sal_Int32 nHeight );
-
sal_Int32 getColumnWidth( sal_Int32 nColumn ) const;
- // sets the layout width of the given column hard, LayoutTable must be called directly after calling this method! */
- void setColumnWidth( sal_Int32 nColumn, sal_Int32 nWidth );
-
sal_Int32 getMinimumColumnWidth( sal_Int32 nColumn );
/** checks if the given edge is visible.
diff --git a/udm/inc/udm/html/htmlitem.hxx b/udm/inc/udm/html/htmlitem.hxx
index 27549d7..b704075 100644
--- a/udm/inc/udm/html/htmlitem.hxx
+++ b/udm/inc/udm/html/htmlitem.hxx
@@ -177,8 +177,6 @@ class TableRow : public csi::xml::AnElement
TableRow()
: csi::xml::AnElement("tr") {}
- TableCell & AddCell(
- DYN csi::xml::Item* let_dpItem = 0 );
private:
virtual bool LineBreakAfterBeginTag() const;
};
@@ -229,10 +227,6 @@ class DefList : public csi::xml::AnElement
DefList()
: csi::xml::AnElement("dl") {}
- DefListTerm & AddTerm(
- DYN csi::xml::Item* let_dpItem = 0 );
- DefListDefinition & AddDefinition(
- DYN csi::xml::Item* let_dpItem = 0 );
private:
virtual bool LineBreakAfterBeginTag() const;
virtual bool FinishEmptyTag_XmlStyle() const;
@@ -267,8 +261,6 @@ class SimpleList : public csi::xml::AnElement
SimpleList()
: csi::xml::AnElement("ul") {}
- ListItem & AddItem(
- DYN csi::xml::Item* let_dpItem = 0 );
private:
virtual bool LineBreakAfterBeginTag() const;
};
diff --git a/udm/source/html/htmlitem.cxx b/udm/source/html/htmlitem.cxx
index ab8bdd7..807a70b 100644
--- a/udm/source/html/htmlitem.cxx
+++ b/udm/source/html/htmlitem.cxx
@@ -79,12 +79,6 @@ TableCell::LineBreakAfterEndTag() const
return true;
}
-TableCell &
-TableRow::AddCell( DYN Item * let_dpItem )
-{
- return PushElem( *this, new TableCell, let_dpItem );
-}
-
bool
TableRow::LineBreakAfterBeginTag() const
{
@@ -142,22 +136,6 @@ DefListDefinition::LineBreakAfterEndTag() const
return true;
}
-
-
-
-
-DefListTerm &
-DefList::AddTerm( DYN csi::xml::Item* let_dpItem )
-{
- return PushElem( *this, new DefListTerm, let_dpItem );
-}
-
-DefListDefinition &
-DefList::AddDefinition( DYN csi::xml::Item* let_dpItem )
-{
- return PushElem( *this, new DefListDefinition, let_dpItem );
-}
-
bool
DefList::LineBreakAfterBeginTag() const
{
@@ -182,13 +160,6 @@ NumeratedList::LineBreakAfterBeginTag() const
return true;
}
-
-ListItem &
-SimpleList::AddItem( DYN csi::xml::Item* let_dpItem )
-{
- return PushElem( *this, new ListItem, let_dpItem );
-}
-
bool
SimpleList::LineBreakAfterBeginTag() const
{
diff --git a/unusedcode.easy b/unusedcode.easy
index 506807c..65c14b6 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -10,7 +10,6 @@ CharPosArray::Insert(CharPosArray const*, unsigned short, unsigned short, unsign
CharPosArray::Replace(int const&, unsigned short)
CharPosArray::Replace(int const*, unsigned short, unsigned short)
CharPosArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(int const&, void*), void*)
-CurrencyField::ImplLoadRes(ResId const&)
CustomToolBarImportHelper::showToolbar(rtl::OUString const&)
DdeGetPutItem::DdeGetPutItem(DdeItem const&)
DdeService::AddFormat(unsigned long)
@@ -28,7 +27,7 @@ FieldEntry::GetBookmarkType()
FileControl::SetButtonText(String const&)
FileList::GetFormat()
FileStat::FileStat()
-FileStat::FileStat(void const*, void const*)
+FileStat::FileStat(void const*)
FileStream::FileStream(rtl::OString const&, FileAccessMode)
FmEntryDataArray::DeleteAndDestroy(unsigned short, unsigned short)
FmEntryDataArray::Insert(FmEntryData* const&, unsigned short&)
@@ -67,11 +66,9 @@ InsCapOptArr::Remove(InsCaptionOpt* const&, unsigned short)
InsCapOptArr::Remove(unsigned short, unsigned short)
ItemList::FindAttrib(unsigned short)
KeyboardSettings::CopyData()
-LinkStructArr::DeleteAndDestroy(unsigned short, unsigned short)
LngSvcMgr::RemoveLngSvcEvtBroadcaster(com::sun::star::uno::Reference<com::sun::star::linguistic2::XLinguServiceEventBroadcaster> const&)
LocaleDataWrapper::getCollatorImplementations() const
LocaleDataWrapper::getTransliterations() const
-LongCurrencyFormatter::ImplLoadRes(ResId const&)
MSDffImportRecords::Insert(MSDffImportRecords const*, unsigned short, unsigned short)
MSDffImportRecords::Insert(SvxMSDffImportRec* const&, unsigned short&)
MSDffImportRecords::Insert(SvxMSDffImportRec* const*, unsigned short)
@@ -119,7 +116,6 @@ OutputDevice::PixelToLogic(PolyPolygon const&, MapMode const&) const
ParagraphObj::ParagraphObj(ParagraphObj&)
ParagraphStyleManager::get(WPXString const&) const
PathDialog::SetPath(Edit const&)
-PatternFormatter::ImplLoadRes(ResId const&)
PluginConnector::getInstance(_NPP*)
PluginConnector::getInstanceById(unsigned int)
PopupMenu::SetSelectedEntry(unsigned short)
@@ -187,6 +183,7 @@ ScDBCollection::AnonDBs::erase(boost::void_ptr_iterator<__gnu_debug::_Safe_itera
ScDBCollection::AnonDBs::size() const
ScDLL::Exit()
ScDPFieldControlBase::SetSelectedField(unsigned long)
+ScDPSaveDimension::Refresh(com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier> const&, std::__debug::list<rtl::OUString, std::allocator<rtl::OUString> > const&)
ScDdeLink::ResetValue()
ScDocRowHeightUpdater::TabRanges::TabRanges()
ScDocument::SetAllTabRangeNames(std::__debug::map<short, ScRangeName const*, std::less<short>, std::allocator<std::pair<short const, ScRangeName const*> > > const&)
@@ -232,6 +229,7 @@ ScValidationEntries_Impl::Insert(ScValidationEntries_Impl const*, unsigned short
ScValidationEntries_Impl::Remove(ScValidationData* const&, unsigned short)
ScValidationEntries_Impl::Remove(unsigned short, unsigned short)
ScValueCell::ScValueCell()
+ScVbaChart::isSeriesIndexValid(int)
ScVbaColorFormat::setColorFormat(short)
ScVbaCommandBarControl::ScVbaCommandBarControl(com::sun::star::uno::Reference<ooo::vba::XHelperInterface> const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> const&, boost::shared_ptr<VbaCommandBarHelper>, com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> const&, rtl::OUString const&, int, unsigned char)
ScVbaCommentShape::ScVbaCommentShape(com::sun::star::uno::Reference<ooo::vba::XHelperInterface> const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, com::sun::star::uno::Reference<com::sun::star::drawing::XShape> const&, com::sun::star::uno::Reference<ooo::vba::excel::XComment> const&, com::sun::star::uno::Reference<com::sun::star::drawing::XShapes> const&, com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&, int)
@@ -323,9 +321,6 @@ SfxSlotPool::NextInterface()
SfxStyleSheet::SfxStyleSheet()
SfxTabDialog::GetApplyHandler() const
SfxThesSubMenuControl::RegisterControl(unsigned short, SfxModule*)
-SfxToDoStack_Implarr_::Contains(SfxToDo_Impl const&) const
-SfxToDoStack_Implarr_::Insert(unsigned short, SfxToDo_Impl const&, unsigned short)
-SfxToDoStack_Implarr_::Remove(SfxToDo_Impl const&)
SfxUINT32s::Insert(SfxUINT32s const*, unsigned short, unsigned short, unsigned short)
SfxUINT32s::Remove(unsigned short, unsigned short)
SfxUINT32s::Replace(unsigned int const&, unsigned short)
@@ -389,6 +384,7 @@ SvPersistStream::InsertObj(SvPersistBase*)
SvPersistStream::RemoveObj(SvPersistBase*)
SvPersistStream::SvPersistStream(SvClassManager&, SvStream*, SvPersistStream const&)
SvPtrarr::Replace(void* const*, unsigned short, unsigned short)
+SvStream::ReadLine(ByteString&)
SvStringsISortDtor::Insert(String* const*, unsigned short)
SvTabListBox::GetTabJustify(unsigned short) const
SvUnoAttributeContainer::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
@@ -516,6 +512,8 @@ SvxSearchDialog::SvxSearchDialog(Window*, SfxBindings&)
SvxSelectionModeControl::GetDefItemWidth(StatusBar const&)
SvxShapePolyPolygonBezier::GetPolygonKind() const
SvxShapeText::SvxShapeText()
+SvxSimpleTable::SvxSimpleTable(SvxSimpleTableContainer&, ResId const&)
+SvxTabStopArr::Insert(SvxTabStop const&, unsigned short&)
SvxTabStopArr::Insert(SvxTabStop const*, unsigned short)
SvxTabStopArr::Remove(SvxTabStop const&, unsigned short)
SvxTabStopArr_SAR::Replace(SvxTabStop const&, unsigned short)
diff --git a/vcl/inc/vcl/field.hxx b/vcl/inc/vcl/field.hxx
index 311346e..970c81d 100644
--- a/vcl/inc/vcl/field.hxx
+++ b/vcl/inc/vcl/field.hxx
@@ -120,7 +120,6 @@ private:
protected:
PatternFormatter();
- SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
SAL_DLLPRIVATE void ImplSetMask(const rtl::OString& rEditMask,
const XubString& rLiteralMask);
SAL_DLLPRIVATE sal_Bool ImplIsSameMask() const { return mbSameMask; }
@@ -608,9 +607,6 @@ public:
class VCL_DLLPUBLIC CurrencyField : public SpinField, public CurrencyFormatter
{
-protected:
- SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
-
public:
CurrencyField( Window* pParent, WinBits nWinStyle );
diff --git a/vcl/inc/vcl/image.hxx b/vcl/inc/vcl/image.hxx
index c76338a..cef4efa 100644
--- a/vcl/inc/vcl/image.hxx
+++ b/vcl/inc/vcl/image.hxx
@@ -162,7 +162,6 @@ private:
const Color* pMaskColor ) const;
SAL_DLLPRIVATE void ImplInit( sal_uInt16 nItems, const Size &rSize );
SAL_DLLPRIVATE sal_uInt16 ImplGetImageId( const ::rtl::OUString& rImageName ) const;
- SAL_DLLPRIVATE void ImplMakeUnique();
};
#endif // _SV_IMAGE_HXX
diff --git a/vcl/inc/vcl/longcurr.hxx b/vcl/inc/vcl/longcurr.hxx
index 60c4d9f..1981000 100644
--- a/vcl/inc/vcl/longcurr.hxx
+++ b/vcl/inc/vcl/longcurr.hxx
@@ -57,8 +57,6 @@ protected:
sal_Bool mbThousandSep;
LongCurrencyFormatter();
- SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
-
public:
~LongCurrencyFormatter();
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 51c4ee2..823a70a 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -2217,27 +2217,6 @@ CurrencyField::CurrencyField( Window* pParent, WinBits nWinStyle ) :
// -----------------------------------------------------------------------
-void CurrencyField::ImplLoadRes( const ResId& rResId )
-{
- SpinField::ImplLoadRes( rResId );
- CurrencyFormatter::ImplLoadRes( ResId( (RSHEADER_TYPE *)GetClassRes(), *rResId.GetResMgr() ) );
-
- sal_uLong nMask = ReadLongRes();
-
- if ( CURRENCYFIELD_FIRST & nMask )
- mnFirst = ReadLongRes();
-
- if ( CURRENCYFIELD_LAST & nMask )
- mnLast = ReadLongRes();
-
- if ( CURRENCYFIELD_SPINSIZE & nMask )
- mnSpinSize = ReadLongRes();
-
- Reformat();
-}
-
-// -----------------------------------------------------------------------
-
CurrencyField::~CurrencyField()
{
}
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 93c36ef..e625a1f 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -824,34 +824,6 @@ PatternFormatter::PatternFormatter()
// -----------------------------------------------------------------------
-void PatternFormatter::ImplLoadRes( const ResId& rResId )
-{
- rtl::OString aEditMask;
- XubString aLiteralMask;
- ResMgr* pMgr = rResId.GetResMgr();
- if( pMgr )
- {
- sal_uLong nMask = pMgr->ReadLong();
-
- if ( PATTERNFORMATTER_STRICTFORMAT & nMask )
- SetStrictFormat( (sal_Bool)pMgr->ReadShort() );
-
- if ( PATTERNFORMATTER_EDITMASK & nMask )
- {
- aEditMask = rtl::OUStringToOString(pMgr->ReadString(),
- RTL_TEXTENCODING_ASCII_US);
- }
-
- if ( PATTERNFORMATTER_LITTERALMASK & nMask )
- aLiteralMask = pMgr->ReadString();
-
- if ( (PATTERNFORMATTER_EDITMASK | PATTERNFORMATTER_LITTERALMASK) & nMask )
- ImplSetMask( aEditMask, aLiteralMask );
- }
-}
-
-// -----------------------------------------------------------------------
-
PatternFormatter::~PatternFormatter()
{
}
diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx
index 6407f48..8f4eb01 100644
--- a/vcl/source/control/longcurr.cxx
+++ b/vcl/source/control/longcurr.cxx
@@ -344,41 +344,6 @@ LongCurrencyFormatter::LongCurrencyFormatter()
// -----------------------------------------------------------------------
-void LongCurrencyFormatter::ImplLoadRes( const ResId& rResId )
-{
- ImpInit();
-
- ResMgr* pMgr = rResId.GetResMgr();
- if( pMgr )
- {
- sal_uLong nMask = pMgr->ReadLong();
-
- if ( NUMERICFORMATTER_MIN & nMask )
- mnMin = pMgr->ReadLong();
-
- if ( NUMERICFORMATTER_MAX & nMask )
- mnMax = pMgr->ReadLong();
-
- if ( NUMERICFORMATTER_STRICTFORMAT & nMask )
- SetStrictFormat( (sal_Bool)pMgr->ReadShort() );
-
- if ( NUMERICFORMATTER_DECIMALDIGITS & nMask )
- SetDecimalDigits( pMgr->ReadShort() );
-
- if ( NUMERICFORMATTER_VALUE & nMask )
- {
- mnFieldValue = pMgr->ReadLong();
- if ( mnFieldValue > mnMax )
- mnFieldValue = mnMax;
- else if ( mnFieldValue < mnMin )
- mnFieldValue = mnMin;
- mnLastValue = mnFieldValue;
- }
- }
-}
-
-// -----------------------------------------------------------------------
-
LongCurrencyFormatter::~LongCurrencyFormatter()
{
}
diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx
index ce63d9d..7860745 100644
--- a/vcl/source/gdi/image.cxx
+++ b/vcl/source/gdi/image.cxx
@@ -470,17 +470,6 @@ void ImageAryData::Load(const rtl::OUString &rPrefix)
}
// -----------------------------------------------------------------------
-
-void ImageList::ImplMakeUnique()
-{
- if( mpImplData && mpImplData->mnRefCount > 1 )
- {
- --mpImplData->mnRefCount;
- mpImplData = new ImplImageList( *mpImplData ) ;
- }
-}
-
-// -----------------------------------------------------------------------
// Rather a performance hazard:
BitmapEx ImageList::GetAsHorizontalStrip() const
{
diff --git a/xml2cmp/Executable_xml2cmp.mk b/xml2cmp/Executable_xml2cmp.mk
index 156199f..660bc5f 100644
--- a/xml2cmp/Executable_xml2cmp.mk
+++ b/xml2cmp/Executable_xml2cmp.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Executable_add_exception_objects,xml2cmp,\
xml2cmp/source/support/syshelp \
xml2cmp/source/support/badcast \
xml2cmp/source/xcd/cr_html \
- xml2cmp/source/xcd/cr_index \
xml2cmp/source/xcd/cr_metho \
xml2cmp/source/xcd/filebuff \
xml2cmp/source/xcd/parse \
diff --git a/xml2cmp/source/xcd/cr_index.cxx b/xml2cmp/source/xcd/cr_index.cxx
deleted file mode 100644
index ff9c488..0000000
--- a/xml2cmp/source/xcd/cr_index.cxx
+++ /dev/null
@@ -1,276 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#include "cr_index.hxx"
-
-#include <string.h>
-#include <fstream>
-#include "../support/syshelp.hxx"
-#include "xmltree.hxx"
-#include "parse.hxx"
-#include "cr_html.hxx"
-
-
-extern unsigned C_nSupportedServicesIndex;
-
-char C_sLineEnd[] = "\n";
-
-char C_sFileBegin[] = "<HTML><HEAD></HEAD><BODY bgcolor=\"#ffffff\">\n";
-char C_sFileEnd[] = "</BODY></HTML>\n";
-char C_sTableBegin[] = "<TABLE WIDTH=100% BORDER=1 CELLPADDING=4 CELLSPACING=0><TBODY>\n";
-char C_sTableEnd[] = "</TBODY></TABLE>\n";
-char C_sService[] = "SupportedService";
-char C_sModule[] = "ModuleName";
-char C_sComponentname[] = "ComponentName";
-
-
-
-Simstr sIdlRootPath;
-
-
-Index::Index( const char * i_sOutputDirectory,
- const char * i_sIdlRootPath )
- : aService2Module(20),
- aModule2Service(20),
- sOutputDirectory(i_sOutputDirectory),
- sIdlRootPath(i_sIdlRootPath)
- // sCurModule
-{
- ::sIdlRootPath = i_sIdlRootPath;
-}
-
-Index::~Index()
-{
-}
-
-void
-Index::GatherData( const List<Simstr> & i_rInputFileList )
-{
- for ( unsigned i = 0; i < i_rInputFileList.size(); ++i )
- {
- ReadFile( i_rInputFileList[i].str() );
- }
-}
-
-void
-Index::WriteOutput( const char * i_sOuputFile )
-{
- std::ofstream aOut( i_sOuputFile, std::ios::out );
- if (! aOut)
- {
- std::cerr << "Error: Indexfile \""
- << i_sOuputFile
- << "\" could not be created."
- << std::endl;
- return;
- }
-
- WriteStr(aOut, C_sFileBegin);
-
- WriteStr(aOut, "<H2>Module Descriptions Index</H2>");
- WriteStr(aOut, C_sLineEnd );
-
-
- WriteTableFromHeap( aOut, aService2Module, C_sService, C_sModule, lt_html );
- WriteTableFromHeap( aOut, aModule2Service, C_sModule, C_sService, lt_idl );
-
- WriteStr( aOut, C_sFileEnd );
- aOut.close();
-}
-
-void
-Index::InsertSupportedService( const Simstr & i_sService )
-{
- aService2Module.InsertValue( i_sService, sCurModule );
- aModule2Service.InsertValue( sCurModule, i_sService );
-}
-
-void
-Index::ReadFile( const char * i_sFilename )
-{
- static char sOutputHtml[1020];
-
- ModuleDescription aModule;
- X2CParser aParser(aModule);
-
- // Parse
- bool bResult = aParser.Parse(i_sFilename);
- if (! bResult)
- {
- std::cerr << "Error: File \""
- << i_sFilename
- << "\" could not be parsed."
- << std::endl;
- return;
- }
-
- // Create Html:
- CreateHtmlFileName( sOutputHtml, aModule );
- HtmlCreator aHtmlCreator( sOutputHtml, aModule, sIdlRootPath );
- aHtmlCreator.Run();
-
- // GetResults:
- sCurModule = aModule.ModuleName();
-
- List< const MultipleTextElement* > aSupportedServices;
- aModule.Get_SupportedServices(aSupportedServices);
-
- for ( unsigned s = 0; s < aSupportedServices.size(); ++s )
- {
- aSupportedServices[s]->Insert2Index(*this);
- }
-}
-
-void
-Index::CreateHtmlFileName( char * o_sOutputHtml,
- const ModuleDescription & i_rModule )
-{
- if ( strlen(sOutputDirectory.str()) + strlen(i_rModule.ModuleName()) > 1000 )
- {
- strcpy( o_sOutputHtml, "too-long-filename.html"); // STRCPY SAFE HERE
- return;
- }
-
- strcpy( o_sOutputHtml, sOutputDirectory.str() ); // STRCPY SAFE HERE
-#if defined(WNT)
- strcat(o_sOutputHtml, "\\"); // STRCAT SAFE HERE
-#elif defined(UNX)
- strcat(o_sOutputHtml, "/"); // STRCAT SAFE HERE
-#else
-#error WNT or UNX have to be defined.
-#endif
- strcat( o_sOutputHtml, i_rModule.ModuleName() ); // STRCAT SAFE HERE
- strcat( o_sOutputHtml, ".html" ); // STRCAT SAFE HERE
-}
-
-
-void
-Index::WriteTableFromHeap( std::ostream & o_rOut,
- Heap & i_rHeap,
- const char * i_sIndexValue,
- const char * i_sIndexReference,
- E_LinkType i_eLinkType )
-{
- WriteStr(o_rOut, "<H3><BR>");
- WriteStr(o_rOut, i_sIndexValue );
- WriteStr(o_rOut, " -> ");
- WriteStr(o_rOut, i_sIndexReference );
- WriteStr(o_rOut, "</H3>\n");
-
- WriteStr(o_rOut, C_sTableBegin);
- WriteHeap( o_rOut, i_rHeap, i_eLinkType );
- WriteStr(o_rOut, C_sTableEnd);
-}
-
-
-void
-Index::WriteHeap( std::ostream & o_rOut,
- Heap & i_rHeap,
- E_LinkType i_eLinkType )
-{
- static Simstr S_sKey;
- static char C_sSpaceInName[] = " ";
- S_sKey = "";
-
-
- WriteStr( o_rOut, "<TR><TD width=33% valign=\"top\">" );
-
- for ( HeapItem * pHeapTop = i_rHeap.ReleaseTop();
- pHeapTop != 0;
- pHeapTop = i_rHeap.ReleaseTop() )
- {
- if ( S_sKey != pHeapTop->Key() )
- {
- const char * pStart = pHeapTop->Key().str();
- const char * pBreak = strstr( pStart, " in ");
-
- if (S_sKey.l()>0)
- {
- WriteStr( o_rOut, "</TD></TR>\n" );
- WriteStr( o_rOut, "<TR><TD width=33% valign=\"top\">" );
- }
-
- if ( pBreak == 0 )
- WriteStr( o_rOut, pStart );
- else
- {
- o_rOut.write( pStart, pBreak - pStart );
- WriteStr( o_rOut, C_sSpaceInName );
- WriteStr( o_rOut, pBreak );
- }
- WriteStr( o_rOut, "</TD><TD width=66%>" );
- S_sKey = pHeapTop->Key();
- }
- else
- {
- WriteStr( o_rOut, "<BR>" );
- }
- WriteName( o_rOut, sIdlRootPath, pHeapTop->Value(), i_eLinkType );
- delete pHeapTop;
- }
-
- WriteStr( o_rOut, "</TD></TR>\n" );
-}
-
-
-
-/** Structure overview
-
-MODULEDESCRIPTION
-{
- ModuleName,
- COMPONENTDESCRIPTION
- {
- Author,
- Name,
- Description,
- LoaderName,
- Language,
- Status,
- SupportedService+,
- ReferenceDocu*
- ServiceDependency*
- Type*
- }
- ProjectBuildDependency*
- RuntimeModuleDependency*
- ReferenceDocu*
- ServiceDependency*
- Type*
-}
-
-
-*/
-
-
-
-
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/xcd/cr_index.hxx b/xml2cmp/source/xcd/cr_index.hxx
deleted file mode 100644
index 8cb0668..0000000
--- a/xml2cmp/source/xcd/cr_index.hxx
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef X2C_CR_INDEX_HXX
-#define X2C_CR_INDEX_HXX
-
-#include "../support/sistr.hxx"
-#include "../support/heap.hxx"
-#include "../support/list.hxx"
-#include "../support/syshelp.hxx"
-
-
-class ModuleDescription;
-
-
-class Index
-{
- public:
- Index(
- const char * i_sOutputDirectory,
- const char * i_sIdlRootPath );
- ~Index();
-
- void GatherData(
- const List<Simstr> &
- i_rInputFileList );
- void WriteOutput(
- const char * i_sOuputFile );
-
- void InsertSupportedService(
- const Simstr & i_sService );
- private:
- void ReadFile(
- const char * i_sFilename );
- void CreateHtmlFileName(
- char * o_sOutputHtml,
- const ModuleDescription &
- i_rModule );
- void WriteTableFromHeap(
- std::ostream & o_rOut,
- Heap & i_rHeap,
- const char * i_sIndexKey,
- const char * i_sIndexReference,
- E_LinkType i_eLinkType );
- void WriteHeap(
- std::ostream & o_rOut,
- Heap & i_rHeap,
- E_LinkType i_eLinkType );
-
- // DATA
- Heap aService2Module;
- Heap aModule2Service;
-
- Simstr sOutputDirectory;
- Simstr sIdlRootPath;
-
- // Temporary Data
- Simstr sCurModule;
-};
-
-
-
-
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/xcd/main.cxx b/xml2cmp/source/xcd/main.cxx
index 5ccaf77..881173b 100644
--- a/xml2cmp/source/xcd/main.cxx
+++ b/xml2cmp/source/xcd/main.cxx
@@ -35,7 +35,6 @@
#include "../support/cmdline.hxx"
#include "cr_metho.hxx"
#include "cr_html.hxx"
-#include "cr_index.hxx"
#include "xmlelem.hxx"
#include "xmltree.hxx"
#include "parse.hxx"
@@ -139,7 +138,7 @@ void Create_TypeInfo( const char* o_sOutputFile, ModuleDescription& i_rData )
int Do_DepCommandLine(const CommandLine & i_rCommandLine)
{
-DependencyFinder aDependencies;
+ DependencyFinder aDependencies;
aDependencies.GatherData(i_rCommandLine.DepPath());
char sInput[500] = "";
diff --git a/xml2cmp/source/xcd/xmlelem.cxx b/xml2cmp/source/xcd/xmlelem.cxx
index 3634d07..5a795d6 100644
--- a/xml2cmp/source/xcd/xmlelem.cxx
+++ b/xml2cmp/source/xcd/xmlelem.cxx
@@ -39,12 +39,6 @@ XmlElement::XmlElement( const char * i_sName )
{
}
-void
-XmlElement::Insert2Index( Index & ) const
-{
- // Default version. Does nothing.
-}
-
XmlElement *
MultipleElement::FindChild( const Simstr & i_sChildName )
{
diff --git a/xml2cmp/source/xcd/xmlelem.hxx b/xml2cmp/source/xcd/xmlelem.hxx
index 66ebc4c..3d00ec7 100644
--- a/xml2cmp/source/xcd/xmlelem.hxx
+++ b/xml2cmp/source/xcd/xmlelem.hxx
@@ -52,8 +52,6 @@ class XmlElement
X2CParser & io_rParser ) = 0;
virtual void Write2Html(
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list