[Libreoffice-commits] .: 3 commits - linguistic/source sfx2/Library_sfx.mk sfx2/source svx/inc svx/source xmloff/inc xmloff/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Mon Jul 25 06:12:46 PDT 2011
linguistic/source/dicimp.cxx | 5 -
linguistic/source/dicimp.hxx | 1
sfx2/Library_sfx.mk | 1
sfx2/source/appl/appinit.cxx | 1
sfx2/source/appl/appmain.cxx | 1
sfx2/source/appl/appmisc.cxx | 1
sfx2/source/dialog/intro.cxx | 109 ---------------------------
sfx2/source/inc/intro.hxx | 57 --------------
svx/inc/svx/camera3d.hxx | 10 --
svx/inc/svx/cube3d.hxx | 1
svx/inc/svx/lathe3d.hxx | 1
svx/inc/svx/obj3d.hxx | 3
svx/inc/svx/polygn3d.hxx | 11 --
svx/inc/svx/scene3d.hxx | 3
svx/inc/svx/sphere3d.hxx | 1
svx/inc/svx/view3d.hxx | 4 -
svx/source/engine3d/camera3d.cxx | 120 ------------------------------
svx/source/engine3d/cube3d.cxx | 9 --
svx/source/engine3d/lathe3d.cxx | 12 ---
svx/source/engine3d/obj3d.cxx | 28 -------
svx/source/engine3d/polygn3d.cxx | 30 -------
svx/source/engine3d/scene3d.cxx | 14 ---
svx/source/engine3d/sphere3d.cxx | 11 --
svx/source/engine3d/view3d.cxx | 124 -------------------------------
xmloff/inc/DomBuilderContext.hxx | 3
xmloff/inc/xexptran.hxx | 9 --
xmloff/source/core/DomBuilderContext.cxx | 6 -
xmloff/source/core/DomExport.cxx | 7 -
xmloff/source/draw/sdxmlimp.cxx | 17 ----
xmloff/source/draw/sdxmlimp_impl.hxx | 6 -
xmloff/source/draw/viewcontext.cxx | 5 -
xmloff/source/draw/viewcontext.hxx | 3
xmloff/source/draw/xexptran.cxx | 55 -------------
33 files changed, 669 deletions(-)
New commits:
commit c4c2b2f23f954084feab5b3c07c3197f911cd8e2
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Jul 22 23:38:52 2011 +0200
callcatcher: remove unused methods
diff --git a/svx/inc/svx/camera3d.hxx b/svx/inc/svx/camera3d.hxx
index 0f1a8ab..382d143 100644
--- a/svx/inc/svx/camera3d.hxx
+++ b/svx/inc/svx/camera3d.hxx
@@ -58,9 +58,6 @@ class SVX_DLLPUBLIC Camera3D : public Viewport3D
double fFocalLen = 35.0, double fBankAng = 0);
Camera3D();
- // Reset to default values
- void Reset();
-
void SetDefaults(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLookAt,
double fFocalLen = 35.0, double fBankAng = 0);
@@ -74,19 +71,12 @@ class SVX_DLLPUBLIC Camera3D : public Viewport3D
// Focal length in mm
void SetFocalLength(double fLen);
- void SetFocalLengthWithCorrect(double fLen);
double GetFocalLength() const { return fFocalLength; }
// Bank angle links/rechts
void SetBankAngle(double fAngle);
double GetBankAngle() const { return fBankAngle; }
- // For rotating the camera position. Changes LookAt.
- void Rotate(double fHAngle, double fVAngle);
-
- // For changing the point of view. Changes the position.
- void RotateAroundLookAt(double fHAngle, double fVAngle);
-
void SetAutoAdjustProjection(bool bAdjust = true)
{ bAutoAdjustProjection = bAdjust; }
bool IsAutoAdjustProjection() const { return bAutoAdjustProjection; }
diff --git a/svx/source/engine3d/camera3d.cxx b/svx/source/engine3d/camera3d.cxx
index aa7be8d..baad704 100644
--- a/svx/source/engine3d/camera3d.cxx
+++ b/svx/source/engine3d/camera3d.cxx
@@ -52,15 +52,6 @@ Camera3D::Camera3D()
Camera3D(aVector3D, basegfx::B3DPoint());
}
-void Camera3D::Reset()
-{
- SetVPD(0);
- fBankAngle = fResetBankAngle;
- SetPosition(aResetPos);
- SetLookAt(aResetLookAt);
- SetFocalLength(fResetFocalLength);
-}
-
// Set default values for reset
void Camera3D::SetDefaults(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLookAt,
@@ -212,115 +203,4 @@ void Camera3D::SetFocalLength(double fLen)
fFocalLength = fLen;
}
-// To rotate the camera position, this changes LookAt
-
-void Camera3D::Rotate(double fHAngle, double fVAngle)
-{
- basegfx::B3DHomMatrix aTf;
- basegfx::B3DVector aDiff(aLookAt - aPosition);
- const double fV(sqrt(aDiff.getX() * aDiff.getX() + aDiff.getZ() * aDiff.getZ()));
-
- if ( fV != 0.0 )
- {
- basegfx::B3DHomMatrix aTemp;
- const double fSin(aDiff.getZ() / fV);
- const double fCos(aDiff.getX() / fV);
-
- aTemp.set(0, 0, fCos);
- aTemp.set(2, 2, fCos);
- aTemp.set(0, 2, fSin);
- aTemp.set(2, 0, -fSin);
-
- aTf *= aTemp;
- }
-
- {
- aTf.rotate(0.0, 0.0, fVAngle);
- }
-
- if ( fV != 0.0 )
- {
- basegfx::B3DHomMatrix aTemp;
- const double fSin(-aDiff.getZ() / fV);
- const double fCos(aDiff.getX() / fV);
-
- aTemp.set(0, 0, fCos);
- aTemp.set(2, 2, fCos);
- aTemp.set(0, 2, fSin);
- aTemp.set(2, 0, -fSin);
-
- aTf *= aTemp;
- }
-
- {
- aTf.rotate(0.0, fHAngle, 0.0);
- }
-
- aDiff *= aTf;
- SetLookAt(aPosition + aDiff);
-}
-
-// To rotate the view point, this changes the position
-
-void Camera3D::RotateAroundLookAt(double fHAngle, double fVAngle)
-{
- basegfx::B3DHomMatrix aTf;
- basegfx::B3DVector aDiff(aPosition - aLookAt);
- const double fV(sqrt(aDiff.getX() * aDiff.getX() + aDiff.getZ() * aDiff.getZ()));
-
- if ( fV != 0.0 )
- {
- basegfx::B3DHomMatrix aTemp;
- const double fSin(aDiff.getZ() / fV);
- const double fCos(aDiff.getX() / fV);
-
- aTemp.set(0, 0, fCos);
- aTemp.set(2, 2, fCos);
- aTemp.set(0, 2, fSin);
- aTemp.set(2, 0, -fSin);
-
- aTf *= aTemp;
- }
-
- {
- aTf.rotate(0.0, 0.0, fVAngle);
- }
-
- if ( fV != 0.0 )
- {
- basegfx::B3DHomMatrix aTemp;
- const double fSin(-aDiff.getZ() / fV);
- const double fCos(aDiff.getX() / fV);
-
- aTemp.set(0, 0, fCos);
- aTemp.set(2, 2, fCos);
- aTemp.set(0, 2, fSin);
- aTemp.set(2, 0, -fSin);
-
- aTf *= aTemp;
- }
-
- {
- aTf.rotate(0.0, fHAngle, 0.0);
- }
-
- aDiff *= aTf;
- SetPosition(aLookAt + aDiff);
-}
-
-// ??? this probably sets the projection plane in a certain depth
-
-void Camera3D::SetFocalLengthWithCorrect(double fLen)
-{
- if ( fLen < 5.0 )
- {
- fLen = 5.0;
- }
-
- SetPRP(basegfx::B3DPoint(0.0, 0.0, aPRP.getZ() * fLen / fFocalLength));
- fFocalLength = fLen;
-}
-
-// eof
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/xexptran.hxx b/xmloff/inc/xexptran.hxx
index 14f27ab..7a5fcfa 100644
--- a/xmloff/inc/xexptran.hxx
+++ b/xmloff/inc/xexptran.hxx
@@ -70,15 +70,11 @@ class SdXMLImExTransform2D
public:
SdXMLImExTransform2D() {}
- SdXMLImExTransform2D(const rtl::OUString& rNew, const SvXMLUnitConverter& rConv);
~SdXMLImExTransform2D() { EmptyList(); }
void AddRotate(double fNew);
- void AddScale(const ::basegfx::B2DTuple& rNew);
void AddTranslate(const ::basegfx::B2DTuple& rNew);
void AddSkewX(double fNew);
- void AddSkewY(double fNew);
- void AddMatrix(const ::basegfx::B2DHomMatrix& rNew);
bool NeedsAction() const { return !maList.empty(); }
void GetFullTransform(::basegfx::B2DHomMatrix& rFullTrans);
@@ -100,11 +96,6 @@ public:
SdXMLImExTransform3D(const rtl::OUString& rNew, const SvXMLUnitConverter& rConv);
~SdXMLImExTransform3D() { EmptyList(); }
- void AddRotateX(double fNew);
- void AddRotateY(double fNew);
- void AddRotateZ(double fNew);
- void AddScale(const ::basegfx::B3DTuple& rNew);
- void AddTranslate(const ::basegfx::B3DTuple& rNew);
void AddMatrix(const ::basegfx::B3DHomMatrix& rNew);
void AddHomogenMatrix(const com::sun::star::drawing::HomogenMatrix& xHomMat);
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 8d9b93d..12b84e6 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -491,15 +491,6 @@ SdXMLImport::~SdXMLImport() throw ()
//////////////////////////////////////////////////////////////////////////////
-void SdXMLImport::SetProgress(sal_Int32 nProg)
-{
- // set progress view
- if(mxStatusIndicator.is())
- mxStatusIndicator->setValue(nProg);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
const SvXMLTokenMap& SdXMLImport::GetDocElemTokenMap()
{
if(!mpDocElemTokenMap)
@@ -854,14 +845,6 @@ SvXMLImportContext *SdXMLImport::CreateFontDeclsContext(const OUString& rLocalNa
}
//////////////////////////////////////////////////////////////////////////////
-// import pool defaults. Parameter contains pool defaults read
-// from input data. These data needs to be set at the model.
-//
-void SdXMLImport::ImportPoolDefaults(const XMLPropStyleContext*)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////////
SvXMLImportContext *SdXMLImport::CreateScriptContext(
const OUString& rLocalName )
diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx
index f0c10ae..06cf8ed 100644
--- a/xmloff/source/draw/sdxmlimp_impl.hxx
+++ b/xmloff/source/draw/sdxmlimp_impl.hxx
@@ -255,8 +255,6 @@ public:
// XInitialization
virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
- void SetProgress(sal_Int32 nProg);
-
virtual void SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps);
virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps);
@@ -312,10 +310,6 @@ public:
sal_Bool IsDraw() const { return mbIsDraw; }
sal_Bool IsImpress() const { return !mbIsDraw; }
- // import pool defaults. Parameter contains pool defaults read
- // from input data. These data needs to be set at the model.
- void ImportPoolDefaults(const XMLPropStyleContext* pPool);
-
// #80365#
virtual void SetStatistics(
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats);
diff --git a/xmloff/source/draw/viewcontext.cxx b/xmloff/source/draw/viewcontext.cxx
index 7f0fbac..0090742 100644
--- a/xmloff/source/draw/viewcontext.cxx
+++ b/xmloff/source/draw/viewcontext.cxx
@@ -44,11 +44,6 @@ using ::rtl::OUString;
//------------------------------------------------------------------
-SdXMLViewSettingsContext::SdXMLViewSettingsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& ) :
- SvXMLImportContext( rImport, nPrfx, rLName )
-{
-}
-
SdXMLViewSettingsContext::~SdXMLViewSettingsContext()
{
}
diff --git a/xmloff/source/draw/viewcontext.hxx b/xmloff/source/draw/viewcontext.hxx
index c7faa2f..2d8ffe5 100644
--- a/xmloff/source/draw/viewcontext.hxx
+++ b/xmloff/source/draw/viewcontext.hxx
@@ -40,9 +40,6 @@ class SdXMLViewSettingsContext : public SvXMLImportContext
::com::sun::star::awt::Rectangle maVisArea;
public:
- SdXMLViewSettingsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList>& xAttrList);
virtual ~SdXMLViewSettingsContext();
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index 9f18076..21983eb 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -386,12 +386,6 @@ void SdXMLImExTransform2D::AddRotate(double fNew)
maList.push_back(new ImpSdXMLExpTransObj2DRotate(fNew));
}
-void SdXMLImExTransform2D::AddScale(const ::basegfx::B2DTuple& rNew)
-{
- if(1.0 != rNew.getX() || 1.0 != rNew.getY())
- maList.push_back(new ImpSdXMLExpTransObj2DScale(rNew));
-}
-
void SdXMLImExTransform2D::AddTranslate(const ::basegfx::B2DTuple& rNew)
{
if(!rNew.equalZero())
@@ -404,18 +398,6 @@ void SdXMLImExTransform2D::AddSkewX(double fNew)
maList.push_back(new ImpSdXMLExpTransObj2DSkewX(fNew));
}
-void SdXMLImExTransform2D::AddSkewY(double fNew)
-{
- if(fNew != 0.0)
- maList.push_back(new ImpSdXMLExpTransObj2DSkewY(fNew));
-}
-
-void SdXMLImExTransform2D::AddMatrix(const ::basegfx::B2DHomMatrix& rNew)
-{
- if(!rNew.isIdentity())
- maList.push_back(new ImpSdXMLExpTransObj2DMatrix(rNew));
-}
-
//////////////////////////////////////////////////////////////////////////////
// gen string for export
const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter& rConv)
@@ -520,13 +502,6 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter&
}
//////////////////////////////////////////////////////////////////////////////
-// for Import: constructor with string, parses it and generates entries
-SdXMLImExTransform2D::SdXMLImExTransform2D(const OUString& rNew, const SvXMLUnitConverter& rConv)
-{
- SetString(rNew, rConv);
-}
-
-//////////////////////////////////////////////////////////////////////////////
// sets new string, parses it and generates entries
void SdXMLImExTransform2D::SetString(const OUString& rNew, const SvXMLUnitConverter& rConv)
{
@@ -836,36 +811,6 @@ void SdXMLImExTransform3D::EmptyList()
//////////////////////////////////////////////////////////////////////////////
// add members
-void SdXMLImExTransform3D::AddRotateX(double fNew)
-{
- if(fNew != 0.0)
- maList.push_back(new ImpSdXMLExpTransObj3DRotateX(fNew));
-}
-
-void SdXMLImExTransform3D::AddRotateY(double fNew)
-{
- if(fNew != 0.0)
- maList.push_back(new ImpSdXMLExpTransObj3DRotateY(fNew));
-}
-
-void SdXMLImExTransform3D::AddRotateZ(double fNew)
-{
- if(fNew != 0.0)
- maList.push_back(new ImpSdXMLExpTransObj3DRotateZ(fNew));
-}
-
-void SdXMLImExTransform3D::AddScale(const ::basegfx::B3DTuple& rNew)
-{
- if(1.0 != rNew.getX() || 1.0 != rNew.getY() || 1.0 != rNew.getZ())
- maList.push_back(new ImpSdXMLExpTransObj3DScale(rNew));
-}
-
-void SdXMLImExTransform3D::AddTranslate(const ::basegfx::B3DTuple& rNew)
-{
- if(!rNew.equalZero())
- maList.push_back(new ImpSdXMLExpTransObj3DTranslate(rNew));
-}
-
void SdXMLImExTransform3D::AddMatrix(const ::basegfx::B3DHomMatrix& rNew)
{
if(!rNew.isIdentity())
commit cfd9e25671347b0d110c978c5b769ba4dd679965
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Jul 22 22:39:26 2011 +0200
callcatcher: remove unused methods
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index ffdf72d..aee79b5 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -1077,11 +1077,6 @@ void SAL_CALL DictionaryNeo::storeToURL(
}
-DicEntry::DicEntry()
-{
- bIsNegativ = sal_False;
-}
-
DicEntry::DicEntry(const OUString &rDicFileWord,
sal_Bool bIsNegativWord)
{
diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx
index ca9bed4..8781ca5 100644
--- a/linguistic/source/dicimp.hxx
+++ b/linguistic/source/dicimp.hxx
@@ -211,7 +211,6 @@ class DicEntry :
::rtl::OUString &rReplacement);
public:
- DicEntry();
DicEntry(const ::rtl::OUString &rDicFileWord, sal_Bool bIsNegativ);
DicEntry(const ::rtl::OUString &rDicWord, sal_Bool bIsNegativ,
const ::rtl::OUString &rRplcText);
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 4af5501..e002fea 100755
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -158,7 +158,6 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
sfx2/source/dialog/dockwin \
sfx2/source/dialog/filedlghelper \
sfx2/source/dialog/filtergrouping \
- sfx2/source/dialog/intro \
sfx2/source/dialog/itemconnect \
sfx2/source/dialog/mailmodel \
sfx2/source/dialog/mgetempl \
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 4d60e33..7d91f33 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -68,7 +68,6 @@
#include <sfx2/dispatch.hxx>
#include <sfx2/docfac.hxx>
#include <sfx2/evntconf.hxx>
-#include "intro.hxx"
#include <sfx2/mnumgr.hxx>
#include <sfx2/msgpool.hxx>
#include <sfx2/progress.hxx>
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index a8fa83d..28c035a 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -54,7 +54,6 @@
#include "sfx2/sfxresid.hxx"
#include <sfx2/fcontnr.hxx>
#include <sfx2/viewsh.hxx>
-#include "intro.hxx"
#include <sfx2/msgpool.hxx>
#include <sfx2/mnumgr.hxx>
#include <sfx2/appuno.hxx>
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index e9cfc20..980237c 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -71,7 +71,6 @@
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
#include "workwin.hxx"
-#include "intro.hxx"
#include <sfx2/fcontnr.hxx>
#include "sfxlocal.hrc"
#include <sfx2/sfx.hrc>
diff --git a/sfx2/source/dialog/intro.cxx b/sfx2/source/dialog/intro.cxx
deleted file mode 100644
index 0583899..0000000
--- a/sfx2/source/dialog/intro.cxx
+++ /dev/null
@@ -1,109 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sfx2.hxx"
-
-#include "intro.hxx"
-
-#include <tools/stream.hxx>
-#include <tools/urlobj.hxx>
-#include <unotools/pathoptions.hxx>
-#include <unotools/configmgr.hxx>
-#include <com/sun/star/uno/Any.h>
-
-#include <sfx2/sfxuno.hxx>
-
-// -----------------------------------------------------------------------
-
-void IntroWindow_Impl::Init()
-{
- Size aSize = aIntroBmp.GetSizePixel();
- SetOutputSizePixel( aSize );
- Size aScreenSize( GetDesktopRectPixel().GetSize() );
- Size aWinSize( GetSizePixel() );
- Point aWinPos( ( aScreenSize.Width() - aWinSize.Width() ) / 2,
- ( aScreenSize.Height() - aWinSize.Height() ) / 2 );
- SetPosPixel( aWinPos );
-
- if ( GetColorCount() >= 16 )
- {
- Show();
- Update();
- }
-}
-
-// -----------------------------------------------------------------------
-
-IntroWindow_Impl::IntroWindow_Impl( const Bitmap& rBmp ) :
-
- WorkWindow( NULL, (WinBits)0 ),
-
- aIntroBmp( rBmp )
-
-{
- Hide();
-
- // load bitmap depends on productname ("StarOffice", "StarSuite",...)
- ::com::sun::star::uno::Any aRet = ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTNAME );
- rtl::OUString aTmp;
- aRet >>= aTmp;
- String aBmpFileName = aTmp;
- aBmpFileName += String( DEFINE_CONST_UNICODE("_intro.bmp") );
- INetURLObject aObj( SvtPathOptions().GetModulePath(), INET_PROT_FILE );
- aObj.insertName( aBmpFileName );
- SvFileStream aStrm( aObj.PathToFileName(), STREAM_STD_READ );
- if ( !aStrm.GetError() )
- aStrm >> aIntroBmp;
-
- Init();
-}
-
-// -----------------------------------------------------------------------
-
-IntroWindow_Impl::~IntroWindow_Impl()
-{
- Hide();
-}
-
-// -----------------------------------------------------------------------
-
-void IntroWindow_Impl::Paint( const Rectangle& )
-{
- DrawBitmap( Point(), aIntroBmp );
- Flush();
-}
-
-// -----------------------------------------------------------------------
-
-void IntroWindow_Impl::Slide()
-{
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/intro.hxx b/sfx2/source/inc/intro.hxx
deleted file mode 100644
index 6b9212c..0000000
--- a/sfx2/source/inc/intro.hxx
+++ /dev/null
@@ -1,57 +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 _SFX_INTRO_HXX
-#define _SFX_INTRO_HXX
-
-// include ---------------------------------------------------------------
-
-#include <vcl/wrkwin.hxx>
-#include <vcl/bitmap.hxx>
-
-// class IntroWindow_Impl ------------------------------------------------
-
-class IntroWindow_Impl : public WorkWindow
-{
-private:
- Bitmap aIntroBmp;
-
- void Init();
-
-public:
- IntroWindow_Impl( const Bitmap& rBmp );
- ~IntroWindow_Impl();
-
- virtual void Paint( const Rectangle& );
-
- void Slide();
-};
-
-#endif // #ifndef _SFX_INTRO_HXX
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/DomBuilderContext.hxx b/xmloff/inc/DomBuilderContext.hxx
index 027749d..bb41ff5 100644
--- a/xmloff/inc/DomBuilderContext.hxx
+++ b/xmloff/inc/DomBuilderContext.hxx
@@ -86,9 +86,6 @@ public:
/** access the DOM tree */
com::sun::star::uno::Reference<com::sun::star::xml::dom::XDocument> getTree();
- /** access this context's DOM sub-tree */
- com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode> getNode();
-
//
// implement SvXMLImportContext methods:
diff --git a/xmloff/source/core/DomBuilderContext.cxx b/xmloff/source/core/DomBuilderContext.cxx
index 439b035..83ab970 100644
--- a/xmloff/source/core/DomBuilderContext.cxx
+++ b/xmloff/source/core/DomBuilderContext.cxx
@@ -108,12 +108,6 @@ Reference<XDocument> DomBuilderContext::getTree()
return mxNode->getOwnerDocument();
}
-Reference<XNode> DomBuilderContext::getNode()
-{
- return mxNode;
-}
-
-
SvXMLImportContext* DomBuilderContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
diff --git a/xmloff/source/core/DomExport.cxx b/xmloff/source/core/DomExport.cxx
index 1f179a8..07379e1 100644
--- a/xmloff/source/core/DomExport.cxx
+++ b/xmloff/source/core/DomExport.cxx
@@ -171,7 +171,6 @@ class DomExport: public DomVisitor
void addNamespace( const OUString& sPrefix, const OUString& sURI );
OUString qualifiedName( const OUString& sPrefix, const OUString& sURI,
const OUString& sLocalName );
- OUString qualifiedName( const Reference<XNode>& );
OUString qualifiedName( const Reference<XElement>& );
OUString qualifiedName( const Reference<XAttr>& );
void addAttribute( const Reference<XAttr>& );
@@ -241,12 +240,6 @@ OUString DomExport::qualifiedName( const OUString& sPrefix,
return sBuffer.makeStringAndClear();
}
-OUString DomExport::qualifiedName( const Reference<XNode>& xNode )
-{
- return qualifiedName( xNode->getPrefix(), xNode->getNamespaceURI(),
- xNode->getNodeName() );
-}
-
OUString DomExport::qualifiedName( const Reference<XElement>& xElement )
{
return qualifiedName( xElement->getPrefix(), xElement->getNamespaceURI(),
commit 47beda6f05d60682098b0cc793baa04f4dd4342c
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Jul 22 21:59:29 2011 +0200
callcatcher: remove unused E3D stuff
diff --git a/svx/inc/svx/cube3d.hxx b/svx/inc/svx/cube3d.hxx
index c748c7a..0a63f0e 100644
--- a/svx/inc/svx/cube3d.hxx
+++ b/svx/inc/svx/cube3d.hxx
@@ -85,7 +85,6 @@ public:
void SetPosIsCenter(sal_Bool bNew);
sal_Bool GetPosIsCenter() { return (sal_Bool)bPosIsCenter; }
- void SetSideFlags(sal_uInt16 nNew);
sal_uInt16 GetSideFlags() { return nSideFlags; }
// TakeObjName...() is for the display in the UI, for example "3 frames selected".
diff --git a/svx/inc/svx/lathe3d.hxx b/svx/inc/svx/lathe3d.hxx
index 2d1f23b..4adc0c1 100644
--- a/svx/inc/svx/lathe3d.hxx
+++ b/svx/inc/svx/lathe3d.hxx
@@ -100,7 +100,6 @@ private:
{ return ((const Svx3DCloseBackItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_CLOSE_BACK)).GetValue(); }
virtual sal_uInt16 GetObjIdentifier() const;
- void ReSegment(sal_uInt32 nHSegs, sal_uInt32 nVSegs);
virtual E3dLatheObj* Clone() const;
diff --git a/svx/inc/svx/obj3d.hxx b/svx/inc/svx/obj3d.hxx
index c28e304..a32be8a 100644
--- a/svx/inc/svx/obj3d.hxx
+++ b/svx/inc/svx/obj3d.hxx
@@ -312,16 +312,13 @@ public :
// set/get parameters for geometry creation
sal_Bool GetCreateNormals() const { return bCreateNormals; }
- void SetCreateNormals(sal_Bool bNew);
sal_Bool GetCreateTexture() const { return bCreateTexture; }
- void SetCreateTexture(sal_Bool bNew);
virtual E3dCompoundObject* Clone() const;
// material of the object
const Color& GetMaterialAmbientColor() const { return aMaterialAmbientColor; }
- void SetMaterialAmbientColor(const Color& rColor);
sal_Bool IsAOrdNumRemapCandidate(E3dScene*& prScene) const;
};
diff --git a/svx/inc/svx/polygn3d.hxx b/svx/inc/svx/polygn3d.hxx
index 5fd24a3..4f5a9d8 100644
--- a/svx/inc/svx/polygn3d.hxx
+++ b/svx/inc/svx/polygn3d.hxx
@@ -58,17 +58,6 @@ public:
E3dDefaultAttributes& rDefault,
const basegfx::B3DPolyPolygon& rPolyPoly3D,
sal_Bool bLinOnly=sal_False);
- E3dPolygonObj(
- E3dDefaultAttributes& rDefault,
- const basegfx::B3DPolyPolygon& rPolyPoly3D,
- const basegfx::B3DPolyPolygon& rPolyNormals3D,
- sal_Bool bLinOnly=sal_False);
- E3dPolygonObj(
- E3dDefaultAttributes& rDefault,
- const basegfx::B3DPolyPolygon& rPolyPoly3D,
- const basegfx::B3DPolyPolygon& rPolyNormals3D,
- const basegfx::B2DPolyPolygon& rPolyTexture2D,
- sal_Bool bLinOnly=sal_False);
E3dPolygonObj();
virtual ~E3dPolygonObj();
diff --git a/svx/inc/svx/scene3d.hxx b/svx/inc/svx/scene3d.hxx
index 0ba52d4..8284b4b 100644
--- a/svx/inc/svx/scene3d.hxx
+++ b/svx/inc/svx/scene3d.hxx
@@ -233,9 +233,6 @@ public:
// break up
virtual sal_Bool IsBreakObjPossible();
- basegfx::B3DVector GetShadowPlaneDirection() const;
- void SetShadowPlaneDirection(const basegfx::B3DVector& rVec);
-
// polygon which is built during creation
virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const;
diff --git a/svx/inc/svx/sphere3d.hxx b/svx/inc/svx/sphere3d.hxx
index 4e6271e..7c98adc 100644
--- a/svx/inc/svx/sphere3d.hxx
+++ b/svx/inc/svx/sphere3d.hxx
@@ -73,7 +73,6 @@ public:
virtual E3dSphereObj* Clone() const;
- void ReSegment(sal_uInt32 nHorzSegments, sal_uInt32 nVertSegments);
const basegfx::B3DPoint& Center() const { return aCenter; }
const basegfx::B3DVector& Size() const { return aSize; }
diff --git a/svx/inc/svx/view3d.hxx b/svx/inc/svx/view3d.hxx
index 05cf956..dd79702 100644
--- a/svx/inc/svx/view3d.hxx
+++ b/svx/inc/svx/view3d.hxx
@@ -117,9 +117,6 @@ public:
// #83403# Service routine used from local Clone() and from SdrCreateView::EndCreateObj(...)
sal_Bool ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point aOffset);
- sal_Bool HasMarkedScene();
- E3dScene* GetMarkedScene();
-
sal_Bool IsConvertTo3DObjPossible() const;
void ConvertMarkedObjTo3D(sal_Bool bExtrude=sal_True, basegfx::B2DPoint aPnt1 = basegfx::B2DPoint(0.0, 0.0), basegfx::B2DPoint aPnt2 = basegfx::B2DPoint(0.0, 1.0));
@@ -270,7 +267,6 @@ public:
return bDoubleSided;
}
- void MergeScenes();
SfxItemSet Get3DAttributes(E3dScene* pInScene = NULL, sal_Bool bOnly3DAttr=sal_False) const;
void Set3DAttributes(const SfxItemSet& rAttr, E3dScene* pInScene = NULL, sal_Bool bOnly3DAttr=sal_False);
};
diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx
index 85ff473..6c5176d 100644
--- a/svx/source/engine3d/cube3d.cxx
+++ b/svx/source/engine3d/cube3d.cxx
@@ -119,15 +119,6 @@ void E3dCubeObj::SetPosIsCenter(sal_Bool bNew)
}
}
-void E3dCubeObj::SetSideFlags(sal_uInt16 nNew)
-{
- if(nSideFlags != nNew)
- {
- nSideFlags = nNew;
- ActionChanged();
- }
-}
-
// Get the name of the object (singular)
void E3dCubeObj::TakeObjNameSingul(XubString& rName) const
diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx
index af948b0..48484e0 100644
--- a/svx/source/engine3d/lathe3d.cxx
+++ b/svx/source/engine3d/lathe3d.cxx
@@ -131,18 +131,6 @@ SdrObject *E3dLatheObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const
return NULL;
}
-void E3dLatheObj::ReSegment(sal_uInt32 nHSegs, sal_uInt32 nVSegs)
-{
- if ((nHSegs != GetHorizontalSegments() || nVSegs != GetVerticalSegments()) &&
- (nHSegs != 0 || nVSegs != 0))
- {
- GetProperties().SetObjectItemDirect(Svx3DHorizontalSegmentsItem(nHSegs));
- GetProperties().SetObjectItemDirect(Svx3DVerticalSegmentsItem(nVSegs));
-
- ActionChanged();
- }
-}
-
// Set Local parameters set to re-create geometry
void E3dLatheObj::SetPolyPoly2D(const basegfx::B2DPolyPolygon& rNew)
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index f1b543b..4a315a4 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -955,34 +955,6 @@ E3dCompoundObject* E3dCompoundObject::Clone() const
return CloneHelper< E3dCompoundObject >();
}
-void E3dCompoundObject::SetCreateNormals(sal_Bool bNew)
-{
- if(bCreateNormals != bNew)
- {
- bCreateNormals = bNew;
- ActionChanged();
- }
-}
-
-void E3dCompoundObject::SetCreateTexture(sal_Bool bNew)
-{
- if(bCreateTexture != bNew)
- {
- bCreateTexture = bNew;
- ActionChanged();
- }
-}
-
-// Material of the object
-
-void E3dCompoundObject::SetMaterialAmbientColor(const Color& rColor)
-{
- if(aMaterialAmbientColor != rColor)
- {
- aMaterialAmbientColor = rColor;
- }
-}
-
// convert given basegfx::B3DPolyPolygon to screen coor
basegfx::B2DPolyPolygon E3dCompoundObject::TransformToScreenCoor(const basegfx::B3DPolyPolygon& rCandidate)
diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx
index 7605ecd..7c777c0 100644
--- a/svx/source/engine3d/polygn3d.cxx
+++ b/svx/source/engine3d/polygn3d.cxx
@@ -63,36 +63,6 @@ E3dPolygonObj::E3dPolygonObj(
CreateDefaultTexture();
}
-E3dPolygonObj::E3dPolygonObj(
- E3dDefaultAttributes& rDefault,
- const basegfx::B3DPolyPolygon& rPolyPoly3D,
- const basegfx::B3DPolyPolygon& rPolyNormals3D,
- sal_Bool bLinOnly)
-: E3dCompoundObject(rDefault),
- bLineOnly(bLinOnly)
-{
- // Set geometry and the normal
- SetPolyPolygon3D(rPolyPoly3D);
- SetPolyNormals3D(rPolyNormals3D);
-
- // Create default texture coordinates
- CreateDefaultTexture();
-}
-
-E3dPolygonObj::E3dPolygonObj(
- E3dDefaultAttributes& rDefault,
- const basegfx::B3DPolyPolygon& rPolyPoly3D,
- const basegfx::B3DPolyPolygon& rPolyNormals3D,
- const basegfx::B2DPolyPolygon& rPolyTexture2D,
- sal_Bool bLinOnly)
-: E3dCompoundObject(rDefault),
- bLineOnly(bLinOnly)
-{
- SetPolyPolygon3D(rPolyPoly3D);
- SetPolyNormals3D(rPolyNormals3D);
- SetPolyTexture2D(rPolyTexture2D);
-}
-
E3dPolygonObj::E3dPolygonObj()
: E3dCompoundObject(),
bLineOnly(false) // added missing initialisation
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 061f0ad..6bec22c 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -696,20 +696,6 @@ sal_Bool E3dScene::IsBreakObjPossible()
return sal_True;
}
-basegfx::B3DVector E3dScene::GetShadowPlaneDirection() const
-{
- double fWink = (double)GetShadowSlant() * F_PI180;
- basegfx::B3DVector aShadowPlaneDir(0.0, sin(fWink), cos(fWink));
- aShadowPlaneDir.normalize();
- return aShadowPlaneDir;
-}
-
-void E3dScene::SetShadowPlaneDirection(const basegfx::B3DVector& rVec)
-{
- sal_uInt16 nSceneShadowSlant = (sal_uInt16)((atan2(rVec.getY(), rVec.getZ()) / F_PI180) + 0.5);
- GetProperties().SetObjectItemDirect(Svx3DShadowSlantItem(nSceneShadowSlant));
-}
-
basegfx::B2DPolyPolygon E3dScene::TakeCreatePoly(const SdrDragStat& /*rDrag*/) const
{
return TakeXorPoly();
diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx
index bcd06d1..588dfd1 100644
--- a/svx/source/engine3d/sphere3d.cxx
+++ b/svx/source/engine3d/sphere3d.cxx
@@ -120,17 +120,6 @@ SdrObject *E3dSphereObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const
return NULL;
}
-void E3dSphereObj::ReSegment(sal_uInt32 nHSegs, sal_uInt32 nVSegs)
-{
- if((nHSegs != GetHorizontalSegments() || nVSegs != GetVerticalSegments()) && (nHSegs != 0 || nVSegs != 0))
- {
- GetProperties().SetObjectItemDirect(Svx3DHorizontalSegmentsItem(nHSegs));
- GetProperties().SetObjectItemDirect(Svx3DVerticalSegmentsItem(nVSegs));
-
- ActionChanged();
- }
-}
-
E3dSphereObj* E3dSphereObj::Clone() const
{
return CloneHelper< E3dSphereObj >();
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 3812dac..ee869c6 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -1303,22 +1303,6 @@ sal_Bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
return SdrView::BegDragObj(rPnt, pOut, pHdl, nMinMov, pForcedMeth);
}
-sal_Bool E3dView::HasMarkedScene()
-{
- return (GetMarkedScene() != NULL);
-}
-
-E3dScene* E3dView::GetMarkedScene()
-{
- sal_uIntPtr nCnt = GetMarkedObjectCount();
-
- for ( sal_uIntPtr i = 0; i < nCnt; i++ )
- if ( GetMarkedObjectByIndex(i)->ISA(E3dScene) )
- return (E3dScene*) GetMarkedObjectByIndex(i);
-
- return NULL;
-}
-
// Set current 3D drawing object, create the scene for this
E3dScene* E3dView::SetCurrent3DObj(E3dObject* p3DObj)
@@ -1640,114 +1624,6 @@ void E3dView::BreakSingle3DObj(E3dObject* pObj)
}
}
-void E3dView::MergeScenes ()
-{
- sal_uIntPtr nCount = GetMarkedObjectCount();
-
- if (nCount > 0)
- {
- sal_uIntPtr nObj = 0;
- SdrObject *pObj = GetMarkedObjectByIndex(nObj);
- E3dScene *pScene = new E3dPolyScene(Get3DDefaultAttributes());
- basegfx::B3DRange aBoundVol;
- Rectangle aAllBoundRect (GetMarkedObjBoundRect ());
- Point aCenter (aAllBoundRect.Center());
-
- while (pObj)
- {
- if (pObj->ISA(E3dScene))
- {
- // It is a 3D-Scene or 3D-PolyScene
- SdrObjList* pSubList = ((E3dObject*) pObj)->GetSubList();
-
- SdrObjListIter aIter(*pSubList, IM_FLAT);
-
- while (aIter.IsMore())
- {
- // Search for Lathe objects
- SdrObject* pSubObj = aIter.Next();
-
- E3dObject *pNewObj = 0;
-
- switch (pSubObj->GetObjIdentifier())
- {
- case E3D_CUBEOBJ_ID :
- pNewObj = new E3dCubeObj;
- *(E3dCubeObj*)pNewObj = *(E3dCubeObj*)pSubObj;
- break;
-
- case E3D_SPHEREOBJ_ID:
- pNewObj = new E3dSphereObj;
- *(E3dSphereObj*)pNewObj = *(E3dSphereObj*)pSubObj;
- break;
-
- case E3D_EXTRUDEOBJ_ID:
- pNewObj = new E3dExtrudeObj;
- *(E3dExtrudeObj*)pNewObj = *(E3dExtrudeObj*)pSubObj;
- break;
-
- case E3D_LATHEOBJ_ID:
- pNewObj = new E3dLatheObj;
- *(E3dLatheObj*)pNewObj = *(E3dLatheObj*)pSubObj;
- break;
-
- case E3D_COMPOUNDOBJ_ID:
- pNewObj = new E3dCompoundObject;
- *(E3dCompoundObject*)pNewObj = *(E3dCompoundObject*)pSubObj;
- break;
- }
-
- Rectangle aBoundRect = pSubObj->GetCurrentBoundRect();
-
- basegfx::B3DHomMatrix aMatrix;
- aMatrix.translate(aBoundRect.Left() - aCenter.getX(), aCenter.getY(), 0.0);
- pNewObj->SetTransform(aMatrix * pNewObj->GetTransform());
-
- if (pNewObj) aBoundVol.expand(pNewObj->GetBoundVolume());
- pScene->Insert3DObj (pNewObj);
- }
- }
-
- nObj++;
-
- if (nObj < nCount)
- {
- pObj = GetMarkedObjectByIndex(nObj);
- }
- else
- {
- pObj = NULL;
- }
- }
-
- double fW = aAllBoundRect.GetWidth();
- double fH = aAllBoundRect.GetHeight();
- Rectangle aRect(0,0, (long) fW, (long) fH);
-
- InitScene(pScene, fW, fH, aBoundVol.getMaxZ() + + ((fW + fH) / 4.0));
- pScene->NbcSetSnapRect(aRect);
-
- Camera3D &aCamera = (Camera3D&) pScene->GetCamera ();
- basegfx::B3DPoint aMinVec(aBoundVol.getMinimum());
- basegfx::B3DPoint aMaxVec(aBoundVol.getMaximum());
- double fDeepth(fabs(aMaxVec.getZ() - aMinVec.getZ()));
-
- aCamera.SetPRP(basegfx::B3DPoint(0.0, 0.0, 1000.0));
- double fDefaultCamPosZ(GetDefaultCamPosZ());
- aCamera.SetPosition(basegfx::B3DPoint(0.0, 0.0, fDefaultCamPosZ + fDeepth / 2.0));
- aCamera.SetFocalLength(GetDefaultCamFocal());
- pScene->SetCamera (aCamera);
-
- // Invalid SnapRects of Objects
- pScene->SetRectsDirty();
-
- InsertObjectAtView(pScene, *(GetSdrPageViewOfMarkedByIndex(0)));
-
- // Invalid SnapRects of Objects
- pScene->SetRectsDirty();
- }
-}
-
void E3dView::CheckPossibilities()
{
// call parent
More information about the Libreoffice-commits
mailing list