chart2/source/controller/dialogs/res_LegendPosition.cxx | 57 - chart2/source/controller/inc/res_LegendPosition.hxx | 7 compilerplugins/clang/unusedmethods.results | 392 ++++++------- compilerplugins/clang/unusedmethods.unused-returns.results | 24 dbaccess/source/ui/dlg/admincontrols.cxx | 27 dbaccess/source/ui/dlg/admincontrols.hxx | 2 editeng/source/editeng/editobj2.hxx | 1 include/sfx2/tabdlg.hxx | 1 reportdesign/source/ui/dlg/PageNumber.cxx | 50 - reportdesign/source/ui/inc/PageNumber.hxx | 2 sfx2/source/dialog/tabdlg.cxx | 6 sw/source/ui/index/swuiidxmrk.cxx | 5 sw/source/uibase/dbui/mailmergehelper.cxx | 123 ---- sw/source/uibase/inc/mailmergehelper.hxx | 11 sw/source/uibase/inc/swuiidxmrk.hxx | 1 15 files changed, 212 insertions(+), 497 deletions(-)
New commits: commit 646a6307b9a31376d85fa3ed12a314118d41d7cc Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Sat Oct 27 07:22:21 2018 +0200 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Sat Oct 27 20:10:03 2018 +0200 loplugin:unusedmethods Change-Id: I66ef078794ed1eb44dbfa854c589545e5f9ba78e Reviewed-on: https://gerrit.libreoffice.org/62407 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx index 5842b0e2206f..089bec1100fd 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx @@ -39,15 +39,6 @@ namespace chart using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; -LegendPositionResources::LegendPositionResources(weld::Builder& rBuilder) - : m_xRbtLeft(rBuilder.weld_radio_button("left")) - , m_xRbtRight(rBuilder.weld_radio_button("right")) - , m_xRbtTop(rBuilder.weld_radio_button("top")) - , m_xRbtBottom(rBuilder.weld_radio_button("bottom")) -{ - impl_setRadioButtonToggleHdl(); -} - LegendPositionResources::LegendPositionResources(weld::Builder& rBuilder, const uno::Reference< uno::XComponentContext >& xCC) : m_xCC(xCC) @@ -174,54 +165,6 @@ IMPL_LINK_NOARG(LegendPositionResources, PositionEnableHdl, weld::ToggleButton&, m_aChangeLink.Call(nullptr); } -void LegendPositionResources::initFromItemSet( const SfxItemSet& rInAttrs ) -{ - const SfxPoolItem* pPoolItem = nullptr; - if( rInAttrs.GetItemState( SCHATTR_LEGEND_POS, true, &pPoolItem ) == SfxItemState::SET ) - { - chart2::LegendPosition nLegendPosition = static_cast<chart2::LegendPosition>(static_cast<const SfxInt32Item*>(pPoolItem)->GetValue()); - switch( nLegendPosition ) - { - case chart2::LegendPosition_LINE_START: - m_xRbtLeft->set_active(true); - break; - case chart2::LegendPosition_PAGE_START: - m_xRbtTop->set_active(true); - break; - case chart2::LegendPosition_LINE_END: - m_xRbtRight->set_active(true); - break; - case chart2::LegendPosition_PAGE_END: - m_xRbtBottom->set_active(true); - break; - default: - break; - } - } - - if( m_xCbxShow && rInAttrs.GetItemState( SCHATTR_LEGEND_SHOW, true, &pPoolItem ) == SfxItemState::SET ) - { - bool bShow = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue(); - m_xCbxShow->set_active(bShow); - } -} - -void LegendPositionResources::writeToItemSet( SfxItemSet& rOutAttrs ) const -{ - chart2::LegendPosition nLegendPosition = chart2::LegendPosition_CUSTOM; - if( m_xRbtLeft->get_active() ) - nLegendPosition = chart2::LegendPosition_LINE_START; - else if( m_xRbtTop->get_active() ) - nLegendPosition = chart2::LegendPosition_PAGE_START; - else if( m_xRbtRight->get_active() ) - nLegendPosition = chart2::LegendPosition_LINE_END; - else if( m_xRbtBottom->get_active() ) - nLegendPosition = chart2::LegendPosition_PAGE_END; - rOutAttrs.Put( SfxInt32Item(SCHATTR_LEGEND_POS, static_cast<sal_Int32>(nLegendPosition) ) ); - - rOutAttrs.Put( SfxBoolItem(SCHATTR_LEGEND_SHOW, !m_xCbxShow || m_xCbxShow->get_active()) ); -} - IMPL_LINK (LegendPositionResources, PositionChangeHdl, weld::ToggleButton&, rRadio, void) { //for each radio click there are coming two change events diff --git a/chart2/source/controller/inc/res_LegendPosition.hxx b/chart2/source/controller/inc/res_LegendPosition.hxx index 40c5c2ff8b70..c9105f7dd1af 100644 --- a/chart2/source/controller/inc/res_LegendPosition.hxx +++ b/chart2/source/controller/inc/res_LegendPosition.hxx @@ -32,8 +32,6 @@ class LegendPositionResources final { public: - //constructor without Display checkbox - LegendPositionResources(weld::Builder& rBuilder); //constructor inclusive Display checkbox LegendPositionResources(weld::Builder& rBuilder, const css::uno::Reference< css::uno::XComponentContext>& xCC ); @@ -42,9 +40,6 @@ public: void writeToResources( const css::uno::Reference< css::frame::XModel >& xChartModel ); void writeToModel( const css::uno::Reference< css::frame::XModel >& xChartModel ) const; - void initFromItemSet( const SfxItemSet& rInAttrs ); - void writeToItemSet( SfxItemSet& rOutAttrs ) const; - void SetChangeHdl( const Link<LinkParamNone*,void>& rLink ); DECL_LINK( PositionEnableHdl, weld::ToggleButton&, void ); @@ -82,8 +77,6 @@ public: void initFromItemSet( const SfxItemSet& rInAttrs ); void writeToItemSet( SfxItemSet& rOutAttrs ) const; - void SetChangeHdl( const Link<LinkParamNone*,void>& rLink ); - DECL_LINK(PositionEnableHdl, weld::ToggleButton&, void); private: diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results index 1c04ba086b90..bc822e40f642 100644 --- a/compilerplugins/clang/unusedmethods.results +++ b/compilerplugins/clang/unusedmethods.results @@ -8,6 +8,14 @@ basic/source/inc/buffer.hxx:46 void SbiBuffer::operator+=(int) canvas/source/vcl/impltools.hxx:105 vclcanvas::tools::LocalGuard::LocalGuard() +chart2/source/controller/inc/res_LegendPosition.hxx:36 + chart::LegendPositionResources::LegendPositionResources(class weld::Builder &) +chart2/source/controller/inc/res_LegendPosition.hxx:45 + void chart::LegendPositionResources::initFromItemSet(const class SfxItemSet &) +chart2/source/controller/inc/res_LegendPosition.hxx:46 + void chart::LegendPositionResources::writeToItemSet(class SfxItemSet &) const +chart2/source/controller/inc/res_LegendPosition.hxx:85 + void chart::SchLegendPositionResources::SetChangeHdl(const class Link<class LinkParamNone *, void> &) connectivity/source/drivers/evoab2/NResultSetMetaData.hxx:51 class com::sun::star::uno::Reference<class com::sun::star::sdbc::XResultSetMetaData> connectivity::evoab::OEvoabResultSetMetaData::operator Reference() connectivity/source/drivers/firebird/Driver.hxx:65 @@ -52,6 +60,8 @@ dbaccess/source/filter/hsqldb/parseschema.hxx:82 const class std::__debug::map<class rtl::OUString, class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> >, struct std::less<class rtl::OUString>, class std::allocator<struct std::pair<const class rtl::OUString, class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > > > > & dbahsql::SchemaParser::getPrimaryKeys() const dbaccess/source/ui/browser/genericcontroller.cxx:1213 const type-parameter-?-? & dbaui::(anonymous namespace)::SGI_identity::operator()(const type-parameter-?-? &) const +dbaccess/source/ui/dlg/admincontrols.hxx:99 + _Bool dbaui::DBMySQLNativeSettings::canAdvance() const dbaccess/source/ui/inc/dsmeta.hxx:88 class __gnu_debug::_Safe_iterator<struct std::_Rb_tree_const_iterator<int>, class std::__debug::set<int, struct std::less<int>, class std::allocator<int> > > dbaui::FeatureSet::begin() const dbaccess/source/ui/inc/dsmeta.hxx:89 @@ -100,8 +110,8 @@ editeng/inc/edtspell.hxx:112 class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const struct editeng::MisspellRange *, class std::__cxx1998::vector<struct editeng::MisspellRange, class std::allocator<struct editeng::MisspellRange> > >, class std::__debug::vector<struct editeng::MisspellRange, class std::allocator<struct editeng::MisspellRange> > > WrongList::begin() const editeng/inc/edtspell.hxx:113 class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const struct editeng::MisspellRange *, class std::__cxx1998::vector<struct editeng::MisspellRange, class std::allocator<struct editeng::MisspellRange> > >, class std::__debug::vector<struct editeng::MisspellRange, class std::allocator<struct editeng::MisspellRange> > > WrongList::end() const -editeng/source/editeng/editstt2.hxx:62 - _Bool InternalEditStatus::IsAnyOutliner() const +editeng/source/editeng/editobj2.hxx:114 + enum OutDevType XParaPortionList::GetRefDevType() const extensions/source/scanner/scanner.hxx:81 void ScannerManager::SetData(void *) framework/source/uiconfiguration/ImageList.hxx:51 @@ -134,9 +144,9 @@ include/basegfx/matrix/b2dhommatrix.hxx:92 class basegfx::B2DHomMatrix & basegfx::B2DHomMatrix::operator*=(double) include/basegfx/matrix/b2dhommatrix.hxx:93 class basegfx::B2DHomMatrix & basegfx::B2DHomMatrix::operator/=(double) -include/basegfx/matrix/b2dhommatrixtools.hxx:132 +include/basegfx/matrix/b2dhommatrixtools.hxx:134 class basegfx::B2DHomMatrix basegfx::utils::createRotateAroundCenterKeepAspectRatioStayInsideRange(const class basegfx::B2DRange &,double) -include/basegfx/matrix/b2dhommatrixtools.hxx:232 +include/basegfx/matrix/b2dhommatrixtools.hxx:234 double basegfx::utils::B2DHomMatrixBufferedOnDemandDecompose::getShearX() const include/basegfx/matrix/b3dhommatrix.hxx:67 void basegfx::B3DHomMatrix::rotate(const class basegfx::B3DTuple &) @@ -156,11 +166,11 @@ include/basegfx/numeric/ftools.hxx:144 double basegfx::snapToRange(double,double,double) include/basegfx/numeric/ftools.hxx:148 double basegfx::copySign(double,double) -include/basegfx/pixel/bpixel.hxx:56 +include/basegfx/pixel/bpixel.hxx:55 basegfx::BPixel::BPixel(unsigned char,unsigned char,unsigned char,unsigned char) -include/basegfx/pixel/bpixel.hxx:87 +include/basegfx/pixel/bpixel.hxx:86 _Bool basegfx::BPixel::operator==(const class basegfx::BPixel &) const -include/basegfx/pixel/bpixel.hxx:92 +include/basegfx/pixel/bpixel.hxx:91 _Bool basegfx::BPixel::operator!=(const class basegfx::BPixel &) const include/basegfx/point/b2dpoint.hxx:93 class basegfx::B2DPoint & basegfx::B2DPoint::operator*=(double) @@ -174,19 +184,19 @@ include/basegfx/point/b3dpoint.hxx:76 class basegfx::B3DPoint & basegfx::B3DPoint::operator*=(const class basegfx::B3DPoint &) include/basegfx/point/b3dpoint.hxx:86 class basegfx::B3DPoint & basegfx::B3DPoint::operator*=(double) -include/basegfx/polygon/b2dtrapezoid.hxx:102 +include/basegfx/polygon/b2dtrapezoid.hxx:104 void basegfx::utils::createLineTrapezoidFromB2DPolygon(class std::__debug::vector<class basegfx::B2DTrapezoid, class std::allocator<class basegfx::B2DTrapezoid> > &,const class basegfx::B2DPolygon &,double) include/basegfx/polygon/b3dpolypolygon.hxx:109 class basegfx::B3DPolygon * basegfx::B3DPolyPolygon::begin() include/basegfx/polygon/b3dpolypolygon.hxx:110 class basegfx::B3DPolygon * basegfx::B3DPolyPolygon::end() -include/basegfx/range/b1drange.hxx:52 +include/basegfx/range/b1drange.hxx:51 basegfx::B1DRange::B1DRange(double) -include/basegfx/range/b1drange.hxx:74 +include/basegfx/range/b1drange.hxx:73 _Bool basegfx::B1DRange::operator==(const class basegfx::B1DRange &) const -include/basegfx/range/b1drange.hxx:145 +include/basegfx/range/b1drange.hxx:144 double basegfx::B1DRange::clamp(double) const -include/basegfx/range/b2dpolyrange.hxx:66 +include/basegfx/range/b2dpolyrange.hxx:65 _Bool basegfx::B2DPolyRange::operator!=(const class basegfx::B2DPolyRange &) const include/basegfx/range/b2drange.hxx:278 class basegfx::B2DTuple basegfx::B2DRange::clamp(const class basegfx::B2DTuple &) const @@ -194,25 +204,25 @@ include/basegfx/range/b2drange.hxx:298 const class basegfx::B2DRange & basegfx::B2DRange::getUnitB2DRange() include/basegfx/range/b2drange.hxx:309 class basegfx::B2DRange basegfx::operator*(const class basegfx::B2DHomMatrix &,const class basegfx::B2DRange &) -include/basegfx/range/b2ibox.hxx:67 +include/basegfx/range/b2ibox.hxx:62 basegfx::B2IBox::B2IBox() -include/basegfx/range/b2ibox.hxx:70 +include/basegfx/range/b2ibox.hxx:65 basegfx::B2IBox::B2IBox(const class basegfx::B2ITuple &) -include/basegfx/range/b2ibox.hxx:89 +include/basegfx/range/b2ibox.hxx:84 basegfx::B2IBox::B2IBox(const class basegfx::B2ITuple &,const class basegfx::B2ITuple &) -include/basegfx/range/b2ibox.hxx:107 +include/basegfx/range/b2ibox.hxx:102 _Bool basegfx::B2IBox::operator==(const class basegfx::B2IBox &) const -include/basegfx/range/b2ibox.hxx:113 +include/basegfx/range/b2ibox.hxx:108 _Bool basegfx::B2IBox::operator!=(const class basegfx::B2IBox &) const -include/basegfx/range/b2ibox.hxx:156 +include/basegfx/range/b2ibox.hxx:151 _Bool basegfx::B2IBox::isInside(const class basegfx::B2ITuple &) const -include/basegfx/range/b2ibox.hxx:172 +include/basegfx/range/b2ibox.hxx:167 void basegfx::B2IBox::intersect(const class basegfx::B2IBox &) -include/basegfx/range/b2irange.hxx:62 +include/basegfx/range/b2irange.hxx:61 basegfx::B2IRange::B2IRange(const class basegfx::B2ITuple &) -include/basegfx/range/b2irange.hxx:198 +include/basegfx/range/b2irange.hxx:197 void basegfx::B2IRange::expand(const class basegfx::B2IRange &) -include/basegfx/range/b2irange.hxx:211 +include/basegfx/range/b2irange.hxx:210 class basegfx::B2ITuple basegfx::B2IRange::clamp(const class basegfx::B2ITuple &) const include/basegfx/range/b3drange.hxx:98 _Bool basegfx::B3DRange::operator!=(const class basegfx::B3DRange &) const @@ -222,73 +232,73 @@ include/basegfx/range/b3drange.hxx:219 const class basegfx::B3DRange & basegfx::B3DRange::getUnitB3DRange() include/basegfx/range/b3drange.hxx:224 class basegfx::B3DRange basegfx::operator*(const class basegfx::B3DHomMatrix &,const class basegfx::B3DRange &) -include/basegfx/tuple/b2i64tuple.hxx:48 +include/basegfx/tuple/b2i64tuple.hxx:47 basegfx::B2I64Tuple::B2I64Tuple() -include/basegfx/tuple/b2i64tuple.hxx:91 +include/basegfx/tuple/b2i64tuple.hxx:90 const long & basegfx::B2I64Tuple::operator[](int) const -include/basegfx/tuple/b2i64tuple.hxx:100 +include/basegfx/tuple/b2i64tuple.hxx:99 long & basegfx::B2I64Tuple::operator[](int) -include/basegfx/tuple/b2i64tuple.hxx:111 +include/basegfx/tuple/b2i64tuple.hxx:110 class basegfx::B2I64Tuple & basegfx::B2I64Tuple::operator+=(const class basegfx::B2I64Tuple &) -include/basegfx/tuple/b2i64tuple.hxx:118 +include/basegfx/tuple/b2i64tuple.hxx:117 class basegfx::B2I64Tuple & basegfx::B2I64Tuple::operator-=(const class basegfx::B2I64Tuple &) -include/basegfx/tuple/b2i64tuple.hxx:125 +include/basegfx/tuple/b2i64tuple.hxx:124 class basegfx::B2I64Tuple & basegfx::B2I64Tuple::operator/=(const class basegfx::B2I64Tuple &) -include/basegfx/tuple/b2i64tuple.hxx:132 +include/basegfx/tuple/b2i64tuple.hxx:131 class basegfx::B2I64Tuple & basegfx::B2I64Tuple::operator*=(const class basegfx::B2I64Tuple &) -include/basegfx/tuple/b2i64tuple.hxx:139 +include/basegfx/tuple/b2i64tuple.hxx:138 class basegfx::B2I64Tuple & basegfx::B2I64Tuple::operator*=(long) -include/basegfx/tuple/b2i64tuple.hxx:146 +include/basegfx/tuple/b2i64tuple.hxx:145 class basegfx::B2I64Tuple & basegfx::B2I64Tuple::operator/=(long) -include/basegfx/tuple/b2i64tuple.hxx:153 +include/basegfx/tuple/b2i64tuple.hxx:152 class basegfx::B2I64Tuple basegfx::B2I64Tuple::operator-() const -include/basegfx/tuple/b2i64tuple.hxx:163 +include/basegfx/tuple/b2i64tuple.hxx:162 _Bool basegfx::B2I64Tuple::operator!=(const class basegfx::B2I64Tuple &) const -include/basegfx/tuple/b2ituple.hxx:128 +include/basegfx/tuple/b2ituple.hxx:126 class basegfx::B2ITuple & basegfx::B2ITuple::operator/=(const class basegfx::B2ITuple &) -include/basegfx/tuple/b2ituple.hxx:135 +include/basegfx/tuple/b2ituple.hxx:133 class basegfx::B2ITuple & basegfx::B2ITuple::operator*=(const class basegfx::B2ITuple &) -include/basegfx/tuple/b2ituple.hxx:149 +include/basegfx/tuple/b2ituple.hxx:147 class basegfx::B2ITuple & basegfx::B2ITuple::operator/=(int) -include/basegfx/tuple/b2ituple.hxx:156 +include/basegfx/tuple/b2ituple.hxx:154 class basegfx::B2ITuple basegfx::B2ITuple::operator-() const -include/basegfx/tuple/b2ituple.hxx:161 +include/basegfx/tuple/b2ituple.hxx:159 _Bool basegfx::B2ITuple::equalZero() const -include/basegfx/tuple/b3dtuple.hxx:171 +include/basegfx/tuple/b3dtuple.hxx:170 class basegfx::B3DTuple & basegfx::B3DTuple::operator/=(const class basegfx::B3DTuple &) -include/basegfx/tuple/b3ituple.hxx:49 +include/basegfx/tuple/b3ituple.hxx:48 basegfx::B3ITuple::B3ITuple() -include/basegfx/tuple/b3ituple.hxx:88 +include/basegfx/tuple/b3ituple.hxx:87 const int & basegfx::B3ITuple::operator[](int) const -include/basegfx/tuple/b3ituple.hxx:97 +include/basegfx/tuple/b3ituple.hxx:96 int & basegfx::B3ITuple::operator[](int) -include/basegfx/tuple/b3ituple.hxx:108 +include/basegfx/tuple/b3ituple.hxx:107 class basegfx::B3ITuple & basegfx::B3ITuple::operator+=(const class basegfx::B3ITuple &) -include/basegfx/tuple/b3ituple.hxx:116 +include/basegfx/tuple/b3ituple.hxx:115 class basegfx::B3ITuple & basegfx::B3ITuple::operator-=(const class basegfx::B3ITuple &) -include/basegfx/tuple/b3ituple.hxx:124 +include/basegfx/tuple/b3ituple.hxx:123 class basegfx::B3ITuple & basegfx::B3ITuple::operator/=(const class basegfx::B3ITuple &) -include/basegfx/tuple/b3ituple.hxx:132 +include/basegfx/tuple/b3ituple.hxx:131 class basegfx::B3ITuple & basegfx::B3ITuple::operator*=(const class basegfx::B3ITuple &) -include/basegfx/tuple/b3ituple.hxx:140 +include/basegfx/tuple/b3ituple.hxx:139 class basegfx::B3ITuple & basegfx::B3ITuple::operator*=(int) -include/basegfx/tuple/b3ituple.hxx:148 +include/basegfx/tuple/b3ituple.hxx:147 class basegfx::B3ITuple & basegfx::B3ITuple::operator/=(int) -include/basegfx/tuple/b3ituple.hxx:156 +include/basegfx/tuple/b3ituple.hxx:155 class basegfx::B3ITuple basegfx::B3ITuple::operator-() const -include/basegfx/tuple/b3ituple.hxx:166 +include/basegfx/tuple/b3ituple.hxx:165 _Bool basegfx::B3ITuple::operator!=(const class basegfx::B3ITuple &) const -include/basegfx/utils/b2dclipstate.hxx:75 +include/basegfx/utils/b2dclipstate.hxx:72 _Bool basegfx::utils::B2DClipState::operator!=(const class basegfx::utils::B2DClipState &) const include/basegfx/utils/systemdependentdata.hxx:69 basegfx::MinimalSystemDependentDataManager::MinimalSystemDependentDataManager() include/basegfx/utils/unopolypolygon.hxx:91 const class basegfx::B2DPolyPolygon & basegfx::unotools::UnoPolyPolygon::getPolyPolygonUnsafe() const -include/basegfx/vector/b2ivector.hxx:75 +include/basegfx/vector/b2ivector.hxx:74 class basegfx::B2IVector & basegfx::B2IVector::operator*=(const class basegfx::B2IVector &) -include/basegfx/vector/b2ivector.hxx:84 +include/basegfx/vector/b2ivector.hxx:83 class basegfx::B2IVector & basegfx::B2IVector::operator*=(int) -include/basegfx/vector/b2ivector.hxx:118 +include/basegfx/vector/b2ivector.hxx:117 class basegfx::B2IVector & basegfx::B2IVector::operator*=(const class basegfx::B2DHomMatrix &) include/basegfx/vector/b3dvector.hxx:76 class basegfx::B3DVector & basegfx::B3DVector::operator*=(const class basegfx::B3DVector &) @@ -316,11 +326,11 @@ include/canvas/rendering/isurfaceproxymanager.hxx:64 class std::shared_ptr<struct canvas::ISurfaceProxyManager> canvas::createSurfaceProxyManager(const class std::shared_ptr<struct canvas::IRenderModule> &) include/canvas/vclwrapper.hxx:66 canvas::vcltools::VCLObject::VCLObject<Wrappee_>(unique_ptr<type-parameter-?-?, default_delete<type-parameter-?-?> >) -include/canvas/vclwrapper.hxx:134 +include/canvas/vclwrapper.hxx:136 type-parameter-?-? & canvas::vcltools::VCLObject::get() -include/canvas/vclwrapper.hxx:135 - const type-parameter-?-? & canvas::vcltools::VCLObject::get() const include/canvas/vclwrapper.hxx:137 + const type-parameter-?-? & canvas::vcltools::VCLObject::get() const +include/canvas/vclwrapper.hxx:139 void canvas::vcltools::VCLObject::swap(VCLObject<Wrappee_> &) include/codemaker/global.hxx:58 class FileStream & operator<<(class FileStream &,const class rtl::OString *) @@ -342,39 +352,39 @@ include/comphelper/configuration.hxx:264 void comphelper::ConfigurationLocalizedProperty::set(const type-parameter-?-? &,const class std::shared_ptr<class comphelper::ConfigurationChanges> &) include/comphelper/configuration.hxx:300 class com::sun::star::uno::Reference<class com::sun::star::container::XHierarchicalNameReplace> comphelper::ConfigurationGroup::get(const class std::shared_ptr<class comphelper::ConfigurationChanges> &) -include/comphelper/logging.hxx:57 +include/comphelper/logging.hxx:59 class rtl::OUString comphelper::log::convert::convertLogArgToString(char16_t) -include/comphelper/logging.hxx:222 +include/comphelper/logging.hxx:226 void comphelper::EventLogger::log(const int,const char *,type-parameter-?-?,type-parameter-?-?) const -include/comphelper/logging.hxx:243 +include/comphelper/logging.hxx:247 void comphelper::EventLogger::log(const int,const char *,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const -include/comphelper/logging.hxx:255 +include/comphelper/logging.hxx:259 void comphelper::EventLogger::log(const int,const char *,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const -include/comphelper/logging.hxx:268 +include/comphelper/logging.hxx:272 void comphelper::EventLogger::log(const int,const char *,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const -include/comphelper/logging.hxx:292 +include/comphelper/logging.hxx:296 void comphelper::EventLogger::logp(const int,const char *,const char *,const class rtl::OUString &,type-parameter-?-?) const -include/comphelper/logging.hxx:301 +include/comphelper/logging.hxx:305 void comphelper::EventLogger::logp(const int,const char *,const char *,const class rtl::OUString &,type-parameter-?-?,type-parameter-?-?) const -include/comphelper/logging.hxx:311 +include/comphelper/logging.hxx:315 void comphelper::EventLogger::logp(const int,const char *,const char *,const class rtl::OUString &,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const -include/comphelper/logging.hxx:322 +include/comphelper/logging.hxx:326 void comphelper::EventLogger::logp(const int,const char *,const char *,const class rtl::OUString &,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const -include/comphelper/logging.hxx:334 +include/comphelper/logging.hxx:338 void comphelper::EventLogger::logp(const int,const char *,const char *,const class rtl::OUString &,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const -include/comphelper/logging.hxx:347 +include/comphelper/logging.hxx:351 void comphelper::EventLogger::logp(const int,const char *,const char *,const class rtl::OUString &,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const -include/comphelper/logging.hxx:371 +include/comphelper/logging.hxx:375 void comphelper::EventLogger::logp(const int,const char *,const char *,const char *,type-parameter-?-?) const -include/comphelper/logging.hxx:380 +include/comphelper/logging.hxx:384 void comphelper::EventLogger::logp(const int,const char *,const char *,const char *,type-parameter-?-?,type-parameter-?-?) const -include/comphelper/logging.hxx:390 +include/comphelper/logging.hxx:394 void comphelper::EventLogger::logp(const int,const char *,const char *,const char *,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const -include/comphelper/logging.hxx:401 +include/comphelper/logging.hxx:405 void comphelper::EventLogger::logp(const int,const char *,const char *,const char *,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const -include/comphelper/logging.hxx:413 +include/comphelper/logging.hxx:417 void comphelper::EventLogger::logp(const int,const char *,const char *,const char *,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const -include/comphelper/logging.hxx:426 +include/comphelper/logging.hxx:430 void comphelper::EventLogger::logp(const int,const char *,const char *,const char *,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?,type-parameter-?-?) const include/comphelper/lok.hxx:47 _Bool comphelper::LibreOfficeKit::isLocalRendering() @@ -422,7 +432,7 @@ include/editeng/hyphenzoneitem.hxx:65 _Bool SvxHyphenZoneItem::IsPageEnd() const include/filter/msfilter/mstoolbar.hxx:103 Indent::Indent(_Bool) -include/formula/opcode.hxx:518 +include/formula/opcode.hxx:519 class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > OpCodeEnumToString(enum OpCode) include/formula/tokenarray.hxx:180 class formula::FormulaTokenArrayReferencesIterator formula::FormulaTokenArrayReferencesIterator::operator++(int) @@ -544,11 +554,11 @@ include/oox/helper/propertymap.hxx:114 void oox::PropertyMap::dumpCode(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &) include/oox/helper/propertymap.hxx:115 void oox::PropertyMap::dumpData(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &) -include/opencl/openclconfig.hxx:55 +include/opencl/openclconfig.hxx:57 _Bool OpenCLConfig::ImplMatcher::operator!=(const struct OpenCLConfig::ImplMatcher &) const include/opencl/OpenCLZone.hxx:42 _Bool OpenCLZone::isInInitialTest() -include/sfx2/basedlgs.hxx:218 +include/sfx2/basedlgs.hxx:216 class weld::Button & SfxSingleTabDialogController::GetOKButton() const include/sfx2/charwin.hxx:63 void SvxCharView::connect_focus_in(const class Link<class weld::Widget &, void> &) @@ -562,16 +572,14 @@ include/sfx2/msg.hxx:120 const class std::type_info * SfxType0::Type() const include/sfx2/sidebar/Context.hxx:55 _Bool sfx2::sidebar::Context::operator==(const class sfx2::sidebar::Context &) const +include/sfx2/tabdlg.hxx:183 + void SfxTabDialog::RemoveResetButton() include/svl/itempool.hxx:167 const type-parameter-?-? * SfxItemPool::GetItem2Default(TypedWhichId<type-parameter-?-?>) const include/svl/itempool.hxx:196 void SfxItemPool::dumpAsXml(struct _xmlTextWriter *) const include/svtools/ctrlbox.hxx:208 long LineListBox::GetWidth() const -include/svtools/dialogcontrolling.hxx:167 - void svt::ControlDependencyManager::enableOnCheckMark(class CheckBox &,class vcl::Window &,class vcl::Window &) -include/svtools/imagemgr.hxx:124 - class rtl::OUString SvFileInformationManager::GetFileImageId(const class INetURLObject &) include/svx/ClassificationEditView.hxx:41 void svx::ClassificationEditView::SetCharAttributes() include/svx/ClassificationEditView.hxx:47 @@ -588,33 +596,27 @@ include/svx/dlgctrl.hxx:295 void SvxLineEndLB::set_active_text(const class rtl::OUString &) include/svx/framelink.hxx:201 _Bool svx::frame::operator>(const class svx::frame::Style &,const class svx::frame::Style &) -include/svx/framelink.hxx:238 - _Bool svx::frame::StyleVectorCombination::operator<(const class svx::frame::StyleVectorCombination &) const -include/svx/langbox.hxx:165 - void LanguageBox::AddLanguages(const class std::__debug::vector<struct o3tl::strong_int<unsigned short, struct LanguageTypeTag>, class std::allocator<struct o3tl::strong_int<unsigned short, struct LanguageTypeTag> > > &,enum SvxLanguageListFlags) include/svx/svdlayer.hxx:76 _Bool SdrLayer::operator==(const class SdrLayer &) const include/svx/svdpntv.hxx:462 _Bool SdrPaintView::IsSwapAsynchron() const -include/svx/svdundo.hxx:100 - void SdrUndoGroup::Clear() include/svx/xpoly.hxx:82 _Bool XPolygon::operator==(const class XPolygon &) const -include/tools/bigint.hxx:86 +include/tools/bigint.hxx:80 BigInt::BigInt(unsigned int) -include/tools/bigint.hxx:92 +include/tools/bigint.hxx:86 unsigned short BigInt::operator unsigned short() const -include/tools/bigint.hxx:94 +include/tools/bigint.hxx:88 unsigned int BigInt::operator unsigned int() const -include/tools/bigint.hxx:117 +include/tools/bigint.hxx:111 class BigInt operator-(const class BigInt &,const class BigInt &) -include/tools/bigint.hxx:120 +include/tools/bigint.hxx:114 class BigInt operator%(const class BigInt &,const class BigInt &) -include/tools/bigint.hxx:123 +include/tools/bigint.hxx:117 _Bool operator!=(const class BigInt &,const class BigInt &) -include/tools/bigint.hxx:126 +include/tools/bigint.hxx:120 _Bool operator<=(const class BigInt &,const class BigInt &) -include/tools/date.hxx:216 +include/tools/date.hxx:215 _Bool Date::operator>=(const class Date &) const include/tools/datetime.hxx:47 DateTime::DateTime(const class tools::Time &) @@ -638,25 +640,27 @@ include/tools/fract.hxx:106 class Fraction operator-(const class Fraction &,double) include/tools/fract.hxx:108 class Fraction operator/(const class Fraction &,double) -include/tools/gen.hxx:252 +include/tools/gen.hxx:251 class Pair & Range::toPair() -include/tools/gen.hxx:319 +include/tools/gen.hxx:318 class Pair & Selection::toPair() -include/tools/poly.hxx:164 +include/tools/poly.hxx:162 _Bool tools::Polygon::operator!=(const class tools::Polygon &) const -include/tools/poly.hxx:251 +include/tools/poly.hxx:249 _Bool tools::PolyPolygon::operator!=(const class tools::PolyPolygon &) const -include/tools/weakbase.h:102 +include/tools/stream.hxx:511 + class rtl::OString read_uInt32_lenPrefixed_uInt8s_ToOString(class SvStream &) +include/tools/weakbase.h:101 _Bool tools::WeakReference::operator==(const type-parameter-?-? *) const -include/tools/weakbase.h:111 +include/tools/weakbase.h:110 _Bool tools::WeakReference::operator<(const WeakReference<reference_type> &) const -include/tools/weakbase.h:114 +include/tools/weakbase.h:113 _Bool tools::WeakReference::operator>(const WeakReference<reference_type> &) const include/unotest/directories.hxx:43 class rtl::OUString test::Directories::getPathFromWorkdir(const class rtl::OUString &) const -include/unotools/moduleoptions.hxx:165 +include/unotools/moduleoptions.hxx:166 _Bool SvtModuleOptions::IsDataBase() const -include/unotools/textsearch.hxx:129 +include/unotools/textsearch.hxx:130 basic_ostream<type-parameter-?-?, type-parameter-?-?> & utl::operator<<(basic_ostream<type-parameter-?-?, type-parameter-?-?> &,const enum utl::SearchParam::SearchType &) include/vcl/alpha.hxx:47 _Bool AlphaMask::operator==(const class AlphaMask &) const @@ -736,6 +740,8 @@ include/vcl/svmain.hxx:27 _Bool ImplSVMainHook(int *) include/vcl/syswin.hxx:173 void SystemWindow::SetIdleDebugName(const char *) +include/vcl/tabdlg.hxx:50 + class vcl::Window * TabDialog::GetViewWindow() const include/vcl/textrectinfo.hxx:44 _Bool TextRectInfo::operator!=(const class TextRectInfo &) const include/vcl/threadex.hxx:98 @@ -762,69 +768,67 @@ include/vcl/weld.hxx:84 void weld::Widget::set_vexpand(_Bool) include/vcl/weld.hxx:85 _Bool weld::Widget::get_vexpand() const -include/vcl/weld.hxx:95 - void weld::Widget::set_tooltip_text(const class rtl::OUString &) include/vcl/weld.hxx:147 void weld::ScrolledWindow::vadjustment_set_upper(int) include/vcl/weld.hxx:148 void weld::ScrolledWindow::set_hpolicy(enum VclPolicyType) include/vcl/weld.hxx:149 enum VclPolicyType weld::ScrolledWindow::get_hpolicy() const -include/vcl/weld.hxx:178 +include/vcl/weld.hxx:179 class rtl::OUString weld::Notebook::get_tab_label_text(const class rtl::OString &) const -include/vcl/weld.hxx:204 +include/vcl/weld.hxx:206 struct SystemEnvData weld::Window::get_system_data() const -include/vcl/weld.hxx:380 +include/vcl/weld.hxx:384 void weld::TreeView::append(const class rtl::OUString &,const class rtl::OUString &,class VirtualDevice &) -include/vcl/weld.hxx:393 +include/vcl/weld.hxx:397 void weld::TreeView::set_top_entry(int) -include/vcl/weld.hxx:424 +include/vcl/weld.hxx:428 void weld::TreeView::select_all() -include/vcl/weld.hxx:515 +include/vcl/weld.hxx:520 void weld::MenuButton::append_item(const class rtl::OUString &,const class rtl::OUString &) -include/vcl/weld.hxx:523 +include/vcl/weld.hxx:528 void weld::MenuButton::append_item(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &) -include/vcl/weld.hxx:527 +include/vcl/weld.hxx:532 void weld::MenuButton::append_item(const class rtl::OUString &,const class rtl::OUString &,class VirtualDevice &) -include/vcl/weld.hxx:580 +include/vcl/weld.hxx:585 void weld::Entry::signal_insert_text(class rtl::OUString &) -include/vcl/weld.hxx:592 +include/vcl/weld.hxx:597 int weld::Entry::get_position() const -include/vcl/weld.hxx:652 +include/vcl/weld.hxx:657 int weld::SpinButton::get_min() const -include/vcl/weld.hxx:927 +include/vcl/weld.hxx:932 class Size weld::MetricSpinButton::get_size_request() const -include/vcl/weld.hxx:938 +include/vcl/weld.hxx:943 void weld::MetricSpinButton::set_position(int) -include/vcl/weld.hxx:985 +include/vcl/weld.hxx:990 _Bool weld::TimeSpinButton::get_sensitive() const -include/vcl/weld.hxx:986 +include/vcl/weld.hxx:991 _Bool weld::TimeSpinButton::get_visible() const -include/vcl/weld.hxx:987 +include/vcl/weld.hxx:992 void weld::TimeSpinButton::grab_focus() -include/vcl/weld.hxx:988 +include/vcl/weld.hxx:993 _Bool weld::TimeSpinButton::has_focus() const -include/vcl/weld.hxx:989 +include/vcl/weld.hxx:994 void weld::TimeSpinButton::show(_Bool) -include/vcl/weld.hxx:990 +include/vcl/weld.hxx:995 void weld::TimeSpinButton::hide() -include/vcl/weld.hxx:991 +include/vcl/weld.hxx:996 void weld::TimeSpinButton::save_value() -include/vcl/weld.hxx:992 +include/vcl/weld.hxx:997 _Bool weld::TimeSpinButton::get_value_changed_from_saved() const -include/vcl/weld.hxx:1083 +include/vcl/weld.hxx:1088 void weld::DrawingArea::connect_key_release(const class Link<const class KeyEvent &, _Bool> &) -include/vcl/weld.hxx:1110 +include/vcl/weld.hxx:1115 void weld::Menu::set_active(const class rtl::OString &,_Bool) -include/vcl/weld.hxx:1120 +include/vcl/weld.hxx:1125 void weld::Menu::append_check(const class rtl::OUString &,const class rtl::OUString &) -include/vcl/weld.hxx:1124 +include/vcl/weld.hxx:1129 void weld::Menu::append(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &) -include/vcl/weld.hxx:1140 +include/vcl/weld.hxx:1145 void weld::SizeGroup::set_mode(enum VclSizeGroupMode) -include/vcl/weld.hxx:1162 +include/vcl/weld.hxx:1167 class std::unique_ptr<class weld::Window, struct std::default_delete<class weld::Window> > weld::Builder::weld_window(const class rtl::OString &,_Bool) -include/vcl/weld.hxx:1273 +include/vcl/weld.hxx:1275 class rtl::OUString weld::MessageDialogController::get_primary_text() const include/vcl/window.hxx:430 const char * ImplDbgCheckWindow(const void *) @@ -844,21 +848,19 @@ oox/inc/drawingml/textliststyle.hxx:49 void oox::drawingml::TextListStyle::dump() const oox/inc/drawingml/textparagraphproperties.hxx:100 void oox::drawingml::TextParagraphProperties::setLineSpacing(const class oox::drawingml::TextSpacing &) +reportdesign/source/ui/inc/PageNumber.hxx:52 + void rptui::OPageNumberDialog::execute() sc/inc/address.hxx:651 _Bool ScRange::operator<=(const class ScRange &) const sc/inc/bigrange.hxx:73 _Bool ScBigAddress::operator!=(const class ScBigAddress &) const sc/inc/columniterator.hxx:82 int sc::ColumnIterator::getType() const -sc/inc/columnspanset.hxx:106 - void sc::ColumnSpanSet::executeColumnAction(class ScDocument &,class sc::ColumnSpanSet::ColumnAction &,double &) const -sc/inc/columnspanset.hxx:165 - void sc::RangeColumnSpanSet::executeAction(class ScDocument &,class sc::ColumnSpanSet::Action &) const -sc/inc/datamapper.hxx:82 +sc/inc/datamapper.hxx:80 void sc::ExternalDataSource::setUpdateFrequency(double) -sc/inc/datamapper.hxx:85 +sc/inc/datamapper.hxx:83 void sc::ExternalDataSource::setURL(const class rtl::OUString &) -sc/inc/datamapper.hxx:86 +sc/inc/datamapper.hxx:84 void sc::ExternalDataSource::setProvider(const class rtl::OUString &) sc/inc/dpfilteredcache.hxx:143 void ScDPFilteredCache::dump() const @@ -890,15 +892,15 @@ sc/qa/unit/ucalc.hxx:375 void Test::testCopyPasteSkipEmptyConditionalFormatting() sc/qa/unit/ucalc.hxx:402 void Test::testSharedFormulaMoveBlock() -sc/qa/unit/ucalc.hxx:514 - void Test::testCondFormatUpdateMoveTab() sc/qa/unit/ucalc.hxx:515 - void Test::testCondFormatUpdateDeleteTab() + void Test::testCondFormatUpdateMoveTab() sc/qa/unit/ucalc.hxx:516 - void Test::testCondFormatUpdateInsertTab() + void Test::testCondFormatUpdateDeleteTab() sc/qa/unit/ucalc.hxx:517 + void Test::testCondFormatUpdateInsertTab() +sc/qa/unit/ucalc.hxx:518 void Test::testCondFormatUpdateReference() -sc/qa/unit/ucalc.hxx:527 +sc/qa/unit/ucalc.hxx:528 void Test::testCondFormatListenToOwnRange() sc/source/core/inc/interpre.hxx:73 basic_ostream<type-parameter-?-?, type-parameter-?-?> & sc::operator<<(basic_ostream<type-parameter-?-?, type-parameter-?-?> &,const struct sc::ParamIfsResult &) @@ -930,23 +932,23 @@ sc/source/filter/inc/xiescher.hxx:156 class Color XclImpDrawObjBase::GetSolidLineColor(const struct XclObjLineData &) const sc/source/filter/xml/xmltransformationi.hxx:160 ScXMLDateTimeContext::ScXMLDateTimeContext(class ScXMLImport &,const class rtl::Reference<class sax_fastparser::FastAttributeList> &) -sc/source/ui/inc/dataprovider.hxx:68 +sc/source/ui/inc/dataprovider.hxx:56 _Bool sc::CSVFetchThread::IsRequestedTerminate() -sc/source/ui/inc/dataprovider.hxx:69 +sc/source/ui/inc/dataprovider.hxx:57 void sc::CSVFetchThread::Terminate() -sc/source/ui/inc/dataprovider.hxx:70 +sc/source/ui/inc/dataprovider.hxx:58 void sc::CSVFetchThread::EndThread() -sc/source/ui/inc/dataprovider.hxx:95 +sc/source/ui/inc/dataprovider.hxx:83 const class rtl::OUString & sc::DataProvider::GetURL() const -sc/source/ui/inc/dataprovider.hxx:97 +sc/source/ui/inc/dataprovider.hxx:85 class std::__debug::map<class rtl::OUString, class rtl::OUString, struct std::less<class rtl::OUString>, class std::allocator<struct std::pair<const class rtl::OUString, class rtl::OUString> > > sc::DataProvider::getDataSourcesForURL(const class rtl::OUString &) sc/source/ui/inc/datatableview.hxx:115 void ScDataTableView::getRowRange(int &,int &) const sc/source/ui/inc/impex.hxx:95 ScImportExport::ScImportExport(class ScDocument *,const class rtl::OUString &) -sc/source/ui/inc/RandomNumberGeneratorDialog.hxx:69 +sc/source/ui/inc/RandomNumberGeneratorDialog.hxx:68 void ScRandomNumberGeneratorDialog::GenerateNumbers(type-parameter-?-? &,const char *,const class boost::optional<signed char>) -sc/source/ui/inc/TableFillingAndNavigationTools.hxx:125 +sc/source/ui/inc/TableFillingAndNavigationTools.hxx:120 unsigned long DataRangeIterator::size() sc/source/ui/inc/viewdata.hxx:406 long ScViewData::GetLOKDocWidthPixel() const @@ -964,8 +966,6 @@ sd/inc/sddll.hxx:48 SdDLL::SdDLL() sd/source/filter/ppt/pptinanimations.hxx:105 void ppt::AnimationImporter::dump(const char *,long) -sd/source/ui/animations/CustomAnimationDialog.hxx:146 - int sd::SdPropertySubControl::getControlType() const sd/source/ui/inc/filedlg.hxx:54 _Bool SdOpenSoundFileDialog::IsInsertAsLinkSelected() sd/source/ui/inc/optsitem.hxx:178 @@ -1036,67 +1036,67 @@ svx/source/svdraw/svdpdf.hxx:96 double ImpSdrPdfImport::Matrix::f() const svx/source/svdraw/svdpdf.hxx:149 class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > ImpSdrPdfImport::Matrix::toString() const -sw/inc/dbgoutsw.hxx:54 +sw/inc/dbgoutsw.hxx:53 const char * dbg_out(const void *) -sw/inc/dbgoutsw.hxx:56 +sw/inc/dbgoutsw.hxx:55 const char * dbg_out(const class SwRect &) -sw/inc/dbgoutsw.hxx:57 +sw/inc/dbgoutsw.hxx:56 const char * dbg_out(const class SwFrameFormat &) -sw/inc/dbgoutsw.hxx:60 +sw/inc/dbgoutsw.hxx:59 const char * dbg_out(const class SwContentNode *) -sw/inc/dbgoutsw.hxx:61 +sw/inc/dbgoutsw.hxx:60 const char * dbg_out(const class SwTextNode *) -sw/inc/dbgoutsw.hxx:62 +sw/inc/dbgoutsw.hxx:61 const char * dbg_out(const class SwTextAttr &) -sw/inc/dbgoutsw.hxx:63 +sw/inc/dbgoutsw.hxx:62 const char * dbg_out(const class SwpHints &) -sw/inc/dbgoutsw.hxx:64 +sw/inc/dbgoutsw.hxx:63 const char * dbg_out(const class SfxPoolItem &) -sw/inc/dbgoutsw.hxx:65 +sw/inc/dbgoutsw.hxx:64 const char * dbg_out(const class SfxPoolItem *) -sw/inc/dbgoutsw.hxx:66 +sw/inc/dbgoutsw.hxx:65 const char * dbg_out(const class SfxItemSet &) -sw/inc/dbgoutsw.hxx:67 +sw/inc/dbgoutsw.hxx:66 const char * dbg_out(const struct SwPosition &) -sw/inc/dbgoutsw.hxx:68 +sw/inc/dbgoutsw.hxx:67 const char * dbg_out(const class SwPaM &) -sw/inc/dbgoutsw.hxx:69 +sw/inc/dbgoutsw.hxx:68 const char * dbg_out(const class SwNodeNum &) -sw/inc/dbgoutsw.hxx:70 +sw/inc/dbgoutsw.hxx:69 const char * dbg_out(const class SwUndo &) -sw/inc/dbgoutsw.hxx:71 +sw/inc/dbgoutsw.hxx:70 const char * dbg_out(const class SwOutlineNodes &) -sw/inc/dbgoutsw.hxx:72 +sw/inc/dbgoutsw.hxx:71 const char * dbg_out(const class SwNumRule &) -sw/inc/dbgoutsw.hxx:73 +sw/inc/dbgoutsw.hxx:72 const char * dbg_out(const class SwTextFormatColl &) -sw/inc/dbgoutsw.hxx:74 +sw/inc/dbgoutsw.hxx:73 const char * dbg_out(const class SwFrameFormats &) -sw/inc/dbgoutsw.hxx:75 +sw/inc/dbgoutsw.hxx:74 const char * dbg_out(const class SwNumRuleTable &) -sw/inc/dbgoutsw.hxx:76 +sw/inc/dbgoutsw.hxx:75 const char * dbg_out(const class SwNodeRange &) -sw/inc/dbgoutsw.hxx:79 +sw/inc/dbgoutsw.hxx:78 class rtl::OUString lcl_dbg_out(const unordered_map<type-parameter-?-?, type-parameter-?-?, type-parameter-?-?, equal_to<type-parameter-?-?>, allocator<pair<const type-parameter-?-?, type-parameter-?-?> > > &) -sw/inc/dbgoutsw.hxx:103 +sw/inc/dbgoutsw.hxx:102 const char * dbg_out(const unordered_map<type-parameter-?-?, type-parameter-?-?, type-parameter-?-?, equal_to<type-parameter-?-?>, allocator<pair<const type-parameter-?-?, type-parameter-?-?> > > &) -sw/inc/dbgoutsw.hxx:107 +sw/inc/dbgoutsw.hxx:106 const char * dbg_out(const struct SwFormToken &) -sw/inc/dbgoutsw.hxx:108 +sw/inc/dbgoutsw.hxx:107 const char * dbg_out(const class std::__debug::vector<struct SwFormToken, class std::allocator<struct SwFormToken> > &) -sw/inc/docary.hxx:147 +sw/inc/docary.hxx:146 void SwVectorModifyBase::dumpAsXml(struct _xmlTextWriter *) -sw/inc/docary.hxx:232 +sw/inc/docary.hxx:231 void SwFrameFormats::erase(unsigned long) -sw/inc/docary.hxx:247 +sw/inc/docary.hxx:246 struct std::pair<class boost::multi_index::detail::bidir_node_iterator<struct boost::multi_index::detail::ordered_index_node<struct boost::multi_index::detail::null_augment_policy, struct boost::multi_index::detail::index_node_base<class SwFrameFormat *, class std::allocator<class SwFrameFormat *> > > >, class boost::multi_index::detail::bidir_node_iterator<struct boost::multi_index::detail::ordered_index_node<struct boost::multi_index::detail::null_augment_policy, struct boost::multi_index::detail::index_node_base<class SwFrameFormat *, class std::allocator<class SwFrameFormat *> > > > > SwFrameFormats::rangeFind(class SwFrameFormat *const &) const -sw/inc/docary.hxx:249 +sw/inc/docary.hxx:248 class boost::multi_index::detail::bidir_node_iterator<struct boost::multi_index::detail::ordered_index_node<struct boost::multi_index::detail::null_augment_policy, struct boost::multi_index::detail::index_node_base<class SwFrameFormat *, class std::allocator<class SwFrameFormat *> > > > SwFrameFormats::rangeEnd() const -sw/inc/docary.hxx:250 +sw/inc/docary.hxx:249 class boost::multi_index::detail::rnd_node_iterator<struct boost::multi_index::detail::random_access_index_node<struct boost::multi_index::detail::ordered_index_node<struct boost::multi_index::detail::null_augment_policy, struct boost::multi_index::detail::index_node_base<class SwFrameFormat *, class std::allocator<class SwFrameFormat *> > > > > SwFrameFormats::rangeProject(const class boost::multi_index::detail::bidir_node_iterator<struct boost::multi_index::detail::ordered_index_node<struct boost::multi_index::detail::null_augment_policy, struct boost::multi_index::detail::index_node_base<class SwFrameFormat *, class std::allocator<class SwFrameFormat *> > > > &) -sw/inc/docary.hxx:255 +sw/inc/docary.hxx:254 class SwFrameFormat *const & SwFrameFormats::front() const -sw/inc/docary.hxx:256 +sw/inc/docary.hxx:255 class SwFrameFormat *const & SwFrameFormats::back() const sw/inc/extinput.hxx:48 class SwExtTextInput * SwExtTextInput::GetPrev() @@ -1182,8 +1182,22 @@ sw/source/core/text/txtpaint.hxx:73 DbgRect::DbgRect(class OutputDevice *,const class tools::Rectangle &,const _Bool,class Color) sw/source/filter/ww8/ww8struc.hxx:243 WW8_BRCVer6::WW8_BRCVer6() +sw/source/uibase/inc/mailmergehelper.hxx:102 + void SwAddressPreview::ReplaceSelectedAddress(const class rtl::OUString &) +sw/source/uibase/inc/mailmergehelper.hxx:103 + void SwAddressPreview::RemoveSelectedAddress() +sw/source/uibase/inc/mailmergehelper.hxx:107 + void SwAddressPreview::EnableScrollBar() +sw/source/uibase/inc/mailmergehelper.hxx:147 + void AddressPreview::Clear() +sw/source/uibase/inc/mailmergehelper.hxx:160 + class rtl::OUString AddressPreview::FillData(const class rtl::OUString &,const class SwMailMergeConfigItem &,const class com::sun::star::uno::Sequence<class rtl::OUString> *) +sw/source/uibase/inc/mailmergehelper.hxx:163 + void AddressPreview::SetSelectHdl(const class Link<class LinkParamNone *, void> &) sw/source/uibase/inc/swcont.hxx:86 _Bool SwContent::operator==(const class SwContent &) const +sw/source/uibase/inc/swuiidxmrk.hxx:274 + void AuthorMarkPane::Activate() test/source/sheet/xsubtotalfield.cxx:28 _Bool CppUnit::assertion_traits::equal(const class com::sun::star::uno::Sequence<struct com::sun::star::sheet::SubTotalColumn> &,const class com::sun::star::uno::Sequence<struct com::sun::star::sheet::SubTotalColumn> &) test/source/sheet/xsubtotalfield.cxx:34 @@ -1200,7 +1214,7 @@ ucb/source/ucp/webdav-neon/NeonUri.hxx:64 _Bool webdav_ucp::NeonUri::operator!=(const class webdav_ucp::NeonUri &) const vcl/inc/bitmapwriteaccess.hxx:75 void BitmapWriteAccess::SetFillColor() -vcl/inc/fontinstance.hxx:65 +vcl/inc/fontinstance.hxx:66 void LogicalFontInstance::SetAverageWidthFactor(double) vcl/inc/fontinstance.hxx:67 double LogicalFontInstance::GetAverageWidthFactor() const @@ -1294,10 +1308,10 @@ vcl/source/fontsubset/xlat.hxx:34 unsigned short vcl::TranslateChar15(unsigned short) vcl/source/fontsubset/xlat.hxx:35 unsigned short vcl::TranslateChar16(unsigned short) +workdir/LexTarget/l10ntools/source/cfglex.cxx:3721 + void YYWarning(const char *) workdir/LexTarget/l10ntools/source/xrmlex.cxx:715 void YYWarning() -workdir/LexTarget/l10ntools/source/xrmlex.cxx:2211 - void YYWarning(const char *) writerfilter/source/ooxml/OOXMLPropertySet.hxx:176 class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> *, class std::__cxx1998::vector<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty>, class std::allocator<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> > > >, class std::__debug::vector<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty>, class std::allocator<class tools::SvRef<class writerfilter::ooxml::OOXMLProperty> > > > writerfilter::ooxml::OOXMLPropertySet::begin() const writerfilter/source/ooxml/OOXMLPropertySet.hxx:177 diff --git a/compilerplugins/clang/unusedmethods.unused-returns.results b/compilerplugins/clang/unusedmethods.unused-returns.results index 5064b4b70174..31a8336dbc05 100644 --- a/compilerplugins/clang/unusedmethods.unused-returns.results +++ b/compilerplugins/clang/unusedmethods.unused-returns.results @@ -12,9 +12,9 @@ extensions/source/scanner/sane.hxx:147 _Bool Sane::ActivateButtonOption(int) extensions/source/scanner/sane.hxx:153 _Bool Sane::Open(int) -extensions/source/scanner/sanedlg.hxx:90 +extensions/source/scanner/sanedlg.hxx:89 _Bool SaneDlg::LoadState() -extensions/source/scanner/sanedlg.hxx:104 +extensions/source/scanner/sanedlg.hxx:103 _Bool SaneDlg::SetAdjustedNumericalValue(const char *,double,int) filter/source/flash/swfexporter.hxx:85 _Bool swf::FlashExporter::exportAll(const class com::sun::star::uno::Reference<class com::sun::star::lang::XComponent> &,const class com::sun::star::uno::Reference<class com::sun::star::io::XOutputStream> &,const class com::sun::star::uno::Reference<class com::sun::star::task::XStatusIndicator> &) @@ -26,7 +26,7 @@ include/basegfx/range/b2dconnectedranges.hxx:217 type-parameter-?-? basegfx::B2DConnectedRanges::forEachAggregate(type-parameter-?-?) const include/basegfx/vector/b2dvector.hxx:115 class basegfx::B2DVector & basegfx::B2DVector::setLength(double) -include/basegfx/vector/b2ivector.hxx:101 +include/basegfx/vector/b2ivector.hxx:100 class basegfx::B2IVector & basegfx::B2IVector::setLength(double) include/basegfx/vector/b3dvector.hxx:146 class basegfx::B3DVector & basegfx::B3DVector::setLength(double) @@ -196,9 +196,9 @@ include/vcl/texteng.hxx:279 _Bool TextEngine::Read(class SvStream &,const class TextSelection *) include/vcl/toolbox.hxx:514 _Bool ToolBox::ChangeHighlightUpDn(_Bool) -include/vcl/weld.hxx:344 +include/vcl/weld.hxx:348 _Bool weld::ComboBox::get_entry_selection_bounds(int &,int &) -include/vcl/weld.hxx:1017 +include/vcl/weld.hxx:1022 _Bool weld::TextView::get_selection_bounds(int &,int &) lotuswordpro/inc/lwpsvstream.hxx:76 class LwpSvStream & LwpSvStream::ReadUInt8(unsigned char &) @@ -206,8 +206,6 @@ lotuswordpro/inc/lwpsvstream.hxx:77 class LwpSvStream & LwpSvStream::ReadUInt16(unsigned short &) lotuswordpro/inc/lwpsvstream.hxx:78 class LwpSvStream & LwpSvStream::ReadUInt32(unsigned int &) -reportdesign/source/ui/inc/DateTime.hxx:76 - short rptui::ODateTimeDialog::execute() sc/inc/orcusfilters.hxx:44 _Bool ScOrcusFilters::importODS_Styles(class ScDocument &,class rtl::OUString &) const sc/source/core/opencl/formulagroupcl.cxx:990 @@ -258,10 +256,6 @@ sd/source/ui/inc/OutlineViewShell.hxx:115 class ErrCode sd::OutlineViewShell::ReadRtf(class SvStream &) sd/source/ui/remotecontrol/IBluetoothSocket.hxx:37 int sd::IBluetoothSocket::write(const void *,unsigned int) -sfx2/source/appl/appserv.cxx:322 - short (anonymous namespace)::LicenseDialog::execute() -sfx2/source/appl/appserv.cxx:339 - short (anonymous namespace)::SafeModeQueryDialog::execute() sw/inc/calc.hxx:113 class SwSbxValue & SwSbxValue::MakeDouble() sw/inc/doc.hxx:1063 @@ -284,8 +278,6 @@ sw/source/core/inc/scriptinfo.hxx:227 _Bool SwScriptInfo::GetBoundsOfHiddenRange(int,int &,int &) const sw/source/filter/ww8/ww8toolbar.hxx:339 _Bool Tcg::ImportCustomToolBar(class SfxObjectShell &) -sw/source/ui/frmdlg/cption.cxx:80 - short SwSequenceOptionDialog::execute() sw/source/uibase/inc/fldmgr.hxx:114 const class com::sun::star::uno::Reference<class com::sun::star::text::XNumberingTypeInfo> & SwFieldMgr::GetNumberingInfo() const sw/source/uibase/inc/mailmergewizard.hxx:79 @@ -314,9 +306,9 @@ vcl/inc/unx/gtk/gtkdata.hxx:164 int GtkSalDisplay::CaptureMouse(class SalFrame *) vcl/inc/unx/saldisp.hxx:316 _Bool SalDisplay::Dispatch(union _XEvent *) -vcl/source/gdi/pdfwriter_impl.hxx:1255 +vcl/source/gdi/pdfwriter_impl.hxx:1252 _Bool vcl::PDFWriterImpl::setCurrentStructureElement(int) -vcl/source/gdi/pdfwriter_impl.hxx:1256 +vcl/source/gdi/pdfwriter_impl.hxx:1253 _Bool vcl::PDFWriterImpl::setStructureAttribute(enum vcl::PDFWriter::StructAttribute,enum vcl::PDFWriter::StructAttributeValue) -vcl/source/gdi/pdfwriter_impl.hxx:1257 +vcl/source/gdi/pdfwriter_impl.hxx:1254 _Bool vcl::PDFWriterImpl::setStructureAttributeNumerical(enum vcl::PDFWriter::StructAttribute,int) diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index 15b67868c1af..22303969b09a 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -447,33 +447,6 @@ namespace dbaui m_xHostPortRadio->set_active(true); } - bool DBMySQLNativeSettings::canAdvance() const - { - if (m_xDatabaseName->get_text().isEmpty()) - return false; - - if ( m_xHostPortRadio->get_active() - && ( ( m_xHostName->get_text().isEmpty() ) - || ( m_xPort->get_text().isEmpty() ) - ) - ) - return false; - -#ifdef UNX - if ( ( m_xSocketRadio->get_active() ) - && ( m_xSocket->get_text().isEmpty() ) - ) -#else - if ( ( m_xNamedPipeRadio->get_active() ) - && ( m_xNamedPipe->get_text().isEmpty() ) - ) -#endif - return false; - - return true; - } - - } // namespace dbaui /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx index f608341de580..de6aed4fdc9e 100644 --- a/dbaccess/source/ui/dlg/admincontrols.hxx +++ b/dbaccess/source/ui/dlg/admincontrols.hxx @@ -95,8 +95,6 @@ namespace dbaui bool FillItemSet( SfxItemSet* rCoreAttrs ); void implInitControls( const SfxItemSet& _rSet ); - - bool canAdvance() const; }; } // namespace dbaui diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx index 9ec7bb698108..349ce205104b 100644 --- a/editeng/source/editeng/editobj2.hxx +++ b/editeng/source/editeng/editobj2.hxx @@ -111,7 +111,6 @@ public: OutputDevice* GetRefDevPtr() const { return nRefDevPtr; } sal_uLong GetPaperWidth() const { return nPaperWidth; } - OutDevType GetRefDevType() const { return eRefDevType; } bool RefDevIsVirtual() const { return (eRefDevType == OUTDEV_VIRDEV) || (eRefDevType == OUTDEV_PDF); } const MapMode& GetRefMapMode() const { return aRefMapMode; } diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 6a47844dd461..3247da37e62f 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -180,7 +180,6 @@ public: const CancelButton& GetCancelButton() const { return *m_pCancelBtn; } CancelButton& GetCancelButton() { return *m_pCancelBtn; } - void RemoveResetButton(); void RemoveStandardButton(); short Execute() override; diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx index 4821b7ac9d52..62462180cfa6 100644 --- a/reportdesign/source/ui/dlg/PageNumber.cxx +++ b/reportdesign/source/ui/dlg/PageNumber.cxx @@ -38,9 +38,8 @@ using namespace ::comphelper; OPageNumberDialog::OPageNumberDialog(weld::Window* pParent, const uno::Reference< report::XReportDefinition >& _xHoldAlive, - OReportController* _pController) + OReportController* ) : GenericDialogController(pParent, "modules/dbreport/ui/pagenumberdialog.ui", "PageNumberDialog") - , m_pController(_pController) , m_xHoldAlive(_xHoldAlive) , m_xPageN(m_xBuilder->weld_radio_button("pagen")) , m_xPageNofM(m_xBuilder->weld_radio_button("pagenofm")) @@ -56,53 +55,6 @@ OPageNumberDialog::~OPageNumberDialog() { } -void OPageNumberDialog::execute() -{ - short nRet = m_xDialog->run(); - if (nRet == RET_OK) - { - try - { - sal_Int32 nControlMaxSize = 3000; - sal_Int32 nPosX = 0; - sal_Int32 nPos2X = 0; - awt::Size aRptSize = getStyleProperty<awt::Size>(m_xHoldAlive,PROPERTY_PAPERSIZE); - switch (m_xAlignmentLst->get_active()) - { - case 0: // left - nPosX = getStyleProperty<sal_Int32>(m_xHoldAlive,PROPERTY_LEFTMARGIN); - break; - case 1: // middle - nPosX = getStyleProperty<sal_Int32>(m_xHoldAlive,PROPERTY_LEFTMARGIN) + (aRptSize.Width - getStyleProperty<sal_Int32>(m_xHoldAlive,PROPERTY_LEFTMARGIN) - getStyleProperty<sal_Int32>(m_xHoldAlive,PROPERTY_RIGHTMARGIN) - nControlMaxSize) / 2; - break; - case 2: // right - nPosX = (aRptSize.Width - getStyleProperty<sal_Int32>(m_xHoldAlive,PROPERTY_RIGHTMARGIN) - nControlMaxSize); - break; - case 3: // inner - case 4: // outer - nPosX = getStyleProperty<sal_Int32>(m_xHoldAlive,PROPERTY_LEFTMARGIN); - nPos2X = (aRptSize.Width - getStyleProperty<sal_Int32>(m_xHoldAlive,PROPERTY_RIGHTMARGIN) - nControlMaxSize); - break; - default: - break; - } - if (m_xAlignmentLst->get_active() > 2) - nPosX = nPos2X; - - uno::Sequence<beans::PropertyValue> aValues( comphelper::InitPropertySequence({ - { PROPERTY_POSITION, uno::Any(awt::Point(nPosX,0)) }, - { PROPERTY_PAGEHEADERON, uno::Any(m_xTopPage->get_active()) }, - { PROPERTY_STATE, uno::Any(m_xPageNofM->get_active()) } - })); - - m_pController->executeChecked(SID_INSERT_FLD_PGNUMBER,aValues); - } - catch(uno::Exception&) - { - } - } -} - } // rptui diff --git a/reportdesign/source/ui/inc/PageNumber.hxx b/reportdesign/source/ui/inc/PageNumber.hxx index 8a5150698e2d..92fd4cc549f8 100644 --- a/reportdesign/source/ui/inc/PageNumber.hxx +++ b/reportdesign/source/ui/inc/PageNumber.hxx @@ -32,7 +32,6 @@ class OReportController; \************************************************************************/ class OPageNumberDialog : public weld::GenericDialogController { - ::rptui::OReportController* m_pController; css::uno::Reference< css::report::XReportDefinition> m_xHoldAlive; std::unique_ptr<weld::RadioButton> m_xPageN; @@ -49,7 +48,6 @@ public: const css::uno::Reference< css::report::XReportDefinition>& _xHoldAlive, ::rptui::OReportController* _pController); virtual ~OPageNumberDialog() override; - void execute(); }; } // namespace rptui diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 72fd6089f4d2..56143ef5ae36 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -555,12 +555,6 @@ void SfxTabDialog::Init_Impl(bool bFmtFlag) } } -void SfxTabDialog::RemoveResetButton() -{ - m_pResetBtn->Hide(); - m_pImpl->bHideResetBtn = true; -} - void SfxTabDialog::RemoveStandardButton() { m_pBaseFmtBtn->Hide(); diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index b986228698fa..5da40144df6d 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -1793,11 +1793,6 @@ void AuthorMarkPane::InitControls() m_xTitleFI->set_label(pEntry->GetAuthorField(AUTH_FIELD_TITLE)); } -void AuthorMarkPane::Activate() -{ - m_xActionBT->set_sensitive(!pSh->HasReadonlySel()); -} - namespace { const char* STR_AUTH_FIELD_ARY[] = diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index f249a8c04e2f..11f436cb9d63 100644 --- a/sw/source/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/uibase/dbui/mailmergehelper.cxx @@ -259,21 +259,6 @@ void SwAddressPreview::Clear() UpdateScrollBar(); } -void SwAddressPreview::ReplaceSelectedAddress(const OUString& rNew) -{ - pImpl->aAddresses[pImpl->nSelectedAddress] = rNew; - Invalidate(); -} - -void SwAddressPreview::RemoveSelectedAddress() -{ - pImpl->aAddresses.erase(pImpl->aAddresses.begin() + pImpl->nSelectedAddress); - if(pImpl->nSelectedAddress) - --pImpl->nSelectedAddress; - UpdateScrollBar(); - Invalidate(); -} - void SwAddressPreview::SetLayout(sal_uInt16 nRows, sal_uInt16 nColumns) { pImpl->nRows = nRows; @@ -281,11 +266,6 @@ void SwAddressPreview::SetLayout(sal_uInt16 nRows, sal_uInt16 nColumns) UpdateScrollBar(); } -void SwAddressPreview::EnableScrollBar() -{ - pImpl->bEnableScrollBar = true; -} - void SwAddressPreview::UpdateScrollBar() { if(pImpl->nColumns) @@ -592,13 +572,6 @@ void AddressPreview::SelectAddress(sal_uInt16 nSelect) m_xVScrollBar->vadjustment_set_value(nSelectRow); } -void AddressPreview::Clear() -{ - pImpl->aAddresses.clear(); - pImpl->nSelectedAddress = 0; - UpdateScrollBar(); -} - void AddressPreview::ReplaceSelectedAddress(const OUString& rNew) { pImpl->aAddresses[pImpl->nSelectedAddress] = rNew; @@ -779,102 +752,6 @@ void AddressPreview::DrawText_Impl(vcl::RenderContext& rRenderContext, const OUS while (nPos >= 0); } -OUString AddressPreview::FillData( - const OUString& rAddress, - SwMailMergeConfigItem const & rConfigItem, - const Sequence< OUString>* pAssignments) -{ - //find the column names in the address string (with name assignment!) and - //exchange the placeholder (like <Firstname>) with the database content - //unassigned columns are expanded to <not assigned> - Reference< XColumnsSupplier > xColsSupp( rConfigItem.GetResultSet(), UNO_QUERY); - Reference <XNameAccess> xColAccess = xColsSupp.is() ? xColsSupp->getColumns() : nullptr; - Sequence< OUString> aAssignment = pAssignments ? - *pAssignments : - rConfigItem.GetColumnAssignment( - rConfigItem.GetCurrentDBData() ); - const OUString* pAssignment = aAssignment.getConstArray(); - const std::vector<std::pair<OUString, int>>& rDefHeaders = rConfigItem.GetDefaultAddressHeaders(); - OUString sNotAssigned = "<" + SwResId(STR_NOTASSIGNED) + ">"; - - bool bIncludeCountry = rConfigItem.IsIncludeCountry(); - const OUString rExcludeCountry = rConfigItem.GetExcludeCountry(); - bool bSpecialReplacementForCountry = (!bIncludeCountry || !rExcludeCountry.isEmpty()); - OUString sCountryColumn; - if( bSpecialReplacementForCountry ) - { - sCountryColumn = rDefHeaders[MM_PART_COUNTRY].first; - Sequence< OUString> aSpecialAssignment = - rConfigItem.GetColumnAssignment( rConfigItem.GetCurrentDBData() ); - if(aSpecialAssignment.getLength() > MM_PART_COUNTRY && aSpecialAssignment[MM_PART_COUNTRY].getLength()) - sCountryColumn = aSpecialAssignment[MM_PART_COUNTRY]; - } - - SwAddressIterator aIter(rAddress); - OUStringBuffer sAddress; - while(aIter.HasMore()) - { - SwMergeAddressItem aItem = aIter.Next(); - if(aItem.bIsColumn) - { - //get the default column name - - //find the appropriate assignment - OUString sConvertedColumn = aItem.sText; - for(sal_uInt32 nColumn = 0; - nColumn < rDefHeaders.size() && nColumn < sal_uInt32(aAssignment.getLength()); - ++nColumn) - { - if (rDefHeaders[nColumn].first == aItem.sText && - !pAssignment[nColumn].isEmpty()) - { - sConvertedColumn = pAssignment[nColumn]; - break; - } - } - if(!sConvertedColumn.isEmpty() && - xColAccess.is() && - xColAccess->hasByName(sConvertedColumn)) - { - //get the content and exchange it in the address string - Any aCol = xColAccess->getByName(sConvertedColumn); - Reference< XColumn > xColumn; - aCol >>= xColumn; - if(xColumn.is()) - { - try - { - OUString sReplace = xColumn->getString(); - - if( bSpecialReplacementForCountry && sCountryColumn == sConvertedColumn ) - { - if( !rExcludeCountry.isEmpty() && sReplace != rExcludeCountry ) - aItem.sText = sReplace; - else - aItem.sText.clear(); - } - else - { - aItem.sText = sReplace; - } - } - catch (const sdbc::SQLException&) - { - OSL_FAIL("SQLException caught"); - } - } - } - else - { - aItem.sText = sNotAssigned; - } - - } - sAddress.append(aItem.sText); - } - return sAddress.makeStringAndClear(); -} - SwMergeAddressItem SwAddressIterator::Next() { //currently the string may either start with a '<' then it's a column diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx index 575c4f679bc2..e2c4ad6b6093 100644 --- a/sw/source/uibase/inc/mailmergehelper.hxx +++ b/sw/source/uibase/inc/mailmergehelper.hxx @@ -99,12 +99,9 @@ public: // returns the selected address sal_uInt16 GetSelectedAddress() const; void SelectAddress(sal_uInt16 nSelect); - void ReplaceSelectedAddress(const OUString&); - void RemoveSelectedAddress(); // set the number of rows and columns of addresses void SetLayout(sal_uInt16 nRows, sal_uInt16 nColumns); - void EnableScrollBar(); // fill the actual data into a string (address block or greeting) static OUString FillData(const OUString& rAddress, SwMailMergeConfigItem const & rConfigItem, @@ -143,8 +140,6 @@ public: void AddAddress(const OUString& rAddress); // for preview mode - replaces the currently used address by the given one void SetAddress(const OUString& rAddress); - // removes all addresses - void Clear(); // returns the selected address sal_uInt16 GetSelectedAddress() const; @@ -155,12 +150,6 @@ public: // set the number of rows and columns of addresses void SetLayout(sal_uInt16 nRows, sal_uInt16 nColumns); void EnableScrollBar(); - - // fill the actual data into a string (address block or greeting) - static OUString FillData(const OUString& rAddress, SwMailMergeConfigItem const & rConfigItem, - const css::uno::Sequence<OUString>* pAssignments = nullptr); - - void SetSelectHdl (const Link<LinkParamNone*,void>& rLink) { m_aSelectHdl = rLink; } }; diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx index 3c8f63754998..f04c5eefe399 100644 --- a/sw/source/uibase/inc/swuiidxmrk.hxx +++ b/sw/source/uibase/inc/swuiidxmrk.hxx @@ -271,7 +271,6 @@ class AuthorMarkPane DECL_LINK(EditModifyHdl, weld::Entry&, void); void InitControls(); - void Activate(); public: AuthorMarkPane(weld::DialogController& rDialog, weld::Builder& rBuilder, bool bNew); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits