diff options
-rw-r--r-- | compilerplugins/clang/unusedfields.writeonly.results | 34 | ||||
-rw-r--r-- | include/svx/camera3d.hxx | 5 | ||||
-rw-r--r-- | include/svx/cube3d.hxx | 1 | ||||
-rw-r--r-- | include/svx/deflt3d.hxx | 1 | ||||
-rw-r--r-- | include/svx/fmsrcimp.hxx | 1 | ||||
-rw-r--r-- | include/svx/obj3d.hxx | 4 | ||||
-rw-r--r-- | include/svx/srchdlg.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdoedge.hxx | 4 | ||||
-rw-r--r-- | include/svx/view3d.hxx | 5 | ||||
-rw-r--r-- | include/svx/viewpt3d.hxx | 7 | ||||
-rw-r--r-- | sd/source/ui/func/fucon3d.cxx | 2 | ||||
-rw-r--r-- | svx/source/customshapes/EnhancedCustomShape3d.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/dlgctl3d.cxx | 4 | ||||
-rw-r--r-- | svx/source/dialog/srchdlg.cxx | 4 | ||||
-rw-r--r-- | svx/source/engine3d/camera3d.cxx | 10 | ||||
-rw-r--r-- | svx/source/engine3d/cube3d.cxx | 1 | ||||
-rw-r--r-- | svx/source/engine3d/deflt3d.cxx | 1 | ||||
-rw-r--r-- | svx/source/engine3d/obj3d.cxx | 11 | ||||
-rw-r--r-- | svx/source/engine3d/view3d.cxx | 6 | ||||
-rw-r--r-- | svx/source/engine3d/viewpt3d2.cxx | 22 | ||||
-rw-r--r-- | svx/source/form/fmsrcimp.cxx | 8 | ||||
-rw-r--r-- | svx/source/svdraw/svdoedge.cxx | 2 | ||||
-rw-r--r-- | svx/source/unodraw/unopage.cxx | 2 | ||||
-rw-r--r-- | svx/source/unodraw/unoshap3.cxx | 2 |
24 files changed, 14 insertions, 127 deletions
diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results index b3b4b5e7cce1..728abbd5b8a0 100644 --- a/compilerplugins/clang/unusedfields.writeonly.results +++ b/compilerplugins/clang/unusedfields.writeonly.results @@ -1230,48 +1230,14 @@ include/svtools/unoevent.hxx:159 SvEventDescriptor xParentRef css::uno::Reference<css::uno::XInterface> include/svx/bmpmask.hxx:129 SvxBmpMask aSelItem class SvxBmpMaskSelectItem -include/svx/camera3d.hxx:39 - Camera3D fResetFocalLength double -include/svx/camera3d.hxx:40 - Camera3D fResetBankAngle double -include/svx/cube3d.hxx:70 - E3dCubeObj nSideFlags enum CubeFaces -include/svx/deflt3d.hxx:55 - E3dDefaultAttributes nDefaultLatheEndAngle long include/svx/float3d.hxx:176 Svx3DWin pControllerItem class Svx3DCtrlItem * -include/svx/fmsrcimp.hxx:172 - FmSearchEngine::FieldInfo bDoubleHandling _Bool include/svx/imapdlg.hxx:118 SvxIMapDlg aIMapItem class SvxIMapDlgItem -include/svx/obj3d.hxx:233 - E3dCompoundObject bCreateNormals _Bool -include/svx/obj3d.hxx:234 - E3dCompoundObject bCreateTexture _Bool include/svx/srchdlg.hxx:231 SvxSearchDialog pSearchController class SvxSearchController * include/svx/srchdlg.hxx:232 SvxSearchDialog pOptionsController class SvxSearchController * -include/svx/srchdlg.hxx:234 - SvxSearchDialog pSearchSetController class SvxSearchController * -include/svx/srchdlg.hxx:235 - SvxSearchDialog pReplaceSetController class SvxSearchController * -include/svx/svdoedge.hxx:94 - SdrEdgeInfoRec cOrthoForm char -include/svx/view3d.hxx:49 - E3dView fDefaultScaleY double -include/svx/view3d.hxx:50 - E3dView fDefaultScaleZ double -include/svx/view3d.hxx:51 - E3dView fDefaultRotateY double -include/svx/view3d.hxx:52 - E3dView fDefaultRotateZ double -include/svx/viewpt3d.hxx:56 - Viewport3D fVPD double -include/svx/viewpt3d.hxx:70 - Viewport3D fWRatio double -include/svx/viewpt3d.hxx:71 - Viewport3D fHRatio double include/vcl/menu.hxx:462 MenuBar::MenuBarButtonCallbackArg bHighlight _Bool include/vcl/salnativewidgets.hxx:415 diff --git a/include/svx/camera3d.hxx b/include/svx/camera3d.hxx index e263acc32120..e5cf1537f13f 100644 --- a/include/svx/camera3d.hxx +++ b/include/svx/camera3d.hxx @@ -36,8 +36,6 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC Camera3D : public Viewport3D protected: basegfx::B3DPoint aResetPos; basegfx::B3DPoint aResetLookAt; - double fResetFocalLength; - double fResetBankAngle; basegfx::B3DPoint aPosition; basegfx::B3DPoint aLookAt; @@ -51,8 +49,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC Camera3D : public Viewport3D double fFocalLen = 35.0); Camera3D(); - void SetDefaults(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLookAt, - double fFocalLen); + void SetDefaults(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLookAt); void SetViewWindow(double fX, double fY, double fW, double fH); diff --git a/include/svx/cube3d.hxx b/include/svx/cube3d.hxx index 2cb6569b8e53..4a467c1bb3cc 100644 --- a/include/svx/cube3d.hxx +++ b/include/svx/cube3d.hxx @@ -67,7 +67,6 @@ private: // Parameter basegfx::B3DPoint aCubePos; basegfx::B3DVector aCubeSize; - CubeFaces nSideFlags; // BOOLeans bool bPosIsCenter : 1; diff --git a/include/svx/deflt3d.hxx b/include/svx/deflt3d.hxx index 5aaa0b8bdcdc..7641727e3cc4 100644 --- a/include/svx/deflt3d.hxx +++ b/include/svx/deflt3d.hxx @@ -52,7 +52,6 @@ private: basegfx::B3DVector aDefaultSphereSize; // Lathe object - long nDefaultLatheEndAngle; bool bDefaultLatheSmoothed; bool bDefaultLatheSmoothFrontBack; bool bDefaultLatheCharacterMode; diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx index a56933533b63..7a2b96048895 100644 --- a/include/svx/fmsrcimp.hxx +++ b/include/svx/fmsrcimp.hxx @@ -169,7 +169,6 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC FmSearchEngine final { css::uno::Reference< css::sdb::XColumn > xContents; sal_uInt32 nFormatKey; - bool bDoubleHandling; }; typedef std::vector<FieldInfo> FieldCollection; diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx index 58d1813d35ed..22a3f9e5db8e 100644 --- a/include/svx/obj3d.hxx +++ b/include/svx/obj3d.hxx @@ -229,10 +229,6 @@ protected: // material of the object Color aMaterialAmbientColor; - // attributes for geometry creation - bool bCreateNormals : 1; - bool bCreateTexture : 1; - protected: void SetDefaultAttributes(E3dDefaultAttributes& rDefault); diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index 6c30e4bcbe9d..8042aaffe190 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -231,8 +231,6 @@ private: SvxSearchController* pSearchController; SvxSearchController* pOptionsController; SvxSearchController* pFamilyController; - SvxSearchController* pSearchSetController; - SvxSearchController* pReplaceSetController; mutable TransliterationFlags nTransliterationFlags; diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx index c4d390ea0f04..670c7ff6894f 100644 --- a/include/svx/svdoedge.hxx +++ b/include/svx/svdoedge.hxx @@ -91,7 +91,6 @@ public: sal_uInt16 nObj1Lines; // 1..3 sal_uInt16 nObj2Lines; // 1..3 sal_uInt16 nMiddleLine; // 0xFFFF=none, otherwiese point number of the beginning of the line - char cOrthoForm; // form of the right-angled connector, e.g., 'Z','U',I','L','S',... public: SdrEdgeInfoRec() @@ -99,8 +98,7 @@ public: nAngle2(0), nObj1Lines(0), nObj2Lines(0), - nMiddleLine(0xFFFF), - cOrthoForm(0) + nMiddleLine(0xFFFF) {} Point& ImpGetLineOffsetPoint(SdrEdgeLineCode eLineCode); diff --git a/include/svx/view3d.hxx b/include/svx/view3d.hxx index 9397b683e1f8..0a25eef18051 100644 --- a/include/svx/view3d.hxx +++ b/include/svx/view3d.hxx @@ -46,11 +46,6 @@ protected: Color aDefaultLightColor; // The parameters for the last colors Color aDefaultAmbientColor; - double fDefaultScaleY; - double fDefaultScaleZ; - double fDefaultRotateY; - double fDefaultRotateZ; - E3dDragConstraint eDragConstraint; // Migrate selections diff --git a/include/svx/viewpt3d.hxx b/include/svx/viewpt3d.hxx index 4d08d40c6af6..6ca043ea2db7 100644 --- a/include/svx/viewpt3d.hxx +++ b/include/svx/viewpt3d.hxx @@ -52,8 +52,7 @@ class SVX_DLLPUBLIC Viewport3D basegfx::B3DVector aVPN; // View Plane Normal basegfx::B3DVector aVUV; // View Up Vector basegfx::B3DPoint aPRP; // Projection Reference Point(View-coordinates) - // up to now only the z-coordinate is considered - double fVPD; // View Plane Distance + // up to now only the z-coordinate is considered ProjectionType eProjection; // kind of the projection tools::Rectangle aDeviceRect; // position and size of the output area @@ -67,9 +66,6 @@ class SVX_DLLPUBLIC Viewport3D // is calculated by the transformation bool bTfValid; // flag, if transformation is valid - double fWRatio; // device/view aspect ratio - double fHRatio; - public: Viewport3D(); @@ -77,7 +73,6 @@ class SVX_DLLPUBLIC Viewport3D void SetVPN(const basegfx::B3DVector& rNewVPN); void SetVUV(const basegfx::B3DVector& rNewVUV); void SetPRP(const basegfx::B3DPoint& rNewPRP); - void SetVPD(double fNewVPD); const basegfx::B3DPoint& GetVRP() const { return aVRP; } const basegfx::B3DVector& GetVUV() const { return aVUV; } diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx index 1d12e5bf85fb..07a946765bab 100644 --- a/sd/source/ui/func/fucon3d.cxx +++ b/sd/source/ui/func/fucon3d.cxx @@ -385,7 +385,7 @@ SdrObject* FuConstruct3dObject::CreateDefaultObject(const sal_uInt16 nID, const ::basegfx::B3DPoint aCamPos(0.0, 0.0, fCamZ < fDefaultCamPosZ ? fDefaultCamPosZ : fCamZ); aCam.SetPosAndLookAt(aCamPos, aLookAt); aCam.SetFocalLength(mpView->GetDefaultCamFocal()); - aCam.SetDefaults(::basegfx::B3DPoint(0.0, 0.0, fDefaultCamPosZ), aLookAt, mpView->GetDefaultCamFocal()); + aCam.SetDefaults(::basegfx::B3DPoint(0.0, 0.0, fDefaultCamPosZ), aLookAt); pScene->SetCamera(aCam); pScene->Insert3DObj(p3DObj); diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index da7502ebf99c..1fad3815f146 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -586,7 +586,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con rCamera.SetViewWindow( -fW / 2, - fH / 2, fW, fH); basegfx::B3DPoint aLookAt( 0.0, 0.0, 0.0 ); basegfx::B3DPoint aCamPos( 0.0, 0.0, 100.0 ); - rCamera.SetDefaults( basegfx::B3DPoint( 0.0, 0.0, 100.0 ), aLookAt, 100.0 ); + rCamera.SetDefaults( basegfx::B3DPoint( 0.0, 0.0, 100.0 ), aLookAt ); rCamera.SetPosAndLookAt( aCamPos, aLookAt ); rCamera.SetFocalLength( 1.0 ); rCamera.SetProjection( eProjectionType ); diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index 0fe4c3535fbd..a971e4871b0d 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -117,7 +117,7 @@ void Svx3DPreviewControl::Construct() rCamera.SetPosAndLookAt(aCamPos, aLookAt); double fDefaultCamFocal = mp3DView->GetDefaultCamFocal(); rCamera.SetFocalLength(fDefaultCamFocal); - rCamera.SetDefaults(basegfx::B3DPoint(0.0, 0.0, fDefaultCamPosZ), aLookAt, fDefaultCamFocal); + rCamera.SetDefaults(basegfx::B3DPoint(0.0, 0.0, fDefaultCamPosZ), aLookAt); mpScene->SetCamera( rCamera ); mpFmPage->InsertObject( mpScene ); @@ -352,7 +352,7 @@ void Svx3DLightControl::Construct2() rCamera.SetPosAndLookAt(aCamPos, aLookAt); double fDefaultCamFocal = mp3DView->GetDefaultCamFocal(); rCamera.SetFocalLength(fDefaultCamFocal); - rCamera.SetDefaults(basegfx::B3DPoint(0.0, 0.0, fDefaultCamPosZ), aLookAt, fDefaultCamFocal); + rCamera.SetDefaults(basegfx::B3DPoint(0.0, 0.0, fDefaultCamPosZ), aLookAt); mpScene->SetCamera( rCamera ); diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 7cad95a43cd9..03a07d5a7dad 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -266,8 +266,6 @@ SvxSearchDialog::SvxSearchDialog( vcl::Window* pParent, SfxChildWindow* pChildWi , pSearchController(nullptr) , pOptionsController(nullptr) , pFamilyController(nullptr) - , pSearchSetController(nullptr) - , pReplaceSetController(nullptr) , nTransliterationFlags(TransliterationFlags::NONE) { get(m_pSearchFrame, "searchframe"); @@ -357,8 +355,6 @@ void SvxSearchDialog::dispose() DELETEZ( pSearchController ); DELETEZ( pOptionsController ); DELETEZ( pFamilyController ); - DELETEZ( pSearchSetController ); - DELETEZ( pReplaceSetController ); rBindings.LeaveRegistrations(); delete pSearchItem; diff --git a/svx/source/engine3d/camera3d.cxx b/svx/source/engine3d/camera3d.cxx index f5c394614e44..b9ea65e56313 100644 --- a/svx/source/engine3d/camera3d.cxx +++ b/svx/source/engine3d/camera3d.cxx @@ -24,12 +24,9 @@ Camera3D::Camera3D(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLook double fFocalLen) : aResetPos(rPos), aResetLookAt(rLookAt), - fResetFocalLength(fFocalLen), - fResetBankAngle(0), fBankAngle(0), bAutoAdjustProjection(true) { - SetVPD(0); SetPosition(rPos); SetLookAt(rLookAt); SetFocalLength(fFocalLen); @@ -37,8 +34,6 @@ Camera3D::Camera3D(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLook Camera3D::Camera3D() : aResetPos(0.0, 0.0, 1.0) - , fResetFocalLength(0.0) - , fResetBankAngle(0.0) , fFocalLength(35.0) , fBankAngle(0.0) , bAutoAdjustProjection(false) @@ -47,13 +42,10 @@ Camera3D::Camera3D() // Set default values for reset -void Camera3D::SetDefaults(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLookAt, - double fFocalLen) +void Camera3D::SetDefaults(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLookAt) { aResetPos = rPos; aResetLookAt = rLookAt; - fResetFocalLength = fFocalLen; - fResetBankAngle = 0; } // Set ViewWindow and adjust PRP diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx index ec456e463e7c..e6816c596f99 100644 --- a/svx/source/engine3d/cube3d.cxx +++ b/svx/source/engine3d/cube3d.cxx @@ -57,7 +57,6 @@ void E3dCubeObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault) { aCubePos = rDefault.GetDefaultCubePos(); aCubeSize = rDefault.GetDefaultCubeSize(); - nSideFlags = rDefault.GetDefaultCubeSideFlags(); bPosIsCenter = rDefault.GetDefaultCubePosIsCenter(); } diff --git a/svx/source/engine3d/deflt3d.cxx b/svx/source/engine3d/deflt3d.cxx index 2b6664cd6016..feb02a9ab00e 100644 --- a/svx/source/engine3d/deflt3d.cxx +++ b/svx/source/engine3d/deflt3d.cxx @@ -48,7 +48,6 @@ void E3dDefaultAttributes::Reset() aDefaultSphereSize = basegfx::B3DPoint(1000.0, 1000.0, 1000.0); // Lathe object - nDefaultLatheEndAngle = 3600; bDefaultLatheSmoothed = true; bDefaultLatheSmoothFrontBack = false; bDefaultLatheCharacterMode = false; diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index a16935602c15..b19530a0c534 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -763,9 +763,7 @@ sdr::properties::BaseProperties* E3dCompoundObject::CreateObjectSpecificProperti E3dCompoundObject::E3dCompoundObject() : E3dObject(), - aMaterialAmbientColor(), - bCreateNormals(false), - bCreateTexture(false) + aMaterialAmbientColor() { // Set defaults E3dDefaultAttributes aDefault; @@ -774,9 +772,7 @@ E3dCompoundObject::E3dCompoundObject() E3dCompoundObject::E3dCompoundObject(E3dDefaultAttributes& rDefault) : E3dObject(), - aMaterialAmbientColor(), - bCreateNormals(false), - bCreateTexture(false) + aMaterialAmbientColor() { // Set defaults SetDefaultAttributes(rDefault); @@ -786,9 +782,6 @@ void E3dCompoundObject::SetDefaultAttributes(E3dDefaultAttributes& rDefault) { // Set defaults aMaterialAmbientColor = rDefault.GetDefaultAmbientColor(); - - bCreateNormals = rDefault.GetDefaultCreateNormals(); - bCreateTexture = rDefault.GetDefaultCreateTexture(); } E3dCompoundObject::~E3dCompoundObject () diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index c48e2238c222..d90aba0823b7 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -1321,7 +1321,7 @@ void E3dView::InitScene(E3dScene* pScene, double fW, double fH, double fCamZ) aCam.SetPosAndLookAt(aCamPos, aLookAt); aCam.SetFocalLength(GetDefaultCamFocal()); - aCam.SetDefaults(basegfx::B3DPoint(0.0, 0.0, fDefaultCamPosZ), aLookAt, GetDefaultCamFocal()); + aCam.SetDefaults(basegfx::B3DPoint(0.0, 0.0, fDefaultCamPosZ), aLookAt); pScene->SetCamera(aCam); } @@ -1511,10 +1511,6 @@ void E3dView::ResetCreationActive () void E3dView::InitView () { eDragConstraint = E3dDragConstraint::XYZ; - fDefaultScaleY = - fDefaultScaleZ = 1.0; - fDefaultRotateY = - fDefaultRotateZ = 0.0; aDefaultLightColor = RGB_Color(COL_WHITE); aDefaultAmbientColor = RGB_Color(COL_BLACK); mpMirrorOverlay = nullptr; diff --git a/svx/source/engine3d/viewpt3d2.cxx b/svx/source/engine3d/viewpt3d2.cxx index 9a0769a953bd..bbf63fd4d6e7 100644 --- a/svx/source/engine3d/viewpt3d2.cxx +++ b/svx/source/engine3d/viewpt3d2.cxx @@ -26,13 +26,10 @@ Viewport3D::Viewport3D() : aVPN(0, 0, 1), aVUV(0, 1, 1), aPRP(0, 0, 2), - fVPD(-3), eProjection(ProjectionType::Perspective), aDeviceRect(Point(0,0), Size(-1,-1)), aViewPoint (0, 0, 5000), - bTfValid(false), - fWRatio (1.0), - fHRatio (1.0) + bTfValid(false) { aViewWin.X = -1; aViewWin.Y = -1; aViewWin.W = 2; aViewWin.H = 2; @@ -48,9 +45,6 @@ void Viewport3D::SetViewWindow(double fX, double fY, double fW, double fH) else aViewWin.W = 1.0; if ( fH > 0 ) aViewWin.H = fH; else aViewWin.H = 1.0; - - fWRatio = aDeviceRect.GetWidth() / aViewWin.W; - fHRatio = aDeviceRect.GetHeight() / aViewWin.H; } // Returns observer position (PRP) in world coordinates @@ -120,12 +114,6 @@ const basegfx::B3DPoint& Viewport3D::GetViewPoint() void Viewport3D::SetDeviceWindow(const tools::Rectangle& rRect) { - long nNewW = rRect.GetWidth(); - long nNewH = rRect.GetHeight(); - - fWRatio = nNewW / aViewWin.W; - fHRatio = nNewH / aViewWin.H; - aDeviceRect = rRect; } @@ -164,12 +152,4 @@ void Viewport3D::SetPRP(const basegfx::B3DPoint& rNewPRP) bTfValid = false; } -// Set View Plane Distance - -void Viewport3D::SetVPD(double fNewVPD) -{ - fVPD = fNewVPD; - bTfValid = false; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index a07db3c07ab9..f97ea15ef1d7 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -274,14 +274,6 @@ void FmSearchEngine::BuildAndInsertFieldInfo(const Reference< css::container::XI FieldInfo fiCurrent; fiCurrent.xContents.set(xCurrentField, UNO_QUERY); fiCurrent.nFormatKey = ::comphelper::getINT32(xProperties->getPropertyValue(FM_PROP_FORMATKEY)); - fiCurrent.bDoubleHandling = false; - if (m_xFormatSupplier.is()) - { - Reference< css::util::XNumberFormats > xNumberFormats(m_xFormatSupplier->getNumberFormats()); - - sal_Int16 nFormatType = ::comphelper::getNumberFormatType(xNumberFormats, fiCurrent.nFormatKey) & ~((sal_Int16)css::util::NumberFormat::DEFINED); - fiCurrent.bDoubleHandling = (nFormatType != css::util::NumberFormat::TEXT); - } // and memorize m_arrUsedFields.insert(m_arrUsedFields.end(), fiCurrent); diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 9cd9502902dd..916562f24ac8 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -832,7 +832,6 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const too bool bVer2=bObn2 || bUnt2; bool bInfo=pInfo!=nullptr; if (bInfo) { - pInfo->cOrthoForm=0; pInfo->nAngle1=nAngle1; pInfo->nAngle2=nAngle2; pInfo->nObj1Lines=1; @@ -1282,7 +1281,6 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const too } else cForm='?'; // more shapes: if (bInfo) { - pInfo->cOrthoForm=cForm; if (cForm=='I' || cForm=='L' || cForm=='Z' || cForm=='U') { pInfo->nObj1Lines=1; pInfo->nObj2Lines=1; diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index 5da13dbcbc40..ece9db430bbe 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -498,7 +498,7 @@ SdrObject *SvxDrawPage::CreateSdrObject_(const Reference< drawing::XShape > & xS basegfx::B3DPoint aCamPos(0.0, 0.0, 10000.0); aCam.SetPosAndLookAt(aCamPos, aLookAt); aCam.SetFocalLength(100.0); - aCam.SetDefaults(aCamPos, aLookAt, 10000.0); + aCam.SetDefaults(aCamPos, aLookAt); pScene->SetCamera(aCam); pScene->SetRectsDirty(); diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index d39c80995a59..ddbfb8b9e992 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -353,7 +353,7 @@ bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxIte basegfx::B3DPoint aCamPos(0.0, 0.0, fCamPosZ); aCam.SetPosAndLookAt(aCamPos, aLookAt); aCam.SetFocalLength(fCamFocal / 100.0); - aCam.SetDefaults(basegfx::B3DPoint(0.0, 0.0, fCamPosZ), aLookAt, fCamFocal / 100.0); + aCam.SetDefaults(basegfx::B3DPoint(0.0, 0.0, fCamPosZ), aLookAt); aCam.SetDeviceWindow(tools::Rectangle(0, 0, (long)fW, (long)fH)); // set at scene |