[Libreoffice-commits] .: binfilter/bf_sfx2 binfilter/inc
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Mon Jan 31 08:16:31 PST 2011
binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx | 85 --
binfilter/inc/bf_sch/chtmodel.hxx | 56 -
binfilter/inc/bf_sd/drawdoc.hxx | 8
binfilter/inc/bf_sfx2/appuno.hxx | 22
binfilter/inc/bf_sfx2/sfxbasemodel.hxx | 699 ---------------------
binfilter/inc/bf_so3/transbnd.hxx | 9
binfilter/inc/bf_svtools/bintitem.hxx | 4
binfilter/inc/bf_svtools/cancel.hxx | 8
binfilter/inc/bf_svtools/sfontitm.hxx | 28
binfilter/inc/bf_svtools/viewoptions.hxx | 40 -
binfilter/inc/bf_svx/chrtitem.hxx | 25
binfilter/inc/bf_svx/dlgutil.hxx | 28
binfilter/inc/bf_svx/obj3d.hxx | 53 -
binfilter/inc/bf_svx/svdattrx.hxx | 44 -
binfilter/inc/bf_svx/svdobj.hxx | 32
binfilter/inc/bf_svx/unotext.hxx | 12
binfilter/inc/bf_xmloff/shapeexport.hxx | 11
binfilter/inc/bf_xmloff/shapeimport.hxx | 8
18 files changed, 9 insertions(+), 1163 deletions(-)
New commits:
commit 9c241c5df64e266d2a70d23c90a7ed9a8150dc65
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 31 16:59:23 2011 +0100
Remove double line spacing and dead code
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx b/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx
index 229420a..c3575ac 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx
@@ -29,88 +29,51 @@
//________________________________________________________________________________________________________
// my own includes
//________________________________________________________________________________________________________
-
#include <sfxbasemodel.hxx>
#include <bf_sfx2/app.hxx>
//________________________________________________________________________________________________________
// include of other projects
//________________________________________________________________________________________________________
-
#include <com/sun/star/view/XPrintJob.hpp>
-
#include <com/sun/star/view/XSelectionSupplier.hpp>
-
#include <com/sun/star/awt/Size.hpp>
-
#include <com/sun/star/lang/DisposedException.hpp>
-
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-
#include <com/sun/star/frame/IllegalArgumentIOException.hpp>
-
#include <com/sun/star/view/PaperFormat.hpp>
-
#include <com/sun/star/view/PaperOrientation.hpp>
-
#include <cppuhelper/interfacecontainer.hxx>
-
#include <comphelper/processfactory.hxx>
-
#include <com/sun/star/container/XIndexContainer.hpp>
-
#include <com/sun/star/ucb/NameClash.hpp>
-
#include <uno/mapping.hxx>
-
#include <bf_svtools/itemset.hxx>
-
#include <bf_svtools/stritem.hxx>
-
#include <bf_svtools/intitem.hxx>
-
#include <bf_svtools/eitem.hxx>
-
#include "bf_basic/sbx.hxx"
-
#include <osl/file.hxx>
-
#include <osl/thread.hxx>
-
#include <tools/urlobj.hxx>
-
#include <unotools/tempfile.hxx>
-
#include <unotools/localfilehelper.hxx>
-
#include <ucbhelper/content.hxx>
-
#include <osl/mutex.hxx>
#include <vcl/salctype.hxx>
//________________________________________________________________________________________________________
// includes of my own project
//________________________________________________________________________________________________________
-
#include "appuno.hxx"
-
#include <objshimp.hxx>
-
-
#include <docfile.hxx>
-
#include <request.hxx>
-
#include <objuno.hxx>
-
#include <printer.hxx>
-
#include <event.hxx>
-
#include <eventsupplier.hxx>
-
#include <evntconf.hxx>
-
#include <interno.hxx>
#include "sfx.hrc"
@@ -121,7 +84,6 @@
#include "fcontnr.hxx"
#include <legacysmgr/legacy_binfilters_smgr.hxx>
-
#include <cppuhelper/typeprovider.hxx>
#include "bf_basic/basmgr.hxx"
@@ -131,7 +93,6 @@ namespace binfilter {
//________________________________________________________________________________________________________
// defines
//________________________________________________________________________________________________________
-
#define SfxIOException_Impl( nErr ) ::com::sun::star::io::IOException()
#define XFRAME ::com::sun::star::frame::XFrame
@@ -161,7 +122,6 @@ namespace binfilter {
// namespaces
//________________________________________________________________________________________________________
-
// Don't use using ... here, because there are at least two classes with the same name in use
using namespace ::com::sun::star;
@@ -174,7 +134,6 @@ using namespace ::com::sun::star::uno;
struct IMPL_SfxBaseModel_DataContainer
{
SfxObjectShellRef m_pObjectShell ;
- //SfxObjectShellLock m_pObjectShellLock ;
OUSTRING m_sURL ;
sal_uInt16 m_nControllerLockCount ;
OMULTITYPEINTERFACECONTAINERHELPER m_aInterfaceContainer ;
@@ -196,7 +155,6 @@ struct IMPL_SfxBaseModel_DataContainer
IMPL_SfxBaseModel_DataContainer( MUTEX& aMutex ,
SfxObjectShell* pObjectShell )
: m_pObjectShell ( pObjectShell )
-// , m_pObjectShellLock ( pObjectShell )
, m_sURL ( String() )
, m_nControllerLockCount ( 0 )
, m_aInterfaceContainer ( aMutex )
@@ -485,21 +443,6 @@ extern sal_Bool supportsMetaFileHandle_Impl();
/*N*/ REFERENCE< XINTERFACE > SAL_CALL SfxBaseModel::getParent() throw( RUNTIMEEXCEPTION )
/*N*/ {
-/* #77222#
- AS->MBA: There is one view only at the moment. We don't must search for other parents in other frames ...!?
-
- if ( !m_pData->m_xParent.is() && m_pData->m_xCurrent.is() )
- {
- // If no parent is set get the parent by view hierarchy
- REFERENCE< XFRAME > xParentFrame( m_pData->m_xCurrent->getFrame()->getCreator(), UNO_QUERY );
- if ( xParentFrame.is() )
- {
- REFERENCE< XCONTROLLER > xCtrl( xParentFrame->getController() );
- if ( xCtrl.is() )
- return xCtrl->getModel();
- }
- }
-*/
/*N*/ SolarMutexGuard aGuard;
/*N*/ if ( impl_isDisposed() )
/*N*/ throw DISPOSEDEXCEPTION();
@@ -569,17 +512,12 @@ extern sal_Bool supportsMetaFileHandle_Impl();
/*N*/ }
/*N*/
/*N*/ pShell = m_pData->m_pObjectShell;
-/*N*/ //pShellLock = m_pData->m_pObjectShellLock;
/*N*/ EndListening( *pShell );
/*N*/ m_pData->m_pObjectShell = SfxObjectShellRef();
-/*N*/ //m_pData->m_pObjectShellLock = SfxObjectShellLock();
/*N*/ }
/*N*/
/*N*/ // Bei dispose keine Speichern-R"uckfrage
-/*N*/ //if ( pShell->IsEnableSetModified() && !pShell->Get_Impl()->bClosing )
-/*N*/ // pShell->SetModified( sal_False );
/*N*/ pShell->Get_Impl()->bDisposing = TRUE;
-/*N*/ //pShellLock = SfxObjectShellLock();
/*N*/ SfxObjectShellClose_Impl( 0, (void*) pShell );
/*N*/ }
/*N*/
@@ -950,10 +888,6 @@ extern sal_Bool supportsMetaFileHandle_Impl();
/*N*/ if ( xDocView.is() )
/*N*/ {
/*N*/ ANY xSel = xDocView->getSelection();
-/*N*/ // automatisch auskommentiert - Wird von UNO III nicht weiter unterstützt!
-/*N*/ // return xSel.getReflection() == XINTERFACE_getReflection()
-/*N*/ // return xSel.getValueType() == ::getCppuType((const XINTERFACE*)0)
-/*N*/ // ? *(REFERENCE< XINTERFACE > *) xSel.get() : REFERENCE< XINTERFACE > ();
/*N*/ xSel >>= xReturn ;
/*N*/ }
/*N*/ }
@@ -1333,19 +1267,11 @@ extern sal_Bool supportsMetaFileHandle_Impl();
// XTransferable
//________________________________________________________________________________________________________
-
/*?*/ SEQUENCE< DATAFLAVOR > SAL_CALL SfxBaseModel::getTransferDataFlavors()
/*?*/ throw (::com::sun::star::uno::RuntimeException)
/*?*/ {DBG_BF_ASSERT(0, "STRIP"); SEQUENCE< DATAFLAVOR > aDATAFLAVOR(0); return aDATAFLAVOR;
/*?*/ }
-//________________________________________________________________________________________________________
-// XTransferable
-//________________________________________________________________________________________________________
-
-
-
-
//--------------------------------------------------------------------------------------------------------
// XEventsSupplier
//--------------------------------------------------------------------------------------------------------
@@ -1454,14 +1380,6 @@ extern sal_Bool supportsMetaFileHandle_Impl();
/*N*/ ::rtl::OUString aTitle = m_pData->m_pObjectShell->GetTitle();
/*N*/ addTitle_Impl( m_pData->m_seqArguments, aTitle );
/*N*/ }
-/*
- else if ( pSimpleHint->GetId() == SFX_HINT_DYING
- || pSimpleHint->GetId() == SFX_HINT_DEINITIALIZING )
- {
- SfxObjectShellLock pShellLock = m_pData->m_pObjectShellLock;
- m_pData->m_pObjectShellLock = SfxObjectShellLock();
- }
-*/
/*N*/ }
/*N*/
/*N*/ }
@@ -1529,8 +1447,6 @@ extern sal_Bool supportsMetaFileHandle_Impl();
/*N*/ if( !sURL.getLength() )
/*N*/ throw ILLEGALARGUMENTIOEXCEPTION();
/*N*/
-/*N*/ //sal_Bool aSaveAsTemplate = sal_False;
-/*N*/
/*N*/ SfxAllItemSet *aParams = new SfxAllItemSet( SFX_APP()->GetPool() );
/*N*/ aParams->Put( SfxStringItem( SID_FILE_NAME, String(sURL) ) );
/*N*/ if ( bSaveTo )
@@ -1636,7 +1552,6 @@ extern sal_Bool supportsMetaFileHandle_Impl();
/*N*/ }
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sch/chtmodel.hxx b/binfilter/inc/bf_sch/chtmodel.hxx
index 2bdf863..2f28545 100644
--- a/binfilter/inc/bf_sch/chtmodel.hxx
+++ b/binfilter/inc/bf_sch/chtmodel.hxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#ifndef _CHTMODEL_HXX
#define _CHTMODEL_HXX
@@ -36,15 +35,11 @@
// Bei Umstellungen alle Files nach SIG_CHARTMODELDEFSCHDOC durchsuchen
// #define ChartModel SchChartDocument
//------------------------------------------------------------------
-
#include <bf_svx/polygn3d.hxx>
#include <bf_svx/extrud3d.hxx>
#include "bf_svx/obj3d.hxx"
-
#include "bf_svx/poly3d.hxx"
-
#include <bf_svx/viewpt3d.hxx>
-
#include <vcl/field.hxx>
#include <bf_svx/svdtrans.hxx>
#include <tools/gen.hxx>
@@ -158,7 +153,6 @@ public:
// -------
// methods
// -------
-
ChartModel( const String& rPalettePath, SfxObjectShell* pDocSh );
virtual ~ChartModel();
@@ -351,7 +345,6 @@ public:
/// returns TRUE, if change requires BuildChart - currently always TRUE !
BOOL IsAttrChangeNeedsBuildChart( const SfxItemSet& rAttr );
-
BOOL SetBaseType( long nBaseType );
// chart features (see chtmode7.cxx)
@@ -379,8 +372,6 @@ public:
BOOL IsXYChart( SvxChartStyle* pStyle = NULL ) const;
-
-
SfxItemPool& GetPool() { return *pItemPool; }
SfxObjectShell* GetObjectShell() { return pDocShell; }
@@ -460,8 +451,6 @@ public:
ChartScene * GetScene();
-
-
BOOL ChangeStatistics( const SfxItemSet & rNewAttr );
void SetShowLegend( BOOL bNewShow );
@@ -476,70 +465,44 @@ public:
inline BOOL & IsCopied ();
inline BOOL IsCopied() const;
-
-
-
-
-
-
-
int & Granularity();
SvxChartStyle & ChartStyle();
SvxChartStyle ChartStyle() const;
-
long PieSegOfs( long nCol ) const;
BOOL & ShowMainTitle();
-
String & MainTitle ();
BOOL & ShowSubTitle();
-
String & SubTitle();
BOOL & ShowXAxisTitle();
-
String & XAxisTitle();
BOOL & ShowYAxisTitle();
-
String & YAxisTitle();
BOOL & ShowZAxisTitle();
-
String & ZAxisTitle();
BOOL & ShowXGridMain();
-
BOOL & ShowXGridHelp();
-
BOOL & ShowYGridMain();
-
BOOL & ShowYGridHelp();
-
BOOL & ShowZGridMain();
-
BOOL & ShowZGridHelp();
-
-
BOOL & ReadError ();
-
Size & InitialSize();
-
-
-
int & SplineDepth() { return nSplineDepth; }
String & ColText( long nCol );
-
String & RowText( long nRow );
-
long GetAxisUID( long nRow );
void SetShowDataDescr( const BOOL b ) { bShowDataDescr = b; }
@@ -719,7 +682,6 @@ private:
// -------
// members
// -------
-
ChartBarDescriptor aBarY1;
ChartBarDescriptor aBarY2;
@@ -879,7 +841,6 @@ private:
ItemSetList aTmpDataPointAttrList;
ItemSetList aTmpSwitchDataPointAttrList;
-
SvxChartDataDescr eDataDescr;
BOOL bShowSym;
BOOL bSwitchData;
@@ -975,7 +936,6 @@ private:
// -------
// methods
// -------
-
bool UsesSourceFormat( long nAxisUID, SfxItemSet** pItemSetPointer = NULL );
USHORT GetRegressStrId( long nRow );
@@ -983,7 +943,6 @@ private:
void DeleteObject( SdrObject* pObj );
-
void SetTextAttr( SdrTextObj &rTextObj,
const SfxItemSet &rAttr,
const long nMaximumWidth = -1 );
@@ -1091,9 +1050,6 @@ private:
void SetAxisAttributes( const SfxItemSet * pAttr,
const SdrObjGroup * pAxisObj );
-
-
-
void Dirty2D( long nRowCnt,
long nCol,
SdrObjList ** pDescrLists,
@@ -1101,21 +1057,10 @@ private:
DataDescription * pDescription );
- /// this method shouldn't be used because it is not axis-oriented (why does it exist then?)
-
/// this one is axis-oriented (whatever that means)
-
void CreateDefaultColors();
void DestroyDefaultColors();
-
-
-
- // ChangeDataRowAttr sub methods
-
- // ChangeDataPointAttr sub methods
-
-
// BuildChart sub methods
void CreateRectsAndTitles( long whatTitle );
void CalculateUpperBorder();
@@ -1131,7 +1076,6 @@ private:
const long nYOfs,
USHORT & rIndex );
-
void LogBookAttrData();
void SetDefAttrRow( SfxItemSet* pDataRowAttr, const long i );
diff --git a/binfilter/inc/bf_sd/drawdoc.hxx b/binfilter/inc/bf_sd/drawdoc.hxx
index c8919bf..be13a2d 100644
--- a/binfilter/inc/bf_sd/drawdoc.hxx
+++ b/binfilter/inc/bf_sd/drawdoc.hxx
@@ -169,7 +169,6 @@ protected:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel();
public:
-
class InsertBookmarkAsPage_PageFunctorBase;
TYPEINFO();
@@ -290,7 +289,6 @@ public:
BOOL GetHideSpell() const { return bHideSpell; }
-
List* GetFrameViewList() const { return pFrameViewList; }
List* GetCustomShowList(BOOL bCreate = FALSE);
@@ -311,21 +309,15 @@ public:
SdIMapInfo* GetIMapInfo( SdrObject* pObject ) const;
-
-
CharClass* GetCharClass() const { return mpCharClass; }
void RestoreLayerNames();
-
void UpdateAllLinks();
-
void CheckMasterPages();
-
::com::sun::star::text::WritingMode GetDefaultWritingMode() const;
public:
-
static SdDrawDocument* pDocLockedInsertingLinks; // static to prevent recursions while resolving links
friend SvStream& operator<<(SvStream& rOut, SdDrawDocument& rDoc);
diff --git a/binfilter/inc/bf_sfx2/appuno.hxx b/binfilter/inc/bf_sfx2/appuno.hxx
index 9984b5f..5fb7a3f 100644
--- a/binfilter/inc/bf_sfx2/appuno.hxx
+++ b/binfilter/inc/bf_sfx2/appuno.hxx
@@ -31,51 +31,30 @@
//____________________________________________________________________________________________________________________________________
// generated header
//____________________________________________________________________________________________________________________________________
-
#include <com/sun/star/frame/XFrame.hpp>
-
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-
#include <com/sun/star/lang/XServiceInfo.hpp>
-
#include <com/sun/star/lang/XInitialization.hpp>
-
#include <com/sun/star/lang/XTypeProvider.hpp>
-
#include <com/sun/star/registry/XSimpleRegistry.hpp>
-
#include <com/sun/star/beans/PropertyValue.hpp>
-
#include <com/sun/star/util/URL.hpp>
-
#include <com/sun/star/uno/Exception.hpp>
-
#include <com/sun/star/frame/XDispatchProvider.hpp>
-
#include <com/sun/star/frame/XDispatch.hpp>
-
#include <com/sun/star/frame/XSynchronousDispatch.hpp>
-
#include <com/sun/star/frame/XNotifyingDispatch.hpp>
-
#include <com/sun/star/frame/XDispatchResultListener.hpp>
-
#include <com/sun/star/frame/DispatchDescriptor.hpp>
-
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
//____________________________________________________________________________________________________________________________________
// fix uno header
//____________________________________________________________________________________________________________________________________
-
#include <com/sun/star/uno/Any.h>
-
#include <com/sun/star/uno/Reference.h>
-
#include <com/sun/star/uno/Sequence.hxx>
-
#include <cppuhelper/weak.hxx>
-
#include <cppuhelper/implbase3.hxx>
//____________________________________________________________________________________________________________________________________
@@ -87,7 +66,6 @@
#define _SVSTDARR_STRINGSDTOR
#include <bf_svtools/svstdarr.hxx>
#include <bf_sfx2/sfxuno.hxx>
-
#include <bf_svtools/poolitem.hxx>
namespace binfilter {
diff --git a/binfilter/inc/bf_sfx2/sfxbasemodel.hxx b/binfilter/inc/bf_sfx2/sfxbasemodel.hxx
index 822828a..1b843f3 100644
--- a/binfilter/inc/bf_sfx2/sfxbasemodel.hxx
+++ b/binfilter/inc/bf_sfx2/sfxbasemodel.hxx
@@ -32,66 +32,30 @@
//________________________________________________________________________________________________________
// include of other projects
//________________________________________________________________________________________________________
-
#include <com/sun/star/lang/XTypeProvider.hpp>
-
#include <com/sun/star/container/XChild.hpp>
-
-
-
-
-
#include <com/sun/star/document/XDocumentInfoSupplier.hpp>
-
#include <com/sun/star/document/XEventBroadcaster.hpp>
-
-
#include <com/sun/star/document/XEventsSupplier.hpp>
-
-
-
#include <com/sun/star/frame/XModel.hpp>
-
-
#include <com/sun/star/util/XModifiable.hpp>
-
-
#include <com/sun/star/util/XCloseable.hpp>
-
-
-
-
#include <com/sun/star/view/XPrintable.hpp>
-
#include <com/sun/star/view/XPrintJobBroadcaster.hpp>
-
#include <com/sun/star/frame/XStorable.hpp>
-
#include <com/sun/star/frame/XLoadable.hpp>
-
-
-
#include <com/sun/star/datatransfer/XTransferable.hpp>
-
-
-
-
#include <cppuhelper/weak.hxx>
-
-
#include <com/sun/star/script/XStarBasicAccess.hpp>
-
-
#include <tools/link.hxx>
-
#include <com/sun/star/document/XViewDataSupplier.hpp>
//________________________________________________________________________________________________________
// include of my own project
//________________________________________________________________________________________________________
-
#include <bf_svtools/lstner.hxx>
#include <tools/debug.hxx> //for strip
+
namespace binfilter {
//________________________________________________________________________________________________________
// defines
@@ -167,9 +131,7 @@ struct IMPL_SfxBaseModel_MutexContainer
/**_______________________________________________________________________________________________________
@short -
-
@descr -
-
@implements XChild
XComponent
XDocumentInfoSupplier
@@ -182,7 +144,6 @@ struct IMPL_SfxBaseModel_MutexContainer
::document::XEventsSupplier
XCloseable
XCloseBroadcaster
-
@base IMPL_MutexContainer
SfxListener
*/
@@ -218,34 +179,8 @@ public:
// constructor/destructor
//____________________________________________________________________________________________________
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
SfxBaseModel( SfxObjectShell *pObjektShell = NULL ) ;
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual ~SfxBaseModel() ;
//____________________________________________________________________________________________________
@@ -255,48 +190,33 @@ public:
/**___________________________________________________________________________________________________
@short give answer, if interface is supported
@descr The interfaces are searched by type.
-
@seealso XInterface
-
@param "rType" is the type of searched interface.
-
@return Any information about found interface
-
@onerror A RuntimeException is thrown.
*/
-
virtual ANY SAL_CALL queryInterface( const UNOTYPE& rType ) throw( RUNTIMEEXCEPTION ) ;
/**___________________________________________________________________________________________________
@short increment refcount
@descr -
-
@seealso XInterface
@seealso release()
-
@param -
-
@return -
-
@onerror A RuntimeException is thrown.
*/
-
virtual void SAL_CALL acquire() throw() ;
/**___________________________________________________________________________________________________
@short decrement refcount
@descr -
-
@seealso XInterface
@seealso acquire()
-
@param -
-
@return -
-
@onerror A RuntimeException is thrown.
*/
-
virtual void SAL_CALL release() throw() ;
//____________________________________________________________________________________________________
@@ -306,32 +226,22 @@ public:
/**___________________________________________________________________________________________________
@short get information about supported interfaces
@descr -
-
@seealso XTypeProvider
-
@param -
-
@return Sequence of types of all supported interfaces
-
@onerror A RuntimeException is thrown.
*/
-
virtual SEQUENCE< UNOTYPE > SAL_CALL getTypes() throw( RUNTIMEEXCEPTION ) ;
/**___________________________________________________________________________________________________
@short get implementation id
@descr This ID is neccessary for UNO-caching. If there no ID, cache is disabled.
Another way, cache is enabled.
-
@seealso XTypeProvider
-
@param -
-
@return ID as Sequence of byte
-
@onerror A RuntimeException is thrown.
*/
-
virtual SEQUENCE< sal_Int8 > SAL_CALL getImplementationId() throw( RUNTIMEEXCEPTION ) ;
//____________________________________________________________________________________________________
@@ -367,428 +277,83 @@ public:
//____________________________________________________________________________________________________
// XChild
//____________________________________________________________________________________________________
-
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual REFERENCE< XINTERFACE > SAL_CALL getParent() throw( RUNTIMEEXCEPTION ) ;
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual void SAL_CALL setParent( const REFERENCE< XINTERFACE >& xParent ) throw( NOSUPPORTEXCEPTION ,
RUNTIMEEXCEPTION ) ;
//____________________________________________________________________________________________________
// XComponent
//____________________________________________________________________________________________________
-
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException);
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual void SAL_CALL addEventListener(const REFERENCE< XEVENTLISTENER >& aListener) throw (::com::sun::star::uno::RuntimeException);
-
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual void SAL_CALL removeEventListener(const REFERENCE< XEVENTLISTENER >& aListener ) throw (::com::sun::star::uno::RuntimeException);
//____________________________________________________________________________________________________
// XDocumentInfoSupplier
//____________________________________________________________________________________________________
-
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual REFERENCE< XDOCUMENTINFO > SAL_CALL getDocumentInfo() throw (::com::sun::star::uno::RuntimeException);
//____________________________________________________________________________________________________
// XEventListener
//____________________________________________________________________________________________________
-
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual void SAL_CALL disposing( const EVENTOBJECT& aEvent ) throw (::com::sun::star::uno::RuntimeException);
//____________________________________________________________________________________________________
// XModel
//____________________________________________________________________________________________________
-
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual sal_Bool SAL_CALL attachResource( const OUSTRING& sURL ,
const SEQUENCE< PROPERTYVALUE >& aArgs )
throw (::com::sun::star::uno::RuntimeException);
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual OUSTRING SAL_CALL getURL() throw (::com::sun::star::uno::RuntimeException);
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual SEQUENCE< PROPERTYVALUE > SAL_CALL getArgs() throw (::com::sun::star::uno::RuntimeException);
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual void SAL_CALL connectController( const REFERENCE< XCONTROLLER >& xController ) throw (::com::sun::star::uno::RuntimeException);
-
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual void SAL_CALL disconnectController( const REFERENCE< XCONTROLLER >& xController ) throw (::com::sun::star::uno::RuntimeException);
-
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual void SAL_CALL lockControllers() throw (::com::sun::star::uno::RuntimeException);
-
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual void SAL_CALL unlockControllers() throw (::com::sun::star::uno::RuntimeException);
-
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual sal_Bool SAL_CALL hasControllersLocked() throw (::com::sun::star::uno::RuntimeException);
-
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual REFERENCE< XCONTROLLER > SAL_CALL getCurrentController() throw (::com::sun::star::uno::RuntimeException);
-
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual void SAL_CALL setCurrentController( const REFERENCE< XCONTROLLER >& xController )
throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual REFERENCE< XINTERFACE > SAL_CALL getCurrentSelection() throw (::com::sun::star::uno::RuntimeException);
//____________________________________________________________________________________________________
// XModifiable
//____________________________________________________________________________________________________
-
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual sal_Bool SAL_CALL isModified() throw (::com::sun::star::uno::RuntimeException);
-
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual void SAL_CALL setModified( sal_Bool bModified )
throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException);
-
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual void SAL_CALL addModifyListener( const REFERENCE< XMODIFYLISTENER >& xListener ) throw( RUNTIMEEXCEPTION ) ;
-
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual void SAL_CALL removeModifyListener(const REFERENCE< XMODIFYLISTENER > & xListener) throw( RUNTIMEEXCEPTION ) ;
//____________________________________________________________________________________________________
// XCloseable
//____________________________________________________________________________________________________
-
virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw (CLOSEVETOEXCEPTION, RUNTIMEEXCEPTION);
//____________________________________________________________________________________________________
// XCloseBroadcaster
//____________________________________________________________________________________________________
-
virtual void SAL_CALL addCloseListener( const REFERENCE< XCLOSELISTENER >& xListener ) throw (RUNTIMEEXCEPTION);
virtual void SAL_CALL removeCloseListener( const REFERENCE< XCLOSELISTENER >& xListener ) throw (RUNTIMEEXCEPTION);
//____________________________________________________________________________________________________
// XPrintJobBroadcaster
//____________________________________________________________________________________________________
-
virtual void SAL_CALL addPrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& )throw (::com::sun::star::uno::RuntimeException) {DBG_BF_ASSERT(0, "STRIP");}
virtual void SAL_CALL removePrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& ) throw (::com::sun::star::uno::RuntimeException) {DBG_BF_ASSERT(0, "STRIP");}
//____________________________________________________________________________________________________
// XPrintable
//____________________________________________________________________________________________________
-
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual SEQUENCE< PROPERTYVALUE > SAL_CALL getPrinter() throw (::com::sun::star::uno::RuntimeException) {DBG_BF_ASSERT(0, "STRIP");SEQUENCE< PROPERTYVALUE > aFlavorSeq( 0 );return aFlavorSeq;}
-
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual void SAL_CALL setPrinter( const SEQUENCE< PROPERTYVALUE >& )
- throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) {DBG_BF_ASSERT(0, "STRIP");}
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
+ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) {DBG_BF_ASSERT(0, "STRIP");}
virtual void SAL_CALL print( const SEQUENCE< PROPERTYVALUE >& seqOptions )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
@@ -796,97 +361,15 @@ public:
//____________________________________________________________________________________________________
// XStorable
//____________________________________________________________________________________________________
-
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual sal_Bool SAL_CALL hasLocation() throw (::com::sun::star::uno::RuntimeException);
-
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual OUSTRING SAL_CALL getLocation() throw (::com::sun::star::uno::RuntimeException);
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual sal_Bool SAL_CALL isReadonly() throw (::com::sun::star::uno::RuntimeException);
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual void SAL_CALL store() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual void SAL_CALL storeAsURL( const OUSTRING& sURL ,
const SEQUENCE< PROPERTYVALUE >& seqArguments )
throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) ;
-
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual void SAL_CALL storeToURL( const OUSTRING& sURL ,
const SEQUENCE< PROPERTYVALUE >& seqArguments )
throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
@@ -894,39 +377,12 @@ public:
//____________________________________________________________________________________________________
// XLoadable
//____________________________________________________________________________________________________
-
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual void SAL_CALL initNew()
throw (::com::sun::star::frame::DoubleInitializationException,
::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException,
::com::sun::star::uno::Exception); // #dochnoetig# {DBG_BF_ASSERT(0, "STRIP");}
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual void SAL_CALL load( const SEQUENCE< PROPERTYVALUE >& seqArguments )
throw (::com::sun::star::frame::DoubleInitializationException,
::com::sun::star::io::IOException,
@@ -936,177 +392,41 @@ public:
//____________________________________________________________________________________________________
// XTransferable
//____________________________________________________________________________________________________
-
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual ANY SAL_CALL getTransferData( const DATAFLAVOR& aFlavor )
throw (::com::sun::star::datatransfer::UnsupportedFlavorException,
::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual SEQUENCE< DATAFLAVOR > SAL_CALL getTransferDataFlavors()
throw (::com::sun::star::uno::RuntimeException);
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual sal_Bool SAL_CALL isDataFlavorSupported( const DATAFLAVOR& )
throw (::com::sun::star::uno::RuntimeException) {DBG_BF_ASSERT(0, "STRIP");return false;}
//____________________________________________________________________________________________________
// XEventsSupplier
//____________________________________________________________________________________________________
-
- /**___________________________________________________________________________________________________
- @short -
- @descr - offers a list of event handlers which are be bound to events of
- this object.
- @seealso -
-
- @param -
-
- @return - an <type>Events</type> object.
-
- @onerror -
- */
-
virtual REFERENCE< XNAMEREPLACE > SAL_CALL getEvents() throw( RUNTIMEEXCEPTION );
//____________________________________________________________________________________________________
// XEventBroadcaster
//____________________________________________________________________________________________________
-
- /**___________________________________________________________________________________________________
- @short -
- @descr - registers the given <type>XEventListener</type>.
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual void SAL_CALL addEventListener( const REFERENCE< XDOCEVENTLISTENER >& xListener ) throw( RUNTIMEEXCEPTION );
-
- /**___________________________________________________________________________________________________
- @short -
- @descr - unregisters the given <type>XEventListener</type>.
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
virtual void SAL_CALL removeEventListener( const REFERENCE< XDOCEVENTLISTENER >& xListener ) throw( RUNTIMEEXCEPTION );
//____________________________________________________________________________________________________
// SfxListener
//____________________________________________________________________________________________________
-
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
void Notify( SfxBroadcaster& aBC ,
const SfxHint& aHint ) ;
//____________________________________________________________________________________________________
// public IMPL?
//____________________________________________________________________________________________________
-
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
void changing() ;
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
SfxObjectShell* GetObjectShell() const ;
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
sal_Bool impl_isDisposed() const ;
::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexAccess > SAL_CALL getViewData() throw (::com::sun::star::uno::RuntimeException);
@@ -1125,20 +445,6 @@ protected:
//________________________________________________________________________________________________________
private:
-
- /**___________________________________________________________________________________________________
- @short -
- @descr -
-
- @seealso -
-
- @param -
-
- @return -
-
- @onerror -
- */
-
void impl_store( SfxObjectShell* pObjectShell ,
const OUSTRING& sURL ,
const SEQUENCE< PROPERTYVALUE >& seqArguments ,
@@ -1151,7 +457,6 @@ private:
//________________________________________________________________________________________________________
private:
-
IMPL_SfxBaseModel_DataContainer* m_pData ;
DECL_LINK( LoadDone_Impl, void* );
diff --git a/binfilter/inc/bf_so3/transbnd.hxx b/binfilter/inc/bf_so3/transbnd.hxx
index a1400ff..fd63c6d 100644
--- a/binfilter/inc/bf_so3/transbnd.hxx
+++ b/binfilter/inc/bf_so3/transbnd.hxx
@@ -30,23 +30,14 @@
#define _TRANSBND_HXX "$Revision: 1.5 $"
#include <tools/solar.h>
-
#include <tools/datetime.hxx>
-
#include <tools/errcode.hxx>
-
#include <tools/link.hxx>
-
#include <tools/ref.hxx>
-
#include <tools/stream.hxx>
-
#include <tools/string.hxx>
-
#include <tools/urlobj.hxx>
-
#include <bf_so3/binding.hxx>
-
#include <bf_so3/transprt.hxx>
#include "bf_so3/so3dllapi.h"
diff --git a/binfilter/inc/bf_svtools/bintitem.hxx b/binfilter/inc/bf_svtools/bintitem.hxx
index af302fa..e4b8c66 100644
--- a/binfilter/inc/bf_svtools/bintitem.hxx
+++ b/binfilter/inc/bf_svtools/bintitem.hxx
@@ -30,13 +30,9 @@
#define _BINTITEM_HXX
#include <tools/solar.h>
-
#include <tools/rtti.hxx>
-
#include <tools/bigint.hxx>
-
#include <tools/debug.hxx>
-
#include <bf_svtools/poolitem.hxx>
class SvStream;
diff --git a/binfilter/inc/bf_svtools/cancel.hxx b/binfilter/inc/bf_svtools/cancel.hxx
index 34e8008..70b899b 100644
--- a/binfilter/inc/bf_svtools/cancel.hxx
+++ b/binfilter/inc/bf_svtools/cancel.hxx
@@ -29,11 +29,8 @@
#define _SFXCANCEL_HXX
#include <tools/string.hxx>
-
#include <tools/ref.hxx>
-
#include <bf_svtools/brdcst.hxx>
-
#include <bf_svtools/smplhint.hxx>
namespace binfilter {
@@ -41,15 +38,10 @@ namespace binfilter {
class SfxCancellable;
#ifdef _SFX_CANCEL_CXX
-
#include <bf_svtools/svarray.hxx>
-
SV_DECL_PTRARR( SfxCancellables_Impl, SfxCancellable*, 0, 4 )
-
#else
-
typedef SvPtrarr SfxCancellables_Impl;
-
#endif
//-------------------------------------------------------------------------
diff --git a/binfilter/inc/bf_svtools/sfontitm.hxx b/binfilter/inc/bf_svtools/sfontitm.hxx
index 605d9b2..f7f8221 100644
--- a/binfilter/inc/bf_svtools/sfontitm.hxx
+++ b/binfilter/inc/bf_svtools/sfontitm.hxx
@@ -72,78 +72,50 @@ public:
virtual int operator ==(const SfxPoolItem & rItem) const;
virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
-
virtual SvStream & Store(SvStream & rStream, USHORT) const;
-
virtual SfxPoolItem * Clone(SfxItemPool * = 0) const
{ return new SfxFontItem(*this); }
sal_Bool hasFont() const { return m_bHasFont; }
-
sal_Bool hasColor() const { return m_bHasColor; }
-
sal_Bool hasFillColor() const { return m_bHasFillColor; }
const XubString & getName() const { return m_aName; }
-
const XubString & getStyleName() const { return m_aStyleName; }
const Size & getSize() const { return m_aSize; }
-
const Color & getColor() const { return m_aColor; }
-
const Color & getFillColor() const { return m_aFillColor; }
rtl_TextEncoding getCharSet() const { return m_nCharSet; }
-
LanguageType getLanguage() const { return m_nLanguage; }
sal_Int16 getFamily() const { return m_nFamily; }
-
sal_Int16 getPitch() const { return m_nPitch; }
-
sal_Int16 getWeight() const { return m_nWeight; }
-
sal_Int16 getWidthType() const { return m_nWidthType; }
-
sal_Int16 getItalic() const { return m_nItalic; }
-
sal_Int16 getUnderline() const { return m_nUnderline; }
-
sal_Int16 getStrikeout() const { return m_nStrikeout; }
-
sal_Int16 getOrientation() const { return m_nOrientation; }
sal_Bool getWordLine() const { return m_bWordLine; }
-
sal_Bool getOutline() const { return m_bOutline; }
-
sal_Bool getShadow() const { return m_bShadow; }
-
sal_Bool getKerning() const { return m_bKerning; }
inline void setFont(sal_Int16 nTheFamily, const XubString & rTheName,
const XubString & rTheStyleName, sal_Int16 nThePitch,
rtl_TextEncoding nTheCharSet);
-
inline void setWeight(sal_Int16 nTheWeight);
-
inline void setItalic(sal_Int16 nTheItalic);
-
inline void setHeight(sal_Int32 nHeight);
-
inline void setColor(const Color & rTheColor);
-
inline void setFillColor(const Color & rTheFillColor);
-
inline void setUnderline(sal_Int16 nTheUnderline);
-
inline void setStrikeout(sal_Int16 nTheStrikeout);
-
inline void setOutline(sal_Bool bTheOutline);
-
inline void setShadow(sal_Bool bTheShadow);
-
inline void setLanguage(LanguageType nTheLanguage);
};
diff --git a/binfilter/inc/bf_svtools/viewoptions.hxx b/binfilter/inc/bf_svtools/viewoptions.hxx
index 688fe32..36d4bf7 100644
--- a/binfilter/inc/bf_svtools/viewoptions.hxx
+++ b/binfilter/inc/bf_svtools/viewoptions.hxx
@@ -31,25 +31,13 @@
//_________________________________________________________________________________________________________________
// includes
//_________________________________________________________________________________________________________________
-
-#ifndef INCLUDED_SVLDLLAPI_H
-
-#endif
-
#include <com/sun/star/uno/Sequence.hxx>
-
#include <com/sun/star/beans/NamedValue.hpp>
-
#include <unotools/configmgr.hxx>
-
#include <unotools/configitem.hxx>
-
#include <sal/types.h>
-
#include <osl/mutex.hxx>
-
#include <rtl/ustring.hxx>
-
#include <bf_svtools/options.hxx>
namespace binfilter
@@ -129,34 +117,11 @@ enum EViewType
@implements -
@base -
-
@devstatus ready to use
*//*-*************************************************************************************************************/
class SvtViewOptions: public Options
{
- /*
- #ifdef TF_OLDVIEW
- public:
- void GetPosition ( sal_Int32& nX ,
- sal_Int32& nY ) const;
- void SetPosition ( sal_Int32 nX ,
- sal_Int32 nY );
- void GetSize ( sal_Int32& nWidth ,
- sal_Int32& nHeight ) const;
- void SetSize ( sal_Int32 nWidth ,
- sal_Int32 nHeight );
- ::rtl::OUString GetUserData ( ) const;
- void SetUserData ( const ::rtl::OUString& sData );
- static ::com::sun::star::uno::Sequence< ::rtl::OUString > SeperateUserData( const ::rtl::OUString& sData ,
- sal_Unicode cSeperator=';' );
- static ::rtl::OUString GenerateUserData( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& seqData ,
- sal_Unicode cSeperator=';' );
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetAnyData ( ) const;
- void SetAnyData ( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lData );
- #endif
- */
-
//-------------------------------------------------------------------------------------------------------------
// public methods
//-------------------------------------------------------------------------------------------------------------
@@ -172,9 +137,7 @@ class SvtViewOptions: public Options
@descr This will de-/initialize an instance with default values.
You must give us the basic type of your view and a name which specify right entry
in dynamical configuration list. If entry not exist, we create a new one!
-
@seealso enum EViewType
-
@param "eType" specify type of your view and is used to use right data container!
@param "sViewName" specify the name of your view and is the key name in data list too.
@return -
@@ -197,12 +160,9 @@ class SvtViewOptions: public Options
@descr These class is threadsafe.
We create a static mutex only for one time and use it to protect our refcount and container
member!
-
@seealso -
-
@param -
@return A reference to a static mutex member.
-
@onerror -
*//*-*****************************************************************************************************/
diff --git a/binfilter/inc/bf_svx/chrtitem.hxx b/binfilter/inc/bf_svx/chrtitem.hxx
index 45d5484..1f809c9 100644
--- a/binfilter/inc/bf_svx/chrtitem.hxx
+++ b/binfilter/inc/bf_svx/chrtitem.hxx
@@ -205,13 +205,6 @@ public:
//------------------------------------------------------------------
-#ifdef ITEMID_CHARTREGRESS
-
-
-#endif
-
-//------------------------------------------------------------------
-
#ifdef ITEMID_CHARTDATADESCR
class SvxChartDataDescrItem : public SfxEnumItem
@@ -302,22 +295,6 @@ public:
#endif
-//------------------------------------------------------------------
-
-#ifdef ITEMID_CHARTKINDERROR
-
-
-#endif
-
-//------------------------------------------------------------------
-
-#ifdef ITEMID_CHARTINDICATE
-
-
-#endif
-
-//------------------------------------------------------------------
-
#ifdef ITEMID_DOUBLE
class SvxDoubleItem : public SfxPoolItem
@@ -338,8 +315,6 @@ public:
virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVersion) const;
virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const;
-
-
double GetValue() const { return fVal; }
void SetValue(double fNewVal) { fVal = fNewVal; }
};
diff --git a/binfilter/inc/bf_svx/dlgutil.hxx b/binfilter/inc/bf_svx/dlgutil.hxx
index c3dbb89..f6123a8 100644
--- a/binfilter/inc/bf_svx/dlgutil.hxx
+++ b/binfilter/inc/bf_svx/dlgutil.hxx
@@ -33,44 +33,16 @@
#include <bf_svtools/intitem.hxx>
namespace binfilter {
-// macro -----------------------------------------------------------------
-
-// typedef ---------------------------------------------------------------
-
-
// Functions -------------------------------------------------------------
-// HM- und LanguageStrings aus der Resource laden
-
// FieldUnit im MetricField oder -Box umsetzen
-
FieldUnit GetModuleFieldUnit( const SfxItemSet* pSet = NULL );
// Metriken umrechnen
long CalcToUnit( float nIn, SfxMapUnit eUnit );
long CalcToPoint( long nIn, SfxMapUnit eUnit, USHORT nFaktor );
-
long ItemToControl( long nIn, SfxMapUnit eItem, SfxFieldUnit eCtrl );
-
-
-
-// to Twips
-
-// to CM
-
-// to MM
-
-// to Inch
-
-// to Point
-
-// To Pica
-
-// generische Wandlung
-
-// replacement of the SfxIniManager
-
#define OUTPUT_DRAWMODE_COLOR (DRAWMODE_DEFAULT)
}//end of namespace binfilter
diff --git a/binfilter/inc/bf_svx/obj3d.hxx b/binfilter/inc/bf_svx/obj3d.hxx
index f84a790..98e8209 100644
--- a/binfilter/inc/bf_svx/obj3d.hxx
+++ b/binfilter/inc/bf_svx/obj3d.hxx
@@ -30,34 +30,21 @@
#define _E3D_OBJ3D_HXX
#include <bf_svx/svdoattr.hxx>
-
#include <bf_svx/svdobj.hxx>
-
#include <bf_svx/volume3d.hxx>
-
#include <bf_svx/matrix3d.hxx>
-
#include <bf_svx/def3d.hxx>
-
#include <bf_svx/svdpage.hxx>
-
#include <bf_svx/deflt3d.hxx>
-
#include <vcl/bitmap.hxx>
-
#include <bf_goodies/b3dgeom.hxx>
-
#include <bf_goodies/matril3d.hxx>
-
#include <bf_goodies/b3dtex.hxx>
-
#include <bf_goodies/b3dlight.hxx>
-
#include <bf_goodies/base3d.hxx>
-
#include <bf_svx/svx3ditems.hxx>
-
#include <bf_svx/xflclit.hxx>
+
class Base3D;
namespace binfilter {
class SfxPoolItem;
@@ -195,13 +182,6 @@ class E3dObject : public SdrAttrObj
virtual SdrObjList* GetSubList() const;
-
- // 3D-Zeichenmethode
-
- // Objekt als Kontur in das Polygon einfuegen
-
- // Schatten fuer 3D-Objekte zeichnen
-
// 3D-Objekt in die Gruppe einfuegen; Eigentumsuebergang!
virtual void Insert3DObj(E3dObject* p3DObj);
void Remove3DObj(E3dObject* p3DObj);
@@ -222,13 +202,6 @@ class E3dObject : public SdrAttrObj
virtual void NbcResetTransform();
virtual void SetTransform(const Matrix4D& rMatrix);
- // Translation
- // Skalierung
-
-
- // Rotation mit Winkel in Radiant
-
-
// [FG] 2D-Rotationen, werden hier als Rotationen um die Z-Achse, die in den Bildschirm zeigt,
// implementiert plus eine Verschiebung der Scene. Dies bedeutet auch die Scene (E3dScene)
// muss diese Routine in der Klasse als virtual definieren.
@@ -425,8 +398,6 @@ protected:
void SetDefaultAttributes(E3dDefaultAttributes& rDefault);
- // convert given PolyPolygon3D to screen coor
-
public :
TYPEINFO();
@@ -501,16 +472,6 @@ public :
virtual void WriteData(SvStream& rOut) const;
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
- // 3D-Zeichenmethode
-
- // Objekt als Kontur in das Polygon einfuegen
-
- // Schatten fuer 3D-Objekte zeichnen
-
- // #78972#
-
- // Bitmaps fuer 3D-Darstellung von Gradients und Hatches holen
-
// Geometrieerzeugung
void DestroyGeometry();
virtual void CreateGeometry();
@@ -526,27 +487,19 @@ public :
// Unterstuetzung Objekte lesen
BOOL AreBytesLeft() const { return bBytesLeft; }
- // Copy-Operator
-
- // Ausgabeparameter an 3D-Kontext setzen
private:
-public:
+public:
// DisplayGeometry rausruecken
B3dGeometry& GetDisplayGeometry();
- // Transformation auf die Geometrie anwenden
-
// Schattenattribute holen
BOOL DoDrawShadow();
- // WireFrame Darstellung eines Objektes
-
- // Nromalen invertiert benutzen
private:
void SetInvertNormals(BOOL bNew);
-public:
+public:
// Material des Objektes
const Color& GetMaterialAmbientColor() const { return aMaterialAmbientColor; }
void SetMaterialAmbientColor(const Color& rColor);
diff --git a/binfilter/inc/bf_svx/svdattrx.hxx b/binfilter/inc/bf_svx/svdattrx.hxx
index ac910fc..631f7a1 100644
--- a/binfilter/inc/bf_svx/svdattrx.hxx
+++ b/binfilter/inc/bf_svx/svdattrx.hxx
@@ -30,93 +30,49 @@
#define _SVDATTRX_HXX
#include <bf_svx/sxmlhitm.hxx>
-
#include <bf_svx/sxallitm.hxx>
-
#include <bf_svx/sxcaitm.hxx>
-
#include <bf_svx/sxcecitm.hxx>
-
#include <bf_svx/sxcgitm.hxx>
-
#include <bf_svx/sxciaitm.hxx>
-
#include <bf_svx/sxcikitm.hxx>
-
#include <bf_svx/sxcisitm.hxx>
-
#include <bf_svx/sxcllitm.hxx>
-
#include <bf_svx/sxcsitm.hxx>
-
#include <bf_svx/sxctitm.hxx>
-
#include <bf_svx/sxekitm.hxx>
-
#include <bf_svx/sxelditm.hxx>
-
#include <bf_svx/sxenditm.hxx>
-
#include <bf_svx/sxesitm.hxx>
-
#include <bf_svx/sxfiitm.hxx>
-
#include <bf_svx/sxlayitm.hxx>
-
#include <bf_svx/sxlogitm.hxx>
-
#include <bf_svx/sxmbritm.hxx>
-
#include <bf_svx/sxmfsitm.hxx>
-
#include <bf_svx/sxmkitm.hxx>
-
#include <bf_svx/sxmoitm.hxx>
-
#include <bf_svx/sxmovitm.hxx>
-
#include <bf_svx/sxmseitm.hxx>
-
#include <bf_svx/sxmsitm.hxx>
-
#include <bf_svx/sxmspitm.hxx>
-
#include <bf_svx/sxmsuitm.hxx>
-
#include <bf_svx/sxmtaitm.hxx>
-
#include <bf_svx/sxmtfitm.hxx>
-
#include <bf_svx/sxmtpitm.hxx>
-
#include <bf_svx/sxmtritm.hxx>
-
#include <bf_svx/sxmuitm.hxx>
-
#include <bf_svx/sxoneitm.hxx>
-
#include <bf_svx/sxonitm.hxx>
-
#include <bf_svx/sxopitm.hxx>
-
#include <bf_svx/sxraitm.hxx>
-
#include <bf_svx/sxreaitm.hxx>
-
#include <bf_svx/sxreoitm.hxx>
-
#include <bf_svx/sxroaitm.hxx>
-
#include <bf_svx/sxrooitm.hxx>
-
#include <bf_svx/sxsaitm.hxx>
-
#include <bf_svx/sxsalitm.hxx>
-
#include <bf_svx/sxsiitm.hxx>
-
#include <bf_svx/sxsoitm.hxx>
-
#include <bf_svx/sxtraitm.hxx>
#endif //_SVDATTRX_HXX
diff --git a/binfilter/inc/bf_svx/svdobj.hxx b/binfilter/inc/bf_svx/svdobj.hxx
index 8c61271..f56e914 100644
--- a/binfilter/inc/bf_svx/svdobj.hxx
+++ b/binfilter/inc/bf_svx/svdobj.hxx
@@ -30,29 +30,17 @@
#define _SVDOBJ_HXX
#include <memory>
-
#include <cppuhelper/weakref.hxx>
-
#include <vcl/mapmod.hxx>
-
#include <bf_svtools/lstner.hxx>
-
#include <vcl/timer.hxx>
-
#include <bf_svx/svdsob.hxx>
-
#include <bf_svx/svdtypes.hxx> // fuer SdrLayerID
-
#include <bf_svx/svdglue.hxx> // Klebepunkte
-
#include <bf_svx/xdash.hxx>
-
#include <bf_svx/xpoly.hxx>
-
#include <bf_svx/poly3d.hxx>
-
#include <bf_svx/xenum.hxx>
-
#include <tools/color.hxx>
class Pointer;
@@ -71,7 +59,6 @@ class SfxPoolItem;
//************************************************************
// Vorausdeklarationen
//************************************************************
-
class ExtOutputDevice;
class OutlinerParaObject;
class SdrOutliner;
@@ -99,7 +86,6 @@ class SdrLineGeometry;
//************************************************************
// Defines
//************************************************************
-
enum SdrObjKind {OBJ_NONE = 0, // Abstraktes Objekt (SdrObject)
OBJ_GRUP = 1, // Objektgruppe
OBJ_LINE = 2, // Strecke
@@ -167,7 +153,6 @@ enum SdrUserCallType {SDRUSERCALL_MOVEONLY, // Nur verschoben, Groesse un
//************************************************************
// Hilfsklasse SdrObjUserCall
//************************************************************
-
class SdrObjUserCall
{
public:
@@ -179,7 +164,6 @@ public:
//************************************************************
// Hilfsklasse SdrObjMacroHitRec
//************************************************************
-
class SdrObjMacroHitRec
{
public:
@@ -303,7 +287,6 @@ public:
// Bitsack fuer DrawObjekte
//
//************************************************************
-
class SdrObjPlusData
{
friend class SdrObject;
@@ -312,7 +295,6 @@ public:
SfxBroadcaster* pBroadcast; // Broadcaster, falls dieses Obj referenziert wird (bVirtObj=TRUE). Auch fuer Konnektoren etc.
SdrObjUserDataList* pUserDataList; // applikationsspeziefische Daten
SdrGluePointList* pGluePoints; // Klebepunkte zum Ankleben von Objektverbindern
-// ImpSdrMtfAnimator* pAnimator; // Fuer Laufschrift und blinkenden Text
AutoTimer* pAutoTimer;
XubString aObjName; // Jedes Objekt soll nun einen Namen haben
@@ -332,7 +314,6 @@ public:
// gibt Auskunft ueber verschiedene Eigenschaften eines ZObjects
//
//************************************************************
-
class SdrObjTransformInfoRec
{
public:
@@ -385,7 +366,6 @@ public:
//************************************************************
// Hilfsklasse SdrObjTransformInfoRec
//************************************************************
-
class SdrPaintInfoRec
{
public:
@@ -436,18 +416,9 @@ public:
////////////////////////////////////////////////////////////////////////////////////////////////////
//
-// @@@@ @@@@@ @@@@@@ @@@@@ @@@@ @@@@@@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@@@@ @@ @@@@ @@ @@
-// @@ @@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@ @@ @@ @@ @@ @@ @@ @@
-// @@@@ @@@@@ @@@@ @@@@@ @@@@ @@
-//
// Abstraktes DrawObject
//
////////////////////////////////////////////////////////////////////////////////////////////////////
-
class SdrObject: public SfxListener
{
friend class SdrObjListIter;
@@ -515,10 +486,7 @@ protected:
SdrObjUserData* ImpGetMacroUserData() const;
// Fuer GetDragComment
-
void ImpForcePlusData() { if (pPlusData==NULL) pPlusData=NewPlusData(); }
-// ImpSdrMtfAnimator* ImpGetMtfAnimator() const { return pPlusData!=NULL ? pPlusData->pAnimator : NULL; }
-
// bNotMyself=TRUE bedeutet: Nur die ObjList auf Dirty setzen, nicht mich.
// Wird z.B. benoetigt fuer NbcMove, denn da movt man SnapRect und aOutRect
diff --git a/binfilter/inc/bf_svx/unotext.hxx b/binfilter/inc/bf_svx/unotext.hxx
index 3ee1293..0d900d9 100644
--- a/binfilter/inc/bf_svx/unotext.hxx
+++ b/binfilter/inc/bf_svx/unotext.hxx
@@ -49,23 +49,14 @@
#include <cppuhelper/weakagg.hxx>
#include <bf_svtools/itemprop.hxx>
-
#include <bf_svx/editdata.hxx>
-
#include <bf_svx/unoedsrc.hxx>
-
#include <bf_svtools/itemset.hxx>
-
#include <bf_svtools/itempool.hxx>
-
#include <bf_svx/svxenum.hxx>
-
#include <bf_svx/outliner.hxx>
-
#include <bf_svx/unoforou.hxx>
-
#include <bf_svx/unoprnms.hxx>
-
#include <bf_svx/eeitem.hxx>
#include <com/sun/star/text/XTextField.hpp>
@@ -92,6 +83,7 @@
#include <bf_svx/unoprov.hxx>
#include <bf_svx/unomid.hxx>
+
namespace binfilter {
#define WID_FONTDESC 3900
@@ -477,7 +469,9 @@ public:
// ====================================================================
}//end of namespace binfilter
+
#include <com/sun/star/text/XTextContent.hpp>
+
namespace binfilter {
class SvUShorts;
class SvxUnoTextContent : public SvxUnoTextRangeBase,
diff --git a/binfilter/inc/bf_xmloff/shapeexport.hxx b/binfilter/inc/bf_xmloff/shapeexport.hxx
index 25dbddb..86df01b 100644
--- a/binfilter/inc/bf_xmloff/shapeexport.hxx
+++ b/binfilter/inc/bf_xmloff/shapeexport.hxx
@@ -29,26 +29,17 @@
#define _XMLOFF_SHAPEEXPORT_HXX_
#include <rtl/ustring.hxx>
-
#include <rtl/ustrbuf.hxx>
-
#include <bf_xmloff/uniref.hxx>
-
#include <com/sun/star/drawing/XShape.hpp>
-
#include <com/sun/star/drawing/XShapes.hpp>
-
#include <com/sun/star/awt/Point.hpp>
-
#include <map>
-
#include <bf_xmloff/xmlprmap.hxx>
-
#include <bf_xmloff/xmlexppr.hxx>
-
#include <bf_xmloff/animexp.hxx>
-
#include <bf_xmloff/families.hxx>
+
class Vector2D;
namespace binfilter {
class Matrix3D;
diff --git a/binfilter/inc/bf_xmloff/shapeimport.hxx b/binfilter/inc/bf_xmloff/shapeimport.hxx
index 9b0797b..bfa2efc 100644
--- a/binfilter/inc/bf_xmloff/shapeimport.hxx
+++ b/binfilter/inc/bf_xmloff/shapeimport.hxx
@@ -30,25 +30,17 @@
#define _XMLOFF_SHAPEIMPORT_HXX_
#include <com/sun/star/beans/XPropertySet.hpp>
-
#include <com/sun/star/frame/XModel.hpp>
-
#include <com/sun/star/xml/sax/XAttributeList.hpp>
-
#include <com/sun/star/drawing/XShapes.hpp>
-
#include <com/sun/star/drawing/HomogenMatrix.hpp>
-
#include <com/sun/star/drawing/ProjectionMode.hpp>
-
#include <com/sun/star/drawing/ShadeMode.hpp>
#include <tools/color.hxx>
#include <bf_goodies/vector3d.hxx>
-
#include <bf_xmloff/uniref.hxx>
-
#include <bf_xmloff/xmlictxt.hxx>
#include <vector>
More information about the Libreoffice-commits
mailing list