[Libreoffice-commits] .: 7 commits - dbaccess/source l10ntools/source lotuswordpro/Library_lwpft.mk lotuswordpro/source rsc/source sc/source sd/source sfx2/source svtools/inc svtools/source svx/inc svx/source sw/source tools/bootstrp unusedcode.easy
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Aug 30 01:32:51 PDT 2011
dbaccess/source/core/api/RowSetBase.cxx | 8
l10ntools/source/export.cxx | 50 ++--
l10ntools/source/export2.cxx | 6
l10ntools/source/gsicheck.cxx | 10
l10ntools/source/helpmerge.cxx | 13 -
l10ntools/source/lngmerge.cxx | 19 +
l10ntools/source/merge.cxx | 4
lotuswordpro/Library_lwpft.mk | 5
lotuswordpro/source/filter/xfilter/xfbookmarkref.cxx | 100 ---------
lotuswordpro/source/filter/xfilter/xfbookmarkref.hxx | 101 ---------
lotuswordpro/source/filter/xfilter/xfcell.cxx | 75 -------
lotuswordpro/source/filter/xfilter/xfcell.hxx | 35 ---
lotuswordpro/source/filter/xfilter/xfcellstyle.cxx | 35 ---
lotuswordpro/source/filter/xfilter/xfcellstyle.hxx | 35 ---
lotuswordpro/source/filter/xfilter/xfcolumns.cxx | 6
lotuswordpro/source/filter/xfilter/xfcolumns.hxx | 1
lotuswordpro/source/filter/xfilter/xfdrawpath.cxx | 5
lotuswordpro/source/filter/xfilter/xfdrawpath.hxx | 2
lotuswordpro/source/filter/xfilter/xffileattrlist.cxx | 80 -------
lotuswordpro/source/filter/xfilter/xffileattrlist.hxx | 85 --------
lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx | 12 -
lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx | 5
lotuswordpro/source/filter/xfilter/xfindex.cxx | 39 ---
lotuswordpro/source/filter/xfilter/xfindex.hxx | 16 -
lotuswordpro/source/filter/xfilter/xflist.cxx | 30 --
lotuswordpro/source/filter/xfilter/xflist.hxx | 17 -
lotuswordpro/source/filter/xfilter/xfofficemeta.cxx | 10
lotuswordpro/source/filter/xfilter/xfofficemeta.hxx | 2
lotuswordpro/source/filter/xfilter/xfoutlinestyle.cxx | 108 ----------
lotuswordpro/source/filter/xfilter/xfoutlinestyle.hxx | 132 -------------
lotuswordpro/source/filter/xfilter/xfparagraph.cxx | 13 -
lotuswordpro/source/filter/xfilter/xfparagraph.hxx | 4
lotuswordpro/source/filter/xfilter/xfrow.cxx | 7
lotuswordpro/source/filter/xfilter/xfrow.hxx | 2
lotuswordpro/source/filter/xfilter/xfrowstyle.cxx | 8
lotuswordpro/source/filter/xfilter/xfrowstyle.hxx | 2
lotuswordpro/source/filter/xfilter/xfsection.cxx | 15 -
lotuswordpro/source/filter/xfilter/xfsection.hxx | 14 -
lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx | 12 -
lotuswordpro/source/filter/xfilter/xfsectionstyle.hxx | 4
lotuswordpro/source/filter/xfilter/xfshadow.cxx | 6
lotuswordpro/source/filter/xfilter/xfshadow.hxx | 2
lotuswordpro/source/filter/xfilter/xfstylemanager.cxx | 5
lotuswordpro/source/filter/xfilter/xfstylemanager.hxx | 3
lotuswordpro/source/filter/xfilter/xftable.cxx | 13 -
lotuswordpro/source/filter/xfilter/xftable.hxx | 2
lotuswordpro/source/filter/xfilter/xftextcontent.cxx | 5
lotuswordpro/source/filter/xfilter/xftextcontent.hxx | 6
lotuswordpro/source/filter/xfilter/xftextheading.cxx | 105 ----------
lotuswordpro/source/filter/xfilter/xftextheading.hxx | 90 --------
lotuswordpro/source/filter/xfilter/xftextspan.cxx | 27 --
lotuswordpro/source/filter/xfilter/xftextspan.hxx | 2
lotuswordpro/source/filter/xfilter/xftime.cxx | 88 --------
lotuswordpro/source/filter/xfilter/xftime.hxx | 107 ----------
rsc/source/parser/rscibas.cxx | 3
rsc/source/rsc/rsc.cxx | 7
sc/source/core/tool/parclass.cxx | 2
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 23 --
sd/source/ui/accessibility/AccessibleOutlineView.cxx | 4
sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx | 4
sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 3
sd/source/ui/accessibility/AccessibleViewForwarder.cxx | 3
sd/source/ui/accessibility/SdShapeTypes.cxx | 2
sfx2/source/view/viewsh.cxx | 2
svtools/inc/svtools/ttprops.hxx | 1
svtools/source/plugapp/ttprops.cxx | 9
svx/inc/svx/xbtmpit.hxx | 2
svx/inc/svx/xflftrit.hxx | 2
svx/inc/svx/xflhtit.hxx | 2
svx/inc/svx/xftshcit.hxx | 1
svx/inc/svx/xlndsit.hxx | 2
svx/inc/svx/xlnedit.hxx | 1
svx/inc/svx/xlnstit.hxx | 1
svx/inc/svx/xtable.hxx | 1
svx/source/xoutdev/xattr.cxx | 91 --------
svx/source/xoutdev/xattrbmp.cxx | 21 --
svx/source/xoutdev/xtabbtmp.cxx | 7
sw/source/core/text/txtpaint.cxx | 3
tools/bootstrp/prj.cxx | 3
unusedcode.easy | 55 -----
80 files changed, 81 insertions(+), 1762 deletions(-)
New commits:
commit 1a777329e8a49bc4b2cf9c0e60397588197c3ca7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 30 09:23:55 2011 +0100
regenerate list
diff --git a/lotuswordpro/source/filter/xfilter/xfcell.cxx b/lotuswordpro/source/filter/xfilter/xfcell.cxx
index 3c8aa8b..be319ca 100644
--- a/lotuswordpro/source/filter/xfilter/xfcell.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcell.cxx
@@ -169,22 +169,6 @@ void XFCell::SetValue(rtl::OUString value)
{
m_eValueType = enumXFValueTypeFloat;
m_strValue = value;
-
- //Reset();
- //XFParagraph *pPara = new XFParagraph();
- //pPara->Add(m_strValue);
- //XFContentContainer::Add(pPara);
-}
-
-void XFCell::SetPercent(rtl::OUString percent)
-{
- m_eValueType = enumXFValueTypePercentage;
- m_strValue = percent;
-
- Reset();
- XFParagraph *pPara = new XFParagraph();
- pPara->Add(m_strValue);
- XFContentContainer::Add(pPara);
}
rtl::OUString XFCell::GetCellName()
diff --git a/lotuswordpro/source/filter/xfilter/xfcell.hxx b/lotuswordpro/source/filter/xfilter/xfcell.hxx
index dff91ba..f63b3c8 100644
--- a/lotuswordpro/source/filter/xfilter/xfcell.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcell.hxx
@@ -111,11 +111,6 @@ public:
void SetValue(rtl::OUString value);
/**
- * @descr Set cell as a percent value with value percent.
- */
- void SetPercent(rtl::OUString percent);
-
- /**
* @descr Set cell formula.
*/
void SetFormula(rtl::OUString formula);
diff --git a/lotuswordpro/source/filter/xfilter/xflist.cxx b/lotuswordpro/source/filter/xfilter/xflist.cxx
index b24b353..cbfa2b1 100644
--- a/lotuswordpro/source/filter/xfilter/xflist.cxx
+++ b/lotuswordpro/source/filter/xfilter/xflist.cxx
@@ -73,14 +73,6 @@ XFList::~XFList()
{
}
-void XFList::AddItem(XFListItem *pItem)
-{
- assert(pItem);
- assert(pItem->GetContentType()!=enumXFContentUnknown);
-
- Add(pItem);
-}
-
void XFList::ToXml(IXFStream *pStrm)
{
IXFAttrList *pAttrList = pStrm->GetAttrList();
diff --git a/lotuswordpro/source/filter/xfilter/xflist.hxx b/lotuswordpro/source/filter/xfilter/xflist.hxx
index 51e838f..76999f0 100644
--- a/lotuswordpro/source/filter/xfilter/xflist.hxx
+++ b/lotuswordpro/source/filter/xfilter/xflist.hxx
@@ -88,11 +88,6 @@ public:
void SetContinueNumber(sal_Bool bContinueNumber=sal_False);
/**
- * @descr Add a list item.
- */
- void AddItem(XFListItem *pItem);
-
- /**
* @descr Output list obejct.
*/
virtual void ToXml(IXFStream *pStrm);
diff --git a/lotuswordpro/source/filter/xfilter/xftextcontent.cxx b/lotuswordpro/source/filter/xfilter/xftextcontent.cxx
index ba8b8ec..1f350a6 100644
--- a/lotuswordpro/source/filter/xfilter/xftextcontent.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftextcontent.cxx
@@ -78,11 +78,6 @@ void XFTextContent::SetText(const rtl::OUString& text)
m_strText = text;
}
-rtl::OUString XFTextContent::GetText()
-{
- return m_strText;
-}
-
void XFTextContent::ToXml(IXFStream *pStrm)
{
// pStrm->Characters(m_strText);
diff --git a/lotuswordpro/source/filter/xfilter/xftextcontent.hxx b/lotuswordpro/source/filter/xfilter/xftextcontent.hxx
index a885aaa..81908e0 100644
--- a/lotuswordpro/source/filter/xfilter/xftextcontent.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftextcontent.hxx
@@ -84,12 +84,6 @@ public:
*/
void SetText(const rtl::OUString& text);
- /**
- * @descr return the content.
- * @return text content.
- */
- rtl::OUString GetText();
-
virtual enumXFContent GetContentType();
virtual void ToXml(IXFStream *pStrm);
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 2361371..ef78810 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -300,7 +300,7 @@ void SAL_CALL
AccessibleDocumentViewBase::propertyChange (rEventObject);
OSL_TRACE ("AccessibleDrawDocumentView::propertyChange");
- if (rEventObject.PropertyName == OUString (RTL_CONSTASCII_USTRINGPARAM("CurrentPage")))
+ if (rEventObject.PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CurrentPage")))
{
OSL_TRACE (" current page changed");
@@ -335,7 +335,7 @@ void SAL_CALL
else
OSL_TRACE ("View invalid");
}
- else if (rEventObject.PropertyName == OUString (RTL_CONSTASCII_USTRINGPARAM("VisibleArea")))
+ else if (rEventObject.PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("VisibleArea")))
{
OSL_TRACE (" visible area changed");
if (mpChildrenManager != NULL)
@@ -399,10 +399,10 @@ void SAL_CALL
{
uno::Sequence< ::rtl::OUString > aServices( xInfo->getSupportedServiceNames() );
OUString sFirstService = aServices[0];
- if (sFirstService == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DrawingDocumentDrawView")))
+ if (sFirstService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DrawingDocumentDrawView")))
{
if( aServices.getLength() >= 2 &&
- aServices[1] == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.PresentationView")))
+ aServices[1].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.PresentationView")))
{
SolarMutexGuard aGuard;
@@ -415,13 +415,13 @@ void SAL_CALL
sName = String( SdResId(SID_SD_A11Y_D_DRAWVIEW_N) );
}
}
- else if (sFirstService == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.NotesView")))
+ else if (sFirstService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.NotesView")))
{
SolarMutexGuard aGuard;
sName = String( SdResId(SID_SD_A11Y_I_NOTESVIEW_N) );
}
- else if (sFirstService == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.HandoutView")))
+ else if (sFirstService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.HandoutView")))
{
SolarMutexGuard aGuard;
@@ -456,10 +456,10 @@ void SAL_CALL
{
uno::Sequence< ::rtl::OUString > aServices( xInfo->getSupportedServiceNames() );
OUString sFirstService = aServices[0];
- if (sFirstService == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DrawingDocumentDrawView")))
+ if (sFirstService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DrawingDocumentDrawView")))
{
if( aServices.getLength() >= 2 &&
- aServices[1] == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.PresentationView")))
+ aServices[1].equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.PresentationView")))
{
SolarMutexGuard aGuard;
@@ -472,13 +472,13 @@ void SAL_CALL
sDescription = String( SdResId(SID_SD_A11Y_D_DRAWVIEW_D) );
}
}
- else if (sFirstService == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.NotesView")))
+ else if (sFirstService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.NotesView")))
{
SolarMutexGuard aGuard;
sDescription = String( SdResId(SID_SD_A11Y_I_NOTESVIEW_D) );
}
- else if (sFirstService == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.HandoutView")))
+ else if (sFirstService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.HandoutView")))
{
SolarMutexGuard aGuard;
@@ -732,9 +732,6 @@ void AccessibleDrawDocumentView::UpdateAccessibleName (void)
SetAccessibleName (sNewName, AutomaticallyCreated);
}
-
-
-
} // end of namespace accessibility
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
index cdf091e..bec8f44 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
@@ -227,14 +227,14 @@ void SAL_CALL
AccessibleDocumentViewBase::propertyChange (rEventObject);
OSL_TRACE ("AccessibleOutlineView::propertyChange");
- if (rEventObject.PropertyName == ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("CurrentPage")))
+ if (rEventObject.PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CurrentPage")))
{
OSL_TRACE (" current page changed");
// The current page changed. Update the children accordingly.
UpdateChildren();
}
- else if (rEventObject.PropertyName == ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("VisibleArea")))
+ else if (rEventObject.PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("VisibleArea")))
{
OSL_TRACE (" visible area changed");
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
index 989d12c..b3c8a59 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
@@ -567,9 +567,6 @@ sal_Bool AccessibleSlideSorterObject::IsDisposed (void)
return (rBHelper.bDisposed || rBHelper.bInDispose);
}
-
-
-
SdPage* AccessibleSlideSorterObject::GetPage (void) const
{
::sd::slidesorter::model::SharedPageDescriptor pDescriptor(
@@ -580,7 +577,6 @@ SdPage* AccessibleSlideSorterObject::GetPage (void) const
return NULL;
}
-
} // end of namespace ::accessibility
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index 14a24d2..514a910 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -1144,9 +1144,6 @@ IMPL_LINK(AccessibleSlideSorterView::Implementation, VisibilityChangeListener, v
return 1;
}
-
-
-
} // end of namespace ::accessibility
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
index 3e59095..43a2246 100644
--- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
+++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
@@ -151,9 +151,6 @@ Point AccessibleViewForwarder::PixelToLogic (const Point& rPoint) const
return Point();
}
-
-
-
Size AccessibleViewForwarder::PixelToLogic (const Size& rSize) const
{
OSL_ASSERT (mpView != NULL);
diff --git a/sd/source/ui/accessibility/SdShapeTypes.cxx b/sd/source/ui/accessibility/SdShapeTypes.cxx
index 731829d..b30b2fa 100644
--- a/sd/source/ui/accessibility/SdShapeTypes.cxx
+++ b/sd/source/ui/accessibility/SdShapeTypes.cxx
@@ -33,7 +33,7 @@
#include "AccessiblePresentationShape.hxx"
#include "AccessiblePresentationGraphicShape.hxx"
#include "AccessiblePresentationOLEShape.hxx"
-#include <rtl/ustring.h>
+#include <rtl/ustring.hxx>
namespace accessibility {
commit 8fef2fef0349d3f21a8c9bfd0f99c72e8b85a9de
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 30 09:22:59 2011 +0100
WaE: unused variable
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index befc248..eb56125 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -424,7 +424,7 @@ enum ETypeFamily
return sType;
}
- catch (const css::uno::RuntimeException& exRun)
+ catch (const css::uno::RuntimeException&)
{
throw;
}
commit 98f246d83db8f1a3e90dd794f48c390593a3ef62
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 29 23:03:08 2011 +0100
ByteString->rtl::OString
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 9cfb032..e75550d 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -38,6 +38,8 @@
#include <rtl/strbuf.hxx>
#include <comphelper/string.hxx>
+using comphelper::string::getToken;
+
extern "C" { int yyerror( const char * ); }
extern "C" { int YYWarning( const char * ); }
@@ -680,17 +682,17 @@ int Export::Execute( int nToken, const char * pToken )
sToken.EraseAllChars( '{' );
while( sToken.SearchAndReplace( "\t", " " ) != STRING_NOTFOUND ) {};
sToken.EraseTrailingChars( ' ' );
- ByteString sT = sToken.GetToken( 0, ' ' );
+ ByteString sT = getToken(sToken, 0, ' ');
pResData->sResTyp = sT.ToLowerAscii();
ByteString sId( sToken.Copy( pResData->sResTyp.Len() + 1 ));
ByteString sCondition;
if ( sId.Search( "#" ) != STRING_NOTFOUND ) {
// between ResTyp, Id and paranthes is a precomp. condition
sCondition = "#";
- sCondition += sId.GetToken( 1, '#' );
- sId = sId.GetToken( 0, '#' );
+ sCondition += ByteString(getToken(sId, 1, '#'));
+ sId = getToken(sId, 0, '#');
}
- sId = sId.GetToken( 0, '/' );
+ sId = getToken(sId, 0, '/');
CleanValue( sId );
sId = sId.EraseAllChars( '\t' );
pResData->SetId( sId, ID_LEVEL_IDENTIFIER );
@@ -779,10 +781,10 @@ int Export::Execute( int nToken, const char * pToken )
case ASSIGNMENT: {
bDontWriteOutput = sal_False;
// interpret different types of assignement
- ByteString sKey = sToken.GetToken( 0, '=' );
+ ByteString sKey = getToken(sToken, 0, '=');
sKey.EraseAllChars( ' ' );
sKey.EraseAllChars( '\t' );
- ByteString sValue = sToken.GetToken( 1, '=' );
+ ByteString sValue = getToken(sToken, 1, '=');
CleanValue( sValue );
if ( sKey.ToUpperAscii() == "IDENTIFIER" ) {
ByteString sId( sValue.EraseAllChars( '\t' ));
@@ -830,7 +832,7 @@ int Export::Execute( int nToken, const char * pToken )
ByteString sKey = sTmpToken.Copy( 0 , nPos );
sKey.EraseAllChars( ' ' );
sKey.EraseAllChars( '\t' );
- ByteString sValue = sToken.GetToken( 1, '=' );
+ ByteString sValue = getToken(sToken, 1, '=');
CleanValue( sValue );
if ( sKey.ToUpperAscii() == "STRINGLIST" ) {
pResData->bList = sal_True;
@@ -872,7 +874,7 @@ int Export::Execute( int nToken, const char * pToken )
}
else {
// new res. is a String- or FilterList
- ByteString sKey = sToken.GetToken( 0, '[' );
+ ByteString sKey = getToken(sToken, 0, '[');
sKey.EraseAllChars( ' ' );
sKey.EraseAllChars( '\t' );
if ( sKey.ToUpperAscii() == "STRINGLIST" )
@@ -886,7 +888,7 @@ int Export::Execute( int nToken, const char * pToken )
else if ( sKey == "UIENTRIES" )
nList = LIST_UIENTRIES;
if ( nList ) {
- ByteString sLang=sToken.GetToken( 1, '[' ).GetToken( 0, ']' );
+ ByteString sLang = getToken(getToken(sToken, 1, '['), 0, ']');
CleanValue( sLang );
m_sListLang = sLang;
nListIndex = 0;
@@ -901,7 +903,7 @@ int Export::Execute( int nToken, const char * pToken )
// this is an entry for a String- or FilterList
if ( nList ) {
SetChildWithText();
- ByteString sEntry( sToken.GetToken( 1, '\"' ));
+ ByteString sEntry(getToken(sToken, 1, '\"'));
if ( sToken.GetTokenCount( '\"' ) > 3 )
sEntry += "\"";
if ( sEntry == "\\\"" )
@@ -921,15 +923,16 @@ int Export::Execute( int nToken, const char * pToken )
CutComment( sToken );
// this is a text line!!!
- ByteString sKey = sToken.GetToken( 0, '=' ).GetToken( 0, '[' );
+ ByteString sKey = getToken(getToken(sToken, 0, '='), 0, '[');
sKey.EraseAllChars( ' ' );
sKey.EraseAllChars( '\t' );
ByteString sText( GetText( sToken, nToken ));
if ( !bMergeMode )
sText = sText.Convert( aCharSet, RTL_TEXTENCODING_MS_1252 );
ByteString sLang;
- if ( sToken.GetToken( 0, '=' ).Search( "[" ) != STRING_NOTFOUND ) {
- sLang = sToken.GetToken( 0, '=' ).GetToken( 1, '[' ).GetToken( 0, ']' );
+ if ( getToken(sToken, 0, '=').indexOf('[') != -1 )
+ {
+ sLang = getToken(getToken(getToken(sToken, 0, '='), 1, '['), 0, ']');
CleanValue( sLang );
}
rtl::OString sLangIndex = sLang;
@@ -1036,15 +1039,14 @@ int Export::Execute( int nToken, const char * pToken )
case APPFONTMAPPING:
{
using comphelper::string::replace;
- using comphelper::string::getToken;
bDontWriteOutput = sal_False;
// this is a AppfontMapping, so look if its a definition
// of field size
- ByteString sKey = sToken.GetToken( 0, '=' );
+ ByteString sKey = getToken(sToken, 0, '=');
sKey.EraseAllChars( ' ' );
sKey.EraseAllChars( '\t' );
- rtl::OString sMapping = sToken.GetToken( 1, '=' );
+ rtl::OString sMapping = getToken(sToken, 1, '=');
sMapping = getToken(sMapping, 1, '(');
sMapping = getToken(sMapping, 0, ')');
sMapping = replace(sMapping, rtl::OString(' '), rtl::OString());
@@ -1067,14 +1069,14 @@ int Export::Execute( int nToken, const char * pToken )
while( sToken.SearchAndReplace( "\r", " " ) != STRING_NOTFOUND ) {};
while( sToken.SearchAndReplace( "\t", " " ) != STRING_NOTFOUND ) {};
while( sToken.SearchAndReplace( " ", " " ) != STRING_NOTFOUND ) {};
- ByteString sCondition = sToken.GetToken( 0, ' ' );
+ ByteString sCondition = getToken(sToken, 0, ' ');
if ( sCondition == "#ifndef" ) {
sActPForm = "!defined ";
- sActPForm += sToken.GetToken( 1, ' ' );
+ sActPForm += ByteString(getToken(sToken, 1, ' '));
}
else if ( sCondition == "#ifdef" ) {
sActPForm = "defined ";
- sActPForm += sToken.GetToken( 1, ' ' );
+ sActPForm += ByteString(getToken(sToken, 1, ' '));
}
else if ( sCondition == "#if" ) {
sActPForm = sToken.Copy( 4 );
@@ -1114,8 +1116,8 @@ int Export::Execute( int nToken, const char * pToken )
sToken.EraseLeadingChars( ' ' );
sToken.EraseTrailingChars( ' ' );
- ByteString sCharset = sToken.GetToken( 1, ' ' );
- ByteString sSet = sToken.GetToken( 2, ' ' );
+ ByteString sCharset = getToken(sToken, 1, ' ');
+ ByteString sSet = getToken(sToken, 2, ' ');
if (( sCharset.ToUpperAscii() == "CHARSET_IBMPC" ) ||
( sCharset == "RTL_TEXTENCODING_IBM_850" ) ||
(( sCharset == "CHARSET" ) && ( sSet.ToUpperAscii() == "IBMPC" )))
@@ -1324,7 +1326,7 @@ sal_Bool Export::WriteData( ResData *pResData, sal_Bool bCreateNew )
}
ByteString Export::GetPairedListID( const ByteString& sText ){
// < "STRING" ; IDENTIFIER ; > ;
- ByteString sIdent = sText.GetToken( 1, ';' );
+ ByteString sIdent = getToken(sText, 1, ';');
sIdent.ToUpperAscii();
while( sIdent.SearchAndReplace( "\t", " " ) != STRING_NOTFOUND ) {};
sIdent.EraseTrailingChars( ' ' );
@@ -1333,7 +1335,7 @@ ByteString Export::GetPairedListID( const ByteString& sText ){
}
ByteString Export::GetPairedListString( const ByteString& sText ){
// < "STRING" ; IDENTIFIER ; > ;
- ByteString sString = sText.GetToken( 0, ';' );
+ ByteString sString = getToken(sText, 0, ';');
while( sString.SearchAndReplace( "\t", " " ) != STRING_NOTFOUND ) {};
sString.EraseTrailingChars( ' ' );
ByteString s1 = sString.Copy( sString.Search( '\"' )+1 );
@@ -1603,7 +1605,7 @@ ByteString Export::GetText( const ByteString &rSource, int nToken )
for ( sal_uInt16 i = nStart; i < sTmp.GetTokenCount( '\"' ); i++ ) {
- ByteString sToken = sTmp.GetToken( i, '\"' );
+ ByteString sToken = getToken(sTmp, i, '\"');
if ( sToken.Len()) {
if ( nState == TXT_STATE_TEXT ) {
sReturn += sToken;
diff --git a/l10ntools/source/export2.cxx b/l10ntools/source/export2.cxx
index d7d39a4..1494787 100644
--- a/l10ntools/source/export2.cxx
+++ b/l10ntools/source/export2.cxx
@@ -39,10 +39,12 @@
#include <iostream>
#include <iomanip>
#include <tools/urlobj.hxx>
+#include <comphelper/string.hxx>
#include <time.h>
#include <stdlib.h>
using namespace std;
+using comphelper::string::getToken;
//
// class ResData();
//
@@ -343,7 +345,7 @@ void Export::InitLanguages( bool bMergeMode ){
ByteString sTmp;
ByteStringBoolHashMap aEnvLangs;
for ( sal_uInt16 x = 0; x < sLanguages.GetTokenCount( ',' ); x++ ){
- sTmp = sLanguages.GetToken( x, ',' ).GetToken( 0, '=' );
+ sTmp = getToken(getToken(sLanguages, x, ','), 0, '=');
sTmp.EraseLeadingAndTrailingChars();
if( bMergeMode && !isAllowed( sTmp ) ){}
else if( !( (sTmp.GetChar(0)=='x' || sTmp.GetChar(0)=='X') && sTmp.GetChar(1)=='-' ) ){
@@ -360,7 +362,7 @@ void Export::InitForcedLanguages( bool bMergeMode ){
ByteString sTmp;
ByteStringBoolHashMap aEnvLangs;
for ( sal_uInt16 x = 0; x < sForcedLanguages.GetTokenCount( ',' ); x++ ){
- sTmp = sForcedLanguages.GetToken( x, ',' ).GetToken( 0, '=' );
+ sTmp = getToken(getToken(sForcedLanguages, x, ','), 0, '=');
sTmp.EraseLeadingAndTrailingChars();
if( bMergeMode && isAllowed( sTmp ) ){}
else if( !( (sTmp.GetChar(0)=='x' || sTmp.GetChar(0)=='X') && sTmp.GetChar(1)=='-' ) )
diff --git a/l10ntools/source/gsicheck.cxx b/l10ntools/source/gsicheck.cxx
index 0b05de0..9f1485b 100644
--- a/l10ntools/source/gsicheck.cxx
+++ b/l10ntools/source/gsicheck.cxx
@@ -37,6 +37,8 @@
#include "tagtest.hxx"
#include "gsicheck.hxx"
+using comphelper::string::getToken;
+
#define MAX_GID_LID_LEN 250
/*****************************************************************************/
@@ -78,8 +80,8 @@ sal_Bool LanguageOK( ByteString aLang )
return islowerAsciiString(aLang);
else if ( aLang.GetTokenCount( '-' ) == 2 )
{
- ByteString aTok0( aLang.GetToken( 0, '-' ) );
- ByteString aTok1( aLang.GetToken( 1, '-' ) );
+ ByteString aTok0( getToken(aLang, 0, '-') );
+ ByteString aTok1( getToken(aLang, 1, '-') );
return aTok0.Len() && islowerAsciiString(aTok0)
&& aTok1.Len() && isupperAsciiString(aTok1)
&& !aTok1.EqualsIgnoreCaseAscii( aTok0 );
@@ -147,7 +149,7 @@ GSILine::GSILine( const ByteString &rLine, sal_uLong nLine )
if ( rLine.GetTokenCount( '\t' ) == 15 )
{
aFormat = FORMAT_SDF;
- aUniqId = rLine.GetToken( 0, '\t' );
+ aUniqId = getToken(rLine, 0, '\t');
aUniqId.Append("/").Append( rLine.GetToken( 1, '\t' ) ).Append("/").Append( rLine.GetToken( 3, '\t' ) ).Append("/").Append( rLine.GetToken( 4, '\t' ) ).Append("/").Append( rLine.GetToken( 5, '\t' ) ).Append("/").Append( rLine.GetToken( 6, '\t' ) ).Append("/").Append( rLine.GetToken( 7, '\t' ) );
aLineType = "";
aLangId = rLine.GetToken( 9, '\t' );
@@ -468,7 +470,7 @@ sal_Bool GSIBlock::IsUTF8( const ByteString &aTestee, sal_Bool bFixTags, sal_uIn
{ // test for old KeyIDs 5 to 6 digits followed by a dot '44373.'
bNewId = sal_False;
nErrorPos = 1;
- aID = aID.GetToken( 0, '.' );
+ aID = getToken(aID, 0, '.');
nAfterID = nAfterID + aID.Len();
}
else
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 6e7019c..8b2eee4 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -40,7 +40,8 @@
#include <iostream>
#include <fstream>
#include <vector>
-#include "rtl/strbuf.hxx"
+#include <rtl/strbuf.hxx>
+#include <comphelper/string.hxx>
#ifdef WNT
#include <windows.h>
#undef CopyFile
@@ -569,15 +570,15 @@ void HelpParser::MakeDir( const ByteString& sPath ){
ByteString sDelimiter( DirEntry::GetAccessDelimiter(), RTL_TEXTENCODING_ASCII_US );
sTPath.SearchAndReplaceAll( sDelimiter , '/' );
sal_uInt16 cnt = sTPath.GetTokenCount( '/' );
- ByteString sCreateDir;
+ rtl::OStringBuffer sCreateDir;
for( sal_uInt16 i = 0 ; i < cnt ; i++ )
{
- sCreateDir += sTPath.GetToken( i , '/' );
- sCreateDir += sDelimiter;
+ sCreateDir.append(comphelper::string::getToken(sTPath, i , '/'));
+ sCreateDir.append(sDelimiter);
#ifdef WNT
- _mkdir( sCreateDir.GetBuffer() );
+ _mkdir( sCreateDir.getStr() );
#else
- mkdir( sCreateDir.GetBuffer() , S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH );
+ mkdir( sCreateDir.getStr() , S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH );
#endif
}
}
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index a9296e3..066fb01 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -29,11 +29,14 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_l10ntools.hxx"
#include <tools/fsys.hxx>
+#include <comphelper/string.hxx>
-// local includes
#include "lngmerge.hxx"
#include <iostream>
+
using namespace std;
+using comphelper::string::getToken;
+
//
// class LngParser
//
@@ -185,7 +188,7 @@ sal_Bool LngParser::CreateSDF(
sLine_in.EraseTrailingChars( ' ' );
if (( sLine_in.GetChar( 0 ) == '[' ) &&
( sLine_in.GetChar( sLine_in.Len() - 1 ) == ']' )){
- sGroup_out = sLine_in.GetToken( 1, '[' ).GetToken( 0, ']' );
+ sGroup_out = getToken(getToken(sLine_in, 1, '['), 0, ']');
sGroup_out.EraseLeadingChars( ' ' );
sGroup_out.EraseTrailingChars( ' ' );
return true;
@@ -193,10 +196,10 @@ sal_Bool LngParser::CreateSDF(
return false;
}
void LngParser::ReadLine( const ByteString &sLine_in , ByteStringHashMap &rText_inout){
- ByteString sLang = sLine_in.GetToken( 0, '=' );
+ ByteString sLang = getToken(sLine_in, 0, '=');
sLang.EraseLeadingChars( ' ' );
sLang.EraseTrailingChars( ' ' );
- ByteString sText = sLine_in.GetToken( 1, '\"' ).GetToken( 0, '\"' );
+ ByteString sText = getToken(getToken(sLine_in, 1, '\"'), 0, '\"');
if( sLang.Len() )
rText_inout[ sLang ] = sText;
}
@@ -234,7 +237,7 @@ sal_Bool LngParser::Merge(
if (( sLine.GetChar( 0 ) == '[' ) &&
( sLine.GetChar( sLine.Len() - 1 ) == ']' ))
{
- sGroup = sLine.GetToken( 1, '[' ).GetToken( 0, ']' );
+ sGroup = getToken(getToken(sLine, 1, '['), 0, ']');
sGroup.EraseLeadingChars( ' ' );
sGroup.EraseTrailingChars( ' ' );
bGroup = sal_True;
@@ -262,7 +265,7 @@ sal_Bool LngParser::Merge(
if (( sLine.GetChar( 0 ) == '[' ) &&
( sLine.GetChar( sLine.Len() - 1 ) == ']' ))
{
- sGroup = sLine.GetToken( 1, '[' ).GetToken( 0, ']' );
+ sGroup = getToken(getToken(sLine, 1, '['), 0, ']');
sGroup.EraseLeadingChars( ' ' );
sGroup.EraseTrailingChars( ' ' );
bGroup = sal_True;
@@ -270,7 +273,7 @@ sal_Bool LngParser::Merge(
sLanguagesDone = "";
}
else if ( sLine.GetTokenCount( '=' ) > 1 ) {
- ByteString sLang = sLine.GetToken( 0, '=' );
+ ByteString sLang = getToken(sLine, 0, '=');
sLang.EraseLeadingChars( ' ' );
sLang.EraseTrailingChars( ' ' );
@@ -286,7 +289,7 @@ sal_Bool LngParser::Merge(
if( bULF && pEntrys )
{
// this is a valid text line
- ByteString sText = sLine.GetToken( 1, '\"' ).GetToken( 0, '\"' );
+ ByteString sText = getToken(getToken(sLine, 1, '\"'), 0, '\"');
if( sLang.Len() ){
ByteString sNewText;
pEntrys->GetText( sNewText, STRING_TYP_TEXT, sLang, sal_True );
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 12ce243..f196f27 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -30,10 +30,12 @@
#include "precompiled_l10ntools.hxx"
#include <stdio.h>
#include <tools/fsys.hxx>
+#include <comphelper/string.hxx>
#include "export.hxx"
#include <iostream>
using namespace std;
+using comphelper::string::getToken;
namespace
{
@@ -207,7 +209,7 @@ MergeDataFile::MergeDataFile(
if ( nToks == 15 )
{
// Skip all wrong filenames
- const ::rtl::OString filename = lcl_NormalizeFilename(sLine.GetToken( 1 , '\t' ));
+ const ::rtl::OString filename = lcl_NormalizeFilename(getToken(sLine, 1 , '\t'));
if(isFileEmpty || sFileNormalized.equals("") || (!isFileEmpty && filename.equals(sFileNormalized)) )
{
xub_StrLen rIdx = 0;
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx
index 057c338..057c809 100644
--- a/rsc/source/parser/rscibas.cxx
+++ b/rsc/source/parser/rscibas.cxx
@@ -36,6 +36,7 @@
#include <string.h>
#include <i18npool/mslangid.hxx>
+#include <comphelper/string.hxx>
#include <tools/rc.h>
#include <tools/color.hxx>
@@ -158,7 +159,7 @@ void RscLangEnum::Init( RscNameTable& rNames )
sal_Bool bOneMore = 1;
while ( bOneMore )
{
- aIsoToken = aEnvIsoTokens.GetToken( nTokenCounter, ' ' );
+ aIsoToken = comphelper::string::getToken(aEnvIsoTokens, nTokenCounter, ' ');
if ( aIsoToken.Len() )
{
SetConstant( rNames.Put( aIsoToken.GetBuffer(), CONSTNAME, mnLangId ), mnLangId );
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index e8c6045..fc972c4 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -75,6 +75,7 @@ using ::rtl::OUString;
using ::rtl::OString;
using ::rtl::OStringBuffer;
using ::rtl::OStringToOUString;
+using comphelper::string::getToken;
/*************** F o r w a r d s *****************************************/
/*************** G l o b a l e V a r i a b l e n **********************/
@@ -1151,9 +1152,9 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
while( aIStm.ReadLine( aLine ) )
{
if( ( aLine.GetTokenCount( '=' ) == 2 ) &&
- ( aLine.GetToken( 0, '=' ).Search( "File" ) != STRING_NOTFOUND ) )
+ ( getToken(aLine, 0, '=').indexOf("File") != -1 ) )
{
- ByteString aBaseFileName( aLine.GetToken( 1, '"' ).GetToken( 0, '.' ) );
+ ByteString aBaseFileName( getToken(getToken(aLine, 1, '"'), 0, '.') );
if( GetImageFilePath( rOutputFile, rContext, aBaseFileName, aFilePath, pSysListFile ) )
( ( aLine = "File = \"" ) += aFilePath ) += "\";";
@@ -1179,7 +1180,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
}
while( aLine.Search( "Prefix" ) == STRING_NOTFOUND );
- const ByteString aPrefix( aLine.GetToken( 1, '"' ) );
+ const ByteString aPrefix( getToken(aLine, 1, '"') );
aIStm.Seek( nImgListStartPos );
do
diff --git a/tools/bootstrp/prj.cxx b/tools/bootstrp/prj.cxx
index b44592c..4b98dac 100644
--- a/tools/bootstrp/prj.cxx
+++ b/tools/bootstrp/prj.cxx
@@ -33,6 +33,7 @@
#include <osl/mutex.hxx>
#include <tools/stream.hxx>
+#include <comphelper/string.hxx>
#include "bootstrp/prj.hxx"
#if defined(WNT)
@@ -60,7 +61,7 @@ rtl::OString SimpleConfig::getNext()
if ( aStringBuffer == "" )
return rtl::OString();
- rtl::OString aString = aStringBuffer.GetToken(0,'\t');
+ rtl::OString aString = comphelper::string::getToken(aStringBuffer, 0, '\t');
aStringBuffer.Erase(0, aString.getLength()+1);
aStringBuffer.EraseLeadingChars( '\t' );
commit 8fd3e7c09177a856fb9ba6de0e42af5d12b67652
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 29 22:26:07 2011 +0100
callcatcher: chop, hack, slay
diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk
index 396b3e2..255d917 100644
--- a/lotuswordpro/Library_lwpft.mk
+++ b/lotuswordpro/Library_lwpft.mk
@@ -171,7 +171,6 @@ $(eval $(call gb_Library_add_exception_objects,lwpft,\
lotuswordpro/source/filter/utlist \
lotuswordpro/source/filter/xfilter/xfbase64 \
lotuswordpro/source/filter/xfilter/xfbgimage \
- lotuswordpro/source/filter/xfilter/xfbookmarkref \
lotuswordpro/source/filter/xfilter/xfborders \
lotuswordpro/source/filter/xfilter/xfcell \
lotuswordpro/source/filter/xfilter/xfcellstyle \
@@ -230,10 +229,8 @@ $(eval $(call gb_Library_add_exception_objects,lwpft,\
lotuswordpro/source/filter/xfilter/xftabstyle \
lotuswordpro/source/filter/xfilter/xftextboxstyle \
lotuswordpro/source/filter/xfilter/xftextcontent \
- lotuswordpro/source/filter/xfilter/xftextheading \
lotuswordpro/source/filter/xfilter/xftextspan \
lotuswordpro/source/filter/xfilter/xftextstyle \
- lotuswordpro/source/filter/xfilter/xftime \
lotuswordpro/source/filter/xfilter/xftimestyle \
lotuswordpro/source/filter/xfilter/xfutil \
))
diff --git a/lotuswordpro/source/filter/xfilter/xfbookmarkref.cxx b/lotuswordpro/source/filter/xfilter/xfbookmarkref.cxx
deleted file mode 100644
index 664ceb0..0000000
--- a/lotuswordpro/source/filter/xfilter/xfbookmarkref.cxx
+++ /dev/null
@@ -1,100 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
- *
- * - GNU Lesser General Public License Version 2.1
- * - Sun Industry Standards Source License Version 1.1
- *
- * Sun Microsystems Inc., October, 2000
- *
- * GNU Lesser General Public License Version 2.1
- * =============================================
- * Copyright 2000 by Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software Foundation.
- *
- * This library 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 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- *
- * Sun Industry Standards Source License Version 1.1
- * =================================================
- * The contents of this file are subject to the Sun Industry Standards
- * Source License Version 1.1 (the "License"); You may not use this file
- * except in compliance with the License. You may obtain a copy of the
- * License at http://www.openoffice.org/license.html.
- *
- * Software provided under this License is provided on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- * See the License for the specific provisions governing your rights and
- * obligations concerning the Software.
- *
- * The Initial Developer of the Original Code is: IBM Corporation
- *
- * Copyright: 2008 by IBM Corporation
- *
- * All Rights Reserved.
- *
- * Contributor(s): _______________________________________
- *
- *
- ************************************************************************/
-/*************************************************************************
- * @file
- * Bookmark reference.
- ************************************************************************/
-#include "xfbookmarkref.hxx"
-
-XFBookmarkRef::XFBookmarkRef()
-{
- m_eRefType = enumXFBookmarkNone;
-}
-
-void XFBookmarkRef::ToXml(IXFStream *pStrm)
-{
- IXFAttrList *pAttrList = pStrm->GetAttrList();
- pAttrList->Clear();
-
- assert(m_strBookmark.getLength() > 0 );
- if( m_eRefType == enumXFBookmarkNone )
- return;
- else if( m_eRefType == enumXFBookmarkPage )
- {
- pAttrList->AddAttribute( A2OUSTR("text:reference-format"), A2OUSTR("page") );
- pAttrList->AddAttribute( A2OUSTR("text:ref-name"), m_strBookmark );
- }
- else if( m_eRefType == enumXFBookmarkChapter )
- {
- pAttrList->AddAttribute( A2OUSTR("text:reference-format"), A2OUSTR("chapter") );
- pAttrList->AddAttribute( A2OUSTR("text:ref-name"), m_strBookmark );
- }
- else if( m_eRefType == enumXFBookmarkDir )
- {
- pAttrList->AddAttribute( A2OUSTR("text:reference-format"), A2OUSTR("direction") );
- pAttrList->AddAttribute( A2OUSTR("text:ref-name"), m_strBookmark );
- }
- else if( m_eRefType == enumXFBookmarkDef )
- {
- pAttrList->AddAttribute( A2OUSTR("text:reference-format"), A2OUSTR("text") );
- pAttrList->AddAttribute( A2OUSTR("text:ref-name"), m_strBookmark );
- }
- pStrm->StartElement( A2OUSTR("text:bookmark-ref") );
- if( m_strText.getLength() )
- pStrm->Characters(m_strBookmark);
- pStrm->EndElement( A2OUSTR("text:bookmark-ref") );
-}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xfbookmarkref.hxx b/lotuswordpro/source/filter/xfilter/xfbookmarkref.hxx
deleted file mode 100644
index 8426a53..0000000
--- a/lotuswordpro/source/filter/xfilter/xfbookmarkref.hxx
+++ /dev/null
@@ -1,101 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
- *
- * - GNU Lesser General Public License Version 2.1
- * - Sun Industry Standards Source License Version 1.1
- *
- * Sun Microsystems Inc., October, 2000
- *
- * GNU Lesser General Public License Version 2.1
- * =============================================
- * Copyright 2000 by Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software Foundation.
- *
- * This library 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 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- *
- * Sun Industry Standards Source License Version 1.1
- * =================================================
- * The contents of this file are subject to the Sun Industry Standards
- * Source License Version 1.1 (the "License"); You may not use this file
- * except in compliance with the License. You may obtain a copy of the
- * License at http://www.openoffice.org/license.html.
- *
- * Software provided under this License is provided on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- * See the License for the specific provisions governing your rights and
- * obligations concerning the Software.
- *
- * The Initial Developer of the Original Code is: IBM Corporation
- *
- * Copyright: 2008 by IBM Corporation
- *
- * All Rights Reserved.
- *
- * Contributor(s): _______________________________________
- *
- *
- ************************************************************************/
-/*************************************************************************
- * @file
- * Bookmark ref.
- ************************************************************************/
-#ifndef _XFBOOKMARKREF_HXX
-#define _XFBOOKMARKREF_HXX
-
-#include "xfcontent.hxx"
-
-class XFBookmarkRef : public XFContent
-{
-public:
- XFBookmarkRef();
-
-public:
- void SetRefType(enumXFBookmarkRef type);
-
- void SetBookmark(rtl::OUString name);
-
- void SetText(rtl::OUString text);
-
- virtual void ToXml(IXFStream *pStrm);
-
-private:
- enumXFBookmarkRef m_eRefType;
- rtl::OUString m_strBookmark;
- rtl::OUString m_strText;
-};
-
-inline void XFBookmarkRef::SetRefType(enumXFBookmarkRef ref)
-{
- m_eRefType = ref;
-}
-
-inline void XFBookmarkRef::SetBookmark(rtl::OUString name)
-{
- m_strBookmark = name;
-}
-
-inline void XFBookmarkRef::SetText(rtl::OUString text)
-{
- m_strText = text;
-}
-
-#endif
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xfcell.cxx b/lotuswordpro/source/filter/xfilter/xfcell.cxx
index 73acf64..3c8aa8b 100644
--- a/lotuswordpro/source/filter/xfilter/xfcell.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcell.cxx
@@ -176,22 +176,6 @@ void XFCell::SetValue(rtl::OUString value)
//XFContentContainer::Add(pPara);
}
-void XFCell::SetString(rtl::OUString str)
-{
- m_eValueType = enumXFValueTypeString;
- m_strValue = str;
-
- Reset();
- XFParagraph *pPara = new XFParagraph();
- pPara->Add(m_strValue);
- XFContentContainer::Add(pPara);
-}
-
-void XFCell::SetPercent(double percent)
-{
- SetPercent(DoubleToOUString(percent));
-}
-
void XFCell::SetPercent(rtl::OUString percent)
{
m_eValueType = enumXFValueTypePercentage;
@@ -203,49 +187,6 @@ void XFCell::SetPercent(rtl::OUString percent)
XFContentContainer::Add(pPara);
}
-void XFCell::SetDate(rtl::OUString date)
-{
- m_eValueType = enumXFValueTypeDate;
- m_strValue = date;
-
- Reset();
- XFParagraph *pPara = new XFParagraph();
- pPara->Add(m_strValue);
- XFContentContainer::Add(pPara);
-}
-
-void XFCell::SetTime(rtl::OUString time)
-{
- m_eValueType = enumXFValueTypeTime;
- m_strValue = time;
-
- Reset();
- XFParagraph *pPara = new XFParagraph();
- pPara->Add(m_strValue);
- XFContentContainer::Add(pPara);
-}
-
-void XFCell::SetCurrency(rtl::OUString currency)
-{
- m_eValueType = enumXFValueTypeCurrency;
- m_strValue = currency;
-
- Reset();
- XFParagraph *pPara = new XFParagraph();
- pPara->Add(m_strValue);
- XFContentContainer::Add(pPara);
-}
-
-void XFCell::SetDisplay(rtl::OUString display)
-{
- m_strDisplay = display;
-
- Reset();
- XFParagraph *pPara = new XFParagraph();
- pPara->Add(m_strDisplay);
- XFContentContainer::Add(pPara);
-}
-
rtl::OUString XFCell::GetCellName()
{
rtl::OUString name;
diff --git a/lotuswordpro/source/filter/xfilter/xfcell.hxx b/lotuswordpro/source/filter/xfilter/xfcell.hxx
index 30ba90b..dff91ba 100644
--- a/lotuswordpro/source/filter/xfilter/xfcell.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcell.hxx
@@ -111,41 +111,11 @@ public:
void SetValue(rtl::OUString value);
/**
- * @descr Set cell string value.
- */
- void SetString(rtl::OUString str);
-
- /**
- * @descr Set cell as a percent value with value percent.
- */
- void SetPercent(double percent);
-
- /**
* @descr Set cell as a percent value with value percent.
*/
void SetPercent(rtl::OUString percent);
/**
- * @descr Set cell as a date value.
- */
- void SetDate(rtl::OUString date);
-
- /**
- * @descr Set cell as a time value.
- */
- void SetTime(rtl::OUString time);
-
- /**
- * @descr Set cell as a currency value.
- */
- void SetCurrency(rtl::OUString currency);
-
- /**
- * @descr Set cell display string.
- */
- void SetDisplay(rtl::OUString display);
-
- /**
* @descr Set cell formula.
*/
void SetFormula(rtl::OUString formula);
diff --git a/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx b/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
index 313cd76..3e6c54a 100644
--- a/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
@@ -80,34 +80,6 @@ XFCellStyle::~XFCellStyle()
delete m_pBorders;
}
-
-void XFCellStyle::SetParentStyle(rtl::OUString parent)
-{
- m_strParentStyleName = parent;
-}
-
-void XFCellStyle::SetFont(XFFont *pFont)
-{
- m_pFont = pFont;
-}
-
-void XFCellStyle::SetIndent(double indent )
-{
- m_fTextIndent = indent;
-}
-
-void XFCellStyle::SetMargins(double left, double right, double top, double bottom)
-{
- if( left != -1 )
- m_aMargin.SetLeft(left);
- if( right != -1 )
- m_aMargin.SetRight(right);
- if( top != -1 )
- m_aMargin.SetTop(top);
- if( bottom != -1 )
- m_aMargin.SetBottom( bottom );
-}
-
void XFCellStyle::SetPadding(double left, double right,double top, double bottom)
{
if( left != -1 )
@@ -120,13 +92,6 @@ void XFCellStyle::SetPadding(double left, double right,double top, double bottom
m_aPadding.SetBottom( bottom );
}
-void XFCellStyle::SetShadow(enumXFShadowPos pos, double offset, XFColor& color)
-{
- m_aShadow.SetPosition(pos);
- m_aShadow.SetOffset(offset);
- m_aShadow.SetColor(color);
-}
-
void XFCellStyle::SetBackColor(XFColor& color)
{
m_aBackColor = color;
diff --git a/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx b/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx
index e6279c5..9f7347a 100644
--- a/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx
@@ -89,25 +89,6 @@ public:
void SetDataStyle(rtl::OUString style);
/**
- * @descr: Parant paragraph style.
- */
- void SetParentStyle(rtl::OUString parent);
-
- /**
- * @descr: set the paragraph defaut font.
- * @param: font font obejct to be setted.Font object are deleted by font-factory,so
- * dont't delete it in the destructure function of para style.
- */
- void SetFont(XFFont *font);
-
- /**
- * @descr: Set the indent of the paragraph.This is the indent for
- the first line.
- * @param: indent value of the first-line indent.
- */
- void SetIndent(double indent );
-
- /**
* @descr: Set the pading of the paragraph.This is the distance
between the border and the top of the text.
* @param: indent value of the padding.
@@ -115,28 +96,12 @@ public:
void SetPadding(double left, double right = -1, double top = -1, double bottom = -1);
/**
- * @descr: Set the Margins of the paragraph.
- * @param: -1: don't change.
- other: set value.
- */
- void SetMargins(double left, double right=-1,double top=-1, double bottom=-1);
-
- /**
* @descr: Set alignment property of the cell.
* @param: eAlign alignment type,left,right,center or justify.
*/
void SetAlignType(enumXFAlignType hori=enumXFAlignNone, enumXFAlignType vert = enumXFAlignBottom);
/**
- * @descr: Set the shadow of the paragraph.there is 4 postions, you
- can find it in the definition of enumShadowPos.
- * @param: pos
- * @param: offset the distance between the paragraph border and the shadow.
- * @param: color color to fill the shadow.
- */
- void SetShadow(enumXFShadowPos pos, double offset, XFColor& color);
-
- /**
* @descr: The borders is complex,so you have to create one before use.
Very few paragraphs will readly have borders property,this way
we can save much memory.
diff --git a/lotuswordpro/source/filter/xfilter/xfcolumns.cxx b/lotuswordpro/source/filter/xfilter/xfcolumns.cxx
index 058a8ec..8eaefd7 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolumns.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolumns.cxx
@@ -139,11 +139,6 @@ void XFColumns::AddColumn(XFColumn& column)
m_aColumns.push_back(column);
}
-sal_Int32 XFColumns::GetCount()
-{
- return m_aColumns.size();;
-}
-
void XFColumns::SetGap(double fGap)
{
m_fGap = fGap;
@@ -160,7 +155,6 @@ void XFColumns::ToXml(IXFStream *pStrm)
IXFAttrList *pAttrList = pStrm->GetAttrList();
pAttrList->Clear();
- //pAttrList->AddAttribute( A2OUSTR("fo:column-count"), Int32ToOUString(GetCount()) );
pAttrList->AddAttribute( A2OUSTR("fo:column-count"), Int32ToOUString(m_nCount));
if( m_nFlag&XFCOLUMNS_FLAG_GAP )
{
diff --git a/lotuswordpro/source/filter/xfilter/xfcolumns.hxx b/lotuswordpro/source/filter/xfilter/xfcolumns.hxx
index 80e7e94..36a5d7b 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolumns.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolumns.hxx
@@ -146,7 +146,6 @@ public:
void SetGap(double fGap);
void SetCount(sal_uInt16 nCount);
void AddColumn(XFColumn& column);
- sal_Int32 GetCount();
void ToXml(IXFStream *pStrm);
private:
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx b/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
index 2d518a9..5306ed1 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
@@ -63,11 +63,6 @@ XFSvgPathEntry::XFSvgPathEntry()
{
}
-XFSvgPathEntry::XFSvgPathEntry(rtl::OUString cmd)
-{
- m_strCommand = cmd;
-}
-
rtl::OUString XFSvgPathEntry::ToString()
{
assert(m_strCommand.getLength()>0);
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx b/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx
index 71d55f1..577987b 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx
@@ -72,8 +72,6 @@ class XFSvgPathEntry
public:
XFSvgPathEntry();
- XFSvgPathEntry(rtl::OUString cmd);
-
public:
/**
* @descr Set svg path command,L for line,M for move,...
diff --git a/lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx b/lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx
index 7b8836f..244a57c 100644
--- a/lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx
@@ -105,18 +105,6 @@ void XFHeaderStyle::SetMinHeight(double minHeight)
m_fMinHeight = minHeight;
}
-void XFHeaderStyle::SetPadding(double left, double right, double top, double bottom)
-{
- if( left != -1 )
- m_aPadding.SetLeft(left);
- if( right != -1 )
- m_aPadding.SetRight(right);
- if( top != -1 )
- m_aPadding.SetTop(top);
- if( bottom != -1 )
- m_aPadding.SetBottom(bottom);
-}
-
void XFHeaderStyle::SetShadow(XFShadow *pShadow)
{
if( m_pShadow && (pShadow != m_pShadow) )
diff --git a/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx b/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx
index ddb2add..a573ccc 100644
--- a/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfheaderstyle.hxx
@@ -97,11 +97,6 @@ public:
void SetMinHeight(double minHeight);
/**
- * @descr Set padding for header. Padding is the space between header borde and header content.
- */
- void SetPadding(double left=-1, double right=-1, double top=-1, double bottom=-1);
-
- /**
* @descr Set header shadow.
*/
void SetShadow(XFShadow *pShadow);
diff --git a/lotuswordpro/source/filter/xfilter/xfindex.cxx b/lotuswordpro/source/filter/xfilter/xfindex.cxx
index 8c1ab7b..19cdee2 100644
--- a/lotuswordpro/source/filter/xfilter/xfindex.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfindex.cxx
@@ -92,38 +92,8 @@ XFIndex::~XFIndex()
}
}
-void XFIndex::AddTemplate(sal_uInt32 level,
- rtl::OUString /*style*/,
- enumXFIndexTemplate type1,
- enumXFIndexTemplate type2,
- enumXFIndexTemplate type3,
- enumXFIndexTemplate type4 )
-{
- if( level<1 )
- return;
-
- if (level > m_nMaxLevel)
- m_nMaxLevel = level;
-
- XFIndexTemplate * templ = new XFIndexTemplate();
-
- templ->AddEntry(type1);
- templ->AddEntry(type2);
- templ->AddEntry(type3);
- templ->AddEntry(type4);
- templ->SetLevel( rtl::OUString::valueOf( ( sal_Int64 ) level ) );
-
- m_aTemplates.push_back( templ );
-}
-
void XFIndex::AddTemplate(rtl::OUString level, rtl::OUString style, XFIndexTemplate* templ)
{
-// if( level<1 || !templ )
-// return;
-
-// if (level > m_nMaxLevel)
-// m_nMaxLevel = level;
-
templ->SetLevel( level );
if(m_eType != enumXFIndexTOC) // TOC's styles are applied to template entries separately
{
@@ -132,15 +102,6 @@ void XFIndex::AddTemplate(rtl::OUString level, rtl::OUString style, XFIndexTe
m_aTemplates.push_back( templ );
}
-void XFIndex::AddEntry(rtl::OUString entry, rtl::OUString strParaStyle)
-{
- XFParagraph *pPara = new XFParagraph();
- pPara->SetStyleName(strParaStyle);
- pPara->Add(entry);
- pPara->Add(new XFTabStop());
- XFContentContainer::Add(pPara);
-}
-
void XFIndex::SetProtected(sal_Bool protect)
{
m_bProtect = protect;
diff --git a/lotuswordpro/source/filter/xfilter/xfindex.hxx b/lotuswordpro/source/filter/xfilter/xfindex.hxx
index 04708bd..4b3aee9 100644
--- a/lotuswordpro/source/filter/xfilter/xfindex.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfindex.hxx
@@ -152,27 +152,11 @@ public:
void SetIndexType(enumXFIndex type);
/**
- * @descr Set index entry template.
- * @param level [1-10].
- */
- void AddTemplate(sal_uInt32 level,
- rtl::OUString style,
- enumXFIndexTemplate type1 = enumXFIndexTemplateChapter,
- enumXFIndexTemplate type2 = enumXFIndexTemplateText,
- enumXFIndexTemplate type3 = enumXFIndexTemplateTab,
- enumXFIndexTemplate type4 = enumXFIndexTemplatePage);
-
- /**
* @descr Add index templaet entry.
*/
void AddTemplate(rtl::OUString level, rtl::OUString style, XFIndexTemplate* templ);
/**
- * @descr Add index entry.
- */
- void AddEntry(rtl::OUString entry, rtl::OUString strParaStyle);
-
- /**
* @descr Set if protected index to prevent handly-revise.
*/
void SetProtected(sal_Bool protect);
diff --git a/lotuswordpro/source/filter/xfilter/xflist.cxx b/lotuswordpro/source/filter/xfilter/xflist.cxx
index 943b726..b24b353 100644
--- a/lotuswordpro/source/filter/xfilter/xflist.cxx
+++ b/lotuswordpro/source/filter/xfilter/xflist.cxx
@@ -69,13 +69,6 @@ XFList::XFList()
m_pHeader = NULL;
}
-XFList::XFList(sal_Bool ordered)
-{
- m_bOrdered = ordered;
- m_bContinueNumber = sal_False;
- m_pHeader = NULL;
-}
-
XFList::~XFList()
{
}
@@ -88,21 +81,6 @@ void XFList::AddItem(XFListItem *pItem)
Add(pItem);
}
-void XFList::AddItem(rtl::OUString text)
-{
- XFListItem *pItem = new XFListItem();
- pItem->Add(text);
- AddItem(pItem);
-}
-
-void XFList::SetHeader(XFListItem *pItem)
-{
- if( m_pHeader )
- delete m_pHeader;
- pItem->SetIsHeader(sal_True);
- m_pHeader = pItem;
-}
-
void XFList::ToXml(IXFStream *pStrm)
{
IXFAttrList *pAttrList = pStrm->GetAttrList();
diff --git a/lotuswordpro/source/filter/xfilter/xflist.hxx b/lotuswordpro/source/filter/xfilter/xflist.hxx
index 71fccc7..51e838f 100644
--- a/lotuswordpro/source/filter/xfilter/xflist.hxx
+++ b/lotuswordpro/source/filter/xfilter/xflist.hxx
@@ -74,8 +74,6 @@ class XFList : public XFContentContainer
public:
XFList();
- XFList(sal_Bool ordered);
-
virtual ~XFList();
public:
@@ -95,16 +93,6 @@ public:
void AddItem(XFListItem *pItem);
/**
- * @descr Add a simple text list item.
- */
- void AddItem(rtl::OUString text);
-
- /**
- * @descr Set the header list item. There can only be one list header.
- */
- void SetHeader(XFListItem *pItem);
-
- /**
* @descr Output list obejct.
*/
virtual void ToXml(IXFStream *pStrm);
diff --git a/lotuswordpro/source/filter/xfilter/xfofficemeta.cxx b/lotuswordpro/source/filter/xfilter/xfofficemeta.cxx
index b0002e8..1a0b00a 100644
--- a/lotuswordpro/source/filter/xfilter/xfofficemeta.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfofficemeta.cxx
@@ -61,16 +61,6 @@
#include "ixfstream.hxx"
#include "ixfattrlist.hxx"
-void XFOfficeMeta::SetGenerator(rtl::OUString generator)
-{
- m_strGenerator = generator;
-}
-
-void XFOfficeMeta::SetTitle(rtl::OUString title)
-{
- m_strTitle = title;
-}
-
void XFOfficeMeta::SetCreator(rtl::OUString creator)
{
m_strCreator = creator;
diff --git a/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx b/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx
index 9473b41..06d9420 100644
--- a/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfofficemeta.hxx
@@ -69,8 +69,6 @@ public:
XFOfficeMeta(){}
virtual ~XFOfficeMeta(){}
- void SetGenerator(rtl::OUString generator);
- void SetTitle(rtl::OUString title);
void SetCreator(rtl::OUString creator);
void SetDescription(rtl::OUString dsr);
void SetKeywords(rtl::OUString keywords);
diff --git a/lotuswordpro/source/filter/xfilter/xfparagraph.cxx b/lotuswordpro/source/filter/xfilter/xfparagraph.cxx
index e1db8df..cdb0012 100644
--- a/lotuswordpro/source/filter/xfilter/xfparagraph.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfparagraph.cxx
@@ -67,14 +67,6 @@ XFParagraph::XFParagraph()
}
-XFParagraph::XFParagraph(rtl::OUString& text,rtl::OUString& style)
-{
- IXFContent *pText = new XFTextContent(text);
- Add(pText);
-
- SetStyleName(style);
-}
-
XFParagraph::~XFParagraph()
{
}
@@ -108,11 +100,6 @@ void XFParagraph::ToXml(IXFStream *pStrm)
pStrm->EndElement( A2OUSTR("text:p") );
}
-void XFParagraph::ClearContents()
-{
- Reset();
-}
-
sal_Bool XFParagraph::HasContents()
{
return GetCount()>0;
diff --git a/lotuswordpro/source/filter/xfilter/xfparagraph.hxx b/lotuswordpro/source/filter/xfilter/xfparagraph.hxx
index 45b1455..eb9e572 100644
--- a/lotuswordpro/source/filter/xfilter/xfparagraph.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfparagraph.hxx
@@ -77,13 +77,9 @@ class XFParagraph : public XFContentContainer
public:
XFParagraph();
- XFParagraph(rtl::OUString& text, rtl::OUString& style);
-
virtual ~XFParagraph();
public:
- void ClearContents();
-
sal_Bool HasContents();
virtual enumXFContent GetContentType();
diff --git a/lotuswordpro/source/filter/xfilter/xfrow.cxx b/lotuswordpro/source/filter/xfilter/xfrow.cxx
index 800fd6b..fe13925 100644
--- a/lotuswordpro/source/filter/xfilter/xfrow.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfrow.cxx
@@ -141,13 +141,6 @@ XFCell* XFRow::GetCell(sal_Int32 col) const
return m_aCells.find(col)->second;
}
-rtl::OUString XFRow::GetRowName()
-{
- if( m_pOwnerTable && m_pOwnerTable->IsSubTable() )
- return m_pOwnerTable->GetTableName();
- return A2OUSTR("");
-}
-
void XFRow::ToXml(IXFStream *pStrm)
{
sal_Int32 lastCol = 0;
diff --git a/lotuswordpro/source/filter/xfilter/xfrow.hxx b/lotuswordpro/source/filter/xfilter/xfrow.hxx
index 4b4e7c8..0dd429d 100644
--- a/lotuswordpro/source/filter/xfilter/xfrow.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfrow.hxx
@@ -93,8 +93,6 @@ public:
XFTable* GetOwnerTable();
- rtl::OUString GetRowName();
-
virtual void ToXml(IXFStream *pStrm);
void RemoveCell(sal_Int32 cell);
diff --git a/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx b/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx
index f7f3616..d522a0c 100644
--- a/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx
@@ -67,14 +67,6 @@ XFRowStyle::XFRowStyle():m_fHeight(0)
m_pBGImage = NULL;
}
-
-void XFRowStyle::SetbackImage(XFBGImage *pImage)
-{
- if( m_pBGImage )
- delete m_pBGImage;
- m_pBGImage = pImage;
-}
-
enumXFStyle XFRowStyle::GetStyleFamily()
{
return enumXFStyleTableRow;
diff --git a/lotuswordpro/source/filter/xfilter/xfrowstyle.hxx b/lotuswordpro/source/filter/xfilter/xfrowstyle.hxx
index 7efdea0..f97aca9 100644
--- a/lotuswordpro/source/filter/xfilter/xfrowstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfrowstyle.hxx
@@ -80,8 +80,6 @@ public:
void SetBackColor(XFColor& color);
- void SetbackImage(XFBGImage *pImage);
-
virtual enumXFStyle GetStyleFamily();
virtual void ToXml(IXFStream *pStrm);
diff --git a/lotuswordpro/source/filter/xfilter/xfsection.cxx b/lotuswordpro/source/filter/xfilter/xfsection.cxx
index dc31822..11371d6 100644
--- a/lotuswordpro/source/filter/xfilter/xfsection.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfsection.cxx
@@ -70,21 +70,6 @@ XFSection::~XFSection()
{
}
-void XFSection::SetSectionName(rtl::OUString name)
-{
- m_strSectionName = name;
-}
-
-void XFSection::SetProtected(sal_Bool bProtected)
-{
- m_bProtected = bProtected;
-}
-
-void XFSection::SetHiden(sal_Bool hiden)
-{
- m_bHiden = hiden;
-}
-
void XFSection::ToXml(IXFStream *pStrm)
{
assert(m_strSectionName.getLength() > 0 );
diff --git a/lotuswordpro/source/filter/xfilter/xfsection.hxx b/lotuswordpro/source/filter/xfilter/xfsection.hxx
index e2ae2e9..fb3acb4 100644
--- a/lotuswordpro/source/filter/xfilter/xfsection.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfsection.hxx
@@ -77,20 +77,6 @@ public:
virtual ~XFSection();
public:
- /**
- * @descr Set section name. If not setted, i'll generate a name for it.
- */
- void SetSectionName(rtl::OUString name);
-
- /**
- * @descr Set protected.
- */
- void SetProtected(sal_Bool bProtected);
-
- /**
- * @descr Set hidden.
- */
- void SetHiden(sal_Bool hiden);
/**
* @descr Output section obejct.
diff --git a/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx b/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx
index 3f0c959..5f263b4 100644
--- a/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx
@@ -91,11 +91,6 @@ void XFSectionStyle::SetMarginRight(double right)
m_fMarginRight = right;
}
-void XFSectionStyle::SetBackColor(const XFColor& color)
-{
- m_aBackColor = color;
-}
-
void XFSectionStyle::SetColumns(XFColumns *pColumns)
{
if( m_pColumns )
@@ -103,13 +98,6 @@ void XFSectionStyle::SetColumns(XFColumns *pColumns)
m_pColumns = pColumns;
}
-void XFSectionStyle::SetBackImage(XFBGImage *image)
-{
- if( m_pBackImage )
- delete m_pBackImage;
- m_pBackImage = image;
-}
-
void XFSectionStyle::ToXml(IXFStream *pStrm)
{
IXFAttrList *pAttrList = pStrm->GetAttrList();
diff --git a/lotuswordpro/source/filter/xfilter/xfsectionstyle.hxx b/lotuswordpro/source/filter/xfilter/xfsectionstyle.hxx
index dd61b76..07ef973 100644
--- a/lotuswordpro/source/filter/xfilter/xfsectionstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfsectionstyle.hxx
@@ -82,12 +82,8 @@ public:
void SetMarginRight(double right);
- void SetBackColor(const XFColor& color);
-
void SetColumns(XFColumns *pColumns);
- void SetBackImage(XFBGImage *image);
-
virtual enumXFStyle GetStyleFamily();
virtual void ToXml(IXFStream *pStrm);
diff --git a/lotuswordpro/source/filter/xfilter/xfshadow.cxx b/lotuswordpro/source/filter/xfilter/xfshadow.cxx
index 814478f..718bbc2 100644
--- a/lotuswordpro/source/filter/xfilter/xfshadow.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfshadow.cxx
@@ -96,12 +96,6 @@ rtl::OUString XFShadow::ToString()
return buf;
}
-void XFShadow::Reset()
-{
- m_ePosition = enumXFShadowNone;
- m_fOffset = 0;
-}
-
void XFShadow::ToXml(IXFStream *pStrm)
{
IXFAttrList *pAttrList = pStrm->GetAttrList();
diff --git a/lotuswordpro/source/filter/xfilter/xfshadow.hxx b/lotuswordpro/source/filter/xfilter/xfshadow.hxx
index db7c344..463d9d9 100644
--- a/lotuswordpro/source/filter/xfilter/xfshadow.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfshadow.hxx
@@ -106,8 +106,6 @@ public:
*/
XFColor GetColor();
- void Reset();
-
rtl::OUString ToString();
virtual void ToXml(IXFStream *pStrm);
diff --git a/lotuswordpro/source/filter/xfilter/xftable.cxx b/lotuswordpro/source/filter/xfilter/xftable.cxx
index 5c6a500..3c1a460 100644
--- a/lotuswordpro/source/filter/xfilter/xftable.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftable.cxx
@@ -201,19 +201,6 @@ sal_Int32 XFTable::GetColumnCount()
colMax = it->first;
}
return colMax;
-/*
- if( m_aColumns.size()<1 )
- return 0;
- std::map<sal_Int32,rtl::OUString>::iterator it = m_aColumns.end();
- it--;
- return it->first;*/
-}
-
-rtl::OUString XFTable::GetColumnStyle(sal_Int32 col)
-{
- if( m_aColumns.find(col) != m_aColumns.end() )
- return m_aColumns[col];
- return A2OUSTR("");
}
enumXFContent XFTable::GetContentType()
diff --git a/lotuswordpro/source/filter/xfilter/xftable.hxx b/lotuswordpro/source/filter/xfilter/xftable.hxx
index 478c404..41f20a3 100644
--- a/lotuswordpro/source/filter/xfilter/xftable.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftable.hxx
@@ -104,8 +104,6 @@ public:
sal_Int32 GetColumnCount();
- rtl::OUString GetColumnStyle(sal_Int32 col);
-
sal_Bool IsSubTable();
void Normalize();
diff --git a/lotuswordpro/source/filter/xfilter/xftextheading.cxx b/lotuswordpro/source/filter/xfilter/xftextheading.cxx
deleted file mode 100644
index e7c7cd3..0000000
--- a/lotuswordpro/source/filter/xfilter/xftextheading.cxx
+++ /dev/null
@@ -1,105 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
- *
- * - GNU Lesser General Public License Version 2.1
- * - Sun Industry Standards Source License Version 1.1
- *
- * Sun Microsystems Inc., October, 2000
- *
- * GNU Lesser General Public License Version 2.1
- * =============================================
- * Copyright 2000 by Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software Foundation.
- *
- * This library 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 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- *
- * Sun Industry Standards Source License Version 1.1
- * =================================================
- * The contents of this file are subject to the Sun Industry Standards
- * Source License Version 1.1 (the "License"); You may not use this file
- * except in compliance with the License. You may obtain a copy of the
- * License at http://www.openoffice.org/license.html.
- *
- * Software provided under this License is provided on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- * See the License for the specific provisions governing your rights and
- * obligations concerning the Software.
- *
- * The Initial Developer of the Original Code is: IBM Corporation
- *
- * Copyright: 2008 by IBM Corporation
- *
- * All Rights Reserved.
- *
- * Contributor(s): _______________________________________
- *
- *
- ************************************************************************/
-/*************************************************************************
- * @file
- * Heading text for OOo.
- ************************************************************************/
-#include "xftextheading.hxx"
-#include "xftextcontent.hxx"
-
-XFTextHeading::XFTextHeading()
-{
- m_pContent = NULL;
- m_nLevel = 0;
-}
-
-XFTextHeading::~XFTextHeading()
-{
- if( m_pContent )
- delete m_pContent;
-}
-
-enumXFContent XFTextHeading::GetContentType()
-{
- return enumXFContentHeading;
-}
-
-void XFTextHeading::SetLevel(sal_Int16 level)
-{
- m_nLevel = level;
-}
-
-void XFTextHeading::SetText(rtl::OUString text)
-{
- m_pContent = new XFTextContent(text);
-}
-
-void XFTextHeading::ToXml(IXFStream *pStrm)
-{
- rtl::OUString style = GetStyleName();
- IXFAttrList *pAttrList = pStrm->GetAttrList();
-
- assert(m_nLevel>0);
- pAttrList->Clear();
- if( style.getLength() )
- pAttrList->AddAttribute( A2OUSTR("text:style-name"), style );
- pAttrList->AddAttribute( A2OUSTR("text:level"), Int16ToOUString(m_nLevel) );
-
- pStrm->StartElement( A2OUSTR("text:h") );
- m_pContent->ToXml(pStrm);
- pStrm->EndElement( A2OUSTR("text:h") );
-}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xftextheading.hxx b/lotuswordpro/source/filter/xfilter/xftextheading.hxx
deleted file mode 100644
index d047ed9..0000000
--- a/lotuswordpro/source/filter/xfilter/xftextheading.hxx
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
- *
- * - GNU Lesser General Public License Version 2.1
- * - Sun Industry Standards Source License Version 1.1
- *
- * Sun Microsystems Inc., October, 2000
- *
- * GNU Lesser General Public License Version 2.1
- * =============================================
- * Copyright 2000 by Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software Foundation.
- *
- * This library 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 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- *
- * Sun Industry Standards Source License Version 1.1
- * =================================================
- * The contents of this file are subject to the Sun Industry Standards
- * Source License Version 1.1 (the "License"); You may not use this file
- * except in compliance with the License. You may obtain a copy of the
- * License at http://www.openoffice.org/license.html.
- *
- * Software provided under this License is provided on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- * See the License for the specific provisions governing your rights and
- * obligations concerning the Software.
- *
- * The Initial Developer of the Original Code is: IBM Corporation
- *
- * Copyright: 2008 by IBM Corporation
- *
- * All Rights Reserved.
- *
- * Contributor(s): _______________________________________
- *
- *
- ************************************************************************/
-/*************************************************************************
- * @file
- * Heading text for OOo.
- ************************************************************************/
-#ifndef _XFTEXTHEADING_HXX
-#define _XFTEXTHEADING_HXX
-
-#include "xfglobal.hxx"
-#include "xfcontent.hxx"
-
-class XFTextContent;
-/**
- * @descr
- * <text:h> object. It has a single property text:level.
- * This object use the same style type with <text:p>
- */
-class XFTextHeading : public XFContent
-{
-public:
- XFTextHeading();
- virtual ~XFTextHeading();
-
- void SetLevel(sal_Int16 level);
- void SetText(rtl::OUString text);
-
- virtual enumXFContent GetContentType();
- virtual void ToXml(IXFStream *pStrm);
-private:
- XFTextContent *m_pContent;
- sal_Int16 m_nLevel;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xftextspan.cxx b/lotuswordpro/source/filter/xfilter/xftextspan.cxx
index af0563f..5000d72 100644
--- a/lotuswordpro/source/filter/xfilter/xftextspan.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftextspan.cxx
@@ -94,33 +94,6 @@ enumXFContent XFTextSpan::GetContentType()
return enumXFContentSpan;
}
-void XFTextSpan::SetText(rtl::OUString& text)
-{
- m_aContents.clear();
- Add(text);
-}
-
-rtl::OUString XFTextSpan::GetText()
-{
- rtl::OUString text;
- std::vector<IXFContent*>::iterator it;
-
- it = m_aContents.begin();
- if( it != m_aContents.end() )
- {
- IXFContent *pContent = *it;
- if( pContent->GetContentType() != enumXFContentText )
- {
- assert(false);
- }
- XFTextContent *pText = (XFTextContent*)pContent;
- if( pText )
- text = pText->GetText();
- }
-
- return text;
-}
-
void XFTextSpan::Add(IXFContent *pContent)
{
m_aContents.push_back(pContent);
diff --git a/lotuswordpro/source/filter/xfilter/xftextspan.hxx b/lotuswordpro/source/filter/xfilter/xftextspan.hxx
index 8733614..fa1746d 100644
--- a/lotuswordpro/source/filter/xfilter/xftextspan.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftextspan.hxx
@@ -74,8 +74,6 @@ public:
virtual ~XFTextSpan();
- void SetText(rtl::OUString& text);
- rtl::OUString GetText();
void Add(IXFContent *pContent);
void Add(rtl::OUString& text);
diff --git a/lotuswordpro/source/filter/xfilter/xftime.cxx b/lotuswordpro/source/filter/xfilter/xftime.cxx
deleted file mode 100644
index f384198..0000000
--- a/lotuswordpro/source/filter/xfilter/xftime.cxx
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
- *
- * - GNU Lesser General Public License Version 2.1
- * - Sun Industry Standards Source License Version 1.1
- *
- * Sun Microsystems Inc., October, 2000
- *
- * GNU Lesser General Public License Version 2.1
- * =============================================
- * Copyright 2000 by Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software Foundation.
- *
- * This library 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 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- *
- * Sun Industry Standards Source License Version 1.1
- * =================================================
- * The contents of this file are subject to the Sun Industry Standards
- * Source License Version 1.1 (the "License"); You may not use this file
- * except in compliance with the License. You may obtain a copy of the
- * License at http://www.openoffice.org/license.html.
- *
- * Software provided under this License is provided on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- * See the License for the specific provisions governing your rights and
- * obligations concerning the Software.
- *
- * The Initial Developer of the Original Code is: IBM Corporation
- *
- * Copyright: 2008 by IBM Corporation
- *
- * All Rights Reserved.
- *
- * Contributor(s): _______________________________________
- *
- *
- ************************************************************************/
-/*************************************************************************
- * @file
- * Time field with time style.
- ************************************************************************/
-#include "xftime.hxx"
-
-XFTime::XFTime()
-{
- m_bFixed = 0;
- rtl_zeroMemory(&m_aDateTime,sizeof(m_aDateTime));
-}
-
-XFTime::~XFTime()
-{
-}
-
-void XFTime::ToXml(IXFStream *pStrm)
-{
- IXFAttrList *pAttrList = pStrm->GetAttrList();
-
- pAttrList->Clear();
- if( GetStyleName().getLength() > 0 )
- pAttrList->AddAttribute( A2OUSTR("style:data-style-name"), GetStyleName() );
- pAttrList->AddAttribute( A2OUSTR("text:time-value"), DateTimeToOUString(m_aDateTime) );
- if( m_bFixed )
- pAttrList->AddAttribute( A2OUSTR("text:fixed"), A2OUSTR("true") );
-
- pStrm->StartElement( A2OUSTR("text:time") );
- pStrm->Characters(m_strText);
- pStrm->EndElement( A2OUSTR("text:time") );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xftime.hxx b/lotuswordpro/source/filter/xfilter/xftime.hxx
deleted file mode 100644
index 4cecc6d..0000000
--- a/lotuswordpro/source/filter/xfilter/xftime.hxx
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
- *
- * - GNU Lesser General Public License Version 2.1
- * - Sun Industry Standards Source License Version 1.1
- *
- * Sun Microsystems Inc., October, 2000
- *
- * GNU Lesser General Public License Version 2.1
- * =============================================
- * Copyright 2000 by Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software Foundation.
- *
- * This library 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 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- *
- * Sun Industry Standards Source License Version 1.1
- * =================================================
- * The contents of this file are subject to the Sun Industry Standards
- * Source License Version 1.1 (the "License"); You may not use this file
- * except in compliance with the License. You may obtain a copy of the
- * License at http://www.openoffice.org/license.html.
- *
- * Software provided under this License is provided on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- * See the License for the specific provisions governing your rights and
- * obligations concerning the Software.
- *
- * The Initial Developer of the Original Code is: IBM Corporation
- *
- * Copyright: 2008 by IBM Corporation
- *
- * All Rights Reserved.
- *
- * Contributor(s): _______________________________________
- *
- *
- ************************************************************************/
-/*************************************************************************
- * @file
- * Time field with time style.
- ************************************************************************/
-#ifndef _XFTIME_HXX
-#define _XFTIME_HXX
-
-#include "xfglobal.hxx"
-#include "xfcontent.hxx"
-
-class XFTime : public XFContent
-{
-public:
- XFTime();
-
- virtual ~XFTime();
-
-public:
- void SetDate(XFDateTime& dt);
-
- void SetText(rtl::OUString& text);
-
- void SetFixed(sal_Bool fixed = sal_True);
-
- virtual void ToXml(IXFStream *pStrm);
-
-private:
- sal_Bool m_bFixed;
-
- rtl::OUString m_strText;
-
- XFDateTime m_aDateTime;
-};
-
-inline void XFTime::SetDate(XFDateTime& dt)
-{
- m_aDateTime = dt;
-}
-
-inline void XFTime::SetText(rtl::OUString& text)
-{
- m_strText = text;
-}
-
-inline void XFTime::SetFixed(sal_Bool fixed)
-{
- m_bFixed = fixed;
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/ttprops.hxx b/svtools/inc/svtools/ttprops.hxx
index 561fd8e..c50303e 100644
--- a/svtools/inc/svtools/ttprops.hxx
+++ b/svtools/inc/svtools/ttprops.hxx
@@ -86,7 +86,6 @@ public:
/// Img
Bitmap *mpBmp;
- sal_Bool Img( Bitmap *pBmp );
static SvtResId GetSvtResId( sal_uInt16 nId );
diff --git a/svtools/source/plugapp/ttprops.cxx b/svtools/source/plugapp/ttprops.cxx
index 3c6be8f..286bca2 100644
--- a/svtools/source/plugapp/ttprops.cxx
+++ b/svtools/source/plugapp/ttprops.cxx
@@ -64,15 +64,6 @@ sal_uInt16 TTProperties::ExecuteFunction( sal_uInt16 nSID, SfxPoolItem** ppArgs,
return nActualPR;
}
-sal_Bool TTProperties::Img( Bitmap *pBmp )
-{
- sal_Bool bRet;
- mpBmp = pBmp;
- bRet = RequestProperty( TT_PR_IMG );
- mpBmp = NULL;
- return bRet;
-}
-
SvtResId TTProperties::GetSvtResId( sal_uInt16 nId )
{
return SvtResId( nId );
diff --git a/svx/inc/svx/xbtmpit.hxx b/svx/inc/svx/xbtmpit.hxx
index 8dc6f98..d9fd096 100644
--- a/svx/inc/svx/xbtmpit.hxx
+++ b/svx/inc/svx/xbtmpit.hxx
@@ -46,10 +46,8 @@ class SVX_DLLPUBLIC XFillBitmapItem : public NameOrIndex
public:
TYPEINFO();
XFillBitmapItem() : NameOrIndex(XATTR_FILLBITMAP, -1 ) {}
- XFillBitmapItem( long nIndex, const XOBitmap& rTheBitmap );
XFillBitmapItem( const String& rName, const XOBitmap& rTheBitmap );
XFillBitmapItem( SfxItemPool* pPool, const XOBitmap& rTheBitmap );
- XFillBitmapItem( SfxItemPool* pPool );
XFillBitmapItem( const XFillBitmapItem& rItem );
XFillBitmapItem( SvStream& rIn, sal_uInt16 nVer = 0 );
diff --git a/svx/inc/svx/xflftrit.hxx b/svx/inc/svx/xflftrit.hxx
index 275810b..1c90b8e 100644
--- a/svx/inc/svx/xflftrit.hxx
+++ b/svx/inc/svx/xflftrit.hxx
@@ -48,10 +48,8 @@ public:
TYPEINFO();
XFillFloatTransparenceItem();
- XFillFloatTransparenceItem( sal_Int32 nIndex, const XGradient& rGradient, sal_Bool bEnable = sal_True );
XFillFloatTransparenceItem(const String& rName, const XGradient& rGradient, sal_Bool bEnable = sal_True );
XFillFloatTransparenceItem(SfxItemPool* pPool, const XGradient& rTheGradient, sal_Bool bEnable = sal_True );
- XFillFloatTransparenceItem(SfxItemPool* pPool );
XFillFloatTransparenceItem( const XFillFloatTransparenceItem& rItem );
virtual int operator==( const SfxPoolItem& rItem ) const;
diff --git a/svx/inc/svx/xflhtit.hxx b/svx/inc/svx/xflhtit.hxx
index 65eed6d..a7a126d 100644
--- a/svx/inc/svx/xflhtit.hxx
+++ b/svx/inc/svx/xflhtit.hxx
@@ -45,10 +45,8 @@ class SVX_DLLPUBLIC XFillHatchItem : public NameOrIndex
public:
TYPEINFO();
XFillHatchItem() : NameOrIndex(XATTR_FILLHATCH, -1) {}
- XFillHatchItem(sal_Int32 nIndex, const XHatch& rTheHatch);
XFillHatchItem(const String& rName, const XHatch& rTheHatch);
XFillHatchItem(SfxItemPool* pPool, const XHatch& rTheHatch);
- XFillHatchItem(SfxItemPool* pPool );
XFillHatchItem(const XFillHatchItem& rItem);
XFillHatchItem(SvStream& rIn);
diff --git a/svx/inc/svx/xftshcit.hxx b/svx/inc/svx/xftshcit.hxx
index ddd1aef..4c9cdd9 100644
--- a/svx/inc/svx/xftshcit.hxx
+++ b/svx/inc/svx/xftshcit.hxx
@@ -43,7 +43,6 @@ class SVX_DLLPUBLIC XFormTextShadowColorItem : public XColorItem
public:
TYPEINFO();
XFormTextShadowColorItem() {}
- XFormTextShadowColorItem(sal_Int32 nIndex, const Color& rTheColor);
XFormTextShadowColorItem(const String& rName, const Color& rTheColor);
XFormTextShadowColorItem(SvStream& rIn);
diff --git a/svx/inc/svx/xlndsit.hxx b/svx/inc/svx/xlndsit.hxx
index 4f61e37..ac8a187 100644
--- a/svx/inc/svx/xlndsit.hxx
+++ b/svx/inc/svx/xlndsit.hxx
@@ -46,10 +46,8 @@ class SVX_DLLPUBLIC XLineDashItem : public NameOrIndex
public:
TYPEINFO();
XLineDashItem() : NameOrIndex(XATTR_LINEDASH, -1) {}
- XLineDashItem(sal_Int32 nIndex, const XDash& rTheDash);
XLineDashItem(const String& rName, const XDash& rTheDash);
XLineDashItem(SfxItemPool* pPool, const XDash& rTheDash);
- XLineDashItem(SfxItemPool* pPool );
XLineDashItem(const XLineDashItem& rItem);
XLineDashItem(SvStream& rIn);
diff --git a/svx/inc/svx/xlnedit.hxx b/svx/inc/svx/xlnedit.hxx
index 7d7082b..461d805 100644
--- a/svx/inc/svx/xlnedit.hxx
+++ b/svx/inc/svx/xlnedit.hxx
@@ -47,7 +47,6 @@ public:
XLineEndItem(sal_Int32 nIndex = -1);
XLineEndItem(const String& rName, const basegfx::B2DPolyPolygon& rPolyPolygon);
XLineEndItem(SfxItemPool* pPool, const basegfx::B2DPolyPolygon& rPolyPolygon);
- XLineEndItem(SfxItemPool* pPool );
XLineEndItem(const XLineEndItem& rItem);
XLineEndItem(SvStream& rIn);
diff --git a/svx/inc/svx/xlnstit.hxx b/svx/inc/svx/xlnstit.hxx
index ad71ea9..24fce63 100644
--- a/svx/inc/svx/xlnstit.hxx
+++ b/svx/inc/svx/xlnstit.hxx
@@ -47,7 +47,6 @@ public:
XLineStartItem(sal_Int32 nIndex = -1);
XLineStartItem(const String& rName, const basegfx::B2DPolyPolygon& rPolyPolygon);
XLineStartItem(SfxItemPool* pPool, const basegfx::B2DPolyPolygon& rPolyPolygon);
- XLineStartItem(SfxItemPool* pPool );
XLineStartItem(const XLineStartItem& rItem);
XLineStartItem(SvStream& rIn);
diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx
index 8635bff..c856f47 100644
--- a/svx/inc/svx/xtable.hxx
+++ b/svx/inc/svx/xtable.hxx
@@ -423,7 +423,6 @@ public:
virtual ~XBitmapList();
using XPropertyList::Replace;
- XBitmapEntry* Replace(XBitmapEntry* pEntry, long nIndex );
using XPropertyList::Remove;
XBitmapEntry* Remove(long nIndex);
using XPropertyList::Get;
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 49a6422..abc3356 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -828,18 +828,6 @@ TYPEINIT1_AUTOFACTORY(XLineDashItem, NameOrIndex);
/*************************************************************************
|*
-|* XLineDashItem::XLineDashItem(sal_Int32 nIndex, const XDash& rTheDash)
-|*
-*************************************************************************/
-
-XLineDashItem::XLineDashItem(sal_Int32 nIndex, const XDash& rTheDash) :
- NameOrIndex(XATTR_LINEDASH, nIndex),
- aDash(rTheDash)
-{
-}
-
-/*************************************************************************
-|*
|* XLineDashItem::XLineDashItem(const String& rName, const XDash& rTheDash)
|*
*************************************************************************/
@@ -894,13 +882,6 @@ XLineDashItem::XLineDashItem(SfxItemPool* /*pPool*/, const XDash& rTheDash)
{
}
-//*************************************************************************
-
-XLineDashItem::XLineDashItem(SfxItemPool* /*pPool*/)
-: NameOrIndex(XATTR_LINEDASH, -1 )
-{
-}
-
/*************************************************************************
|*
|* XLineDashItem::Clone(SfxItemPool* pPool) const
@@ -1646,13 +1627,6 @@ XLineStartItem::XLineStartItem(SfxItemPool* /*pPool*/, const basegfx::B2DPolyPol
{
}
-//*************************************************************************
-
-XLineStartItem::XLineStartItem(SfxItemPool* /*pPool*/)
-: NameOrIndex(XATTR_LINESTART, -1 )
-{
-}
-
/*************************************************************************
|*
|* XLineStartItem::Clone(SfxItemPool* pPool) const
@@ -2078,13 +2052,6 @@ XLineEndItem::XLineEndItem(SfxItemPool* /*pPool*/, const basegfx::B2DPolyPolygon
{
}
-//*************************************************************************
-
-XLineEndItem::XLineEndItem(SfxItemPool* /*pPool*/)
-: NameOrIndex(XATTR_LINEEND, -1 )
-{
-}
-
/*************************************************************************
|*
|* XLineEndItem::Clone(SfxItemPool* pPool) const
@@ -3673,15 +3640,6 @@ XFillFloatTransparenceItem::XFillFloatTransparenceItem() :
//------------------------------------------------------------------------
-XFillFloatTransparenceItem::XFillFloatTransparenceItem( sal_Int32 nIndex, const XGradient& rGradient, sal_Bool bEnable ) :
- XFillGradientItem ( nIndex, rGradient ),
- bEnabled ( bEnable )
-{
- SetWhich( XATTR_FILLFLOATTRANSPARENCE );
-}
-
-//------------------------------------------------------------------------
-
XFillFloatTransparenceItem::XFillFloatTransparenceItem(const XubString& rName, const XGradient& rGradient, sal_Bool bEnable ) :
XFillGradientItem ( rName, rGradient ),
bEnabled ( bEnable )
@@ -3698,15 +3656,6 @@ XFillFloatTransparenceItem::XFillFloatTransparenceItem( const XFillFloatTranspar
SetWhich( XATTR_FILLFLOATTRANSPARENCE );
}
-//------------------------------------------------------------------------
-
-//XFillFloatTransparenceItem::XFillFloatTransparenceItem( SvStream& rIn, sal_uInt16 nVer ) :
-// XFillGradientItem ( rIn, nVer )
-//{
-// SetWhich( XATTR_FILLFLOATTRANSPARENCE );
-// rIn >> bEnabled;
-//}
-
//*************************************************************************
XFillFloatTransparenceItem::XFillFloatTransparenceItem(SfxItemPool* /*pPool*/, const XGradient& rTheGradient, sal_Bool bEnable )
@@ -3716,13 +3665,6 @@ XFillFloatTransparenceItem::XFillFloatTransparenceItem(SfxItemPool* /*pPool*/, c
SetWhich( XATTR_FILLFLOATTRANSPARENCE );
}
-//*************************************************************************
-
-XFillFloatTransparenceItem::XFillFloatTransparenceItem(SfxItemPool* /*pPool*/)
-{
- SetWhich( XATTR_FILLFLOATTRANSPARENCE );
-}
-
//------------------------------------------------------------------------
int XFillFloatTransparenceItem::operator==( const SfxPoolItem& rItem ) const
@@ -3869,20 +3811,6 @@ TYPEINIT1_AUTOFACTORY(XFillHatchItem, NameOrIndex);
/*************************************************************************
|*
-|* XFillHatchItem::XFillHatchItem(sal_Int32 nIndex,
-|* const XHatch& rTheHatch)
-|*
-*************************************************************************/
-
-XFillHatchItem::XFillHatchItem(sal_Int32 nIndex,
- const XHatch& rTheHatch) :
- NameOrIndex(XATTR_FILLHATCH, nIndex),
- aHatch(rTheHatch)
-{
-}
-
-/*************************************************************************
-|*
|* XFillHatchItem::XFillHatchItem(const XubString& rName,
|* const XHatch& rTheHatch)
|*
@@ -3946,13 +3874,6 @@ XFillHatchItem::XFillHatchItem(SfxItemPool* /*pPool*/, const XHatch& rTheHatch)
{
}
-//*************************************************************************
-
-XFillHatchItem::XFillHatchItem(SfxItemPool* /*pPool*/)
-: NameOrIndex(XATTR_FILLHATCH, -1 )
-{
-}
-
/*************************************************************************
|*
|* XFillHatchItem::Clone(SfxItemPool* pPool) const
@@ -4734,18 +4655,6 @@ TYPEINIT1_AUTOFACTORY(XFormTextShadowColorItem, XColorItem);
/*************************************************************************
|*
-|* XFormTextShadowColorItem::XFormTextShadowColorItem()
-|*
-*************************************************************************/
-
-XFormTextShadowColorItem::XFormTextShadowColorItem(sal_Int32 nIndex,
- const Color& rTheColor) :
- XColorItem(XATTR_FORMTXTSHDWCOLOR, nIndex, rTheColor)
-{
-}
-
-/*************************************************************************
-|*
|* XFormTextShadowColorItem::XFormTextShadowColorItem(const XubString& rName, const Color& rTheColor)
|*
*************************************************************************/
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index 9b37584..80ff904 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -372,20 +372,6 @@ TYPEINIT1_AUTOFACTORY(XFillBitmapItem, NameOrIndex);
/*************************************************************************
|*
-|* XFillBitmapItem::XFillBitmapItem(long nIndex,
-|* const Bitmap& rTheBitmap)
-|*
-*************************************************************************/
-
-XFillBitmapItem::XFillBitmapItem(long nIndex,
- const XOBitmap& rTheBitmap) :
- NameOrIndex( XATTR_FILLBITMAP, nIndex ),
- aXOBitmap( rTheBitmap )
-{
-}
-
-/*************************************************************************
-|*
|* XFillBitmapItem::XFillBitmapItem(const XubString& rName,
|* const Bitmap& rTheBitmap)
|*
@@ -488,13 +474,6 @@ XFillBitmapItem::XFillBitmapItem( SfxItemPool* /*pPool*/, const XOBitmap& rTheBi
{
}
-//*************************************************************************
-
-XFillBitmapItem::XFillBitmapItem( SfxItemPool* /*pPool*/)
-: NameOrIndex(XATTR_FILLBITMAP, -1 )
-{
-}
-
/*************************************************************************
|*
|* XFillBitmapItem::Clone(SfxItemPool* pPool) const
diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx
index 320f4fd..5c9f4ba 100644
--- a/svx/source/xoutdev/xtabbtmp.cxx
+++ b/svx/source/xoutdev/xtabbtmp.cxx
@@ -84,13 +84,6 @@ XBitmapList::~XBitmapList()
/************************************************************************/
-XBitmapEntry* XBitmapList::Replace(XBitmapEntry* pEntry, long nIndex )
-{
- return (XBitmapEntry*) XPropertyList::Replace(pEntry, nIndex);
-}
-
-/************************************************************************/
-
XBitmapEntry* XBitmapList::Remove(long nIndex)
{
return (XBitmapEntry*) XPropertyList::Remove(nIndex);
diff --git a/unusedcode.easy b/unusedcode.easy
index 4dfdde0..73ea6e8 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1450,7 +1450,6 @@ TEWritingDirectionInfos::Replace(TEWritingDirectionInfo const&, unsigned short)
TEWritingDirectionInfos::Replace(TEWritingDirectionInfo const*, unsigned short, unsigned short)
TEWritingDirectionInfos::_ForEach(unsigned short, unsigned short, unsigned char (*)(TEWritingDirectionInfo const&, void*), void*)
TTProfiler::Dec(unsigned long)
-TTProperties::Img(Bitmap*)
TaskStatusBar::ImplGetFieldItem(unsigned short) const
TaskStatusFieldItem::TaskStatusFieldItem()
TempFile::IsValid() const
@@ -1516,59 +1515,8 @@ WrongRanges::Replace(WrongRange const*, unsigned short, unsigned short)
WrongRanges::_ForEach(unsigned short, unsigned short, unsigned char (*)(WrongRange const&, void*), void*)
X11SalGraphics::SetMask(int&, int&, unsigned int&, unsigned int&, int&, int&, unsigned long)
X509Certificate_NssImpl::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
-XBitmapList::Replace(XBitmapEntry*, long)
-XFBookmarkRef::XFBookmarkRef()
-XFCell::SetCurrency(rtl::OUString)
-XFCell::SetDate(rtl::OUString)
-XFCell::SetDisplay(rtl::OUString)
-XFCell::SetPercent(double)
-XFCell::SetString(rtl::OUString)
-XFCell::SetTime(rtl::OUString)
-XFCellStyle::SetFont(XFFont*)
-XFCellStyle::SetIndent(double)
-XFCellStyle::SetMargins(double, double, double, double)
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list