[Libreoffice-commits] .: 2 commits - binfilter/bf_sch binfilter/bf_sd binfilter/bf_starmath binfilter/bf_svx binfilter/bf_sw binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Sun Sep 18 15:35:47 PDT 2011
binfilter/bf_sch/source/ui/inc/ChXDiagram.hxx | 119 ---------
binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx | 5
binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx | 12
binfilter/bf_starmath/source/starmath_document.cxx | 96 +++----
binfilter/bf_svx/source/editeng/svx_impedit2.cxx | 6
binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx | 24 -
binfilter/bf_sw/source/core/fields/sw_dbfld.cxx | 22 -
binfilter/bf_sw/source/ui/app/sw_apphdl.cxx | 2
binfilter/bf_sw/source/ui/app/sw_swmodul1.cxx | 1
binfilter/bf_sw/source/ui/app/sw_swmodule.cxx | 2
binfilter/bf_sw/source/ui/dbui/sw_dbmgr.cxx | 5
binfilter/bf_sw/source/ui/envelp/label.hrc | 117 ---------
binfilter/bf_sw/source/ui/envelp/makefile.mk | 55 ----
binfilter/bf_sw/source/ui/envelp/sw_envimg.cxx | 92 -------
binfilter/bf_sw/source/ui/envelp/sw_label.src | 92 -------
binfilter/bf_sw/source/ui/inc/chldwrap.hxx | 52 ----
binfilter/bf_sw/source/ui/inc/drwtxtsh.hxx | 92 -------
binfilter/bf_sw/source/ui/inc/fldwrap.hxx | 64 -----
binfilter/bf_sw/source/ui/inc/glosdoc.hxx | 149 -----------
binfilter/bf_sw/source/ui/inc/hdftctrl.hxx | 56 ----
binfilter/bf_sw/source/ui/inc/pview.hxx | 236 -------------------
binfilter/bf_sw/source/ui/inc/redlndlg.hxx | 66 -----
binfilter/bf_sw/source/ui/inc/uinums.hxx | 63 -----
binfilter/bf_sw/source/ui/uno/sw_unomod.cxx | 7
binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx | 10
binfilter/bf_sw/source/ui/utlui/sw_attrdesc.cxx | 132 ----------
binfilter/bf_sw/source/ui/utlui/sw_uitool.cxx | 4
binfilter/inc/bf_svtools/svarray.hxx | 2
binfilter/inc/bf_svx/xoutx.hxx | 5
binfilter/inc/bf_sw/cellatr.hxx | 6
binfilter/inc/bf_sw/charatr.hxx | 7
binfilter/inc/bf_sw/dbmgr.hxx | 1
binfilter/inc/bf_sw/fchrfmt.hxx | 14 -
binfilter/inc/bf_sw/fmtanchr.hxx | 3
binfilter/inc/bf_sw/fmtclbl.hxx | 3
binfilter/inc/bf_sw/fmtclds.hxx | 3
binfilter/inc/bf_sw/fmtcntnt.hxx | 4
binfilter/inc/bf_sw/fmteiro.hxx | 3
binfilter/inc/bf_sw/fmtfordr.hxx | 3
binfilter/inc/bf_sw/fmtfsize.hxx | 3
binfilter/inc/bf_sw/fmtftntx.hxx | 4
binfilter/inc/bf_sw/fmthdft.hxx | 3
binfilter/inc/bf_sw/fmtline.hxx | 3
binfilter/inc/bf_sw/fmtlsplt.hxx | 3
binfilter/inc/bf_sw/fmtornt.hxx | 3
binfilter/inc/bf_sw/fmtsrnd.hxx | 3
binfilter/inc/bf_sw/fmturl.hxx | 3
binfilter/inc/bf_sw/format.hxx | 89 +++----
binfilter/inc/bf_sw/frmatr.hxx | 7
binfilter/inc/bf_sw/grfatr.hxx | 6
binfilter/inc/bf_sw/hfspacingitem.hxx | 14 -
binfilter/inc/bf_sw/ndgrf.hxx | 3
binfilter/inc/bf_sw/ndnotxt.hxx | 4
binfilter/inc/bf_sw/ndole.hxx | 4
binfilter/inc/bf_sw/ndtxt.hxx | 5
binfilter/inc/bf_sw/node.hxx | 4
binfilter/inc/bf_sw/swatrset.hxx | 7
binfilter/inc/bf_sw/swmodule.hxx | 1
binfilter/inc/bf_sw/unomid.h | 15 -
binfilter/inc/bf_sw/unotxdoc.hxx | 170 -------------
binfilter/inc/bf_xmloff/txtimp.hxx | 6
61 files changed, 122 insertions(+), 1873 deletions(-)
New commits:
commit 248a786dc8394bed84b2f617b5ea1efb27b36e84
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sun Sep 18 15:34:52 2011 -0700
Currently you can only compile MacOSX using GCC 4.0; remove <3 code
Plus the gcc_outl.cxx file is missing so it wouldn't work anyways.
diff --git a/binfilter/bf_sch/source/ui/inc/ChXDiagram.hxx b/binfilter/bf_sch/source/ui/inc/ChXDiagram.hxx
index f8f2474..abf7c7d 100644
--- a/binfilter/bf_sch/source/ui/inc/ChXDiagram.hxx
+++ b/binfilter/bf_sch/source/ui/inc/ChXDiagram.hxx
@@ -55,10 +55,6 @@ namespace binfilter {
class ChartModel;
class SchChartDocShell;
} //namespace binfilter
-// GrP gcc 2.95.2 on Mac OS X chokes on this huge template class.
-// Expand the template by hand.
-//#if ! (defined(MACOSX) && ( __GNUC__ < 3 ))
-#if 1
// Construct a WeakImplHelper14 with the emphasis on 14.
// Fourteen interfaces are two to many to use the newer template definition
@@ -80,121 +76,6 @@ __DEF_IMPLHELPER_PRE(14)
__IFC_WRITEOFFSET(13) __IFC_WRITEOFFSET(14)
__DEF_IMPLHELPER_POST(14)
-// !defined(MACOSX)
-#else
-// defined(MACOSX) && (__GNUC__ < 3 )
-
-namespace cppu {
- struct ClassData14 : public ClassDataBase
- {
- Type_Offset arType2Offset[ 14 ];
- ClassData14( ) SAL_THROW( () )
- : ClassDataBase( 14 )
- {}
- };
-
- class SAL_NO_VTABLE ImplHelperBase14
- : public ::com::sun::star::lang::XTypeProvider
- , public ::com::sun::star::chart::XDiagram,
- public ::com::sun::star::chart::XAxisZSupplier,
- public ::com::sun::star::chart::XTwoAxisXSupplier,
- public ::com::sun::star::chart::XTwoAxisYSupplier,
- public ::com::sun::star::chart::XStatisticDisplay,
- public ::com::sun::star::chart::X3DDisplay,
- public ::com::sun::star::beans::XPropertySet,
- public ::com::sun::star::beans::XMultiPropertySet,
- public ::com::sun::star::beans::XPropertyState,
- public ::com::sun::star::beans::XMultiPropertyStates,
- public ::com::sun::star::lang::XServiceInfo,
- public ::com::sun::star::lang::XUnoTunnel,
- public ::com::sun::star::lang::XComponent,
- public ::com::sun::star::lang::XEventListener
- {
- protected:
- ClassData & SAL_CALL getClassData( ClassDataBase & s_aCD ) SAL_THROW( () )
- {
- ClassData & rCD = * static_cast< ClassData * >( &s_aCD );
- if (! rCD.bOffsetsInit)
- {
- ::osl::MutexGuard aGuard( getImplHelperInitMutex() );
- if (! rCD.bOffsetsInit)
- {
- char * pBase = (char *)this;
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram > *)0 ),
- (char *)(::com::sun::star::chart::XDiagram *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XAxisZSupplier > *)0 ),
- (char *)(::com::sun::star::chart::XAxisZSupplier *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XTwoAxisXSupplier > *)0 ),
- (char *)(::com::sun::star::chart::XTwoAxisXSupplier *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XTwoAxisYSupplier > *)0 ),
- (char *)(::com::sun::star::chart::XTwoAxisYSupplier *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XStatisticDisplay > *)0 ),
- (char *)(::com::sun::star::chart::XStatisticDisplay *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::chart::X3DDisplay > *)0 ),
- (char *)(::com::sun::star::chart::X3DDisplay *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > *)0 ),
- (char *)(::com::sun::star::beans::XPropertySet *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
- (char *)(::com::sun::star::beans::XMultiPropertySet *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState > *)0 ),
- (char *)(::com::sun::star::beans::XPropertyState *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertyStates > *)0 ),
- (char *)(::com::sun::star::beans::XMultiPropertyStates *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo > *)0 ),
- (char *)(::com::sun::star::lang::XServiceInfo *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > *)0 ),
- (char *)(::com::sun::star::lang::XUnoTunnel *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > *)0 ),
- (char *)(::com::sun::star::lang::XComponent *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > *)0 ),
- (char *)(::com::sun::star::lang::XEventListener *)this - pBase );
- rCD.bOffsetsInit = sal_True;
- }
- }
- return rCD;
- }
- };
-
-
- class SAL_NO_VTABLE ImplHelper14
- : public ImplHelperBase14
- {
- static ClassData14 s_aCD;
- public:
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException)
- { return getClassData( s_aCD ).query( rType, (ImplHelperBase14 *)this ); }
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
- { return getClassData( s_aCD ).getTypes(); }
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
- { return getClassData( s_aCD ).getImplementationId(); }
- };
-
-
- class SAL_NO_VTABLE WeakImplHelper14
- : public ::cppu::OWeakObject
- , public ImplHelperBase14
- {
- static ClassData14 s_aCD;
- public:
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException)
- {
- ::com::sun::star::uno::Any aRet( getClassData( s_aCD ).query( rType, (ImplHelperBase14 *)this ) );
- return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
- }
- virtual void SAL_CALL acquire() throw ()
- { OWeakObject::acquire(); }
- virtual void SAL_CALL release() throw ()
- { OWeakObject::release(); }
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
- { return getClassData( s_aCD ).getTypes(); }
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
- { return getClassData( s_aCD ).getImplementationId(); }
- };
-
- // namespace ::cppu
-}
-
-#endif
namespace binfilter {
class ChXDiagram : public ::cppu::WeakImplHelper14
<
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
index 08f827f..9482507 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
@@ -110,11 +110,6 @@ using rtl::OUString;
extern SchUnoPropertyMapProvider aSchMapProvider;
-#if defined(MACOSX) && ( __GNUC__ < 3 )
-static cppu::ClassData14 cppu::ImplHelper14::s_aCD;
-static cppu::ClassData14 cppu::WeakImplHelper14::s_aCD;
-#endif
-
#define MATRIX4D_TO_HOMOGEN_MATRIX( m, h ) \
h.Line1.Column1 = m[0][0]; \
h.Line1.Column2 = m[0][1]; \
diff --git a/binfilter/bf_svx/source/editeng/svx_impedit2.cxx b/binfilter/bf_svx/source/editeng/svx_impedit2.cxx
index dd715af..a8fd09b 100644
--- a/binfilter/bf_svx/source/editeng/svx_impedit2.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_impedit2.cxx
@@ -83,12 +83,6 @@
#include <unicode/ubidi.h>
namespace binfilter {
-#if defined(MACOSX) && ( __GNUC__ < 3 )
-// moved from editundo.hxx
-const EPaM& EditUndoRemoveChars::GetEPaM() { return aEPaM; }
-String& EditUndoRemoveChars::GetStr() { return aText; }
-#endif
-
using namespace ::com::sun::star;
/*N*/ USHORT lcl_CalcExtraSpace( const SvxLineSpacingItem& rLSItem )
diff --git a/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx b/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
index 26e4bd9..1e868c7 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
@@ -124,12 +124,6 @@ using namespace ::com::sun::star::i18n;
using ::rtl::OUString;
using ::osl::FileBase;
-#if defined(MACOSX) && ( __GNUC__ < 3 )
-static cppu::ClassData27 cppu::ImplHelper27::s_aCD;
-static cppu::ClassData27 cppu::WeakImplHelper27::s_aCD;
-#endif
-
-
#define SW_CREATE_DASH_TABLE 0x01
#define SW_CREATE_GRADIENT_TABLE 0x02
#define SW_CREATE_HATCH_TABLE 0x03
diff --git a/binfilter/inc/bf_svtools/svarray.hxx b/binfilter/inc/bf_svtools/svarray.hxx
index 10d1429..f5eb78b 100644
--- a/binfilter/inc/bf_svtools/svarray.hxx
+++ b/binfilter/inc/bf_svtools/svarray.hxx
@@ -919,7 +919,7 @@ public:\
#define C40_PTR_REPLACE( c, p) Replace( (c const *) p )
#define C40_GETPOS( c, r) GetPos( (c const *)r )
#else
-#if defined ICC|| (defined GCC && __GNUC__ >= 3) || (defined(WNT) && _MSC_VER >= 1400)
+#if defined ICC || defined GCC || ( defined(WNT) && _MSC_VER >= 1400)
#define C40_INSERT( c, p, n ) Insert( (c const *&) p, n )
#define C40_PUSH( c, p) Push( (c const *&) p )
#define C40_PTR_INSERT( c, p ) Insert( (c const *&) p )
diff --git a/binfilter/inc/bf_svx/xoutx.hxx b/binfilter/inc/bf_svx/xoutx.hxx
index 56bd9a7..1eef851 100644
--- a/binfilter/inc/bf_svx/xoutx.hxx
+++ b/binfilter/inc/bf_svx/xoutx.hxx
@@ -83,11 +83,6 @@ struct ImpData
|*
\************************************************************************/
-#if defined(MACOSX) && (__GNUC__ < 3)
-static Brush aBrush;
-static Pen aPen;
-#endif
-
class XOutputDevice
{
private:
diff --git a/binfilter/inc/bf_sw/cellatr.hxx b/binfilter/inc/bf_sw/cellatr.hxx
index a362904..604c1b5 100644
--- a/binfilter/inc/bf_sw/cellatr.hxx
+++ b/binfilter/inc/bf_sw/cellatr.hxx
@@ -116,27 +116,21 @@ public:
//***************************************************************************
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
inline const SwTblBoxNumFormat &SwAttrSet::GetTblBoxNumFmt(BOOL bInP) const
{ return (const SwTblBoxNumFormat&)Get( RES_BOXATR_FORMAT,bInP); }
inline const SwTblBoxFormula &SwAttrSet::GetTblBoxFormula(BOOL bInP) const
{ return (const SwTblBoxFormula&)Get( RES_BOXATR_FORMULA,bInP); }
inline const SwTblBoxValue &SwAttrSet::GetTblBoxValue(BOOL bInP) const
{ return (const SwTblBoxValue&)Get( RES_BOXATR_VALUE, bInP); }
-#endif
//***************************************************************************
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
inline const SwTblBoxNumFormat &SwFmt::GetTblBoxNumFmt(BOOL bInP) const
{ return aSet.GetTblBoxNumFmt(bInP); }
inline const SwTblBoxFormula &SwFmt::GetTblBoxFormula(BOOL bInP) const
{ return aSet.GetTblBoxFormula(bInP); }
inline const SwTblBoxValue &SwFmt::GetTblBoxValue(BOOL bInP) const
{ return aSet.GetTblBoxValue(bInP); }
-#endif
} //namespace binfilter
#endif
diff --git a/binfilter/inc/bf_sw/charatr.hxx b/binfilter/inc/bf_sw/charatr.hxx
index 9e7a01c..5e1b626 100644
--- a/binfilter/inc/bf_sw/charatr.hxx
+++ b/binfilter/inc/bf_sw/charatr.hxx
@@ -73,12 +73,8 @@ inline const SvxFontHeightItem &SwAttrSet::GetCTLSize(BOOL bInP) const
{ return (const SvxFontHeightItem&)Get( RES_CHRATR_CTL_FONTSIZE,bInP); }
inline const SvxPropSizeItem &SwAttrSet::GetPropSize(BOOL bInP) const
{ return (const SvxPropSizeItem&)Get( RES_CHRATR_PROPORTIONALFONTSIZE,bInP); }
-
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
inline const SvxFontItem &SwAttrSet::GetFont(BOOL bInP) const
{ return (const SvxFontItem&)Get( RES_CHRATR_FONT,bInP); }
-#endif
inline const SvxFontItem &SwAttrSet::GetCJKFont(BOOL bInP) const
{ return (const SvxFontItem&)Get( RES_CHRATR_CJK_FONT,bInP); }
inline const SvxFontItem &SwAttrSet::GetCTLFont(BOOL bInP) const
@@ -141,11 +137,8 @@ inline const SvxFontHeightItem &SwFmt::GetSize(BOOL bInP) const
{ return aSet.GetSize(bInP); }
inline const SvxPropSizeItem &SwFmt::GetPropSize(BOOL bInP) const
{ return aSet.GetPropSize(bInP); }
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
inline const SvxFontItem &SwFmt::GetFont(BOOL bInP) const
{ return aSet.GetFont(bInP); }
-#endif
inline const SvxFontItem &SwFmt::GetCJKFont(BOOL bInP) const
{ return aSet.GetCJKFont(bInP); }
inline const SvxFontItem &SwFmt::GetCTLFont(BOOL bInP) const
diff --git a/binfilter/inc/bf_sw/fmtanchr.hxx b/binfilter/inc/bf_sw/fmtanchr.hxx
index 26e58b8..5437c1f 100644
--- a/binfilter/inc/bf_sw/fmtanchr.hxx
+++ b/binfilter/inc/bf_sw/fmtanchr.hxx
@@ -78,14 +78,11 @@ public:
void SetAnchor( const SwPosition *pPos );
};
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
inline const SwFmtAnchor &SwAttrSet::GetAnchor(BOOL bInP) const
{ return (const SwFmtAnchor&)Get( RES_ANCHOR,bInP); }
inline const SwFmtAnchor &SwFmt::GetAnchor(BOOL bInP) const
{ return aSet.GetAnchor(bInP); }
-#endif
} //namespace binfilter
#endif
diff --git a/binfilter/inc/bf_sw/fmtclbl.hxx b/binfilter/inc/bf_sw/fmtclbl.hxx
index 7fb23ad..8653345 100644
--- a/binfilter/inc/bf_sw/fmtclbl.hxx
+++ b/binfilter/inc/bf_sw/fmtclbl.hxx
@@ -52,14 +52,11 @@ public:
};
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
inline const SwFmtNoBalancedColumns &SwAttrSet::GetBalancedColumns(BOOL bInP) const
{ return (const SwFmtNoBalancedColumns&)Get( RES_COLUMNBALANCE, bInP ); }
inline const SwFmtNoBalancedColumns &SwFmt::GetBalancedColumns(BOOL bInP) const
{ return aSet.GetBalancedColumns( bInP ); }
-#endif
} //namespace binfilter
#endif
diff --git a/binfilter/inc/bf_sw/fmtclds.hxx b/binfilter/inc/bf_sw/fmtclds.hxx
index 20e2121..75daa57 100644
--- a/binfilter/inc/bf_sw/fmtclds.hxx
+++ b/binfilter/inc/bf_sw/fmtclds.hxx
@@ -161,14 +161,11 @@ public:
//den Anwender die Spalte ist - geliefert.
};
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
inline const SwFmtCol &SwAttrSet::GetCol(BOOL bInP) const
{ return (const SwFmtCol&)Get( RES_COL,bInP); }
inline const SwFmtCol &SwFmt::GetCol(BOOL bInP) const
{ return aSet.GetCol(bInP); }
-#endif
} //namespace binfilter
#endif
diff --git a/binfilter/inc/bf_sw/fmtcntnt.hxx b/binfilter/inc/bf_sw/fmtcntnt.hxx
index 7277974..527bcb9 100644
--- a/binfilter/inc/bf_sw/fmtcntnt.hxx
+++ b/binfilter/inc/bf_sw/fmtcntnt.hxx
@@ -45,7 +45,6 @@ class SwFmtCntnt: public SfxPoolItem
SwFmtCntnt &operator=( const SwFmtCntnt & ); //Kopieren verboten
public:
-// SwFmtCntnt( const SwNodeIndex *pStartNodeIdx = 0 );
SwFmtCntnt( const SwStartNode* pStartNode = 0 );
SwFmtCntnt( const SwFmtCntnt &rCpy );
~SwFmtCntnt();
@@ -60,14 +59,11 @@ public:
void SetNewCntntIdx( const SwNodeIndex *pIdx );
};
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.hxx; revisit with gcc3
inline const SwFmtCntnt &SwAttrSet::GetCntnt(BOOL bInP) const
{ return (const SwFmtCntnt&)Get( RES_CNTNT,bInP); }
inline const SwFmtCntnt &SwFmt::GetCntnt(BOOL bInP) const
{ return aSet.GetCntnt(bInP); }
-#endif
} //namespace binfilter
#endif
diff --git a/binfilter/inc/bf_sw/fmteiro.hxx b/binfilter/inc/bf_sw/fmteiro.hxx
index 9e12dc3..e57b993 100644
--- a/binfilter/inc/bf_sw/fmteiro.hxx
+++ b/binfilter/inc/bf_sw/fmteiro.hxx
@@ -51,14 +51,11 @@ public:
virtual USHORT GetVersion( USHORT nFFVer ) const;
};
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
inline const SwFmtEditInReadonly &SwAttrSet::GetEditInReadonly(BOOL bInP) const
{ return (const SwFmtEditInReadonly&)Get( RES_EDIT_IN_READONLY,bInP); }
inline const SwFmtEditInReadonly &SwFmt::GetEditInReadonly(BOOL bInP) const
{ return aSet.GetEditInReadonly(bInP); }
-#endif
} //namespace binfilter
#endif
diff --git a/binfilter/inc/bf_sw/fmtfordr.hxx b/binfilter/inc/bf_sw/fmtfordr.hxx
index 4f46b12..422a35b 100644
--- a/binfilter/inc/bf_sw/fmtfordr.hxx
+++ b/binfilter/inc/bf_sw/fmtfordr.hxx
@@ -68,14 +68,11 @@ inline SwFmtFillOrder &SwFmtFillOrder::operator=( const SwFmtFillOrder &rCpy )
return *this;
}
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
inline const SwFmtFillOrder &SwAttrSet::GetFillOrder(BOOL bInP) const
{ return (const SwFmtFillOrder&)Get( RES_FILL_ORDER,bInP); }
inline const SwFmtFillOrder &SwFmt::GetFillOrder(BOOL bInP) const
{ return aSet.GetFillOrder(bInP); }
-#endif
} //namespace binfilter
#endif
diff --git a/binfilter/inc/bf_sw/fmtfsize.hxx b/binfilter/inc/bf_sw/fmtfsize.hxx
index 89258a0..c763dac 100644
--- a/binfilter/inc/bf_sw/fmtfsize.hxx
+++ b/binfilter/inc/bf_sw/fmtfsize.hxx
@@ -102,14 +102,11 @@ public:
const SvxULSpaceItem *pULSpace ) const;
};
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
inline const SwFmtFrmSize &SwAttrSet::GetFrmSize(BOOL bInP) const
{ return (const SwFmtFrmSize&)Get( RES_FRM_SIZE,bInP); }
inline const SwFmtFrmSize &SwFmt::GetFrmSize(BOOL bInP) const
{ return aSet.GetFrmSize(bInP); }
-#endif
} //namespace binfilter
#endif
diff --git a/binfilter/inc/bf_sw/fmtftntx.hxx b/binfilter/inc/bf_sw/fmtftntx.hxx
index fdecd6e..047e5c6 100644
--- a/binfilter/inc/bf_sw/fmtftntx.hxx
+++ b/binfilter/inc/bf_sw/fmtftntx.hxx
@@ -118,19 +118,15 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
};
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
inline const SwFmtFtnAtTxtEnd &SwAttrSet::GetFtnAtTxtEnd(BOOL bInP) const
{ return (const SwFmtFtnAtTxtEnd&)Get( RES_FTN_AT_TXTEND, bInP); }
inline const SwFmtEndAtTxtEnd &SwAttrSet::GetEndAtTxtEnd(BOOL bInP) const
{ return (const SwFmtEndAtTxtEnd&)Get( RES_END_AT_TXTEND, bInP); }
-
inline const SwFmtFtnAtTxtEnd &SwFmt::GetFtnAtTxtEnd(BOOL bInP) const
{ return aSet.GetFtnAtTxtEnd(bInP); }
inline const SwFmtEndAtTxtEnd &SwFmt::GetEndAtTxtEnd(BOOL bInP) const
{ return aSet.GetEndAtTxtEnd(bInP); }
-#endif
} //namespace binfilter
#endif
diff --git a/binfilter/inc/bf_sw/fmthdft.hxx b/binfilter/inc/bf_sw/fmthdft.hxx
index 4d5ce94..8e42837 100644
--- a/binfilter/inc/bf_sw/fmthdft.hxx
+++ b/binfilter/inc/bf_sw/fmthdft.hxx
@@ -96,8 +96,6 @@ public:
void SetActive( BOOL bNew = TRUE ) { bActive = bNew; }
};
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ) )
-// GrP moved to gcc_outl.cxx; revisit with gcc3
inline const SwFmtHeader &SwAttrSet::GetHeader(BOOL bInP) const
{ return (const SwFmtHeader&)Get( RES_HEADER,bInP); }
inline const SwFmtFooter &SwAttrSet::GetFooter(BOOL bInP) const
@@ -107,7 +105,6 @@ inline const SwFmtHeader &SwFmt::GetHeader(BOOL bInP) const
{ return aSet.GetHeader(bInP); }
inline const SwFmtFooter &SwFmt::GetFooter(BOOL bInP) const
{ return aSet.GetFooter(bInP); }
-#endif
} //namespace binfilter
#endif
diff --git a/binfilter/inc/bf_sw/fmtline.hxx b/binfilter/inc/bf_sw/fmtline.hxx
index a8b7bdc..11a1678 100644
--- a/binfilter/inc/bf_sw/fmtline.hxx
+++ b/binfilter/inc/bf_sw/fmtline.hxx
@@ -63,14 +63,11 @@ public:
void SetCountLines( BOOL b ) { bCountLines = b; }
};
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
inline const SwFmtLineNumber &SwAttrSet::GetLineNumber(BOOL bInP) const
{ return (const SwFmtLineNumber&)Get( RES_LINENUMBER,bInP); }
inline const SwFmtLineNumber &SwFmt::GetLineNumber(BOOL bInP) const
{ return aSet.GetLineNumber(bInP); }
-#endif
} //namespace binfilter
#endif
diff --git a/binfilter/inc/bf_sw/fmtlsplt.hxx b/binfilter/inc/bf_sw/fmtlsplt.hxx
index 8bde656..283104b 100644
--- a/binfilter/inc/bf_sw/fmtlsplt.hxx
+++ b/binfilter/inc/bf_sw/fmtlsplt.hxx
@@ -48,14 +48,11 @@ public:
virtual USHORT GetVersion( USHORT nFFVer ) const;
};
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
inline const SwFmtLayoutSplit &SwAttrSet::GetLayoutSplit(BOOL bInP) const
{ return (const SwFmtLayoutSplit&)Get( RES_LAYOUT_SPLIT,bInP); }
inline const SwFmtLayoutSplit &SwFmt::GetLayoutSplit(BOOL bInP) const
{ return aSet.GetLayoutSplit(bInP); }
-#endif
} //namespace binfilter
#endif
diff --git a/binfilter/inc/bf_sw/fmtornt.hxx b/binfilter/inc/bf_sw/fmtornt.hxx
index 44e3f9f..0999b02 100644
--- a/binfilter/inc/bf_sw/fmtornt.hxx
+++ b/binfilter/inc/bf_sw/fmtornt.hxx
@@ -129,8 +129,6 @@ inline SwFmtHoriOrient &SwFmtHoriOrient::operator=( const SwFmtHoriOrient &rCpy
return *this;
}
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx
inline const SwFmtVertOrient &SwAttrSet::GetVertOrient(BOOL bInP) const
{ return (const SwFmtVertOrient&)Get( RES_VERT_ORIENT,bInP); }
inline const SwFmtHoriOrient &SwAttrSet::GetHoriOrient(BOOL bInP) const
@@ -140,7 +138,6 @@ inline const SwFmtVertOrient &SwFmt::GetVertOrient(BOOL bInP) const
{ return aSet.GetVertOrient(bInP); }
inline const SwFmtHoriOrient &SwFmt::GetHoriOrient(BOOL bInP) const
{ return aSet.GetHoriOrient(bInP); }
-#endif
} //namespace binfilter
#endif
diff --git a/binfilter/inc/bf_sw/fmtsrnd.hxx b/binfilter/inc/bf_sw/fmtsrnd.hxx
index 58c2446..61282db 100644
--- a/binfilter/inc/bf_sw/fmtsrnd.hxx
+++ b/binfilter/inc/bf_sw/fmtsrnd.hxx
@@ -91,14 +91,11 @@ inline SwFmtSurround &SwFmtSurround::operator=( const SwFmtSurround &rCpy )
return *this;
}
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.hxx; revisit with gcc3
inline const SwFmtSurround &SwAttrSet::GetSurround(BOOL bInP) const
{ return (const SwFmtSurround&)Get( RES_SURROUND,bInP); }
inline const SwFmtSurround &SwFmt::GetSurround(BOOL bInP) const
{ return aSet.GetSurround(bInP); }
-#endif
} //namespace binfilter
#endif
diff --git a/binfilter/inc/bf_sw/fmturl.hxx b/binfilter/inc/bf_sw/fmturl.hxx
index e128176..eaeaa88 100644
--- a/binfilter/inc/bf_sw/fmturl.hxx
+++ b/binfilter/inc/bf_sw/fmturl.hxx
@@ -80,14 +80,11 @@ public:
};
-#if ! (defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
inline const SwFmtURL &SwAttrSet::GetURL(BOOL bInP) const
{ return (const SwFmtURL&)Get( RES_URL,bInP); }
inline const SwFmtURL &SwFmt::GetURL(BOOL bInP) const
{ return aSet.GetURL(bInP); }
-#endif
} //namespace binfilter
#endif
diff --git a/binfilter/inc/bf_sw/format.hxx b/binfilter/inc/bf_sw/format.hxx
index 945cbc4..b1d81ea 100644
--- a/binfilter/inc/bf_sw/format.hxx
+++ b/binfilter/inc/bf_sw/format.hxx
@@ -154,12 +154,6 @@ public:
nWhichId == RES_DRAWFRMFMT||
nWhichId == RES_FRMFMT; }
-#if defined(MACOSX) && ( __GNUC__ < 3 )
-#define INLINE /* GrP revisit with gcc3 */
-#else
-#define INLINE inline
-#endif
-
// GetMethoden: das Bool gibt an, ob nur im Set (FALSE) oder auch in
// den Parents gesucht werden soll. Wird nichts gefunden,
// wird das deflt. Attribut returnt.
@@ -176,7 +170,7 @@ public:
inline const SvxCrossedOutItem &GetCrossedOut( BOOL = TRUE ) const;
inline const SvxFontHeightItem &GetSize( BOOL = TRUE ) const;
inline const SvxPropSizeItem &GetPropSize( BOOL = TRUE ) const;
- INLINE const SvxFontItem &GetFont( BOOL = TRUE ) const;
+ inline const SvxFontItem &GetFont( BOOL = TRUE ) const;
inline const SvxColorItem &GetColor( BOOL = TRUE ) const;
inline const SvxCharSetColorItem &GetCharSetColor( BOOL = TRUE ) const;
inline const SvxLanguageItem &GetLanguage( BOOL = TRUE ) const;
@@ -204,43 +198,43 @@ public:
inline const SvxCharReliefItem &GetCharRelief( BOOL = TRUE ) const;
// Frame-Attribute - impl. steht im frmatr.hxx,
- INLINE const SwFmtFillOrder &GetFillOrder( BOOL = TRUE ) const;
- INLINE const SwFmtFrmSize &GetFrmSize( BOOL = TRUE ) const;
- INLINE const SwFmtHeader &GetHeader( BOOL = TRUE ) const;
- INLINE const SwFmtFooter &GetFooter( BOOL = TRUE ) const;
- INLINE const SwFmtSurround &GetSurround( BOOL = TRUE ) const;
- INLINE const SwFmtHoriOrient &GetHoriOrient( BOOL = TRUE ) const;
- INLINE const SwFmtAnchor &GetAnchor( BOOL = TRUE ) const;
- INLINE const SwFmtCol &GetCol( BOOL = TRUE ) const;
- INLINE const SvxPaperBinItem &GetPaperBin( BOOL = TRUE ) const;
- INLINE const SvxLRSpaceItem &GetLRSpace( BOOL = TRUE ) const;
- INLINE const SvxULSpaceItem &GetULSpace( BOOL = TRUE ) const;
- INLINE const SwFmtCntnt &GetCntnt( BOOL = TRUE ) const;
- INLINE const SvxPrintItem &GetPrint( BOOL = TRUE ) const;
- INLINE const SvxOpaqueItem &GetOpaque( BOOL = TRUE ) const;
- INLINE const SvxProtectItem &GetProtect( BOOL = TRUE ) const;
- INLINE const SwFmtVertOrient &GetVertOrient( BOOL = TRUE ) const;
- INLINE const SvxBoxItem &GetBox( BOOL = TRUE ) const;
- INLINE const SvxFmtKeepItem &GetKeep( BOOL = TRUE ) const;
- INLINE const SvxBrushItem &GetBackground( BOOL = TRUE ) const;
- INLINE const SvxShadowItem &GetShadow( BOOL = TRUE ) const;
- INLINE const SwFmtPageDesc &GetPageDesc( BOOL = TRUE ) const;
- INLINE const SvxFmtBreakItem &GetBreak( BOOL = TRUE ) const;
- INLINE const SvxMacroItem &GetMacro( BOOL = TRUE ) const;
- INLINE const SwFmtURL &GetURL( BOOL = TRUE ) const;
- INLINE const SwFmtEditInReadonly &GetEditInReadonly( BOOL = TRUE ) const;
- INLINE const SwFmtLayoutSplit &GetLayoutSplit( BOOL = TRUE ) const;
- INLINE const SwFmtChain &GetChain( BOOL = TRUE ) const;
- INLINE const SwFmtLineNumber &GetLineNumber( BOOL = TRUE ) const;
- INLINE const SwFmtFtnAtTxtEnd &GetFtnAtTxtEnd( BOOL = TRUE ) const;
- INLINE const SwFmtEndAtTxtEnd &GetEndAtTxtEnd( BOOL = TRUE ) const;
- INLINE const SwFmtNoBalancedColumns &GetBalancedColumns( BOOL = TRUE ) const;
- INLINE const SvxFrameDirectionItem &GetFrmDir( BOOL = TRUE ) const;
- INLINE const SwTextGridItem &GetTextGrid( BOOL = TRUE ) const;
+ inline const SwFmtFillOrder &GetFillOrder( BOOL = TRUE ) const;
+ inline const SwFmtFrmSize &GetFrmSize( BOOL = TRUE ) const;
+ inline const SwFmtHeader &GetHeader( BOOL = TRUE ) const;
+ inline const SwFmtFooter &GetFooter( BOOL = TRUE ) const;
+ inline const SwFmtSurround &GetSurround( BOOL = TRUE ) const;
+ inline const SwFmtHoriOrient &GetHoriOrient( BOOL = TRUE ) const;
+ inline const SwFmtAnchor &GetAnchor( BOOL = TRUE ) const;
+ inline const SwFmtCol &GetCol( BOOL = TRUE ) const;
+ inline const SvxPaperBinItem &GetPaperBin( BOOL = TRUE ) const;
+ inline const SvxLRSpaceItem &GetLRSpace( BOOL = TRUE ) const;
+ inline const SvxULSpaceItem &GetULSpace( BOOL = TRUE ) const;
+ inline const SwFmtCntnt &GetCntnt( BOOL = TRUE ) const;
+ inline const SvxPrintItem &GetPrint( BOOL = TRUE ) const;
+ inline const SvxOpaqueItem &GetOpaque( BOOL = TRUE ) const;
+ inline const SvxProtectItem &GetProtect( BOOL = TRUE ) const;
+ inline const SwFmtVertOrient &GetVertOrient( BOOL = TRUE ) const;
+ inline const SvxBoxItem &GetBox( BOOL = TRUE ) const;
+ inline const SvxFmtKeepItem &GetKeep( BOOL = TRUE ) const;
+ inline const SvxBrushItem &GetBackground( BOOL = TRUE ) const;
+ inline const SvxShadowItem &GetShadow( BOOL = TRUE ) const;
+ inline const SwFmtPageDesc &GetPageDesc( BOOL = TRUE ) const;
+ inline const SvxFmtBreakItem &GetBreak( BOOL = TRUE ) const;
+ inline const SvxMacroItem &GetMacro( BOOL = TRUE ) const;
+ inline const SwFmtURL &GetURL( BOOL = TRUE ) const;
+ inline const SwFmtEditInReadonly &GetEditInReadonly( BOOL = TRUE ) const;
+ inline const SwFmtLayoutSplit &GetLayoutSplit( BOOL = TRUE ) const;
+ inline const SwFmtChain &GetChain( BOOL = TRUE ) const;
+ inline const SwFmtLineNumber &GetLineNumber( BOOL = TRUE ) const;
+ inline const SwFmtFtnAtTxtEnd &GetFtnAtTxtEnd( BOOL = TRUE ) const;
+ inline const SwFmtEndAtTxtEnd &GetEndAtTxtEnd( BOOL = TRUE ) const;
+ inline const SwFmtNoBalancedColumns &GetBalancedColumns( BOOL = TRUE ) const;
+ inline const SvxFrameDirectionItem &GetFrmDir( BOOL = TRUE ) const;
+ inline const SwTextGridItem &GetTextGrid( BOOL = TRUE ) const;
inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( BOOL = TRUE ) const;
// Grafik-Attribute - impl. steht im grfatr.hxx
- INLINE const SwMirrorGrf &GetMirrorGrf( BOOL = TRUE ) const;
+ inline const SwMirrorGrf &GetMirrorGrf( BOOL = TRUE ) const;
inline const SwCropGrf &GetCropGrf( BOOL = TRUE ) const;
inline const SwRotationGrf &GetRotationGrf(BOOL = TRUE ) const;
inline const SwLuminanceGrf &GetLuminanceGrf(BOOL = TRUE ) const;
@@ -272,9 +266,9 @@ public:
inline const SwParaConnectBorderItem &GetParaConnectBorder(BOOL = TRUE ) const;
// TabellenBox-Attribute - impl. steht im cellatr.hxx
- INLINE const SwTblBoxNumFormat &GetTblBoxNumFmt( BOOL = TRUE ) const;
- INLINE const SwTblBoxFormula &GetTblBoxFormula( BOOL = TRUE ) const;
- INLINE const SwTblBoxValue &GetTblBoxValue( BOOL = TRUE ) const;
+ inline const SwTblBoxNumFormat &GetTblBoxNumFmt( BOOL = TRUE ) const;
+ inline const SwTblBoxFormula &GetTblBoxFormula( BOOL = TRUE ) const;
+ inline const SwTblBoxValue &GetTblBoxValue( BOOL = TRUE ) const;
/** SwFmt::IsBackgroundTransparent - for feature #99657#
@@ -311,8 +305,6 @@ inline SfxItemState SwFmt::GetItemState( USHORT nWhich, BOOL bSrchInParent,
return aSet.GetItemState( nWhich, bSrchInParent, ppItem );
}
-#undef INLINE
-
} //namespace binfilter
#endif // _FORMAT_HXX
diff --git a/binfilter/inc/bf_sw/frmatr.hxx b/binfilter/inc/bf_sw/frmatr.hxx
index b182ebc..ee4f045 100644
--- a/binfilter/inc/bf_sw/frmatr.hxx
+++ b/binfilter/inc/bf_sw/frmatr.hxx
@@ -33,15 +33,10 @@
#include <format.hxx> //fuer Implementierung der inlines
namespace binfilter {
-//------------------------ Inlines ---------------------------------
-
-
/******************************************************************************
* Implementierung der FrameAttribut Methoden vom SwAttrSet
******************************************************************************/
-#if ! (defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
inline const SvxPaperBinItem &SwAttrSet::GetPaperBin(BOOL bInP) const
{ return (const SvxPaperBinItem&)Get( RES_PAPER_BIN,bInP); }
inline const SvxLRSpaceItem &SwAttrSet::GetLRSpace(BOOL bInP) const
@@ -101,8 +96,6 @@ inline const SvxMacroItem &SwFmt::GetMacro(BOOL bInP) const
inline const SvxFrameDirectionItem &SwFmt::GetFrmDir(BOOL bInP) const
{ return aSet.GetFrmDir(bInP); }
-#endif
-
} //namespace binfilter
#endif //_FRMATR_HXX
diff --git a/binfilter/inc/bf_sw/grfatr.hxx b/binfilter/inc/bf_sw/grfatr.hxx
index b78866b..7ae94e8 100644
--- a/binfilter/inc/bf_sw/grfatr.hxx
+++ b/binfilter/inc/bf_sw/grfatr.hxx
@@ -288,11 +288,8 @@ public:
* Implementierung der GrafikAttribut Methoden vom SwAttrSet
******************************************************************************/
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
inline const SwMirrorGrf &SwAttrSet::GetMirrorGrf(BOOL bInP) const
{ return (const SwMirrorGrf&)Get( RES_GRFATR_MIRRORGRF,bInP); }
-#endif
inline const SwCropGrf &SwAttrSet::GetCropGrf(BOOL bInP) const
{ return (const SwCropGrf&)Get( RES_GRFATR_CROPGRF,bInP); }
inline const SwRotationGrf &SwAttrSet::GetRotationGrf(BOOL bInP) const
@@ -320,11 +317,8 @@ inline const SwDrawModeGrf &SwAttrSet::GetDrawModeGrf(BOOL bInP) const
* Implementierung der GrafikAttribut Methoden vom SwFmt
******************************************************************************/
-#if ! (defined(MACOSX) && ( __GNUC__ < 3 ) )
-// GrP moved to gcc_outl.cxx; revisit with gcc3
inline const SwMirrorGrf &SwFmt::GetMirrorGrf(BOOL bInP) const
{ return aSet.GetMirrorGrf(bInP); }
-#endif
inline const SwCropGrf &SwFmt::GetCropGrf(BOOL bInP) const
{ return aSet.GetCropGrf(bInP); }
inline const SwRotationGrf &SwFmt::GetRotationGrf(BOOL bInP) const
diff --git a/binfilter/inc/bf_sw/ndgrf.hxx b/binfilter/inc/bf_sw/ndgrf.hxx
index 4f57cd8..8a74bfa 100644
--- a/binfilter/inc/bf_sw/ndgrf.hxx
+++ b/binfilter/inc/bf_sw/ndgrf.hxx
@@ -165,8 +165,6 @@ public:
// ----------------------------------------------------------------------
// Inline Metoden aus Node.hxx - erst hier ist der TxtNode bekannt !!
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
inline SwGrfNode *SwNode::GetGrfNode()
{
return ND_GRFNODE == nNodeType ? (SwGrfNode*)this : 0;
@@ -175,7 +173,6 @@ inline const SwGrfNode *SwNode::GetGrfNode() const
{
return ND_GRFNODE == nNodeType ? (const SwGrfNode*)this : 0;
}
-#endif
#ifndef _FESHVIEW_ONLY_INLINE_NEEDED
inline BOOL SwGrfNode::IsLinkedFile() const
diff --git a/binfilter/inc/bf_sw/ndnotxt.hxx b/binfilter/inc/bf_sw/ndnotxt.hxx
index c9b8edb..6acb46c 100644
--- a/binfilter/inc/bf_sw/ndnotxt.hxx
+++ b/binfilter/inc/bf_sw/ndnotxt.hxx
@@ -105,17 +105,15 @@ inline SwGrfFmtColl* SwNoTxtNode::GetGrfColl() const
}
// Inline Metoden aus Node.hxx - erst hier ist der TxtNode bekannt !!
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
inline SwNoTxtNode *SwNode::GetNoTxtNode()
{
return ND_NOTXTNODE & nNodeType ? (SwNoTxtNode*)this : 0;
}
+
inline const SwNoTxtNode *SwNode::GetNoTxtNode() const
{
return ND_NOTXTNODE & nNodeType ? (const SwNoTxtNode*)this : 0;
}
-#endif
} //namespace binfilter
#endif // _NDNOTXT_HXX
diff --git a/binfilter/inc/bf_sw/ndole.hxx b/binfilter/inc/bf_sw/ndole.hxx
index ae006cc..12411da 100644
--- a/binfilter/inc/bf_sw/ndole.hxx
+++ b/binfilter/inc/bf_sw/ndole.hxx
@@ -128,17 +128,15 @@ public:
// Inline Metoden aus Node.hxx - erst hier ist der TxtNode bekannt !!
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
inline SwOLENode *SwNode::GetOLENode()
{
return ND_OLENODE == nNodeType ? (SwOLENode*)this : 0;
}
+
inline const SwOLENode *SwNode::GetOLENode() const
{
return ND_OLENODE == nNodeType ? (const SwOLENode*)this : 0;
}
-#endif
} //namespace binfilter
#endif // _NDOLE_HXX
diff --git a/binfilter/inc/bf_sw/ndtxt.hxx b/binfilter/inc/bf_sw/ndtxt.hxx
index f904639..72643d7 100644
--- a/binfilter/inc/bf_sw/ndtxt.hxx
+++ b/binfilter/inc/bf_sw/ndtxt.hxx
@@ -276,7 +276,6 @@ public:
// fuers Umhaengen der TxtFmtCollections (Outline-Nummerierung!!)
virtual void Modify( SfxPoolItem*, SfxPoolItem* );
-// virtual BOOL GetInfo( SfxPoolItem& ) const;
// aus SwIndexReg
virtual void Update( const SwIndex & aPos, USHORT xub_StrLen,
@@ -317,18 +316,16 @@ inline SwTxtFmtColl* SwTxtNode::GetTxtColl() const
// fuer den IBM-Compiler nicht inlinen wg. 42876
#ifndef ICC
// Inline Metoden aus Node.hxx - erst hier ist der TxtNode bekannt !!
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP moved to gcc_outl.cxx; revisit with gcc3
inline SwTxtNode *SwNode::GetTxtNode()
{
return ND_TEXTNODE == nNodeType ? (SwTxtNode*)this : 0;
}
+
inline const SwTxtNode *SwNode::GetTxtNode() const
{
return ND_TEXTNODE == nNodeType ? (const SwTxtNode*)this : 0;
}
#endif
-#endif
inline void SwTxtNode::Cut(SwTxtNode *pDest, const SwIndex &rDestStart,
const SwIndex &rStart, xub_StrLen nLen)
diff --git a/binfilter/inc/bf_sw/node.hxx b/binfilter/inc/bf_sw/node.hxx
index ef68796..facb778 100644
--- a/binfilter/inc/bf_sw/node.hxx
+++ b/binfilter/inc/bf_sw/node.hxx
@@ -66,11 +66,7 @@ class SwPageDesc;
class ViewShell;
struct SwPosition;
-#if defined(MACOSX) && ( __GNUC__ < 3 )
-#define INLINE /* GrP revisit with gcc3 */
-#else
#define INLINE inline
-#endif
// --------------------
// class SwNode
diff --git a/binfilter/inc/bf_sw/swatrset.hxx b/binfilter/inc/bf_sw/swatrset.hxx
index 3f785c1..f14ba0c 100644
--- a/binfilter/inc/bf_sw/swatrset.hxx
+++ b/binfilter/inc/bf_sw/swatrset.hxx
@@ -141,12 +141,8 @@ class SwTblBoxFormula;
class SwTblBoxValue;
#ifndef INLINE
-#if defined(MACOSX) && ( __GNUC__ < 3 )
-#define INLINE /* GrP revisit with gcc3 */
-#else
#define INLINE inline
#endif
-#endif
class SwAttrPool : public SfxItemPool
{
diff --git a/binfilter/inc/bf_sw/unotxdoc.hxx b/binfilter/inc/bf_sw/unotxdoc.hxx
index 3de78a1..507f181 100644
--- a/binfilter/inc/bf_sw/unotxdoc.hxx
+++ b/binfilter/inc/bf_sw/unotxdoc.hxx
@@ -72,8 +72,6 @@
#include <cppuhelper/implbase4.hxx> // helper for implementations
#include <RefreshListenerContainer.hxx>
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
-// GrP Mac OS X internal compiler error; revisit with gcc3
#define __IFC27 Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, Ifc13, Ifc14, Ifc15, Ifc16, \
Ifc17, Ifc18, Ifc19, Ifc20, Ifc21, Ifc22, Ifc23, Ifc24, Ifc25, Ifc26, Ifc27
@@ -108,7 +106,6 @@ public Ifc25, public Ifc26, public Ifc27
#include <cppuhelper/implbase_ex_post.hxx>
__DEF_IMPLHELPER_EX( 27 )
-#endif
namespace binfilter {
class SwDoc;
@@ -127,171 +124,6 @@ SV_DECL_PTRARR(ActionContextArr, UnoActionContextPtr, 4, 4)
*
******************************************************************************/
-#if defined(MACOSX) && ( __GNUC__ < 3 )
-// [ed] Explicit template instantiation to workaround compiler ICE
-
-namespace cppu
-{
- struct ClassData27 : public ClassDataBase
- {
- Type_Offset arType2Offset[ 27 ];
- ClassData27( ) SAL_THROW( () )
- : ClassDataBase( 27 )
- {}
- };
-
- class SAL_NO_VTABLE ImplHelperBase27
- : public ::com::sun::star::lang::XTypeProvider
- , public ::com::sun::star::text::XTextDocument, public ::com::sun::star::text::XLineNumberingProperties, public ::com::sun::star::text::XChapterNumberingSupplier, public ::com::sun::star::text::XFootnotesSupplier,
-public ::com::sun::star::text::XEndnotesSupplier, public ::com::sun::star::util::XReplaceable, public ::com::sun::star::text::XPagePrintable, public ::com::sun::star::text::XReferenceMarksSupplier, public ::com::sun::star::text::XTextTablesSupplier,
-public ::com::sun::star::text::XTextFramesSupplier, public ::com::sun::star::text::XBookmarksSupplier, public ::com::sun::star::text::XTextSectionsSupplier, public ::com::sun::star::text::XTextGraphicObjectsSupplier, public ::com::sun::star::text::XTextEmbeddedObjectsSupplier,
-public ::com::sun::star::text::XTextFieldsSupplier, public ::com::sun::star::style::XStyleFamiliesSupplier, public ::com::sun::star::lang::XServiceInfo, public ::com::sun::star::drawing::XDrawPageSupplier, public ::com::sun::star::text::XDocumentIndexesSupplier,
-public ::com::sun::star::beans::XPropertySet, public ::com::sun::star::beans::XPropertyState, public ::com::sun::star::document::XLinkTargetSupplier, public ::com::sun::star::document::XRedlinesSupplier, public ::com::sun::star::util::XRefreshable,
-public ::com::sun::star::util::XLinkUpdate, public ::com::sun::star::lang::XUnoTunnel, public ::com::sun::star::view::XRenderable
- {
- protected:
- ClassData & SAL_CALL getClassData( ClassDataBase & s_aCD ) SAL_THROW( () )
- {
- ClassData & rCD = * static_cast< ClassData * >( &s_aCD );
- if (! rCD.bOffsetsInit)
- {
- ::osl::MutexGuard aGuard( getImplHelperInitMutex() );
- if (! rCD.bOffsetsInit)
- {
- char * pBase = (char *)this;
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextDocument > *)0 ),
- (char *)(::com::sun::star::text::XTextDocument *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XLineNumberingProperties > *)0 ),
- (char *)(::com::sun::star::text::XLineNumberingProperties *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XChapterNumberingSupplier > *)0 ),
- (char *)(::com::sun::star::text::XChapterNumberingSupplier *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnotesSupplier > *)0 ),
- (char *)(::com::sun::star::text::XFootnotesSupplier *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XEndnotesSupplier > *)0 ),
- (char *)(::com::sun::star::text::XEndnotesSupplier *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::util::XReplaceable > *)0 ),
- (char *)(::com::sun::star::util::XReplaceable *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XPagePrintable > *)0 ),
- (char *)(::com::sun::star::text::XPagePrintable *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XReferenceMarksSupplier > *)0 ),
- (char *)(::com::sun::star::text::XReferenceMarksSupplier *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextTablesSupplier > *)0 ),
- (char *)(::com::sun::star::text::XTextTablesSupplier *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextFramesSupplier > *)0 ),
- (char *)(::com::sun::star::text::XTextFramesSupplier *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XBookmarksSupplier > *)0 ),
- (char *)(::com::sun::star::text::XBookmarksSupplier *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSectionsSupplier > *)0 ),
- (char *)(::com::sun::star::text::XTextSectionsSupplier *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextGraphicObjectsSupplier > *)0 ),
- (char *)(::com::sun::star::text::XTextGraphicObjectsSupplier *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextEmbeddedObjectsSupplier > *)0 ),
- (char *)(::com::sun::star::text::XTextEmbeddedObjectsSupplier *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextFieldsSupplier > *)0 ),
- (char *)(::com::sun::star::text::XTextFieldsSupplier *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyleFamiliesSupplier > *)0 ),
- (char *)(::com::sun::star::style::XStyleFamiliesSupplier *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo > *)0 ),
- (char *)(::com::sun::star::lang::XServiceInfo *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPageSupplier > *)0 ),
- (char *)(::com::sun::star::drawing::XDrawPageSupplier *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::text::XDocumentIndexesSupplier > *)0 ),
- (char *)(::com::sun::star::text::XDocumentIndexesSupplier *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > *)0 ),
- (char *)(::com::sun::star::beans::XPropertySet *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState > *)0 ),
- (char *)(::com::sun::star::beans::XPropertyState *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::document::XLinkTargetSupplier > *)0 ),
- (char *)(::com::sun::star::document::XLinkTargetSupplier *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::document::XRedlinesSupplier > *)0 ),
- (char *)(::com::sun::star::document::XRedlinesSupplier *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable > *)0 ),
- (char *)(::com::sun::star::util::XRefreshable *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::util::XLinkUpdate > *)0 ),
- (char *)(::com::sun::star::util::XLinkUpdate *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > *)0 ),
- (char *)(::com::sun::star::lang::XUnoTunnel *)this - pBase );
- rCD.writeTypeOffset( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::view::XRenderable > *)0 ),
- (char *)(::com::sun::star::view::XRenderable *)this - pBase );
- rCD.bOffsetsInit = sal_True;
- }
- }
- return rCD;
- }
- };
-
-
- class SAL_NO_VTABLE ImplHelper27
- : public ImplHelperBase27
- {
- static ClassData27 s_aCD;
- public:
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException)
- { return getClassData( s_aCD ).query( rType, (ImplHelperBase27 *)this ); }
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
- { return getClassData( s_aCD ).getTypes(); }
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
- { return getClassData( s_aCD ).getImplementationId(); }
- };
-
- class SAL_NO_VTABLE WeakImplHelper27
- : public ::cppu::OWeakObject
- , public ImplHelperBase27
- {
- static ClassData27 s_aCD;
- public:
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException)
- {
- ::com::sun::star::uno::Any aRet( getClassData( s_aCD ).query( rType, (ImplHelperBase27 *)this ) );
- return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
- }
- virtual void SAL_CALL acquire() throw ()
- { OWeakObject::acquire(); }
- virtual void SAL_CALL release() throw ()
- { OWeakObject::release(); }
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
- { return getClassData( s_aCD ).getTypes(); }
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
- { return getClassData( s_aCD ).getImplementationId(); }
- };
-
- class SAL_NO_VTABLE WeakAggImplHelper27
- : public ::cppu::OWeakAggObject
- , public ImplHelperBase27
- {
- static ClassData27 s_aCD;
- public:
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException)
- { return OWeakAggObject::queryInterface( rType ); }
- virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException)
- {
- ::com::sun::star::uno::Any aRet( getClassData( s_aCD ).query( rType, (ImplHelperBase27 *)this ) );
- return (aRet.hasValue() ? aRet : OWeakAggObject::queryAggregation( rType ));
- }
- virtual void SAL_CALL acquire() throw ()
- { OWeakAggObject::acquire(); }
- virtual void SAL_CALL release() throw ()
- { OWeakAggObject::release(); }
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException)
- { return getClassData( s_aCD ).getTypes(); }
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException)
- { return getClassData( s_aCD ).getImplementationId(); }
- };
-
-#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
- template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 >
- ClassData12 ImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 >::s_aCD = ClassData12( 0 );
- template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 >
- ClassData12 WeakImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 >::s_aCD = ClassData12( 1 );
- template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 >
- ClassData12 WeakAggImplHelper12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12 >::s_aCD = ClassData12( 2 );
-#endif
-
-}
-
-typedef cppu::WeakImplHelper27 SwXTextDocumentBaseClass;
-#else
-
typedef cppu::WeakImplHelper27
<
::com::sun::star::text::XTextDocument,
@@ -324,7 +156,6 @@ typedef cppu::WeakImplHelper27
>
SwXTextDocumentBaseClass;
-#endif /* MACOSX */
class SwXTextDocument : public SwXTextDocumentBaseClass,
public SvxFmMSFactory,
public SfxBaseModel
@@ -353,7 +184,6 @@ class SwXTextDocument : public SwXTextDocumentBaseClass,
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > * pxXTextFieldMasters;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > * pxXTextSections;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > * pxXBookmarks;
-// ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > * pxXTextShapes;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > * pxXTextTables;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > * pxXTextFrames;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > * pxXGraphicObjects;
diff --git a/binfilter/inc/bf_xmloff/txtimp.hxx b/binfilter/inc/bf_xmloff/txtimp.hxx
index d19ba1b..9d5fd8e 100644
--- a/binfilter/inc/bf_xmloff/txtimp.hxx
+++ b/binfilter/inc/bf_xmloff/txtimp.hxx
@@ -452,15 +452,9 @@ protected:
// access, lazy initialization and destruction of backpatchers
// Code is implemented in XMLPropertyBackpatcher.cxx
-#if !(defined(MACOSX) && (__GNUC__ < 3))
inline XMLPropertyBackpatcher<sal_Int16>& GetFootnoteBP();
inline XMLPropertyBackpatcher<sal_Int16>& GetSequenceIdBP();
inline XMLPropertyBackpatcher< ::rtl::OUString> & GetSequenceNameBP();
-#else
- XMLPropertyBackpatcher<sal_Int16>& GetFootnoteBP();
- XMLPropertyBackpatcher<sal_Int16>& GetSequenceIdBP();
- XMLPropertyBackpatcher< ::rtl::OUString> & GetSequenceNameBP();
-#endif
public:
commit 899c4e04cd45d4b0174af04c45070d74392e446d
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sun Sep 18 14:41:51 2011 -0700
Some more DBG_BF_ASSERT cleanup in bf_sw
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
index 5a6a77c..a20c8c7 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
@@ -1292,24 +1292,12 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& /
if( pDocShell && pDoc )
{
uno::Reference< awt::XDevice > xRenderDevice;
- const sal_Int32 nPageNumber = nRenderer + 1;
for( sal_Int32 nProperty = 0, nPropertyCount = rxOptions.getLength(); nProperty < nPropertyCount; ++nProperty )
{
if( rxOptions[ nProperty ].Name == OUString( RTL_CONSTASCII_USTRINGPARAM( "RenderDevice" ) ) )
rxOptions[ nProperty].Value >>= xRenderDevice;
}
-
- if( xRenderDevice.is() && nPageNumber && ( nPageNumber <= pDoc->GetSdPageCount( PK_STANDARD ) ) )
- {
- VCLXDevice* pDevice = VCLXDevice::GetImplementation( xRenderDevice );
- OutputDevice* pOut = pDevice ? pDevice->GetOutputDevice() : NULL;
-
- if( pOut )
- {
- DBG_BF_ASSERT(0, "STRIP");
- }
- }
}
}
diff --git a/binfilter/bf_starmath/source/starmath_document.cxx b/binfilter/bf_starmath/source/starmath_document.cxx
index 680bd55..4678057 100644
--- a/binfilter/bf_starmath/source/starmath_document.cxx
+++ b/binfilter/bf_starmath/source/starmath_document.cxx
@@ -433,54 +433,54 @@ static const char pStarMathDoc[] = "StarMathDocument";
/*N*/ }
-/*N*/ BOOL SmDocShell::Load(SvStorage *pStor)
-/*N*/ {
-/*N*/ BOOL bRet = FALSE;
-/*N*/ if( SfxInPlaceObject::Load( pStor ))
-/*N*/ {
-/*N*/ String aTmpStr( C2S( "Equation Native" ));
-/*N*/ if( pStor->IsStream( aTmpStr ))
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else if( pStor->IsStream(C2S("content.xml")) ||
-/*N*/ pStor->IsStream(C2S("Content.xml")) )
-/*N*/ {
-/*?*/ // is this a fabulous math package ?
-/*?*/ Reference< ::com::sun::star::frame::XModel> xModel(GetModel());
-/*?*/ SmXMLWrapper aEquation(xModel);
-/*?*/ SfxMedium aMedium(pStor);
-/*?*/ ULONG nError = aEquation.Import(aMedium);
-/*?*/ bRet = 0 == nError;
-/*?*/ SetError( nError );
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ bRet = Try3x(pStor, STREAM_READWRITE);
-/*N*/
-/*N*/ if( !bRet )
-/*N*/ {
-/*?*/ pStor->Remove(String::CreateFromAscii(pStarMathDoc));
-/*?*/ bRet = Try2x(pStor, STREAM_READWRITE);
-/*?*/ pStor->Remove(C2S("\1Ole10Native"));
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ long nVersion = pStor->GetVersion();
-/*N*/ if ( nVersion <= SOFFICE_FILEFORMAT_40 )
-/*N*/ ConvertText( aText, CONVERT_40_TO_50 );
-/*N*/ if ( nVersion <= SOFFICE_FILEFORMAT_50 )
-/*N*/ ConvertText( aText, CONVERT_50_TO_60 );
-/*N*/ if (pTree)
-/*?*/ { delete pTree;
-/*?*/ pTree = NULL;
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ FinishedLoading( SFX_LOADED_ALL );
-/*N*/ return bRet;
-/*N*/ }
+BOOL SmDocShell::Load(SvStorage *pStor)
+{
+ BOOL bRet = FALSE;
+ if( SfxInPlaceObject::Load( pStor ))
+ {
+ String aTmpStr( C2S( "Equation Native" ));
+ if( !pStor->IsStream( aTmpStr ) )
+ {
+ if ( pStor->IsStream(C2S("content.xml"))
+ || pStor->IsStream(C2S("Content.xml"))
+ )
+ {
+ // is this a fabulous math package ?
+ Reference< ::com::sun::star::frame::XModel> xModel(GetModel());
+ SmXMLWrapper aEquation(xModel);
+ SfxMedium aMedium(pStor);
+ ULONG nError = aEquation.Import(aMedium);
+ bRet = 0 == nError;
+ SetError( nError );
+ }
+ else
+ {
+ bRet = Try3x(pStor, STREAM_READWRITE);
+ if( !bRet )
+ {
+ pStor->Remove(String::CreateFromAscii(pStarMathDoc));
+ bRet = Try2x(pStor, STREAM_READWRITE);
+ pStor->Remove(C2S("\1Ole10Native"));
+ }
+ else
+ {
+ long nVersion = pStor->GetVersion();
+ if ( nVersion <= SOFFICE_FILEFORMAT_40 )
+ ConvertText( aText, CONVERT_40_TO_50 );
+ if ( nVersion <= SOFFICE_FILEFORMAT_50 )
+ ConvertText( aText, CONVERT_50_TO_60 );
+ if (pTree)
+ {
+ delete pTree;
+ pTree = NULL;
+ }
+ }
+ }
+ }
+ }
+ FinishedLoading( SFX_LOADED_ALL );
+ return bRet;
+}
/*N*/ void SmDocShell::HandsOff()
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx b/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx
index 2dad828..e4eb8ac 100644
--- a/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx
@@ -343,9 +343,6 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
/*N*/ {
/*N*/ if( nId == ( pNewColl = (*pTxtFmtCollTbl)[ n ] )->GetPoolFmtId() )
/*N*/ {
-/*N*/ if( pDesc )
-/*N*/ pNewColl->GetPresentation( ePres, eCoreMetric,
-/*N*/ ePresMetric, *pDesc );
/*N*/ return pNewColl;
/*N*/ }
/*N*/ if( !pDesc && pNewColl->GetOutlineLevel() < MAXLEVEL )
@@ -1068,17 +1065,11 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
/*N*/ {
/*N*/ if( pDesc )
/*N*/ {
-/*?*/ String aStr;
-/*?*/ aSet.GetPresentation( ePres, eCoreMetric, ePresMetric, aStr );
/*?*/ pDesc->AppendAscii( sKomma );
-/*?*/ *pDesc += aStr;
/*N*/ }
/*N*/ else
/*N*/ {
/*N*/ pNewColl->SetAttr( aSet );
-/*N*/ // JP 31.08.95: erzeugen einer PoolVorlage ist keine Modifikation
-/*N*/ // (Bug: 18545)
-/*N*/ // SetModified();
/*N*/ }
/*N*/ }
/*N*/ return pNewColl;
@@ -1162,9 +1153,6 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
/*M*/ if( nId == ( pNewFmt = (SwFmt*)(*pArray[ nArrCnt ] )[ n ] )->
/*M*/ GetPoolFmtId() )
/*M*/ {
-/*M*/ if( pDesc )
-/*M*/ pNewFmt->GetPresentation( ePres, eCoreMetric,
-/*M*/ ePresMetric, *pDesc );
/*M*/ return pNewFmt;
/*M*/ }
/*M*/
@@ -1368,17 +1356,11 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
/*M*/ {
/*M*/ if( pDesc )
/*M*/ {
-/*M*/ String aStr;
-/*M*/ aSet.GetPresentation( ePres, eCoreMetric, ePresMetric, aStr );
/*M*/ pDesc->AppendAscii( sKomma );
-/*M*/ *pDesc += aStr;
/*M*/ }
/*M*/ else
/*M*/ {
/*M*/ pNewFmt->SetAttr( aSet );
-/*M*/ // JP 31.08.95: erzeugen einer PoolVorlage ist keine Modifikation
-/*M*/ // (Bug: 18545)
-/*M*/ // SetModified();
/*M*/ }
/*M*/ }
/*M*/ return pNewFmt;
@@ -1558,19 +1540,13 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
/*N*/ {
/*N*/ if( pDesc )
/*N*/ {
-/*?*/ String aStr;
-/*?*/ aSet.GetPresentation( ePres, eCoreMetric, ePresMetric, aStr );
/*?*/ pDesc->AppendAscii( sKomma );
-/*?*/ *pDesc += aStr;
/*N*/ }
/*N*/ else
/*N*/ {
/*N*/ if( bSetLeft )
/*N*/ pNewPgDsc->GetLeft().SetAttr( aSet );
/*N*/ pNewPgDsc->GetMaster().SetAttr( aSet );
-/*N*/ // JP 31.08.95: erzeugen einer PoolVorlage ist keine Modifikation
-/*N*/ // (Bug: 18545)
-/*N*/ // SetModified();
/*N*/ }
/*N*/ }
/*N*/ return pNewPgDsc;
diff --git a/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx b/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx
index f1fa1b9..70c2c7b 100644
--- a/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx
@@ -648,17 +648,17 @@ SwDBNumSetFieldType::SwDBNumSetFieldType()
/*N*/ return pTmp;
/*N*/ }
-/*N*/ void SwDBNumSetField::Evaluate(SwDoc* pDoc)
-/*N*/ {
-/*N*/ SwNewDBMgr* pMgr = pDoc->GetNewDBMgr();
-/*N*/ const SwDBData& aTmpData = GetDBData();
-/*N*/
-/*N*/ if( bCondValid && pMgr && pMgr->IsInMerge() &&
-/*N*/ pMgr->IsDataSourceOpen(aTmpData.sDataSource, aTmpData.sCommand, sal_True))
-/*N*/ { // Bedingug OK -> aktuellen Set einstellen
-/*N*/ pMgr->ToRecordId(Max((USHORT)aPar2.ToInt32(), USHORT(1))-1);
-/*N*/ }
-/*N*/ }
+void SwDBNumSetField::Evaluate(SwDoc* pDoc)
+{
+ SwNewDBMgr* pMgr = pDoc->GetNewDBMgr();
+ const SwDBData& aTmpData = GetDBData();
+
+ if( bCondValid
+ && pMgr
+ && pMgr->IsInMerge()
+ && pMgr->IsDataSourceOpen(aTmpData.sDataSource, aTmpData.sCommand, sal_True)
+ ); // IsDataSourceOpen() may have a side effect
+}
/*--------------------------------------------------------------------
Beschreibung: LogDBName
diff --git a/binfilter/bf_sw/source/ui/app/sw_apphdl.cxx b/binfilter/bf_sw/source/ui/app/sw_apphdl.cxx
index 466f0d4..bb03c4e 100644
--- a/binfilter/bf_sw/source/ui/app/sw_apphdl.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_apphdl.cxx
@@ -57,7 +57,6 @@
#include <modcfg.hxx>
#include <fontcfg.hxx>
#include <barcfg.hxx>
-#include <uinums.hxx>
#include <dbconfig.hxx>
#include <bf_sfx2/app.hxx>
@@ -106,7 +105,6 @@ namespace binfilter {
/*M*/ DELETEZ(pModuleConfig);
/*M*/ DELETEZ(pPrtOpt) ;
/*M*/ DELETEZ(pWebPrtOpt) ;
-/*M*/ DELETEZ(pChapterNumRules);
/*M*/ DELETEZ(pStdFontConfig) ;
/*M*/ DELETEZ(pAuthorNames) ;
/*M*/ DELETEZ(pDBConfig);
diff --git a/binfilter/bf_sw/source/ui/app/sw_swmodul1.cxx b/binfilter/bf_sw/source/ui/app/sw_swmodul1.cxx
index 8612043..801948f 100644
--- a/binfilter/bf_sw/source/ui/app/sw_swmodul1.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_swmodul1.cxx
@@ -66,7 +66,6 @@
#include <docsh.hxx>
#include <dbmgr.hxx>
-#include <uinums.hxx>
#include <prtopt.hxx> // fuer PrintOptions
#include <doc.hxx>
#include <cmdid.h>
diff --git a/binfilter/bf_sw/source/ui/app/sw_swmodule.cxx b/binfilter/bf_sw/source/ui/app/sw_swmodule.cxx
index 82ee1f0..12baf7a 100644
--- a/binfilter/bf_sw/source/ui/app/sw_swmodule.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_swmodule.cxx
@@ -56,7 +56,6 @@
#include <wdocsh.hxx>
#include <globdoc.hxx>
#include <usrpref.hxx>
-#include <uinums.hxx>
#include <prtopt.hxx>
#include <modcfg.hxx>
#include <fontcfg.hxx>
@@ -115,7 +114,6 @@ using namespace ::rtl;
/*N*/ pWebUsrPref(0),
/*N*/ pPrtOpt(0),
/*N*/ pWebPrtOpt(0),
-/*N*/ pChapterNumRules(0),
/*N*/ pStdFontConfig(0),
/*N*/ pDBConfig(0),
/*N*/ pColorConfig(0),
diff --git a/binfilter/bf_sw/source/ui/dbui/sw_dbmgr.cxx b/binfilter/bf_sw/source/ui/dbui/sw_dbmgr.cxx
index 6c1b3a6..30f733a 100644
--- a/binfilter/bf_sw/source/ui/dbui/sw_dbmgr.cxx
+++ b/binfilter/bf_sw/source/ui/dbui/sw_dbmgr.cxx
@@ -340,11 +340,6 @@ const sal_Char cActiveConnection[] = "ActiveConnection";
/*N*/ }
-/*N*/ sal_Bool SwNewDBMgr::ToRecordId(sal_Int32)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*N*/ }
-
-
/*N*/ BOOL SwNewDBMgr::OpenDataSource(const String& rDataSource, const String& rTableOrQuery, sal_Int32 nCommandType)
/*N*/ {
/*?*/ SwDBData aData;
diff --git a/binfilter/bf_sw/source/ui/envelp/label.hrc b/binfilter/bf_sw/source/ui/envelp/label.hrc
deleted file mode 100644
index 97cba9c..0000000
--- a/binfilter/bf_sw/source/ui/envelp/label.hrc
+++ /dev/null
@@ -1,117 +0,0 @@
-/*************************************************************************
- *
- * 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 _LABEL_HRC
-#define _LABEL_HRC
-
-// Lokale Resourcen *********************************************************
-
-#define TXT_WRITING 1
-#define BOX_ADDR 2
-#define EDT_WRITING 3
-#define FT_DATABASE 4
-#define LB_DATABASE 5
-#define FT_TABLE 6
-#define LB_TABLE 7
-#define FL_WRITING 8
-#define BTN_CONT 9
-#define BTN_SHEET 10
-#define TXT_MAKE 11
-#define BOX_MAKE 12
-#define TXT_TYPE 13
-#define BOX_TYPE 14
-#define INF_FORMAT 15
-#define FL_FORMAT 16
-#define FT_DBFIELD 17
-#define LB_DBFIELD 18
-#define BTN_INSERT 19
-#define BTN_SYNC 20
-
-#define RB_FROM_AUTO_TEXT 1
-#define RB_FROM_EDIT 2
-#define LB_AUTO_TEXT 3
-#define FT_AUTO_TEXT_GROUP 4
-#define LB_AUTO_TEXT_GROUP 5
-#define ED_TEXT 6
-#define FL_CONTENT 7
-#define WIN_EXAMPLE 8
-#define ST_VISCARD_GROUP 10
-
-#define FL_DATA 30
-#define FT_NAME 31
-#define ED_FIRSTNAME 32
-#define ED_NAME 33
-#define ED_SHORTCUT 34
-#define FT_STREET 35
-#define ED_STREET 36
-#define FT_ZIPCITY 37
-#define ED_ZIP 38
-#define ED_CITY 39
-#define FT_COUNTRYSTATE 40
-#define ED_COUNTRY 41
-#define FT_TITLEPROF 42
-#define ED_PROFESSION 43
-#define ED_TITLE 44
-
-#define ED_PHONE 46
-#define ED_MOBILE 47
-
-#define ED_FAX 49
-#define FT_WWWMAIL 50
-#define ED_WWW 51
-#define ED_MAIL 52
-#define ED_STATE 53
-#define FT_COMP 54
-#define ED_COMP 55
-#define FT_COMP_EXT 56
-#define ED_COMP_EXT 57
-#define FT_SLOGAN 58
-#define ED_SLOGAN 59
-#define FT_POSITION 60
-#define ED_POSITION 61
-
-#define ST_BUSINESSCARDDLG 62
-#define ST_FIRSTPAGE_LAB 63
-#define ST_FIRSTPAGE_BC 64
-
-#define FT_NAME_2 65
-#define ED_FIRSTNAME_2 66
-#define ED_NAME_2 67
-#define ED_SHORTCUT_2 68
-
-#define FT_PHONE_MOBILE 70
-//#define FT_PHONE 71
-//#define FT_MOBILE 72
-#define FT_FAX 73
-
-// Globale Resourcen ********************************************************
-
-// Ueberlaufpruefung ********************************************************
-
-
-#endif
-
diff --git a/binfilter/bf_sw/source/ui/envelp/makefile.mk b/binfilter/bf_sw/source/ui/envelp/makefile.mk
deleted file mode 100644
index 8af5e0e..0000000
--- a/binfilter/bf_sw/source/ui/envelp/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-BFPRJ=..$/..$/..
-
-PRJNAME=binfilter
-TARGET=sw_envelp
-
-NO_HIDS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/inc$/bf_sw$/swpre.mk
-.INCLUDE : settings.mk
-alllangiso=en-US
-.INCLUDE : $(PRJ)$/inc$/bf_sw$/sw.mk
-INC+= -I$(PRJ)$/inc$/bf_sw
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =\
- sw_label.src
-
-SLOFILES = \
- $(SLO)$/sw_envimg.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/binfilter/bf_sw/source/ui/envelp/sw_envimg.cxx b/binfilter/bf_sw/source/ui/envelp/sw_envimg.cxx
deleted file mode 100644
index 812d9fd..0000000
--- a/binfilter/bf_sw/source/ui/envelp/sw_envimg.cxx
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#ifdef _MSC_VER
-#pragma hdrstop
-#endif
-
-#include <swtypes.hxx>
-#include <envimg.hxx>
-
-#include <cmdid.h>
-namespace binfilter {
-
-#ifdef WIN
-#define NEXTLINE UniString::CreateFromAscii("\r\n")
-#else
-#define NEXTLINE '\n'
-#endif
-
-using namespace utl;
-using namespace ::com::sun::star::uno;
-using ::rtl::OUString;
-
-#define C2U(cChar) OUString::createFromAscii(cChar)
-
-/*N*/ TYPEINIT1_AUTOFACTORY( SwEnvItem, SfxPoolItem );
-
-/*N*/ SwEnvItem::SwEnvItem() :
-/*N*/ SfxPoolItem(FN_ENVELOP)
-/*N*/ {
-/*N*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-// --------------------------------------------------------------------------
-/*N*/ SwEnvItem::SwEnvItem(const SwEnvItem& rItem) :
-/*N*/ SfxPoolItem(FN_ENVELOP),
-/*N*/ aAddrText (rItem.aAddrText),
-/*N*/ bSend (rItem.bSend),
-/*N*/ aSendText (rItem.aSendText),
-/*N*/ lAddrFromLeft (rItem.lAddrFromLeft),
-/*N*/ lAddrFromTop (rItem.lAddrFromTop),
-/*N*/ lSendFromLeft (rItem.lSendFromLeft),
-/*N*/ lSendFromTop (rItem.lSendFromTop),
-/*N*/ lWidth (rItem.lWidth),
-/*N*/ lHeight (rItem.lHeight),
-/*N*/ eAlign (rItem.eAlign),
-/*N*/ bPrintFromAbove(rItem.bPrintFromAbove),
-/*N*/ lShiftRight (rItem.lShiftRight),
-/*N*/ lShiftDown (rItem.lShiftDown)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-// --------------------------------------------------------------------------
-/*N*/ int SwEnvItem::operator ==(const SfxPoolItem&) const
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*N*/ }
-
-// --------------------------------------------------------------------------
-/*N*/ SfxPoolItem* SwEnvItem::Clone(SfxItemPool*) const
-/*N*/ {
-/*N*/ return new SwEnvItem(*this);
-/*N*/ }
-// --------------------------------------------------------------------------
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/ui/envelp/sw_label.src b/binfilter/bf_sw/source/ui/envelp/sw_label.src
deleted file mode 100644
index bbe2ff5..0000000
--- a/binfilter/bf_sw/source/ui/envelp/sw_label.src
+++ /dev/null
@@ -1,92 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-#define NO_LOCALIZE_EXPORT
-
-#include "label.hrc"
-#include "globals.hrc"
-#include "helpid.h"
-// ----- defined strings -----------------------------------------------------
-#define LABEL_STRING \
- Text [ de ] = "Etiketten" ; \
- Text [ en-US ] = "Labels" ; \
- Text[ pt ] = "Etiquetas";\
- Text[ ru ] = "Ðтикетки";\
- Text[ el ] = "ΕτικÎτες";\
- Text[ nl ] = "Etiketten";\
- Text[ fr ] = "Étiquettes";\
- Text[ es ] = "Etiquetas";\
- Text[ fi ] = "Osoitetarrat";\
- Text[ ca ] = "Etiquetes";\
- Text[ it ] = "Etichette";\
- Text[ sk ] = "Å tÃtky";\
- Text[ da ] = "Etiketter";\
- Text[ sv ] = "Etiketter";\
- Text[ pl ] = "Etykiety";\
- Text[ pt-BR ] = "Etiquetas";\
- Text[ th ] = "ป้ายชื่à¸";\
- Text[ ja ] = "ラベル書ã";\
- Text[ ko ] = "ë ˆì´ë¸”";\
- Text[ zh-CN ] = "æ ‡ç¾";\
- Text[ zh-TW ] = "貼標";\
- Text[ tr ] = "Etiket";\
- Text[ hi-IN ] = "लेबिलें";\
- Text[ ar ] = "بطاقات عنونة";\
- Text[ he ] = "‮מדבקות‬";\
-
-#define BUSINESS_CARD_STRING \
- Text [ de ] = "Visitenkarten" ; \
- Text [ en-US ] = "Business Cards"; \
- Text[ pt ] = "Cartões de visita";\
- Text[ ru ] = "Визитные карточки";\
- Text[ el ] = "ΕπαγγελματικÎÏ‚ κάÏτες";\
- Text[ nl ] = "Visitekaartjes";\
- Text[ fr ] = "Cartes de visite";\
- Text[ es ] = "Tarjetas de visita";\
- Text[ fi ] = "Käyntikortit";\
- Text[ ca ] = "Targetes de visita";\
- Text[ it ] = "Biglietti da visita";\
- Text[ sk ] = "Vizitky";\
- Text[ da ] = "Visitkort";\
- Text[ sv ] = "Visitkort";\
- Text[ pl ] = "Wizytówki";\
- Text[ pt-BR ] = "Cartões de Visita";\
- Text[ th ] = "นามบัตร";\
- Text[ ja ] = "å刺";\
- Text[ ko ] = "명함";\
- Text[ zh-CN ] = "å片";\
- Text[ zh-TW ] = "å片";\
- Text[ tr ] = "Meslek Kartları";\
- Text[ hi-IN ] = "वà¥à¤¯à¤µà¤¹à¤¾à¤° कारà¥à¤¡à¤¸";\
- Text[ ar ] = "بطاقات الزيارة";\
- Text[ he ] = "‮כרטיסי ביקור‬";\
-
- // DLG_LAB ------------------------------------------------------------------
- // TP_LAB_LAB ---------------------------------------------------------------
-#define WIDTH 100
-#define HEIGHT 16
- // String *******************************************************************
-/********************************************************************/
diff --git a/binfilter/bf_sw/source/ui/inc/chldwrap.hxx b/binfilter/bf_sw/source/ui/inc/chldwrap.hxx
deleted file mode 100644
index 873dac0..0000000
--- a/binfilter/bf_sw/source/ui/inc/chldwrap.hxx
+++ /dev/null
@@ -1,52 +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 _CHLDWRAP_HXX
-#define _CHLDWRAP_HXX
-
-#include <bf_sfx2/childwin.hxx>
-
-#include <vcl/timer.hxx>
-namespace binfilter {
-
-class SwDocShell;
-
-class SwChildWinWrapper : public SfxChildWindow
-{
-
-
- // Implementation in fldtdlg.cxx
-protected:
- SwChildWinWrapper(Window *pParentWindow, USHORT nId):SfxChildWindow(pParentWindow, nId){DBG_BF_ASSERT(0, "STRIP");}
-
-};
-
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/ui/inc/drwtxtsh.hxx b/binfilter/bf_sw/source/ui/inc/drwtxtsh.hxx
deleted file mode 100644
index a4f7738..0000000
--- a/binfilter/bf_sw/source/ui/inc/drwtxtsh.hxx
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SWDRWTXTSH_HXX
-#define _SWDRWTXTSH_HXX
-
-#include <bf_svtools/bf_solar.h>
-
-
-#include <bf_sfx2/shell.hxx>
-#include "shellid.hxx"
-namespace binfilter {
-
-class OutlinerView;
-class SdrOutliner;
-class SdrView;
-class SwView;
-class SfxModule;
-class SwWrtShell;
-
-class SwDrawTextShell: public SfxShell
-{
- SwView &rView;
-
- SdrView *pSdrView;
- OutlinerView*pOLV;
- SdrOutliner *pOutliner;
-
- BOOL bRotate : 1;
- BOOL bSelMove: 1;
-
- void SetAttrToMarked(const SfxItemSet& rAttr);
- void InsertSymbol();
- BOOL IsTextEdit();
-public:
- SFX_DECL_INTERFACE(SW_DRWTXTSHELL);
- TYPEINFO();
-
- SwView &GetView() { return rView; }
- SwWrtShell &GetShell();
-
- SwDrawTextShell(SwView &rView);
-
- void StateDisableItems(SfxItemSet &){DBG_BF_ASSERT(0, "STRIP");};
-
- void Execute(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;
- void ExecDraw(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");};
- void GetState(SfxItemSet &){DBG_BF_ASSERT(0, "STRIP");} ;
- void GetDrawTxtCtrlState(SfxItemSet&){DBG_BF_ASSERT(0, "STRIP");} ;
-
- void ExecFontWork(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");} ;
- void StateFontWork(SfxItemSet& rSet){DBG_BF_ASSERT(0, "STRIP");} ;
- void ExecFormText(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");} ;
- void GetFormTextState(SfxItemSet& rSet){DBG_BF_ASSERT(0, "STRIP");} ;
- void ExecDrawLingu(SfxRequest &rReq){DBG_BF_ASSERT(0, "STRIP");} ;
- void ExecUndo(SfxRequest &rReq){DBG_BF_ASSERT(0, "STRIP");};
- void StateUndo(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");};
- void ExecClpbrd(SfxRequest &rReq){DBG_BF_ASSERT(0, "STRIP");};
- void StateClpbrd(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");};
- void StateInsert(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");} ;
- void ExecTransliteration(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;
-
-};
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/ui/inc/fldwrap.hxx b/binfilter/bf_sw/source/ui/inc/fldwrap.hxx
deleted file mode 100644
index 158324e..0000000
--- a/binfilter/bf_sw/source/ui/inc/fldwrap.hxx
+++ /dev/null
@@ -1,64 +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 _FLDWRAP_HXX
-#define _FLDWRAP_HXX
-
-#include <bf_svtools/bf_solar.h>
-
-#include "chldwrap.hxx"
-namespace binfilter {
-
-class SwFldDlgWrapper : public SwChildWinWrapper
-{
-public:
- SwFldDlgWrapper( Window* pParent, USHORT nId,
- SfxBindings* pBindings, SfxChildWinInfo* pInfo ): SwChildWinWrapper( pParent, nId ){DBG_BF_ASSERT(0, "STRIP");}
-
- SFX_DECL_CHILDWINDOW(SwFldDlgWrapper);
-
-};
-/* --------------------------------------------------
- * field dialog only showing database page to support
- * mail merge
- * --------------------------------------------------*/
-class SwFldDataOnlyDlgWrapper : public SwChildWinWrapper
-{
-public:
- SwFldDataOnlyDlgWrapper( Window* pParent, USHORT nId,
- SfxBindings* pBindings, SfxChildWinInfo* pInfo );
-
- SFX_DECL_CHILDWINDOW(SwFldDataOnlyDlgWrapper);
-
- virtual BOOL ReInitDlg(SwDocShell *pDocSh);
-};
-
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/ui/inc/glosdoc.hxx b/binfilter/bf_sw/source/ui/inc/glosdoc.hxx
deleted file mode 100644
index 4d37005..0000000
--- a/binfilter/bf_sw/source/ui/inc/glosdoc.hxx
+++ /dev/null
@@ -1,149 +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 _GLOSDOC_HXX
-#define _GLOSDOC_HXX
-
-#include <bf_svtools/bf_solar.h>
-
-
-#include <tools/string.hxx>
-
-
-#include <bf_svtools/svarray.hxx>
-#include <com/sun/star/text/XAutoTextGroup.hpp>
-class SvStrings;
-namespace binfilter {
-class SwTextBlocks;
-
-class SwDocShell;
-} //namespace binfilter
-
-#ifndef SW_DECL_SWDOCSHELL_DEFINED
-#define SW_DECL_SWDOCSHELL_DEFINED
-#include <tools/ref.hxx>
-namespace binfilter {
-SV_DECL_REF( SwDocShell )
-} //namespace binfilter
-#endif
-
-#include <cppuhelper/weakref.hxx>
-
-#include <vector>
-namespace binfilter {
-
-typedef ::com::sun::star::uno::WeakReference< ::com::sun::star::text::XAutoTextGroup > AutoTextGroupRef;
-typedef ::std::vector< AutoTextGroupRef > UnoAutoTextGroups;
-
-typedef ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextEntry > AutoTextEntryRef;
-typedef ::std::vector< AutoTextEntryRef > UnoAutoTextEntries;
-
-#define GLOS_DELIM (sal_Unicode)'*'
-
-// CLASS -----------------------------------------------------------------
-class SwGlossaries
-{
- UnoAutoTextGroups aGlossaryGroups;
- UnoAutoTextEntries aGlossaryEntries;
- String aPath;
- String sOldErrPath;
- String sErrPath;
- SvStrings *pPathArr;
- SvStrings *pGlosArr;
- BOOL bError;
- SwTextBlocks* GetGlosDoc(const String &rName, BOOL bCreate = TRUE) const{DBG_BF_ASSERT(0, "STRIP"); return NULL;};
- SvStrings *GetNameList();
- void RemoveFileFromList( const String& rGroup );
- void InvalidateUNOOjects();
-
-public:
- SwGlossaries();
- ~SwGlossaries();
-
- /** returns the cached AutoTextGroup (if any) for the given group name
-
- @precond
- If <arg>_bCreate</arg> is <TRUE/>, the SolarMutex must be locked when calling into this method.
-
- @param _rGroupName
- the name of the glossaries group
- @param _bCreate
- if <TRUE/>, the group is created if it does not yet exist
- */
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextGroup >
- GetAutoTextGroup(
- const ::rtl::OUString& _rGroupName,
- bool _bCreate = false
- );
-
- /** returns the cached AutoTextEntry (if any) for the given group/with the given name
-
- @precond
- If <arg>_bCreate</arg> is <TRUE/>, the SolarMutex must be locked when calling into this method.
-
- @param _rGroupAccessName
- the name to access the group
- @param _rGroupName
- the name of the glossaries group, as to be passed to the entry
- @param _rEntryName
- the name of the auto text entry
- @param _bCreate
- if <TRUE/>, the entry is created if it does not yet exist
- */
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextEntry >
- GetAutoTextEntry(
- const String& _rCompleteGroupName,
- const ::rtl::OUString& _rGroupName,
- const ::rtl::OUString& _rEntryName,
- bool _bCreate = false
- );
-
- USHORT GetGroupCnt();
- String GetGroupName(USHORT );
- String GetGroupTitle( const String& rGroupName );
-
- BOOL FindGroupName(String & rGroup);
-
- SwTextBlocks* GetGroupDoc(const String &rName,
- BOOL bCreate = FALSE) const;
- SwTextBlocks* GetDefGroupDoc() const {return GetGroupDoc(GetDefName());}
- void PutGroupDoc(SwTextBlocks *pBlock);
- static String GetDefName();
- static String GetExtension();
-
- BOOL NewGroupDoc(String &rGroupName, const String& rTitle);
- BOOL RenameGroupDoc(const String& sOldGroup, String& sNewGroup, const String& rNewTitle);
- BOOL DelGroupDoc(const String &);
- SwDocShellRef EditGroupDoc(const String &rGrpName, const String& rShortName, BOOL bShow = TRUE );
- void UpdateGlosPath(BOOL bFull);
-};
-
-
-} //namespace binfilter
-#endif // _GLOSDOC_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/ui/inc/hdftctrl.hxx b/binfilter/bf_sw/source/ui/inc/hdftctrl.hxx
deleted file mode 100644
index 7caeadc..0000000
--- a/binfilter/bf_sw/source/ui/inc/hdftctrl.hxx
+++ /dev/null
@@ -1,56 +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 _HDFTCTRL_HXX
-#define _HDFTCTRL_HXX
-
-#include <bf_svtools/bf_solar.h>
-
-#include <bf_sfx2/mnuitem.hxx>
-#include <bf_sfx2/app.hxx>
-#define _SVSTDARR_STRINGSSORTDTOR
-#define _SVSTDARR_BOOLS
-#include <bf_svtools/svstdarr.hxx>
-namespace binfilter {
-
-class SwDocShell;
-
-class SwHeadFootMenuControl : public SfxMenuControl
-{
-
-public:
- SFX_DECL_MENU_CONTROL();
-
- SwHeadFootMenuControl( USHORT nPos, Menu& rMenu,
- SfxBindings& rBindings ){DBG_BF_ASSERT(0, "STRIP");};
-};
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/ui/inc/pview.hxx b/binfilter/bf_sw/source/ui/inc/pview.hxx
deleted file mode 100644
index 81062f8..0000000
--- a/binfilter/bf_sw/source/ui/inc/pview.hxx
+++ /dev/null
@@ -1,236 +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 _SWPVIEW_HXX
-#define _SWPVIEW_HXX
-
-#include <bf_svtools/bf_solar.h>
-
-#include <bf_sfx2/viewfrm.hxx>
-#include <bf_sfx2/viewfac.hxx>
-#include <tools/link.hxx>
-#include <vcl/window.hxx>
-#include <bf_sfx2/viewsh.hxx>
-#include "shellid.hxx"
-#include <bf_svx/zoomitem.hxx>
-class ImageButton;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list