diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-24 19:23:00 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-24 19:23:00 +0200 |
commit | 41ce86ad453eefdf1a5f8c5b72f2d0099f3938a7 (patch) | |
tree | b98deba63cc7e874608de37335b533858ad43acc /tools | |
parent | 182488ef1409a0a524e4a3e72d6098efd7bc8479 (diff) | |
parent | a3a5ec733152f282ba243644bced2c3cdecdcf98 (diff) |
Merge branch 'master' into feature/gnumake4
Diffstat (limited to 'tools')
-rw-r--r-- | tools/inc/tools/b3dtrans.hxx | 4 | ||||
-rw-r--r-- | tools/inc/tools/errinf.hxx | 2 | ||||
-rw-r--r-- | tools/inc/tools/fsys.hxx | 1 | ||||
-rw-r--r-- | tools/source/fsys/filecopy.cxx | 16 | ||||
-rw-r--r-- | tools/source/generic/b3dtrans.cxx | 50 | ||||
-rw-r--r-- | tools/source/ref/errinf.cxx | 5 |
6 files changed, 0 insertions, 78 deletions
diff --git a/tools/inc/tools/b3dtrans.hxx b/tools/inc/tools/b3dtrans.hxx index 420db468291a..6385cbad507c 100644 --- a/tools/inc/tools/b3dtrans.hxx +++ b/tools/inc/tools/b3dtrans.hxx @@ -213,10 +213,6 @@ protected: void PostSetProjection(); void PostSetViewport(); - void CalcMatObjectToDevice(); - void CalcMatFromWorldToView(); - void CalcMatInvTransObjectToEye(); - virtual void DeviceRectangleChange(); }; diff --git a/tools/inc/tools/errinf.hxx b/tools/inc/tools/errinf.hxx index ae407e345885..0b08d38592c8 100644 --- a/tools/inc/tools/errinf.hxx +++ b/tools/inc/tools/errinf.hxx @@ -210,8 +210,6 @@ private: protected: virtual sal_Bool CreateString( const ErrorInfo *, String &, sal_uInt16& nMask ) const = 0; - sal_Bool ForwCreateString( const ErrorInfo*, - String&, sal_uInt16& nMask ) const; public: ErrorHandler(); diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx index a0a494f538ad..d63dee9801dc 100644 --- a/tools/inc/tools/fsys.hxx +++ b/tools/inc/tools/fsys.hxx @@ -375,7 +375,6 @@ protected: const DirEntry *pSource, const DirEntry *pTarget ); public: - FileCopier(); FileCopier( const DirEntry &rSource, const DirEntry &rTarget ); FileCopier( const FileCopier &rCopier ); diff --git a/tools/source/fsys/filecopy.cxx b/tools/source/fsys/filecopy.cxx index 66b01e57a4b4..8629f2bc194e 100644 --- a/tools/source/fsys/filecopy.cxx +++ b/tools/source/fsys/filecopy.cxx @@ -53,22 +53,6 @@ using namespace ::osl; -/************************************************************************* -|* -|* FileCopier::FileCopier() -|* -*************************************************************************/ - -FileCopier::FileCopier() : - - nBytesTotal ( 0 ), - nBytesCopied( 0 ), - nBlockSize ( 4096 ), - pImp ( new FileCopier_Impl ) - -{ -} - // ----------------------------------------------------------------------- FileCopier::FileCopier( const DirEntry& rSource, const DirEntry& rTarget ) : diff --git a/tools/source/generic/b3dtrans.cxx b/tools/source/generic/b3dtrans.cxx index 1f731e1fd387..7a086f5a6166 100644 --- a/tools/source/generic/b3dtrans.cxx +++ b/tools/source/generic/b3dtrans.cxx @@ -449,56 +449,6 @@ const basegfx::B3DVector& B3dTransformationSet::GetTranslate() /************************************************************************* |* -|* Hilfsmatrixberechnungsroutinen -|* -\************************************************************************/ - -void B3dTransformationSet::CalcMatObjectToDevice() -{ - // ObjectToDevice berechnen (Orientation * Projection * Object) - maObjectToDevice = maObjectTrans; - maObjectToDevice *= maOrientation; - maObjectToDevice *= GetProjection(); - - // auf gueltig setzen - mbObjectToDeviceValid = sal_True; -} - -void B3dTransformationSet::CalcMatInvTransObjectToEye() -{ - maInvTransObjectToEye = maObjectTrans; - maInvTransObjectToEye *= maOrientation; - maInvTransObjectToEye.invert(); - maInvTransObjectToEye.transpose(); - - // eventuelle Translationen rausschmeissen, da diese - // Matrix nur zur Transformation von Vektoren gedacht ist - maInvTransObjectToEye.set(3, 0, 0.0); - maInvTransObjectToEye.set(3, 1, 0.0); - maInvTransObjectToEye.set(3, 2, 0.0); - maInvTransObjectToEye.set(3, 3, 1.0); - - // auf gueltig setzen - mbInvTransObjectToEyeValid = sal_True; -} - -void B3dTransformationSet::CalcMatFromWorldToView() -{ - maMatFromWorldToView = maOrientation; - maMatFromWorldToView *= GetProjection(); - const basegfx::B3DVector& rScale(GetScale()); - maMatFromWorldToView.scale(rScale.getX(), rScale.getY(), rScale.getZ()); - const basegfx::B3DVector& rTranslate(GetTranslate()); - maMatFromWorldToView.translate(rTranslate.getX(), rTranslate.getY(), rTranslate.getZ()); - maInvMatFromWorldToView = maMatFromWorldToView; - maInvMatFromWorldToView.invert(); - - // gueltig setzen - mbWorldToViewValid = sal_True; -} - -/************************************************************************* -|* |* Direkter Zugriff auf verschiedene Transformationen |* \************************************************************************/ diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx index 9a3dece87cf9..d47dc7586d0a 100644 --- a/tools/source/ref/errinf.cxx +++ b/tools/source/ref/errinf.cxx @@ -409,11 +409,6 @@ sal_uInt16 ErrorHandler::HandleError(sal_uIntPtr lId, sal_uInt16 nFlags) return HandleError_Impl( lId, nFlags, sal_False, aDummy ); } -sal_Bool ErrorHandler::ForwCreateString(const ErrorInfo* pInfo, String& rStr, sal_uInt16 &rFlags) const -{ - return ErrHdl_Impl::CreateString(this->pImpl->pNext, pInfo, rStr, rFlags); -} - sal_Bool ErrHdl_Impl::CreateString( const ErrorHandler *pStart, const ErrorInfo* pInfo, String& pStr, sal_uInt16 &rFlags) |