diff options
-rw-r--r-- | compilerplugins/clang/unusedmethods.cxx | 3 | ||||
-rw-r--r-- | forms/source/richtext/richtextengine.cxx | 1 | ||||
-rw-r--r-- | forms/source/richtext/richtextengine.hxx | 3 | ||||
-rw-r--r-- | include/editeng/unotext.hxx | 1 | ||||
-rw-r--r-- | include/svl/itemprop.hxx | 37 | ||||
-rw-r--r-- | include/vcl/window.hxx | 24 | ||||
-rw-r--r-- | sc/inc/cellsuno.hxx | 1 | ||||
-rw-r--r-- | sc/inc/column.hxx | 3 | ||||
-rw-r--r-- | sc/inc/document.hxx | 4 | ||||
-rw-r--r-- | sc/inc/styleuno.hxx | 1 | ||||
-rw-r--r-- | sc/inc/table.hxx | 3 | ||||
-rw-r--r-- | sc/source/core/data/column2.cxx | 12 | ||||
-rw-r--r-- | sc/source/core/data/document.cxx | 18 | ||||
-rw-r--r-- | sc/source/core/data/table1.cxx | 16 | ||||
-rw-r--r-- | sd/inc/stlsheet.hxx | 1 | ||||
-rw-r--r-- | sfx2/inc/commandpopup/CommandPopup.hxx | 1 | ||||
-rw-r--r-- | sw/inc/textboxhelper.hxx | 3 | ||||
-rw-r--r-- | sw/inc/unocrsrhelper.hxx | 1 | ||||
-rw-r--r-- | sw/source/core/doc/textboxhelper.cxx | 10 | ||||
-rw-r--r-- | sw/source/uibase/inc/FrameControl.hxx | 5 | ||||
-rw-r--r-- | sw/source/uibase/inc/OutlineContentVisibilityWin.hxx | 1 | ||||
-rw-r--r-- | vcl/inc/unx/gtk/gtkframe.hxx | 3 | ||||
-rw-r--r-- | vcl/source/window/window3.cxx | 64 |
23 files changed, 2 insertions, 214 deletions
diff --git a/compilerplugins/clang/unusedmethods.cxx b/compilerplugins/clang/unusedmethods.cxx index 818c0b645a48..5d39020ad538 100644 --- a/compilerplugins/clang/unusedmethods.cxx +++ b/compilerplugins/clang/unusedmethods.cxx @@ -225,7 +225,8 @@ bool UnusedMethods::checkIgnoreLocation(SourceLocation loc) return true; const char* bufferName = presumedLoc.getFilename(); if (bufferName == NULL - || loplugin::hasPathnamePrefix(bufferName, SRCDIR "/external/")) + || loplugin::hasPathnamePrefix(bufferName, SRCDIR "/external/") + || loplugin::hasPathnamePrefix(bufferName, WORKDIR "/")) return true; if( loplugin::hasPathnamePrefix(bufferName, BUILDDIR "/") || loplugin::hasPathnamePrefix(bufferName, SRCDIR "/") ) diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx index e6fd4848aa4f..14f50a6fca4d 100644 --- a/forms/source/richtext/richtextengine.cxx +++ b/forms/source/richtext/richtextengine.cxx @@ -95,7 +95,6 @@ namespace frm RichTextEngine::RichTextEngine( SfxItemPool* _pPool ) :EditEngine( _pPool ) - ,m_pEnginePool( _pPool ) { } diff --git a/forms/source/richtext/richtextengine.hxx b/forms/source/richtext/richtextengine.hxx index b0eccbe80ef5..c9413e6bd029 100644 --- a/forms/source/richtext/richtextengine.hxx +++ b/forms/source/richtext/richtextengine.hxx @@ -41,7 +41,6 @@ namespace frm class RichTextEngine final : public EditEngine { private: - SfxItemPool* m_pEnginePool; ::std::vector< IEngineStatusListener* > m_aStatusListeners; public: @@ -54,8 +53,6 @@ namespace frm void registerEngineStatusListener( IEngineStatusListener* _pListener ); void revokeEngineStatusListener( IEngineStatusListener const * _pListener ); - SfxItemPool* getPool() { return m_pEnginePool; } - private: /** constructs a new RichTextEngine. The instances takes the ownership of the given SfxItemPool */ diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index 8a5c31101fe0..8a029b72a1b1 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -57,7 +57,6 @@ class SvxItemPropertySet; struct SfxItemPropertyMapEntry; -struct SfxItemPropertySimpleEntry; #define WID_FONTDESC OWN_ATTR_VALUE_START #define WID_NUMLEVEL OWN_ATTR_VALUE_START+1 diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx index c6f6b9bd1425..d6461558abde 100644 --- a/include/svl/itemprop.hxx +++ b/include/svl/itemprop.hxx @@ -69,43 +69,6 @@ struct SfxItemPropertyMapEntry } }; -struct SfxItemPropertySimpleEntry -{ - css::uno::Type aType; - sal_uInt16 nWID; - /// flag bitmap, @see css::beans::PropertyAttribute - sal_Int16 nFlags; - sal_uInt8 nMemberId; - PropertyMoreFlags nMoreFlags = PropertyMoreFlags::NONE; - - SfxItemPropertySimpleEntry() - : nWID( 0 ) - , nFlags( 0 ) - , nMemberId( 0 ) - { - } - - SfxItemPropertySimpleEntry(sal_uInt16 _nWID, css::uno::Type const & _rType, - sal_Int16 _nFlags) - : aType( _rType ) - , nWID( _nWID ) - , nFlags( _nFlags ) - , nMemberId( 0 ) - { - assert(_nFlags <= 0x1ff ); - } - - explicit SfxItemPropertySimpleEntry( const SfxItemPropertyMapEntry& rMapEntry ) - : aType( rMapEntry.aType ) - , nWID( rMapEntry.nWID ) - , nFlags( rMapEntry.nFlags ) - , nMemberId( rMapEntry.nMemberId ) - , nMoreFlags( rMapEntry.nMoreFlags ) - { - } - -}; - struct SfxItemPropertyMapCompare { bool operator() ( const SfxItemPropertyMapEntry * lhs, const SfxItemPropertyMapEntry * rhs ) const diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 3021bb95870a..9d8c5ae954c5 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -1490,9 +1490,6 @@ public: Point LogicToPixel( const Point& rLogicPt ) const; Size LogicToPixel( const Size& rLogicSize ) const; tools::Rectangle LogicToPixel( const tools::Rectangle& rLogicRect ) const; - tools::Polygon LogicToPixel( const tools::Polygon& rLogicPoly ) const; - tools::PolyPolygon LogicToPixel( const tools::PolyPolygon& rLogicPolyPoly ) const; - basegfx::B2DPolyPolygon LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly ) const; vcl::Region LogicToPixel( const vcl::Region& rLogicRegion )const; Point LogicToPixel( const Point& rLogicPt, const MapMode& rMapMode ) const; @@ -1500,17 +1497,11 @@ public: const MapMode& rMapMode ) const; tools::Rectangle LogicToPixel( const tools::Rectangle& rLogicRect, const MapMode& rMapMode ) const; - tools::Polygon LogicToPixel( const tools::Polygon& rLogicPoly, - const MapMode& rMapMode ) const; - basegfx::B2DPolyPolygon LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly, - const MapMode& rMapMode ) const; Point PixelToLogic( const Point& rDevicePt ) const; Size PixelToLogic( const Size& rDeviceSize ) const; tools::Rectangle PixelToLogic( const tools::Rectangle& rDeviceRect ) const; - tools::Polygon PixelToLogic( const tools::Polygon& rDevicePoly ) const; tools::PolyPolygon PixelToLogic( const tools::PolyPolygon& rDevicePolyPoly ) const; - basegfx::B2DPolyPolygon PixelToLogic( const basegfx::B2DPolyPolygon& rDevicePolyPoly ) const; vcl::Region PixelToLogic( const vcl::Region& rDeviceRegion ) const; Point PixelToLogic( const Point& rDevicePt, const MapMode& rMapMode ) const; @@ -1518,22 +1509,10 @@ public: const MapMode& rMapMode ) const; tools::Rectangle PixelToLogic( const tools::Rectangle& rDeviceRect, const MapMode& rMapMode ) const; - tools::Polygon PixelToLogic( const tools::Polygon& rDevicePoly, - const MapMode& rMapMode ) const; - basegfx::B2DPolygon PixelToLogic( const basegfx::B2DPolygon& rDevicePoly, - const MapMode& rMapMode ) const; - basegfx::B2DPolyPolygon PixelToLogic( const basegfx::B2DPolyPolygon& rDevicePolyPoly, - const MapMode& rMapMode ) const; - Point LogicToLogic( const Point& rPtSource, - const MapMode* pMapModeSource, - const MapMode* pMapModeDest ) const; Size LogicToLogic( const Size& rSzSource, const MapMode* pMapModeSource, const MapMode* pMapModeDest ) const; - tools::Rectangle LogicToLogic( const tools::Rectangle& rRectSource, - const MapMode* pMapModeSource, - const MapMode* pMapModeDest ) const; const AllSettings& GetSettings() const; void SetSettings( const AllSettings& rSettings ); @@ -1544,11 +1523,8 @@ public: TextRectInfo* pInfo = nullptr, const vcl::ITextLayout* _pTextLayout = nullptr ) const; float GetDPIScaleFactor() const; - sal_Int32 GetDPIScalePercentage() const; tools::Long GetOutOffXPixel() const; tools::Long GetOutOffYPixel() const; - void SetOutOffXPixel(tools::Long nOutOffX); - void SetOutOffYPixel(tools::Long nOutOffY); void EnableMapMode( bool bEnable = true ); bool IsMapModeEnabled() const; diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx index eb50b536f3ac..c5aa7579497b 100644 --- a/sc/inc/cellsuno.hxx +++ b/sc/inc/cellsuno.hxx @@ -113,7 +113,6 @@ class SfxHint; class SfxItemPropertyMap; class SfxItemPropertySet; class SfxItemSet; -struct SfxItemPropertySimpleEntry; struct SfxItemPropertyMapEntry; namespace editeng { class SvxBorderLine; } diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index 58374fe37d28..c68110795311 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -586,9 +586,6 @@ public: void SetScriptType( SCROW nRow, SvtScriptType nType ); void UpdateScriptTypes( SCROW nRow1, SCROW nRow2 ); - size_t GetFormulaHash( SCROW nRow ) const; - - ScFormulaVectorState GetFormulaVectorState( SCROW nRow ) const; formula::FormulaTokenRef ResolveStaticReference( SCROW nRow ); bool ResolveStaticReference( ScMatrix& rMat, SCCOL nMatCol, SCROW nRow1, SCROW nRow2 ); void FillMatrix( ScMatrix& rMat, size_t nMatCol, SCROW nRow1, SCROW nRow2, svl::SharedStringPool* pPool ) const; diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index a40324f63cd2..e4127d426d25 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -2460,8 +2460,6 @@ public: void SetScriptType( const ScAddress& rPos, SvtScriptType nType ); void UpdateScriptTypes( const ScAddress& rPos, SCCOL nColSize, SCROW nRowSize ); - size_t GetFormulaHash( const ScAddress& rPos ) const; - /** * Make specified formula cells non-grouped. * @@ -2476,8 +2474,6 @@ public: void RegroupFormulaCells( SCTAB nTab, SCCOL nCol ); void RegroupFormulaCells( const ScRange& range ); - ScFormulaVectorState GetFormulaVectorState( const ScAddress& rPos ) const; - formula::FormulaTokenRef ResolveStaticReference( const ScAddress& rPos ); formula::FormulaTokenRef ResolveStaticReference( const ScRange& rRange ); diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx index 53dcdcb05e38..a4ded70ab6f2 100644 --- a/sc/inc/styleuno.hxx +++ b/sc/inc/styleuno.hxx @@ -43,7 +43,6 @@ class SfxItemSet; class ScStyleFamilyObj; class ScStyleObj; -struct SfxItemPropertySimpleEntry; struct SfxItemPropertyMapEntry; class ScStyleFamiliesObj final : public ::cppu::WeakImplHelper< diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 2436b0ccac87..8d938e6e5ce1 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -1004,9 +1004,6 @@ public: SvtScriptType GetRangeScriptType( sc::ColumnBlockPosition& rBlockPos, SCCOL nCol, SCROW nRow1, SCROW nRow2 ); - size_t GetFormulaHash( SCCOL nCol, SCROW nRow ) const; - - ScFormulaVectorState GetFormulaVectorState( SCCOL nCol, SCROW nRow ) const; formula::FormulaTokenRef ResolveStaticReference( SCCOL nCol, SCROW nRow ); formula::FormulaTokenRef ResolveStaticReference( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); formula::VectorRefArray FetchVectorRefArray( SCCOL nCol, SCROW nRow1, SCROW nRow2 ); diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index dda91a5cf4f4..dd0337784fa0 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -2153,18 +2153,6 @@ void ScColumn::SetScriptType( SCROW nRow, SvtScriptType nType ) CellStorageModified(); } -size_t ScColumn::GetFormulaHash( SCROW nRow ) const -{ - const ScFormulaCell* pCell = FetchFormulaCell(nRow); - return pCell ? pCell->GetHash() : 0; -} - -ScFormulaVectorState ScColumn::GetFormulaVectorState( SCROW nRow ) const -{ - const ScFormulaCell* pCell = FetchFormulaCell(nRow); - return pCell ? pCell->GetVectorState() : FormulaVectorUnknown; -} - formula::FormulaTokenRef ScColumn::ResolveStaticReference( SCROW nRow ) { std::pair<sc::CellStoreType::iterator,size_t> aPos = maCells.position(nRow); diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 29ce6fa3c77a..012913d37924 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -1749,24 +1749,6 @@ bool ScDocument::HasPartOfMerged( const ScRange& rRange ) return bPart; } -size_t ScDocument::GetFormulaHash( const ScAddress& rPos ) const -{ - SCTAB nTab = rPos.Tab(); - if (!ValidTab(nTab) || o3tl::make_unsigned(nTab) >= maTabs.size() || !maTabs[nTab]) - return 0; - - return maTabs[nTab]->GetFormulaHash(rPos.Col(), rPos.Row()); -} - -ScFormulaVectorState ScDocument::GetFormulaVectorState( const ScAddress& rPos ) const -{ - SCTAB nTab = rPos.Tab(); - if (!ValidTab(nTab) || o3tl::make_unsigned(nTab) >= maTabs.size() || !maTabs[nTab]) - return FormulaVectorUnknown; - - return maTabs[nTab]->GetFormulaVectorState(rPos.Col(), rPos.Row()); -} - formula::FormulaTokenRef ScDocument::ResolveStaticReference( const ScAddress& rPos ) { SCTAB nTab = rPos.Tab(); diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index b70e5b490cde..40aeab42cfa2 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -2414,22 +2414,6 @@ SvtScriptType ScTable::GetRangeScriptType( return aCol[nCol].GetRangeScriptType(rBlockPos.miCellTextAttrPos, nRow1, nRow2, itr); } -size_t ScTable::GetFormulaHash( SCCOL nCol, SCROW nRow ) const -{ - if ( !IsColValid( nCol ) ) - return 0; - - return aCol[nCol].GetFormulaHash(nRow); -} - -ScFormulaVectorState ScTable::GetFormulaVectorState( SCCOL nCol, SCROW nRow ) const -{ - if ( !IsColValid( nCol ) ) - return FormulaVectorUnknown; - - return aCol[nCol].GetFormulaVectorState(nRow); -} - formula::FormulaTokenRef ScTable::ResolveStaticReference( SCCOL nCol, SCROW nRow ) { if ( !ValidCol( nCol ) || !ValidRow( nRow ) ) diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx index 8617eade17e1..105eb4cd797a 100644 --- a/sd/inc/stlsheet.hxx +++ b/sd/inc/stlsheet.hxx @@ -39,7 +39,6 @@ #include "prlayout.hxx" class ModifyListenerForwarder; -struct SfxItemPropertySimpleEntry; struct SfxItemPropertyMapEntry; typedef cppu::ImplInheritanceHelper< SfxUnoStyleSheet, diff --git a/sfx2/inc/commandpopup/CommandPopup.hxx b/sfx2/inc/commandpopup/CommandPopup.hxx index feec24904fce..6ec23caf0de9 100644 --- a/sfx2/inc/commandpopup/CommandPopup.hxx +++ b/sfx2/inc/commandpopup/CommandPopup.hxx @@ -78,7 +78,6 @@ private: DECL_LINK(QueryTooltip, const weld::TreeIter&, OUString); DECL_LINK(RowActivated, weld::TreeView&, bool); DECL_LINK(ModifyHdl, weld::Entry&, void); - DECL_LINK(SelectionChanged, weld::TreeView&, void); DECL_LINK(TreeViewKeyPress, const KeyEvent&, bool); void dispatchCommandAndClose(OUString const& rCommand); diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx index d9c2b1ac9429..0db804424332 100644 --- a/sw/inc/textboxhelper.hxx +++ b/sw/inc/textboxhelper.hxx @@ -82,9 +82,6 @@ public: /// Similar to syncProperty(), but used by the internal API (e.g. for UI purposes). static void syncFlyFrameAttr(SwFrameFormat& rShape, SfxItemSet const& rSet); - /// Returns the SwFrameFormat* of the given UNO-XShape if exists otherwise nullptr. - static SwFrameFormat* getShapeFormat(css::uno::Reference<css::drawing::XShape> xShape); - /// Copy shape attributes to the text frame static void updateTextBoxMargin(SdrObject* pObj); diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx index f7477565a4d7..dd9e44b21d96 100644 --- a/sw/inc/unocrsrhelper.hxx +++ b/sw/inc/unocrsrhelper.hxx @@ -28,7 +28,6 @@ class SfxItemSet; class SfxItemPropertySet; -struct SfxItemPropertySimpleEntry; struct SfxItemPropertyMapEntry; class SdrObject; class SwTextNode; diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx index 72676dcf777f..9ad8d8c33d57 100644 --- a/sw/source/core/doc/textboxhelper.cxx +++ b/sw/source/core/doc/textboxhelper.cxx @@ -1018,16 +1018,6 @@ void SwTextBoxHelper::syncFlyFrameAttr(SwFrameFormat& rShape, SfxItemSet const& pFormat->GetDoc()->SetFlyFrameAttr(*pFormat, aTextBoxSet); } -SwFrameFormat* SwTextBoxHelper::getShapeFormat(uno::Reference<drawing::XShape> xShape) -{ - if (xShape) - if (auto pShape = dynamic_cast<SwXShape*>(xShape.get())) - if (SwFrameFormat* pFormat = pShape->GetFrameFormat()) - return pFormat; - SAL_WARN("sw.core", "SwTextBoxHelper::getShapeFormat: No Shape Format!"); - return nullptr; -} - void SwTextBoxHelper::updateTextBoxMargin(SdrObject* pObj) { if (!pObj) diff --git a/sw/source/uibase/inc/FrameControl.hxx b/sw/source/uibase/inc/FrameControl.hxx index 9efce9cf699e..e53c765bf831 100644 --- a/sw/source/uibase/inc/FrameControl.hxx +++ b/sw/source/uibase/inc/FrameControl.hxx @@ -30,9 +30,6 @@ public: /// Returns true if the point is inside the control. virtual bool Contains( const Point &rDocPt ) const = 0; - /// Returns true if the control has focus - virtual bool IsFocused() const = 0; - virtual const SwFrame* GetFrame() = 0; virtual SwEditWin* GetEditWin() = 0; }; @@ -51,7 +48,6 @@ public: void SetReadonly( bool bReadonly ) { mpIFace->SetReadonly( bReadonly ); } void ShowAll( bool bShow ) { mpIFace->ShowAll( bShow ); } bool Contains( const Point &rDocPt ) const { return mpIFace->Contains( rDocPt ); } - bool HasFocus() const { return mpIFace->IsFocused(); } }; /** Class sharing some MenuButton code @@ -76,7 +72,6 @@ public: virtual const SwFrame* GetFrame() override { return m_pFrame; } virtual SwEditWin* GetEditWin() override { return m_pEditWin; } - virtual bool IsFocused() const override { return ControlHasFocus(); } const SwPageFrame* GetPageFrame() const; }; diff --git a/sw/source/uibase/inc/OutlineContentVisibilityWin.hxx b/sw/source/uibase/inc/OutlineContentVisibilityWin.hxx index db993021aa11..36f096ae3df4 100644 --- a/sw/source/uibase/inc/OutlineContentVisibilityWin.hxx +++ b/sw/source/uibase/inc/OutlineContentVisibilityWin.hxx @@ -40,7 +40,6 @@ public: virtual void ShowAll(bool bShow) override; virtual bool Contains(const Point& rDocPt) const override; virtual void SetReadonly(bool /*bReadonly*/) override {} - virtual bool IsFocused() const override { return ControlHasFocus(); } virtual const SwFrame* GetFrame() override { return m_pFrame; } virtual SwEditWin* GetEditWin() override { return m_pEditWin; } diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 189a097fd40e..28117a9a1711 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -416,9 +416,6 @@ public: static GdkDisplay* getGdkDisplay(); GtkWidget* getWindow() const { return m_pWindow; } GtkFixed* getFixedContainer() const { return GTK_FIXED(m_pFixedContainer); } -#if !GTK_CHECK_VERSION(4, 0, 0) - GtkEventBox* getEventBox() const { return m_pEventBox; } -#endif GtkWidget* getMouseEventWidget() const; GtkGrid* getTopLevelGridWidget() const { return m_pTopLevelGrid; } const SalX11Screen& getXScreenNumber() const { return m_nXScreen; } diff --git a/vcl/source/window/window3.cxx b/vcl/source/window/window3.cxx index 6640cbbed3ce..371b4066ed19 100644 --- a/vcl/source/window/window3.cxx +++ b/vcl/source/window/window3.cxx @@ -120,17 +120,8 @@ bool Window::IsOverlineColor() const { return GetOutDev()->IsOverlineColor(); } void Window::SetTextAlign(TextAlign eAlign) { GetOutDev()->SetTextAlign(eAlign); } float Window::GetDPIScaleFactor() const { return GetOutDev()->GetDPIScaleFactor(); } -sal_Int32 Window::GetDPIScalePercentage() const { return GetOutDev()->GetDPIScalePercentage(); } tools::Long Window::GetOutOffXPixel() const { return GetOutDev()->GetOutOffXPixel(); } tools::Long Window::GetOutOffYPixel() const { return GetOutDev()->GetOutOffYPixel(); } -void Window::SetOutOffXPixel(tools::Long nOutOffX) -{ - return GetOutDev()->SetOutOffXPixel(nOutOffX); -} -void Window::SetOutOffYPixel(tools::Long nOutOffY) -{ - return GetOutDev()->SetOutOffXPixel(nOutOffY); -} void Window::SetMapMode() { GetOutDev()->SetMapMode(); } void Window::SetMapMode(const MapMode& rNewMapMode) { GetOutDev()->SetMapMode(rNewMapMode); } bool Window::IsRTLEnabled() const { return GetOutDev()->IsRTLEnabled(); } @@ -149,18 +140,6 @@ tools::Rectangle Window::LogicToPixel(const tools::Rectangle& rLogicRect) const { return GetOutDev()->LogicToPixel(rLogicRect); } -tools::Polygon Window::LogicToPixel(const tools::Polygon& rLogicPoly) const -{ - return GetOutDev()->LogicToPixel(rLogicPoly); -} -tools::PolyPolygon Window::LogicToPixel(const tools::PolyPolygon& rLogicPoly) const -{ - return GetOutDev()->LogicToPixel(rLogicPoly); -} -basegfx::B2DPolyPolygon Window::LogicToPixel(const basegfx::B2DPolyPolygon& rLogicPolyPoly) const -{ - return GetOutDev()->LogicToPixel(rLogicPolyPoly); -} vcl::Region Window::LogicToPixel(const vcl::Region& rLogicRegion) const { return GetOutDev()->LogicToPixel(rLogicRegion); @@ -178,15 +157,6 @@ tools::Rectangle Window::LogicToPixel(const tools::Rectangle& rLogicRect, { return GetOutDev()->LogicToPixel(rLogicRect, rMapMode); } -tools::Polygon Window::LogicToPixel(const tools::Polygon& rLogicPoly, const MapMode& rMapMode) const -{ - return GetOutDev()->LogicToPixel(rLogicPoly, rMapMode); -} -basegfx::B2DPolyPolygon Window::LogicToPixel(const basegfx::B2DPolyPolygon& rLogicPolyPoly, - const MapMode& rMapMode) const -{ - return GetOutDev()->LogicToPixel(rLogicPolyPoly, rMapMode); -} Point Window::PixelToLogic(const Point& rDevicePt) const { @@ -200,18 +170,10 @@ tools::Rectangle Window::PixelToLogic(const tools::Rectangle& rDeviceRect) const { return GetOutDev()->PixelToLogic(rDeviceRect); } -tools::Polygon Window::PixelToLogic(const tools::Polygon& rDevicePoly) const -{ - return GetOutDev()->PixelToLogic(rDevicePoly); -} tools::PolyPolygon Window::PixelToLogic(const tools::PolyPolygon& rDevicePolyPoly) const { return GetOutDev()->PixelToLogic(rDevicePolyPoly); } -basegfx::B2DPolyPolygon Window::PixelToLogic(const basegfx::B2DPolyPolygon& rDevicePolyPoly) const -{ - return GetOutDev()->PixelToLogic(rDevicePolyPoly); -} vcl::Region Window::PixelToLogic(const vcl::Region& rDeviceRegion) const { return GetOutDev()->PixelToLogic(rDeviceRegion); @@ -229,38 +191,12 @@ tools::Rectangle Window::PixelToLogic(const tools::Rectangle& rDeviceRect, { return GetOutDev()->PixelToLogic(rDeviceRect, rMapMode); } -tools::Polygon Window::PixelToLogic(const tools::Polygon& rDevicePoly, - const MapMode& rMapMode) const -{ - return GetOutDev()->PixelToLogic(rDevicePoly, rMapMode); -} -basegfx::B2DPolygon Window::PixelToLogic(const basegfx::B2DPolygon& rDevicePoly, - const MapMode& rMapMode) const -{ - return GetOutDev()->PixelToLogic(rDevicePoly, rMapMode); -} -basegfx::B2DPolyPolygon Window::PixelToLogic(const basegfx::B2DPolyPolygon& rDevicePolyPoly, - const MapMode& rMapMode) const -{ - return GetOutDev()->PixelToLogic(rDevicePolyPoly, rMapMode); -} -Point Window::LogicToLogic(const Point& rPtSource, const MapMode* pMapModeSource, - const MapMode* pMapModeDest) const -{ - return GetOutDev()->LogicToLogic(rPtSource, pMapModeSource, pMapModeDest); -} Size Window::LogicToLogic(const Size& rSzSource, const MapMode* pMapModeSource, const MapMode* pMapModeDest) const { return GetOutDev()->LogicToLogic(rSzSource, pMapModeSource, pMapModeDest); } -tools::Rectangle Window::LogicToLogic(const tools::Rectangle& rRectSource, - const MapMode* pMapModeSource, - const MapMode* pMapModeDest) const -{ - return GetOutDev()->LogicToLogic(rRectSource, pMapModeSource, pMapModeDest); -} tools::Rectangle Window::GetTextRect(const tools::Rectangle& rRect, const OUString& rStr, DrawTextFlags nStyle, TextRectInfo* pInfo, |