diff options
75 files changed, 47 insertions, 1045 deletions
diff --git a/accessibility/inc/standard/vclxaccessiblelist.hxx b/accessibility/inc/standard/vclxaccessiblelist.hxx index b05bbd6d37ac..6c16ef84fa93 100644 --- a/accessibility/inc/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/standard/vclxaccessiblelist.hxx @@ -125,7 +125,6 @@ public: void UpdateSelection_Acc (const ::rtl::OUString& sTextOfSelectedItem, bool b_IsDropDownList); void UpdateSelection_Impl_Acc (bool b_IsDropDownList); - void UpdateFocus_Impl_Acc ( sal_Int32 nPos, bool b_IsDropDownList) ; static void NotifyListItem(css::uno::Any& val); ::accessibility::IComboListBoxHelper* getListBoxHelper() { return m_pListBoxHelper.get(); } protected: diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index 9886509ba2c4..e82cf5e32817 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -310,28 +310,6 @@ void VCLXAccessibleList::NotifyListItem(css::uno::Any& val) } } -void VCLXAccessibleList::UpdateFocus_Impl_Acc (sal_Int32 nPos ,bool b_IsDropDownList) -{ - if (!(m_aBoxType == LISTBOX && !b_IsDropDownList)) - { - return ; - } - Reference<XAccessible> xChild= CreateChild(nPos); - if ( !xChild.is() ) - { - return ; - } - m_nCurSelectedPos = nPos; - uno::Any aOldValue, aNewValue; - aNewValue <<= xChild; - - NotifyAccessibleEvent( - AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, - aOldValue, - aNewValue ); -} - - void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent, bool b_IsDropDownList) { switch ( rVclWindowEvent.GetId() ) diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index d6f02ea6468c..ceb52885ad54 100644 --- a/basctl/source/inc/basidesh.hxx +++ b/basctl/source/inc/basidesh.hxx @@ -149,7 +149,6 @@ public: virtual ~Shell() override; BaseWindow* GetCurWindow() const { return pCurWin; } - ScriptDocument const& GetCurDocument() const { return m_aCurDocument; } OUString const& GetCurLibName() const { return m_aCurLibName; } const std::shared_ptr<LocalizationMgr>& GetCurLocalizationMgr() const { return m_pCurLocalizationMgr; } diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index 6af2660954fe..04e3be2b6ee3 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -466,9 +466,7 @@ public: css::uno::Reference< css::uno::XInterface > getChartView() const; bool isTimeBased() const { return mbTimeBased;} - void setTimeBased(bool bTimeBased); - void getNextTimePoint(); void setTimeBasedRange(sal_Int32 nStart, sal_Int32 nEnd); #if HAVE_FEATURE_OPENGL diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index a3c26532907a..fe8ada3639d0 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -1320,42 +1320,6 @@ OUString SAL_CALL ChartModel::dump() return OUString(); } -void ChartModel::setTimeBased(bool bTimeBased) -{ - mbTimeBased = bTimeBased; - uno::Sequence<Reference< chart2::data::XLabeledDataSequence > > - xDataSequences = getDataSequences(); - sal_Int32 n = xDataSequences.getLength(); - for(sal_Int32 i = 0; i < n; ++i) - { - uno::Reference< chart2::XTimeBased > xTimeBased(xDataSequences[i]->getValues(), uno::UNO_QUERY); - SAL_WARN_IF(!xTimeBased.is(), "chart2", "does not support time based charting"); - if(xTimeBased.is()) - { - uno::Reference< beans::XPropertySet > xPropSet(xTimeBased, uno::UNO_QUERY_THROW); - xPropSet->setPropertyValue("TimeBased", uno::Any(bTimeBased)); - } - } -} - -void ChartModel::getNextTimePoint() -{ - uno::Sequence< Reference< chart2::data::XLabeledDataSequence > > xDataSequences = getDataSequences(); - sal_Int32 n = xDataSequences.getLength(); - for(sal_Int32 i = 0; i < n; ++i) - { - uno::Reference< chart2::XTimeBased > xTimeBased(xDataSequences[i]->getValues(), uno::UNO_QUERY); - SAL_WARN_IF(!xTimeBased.is(), "chart2", "does not support time based charting"); - if(xTimeBased.is()) - { - if(!bSet) - xTimeBased->setRange(mnStart, mnEnd); - xTimeBased->switchToNext(true); - } - } - bSet = true; -} - void ChartModel::setTimeBasedRange(sal_Int32 nStart, sal_Int32 nEnd) { bSet = false; diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index dcac408abfce..a942fba97ffc 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -1361,34 +1361,6 @@ bool OGenericUnoController::isCommandEnabled(sal_uInt16 _nCommandId) const return GetState( _nCommandId ).bEnabled; } -sal_uInt16 OGenericUnoController::registerCommandURL( const OUString& _rCompleteCommandURL ) -{ - if ( _rCompleteCommandURL.isEmpty() ) - return 0; - - SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.find( _rCompleteCommandURL ); - if ( aIter != m_aSupportedFeatures.end() ) - return aIter->second.nFeatureId; - - // this is a previously unknown command - sal_uInt16 nFeatureId = FIRST_USER_DEFINED_FEATURE; - while ( isFeatureSupported( nFeatureId ) && ( nFeatureId < LAST_USER_DEFINED_FEATURE ) ) - ++nFeatureId; - if ( nFeatureId == LAST_USER_DEFINED_FEATURE ) - { - SAL_WARN("dbaccess.ui", "OGenericUnoController::registerCommandURL: no more space for user defined features!" ); - return 0L; - } - - ControllerFeature aFeature; - aFeature.Command = _rCompleteCommandURL; - aFeature.nFeatureId = nFeatureId; - aFeature.GroupId = CommandGroup::INTERNAL; - m_aSupportedFeatures[ aFeature.Command ] = aFeature; - - return nFeatureId; -} - void OGenericUnoController::notifyHiContrastChanged() { } diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index e76a2932a313..79ac4e10dfbe 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -1165,13 +1165,6 @@ void ExtensionBox_Impl::checkEntries() } -void ExtensionBox_Impl::SetScrollHdl( const Link<ScrollBar*,void>& rLink ) -{ - if ( m_pScrollBar ) - m_pScrollBar->SetScrollHdl( rLink ); -} - - void ExtensionBox_Impl::DoScroll( long nDelta ) { m_nTopIndex += nDelta; diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index e2a77abd3376..1f60db9e7cfa 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -173,13 +173,11 @@ public: virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual Size GetOptimalSize() const override; - void SetExtraSize( long nSize ) { m_nExtraHeight = nSize; } TEntry_Impl GetEntryData( long nPos ) { return m_vEntries[ nPos ]; } long GetEntryCount() { return (long) m_vEntries.size(); } Rectangle GetEntryRect( const long nPos ) const; bool HasActive() { return m_bHasActive; } long PointToPos( const Point& rPos ); - void SetScrollHdl( const Link<ScrollBar*,void>& rLink ); void DoScroll( long nDelta ); virtual void RecalcAll(); void RemoveUnlocked(); diff --git a/include/dbaccess/IController.hxx b/include/dbaccess/IController.hxx index 2f3e0ba6ef3d..5890489da5e7 100644 --- a/include/dbaccess/IController.hxx +++ b/include/dbaccess/IController.hxx @@ -89,20 +89,6 @@ namespace dbaui */ virtual bool isCommandEnabled( const OUString& _rCompleteCommandURL ) const = 0; - /** registers a command URL, giving it a unique name - - If you call this with a command URL which is supported by the controller, then - you will simply get the controller's internal numeric shortcut to this command. - - If you call this with a command URL which is not supported by the controller, then - you will get a new ID, which is unique during the lifetime of the controller. - - If the command URL is invalid, or the controller cannot register new commands anymore, - then 0 is returned. - */ - virtual sal_uInt16 - registerCommandURL( const OUString& _rCompleteCommandURL ) = 0; - /** notifyHiContrastChanged will be called when the hicontrast mode changed. @param _bHiContrast <TRUE/> when in hicontrast mode. diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx index bae36a23ec54..e2e389c8d9a6 100644 --- a/include/dbaccess/genericcontroller.hxx +++ b/include/dbaccess/genericcontroller.hxx @@ -461,7 +461,6 @@ namespace dbaui virtual void executeChecked(sal_uInt16 _nCommandId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) override; virtual bool isCommandEnabled(sal_uInt16 _nCommandId) const override; virtual bool isCommandEnabled(const OUString& _rCompleteCommandURL) const override; - virtual sal_uInt16 registerCommandURL( const OUString& _rCompleteCommandURL ) override; virtual void notifyHiContrastChanged() override; virtual bool isDataSourceReadOnly() const override; virtual css::uno::Reference< css::frame::XController > getXController() override; diff --git a/include/svx/fmpage.hxx b/include/svx/fmpage.hxx index 3a515163d708..0a9c5672af61 100644 --- a/include/svx/fmpage.hxx +++ b/include/svx/fmpage.hxx @@ -56,8 +56,7 @@ public: virtual SdrPage* Clone() const override; virtual SdrPage* Clone(SdrModel* pNewModel) const override; - virtual void InsertObject(SdrObject* pObj, size_t nPos = SAL_MAX_SIZE, - const SdrInsertReason* pReason=nullptr) override; + virtual void InsertObject(SdrObject* pObj, size_t nPos = SAL_MAX_SIZE) override; virtual SdrObject* RemoveObject(size_t nObjNum) override; diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx index accfb8f69b1a..72d1849e300e 100644 --- a/include/svx/obj3d.hxx +++ b/include/svx/obj3d.hxx @@ -86,8 +86,8 @@ public: virtual E3dObjList* Clone() const override; - virtual void NbcInsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE, const SdrInsertReason* pReason=nullptr) override; - virtual void InsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE, const SdrInsertReason* pReason=nullptr) override; + virtual void NbcInsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE) override; + virtual void InsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE) override; virtual SdrObject* NbcRemoveObject(size_t nObjNum) override; virtual SdrObject* RemoveObject(size_t nObjNum) override; diff --git a/include/svx/postattr.hxx b/include/svx/postattr.hxx index 19477acbd267..7f9a374cf009 100644 --- a/include/svx/postattr.hxx +++ b/include/svx/postattr.hxx @@ -125,9 +125,7 @@ class SVX_DLLPUBLIC SvxPostItIdItem: public SfxStringItem public: static SfxPoolItem* CreateDefault(); - SvxPostItIdItem( sal_uInt16 nWhich ); - - SvxPostItIdItem( const OUString& rId, sal_uInt16 nWhich ); + SvxPostItIdItem( sal_uInt16 nWhich ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index 2df53603f833..be9dc8bafa7a 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -52,21 +52,6 @@ class Color; class SfxStyleSheet; class SvxUnoDrawPagesAccess; -enum class SdrInsertReasonKind { - Undo, /// from Undo - Copy, /// something copied... - ViewCall /// via SdrView::Group(), ... -}; - -class SdrInsertReason { - SdrInsertReasonKind eReason; -public: - SdrInsertReason(SdrInsertReasonKind eR): eReason(eR) {} - - SdrInsertReasonKind GetReason() const { return eReason; } -}; - - // class SdrObjList class SVX_DLLPUBLIC SdrObjList @@ -120,10 +105,8 @@ public: /// recalculate order numbers / ZIndex void RecalcObjOrdNums(); bool IsObjOrdNumsDirty() const { return bObjOrdNumsDirty; } - virtual void NbcInsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE, - const SdrInsertReason* pReason=nullptr); - virtual void InsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE, - const SdrInsertReason* pReason=nullptr); + virtual void NbcInsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE); + virtual void InsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE); /// remove from list without delete virtual SdrObject* NbcRemoveObject(size_t nObjNum); virtual SdrObject* RemoveObject(size_t nObjNum); diff --git a/include/tools/poly.hxx b/include/tools/poly.hxx index 4f8a6d8119c3..528753a286ae 100644 --- a/include/tools/poly.hxx +++ b/include/tools/poly.hxx @@ -120,7 +120,6 @@ public: Rectangle GetBoundRect() const; double GetSignedArea() const; bool IsInside( const Point& rPt ) const; - bool IsRightOrientated() const; double CalcDistance( sal_uInt16 nPt1, sal_uInt16 nPt2 ); void Clip( const Rectangle& rRect ); void Optimize( PolyOptimizeFlags nOptimizeFlags ); diff --git a/include/tools/rc.hxx b/include/tools/rc.hxx index ece1c646f6dc..20df1fe9b1de 100644 --- a/include/tools/rc.hxx +++ b/include/tools/rc.hxx @@ -62,7 +62,6 @@ protected: // constructors Resource() : m_pResMgr( nullptr ) {} - Resource( const ResId& rResId ); public: #ifdef DBG_UTIL diff --git a/include/unotools/textsearch.hxx b/include/unotools/textsearch.hxx index 9efa5d2ead3d..145e6607d49c 100644 --- a/include/unotools/textsearch.hxx +++ b/include/unotools/textsearch.hxx @@ -132,11 +132,6 @@ public: // signed return for API use sal_Int32 GetWildEscChar() const { return static_cast<sal_Int32>(m_cWildEscChar); } - bool IsSrchRelaxed() const { return bLEV_Relaxed; } - int GetLEVOther() const { return nLEV_OtherX; } - int GetLEVShorter() const { return nLEV_ShorterY; } - int GetLEVLonger() const { return nLEV_LongerZ; } - long GetTransliterationFlags() const { return nTransliterationFlags; } }; diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index aff55ce29632..f1b950052526 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -673,7 +673,6 @@ public: int* pCount ); SAL_DLLPRIVATE bool ImplMakeMono( sal_uInt8 cThreshold ); - SAL_DLLPRIVATE bool ImplMakeMonoDither(); SAL_DLLPRIVATE bool ImplMakeGreyscales( sal_uInt16 nGreyscales ); SAL_DLLPRIVATE bool ImplConvertUp( sal_uInt16 nBitCount, Color* pExtColor = nullptr ); SAL_DLLPRIVATE bool ImplConvertDown( sal_uInt16 nBitCount, Color* pExtColor = nullptr ); diff --git a/include/vcl/bitmapaccess.hxx b/include/vcl/bitmapaccess.hxx index 2788333fbcd0..872ca4e3212e 100644 --- a/include/vcl/bitmapaccess.hxx +++ b/include/vcl/bitmapaccess.hxx @@ -134,7 +134,6 @@ public: static BitmapColor GetPixelForN16BitTcLsbMask(ConstScanline pScanline, long nX, const ColorMask& rMask); static BitmapColor GetPixelForN24BitTcBgr(ConstScanline pScanline, long nX, const ColorMask& rMask); static BitmapColor GetPixelForN24BitTcRgb(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelForN24BitTcMask(ConstScanline pScanline, long nX, const ColorMask& rMask); static BitmapColor GetPixelForN32BitTcAbgr(ConstScanline pScanline, long nX, const ColorMask& rMask); static BitmapColor GetPixelForN32BitTcArgb(ConstScanline pScanline, long nX, const ColorMask& rMask); static BitmapColor GetPixelForN32BitTcBgra(ConstScanline pScanline, long nX, const ColorMask& rMask); @@ -151,7 +150,6 @@ public: static void SetPixelForN16BitTcLsbMask(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); static void SetPixelForN24BitTcBgr(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); static void SetPixelForN24BitTcRgb(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelForN24BitTcMask(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); static void SetPixelForN32BitTcAbgr(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); static void SetPixelForN32BitTcArgb(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); static void SetPixelForN32BitTcBgra(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx index a0346546c43b..6beeea11c0c3 100644 --- a/include/vcl/pdfwriter.hxx +++ b/include/vcl/pdfwriter.hxx @@ -1023,37 +1023,6 @@ The following structure describes the permissions used in PDF security */ sal_Int32 CreateOutlineItem( sal_Int32 nParent, const OUString& rText, sal_Int32 nDestID ); - /** Set an outline item's parent - - @param nItem - specififies which item should be reparented. - - @param nNewParent - specifies which outline item will be the item's new parent. - Use 0 for reparenting to top level. - */ - void SetOutlineItemParent( sal_Int32 nItem, sal_Int32 nNewParent ); - - /** Set an outline item's title text - - @param nItem - specififies which item should get a new text - - @param rText - sets the title text of the item - */ - void SetOutlineItemText( sal_Int32 nItem, const OUString& rText ); - - /** Set an outline item's destination - - @param nItem - specififies which item should get a new dest - - @param nDestID - specifies the item's new destination - */ - void SetOutlineItemDest( sal_Int32 nItem, sal_Int32 nDestID ); - /** Create a new note on a page @param rRect @@ -1210,17 +1179,6 @@ The following structure describes the permissions used in PDF security */ void SetAlternateText( const OUString& rText ); - /** Sets the time in seconds a page will appear before the next - page is shown automatically - - @param nSeconds - time in seconds the current page will be shown; pass 0 for manual advancement - - @param nPageNr - the page number to apply the autoadvance time to; -1 denotes the current page - */ - void SetAutoAdvanceTime( sal_uInt32 nSeconds, sal_Int32 nPageNr ); - /** Sets the transitional effect to be applied when the current page gets shown. @param eType diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx index 30997a984911..e60cfe98f956 100644 --- a/include/vcl/salnativewidgets.hxx +++ b/include/vcl/salnativewidgets.hxx @@ -367,7 +367,6 @@ class VCL_DLLPUBLIC TabitemValue : public ImplControlValue bool isBothAligned() const { return isLeftAligned() && isRightAligned(); } bool isNotAligned() const { return !(mnAlignment & (TabitemFlags::LeftAligned | TabitemFlags::RightAligned)); } bool isFirst() const { return bool(mnAlignment & TabitemFlags::FirstInGroup); } - bool isLast() const { return bool(mnAlignment & TabitemFlags::LastInGroup); } const Rectangle& getContentRect() const { return maContentRect; } }; diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx index 9f81d7f65f43..f8ab98e08cbe 100644 --- a/include/vcl/splitwin.hxx +++ b/include/vcl/splitwin.hxx @@ -122,7 +122,6 @@ public: virtual void StartSplit(); virtual void Split(); virtual void SplitResize(); - virtual void AutoHide(); virtual void FadeIn(); virtual void FadeOut(); diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx index 49d9aa7fb4a3..c7bf7253a2d3 100644 --- a/include/vcl/timer.hxx +++ b/include/vcl/timer.hxx @@ -56,7 +56,6 @@ public: */ void Invoke( Timer *arg ); void SetInvokeHandler( const Link<Timer *, void>& rLink ) { maInvokeHandler = rLink; } - bool HasInvokeHandler() const { return maInvokeHandler.IsSet(); }; void ClearInvokeHandler() { SetInvokeHandler( Link<Timer *, void>() ); } void SetTimeout( sal_uInt64 nTimeoutMs ); diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx index e95a7664ad07..ef8f28ab01cf 100644 --- a/include/vcl/wrkwin.hxx +++ b/include/vcl/wrkwin.hxx @@ -80,7 +80,6 @@ public: @overload void ShowFullScreenMode(bool bFullScreenMode, sal_Int32 nDisplayScreen) */ void ShowFullScreenMode( bool bFullScreenMode = true ); - void EndFullScreenMode() { ShowFullScreenMode( false ); } bool IsFullScreenMode() const { return mbFullScreenMode; } void StartPresentationMode( bool bPresentation, diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx index bded3697732d..4936b36a7068 100644 --- a/include/xmloff/shapeimport.hxx +++ b/include/xmloff/shapeimport.hxx @@ -330,11 +330,6 @@ public: void addGluePointMapping( css::uno::Reference< css::drawing::XShape >& xShape, sal_Int32 nSourceId, sal_Int32 nDestinnationId ); - /** find mapping for given DestinationID. This allows to extract the original draw:id imported with a draw:glue-point */ - sal_Int32 findGluePointMapping( - const css::uno::Reference< css::drawing::XShape >& xShape, - sal_Int32 nDestinnationId ) const; - /** moves all current DestinationId's for rXShape by n */ void moveGluePointMapping( const css::uno::Reference< css::drawing::XShape >& xShape, const sal_Int32 n ); diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx index a6f1683a399d..d30764362954 100644 --- a/reportdesign/inc/RptPage.hxx +++ b/reportdesign/inc/RptPage.hxx @@ -60,7 +60,7 @@ public: virtual SdrPage* Clone() const override; virtual SdrPage* Clone( SdrModel* pNewModel ) const override; - virtual void NbcInsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE, const SdrInsertReason* pReason=nullptr) override; + virtual void NbcInsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE) override; virtual SdrObject* RemoveObject(size_t nObjNum) override; /** returns the index inside the object list which belongs to the report component. diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx index 6a101ed825f3..4e254a62b63f 100644 --- a/reportdesign/source/core/sdr/RptPage.cxx +++ b/reportdesign/source/core/sdr/RptPage.cxx @@ -179,9 +179,9 @@ void OReportPage::resetSpecialMode() m_bSpecialInsertMode = false; } -void OReportPage::NbcInsertObject(SdrObject* pObj, size_t nPos, const SdrInsertReason* pReason) +void OReportPage::NbcInsertObject(SdrObject* pObj, size_t nPos) { - SdrPage::NbcInsertObject(pObj, nPos, pReason); + SdrPage::NbcInsertObject(pObj, nPos); OUnoObject* pUnoObj = dynamic_cast< OUnoObject* >( pObj ); if (getSpecialMode()) diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 57eccdc35233..4dbcf32fa63c 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -268,8 +268,7 @@ void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyC pNeuObj->SetPage( m_pPage ); pNeuObj->SetModel( m_pModel.get() ); - SdrInsertReason aReason(SdrInsertReasonKind::ViewCall); - m_pPage->InsertObject(pNeuObj, SAL_MAX_SIZE, &aReason); + m_pPage->InsertObject(pNeuObj, SAL_MAX_SIZE); Rectangle aRet(VCLPoint((*pCopiesIter)->getPosition()),VCLSize((*pCopiesIter)->getSize())); aRet.setHeight(aRet.getHeight() + 1); diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index 07490d6fe304..1ef86e66d91b 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -36,7 +36,6 @@ class RscError; class RscTupel; class RscCont; class RscCmdLine; -enum class KeyFuncType : sal_Int32; enum class MenuItemBits : sal_Int16; enum class MapUnit; @@ -81,7 +80,6 @@ class RscTypCont void Init(); // initializes classes and tables void SETCONST( RscConst *, const char *, sal_uInt32 ); void SETCONST( RscConst *, Atom, sal_uInt32 ); - inline void SETCONST( RscConst *p1, const char * p2, KeyFuncType p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } inline void SETCONST( RscConst *p1, Atom p2, MenuItemBits p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } RscEnum * InitFieldUnitsType(); RscTupel * InitStringLongTupel(); diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx index a63e04878583..3929b180de57 100644 --- a/sc/source/filter/inc/worksheethelper.hxx +++ b/sc/source/filter/inc/worksheethelper.hxx @@ -203,8 +203,6 @@ public: /** Returns the absolute cell position in 1/100 mm. */ css::awt::Point getCellPosition( sal_Int32 nCol, sal_Int32 nRow ) const; - /** Returns the cell size in 1/100 mm. */ - css::awt::Size getCellSize( sal_Int32 nCol, sal_Int32 nRow ) const; /** Returns the size of the entire drawing page in 1/100 mm. */ css::awt::Size getDrawPageSize() const; diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 728a45a9d7c9..14a021af27dd 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -236,8 +236,6 @@ public: /** Returns the absolute position of the top-left corner of the cell in 1/100 mm. */ awt::Point getCellPosition( sal_Int32 nCol, sal_Int32 nRow ) const; - /** Returns the size of the cell in 1/100 mm. */ - awt::Size getCellSize( sal_Int32 nCol, sal_Int32 nRow ) const; /** Returns the address of the cell that contains the passed point in 1/100 mm. */ ScAddress getCellAddressFromPosition( const awt::Point& rPosition ) const; @@ -545,14 +543,6 @@ awt::Point WorksheetGlobals::getCellPosition( sal_Int32 nCol, sal_Int32 nRow ) c return aPoint; } -awt::Size WorksheetGlobals::getCellSize( sal_Int32 nCol, sal_Int32 nRow ) const -{ - awt::Size aSize; - PropertySet aCellProp( getCell( ScAddress( nCol, nRow, getSheetIndex() ) ) ); - aCellProp.getProperty( aSize, PROP_Size ); - return aSize; -} - namespace { inline sal_Int32 lclGetMidAddr( sal_Int32 nBegAddr, sal_Int32 nEndAddr, sal_Int32 nBegPos, sal_Int32 nEndPos, sal_Int32 nSearchPos ) @@ -1402,11 +1392,6 @@ awt::Point WorksheetHelper::getCellPosition( sal_Int32 nCol, sal_Int32 nRow ) co return mrSheetGlob.getCellPosition( nCol, nRow ); } -awt::Size WorksheetHelper::getCellSize( sal_Int32 nCol, sal_Int32 nRow ) const -{ - return mrSheetGlob.getCellSize( nCol, nRow ); -} - awt::Size WorksheetHelper::getDrawPageSize() const { return mrSheetGlob.getDrawPageSize(); diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx index 0a6537425867..98049b998bcf 100644 --- a/sc/source/ui/inc/dbfunc.hxx +++ b/sc/source/ui/inc/dbfunc.hxx @@ -85,7 +85,6 @@ public: void UngroupDataPilot(); void DataPilotInput( const ScAddress& rPos, const OUString& rString ); - void DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16* pUserListId = nullptr ); void DataPilotSort(ScDPObject* pDPObject, long nDimIndex, bool bAscending, sal_uInt16* pUserListId = nullptr); bool DataPilotMove( const ScRange& rSource, const ScAddress& rDest ); diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index d8217c5400f9..93f50dc83516 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -223,14 +223,10 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou void UpdateDragRect( bool bShowRange, const Rectangle& rPosRect ); bool IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab ); - void ExecFilter( sal_uLong nSel, SCCOL nCol, SCROW nRow, - const OUString& aValue ); void FilterSelect( sal_uLong nSel ); void ExecDataSelect( SCCOL nCol, SCROW nRow, const OUString& rStr ); - void ExecPageFieldSelect( SCCOL nCol, SCROW nRow, bool bHasSelection, const OUString& rStr ); - bool HasScenarioButton( const Point& rPosPixel, ScRange& rScenRange ); bool DropScroll( const Point& rMousePos ); diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx index d7915538815a..a5eaad917660 100644 --- a/sc/source/ui/inc/output.hxx +++ b/sc/source/ui/inc/output.hxx @@ -283,7 +283,6 @@ public: void SetEditCell( SCCOL nCol, SCROW nRow ); void SetSyntaxMode( bool bNewMode ); void SetMetaFileMode( bool bNewMode ); - void SetSingleGrid( bool bNewMode ); void SetGridColor( const Color& rColor ); void SetMarkClipped( bool bSet ); void SetShowNullValues ( bool bSet ); @@ -321,7 +320,6 @@ public: void PrintDrawingLayer(const sal_uInt16 nLayer, const Point& rMMOffset); // only screen: - void DrawingSingle(const sal_uInt16 nLayer); void DrawSelectiveObjects(const sal_uInt16 nLayer); bool SetChangedClip(); // sal_False = not diff --git a/sc/source/ui/inc/undodraw.hxx b/sc/source/ui/inc/undodraw.hxx index b2ef04cdbc30..763fa4f57d4a 100644 --- a/sc/source/ui/inc/undodraw.hxx +++ b/sc/source/ui/inc/undodraw.hxx @@ -36,7 +36,6 @@ public: ScUndoDraw( SfxUndoAction* pUndo, ScDocShell* pDocSh ); virtual ~ScUndoDraw() override; - SfxUndoAction* GetDrawUndo() { return pDrawUndo.get(); } SfxUndoAction* ReleaseDrawUndo() { return pDrawUndo.release(); } virtual void Undo() override; diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index ff4d34fd7543..a0a20ae9b3ef 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -1744,22 +1744,6 @@ void ScDBFunc::DataPilotSort(ScDPObject* pDPObj, long nDimIndex, bool bAscending aFunc.DataPilotUpdate(pDPObj, pNewObj.get(), true, false); } -void ScDBFunc::DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16* pUserListId ) -{ - ScDocument* pDoc = GetViewData().GetDocument(); - ScDPObject* pDPObj = pDoc->GetDPAtCursor(rPos.Col(), rPos.Row(), rPos.Tab()); - if (!pDPObj) - return; - - sal_uInt16 nOrientation; - long nDimIndex = pDPObj->GetHeaderDim(rPos, nOrientation); - if (nDimIndex < 0) - // Invalid dimension index. Bail out. - return; - - DataPilotSort(pDPObj, nDimIndex, bAscending, pUserListId); -} - bool ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest ) { bool bRet = false; diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 2f344b0f0bc9..54ad1b0b9a1c 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -147,12 +147,6 @@ using namespace css; using namespace css::uno; -#define SC_AUTOFILTER_ALL 0 -#define SC_AUTOFILTER_TOP10 1 -#define SC_AUTOFILTER_CUSTOM 2 -#define SC_AUTOFILTER_EMPTY 3 -#define SC_AUTOFILTER_NOTEMPTY 4 - enum class ScFilterBoxMode { DataSelect, @@ -554,46 +548,6 @@ IMPL_LINK( ScGridWindow, PopupSpellingHdl, SpellCallbackInfo&, rInfo, void ) pViewData->GetDispatcher().Execute( SID_AUTO_CORRECT_DLG, SfxCallMode::ASYNCHRON ); } -void ScGridWindow::ExecPageFieldSelect( SCCOL nCol, SCROW nRow, bool bHasSelection, const OUString& rStr ) -{ - //! gridwin2 ? - - ScDocument* pDoc = pViewData->GetDocument(); - SCTAB nTab = pViewData->GetTabNo(); - ScDPObject* pDPObj = pDoc->GetDPAtCursor(nCol, nRow, nTab); - if ( pDPObj && nCol > 0 ) - { - // look for the dimension header left of the drop-down arrow - sal_uInt16 nOrient = sheet::DataPilotFieldOrientation_HIDDEN; - long nField = pDPObj->GetHeaderDim( ScAddress( nCol-1, nRow, nTab ), nOrient ); - if ( nField >= 0 && nOrient == sheet::DataPilotFieldOrientation_PAGE ) - { - ScDPSaveData aSaveData( *pDPObj->GetSaveData() ); - - bool bIsDataLayout; - OUString aDimName = pDPObj->GetDimName( nField, bIsDataLayout ); - if ( !bIsDataLayout ) - { - ScDPSaveDimension* pDim = aSaveData.GetDimensionByName(aDimName); - - if ( bHasSelection ) - { - const OUString aName = rStr; - pDim->SetCurrentPage( &aName ); - } - else - pDim->SetCurrentPage( nullptr ); - - ScDPObject aNewObj( *pDPObj ); - aNewObj.SetSaveData( aSaveData ); - ScDBDocFunc aFunc( *pViewData->GetDocShell() ); - aFunc.DataPilotUpdate( pDPObj, &aNewObj, true, false ); - pViewData->GetView()->CursorPosChanged(); // shells may be switched - } - } - } -} - namespace { struct AutoFilterData : public ScCheckListMenuWindow::ExtendedData @@ -1250,130 +1204,6 @@ void ScGridWindow::ExecDataSelect( SCCOL nCol, SCROW nRow, const OUString& rStr } } -void ScGridWindow::ExecFilter( sal_uLong nSel, - SCCOL nCol, SCROW nRow, - const OUString& aValue ) -{ - SCTAB nTab = pViewData->GetTabNo(); - ScDocument* pDoc = pViewData->GetDocument(); - svl::SharedStringPool& rPool = pDoc->GetSharedStringPool(); - - ScDBData* pDBData = pDoc->GetDBAtCursor( nCol, nRow, nTab, ScDBDataPortion::AREA ); - if (pDBData) - { - ScQueryParam aParam; - pDBData->GetQueryParam( aParam ); // Can only return MAXQUERY entries - - if (SC_AUTOFILTER_CUSTOM == nSel) - { - SCTAB nAreaTab; - SCCOL nStartCol; - SCROW nStartRow; - SCCOL nEndCol; - SCROW nEndRow; - pDBData->GetArea( nAreaTab, nStartCol,nStartRow,nEndCol,nEndRow ); - pViewData->GetView()->MarkRange( ScRange( nStartCol,nStartRow,nAreaTab,nEndCol,nEndRow,nAreaTab)); - pViewData->GetView()->SetCursor(nCol,nRow); //! Also through Slot ?? - pViewData->GetDispatcher().Execute( SID_FILTER, SfxCallMode::SLOT | SfxCallMode::RECORD ); - } - else - { - bool bDeleteOld = false; - SCSIZE nQueryPos = 0; - bool bFound = false; - if (!aParam.bInplace) - bDeleteOld = true; - if (aParam.eSearchType != utl::SearchParam::SearchType::Normal) - bDeleteOld = true; - SCSIZE nCount = aParam.GetEntryCount(); - for (SCSIZE i = 0; i < nCount && !bDeleteOld; ++i) // current filter settings - if (aParam.GetEntry(i).bDoQuery) - { - //! Summaries DrawButtons query! - - ScQueryEntry& rEntry = aParam.GetEntry(i); - if (i>0) - if (rEntry.eConnect != SC_AND) - bDeleteOld = true; - - if (rEntry.nField == nCol) - { - if (bFound) // this column twice? - bDeleteOld = true; - nQueryPos = i; - bFound = true; - } - if (!bFound) - nQueryPos = i + 1; - } - - if (bDeleteOld) - { - SCSIZE nEC = aParam.GetEntryCount(); - for (SCSIZE i=0; i<nEC; i++) - aParam.GetEntry(i).Clear(); - nQueryPos = 0; - aParam.bInplace = true; - aParam.eSearchType = utl::SearchParam::SearchType::Normal; - } - - if ( nQueryPos < nCount || SC_AUTOFILTER_ALL == nSel ) // delete is always possible - { - if (nSel) - { - ScQueryEntry& rNewEntry = aParam.GetEntry(nQueryPos); - ScQueryEntry::Item& rItem = rNewEntry.GetQueryItem(); - rNewEntry.bDoQuery = true; - rNewEntry.nField = nCol; - rItem.meType = ScQueryEntry::ByString; - - if ( nSel == SC_AUTOFILTER_TOP10 ) - { - rNewEntry.eOp = SC_TOPVAL; - rItem.maString = rPool.intern("10"); - } - else if (nSel == SC_AUTOFILTER_EMPTY) - { - rNewEntry.SetQueryByEmpty(); - } - else if (nSel == SC_AUTOFILTER_NOTEMPTY) - { - rNewEntry.SetQueryByNonEmpty(); - } - else - { - rNewEntry.eOp = SC_EQUAL; - rItem.maString = rPool.intern(aValue); - } - if (nQueryPos > 0) - rNewEntry.eConnect = SC_AND; - } - else - { - if (bFound) - aParam.RemoveEntryByField(nCol); - } - - // end edit mode - like in ScCellShell::ExecuteDB - if ( pViewData->HasEditView( pViewData->GetActivePart() ) ) - { - SC_MOD()->InputEnterHandler(); - pViewData->GetViewShell()->UpdateInputHandler(); - } - - pViewData->GetView()->Query( aParam, nullptr, true ); - pDBData->SetQueryParam( aParam ); // save - } - else // "Too many conditions" - pViewData->GetView()->ErrorMessage( STR_FILTER_TOOMANY ); - } - } - else - { - OSL_FAIL("Where is the database range?"); - } -} - void ScGridWindow::MoveMouseStatus( ScGridWindow& rDestWin ) { if (nButtonDown) diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index 519bdbdb9c21..6368dfea5478 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -290,11 +290,6 @@ void ScOutputData::SetMetaFileMode( bool bNewMode ) bMetaFile = bNewMode; } -void ScOutputData::SetSingleGrid( bool bNewMode ) -{ - bSingleGrid = bNewMode; -} - void ScOutputData::SetSyntaxMode( bool bNewMode ) { mbSyntaxMode = bNewMode; diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx index 56a360e3e8b2..beb7e5fa532b 100644 --- a/sc/source/ui/view/output3.cxx +++ b/sc/source/ui/view/output3.cxx @@ -211,32 +211,4 @@ void ScOutputData::DrawSelectiveObjects(const sal_uInt16 nLayer) mpDev->SetDrawMode(nOldDrawMode); } -// parts only for the screen - -void ScOutputData::DrawingSingle(const sal_uInt16 nLayer) -{ - bool bHad = false; - SCSIZE nArrY; - for (nArrY=1; nArrY+1<nArrCount; nArrY++) - { - RowInfo* pThisRowInfo = &pRowInfo[nArrY]; - - if ( pThisRowInfo->bChanged ) - { - if (!bHad) - { - bHad = true; - } - } - else if (bHad) - { - DrawSelectiveObjects( nLayer ); - bHad = false; - } - } - - if (bHad) - DrawSelectiveObjects( nLayer ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index bdf391fe9436..23b1ec9532de 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -115,11 +115,6 @@ public: Rectangle aRect = m_pObject->GetLogicRect(); m_pViewShell->DoDPFieldPopup(aRect.TopLeft(), aRect.GetSize()); } - - virtual void SAL_CALL disposing() - { - m_pViewShell = nullptr; - } }; void ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb ) diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index 6b5c15655434..dd1ed957a895 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -194,8 +194,7 @@ public: void CreateTitleAndLayout(bool bInit=false, bool bCreate=false); SdrObject* InsertAutoLayoutShape(SdrObject* pObj, PresObjKind eObjKind, bool bVertical, const Rectangle& rRect, bool bInit); - virtual void NbcInsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE, - const SdrInsertReason* pReason=nullptr) override; + virtual void NbcInsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE) override; virtual SdrObject* NbcRemoveObject(size_t nObjNum) override; virtual SdrObject* RemoveObject(size_t nObjNum) override; diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 15e35df6f3ec..70326eaae0f1 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -1645,9 +1645,9 @@ void SdPage::SetAutoLayout(AutoLayout eLayout, bool bInit, bool bCreate ) |* \************************************************************************/ -void SdPage::NbcInsertObject(SdrObject* pObj, size_t nPos, const SdrInsertReason* pReason) +void SdPage::NbcInsertObject(SdrObject* pObj, size_t nPos) { - FmFormPage::NbcInsertObject(pObj, nPos, pReason); + FmFormPage::NbcInsertObject(pObj, nPos); static_cast<SdDrawDocument*>(pModel)->InsertObject(pObj, this); diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index ed064ad780a6..35bbc1c2f8c7 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -122,7 +122,6 @@ public: SplitWindow::dispose(); } - virtual void AutoHide() override; virtual void FadeIn() override; void Actualize(); }; @@ -145,14 +144,6 @@ void SfxEmptySplitWin_Impl::Actualize() SetSizePixel( aSize ); } -void SfxEmptySplitWin_Impl::AutoHide() -{ - pOwner->SetPinned_Impl( !pOwner->bPinned ); - pOwner->SaveConfig_Impl(); - bAutoHide = true; - FadeIn(); -} - void SfxEmptySplitWin_Impl::FadeIn() { if (!bAutoHide ) @@ -1145,28 +1136,6 @@ void SfxSplitWindow::SetFadeIn_Impl( bool bOn ) } } -void SfxSplitWindow::AutoHide() -{ - // If this handler is called in the "real" SplitWindow, it is - // either docked and should be displayed as floating, or vice versa - if ( !bPinned ) - { - // It "floats", thus dock it again - SetPinned_Impl( true ); - pWorkWin->ArrangeChildren_Impl(); - } - else - { - // In "limbo" - SetPinned_Impl( false ); - pWorkWin->ArrangeChildren_Impl(); - pWorkWin->ArrangeAutoHideWindows( this ); - } - - pWorkWin->ShowChildren_Impl(); - SaveConfig_Impl(); -} - void SfxSplitWindow::FadeOut_Impl() { if ( pEmptyWin->aTimer.IsActive() ) diff --git a/sfx2/source/inc/splitwin.hxx b/sfx2/source/inc/splitwin.hxx index d6eb7ae7df3e..59e3b252383a 100644 --- a/sfx2/source/inc/splitwin.hxx +++ b/sfx2/source/inc/splitwin.hxx @@ -120,7 +120,6 @@ public: bool IsAutoHide( bool bSelf ) const; SplitWindow* GetSplitWindow(); - virtual void AutoHide() override; virtual void FadeOut() override; virtual void FadeIn() override; void SetActiveWindow_Impl( SfxDockingWindow* pWin ); diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index 59316b045d51..f787bda7fd46 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -441,7 +441,6 @@ public: bool bInScrollBarEvent=false ); - void AdjustEntryAtGrid(); #ifdef DBG_UTIL void SetEntryTextMode( SvxIconChoiceCtrlTextMode, diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index eae629111bb4..e5301fd1d0e4 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -2691,25 +2691,6 @@ IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, EditTimeoutHdl, Timer *, void) } } - -// Function to align entries to the grid - - -// pStart == 0: align all entries -// else: align all entries of the row from pStart on (including pStart) -void SvxIconChoiceCtrl_Impl::AdjustEntryAtGrid() -{ - IconChoiceMap aLists; - pImpCursor->CreateGridAjustData( aLists ); - for (IconChoiceMap::const_iterator iter = aLists.begin(); - iter != aLists.end(); ++iter) - { - AdjustAtGrid(iter->second); - } - IcnCursor_Impl::DestroyGridAdjustData( aLists ); - CheckScrollBars(); -} - // align a row, might expand width, doesn't break the line void SvxIconChoiceCtrl_Impl::AdjustAtGrid( const SvxIconChoiceCtrlEntryPtrVec& rRow ) { diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index 877575cd6758..da26db574f64 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -105,7 +105,7 @@ E3dObjList::~E3dObjList() { } -void E3dObjList::NbcInsertObject(SdrObject* pObj, size_t nPos, const SdrInsertReason* pReason) +void E3dObjList::NbcInsertObject(SdrObject* pObj, size_t nPos) { // Get owner DBG_ASSERT(dynamic_cast<const E3dObject*>(GetOwnerObj()), "Insert 3D object in parent != 3DObject"); @@ -115,7 +115,7 @@ void E3dObjList::NbcInsertObject(SdrObject* pObj, size_t nPos, const SdrInsertRe { // Normal 3D object, insert means // call parent - SdrObjList::NbcInsertObject(pObj, nPos, pReason); + SdrObjList::NbcInsertObject(pObj, nPos); } else { @@ -124,12 +124,12 @@ void E3dObjList::NbcInsertObject(SdrObject* pObj, size_t nPos, const SdrInsertRe } } -void E3dObjList::InsertObject(SdrObject* pObj, size_t nPos, const SdrInsertReason* pReason) +void E3dObjList::InsertObject(SdrObject* pObj, size_t nPos) { OSL_ENSURE(dynamic_cast<const E3dObject*>(GetOwnerObj()), "Insert 3D object in non-3D Parent"); // call parent - SdrObjList::InsertObject(pObj, nPos, pReason); + SdrObjList::InsertObject(pObj, nPos); E3dScene* pScene = static_cast<E3dObject*>(GetOwnerObj())->GetScene(); if(pScene) diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx index dc35dad611d4..ed0da03cfac7 100644 --- a/svx/source/form/fmpage.cxx +++ b/svx/source/form/fmpage.cxx @@ -129,10 +129,9 @@ SdrPage* FmFormPage::Clone(SdrModel* const pNewModel) const } -void FmFormPage::InsertObject(SdrObject* pObj, size_t nPos, - const SdrInsertReason* pReason) +void FmFormPage::InsertObject(SdrObject* pObj, size_t nPos) { - SdrPage::InsertObject( pObj, nPos, pReason ); + SdrPage::InsertObject( pObj, nPos ); if (GetModel()) static_cast<FmFormModel*>(GetModel())->GetUndoEnv().Inserted(pObj); } diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx index 52d98a312d74..a31d6e33e785 100644 --- a/svx/source/items/postattr.cxx +++ b/svx/source/items/postattr.cxx @@ -151,11 +151,6 @@ SvxPostItIdItem::SvxPostItIdItem( sal_uInt16 _nWhich ) SetWhich( _nWhich ); } -SvxPostItIdItem::SvxPostItIdItem( const OUString& rId, sal_uInt16 _nWhich ) : - SfxStringItem( _nWhich, rId ) -{ -} - SfxPoolItem* SvxPostItIdItem::Clone( SfxItemPool * ) const { return new SvxPostItIdItem( *this ); diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index 74de5e46e874..97bd8a7b9287 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -676,8 +676,7 @@ void SdrEditView::ForceMarkedObjToAnotherPage() if(bFnd) { pM->GetPageView()->GetObjList()->RemoveObject(pObj->GetOrdNum()); - SdrInsertReason aReason(SdrInsertReasonKind::ViewCall); - pPV->GetObjList()->InsertObject(pObj, SAL_MAX_SIZE, &aReason); + pPV->GetObjList()->InsertObject(pObj, SAL_MAX_SIZE); pM->SetPageView(pPV); InvalidateAllWin(aObjRect); bFlg=true; @@ -906,8 +905,7 @@ void SdrEditView::CopyMarkedObj() SdrMark* pM=aSourceObjectsForCopy.GetMark(nm); SdrObject* pO=pM->GetMarkedSdrObj()->Clone(); if (pO!=nullptr) { - SdrInsertReason aReason(SdrInsertReasonKind::ViewCall); - pM->GetPageView()->GetObjList()->InsertObject(pO, SAL_MAX_SIZE, &aReason); + pM->GetPageView()->GetObjList()->InsertObject(pO, SAL_MAX_SIZE); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoCopyObject(*pO)); @@ -969,11 +967,10 @@ bool SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, SdrInser pObj->SetMergedItemSet(maDefaultAttr); } if (!pObj->IsInserted()) { - SdrInsertReason aReason(SdrInsertReasonKind::ViewCall); if (nOptions & SdrInsertFlags::NOBROADCAST) { - rPV.GetObjList()->NbcInsertObject(pObj, SAL_MAX_SIZE, &aReason); + rPV.GetObjList()->NbcInsertObject(pObj, SAL_MAX_SIZE); } else { - rPV.GetObjList()->InsertObject(pObj, SAL_MAX_SIZE, &aReason); + rPV.GetObjList()->InsertObject(pObj, SAL_MAX_SIZE); } } if( IsUndoEnabled() ) diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 9ed2ef55029f..cfd03d34b76a 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -1129,8 +1129,7 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode) { SdrPathObj* pPath = new SdrPathObj(OBJ_PATHFILL, aMergePolyPolygonA); ImpCopyAttributes(pAttrObj, pPath); - SdrInsertReason aReason(SdrInsertReasonKind::ViewCall); - pInsOL->InsertObject(pPath, nInsPos, &aReason); + pInsOL->InsertObject(pPath, nInsPos); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath)); @@ -1375,8 +1374,7 @@ void SdrEditView::CombineMarkedObjects(bool bNoPolyPoly) pPath->SetMergedItem(XLineStyleItem(drawing::LineStyle_SOLID)); } - SdrInsertReason aReason(SdrInsertReasonKind::ViewCall); - pInsOL->InsertObject(pPath,nInsPos,&aReason); + pInsOL->InsertObject(pPath,nInsPos); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath)); @@ -1529,8 +1527,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, SdrPathObj* pPath = new SdrPathObj((SdrObjKind)pSrcPath->GetObjIdentifier(), basegfx::B2DPolyPolygon(rCandidate)); ImpCopyAttributes(pSrcPath, pPath); pLast = pPath; - SdrInsertReason aReason(SdrInsertReasonKind::ViewCall); - rOL.InsertObject(pPath, rPos, &aReason); + rOL.InsertObject(pPath, rPos); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, true)); MarkObj(pPath, pPV, false, true); @@ -1564,8 +1561,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, SdrPathObj* pPath = new SdrPathObj(eKind, basegfx::B2DPolyPolygon(aNewPolygon)); ImpCopyAttributes(pSrcPath, pPath); pLast = pPath; - SdrInsertReason aReason(SdrInsertReasonKind::ViewCall); - rOL.InsertObject(pPath, rPos, &aReason); + rOL.InsertObject(pPath, rPos); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, true)); MarkObj(pPath, pPV, false, true); @@ -1600,8 +1596,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, } } - SdrInsertReason aReason(SdrInsertReasonKind::ViewCall); - rOL.InsertObject(pCandidate, rPos, &aReason); + rOL.InsertObject(pCandidate, rPos); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pCandidate, true)); MarkObj(pCandidate, pPV, false, true); @@ -1646,7 +1641,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, pTextObj->SetMergedItemSet(aTargetItemSet); // insert object - rOL.InsertObject(pTextObj, rPos + 1, &aReason); + rOL.InsertObject(pTextObj, rPos + 1); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pTextObj, true)); MarkObj(pTextObj, pPV, false, true); @@ -1785,8 +1780,7 @@ void SdrEditView::GroupMarked() pSrcLst->RemoveObject(pObj->GetOrdNumDirect()); if (!bForeignList) nInsPos--; // correct InsertPos - SdrInsertReason aReason(SdrInsertReasonKind::ViewCall); - pDstLst->InsertObject(pObj,0,&aReason); + pDstLst->InsertObject(pObj,0); GetMarkedObjectListWriteAccess().DeleteMark(nm); pSrcLst0=pSrcLst; } @@ -1795,8 +1789,7 @@ void SdrEditView::GroupMarked() { aNewMark.InsertEntry(SdrMark(pGrp,pPV)); const size_t nCount=pDstLst->GetObjCount(); - SdrInsertReason aReason(SdrInsertReasonKind::ViewCall); - pAktLst->InsertObject(pGrp,nInsPos,&aReason); + pAktLst->InsertObject(pGrp,nInsPos); if( bUndo ) { AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pGrp,true)); // no recalculation! @@ -1871,8 +1864,7 @@ void SdrEditView::UnGroupMarked() for (size_t no=0; no<nObjCount; ++no) { SdrObject* pObj=pSrcLst->RemoveObject(0); - SdrInsertReason aReason(SdrInsertReasonKind::ViewCall); - pDstLst->InsertObject(pObj,nDstCnt,&aReason); + pDstLst->InsertObject(pObj,nDstCnt); if( bUndo ) AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoInsertObject(*pObj,true)); nDstCnt++; diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 52a11eceb751..ac7253de8196 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -293,11 +293,9 @@ size_t ImpSdrGDIMetaFileImport::DoImport( // insert all objects cached in aTmpList now into rOL from nInsPos nInsPos = std::min(nInsPos, rOL.GetObjCount()); - SdrInsertReason aReason(SdrInsertReasonKind::ViewCall); - for(SdrObject* pObj : maTmpList) { - rOL.NbcInsertObject(pObj, nInsPos, &aReason); + rOL.NbcInsertObject(pObj, nInsPos); nInsPos++; if(pProgrInfo) diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 4277668effe4..3e48ddc21cac 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -135,7 +135,6 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList) bRectsDirty =false; size_t nCloneErrCnt = 0; const size_t nCount = rSrcList.GetObjCount(); - SdrInsertReason aReason(SdrInsertReasonKind::Copy); for (size_t no=0; no<nCount; ++no) { SdrObject* pSO=rSrcList.GetObj(no); @@ -144,7 +143,7 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList) if (pDO!=nullptr) { pDO->SetModel(pModel); pDO->SetPage(pPage); - NbcInsertObject(pDO, SAL_MAX_SIZE, &aReason); + NbcInsertObject(pDO, SAL_MAX_SIZE); } else { nCloneErrCnt++; } @@ -326,7 +325,7 @@ void SdrObjList::impChildInserted(SdrObject& rChild) } } -void SdrObjList::NbcInsertObject(SdrObject* pObj, size_t nPos, const SdrInsertReason* /*pReason*/) +void SdrObjList::NbcInsertObject(SdrObject* pObj, size_t nPos) { DBG_ASSERT(pObj!=nullptr,"SdrObjList::NbcInsertObject(NULL)"); if (pObj!=nullptr) { @@ -352,7 +351,7 @@ void SdrObjList::NbcInsertObject(SdrObject* pObj, size_t nPos, const SdrInsertRe } } -void SdrObjList::InsertObject(SdrObject* pObj, size_t nPos, const SdrInsertReason* pReason) +void SdrObjList::InsertObject(SdrObject* pObj, size_t nPos) { DBG_ASSERT(pObj!=nullptr,"SdrObjList::InsertObject(NULL)"); @@ -367,7 +366,7 @@ void SdrObjList::InsertObject(SdrObject* pObj, size_t nPos, const SdrInsertReaso } // do insert to new group - NbcInsertObject(pObj, nPos, pReason); + NbcInsertObject(pObj, nPos); // In case the object is inserted into a group and doesn't overlap with // the group's other members, it needs an own repaint. @@ -734,8 +733,7 @@ void SdrObjList::UnGroupObj( size_t nObjNum ) for( size_t i=0; i<nCount; ++i ) { SdrObject* pObj = pSrcLst->RemoveObject(0); - SdrInsertReason aReason(SdrInsertReasonKind::ViewCall); - InsertObject(pObj, nInsertPos, &aReason); + InsertObject(pObj, nInsertPos); ++nInsertPos; } diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx index b8b0356ad5cd..77185149eafb 100644 --- a/svx/source/svdraw/svdpoev.cxx +++ b/svx/source/svdraw/svdpoev.cxx @@ -370,8 +370,7 @@ void SdrPolyEditView::RipUpAtMarkedPoints() if(pNeuObj) { - SdrInsertReason aReason(SdrInsertReasonKind::ViewCall); - pM->GetPageView()->GetObjList()->InsertObject(pNeuObj, pObj->GetOrdNum() + 1, &aReason); + pM->GetPageView()->GetObjList()->InsertObject(pNeuObj, pObj->GetOrdNum() + 1); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pNeuObj)); MarkObj(pNeuObj, pM->GetPageView(), false, true); diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 530602459d68..a1c836fbb4d5 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -742,8 +742,7 @@ void SdrUndoRemoveObj::Undo() } E3DModifySceneSnapRectUpdater aUpdater(pObjList->GetOwnerObj()); - SdrInsertReason aReason(SdrInsertReasonKind::Undo); - pObjList->InsertObject(pObj,nOrdNum,&aReason); + pObjList->InsertObject(pObj,nOrdNum); // #i11426# if(aOwnerAnchorPos.X() || aOwnerAnchorPos.Y()) @@ -801,8 +800,7 @@ void SdrUndoInsertObj::Redo() aAnchorPos = pObj->GetAnchorPos(); } - SdrInsertReason aReason(SdrInsertReasonKind::Undo); - pObjList->InsertObject(pObj,nOrdNum,&aReason); + pObjList->InsertObject(pObj,nOrdNum); // Arcs lose position when grouped (#i45952#) if ( aAnchorPos.X() || aAnchorPos.Y() ) diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index 767b384728fb..ba333fdd4395 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -342,8 +342,7 @@ bool SdrExchangeView::Paste( pNeuObj->SetLayer(nLayer); } - SdrInsertReason aReason(SdrInsertReasonKind::ViewCall); - pDstLst->InsertObject(pNeuObj, SAL_MAX_SIZE, &aReason); + pDstLst->InsertObject(pNeuObj, SAL_MAX_SIZE); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pNeuObj)); @@ -420,8 +419,7 @@ void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Po Point aPos(rCenter.X()-xs/2,rCenter.Y()-ys/2); Rectangle aR(aPos.X(),aPos.Y(),aPos.X()+xs,aPos.Y()+ys); pObj->SetLogicRect(aR); - SdrInsertReason aReason(SdrInsertReasonKind::ViewCall); - rLst.InsertObject(pObj, SAL_MAX_SIZE, &aReason); + rLst.InsertObject(pObj, SAL_MAX_SIZE); if( IsUndoEnabled() ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pObj)); @@ -750,8 +748,7 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const pNeuObj->SetModel( pNeuMod ); } - SdrInsertReason aReason(SdrInsertReasonKind::ViewCall); - pNeuPag->InsertObject(pNeuObj, SAL_MAX_SIZE, &aReason); + pNeuPag->InsertObject(pNeuObj, SAL_MAX_SIZE); // #i13033# aCloneList.AddPair(pObj, pNeuObj); diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 4268e8f98593..f7d8d7da1fc4 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -2564,8 +2564,7 @@ bool SvxTableController::GetMarkedObjModel( SdrPage* pNewPage ) pNewTableObj->SetPage( pNewPage ); pNewTableObj->SetModel( pNewPage->GetModel() ); - SdrInsertReason aReason(SdrInsertReasonKind::ViewCall); - pNewPage->InsertObject(pNewTableObj, SAL_MAX_SIZE, &aReason); + pNewPage->InsertObject(pNewTableObj, SAL_MAX_SIZE); return true; } diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx index b0f068370d27..b66f21691933 100644 --- a/tools/source/generic/poly.cxx +++ b/tools/source/generic/poly.cxx @@ -1464,11 +1464,6 @@ bool Polygon::IsInside( const Point& rPoint ) const return ( ( nPCounter & 1 ) == 1 ); } -bool Polygon::IsRightOrientated() const -{ - return GetSignedArea() >= 0.0; -} - void Polygon::Insert( sal_uInt16 nPos, const Point& rPt ) { ImplMakeUnique(); diff --git a/tools/source/rc/rc.cxx b/tools/source/rc/rc.cxx index 262f07a6a5e3..2f0ea96a9986 100644 --- a/tools/source/rc/rc.cxx +++ b/tools/source/rc/rc.cxx @@ -24,12 +24,6 @@ #include <tools/rc.hxx> #include <tools/rcid.h> -Resource::Resource( const ResId& rResId ) - : m_pResMgr(nullptr) -{ - GetRes( rResId.SetRT( RSC_RESOURCE ) ); -} - void Resource::GetRes( const ResId& rResId ) { if( rResId.GetResMgr() ) diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index 16a83f856815..b893a0f6399b 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -196,10 +196,6 @@ protected: SalLayout(); virtual ~SalLayout(); - // used by layout layers - void SetOrientation( int nOrientation ) // in 0-3600 system - { mnOrientation = nOrientation; } - static int CalcAsianKerning( sal_UCS4, bool bLeft, bool bVertical ); private: diff --git a/vcl/inc/unx/fc_fontoptions.hxx b/vcl/inc/unx/fc_fontoptions.hxx index 06403e3b20a9..019482322fcb 100644 --- a/vcl/inc/unx/fc_fontoptions.hxx +++ b/vcl/inc/unx/fc_fontoptions.hxx @@ -46,7 +46,6 @@ public: mpPattern(pPattern) {} ~FontConfigFontOptions(); - FontHintStyle GetHintStyle() const { return meHintStyle; } void SyncPattern(const OString& rFileName, int nFontFace, bool bEmbolden); FcPattern* GetPattern() const; static void cairo_font_options_substitute(FcPattern* pPattern); diff --git a/vcl/source/fontsubset/ttcr.cxx b/vcl/source/fontsubset/ttcr.cxx index ff7169cfed29..ac335512a6bc 100644 --- a/vcl/source/fontsubset/ttcr.cxx +++ b/vcl/source/fontsubset/ttcr.cxx @@ -1234,18 +1234,6 @@ sal_uInt32 glyfCount(const TrueTypeTable *table) return listCount(static_cast<list>(table->data)); } -void nameAdd(TrueTypeTable *table, NameRecord *nr) -{ - list l; - - assert(table != nullptr); - assert(table->tag == T_name); - - l = static_cast<list>(table->data); - - listAppend(l, NameRecordNewCopy(nr)); -} - static TrueTypeTable *FindTable(TrueTypeCreator *tt, sal_uInt32 tag) { if (listIsEmpty(tt->tables)) return nullptr; diff --git a/vcl/source/fontsubset/ttcr.hxx b/vcl/source/fontsubset/ttcr.hxx index 3f9963dde805..10ce873fbc90 100644 --- a/vcl/source/fontsubset/ttcr.hxx +++ b/vcl/source/fontsubset/ttcr.hxx @@ -204,13 +204,6 @@ namespace vcl */ sal_uInt32 glyfCount(const TrueTypeTable *); -/** - * Add a Name Record to a name table. - * NOTE: This function duplicates NameRecord, so the argument - * has to be deallocated by the caller (unlike glyfAdd) - */ - void nameAdd(TrueTypeTable *, NameRecord *nr); - } // namespace extern "C" diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index 7d42865214b0..adcdba447f68 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -215,35 +215,6 @@ const long FloydIndexMap[6] = -30, 21, 72, 123, 174, 225 }; -void ImplCreateDitherMatrix( sal_uInt8 (*pDitherMatrix)[16][16] ) -{ - const double fVal = 3.125; - const double fVal16 = fVal / 16.; - const double fValScale = 254.; - sal_uInt16 pMtx[ 16 ][ 16 ]; - sal_uInt16 nMax = 0; - static const sal_uInt8 pMagic[4][4] = { { 0, 14, 3, 13, }, - {11, 5, 8, 6, }, - {12, 2, 15, 1, }, - {7, 9, 4, 10 } }; - - // Build MagicSquare - for ( long i = 0; i < 4; i++ ) - for ( long j = 0; j < 4; j++ ) - for ( long k = 0; k < 4; k++ ) - for ( long l = 0; l < 4; l++ ) - { - pMtx[ (k<<2) + i][(l<<2 ) + j ] = (sal_uInt16) ( 0.5 + pMagic[i][j]*fVal + pMagic[k][l]*fVal16 ); - nMax = std::max ( pMtx[ (k<<2) + i][(l<<2 ) + j], nMax ); - } - - // Scale to interval [0;254] - double tmp = fValScale / nMax; - for ( long i = 0; i < 16; i++ ) - for( long j = 0; j < 16; j++ ) - (*pDitherMatrix)[i][j] = (sal_uInt8) ( tmp * pMtx[i][j] ); -} - bool Bitmap::Convert( BmpConversion eConversion ) { // try to convert in backend @@ -401,81 +372,6 @@ bool Bitmap::ImplMakeMono( sal_uInt8 cThreshold ) return bRet; } -bool Bitmap::ImplMakeMonoDither() -{ - ScopedReadAccess pReadAcc(*this); - bool bRet = false; - - if( pReadAcc ) - { - Bitmap aNewBmp( GetSizePixel(), 1 ); - ScopedWriteAccess pWriteAcc(aNewBmp); - - if( pWriteAcc ) - { - const BitmapColor aBlack( pWriteAcc->GetBestMatchingColor( Color( COL_BLACK ) ) ); - const BitmapColor aWhite( pWriteAcc->GetBestMatchingColor( Color( COL_WHITE ) ) ); - const long nWidth = pWriteAcc->Width(); - const long nHeight = pWriteAcc->Height(); - sal_uInt8 pDitherMatrix[ 16 ][ 16 ]; - - ImplCreateDitherMatrix( &pDitherMatrix ); - - if( pReadAcc->HasPalette() ) - { - for( long nY = 0; nY < nHeight; nY++ ) - { - for( long nX = 0, nModY = nY % 16; nX < nWidth; nX++ ) - { - const sal_uInt8 cIndex = pReadAcc->GetPixelIndex( nY, nX ); - if( pReadAcc->GetPaletteColor( cIndex ).GetLuminance() > - pDitherMatrix[ nModY ][ nX % 16 ] ) - { - pWriteAcc->SetPixel( nY, nX, aWhite ); - } - else - pWriteAcc->SetPixel( nY, nX, aBlack ); - } - } - } - else - { - for( long nY = 0; nY < nHeight; nY++ ) - { - for( long nX = 0, nModY = nY % 16; nX < nWidth; nX++ ) - { - if( pReadAcc->GetPixel( nY, nX ).GetLuminance() > - pDitherMatrix[ nModY ][ nX % 16 ] ) - { - pWriteAcc->SetPixel( nY, nX, aWhite ); - } - else - pWriteAcc->SetPixel( nY, nX, aBlack ); - } - } - } - - pWriteAcc.reset(); - bRet = true; - } - - pReadAcc.reset(); - - if( bRet ) - { - const MapMode aMap( maPrefMapMode ); - const Size aSize( maPrefSize ); - - *this = aNewBmp; - - maPrefMapMode = aMap; - maPrefSize = aSize; - } - } - - return bRet; -} - bool Bitmap::ImplMakeGreyscales( sal_uInt16 nGreys ) { SAL_WARN_IF( nGreys != 16 && nGreys != 256, "vcl", "Only 16 or 256 greyscales are supported!" ); diff --git a/vcl/source/gdi/bmpacc2.cxx b/vcl/source/gdi/bmpacc2.cxx index 8501f00af171..83391d1b4921 100644 --- a/vcl/source/gdi/bmpacc2.cxx +++ b/vcl/source/gdi/bmpacc2.cxx @@ -159,18 +159,6 @@ void BitmapReadAccess::SetPixelForN24BitTcRgb(Scanline pScanline, long nX, const *pScanline = rBitmapColor.GetBlue(); } -BitmapColor BitmapReadAccess::GetPixelForN24BitTcMask(ConstScanline pScanline, long nX, const ColorMask& rMask) -{ - BitmapColor aColor; - rMask.GetColorFor24Bit( aColor, pScanline + nX * 3 ); - return aColor; -} - -void BitmapReadAccess::SetPixelForN24BitTcMask(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask) -{ - rMask.SetColorFor24Bit( rBitmapColor, pScanline + nX * 3 ); -} - BitmapColor BitmapReadAccess::GetPixelForN32BitTcAbgr(ConstScanline pScanline, long nX, const ColorMask&) { BitmapColor aBitmapColor; diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx index cb56a0e0953f..c17c3f65924b 100644 --- a/vcl/source/gdi/pdfwriter.cxx +++ b/vcl/source/gdi/pdfwriter.cxx @@ -393,21 +393,6 @@ sal_Int32 PDFWriter::CreateOutlineItem( sal_Int32 nParent, const OUString& rText return xImplementation->createOutlineItem( nParent, rText, nDestID ); } -void PDFWriter::SetOutlineItemParent( sal_Int32 nItem, sal_Int32 nNewParent ) -{ - xImplementation->setOutlineItemParent( nItem, nNewParent ); -} - -void PDFWriter::SetOutlineItemText( sal_Int32 nItem, const OUString& rText ) -{ - xImplementation->setOutlineItemText( nItem, rText ); -} - -void PDFWriter::SetOutlineItemDest( sal_Int32 nItem, sal_Int32 nDest ) -{ - xImplementation->setOutlineItemDest( nItem, nDest ); -} - void PDFWriter::CreateNote( const Rectangle& rRect, const PDFNote& rNote, sal_Int32 nPageNr ) { xImplementation->createNote( rRect, rNote, nPageNr ); @@ -453,11 +438,6 @@ void PDFWriter::SetAlternateText( const OUString& rText ) xImplementation->setAlternateText( rText ); } -void PDFWriter::SetAutoAdvanceTime( sal_uInt32 nSeconds, sal_Int32 nPageNr ) -{ - xImplementation->setAutoAdvanceTime( nSeconds, nPageNr ); -} - void PDFWriter::SetPageTransition( PDFWriter::PageTransition eType, sal_uInt32 nMilliSec, sal_Int32 nPageNr ) { xImplementation->setPageTransition( eType, nMilliSec, nPageNr ); diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index b53386344832..821ae3b50868 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -2039,10 +2039,6 @@ void SplitWindow::SplitResize() { } -void SplitWindow::AutoHide() -{ -} - void SplitWindow::FadeIn() { } diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index ba1d0f6ad9b9..44c648fa641f 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -941,35 +941,6 @@ void XMLShapeImportHelper::addGluePointMapping( css::uno::Reference< css::drawin mpPageContext->maShapeGluePointsMap[xShape][nSourceId] = nDestinnationId; } -/** find mapping for given DestinationID. This allows to extract the original draw:id imported with a draw:glue-point */ -sal_Int32 XMLShapeImportHelper::findGluePointMapping( - const css::uno::Reference< css::drawing::XShape >& xShape, - sal_Int32 nDestinnationId ) const -{ - if( mpPageContext ) - { - ShapeGluePointsMap::iterator aShapeIter( mpPageContext->maShapeGluePointsMap.find( xShape ) ); - - if( aShapeIter != mpPageContext->maShapeGluePointsMap.end() ) - { - GluePointIdMap::iterator aShapeIdIter = (*aShapeIter).second.begin(); - GluePointIdMap::iterator aShapeIdEnd = (*aShapeIter).second.end(); - - while ( aShapeIdIter != aShapeIdEnd ) - { - if ( (*aShapeIdIter).second == nDestinnationId ) - { - return (*aShapeIdIter).first; - } - - ++aShapeIdIter; - } - } - } - - return -1; -} - /** moves all current DestinationId's by n */ void XMLShapeImportHelper::moveGluePointMapping( const css::uno::Reference< css::drawing::XShape >& xShape, const sal_Int32 n ) { diff --git a/xmlsecurity/Library_xsec_fw.mk b/xmlsecurity/Library_xsec_fw.mk index 201fc71b9a85..b8ebdb2662a1 100644 --- a/xmlsecurity/Library_xsec_fw.mk +++ b/xmlsecurity/Library_xsec_fw.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Library_add_exception_objects,xsec_fw,\ xmlsecurity/source/framework/buffernode \ xmlsecurity/source/framework/elementcollector \ xmlsecurity/source/framework/elementmark \ - xmlsecurity/source/framework/encryptionengine \ xmlsecurity/source/framework/saxeventkeeperimpl \ xmlsecurity/source/framework/securityengine \ xmlsecurity/source/framework/signaturecreatorimpl \ diff --git a/xmlsecurity/source/framework/encryptionengine.cxx b/xmlsecurity/source/framework/encryptionengine.cxx deleted file mode 100644 index 8cf7d295da5c..000000000000 --- a/xmlsecurity/source/framework/encryptionengine.cxx +++ /dev/null @@ -1,159 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include "encryptionengine.hxx" -#include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <rtl/ref.hxx> -#include <xmlencryptiontemplateimpl.hxx> - -using namespace com::sun::star::uno; -namespace cssxc = com::sun::star::xml::crypto; -namespace cssxw = com::sun::star::xml::wrapper; - -EncryptionEngine::EncryptionEngine( const Reference<XComponentContext> & xContext) - :m_xContext(xContext), m_nIdOfBlocker(-1) -{ -} - -bool EncryptionEngine::checkReady() const -/****** EncryptionEngine/checkReady ****************************************** - * - * NAME - * checkReady -- checks the conditions for the main operation. - * - * SYNOPSIS - * bReady = checkReady( ); - * - * FUNCTION - * checks whether all following conditions are satisfied: - * 1. the main operation has't begun yet; - * 2. the key material is known; - * 3. the id of the template blocker is known; - * 4. both the key element and the encryption template - * are bufferred. - * - * RESULT - * bReady - true if all conditions are satisfied, false otherwise - ******************************************************************************/ -{ - bool rc = true; - - sal_Int32 nKeyInc = 0; - if (m_nIdOfKeyEC != 0) - { - nKeyInc = 1; - } - - if (m_bMissionDone || - m_nIdOfKeyEC == -1 || - m_nIdOfBlocker == -1 || - 1+nKeyInc > m_nNumOfResolvedReferences ) - { - rc = false; - } - - return rc; -} - -void EncryptionEngine::tryToPerform( ) -/****** EncryptionEngine/tryToPerform **************************************** - * - * NAME - * tryToPerform -- tries to perform the encryption/decryption operation. - * - * SYNOPSIS - * tryToPerform( ); - * - * FUNCTION - * if the situation is ready, perform following operations. - * 1. prepares a encryption template; - * 2. calls the encryption bridge component; - * 3. clears up all used resources; - * 4. notifies the result listener; - * 5. sets the "accomplishment" flag. - ******************************************************************************/ -{ - if (checkReady()) - { - rtl::Reference<XMLEncryptionTemplateImpl> xEncryptionTemplate = new XMLEncryptionTemplateImpl(); - - Reference< cssxw::XXMLElementWrapper > xXMLElement - = m_xSAXEventKeeper->getElement( m_nIdOfTemplateEC ); - - xEncryptionTemplate->setTemplate(xXMLElement); - - startEngine(Reference<cssxc::XXMLEncryptionTemplate>(xEncryptionTemplate.get())); - - /* - * done - */ - clearUp( ); - - notifyResultListener(); - - m_bMissionDone = true; - } -} - -void EncryptionEngine::clearUp( ) const -/****** EncryptionEngine/clearup ********************************************* - * - * NAME - * clearUp -- clear up all resources used by this operation. - * - * SYNOPSIS - * clearUp( ); - * - * FUNCTION - * cleaning resources up includes: - * 1. releases the ElementCollector for the encryption template element; - * 2. releases the Blocker for the encryption template element; - * 3. releases the ElementCollector for the key element, if there is one. - ******************************************************************************/ -{ - Reference < cssxc::sax::XReferenceResolvedBroadcaster > - xReferenceResolvedBroadcaster( m_xSAXEventKeeper, UNO_QUERY ); - - xReferenceResolvedBroadcaster->removeReferenceResolvedListener( - m_nIdOfTemplateEC, - static_cast<const Reference < cssxc::sax::XReferenceResolvedListener > >(static_cast<SecurityEngine *>(const_cast<EncryptionEngine *>(this)))); - - m_xSAXEventKeeper->removeElementCollector(m_nIdOfTemplateEC); - - if (m_nIdOfBlocker != -1) - { - m_xSAXEventKeeper->removeBlocker(m_nIdOfBlocker); - } - - if (m_nIdOfKeyEC != 0 && m_nIdOfKeyEC != -1) - { - m_xSAXEventKeeper->removeElementCollector(m_nIdOfKeyEC); - } -} - -/* XBlockerMonitor */ -void SAL_CALL EncryptionEngine::setBlockerId( sal_Int32 id ) -{ - m_nIdOfBlocker = id; - tryToPerform(); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/framework/encryptionengine.hxx b/xmlsecurity/source/framework/encryptionengine.hxx deleted file mode 100644 index 33915c5ceb0e..000000000000 --- a/xmlsecurity/source/framework/encryptionengine.hxx +++ /dev/null @@ -1,93 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_XMLSECURITY_SOURCE_FRAMEWORK_ENCRYPTIONENGINE_HXX -#define INCLUDED_XMLSECURITY_SOURCE_FRAMEWORK_ENCRYPTIONENGINE_HXX - -#include <com/sun/star/xml/crypto/sax/XReferenceResolvedListener.hpp> -#include <com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.hpp> -#include <com/sun/star/xml/crypto/sax/XBlockerMonitor.hpp> -#include <com/sun/star/xml/crypto/sax/XKeyCollector.hpp> -#include <com/sun/star/xml/crypto/sax/XMissionTaker.hpp> -#include <com/sun/star/xml/crypto/sax/XSAXEventKeeper.hpp> -#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp> -#include <com/sun/star/xml/crypto/XXMLEncryption.hpp> -#include <cppuhelper/implbase.hxx> - -#include "framework/securityengine.hxx" - -namespace com { namespace sun { namespace star { namespace uno { - class XComponentContext; -} } } } - -class EncryptionEngine : public cppu::ImplInheritanceHelper -< - SecurityEngine, - css::xml::crypto::sax::XBlockerMonitor -> -/****** encryptionEngine.hxx/CLASS encryptionEngine *************************** - * - * NAME - * EncryptionEngine -- Base class of Encryptor and Decryptor - * - * FUNCTION - * Maintains common members and methods related with encryption. - ******************************************************************************/ -{ -private: - css::uno::Reference< css::uno::XComponentContext > m_xContext; - -protected: - /* - * the Encryption bridge component, which performs encrypt and decrypt - * operation based on xmlsec library. - */ - css::uno::Reference< css::xml::crypto::XXMLEncryption > m_xXMLEncryption; - - /* - * the Id of template blocker. - */ - sal_Int32 m_nIdOfBlocker; - -protected: - explicit EncryptionEngine( const css::uno::Reference< css::uno::XComponentContext > & xContext ); - virtual ~EncryptionEngine() override {}; - - virtual void tryToPerform( ) override; - virtual void clearUp( ) const override; - virtual bool checkReady() const override; - - /* - * starts the main function. This method will be implemented by any sub-class. - * For a Encryptor, it performs encryption operation; - * for a Decryptor, decryption operation is performed. - */ - /// @throws css::uno::Exception - /// @throws css::uno::RuntimeException - virtual void startEngine( const css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate >&) - {}; - -public: - /* XBlockerMonitor */ - virtual void SAL_CALL setBlockerId( sal_Int32 id ) override; -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx index 923f4bb73b3a..09201d90679b 100644 --- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx +++ b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx @@ -108,8 +108,4 @@ Reference< XInterface > SAL_CALL XMLEncryptionTemplateImpl::impl_createInstance( return Reference< XInterface >( *new XMLEncryptionTemplateImpl ) ; } -Reference< XSingleServiceFactory > XMLEncryptionTemplateImpl::impl_createFactory( const Reference< XMultiServiceFactory >& aServiceManager ) { - return ::cppu::createSingleFactory( aServiceManager , impl_getImplementationName() , impl_createInstance , impl_getSupportedServiceNames() ) ; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx index adc92a868d48..a9bbf47eebf4 100644 --- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx +++ b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx @@ -85,9 +85,7 @@ class XMLEncryptionTemplateImpl : public ::cppu::WeakImplHelper< //Helper for registry /// @throws css::uno::RuntimeException static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ; - - static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ; -} ; +}; #endif // _XMLENCRYPTIONTEMPLATE_XMLSECIMPL_HXX_ diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx index 8d85579e4a7b..b117dac54525 100644 --- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx +++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx @@ -128,9 +128,4 @@ OUString XMLSignatureTemplateImpl::impl_getImplementationName() { Reference< XInterface > SAL_CALL XMLSignatureTemplateImpl::impl_createInstance( const Reference< XMultiServiceFactory >& ) { return Reference< XInterface >( *new XMLSignatureTemplateImpl ) ; } - -Reference< XSingleServiceFactory > XMLSignatureTemplateImpl::impl_createFactory( const Reference< XMultiServiceFactory >& aServiceManager ) { - return ::cppu::createSingleFactory( aServiceManager , impl_getImplementationName() , impl_createInstance , impl_getSupportedServiceNames() ) ; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx index 62f713aecc6f..1876aeb037a5 100644 --- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx +++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx @@ -92,9 +92,7 @@ class XMLSignatureTemplateImpl : public ::cppu::WeakImplHelper< //Helper for registry /// @throws css::uno::RuntimeException static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ; - - static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ; -} ; +}; #endif // _XMLSIGNATURETEMPLATE_XMLSECIMPL_HXX_ |