[Libreoffice-commits] .: 4 commits - binfilter/bf_basic binfilter/bf_forms binfilter/bf_sc binfilter/bf_sch binfilter/bf_sfx2 binfilter/bf_starmath binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Aug 12 03:51:48 PDT 2011
binfilter/bf_basic/source/basmgr/basmgr.cxx | 32 -
binfilter/bf_forms/source/component/errorbroadcaster.hxx | 1
binfilter/bf_forms/source/component/forms_DatabaseForm.cxx | 8
binfilter/bf_forms/source/component/forms_errorbroadcaster.cxx | 6
binfilter/bf_sc/source/core/data/sc_documen4.cxx | 22 -
binfilter/bf_sc/source/core/data/sc_document.cxx | 16
binfilter/bf_sc/source/core/data/sc_stlpool.cxx | 7
binfilter/bf_sc/source/core/tool/sc_token.cxx | 20 -
binfilter/bf_sch/source/filter/xml/sch_SchXMLWrapper.cxx | 183 ----------
binfilter/bf_sfx2/source/config/cfgimpl.hxx | 1
binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx | 4
binfilter/bf_starmath/source/mathml.hxx | 22 -
binfilter/bf_starmath/source/starmath_mathml.cxx | 121 ------
binfilter/bf_svtools/source/misc/svt_imap.cxx | 32 -
binfilter/bf_svx/source/form/svx_fmpgeimp.cxx | 35 -
binfilter/bf_svx/source/inc/fmpgeimp.hxx | 1
binfilter/bf_svx/source/svdraw/svx_svdetc.cxx | 11
binfilter/bf_sw/source/core/doc/sw_docfly.cxx | 2
binfilter/bf_sw/source/core/doc/sw_doclay.cxx | 38 --
binfilter/bf_sw/source/core/inc/viewimp.hxx | 4
binfilter/bf_sw/source/core/layout/makefile.mk | 4
binfilter/bf_sw/source/core/layout/sw_flypos.cxx | 117 ------
binfilter/bf_sw/source/core/layout/sw_pageiter.cxx | 111 ------
binfilter/bf_sw/source/core/sw3io/sw3imp.hxx | 5
binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx | 44 --
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx | 29 -
binfilter/bf_sw/source/core/sw3io/sw_sw3sectn.cxx | 1
binfilter/bf_sw/source/core/swg/sw_rdmisc.cxx | 1
binfilter/bf_sw/source/core/swg/sw_rdnds.cxx | 1
binfilter/bf_sw/source/core/text/sw_txtfrm.cxx | 5
binfilter/bf_sw/source/core/text/sw_txtio.cxx | 40 --
binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx | 1
binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx | 12
binfilter/bf_sw/source/core/view/sw_viewimp.cxx | 12
binfilter/bf_sw/source/core/view/sw_viewsh.cxx | 6
binfilter/bf_sw/source/core/view/sw_vnew.cxx | 75 ----
binfilter/bf_sw/source/filter/w4w/wrtw4w.hxx | 5
binfilter/bf_sw/source/ui/config/sw_viewopt.cxx | 25 -
binfilter/inc/bf_basic/basmgr.hxx | 4
binfilter/inc/bf_sc/compiler.hxx | 1
binfilter/inc/bf_sc/document.hxx | 3
binfilter/inc/bf_sc/stlpool.hxx | 3
binfilter/inc/bf_sch/SchXMLWrapper.hxx | 8
binfilter/inc/bf_svtools/imapobj.hxx | 1
binfilter/inc/bf_svx/svdetc.hxx | 1
binfilter/inc/bf_sw/doc.hxx | 9
binfilter/inc/bf_sw/flypos.hxx | 68 ---
binfilter/inc/bf_sw/pageiter.hxx | 58 ---
binfilter/inc/bf_sw/viewopt.hxx | 7
binfilter/inc/bf_sw/viewsh.hxx | 4
50 files changed, 4 insertions(+), 1223 deletions(-)
New commits:
commit 15fcc2ae0ae2a86d52d78a5ea3da2b5beeea7df9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Aug 12 11:14:46 2011 +0100
callcatcher: remove freshly unused methods
diff --git a/binfilter/bf_sch/source/filter/xml/sch_SchXMLWrapper.cxx b/binfilter/bf_sch/source/filter/xml/sch_SchXMLWrapper.cxx
index 35f7fa9..3ba8069 100644
--- a/binfilter/bf_sch/source/filter/xml/sch_SchXMLWrapper.cxx
+++ b/binfilter/bf_sch/source/filter/xml/sch_SchXMLWrapper.cxx
@@ -82,74 +82,6 @@ using namespace comphelper;
/*N*/ mrStorage( rStorage ),
/*N*/ mbShowProgress( bShowProgress )
/*N*/ {}
-
-// -----------------------------------------------------------------------------
-
-/*N*/ sal_Bool SchXMLWrapper::ExportStream(
-/*N*/ const ::rtl::OUString& rsStreamName,
-/*N*/ const ::rtl::OUString& rsServiceName,
-/*N*/ uno::Reference< io::XActiveDataSource >& xDataSource,
-/*N*/ uno::Reference< lang::XMultiServiceFactory>& xServiceFactory,
-/*N*/ uno::Sequence< uno::Any >& aArgs )
-/*N*/ {
-/*N*/ sal_Bool bRet = sal_False;
-/*N*/
-/*N*/ try
-/*N*/ {
-/*N*/ // create output stream
-/*N*/ SvStorageStreamRef rOutputStream( mrStorage.OpenStream(
-/*N*/ String( rsStreamName ), STREAM_WRITE | STREAM_SHARE_DENYWRITE | STREAM_TRUNC ));
-/*N*/
-/*N*/ ::rtl::OUString sMIMEType( RTL_CONSTASCII_USTRINGPARAM( "text/xml" ) );
-/*N*/ uno::Any aAny;
-/*N*/ aAny <<= sMIMEType;
-/*N*/ rOutputStream->SetProperty( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" )), aAny );
-/*N*/
-/*N*/ // "Encrypted" means "Encryptable". Has to be set for all but the meta stream (which doesn't exist in charts)
-/*N*/ aAny <<= (sal_Bool)(sal_True);
-/*N*/ rOutputStream->SetProperty( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Encrypted" )), aAny );
-/*N*/
-/*N*/ rOutputStream->SetBufferSize( 0x4000 ); // 16*1024
-/*N*/
-/*N*/ if( xDataSource.is())
-/*N*/ xDataSource->setOutputStream( new ::utl::OOutputStreamWrapper( *rOutputStream ));
-/*N*/
-/*N*/ uno::Reference< document::XFilter > xFilter(
-/*N*/ xServiceFactory->createInstanceWithArguments( rsServiceName, aArgs ),
-/*N*/ uno::UNO_QUERY );
-/*N*/
-/*N*/ if( xFilter.is())
-/*N*/ {
-/*N*/ uno::Reference< document::XExporter > xExporter( xFilter, uno::UNO_QUERY );
-/*N*/ if( xExporter.is())
-/*N*/ {
-/*N*/ uno::Reference< lang::XComponent > xModelComponent( mxModel, uno::UNO_QUERY );
-/*N*/ xExporter->setSourceDocument( xModelComponent );
-/*N*/ }
-/*N*/
-/*N*/ // empty Descriptior (formerly FileName was given)
-/*N*/ uno::Sequence< beans::PropertyValue > aEmptyDescriptor( 0 );
-/*N*/ bRet = xFilter->filter( aEmptyDescriptor );
-/*N*/
-/*N*/ if( bRet && rOutputStream.Is())
-/*N*/ rOutputStream->Commit();
-/*N*/ }
-/*N*/ }
-/*N*/ catch( uno::Exception aEx )
-/*N*/ {
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*N*/ // convert ::rtl::OUString => tools String => ByteString
-/*?*/ String aStr( aEx.Message );
-/*?*/ ByteString aBStr( aStr, RTL_TEXTENCODING_ASCII_US );
-/*?*/ ByteString aBStrStreamName = ByteString( String( rsStreamName ), RTL_TEXTENCODING_ASCII_US );
-/*?*/ OSL_TRACE( "Exception caught during Export of \"%s\" stream(): %s",
-/*?*/ aBStrStreamName.GetBuffer(),
-/*?*/ aBStr.GetBuffer());
-/*N*/ #endif
-/*N*/ }
-/*N*/
-/*N*/ return bRet;
-/*N*/ }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_starmath/source/mathml.hxx b/binfilter/bf_starmath/source/mathml.hxx
index 9209395..cb90287 100644
--- a/binfilter/bf_starmath/source/mathml.hxx
+++ b/binfilter/bf_starmath/source/mathml.hxx
@@ -73,17 +73,6 @@ private:
const sal_Char* pCompatibilityStreamName,
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rFactory,
const sal_Char* pFilterName );
-
- sal_Bool WriteThroughComponent(
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
- xOutputStream,
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
- xComponent,
- ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XMultiServiceFactory > & rFactory,
- ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet > & rPropSet,
- const sal_Char* pComponentName );
};
diff --git a/binfilter/bf_starmath/source/starmath_mathml.cxx b/binfilter/bf_starmath/source/starmath_mathml.cxx
index b06fa03..a2b5b4b 100644
--- a/binfilter/bf_starmath/source/starmath_mathml.cxx
+++ b/binfilter/bf_starmath/source/starmath_mathml.cxx
@@ -662,64 +662,6 @@ void SmXMLImport::endDocument(void)
SvXMLImport::endDocument();
}
-/// export through an XML exporter component (output stream version)
-sal_Bool SmXMLWrapper::WriteThroughComponent(
- Reference<io::XOutputStream> xOutputStream,
- Reference<XComponent> xComponent,
- Reference<lang::XMultiServiceFactory> & rFactory,
- Reference<beans::XPropertySet> & rPropSet,
- const sal_Char* pComponentName
- )
-{
- DBG_ASSERT(xOutputStream.is(), "I really need an output stream!");
- DBG_ASSERT(xComponent.is(), "Need component!");
- DBG_ASSERT(NULL != pComponentName, "Need component name!");
-
- // get component
- Reference< io::XActiveDataSource > xSaxWriter(
- rFactory->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Writer" )) ),
- UNO_QUERY );
- DBG_ASSERT( xSaxWriter.is(), "can't instantiate XML writer" );
- if(!xSaxWriter.is())
- return sal_False;
-
- // connect XML writer to output stream
- xSaxWriter->setOutputStream( xOutputStream );
-
- // prepare arguments (prepend doc handler to given arguments)
- Reference<xml::sax::XDocumentHandler> xDocHandler( xSaxWriter,UNO_QUERY);
-
- Sequence<Any> aArgs( 2 );
- aArgs[0] <<= xDocHandler;
- aArgs[1] <<= rPropSet;
-
- // get filter component
- Reference< document::XExporter > xExporter(
- rFactory->createInstanceWithArguments(
- OUString::createFromAscii(pComponentName), aArgs), UNO_QUERY);
- DBG_ASSERT( xExporter.is(),
- "can't instantiate export filter component" );
- if( !xExporter.is() )
- return sal_False;
-
-
- // connect model and filter
- xExporter->setSourceDocument( xComponent );
-
- // filter!
- Reference < XFilter > xFilter( xExporter, UNO_QUERY );
- uno::Sequence< PropertyValue > aProps(0);
- xFilter->filter( aProps );
-
- uno::Reference<lang::XUnoTunnel> xFilterTunnel;
- xFilterTunnel = uno::Reference<lang::XUnoTunnel>
- ( xFilter, uno::UNO_QUERY );
- SmXMLExport *pFilter = (SmXMLExport *)xFilterTunnel->getSomething(
- SmXMLExport::getUnoTunnelId() );
- return pFilter ? pFilter->GetSuccess() : sal_True;
-}
-
sal_uInt32 SmXMLExport::exportDoc(enum XMLTokenEnum eClass)
{
if( (getExportFlags() & EXPORT_CONTENT) == 0 )
diff --git a/binfilter/bf_svtools/source/misc/svt_imap.cxx b/binfilter/bf_svtools/source/misc/svt_imap.cxx
index cba1681..7e37c87 100644
--- a/binfilter/bf_svtools/source/misc/svt_imap.cxx
+++ b/binfilter/bf_svtools/source/misc/svt_imap.cxx
@@ -87,38 +87,6 @@ UINT16 IMapObject::GetVersion() const
return IMAP_OBJ_VERSION;
}
-
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
-void IMapObject::Write( SvStream& rOStm, const String& rBaseURL ) const
-{
- IMapCompat* pCompat;
- const rtl_TextEncoding eEncoding = gsl_getSystemTextEncoding();
-
- rOStm << GetType();
- rOStm << GetVersion();
- rOStm << ( (UINT16) eEncoding );
-
- const ByteString aRelURL = ByteString( String(::binfilter::simpleNormalizedMakeRelative( rBaseURL, aURL )), eEncoding );
- rOStm.WriteByteString( aRelURL );
- rOStm.WriteByteString( ByteString( aAltText, eEncoding ) );
- rOStm << bActive;
- rOStm.WriteByteString( ByteString( aTarget, eEncoding ) );
-
- pCompat = new IMapCompat( rOStm, STREAM_WRITE );
-
- WriteIMapObject( rOStm );
- aEventList.Write( rOStm ); // V4
- rOStm.WriteByteString( ByteString( aName, eEncoding ) ); // V5
-
- delete pCompat;
-}
-
-
/******************************************************************************
|*
|* Binaer-Import
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfly.cxx b/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
index 0b279b7..44e9b67 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
@@ -60,8 +60,6 @@
#include <crstate.hxx>
namespace binfilter {
-extern USHORT GetHtmlMode( const SwDocShell* );
-
/**********************************************************************/
/*N*/ USHORT SwDoc::GetFlyCount(FlyCntType eType ) const
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
index 4ccefd1..8d6a234 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
@@ -266,7 +266,6 @@ public:
void Clear();
void RemoveExtensions( SwDoc& );
static void RemoveExtension( String& );
- USHORT Add( const String&, USHORT nPoolId /*= 0*/, BOOL bDontSearch=FALSE );
const String& Find( USHORT );
USHORT FindPoolId( USHORT );
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
index 1b75e82..ab01017 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
@@ -1332,33 +1332,6 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ rName.Erase( nOff );
/*N*/ }
-/*N*/ sal_uInt16 Sw3StringPool::Add( const String& r, sal_uInt16 n, sal_Bool bDontSearch )
-/*N*/ {
-/*N*/ sal_uInt16 i = bDontSearch ? aPool.Count() : 0;
-/*N*/
-/*N*/ OSL_ENSURE( nExpFFVersion, "String-Pool: FF-Version nicht gesetzt" );
-/*N*/ if( nExpFFVersion <= SOFFICE_FILEFORMAT_40 && n && n<IDX_SPEC_VALUE )
-/*N*/ n = ConvertToOldPoolId( n, nExpFFVersion );
-/*N*/
-/*N*/ for( ; i < aPool.Count(); i++ )
-/*N*/ {
-/*N*/ const Sw3String* p3Str = aPool.GetObject( i );
-/*N*/ if( n == p3Str->GetPoolId() && r == *p3Str )
-/*N*/ return i;
-/*N*/ }
-/*N*/ if( !bFixed )
-/*N*/ {
-/*N*/ Sw3String* p = new Sw3String( r, n );
-/*N*/ aPool.Insert( p, i );
-/*N*/ return i;
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*?*/ OSL_ENSURE( !bFixed, "String nicht im Pool eingetragen" );
-/*?*/ return IDX_NO_VALUE;
-/*N*/ }
-/*N*/ }
-
/*N*/ const String& Sw3StringPool::Find( sal_uInt16 i )
/*N*/ {
/*N*/ if( i < IDX_SPEC_VALUE )
diff --git a/binfilter/bf_sw/source/core/view/sw_viewsh.cxx b/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
index f2bf35f..d03b196 100644
--- a/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
+++ b/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
@@ -507,12 +507,6 @@ bool bInSizeNotify = FALSE;
/*N*/ {
/*N*/ return GetDoc()->GetRootFrm();
/*N*/ }
-/*N*/
-/*N*/ SfxPrinter* ViewShell::GetPrt( BOOL bCreate ) const
-/*N*/ {
-/*N*/ return GetDoc()->GetPrt( bCreate );
-/*N*/ }
-
/*N*/ OutputDevice& ViewShell::GetRefDev() const
/*N*/ {
diff --git a/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx b/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx
index b622556..426c262 100644
--- a/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx
+++ b/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx
@@ -200,20 +200,6 @@ static const char aPostItStr[] = " ";
/*N*/ {
/*N*/ }
-/*************************************************************************
-|*
-|* ViewOption::Init()
-|*
-|*************************************************************************/
-
-/*N*/ void SwViewOption::Init( Window *pWin )
-/*N*/ {
-/*N*/ if( !nPixelTwips && pWin )
-/*N*/ {
-/*N*/ nPixelTwips = (USHORT)pWin->PixelToLogic( Size(1,1) ).Height();
-/*N*/ }
-/*N*/ }
-
/*************************************************************************/
/*N*/ AuthorCharAttr::AuthorCharAttr() :
/*N*/ nItemId (SID_ATTR_CHAR_UNDERLINE),
@@ -222,17 +208,6 @@ static const char aPostItStr[] = " ";
/*N*/ {
/*N*/ }
-
-/*************************************************************************/
-/*N*/ USHORT GetHtmlMode(const SwDocShell* pShell)
-/*N*/ {
-/*N*/ USHORT nRet = 0;
-/*N*/ if(!pShell || PTR_CAST(SwWebDocShell, pShell))
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ return nRet;
-/*N*/ }
-
/*************************************************************************/
/*N*/ void SwViewOption::ApplyColorConfigValues(const ColorConfig& rConfig )
/*N*/ {
diff --git a/binfilter/inc/bf_sch/SchXMLWrapper.hxx b/binfilter/inc/bf_sch/SchXMLWrapper.hxx
index f994ab6..df8eaa3 100644
--- a/binfilter/inc/bf_sch/SchXMLWrapper.hxx
+++ b/binfilter/inc/bf_sch/SchXMLWrapper.hxx
@@ -63,13 +63,6 @@ class SchXMLWrapper
sal_Bool mbIsDraw : 1;
sal_Bool mbShowProgress : 1;
- sal_Bool ExportStream(
- const ::rtl::OUString& rsStreamName,
- const ::rtl::OUString& rsServiceName,
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XActiveDataSource >& xDataSource,
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& xServiceFactory,
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArgs );
-
public:
SchXMLWrapper( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel,
SvStorage& rStorage,
diff --git a/binfilter/inc/bf_svtools/imapobj.hxx b/binfilter/inc/bf_svtools/imapobj.hxx
index 817550c..971da75 100644
--- a/binfilter/inc/bf_svtools/imapobj.hxx
+++ b/binfilter/inc/bf_svtools/imapobj.hxx
@@ -108,7 +108,6 @@ public:
virtual UINT16 GetType() const = 0;
virtual BOOL IsHit( const Point& rPoint ) const = 0;
- void Write ( SvStream& rOStm, const String& rBaseURL ) const;
void Read( SvStream& rIStm, const String& rBaseURL );
virtual Rectangle GetBoundRect() const = 0;
diff --git a/binfilter/inc/bf_sw/viewopt.hxx b/binfilter/inc/bf_sw/viewopt.hxx
index 04ef637..aebcd1f 100644
--- a/binfilter/inc/bf_sw/viewopt.hxx
+++ b/binfilter/inc/bf_sw/viewopt.hxx
@@ -186,8 +186,6 @@ public:
SwViewOption(const SwViewOption&); //
~SwViewOption(); //
- void Init( Window *pWin ); // Initialisierung der statischen Daten
-
USHORT GetPixelTwips() const { return nPixelTwips; }
inline UINT32 GetCoreOptions() const {return nCoreOptions;}
@@ -556,11 +554,6 @@ inline void SwViewOption::SetUIOptions( const SwViewOption& rVOpt )
nShdwCrsrFillMode = rVOpt.nShdwCrsrFillMode;
}
-
-// Hilfsfunktion zur Ermittlung der HTML-Faehigkeiten
-USHORT GetHtmlMode(const SwDocShell*);
-
-
} //namespace binfilter
#endif
diff --git a/binfilter/inc/bf_sw/viewsh.hxx b/binfilter/inc/bf_sw/viewsh.hxx
index 05a7e8e..3f455c1 100644
--- a/binfilter/inc/bf_sw/viewsh.hxx
+++ b/binfilter/inc/bf_sw/viewsh.hxx
@@ -232,7 +232,6 @@ public:
// 3. GetRefDev: Either the printer or the virtual device from the doc
// 2. GetWin: Available if we not printing
// 4. GetOut: Printer, Window or Virtual device
- SfxPrinter* GetPrt( sal_Bool bCreate = sal_False ) const;
VirtualDevice* GetVirDev( sal_Bool bCreate = sal_False ) const;
OutputDevice& GetRefDev() const;
inline Window* GetWin() const { return pWin; }
commit b134d7e076debce58118e38d6acbd5e49d3d8bfd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Aug 12 10:19:00 2011 +0100
remove one of the ByteString ctors
diff --git a/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx b/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
index 55ebcf3..8e72ef0 100644
--- a/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
+++ b/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
@@ -2211,9 +2211,9 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com:
aArgs.getArray()[0].Value <<= aReferer;
// build a sequence from the to-be-submitted string
- ByteString a8BitData(aData.getStr(), (sal_uInt16)aData.getLength(), RTL_TEXTENCODING_MS_1252);
+ rtl::OString a8BitData(rtl::OUStringToOString(aData, RTL_TEXTENCODING_MS_1252));
// always ANSI #58641
- Sequence< sal_Int8 > aPostData((sal_Int8*)a8BitData.GetBuffer(), a8BitData.Len());
+ Sequence< sal_Int8 > aPostData((const sal_Int8*)a8BitData.getStr(), a8BitData.getLength());
Reference< XInputStream > xPostData = new SequenceInputStream(aPostData);
aArgs.getArray()[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PostData" ));
@@ -2291,8 +2291,8 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com:
aArgs.getArray()[0].Value <<= aReferer;
// build a sequence from the to-be-submitted string
- ByteString aSystemEncodedData(aData.getStr(), (sal_uInt16)aData.getLength(), osl_getThreadTextEncoding());
- Sequence< sal_Int8 > aPostData((sal_Int8*)aSystemEncodedData.GetBuffer(), aSystemEncodedData.Len());
+ rtl::OString aSystemEncodedData(rtl::OUStringToOString(aData, osl_getThreadTextEncoding()));
+ Sequence< sal_Int8 > aPostData((const sal_Int8*)aSystemEncodedData.getStr(), aSystemEncodedData.getLength());
Reference< XInputStream > xPostData = new SequenceInputStream(aPostData);
aArgs.getArray()[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PostData" ));
commit d96d72d33a89817ef35e728ea1a3b203cb5100a3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 11 23:01:07 2011 +0100
no SwPosFlyFrm can be constructed, follow logical consequences
diff --git a/binfilter/bf_sw/source/core/doc/sw_doclay.cxx b/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
index 71a9570..4f948ff 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
@@ -718,44 +718,6 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
/*************************************************************************
|*
-|* SwDoc::GetAllFlyFmts
-|*
-|*************************************************************************/
-
-/* ---------------------------------------------------------------------------
- paragraph frames - o.k. if the PaM includes the paragraph from the beginning
- to the beginning of the next paragraph at least
- frames at character - o.k. if the pam start at least at the same position
- as the frame
- ---------------------------------------------------------------------------*/
-
-
-/*N*/ void SwDoc::GetAllFlyFmts( SwPosFlyFrms& /*rPosFlyFmts*/,
-/*N*/ const SwPaM* /*pCmpRange*/, sal_Bool /*bDrawAlso*/ ) const
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-/*************************************************************************
-|*
-|* SwDoc::InsertLabel()
-|*
-|*************************************************************************/
-
-/* #i6447# changed behaviour if lcl_CpyAttr:
-
- If the old item set contains the item to set (no inheritance) copy the item
- into the new set.
-
- If the old item set contains the item by inheritance and the new set
- contains the item, too:
- If the two items differ copy the item from the old set to the new set.
-
- Otherwise the new set will not be changed.
-*/
-
-/*************************************************************************
-|*
|* SwDoc::DoIdleJobs()
|*
|*************************************************************************/
diff --git a/binfilter/bf_sw/source/core/layout/makefile.mk b/binfilter/bf_sw/source/core/layout/makefile.mk
index 77056fc..f182c2e 100644
--- a/binfilter/bf_sw/source/core/layout/makefile.mk
+++ b/binfilter/bf_sw/source/core/layout/makefile.mk
@@ -70,7 +70,6 @@ CXXFILES = \
sw_flycnt.cxx \
sw_flyincnt.cxx \
sw_flylay.cxx \
- sw_flypos.cxx \
sw_frmtool.cxx \
sw_ftnfrm.cxx \
sw_hffrm.cxx \
@@ -100,7 +99,6 @@ SLOFILES = \
$(SLO)$/sw_flycnt.obj \
$(SLO)$/sw_flyincnt.obj \
$(SLO)$/sw_flylay.obj \
- $(SLO)$/sw_flypos.obj \
$(SLO)$/sw_frmtool.obj \
$(SLO)$/sw_ftnfrm.obj \
$(SLO)$/sw_hffrm.obj \
diff --git a/binfilter/bf_sw/source/core/layout/sw_flypos.cxx b/binfilter/bf_sw/source/core/layout/sw_flypos.cxx
deleted file mode 100644
index 0fcef0b..0000000
--- a/binfilter/bf_sw/source/core/layout/sw_flypos.cxx
+++ /dev/null
@@ -1,117 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#ifdef _MSC_VER
-#pragma hdrstop
-#endif
-
-#include <horiornt.hxx>
-
-#include "doc.hxx"
-
-#include <osl/diagnose.h>
-
-#include <docary.hxx>
-
-
-#include <fmtanchr.hxx>
-#include "flypos.hxx"
-#include "frmfmt.hxx"
-#include "dcontact.hxx"
-#include "flyfrm.hxx"
-#include "dflyobj.hxx"
-#include "ndindex.hxx"
-namespace binfilter {
-
-
-
-/*N*/ SV_IMPL_OP_PTRARR_SORT( SwPosFlyFrms, SwPosFlyFrmPtr )
-
-/*N*/ SwPosFlyFrm::SwPosFlyFrm( const SwNodeIndex& rIdx, const SwFrmFmt* pFmt,
-/*N*/ USHORT nArrPos )
-/*N*/ : pFrmFmt( pFmt )
-/*N*/ , pNdIdx( (SwNodeIndex*) &rIdx )
-/*N*/ {
-/*N*/ BOOL bFnd = FALSE;
-/*N*/ const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
-/*N*/ if( FLY_PAGE == rAnchor.GetAnchorId() )
-/*?*/ pNdIdx = new SwNodeIndex( rIdx );
-/*N*/ else if( pFmt->GetDoc()->GetRootFrm() )
-/*N*/ {
-/*N*/ SwClientIter aIter( (SwFmt&)*pFmt );
-/*N*/ if( RES_FLYFRMFMT == pFmt->Which() )
-/*N*/ {
-/*N*/ // Schauen, ob es ein SdrObject dafuer gibt
-/*N*/ if( aIter.First( TYPE( SwFlyFrm) ) )
-/*N*/ nOrdNum = ((SwFlyFrm*)aIter())->GetVirtDrawObj()->GetOrdNum(),
-/*N*/ bFnd = TRUE;
-/*N*/ }
-/*N*/ else if( RES_DRAWFRMFMT == pFmt->Which() )
-/*N*/ {
-/*N*/ // Schauen, ob es ein SdrObject dafuer gibt
-/*N*/ if( aIter.First( TYPE(SwDrawContact) ) )
-/*N*/ nOrdNum = ((SwDrawContact*)aIter())->GetMaster()->GetOrdNum(),
-/*N*/ bFnd = TRUE;
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ if( !bFnd )
-/*N*/ {
-/*N*/ nOrdNum = pFmt->GetDoc()->GetSpzFrmFmts()->Count();
-/*N*/ nOrdNum += nArrPos;
-/*N*/ }
-/*N*/ }
-
-/*N*/ SwPosFlyFrm::~SwPosFlyFrm()
-/*N*/ {
-/*N*/ const SwFmtAnchor& rAnchor = pFrmFmt->GetAnchor();
-/*N*/ if( FLY_PAGE == rAnchor.GetAnchorId() )
-/*?*/ delete pNdIdx;
-/*N*/ }
-
-/*N*/ BOOL SwPosFlyFrm::operator==( const SwPosFlyFrm& )
-/*N*/ {
-/*N*/ return FALSE; // FlyFrames koennen auf der gleichen Position stehen
-/*N*/ }
-
-/*N*/ BOOL SwPosFlyFrm::operator<( const SwPosFlyFrm& rPosFly )
-/*N*/ {
-/*N*/ if( pNdIdx->GetIndex() == rPosFly.pNdIdx->GetIndex() )
-/*N*/ {
-/*N*/ // dann entscheidet die Ordnungsnummer!
-/*N*/ return nOrdNum < rPosFly.nOrdNum;
-/*N*/ }
-/*N*/ return pNdIdx->GetIndex() < rPosFly.pNdIdx->GetIndex();
-/*N*/ }
-
-
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
index 67b9288..4ccefd1 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
@@ -86,7 +86,6 @@ class SwOLENode;
class SwPaM;
class SwPageDesc;
class SwPageFtnInfo;
-class SwPosFlyFrms;
class SwRedline;
class SwSectionNode;
class SwStartNode;
@@ -396,7 +395,6 @@ public:
SwNumRule* pCurNumRule; // aktuelle Numerierungsregel
SwPaM* pCurNumRange;// aktueller Numerierungsbereich
SwPaM* pCurPaM; // aktueller PaM
- SwPosFlyFrms* pFlyFrms; // alle absatzgebundenen FlyFrames
Sw3TOXs* pTOXs; // I: Liste aller TOX-Bereiche
Sw3Bookmarks* pBookmarks; // I: Liste aller Bookmarks
Sw3Redlines* pRedlines; // I: Liste alle Bookmarks
@@ -599,8 +597,6 @@ public:
SwFmt* FindNamedFmt( USHORT nIdx, BYTE);// Suchen einer Formatvorlage
SwTxtFmtColl* FindTxtColl( USHORT n ); // Suchen einer Absatzvorlage
SwPageDesc* FindPageDesc( USHORT nIdx );// Suchen einer Seitenvorlage
- void FreeFlyFrms(); // nach Ausgabe. Infos freigeben
- SwFmt* FindFlyFrm( ULONG nNodeId ); // O: absatzgebundenen Fly suchen
void InMacroTbl(); // I: globale Makros
void InDictionary(); // I: Woerterbuecher (Online-Spl.)
void InJobSetup(); // I: Job Setup
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx
index 9cea15e..d9d3843 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx
@@ -59,7 +59,6 @@
#include "cntfrm.hxx"
#include "pam.hxx"
#include "section.hxx"
-#include "flypos.hxx"
#include "sw3imp.hxx"
#include "poolfmt.hxx"
#include "dcontact.hxx"
@@ -700,50 +699,7 @@ sal_Bool lcl_sw3io_insFtn( const SwTxtNode *pTxtNd )
/*N*/ bInsIntoHdrFtr = bInsIntoHdrFtrSave;
/*N*/ }
-// Freigabe der gesammelten FlyFrame-Infos nach dem Schreiben
-
-/*N*/ void Sw3IoImp::FreeFlyFrms()
-/*N*/ {
-/*N*/ if( pFlyFrms )
-/*N*/ {
-/*N*/ for( USHORT i = 0; i < pFlyFrms->Count(); i++ )
-/*N*/ delete (*pFlyFrms)[ i ];
-/*N*/ delete pFlyFrms;
-/*N*/ pFlyFrms = NULL;
-/*N*/ }
-/*N*/ }
-
-// Suchen eines absatzgebundenen Flys. Wenn gefunden, wird der Fly
-// zurueckgeliefert und das Element aus dem Array entfernt.
-
-/*N*/ SwFmt* Sw3IoImp::FindFlyFrm( ULONG nNodeId )
-/*N*/ {
-/*N*/ SwFmt* pFmt = NULL;
-/*N*/ if( pFlyFrms )
-/*N*/ {
-/*N*/ for( USHORT i = 0; i < pFlyFrms->Count(); i++ )
-/*N*/ {
-/*N*/ ULONG nId = (*pFlyFrms)[ i ]->GetNdIndex().GetIndex();
-/*N*/ if( nNodeId == nId )
-/*N*/ {
-/*N*/ pFmt = (SwFmt*) &(*pFlyFrms)[ i ]->GetFmt();
-/*N*/ pFlyFrms->DeleteAndDestroy( i );
-/*N*/ break;
-/*N*/ }
-/*N*/ if( nId > nNodeId )
-/*N*/ break;
-/*N*/ }
-/*N*/ }
-/*N*/ return pFmt;
-/*N*/ }
-
////////////////////////////////////////////////////////////////////////////
-
-
-
}
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
index e9311a9..1b75e82 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
@@ -169,7 +169,6 @@ public:
/*N*/ bSw31Export =
/*N*/ bOrganizer =
/*N*/ bInsIntoHdrFtr = sal_False;
-/*N*/ pFlyFrms = NULL;
/*N*/ pExportInfo = NULL;
/*N*/ pCrypter = NULL;
/*N*/ pTOXs = NULL;
@@ -235,7 +234,6 @@ public:
/*N*/ pBlkList = NULL;
/*N*/ bInsIntoHdrFtr = sal_False;
/*N*/ bSw31Export = sal_False;
-/*N*/ FreeFlyFrms();
/*N*/ aBlkName.Erase();
/*N*/ pStrm = 0; // wg. Assert in IsSw.*Export
/*N*/ Reset2();
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3sectn.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3sectn.cxx
index a6e521c..4170224 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3sectn.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3sectn.cxx
@@ -52,7 +52,6 @@
#include <section.hxx>
#include <ndtxt.hxx>
#include <ndnotxt.hxx>
-#include <flypos.hxx>
#include <swerror.h>
#include "bf_so3/staticbaseurl.hxx"
namespace binfilter {
diff --git a/binfilter/bf_sw/source/core/swg/sw_rdmisc.cxx b/binfilter/bf_sw/source/core/swg/sw_rdmisc.cxx
index abb2235..a705a1f 100644
--- a/binfilter/bf_sw/source/core/swg/sw_rdmisc.cxx
+++ b/binfilter/bf_sw/source/core/swg/sw_rdmisc.cxx
@@ -48,7 +48,6 @@
#include <rdswg.hxx>
#include <swgpar.hxx> // SWGRD_xxx-Flags
#include <frmids.hxx>
-#include <flypos.hxx>
#include <ndtxt.hxx> // Zeichen-Konversion
namespace binfilter {
diff --git a/binfilter/bf_sw/source/core/swg/sw_rdnds.cxx b/binfilter/bf_sw/source/core/swg/sw_rdnds.cxx
index 4b50950..c029bc9 100644
--- a/binfilter/bf_sw/source/core/swg/sw_rdnds.cxx
+++ b/binfilter/bf_sw/source/core/swg/sw_rdnds.cxx
@@ -56,7 +56,6 @@
#include <ndgrf.hxx>
#include <ndole.hxx>
#include <frmatr.hxx>
-#include <flypos.hxx>
#include <bookmrk.hxx>
#include <swgpar.hxx>
#include <swerror.h>
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
index 1806f44..20d3b9a 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
@@ -101,7 +101,6 @@
#include <bf_svx/flstitem.hxx>
#include <bf_svtools/ctrltool.hxx>
#include <bf_svtools/eitem.hxx>
-#include <flypos.hxx>
#include <txtftn.hxx>
#include <section.hxx>
#include <fmtftn.hxx>
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx
index 6b53264..d8f883a 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx
@@ -101,7 +101,6 @@
#include <bf_svx/unolingu.hxx>
#include <bf_svtools/ctrltool.hxx>
#include <bf_svtools/eitem.hxx>
-#include <flypos.hxx>
#include <txtftn.hxx>
#include <section.hxx>
#include <fmtftn.hxx>
@@ -1992,17 +1991,6 @@ SwXParaFrameEnumeration::SwXParaFrameEnumeration(const SwUnoCrsr& rUnoCrsr,
{
if(PARAFRAME_PORTION_TEXTRANGE == nParaFrameMode)
{
- SwPosFlyFrms aFlyFrms;
- //get all frames that are bound at paragraph or at character
- pDoc->GetAllFlyFmts(aFlyFrms, pUnoCrsr);//, bDraw);
- for(USHORT i = 0; i < aFlyFrms.Count(); i++)
- {
- SwPosFlyFrm* pPosFly = aFlyFrms[i];
- SwFrmFmt* pFrmFmt = (SwFrmFmt*)&pPosFly->GetFmt();
- //jetzt einen SwDepend anlegen und in das Array einfuegen
- SwDepend* pNewDepend = new SwDepend(this, pFrmFmt);
- aFrameArr.C40_INSERT(SwDepend, pNewDepend, aFrameArr.Count());
- }
//created from any text range
if(pUnoCrsr->HasMark())
{
diff --git a/binfilter/inc/bf_sw/doc.hxx b/binfilter/inc/bf_sw/doc.hxx
index 67ac3d0..b465697 100644
--- a/binfilter/inc/bf_sw/doc.hxx
+++ b/binfilter/inc/bf_sw/doc.hxx
@@ -144,7 +144,6 @@ class SwNodeRange;
class SwNumRule;
class SwNumRuleTbl;
class SwPageDesc;
-class SwPosFlyFrms;
class SwPagePreViewPrtData;
class SwRedline;
class SwRedlineTbl;
@@ -602,14 +601,6 @@ public:
*/
SdrLayerID GetInvisibleLayerIdByVisibleOne( const SdrLayerID& _nVisibleLayerId );
- // liefert zu allen fliegenden Rahmen die Position im Dokument.
- // Wird ein Pam-Pointer uebergeben, muessen die absatzgebundenen
- // FlyFrames von der ::com::sun::star::awt::Selection vollstaendig umschlossen sein
- // ( Start < Pos < End ) !!!
- // (wird fuer die Writer benoetigt)
- void GetAllFlyFmts( SwPosFlyFrms& rPosFlyFmts, const SwPaM* = 0,
- sal_Bool bDrawAlso = sal_False ) const;
-
// dokumentglobale Macros
void SetGlobalMacro(sal_uInt16 nEvent, const SvxMacro&);
const SvxMacroTableDtor& GetMacroTable() const { return *pMacroTable; }
diff --git a/binfilter/inc/bf_sw/flypos.hxx b/binfilter/inc/bf_sw/flypos.hxx
deleted file mode 100644
index afed58f..0000000
--- a/binfilter/inc/bf_sw/flypos.hxx
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _FLYPOS_HXX
-#define _FLYPOS_HXX
-
-#include <bf_svtools/bf_solar.h>
-
-
-#include <bf_svtools/svarray.hxx>
-namespace binfilter {
-
-class SwCntntNode;
-class ViewShell;
-class SwFrmFmt;
-class SwNodeIndex;
-
-// Struktur zum Erfragen der akt. freifliegenden Rahmen am Dokument.
-class SwPosFlyFrm
-{
- const SwFrmFmt* pFrmFmt; // das FlyFrmFmt
- SwNodeIndex* pNdIdx; // es reicht ein Index auf den Node
- UINT32 nOrdNum;
-public:
- SwPosFlyFrm( const SwNodeIndex& , const SwFrmFmt*, USHORT nArrPos );
- virtual ~SwPosFlyFrm(); // virtual fuer die Writer (DLL !!)
-
- // operatoren fuer das Sort-Array
- BOOL operator==( const SwPosFlyFrm& );
- BOOL operator<( const SwPosFlyFrm& );
-
- const SwFrmFmt& GetFmt() const { return *pFrmFmt; }
- const SwNodeIndex& GetNdIndex() const { return *pNdIdx; }
- UINT32 GetOrdNum() const { return nOrdNum; }
-};
-
-typedef SwPosFlyFrm* SwPosFlyFrmPtr;
-SV_DECL_PTRARR_SORT( SwPosFlyFrms, SwPosFlyFrmPtr, 0, 40 )
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 97fe538d2efd0f7cc429757686f6811f53d6123c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 11 22:47:06 2011 +0100
callcatcher: unused code
diff --git a/binfilter/bf_basic/source/basmgr/basmgr.cxx b/binfilter/bf_basic/source/basmgr/basmgr.cxx
index dc75ed7..1bdd895 100644
--- a/binfilter/bf_basic/source/basmgr/basmgr.cxx
+++ b/binfilter/bf_basic/source/basmgr/basmgr.cxx
@@ -378,28 +378,8 @@ public:
void InsertError( const BasicError& rError );
BOOL HasErrors() { return !aErrorList.empty(); }
- BasicError* GetFirstError();
- BasicError* GetNextError();
};
-BasicError* BasicErrorManager::GetFirstError()
-{
- CurrentError = 0;
- if ( aErrorList.empty() )
- return NULL;
- return aErrorList[ 0 ];
-}
-
-BasicError* BasicErrorManager::GetNextError()
-{
- if ( aErrorList.empty()
- || CurrentError + 1 >= aErrorList.size()
- )
- return NULL;
- CurrentError++;
- return aErrorList[ CurrentError ];
-}
-
BasicErrorManager::~BasicErrorManager()
{
Reset();
@@ -1649,18 +1629,6 @@ BasicLibInfo* BasicManager::FindLibInfo( StarBASIC* pBasic ) const
return 0;
}
-BOOL BasicManager::HasErrors()
-{
- DBG_CHKTHIS( BasicManager, 0 );
- return pErrorMgr->HasErrors();
-}
-
-void BasicManager::ClearErrors()
-{
- DBG_CHKTHIS( BasicManager, 0 );
- pErrorMgr->Reset();
-}
-
//=====================================================================
class ModuleInfo_Impl : public ModuleInfoHelper
diff --git a/binfilter/bf_forms/source/component/errorbroadcaster.hxx b/binfilter/bf_forms/source/component/errorbroadcaster.hxx
index 6360d02..d75f44f 100644
--- a/binfilter/bf_forms/source/component/errorbroadcaster.hxx
+++ b/binfilter/bf_forms/source/component/errorbroadcaster.hxx
@@ -58,7 +58,6 @@ namespace frm
void SAL_CALL disposing();
- void SAL_CALL onError( const ::com::sun::star::sdbc::SQLException& _rException, const ::rtl::OUString& _rContextDescription );
void SAL_CALL onError( const ::com::sun::star::sdb::SQLErrorEvent& _rException );
protected:
diff --git a/binfilter/bf_forms/source/component/forms_errorbroadcaster.cxx b/binfilter/bf_forms/source/component/forms_errorbroadcaster.cxx
index e046d97..ede75be 100644
--- a/binfilter/bf_forms/source/component/forms_errorbroadcaster.cxx
+++ b/binfilter/bf_forms/source/component/forms_errorbroadcaster.cxx
@@ -72,12 +72,6 @@ namespace frm
}
//------------------------------------------------------------------------------
- void SAL_CALL OErrorBroadcaster::onError( const SQLException& /*_rException*/, const ::rtl::OUString& /*_rContextDescription*/ )
- {
- OSL_FAIL( "OErrorBroadcaster::onError: dead code!" );
- }
-
- //------------------------------------------------------------------------------
void SAL_CALL OErrorBroadcaster::onError( const ::com::sun::star::sdb::SQLErrorEvent& _rError )
{
if ( m_aErrorListeners.getLength() )
diff --git a/binfilter/bf_sc/source/core/data/sc_documen4.cxx b/binfilter/bf_sc/source/core/data/sc_documen4.cxx
index bc2714d..70a27db 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen4.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen4.cxx
@@ -438,30 +438,8 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ }
-/*N*/ void ScDocument::SetConditionalUsed( ULONG nKey ) // aus dem Speichern der Tabellen
-/*N*/ {
-/*N*/ if ( nKey && pCondFormList ) // nKey==0 -> noop
-/*N*/ {
-/*N*/ ScConditionalFormat* pForm = pCondFormList->GetFormat( nKey );
-/*N*/ if (pForm)
-/*N*/ pForm->SetUsed(TRUE);
-/*N*/ }
-/*N*/ }
-
-/*N*/ void ScDocument::SetValidationUsed( ULONG nKey ) // aus dem Speichern der Tabellen
-/*N*/ {
-/*N*/ if ( nKey && pValidationList ) // nKey==0 -> noop
-/*N*/ {
-/*N*/ ScValidationData* pData = pValidationList->GetData( nKey );
-/*N*/ if (pData)
-/*N*/ pData->SetUsed(TRUE);
-/*N*/ }
-/*N*/ }
-
-
//------------------------------------------------------------------------
-
/*N*/ void ScDocument::AddDetectiveOperation( const ScDetOpData& rData )
/*N*/ {
/*N*/ if (!pDetOpList)
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx b/binfilter/bf_sc/source/core/data/sc_document.cxx
index 4282e0e..cc53023 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -2718,28 +2718,12 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ return nCellCount;
/*N*/ }
-
-/*N*/ long ScDocument::GetWeightedCount() const
-/*N*/ {
-/*N*/ long nCellCount = 0L;
-/*N*/
-/*N*/ for ( USHORT nTab=0; nTab<=MAXTAB; nTab++ )
-/*N*/ if ( pTab[nTab] )
-/*N*/ nCellCount += pTab[nTab]->GetWeightedCount();
-/*N*/
-/*N*/ return nCellCount;
-/*N*/ }
-
-
-
-
/*N*/ void ScDocument::SetPageStyle( USHORT nTab, const String& rName )
/*N*/ {
/*N*/ if ( nTab <= MAXTAB && pTab[nTab] )
/*N*/ pTab[nTab]->SetPageStyle( rName );
/*N*/ }
-
/*N*/ const String& ScDocument::GetPageStyle( USHORT nTab ) const
/*N*/ {
/*N*/ if ( nTab <= MAXTAB && pTab[nTab] )
diff --git a/binfilter/bf_sc/source/core/data/sc_stlpool.cxx b/binfilter/bf_sc/source/core/data/sc_stlpool.cxx
index 16e2970..fc60896 100644
--- a/binfilter/bf_sc/source/core/data/sc_stlpool.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_stlpool.cxx
@@ -96,13 +96,6 @@ namespace binfilter {
//------------------------------------------------------------------------
-/*N*/ void ScStyleSheetPool::SetForceStdName( const String* pSet )
-/*N*/ {
-/*N*/ pForceStdName = pSet;
-/*N*/ }
-
-//------------------------------------------------------------------------
-
/*N*/ SfxStyleSheetBase& ScStyleSheetPool::Make( const String& rName,
/*N*/ SfxStyleFamily eFam, USHORT mask, USHORT nPos )
/*N*/ {
diff --git a/binfilter/bf_sc/source/core/tool/sc_token.cxx b/binfilter/bf_sc/source/core/tool/sc_token.cxx
index 466f478..c55fd17 100644
--- a/binfilter/bf_sc/source/core/tool/sc_token.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_token.cxx
@@ -1224,26 +1224,6 @@ USHORT lcl_ScRawTokenOffset()
/*N*/ }
/*N*/ }
-
-/*N*/ ScRecalcMode40 ScTokenArray::ExportRecalcMode40() const
-/*N*/ {
-/*N*/ //! Reihenfolge ist wichtig
-/*N*/ if ( nMode & RECALCMODE_ALWAYS )
-/*N*/ return RC_ALWAYS;
-/*N*/ if ( nMode & RECALCMODE_ONLOAD )
-/*N*/ return RC_ONLOAD;
-/*N*/ if ( nMode & RECALCMODE_FORCED )
-/*N*/ return RC_FORCED;
-/*N*/ if ( nMode & RECALCMODE_ONREFMOVE )
-/*N*/ return RC_ONREFMOVE;
-/*N*/ // kommt eigentlich nicht vor weil in Calc bereits umgesetzt,
-/*N*/ // und woanders gibt es keinen 4.0-Export, deswegen als letztes
-/*N*/ if ( nMode & RECALCMODE_ONLOAD_ONCE )
-/*N*/ return RC_ONLOAD_ONCE;
-/*N*/ return RC_NORMAL;
-/*N*/ }
-
-
/*N*/ void ScTokenArray::AddRecalcMode( ScRecalcMode nBits )
/*N*/ {
/*N*/ //! Reihenfolge ist wichtig
diff --git a/binfilter/bf_sch/source/filter/xml/sch_SchXMLWrapper.cxx b/binfilter/bf_sch/source/filter/xml/sch_SchXMLWrapper.cxx
index 2aeed09..35f7fa9 100644
--- a/binfilter/bf_sch/source/filter/xml/sch_SchXMLWrapper.cxx
+++ b/binfilter/bf_sch/source/filter/xml/sch_SchXMLWrapper.cxx
@@ -150,121 +150,6 @@ using namespace comphelper;
/*N*/
/*N*/ return bRet;
/*N*/ }
-
-/*N*/ sal_Bool SchXMLWrapper::Export()
-/*N*/ {
-/*N*/ sal_Bool bRet = sal_False;
-/*N*/
-/*N*/ try
-/*N*/ {
-/*N*/ if( !mxModel.is() )
-/*N*/ {
-/*N*/ OSL_FAIL("Got NO Model in XMLExport");
-/*N*/ return sal_False;
-/*N*/ }
-/*N*/
-/*N*/ uno::Reference< lang::XServiceInfo > xServiceInfo( mxModel, uno::UNO_QUERY );
-/*N*/
-/*N*/ if( ! xServiceInfo.is() || !xServiceInfo->supportsService(
-/*N*/ OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartDocument" ) ) ) )
-/*N*/ {
-/*N*/ OSL_FAIL( "Model is no ChartDocument in XMLExport" );
-/*N*/ return sal_False;
-/*N*/ }
-/*N*/
-/*N*/ uno::Reference< lang::XMultiServiceFactory> xServiceFactory( ::legacy_binfilters::getLegacyProcessServiceFactory() );
-/*N*/
-/*N*/ if( !xServiceFactory.is() )
-/*N*/ {
-/*N*/ OSL_FAIL( "got no service manager" );
-/*N*/ return sal_False;
-/*N*/ }
-/*N*/
-/*N*/ uno::Reference< uno::XInterface > xWriter( xServiceFactory->createInstance(
-/*N*/ OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Writer" ) ) ) );
-/*N*/
-/*N*/ if( !xWriter.is() )
-/*N*/ {
-/*N*/ OSL_FAIL( "com.sun.star.xml.sax.Writer service missing" );
-/*N*/ return sal_False;
-/*N*/ }
-/*N*/ uno::Reference<xml::sax::XDocumentHandler > xHandler( xWriter, uno::UNO_QUERY );
-/*N*/ uno::Sequence< beans::PropertyValue > aEmptyDescriptor( 0 );
-/*N*/
-/*N*/
-/*N*/ /** property map for export info set */
-/*N*/ PropertyMapEntry aExportInfoMap[] =
-/*N*/ {
-/*N*/ { MAP_LEN( "UsePrettyPrinting"),0, &::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-/*N*/ { NULL, 0, 0, NULL, 0, 0 }
-/*N*/ };
-/*N*/
-/*N*/ uno::Reference< beans::XPropertySet > xInfoSet( GenericPropertySet_CreateInstance( new PropertySetInfo( aExportInfoMap ) ) );
-/*N*/
-/*N*/ SvtSaveOptions aSaveOpt;
-/*N*/ OUString sUsePrettyPrinting(RTL_CONSTASCII_USTRINGPARAM("UsePrettyPrinting"));
-/*N*/ sal_Bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() );
-/*N*/ xInfoSet->setPropertyValue( sUsePrettyPrinting, uno::makeAny( bUsePrettyPrinting ) );
-/*N*/
-/*N*/
-/*N*/ SvXMLGraphicHelper* pGraphicHelper = SvXMLGraphicHelper::Create( mrStorage, GRAPHICHELPER_MODE_WRITE, sal_False );
-/*N*/ uno::Reference< document::XGraphicObjectResolver > xGraphObjResolver( pGraphicHelper );
-/*N*/ uno::Reference< io::XActiveDataSource > xDataSource( xWriter, uno::UNO_QUERY );
-/*N*/
-/*N*/ // there is no meta info needed in charts - they are always OLE objects
-/*N*/ // export meta
-/*N*/ // uno::Sequence< uno::Any > aMetaArgs( 1 );
-/*N*/ // aMetaArgs[ 0 ] <<= xHandler;
-/*N*/ // bRet = ExportStream(
-/*N*/ // ::rtl::OUString::createFromAscii( sXML_metaStreamName ),
-/*N*/ // ::rtl::OUString::createFromAscii( sXML_export_chart_meta_service ),
-/*N*/ // xDataSource, xServiceFactory, aMetaArgs );
-/*N*/
-/*N*/ // prepare arguments: document handler / status indicator and graphics resolver
-/*N*/ sal_Int32 nArgs = 2;
-/*N*/ if( mxStatusIndicator.is())
-/*N*/ nArgs++;
-/*N*/ if( xGraphObjResolver.is())
-/*N*/ nArgs++;
-/*N*/
-/*N*/ uno::Sequence< uno::Any > aArgs( nArgs );
-/*N*/
-/*N*/ nArgs = 0;
-/*N*/ aArgs[ nArgs++ ] <<= xHandler;
-/*N*/ aArgs[ nArgs++ ] <<= xInfoSet;
-/*N*/
-/*N*/ if( mxStatusIndicator.is())
-/*?*/ aArgs[ nArgs++ ] <<= mxStatusIndicator;
-/*N*/ if( xGraphObjResolver.is())
-/*N*/ aArgs[ nArgs++ ] <<= xGraphObjResolver;
-/*N*/
-/*N*/ // styles export
-/*N*/ bRet = ExportStream(
-/*N*/ ::rtl::OUString::createFromAscii( sXML_styleStreamName ),
-/*N*/ ::rtl::OUString::createFromAscii( sXML_export_chart_styles_service ),
-/*N*/ xDataSource, xServiceFactory, aArgs );
-/*N*/
-/*N*/ // content export
-/*N*/ bRet = ExportStream(
-/*N*/ ::rtl::OUString::createFromAscii( sXML_contentStreamName ),
-/*N*/ ::rtl::OUString::createFromAscii( sXML_export_chart_content_service ),
-/*N*/ xDataSource, xServiceFactory, aArgs );
-/*N*/
-/*N*/ // graphics resolver has to be destroyed this way!
-/*N*/ SvXMLGraphicHelper::Destroy( pGraphicHelper );
-/*N*/ }
-/*N*/ catch( uno::Exception aEx )
-/*N*/ {
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*?*/ // convert ::rtl::OUString => tools String => ByteString
-/*?*/ String aStr( aEx.Message );
-/*?*/ ByteString aBStr( aStr, RTL_TEXTENCODING_ASCII_US );
-/*?*/ OSL_TRACE( "Exception caught during Export of : %s", aBStr.GetBuffer());
-/*N*/ #endif
-/*N*/ }
-/*N*/
-/*N*/ return bRet;
-/*N*/ }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sfx2/source/config/cfgimpl.hxx b/binfilter/bf_sfx2/source/config/cfgimpl.hxx
index 5360d2e..4f95f98 100644
--- a/binfilter/bf_sfx2/source/config/cfgimpl.hxx
+++ b/binfilter/bf_sfx2/source/config/cfgimpl.hxx
@@ -77,7 +77,6 @@ public:
{}
USHORT Import( SotStorage* pIn, SotStorage* pStor );
- USHORT Export( SotStorage* pStor, SotStorage* pOut );
static String GetStreamName( USHORT nType );
static USHORT GetType( const String& rStreamName );
diff --git a/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx b/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx
index d4335f1..12acd67 100644
--- a/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx
+++ b/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx
@@ -470,10 +470,6 @@ static const char pStorageName[] = "Configurations";
return bRet;
/*N*/ }
-/*?*/ USHORT SfxConfigManagerImExport_Impl::Export( SotStorage* /*pStor*/, SotStorage* /*pOut*/ )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*?*/ }
-
/*N*/ String SfxConfigManagerImExport_Impl::GetStreamName( USHORT nType )
/*N*/ {
/*N*/ if ( 11 == nType )
diff --git a/binfilter/bf_starmath/source/mathml.hxx b/binfilter/bf_starmath/source/mathml.hxx
index 9773ba3..9209395 100644
--- a/binfilter/bf_starmath/source/mathml.hxx
+++ b/binfilter/bf_starmath/source/mathml.hxx
@@ -84,17 +84,6 @@ private:
::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropSet,
const sal_Char* pComponentName );
- sal_Bool WriteThroughComponent(
- SvStorage* pStorage,
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
- xComponent,
- const sal_Char* pStreamName,
- ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XMultiServiceFactory > & rFactory,
- ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet > & rPropSet,
- const sal_Char* pComponentName,
- sal_Bool bCompress=sal_True );
};
diff --git a/binfilter/bf_starmath/source/starmath_mathml.cxx b/binfilter/bf_starmath/source/starmath_mathml.cxx
index 4871c56..b06fa03 100644
--- a/binfilter/bf_starmath/source/starmath_mathml.cxx
+++ b/binfilter/bf_starmath/source/starmath_mathml.cxx
@@ -720,69 +720,6 @@ sal_Bool SmXMLWrapper::WriteThroughComponent(
return pFilter ? pFilter->GetSuccess() : sal_True;
}
-/// export through an XML exporter component (storage version)
-sal_Bool SmXMLWrapper::WriteThroughComponent(
- SvStorage* pStorage,
- Reference<XComponent> xComponent,
- const sal_Char* pStreamName,
- Reference<lang::XMultiServiceFactory> & rFactory,
- Reference<beans::XPropertySet> & rPropSet,
- const sal_Char* pComponentName,
- sal_Bool bCompress
- )
-{
- DBG_ASSERT(NULL != pStorage, "Need storage!");
- DBG_ASSERT(NULL != pStreamName, "Need stream name!");
-
- Reference< io::XOutputStream > xOutputStream;
- SvStorageStreamRef xDocStream;
-
- // open stream
- OUString sStreamName = OUString::createFromAscii(pStreamName);
- xDocStream = pStorage->OpenStream( sStreamName,
- STREAM_WRITE | STREAM_SHARE_DENYWRITE );
- DBG_ASSERT(xDocStream.Is(), "Can't create output stream in package!");
- if (! xDocStream.Is())
- return sal_False;
-
- xDocStream->SetSize( 0 );
-
- String aPropName( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("MediaType") ) );
- OUString aMime( RTL_CONSTASCII_USTRINGPARAM("text/xml") );
- uno::Any aAny;
- aAny <<= aMime;
- xDocStream->SetProperty( aPropName, aAny );
-
- if( !bCompress )
- {
- aPropName = String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("Compressed") );
- sal_Bool bFalse = sal_False;
- aAny.setValue( &bFalse, ::getBooleanCppuType() );
- xDocStream->SetProperty( aPropName, aAny );
- }
- else
- {
- OUString aLclPropName( RTL_CONSTASCII_USTRINGPARAM("Encrypted") );
- sal_Bool bTrue = sal_True;
- aAny.setValue( &bTrue, ::getBooleanCppuType() );
- xDocStream->SetProperty( aLclPropName, aAny );
- }
-
- // set buffer and create outputstream
- xDocStream->SetBufferSize( 16*1024 );
- xOutputStream = new ::utl::OOutputStreamWrapper( *xDocStream );
-
- // write the stuff
- sal_Bool bRet = WriteThroughComponent( xOutputStream, xComponent, rFactory,
- rPropSet, pComponentName );
-
- // finally, commit stream.
- if( bRet )
- xDocStream->Commit();
-
- return bRet;
-}
-
sal_uInt32 SmXMLExport::exportDoc(enum XMLTokenEnum eClass)
{
if( (getExportFlags() & EXPORT_CONTENT) == 0 )
diff --git a/binfilter/bf_svx/source/form/svx_fmpgeimp.cxx b/binfilter/bf_svx/source/form/svx_fmpgeimp.cxx
index 7219e7b..c5e0679 100644
--- a/binfilter/bf_svx/source/form/svx_fmpgeimp.cxx
+++ b/binfilter/bf_svx/source/form/svx_fmpgeimp.cxx
@@ -165,41 +165,6 @@ using namespace ::binfilter::svxform;
/*N*/ }
//------------------------------------------------------------------------------
-/*N*/ void FmFormPageImpl::write(const Reference< ::com::sun::star::io::XObjectOutputStream > & xOutStrm) const
-/*N*/ {
-/*N*/ Reference< ::com::sun::star::io::XMarkableStream > xMarkStrm(xOutStrm, UNO_QUERY);
-/*N*/ if (!xMarkStrm.is())
-/*N*/ return; // exception
-/*N*/
-/*N*/ // sortieren der objectlist nach der Reihenfolge
-/*N*/ FmObjectList aList;
-/*N*/ fillList(aList, *pPage, sal_True);
-/*N*/
-/*N*/ // schreiben aller forms
-/*N*/ Reference< ::com::sun::star::io::XPersistObject > xAsPersist(xForms, UNO_QUERY);
-/*N*/ if (xAsPersist.is())
-/*N*/ xAsPersist->write(xOutStrm);
-/*N*/ // don't use the writeObject of the stream, as this wouldn't be compatible with older documents
-/*N*/
-/*N*/ // objectliste einfuegen
-/*N*/ sal_Int32 nLength = aList.size();
-/*N*/
-/*N*/ // schreiben der laenge
-/*N*/ xOutStrm->writeLong(nLength);
-/*N*/
-/*N*/ for (sal_Int32 i = 0; i < nLength; i++)
-/*N*/ {
-/*N*/ // schreiben des Objects mit Marke
-/*N*/ // Marke um an den Anfang zu springen
-/*N*/ Reference< ::com::sun::star::io::XPersistObject > xObj(aList[ i ]->GetUnoControlModel(), UNO_QUERY);
-/*N*/ if (xObj.is())
-/*N*/ {
-/*N*/ xOutStrm->writeObject(xObj);
-/*N*/ }
-/*N*/ }
-/*N*/ }
-
-//------------------------------------------------------------------------------
/*N*/ void FmFormPageImpl::read(const Reference< ::com::sun::star::io::XObjectInputStream > & xInStrm)
/*N*/ {
/*N*/ Reference< ::com::sun::star::io::XMarkableStream > xMarkStrm(xInStrm, UNO_QUERY);
diff --git a/binfilter/bf_svx/source/inc/fmpgeimp.hxx b/binfilter/bf_svx/source/inc/fmpgeimp.hxx
index 3beb686..e2379bf 100644
--- a/binfilter/bf_svx/source/inc/fmpgeimp.hxx
+++ b/binfilter/bf_svx/source/inc/fmpgeimp.hxx
@@ -105,7 +105,6 @@ protected:
void WriteData(SvStream& ) const {}
void ReadData(const SdrIOHeader& rHead, SvStream& rIn); //
- void write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& OutStream) const;
void read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& InStream);
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& getForms() {return xForms;}
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdetc.cxx b/binfilter/bf_svx/source/svdraw/svx_svdetc.cxx
index 2bb0819..b6b6cd2 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdetc.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdetc.cxx
@@ -181,17 +181,6 @@ namespace binfilter {
/*N*/ return 0;
/*N*/ }
-
-
-/*N*/ void ContainerSorter::DoSort(ULONG a, ULONG b) const
-/*N*/ {
-/*N*/ ULONG nAnz=rCont.Count();
-/*N*/ if (b>nAnz) b=nAnz;
-/*N*/ if (b>0) b--;
-/*N*/ if (a<b) ImpSubSort(a,b);
-/*N*/ }
-
-
/*?*/ void ContainerSorter::ImpSubSort(long nL, long nR) const
/*?*/ {
/*?*/ long i,j;
diff --git a/binfilter/bf_sw/source/core/inc/viewimp.hxx b/binfilter/bf_sw/source/core/inc/viewimp.hxx
index 04fd67b..4761f15 100644
--- a/binfilter/bf_sw/source/core/inc/viewimp.hxx
+++ b/binfilter/bf_sw/source/core/inc/viewimp.hxx
@@ -153,12 +153,8 @@ class SwViewImp
void StartAction(); //Henkel Anzeigen und verstecken.
void EndAction(); //gerufen von ViewShell::ImplXXXAction
-#ifdef ACCESSIBLE_LAYOUT
-#endif
-
public:
~SwViewImp();
- void Init( const SwViewOption * ); //nur fuer ViewShell::Init()
const ViewShell *GetShell() const { return pSh; }
ViewShell *GetShell() { return pSh; }
diff --git a/binfilter/bf_sw/source/core/layout/makefile.mk b/binfilter/bf_sw/source/core/layout/makefile.mk
index a0b8e74..77056fc 100644
--- a/binfilter/bf_sw/source/core/layout/makefile.mk
+++ b/binfilter/bf_sw/source/core/layout/makefile.mk
@@ -80,7 +80,6 @@ CXXFILES = \
sw_newfrm.cxx \
sw_pagechg.cxx \
sw_pagedesc.cxx \
- sw_pageiter.cxx \
sw_paintfrm.cxx \
sw_sectfrm.cxx \
sw_ssfrm.cxx \
@@ -111,7 +110,6 @@ SLOFILES = \
$(SLO)$/sw_newfrm.obj \
$(SLO)$/sw_pagechg.obj \
$(SLO)$/sw_pagedesc.obj \
- $(SLO)$/sw_pageiter.obj \
$(SLO)$/sw_paintfrm.obj \
$(SLO)$/sw_sectfrm.obj \
$(SLO)$/sw_ssfrm.obj \
diff --git a/binfilter/bf_sw/source/core/layout/sw_pageiter.cxx b/binfilter/bf_sw/source/core/layout/sw_pageiter.cxx
deleted file mode 100644
index 25d9337..0000000
--- a/binfilter/bf_sw/source/core/layout/sw_pageiter.cxx
+++ /dev/null
@@ -1,111 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#ifdef _MSC_VER
-#pragma hdrstop
-#endif
-
-#include <horiornt.hxx>
-
-#include "doc.hxx"
-#include "pagefrm.hxx"
-#include "cntfrm.hxx"
-#include "pam.hxx"
-
-#include <node.hxx>
-#include "pageiter.hxx"
-#include "txtfrm.hxx"
-namespace binfilter {
-
-
-
-
-SwPageIter::SwPageIter( const SwDoc &rDoc, const SwPosition &rStartPos )
- : rPDoc( rDoc ), pPage(0)
-{
- Seek( rStartPos );
-}
-
-
-
-BOOL SwPageIter::NextPage()
-{
- if( IsEnd() )
- return FALSE;
- pPage = (SwPageFrm*)pPage->GetNext();
- return TRUE;
-}
-
-
-
-const SwPageDesc* SwPageIter::GetPageDesc() const
-{
- return ( IsEnd() )? 0 : pPage->GetPageDesc();
-}
-
-
-
-BOOL SwPageIter::Seek( const SwPosition &rPos )
-{
- const SwTxtFrm *pTxt = (SwTxtFrm*)rPDoc.GetNodes()[rPos.nNode.GetIndex()]->
- GetCntntNode()->GetFrm();
- if ( !pTxt )
- return FALSE;
-
- pTxt = pTxt->GetFrmAtPos( rPos );
- pPage = pTxt->FindPageFrm();
- return TRUE;
-}
-
-
-
-BOOL SwPageIter::GetPosition( SwPosition &rPos ) const
-{
- if( IsEnd() )
- return FALSE;
-
- const SwCntntFrm *pCnt = pPage->FindFirstBodyCntnt();
- if ( !pCnt )
- return FALSE;
-
- pCnt = ((SwTxtFrm*)pCnt)->GetFrmAtPos( rPos );
- if ( !pCnt )
- return FALSE;
-
- rPos.nNode = *pCnt->GetNode();
- rPos.nContent.Assign( rPos.nNode.GetNode().GetCntntNode(),
- ((SwTxtFrm*)pCnt)->GetOfst() );
-
- return TRUE;
-}
-
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/text/sw_txtfrm.cxx b/binfilter/bf_sw/source/core/text/sw_txtfrm.cxx
index 0985030..9d8359a 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtfrm.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtfrm.cxx
@@ -69,11 +69,6 @@
#include <wrong.hxx> // SwWrongList
#include <lineinfo.hxx>
-#if OSL_DEBUG_LEVEL > 1
-namespace binfilter {
-extern const sal_Char *GetPrepName( const enum PrepareHint ePrep );
-}
-#endif
namespace binfilter {
/*N*/ TYPEINIT1( SwTxtFrm, SwCntntFrm );
diff --git a/binfilter/bf_sw/source/core/text/sw_txtio.cxx b/binfilter/bf_sw/source/core/text/sw_txtio.cxx
index e08360c..f8764d0 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtio.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtio.cxx
@@ -347,11 +347,6 @@ namespace binfilter {
/*N*/ return 0;
/*N*/ }
-/*N*/ const char *GetPrepName( const PrepareHint )
-/*N*/ {
-/*N*/ return 0;
-/*N*/ }
-
/*N*/ const char *GetLangName( const MSHORT )
/*N*/ {
/*N*/ return 0;
@@ -432,41 +427,6 @@ namespace binfilter {
/*N*/ #endif
/*N*/ }
-/*N*/ CONSTCHAR( pPREP_CLEAR, "CLEAR" );
-/*N*/ CONSTCHAR( pPREP_WIDOWS_ORPHANS, "WIDOWS_ORPHANS" );
-/*N*/ CONSTCHAR( pPREP_FIXSIZE_CHG, "FIXSIZE_CHG" );
-/*N*/ CONSTCHAR( pPREP_FOLLOW_FOLLOWS, "FOLLOW_FOLLOWS" );
-/*N*/ CONSTCHAR( pPREP_ADJUST_FRM, "ADJUST_FRM" );
-/*N*/ CONSTCHAR( pPREP_FREE_SPACE, "FREE_SPACE" );
-/*N*/ CONSTCHAR( pPREP_FLY_CHGD, "FLY_CHGD" );
-/*N*/ CONSTCHAR( pPREP_FLY_ATTR_CHG, "FLY_ATTR_CHG" );
-/*N*/ CONSTCHAR( pPREP_FLY_ARRIVE, "FLY_ARRIVE" );
-/*N*/ CONSTCHAR( pPREP_FLY_LEAVE, "FLY_LEAVE" );
-/*N*/ CONSTCHAR( pPREP_VIEWOPT, "VIEWOPT" );
-/*N*/ CONSTCHAR( pPREP_FTN, "FTN" );
-/*N*/ CONSTCHAR( pPREP_POS_CHGD, "POS" );
-/*N*/ CONSTCHAR( pPREP_UL_SPACE, "UL_SPACE" );
-/*N*/ CONSTCHAR( pPREP_MUST_FIT, "MUST_FIT" );
-/*N*/ CONSTCHAR( pPREP_WIDOWS, "ORPHANS" );
-/*N*/ CONSTCHAR( pPREP_QUOVADIS, "QUOVADIS" );
-/*N*/ CONSTCHAR( pPREP_PAGE, "PAGE" );
-
-/*N*/ const char *GetPrepName( const PrepareHint ePrep )
-/*N*/ {
-/*N*/ // Kurz und schmerzlos:
-/*N*/ const char *ppNameArr[PREP_END] =
-/*N*/ {
-/*N*/ pPREP_CLEAR, pPREP_WIDOWS_ORPHANS, pPREP_FIXSIZE_CHG,
-/*N*/ pPREP_FOLLOW_FOLLOWS, pPREP_ADJUST_FRM, pPREP_FREE_SPACE,
-/*N*/ pPREP_FLY_CHGD, pPREP_FLY_ATTR_CHG, pPREP_FLY_ARRIVE,
-/*N*/ pPREP_FLY_LEAVE, pPREP_VIEWOPT, pPREP_FTN, pPREP_POS_CHGD,
-/*N*/ pPREP_UL_SPACE, pPREP_MUST_FIT, pPREP_WIDOWS, pPREP_QUOVADIS,
-/*N*/ pPREP_PAGE
-/*N*/ };
-/*N*/ OSL_ENSURE( ePrep < PREP_END, "GetPrepName: unknown PrepareHint" );
-/*N*/ return( ppNameArr[ePrep] );
-/*N*/ }
-
/*N*/ #ifdef USED
/*N*/ CONSTCHAR( pRES_LNG_ALBANIAN, "ALBANIAN" );
/*N*/ CONSTCHAR( pRES_LNG_ARABIC, "ARABIC" );
diff --git a/binfilter/bf_sw/source/core/view/sw_viewimp.cxx b/binfilter/bf_sw/source/core/view/sw_viewimp.cxx
index 1bc2c99..3fff7f4 100644
--- a/binfilter/bf_sw/source/core/view/sw_viewimp.cxx
+++ b/binfilter/bf_sw/source/core/view/sw_viewimp.cxx
@@ -48,20 +48,8 @@
#ifdef ACCESSIBLE_LAYOUT
#endif
-// OD 12.12.2002 #103492#
namespace binfilter {
-/*************************************************************************
-|*
-|* SwViewImp::Init()
-|*
-|*************************************************************************/
-
-/*N*/ void SwViewImp::Init( const SwViewOption* /*pNewOpt*/ )
-/*N*/ {
- OSL_FAIL("Strip!");
-/*N*/ }
-
/******************************************************************************
|*
|* SwViewImp::~SwViewImp()
diff --git a/binfilter/bf_sw/source/core/view/sw_vnew.cxx b/binfilter/bf_sw/source/core/view/sw_vnew.cxx
index f0f681c..f9b1aff 100644
--- a/binfilter/bf_sw/source/core/view/sw_vnew.cxx
+++ b/binfilter/bf_sw/source/core/view/sw_vnew.cxx
@@ -52,81 +52,6 @@
#include <accessibilityoptions.hxx>
namespace binfilter {
-/*************************************************************************
-|*
-|* ViewShell::Init()
-|*
-|*************************************************************************/
-
-/*N*/ void ViewShell::Init( const SwViewOption *pNewOpt )
-/*N*/ {
-/*N*/ RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "ViewShell::Init" );
-/*N*/
-/*N*/ bDocSizeChgd = FALSE;
-/*N*/
-/*N*/ // Wir gehen auf Nummer sicher:
-/*N*/ // Wir muessen die alten Fontinformationen wegschmeissen,
-/*N*/ // wenn die Druckeraufloesung oder der Zoomfaktor sich aendert.
-/*N*/ // Init() und Reformat() sind die sichersten Stellen.
-/*N*/ pFntCache->Flush( );
-/*N*/
-/*N*/ // ViewOptions werden dynamisch angelegt
-/*N*/ if( !pOpt )
-/*N*/ {
-/*N*/ pOpt = new SwViewOption;
-/*N*/
-/*N*/ // Ein ApplyViewOptions braucht nicht gerufen zu werden
-/*N*/ if( pNewOpt )
-/*N*/ {
-/*N*/ *pOpt = *pNewOpt;
-/*N*/ // Der Zoomfaktor muss eingestellt werden, weil in der CTOR-
-/*N*/ // phase aus Performancegruenden kein ApplyViewOptions gerufen wird.
-/*N*/ if( GetWin() && 100 != pOpt->GetZoom() )
-/*N*/ {
-/*N*/ MapMode aMode( pWin->GetMapMode() );
-/*N*/ const Fraction aNewFactor( pOpt->GetZoom(), 100 );
-/*N*/ aMode.SetScaleX( aNewFactor );
-/*N*/ aMode.SetScaleY( aNewFactor );
-/*N*/ pWin->SetMapMode( aMode );
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ SwDocShell* pDShell = pDoc->GetDocShell();
-/*N*/ pDoc->SetHTMLMode( 0 != ::binfilter::GetHtmlMode( pDShell ) );
-/*N*/
-/*N*/ // JP 02.02.99: Bug 61335 - Readonly-Flag an den ViewOptions setzen,
-/*N*/ // bevor das Layout angelegt wird. Ansonsten muesste man
-/*N*/ // nochmals durchformatieren!!
-/*N*/ if( pDShell && pDShell->IsReadOnly() )
-/*N*/ pOpt->SetReadonly( TRUE );
-/*N*/
-/*N*/ RTL_LOGFILE_CONTEXT_TRACE( aLog, "View::Init - before InitPrt" );
-
- // Setup the printer. This has to be done even if we use the virtual
- // device for formatting, because the default page format is obtained
- // from the printer
-/*N*/ if( GetPrt( ! pDoc->IsBrowseMode() ) )
-/*N*/ InitPrt( GetPrt() );
-/*N*/
-/*N*/ RTL_LOGFILE_CONTEXT_TRACE( aLog, "View::Init - after InitPrt" );
-/*N*/
-/*N*/ if( GetWin() )
-/*N*/ {
-/*N*/ pOpt->Init( GetWin() );
-/*N*/ GetWin()->SetFillColor();
-/*N*/ GetWin()->SetBackground();
-/*N*/ GetWin()->SetLineColor();
-/*N*/ }
-/*N*/
-/*N*/ //Layout erzeugen wenn es noch nicht vorhanden ist.
-/*N*/ SwRootFrm* pRoot = GetDoc()->GetRootFrm();
-/*N*/ if( !pRoot )
-/*N*/ GetDoc()->SetRootFrm( pRoot = new SwRootFrm( pDoc->GetDfltFrmFmt(), this ) );
-/*N*/
-/*N*/ SizeChgNotify( pRoot->Frm().SSize() );
-/*N*/ }
-
/******************************************************************************
|*
|* ViewShell::~ViewShell()
diff --git a/binfilter/bf_sw/source/filter/w4w/wrtw4w.hxx b/binfilter/bf_sw/source/filter/w4w/wrtw4w.hxx
index e391a4a..0a73782 100644
--- a/binfilter/bf_sw/source/filter/w4w/wrtw4w.hxx
+++ b/binfilter/bf_sw/source/filter/w4w/wrtw4w.hxx
@@ -47,17 +47,12 @@ class SwFmt;
class SwFrmFmt;
class SwGrfNode;
class SwPageDesc;
-class SwPageIter;
-class SwPosFlyFrms;
class SwTable;
class SwTableLine;
class SwTableNode;
class SwTxtFmtColl;
struct SwPosition;
-//extern SwAttrFnTab aW4WAttrFnTab;
-//extern SwNodeFnTab aW4WNodeFnTab;
-
#define cW4W_BEGICF '\x1b'
#define cW4W_LED '\x1d'
#define cW4W_TXTERM '\x1f'
diff --git a/binfilter/inc/bf_basic/basmgr.hxx b/binfilter/inc/bf_basic/basmgr.hxx
index ff7314b..2ce19e4 100644
--- a/binfilter/inc/bf_basic/basmgr.hxx
+++ b/binfilter/inc/bf_basic/basmgr.hxx
@@ -205,10 +205,6 @@ public:
void SetLibraryContainerInfo( LibraryContainerInfo* pInfo );
BOOL RemoveLib( USHORT nLib, BOOL bDelBasicFromStorage );
-
- BOOL HasErrors();
- void ClearErrors();
-
private:
BOOL IsReference( USHORT nLib );
diff --git a/binfilter/inc/bf_sc/compiler.hxx b/binfilter/inc/bf_sc/compiler.hxx
index bf7d1b8..0f656a6 100644
--- a/binfilter/inc/bf_sc/compiler.hxx
+++ b/binfilter/inc/bf_sc/compiler.hxx
@@ -272,7 +272,6 @@ class ScTokenArray
ScToken* Add( ScToken* );
void ImportRecalcMode40( ScRecalcMode40 );
- ScRecalcMode40 ExportRecalcMode40() const;
inline void SetCombinedBitsRecalcMode( ScRecalcMode nBits )
{ nMode |= (nBits & ~RECALCMODE_EMASK); }
inline ScRecalcMode GetCombinedBitsRecalcMode() const
diff --git a/binfilter/inc/bf_sc/document.hxx b/binfilter/inc/bf_sc/document.hxx
index 847035a..89cc0f1 100644
--- a/binfilter/inc/bf_sc/document.hxx
+++ b/binfilter/inc/bf_sc/document.hxx
@@ -445,7 +445,6 @@ private:
public:
long GetCellCount() const; // alle Zellen
- long GetWeightedCount() const; // Formeln und Edit staerker gewichtet
DECL_LINK( GetUserDefinedColor, USHORT * );
// Numberformatter
@@ -866,10 +865,8 @@ public:
void FindConditionalFormat( ULONG nKey, ScRangeList& rRanges );
void FindConditionalFormat( ULONG nKey, ScRangeList& rRanges, USHORT nTab );
void ConditionalChanged( ULONG nKey );
- void SetConditionalUsed( ULONG nKey ); // beim Speichern
ULONG AddValidationEntry( const ScValidationData& rNew );
- void SetValidationUsed( ULONG nKey ); // beim Speichern
const ScValidationData* GetValidationEntry( ULONG nIndex ) const;
diff --git a/binfilter/inc/bf_sc/stlpool.hxx b/binfilter/inc/bf_sc/stlpool.hxx
index 8b2bd08..bfa8930 100644
--- a/binfilter/inc/bf_sc/stlpool.hxx
+++ b/binfilter/inc/bf_sc/stlpool.hxx
@@ -56,9 +56,6 @@ public:
void CreateStandardStyles();
void UpdateStdNames();
-
-
- void SetForceStdName( const String* pSet );
const String* GetForceStdName() const { return pForceStdName; }
virtual SfxStyleSheetBase& Make( const String&, SfxStyleFamily eFam,
diff --git a/binfilter/inc/bf_sch/SchXMLWrapper.hxx b/binfilter/inc/bf_sch/SchXMLWrapper.hxx
index b2baede..f994ab6 100644
--- a/binfilter/inc/bf_sch/SchXMLWrapper.hxx
+++ b/binfilter/inc/bf_sch/SchXMLWrapper.hxx
@@ -76,7 +76,6 @@ public:
sal_Bool bShowProgress = TRUE );
sal_Int32 Import();
- sal_Bool Export();
};
} //namespace binfilter
diff --git a/binfilter/inc/bf_svx/svdetc.hxx b/binfilter/inc/bf_svx/svdetc.hxx
index 066da6c..45bc707 100644
--- a/binfilter/inc/bf_svx/svdetc.hxx
+++ b/binfilter/inc/bf_svx/svdetc.hxx
@@ -155,7 +155,6 @@ private:
#endif // __PRIVATE
public:
ContainerSorter(Container& rNewCont): rCont(rNewCont) {}
- void DoSort(ULONG a=0, ULONG b=0xFFFFFFFF) const;
#ifdef This_Is_Just_For_A_Comment
Compare() muss returnieren:
-1 falls *pElem1<*pElem2
diff --git a/binfilter/inc/bf_sw/flypos.hxx b/binfilter/inc/bf_sw/flypos.hxx
index 71687c9..afed58f 100644
--- a/binfilter/inc/bf_sw/flypos.hxx
+++ b/binfilter/inc/bf_sw/flypos.hxx
@@ -43,7 +43,6 @@ class SwNodeIndex;
class SwPosFlyFrm
{
const SwFrmFmt* pFrmFmt; // das FlyFrmFmt
-// SwPosition* pPos; // Position in den ContentNode
SwNodeIndex* pNdIdx; // es reicht ein Index auf den Node
UINT32 nOrdNum;
public:
diff --git a/binfilter/inc/bf_sw/pageiter.hxx b/binfilter/inc/bf_sw/pageiter.hxx
deleted file mode 100644
index 53ce37d..0000000
--- a/binfilter/inc/bf_sw/pageiter.hxx
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _PAGEITER_HXX
-#define _PAGEITER_HXX
-
-#include <bf_svtools/bf_solar.h>
-
-namespace binfilter {
-
- class SwDoc;
- class SwPageFrm;
- struct SwPosition;
- class SwPageDesc;
-
- class SwPageIter {
- const SwDoc &rPDoc;
- const SwPageFrm *pPage;
-
- public:
- SwPageIter( const SwDoc &rDoc, const SwPosition &rStartPos );
-
- BOOL IsEnd() const { return 0 == pPage; }
- BOOL NextPage();
- const SwPageDesc* GetPageDesc() const;
- BOOL Seek( const SwPosition &rPos );
- BOOL GetPosition( SwPosition &rPos ) const;
- };
-
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sw/viewsh.hxx b/binfilter/inc/bf_sw/viewsh.hxx
index e641f89..05a7e8e 100644
--- a/binfilter/inc/bf_sw/viewsh.hxx
+++ b/binfilter/inc/bf_sw/viewsh.hxx
@@ -137,9 +137,6 @@ class ViewShell : public Ring
//Device (etwa beim Browsen)
- //Initialisierung, wird von den verschiedenen Konstruktoren gerufen.
- void Init( const SwViewOption *pNewOpt );
-
inline void ResetInvalidRect();
More information about the Libreoffice-commits
mailing list